From dd75bc4415d25ae0b36963437f12fbae59c26913 Mon Sep 17 00:00:00 2001
From: David Goodwin <david.goodwin@orlo.tech>
Date: Thu, 15 Aug 2019 16:13:25 +0100
Subject: [PATCH 01/78] Update PHPDoc - don't return "Boolean" use bool or
 false instead

Helps e.g. psalm static analysis.
---
 lib/request/sfRequest.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/request/sfRequest.class.php b/lib/request/sfRequest.class.php
index e2594e2d1..b7249728b 100644
--- a/lib/request/sfRequest.class.php
+++ b/lib/request/sfRequest.class.php
@@ -171,7 +171,7 @@ public function setMethod($method)
    *
    * @param  string $name The name of the request parameter
    *
-   * @return Boolean true if the request parameter exists, false otherwise
+   * @return bool true if the request parameter exists, false otherwise
    */
   public function offsetExists($name)
   {
@@ -308,7 +308,7 @@ public function setParameter($name, $value)
   /**
    * Returns the content of the current request.
    *
-   * @return string|Boolean The content or false if none is available
+   * @return string|false The content or false if none is available
    */
   public function getContent()
   {

From daebc947d1870643b316c556462b80a60b644680 Mon Sep 17 00:00:00 2001
From: callmebob2016 <38659523+callmebob2016@users.noreply.github.com>
Date: Tue, 26 Nov 2019 11:30:34 +0100
Subject: [PATCH 02/78] Update README.md

Change mentioned current Symfony version from 4 to 5
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ff1d95810..06b00303d 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ About this version
 
 This is a community driven fork of symfony 1, as official support has been [interrupted in November 2012](http://symfony.com/blog/symfony-1-4-end-of-maintenance-what-does-it-mean).
 
-**Do not use it for new projects: this version is great to improve existing symfony1 applications, but [Symfony4](http://symfony.com/) is the way to go today.**
+**Do not use it for new projects: this version is great to improve existing symfony1 applications, but [Symfony5](http://symfony.com/) is the way to go today.**
 
 All the enhancements and BC breaks are listed in the [WHATS_NEW](https://github.com/FriendsOfSymfony1/symfony1/blob/master/WHATS_NEW.md) file, this include:
 

From 113be3dfe0157292f2731d6ebf366a5eaebb9d18 Mon Sep 17 00:00:00 2001
From: adrienperonnet <adrien@vendhq.com>
Date: Wed, 27 Nov 2019 15:01:46 +1300
Subject: [PATCH 03/78] [HttpFoundation] fix guessing mime-types of files with
 leading dash

Backport fix https://github.com/symfony/symfony/commit/691486e43ce0e4893cd703e221bafc10a871f365
---
 lib/validator/sfValidatorFile.class.php     | 4 +++-
 test/unit/validator/sfValidatorFileTest.php | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/validator/sfValidatorFile.class.php b/lib/validator/sfValidatorFile.class.php
index ec9bab22b..dd6b18181 100644
--- a/lib/validator/sfValidatorFile.class.php
+++ b/lib/validator/sfValidatorFile.class.php
@@ -263,7 +263,9 @@ protected function guessFromFileBinary($file)
   {
     ob_start();
     //need to use --mime instead of -i. see #6641
-    passthru(sprintf('file -b --mime %s 2>/dev/null', escapeshellarg($file)), $return);
+    $cmd = 'file -b --mime %s -- 2>/dev/null';
+    $file = (0 === strpos($file, '-') ? './' : '').$file;
+    passthru(sprintf($cmd, escapeshellarg($file)), $return);
     if ($return > 0)
     {
       ob_end_clean();
diff --git a/test/unit/validator/sfValidatorFileTest.php b/test/unit/validator/sfValidatorFileTest.php
index 407f0e316..c5b140557 100755
--- a/test/unit/validator/sfValidatorFileTest.php
+++ b/test/unit/validator/sfValidatorFileTest.php
@@ -106,6 +106,7 @@ public function getMimeTypesFromCategory($category)
 $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->is($v->guessFromFileBinary('/bin/ls'), (PHP_OS != 'Darwin') ? 'application/x-executable' : 'application/octet-stream', '->guessFromFileBinary() returns correct type if file is guessable');
+$t->is($v->guessFromFileBinary('-test'), null, '->guessFromFileBinary() returns null if file path has leading dash');
 
 // ->getMimeType()
 $t->diag('->getMimeType()');

From dbe7d74569fa6623ef16cda54112db3f1fa91c01 Mon Sep 17 00:00:00 2001
From: adrienperonnet <adrien@vendhq.com>
Date: Wed, 27 Nov 2019 16:30:01 +1300
Subject: [PATCH 04/78] path need to be placed after the double dash

---
 lib/validator/sfValidatorFile.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/validator/sfValidatorFile.class.php b/lib/validator/sfValidatorFile.class.php
index dd6b18181..294dea8c0 100644
--- a/lib/validator/sfValidatorFile.class.php
+++ b/lib/validator/sfValidatorFile.class.php
@@ -263,7 +263,7 @@ protected function guessFromFileBinary($file)
   {
     ob_start();
     //need to use --mime instead of -i. see #6641
-    $cmd = 'file -b --mime %s -- 2>/dev/null';
+    $cmd = 'file -b --mime -- %s 2>/dev/null';
     $file = (0 === strpos($file, '-') ? './' : '').$file;
     passthru(sprintf($cmd, escapeshellarg($file)), $return);
     if ($return > 0)

From 1d8ba1d8eef3c163e444b9e182b4e98a26600e61 Mon Sep 17 00:00:00 2001
From: Dieter <beck.worma@gmail.com>
Date: Sun, 22 Mar 2020 19:38:55 +0100
Subject: [PATCH 05/78] Test PHP 7.3 and 7.4

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 4fda37d57..462a8b11f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,8 @@ php:
     - 7.0
     - 7.1
     - 7.2
+    - 7.3
+    - 7.4
     - nightly
 
 # run build against nightly but allow them to fail

From 89421abf6d095c77b164005472259fba88f77887 Mon Sep 17 00:00:00 2001
From: Dieter <beck.worma@gmail.com>
Date: Sun, 22 Mar 2020 19:57:04 +0100
Subject: [PATCH 06/78] Fix array and string offset access using curly braces
 (deprecated since PHP 7.4)

---
 lib/i18n/sfDateFormat.class.php | 6 +++---
 lib/util/sfFinder.class.php     | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/i18n/sfDateFormat.class.php b/lib/i18n/sfDateFormat.class.php
index 064bc65a1..27974a1bd 100644
--- a/lib/i18n/sfDateFormat.class.php
+++ b/lib/i18n/sfDateFormat.class.php
@@ -229,7 +229,7 @@ public function format($time, $pattern = 'F', $inputPattern = null, $charset = '
     for ($i = 0, $max = count($tokens); $i < $max; $i++)
     {
       $pattern = $tokens[$i];
-      if ($pattern{0} == "'" && $pattern{strlen($pattern) - 1} == "'")
+      if ($pattern[0] == "'" && $pattern{strlen($pattern) - 1} == "'")
       {
         $tokens[$i] = str_replace('``````', '\'', preg_replace('/(^\')|(\'$)/', '', $pattern));
       }
@@ -266,9 +266,9 @@ public function format($time, $pattern = 'F', $inputPattern = null, $charset = '
    */
   protected function getFunctionName($token)
   {
-    if (isset($this->tokens[$token{0}]))
+    if (isset($this->tokens[$token[0]]))
     {
-      return $this->tokens[$token{0}];
+      return $this->tokens[$token[0]];
     }
   }
 
diff --git a/lib/util/sfFinder.class.php b/lib/util/sfFinder.class.php
index 879dd54eb..be56137a3 100644
--- a/lib/util/sfFinder.class.php
+++ b/lib/util/sfFinder.class.php
@@ -580,10 +580,10 @@ protected function exec_ok($dir, $entry)
 
   public static function isPathAbsolute($path)
   {
-    if ($path{0} === '/' || $path{0} === '\\' ||
-        (strlen($path) > 3 && ctype_alpha($path{0}) &&
-         $path{1} === ':' &&
-         ($path{2} === '\\' || $path{2} === '/')
+    if ($path[0] === '/' || $path[0] === '\\' ||
+        (strlen($path) > 3 && ctype_alpha($path[0]) &&
+         $path[1] === ':' &&
+         ($path[2] === '\\' || $path[2] === '/')
         )
        )
     {

From d6468e191ae475c7ccd9464ee2bfbc7e72c079a3 Mon Sep 17 00:00:00 2001
From: Dieter <beck.worma@gmail.com>
Date: Sun, 22 Mar 2020 20:30:00 +0100
Subject: [PATCH 07/78] Call get_magic_quotes_gpc() only for PHP < 5.4 as it
 always returns false on newer versions and is deprecated since PHP 7.4

---
 lib/request/sfWebRequest.class.php | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/lib/request/sfWebRequest.class.php b/lib/request/sfWebRequest.class.php
index 52c766f0f..2cc552bb9 100644
--- a/lib/request/sfWebRequest.class.php
+++ b/lib/request/sfWebRequest.class.php
@@ -75,7 +75,14 @@ public function initialize(sfEventDispatcher $dispatcher, $parameters = array(),
     parent::initialize($dispatcher, $parameters, $attributes, $options);
 
     // GET parameters
-    $this->getParameters = get_magic_quotes_gpc() ? sfToolkit::stripslashesDeep($_GET) : $_GET;
+    if (version_compare(PHP_VERSION, '5.4', '<') && get_magic_quotes_gpc())
+    {
+      $this->getParameters = sfToolkit::stripslashesDeep($_GET);
+    }
+    else
+    {
+      $this->getParameters = $_GET;
+    }
     $this->parameterHolder->add($this->getParameters);
 
     $postParameters = $_POST;
@@ -148,7 +155,15 @@ public function initialize(sfEventDispatcher $dispatcher, $parameters = array(),
       $this->setMethod(self::GET);
     }
 
-    $this->postParameters = get_magic_quotes_gpc() ? sfToolkit::stripslashesDeep($postParameters) : $postParameters;
+    if (version_compare(PHP_VERSION, '5.4', '<') && get_magic_quotes_gpc())
+    {
+      $this->postParameters = sfToolkit::stripslashesDeep($postParameters);
+    }
+    else
+    {
+      $this->postParameters = $postParameters;
+    }
+
     $this->parameterHolder->add($this->postParameters);
 
     if ($formats = $this->getOption('formats'))
@@ -600,7 +615,14 @@ public function getCookie($name, $defaultValue = null)
 
     if (isset($_COOKIE[$name]))
     {
-      $retval = get_magic_quotes_gpc() ? sfToolkit::stripslashesDeep($_COOKIE[$name]) : $_COOKIE[$name];
+      if (version_compare(PHP_VERSION, '5.4', '<') && get_magic_quotes_gpc())
+      {
+        $retval = sfToolkit::stripslashesDeep($_COOKIE[$name]);
+      }
+      else
+      {
+        $retval = $_COOKIE[$name];
+      }
     }
 
     return $retval;

From 793f15236092bbfb15e34d7583af36da5e736dc4 Mon Sep 17 00:00:00 2001
From: Dieter <beck.worma@gmail.com>
Date: Sun, 22 Mar 2020 20:40:54 +0100
Subject: [PATCH 08/78] Use trusty for PHP 5.5

---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 462a8b11f..2da3037dc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,6 @@
 language: php
 
 php:
-    - 5.5
     - 5.6
     - 7.0
     - 7.1
@@ -22,6 +21,9 @@ matrix:
         - php: 5.4
           dist: precise
           sudo: required
+        - php: 5.5
+          dist: trusty
+          sudo: required
 
 # faster builds on new travis setup not using sudo
 sudo: false

From a0dc91ddbf4dd697890fd2ba4d2d7c0762094d82 Mon Sep 17 00:00:00 2001
From: Dieter <beck.worma@gmail.com>
Date: Sun, 22 Mar 2020 20:50:11 +0100
Subject: [PATCH 09/78] Use trusty for PHP 5.6 to fix issue with memcache
 extension

---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 2da3037dc..91ad92f18 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,6 @@
 language: php
 
 php:
-    - 5.6
     - 7.0
     - 7.1
     - 7.2
@@ -24,6 +23,9 @@ matrix:
         - php: 5.5
           dist: trusty
           sudo: required
+        - php: 5.6
+          dist: trusty
+          sudo: required
 
 # faster builds on new travis setup not using sudo
 sudo: false

From 2032c8345c45ff2b7baa5ea60c59ea59f0d000a5 Mon Sep 17 00:00:00 2001
From: Dieter <beck.worma@gmail.com>
Date: Mon, 23 Mar 2020 19:25:03 +0100
Subject: [PATCH 10/78] Call get_magic_quotes_gpc() for PHP < 5.4.0-dev

---
 lib/request/sfWebRequest.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/request/sfWebRequest.class.php b/lib/request/sfWebRequest.class.php
index 2cc552bb9..bf35cbcb4 100644
--- a/lib/request/sfWebRequest.class.php
+++ b/lib/request/sfWebRequest.class.php
@@ -75,7 +75,7 @@ public function initialize(sfEventDispatcher $dispatcher, $parameters = array(),
     parent::initialize($dispatcher, $parameters, $attributes, $options);
 
     // GET parameters
-    if (version_compare(PHP_VERSION, '5.4', '<') && get_magic_quotes_gpc())
+    if (version_compare(PHP_VERSION, '5.4.0-dev', '<') && get_magic_quotes_gpc())
     {
       $this->getParameters = sfToolkit::stripslashesDeep($_GET);
     }
@@ -155,7 +155,7 @@ public function initialize(sfEventDispatcher $dispatcher, $parameters = array(),
       $this->setMethod(self::GET);
     }
 
-    if (version_compare(PHP_VERSION, '5.4', '<') && get_magic_quotes_gpc())
+    if (version_compare(PHP_VERSION, '5.4.0-dev', '<') && get_magic_quotes_gpc())
     {
       $this->postParameters = sfToolkit::stripslashesDeep($postParameters);
     }
@@ -615,7 +615,7 @@ public function getCookie($name, $defaultValue = null)
 
     if (isset($_COOKIE[$name]))
     {
-      if (version_compare(PHP_VERSION, '5.4', '<') && get_magic_quotes_gpc())
+      if (version_compare(PHP_VERSION, '5.4.0-dev', '<') && get_magic_quotes_gpc())
       {
         $retval = sfToolkit::stripslashesDeep($_COOKIE[$name]);
       }

From 437a29da9e8608a0887024d797b09c0b581778ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Benoist?=
 <j0k3r@users.noreply.github.com>
Date: Fri, 3 Apr 2020 12:08:40 +0200
Subject: [PATCH 11/78] 1.5.12

---
 lib/autoload/sfCoreAutoload.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/autoload/sfCoreAutoload.class.php b/lib/autoload/sfCoreAutoload.class.php
index d16a0310b..441495503 100755
--- a/lib/autoload/sfCoreAutoload.class.php
+++ b/lib/autoload/sfCoreAutoload.class.php
@@ -11,7 +11,7 @@
 /**
  * The current symfony version.
  */
-define('SYMFONY_VERSION', '1.5.12-dev');
+define('SYMFONY_VERSION', '1.5.12');
 
 /**
  * sfCoreAutoload class.

From 7d1bd476772e8541b0a99dae02cfcf11eabe6d2d Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Fri, 3 Apr 2020 12:13:07 +0200
Subject: [PATCH 12/78] Fix tests count following #218

---
 test/unit/validator/sfValidatorFileTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/validator/sfValidatorFileTest.php b/test/unit/validator/sfValidatorFileTest.php
index c5b140557..43412cffc 100755
--- a/test/unit/validator/sfValidatorFileTest.php
+++ b/test/unit/validator/sfValidatorFileTest.php
@@ -10,7 +10,7 @@
 
 require_once(__DIR__.'/../../bootstrap/unit.php');
 
-$t = new lime_test(69);
+$t = new lime_test(70);
 
 $tmpDir = sys_get_temp_dir();
 $content = 'This is an ASCII file.';

From 80ff0d2f9fcf45940ae4a9cac3a66c7050827aea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Benoist?=
 <j0k3r@users.noreply.github.com>
Date: Fri, 3 Apr 2020 12:25:00 +0200
Subject: [PATCH 13/78] 1.5.13-dev

---
 lib/autoload/sfCoreAutoload.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/autoload/sfCoreAutoload.class.php b/lib/autoload/sfCoreAutoload.class.php
index 441495503..f1bc5822f 100755
--- a/lib/autoload/sfCoreAutoload.class.php
+++ b/lib/autoload/sfCoreAutoload.class.php
@@ -11,7 +11,7 @@
 /**
  * The current symfony version.
  */
-define('SYMFONY_VERSION', '1.5.12');
+define('SYMFONY_VERSION', '1.5.13-dev');
 
 /**
  * sfCoreAutoload class.

From ff4f9ca196cb362b1328c0834f9bcc18fa63b62b Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <sergey.matvienko@starofservice.com>
Date: Wed, 6 May 2020 17:17:26 +0300
Subject: [PATCH 14/78] Remove `PHP Notice: Trying to access array offset on
 value of type null in sfForm.class.php on line 947`

---
 lib/form/sfForm.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/form/sfForm.class.php b/lib/form/sfForm.class.php
index 04fb38a59..db46c4d82 100644
--- a/lib/form/sfForm.class.php
+++ b/lib/form/sfForm.class.php
@@ -63,7 +63,6 @@ class sfForm implements ArrayAccess, Iterator, Countable
    */
   public function __construct($defaults = array(), $options = array(), $CSRFSecret = null)
   {
-    $this->setDefaults($defaults);
     $this->options = $options;
     $this->localCSRFSecret = $CSRFSecret;
 
@@ -71,6 +70,7 @@ public function __construct($defaults = array(), $options = array(), $CSRFSecret
     $this->widgetSchema    = new sfWidgetFormSchema();
     $this->errorSchema     = new sfValidatorErrorSchema($this->validatorSchema);
 
+    $this->setDefaults($defaults);
     $this->setup();
     $this->configure();
 

From 73bae70bd9f0754b59f3fea47b112d6e00d90179 Mon Sep 17 00:00:00 2001
From: pathumhdes <pathumhdes@gmail.com>
Date: Mon, 20 Apr 2020 11:28:34 +0530
Subject: [PATCH 15/78] PHP 7.4 Incompatibility Fixes

Fix array and string offset access using curly braces (Deprecated since PHP 7.4)

Fix array and string offset access using curly braces (Deprecated since PHP 7.4)

PHP 7.4 incompatibility fix: Passing the glue and pieces parameters in reverse order to implode has been deprecated since PHP 7.4
---
 lib/helper/UrlHelper.php              |  2 +-
 lib/i18n/sfDateFormat.class.php       | 16 ++++++++--------
 lib/i18n/sfNumberFormat.class.php     |  2 +-
 lib/i18n/sfNumberFormatInfo.class.php |  6 +++---
 lib/view/sfViewCacheManager.class.php |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/lib/helper/UrlHelper.php b/lib/helper/UrlHelper.php
index 88b1895ac..de61246d2 100644
--- a/lib/helper/UrlHelper.php
+++ b/lib/helper/UrlHelper.php
@@ -630,7 +630,7 @@ function _encodeText($text)
 
   for ($i = 0; $i < strlen($text); $i++)
   {
-    $char = $text{$i};
+    $char = $text[$i];
     $r = mt_rand(0, 100);
 
     # roughly 10% raw, 45% hex, 45% dec
diff --git a/lib/i18n/sfDateFormat.class.php b/lib/i18n/sfDateFormat.class.php
index 27974a1bd..ceace0eee 100644
--- a/lib/i18n/sfDateFormat.class.php
+++ b/lib/i18n/sfDateFormat.class.php
@@ -229,7 +229,7 @@ public function format($time, $pattern = 'F', $inputPattern = null, $charset = '
     for ($i = 0, $max = count($tokens); $i < $max; $i++)
     {
       $pattern = $tokens[$i];
-      if ($pattern[0] == "'" && $pattern{strlen($pattern) - 1} == "'")
+      if ($pattern[0] == "'" && $pattern[(strlen($pattern) - 1)] == "'")
       {
         $tokens[$i] = str_replace('``````', '\'', preg_replace('/(^\')|(\'$)/', '', $pattern));
       }
@@ -397,30 +397,30 @@ protected function getTokens($pattern)
 
     for ($i = 0, $max = strlen($pattern); $i < $max; $i++)
     {
-      if ($char == null || $pattern{$i} == $char || $text)
+      if ($char == null || $pattern[$i] == $char || $text)
       {
-        $token .= $pattern{$i};
+        $token .= $pattern[$i];
       }
       else
       {
         $tokens[] = str_replace("''", "'", $token);
-        $token = $pattern{$i};
+        $token = $pattern[$i];
       }
 
-      if ($pattern{$i} == "'" && $text == false)
+      if ($pattern[$i] == "'" && $text == false)
       {
         $text = true;
       }
-      else if ($text && $pattern{$i} == "'" && $char == "'")
+      else if ($text && $pattern[$i] == "'" && $char == "'")
       {
         $text = true;
       }
-      else if ($text && $char != "'" && $pattern{$i} == "'")
+      else if ($text && $char != "'" && $pattern[$i] == "'")
       {
         $text = false;
       }
 
-      $char = $pattern{$i};
+      $char = $pattern[$i];
 
     }
     $tokens[] = $token;
diff --git a/lib/i18n/sfNumberFormat.class.php b/lib/i18n/sfNumberFormat.class.php
index 9c559f6f3..117ee2004 100644
--- a/lib/i18n/sfNumberFormat.class.php
+++ b/lib/i18n/sfNumberFormat.class.php
@@ -193,7 +193,7 @@ protected function formatInteger($string)
       // now for the integer groupings
       for ($i = 0; $i < $len; $i++)
       {
-        $char = $string{$len - $i - 1};
+        $char = $string[($len - $i - 1)];
 
         if ($multiGroup && $count == 0)
         {
diff --git a/lib/i18n/sfNumberFormatInfo.class.php b/lib/i18n/sfNumberFormatInfo.class.php
index 613b48adb..2bfb7a613 100644
--- a/lib/i18n/sfNumberFormatInfo.class.php
+++ b/lib/i18n/sfNumberFormatInfo.class.php
@@ -316,7 +316,7 @@ protected function parsePattern($pattern)
         // to find the groupsize 1.
         for ($i = strlen($pattern) - 1; $i >= 0; $i--)
         {
-          if ($pattern{$i} == $digit || $pattern{$i} == $hash)
+          if ($pattern[$i] == $digit || $pattern[$i] == $hash)
           {
             $groupSize1 = $i - $groupPos1;
             break;
@@ -335,11 +335,11 @@ protected function parsePattern($pattern)
     {
       for ($i = strlen($pattern) - 1; $i >= 0; $i--)
       {
-        if ($pattern{$i} == $dot)
+        if ($pattern[$i] == $dot)
         {
           break;
         }
-        if ($pattern{$i} == $digit)
+        if ($pattern[$i] == $digit)
         {
           $decimalPoints = $i - $decimalPos;
           break;
diff --git a/lib/view/sfViewCacheManager.class.php b/lib/view/sfViewCacheManager.class.php
index 834d46697..f055e50f1 100644
--- a/lib/view/sfViewCacheManager.class.php
+++ b/lib/view/sfViewCacheManager.class.php
@@ -236,7 +236,7 @@ protected function getCacheKeyVaryHeaderPart($internalUri, $vary = '')
       {
         $varys[] = $header . '-' . preg_replace('/\W+/', '_', $request->getHttpHeader($header));
       }
-      $vary = implode($varys, '-');
+      $vary = implode('-', $varys);
     }
 
     return $vary;

From 4d512dedcb6102278d665690beb5420b0df2bd0d Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <sergey.matvienko@starofservice.com>
Date: Wed, 6 May 2020 16:56:13 +0300
Subject: [PATCH 16/78] Fix for `Warning: ini_set(): A session is active. You
 cannot change the session module's ini settings at this time`

---
 lib/config/sfFactoryConfigHandler.class.php |  4 ++++
 lib/storage/sfSessionStorage.class.php      |  7 +++++++
 lib/user/sfBasicSecurityUser.class.php      | 10 ++--------
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/lib/config/sfFactoryConfigHandler.class.php b/lib/config/sfFactoryConfigHandler.class.php
index f4a7b530a..c42b0e992 100644
--- a/lib/config/sfFactoryConfigHandler.class.php
+++ b/lib/config/sfFactoryConfigHandler.class.php
@@ -109,6 +109,10 @@ public function execute($configFiles)
             unset($parameters['database']);
           }
 
+          if (isset($config['user']['param']['timeout'])) {
+            $defaultParameters[] = sprintf("'gc_maxlifetime' => %d,", $config['user']['param']['timeout']);
+          }
+
           $instances[] = sprintf("  \$class = sfConfig::get('sf_factory_storage', '%s');\n  \$this->factories['storage'] = new \$class(array_merge(array(\n%s\n), sfConfig::get('sf_factory_storage_parameters', %s)));", $class, implode("\n", $defaultParameters), var_export($parameters, true));
           break;
 
diff --git a/lib/storage/sfSessionStorage.class.php b/lib/storage/sfSessionStorage.class.php
index 0a29f19e0..57ff59973 100644
--- a/lib/storage/sfSessionStorage.class.php
+++ b/lib/storage/sfSessionStorage.class.php
@@ -63,6 +63,7 @@ public function initialize($options = null)
       'session_cookie_secure'   => $cookieDefaults['secure'],
       'session_cookie_httponly' => isset($cookieDefaults['httponly']) ? $cookieDefaults['httponly'] : false,
       'session_cache_limiter'   => null,
+      'gc_maxlifetime'          => 1800,
     ), $options);
 
     // initialize parent
@@ -90,6 +91,12 @@ public function initialize($options = null)
       session_cache_limiter($this->options['session_cache_limiter']);
     }
 
+    // force the max lifetime for session garbage collector to be greater than timeout
+    if (ini_get('session.gc_maxlifetime') < $this->options['gc_maxlifetime'])
+    {
+      ini_set('session.gc_maxlifetime', $this->options['gc_maxlifetime']);
+    }
+
     if ($this->options['auto_start'] && !self::$sessionStarted)
     {
       session_start();
diff --git a/lib/user/sfBasicSecurityUser.class.php b/lib/user/sfBasicSecurityUser.class.php
index d624d3c49..02086fffb 100644
--- a/lib/user/sfBasicSecurityUser.class.php
+++ b/lib/user/sfBasicSecurityUser.class.php
@@ -4,7 +4,7 @@
  * 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>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -42,7 +42,7 @@ public function clearCredentials()
 
   /**
    * Returns the current user's credentials.
-   * 
+   *
    * @return array
    */
   public function getCredentials()
@@ -251,12 +251,6 @@ public function initialize(sfEventDispatcher $dispatcher, sfStorage $storage, $o
       $this->options['timeout'] = 1800;
     }
 
-    // force the max lifetime for session garbage collector to be greater than timeout
-    if (ini_get('session.gc_maxlifetime') < $this->options['timeout'])
-    {
-      ini_set('session.gc_maxlifetime', $this->options['timeout']);
-    }
-
     // read data from storage
     $this->authenticated = $storage->read(self::AUTH_NAMESPACE);
     $this->credentials   = $storage->read(self::CREDENTIAL_NAMESPACE);

From 62e9c1e62fe92362bc97081eb7035dfeb8963260 Mon Sep 17 00:00:00 2001
From: pathumhdes <pathumhdes@gmail.com>
Date: Sun, 17 May 2020 09:39:03 +0530
Subject: [PATCH 17/78] Changes done as per feedback

---
 lib/i18n/sfDateFormat.class.php   | 2 +-
 lib/i18n/sfNumberFormat.class.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/i18n/sfDateFormat.class.php b/lib/i18n/sfDateFormat.class.php
index ceace0eee..80a5a571f 100644
--- a/lib/i18n/sfDateFormat.class.php
+++ b/lib/i18n/sfDateFormat.class.php
@@ -229,7 +229,7 @@ public function format($time, $pattern = 'F', $inputPattern = null, $charset = '
     for ($i = 0, $max = count($tokens); $i < $max; $i++)
     {
       $pattern = $tokens[$i];
-      if ($pattern[0] == "'" && $pattern[(strlen($pattern) - 1)] == "'")
+      if ($pattern[0] == "'" && $pattern[strlen($pattern) - 1] == "'")
       {
         $tokens[$i] = str_replace('``````', '\'', preg_replace('/(^\')|(\'$)/', '', $pattern));
       }
diff --git a/lib/i18n/sfNumberFormat.class.php b/lib/i18n/sfNumberFormat.class.php
index 117ee2004..bcf948d55 100644
--- a/lib/i18n/sfNumberFormat.class.php
+++ b/lib/i18n/sfNumberFormat.class.php
@@ -193,7 +193,7 @@ protected function formatInteger($string)
       // now for the integer groupings
       for ($i = 0; $i < $len; $i++)
       {
-        $char = $string[($len - $i - 1)];
+        $char = $string[$len - $i - 1];
 
         if ($multiGroup && $count == 0)
         {

From d8388cdb31a19e9dca37c6d10c1b821aa2a6a513 Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Mon, 8 Jun 2020 08:21:48 +0200
Subject: [PATCH 18/78] Rename package to `friendsofsymfony1/symfony1`

- Add PHP requirements
- Cleanup Travis
- Update changelog
---
 .travis.yml   | 24 ++++++++----------------
 CHANGELOG.md  | 15 +++++++++++++++
 README.md     |  2 +-
 composer.json |  7 ++++---
 4 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 91ad92f18..c163be702 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,5 @@
+os: linux
+dist: xenial
 language: php
 
 php:
@@ -9,45 +11,35 @@ php:
     - nightly
 
 # run build against nightly but allow them to fail
-matrix:
+jobs:
     fast_finish: true
     allow_failures:
         - php: nightly
     include:
         - php: 5.3
           dist: precise
-          sudo: required
         - php: 5.4
           dist: precise
-          sudo: required
         - php: 5.5
           dist: trusty
-          sudo: required
         - php: 5.6
           dist: trusty
-          sudo: required
-
-# faster builds on new travis setup not using sudo
-sudo: false
 
 services:
     - memcached
 
-# cache vendor dirs
 cache:
     directories:
-        - lib/vendor/swiftmailer
         - $HOME/.composer/cache
 
-install:
-    - composer self-update
+before_install:
+    - sh -c 'if [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ] && [ $(php -r "echo PHP_MAJOR_VERSION;") -le 5 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
+    - sh -c 'if [ $(php -r "echo PHP_RELEASE_VERSION;") -le 98 ] && [ $(php -r "echo PHP_MAJOR_VERSION;") -le 5 ]; then echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
 
-before_script:
+install:
     # by default, --remote is not used on travis
     - git submodule update --remote --force
-    - sh -c 'if [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ] && [ $(php -r "echo PHP_MAJOR_VERSION;") -le 5 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
-    - sh -c 'if [ $(php -r "echo PHP_RELEASE_VERSION;") -le 98 ] && [ $(php -r "echo PHP_MAJOR_VERSION;") -le 5 ]; then echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
-    - composer install
+    - composer install --prefer-dist --no-progress --no-suggest -o
 
 script:
     - php data/bin/check_configuration.php
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 022e5a39e..9b84ddec7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,21 @@
 CHANGELOG
 =========
 
+xx/xx/xxxx: Version 1.5.13
+--------------------------
+
+* Fix for `Warning: ini_set(): A session is active...` #229
+
+=========
+
+03/04/2020: Version 1.5.12
+--------------------------
+
+* Move project from @LExpress to @FriendsOfSymfony1
+* Some doc & readme update
+* Fixes for PHP 7.3 & 7.4 (thanks @W0rma for the code and @alquerci for the review) #224
+* Backport fix for cve-2019-18888 by @adrienperonnet #218
+
 17/03/2018: Version 1.5.11
 --------------------------
 
diff --git a/README.md b/README.md
index 06b00303d..5a415e134 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ The end result of these advantages means there is no need to reinvent the wheel
 Symfony was written entirely in PHP 5.
 It has been thoroughly tested in various real-world projects, and is actually in use for high-demand e-business websites.
 It is compatible with most of the available databases engines, including MySQL, PostgreSQL, Oracle, and Microsoft SQL Server.
-It runs on *nix and Windows platforms.
+It runs on *nix and Windows platforms*.
 
 Requirements
 ------------
diff --git a/composer.json b/composer.json
index 2562a3bc5..8e3a7c61b 100755
--- a/composer.json
+++ b/composer.json
@@ -1,19 +1,20 @@
 {
-    "name": "lexpress/symfony1",
+    "name": "friendsofsymfony1/symfony1",
     "description": "Fork of symfony 1.4 with dic, form enhancements, latest swiftmailer and better performance",
+    "type": "library",
     "license": "MIT",
     "require": {
+        "php" : ">=5.3.0",
         "swiftmailer/swiftmailer": "~5.2"
     },
     "require-dev": {
         "psr/log": "*"
     },
-    "type": "library",
     "autoload": {
         "files": ["autoload.php"]
     },
     "suggest": {
-        "lexpress/doctrine1": "Doctrine plugin",
+        "friendsofsymfony1/doctrine1": "Doctrine plugin",
         "propel/sf-propel-o-r-m-plugin": "Propel plugin",
         "psr/log": "Psr logger"
     },

From 28fa68237e2ed4aa25eba8c453884b0a681c4ce2 Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Mon, 8 Jun 2020 15:48:13 +0200
Subject: [PATCH 19/78] 1.5.13

---
 CHANGELOG.md                          | 7 ++++---
 lib/autoload/sfCoreAutoload.class.php | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9b84ddec7..33855aef2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,13 @@
 CHANGELOG
 =========
 
-xx/xx/xxxx: Version 1.5.13
+08/06/2020: Version 1.5.13
 --------------------------
 
 * Fix for `Warning: ini_set(): A session is active...` #229
-
-=========
+* Php 7.4 Incompatibility Fixes #228
+* Remove notice appeared on php 7.4 #230
+* Rename package to `friendsofsymfony1/symfony1` #231
 
 03/04/2020: Version 1.5.12
 --------------------------
diff --git a/lib/autoload/sfCoreAutoload.class.php b/lib/autoload/sfCoreAutoload.class.php
index f1bc5822f..104a67238 100755
--- a/lib/autoload/sfCoreAutoload.class.php
+++ b/lib/autoload/sfCoreAutoload.class.php
@@ -11,7 +11,7 @@
 /**
  * The current symfony version.
  */
-define('SYMFONY_VERSION', '1.5.13-dev');
+define('SYMFONY_VERSION', '1.5.13');
 
 /**
  * sfCoreAutoload class.

From 1c02ce21540081286827c6d6666fb8ab0fcb3b49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Benoist?=
 <j0k3r@users.noreply.github.com>
Date: Thu, 18 Jun 2020 13:17:50 +0200
Subject: [PATCH 20/78] Update package name

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5a415e134..38d65cc4b 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ See http://symfony.com/legacy/doc/getting-started/1_4/en/03-Symfony-Installation
 
 Option 1: Using [Composer](http://getcomposer.org/doc/00-intro.md) as dependency management:
 
-    composer require lexpress/symfony1 "1.5.*"
+    composer require friendsofsymfony1/symfony1 "1.5.*"
     composer install
     
 Note: On windows, if your project is a few directories down from the drive root, composer can throw an error  relating to ZipArchive::extractTo(), this can be because pathnames are too long. There currently appears to be no proper solution but a workaround is to move your project to the drive root, run the commands from there, where they will run happily, and then move your project back. 

From 2987dcda4746c1bbb3a07ed3843a3efa31f64c84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Benoist?=
 <j0k3r@users.noreply.github.com>
Date: Thu, 18 Jun 2020 14:20:19 +0200
Subject: [PATCH 21/78] 1.5.14-dev

---
 lib/autoload/sfCoreAutoload.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/autoload/sfCoreAutoload.class.php b/lib/autoload/sfCoreAutoload.class.php
index 104a67238..5e1604f79 100755
--- a/lib/autoload/sfCoreAutoload.class.php
+++ b/lib/autoload/sfCoreAutoload.class.php
@@ -11,7 +11,7 @@
 /**
  * The current symfony version.
  */
-define('SYMFONY_VERSION', '1.5.13');
+define('SYMFONY_VERSION', '1.5.14-dev');
 
 /**
  * sfCoreAutoload class.

From e79e664214ec77ab20e6e059812af0784914b7b9 Mon Sep 17 00:00:00 2001
From: pathumhdes <pathumhdes@gmail.com>
Date: Fri, 19 Jun 2020 09:12:15 +0530
Subject: [PATCH 22/78] Fixing Issue #234

---
 lib/validator/sfValidatorBoolean.class.php     | 8 ++++----
 test/unit/validator/sfValidatorBooleanTest.php | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 lib/validator/sfValidatorBoolean.class.php
 mode change 100644 => 100755 test/unit/validator/sfValidatorBooleanTest.php

diff --git a/lib/validator/sfValidatorBoolean.class.php b/lib/validator/sfValidatorBoolean.class.php
old mode 100644
new mode 100755
index 43e476ef4..e226edeaa
--- a/lib/validator/sfValidatorBoolean.class.php
+++ b/lib/validator/sfValidatorBoolean.class.php
@@ -33,8 +33,8 @@ class sfValidatorBoolean extends sfValidatorBase
    */
   protected function configure($options = array(), $messages = array())
   {
-    $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', array('true', 't', 'yes', 'y', 'on', '1', 1, true));
+    $this->addOption('false_values', array('false', 'f', 'no', 'n', 'off', '0', 0, false));
 
     $this->setOption('required', false);
     $this->setOption('empty_value', false);
@@ -45,12 +45,12 @@ protected function configure($options = array(), $messages = array())
    */
   protected function doClean($value)
   {
-    if (in_array($value, $this->getOption('true_values')))
+    if (in_array($value, $this->getOption('true_values'), true))
     {
       return true;
     }
 
-    if (in_array($value, $this->getOption('false_values')))
+    if (in_array($value, $this->getOption('false_values'), true))
     {
       return false;
     }
diff --git a/test/unit/validator/sfValidatorBooleanTest.php b/test/unit/validator/sfValidatorBooleanTest.php
old mode 100644
new mode 100755
index 944455bf9..d77efcfdd
--- a/test/unit/validator/sfValidatorBooleanTest.php
+++ b/test/unit/validator/sfValidatorBooleanTest.php
@@ -10,7 +10,7 @@
 
 require_once(__DIR__.'/../../bootstrap/unit.php');
 
-$t = new lime_test(17);
+$t = new lime_test(21);
 
 $v = new sfValidatorBoolean();
 

From 5d174453214e0f71a23c5a6b6a59132226b63bdc Mon Sep 17 00:00:00 2001
From: pathumhdes <pathumhdes@gmail.com>
Date: Sat, 20 Jun 2020 07:43:38 +0530
Subject: [PATCH 23/78] Redefining the fix to avoid the BC break

---
 lib/validator/sfValidatorBoolean.class.php     |  9 +++++----
 test/unit/validator/sfValidatorBooleanTest.php | 18 +++++++++++++++++-
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/lib/validator/sfValidatorBoolean.class.php b/lib/validator/sfValidatorBoolean.class.php
index e226edeaa..ea4da0c26 100755
--- a/lib/validator/sfValidatorBoolean.class.php
+++ b/lib/validator/sfValidatorBoolean.class.php
@@ -33,8 +33,8 @@ class sfValidatorBoolean extends sfValidatorBase
    */
   protected function configure($options = array(), $messages = array())
   {
-    $this->addOption('true_values', array('true', 't', 'yes', 'y', 'on', '1', 1, true));
-    $this->addOption('false_values', array('false', 'f', 'no', 'n', 'off', '0', 0, false));
+    $this->addOption('true_values', array('true', 't', 'yes', 'y', 'on', '1'));
+    $this->addOption('false_values', array('false', 'f', 'no', 'n', 'off', '0'));
 
     $this->setOption('required', false);
     $this->setOption('empty_value', false);
@@ -45,12 +45,13 @@ protected function configure($options = array(), $messages = array())
    */
   protected function doClean($value)
   {
-    if (in_array($value, $this->getOption('true_values'), true))
+    $stringValue = $value !== false ? (string) $value : '0';
+    if (in_array($stringValue, $this->getOption('true_values')))
     {
       return true;
     }
 
-    if (in_array($value, $this->getOption('false_values'), true))
+    if (in_array($stringValue, $this->getOption('false_values')))
     {
       return false;
     }
diff --git a/test/unit/validator/sfValidatorBooleanTest.php b/test/unit/validator/sfValidatorBooleanTest.php
index d77efcfdd..981f814c2 100755
--- a/test/unit/validator/sfValidatorBooleanTest.php
+++ b/test/unit/validator/sfValidatorBooleanTest.php
@@ -10,7 +10,7 @@
 
 require_once(__DIR__.'/../../bootstrap/unit.php');
 
-$t = new lime_test(21);
+$t = new lime_test(23);
 
 $v = new sfValidatorBoolean();
 
@@ -31,6 +31,22 @@
   $t->is($v->clean($false_value), false, '->clean() returns false if the value is in the false_values option');
 }
 
+// other special test cases
+$t->is($v->clean(0), false, '->clean() returns false if the value is 0');
+$t->is($v->clean(false), false, '->clean() returns false if the value is false');
+$t->is($v->clean(1), true, '->clean() returns true if the value is 1');
+$t->is($v->clean(true), true, '->clean() returns true if the value is true');
+$t->is($v->clean(''), false, '->clean() returns false if the value is empty string as empty_value is false by default');
+
+class MyFalseClass
+{
+  public function __toString()
+  {
+    return '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');
 

From a38381f9736fd0079734321a8517dae015c60443 Mon Sep 17 00:00:00 2001
From: pathumhdes <pathumhdes@gmail.com>
Date: Sat, 27 Jun 2020 09:06:39 +0530
Subject: [PATCH 24/78] Revise the fix to avoid the BC break

---
 lib/validator/sfValidatorBoolean.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/validator/sfValidatorBoolean.class.php b/lib/validator/sfValidatorBoolean.class.php
index ea4da0c26..b7d92b667 100755
--- a/lib/validator/sfValidatorBoolean.class.php
+++ b/lib/validator/sfValidatorBoolean.class.php
@@ -45,13 +45,13 @@ protected function configure($options = array(), $messages = array())
    */
   protected function doClean($value)
   {
-    $stringValue = $value !== false ? (string) $value : '0';
-    if (in_array($stringValue, $this->getOption('true_values')))
+    $checkValue = $value === 0 ? '0' : $value;
+    if (in_array($checkValue, $this->getOption('true_values')))
     {
       return true;
     }
 
-    if (in_array($stringValue, $this->getOption('false_values')))
+    if (in_array($checkValue, $this->getOption('false_values')))
     {
       return false;
     }

From 07f31d6ea5472bd431dfd030454bd5080ee3adbf Mon Sep 17 00:00:00 2001
From: "Thomas A. Hirsch" <thomas.hirsch@vema-eg.de>
Date: Tue, 8 Sep 2020 10:26:24 +0200
Subject: [PATCH 25/78] Updated lexpress to fos1 in the submodules.

---
 .gitmodules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index f9e1e7496..3ee8d0c7d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,4 +4,4 @@
 	branch = 5.x
 [submodule "lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine"]
 	path = lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine
-	url = https://github.com/LExpress/doctrine1.git
+	url = https://github.com/FriendsOfSymfony1/doctrine1.git

From 9c1ef4e1bb21e16cb165e3716c780b5c7733cec6 Mon Sep 17 00:00:00 2001
From: "Thomas A. Hirsch" <thomas.hirsch@vema-eg.de>
Date: Wed, 9 Sep 2020 21:21:10 +0200
Subject: [PATCH 26/78] Changes to allow Swiftmailer 5 and 6.

---
 composer.json                 | 2 +-
 lib/mailer/sfMailer.class.php | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 8e3a7c61b..150e446cb 100755
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
     "license": "MIT",
     "require": {
         "php" : ">=5.3.0",
-        "swiftmailer/swiftmailer": "~5.2"
+        "swiftmailer/swiftmailer": "~5.2|^6.0"
     },
     "require-dev": {
         "psr/log": "*"
diff --git a/lib/mailer/sfMailer.class.php b/lib/mailer/sfMailer.class.php
index ee9ce93e8..fc545ff86 100755
--- a/lib/mailer/sfMailer.class.php
+++ b/lib/mailer/sfMailer.class.php
@@ -239,7 +239,8 @@ public function setDeliveryAddress($address)
    */
   public function compose($from = null, $to = null, $subject = null, $body = null)
   {
-    return Swift_Message::newInstance()
+    $msg = new Swift_Message();
+    return $msg
       ->setFrom($from)
       ->setTo($to)
       ->setSubject($subject)
@@ -282,7 +283,7 @@ public function sendNextImmediately()
    *
    * @return int|false The number of sent emails
    */
-  public function send(Swift_Mime_Message $message, &$failedRecipients = null)
+  public function send($message, &$failedRecipients = null)
   {
     if ($this->force)
     {

From 1c64cbdfd98f76f0bb1d87ee5736643a32f6f627 Mon Sep 17 00:00:00 2001
From: "Thomas A. Hirsch" <thomas.hirsch@vema-eg.de>
Date: Thu, 10 Sep 2020 07:42:18 +0200
Subject: [PATCH 27/78] PR feedback.

---
 lib/mailer/sfMailer.class.php   | 5 +++--
 lib/mailer/sfNoMailer.class.php | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/mailer/sfMailer.class.php b/lib/mailer/sfMailer.class.php
index fc545ff86..86afba3e3 100755
--- a/lib/mailer/sfMailer.class.php
+++ b/lib/mailer/sfMailer.class.php
@@ -240,6 +240,7 @@ public function setDeliveryAddress($address)
   public function compose($from = null, $to = null, $subject = null, $body = null)
   {
     $msg = new Swift_Message();
+
     return $msg
       ->setFrom($from)
       ->setTo($to)
@@ -278,8 +279,8 @@ public function sendNextImmediately()
   /**
    * Sends the given message.
    *
-   * @param Swift_Transport $transport         A transport instance
-   * @param string[]        &$failedRecipients An array of failures by-reference
+   * @param Swift_Mime_Message|Swift_Mime_SimpleMessage $message           The message to send.
+   * @param string[]                                    &$failedRecipients An array of failures by-reference
    *
    * @return int|false The number of sent emails
    */
diff --git a/lib/mailer/sfNoMailer.class.php b/lib/mailer/sfNoMailer.class.php
index 83324e9a0..507b61a33 100644
--- a/lib/mailer/sfNoMailer.class.php
+++ b/lib/mailer/sfNoMailer.class.php
@@ -56,7 +56,7 @@ public function sendNextImmediately()
     return null;
   }
 
-  public function send(Swift_Mime_Message $message, &$failedRecipients = null)
+  public function send($message, &$failedRecipients = null)
   {
     return null;
   }

From 44bcf108ba725e0e3c834db6aa506d50bcfd6b90 Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <sergey.matvienko@starofservice.com>
Date: Thu, 19 Nov 2020 14:36:11 +0200
Subject: [PATCH 28/78] Update composer.json to automatically remove
 `lexpress/symfony1` package

---
 composer.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/composer.json b/composer.json
index 8e3a7c61b..7a963b7b5 100755
--- a/composer.json
+++ b/composer.json
@@ -23,5 +23,8 @@
             "dev-master": "1.5-dev"
         }
     },
+    "replace": {
+        "lexpress/symfony1": "^1.5"
+    },
     "bin": ["data/bin/symfony"]
 }

From 8ae3232c51e309e1244a76c6559f92623894a007 Mon Sep 17 00:00:00 2001
From: "Thomas A. Hirsch" <thomas.hirsch@vema-eg.de>
Date: Tue, 23 Mar 2021 18:00:40 +0100
Subject: [PATCH 29/78] PR feedback.

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 150e446cb..d5bc7d931 100755
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
     "license": "MIT",
     "require": {
         "php" : ">=5.3.0",
-        "swiftmailer/swiftmailer": "~5.2|^6.0"
+        "swiftmailer/swiftmailer": "~5.2 || ^6.0"
     },
     "require-dev": {
         "psr/log": "*"

From 10e1a1b175d4c86f44b9843d413b3cc2702ad5a8 Mon Sep 17 00:00:00 2001
From: Pavel <cmdeviant@users.noreply.github.com>
Date: Wed, 12 May 2021 20:45:02 +1000
Subject: [PATCH 30/78] Update PHPDoc for sfWebController::redirect() func

We can actually pass array to sfWebController::redirect() function as first parameter, but IDE wrongly highlights this as "Expected parameter of type 'string', 'array' provided".
---
 lib/controller/sfWebController.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/controller/sfWebController.class.php b/lib/controller/sfWebController.class.php
index b7eb9f466..52944443c 100644
--- a/lib/controller/sfWebController.class.php
+++ b/lib/controller/sfWebController.class.php
@@ -168,7 +168,7 @@ public function convertUrlStringToParameters($url)
   /**
    * Redirects the request to another URL.
    *
-   * @param string $url        An associative array of URL parameters or an internal URI as a string
+   * @param mixed $url         An associative array of URL parameters or an internal URI as a string
    * @param int    $delay      A delay in seconds before redirecting. This is only needed on
    *                           browsers that do not support HTTP headers
    * @param int    $statusCode The status code

From aa68163805d5c05ce3dac1364d1bc89cc192a15b Mon Sep 17 00:00:00 2001
From: Pavel <cmdeviant@users.noreply.github.com>
Date: Fri, 14 May 2021 19:08:06 +1000
Subject: [PATCH 31/78] sfWebController::redirect() - PHPDoc with more precise
 types

The more precise the types are, the better IDE will help preventing errors.

Co-authored-by: Ivan Voskoboinyk <ivan.voskoboinyk@gmail.com>
---
 lib/controller/sfWebController.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/controller/sfWebController.class.php b/lib/controller/sfWebController.class.php
index 52944443c..0b0dffb18 100644
--- a/lib/controller/sfWebController.class.php
+++ b/lib/controller/sfWebController.class.php
@@ -168,7 +168,7 @@ public function convertUrlStringToParameters($url)
   /**
    * Redirects the request to another URL.
    *
-   * @param mixed $url         An associative array of URL parameters or an internal URI as a string
+   * @param string|array $url         An associative array of URL parameters or an internal URI as a string
    * @param int    $delay      A delay in seconds before redirecting. This is only needed on
    *                           browsers that do not support HTTP headers
    * @param int    $statusCode The status code

From c5bf8ceb0c9e04640eadb01546ee1cb882363b9a Mon Sep 17 00:00:00 2001
From: Pavel <cmdeviant@users.noreply.github.com>
Date: Fri, 14 May 2021 19:20:21 +1000
Subject: [PATCH 32/78] sfWebController::genUrl() - PHPDoc with more precise
 types

According to discussion: https://github.com/FriendsOfSymfony1/symfony1/pull/246#discussion_r632077346
---
 lib/controller/sfWebController.class.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/controller/sfWebController.class.php b/lib/controller/sfWebController.class.php
index 0b0dffb18..ebf54500f 100644
--- a/lib/controller/sfWebController.class.php
+++ b/lib/controller/sfWebController.class.php
@@ -23,8 +23,8 @@ abstract class sfWebController extends sfController
   /**
    * Generates an URL from an array of parameters.
    *
-   * @param mixed   $parameters An associative array of URL parameters or an internal URI as a string.
-   * @param boolean $absolute   Whether to generate an absolute URL
+   * @param string|array  $parameters An associative array of URL parameters or an internal URI as a string.
+   * @param boolean       $absolute   Whether to generate an absolute URL
    *
    * @return string A URL to a symfony resource
    */
@@ -168,10 +168,10 @@ public function convertUrlStringToParameters($url)
   /**
    * Redirects the request to another URL.
    *
-   * @param string|array $url         An associative array of URL parameters or an internal URI as a string
-   * @param int    $delay      A delay in seconds before redirecting. This is only needed on
-   *                           browsers that do not support HTTP headers
-   * @param int    $statusCode The status code
+   * @param string|array  $url        An associative array of URL parameters or an internal URI as a string
+   * @param int           $delay      A delay in seconds before redirecting. This is only needed on
+   *                                  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
    */

From e8cbc9d3cccda68220b0f46a1322cc8ddf656320 Mon Sep 17 00:00:00 2001
From: Alexandre Quercia <alquerci@email.com>
Date: Sat, 11 Sep 2021 03:17:09 +0200
Subject: [PATCH 33/78] Add docker compose

* Add apcu for PHP 5.5+
* Disable APC on PHP 7+ as APCu 5 is not supported
* Add ability to use a custom test runtime

Co-authored-by: Thomas <th@it-solutions-hirsch.de>
---
 .docker/php53/Dockerfile                |  57 ++++++++
 .docker/php54/Dockerfile                |  34 +++++
 .docker/php55_71/Dockerfile             |  40 ++++++
 .docker/php72_73/Dockerfile             |  56 ++++++++
 .docker/php74_81/Dockerfile             |  68 +++++++++
 .env.dist                               |  11 ++
 README.md                               |  31 +++++
 docker-compose.yml                      | 176 ++++++++++++++++++++++++
 test/bin/test                           |  89 ++++++++++++
 test/unit/cache/sfMemcacheCacheTest.php |  10 +-
 10 files changed, 571 insertions(+), 1 deletion(-)
 create mode 100644 .docker/php53/Dockerfile
 create mode 100644 .docker/php54/Dockerfile
 create mode 100644 .docker/php55_71/Dockerfile
 create mode 100644 .docker/php72_73/Dockerfile
 create mode 100644 .docker/php74_81/Dockerfile
 create mode 100644 .env.dist
 create mode 100644 docker-compose.yml
 create mode 100755 test/bin/test

diff --git a/.docker/php53/Dockerfile b/.docker/php53/Dockerfile
new file mode 100644
index 000000000..99ca06bf0
--- /dev/null
+++ b/.docker/php53/Dockerfile
@@ -0,0 +1,57 @@
+FROM buildpack-deps:jessie
+
+ENV PHP_VERSION 5.3.29
+
+# php 5.3 needs older autoconf
+RUN set -eux; \
+  \
+  apt-get update; \
+  apt-get install -y \
+    curl \
+    autoconf2.13 \
+  ; \
+  rm -r /var/lib/apt/lists/*; \
+  \
+  curl -sSLfO http://launchpadlibrarian.net/140087283/libbison-dev_2.7.1.dfsg-1_amd64.deb; \
+  curl -sSLfO http://launchpadlibrarian.net/140087282/bison_2.7.1.dfsg-1_amd64.deb; \
+  dpkg -i libbison-dev_2.7.1.dfsg-1_amd64.deb; \
+  dpkg -i bison_2.7.1.dfsg-1_amd64.deb; \
+  rm *.deb; \
+  \
+  curl -sSLf "https://php.net/get/php-$PHP_VERSION.tar.bz2/from/this/mirror" -o php.tar.bz2; \
+  echo 'c4e1cf6972b2a9c7f2777a18497d83bf713cdbecabb65d3ff62ba441aebb0091  php.tar.bz2' | sha256sum -cw --status; \
+  \
+  mkdir -p /usr/src/php; \
+  tar -xf php.tar.bz2 -C /usr/src/php --strip-components=1; \
+  rm php.tar.bz2*; \
+  \
+  cd /usr/src/php; \
+  ./buildconf --force; \
+  ./configure --disable-cgi \
+    $(command -v apxs2 > /dev/null 2>&1 && echo '--with-apxs2' || true) \
+    --with-pdo-mysql \
+    --with-zlib \
+    --enable-mbstring \
+  ; \
+  make -j"$(nproc)"; \
+  make install; \
+  \
+  dpkg -r \
+    bison \
+    libbison-dev \
+  ; \
+  apt-get purge -y --auto-remove \
+    autoconf2.13 \
+  ; \
+  rm -r /usr/src/php
+
+# Install APC PHP extension
+#
+RUN set -eux; \
+  \
+  pecl install apc-3.1.13; \
+  echo 'extension=apc.so' >> /usr/local/lib/php.ini; \
+  \
+  rm -r /tmp/pear;
+
+CMD ["php", "-a"]
diff --git a/.docker/php54/Dockerfile b/.docker/php54/Dockerfile
new file mode 100644
index 000000000..ef5acfd0e
--- /dev/null
+++ b/.docker/php54/Dockerfile
@@ -0,0 +1,34 @@
+FROM php:5.4-cli
+
+RUN docker-php-ext-install pdo
+RUN docker-php-ext-install pdo_mysql
+RUN docker-php-ext-install mbstring
+
+# Install APC PHP extension
+#
+RUN set -eux; \
+  pecl install apc-3.1.13; \
+  docker-php-ext-enable apc; \
+  rm -r /tmp/pear;
+
+# Install memcache PHP extension
+#
+ARG MEMCACHE_VERSION
+RUN set -eux; \
+  buildDeps=' \
+    libzip-dev \
+  '; \
+  apt-get update; \
+  apt-get install -y --no-upgrade --no-install-recommends \
+    $buildDeps \
+  ; \
+  \
+  pecl install memcache-${MEMCACHE_VERSION}; \
+  docker-php-ext-enable memcache; \
+  \
+  apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=true \
+    $buildDeps \
+  ; \
+  apt-get clean; \
+  rm -rf /var/lib/apt/lists/*; \
+  rm -r /tmp/pear
diff --git a/.docker/php55_71/Dockerfile b/.docker/php55_71/Dockerfile
new file mode 100644
index 000000000..1aa2171a3
--- /dev/null
+++ b/.docker/php55_71/Dockerfile
@@ -0,0 +1,40 @@
+ARG PHP_TAG
+FROM php:${PHP_TAG}
+
+RUN docker-php-ext-install pdo
+RUN docker-php-ext-install pdo_mysql
+RUN docker-php-ext-install mbstring
+
+# Install APCu PHP extension
+#
+ARG APCU_VERSION
+RUN set -eux; \
+  \
+  test x"" = x"${APCU_VERSION}" || { \
+    pecl install apcu-${APCU_VERSION}; \
+    docker-php-ext-enable apcu; \
+    \
+    rm -r /tmp/pear; \
+  }
+
+# Install memcache PHP extension
+#
+ARG MEMCACHE_VERSION
+RUN set -eux; \
+  buildDeps=' \
+    libzip-dev \
+  '; \
+  apt-get update; \
+  apt-get install -y --no-upgrade --no-install-recommends \
+    $buildDeps \
+  ; \
+  \
+  pecl install memcache-${MEMCACHE_VERSION}; \
+  docker-php-ext-enable memcache; \
+  \
+  apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=true \
+    $buildDeps \
+  ; \
+  apt-get clean; \
+  rm -rf /var/lib/apt/lists/*; \
+  rm -r /tmp/pear
diff --git a/.docker/php72_73/Dockerfile b/.docker/php72_73/Dockerfile
new file mode 100644
index 000000000..69353468b
--- /dev/null
+++ b/.docker/php72_73/Dockerfile
@@ -0,0 +1,56 @@
+ARG PHP_VERSION
+FROM php:${PHP_VERSION}-cli
+
+RUN docker-php-ext-install pdo
+RUN docker-php-ext-install pdo_mysql
+RUN docker-php-ext-install mbstring
+
+# Install APCu PHP extension
+#
+ARG APCU_VERSION
+RUN set -eux; \
+  \
+  test x"" = x"${APCU_VERSION}" || { \
+    pecl install apcu-${APCU_VERSION}; \
+    docker-php-ext-enable apcu; \
+    \
+    rm -r /tmp/pear; \
+  }
+
+# Install memcache PHP extension
+#
+ARG MEMCACHE_VERSION
+RUN set -eux; \
+  buildDeps=' \
+    libzip-dev \
+  '; \
+  apt-get update; \
+  apt-get install -y --no-upgrade --no-install-recommends \
+    $buildDeps \
+  ; \
+  \
+  pecl install memcache-${MEMCACHE_VERSION}; \
+  docker-php-ext-enable memcache; \
+  \
+  apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=true \
+    $buildDeps \
+  ; \
+  apt-get clean; \
+  rm -rf /var/lib/apt/lists/*; \
+  rm -r /tmp/pear
+
+# For consistent mime type file guesser
+RUN set -eux; \
+  distFilePath=`which file`; \
+  \
+  mv ${distFilePath} ${distFilePath}.dist; \
+  { \
+    echo '#! /bin/sh -eu'; \
+    echo ''; \
+    echo "${distFilePath}"'.dist "$@" | sed -e s,application/x-pie-executable,application/x-executable,g'; \
+  } | tee ${distFilePath}; \
+  \
+  chmod +x ${distFilePath}; \
+  \
+  file /bin/ls --mime | grep application/x-executable; \
+  :;
diff --git a/.docker/php74_81/Dockerfile b/.docker/php74_81/Dockerfile
new file mode 100644
index 000000000..a9d410dbf
--- /dev/null
+++ b/.docker/php74_81/Dockerfile
@@ -0,0 +1,68 @@
+ARG PHP_VERSION
+FROM php:${PHP_VERSION}-cli
+
+RUN docker-php-ext-install pdo
+RUN docker-php-ext-install pdo_mysql
+
+# Install mbstring PHP extension
+#
+RUN set -eux; \
+  apt-get update; \
+  apt-get install -y --no-upgrade --no-install-recommends \
+    libonig-dev \
+  ; \
+  \
+  apt-get clean; \
+  rm -rf /var/lib/apt/lists/*; \
+  \
+  docker-php-ext-install mbstring
+
+# Install APCu PHP extension
+#
+ARG APCU_VERSION
+RUN set -eux; \
+  \
+  test x"" = x"${APCU_VERSION}" || { \
+    pecl install apcu-${APCU_VERSION}; \
+    docker-php-ext-enable apcu; \
+    \
+    rm -r /tmp/pear; \
+  }
+
+# Install memcache PHP extension
+#
+ARG MEMCACHE_VERSION
+RUN set -eux; \
+  buildDeps=' \
+    libzip-dev \
+  '; \
+  apt-get update; \
+  apt-get install -y --no-upgrade --no-install-recommends \
+    $buildDeps \
+  ; \
+  \
+  pecl install memcache-${MEMCACHE_VERSION}; \
+  docker-php-ext-enable memcache; \
+  \
+  apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=true \
+    $buildDeps \
+  ; \
+  apt-get clean; \
+  rm -rf /var/lib/apt/lists/*; \
+  rm -r /tmp/pear
+
+# For consistent mime type file guesser
+RUN set -eux; \
+  distFilePath=`which file`; \
+  \
+  mv ${distFilePath} ${distFilePath}.dist; \
+  { \
+    echo '#! /bin/sh -eu'; \
+    echo ''; \
+    echo "${distFilePath}"'.dist "$@" | sed -e s,application/x-pie-executable,application/x-executable,g'; \
+  } | tee ${distFilePath}; \
+  \
+  chmod +x ${distFilePath}; \
+  \
+  file /bin/ls --mime | grep application/x-executable; \
+  :;
diff --git a/.env.dist b/.env.dist
new file mode 100644
index 000000000..14b756ef5
--- /dev/null
+++ b/.env.dist
@@ -0,0 +1,11 @@
+#
+# Environment variables used by docker-compose for test.
+#
+# Copy to `.env` in order to use it.
+#
+
+# APC test are disabled.
+#
+# To enable them in order to provide a fix, set to "on".
+#
+APC_ENABLE_CLI=off
diff --git a/README.md b/README.md
index 38d65cc4b..900179110 100644
--- a/README.md
+++ b/README.md
@@ -54,6 +54,37 @@ Option 2: Using Git submodules:
     git submodule add https://github.com/FriendsOfSymfony1/symfony1.git lib/vendor/symfony
     git submodule update --init --recursive
 
+
+Tests
+-----
+
+### Prerequisites
+
+  * docker-engine version 17.12.0+
+  * docker-compose version 1.20.0+
+
+### How to execute all tests on all supported PHP versions and dependencies?
+
+    test/bin/test
+
+### For PHP 7.3 and for lowest dependencies versions?
+
+    test/bin/test php73 lowest
+
+### For PHP 7.3 and for highest dependencies versions?
+
+    test/bin/test php73 highest
+
+### For executing a dedicated test file?
+
+    test/bin/test php73 highest test/unit/cache/sfAPCCacheTest.php
+
+
+### When you finish your work day, do not forget to clean up your desk
+
+    docker-compose down
+
+
 Documentation
 -------------
 
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 000000000..b18e91032
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,176 @@
+version: '3.5'
+
+volumes:
+  db_socket:
+
+services:
+  composer:
+    image: composer
+    working_dir: /app
+    volumes:
+      - .:/app
+    entrypoint:
+      - sh
+      - -c
+      - |
+        exec tail -f /dev/null
+
+  php53:
+    build: .docker/php53
+    working_dir: /app
+    volumes:
+      - .:/app
+      - db_socket:/var/run/mysqld
+    entrypoint:
+      - sh
+      - -c
+      - |
+        {
+          echo 'pdo_mysql.default_socket = /var/run/mysqld/mysql.sock'
+          echo 'memory_limit = -1'
+          echo 'short_open_tag = off'
+          echo 'magic_quotes_gpc = off'
+          echo 'date.timezone = "UTC"'
+          echo 'apc.enable_cli = ${APC_ENABLE_CLI-off}'
+          echo 'apc.use_request_time = 0'
+        } | tee -a /usr/local/lib/php.ini
+
+        exec tail -f /dev/null
+    depends_on:
+      - db
+
+  php54: &services_php54
+    build:
+      context: .docker/php54
+      args:
+        MEMCACHE_VERSION: '3.0.8'
+    environment:
+      MEMCACHED_HOST: memcached
+    working_dir: /app
+    volumes:
+      - .:/app
+      - db_socket:/var/run/mysqld
+    entrypoint:
+      - sh
+      - -c
+      - |
+        {
+          echo 'pdo_mysql.default_socket = /var/run/mysqld/mysql.sock'
+          echo 'memory_limit = -1'
+          echo 'short_open_tag = off'
+          echo 'magic_quotes_gpc = off'
+          echo 'date.timezone = "UTC"'
+          echo 'apc.enable_cli = ${APC_ENABLE_CLI-off}'
+          echo 'apc.use_request_time = 0'
+        } | tee -a /usr/local/etc/php/php.ini
+
+        exec tail -f /dev/null
+    depends_on:
+      - db
+      - memcached
+
+  php55:
+    <<: *services_php54
+    build:
+      context: .docker/php55_71
+      args:
+        PHP_TAG: '5.5-cli'
+        MEMCACHE_VERSION: '3.0.8'
+        APCU_VERSION: '4.0.11'
+
+  php56:
+    <<: *services_php54
+    build:
+      context: .docker/php55_71
+      args:
+        PHP_TAG: '5.6-cli-jessie'
+        MEMCACHE_VERSION: '3.0.8'
+        APCU_VERSION: '4.0.11'
+
+  php70:
+    <<: *services_php54
+    build:
+      context: .docker/php55_71
+      args:
+        PHP_TAG: '7.0-cli-jessie'
+        MEMCACHE_VERSION: '4.0.5.2'
+        APCU_VERSION: ''
+
+  php71:
+    <<: *services_php54
+    build:
+      context: .docker/php55_71
+      args:
+        PHP_TAG: '7.1-cli-jessie'
+        MEMCACHE_VERSION: '4.0.5.2'
+        APCU_VERSION: ''
+
+
+  php72:
+    <<: *services_php54
+    build:
+      context: .docker/php72_73
+      args:
+        PHP_VERSION: '7.2'
+        MEMCACHE_VERSION: '4.0.5.2'
+        APCU_VERSION: ''
+
+
+  php73:
+    <<: *services_php54
+    build:
+      context: .docker/php72_73
+      args:
+        PHP_VERSION: '7.3'
+        MEMCACHE_VERSION: '4.0.5.2'
+        APCU_VERSION: ''
+
+
+  php74:
+    <<: *services_php54
+    build:
+      context: .docker/php74_81
+      args:
+        PHP_VERSION: '7.4'
+        MEMCACHE_VERSION: '4.0.5.2'
+        APCU_VERSION: ''
+
+
+  php80:
+    <<: *services_php54
+    build:
+      context: .docker/php74_81
+      args:
+        PHP_VERSION: '8.0'
+        MEMCACHE_VERSION: '8.0'
+        APCU_VERSION: ''
+
+
+  php81:
+    <<: *services_php54
+    build:
+      context: .docker/php74_81
+      args:
+        PHP_VERSION: '8.1'
+        MEMCACHE_VERSION: '8.0'
+        APCU_VERSION: ''
+
+
+  db:
+    image: mysql:5.5.62
+    environment:
+      - MYSQL_ALLOW_EMPTY_PASSWORD=yes
+    volumes:
+      - db_socket:/tmp
+    entrypoint:
+      - bash
+      - -c
+      - |
+        {
+            echo "CREATE DATABASE IF NOT EXISTS test;"
+        } | tee /docker-entrypoint-initdb.d/init.sql
+
+        exec /usr/local/bin/docker-entrypoint.sh mysqld
+
+  memcached:
+    image: memcached:1.6.13-alpine3.15
diff --git a/test/bin/test b/test/bin/test
new file mode 100755
index 000000000..5305c0541
--- /dev/null
+++ b/test/bin/test
@@ -0,0 +1,89 @@
+#! /bin/sh -eu
+#
+# [<php-version>] [<dependency-preference>] [<php-test-runtime>]
+#
+# <php-version>  example: php70
+# <dependency-preference> One of highest (default), lowest
+#
+# Both arguments can be a space separated value.
+# Example: "lowest highest"
+#
+
+# Configuration
+#
+dependencyPreferences='highest'
+skipPHPVersions='php8'
+
+# Commands
+#
+dcexec="docker-compose exec -u `id -u`:`id -g`"
+installSubmodule='git submodule update --checkout --recursive --force'
+composerUpdate='composer update --prefer-dist --no-suggest --optimize-autoloader'
+symfonyTestSuite='data/bin/symfony symfony:test --trace'
+
+# Parse arguments
+#
+phpVersions="${1-}"
+dependencyPreferences="${2-${dependencyPreferences}}"
+phpTestRuntime="${3-${symfonyTestSuite}}"
+
+script ()
+{
+  echo
+  echo
+  echo $0 ${1} ${2}
+  echo
+  ${dcexec} ${1} php data/bin/check_configuration.php
+  ${dcexec} ${1} php ${phpTestRuntime}
+}
+
+scriptAll ()
+{
+  for dependencyPreference in ${dependencyPreferences}
+  do
+    install_${dependencyPreference}
+
+    for phpVersion in ${phpVersions}
+    do
+      script ${phpVersion} ${dependencyPreference}
+    done
+  done
+}
+
+fetchAllPHPVersions ()
+{
+  docker-compose 2>/dev/null ps --services --filter status=running \
+    | grep php \
+    | sort \
+    | grep -v ${skipPHPVersions}
+}
+
+install_highest ()
+{
+  ${installSubmodule} --remote
+  ${dcexec} composer ${composerUpdate}
+}
+
+install_lowest ()
+{
+  reset_submodules
+
+  ${installSubmodule}
+  ${dcexec} composer ${composerUpdate} --prefer-lowest
+}
+
+reset_submodules ()
+{
+  git submodule deinit --force --quiet -- .
+
+  git submodule init
+}
+
+echo '+ docker-compose build'
+docker-compose up -d --build --remove-orphans > /dev/null
+
+test x"" != x"${phpVersions}" || {
+  phpVersions=`fetchAllPHPVersions`
+}
+
+scriptAll
diff --git a/test/unit/cache/sfMemcacheCacheTest.php b/test/unit/cache/sfMemcacheCacheTest.php
index 7de822f0d..ceba9b39e 100644
--- a/test/unit/cache/sfMemcacheCacheTest.php
+++ b/test/unit/cache/sfMemcacheCacheTest.php
@@ -28,7 +28,15 @@
 $t->diag('->initialize()');
 try
 {
-  $cache = new sfMemcacheCache(array('storeCacheInfo' => true));
+  $memcachedHost = getenv('MEMCACHED_HOST');
+  if (!$memcachedHost) {
+    $memcachedHost = null;
+  }
+
+  $cache = new sfMemcacheCache(array(
+    'storeCacheInfo' => true,
+    'host' => $memcachedHost,
+  ));
 }
 catch (sfInitializationException $e)
 {

From 32b2a4b5f1f90cf6d4a6d6489f18299b01dce22c Mon Sep 17 00:00:00 2001
From: thePanz <thepanz@gmail.com>
Date: Fri, 25 Nov 2022 11:19:20 +0100
Subject: [PATCH 34/78] Use GitHub actions for Continuous Integration tests

Remove TravisCI integration
---
 .github/workflows/continuous-integration.yml  | 44 ++++++++++++++++++
 .travis.yml                                   | 46 -------------------
 .../sfDoctrinePlugin/lib/vendor/doctrine      |  2 +-
 lib/vendor/swiftmailer                        |  2 +-
 4 files changed, 46 insertions(+), 48 deletions(-)
 create mode 100644 .github/workflows/continuous-integration.yml
 delete mode 100644 .travis.yml

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
new file mode 100644
index 000000000..13d1bdfa7
--- /dev/null
+++ b/.github/workflows/continuous-integration.yml
@@ -0,0 +1,44 @@
+name: "Continuous Integration"
+
+on: [push]
+
+env:
+    fail-fast: true
+
+jobs:
+    tests:
+        name: "Symfony1 Tests"
+        runs-on: "ubuntu-22.04"
+
+        strategy:
+            matrix:
+                php-version:
+                    - "7.4"
+                    # - "8.0"
+                    # - "8.1"
+                memcached-version:
+                    - "1.6"
+
+        services:
+            memcached:
+              image: "memcached:${{ matrix.memcached-version }}"
+
+        steps:
+            - name: "Checkout"
+              uses: "actions/checkout@v3"
+              with:
+                submodules: "true"
+
+            - name: "Install PHP"
+              uses: "shivammathur/setup-php@v2"
+              with:
+                  php-version: "${{ matrix.php-version }}"
+
+            - name: "Install dependencies with Composer"
+              uses: "ramsey/composer-install@v2"
+
+            - name: "Run Check configuration"
+              run: "php data/bin/check_configuration.php"
+
+            - name: "Run Tests"
+              run: "php data/bin/symfony symfony:test --trace"
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index c163be702..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-os: linux
-dist: xenial
-language: php
-
-php:
-    - 7.0
-    - 7.1
-    - 7.2
-    - 7.3
-    - 7.4
-    - nightly
-
-# run build against nightly but allow them to fail
-jobs:
-    fast_finish: true
-    allow_failures:
-        - php: nightly
-    include:
-        - php: 5.3
-          dist: precise
-        - php: 5.4
-          dist: precise
-        - php: 5.5
-          dist: trusty
-        - php: 5.6
-          dist: trusty
-
-services:
-    - memcached
-
-cache:
-    directories:
-        - $HOME/.composer/cache
-
-before_install:
-    - sh -c 'if [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ] && [ $(php -r "echo PHP_MAJOR_VERSION;") -le 5 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
-    - sh -c 'if [ $(php -r "echo PHP_RELEASE_VERSION;") -le 98 ] && [ $(php -r "echo PHP_MAJOR_VERSION;") -le 5 ]; then echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
-
-install:
-    # by default, --remote is not used on travis
-    - git submodule update --remote --force
-    - composer install --prefer-dist --no-progress --no-suggest -o
-
-script:
-    - php data/bin/check_configuration.php
-    - php data/bin/symfony symfony:test --trace
diff --git a/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine b/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine
index 0564971b2..f8ea8b76c 160000
--- a/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine
+++ b/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine
@@ -1 +1 @@
-Subproject commit 0564971b2badd778914ac0fcb74518a00d6918f1
+Subproject commit f8ea8b76cb3f932a4a21aa146c0ebc27939ccc04
diff --git a/lib/vendor/swiftmailer b/lib/vendor/swiftmailer
index 4cc928420..181b89f18 160000
--- a/lib/vendor/swiftmailer
+++ b/lib/vendor/swiftmailer
@@ -1 +1 @@
-Subproject commit 4cc92842069c2bbc1f28daaaf1d2576ec4dfe153
+Subproject commit 181b89f18a90f8925ef805f950d47a7190e9b950

From 21b73811eed017564c87258c5538841673be653c Mon Sep 17 00:00:00 2001
From: thePanz <thepanz@gmail.com>
Date: Fri, 25 Nov 2022 15:34:45 +0100
Subject: [PATCH 35/78] Fix test for /bin/ls file mimetype guessing, using
 application/x-pie-executable

---
 test/unit/validator/sfValidatorFileTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/validator/sfValidatorFileTest.php b/test/unit/validator/sfValidatorFileTest.php
index 43412cffc..42463acfa 100755
--- a/test/unit/validator/sfValidatorFileTest.php
+++ b/test/unit/validator/sfValidatorFileTest.php
@@ -105,7 +105,7 @@ public function getMimeTypesFromCategory($category)
 $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->is($v->guessFromFileBinary('/bin/ls'), (PHP_OS != 'Darwin') ? 'application/x-executable' : 'application/octet-stream', '->guessFromFileBinary() returns correct type if file is guessable');
+$t->is($v->guessFromFileBinary('/bin/ls'), (PHP_OS != 'Darwin') ? 'application/x-pie-executable' : 'application/octet-stream', '->guessFromFileBinary() returns correct type if file is guessable');
 $t->is($v->guessFromFileBinary('-test'), null, '->guessFromFileBinary() returns null if file path has leading dash');
 
 // ->getMimeType()

From 245c7cce0d705d97fbe2b0209474d8a18920c859 Mon Sep 17 00:00:00 2001
From: Tybaze <tybaze@users.noreply.github.com>
Date: Thu, 19 May 2022 15:52:46 +0200
Subject: [PATCH 36/78] PHP 8.1 > internal_method_return_types
 https://wiki.php.net/rfc/internal_method_return_types

PHP 8.0 added return type for abstract methods on Iterator, ArrayAccess, Countable, IteratorAggregate
PHP 8.1 made non implementation as a Deprecated Warning
PHP 9.0 (no release date at this moment) will drop the support.

Temporary Fix : adding this Attribute
Will drop the Deprecated warning.

Adding return type will break compatibility before PHP 7.4,
Return type has been added on PHP 7.0, but "mixed" special type is required, and it has been added on PHP 7.4.
In order to be compatible with future PHP 9.0, once it will be release, we will have to drop the support to PHP Version before 7.4

Currently a lot of Unix distribution in LTS are running a PHP Version older than 7.4 so moving to the final solution of "add return type" should break a lot of setup for the moment.
---
 lib/addon/sfPager.class.php                            |  6 ++++++
 lib/escaper/sfOutputEscaperArrayDecorator.class.php    | 10 ++++++++++
 lib/escaper/sfOutputEscaperIteratorDecorator.class.php |  9 +++++++++
 lib/escaper/sfOutputEscaperObjectDecorator.class.php   |  1 +
 lib/event/sfEvent.class.php                            |  6 +++++-
 lib/form/sfForm.class.php                              | 10 ++++++++++
 lib/form/sfFormFieldSchema.class.php                   | 10 ++++++++++
 .../lib/generator/sfDoctrineColumn.class.php           |  6 +++++-
 lib/request/sfRequest.class.php                        |  4 ++++
 lib/routing/sfRouteCollection.class.php                |  5 +++++
 lib/user/sfUser.class.php                              |  4 ++++
 lib/util/sfContext.class.php                           |  4 ++++
 lib/util/sfDomCssSelector.class.php                    |  6 ++++++
 lib/validator/sfValidatorErrorSchema.class.php         | 10 ++++++++++
 lib/validator/sfValidatorSchema.class.php              |  4 ++++
 lib/widget/sfWidgetFormSchema.class.php                |  4 ++++
 lib/widget/sfWidgetFormSchemaDecorator.class.php       |  4 ++++
 .../escaper/sfOutputEscaperObjectDecoratorTest.php     |  1 +
 18 files changed, 102 insertions(+), 2 deletions(-)

diff --git a/lib/addon/sfPager.class.php b/lib/addon/sfPager.class.php
index 594b1417a..84a4cc5f1 100644
--- a/lib/addon/sfPager.class.php
+++ b/lib/addon/sfPager.class.php
@@ -529,6 +529,7 @@ protected function resetIterator()
    *
    * @see Iterator
    */
+  #[\ReturnTypeWillChange]
   public function current()
   {
     if (!$this->isIteratorInitialized())
@@ -544,6 +545,7 @@ public function current()
    *
    * @see Iterator
    */
+  #[\ReturnTypeWillChange]
   public function key()
   {
     if (!$this->isIteratorInitialized())
@@ -559,6 +561,7 @@ public function key()
    *
    * @see Iterator
    */
+  #[\ReturnTypeWillChange]
   public function next()
   {
     if (!$this->isIteratorInitialized())
@@ -576,6 +579,7 @@ public function next()
    *
    * @see Iterator
    */
+  #[\ReturnTypeWillChange]
   public function rewind()
   {
     if (!$this->isIteratorInitialized())
@@ -593,6 +597,7 @@ public function rewind()
    *
    * @see Iterator
    */
+  #[\ReturnTypeWillChange]
   public function valid()
   {
     if (!$this->isIteratorInitialized())
@@ -608,6 +613,7 @@ public function valid()
    *
    * @see Countable
    */
+  #[\ReturnTypeWillChange]
   public function count()
   {
     return $this->getNbResults();
diff --git a/lib/escaper/sfOutputEscaperArrayDecorator.class.php b/lib/escaper/sfOutputEscaperArrayDecorator.class.php
index 0e6b0b0ae..6b87a4322 100644
--- a/lib/escaper/sfOutputEscaperArrayDecorator.class.php
+++ b/lib/escaper/sfOutputEscaperArrayDecorator.class.php
@@ -42,6 +42,7 @@ public function __construct($escapingMethod, $value)
   /**
    * Reset the array to the beginning (as required for the Iterator interface).
    */
+  #[\ReturnTypeWillChange]
   public function rewind()
   {
     reset($this->value);
@@ -54,6 +55,7 @@ public function rewind()
    *
    * @return string The key
    */
+  #[\ReturnTypeWillChange]
   public function key()
   {
     return key($this->value);
@@ -67,6 +69,7 @@ public function key()
    *
    * @return mixed The escaped value
    */
+  #[\ReturnTypeWillChange]
   public function current()
   {
     return sfOutputEscaper::escape($this->escapingMethod, current($this->value));
@@ -75,6 +78,7 @@ public function current()
   /**
    * Moves to the next element (as required by the Iterator interface).
    */
+  #[\ReturnTypeWillChange]
   public function next()
   {
     next($this->value);
@@ -91,6 +95,7 @@ public function next()
    *
    * @return bool The validity of the current element; true if it is valid
    */
+  #[\ReturnTypeWillChange]
   public function valid()
   {
     return $this->count > 0;
@@ -103,6 +108,7 @@ public function valid()
    *
    * @return bool true if the offset isset; false otherwise
    */
+  #[\ReturnTypeWillChange]
   public function offsetExists($offset)
   {
     return isset($this->value[$offset]);
@@ -115,6 +121,7 @@ public function offsetExists($offset)
    *
    * @return mixed The escaped value
    */
+  #[\ReturnTypeWillChange]
   public function offsetGet($offset)
   {
     return sfOutputEscaper::escape($this->escapingMethod, $this->value[$offset]);
@@ -132,6 +139,7 @@ public function offsetGet($offset)
    *
    * @throws sfException
    */
+  #[\ReturnTypeWillChange]
   public function offsetSet($offset, $value)
   {
     throw new sfException('Cannot set values.');
@@ -148,6 +156,7 @@ public function offsetSet($offset, $value)
    *
    * @throws sfException
    */
+  #[\ReturnTypeWillChange]
   public function offsetUnset($offset)
   {
     throw new sfException('Cannot unset values.');
@@ -158,6 +167,7 @@ public function offsetUnset($offset)
    *
    * @return int The size of the array
    */
+  #[\ReturnTypeWillChange]
   public function count()
   {
     return count($this->value);
diff --git a/lib/escaper/sfOutputEscaperIteratorDecorator.class.php b/lib/escaper/sfOutputEscaperIteratorDecorator.class.php
index 7d9eca063..68ed43dfd 100644
--- a/lib/escaper/sfOutputEscaperIteratorDecorator.class.php
+++ b/lib/escaper/sfOutputEscaperIteratorDecorator.class.php
@@ -56,6 +56,7 @@ public function __construct($escapingMethod, Traversable $value)
    *
    * @return void
    */
+  #[\ReturnTypeWillChange]
   public function rewind()
   {
     return $this->iterator->rewind();
@@ -66,6 +67,7 @@ public function rewind()
    *
    * @return mixed The escaped value
    */
+  #[\ReturnTypeWillChange]
   public function current()
   {
     return sfOutputEscaper::escape($this->escapingMethod, $this->iterator->current());
@@ -76,6 +78,7 @@ public function current()
    *
    * @return string Iterator key
    */
+  #[\ReturnTypeWillChange]
   public function key()
   {
     return $this->iterator->key();
@@ -86,6 +89,7 @@ public function key()
    *
    * @return void
    */
+  #[\ReturnTypeWillChange]
   public function next()
   {
     return $this->iterator->next();
@@ -97,6 +101,7 @@ public function next()
    *
    * @return bool true if the current element is valid; false otherwise
    */
+  #[\ReturnTypeWillChange]
   public function valid()
   {
     return $this->iterator->valid();
@@ -109,6 +114,7 @@ public function valid()
    *
    * @return bool true if the offset isset; false otherwise
    */
+  #[\ReturnTypeWillChange]
   public function offsetExists($offset)
   {
     return isset($this->value[$offset]);
@@ -121,6 +127,7 @@ public function offsetExists($offset)
    *
    * @return mixed The escaped value
    */
+  #[\ReturnTypeWillChange]
   public function offsetGet($offset)
   {
     return sfOutputEscaper::escape($this->escapingMethod, $this->value[$offset]);
@@ -138,6 +145,7 @@ public function offsetGet($offset)
    *
    * @throws sfException
    */
+  #[\ReturnTypeWillChange]
   public function offsetSet($offset, $value)
   {
     throw new sfException('Cannot set values.');
@@ -154,6 +162,7 @@ public function offsetSet($offset, $value)
    *
    * @throws sfException
    */
+  #[\ReturnTypeWillChange]
   public function offsetUnset($offset)
   {
     throw new sfException('Cannot unset values.');
diff --git a/lib/escaper/sfOutputEscaperObjectDecorator.class.php b/lib/escaper/sfOutputEscaperObjectDecorator.class.php
index 89e70edcd..fe506d9c1 100644
--- a/lib/escaper/sfOutputEscaperObjectDecorator.class.php
+++ b/lib/escaper/sfOutputEscaperObjectDecorator.class.php
@@ -115,6 +115,7 @@ public function __isset($key)
    *
    * @return int The size of the object
    */
+  #[\ReturnTypeWillChange]
   public function count()
   {
     return count($this->value);
diff --git a/lib/event/sfEvent.class.php b/lib/event/sfEvent.class.php
index 0ffd44281..750b28023 100644
--- a/lib/event/sfEvent.class.php
+++ b/lib/event/sfEvent.class.php
@@ -83,7 +83,7 @@ public function getReturnValue()
   /**
    * Sets the processed flag.
    *
-   * @param Boolean $processed The processed flag value
+   * @param boolean $processed The processed flag value
    */
   public function setProcessed($processed)
   {
@@ -117,6 +117,7 @@ public function getParameters()
    *
    * @return Boolean true if the parameter exists, false otherwise
    */
+  #[\ReturnTypeWillChange]
   public function offsetExists($name)
   {
     return array_key_exists($name, $this->parameters);
@@ -129,6 +130,7 @@ public function offsetExists($name)
    *
    * @return mixed  The parameter value
    */
+  #[\ReturnTypeWillChange]
   public function offsetGet($name)
   {
     if (!array_key_exists($name, $this->parameters))
@@ -145,6 +147,7 @@ public function offsetGet($name)
    * @param string  $name   The parameter name
    * @param mixed   $value  The parameter value
    */
+  #[\ReturnTypeWillChange]
   public function offsetSet($name, $value)
   {
     $this->parameters[$name] = $value;
@@ -155,6 +158,7 @@ public function offsetSet($name, $value)
    *
    * @param string $name    The parameter name
    */
+  #[\ReturnTypeWillChange]
   public function offsetUnset($name)
   {
     unset($this->parameters[$name]);
diff --git a/lib/form/sfForm.class.php b/lib/form/sfForm.class.php
index db46c4d82..2db45bbde 100644
--- a/lib/form/sfForm.class.php
+++ b/lib/form/sfForm.class.php
@@ -1064,6 +1064,7 @@ public function resetFormFields()
    *
    * @return Boolean true if the widget exists, false otherwise
    */
+  #[\ReturnTypeWillChange]
   public function offsetExists($name)
   {
     return isset($this->widgetSchema[$name]);
@@ -1076,6 +1077,7 @@ public function offsetExists($name)
    *
    * @return sfFormField|sfFormFieldSchema A form field instance
    */
+  #[\ReturnTypeWillChange]
   public function offsetGet($name)
   {
     if (!isset($this->formFields[$name]))
@@ -1114,6 +1116,7 @@ public function offsetGet($name)
    *
    * @throws <b>LogicException</b>
    */
+  #[\ReturnTypeWillChange]
   public function offsetSet($offset, $value)
   {
     throw new LogicException('Cannot update form fields.');
@@ -1126,6 +1129,7 @@ public function offsetSet($offset, $value)
    *
    * @param string $offset The field name
    */
+  #[\ReturnTypeWillChange]
   public function offsetUnset($offset)
   {
     unset(
@@ -1227,6 +1231,7 @@ public function getErrors()
   /**
    * Resets the field names array to the beginning (implements the Iterator interface).
    */
+  #[\ReturnTypeWillChange]
   public function rewind()
   {
     $this->fieldNames = $this->widgetSchema->getPositions();
@@ -1240,6 +1245,7 @@ public function rewind()
    *
    * @return string The key
    */
+  #[\ReturnTypeWillChange]
   public function key()
   {
     return current($this->fieldNames);
@@ -1250,6 +1256,7 @@ public function key()
    *
    * @return mixed The escaped value
    */
+  #[\ReturnTypeWillChange]
   public function current()
   {
     return $this[current($this->fieldNames)];
@@ -1258,6 +1265,7 @@ public function current()
   /**
    * Moves to the next form field (implements the Iterator interface).
    */
+  #[\ReturnTypeWillChange]
   public function next()
   {
     next($this->fieldNames);
@@ -1269,6 +1277,7 @@ public function next()
    *
    * @return boolean The validity of the current element; true if it is valid
    */
+  #[\ReturnTypeWillChange]
   public function valid()
   {
     return $this->count > 0;
@@ -1279,6 +1288,7 @@ public function valid()
    *
    * @return integer The number of embedded form fields
    */
+  #[\ReturnTypeWillChange]
   public function count()
   {
     return count($this->getFormFieldSchema());
diff --git a/lib/form/sfFormFieldSchema.class.php b/lib/form/sfFormFieldSchema.class.php
index 520058dfe..2e9407ad5 100644
--- a/lib/form/sfFormFieldSchema.class.php
+++ b/lib/form/sfFormFieldSchema.class.php
@@ -91,6 +91,7 @@ public function getHiddenFields($recursive = true)
    *
    * @return Boolean true if the widget exists, false otherwise
    */
+  #[\ReturnTypeWillChange]
   public function offsetExists($name)
   {
     return isset($this->widget[$name]);
@@ -103,6 +104,7 @@ public function offsetExists($name)
    *
    * @return sfFormField A form field instance
    */
+  #[\ReturnTypeWillChange]
   public function offsetGet($name)
   {
     if (!isset($this->fields[$name]))
@@ -144,6 +146,7 @@ public function offsetGet($name)
    *
    * @throws LogicException
    */
+  #[\ReturnTypeWillChange]
   public function offsetSet($offset, $value)
   {
     throw new LogicException('Cannot update form fields (read-only).');
@@ -156,6 +159,7 @@ public function offsetSet($offset, $value)
    *
    * @throws LogicException
    */
+  #[\ReturnTypeWillChange]
   public function offsetUnset($offset)
   {
     throw new LogicException('Cannot remove form fields (read-only).');
@@ -164,6 +168,7 @@ public function offsetUnset($offset)
   /**
    * Resets the field names array to the beginning (implements the Iterator interface).
    */
+  #[\ReturnTypeWillChange]
   public function rewind()
   {
     reset($this->fieldNames);
@@ -175,6 +180,7 @@ public function rewind()
    *
    * @return string The key
    */
+  #[\ReturnTypeWillChange]
   public function key()
   {
     return current($this->fieldNames);
@@ -185,6 +191,7 @@ public function key()
    *
    * @return mixed The escaped value
    */
+  #[\ReturnTypeWillChange]
   public function current()
   {
     return $this[current($this->fieldNames)];
@@ -193,6 +200,7 @@ public function current()
   /**
    * Moves to the next form field (implements the Iterator interface).
    */
+  #[\ReturnTypeWillChange]
   public function next()
   {
     next($this->fieldNames);
@@ -204,6 +212,7 @@ public function next()
    *
    * @return boolean The validity of the current element; true if it is valid
    */
+  #[\ReturnTypeWillChange]
   public function valid()
   {
     return $this->count > 0;
@@ -214,6 +223,7 @@ public function valid()
    *
    * @return integer The number of embedded form fields
    */
+  #[\ReturnTypeWillChange]
   public function count()
   {
     return count($this->fieldNames);
diff --git a/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineColumn.class.php b/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineColumn.class.php
index 6611f26a3..f693ebb55 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineColumn.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineColumn.class.php
@@ -349,23 +349,27 @@ public function getTable()
     return $this->table;
   }
 
+  #[\ReturnTypeWillChange]
   public function offsetExists($offset)
   {
     return isset($this->definition[$offset]);
   }
 
+  #[\ReturnTypeWillChange]
   public function offsetSet($offset, $value)
   {
     $this->definition[$offset] = $value;
   }
 
+  #[\ReturnTypeWillChange]
   public function offsetGet($offset)
   {
     return $this->definition[$offset];
   }
 
+  #[\ReturnTypeWillChange]
   public function offsetUnset($offset)
   {
     unset($this->definition[$offset]);
   }
-}
\ No newline at end of file
+}
diff --git a/lib/request/sfRequest.class.php b/lib/request/sfRequest.class.php
index b7249728b..ac6928e20 100644
--- a/lib/request/sfRequest.class.php
+++ b/lib/request/sfRequest.class.php
@@ -173,6 +173,7 @@ public function setMethod($method)
    *
    * @return bool true if the request parameter exists, false otherwise
    */
+  #[\ReturnTypeWillChange]
   public function offsetExists($name)
   {
     return $this->hasParameter($name);
@@ -185,6 +186,7 @@ public function offsetExists($name)
    *
    * @return mixed The request parameter if exists, null otherwise
    */
+  #[\ReturnTypeWillChange]
   public function offsetGet($name)
   {
     return $this->getParameter($name, false);
@@ -196,6 +198,7 @@ public function offsetGet($name)
    * @param string $offset The parameter name
    * @param string $value The parameter value
    */
+  #[\ReturnTypeWillChange]
   public function offsetSet($offset, $value)
   {
     $this->setParameter($offset, $value);
@@ -206,6 +209,7 @@ public function offsetSet($offset, $value)
    *
    * @param string $offset The parameter name
    */
+  #[\ReturnTypeWillChange]
   public function offsetUnset($offset)
   {
     $this->getParameterHolder()->remove($offset);
diff --git a/lib/routing/sfRouteCollection.class.php b/lib/routing/sfRouteCollection.class.php
index ee0117185..f95d2dbbb 100644
--- a/lib/routing/sfRouteCollection.class.php
+++ b/lib/routing/sfRouteCollection.class.php
@@ -61,6 +61,7 @@ public function getOptions()
   /**
    * Reset the error array to the beginning (implements the Iterator interface).
    */
+  #[\ReturnTypeWillChange]
   public function rewind()
   {
     reset($this->routes);
@@ -73,6 +74,7 @@ public function rewind()
    *
    * @return string The key
    */
+  #[\ReturnTypeWillChange]
   public function key()
   {
     return key($this->routes);
@@ -83,6 +85,7 @@ public function key()
    *
    * @return mixed The escaped value
    */
+  #[\ReturnTypeWillChange]
   public function current()
   {
     return current($this->routes);
@@ -91,6 +94,7 @@ public function current()
   /**
    * Moves to the next route (implements the Iterator interface).
    */
+  #[\ReturnTypeWillChange]
   public function next()
   {
     next($this->routes);
@@ -103,6 +107,7 @@ public function next()
    *
    * @return boolean The validity of the current route; true if it is valid
    */
+  #[\ReturnTypeWillChange]
   public function valid()
   {
     return $this->count > 0;
diff --git a/lib/user/sfUser.class.php b/lib/user/sfUser.class.php
index 2b65fa065..47d122a20 100644
--- a/lib/user/sfUser.class.php
+++ b/lib/user/sfUser.class.php
@@ -227,6 +227,7 @@ public function getCulture()
    *
    * @return Boolean true if the user attribute exists, false otherwise
    */
+  #[\ReturnTypeWillChange]
   public function offsetExists($name)
   {
     return $this->hasAttribute($name);
@@ -239,6 +240,7 @@ public function offsetExists($name)
    *
    * @return mixed The user attribute if exists, null otherwise
    */
+  #[\ReturnTypeWillChange]
   public function offsetGet($name)
   {
     return $this->getAttribute($name, false);
@@ -250,6 +252,7 @@ public function offsetGet($name)
    * @param string $offset The parameter name
    * @param string $value The parameter value
    */
+  #[\ReturnTypeWillChange]
   public function offsetSet($offset, $value)
   {
     $this->setAttribute($offset, $value);
@@ -260,6 +263,7 @@ public function offsetSet($offset, $value)
    *
    * @param string $offset The parameter name
    */
+  #[\ReturnTypeWillChange]
   public function offsetUnset($offset)
   {
     $this->getAttributeHolder()->remove($offset);
diff --git a/lib/util/sfContext.class.php b/lib/util/sfContext.class.php
index 439cbf5a6..b0128afc7 100644
--- a/lib/util/sfContext.class.php
+++ b/lib/util/sfContext.class.php
@@ -508,6 +508,7 @@ public function getConfigCache()
    *
    * @return Boolean true if the context object exists, false otherwise
    */
+  #[\ReturnTypeWillChange]
   public function offsetExists($name)
   {
     return $this->has($name);
@@ -520,6 +521,7 @@ public function offsetExists($name)
    *
    * @return mixed The context object if exists, null otherwise
    */
+  #[\ReturnTypeWillChange]
   public function offsetGet($name)
   {
     return $this->get($name);
@@ -531,6 +533,7 @@ public function offsetGet($name)
    * @param string $offset Service name
    * @param mixed  $value Service
    */
+  #[\ReturnTypeWillChange]
   public function offsetSet($offset, $value)
   {
     $this->set($offset, $value);
@@ -541,6 +544,7 @@ public function offsetSet($offset, $value)
    *
    * @param string $offset The parameter name
    */
+  #[\ReturnTypeWillChange]
   public function offsetUnset($offset)
   {
     unset($this->factories[$offset]);
diff --git a/lib/util/sfDomCssSelector.class.php b/lib/util/sfDomCssSelector.class.php
index 8a6d2362f..a207f4e75 100644
--- a/lib/util/sfDomCssSelector.class.php
+++ b/lib/util/sfDomCssSelector.class.php
@@ -563,6 +563,7 @@ protected function nth($cur, $result = 1, $dir = 'nextSibling')
   /**
    * Reset the array to the beginning (as required for the Iterator interface).
    */
+  #[\ReturnTypeWillChange]
   public function rewind()
   {
     reset($this->nodes);
@@ -575,6 +576,7 @@ public function rewind()
    *
    * @return string The key
    */
+  #[\ReturnTypeWillChange]
   public function key()
   {
     return key($this->nodes);
@@ -585,6 +587,7 @@ public function key()
    *
    * @return mixed The escaped value
    */
+  #[\ReturnTypeWillChange]
   public function current()
   {
     return current($this->nodes);
@@ -593,6 +596,7 @@ public function current()
   /**
    * Moves to the next element (as required by the Iterator interface).
    */
+  #[\ReturnTypeWillChange]
   public function next()
   {
     next($this->nodes);
@@ -609,6 +613,7 @@ public function next()
    *
    * @return bool The validity of the current element; true if it is valid
    */
+  #[\ReturnTypeWillChange]
   public function valid()
   {
     return $this->count > 0;
@@ -619,6 +624,7 @@ public function valid()
    *
    * @param integer The number of matching nodes
    */
+  #[\ReturnTypeWillChange]
   public function count()
   {
     return count($this->nodes);
diff --git a/lib/validator/sfValidatorErrorSchema.class.php b/lib/validator/sfValidatorErrorSchema.class.php
index d722102ac..f0175d226 100644
--- a/lib/validator/sfValidatorErrorSchema.class.php
+++ b/lib/validator/sfValidatorErrorSchema.class.php
@@ -176,6 +176,7 @@ public function getMessageFormat()
    *
    * @return int The number of array
    */
+  #[\ReturnTypeWillChange]
   public function count()
   {
     return count($this->errors);
@@ -184,6 +185,7 @@ public function count()
   /**
    * Reset the error array to the beginning (implements the Iterator interface).
    */
+  #[\ReturnTypeWillChange]
   public function rewind()
   {
     reset($this->errors);
@@ -196,6 +198,7 @@ public function rewind()
    *
    * @return string The key
    */
+  #[\ReturnTypeWillChange]
   public function key()
   {
     return key($this->errors);
@@ -206,6 +209,7 @@ public function key()
    *
    * @return mixed The escaped value
    */
+  #[\ReturnTypeWillChange]
   public function current()
   {
     return current($this->errors);
@@ -214,6 +218,7 @@ public function current()
   /**
    * Moves to the next error (implements the Iterator interface).
    */
+  #[\ReturnTypeWillChange]
   public function next()
   {
     next($this->errors);
@@ -226,6 +231,7 @@ public function next()
    *
    * @return boolean The validity of the current element; true if it is valid
    */
+  #[\ReturnTypeWillChange]
   public function valid()
   {
     return $this->count > 0;
@@ -238,6 +244,7 @@ public function valid()
    *
    * @return bool true if the error exists, false otherwise
    */
+  #[\ReturnTypeWillChange]
   public function offsetExists($name)
   {
     return isset($this->errors[$name]);
@@ -250,6 +257,7 @@ public function offsetExists($name)
    *
    * @return sfValidatorError A sfValidatorError instance
    */
+  #[\ReturnTypeWillChange]
   public function offsetGet($name)
   {
     return isset($this->errors[$name]) ? $this->errors[$name] : null;
@@ -263,6 +271,7 @@ public function offsetGet($name)
    *
    * @throws LogicException
    */
+  #[\ReturnTypeWillChange]
   public function offsetSet($offset, $value)
   {
     throw new LogicException('Unable update an error.');
@@ -273,6 +282,7 @@ public function offsetSet($offset, $value)
    *
    * @param string $offset  (ignored)
    */
+  #[\ReturnTypeWillChange]
   public function offsetUnset($offset)
   {
   }
diff --git a/lib/validator/sfValidatorSchema.class.php b/lib/validator/sfValidatorSchema.class.php
index bbd215203..34c97180e 100644
--- a/lib/validator/sfValidatorSchema.class.php
+++ b/lib/validator/sfValidatorSchema.class.php
@@ -309,6 +309,7 @@ public function getPostValidator()
    *
    * @return bool true if the schema has a field with the given name, false otherwise
    */
+  #[\ReturnTypeWillChange]
   public function offsetExists($name)
   {
     return isset($this->fields[$name]);
@@ -321,6 +322,7 @@ public function offsetExists($name)
    *
    * @return sfValidatorBase The sfValidatorBase instance associated with the given name, null if it does not exist
    */
+  #[\ReturnTypeWillChange]
   public function offsetGet($name)
   {
     return isset($this->fields[$name]) ? $this->fields[$name] : null;
@@ -332,6 +334,7 @@ public function offsetGet($name)
    * @param string          $name       The field name
    * @param sfValidatorBase $validator  An sfValidatorBase instance
    */
+  #[\ReturnTypeWillChange]
   public function offsetSet($name, $validator)
   {
     if (!$validator instanceof sfValidatorBase)
@@ -347,6 +350,7 @@ public function offsetSet($name, $validator)
    *
    * @param string $name
    */
+  #[\ReturnTypeWillChange]
   public function offsetUnset($name)
   {
     unset($this->fields[$name]);
diff --git a/lib/widget/sfWidgetFormSchema.class.php b/lib/widget/sfWidgetFormSchema.class.php
index acc3090d4..079db376f 100644
--- a/lib/widget/sfWidgetFormSchema.class.php
+++ b/lib/widget/sfWidgetFormSchema.class.php
@@ -659,6 +659,7 @@ public function generateName($name)
    *
    * @return bool true if the schema has a field with the given name, false otherwise
    */
+  #[\ReturnTypeWillChange]
   public function offsetExists($name)
   {
     return isset($this->fields[$name]);
@@ -671,6 +672,7 @@ public function offsetExists($name)
    *
    * @return sfWidget|null The sfWidget instance associated with the given name, null if it does not exist
    */
+  #[\ReturnTypeWillChange]
   public function offsetGet($name)
   {
     return isset($this->fields[$name]) ? $this->fields[$name] : null;
@@ -684,6 +686,7 @@ public function offsetGet($name)
    *
    * @throws InvalidArgumentException when the field is not instance of sfWidget
    */
+  #[\ReturnTypeWillChange]
   public function offsetSet($name, $widget)
   {
     if (!$widget instanceof sfWidget)
@@ -710,6 +713,7 @@ public function offsetSet($name, $widget)
    *
    * @param string $name field name
    */
+  #[\ReturnTypeWillChange]
   public function offsetUnset($name)
   {
     unset($this->fields[$name]);
diff --git a/lib/widget/sfWidgetFormSchemaDecorator.class.php b/lib/widget/sfWidgetFormSchemaDecorator.class.php
index c5d414068..5bc26bc5c 100644
--- a/lib/widget/sfWidgetFormSchemaDecorator.class.php
+++ b/lib/widget/sfWidgetFormSchemaDecorator.class.php
@@ -346,6 +346,7 @@ public function moveField($field, $action, $pivot = null)
    * @see sfWidgetFormSchema
    * @inheritdoc
    */
+  #[\ReturnTypeWillChange]
   public function offsetExists($name)
   {
     return isset($this->widget[$name]);
@@ -355,6 +356,7 @@ public function offsetExists($name)
    * @see sfWidgetFormSchema
    * @inheritdoc
    */
+  #[\ReturnTypeWillChange]
   public function offsetGet($name)
   {
     return $this->widget[$name];
@@ -364,6 +366,7 @@ public function offsetGet($name)
    * @see sfWidgetFormSchema
    * @inheritdoc
    */
+  #[\ReturnTypeWillChange]
   public function offsetSet($name, $widget)
   {
     $this->widget[$name] = $widget;
@@ -373,6 +376,7 @@ public function offsetSet($name, $widget)
    * @see sfWidgetFormSchema
    * @inheritdoc
    */
+  #[\ReturnTypeWillChange]
   public function offsetUnset($name)
   {
     unset($this->widget[$name]);
diff --git a/test/unit/escaper/sfOutputEscaperObjectDecoratorTest.php b/test/unit/escaper/sfOutputEscaperObjectDecoratorTest.php
index 967bde98a..caff163b2 100644
--- a/test/unit/escaper/sfOutputEscaperObjectDecoratorTest.php
+++ b/test/unit/escaper/sfOutputEscaperObjectDecoratorTest.php
@@ -74,6 +74,7 @@ class Foo
 
 class FooCountable implements Countable
 {
+  #[\ReturnTypeWillChange]
   public function count()
   {
     return 2;

From 6401fcc10f19b227af1227f1f3a808963558a968 Mon Sep 17 00:00:00 2001
From: Tybaze <tybaze@users.noreply.github.com>
Date: Thu, 19 May 2022 18:07:47 +0200
Subject: [PATCH 37/78] PHP 8.1 > Serializable Phase Out
 https://wiki.php.net/rfc/phase_out_serializable

PHP 7.4 add a new Serialize mecanism
PHP 8.1 made old method, "Serializable implementation" deprecated
PHP 9.0 (no release date at this moment) will drop the support.

Temporary Fix: Adding both method serialize/unserialize and __serialize/__unserialize

In order to be compatible with future PHP 9.0, once it will be release, we will have to drop the support to PHP Version before 7.4.

Currently a lot of Unix distribution in LTS are running a PHP Version older than 7.4 so moving to the final solution of "add return type" should break a lot of setup for the moment.

Each class has been serialized/unserialized and compared on PHP 8.1.2 and 5.6.30
---
 .../lib/pager/sfDoctrinePager.class.php       | 33 +++++++++++++++----
 lib/response/sfResponse.class.php             | 21 +++++++++++-
 lib/response/sfWebResponse.class.php          | 22 +++++++++++--
 lib/routing/sfRoute.class.php                 | 28 ++++++++++++++--
 .../sfNamespacedParameterHolder.class.php     | 29 +++++++++++++---
 lib/util/sfParameterHolder.class.php          | 28 +++++++++++++---
 lib/validator/sfValidatorError.class.php      | 29 ++++++++++++++--
 lib/view/sfViewParameterHolder.class.php      | 27 ++++++++++++---
 test/unit/response/sfResponseTest.php         |  4 ++-
 .../validator/sfValidatorErrorSchemaTest.php  | 10 ++++++
 test/unit/validator/sfValidatorErrorTest.php  | 10 ++++++
 11 files changed, 212 insertions(+), 29 deletions(-)

diff --git a/lib/plugins/sfDoctrinePlugin/lib/pager/sfDoctrinePager.class.php b/lib/plugins/sfDoctrinePlugin/lib/pager/sfDoctrinePager.class.php
index 9592575f1..b63cd66c0 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/pager/sfDoctrinePager.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/pager/sfDoctrinePager.class.php
@@ -52,9 +52,7 @@ public function setTableMethod($tableMethodName)
    */
   public function serialize()
   {
-    $vars = get_object_vars($this);
-    unset($vars['query']);
-    return serialize($vars);
+    return serialize($this->__serialize());
   }
 
   /**
@@ -66,12 +64,35 @@ public function unserialize($serialized)
   {
     $array = unserialize($serialized);
 
-    foreach ($array as $name => $values)
+    return $this->__unserialize($array);
+  }
+
+  /**
+   * Serializes the current instance for php 7.4+
+   *
+   * @return array
+   */
+  public function __serialize()
+  {
+    $vars = get_object_vars($this);
+    unset($vars['query']);
+    return $vars;
+  }
+
+  /**
+   * Unserializes a sfDoctrinePager instance for php 7.4+
+   *
+   * @param array $data
+   */
+  public function __unserialize($data)
+  {
+
+    foreach ($data as $name => $values)
     {
-      $this->$name = $values;
+       $this->$name = $values;
     }
 
-    $this->tableMethodCalled = false; 
+    $this->tableMethodCalled = false;
   }
 
   /**
diff --git a/lib/response/sfResponse.class.php b/lib/response/sfResponse.class.php
index 0dac345cb..905d07996 100644
--- a/lib/response/sfResponse.class.php
+++ b/lib/response/sfResponse.class.php
@@ -152,7 +152,7 @@ public function __call($method, $arguments)
   /**
    * Serializes the current instance.
    *
-   * @return array Objects instance
+   * @return string Objects instance
    */
   public function serialize()
   {
@@ -171,4 +171,23 @@ public function unserialize($serialized)
   {
     $this->content = unserialize($serialized);
   }
+
+  /**
+   * Serializes the current instance for php 7.4+
+   *
+   * @return array
+   */
+  public function __serialize() {
+    return array('content' => $this->content);
+  }
+
+  /**
+   * Unserializes a sfResponse instance for php 7.4+
+   *
+   * @param array $data
+  */
+  public function __unserialize($data)
+  {
+    $this->content = $data['content'];
+  }
 }
diff --git a/lib/response/sfWebResponse.class.php b/lib/response/sfWebResponse.class.php
index 4a9a6585a..9f25c50f3 100644
--- a/lib/response/sfWebResponse.class.php
+++ b/lib/response/sfWebResponse.class.php
@@ -876,7 +876,7 @@ public function merge(sfWebResponse $response)
    */
   public function serialize()
   {
-    return serialize(array($this->content, $this->statusCode, $this->statusText, $this->options, $this->headerOnly, $this->headers, $this->metas, $this->httpMetas, $this->stylesheets, $this->javascripts, $this->slots));
+    return serialize($this->__serialize());
   }
 
   /**
@@ -885,7 +885,25 @@ public function serialize()
    */
   public function unserialize($serialized)
   {
-    list($this->content, $this->statusCode, $this->statusText, $this->options, $this->headerOnly, $this->headers, $this->metas, $this->httpMetas, $this->stylesheets, $this->javascripts, $this->slots) = unserialize($serialized);
+    $this->__unserialize(unserialize($serialized));
+  }
+
+  /**
+   * @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);
+  }
+
+  /**
+   * @see sfResponse
+   * @param array $data
+   */
+  public function __unserialize($data)
+  {
+    list($this->content, $this->statusCode, $this->statusText, $this->options, $this->headerOnly, $this->headers, $this->metas, $this->httpMetas, $this->stylesheets, $this->javascripts, $this->slots) = $data;
   }
 
   /**
diff --git a/lib/routing/sfRoute.class.php b/lib/routing/sfRoute.class.php
index 6887e4e24..5a0f0e508 100644
--- a/lib/routing/sfRoute.class.php
+++ b/lib/routing/sfRoute.class.php
@@ -847,15 +847,37 @@ protected function fixSuffix()
 
   public function serialize()
   {
+    return serialize($this->__serialize());
+  }
+
+  public function unserialize($serialized)
+  {
+    $array = unserialize($serialized);
+
+    $this->__unserialize($array);
+  }
+
+  /**
+   * Serializes the current instance for php 7.4+
+   *
+   * @return array
+   */
+  public function __serialize() {
     // always serialize compiled routes
     $this->compile();
     // sfPatternRouting will always re-set defaultParameters, so no need to serialize them
-    return serialize(array($this->tokens, $this->defaultOptions, $this->options, $this->pattern, $this->staticPrefix, $this->regex, $this->variables, $this->defaults, $this->requirements, $this->suffix, $this->customToken));
+    return array($this->tokens, $this->defaultOptions, $this->options, $this->pattern, $this->staticPrefix, $this->regex, $this->variables, $this->defaults, $this->requirements, $this->suffix, $this->customToken);
   }
 
-  public function unserialize($data)
+  /**
+   * Unserializes a sfRoute instance for php 7.4+
+   *
+   * @param array $data
+   */
+  public function __unserialize($data)
   {
-    list($this->tokens, $this->defaultOptions, $this->options, $this->pattern, $this->staticPrefix, $this->regex, $this->variables, $this->defaults, $this->requirements, $this->suffix, $this->customToken) = unserialize($data);
+    list($this->tokens, $this->defaultOptions, $this->options, $this->pattern, $this->staticPrefix, $this->regex, $this->variables, $this->defaults, $this->requirements, $this->suffix, $this->customToken) = $data;
+
     $this->compiled = true;
   }
 }
diff --git a/lib/util/sfNamespacedParameterHolder.class.php b/lib/util/sfNamespacedParameterHolder.class.php
index 18eb76c67..757d86edd 100644
--- a/lib/util/sfNamespacedParameterHolder.class.php
+++ b/lib/util/sfNamespacedParameterHolder.class.php
@@ -366,11 +366,11 @@ public function addByRef(& $parameters, $ns = null)
   /**
    * Serializes the current instance.
    *
-   * @return array Objects instance
+   * @return string Objects instance
    */
   public function serialize()
   {
-    return serialize(array($this->default_namespace, $this->parameters));
+    return serialize($this->__serialize());
   }
 
   /**
@@ -380,9 +380,28 @@ public function serialize()
    */
   public function unserialize($serialized)
   {
-    $data = unserialize($serialized);
+    $this->__unserialize(unserialize($serialized));
+  }
+
+
+  /**
+   * Serializes the current instance for PHP 7.4+
+   *
+   * @return array
+   */
+  public function __serialize()
+  {
+    return array($this->default_namespace, $this->parameters);
+  }
 
-    $this->default_namespace = $data[0];
-    $this->parameters = $data[1];
+  /**
+   * Unserializes a sfParameterHolder instance. for PHP 7.4
+   *
+   * @param array $data
+   */
+  public function __unserialize($data)
+  {
+      $this->default_namespace = $data[0];
+      $this->parameters = $data[1];
   }
 }
diff --git a/lib/util/sfParameterHolder.class.php b/lib/util/sfParameterHolder.class.php
index 6f46b64f3..aecd57435 100644
--- a/lib/util/sfParameterHolder.class.php
+++ b/lib/util/sfParameterHolder.class.php
@@ -4,7 +4,7 @@
  * 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>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -181,11 +181,11 @@ public function addByRef(& $parameters)
   /**
    * Serializes the current instance.
    *
-   * @return array Objects instance
+   * @return string Objects instance
    */
   public function serialize()
   {
-    return serialize($this->parameters);
+    return serialize($this->__serialize());
   }
 
   /**
@@ -195,6 +195,26 @@ public function serialize()
    */
   public function unserialize($serialized)
   {
-    $this->parameters = unserialize($serialized);
+    $this->__unserialize(unserialize($serialized));
+  }
+
+  /**
+   * Serializes the current instance for PHP 7.4+
+   *
+   * @return Array
+   */
+  public function __serialize() {
+
+      return $this->parameters;
+  }
+
+  /**
+   * Unserializes a sfParameterHolder instance. for PHP 7.4
+   *
+   * @param array $data
+   */
+  public function __unserialize($data)
+  {
+    $this->parameters = $data;
   }
 }
diff --git a/lib/validator/sfValidatorError.class.php b/lib/validator/sfValidatorError.class.php
index 5eab900ae..fc4fc6c33 100644
--- a/lib/validator/sfValidatorError.class.php
+++ b/lib/validator/sfValidatorError.class.php
@@ -109,7 +109,7 @@ public function getArguments($raw = false)
    * error messages:
    *
    * $i18n->__($error->getMessageFormat(), $error->getArguments());
-   * 
+   *
    * If no message format has been set in the validator, the exception standard
    * message is returned.
    *
@@ -140,7 +140,7 @@ public function getMessageFormat()
    */
   public function serialize()
   {
-    return serialize(array($this->validator, $this->arguments, $this->code, $this->message));
+    return serialize($this->__serialize());
   }
 
   /**
@@ -151,6 +151,29 @@ public function serialize()
    */
   public function unserialize($serialized)
   {
-    list($this->validator, $this->arguments, $this->code, $this->message) = unserialize($serialized);
+    $array = unserialize($serialized);
+
+    $this->__unserialize($array);
+  }
+
+  /**
+   * Serializes the current instance for php 7.4+
+   *
+   * @return array
+   */
+  public function __serialize()
+  {
+    return array($this->validator, $this->arguments, $this->code, $this->message);
   }
+
+  /**
+   * Unserializes a sfValidatorError instance for php 7.4+
+   *
+   * @param string $serialized  A serialized sfValidatorError instance
+   */
+  public function __unserialize($data)
+  {
+    list($this->validator, $this->arguments, $this->code, $this->message) = $data;
+  }
+
 }
diff --git a/lib/view/sfViewParameterHolder.class.php b/lib/view/sfViewParameterHolder.class.php
index 5172c8aac..4cc6d636c 100644
--- a/lib/view/sfViewParameterHolder.class.php
+++ b/lib/view/sfViewParameterHolder.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -165,11 +165,11 @@ public function setEscapingMethod($method)
   /**
    * Serializes the current instance.
    *
-   * @return array Objects instance
+   * @return string Objects instance
    */
   public function serialize()
   {
-    return serialize(array($this->getAll(), $this->escapingMethod, $this->escaping));
+    return serialize($this->__serialize());
   }
 
   /**
@@ -179,8 +179,27 @@ public function serialize()
    */
   public function unserialize($serialized)
   {
-    list($this->parameters, $escapingMethod, $escaping) = unserialize($serialized);
+    $this->__unserialize(unserialize($serialized));
+  }
+
+  /**
+   * Serializes the current instance for PHP 7.4+
+   *
+   * @return array
+   */
+  public function __serialize()
+  {
+    return array($this->getAll(), $this->escapingMethod, $this->escaping);
+  }
 
+  /**
+   * Unserializes a sfParameterHolder instance. for PHP 7.4
+   *
+   * @param array $data
+   */
+  public function __unserialize($data)
+  {
+    list($this->parameters, $escapingMethod, $escaping) = $data;
     $this->initialize(sfContext::hasInstance() ? sfContext::getInstance()->getEventDispatcher() : new sfEventDispatcher());
 
     $this->setEscapingMethod($escapingMethod);
diff --git a/test/unit/response/sfResponseTest.php b/test/unit/response/sfResponseTest.php
index 31aad5842..c6f357f41 100644
--- a/test/unit/response/sfResponseTest.php
+++ b/test/unit/response/sfResponseTest.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -14,6 +14,8 @@ class myResponse extends sfResponse
 {
   function serialize() {}
   function unserialize($serialized) {}
+  function __serialize() {}
+  function __unserialize($data) {}
 }
 
 class fakeResponse
diff --git a/test/unit/validator/sfValidatorErrorSchemaTest.php b/test/unit/validator/sfValidatorErrorSchemaTest.php
index e7768a9a6..7ca40047f 100644
--- a/test/unit/validator/sfValidatorErrorSchemaTest.php
+++ b/test/unit/validator/sfValidatorErrorSchemaTest.php
@@ -187,6 +187,16 @@ public function unserialize($serialized)
   {
     throw new Exception('Not serializable');
   }
+
+  public function __serialize()
+  {
+    throw new Exception('Not serializable');
+  }
+
+  public function __unserialize($data)
+  {
+    throw new Exception('Not serializable');
+  }
 }
 
 function will_crash($a)
diff --git a/test/unit/validator/sfValidatorErrorTest.php b/test/unit/validator/sfValidatorErrorTest.php
index 41b03f4c3..f3b37ea46 100644
--- a/test/unit/validator/sfValidatorErrorTest.php
+++ b/test/unit/validator/sfValidatorErrorTest.php
@@ -65,6 +65,16 @@ public function unserialize($serialized)
   {
     throw new Exception('Not serializable');
   }
+
+  public function __serialize()
+  {
+    throw new Exception('Not serializable');
+  }
+
+  public function __unserialize($data)
+  {
+    throw new Exception('Not serializable');
+  }
 }
 
 function will_crash($a)

From 029b0e7e03dd8a57a35a3ea41ec67a516bb14a1e Mon Sep 17 00:00:00 2001
From: Tybaze <tybaze@users.noreply.github.com>
Date: Mon, 23 May 2022 10:41:36 +0200
Subject: [PATCH 38/78] PHP 8.0 & 8.1 > Deprecated of null to non-nullable
 internal function parameters

Mainly ensure use of string instead of null / false by casting the variable into (string)
Also fix method/function arguments with default value must be at the end.

Thanks to @teymour
https://github.com/FriendsOfSymfony1/symfony1/pull/265/commits/cba71a47894ca8a89f2a88a5cd9dcb637129dbeb
---
 lib/helper/DateHelper.php                                     | 2 +-
 lib/helper/I18NHelper.php                                     | 4 ++--
 lib/i18n/sfDateFormat.class.php                               | 3 ++-
 .../lib/database/sfDoctrineConnectionProfiler.class.php       | 2 +-
 .../lib/debug/sfWebDebugPanelDoctrine.class.php               | 4 ++--
 lib/routing/sfRoute.class.php                                 | 4 ++--
 lib/util/sfBrowserBase.class.php                              | 2 +-
 lib/util/sfInflector.class.php                                | 4 ++--
 lib/util/sfToolkit.class.php                                  | 2 +-
 lib/vendor/lime/lime.php                                      | 2 +-
 lib/widget/sfWidgetFormDate.class.php                         | 2 +-
 lib/widget/sfWidgetFormTime.class.php                         | 4 ++--
 lib/yaml/sfYamlInline.class.php                               | 2 +-
 lib/yaml/sfYamlParser.class.php                               | 2 +-
 .../apps/frontend/config/frontendConfiguration.class.php      | 2 +-
 15 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/lib/helper/DateHelper.php b/lib/helper/DateHelper.php
index 564aae975..51265f48e 100644
--- a/lib/helper/DateHelper.php
+++ b/lib/helper/DateHelper.php
@@ -17,7 +17,7 @@
  * @version    SVN: $Id$
  */
 
-function format_daterange($start_date, $end_date, $format = 'd', $full_text, $start_text, $end_text, $culture = null, $charset = null)
+function format_daterange($start_date, $end_date, $format = 'd', $full_text = '', $start_text = '', $end_text = '', $culture = null, $charset = null)
 {
   if ($start_date != '' && $end_date != '')
   {
diff --git a/lib/helper/I18NHelper.php b/lib/helper/I18NHelper.php
index cde3e3352..95d285a32 100644
--- a/lib/helper/I18NHelper.php
+++ b/lib/helper/I18NHelper.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -60,7 +60,7 @@ function __($text, $args = array(), $catalogue = 'messages')
  *
  * @return string Result of the translation
  */
-function format_number_choice($text, $args = array(), $number, $catalogue = 'messages')
+function format_number_choice($text, $args = array(), $number = null, $catalogue = 'messages')
 {
   $translated = __($text, $args, $catalogue);
 
diff --git a/lib/i18n/sfDateFormat.class.php b/lib/i18n/sfDateFormat.class.php
index 80a5a571f..90b2aded3 100644
--- a/lib/i18n/sfDateFormat.class.php
+++ b/lib/i18n/sfDateFormat.class.php
@@ -239,9 +239,10 @@ public function format($time, $pattern = 'F', $inputPattern = null, $charset = '
       }
       else
       {
-        $function = ucfirst($this->getFunctionName($pattern));
+        $function = $this->getFunctionName($pattern);
         if ($function != null)
         {
+          $function = ucfirst($function);
           $fName = 'get'.$function;
           if (in_array($fName, $this->methods))
           {
diff --git a/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionProfiler.class.php b/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionProfiler.class.php
index 0643cab71..e3824c7c2 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionProfiler.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionProfiler.class.php
@@ -200,7 +200,7 @@ static public function fixParams($params)
 
     foreach ($params as $key => $param)
     {
-      if (strlen($param) >= 255)
+      if ($param && strlen($param) >= 255)
       {
         $params[$key] = '['.number_format(strlen($param) / 1024, 2).'Kb]';
       }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/debug/sfWebDebugPanelDoctrine.class.php b/lib/plugins/sfDoctrinePlugin/lib/debug/sfWebDebugPanelDoctrine.class.php
index e7477b34d..9c4bacf7d 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/debug/sfWebDebugPanelDoctrine.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/debug/sfWebDebugPanelDoctrine.class.php
@@ -68,7 +68,7 @@ static public function listenToAddPanelEvent(sfEvent $event)
 
   /**
    * Returns an array of Doctrine query events.
-   * 
+   *
    * @return array
    */
   protected function getDoctrineEvents()
@@ -116,7 +116,7 @@ protected function getSqlLogs()
       // interpolate parameters
       foreach ($params as $param)
       {
-        $param = htmlspecialchars($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));
       }
 
diff --git a/lib/routing/sfRoute.class.php b/lib/routing/sfRoute.class.php
index 5a0f0e508..05385fe6c 100644
--- a/lib/routing/sfRoute.class.php
+++ b/lib/routing/sfRoute.class.php
@@ -285,7 +285,7 @@ protected function generateWithTokens($parameters)
       switch ($token[0])
       {
         case 'variable':
-          if (!$optional || !isset($this->defaults[$token[3]]) || $parameters[$token[3]] != $this->defaults[$token[3]])
+          if (!$optional || !isset($this->defaults[$token[3]]) || (isset($parameters[$token[3]]) && $parameters[$token[3]] != $this->defaults[$token[3]]))
           {
             $url[] = urlencode($parameters[$token[3]]);
             $optional = false;
@@ -791,7 +791,7 @@ protected function fixDefaults()
       }
       else
       {
-        $this->defaults[$key] = urldecode($value);
+        $this->defaults[$key] = urldecode((string) $value);
       }
     }
   }
diff --git a/lib/util/sfBrowserBase.class.php b/lib/util/sfBrowserBase.class.php
index 21d3de7da..c02c97e4f 100755
--- a/lib/util/sfBrowserBase.class.php
+++ b/lib/util/sfBrowserBase.class.php
@@ -908,7 +908,7 @@ public function doClickElement(DOMElement $item, $arguments = array(), $options
     }
     else
     {
-      $queryString = http_build_query($arguments, null, '&');
+      $queryString = (is_array($arguments)) ? http_build_query($arguments, null, '&') : '';
       $sep = false === strpos($url, '?') ? '?' : '&';
 
       return array($url.($queryString ? $sep.$queryString : ''), 'get', array());
diff --git a/lib/util/sfInflector.class.php b/lib/util/sfInflector.class.php
index 378d5e79e..f1676eb06 100644
--- a/lib/util/sfInflector.class.php
+++ b/lib/util/sfInflector.class.php
@@ -28,7 +28,7 @@ class sfInflector
   public static function camelize($lower_case_and_underscored_word)
   {
 
-    return strtr(ucwords(strtr($lower_case_and_underscored_word, array('/' => ':: ', '_' => ' ', '-' => ' '))), array(' ' => ''));
+    return strtr(ucwords(strtr((string) $lower_case_and_underscored_word, array('/' => ':: ', '_' => ' ', '-' => ' '))), array(' ' => ''));
   }
 
   /**
@@ -40,7 +40,7 @@ public static function camelize($lower_case_and_underscored_word)
    */
   public static function underscore($camel_cased_word)
   {
-    $tmp = $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'));
diff --git a/lib/util/sfToolkit.class.php b/lib/util/sfToolkit.class.php
index b3bda1000..811df0edb 100644
--- a/lib/util/sfToolkit.class.php
+++ b/lib/util/sfToolkit.class.php
@@ -366,7 +366,7 @@ public static function replaceConstants($value)
    */
   public static function pregtr($search, $replacePairs)
   {
-    return preg_replace(array_keys($replacePairs), array_values($replacePairs), $search);
+    return preg_replace(array_keys($replacePairs), array_values($replacePairs), (string) $search);
   }
 
   /**
diff --git a/lib/vendor/lime/lime.php b/lib/vendor/lime/lime.php
index 53fdd0dd1..d087dd631 100644
--- a/lib/vendor/lime/lime.php
+++ b/lib/vendor/lime/lime.php
@@ -564,7 +564,7 @@ protected function find_caller($traces)
     return array($traces[$last]['file'], $traces[$last]['line']);
   }
 
-  public function handle_error($code, $message, $file, $line, $context)
+  public function handle_error($code, $message, $file, $line, $context = null)
   {
     if (!$this->options['error_reporting'] || ($code & error_reporting()) == 0)
     {
diff --git a/lib/widget/sfWidgetFormDate.class.php b/lib/widget/sfWidgetFormDate.class.php
index 96eba1a5d..c8ed674df 100644
--- a/lib/widget/sfWidgetFormDate.class.php
+++ b/lib/widget/sfWidgetFormDate.class.php
@@ -70,7 +70,7 @@ public function render($name, $value = null, $attributes = array(), $errors = ar
     }
     else
     {
-      $value = (string) $value == (string) (integer) $value ? (integer) $value : strtotime($value);
+      $value = (string) $value == (string) (integer) $value ? (integer) $value : strtotime( (string) $value);
       if (false === $value)
       {
         $value = $default;
diff --git a/lib/widget/sfWidgetFormTime.class.php b/lib/widget/sfWidgetFormTime.class.php
index d68f375df..5917ed841 100644
--- a/lib/widget/sfWidgetFormTime.class.php
+++ b/lib/widget/sfWidgetFormTime.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -72,7 +72,7 @@ public function render($name, $value = null, $attributes = array(), $errors = ar
     }
     else
     {
-      $value = ctype_digit($value) ? (integer) $value : strtotime($value);
+      $value = ctype_digit( (string) $value) ? (integer) $value : strtotime( (string) $value);
       if (false === $value)
       {
         $value = $default;
diff --git a/lib/yaml/sfYamlInline.class.php b/lib/yaml/sfYamlInline.class.php
index ad9342099..2b7ccd6c5 100644
--- a/lib/yaml/sfYamlInline.class.php
+++ b/lib/yaml/sfYamlInline.class.php
@@ -97,7 +97,7 @@ static public function dump($value)
         return 'true';
       case false === $value:
         return 'false';
-      case ctype_digit($value):
+      case (is_string($value) && ctype_digit($value)):
         return is_string($value) ? "'$value'" : (int) $value;
       case is_numeric($value):
         return is_infinite($value) ? str_ireplace('INF', '.Inf', (string) $value) : (is_string($value) ? "'$value'" : $value);
diff --git a/lib/yaml/sfYamlParser.class.php b/lib/yaml/sfYamlParser.class.php
index 69b9f2651..58aa6b8eb 100644
--- a/lib/yaml/sfYamlParser.class.php
+++ b/lib/yaml/sfYamlParser.class.php
@@ -421,7 +421,7 @@ protected function parseValue($value)
     {
       $modifiers = isset($matches['modifiers']) ? $matches['modifiers'] : '';
 
-      return $this->parseFoldedScalar($matches['separator'], preg_replace('#\d+#', '', $modifiers), (int) abs($modifiers));
+      return $this->parseFoldedScalar($matches['separator'], preg_replace('#\d+#', '', $modifiers), (int) abs((int) $modifiers));
     }
     else
     {
diff --git a/test/functional/fixtures/apps/frontend/config/frontendConfiguration.class.php b/test/functional/fixtures/apps/frontend/config/frontendConfiguration.class.php
index 58e520532..9b0b90c90 100644
--- a/test/functional/fixtures/apps/frontend/config/frontendConfiguration.class.php
+++ b/test/functional/fixtures/apps/frontend/config/frontendConfiguration.class.php
@@ -11,7 +11,7 @@ public function configure()
 
   public function filter_parameters(sfEvent $event, $parameters)
   {
-    if (false !== stripos($event->getSubject()->getHttpHeader('user-agent'), 'iPhone'))
+    if (false !== stripos((string) $event->getSubject()->getHttpHeader('user-agent'), 'iPhone'))
     {
       $event->getSubject()->setRequestFormat('iphone');
     }

From dcb1ce3a6ed98127b604e1bc7b2c380367a1d581 Mon Sep 17 00:00:00 2001
From: Tybaze <tybaze@users.noreply.github.com>
Date: Mon, 23 May 2022 12:59:20 +0200
Subject: [PATCH 39/78] PHP 8.1 > strftime deprecated.

2 possible workaround, use partial implementation with php date method or use IntlDateFormatter.
As symfony1 is not intended to evolve, it should not rely on currently unused PHP-Extension (nor update composer.json).

I propose a fix to replace "strftime" by "date", with a translation of format for PHP 8.1+

It will lose the ability of translating date of logs (does anybody use it ?) and it will deprecated a few strftime format (probably not used)
Performances should remains OK

I only tested it with a few formats (the default one and a few others)
If you need some missing strftime formats, please add them.
---
 lib/log/sfFileLogger.class.php     | 60 +++++++++++++++++++++++++++++-
 test/unit/log/sfFileLoggerTest.php |  8 ++--
 2 files changed, 62 insertions(+), 6 deletions(-)

diff --git a/lib/log/sfFileLogger.class.php b/lib/log/sfFileLogger.class.php
index dfb610a8e..eceb47255 100644
--- a/lib/log/sfFileLogger.class.php
+++ b/lib/log/sfFileLogger.class.php
@@ -92,7 +92,7 @@ public function initialize(sfEventDispatcher $dispatcher, $options = array())
    * Logs a message.
    *
    * @param string $message   Message
-   * @param int    $priority  Message priority
+   * @param int $priority  Message priority
    */
   protected function doLog($message, $priority)
   {
@@ -100,7 +100,7 @@ protected function doLog($message, $priority)
     fwrite($this->fp, strtr($this->format, array(
       '%type%'     => $this->type,
       '%message%'  => $message,
-      '%time%'     => strftime($this->timeFormat),
+      '%time%'     => self::strftime($this->timeFormat),
       '%priority%' => $this->getPriority($priority),
       '%EOL%'      => PHP_EOL,
     )));
@@ -129,4 +129,60 @@ public function shutdown()
       fclose($this->fp);
     }
   }
+
+  /**
+   * @param $format
+   * @return false|string
+   */
+  public static function strftime($format)
+  {
+    if (version_compare(PHP_VERSION, '8.1.0') < 0) {
+      return strftime($format);
+    }
+    return date(self::_strftimeFormatToDateFormat($format));
+  }
+
+  /**
+   * Try to Convert a strftime to date format
+   *
+   * Unable to find a perfect implementation, based on those one (Each contains some errors)
+   * https://github.com/Fabrik/fabrik/blob/master/plugins/fabrik_element/date/date.php
+   * https://gist.github.com/mcaskill/02636e5970be1bb22270
+   * https://stackoverflow.com/questions/22665959/using-php-strftime-using-date-format-string
+   *
+   * Limitation:
+   * - Do not apply translation
+   * - Some few strftime format could be broken (low probability to be used on logs)
+   *
+   * Private: because it should not be used outside of this scope
+   *
+   * A better solution is to use : IntlDateFormatter, but it will require to load a new php extension, which could break some setup.
+   *
+   * @return array|string|string[]
+   */
+  private static function _strftimeFormatToDateFormat($strftimeFormat) {
+
+    // Missing %V %C %g %G
+    $search = array(
+      '%a', '%A', '%d', '%e', '%u',
+      '%w', '%W', '%b', '%h', '%B',
+      '%m', '%y', '%Y', '%D', '%F',
+      '%x', '%n', '%t', '%H', '%k',
+      '%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(
+      'D', 'l', 'd', 'j', 'N',
+      'w', 'W', 'M', 'M', 'F',
+      'm', 'y', 'Y', 'm/d/y', 'Y-m-d',
+      'm/d/y', "\n", "\t", 'H', 'G',
+      '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/test/unit/log/sfFileLoggerTest.php b/test/unit/log/sfFileLoggerTest.php
index 81fa52a58..3fbb66f9b 100644
--- a/test/unit/log/sfFileLoggerTest.php
+++ b/test/unit/log/sfFileLoggerTest.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -61,7 +61,7 @@ protected function getPriority($priority)
 unlink($file);
 $logger = new TestLogger($dispatcher, array('file' => $file));
 $logger->log('foo');
-$t->is(file_get_contents($file), 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%'));
@@ -73,14 +73,14 @@ protected function getPriority($priority)
 unlink($file);
 $logger = new TestLogger($dispatcher, array('file' => $file, 'time_format' => '%Y %m %d'));
 $logger->log('foo');
-$t->is(file_get_contents($file), 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->log('foo');
-$t->is(file_get_contents($file), 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()');

From 8450b13a012ac8fc216231571f95630eb073a354 Mon Sep 17 00:00:00 2001
From: Tybaze <tybaze@users.noreply.github.com>
Date: Thu, 9 Jun 2022 14:31:05 +0200
Subject: [PATCH 40/78] PHP 8.1 > Unit Test

sfException> fileExcerpt file can be null, and PHP 8.1 do not allow null on is_readable()

sfBrowser> Move sf_test conf before getContext, because getContext can throw some sfException, which will raise some printStackTrace, hidden by another Exception "header already sent ..."

lime.php> some trace can have no "file" (internal methods call)
lime.php> handle_exception can handle Error/Throwable, not avaialble under php7.2: remove typing

sfTestFunctionalBase> can throw exception

Fix Select Unit test NewActivePendingExpired.
DomDocument on recent php return a list of values, not concatened ones.

Fix SessionStorage UnitTest.

sfSessionStorage could not be restarted.
Flag $sessionStarted as false when shutdown to avoid error during unit test which can start several sfSessionStorage

Storage need to be shutdown to avoid:
PHP Warning:  session_name(): Session name cannot be changed when a session is active
---
 lib/exception/sfException.class.php           |  4 ++++
 .../test/functional/AdminGenBrowser.class.php |  4 ++--
 lib/storage/sfSessionStorage.class.php        |  1 +
 lib/test/sfTestFunctionalBase.class.php       |  2 +-
 lib/util/sfBrowser.class.php                  |  5 +++--
 lib/vendor/lime/lime.php                      | 19 ++++++++++++-------
 test/unit/storage/sfSessionStorageTest.php    |  1 +
 7 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/lib/exception/sfException.class.php b/lib/exception/sfException.class.php
index 3611caada..fbd742596 100644
--- a/lib/exception/sfException.class.php
+++ b/lib/exception/sfException.class.php
@@ -366,6 +366,10 @@ static protected function formatArrayAsHtml($values)
    */
   static protected function fileExcerpt($file, $line)
   {
+    // $file can be null for RuntimeException
+    if($file === null) {
+      return '';
+    }
     if (is_readable($file))
     {
       $content = preg_split('#<br />#', preg_replace('/^<code>(.*)<\/code>$/s', '$1', highlight_file($file, true)));
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/AdminGenBrowser.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/AdminGenBrowser.class.php
index a5efd75f7..cb29fe83e 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/AdminGenBrowser.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/AdminGenBrowser.class.php
@@ -152,7 +152,7 @@ protected function _testEnumDropdown()
     $this->
       get('/subscriptions/new')->
         with('response')->begin()->
-          checkElement('select', 'NewActivePendingExpired')->
+          checkElement('select', '/^New\R?Active\R?Pending\R?Expired\R?$/m')->
         end()
     ;
   }
@@ -237,7 +237,7 @@ 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));
diff --git a/lib/storage/sfSessionStorage.class.php b/lib/storage/sfSessionStorage.class.php
index 57ff59973..f11337d39 100644
--- a/lib/storage/sfSessionStorage.class.php
+++ b/lib/storage/sfSessionStorage.class.php
@@ -190,5 +190,6 @@ public function shutdown()
   {
     // don't need a shutdown procedure because read/write do it in real-time
     session_write_close();
+    self::$sessionStarted = false;
   }
 }
diff --git a/lib/test/sfTestFunctionalBase.class.php b/lib/test/sfTestFunctionalBase.class.php
index 2f3da782c..97ac815a6 100644
--- a/lib/test/sfTestFunctionalBase.class.php
+++ b/lib/test/sfTestFunctionalBase.class.php
@@ -478,7 +478,7 @@ static public function handlePhpError($errno, $errstr, $errfile, $errline)
   /**
    * Exception handler for the current test browser instance.
    *
-   * @param Exception $exception The exception
+   * @param Throwable $exception The exception
    */
   function handleException($exception)
   {
diff --git a/lib/util/sfBrowser.class.php b/lib/util/sfBrowser.class.php
index a4f89691c..ad45e1225 100644
--- a/lib/util/sfBrowser.class.php
+++ b/lib/util/sfBrowser.class.php
@@ -28,11 +28,12 @@ class sfBrowser extends sfBrowserBase
    */
   protected function doCall()
   {
+    // Before getContext, it can trigger some
+    sfConfig::set('sf_test', true);
+
     // recycle our context object
     $this->context = $this->getContext(true);
 
-    sfConfig::set('sf_test', true);
-
     // we register a fake rendering filter
     sfConfig::set('sf_rendering_filter', array('sfFakeRenderingFilter', null));
 
diff --git a/lib/vendor/lime/lime.php b/lib/vendor/lime/lime.php
index d087dd631..8020c94b5 100644
--- a/lib/vendor/lime/lime.php
+++ b/lib/vendor/lime/lime.php
@@ -520,11 +520,11 @@ public function error($message, $file = null, $line = null, array $traces = arra
   {
     $this->output->error($message, $file, $line, $traces);
 
-  	$this->results['stats']['errors'][] = array(
-  	  'message' => $message,
-  	  'file' => $file,
-  	  'line' => $line,
-  	);
+    $this->results['stats']['errors'][] = array(
+      'message' => $message,
+      'file' => $file,
+      'line' => $line,
+    );
   }
 
   protected function update_stats()
@@ -553,7 +553,8 @@ protected function find_caller($traces)
     $t = array_reverse($traces);
     foreach ($t as $trace)
     {
-      if (isset($trace['object']) && $this->is_test_object($trace['object']))
+      // In internal calls, like error_handle, 'file' will be missing
+      if (isset($trace['object']) && $this->is_test_object($trace['object']) && isset($trace['file']))
       {
         return array($trace['file'], $trace['line']);
       }
@@ -587,7 +588,11 @@ public function handle_error($code, $message, $file, $line, $context = null)
     $this->error($type.': '.$message, $file, $line, $trace);
   }
 
-  public function handle_exception(Throwable $exception)
+  /**
+   * @param Throwable $exception only available on php7
+   * @return bool
+   */
+  public function handle_exception($exception)
   {
     $this->error(get_class($exception).': '.$exception->getMessage(), $exception->getFile(), $exception->getLine(), $exception->getTrace());
 
diff --git a/test/unit/storage/sfSessionStorageTest.php b/test/unit/storage/sfSessionStorageTest.php
index ddc1f4a6b..2349ee02b 100644
--- a/test/unit/storage/sfSessionStorageTest.php
+++ b/test/unit/storage/sfSessionStorageTest.php
@@ -26,6 +26,7 @@
 {
   $storage = new sfSessionStorage();
   $t->pass('->__construct() does not throw an exception when not provided with options');
+  $storage->shutdown();
 }
 catch (InvalidArgumentException $e)
 {

From 9cb7fb482b1b91fa22a7f5f78f3055a3def5130f Mon Sep 17 00:00:00 2001
From: Tybaze <tybaze@users.noreply.github.com>
Date: Thu, 9 Jun 2022 15:31:25 +0200
Subject: [PATCH 41/78] Fix lime message: "An uncaught exception has been
 thrown" do not have "error" value

uncaught exception does not populate error field
---
 lib/vendor/lime/lime.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/vendor/lime/lime.php b/lib/vendor/lime/lime.php
index 8020c94b5..5b3c16560 100644
--- a/lib/vendor/lime/lime.php
+++ b/lib/vendor/lime/lime.php
@@ -1103,7 +1103,9 @@ function lime_shutdown()
 
             $this->output->comment(sprintf('  at %s line %s', $this->get_relative_file($testsuite['tests'][$testcase]['file']).$this->extension, $testsuite['tests'][$testcase]['line']));
             $this->output->info('  '.$testsuite['tests'][$testcase]['message']);
-            $this->output->echoln($testsuite['tests'][$testcase]['error'], null, false);
+            if(isset($testsuite['tests'][$testcase]['error'])) {
+              $this->output->echoln($testsuite['tests'][$testcase]['error'], null, false);
+            }
           }
         }
       }

From 25a5e71b67b0522d93ad9a0130b20826a6d57e90 Mon Sep 17 00:00:00 2001
From: Tybaze <tybaze@users.noreply.github.com>
Date: Thu, 9 Jun 2022 18:12:21 +0200
Subject: [PATCH 42/78] PHP 8.1 > uasort(): Returning bool from comparison
 function is deprecated, return an integer less than, equal to, or greater
 than zero

---
 lib/routing/sfRoute.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/routing/sfRoute.class.php b/lib/routing/sfRoute.class.php
index 05385fe6c..a0093b18e 100644
--- a/lib/routing/sfRoute.class.php
+++ b/lib/routing/sfRoute.class.php
@@ -264,7 +264,7 @@ public function generate($params, $context = array(), $absolute = false)
 
   static private function generateCompareVarsByStrlen($a, $b)
   {
-    return strlen($a) < strlen($b);
+    return (strlen($a) < strlen($b)) ? 1 : -1;
   }
 
   /**

From 09fc710a73336971f816f991b8a1011c1d31c2e0 Mon Sep 17 00:00:00 2001
From: Tybaze <tybaze@users.noreply.github.com>
Date: Thu, 9 Jun 2022 18:30:50 +0200
Subject: [PATCH 43/78] Fix ValueError: DOMDocument::loadHTML(): Argument #1
 ($source) must not be empty

---
 lib/test/sfTesterResponse.class.php | 12 +++++++-----
 lib/util/sfBrowserBase.class.php    |  4 +++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/lib/test/sfTesterResponse.class.php b/lib/test/sfTesterResponse.class.php
index 4fca01923..1a1c7a86a 100644
--- a/lib/test/sfTesterResponse.class.php
+++ b/lib/test/sfTesterResponse.class.php
@@ -49,7 +49,9 @@ public function initialize()
       }
       else
       {
-        @$this->dom->loadHTML($this->response->getContent());
+        if($this->response->getContent()) {
+          @$this->dom->loadHTML($this->response->getContent());
+        }
       }
       $this->domCssSelector = new sfDomCssSelector($this->dom);
     }
@@ -120,10 +122,10 @@ public function checkElement($selector, $value = true, $options = array())
 
   /**
    * Checks that a form is rendered correctly.
-   * 
+   *
    * @param  sfForm|string $form     A form object or the name of a form class
    * @param  string        $selector CSS selector for the root form element for this form
-   * 
+   *
    * @return sfTestFunctionalBase|sfTester
    */
   public function checkForm($form, $selector = 'form')
@@ -333,11 +335,11 @@ public function isHeader($key, $value)
 
   /**
    * Tests if a cookie was set.
-   * 
+   *
    * @param  string $name
    * @param  string $value
    * @param  array  $attributes Other cookie attributes to check (expires, path, domain, etc)
-   * 
+   *
    * @return sfTestFunctionalBase|sfTester
    */
   public function setsCookie($name, $value = null, $attributes = array())
diff --git a/lib/util/sfBrowserBase.class.php b/lib/util/sfBrowserBase.class.php
index c02c97e4f..4ec39098a 100755
--- a/lib/util/sfBrowserBase.class.php
+++ b/lib/util/sfBrowserBase.class.php
@@ -363,7 +363,9 @@ public function call($uri, $method = 'get', $parameters = array(), $changeStack
       }
       else
       {
-        @$this->dom->loadHTML($response->getContent());
+        if($response->getContent()) {
+          @$this->dom->loadHTML($response->getContent());
+        }
       }
       $this->domCssSelector = new sfDomCssSelector($this->dom);
     }

From df2ec65dbe8729ef7495a8a7f45b44c823dc7e72 Mon Sep 17 00:00:00 2001
From: Tybaze <tybaze@users.noreply.github.com>
Date: Thu, 9 Jun 2022 19:36:56 +0200
Subject: [PATCH 44/78] PHP 8.0 > fread()/count() behavior

ValueError: fread(): Argument #2 ($length) must be greater than 0

TypeError: count(): Argument #1 ($value) must be of type Countable|array Foo Given
Use Symfony Polyfill https://github.com/symfony/polyfill/commit/d330c0094a47d8edceeea1ed553d6e08215a9fc2

TypeError: count(): Argument #1 ($value) must be of type Countable|array, string given
Do not use Symfony pollyfill, is_array is enought
---
 lib/cache/sfFileCache.class.php               |  6 +++-
 .../sfOutputEscaperObjectDecorator.class.php  |  8 ++++--
 lib/i18n/sfCultureInfo.class.php              | 28 +++++++++----------
 3 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/lib/cache/sfFileCache.class.php b/lib/cache/sfFileCache.class.php
index dcd03f345..2997d6c96 100644
--- a/lib/cache/sfFileCache.class.php
+++ b/lib/cache/sfFileCache.class.php
@@ -256,7 +256,11 @@ protected function read($path, $type = self::READ_DATA)
         fseek($fp, 0, SEEK_END);
         $length = ftell($fp) - 24;
         fseek($fp, 24);
-        $data[self::READ_DATA] = @fread($fp, $length);
+        if($length > 0) {
+          $data[self::READ_DATA] = @fread($fp, $length);
+        } else {
+          $data[self::READ_DATA] = '';
+        }
       }
     }
     else
diff --git a/lib/escaper/sfOutputEscaperObjectDecorator.class.php b/lib/escaper/sfOutputEscaperObjectDecorator.class.php
index fe506d9c1..86d0ae71e 100644
--- a/lib/escaper/sfOutputEscaperObjectDecorator.class.php
+++ b/lib/escaper/sfOutputEscaperObjectDecorator.class.php
@@ -111,13 +111,17 @@ public function __isset($key)
   /**
    * Returns the size of the object if it implements Countable (is required by the Countable interface).
    *
-   * It returns 1 if other cases (which is the default PHP behavior in such a case).
+   * It returns 1 if other cases (which was the default PHP behavior in such a case before php 7.3).
    *
    * @return int The size of the object
    */
   #[\ReturnTypeWillChange]
   public function count()
   {
-    return count($this->value);
+    // 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) {
+      return count($this->value);
+    }
+    return 1;
   }
 }
diff --git a/lib/i18n/sfCultureInfo.class.php b/lib/i18n/sfCultureInfo.class.php
index a14fd7c0f..aaf8d3bb7 100644
--- a/lib/i18n/sfCultureInfo.class.php
+++ b/lib/i18n/sfCultureInfo.class.php
@@ -92,11 +92,11 @@ class sfCultureInfo
    * @var sfNumberFormatInfo
    */
   protected $numberFormat;
-  
+
   /**
    * A list of properties that are accessable/writable.
    * @var array
-   */ 
+   */
   protected $properties = array();
 
   /**
@@ -191,9 +191,9 @@ public function __set($name, $value)
   }
 
   /**
-   * Initializes a new instance of the sfCultureInfo class based on the 
+   * Initializes a new instance of the sfCultureInfo class based on the
    * culture specified by name. E.g. <code>new sfCultureInfo('en_AU');</code>
-   * The culture indentifier must be of the form 
+   * The culture indentifier must be of the form
    * "<language>_(country/region/variant)".
    *
    * @param string $culture a culture name, e.g. "en_AU".
@@ -323,7 +323,7 @@ protected function loadCultureData($culture)
    * this function.
    *
    * @param string $filename the ICU data filename
-   * @return array ICU data 
+   * @return array ICU data
    */
   protected function &getData($filename)
   {
@@ -347,7 +347,7 @@ protected function &getData($filename)
    * Use merge=true to return the ICU including the parent culture.
    * E.g. The currency data for a variant, say "en_AU" contains one
    * entry, the currency for AUD, the other currency data are stored
-   * in the "en" data file. Thus to retrieve all the data regarding 
+   * in the "en" data file. Thus to retrieve all the data regarding
    * currency for "en_AU", you need to use findInfo("Currencies,true);.
    *
    * @param string  $path   the data you want to find.
@@ -429,9 +429,9 @@ protected function searchArray($info, $path = '/')
       }
     }
   }
-  
+
   /**
-   * Gets the culture name in the format 
+   * Gets the culture name in the format
    * "<languagecode2>_(country/regioncode2)".
    *
    * @return string culture name.
@@ -516,7 +516,7 @@ public function getEnglishName()
     $culture = $this->getInvariantCulture();
 
     $language = $culture->findInfo("Languages/{$lang}");
-    if (count($language) == 0)
+    if (is_array($language) && count($language) == 0)
     {
       return $this->culture;
     }
@@ -547,7 +547,7 @@ static function getInvariantCulture()
   }
 
   /**
-   * Gets a value indicating whether the current sfCultureInfo 
+   * Gets a value indicating whether the current sfCultureInfo
    * represents a neutral culture. Returns true if the culture
    * only contains two characters.
    *
@@ -590,7 +590,7 @@ public function setNumberFormat($numberFormat)
   }
 
   /**
-   * Gets the sfCultureInfo that represents the parent culture of the 
+   * Gets the sfCultureInfo that represents the parent culture of the
    * current sfCultureInfo
    *
    * @return sfCultureInfo parent culture information.
@@ -606,14 +606,14 @@ public function getParent()
   }
 
   /**
-   * Gets the list of supported cultures filtered by the specified 
+   * Gets the list of supported cultures filtered by the specified
    * culture type. This is an EXPENSIVE function, it needs to traverse
    * a list of ICU files in the data directory.
    * This function can be called statically.
    *
    * @param int $type culture type, sfCultureInfo::ALL, sfCultureInfo::NEUTRAL
    * or sfCultureInfo::SPECIFIC.
-   * @return array list of culture information available. 
+   * @return array list of culture information available.
    */
   static function getCultures($type = sfCultureInfo::ALL)
   {
@@ -719,7 +719,7 @@ public function getLanguage($code)
    *
    * @param  array $countries An array of countries used to restrict the returned array (null by default, which means all countries)
    *
-   * @return array a list of localized country names. 
+   * @return array a list of localized country names.
    */
   public function getCountries($countries = null)
   {

From 42112ab7f22b6b5d4523d51e190511f1bb11912c Mon Sep 17 00:00:00 2001
From: Tybaze <tybaze@users.noreply.github.com>
Date: Thu, 9 Jun 2022 22:25:36 +0200
Subject: [PATCH 45/78] Fix Declaration of sfPearRestTest::downloadHttp($url,
 $lastmodified = null, $accept = false) must be compatible with
 sfPearRest::downloadHttp($url, $lastmodified = null, $accept = false,
 $channel = false)

---
 lib/plugin/sfPearRest.class.php           | 4 ++--
 test/unit/plugin/sfPearRestTest.class.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/plugin/sfPearRest.class.php b/lib/plugin/sfPearRest.class.php
index f17b6deb3..72cb66960 100644
--- a/lib/plugin/sfPearRest.class.php
+++ b/lib/plugin/sfPearRest.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -23,7 +23,7 @@ class sfPearRest extends PEAR_REST
   /**
    * @see PEAR_REST::downloadHttp()
    */
-  public function downloadHttp($url, $lastmodified = null, $accept = false)
+  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)));
   }
diff --git a/test/unit/plugin/sfPearRestTest.class.php b/test/unit/plugin/sfPearRestTest.class.php
index 251f913fc..df3138708 100644
--- a/test/unit/plugin/sfPearRestTest.class.php
+++ b/test/unit/plugin/sfPearRestTest.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -21,7 +21,7 @@ class sfPearRestTest extends sfPearRest
   /**
    * @see PEAR_REST::downloadHttp()
    */
-  public function downloadHttp($url, $lastmodified = null, $accept = false)
+  public function downloadHttp($url, $lastmodified = null, $accept = false, $channel = false)
   {
     try
     {

From 29ab2a79aa8e25d1df2a430a86a01f528ff5d730 Mon Sep 17 00:00:00 2001
From: Tybaze <tybaze@users.noreply.github.com>
Date: Thu, 9 Jun 2022 22:00:51 +0200
Subject: [PATCH 46/78] PHP 8.0 > mktime update

8.0.0 	hour is no longer optional.
8.0.0 	minute, second, month, day and year are nullable now.
---
 lib/i18n/sfI18N.class.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/i18n/sfI18N.class.php b/lib/i18n/sfI18N.class.php
index b64ebccb4..5478e6d73 100644
--- a/lib/i18n/sfI18N.class.php
+++ b/lib/i18n/sfI18N.class.php
@@ -271,6 +271,15 @@ public function getTimestampForCulture($dateTime, $culture = null)
     list($day, $month, $year) = $this->getDateForCulture($dateTime, null === $culture ? $this->culture : $culture);
     list($hour, $minute) = $this->getTimeForCulture($dateTime, null === $culture ? $this->culture : $culture);
 
+    // mktime behavior change with php8
+    // $hour become not nullable
+    if (!$hour) {
+      $hour = 0;
+    }
+    // Before 8.0, $minutes value to null, was casted as (int)0
+    if (!$minute) {
+      $minute = 0;
+    }
     return null === $day ? null : mktime($hour, $minute, 0, $month, $day, $year);
   }
 

From 12f7b4caae6dd33a3b609ca6b9a4e5e0c671f5be Mon Sep 17 00:00:00 2001
From: Tybaze <tybaze@users.noreply.github.com>
Date: Fri, 10 Jun 2022 08:53:35 +0200
Subject: [PATCH 47/78] Fix sfWebResponse->getContentType() return a string not
 an array

---
 lib/response/sfWebResponse.class.php     | 2 +-
 test/unit/response/sfWebResponseTest.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/response/sfWebResponse.class.php b/lib/response/sfWebResponse.class.php
index 9f25c50f3..af69e38e2 100644
--- a/lib/response/sfWebResponse.class.php
+++ b/lib/response/sfWebResponse.class.php
@@ -312,7 +312,7 @@ public function getCharset()
   /**
    * Gets response content type.
    *
-   * @return array
+   * @return string
    */
   public function getContentType()
   {
diff --git a/test/unit/response/sfWebResponseTest.php b/test/unit/response/sfWebResponseTest.php
index 0697da8d8..916a8298c 100644
--- a/test/unit/response/sfWebResponseTest.php
+++ b/test/unit/response/sfWebResponseTest.php
@@ -132,7 +132,7 @@ public function normalizeHeaderName($name)
 
 $response->setContentType('text/xml');
 $response->setContentType('text/html');
-$t->is(count($response->getHttpHeader('content-type')), 1, '->setContentType() overrides previous content type if replace is true');
+$t->is($response->getHttpHeader('content-type'), 'text/html; charset=ISO-8859-1', '->setContentType() overrides previous content type if replace is true');
 
 // ->getTitle() ->setTitle() ->prependTitle
 $t->diag('->getTitle() ->setTitle() ->prependTitle()');

From cae793e1ac19124d1251420bb0833d840355ca63 Mon Sep 17 00:00:00 2001
From: Tybaze <tybaze@users.noreply.github.com>
Date: Fri, 10 Jun 2022 09:26:26 +0200
Subject: [PATCH 48/78] Fix sfDoctrineTester, string cannot be accessed as
 array

---
 .../sfDoctrinePlugin/lib/test/sfTesterDoctrine.class.php      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/sfDoctrinePlugin/lib/test/sfTesterDoctrine.class.php b/lib/plugins/sfDoctrinePlugin/lib/test/sfTesterDoctrine.class.php
index 8ce1c985c..48fd0374b 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/test/sfTesterDoctrine.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/test/sfTesterDoctrine.class.php
@@ -65,7 +65,7 @@ public function check($model, $query, $value = true)
         }
 
         $operator = '=';
-        if ('!' == $condition[0])
+        if (strlen($condition) && '!' == substr($condition,0,1))
         {
           $operator = false !== strpos($condition, '%') ? 'NOT LIKE' : '!=';
           $condition = substr($condition, 1);
@@ -103,7 +103,7 @@ public function check($model, $query, $value = true)
 
   /**
    * Outputs some debug information about queries run during the current request.
-   * 
+   *
    * @param integer|string $limit Either an integer to return the last many queries, a regular expression or a substring to search for
    */
   public function debug($limit = null)

From 7341b43844efd3720c706f48e3c9341f7861e478 Mon Sep 17 00:00:00 2001
From: Tybaze <tybaze@users.noreply.github.com>
Date: Fri, 10 Jun 2022 12:52:25 +0200
Subject: [PATCH 49/78] PHP 8.0 > Fix is_numeric behavior with trailing empty
 char Numeric strings ending with whitespace ("42 ") will now return true.
 Previously, false was return instead.

Use same fix has main maintened Yaml lib :
https://github.com/symfony/yaml/commit/4152e36b0f305c2a57aa0233dee56ec27bca4f06
+ performance improvement
https://github.com/symfony/yaml/commit/2b5f2ae892b489e51d81616fbc475c8238b533dc
---
 lib/yaml/sfYamlInline.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/yaml/sfYamlInline.class.php b/lib/yaml/sfYamlInline.class.php
index 2b7ccd6c5..840f3fa7a 100644
--- a/lib/yaml/sfYamlInline.class.php
+++ b/lib/yaml/sfYamlInline.class.php
@@ -99,7 +99,7 @@ static public function dump($value)
         return 'false';
       case (is_string($value) && ctype_digit($value)):
         return is_string($value) ? "'$value'" : (int) $value;
-      case is_numeric($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));

From b191cb8a43789dde46435b472edeff268f7642a2 Mon Sep 17 00:00:00 2001
From: Tybaze <tybaze@users.noreply.github.com>
Date: Fri, 10 Jun 2022 14:31:05 +0200
Subject: [PATCH 50/78] PHP 8.0 > String to Number Comparison. When
 $previousIndent was equal to 0, and $matches['indent'] = "    "

PHP(before 8.0)> (0 != "    ") ==> false
PHP8.0+ > (0 != "     ")  ==> true

In order to keep "false" value we avoid "0" as a valid value.

More details here why here:
https://www.php.net/manual/en/migration80.incompatible.php
---
 lib/yaml/sfYamlParser.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/yaml/sfYamlParser.class.php b/lib/yaml/sfYamlParser.class.php
index 58aa6b8eb..ed5b179ee 100644
--- a/lib/yaml/sfYamlParser.class.php
+++ b/lib/yaml/sfYamlParser.class.php
@@ -474,7 +474,7 @@ protected function parseFoldedScalar($separator, $indicator = '', $indentation =
 
       if (preg_match('#^(?P<indent> {'.strlen($textIndent).',})(?P<text>.+)$#u', $this->currentLine, $matches))
       {
-        if (' ' == $separator && $previousIndent != $matches['indent'])
+        if (' ' == $separator && ($previousIndent && $previousIndent != $matches['indent']))
         {
           $text = substr($text, 0, -1)."\n";
         }

From 956cb1aaef2543f56cfb18bf91f91cac66e00b4a Mon Sep 17 00:00:00 2001
From: Tybaze <tybaze@users.noreply.github.com>
Date: Mon, 23 May 2022 13:00:35 +0200
Subject: [PATCH 51/78] PHP 8.1 > Change support to PHP 8.1

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 900179110..e5147ca4d 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ All the enhancements and BC breaks are listed in the [WHATS_NEW](https://github.
 
 - [DIC](https://github.com/FriendsOfSymfony1/symfony1/wiki/ServiceContainer)
 - Composer support
-- PHP 7.2 support
+- PHP 8.1 support
 - performance boost
 - new widgets & validators
 - some tickets fixed from the symfony trac

From b0cb92e75edcc8dd7e8186e7b31a67bd1768c675 Mon Sep 17 00:00:00 2001
From: Tybaze <tybaze@users.noreply.github.com>
Date: Fri, 10 Jun 2022 19:00:21 +0200
Subject: [PATCH 52/78] Fix UnitTest application/x-sharedlib

/bin/ls can be reported as:
- application/x-sharedlib
- application/x-executable
- application/x-pie-executable
---
 test/unit/validator/sfValidatorFileTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/validator/sfValidatorFileTest.php b/test/unit/validator/sfValidatorFileTest.php
index 42463acfa..d7d101d6d 100755
--- a/test/unit/validator/sfValidatorFileTest.php
+++ b/test/unit/validator/sfValidatorFileTest.php
@@ -105,7 +105,7 @@ public function getMimeTypesFromCategory($category)
 $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->is($v->guessFromFileBinary('/bin/ls'), (PHP_OS != 'Darwin') ? 'application/x-pie-executable' : 'application/octet-stream', '->guessFromFileBinary() returns correct type if file is 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');
 $t->is($v->guessFromFileBinary('-test'), null, '->guessFromFileBinary() returns null if file path has leading dash');
 
 // ->getMimeType()

From bb221418824b1251d9ff5964ff3295285ede2f32 Mon Sep 17 00:00:00 2001
From: Tybaze <tybaze@users.noreply.github.com>
Date: Fri, 10 Jun 2022 19:26:51 +0200
Subject: [PATCH 53/78] PHP 8.1 > mysqli_report revert to off
 https://php.watch/versions/8.1/mysqli-error-mode

---
 lib/database/sfMySQLiDatabase.class.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/database/sfMySQLiDatabase.class.php b/lib/database/sfMySQLiDatabase.class.php
index e4814794a..bdc8be447 100644
--- a/lib/database/sfMySQLiDatabase.class.php
+++ b/lib/database/sfMySQLiDatabase.class.php
@@ -29,6 +29,9 @@ class sfMySQLiDatabase extends sfMySQLDatabase
    */
   protected function getConnectMethod($persistent)
   {
+    // PHP 8.1 Activate Exception per default, revert behavior to "return false"
+    mysqli_report(MYSQLI_REPORT_OFF);
+
     return 'mysqli_connect';
   }
 

From d0d0d122e8bb2b5197be327ff89ab3a2291b0ca0 Mon Sep 17 00:00:00 2001
From: Tybaze <tybaze@users.noreply.github.com>
Date: Thu, 7 Jul 2022 11:13:16 +0200
Subject: [PATCH 54/78] Refactor code and apply Coding Style fixes

---
 lib/cache/sfFileCache.class.php                        |  8 ++++++--
 lib/escaper/sfOutputEscaperObjectDecorator.class.php   |  3 ++-
 lib/event/sfEvent.class.php                            |  2 +-
 lib/exception/sfException.class.php                    |  4 +++-
 lib/i18n/sfDateFormat.class.php                        |  3 +--
 lib/i18n/sfI18N.class.php                              | 10 ++--------
 lib/log/sfFileLogger.class.php                         |  7 ++++---
 .../lib/test/sfTesterDoctrine.class.php                |  2 +-
 lib/response/sfResponse.class.php                      |  3 ++-
 lib/routing/sfRoute.class.php                          |  3 ++-
 lib/test/sfTestFunctionalBase.class.php                |  2 +-
 lib/test/sfTesterResponse.class.php                    |  5 +++--
 lib/util/sfBrowserBase.class.php                       |  7 ++++---
 lib/util/sfNamespacedParameterHolder.class.php         |  2 +-
 lib/util/sfParameterHolder.class.php                   |  6 +++---
 lib/vendor/lime/lime.php                               |  5 +++--
 lib/view/sfViewParameterHolder.class.php               |  2 +-
 lib/widget/sfWidgetFormDate.class.php                  |  2 +-
 lib/widget/sfWidgetFormTime.class.php                  |  2 +-
 lib/yaml/sfYamlParser.class.php                        |  2 +-
 20 files changed, 43 insertions(+), 37 deletions(-)

diff --git a/lib/cache/sfFileCache.class.php b/lib/cache/sfFileCache.class.php
index 2997d6c96..f84be899f 100644
--- a/lib/cache/sfFileCache.class.php
+++ b/lib/cache/sfFileCache.class.php
@@ -256,9 +256,13 @@ protected function read($path, $type = self::READ_DATA)
         fseek($fp, 0, SEEK_END);
         $length = ftell($fp) - 24;
         fseek($fp, 24);
-        if($length > 0) {
+
+        if ($length > 0)
+        {
           $data[self::READ_DATA] = @fread($fp, $length);
-        } else {
+        }
+        else
+        {
           $data[self::READ_DATA] = '';
         }
       }
diff --git a/lib/escaper/sfOutputEscaperObjectDecorator.class.php b/lib/escaper/sfOutputEscaperObjectDecorator.class.php
index 86d0ae71e..ea4adcc57 100644
--- a/lib/escaper/sfOutputEscaperObjectDecorator.class.php
+++ b/lib/escaper/sfOutputEscaperObjectDecorator.class.php
@@ -119,7 +119,8 @@ public function __isset($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);
     }
     return 1;
diff --git a/lib/event/sfEvent.class.php b/lib/event/sfEvent.class.php
index 750b28023..67415e7ee 100644
--- a/lib/event/sfEvent.class.php
+++ b/lib/event/sfEvent.class.php
@@ -83,7 +83,7 @@ public function getReturnValue()
   /**
    * Sets the processed flag.
    *
-   * @param boolean $processed The processed flag value
+   * @param bool $processed The processed flag value
    */
   public function setProcessed($processed)
   {
diff --git a/lib/exception/sfException.class.php b/lib/exception/sfException.class.php
index fbd742596..9ade775db 100644
--- a/lib/exception/sfException.class.php
+++ b/lib/exception/sfException.class.php
@@ -367,9 +367,11 @@ static protected function formatArrayAsHtml($values)
   static protected function fileExcerpt($file, $line)
   {
     // $file can be null for RuntimeException
-    if($file === null) {
+    if (null === $file)
+    {
       return '';
     }
+
     if (is_readable($file))
     {
       $content = preg_split('#<br />#', preg_replace('/^<code>(.*)<\/code>$/s', '$1', highlight_file($file, true)));
diff --git a/lib/i18n/sfDateFormat.class.php b/lib/i18n/sfDateFormat.class.php
index 90b2aded3..91f827081 100644
--- a/lib/i18n/sfDateFormat.class.php
+++ b/lib/i18n/sfDateFormat.class.php
@@ -239,8 +239,7 @@ public function format($time, $pattern = 'F', $inputPattern = null, $charset = '
       }
       else
       {
-        $function = $this->getFunctionName($pattern);
-        if ($function != null)
+        if (null !== $function = $this->getFunctionName($pattern))
         {
           $function = ucfirst($function);
           $fName = 'get'.$function;
diff --git a/lib/i18n/sfI18N.class.php b/lib/i18n/sfI18N.class.php
index 5478e6d73..c236c9d2a 100644
--- a/lib/i18n/sfI18N.class.php
+++ b/lib/i18n/sfI18N.class.php
@@ -272,14 +272,8 @@ public function getTimestampForCulture($dateTime, $culture = null)
     list($hour, $minute) = $this->getTimeForCulture($dateTime, null === $culture ? $this->culture : $culture);
 
     // mktime behavior change with php8
-    // $hour become not nullable
-    if (!$hour) {
-      $hour = 0;
-    }
-    // Before 8.0, $minutes value to null, was casted as (int)0
-    if (!$minute) {
-      $minute = 0;
-    }
+    $hour = null !== $hour ? $hour : 0;
+    $minute = null !== $minute ? $minute : 0;
     return null === $day ? null : mktime($hour, $minute, 0, $month, $day, $year);
   }
 
diff --git a/lib/log/sfFileLogger.class.php b/lib/log/sfFileLogger.class.php
index eceb47255..35d269a5a 100644
--- a/lib/log/sfFileLogger.class.php
+++ b/lib/log/sfFileLogger.class.php
@@ -136,7 +136,8 @@ public function shutdown()
    */
   public static function strftime($format)
   {
-    if (version_compare(PHP_VERSION, '8.1.0') < 0) {
+    if (version_compare(PHP_VERSION, '8.1.0') < 0)
+    {
       return strftime($format);
     }
     return date(self::_strftimeFormatToDateFormat($format));
@@ -160,8 +161,8 @@ public static function strftime($format)
    *
    * @return array|string|string[]
    */
-  private static function _strftimeFormatToDateFormat($strftimeFormat) {
-
+  private static function _strftimeFormatToDateFormat($strftimeFormat)
+  {
     // Missing %V %C %g %G
     $search = array(
       '%a', '%A', '%d', '%e', '%u',
diff --git a/lib/plugins/sfDoctrinePlugin/lib/test/sfTesterDoctrine.class.php b/lib/plugins/sfDoctrinePlugin/lib/test/sfTesterDoctrine.class.php
index 48fd0374b..f8392c7ae 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/test/sfTesterDoctrine.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/test/sfTesterDoctrine.class.php
@@ -65,7 +65,7 @@ public function check($model, $query, $value = true)
         }
 
         $operator = '=';
-        if (strlen($condition) && '!' == substr($condition,0,1))
+        if (strlen($condition) && '!' == substr($condition, 0, 1))
         {
           $operator = false !== strpos($condition, '%') ? 'NOT LIKE' : '!=';
           $condition = substr($condition, 1);
diff --git a/lib/response/sfResponse.class.php b/lib/response/sfResponse.class.php
index 905d07996..1c8e3d48c 100644
--- a/lib/response/sfResponse.class.php
+++ b/lib/response/sfResponse.class.php
@@ -177,7 +177,8 @@ public function unserialize($serialized)
    *
    * @return array
    */
-  public function __serialize() {
+  public function __serialize()
+  {
     return array('content' => $this->content);
   }
 
diff --git a/lib/routing/sfRoute.class.php b/lib/routing/sfRoute.class.php
index a0093b18e..fd2ac0319 100644
--- a/lib/routing/sfRoute.class.php
+++ b/lib/routing/sfRoute.class.php
@@ -862,7 +862,8 @@ public function unserialize($serialized)
    *
    * @return array
    */
-  public function __serialize() {
+  public function __serialize()
+  {
     // always serialize compiled routes
     $this->compile();
     // sfPatternRouting will always re-set defaultParameters, so no need to serialize them
diff --git a/lib/test/sfTestFunctionalBase.class.php b/lib/test/sfTestFunctionalBase.class.php
index 97ac815a6..fc83df3b5 100644
--- a/lib/test/sfTestFunctionalBase.class.php
+++ b/lib/test/sfTestFunctionalBase.class.php
@@ -478,7 +478,7 @@ static public function handlePhpError($errno, $errstr, $errfile, $errline)
   /**
    * Exception handler for the current test browser instance.
    *
-   * @param Throwable $exception The exception
+   * @param Throwable|Exception $exception The exception
    */
   function handleException($exception)
   {
diff --git a/lib/test/sfTesterResponse.class.php b/lib/test/sfTesterResponse.class.php
index 1a1c7a86a..7409dfc2d 100644
--- a/lib/test/sfTesterResponse.class.php
+++ b/lib/test/sfTesterResponse.class.php
@@ -49,8 +49,9 @@ public function initialize()
       }
       else
       {
-        if($this->response->getContent()) {
-          @$this->dom->loadHTML($this->response->getContent());
+        if ($content = $this->response->getContent())
+        {
+          @$this->dom->loadHTML($content);
         }
       }
       $this->domCssSelector = new sfDomCssSelector($this->dom);
diff --git a/lib/util/sfBrowserBase.class.php b/lib/util/sfBrowserBase.class.php
index 4ec39098a..535d8ac45 100755
--- a/lib/util/sfBrowserBase.class.php
+++ b/lib/util/sfBrowserBase.class.php
@@ -363,8 +363,9 @@ public function call($uri, $method = 'get', $parameters = array(), $changeStack
       }
       else
       {
-        if($response->getContent()) {
-          @$this->dom->loadHTML($response->getContent());
+        if ($content = $response->getContent())
+        {
+          @$this->dom->loadHTML($content);
         }
       }
       $this->domCssSelector = new sfDomCssSelector($this->dom);
@@ -910,7 +911,7 @@ public function doClickElement(DOMElement $item, $arguments = array(), $options
     }
     else
     {
-      $queryString = (is_array($arguments)) ? http_build_query($arguments, null, '&') : '';
+      $queryString = is_array($arguments) ? http_build_query($arguments, null, '&') : '';
       $sep = false === strpos($url, '?') ? '?' : '&';
 
       return array($url.($queryString ? $sep.$queryString : ''), 'get', array());
diff --git a/lib/util/sfNamespacedParameterHolder.class.php b/lib/util/sfNamespacedParameterHolder.class.php
index 757d86edd..03008a030 100644
--- a/lib/util/sfNamespacedParameterHolder.class.php
+++ b/lib/util/sfNamespacedParameterHolder.class.php
@@ -395,7 +395,7 @@ public function __serialize()
   }
 
   /**
-   * Unserializes a sfParameterHolder instance. for PHP 7.4
+   * Unserializes a sfParameterHolder instance for PHP 7.4+
    *
    * @param array $data
    */
diff --git a/lib/util/sfParameterHolder.class.php b/lib/util/sfParameterHolder.class.php
index aecd57435..b4d57b6d5 100644
--- a/lib/util/sfParameterHolder.class.php
+++ b/lib/util/sfParameterHolder.class.php
@@ -203,13 +203,13 @@ public function unserialize($serialized)
    *
    * @return Array
    */
-  public function __serialize() {
-
+  public function __serialize()
+  {
       return $this->parameters;
   }
 
   /**
-   * Unserializes a sfParameterHolder instance. for PHP 7.4
+   * Unserializes a sfParameterHolder instance for PHP 7.4+
    *
    * @param array $data
    */
diff --git a/lib/vendor/lime/lime.php b/lib/vendor/lime/lime.php
index 5b3c16560..2d5f8986e 100644
--- a/lib/vendor/lime/lime.php
+++ b/lib/vendor/lime/lime.php
@@ -589,7 +589,7 @@ public function handle_error($code, $message, $file, $line, $context = null)
   }
 
   /**
-   * @param Throwable $exception only available on php7
+   * @param Throwable|Exception $exception
    * @return bool
    */
   public function handle_exception($exception)
@@ -1103,7 +1103,8 @@ function lime_shutdown()
 
             $this->output->comment(sprintf('  at %s line %s', $this->get_relative_file($testsuite['tests'][$testcase]['file']).$this->extension, $testsuite['tests'][$testcase]['line']));
             $this->output->info('  '.$testsuite['tests'][$testcase]['message']);
-            if(isset($testsuite['tests'][$testcase]['error'])) {
+            if (isset($testsuite['tests'][$testcase]['error']))
+            {
               $this->output->echoln($testsuite['tests'][$testcase]['error'], null, false);
             }
           }
diff --git a/lib/view/sfViewParameterHolder.class.php b/lib/view/sfViewParameterHolder.class.php
index 4cc6d636c..3d8c63f18 100644
--- a/lib/view/sfViewParameterHolder.class.php
+++ b/lib/view/sfViewParameterHolder.class.php
@@ -193,7 +193,7 @@ public function __serialize()
   }
 
   /**
-   * Unserializes a sfParameterHolder instance. for PHP 7.4
+   * Unserializes a sfParameterHolder instance for PHP 7.4+
    *
    * @param array $data
    */
diff --git a/lib/widget/sfWidgetFormDate.class.php b/lib/widget/sfWidgetFormDate.class.php
index c8ed674df..9c87946b7 100644
--- a/lib/widget/sfWidgetFormDate.class.php
+++ b/lib/widget/sfWidgetFormDate.class.php
@@ -70,7 +70,7 @@ public function render($name, $value = null, $attributes = array(), $errors = ar
     }
     else
     {
-      $value = (string) $value == (string) (integer) $value ? (integer) $value : strtotime( (string) $value);
+      $value = (string) $value == (string) (integer) $value ? (integer) $value : strtotime((string) $value);
       if (false === $value)
       {
         $value = $default;
diff --git a/lib/widget/sfWidgetFormTime.class.php b/lib/widget/sfWidgetFormTime.class.php
index 5917ed841..4a90d957b 100644
--- a/lib/widget/sfWidgetFormTime.class.php
+++ b/lib/widget/sfWidgetFormTime.class.php
@@ -72,7 +72,7 @@ public function render($name, $value = null, $attributes = array(), $errors = ar
     }
     else
     {
-      $value = ctype_digit( (string) $value) ? (integer) $value : strtotime( (string) $value);
+      $value = ctype_digit((string) $value) ? (integer) $value : strtotime((string) $value);
       if (false === $value)
       {
         $value = $default;
diff --git a/lib/yaml/sfYamlParser.class.php b/lib/yaml/sfYamlParser.class.php
index ed5b179ee..3cf5580b1 100644
--- a/lib/yaml/sfYamlParser.class.php
+++ b/lib/yaml/sfYamlParser.class.php
@@ -421,7 +421,7 @@ protected function parseValue($value)
     {
       $modifiers = isset($matches['modifiers']) ? $matches['modifiers'] : '';
 
-      return $this->parseFoldedScalar($matches['separator'], preg_replace('#\d+#', '', $modifiers), (int) abs((int) $modifiers));
+      return $this->parseFoldedScalar($matches['separator'], preg_replace('#\d+#', '', $modifiers), abs((int) $modifiers));
     }
     else
     {

From 01fadb98ff556c2d66988941dddc5090d8e830d9 Mon Sep 17 00:00:00 2001
From: Tybaze <tybaze@users.noreply.github.com>
Date: Tue, 2 Aug 2022 14:34:54 +0200
Subject: [PATCH 55/78] PHP 8.1 > Better MYSQLI_REPORT_OFF implementations for
 php8.1 compat

Thanks @mentalstring
---
 lib/database/sfMySQLiDatabase.class.php | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/lib/database/sfMySQLiDatabase.class.php b/lib/database/sfMySQLiDatabase.class.php
index bdc8be447..cb13c1edc 100644
--- a/lib/database/sfMySQLiDatabase.class.php
+++ b/lib/database/sfMySQLiDatabase.class.php
@@ -18,6 +18,18 @@
 class sfMySQLiDatabase extends sfMySQLDatabase
 {
 
+  /**
+   * @return void
+   * @throws sfDatabaseException
+   */
+  public function connect()
+  {
+    // PHP 8.1 Activate Exception per default, revert behavior to "return false"
+    mysqli_report(MYSQLI_REPORT_OFF);
+
+    parent::connect();
+  }
+
   /**
    * Returns the appropriate connect method.
    *
@@ -29,9 +41,6 @@ class sfMySQLiDatabase extends sfMySQLDatabase
    */
   protected function getConnectMethod($persistent)
   {
-    // PHP 8.1 Activate Exception per default, revert behavior to "return false"
-    mysqli_report(MYSQLI_REPORT_OFF);
-
     return 'mysqli_connect';
   }
 

From 3bb8339eb0e7401f2ed3fed9de861b4b2ebd8064 Mon Sep 17 00:00:00 2001
From: Paulo Magalhaes <mentalstring@gmail.com>
Date: Fri, 12 Aug 2022 22:37:57 +0100
Subject: [PATCH 56/78] PHP 8.1 > remove full_path from uploads added on PHP
 v8.1

---
 lib/request/sfWebRequest.class.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/request/sfWebRequest.class.php b/lib/request/sfWebRequest.class.php
index bf35cbcb4..cf7549fad 100644
--- a/lib/request/sfWebRequest.class.php
+++ b/lib/request/sfWebRequest.class.php
@@ -872,6 +872,9 @@ static public function convertFileInformation(array $taintedFiles)
    */
   static protected function fixPhpFilesArray(array $data)
   {
+    // remove full_path added on php8.1
+    unset($data['full_path']);
+
     $fileKeys = array('error', 'name', 'size', 'tmp_name', 'type');
     $keys = array_keys($data);
     sort($keys);

From 77983281163bcab2969dbbf33ee5e2ee8bc86671 Mon Sep 17 00:00:00 2001
From: Paulo Magalhaes <mentalstring@gmail.com>
Date: Fri, 12 Aug 2022 23:40:02 +0200
Subject: [PATCH 57/78] Fix use of null on string parameter on multiple classes

---
 lib/generator/sfModelGenerator.class.php | 2 +-
 lib/util/sfBrowserBase.class.php         | 2 +-
 lib/view/sfViewCacheManager.class.php    | 4 ++--
 test/unit/sfNoRouting.class.php          | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/generator/sfModelGenerator.class.php b/lib/generator/sfModelGenerator.class.php
index b52a2570a..e84a7e1fc 100644
--- a/lib/generator/sfModelGenerator.class.php
+++ b/lib/generator/sfModelGenerator.class.php
@@ -273,7 +273,7 @@ public function renderField($field)
     }
     else if ('Date' == $field->getType())
     {
-      $html = sprintf("false !== strtotime($html) ? format_date(%s, \"%s\") : '&nbsp;'", $html, $field->getConfig('date_format', 'f'));
+      $html = sprintf("is_string($html) && false !== strtotime($html) ? format_date(%s, \"%s\") : '&nbsp;'", $html, $field->getConfig('date_format', 'f'));
     }
     else if ('Boolean' == $field->getType())
     {
diff --git a/lib/util/sfBrowserBase.class.php b/lib/util/sfBrowserBase.class.php
index 535d8ac45..4267bb0a9 100755
--- a/lib/util/sfBrowserBase.class.php
+++ b/lib/util/sfBrowserBase.class.php
@@ -911,7 +911,7 @@ public function doClickElement(DOMElement $item, $arguments = array(), $options
     }
     else
     {
-      $queryString = is_array($arguments) ? http_build_query($arguments, null, '&') : '';
+      $queryString = is_array($arguments) ? http_build_query($arguments, '', '&') : '';
       $sep = false === strpos($url, '?') ? '?' : '&';
 
       return array($url.($queryString ? $sep.$queryString : ''), 'get', array());
diff --git a/lib/view/sfViewCacheManager.class.php b/lib/view/sfViewCacheManager.class.php
index f055e50f1..70198e10f 100644
--- a/lib/view/sfViewCacheManager.class.php
+++ b/lib/view/sfViewCacheManager.class.php
@@ -1005,8 +1005,8 @@ public function getCurrentCacheKey()
 
     if ($getParameters = $this->request->getGetParameters())
     {
-      $cacheKey .= false === strpos($cacheKey, '?') ? '?' : '&';
-      $cacheKey .= http_build_query($getParameters, null, '&');
+      $cacheKey .= false === strpos((string) $cacheKey, '?') ? '?' : '&';
+      $cacheKey .= http_build_query($getParameters, '', '&');
     }
 
     return $cacheKey;
diff --git a/test/unit/sfNoRouting.class.php b/test/unit/sfNoRouting.class.php
index 2899cccb0..fc13704c4 100644
--- a/test/unit/sfNoRouting.class.php
+++ b/test/unit/sfNoRouting.class.php
@@ -29,7 +29,7 @@ public function getCurrentInternalUri($with_route_name = false)
     // other parameters
     unset($parameters['module'], $parameters['action']);
     ksort($parameters);
-    $parameters = count($parameters) ? '?'.http_build_query($parameters, null, '&') : '';
+    $parameters = count($parameters) ? '?'.http_build_query($parameters, '', '&') : '';
 
     return sprintf('%s%s', $action, $parameters);
   }
@@ -49,7 +49,7 @@ public function generate($name, $params = array(), $absolute = false)
       unset($parameters['action']);
     }
 
-    $parameters = http_build_query($parameters, null, '&');
+    $parameters = http_build_query($parameters, '', '&');
 
     return $this->fixGeneratedUrl('/'.($parameters ? '?'.$parameters : ''), $absolute);
   }

From 1e9b188eeccb5185d70e49d5737fd408ef79e6e8 Mon Sep 17 00:00:00 2001
From: thePanz <thepanz@gmail.com>
Date: Fri, 25 Nov 2022 16:34:43 +0100
Subject: [PATCH 58/78] Github Actions: enable testing on PHP v8.0 and v8.1
 (for PRs too)

---
 .github/workflows/continuous-integration.yml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 13d1bdfa7..78e07a5d0 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -1,6 +1,10 @@
 name: "Continuous Integration"
 
-on: [push]
+on:
+    push:
+      branches:
+        - master
+    pull_request:
 
 env:
     fail-fast: true
@@ -14,8 +18,8 @@ jobs:
             matrix:
                 php-version:
                     - "7.4"
-                    # - "8.0"
-                    # - "8.1"
+                    - "8.0"
+                    - "8.1"
                 memcached-version:
                     - "1.6"
 

From fa161a1e93e8ec52064d7023861727d5a8168c46 Mon Sep 17 00:00:00 2001
From: "Thomas A. Hirsch" <thomas.hirsch@vema-eg.de>
Date: Tue, 13 Dec 2022 19:52:34 +0100
Subject: [PATCH 59/78] test environment for php 8.2

---
 .docker/{php74_81 => php74_82}/Dockerfile    |  0
 .github/workflows/continuous-integration.yml |  1 +
 docker-compose.yml                           | 15 ++++++++++++---
 3 files changed, 13 insertions(+), 3 deletions(-)
 rename .docker/{php74_81 => php74_82}/Dockerfile (100%)

diff --git a/.docker/php74_81/Dockerfile b/.docker/php74_82/Dockerfile
similarity index 100%
rename from .docker/php74_81/Dockerfile
rename to .docker/php74_82/Dockerfile
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 78e07a5d0..b27f75493 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -20,6 +20,7 @@ jobs:
                     - "7.4"
                     - "8.0"
                     - "8.1"
+                    - "8.2"
                 memcached-version:
                     - "1.6"
 
diff --git a/docker-compose.yml b/docker-compose.yml
index b18e91032..373560b09 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -129,7 +129,7 @@ services:
   php74:
     <<: *services_php54
     build:
-      context: .docker/php74_81
+      context: .docker/php74_82
       args:
         PHP_VERSION: '7.4'
         MEMCACHE_VERSION: '4.0.5.2'
@@ -139,7 +139,7 @@ services:
   php80:
     <<: *services_php54
     build:
-      context: .docker/php74_81
+      context: .docker/php74_82
       args:
         PHP_VERSION: '8.0'
         MEMCACHE_VERSION: '8.0'
@@ -149,12 +149,21 @@ services:
   php81:
     <<: *services_php54
     build:
-      context: .docker/php74_81
+      context: .docker/php74_82
       args:
         PHP_VERSION: '8.1'
         MEMCACHE_VERSION: '8.0'
         APCU_VERSION: ''
 
+  php82:
+    <<: *services_php54
+    build:
+      context: .docker/php74_82
+      args:
+        PHP_VERSION: '8.2'
+        MEMCACHE_VERSION: '8.0'
+        APCU_VERSION: ''
+
 
   db:
     image: mysql:5.5.62

From f6d779cc48d2295722366209dcaf4f956ad55ec9 Mon Sep 17 00:00:00 2001
From: "Thomas A. Hirsch" <thomas.hirsch@vema-eg.de>
Date: Tue, 13 Dec 2022 19:54:03 +0100
Subject: [PATCH 60/78] PHP 8.2 > Using ${var} in strings is deprecated, use
 {$var} instead.

---
 lib/command/sfAnsiColorFormatter.class.php | 2 +-
 lib/task/help/sfHelpTask.class.php         | 2 +-
 lib/task/help/sfListTask.class.php         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/command/sfAnsiColorFormatter.class.php b/lib/command/sfAnsiColorFormatter.class.php
index 904da78b2..2f6c29e14 100644
--- a/lib/command/sfAnsiColorFormatter.class.php
+++ b/lib/command/sfAnsiColorFormatter.class.php
@@ -100,7 +100,7 @@ public function formatSection($section, $text, $size = null, $style = 'INFO')
     $style = array_key_exists($style, $this->styles) ? $style : 'INFO';
     $width = 9 + strlen($this->format('', $style));
 
-    return sprintf(">> %-${width}s %s", $this->format($section, $style), $this->excerpt($text, $size - 4 - (strlen($section) > 9 ? strlen($section) : 9)));
+    return sprintf(">> %-{$width}s %s", $this->format($section, $style), $this->excerpt($text, $size - 4 - (strlen($section) > 9 ? strlen($section) : 9)));
   }
 
   /**
diff --git a/lib/task/help/sfHelpTask.class.php b/lib/task/help/sfHelpTask.class.php
index 1f4ac9e21..b386bd3f7 100644
--- a/lib/task/help/sfHelpTask.class.php
+++ b/lib/task/help/sfHelpTask.class.php
@@ -96,7 +96,7 @@ protected function outputAsText(sfTask $task)
       foreach ($task->getArguments() as $argument)
       {
         $default = null !== $argument->getDefault() && (!is_array($argument->getDefault()) || count($argument->getDefault())) ? $this->formatter->format(sprintf(' (default: %s)', is_array($argument->getDefault()) ? str_replace("\n", '', print_r($argument->getDefault(), true)): $argument->getDefault()), 'COMMENT') : '';
-        $messages[] = sprintf(" %-${max}s %s%s", $this->formatter->format($argument->getName(), 'INFO'), $argument->getHelp(), $default);
+        $messages[] = sprintf(" %-{$max}s %s%s", $this->formatter->format($argument->getName(), 'INFO'), $argument->getHelp(), $default);
       }
 
       $messages[] = '';
diff --git a/lib/task/help/sfListTask.class.php b/lib/task/help/sfListTask.class.php
index c167ae807..38354c33f 100644
--- a/lib/task/help/sfListTask.class.php
+++ b/lib/task/help/sfListTask.class.php
@@ -120,7 +120,7 @@ protected function outputAsText($namespace, $tasks)
 
       $aliases = $task->getAliases() ? $this->formatter->format(' ('.implode(', ', $task->getAliases()).')', 'COMMENT') : '';
 
-      $messages[] = sprintf("  %-${width}s %s%s", $this->formatter->format(':'.$task->getName(), 'INFO'), $task->getBriefDescription(), $aliases);
+      $messages[] = sprintf("  %-{$width}s %s%s", $this->formatter->format(':'.$task->getName(), 'INFO'), $task->getBriefDescription(), $aliases);
     }
 
     $this->log($messages);

From d89618fc27b3efa2a758a10a9f3ffd312300f583 Mon Sep 17 00:00:00 2001
From: "Thomas A. Hirsch" <thomas.hirsch@vema-eg.de>
Date: Tue, 13 Dec 2022 19:57:10 +0100
Subject: [PATCH 61/78] PHP 8.2 > Creation of dynamic property Class::$property
 is deprecated

---
 .../lib/database/sfDoctrineConnectionListener.class.php    | 4 ++++
 lib/routing/sfRoute.class.php                              | 7 +++----
 lib/task/sfBaseTask.class.php                              | 4 +++-
 lib/util/sfBrowser.class.php                               | 3 ++-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionListener.class.php b/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionListener.class.php
index ad39b2aae..5129020ad 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionListener.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionListener.class.php
@@ -20,6 +20,10 @@
  */
 class sfDoctrineConnectionListener extends Doctrine_EventListener
 {
+  protected
+    $connection,
+    $encoding;
+
   public function __construct($connection, $encoding)
   {
     $this->connection = $connection;
diff --git a/lib/routing/sfRoute.class.php b/lib/routing/sfRoute.class.php
index fd2ac0319..f8a6ea7a5 100644
--- a/lib/routing/sfRoute.class.php
+++ b/lib/routing/sfRoute.class.php
@@ -15,9 +15,6 @@
  * @subpackage routing
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @version    SVN: $Id$
- *
- * @property $firstOptional int
- * @property $segments array
  */
 class sfRoute implements Serializable
 {
@@ -37,7 +34,9 @@ class sfRoute implements Serializable
     $defaults          = array(),
     $requirements      = array(),
     $tokens            = array(),
-    $customToken       = false;
+    $customToken       = false,
+    $firstOptional     = null,
+    $segments          = array();
 
   /**
    * Constructor.
diff --git a/lib/task/sfBaseTask.class.php b/lib/task/sfBaseTask.class.php
index 564a0be6c..247576054 100644
--- a/lib/task/sfBaseTask.class.php
+++ b/lib/task/sfBaseTask.class.php
@@ -21,7 +21,9 @@ abstract class sfBaseTask extends sfCommandApplicationTask
   protected
     $configuration   = null,
     $pluginManager   = null,
-    $statusStartTime = null;
+    $statusStartTime = null,
+    $filesystem      = null,
+    $tokens          = array();
 
   /**
    * @see sfTask
diff --git a/lib/util/sfBrowser.class.php b/lib/util/sfBrowser.class.php
index ad45e1225..ec13e4460 100644
--- a/lib/util/sfBrowser.class.php
+++ b/lib/util/sfBrowser.class.php
@@ -21,7 +21,8 @@ class sfBrowser extends sfBrowserBase
   protected
     $listeners        = array(),
     $context          = null,
-    $currentException = null;
+    $currentException = null,
+    $rawConfiguration = array();
 
   /**
    * Calls a request to a uri.

From 89c24cf5cc518f13193b8940b40ccb5ed906fb9a Mon Sep 17 00:00:00 2001
From: "Thomas A. Hirsch" <thomas.hirsch@vema-eg.de>
Date: Tue, 13 Dec 2022 20:03:00 +0100
Subject: [PATCH 62/78] PHP 8.0 > Uncaught ArgumentCountError: Too few
 arguments to function

---
 lib/task/project/sfProjectPermissionsTask.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/task/project/sfProjectPermissionsTask.class.php b/lib/task/project/sfProjectPermissionsTask.class.php
index 72b3b7620..c5b5d9b0c 100644
--- a/lib/task/project/sfProjectPermissionsTask.class.php
+++ b/lib/task/project/sfProjectPermissionsTask.class.php
@@ -112,7 +112,7 @@ protected function chmod($file, $mode, $umask = 0000)
    *
    * @see http://www.php.net/set_error_handler
    */
-  public function handleError($no, $string, $file, $line, $context)
+  public function handleError($no, $string, $file, $line, $context = null)
   {
     $this->failed[] = $this->current;
   }

From 754c940232355aaed6f96f3d4bfb316a092d6294 Mon Sep 17 00:00:00 2001
From: "Thomas A. Hirsch" <thomas.hirsch@vema-eg.de>
Date: Tue, 13 Dec 2022 20:09:26 +0100
Subject: [PATCH 63/78] PHP 8.0 > Trying to access array offset on value of
 type bool

---
 lib/yaml/sfYamlInline.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/yaml/sfYamlInline.class.php b/lib/yaml/sfYamlInline.class.php
index 840f3fa7a..0957595ac 100644
--- a/lib/yaml/sfYamlInline.class.php
+++ b/lib/yaml/sfYamlInline.class.php
@@ -168,7 +168,7 @@ static protected function dumpArray($value)
    */
   static public function parseScalar($scalar, $delimiters = null, $stringDelimiters = array('"', "'"), &$i = 0, $evaluate = true)
   {
-    if (in_array($scalar[$i], $stringDelimiters))
+    if (is_string($scalar) && in_array($scalar[$i], $stringDelimiters))
     {
       // quoted scalar
       $output = self::parseQuotedScalar($scalar, $i);

From 13bfee2aa0bc140870159274ad5a7f2d42aa6115 Mon Sep 17 00:00:00 2001
From: "Thomas A. Hirsch" <thomas.hirsch@vema-eg.de>
Date: Tue, 13 Dec 2022 20:10:13 +0100
Subject: [PATCH 64/78] PHP 8.0 > Passing null to parameter #1 ($haystack) of
 type string is deprecated

---
 lib/yaml/sfYamlInline.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/yaml/sfYamlInline.class.php b/lib/yaml/sfYamlInline.class.php
index 0957595ac..97d8c5b03 100644
--- a/lib/yaml/sfYamlInline.class.php
+++ b/lib/yaml/sfYamlInline.class.php
@@ -272,7 +272,7 @@ static protected function parseSequence($sequence, &$i = 0)
           $isQuoted = in_array($sequence[$i], array('"', "'"));
           $value = self::parseScalar($sequence, array(',', ']'), array('"', "'"), $i);
 
-          if (!$isQuoted && false !== strpos($value, ': '))
+          if (!$isQuoted && false !== strpos((string) $value, ': '))
           {
             // embedded mapping?
             try

From 5d94af72bf06686fc92c0b3139d49893846689a7 Mon Sep 17 00:00:00 2001
From: "Thomas A. Hirsch" <thomas.hirsch@vema-eg.de>
Date: Tue, 13 Dec 2022 13:15:52 +0100
Subject: [PATCH 65/78] set symfony version to 1.5.15-dev

---
 lib/autoload/sfCoreAutoload.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/autoload/sfCoreAutoload.class.php b/lib/autoload/sfCoreAutoload.class.php
index 5e1604f79..00f558f8e 100755
--- a/lib/autoload/sfCoreAutoload.class.php
+++ b/lib/autoload/sfCoreAutoload.class.php
@@ -11,7 +11,7 @@
 /**
  * The current symfony version.
  */
-define('SYMFONY_VERSION', '1.5.14-dev');
+define('SYMFONY_VERSION', '1.5.15-dev');
 
 /**
  * sfCoreAutoload class.

From 4820ada503deb3ee0e2257c8e95d668770e6dbac Mon Sep 17 00:00:00 2001
From: "Thomas A. Hirsch" <thomas.hirsch@vema-eg.de>
Date: Tue, 13 Dec 2022 13:25:38 +0100
Subject: [PATCH 66/78] PHP 8.0 > Class name must be a valid object or a string
 in case the controller does not exist.

---
 lib/controller/sfController.class.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/controller/sfController.class.php b/lib/controller/sfController.class.php
index 1d1deec76..6b69b857d 100644
--- a/lib/controller/sfController.class.php
+++ b/lib/controller/sfController.class.php
@@ -299,7 +299,10 @@ protected function getController($moduleName, $controllerName, $extension)
     $classSuffix = ucfirst(strtolower($extension));
     if (!isset($this->controllerClasses[$moduleName.'_'.$controllerName.'_'.$classSuffix]))
     {
-      $this->controllerExists($moduleName, $controllerName, $extension, true);
+      if (!$this->controllerExists($moduleName, $controllerName, $extension, true))
+      {
+        return null;
+      }
     }
 
     $class = $this->controllerClasses[$moduleName.'_'.$controllerName.'_'.$classSuffix];

From c55d53c0055f70e6ea109e9ddc7bc498d3d66a29 Mon Sep 17 00:00:00 2001
From: "Thomas A. Hirsch" <thomas.hirsch@vema-eg.de>
Date: Tue, 13 Dec 2022 13:26:17 +0100
Subject: [PATCH 67/78] PHP 8.0 > Fix undefined array key

---
 lib/escaper/sfOutputEscaperArrayDecorator.class.php | 3 ++-
 lib/response/sfWebResponse.class.php                | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/escaper/sfOutputEscaperArrayDecorator.class.php b/lib/escaper/sfOutputEscaperArrayDecorator.class.php
index 6b87a4322..5cc37aaf6 100644
--- a/lib/escaper/sfOutputEscaperArrayDecorator.class.php
+++ b/lib/escaper/sfOutputEscaperArrayDecorator.class.php
@@ -124,7 +124,8 @@ public function offsetExists($offset)
   #[\ReturnTypeWillChange]
   public function offsetGet($offset)
   {
-    return sfOutputEscaper::escape($this->escapingMethod, $this->value[$offset]);
+    $value = isset($this->value[$offset]) ? $this->value[$offset] : null;
+    return sfOutputEscaper::escape($this->escapingMethod, $value);
   }
 
   /**
diff --git a/lib/response/sfWebResponse.class.php b/lib/response/sfWebResponse.class.php
index af69e38e2..3bdc87639 100644
--- a/lib/response/sfWebResponse.class.php
+++ b/lib/response/sfWebResponse.class.php
@@ -365,7 +365,8 @@ public function sendHttpHeaders()
     // cookies
     foreach ($this->cookies as $cookie)
     {
-      setrawcookie($cookie['name'], $cookie['value'], $cookie['expire'], $cookie['path'], $cookie['domain'], $cookie['secure'], $cookie['httpOnly']);
+      $expire = isset($cookie['expire']) ? $cookie['expire'] : 0;
+      setrawcookie($cookie['name'], $cookie['value'], $expire, $cookie['path'], $cookie['domain'], $cookie['secure'], $cookie['httpOnly']);
 
       if ($this->options['logging'])
       {

From 8b81a568e1efaebe3455974ef17a0c0a2c4b7e7b Mon Sep 17 00:00:00 2001
From: "Thomas A. Hirsch" <thomas.hirsch@vema-eg.de>
Date: Tue, 13 Dec 2022 13:27:15 +0100
Subject: [PATCH 68/78] PHP 8.1 > Fix some more null on string parameter

---
 lib/config/sfViewConfigHandler.class.php | 2 +-
 lib/request/sfWebRequest.class.php       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/config/sfViewConfigHandler.class.php b/lib/config/sfViewConfigHandler.class.php
index f3b681bb0..8068fd57c 100644
--- a/lib/config/sfViewConfigHandler.class.php
+++ b/lib/config/sfViewConfigHandler.class.php
@@ -223,7 +223,7 @@ protected function addHtmlHead($viewName = '')
 
     foreach ($this->mergeConfigValue('metas', $viewName) as $name => $content)
     {
-      $data[] = sprintf("  \$response->addMeta('%s', '%s', false, false);", $name, str_replace('\'', '\\\'', preg_replace('/&amp;(?=\w+;)/', '&', htmlspecialchars($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";
diff --git a/lib/request/sfWebRequest.class.php b/lib/request/sfWebRequest.class.php
index cf7549fad..99f8616e3 100644
--- a/lib/request/sfWebRequest.class.php
+++ b/lib/request/sfWebRequest.class.php
@@ -192,7 +192,7 @@ public function getContentType($trim = true)
   {
     $contentType = $this->getHttpHeader('Content-Type', null);
 
-    if ($trim && false !== $pos = strpos($contentType, ';'))
+    if ($trim && false !== $pos = strpos((string) $contentType, ';'))
     {
       $contentType = substr($contentType, 0, $pos);
     }

From e432434991623b076cb87d0d9a31d2e08f5ab4cd Mon Sep 17 00:00:00 2001
From: "Thomas A. Hirsch" <thomas.hirsch@vema-eg.de>
Date: Tue, 10 Jan 2023 15:37:40 +0100
Subject: [PATCH 69/78] Prepared release 1.5.15

---
 CHANGELOG.md                          | 18 ++++++++++++++++++
 README.md                             |  2 +-
 lib/autoload/sfCoreAutoload.class.php |  2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33855aef2..432f8669a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,24 @@
 CHANGELOG
 =========
 
+??/01/2023: Version 1.5.15
+--------------------------
+
+* Add support for PHP 8.2 by @thirsch in #274
+* More adjustments for PHP 8.0 & 8.1 by @thirsch in #272
+
+25/11/2022: Version 1.5.14
+--------------------------
+
+* Update composer.json to automatically remove lexpress/symfony1 package by @spirit-q2 in #241
+* Updated lexpress to fos1 in the submodules. by @thirsch in #238
+* Compat for Swiftmailer 6 but preserve compatibility with Swiftmailer 5. by @thirsch in #240
+* Update PHPDoc for `sfWebController::redirect()` func by @cmdeviant in #246
+* Fixing Issue #234 by @pathumhdes in #235
+* Add consistent local environment for testing with docker and docker-compose by @alquerci in #262
+* Use GitHub actions for Continuous Integration tests by @thePanz in #268
+* Add support for PHP 8.0 & 8.1 by @Tybaze in #266
+
 08/06/2020: Version 1.5.13
 --------------------------
 
diff --git a/README.md b/README.md
index e5147ca4d..4b285a0b0 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ All the enhancements and BC breaks are listed in the [WHATS_NEW](https://github.
 
 - [DIC](https://github.com/FriendsOfSymfony1/symfony1/wiki/ServiceContainer)
 - Composer support
-- PHP 8.1 support
+- PHP 8.2 support
 - performance boost
 - new widgets & validators
 - some tickets fixed from the symfony trac
diff --git a/lib/autoload/sfCoreAutoload.class.php b/lib/autoload/sfCoreAutoload.class.php
index 00f558f8e..a8f15264c 100755
--- a/lib/autoload/sfCoreAutoload.class.php
+++ b/lib/autoload/sfCoreAutoload.class.php
@@ -11,7 +11,7 @@
 /**
  * The current symfony version.
  */
-define('SYMFONY_VERSION', '1.5.15-dev');
+define('SYMFONY_VERSION', '1.5.15');
 
 /**
  * sfCoreAutoload class.

From 9945f3f27cdc5aac36f5e8c60485e5c9d5df86f2 Mon Sep 17 00:00:00 2001
From: thePanz <thepanz@gmail.com>
Date: Thu, 12 Jan 2023 14:07:07 +0100
Subject: [PATCH 70/78] Add(changelog) Add v1.5.15 release date to Changelog
 file

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 432f8669a..48eafda6f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 CHANGELOG
 =========
 
-??/01/2023: Version 1.5.15
+12/01/2023: Version 1.5.15
 --------------------------
 
 * Add support for PHP 8.2 by @thirsch in #274

From 31d2c602a51e6c43c4370791f6c96c7ee1fefff2 Mon Sep 17 00:00:00 2001
From: thePanz <thepanz@gmail.com>
Date: Thu, 12 Jan 2023 14:15:04 +0100
Subject: [PATCH 71/78] Add(versioning) Add v1.5.16-dev as next release

---
 CHANGELOG.md                          | 4 ++++
 lib/autoload/sfCoreAutoload.class.php | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48eafda6f..656732e6d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 CHANGELOG
 =========
 
+xx/xx/xxxx: Version 1.5.16
+--------------------------
+
+
 12/01/2023: Version 1.5.15
 --------------------------
 
diff --git a/lib/autoload/sfCoreAutoload.class.php b/lib/autoload/sfCoreAutoload.class.php
index a8f15264c..ff6dfce1b 100755
--- a/lib/autoload/sfCoreAutoload.class.php
+++ b/lib/autoload/sfCoreAutoload.class.php
@@ -11,7 +11,7 @@
 /**
  * The current symfony version.
  */
-define('SYMFONY_VERSION', '1.5.15');
+define('SYMFONY_VERSION', '1.5.16-dev');
 
 /**
  * sfCoreAutoload class.

From 2c5a4d625d1853cb207dfbb73817505831874371 Mon Sep 17 00:00:00 2001
From: Emanuele Panzeri <thepanz@gmail.com>
Date: Fri, 13 Jan 2023 15:02:03 +0100
Subject: [PATCH 72/78] Fix(deprecations) Fix deprecations in
 sfMessageSource_Aggregate (#277)

* Fix(deprecations) Fix deprecations in sfMessageSource_Aggregate, add return types from implemented sfIMessageSource
---
 CHANGELOG.md                                 |  1 +
 lib/i18n/sfMessageSource_Aggregate.class.php | 69 +++++++++++++++++++-
 2 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 656732e6d..20c65db4f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 CHANGELOG
 =========
 
+=======
 xx/xx/xxxx: Version 1.5.16
 --------------------------
 
diff --git a/lib/i18n/sfMessageSource_Aggregate.class.php b/lib/i18n/sfMessageSource_Aggregate.class.php
index 14c89aeea..3270f76d9 100644
--- a/lib/i18n/sfMessageSource_Aggregate.class.php
+++ b/lib/i18n/sfMessageSource_Aggregate.class.php
@@ -18,8 +18,7 @@
  */
 class sfMessageSource_Aggregate extends sfMessageSource
 {
-  protected
-    $messageSources = array();
+  protected $messageSources = array();
 
   /**
    * Constructor.
@@ -46,6 +45,12 @@ public function setCulture($culture)
     }
   }
 
+  /**
+   * Gets the last modified unix-time for this particular catalogue+variant.
+   *
+   * @param string $source catalogue+variant
+   * @return int last modified in unix-time format.
+   */
   protected function getLastModified($sources)
   {
     $lastModified = time();
@@ -60,6 +65,12 @@ protected function getLastModified($sources)
     return $lastModified;
   }
 
+  /**
+   * Determines if the source is valid.
+   *
+   * @param string $source catalogue+variant
+   * @return boolean true if valid, false otherwise.
+   */
   public function isValidSource($sources)
   {
     foreach ($sources as $source)
@@ -75,6 +86,12 @@ public function isValidSource($sources)
     return false;
   }
 
+  /**
+   * Gets the source, this could be a filename or database ID.
+   *
+   * @param string $variant catalogue+variant
+   * @return string the resource key
+   */
   public function getSource($variant)
   {
     $sources = array();
@@ -86,6 +103,12 @@ public function getSource($variant)
     return $sources;
   }
 
+  /**
+   * Loads the message for a particular catalogue+variant.
+   * This methods needs to implemented by subclasses.
+   *
+   * @return array of translation messages.
+   */
   public function &loadData($sources)
   {
     $messages = array();
@@ -106,6 +129,13 @@ public function &loadData($sources)
     return $messages;
   }
 
+  /**
+   * Gets all the variants of a particular catalogue.
+   * This method must be implemented by subclasses.
+   *
+   * @param string $catalogue catalogue name
+   * @return array list of all variants for this catalogue.
+   */
   public function getCatalogueList($catalogue)
   {
     $variants = array();
@@ -120,6 +150,12 @@ public function getCatalogueList($catalogue)
     return $variants;
   }
 
+  /**
+   * Adds a untranslated message to the source. Need to call save()
+   * to save the messages to source.
+   *
+   * @param string $message message to add
+   */
   public function append($message)
   {
     // Append to the first message source only
@@ -129,6 +165,15 @@ public function append($message)
     }
   }
 
+  /**
+   * Updates the translation.
+   *
+   * @param string $text      the source string.
+   * @param string $target    the new translation string.
+   * @param string $comments  comments
+   * @param string $catalogue the catalogue of the translation.
+   * @return boolean true if translation was updated, false otherwise.
+   */
   public function update($text, $target, $comments, $catalogue = 'messages')
   {
     // Only update one message source
@@ -143,6 +188,13 @@ public function update($text, $target, $comments, $catalogue = 'messages')
     return false;
   }
 
+  /**
+   * Deletes a particular message from the specified catalogue.
+   *
+   * @param string $message   the source message to delete.
+   * @param string $catalogue the catalogue to delete from.
+   * @return boolean true if deleted, false otherwise.
+   */
   public function delete($message, $catalogue = 'messages')
   {
     $retval = false;
@@ -157,6 +209,14 @@ public function delete($message, $catalogue = 'messages')
     return $retval;
   }
 
+  /**
+   * Saves the list of untranslated blocks to the translation source.
+   * If the translation was not found, you should add those
+   * strings to the translation source via the <b>append()</b> method.
+   *
+   * @param string $catalogue the catalogue to add to
+   * @return boolean true if saved successfuly, false otherwise.
+   */
   public function save($catalogue = 'messages')
   {
     $retval = false;
@@ -182,6 +242,11 @@ public function getId()
     return md5($id);
   }
 
+  /**
+   * Returns a list of catalogue as key and all it variants as value.
+   *
+   * @return array list of catalogues
+   */
   public function catalogues()
   {
     throw new sfException('The "catalogues()" method is not implemented for this message source.');

From ffbbce6eff0f0f92397c85eb66f255e877def2cc Mon Sep 17 00:00:00 2001
From: Karoly Gossler <connor@connor.hu>
Date: Tue, 10 Jan 2023 17:59:53 +0100
Subject: [PATCH 73/78] Add(linting) Add code linting to GitHub workflow, use
 php-cs-fixer

---
 .github/workflows/lint.yml | 31 +++++++++++++++++++++++++++++++
 .gitignore                 |  1 +
 .php-cs-fixer.dist.php     | 29 +++++++++++++++++++++++++++++
 3 files changed, 61 insertions(+)
 create mode 100644 .github/workflows/lint.yml
 create mode 100644 .php-cs-fixer.dist.php

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
new file mode 100644
index 000000000..3f797cef8
--- /dev/null
+++ b/.github/workflows/lint.yml
@@ -0,0 +1,31 @@
+name: "Code Linting"
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  php-cs-fixer:
+    name: 'PHP-CS-Fixer'
+    runs-on: 'ubuntu-latest'
+    steps:
+      - uses: 'actions/checkout@v3'
+
+      - name: 'Setup PHP'
+        uses: 'shivammathur/setup-php@v2'
+        with:
+          php-version: '8.1'
+          tools: php-cs-fixer, cs2pr
+
+      - uses: 'actions/cache@v3'
+        with:
+          path: '.php-cs-fixer.cache'
+          key: '${{ github.repository }}-8.1-phpcsfixer-${{ github.ref_name }}'
+          restore-keys: |
+            ${{ github.repository }}-8.1-phpcsfixer-main
+            ${{ github.repository }}-8.1-phpcsfixer-
+
+      - name: 'Run PHP-CS-Fixer'
+        # Using cs2pr settings, see: https://github.com/shivammathur/setup-php#tools-with-checkstyle-support
+        run: 'php-cs-fixer fix --dry-run --format checkstyle | cs2pr'
diff --git a/.gitignore b/.gitignore
index ebc31dcea..3c17d4767 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 lib/plugins/sfDoctrinePlugin/test/functional/fixtures/log/
 /vendor
 /composer.lock
+.php-cs-fixer.cache
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
new file mode 100644
index 000000000..f5e11f987
--- /dev/null
+++ b/.php-cs-fixer.dist.php
@@ -0,0 +1,29 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->ignoreVCSIgnored(true)
+    ->in(__DIR__.'/lib')
+    ->in(__DIR__.'/data/bin')
+    ->in(__DIR__.'/test')
+    ->append(array(__FILE__))
+    // Exclude PHP classes templates/generators, which are not valid PHP files
+    ->exclude('task/generator/skeleton/')
+    ->exclude('plugins/sfDoctrinePlugin/data/generator/')
+    // Exclude generated files (single files)
+    ->notPath('unit/config/fixtures/sfDefineEnvironmentConfigHandler/prefix_result.php')
+    ->notPath('unit/config/fixtures/sfFilterConfigHandler/result.php')
+;
+
+$config = new PhpCsFixer\Config();
+$config->setRules(array(
+    '@PhpCsFixer' => true,
+    '@Symfony' => true,
+    'array_syntax' => array(
+        'syntax' => 'long',
+    ),
+))
+    ->setCacheFile('.php-cs-fixer.cache')
+    ->setFinder($finder)
+;
+
+return $config;

From 2cbd557118d92e0d5517129aab24f29fe0b86c2e Mon Sep 17 00:00:00 2001
From: thePanz <thepanz@gmail.com>
Date: Mon, 20 Feb 2023 22:53:56 +0100
Subject: [PATCH 74/78] Fix(php-cs) Fix php-cs styles according to
 configuration

---
 .editorconfig                                 |    2 +-
 data/bin/changelog.php                        |   31 +-
 data/bin/check_configuration.php              |   77 +-
 data/bin/release.php                          |   90 +-
 data/bin/sandbox_installer.php                |   14 +-
 lib/action/sfAction.class.php                 |  953 +++---
 lib/action/sfActionStack.class.php            |  169 +-
 lib/action/sfActionStackEntry.class.php       |  134 +-
 lib/action/sfActions.class.php                |   72 +-
 lib/action/sfComponent.class.php              |  805 ++---
 lib/action/sfComponents.class.php             |   27 +-
 lib/addon/sfData.class.php                    |  180 +-
 lib/addon/sfPager.class.php                   | 1147 ++++---
 lib/autoload/sfAutoload.class.php             |  350 +--
 lib/autoload/sfAutoloadAgain.class.php        |  182 +-
 lib/autoload/sfCoreAutoload.class.php         |  972 +++---
 lib/autoload/sfSimpleAutoload.class.php       |  497 ++-
 lib/cache/sfAPCCache.class.php                |  305 +-
 lib/cache/sfCache.class.php                   |  427 ++-
 lib/cache/sfEAcceleratorCache.class.php       |  283 +-
 lib/cache/sfFileCache.class.php               |  531 ++--
 lib/cache/sfFunctionCache.class.php           |  158 +-
 lib/cache/sfMemcacheCache.class.php           |  465 ++-
 lib/cache/sfNoCache.class.php                 |  131 +-
 lib/cache/sfSQLiteCache.class.php             |  507 ++--
 lib/cache/sfXCacheCache.class.php             |  323 +-
 lib/command/cli.php                           |   46 +-
 lib/command/sfAnsiColorFormatter.class.php    |  179 +-
 lib/command/sfCommandApplication.class.php    | 1161 ++++---
 lib/command/sfCommandArgument.class.php       |  192 +-
 lib/command/sfCommandArgumentSet.class.php    |  265 +-
 .../sfCommandArgumentsException.class.php     |    5 +-
 lib/command/sfCommandException.class.php      |    5 +-
 lib/command/sfCommandLogger.class.php         |   71 +-
 lib/command/sfCommandManager.class.php        |  619 ++--
 lib/command/sfCommandOption.class.php         |  288 +-
 lib/command/sfCommandOptionSet.class.php      |  285 +-
 lib/command/sfFormatter.class.php             |  161 +-
 .../sfSymfonyCommandApplication.class.php     |  216 +-
 .../sfApplicationConfiguration.class.php      | 1131 ++++---
 lib/config/sfAutoloadConfigHandler.class.php  |  273 +-
 lib/config/sfCacheConfigHandler.class.php     |  171 +-
 lib/config/sfCompileConfigHandler.class.php   |  118 +-
 lib/config/sfConfig.class.php                 |  132 +-
 lib/config/sfConfigCache.class.php            |  584 ++--
 lib/config/sfConfigHandler.class.php          |  189 +-
 lib/config/sfDatabaseConfigHandler.class.php  |  209 +-
 ...sfDefineEnvironmentConfigHandler.class.php |  217 +-
 lib/config/sfFactoryConfigHandler.class.php   |  464 +--
 lib/config/sfFilterConfigHandler.class.php    |  315 +-
 lib/config/sfGeneratorConfigHandler.class.php |  118 +-
 lib/config/sfPluginConfiguration.class.php    |  356 ++-
 .../sfPluginConfigurationGeneric.class.php    |   17 +-
 lib/config/sfProjectConfiguration.class.php   | 1059 ++++---
 lib/config/sfRootConfigHandler.class.php      |  155 +-
 lib/config/sfRoutingConfigHandler.class.php   |  168 +-
 lib/config/sfSecurityConfigHandler.class.php  |   72 +-
 lib/config/sfServiceConfigHandler.class.php   |   88 +-
 .../sfSimpleYamlConfigHandler.class.php       |   53 +-
 lib/config/sfViewConfigHandler.class.php      |  504 ++--
 lib/config/sfYamlConfigHandler.class.php      |  226 +-
 .../default/actions/actions.class.php         |   83 +-
 .../default/templates/defaultLayout.php       |   18 +-
 .../default/templates/disabledSuccess.php     |    6 +-
 .../default/templates/error404Success.php     |   10 +-
 .../default/templates/indexSuccess.php        |    6 +-
 .../default/templates/loginSuccess.php        |    6 +-
 .../default/templates/moduleSuccess.php       |   10 +-
 .../default/templates/secureSuccess.php       |    4 +-
 lib/controller/sfController.class.php         |  844 +++---
 lib/controller/sfFrontWebController.class.php |   57 +-
 lib/controller/sfWebController.class.php      |  318 +-
 lib/database/sfDatabase.class.php             |  287 +-
 lib/database/sfDatabaseManager.class.php      |  183 +-
 lib/database/sfMySQLDatabase.class.php        |  154 +-
 lib/database/sfMySQLiDatabase.class.php       |   88 +-
 lib/database/sfPDODatabase.class.php          |  137 +-
 lib/database/sfPostgreSQLDatabase.class.php   |   85 +-
 lib/debug/sfDebug.class.php                   |  414 ++-
 lib/debug/sfTimer.class.php                   |  111 +-
 lib/debug/sfTimerManager.class.php            |   78 +-
 lib/debug/sfWebDebug.class.php                |  421 ++-
 lib/debug/sfWebDebugPanel.class.php           |  327 +-
 lib/debug/sfWebDebugPanelCache.class.php      |   42 +-
 lib/debug/sfWebDebugPanelConfig.class.php     |  102 +-
 lib/debug/sfWebDebugPanelLogs.class.php       |  160 +-
 lib/debug/sfWebDebugPanelMailer.class.php     |  131 +-
 lib/debug/sfWebDebugPanelMemory.class.php     |   25 +-
 .../sfWebDebugPanelSymfonyVersion.class.php   |   23 +-
 lib/debug/sfWebDebugPanelTimer.class.php      |  108 +-
 lib/debug/sfWebDebugPanelView.class.php       |  567 ++--
 lib/escaper/sfOutputEscaper.class.php         |  379 ++-
 .../sfOutputEscaperArrayDecorator.class.php   |  336 +--
 .../sfOutputEscaperGetterDecorator.class.php  |   61 +-
 ...sfOutputEscaperIteratorDecorator.class.php |  254 +-
 .../sfOutputEscaperObjectDecorator.class.php  |  185 +-
 lib/escaper/sfOutputEscaperSafe.class.php     |   95 +-
 lib/event/sfEvent.class.php                   |  285 +-
 lib/event/sfEventDispatcher.class.php         |  221 +-
 lib/exception/data/error.atom.php             |    4 +-
 lib/exception/data/error.css.php              |    2 +-
 lib/exception/data/error.html.php             |   12 +-
 lib/exception/data/error.js.php               |    2 +-
 lib/exception/data/error.json.php             |   12 +-
 lib/exception/data/error.rdf.php              |    4 +-
 lib/exception/data/error.txt.php              |    2 +-
 lib/exception/data/error.xml.php              |    4 +-
 lib/exception/data/exception.atom.php         |    4 +-
 lib/exception/data/exception.css.php          |   12 +-
 lib/exception/data/exception.html.php         |   20 +-
 lib/exception/data/exception.js.php           |   12 +-
 lib/exception/data/exception.json.php         |   22 +-
 lib/exception/data/exception.rdf.php          |    4 +-
 lib/exception/data/exception.txt.php          |   18 +-
 lib/exception/data/exception.xml.php          |   14 +-
 lib/exception/data/unavailable.php            |   12 +-
 lib/exception/sfCacheException.class.php      |    5 +-
 .../sfConfigurationException.class.php        |    5 +-
 lib/exception/sfControllerException.class.php |    5 +-
 lib/exception/sfDatabaseException.class.php   |    5 +-
 lib/exception/sfError404Exception.class.php   |   52 +-
 lib/exception/sfException.class.php           |  747 +++--
 lib/exception/sfFactoryException.class.php    |    5 +-
 lib/exception/sfFileException.class.php       |    5 +-
 lib/exception/sfFilterException.class.php     |    5 +-
 lib/exception/sfForwardException.class.php    |    5 +-
 .../sfInitializationException.class.php       |    5 +-
 lib/exception/sfParseException.class.php      |    5 +-
 lib/exception/sfRenderException.class.php     |    5 +-
 lib/exception/sfSecurityException.class.php   |    5 +-
 lib/exception/sfStopException.class.php       |   17 +-
 lib/exception/sfStorageException.class.php    |    5 +-
 lib/exception/sfViewException.class.php       |    5 +-
 lib/filter/sfBasicSecurityFilter.class.php    |  141 +-
 lib/filter/sfCacheFilter.class.php            |  317 +-
 lib/filter/sfCommonFilter.class.php           |   67 +-
 lib/filter/sfExecutionFilter.class.php        |  252 +-
 lib/filter/sfFilter.class.php                 |  256 +-
 lib/filter/sfFilterChain.class.php            |  108 +-
 lib/filter/sfRenderingFilter.class.php        |   56 +-
 lib/form/addon/sfFormFilter.class.php         |    3 +-
 lib/form/addon/sfFormObject.class.php         |  449 ++-
 lib/form/addon/sfFormSymfony.class.php        |  150 +-
 lib/form/sfForm.class.php                     | 2661 ++++++++---------
 lib/form/sfFormField.class.php                |  536 ++--
 lib/form/sfFormFieldSchema.class.php          |  389 ++-
 lib/generator/sfGenerator.class.php           |  346 ++-
 lib/generator/sfGeneratorManager.class.php    |  170 +-
 lib/generator/sfModelGenerator.class.php      |  724 +++--
 .../sfModelGeneratorConfiguration.class.php   |  881 +++---
 ...ModelGeneratorConfigurationField.class.php |  424 ++-
 .../sfModelGeneratorHelper.class.php          |   85 +-
 lib/helper/AssetHelper.php                    |  476 ++-
 lib/helper/CacheHelper.php                    |   63 +-
 lib/helper/DateHelper.php                     |  214 +-
 lib/helper/DebugHelper.php                    |    7 +-
 lib/helper/EscapingHelper.php                 |   34 +-
 lib/helper/HelperHelper.php                   |    8 +-
 lib/helper/I18NHelper.php                     |   61 +-
 lib/helper/JavascriptBaseHelper.php           |  138 +-
 lib/helper/NumberHelper.php                   |   31 +-
 lib/helper/PartialHelper.php                  |  319 +-
 lib/helper/TagHelper.php                      |  140 +-
 lib/helper/TextHelper.php                     |  351 +--
 lib/helper/UrlHelper.php                      |  630 ++--
 lib/i18n/Gettext/MO.php                       |  152 +-
 lib/i18n/Gettext/PO.php                       |   71 +-
 lib/i18n/Gettext/TGettext.class.php           |  154 +-
 .../sfI18nApplicationExtract.class.php        |  100 +-
 lib/i18n/extract/sfI18nExtract.class.php      |  346 ++-
 .../sfI18nExtractorInterface.class.php        |   19 +-
 .../extract/sfI18nModuleExtract.class.php     |   89 +-
 lib/i18n/extract/sfI18nPhpExtractor.class.php |  160 +-
 .../extract/sfI18nYamlExtractor.class.php     |    3 +-
 .../sfI18nYamlGeneratorExtractor.class.php    |  142 +-
 .../sfI18nYamlValidateExtractor.class.php     |  133 +-
 lib/i18n/sfChoiceFormat.class.php             |  275 +-
 lib/i18n/sfCultureInfo.class.php              | 1512 +++++-----
 lib/i18n/sfDateFormat.class.php               | 1451 ++++-----
 lib/i18n/sfDateTimeFormatInfo.class.php       |  993 +++---
 lib/i18n/sfI18N.class.php                     |  718 +++--
 lib/i18n/sfIMessageSource.class.php           |  189 +-
 lib/i18n/sfMessageFormat.class.php            |  372 ++-
 lib/i18n/sfMessageSource.class.php            |  502 ++--
 lib/i18n/sfMessageSource_Aggregate.class.php  |  395 ++-
 lib/i18n/sfMessageSource_Database.class.php   |  302 +-
 lib/i18n/sfMessageSource_File.class.php       |  313 +-
 lib/i18n/sfMessageSource_MySQL.class.php      |  631 ++--
 lib/i18n/sfMessageSource_SQLite.class.php     |  522 ++--
 lib/i18n/sfMessageSource_SQLite3.class.php    |  541 ++--
 lib/i18n/sfMessageSource_XLIFF.class.php      |  648 ++--
 lib/i18n/sfMessageSource_gettext.class.php    |  508 ++--
 lib/i18n/sfNumberFormat.class.php             |  452 ++-
 lib/i18n/sfNumberFormatInfo.class.php         | 1326 ++++----
 lib/log/sfAggregateLogger.class.php           |  154 +-
 lib/log/sfConsoleLogger.class.php             |   27 +-
 lib/log/sfEventLogger.class.php               |   45 +-
 lib/log/sfFileLogger.class.php                |  295 +-
 lib/log/sfLogger.class.php                    |  507 ++--
 lib/log/sfLoggerInterface.class.php           |   17 +-
 lib/log/sfLoggerWrapper.class.php             |   46 +-
 lib/log/sfNoLogger.class.php                  |   41 +-
 lib/log/sfPsrLoggerAdapter.class.php          |  252 +-
 lib/log/sfStreamLogger.class.php              |  100 +-
 lib/log/sfVarLogger.class.php                 |  283 +-
 lib/log/sfWebDebugLogger.class.php            |  288 +-
 lib/mailer/sfMailer.class.php                 |  525 ++--
 .../sfMailerMessageLoggerPlugin.class.php     |  110 +-
 lib/mailer/sfNoMailer.class.php               |  104 +-
 lib/plugin/sfPearConfig.class.php             |   15 +-
 lib/plugin/sfPearDownloader.class.php         |   27 +-
 lib/plugin/sfPearEnvironment.class.php        |  403 ++-
 lib/plugin/sfPearFrontendPlugin.class.php     |   72 +-
 lib/plugin/sfPearRest.class.php               |   22 +-
 lib/plugin/sfPearRest10.class.php             |   24 +-
 lib/plugin/sfPearRest11.class.php             |   24 +-
 lib/plugin/sfPearRestPlugin.class.php         |  338 +--
 .../sfPluginDependencyException.class.php     |    5 +-
 lib/plugin/sfPluginException.class.php        |    5 +-
 lib/plugin/sfPluginManager.class.php          |  788 +++--
 ...uginRecursiveDependencyException.class.php |    5 +-
 lib/plugin/sfPluginRestException.class.php    |    5 +-
 lib/plugin/sfSymfonyPluginManager.class.php   |  370 ++-
 .../sfDoctrinePluginConfiguration.class.php   |  143 +-
 .../lib/cli/sfDoctrineCli.class.php           |   94 +-
 .../sfDoctrineConnectionListener.class.php    |   32 +-
 .../sfDoctrineConnectionProfiler.class.php    |  314 +-
 .../lib/database/sfDoctrineDatabase.class.php |  226 +-
 .../debug/sfWebDebugPanelDoctrine.class.php   |  236 +-
 .../lib/form/sfFormDoctrine.class.php         |  663 ++--
 .../lib/form/sfFormFilterDoctrine.class.php   |  490 ++-
 .../lib/generator/sfDoctrineColumn.class.php  |  608 ++--
 .../sfDoctrineFormFilterGenerator.class.php   |  618 ++--
 .../sfDoctrineFormGenerator.class.php         | 1206 ++++----
 .../generator/sfDoctrineGenerator.class.php   |  433 ++-
 .../lib/mailer/Swift_DoctrineSpool.class.php  |  192 +-
 .../lib/pager/sfDoctrinePager.class.php       |  365 ++-
 .../lib/record/sfDoctrineRecord.class.php     |  404 ++-
 .../sfDoctrineRecordI18nFilter.class.php      |   72 +-
 .../lib/routing/sfDoctrineRoute.class.php     |  186 +-
 .../sfDoctrineRouteCollection.class.php       |    8 +-
 .../lib/sfDoctrineException.class.php         |    7 +-
 .../lib/task/sfDoctrineBaseTask.class.php     |  437 ++-
 .../lib/task/sfDoctrineBuildDbTask.class.php  |   81 +-
 .../task/sfDoctrineBuildFiltersTask.class.php |   88 +-
 .../task/sfDoctrineBuildFormsTask.class.php   |  101 +-
 .../task/sfDoctrineBuildModelTask.class.php   |  162 +-
 .../task/sfDoctrineBuildSchemaTask.class.php  |   64 +-
 .../lib/task/sfDoctrineBuildSqlTask.class.php |   64 +-
 .../lib/task/sfDoctrineBuildTask.class.php    |  405 ++-
 .../sfDoctrineCleanModelFilesTask.class.php   |  170 +-
 .../lib/task/sfDoctrineCompileTask.class.php  |   91 +-
 .../sfDoctrineConfigureDatabaseTask.class.php |   93 +-
 .../sfDoctrineCreateModelTablesTask.class.php |  115 +-
 .../lib/task/sfDoctrineDataDumpTask.class.php |  101 +-
 .../lib/task/sfDoctrineDataLoadTask.class.php |   96 +-
 .../sfDoctrineDeleteModelFilesTask.class.php  |  207 +-
 .../lib/task/sfDoctrineDqlTask.class.php      |  244 +-
 .../lib/task/sfDoctrineDropDbTask.class.php   |  115 +-
 .../sfDoctrineGenerateAdminTask.class.php     |  275 +-
 .../sfDoctrineGenerateMigrationTask.class.php |  109 +-
 ...DoctrineGenerateMigrationsDbTask.class.php |   71 +-
 ...ctrineGenerateMigrationsDiffTask.class.php |   69 +-
 ...rineGenerateMigrationsModelsTask.class.php |   63 +-
 ...ctrineGenerateModuleForRouteTask.class.php |  136 +-
 .../sfDoctrineGenerateModuleTask.class.php    |  305 +-
 .../task/sfDoctrineInsertSqlTask.class.php    |   60 +-
 .../lib/task/sfDoctrineMigrateTask.class.php  |  185 +-
 .../lib/test/sfTesterDoctrine.class.php       |  250 +-
 .../sfValidatorDoctrineChoice.class.php       |  177 +-
 .../sfValidatorDoctrineUnique.class.php       |  236 +-
 .../sfWidgetFormDoctrineArrayChoice.class.php |  113 +-
 .../sfWidgetFormDoctrineChoice.class.php      |  176 +-
 .../sfDoctrinePlugin/test/bin/coverage.php    |    7 +-
 .../sfDoctrinePlugin/test/bin/prove.php       |   15 +-
 .../test/bootstrap/functional.php             |   42 +-
 .../sfDoctrinePlugin/test/bootstrap/unit.php  |    8 +-
 .../test/functional/ActionRedirectTest.php    |   15 +-
 .../test/functional/AdminGenBrowser.class.php |  487 ++-
 .../test/functional/AdminGenTest.php          |   10 +-
 .../test/functional/EnvironmentSetupTest.php  |   21 +-
 .../test/functional/FormGeneratorTest.php     |   32 +-
 .../test/functional/FormTest.php              |   73 +-
 .../test/functional/I18nTest.php              |  288 +-
 .../test/functional/PagerTest.php             |   19 +-
 .../test/functional/RouteTest.php             |   91 +-
 .../test/functional/SchemaMergeTest.php       |   15 +-
 .../test/functional/Ticket/5269Test.php       |   22 +-
 .../test/functional/Ticket/7774Test.php       |   10 +-
 .../test/functional/UniqueTest.php            |   13 +-
 .../test/functional/UploadTest.php            |   43 +-
 .../config/backendConfiguration.class.php     |    6 +-
 .../actions/actions.class.php                 |   25 +-
 .../templates/indexSuccess.php                |    4 +-
 .../my_articles/actions/actions.class.php     |    4 +-
 ...y_articlesGeneratorConfiguration.class.php |    3 +-
 .../lib/my_articlesGeneratorHelper.class.php  |    3 +-
 .../apps/backend/templates/layout.php         |   12 +-
 .../config/frontendConfiguration.class.php    |    6 +-
 .../articles/actions/actions.class.php        |  121 +-
 .../articles/templates/editSuccess.php        |   38 +-
 .../articles/templates/indexSuccess.php       |   14 +-
 .../articles/templates/showSuccess.php        |    2 +-
 .../attachment/actions/actions.class.php      |   77 +-
 .../attachment/templates/editableInput.php    |    4 +-
 .../attachment/templates/indexInput.php       |    4 +-
 .../apps/frontend/templates/layout.php        |   12 +-
 .../config/ProjectConfiguration.class.php     |   94 +-
 .../doctrine/ArticleFormFilter.class.php      |   10 +-
 .../ArticleTranslationFormFilter.class.php    |   10 +-
 .../doctrine/AttachmentFormFilter.class.php   |    9 +-
 .../doctrine/AuthorFormFilter.class.php       |   10 +-
 ...horInheritanceConcreteFormFilter.class.php |    9 +-
 .../AuthorInheritanceFormFilter.class.php     |   10 +-
 .../doctrine/BaseFormFilterDoctrine.class.php |   10 +-
 .../doctrine/BlogArticleFormFilter.class.php  |   17 +-
 ...BlogArticleTranslationFormFilter.class.php |    9 +-
 .../doctrine/BlogAuthorFormFilter.class.php   |   17 +-
 .../doctrine/CamelCaseFormFilter.class.php    |   10 +-
 .../DefaultValueTestFormFilter.class.php      |    9 +-
 .../FormGeneratorTest2FormFilter.class.php    |   10 +-
 .../filter/doctrine/GroupFormFilter.class.php |   10 +-
 .../doctrine/PermissionFormFilter.class.php   |   10 +-
 .../doctrine/ProfileFormFilter.class.php      |   10 +-
 .../doctrine/ResourceTypeFormFilter.class.php |    9 +-
 .../SettingFormFilter.class.php               |    9 +-
 .../doctrine/SubscriptionFormFilter.class.php |   10 +-
 .../doctrine/UniqueTestFormFilter.class.php   |   10 +-
 .../filter/doctrine/UserFormFilter.class.php  |   10 +-
 .../fixtures/lib/form/BaseForm.class.php      |    5 +-
 .../lib/form/doctrine/ArticleForm.class.php   |   12 +-
 .../doctrine/ArticleTranslationForm.class.php |   10 +-
 .../form/doctrine/AttachmentForm.class.php    |   40 +-
 .../lib/form/doctrine/AuthorForm.class.php    |   10 +-
 .../AuthorInheritanceConcreteForm.class.php   |   17 +-
 .../doctrine/AuthorInheritanceForm.class.php  |   10 +-
 .../form/doctrine/BaseFormDoctrine.class.php  |    9 +-
 .../form/doctrine/BlogArticleForm.class.php   |   17 +-
 .../BlogArticleTranslationForm.class.php      |    9 +-
 .../form/doctrine/BlogAuthorForm.class.php    |   17 +-
 .../lib/form/doctrine/CamelCaseForm.class.php |   10 +-
 .../doctrine/DefaultValueTestForm.class.php   |    9 +-
 .../doctrine/FormGeneratorTestForm.class.php  |   10 +-
 .../lib/form/doctrine/GroupForm.class.php     |   10 +-
 .../form/doctrine/PermissionForm.class.php    |   10 +-
 .../lib/form/doctrine/ProfileForm.class.php   |   10 +-
 .../form/doctrine/ResourceTypeForm.class.php  |    9 +-
 .../SettingsPlugin/SettingForm.class.php      |    9 +-
 .../form/doctrine/SubscriptionForm.class.php  |   10 +-
 .../form/doctrine/UniqueTestForm.class.php    |   10 +-
 .../lib/form/doctrine/UserForm.class.php      |   16 +-
 .../lib/model/doctrine/Article.class.php      |   12 +-
 .../lib/model/doctrine/ArticleTable.class.php |  117 +-
 .../lib/model/doctrine/Attachment.class.php   |    9 +-
 .../lib/model/doctrine/Author.class.php       |   28 +-
 .../doctrine/AuthorInheritance.class.php      |   12 +-
 .../AuthorInheritanceConcrete.class.php       |   12 +-
 .../AuthorInheritanceConcreteTable.class.php  |    6 +-
 .../doctrine/AuthorInheritanceTable.class.php |    6 +-
 .../lib/model/doctrine/AuthorTable.class.php  |   46 +-
 .../lib/model/doctrine/BlogArticle.class.php  |    9 +-
 .../lib/model/doctrine/BlogAuthor.class.php   |    9 +-
 .../lib/model/doctrine/CamelCase.class.php    |   12 +-
 .../model/doctrine/CamelCaseTable.class.php   |    6 +-
 .../model/doctrine/DefaultValueTest.class.php |   16 +-
 .../doctrine/DefaultValueTestTable.class.php  |    6 +-
 .../doctrine/FormGeneratorTest.class.php      |   16 +-
 .../doctrine/FormGeneratorTest2.class.php     |   12 +-
 .../FormGeneratorTest2Table.class.php         |    6 +-
 .../doctrine/FormGeneratorTest3.class.php     |    9 +-
 .../doctrine/FormGeneratorTestTable.class.php |    6 +-
 .../lib/model/doctrine/Group.class.php        |    5 +-
 .../model/doctrine/GroupPermission.class.php  |    5 +-
 .../doctrine/GroupPermissionTable.class.php   |    5 +-
 .../lib/model/doctrine/GroupTable.class.php   |    5 +-
 .../doctrine/ModelFromLinkedSchema.class.php  |    9 +-
 .../ModelWithNumberInColumn.class.php         |    9 +-
 .../lib/model/doctrine/Permission.class.php   |    5 +-
 .../model/doctrine/PermissionTable.class.php  |    5 +-
 .../lib/model/doctrine/Profile.class.php      |    5 +-
 .../lib/model/doctrine/ProfileTable.class.php |    5 +-
 .../lib/model/doctrine/ResourceType.class.php |    9 +-
 .../doctrine/SettingsPlugin/Setting.class.php |    9 +-
 .../SettingsPlugin/SettingTable.class.php     |    4 +-
 .../lib/model/doctrine/Subscription.class.php |    5 +-
 .../doctrine/SubscriptionTable.class.php      |    5 +-
 .../lib/model/doctrine/UniqueTest.class.php   |    9 +-
 .../model/doctrine/UniqueTestTable.class.php  |    5 +-
 .../lib/model/doctrine/User.class.php         |   12 +-
 .../lib/model/doctrine/UserGroup.class.php    |    5 +-
 .../model/doctrine/UserGroupTable.class.php   |    5 +-
 .../model/doctrine/UserPermission.class.php   |    5 +-
 .../doctrine/UserPermissionTable.class.php    |    5 +-
 .../lib/model/doctrine/UserTable.class.php    |   47 +-
 .../fixtures/lib/myDoctrineRecord.class.php   |    4 +-
 .../PluginSettingFormFilter.class.php         |    3 +-
 .../form/doctrine/PluginSettingForm.class.php |    3 +-
 .../model/doctrine/PluginSetting.class.php    |   12 +-
 .../doctrine/PluginSettingTable.class.php     |    6 +-
 .../test/functional/sfDoctrineRecordTest.php  |    9 +-
 .../test/unit/form/sfFormDoctrineTest.php     |   49 +-
 .../unit/form/sfFormFilterDoctrineTest.php    |  107 +-
 .../test/unit/pager/sfDoctrinePagerTest.php   |   11 +-
 .../test/unit/record/sfDoctrineRecordTest.php |   22 +-
 .../test/unit/sfDoctrineColumnTest.php        |   47 +-
 .../test/unit/sfDoctrineDatabaseTest.php      |   18 +-
 .../sfValidatorDoctrineChoiceTest.php         |    1 +
 .../sfWidgetFormDoctrineArrayChoiceTest.php   |    1 +
 .../widget/sfWidgetFormDoctrineChoiceTest.php |    1 +
 lib/request/sfRequest.class.php               |  620 ++--
 lib/request/sfWebRequest.class.php            | 1747 +++++------
 lib/response/sfResponse.class.php             |  326 +-
 lib/response/sfWebResponse.class.php          | 1656 +++++-----
 lib/routing/sfObjectRoute.class.php           |  338 +--
 lib/routing/sfObjectRouteCollection.class.php |  354 ++-
 lib/routing/sfPatternRouting.class.php        |  889 +++---
 lib/routing/sfRequestRoute.class.php          |  143 +-
 lib/routing/sfRoute.class.php                 | 1425 +++++----
 lib/routing/sfRouteCollection.class.php       |  165 +-
 lib/routing/sfRouting.class.php               |  509 ++--
 lib/service/sfServiceContainer.class.php      |  311 +-
 .../sfServiceContainerBuilder.class.php       |  526 ++--
 .../sfServiceContainerDumper.class.php        |   45 +-
 ...sfServiceContainerDumperGraphviz.class.php |  314 +-
 ...fServiceContainerDumperInterface.class.php |    5 +-
 .../sfServiceContainerDumperPhp.class.php     |  506 ++--
 .../sfServiceContainerInterface.class.php     |  151 +-
 .../sfServiceContainerLoader.class.php        |  158 +-
 .../sfServiceContainerLoaderArray.class.php   |  175 +-
 ...fServiceContainerLoaderInterface.class.php |    5 +-
 lib/service/sfServiceDefinition.class.php     |  443 ++-
 lib/service/sfServiceParameter.class.php      |   42 +-
 lib/service/sfServiceReference.class.php      |   42 +-
 lib/storage/sfCacheSessionStorage.class.php   |  495 ++-
 .../sfDatabaseSessionStorage.class.php        |  325 +-
 lib/storage/sfMySQLSessionStorage.class.php   |  354 ++-
 lib/storage/sfMySQLiSessionStorage.class.php  |  109 +-
 lib/storage/sfNoStorage.class.php             |  130 +-
 lib/storage/sfPDOSessionStorage.class.php     |  266 +-
 .../sfPostgreSQLSessionStorage.class.php      |  244 +-
 lib/storage/sfSessionStorage.class.php        |  290 +-
 lib/storage/sfSessionTestStorage.class.php    |  257 +-
 lib/storage/sfStorage.class.php               |  189 +-
 lib/task/app/sfAppRoutesTask.class.php        |  236 +-
 lib/task/cache/sfCacheClearTask.class.php     |  340 +--
 .../configure/sfConfigureAuthorTask.class.php |   77 +-
 .../generator/sfGenerateAppTask.class.php     |  215 +-
 .../generator/sfGenerateModuleTask.class.php  |  127 +-
 .../generator/sfGenerateProjectTask.class.php |  206 +-
 .../generator/sfGenerateTaskTask.class.php    |  147 +-
 .../generator/sfGeneratorBaseTask.class.php   |    5 +-
 lib/task/help/sfHelpTask.class.php            |  180 +-
 lib/task/help/sfListTask.class.php            |  255 +-
 lib/task/i18n/sfI18nExtractTask.class.php     |  152 +-
 lib/task/i18n/sfI18nFindTask.class.php        |  204 +-
 lib/task/log/sfLogClearTask.class.php         |   44 +-
 lib/task/log/sfLogRotateTask.class.php        |  248 +-
 .../plugin/sfPluginAddChannelTask.class.php   |   56 +-
 lib/task/plugin/sfPluginBaseTask.class.php    |    5 +-
 lib/task/plugin/sfPluginInstallTask.class.php |  114 +-
 lib/task/plugin/sfPluginListTask.class.php    |   49 +-
 .../sfPluginPublishAssetsTask.class.php       |  129 +-
 .../plugin/sfPluginUninstallTask.class.php    |   72 +-
 lib/task/plugin/sfPluginUpgradeTask.class.php |   62 +-
 .../sfProjectClearControllersTask.class.php   |   57 +-
 .../project/sfProjectDeployTask.class.php     |  239 +-
 .../project/sfProjectDisableTask.class.php    |   85 +-
 .../project/sfProjectEnableTask.class.php     |   93 +-
 .../project/sfProjectOptimizeTask.class.php   |  277 +-
 .../sfProjectPermissionsTask.class.php        |  162 +-
 .../project/sfProjectSendEmailsTask.class.php |   53 +-
 .../project/sfProjectValidateTask.class.php   |  116 +-
 .../sfDeprecatedClassesValidation.class.php   |  127 +-
 ...atedConfigurationFilesValidation.class.php |   87 +-
 .../sfDeprecatedHelpersValidation.class.php   |  119 +-
 .../sfDeprecatedMethodsValidation.class.php   |  139 +-
 .../sfDeprecatedPluginsValidation.class.php   |   73 +-
 .../sfDeprecatedSettingsValidation.class.php  |   99 +-
 .../sfParameterHolderValidation.class.php     |   79 +-
 .../project/validation/sfValidation.class.php |  172 +-
 lib/task/sfBaseTask.class.php                 |  871 +++---
 lib/task/sfCommandApplicationTask.class.php   |  379 ++-
 lib/task/sfFilesystem.class.php               |  774 +++--
 lib/task/sfTask.class.php                     | 1111 ++++---
 lib/task/symfony/lime_symfony.php             |   18 +-
 lib/task/symfony/sfSymfonyTestTask.class.php  |  189 +-
 lib/task/test/sfLimeHarness.class.php         |   38 +-
 lib/task/test/sfTestAllTask.class.php         |  127 +-
 lib/task/test/sfTestBaseTask.class.php        |   70 +-
 lib/task/test/sfTestCoverageTask.class.php    |  131 +-
 lib/task/test/sfTestFunctionalTask.class.php  |  141 +-
 lib/task/test/sfTestPluginTask.class.php      |   74 +-
 lib/task/test/sfTestUnitTask.class.php        |  137 +-
 lib/test/sfTestBrowser.class.php              |   51 +-
 lib/test/sfTestFunctional.class.php           |   89 +-
 lib/test/sfTestFunctionalBase.class.php       |  844 +++---
 lib/test/sfTester.class.php                   |  116 +-
 lib/test/sfTesterForm.class.php               |  374 +--
 lib/test/sfTesterMailer.class.php             |  397 ++-
 lib/test/sfTesterRequest.class.php            |  217 +-
 lib/test/sfTesterResponse.class.php           |  763 +++--
 lib/test/sfTesterUser.class.php               |  161 +-
 lib/test/sfTesterViewCache.class.php          |  173 +-
 lib/user/sfBasicSecurityUser.class.php        |  442 ++-
 lib/user/sfSecurityUser.class.php             |   77 +-
 lib/user/sfUser.class.php                     |  553 ++--
 lib/util/sfBrowser.class.php                  |  272 +-
 lib/util/sfBrowserBase.class.php              | 1732 +++++------
 lib/util/sfCallable.class.php                 |   75 +-
 lib/util/sfClassManipulator.class.php         |  498 ++-
 lib/util/sfContext.class.php                  | 1196 ++++----
 lib/util/sfDomCssSelector.class.php           |  980 +++---
 lib/util/sfFinder.class.php                   | 1202 ++++----
 lib/util/sfInflector.class.php                |  180 +-
 .../sfNamespacedParameterHolder.class.php     |  615 ++--
 lib/util/sfParameterHolder.class.php          |  354 ++-
 lib/util/sfToolkit.class.php                  |  959 +++---
 .../sfValidatorI18nChoiceCountry.class.php    |   59 +-
 .../sfValidatorI18nChoiceLanguage.class.php   |   59 +-
 .../sfValidatorI18nChoiceTimezone.class.php   |   33 +-
 lib/validator/sfValidatedFile.class.php       | 1234 ++++----
 lib/validator/sfValidatorAnd.class.php        |  248 +-
 lib/validator/sfValidatorBase.class.php       |  880 +++---
 lib/validator/sfValidatorBoolean.class.php    |   73 +-
 lib/validator/sfValidatorCSRFToken.class.php  |   45 +-
 lib/validator/sfValidatorCallback.class.php   |   57 +-
 lib/validator/sfValidatorChoice.class.php     |  252 +-
 lib/validator/sfValidatorDate.class.php       |  427 ++-
 lib/validator/sfValidatorDateRange.class.php  |   82 +-
 lib/validator/sfValidatorDateTime.class.php   |   22 +-
 lib/validator/sfValidatorDecorator.class.php  |  296 +-
 lib/validator/sfValidatorEmail.class.php      |   24 +-
 lib/validator/sfValidatorEqual.class.php      |   81 +-
 lib/validator/sfValidatorError.class.php      |  286 +-
 .../sfValidatorErrorSchema.class.php          |  579 ++--
 lib/validator/sfValidatorFile.class.php       |  529 ++--
 lib/validator/sfValidatorFileMulti.class.php  |   24 +-
 .../sfValidatorFromDescription.class.php      |  610 ++--
 lib/validator/sfValidatorInteger.class.php    |   94 +-
 lib/validator/sfValidatorIp.class.php         |  151 +-
 lib/validator/sfValidatorNumber.class.php     |   92 +-
 lib/validator/sfValidatorOr.class.php         |  203 +-
 lib/validator/sfValidatorPass.class.php       |   37 +-
 lib/validator/sfValidatorRegex.class.php      |   93 +-
 lib/validator/sfValidatorSchema.class.php     |  648 ++--
 .../sfValidatorSchemaCompare.class.php        |  277 +-
 .../sfValidatorSchemaFilter.class.php         |   97 +-
 lib/validator/sfValidatorString.class.php     |   89 +-
 lib/validator/sfValidatorTime.class.php       |  218 +-
 lib/validator/sfValidatorUrl.class.php        |   55 +-
 lib/view/sfPHPView.class.php                  |  280 +-
 lib/view/sfPartialView.class.php              |  234 +-
 lib/view/sfView.class.php                     | 1010 +++----
 lib/view/sfViewCacheManager.class.php         | 1740 +++++------
 lib/view/sfViewParameterHolder.class.php      |  341 ++-
 .../sfWidgetFormI18nChoiceCountry.class.php   |   64 +-
 .../sfWidgetFormI18nChoiceCurrency.class.php  |   64 +-
 .../sfWidgetFormI18nChoiceLanguage.class.php  |   64 +-
 .../sfWidgetFormI18nChoiceTimezone.class.php  |   60 +-
 .../i18n/sfWidgetFormI18nDate.class.php       |  104 +-
 .../i18n/sfWidgetFormI18nDateTime.class.php   |   75 +-
 .../i18n/sfWidgetFormI18nTime.class.php       |   86 +-
 lib/widget/sfWidget.class.php                 |  739 +++--
 lib/widget/sfWidgetForm.class.php             |  599 ++--
 lib/widget/sfWidgetFormChoice.class.php       |  211 +-
 lib/widget/sfWidgetFormChoiceBase.class.php   |  117 +-
 lib/widget/sfWidgetFormDate.class.php         |  203 +-
 lib/widget/sfWidgetFormDateRange.class.php    |  123 +-
 lib/widget/sfWidgetFormDateTime.class.php     |  209 +-
 lib/widget/sfWidgetFormFilterDate.class.php   |   95 +-
 lib/widget/sfWidgetFormFilterInput.class.php  |   89 +-
 lib/widget/sfWidgetFormInput.class.php        |   73 +-
 .../sfWidgetFormInputCheckbox.class.php       |  110 +-
 lib/widget/sfWidgetFormInputFile.class.php    |   31 +-
 .../sfWidgetFormInputFileEditable.class.php   |  152 +-
 .../sfWidgetFormInputFileMulti.class.php      |   68 +-
 lib/widget/sfWidgetFormInputHidden.class.php  |   33 +-
 .../sfWidgetFormInputPassword.class.php       |   73 +-
 lib/widget/sfWidgetFormInputRead.class.php    |   89 +-
 lib/widget/sfWidgetFormInputText.class.php    |   31 +-
 lib/widget/sfWidgetFormSchema.class.php       | 1550 +++++-----
 .../sfWidgetFormSchemaDecorator.class.php     |  735 +++--
 .../sfWidgetFormSchemaFormatter.class.php     |  530 ++--
 .../sfWidgetFormSchemaFormatterList.class.php |   16 +-
 ...sfWidgetFormSchemaFormatterTable.class.php |   16 +-
 lib/widget/sfWidgetFormSelect.class.php       |  158 +-
 .../sfWidgetFormSelectCheckbox.class.php      |  178 +-
 lib/widget/sfWidgetFormSelectMany.class.php   |   31 +-
 lib/widget/sfWidgetFormSelectRadio.class.php  |  171 +-
 lib/widget/sfWidgetFormTextarea.class.php     |   63 +-
 lib/widget/sfWidgetFormTime.class.php         |  152 +-
 lib/yaml/sfYaml.class.php                     |  247 +-
 lib/yaml/sfYamlDumper.class.php               |   66 +-
 lib/yaml/sfYamlInline.class.php               |  755 ++---
 lib/yaml/sfYamlParser.class.php               |  974 +++---
 test/bin/coverage.php                         |   12 +-
 test/bin/loc.php                              |   33 +-
 test/bootstrap/functional.php                 |   59 +-
 test/bootstrap/task.php                       |   11 +-
 test/bootstrap/unit.php                       |   47 +-
 test/functional/authTest.php                  |   71 +-
 test/functional/autoloadTest.php              |    5 +-
 test/functional/cacheTest.php                 |  646 ++--
 test/functional/escapingTest.php              |   27 +-
 test/functional/filterTest.php                |    7 +-
 .../cache/config/cacheConfiguration.class.php |    6 +-
 .../modules/cache/actions/actions.class.php   |  185 +-
 .../cache/actions/components.class.php        |   43 +-
 .../templates/_anotherCacheablePartial.php    |   14 +-
 .../cache/templates/_cacheableComponent.php   |    8 +-
 .../cache/templates/_cacheablePartial.php     |   10 +-
 .../modules/cache/templates/_component.php    |    2 +-
 .../_contextualCacheableComponent.php         |    2 +-
 .../templates/_contextualCacheablePartial.php |    2 +-
 .../cache/templates/_contextualComponent.php  |    2 +-
 .../cache/templates/anotherPartialSuccess.php |    2 +-
 .../cache/templates/componentSuccess.php      |    4 +-
 .../modules/cache/templates/imageSuccess.php  |    4 +-
 .../modules/cache/templates/listSuccess.php   |    2 +-
 .../cache/templates/multiBisSuccess.php       |   12 +-
 .../modules/cache/templates/multiSuccess.php  |   28 +-
 .../cache/templates/partialSuccess.php        |    2 +-
 .../templates/specificCacheKeySuccess.php     |    8 +-
 .../httpcache/actions/actions.class.php       |   36 +-
 .../modules/nocache/actions/actions.class.php |   16 +-
 .../fixtures/apps/cache/templates/image.php   |    4 +-
 .../fixtures/apps/cache/templates/layout.php  |   18 +-
 .../config/frontendConfiguration.class.php    |   51 +-
 .../lib/myAppsFrontendLibClass.class.php      |    8 +-
 .../apps/frontend/lib/myAutoload.class.php    |   15 +-
 .../frontend/lib/myAutoloadedClass.class.php  |    8 +-
 .../apps/frontend/lib/myFilter.class.php      |   24 +-
 .../assetInclusion/actions/actions.class.php  |    9 +-
 .../modules/auth/actions/actions.class.php    |   34 +-
 .../modules/auth/templates/basicSuccess.php   |    6 +-
 .../autoload/actions/actions.class.php        |   25 +-
 ...myAppsFrontendModulesAutoloadLib.class.php |    8 +-
 .../autoload/templates/indexSuccess.php       |    8 +-
 .../autoload/templates/myAutoloadSuccess.php  |    2 +-
 .../modules/browser/actions/actions.class.php |   76 +-
 .../actions/actions.class.php                 |    9 +-
 .../configFiltersSimpleFilterFilter.class.php |   12 +-
 .../templates/indexSuccess.php                |    4 +-
 .../actions/actions.class.php                 |    9 +-
 .../actions/actions.class.php                 |    9 +-
 .../actions/actions.class.php                 |    9 +-
 .../actions/actions.class.php                 |   11 +-
 .../actions/actions.class.php                 |    9 +-
 .../modules/cookie/actions/actions.class.php  |   31 +-
 .../escaping/actions/actions.class.php        |   31 +-
 .../modules/escaping/templates/_partial1.php  |    8 +-
 .../modules/escaping/templates/_partial2.php  |    6 +-
 .../escaping/templates/indexSuccess.php       |    6 +-
 .../exception/actions/actions.class.php       |   27 +-
 .../modules/filter/actions/actions.class.php  |   19 +-
 .../modules/format/actions/actions.class.php  |   55 +-
 .../format/templates/indexSuccess.js.php      |    2 +-
 .../notfound/actions/actions.class.php        |   13 +-
 .../presentation/actions/actions.class.php    |   19 +-
 .../presentation/templates/indexSuccess.php   |    4 +-
 .../renderText/actions/actions.class.php      |   11 +-
 .../modules/view/actions/actions.class.php    |   23 +-
 .../apps/frontend/templates/layout.iphone.php |   12 +-
 .../apps/frontend/templates/layout.php        |   12 +-
 .../apps/frontend/templates/layout.xml.php    |    2 +-
 .../i18n/config/i18nConfiguration.class.php   |   10 +-
 .../modules/i18n/actions/actions.class.php    |   60 +-
 .../lib/I18nCustomCatalogueForm.class.php     |   11 +-
 .../i18n/modules/i18n/lib/I18nForm.class.php  |   43 +-
 .../i18n/templates/i18nFormSuccess.php        |    4 +-
 .../modules/i18n/templates/indexSuccess.php   |   18 +-
 .../fixtures/apps/i18n/templates/layout.php   |   12 +-
 .../config/ProjectConfiguration.class.php     |   10 +-
 .../fixtures/lib/form/BaseForm.class.php      |    5 +-
 .../fixtures/lib/myLibClass.class.php         |    8 +-
 .../autoloadPlugin/actions/actions.class.php  |   12 +-
 ...adPluginModulesAutoloadPluginLib.class.php |    8 +-
 .../autoloadPlugin/templates/indexSuccess.php |    6 +-
 .../sfI18NPlugin/actions/actions.class.php    |   21 +-
 .../sfI18NPlugin/templates/indexSuccess.php   |   22 +-
 test/functional/formatTest.php                |    7 +-
 test/functional/genericTest.php               |    5 +-
 test/functional/httpcacheTest.php             |    7 +-
 test/functional/i18nFormTest.php              |    7 +-
 test/functional/i18nTest.php                  |   45 +-
 test/functional/prodTest.php                  |    7 +-
 test/functional/sfTestBrowserTest.php         |   56 +-
 .../fixtures/task/myPluginTask.class.php      |   22 +-
 test/other/fixtures/test/unit/testTest.php    |    2 +-
 test/other/tasksTest.php                      |  110 +-
 test/unit/action/sfComponentTest.php          |   20 +-
 test/unit/addon/sfPagerTest.php               |   89 +-
 test/unit/autoload/sfCoreAutoloadTest.php     |    2 +-
 test/unit/autoload/sfSimpleAutoloadTest.php   |    2 +-
 test/unit/cache/sfAPCCacheTest.php            |   28 +-
 test/unit/cache/sfCacheDriverTests.class.php  |  331 +-
 test/unit/cache/sfCacheTest.php               |   43 +-
 test/unit/cache/sfEAcceleratorCacheTest.php   |   20 +-
 test/unit/cache/sfFileCacheTest.php           |   21 +-
 test/unit/cache/sfFunctionCacheTest.php       |  107 +-
 test/unit/cache/sfMemcacheCacheTest.php       |   59 +-
 test/unit/cache/sfNoCacheTest.php             |    2 +-
 test/unit/cache/sfSQLiteCacheTest.php         |   43 +-
 test/unit/cache/sfXCacheCacheTest.php         |   20 +-
 .../unit/command/sfCommandArgumentSetTest.php |   69 +-
 test/unit/command/sfCommandArgumentTest.php   |   47 +-
 test/unit/command/sfCommandManagerTest.php    |   92 +-
 test/unit/command/sfCommandOptionSetTest.php  |  102 +-
 test/unit/command/sfCommandOptionTest.php     |   49 +-
 .../config/sfCompileConfigHandlerTest.php     |    6 +-
 test/unit/config/sfConfigHandlerTest.php      |   16 +-
 test/unit/config/sfConfigTest.php             |    4 +-
 .../sfDefineEnvironmentConfigHandlerTest.php  |    8 +-
 .../unit/config/sfFilterConfigHandlerTest.php |   68 +-
 .../config/sfGeneratorConfigHandlerTest.php   |   89 +-
 .../unit/config/sfPluginConfigurationTest.php |   10 +-
 .../config/sfProjectConfigurationTest.php     |   61 +-
 .../config/sfSimpleYamlConfigHandlerTest.php  |   12 +-
 test/unit/config/sfViewConfigHandlerTest.php  |  380 +--
 test/unit/config/sfYamlConfigHandlerTest.php  |   74 +-
 test/unit/controller/sfControllerTest.php     |   13 +-
 test/unit/controller/sfWebControllerTest.php  |  280 +-
 test/unit/database/sfDatabaseTest.php         |   18 +-
 test/unit/debug/sfDebugTest.php               |    4 +-
 test/unit/debug/sfTimerTest.php               |    4 +-
 test/unit/debug/sfWebDebugTest.php            |   19 +-
 .../sfOutputEscaperArrayDecoratorTest.php     |   90 +-
 .../sfOutputEscaperObjectDecoratorTest.php    |   75 +-
 test/unit/escaper/sfOutputEscaperSafeTest.php |   28 +-
 test/unit/escaper/sfOutputEscaperTest.php     |   91 +-
 test/unit/event/sfEventDispatcherTest.php     |   71 +-
 test/unit/event/sfEventTest.php               |   15 +-
 test/unit/exception/sfExceptionsTest.php      |   31 +-
 test/unit/filter/sfFilterTest.php             |   17 +-
 test/unit/form/addon/sfFormSymfonyTest.php    |   48 +-
 test/unit/form/sfFormFieldSchemaTest.php      |   62 +-
 test/unit/form/sfFormFieldTest.php            |   80 +-
 test/unit/form/sfFormTest.php                 |  814 ++---
 test/unit/generator/sfGeneratorTest.php       |    8 +-
 ...sfModelGeneratorConfigurationFieldTest.php |    2 +-
 test/unit/helper/AssetHelperTest.php          |  281 +-
 test/unit/helper/DateHelperTest.php           |   43 +-
 test/unit/helper/EscapingHelperTest.php       |    8 +-
 test/unit/helper/JavascriptBaseHelperTest.php |   22 +-
 test/unit/helper/NumberHelperTest.php         |   13 +-
 test/unit/helper/PartialHelperTest.php        |   34 +-
 test/unit/helper/TagHelperTest.php            |   15 +-
 test/unit/helper/TestObject.php               |   66 +-
 test/unit/helper/TextHelperTest.php           |   81 +-
 test/unit/helper/UrlHelperTest.php            |   97 +-
 test/unit/i18n/dataTest.php                   |   42 +-
 test/unit/i18n/extract/sfI18nExtractTest.php  |   33 +-
 .../i18n/extract/sfI18nPhpExtractorTest.php   |   20 +-
 .../sfI18nYamlGeneratorExtractorTest.php      |   28 +-
 .../sfI18nYamlValidateExtractorTest.php       |   14 +-
 test/unit/i18n/sfChoiceFormatTest.php         |  124 +-
 test/unit/i18n/sfCultureInfoTest.php          |  128 +-
 test/unit/i18n/sfI18NTest.php                 |   37 +-
 test/unit/i18n/sfMessageSourceTest.php        |   33 +-
 .../i18n/sfMessageSource_AggregateTest.php    |   10 +-
 test/unit/i18n/sfMessageSource_FileTest.php   |   28 +-
 test/unit/i18n/sfMessageSource_SQLiteTest.php |   76 +-
 test/unit/i18n/sfMessageSource_XLIFFTest.php  |    4 +-
 test/unit/i18n/sfNumberFormatInfoTest.php     |  132 +-
 test/unit/log/sfAggregateLoggerTest.php       |   11 +-
 test/unit/log/sfConsoleLoggerTest.php         |    4 +-
 test/unit/log/sfFileLoggerTest.php            |   41 +-
 test/unit/log/sfLoggerTest.php                |   72 +-
 test/unit/log/sfLoggerWrapperTest.php         |   22 +-
 test/unit/log/sfStreamLoggerTest.php          |    4 +-
 test/unit/log/sfVarLoggerTest.php             |    4 +-
 test/unit/log/sfWebDebugLoggerTest.php        |    3 +-
 .../mailer/fixtures/TestMailMessage.class.php |   12 +-
 .../fixtures/TestMailerTransport.class.php    |  108 +-
 test/unit/mailer/fixtures/TestSpool.class.php |   76 +-
 test/unit/mailer/sfMailerTest.php             |   94 +-
 .../plugin/sfPearDownloaderTest.class.php     |   49 +-
 test/unit/plugin/sfPearEnvironmentTest.php    |   48 +-
 test/unit/plugin/sfPearRestPluginTest.php     |   24 +-
 test/unit/plugin/sfPearRestTest.class.php     |   53 +-
 test/unit/plugin/sfPluginManagerTest.php      |  176 +-
 test/unit/plugin/sfPluginTestHelper.class.php |   34 +-
 test/unit/request/sfRequestTest.php           |   27 +-
 test/unit/request/sfWebRequestTest.php        |  140 +-
 test/unit/response/sfResponseTest.php         |   23 +-
 test/unit/response/sfWebResponseTest.php      |   69 +-
 .../routing/fixtures/config_routing.yml.php   |    1 +
 .../routing/sfObjectRouteCollectionTest.php   |   92 +-
 test/unit/routing/sfObjectRouteTest.php       |   30 +-
 test/unit/routing/sfPatternRoutingTest.php    |  179 +-
 test/unit/routing/sfRequestRouteTest.php      |    4 +-
 test/unit/routing/sfRouteTest.php             |   66 +-
 .../fixtures/containers/container8.php        |    6 +-
 .../fixtures/containers/container9.php        |    6 +-
 .../service/fixtures/includes/classes.php     |   32 +-
 test/unit/service/fixtures/includes/foo.php   |   50 +-
 .../service/sfServiceContainerBuilderTest.php |   89 +-
 .../sfServiceContainerDumperGraphvizTest.php  |   15 +-
 .../sfServiceContainerDumperPhpTest.php       |   17 +-
 .../service/sfServiceContainerDumperTest.php  |   16 +-
 .../sfServiceContainerLoaderArrayTest.php     |   36 +-
 .../service/sfServiceContainerLoaderTest.php  |   26 +-
 test/unit/service/sfServiceContainerTest.php  |   80 +-
 test/unit/service/sfServiceDefinitionTest.php |    2 +-
 test/unit/service/sfServiceParameterTest.php  |    2 +-
 test/unit/service/sfServiceReferenceTest.php  |    2 +-
 test/unit/sfContextMock.class.php             |  211 +-
 test/unit/sfEventDispatcherTest.class.php     |   48 +-
 test/unit/sfNoRouting.class.php               |  166 +-
 test/unit/sfParameterHolderTest.class.php     |   79 +-
 .../storage/sfCacheSessionStorageTest.php     |   29 +-
 test/unit/storage/sfMySQLStorageTest.php      |   98 +-
 test/unit/storage/sfMySQLiStorageTest.php     |   96 +-
 test/unit/storage/sfNoStorageTest.php         |    4 +-
 test/unit/storage/sfPDOSessionStorageTest.php |   67 +-
 test/unit/storage/sfSessionStorageTest.php    |   21 +-
 test/unit/storage/sfStorageTest.php           |   28 +-
 test/unit/task/cache/sfCacheClearTaskTest.php |    4 +-
 test/unit/task/sfBaseTaskTest.php             |  111 +-
 test/unit/task/sfFilesystemTest.php           |   24 +-
 test/unit/task/sfTaskTest.php                 |   83 +-
 test/unit/test/limeTestTest.php               |    2 +-
 test/unit/test/sfTestFunctionalTest.php       |   49 +-
 test/unit/user/sfBasicSecurityUserTest.php    |   14 +-
 test/unit/user/sfUserTest.php                 |   18 +-
 test/unit/util/sfBrowserTest.php              |  144 +-
 test/unit/util/sfCallableTest.php             |   34 +-
 test/unit/util/sfClassManipulatorTest.php     |   89 +-
 test/unit/util/sfContextTest.php              |   35 +-
 test/unit/util/sfDomCssSelectorTest.php       |   34 +-
 test/unit/util/sfFinderTest.php               |  124 +-
 test/unit/util/sfInflectorTest.php            |   10 +-
 .../util/sfNamespacedParameterHolderTest.php  |    4 +-
 test/unit/util/sfParameterHolderTest.php      |    8 +-
 test/unit/util/sfToolkitTest.php              |  150 +-
 .../i18n/sfValidatorI18nChoiceCountryTest.php |   15 +-
 .../sfValidatorI18nChoiceLanguageTest.php     |   15 +-
 .../sfValidatorI18nChoiceTimezoneTest.php     |    2 +-
 test/unit/validator/sfValidatorAndTest.php    |  128 +-
 test/unit/validator/sfValidatorBaseTest.php   |  156 +-
 .../unit/validator/sfValidatorBooleanTest.php |   41 +-
 .../validator/sfValidatorCSRFTokenTest.php    |   33 +-
 .../validator/sfValidatorCallbackTest.php     |   43 +-
 test/unit/validator/sfValidatorChoiceTest.php |   96 +-
 .../validator/sfValidatorDateRangeTest.php    |   59 +-
 test/unit/validator/sfValidatorDateTest.php   |  210 +-
 .../validator/sfValidatorDateTimeTest.php     |    2 +-
 .../validator/sfValidatorDecoratorTest.php    |   84 +-
 test/unit/validator/sfValidatorEmailTest.php  |   43 +-
 test/unit/validator/sfValidatorEqualTest.php  |   80 +-
 .../validator/sfValidatorErrorSchemaTest.php  |   75 +-
 test/unit/validator/sfValidatorErrorTest.php  |   55 +-
 .../validator/sfValidatorFileMultiTest.php    |    6 +-
 test/unit/validator/sfValidatorFileTest.php   |  258 +-
 .../sfValidatorFromDescriptionTest.php        |  129 +-
 .../unit/validator/sfValidatorIntegerTest.php |  102 +-
 test/unit/validator/sfValidatorIpTest.php     |  352 +--
 test/unit/validator/sfValidatorNumberTest.php |   77 +-
 test/unit/validator/sfValidatorOrTest.php     |   84 +-
 test/unit/validator/sfValidatorPassTest.php   |    2 +-
 test/unit/validator/sfValidatorRegexTest.php  |   65 +-
 .../sfValidatorSchemaCompareTest.php          |  154 +-
 .../validator/sfValidatorSchemaFilterTest.php |   49 +-
 test/unit/validator/sfValidatorSchemaTest.php |  380 ++-
 test/unit/validator/sfValidatorStringTest.php |   83 +-
 test/unit/validator/sfValidatorTimeTest.php   |  137 +-
 test/unit/validator/sfValidatorUrlTest.php    |   64 +-
 test/unit/view/sfViewCacheManagerTest.php     |  229 +-
 test/unit/view/sfViewParameterHolderTest.php  |   49 +-
 test/unit/view/sfViewTest.php                 |   48 +-
 .../sfWidgetFormI18nChoiceCountryTest.php     |   18 +-
 .../sfWidgetFormI18nChoiceCurrencyTest.php    |   18 +-
 .../sfWidgetFormI18nChoiceLanguageTest.php    |   18 +-
 .../sfWidgetFormI18nChoiceTimezoneTest.php    |    4 +-
 .../widget/i18n/sfWidgetFormI18nDateTest.php  |   17 +-
 .../i18n/sfWidgetFormI18nDateTimeTest.php     |    4 +-
 .../widget/i18n/sfWidgetFormI18nTimeTest.php  |    4 +-
 test/unit/widget/sfWidgetFormChoiceTest.php   |   46 +-
 .../unit/widget/sfWidgetFormDateRangeTest.php |   34 +-
 test/unit/widget/sfWidgetFormDateTest.php     |   27 +-
 test/unit/widget/sfWidgetFormDateTimeTest.php |   47 +-
 .../widget/sfWidgetFormFilterDateTest.php     |   33 +-
 .../widget/sfWidgetFormFilterInputTest.php    |   19 +-
 .../widget/sfWidgetFormInputCheckboxTest.php  |    3 +-
 .../sfWidgetFormInputFileEditableTest.php     |   47 +-
 .../widget/sfWidgetFormInputFileMultiTest.php |    4 +-
 .../unit/widget/sfWidgetFormInputFileTest.php |    2 +-
 .../widget/sfWidgetFormInputHiddenTest.php    |    2 +-
 .../widget/sfWidgetFormInputPasswordTest.php  |    2 +-
 .../unit/widget/sfWidgetFormInputReadTest.php |    2 +-
 .../unit/widget/sfWidgetFormInputTextTest.php |    2 +-
 .../sfWidgetFormSchemaDecoratorTest.php       |   22 +-
 .../sfWidgetFormSchemaFormatterListTest.php   |    6 +-
 .../sfWidgetFormSchemaFormatterTableTest.php  |    6 +-
 .../sfWidgetFormSchemaFormatterTest.php       |  102 +-
 test/unit/widget/sfWidgetFormSchemaTest.php   |  250 +-
 .../widget/sfWidgetFormSelectCheckboxTest.php |   41 +-
 .../widget/sfWidgetFormSelectManyTest.php     |    4 +-
 .../widget/sfWidgetFormSelectRadioTest.php    |   39 +-
 test/unit/widget/sfWidgetFormSelectTest.php   |   33 +-
 test/unit/widget/sfWidgetFormTest.php         |   20 +-
 test/unit/widget/sfWidgetFormTextareaTest.php |    2 +-
 test/unit/widget/sfWidgetFormTimeTest.php     |   25 +-
 test/unit/widget/sfWidgetTest.php             |   80 +-
 test/unit/yaml/sfYamlDumperTest.php           |   83 +-
 test/unit/yaml/sfYamlInlineTest.php           |  198 +-
 test/unit/yaml/sfYamlParserTest.php           |   71 +-
 907 files changed, 67547 insertions(+), 73034 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 4a7ea3036..779f99a12 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -2,7 +2,7 @@ root = true
 
 [*]
 indent_style = space
-indent_size = 2
+indent_size = 4
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
diff --git a/data/bin/changelog.php b/data/bin/changelog.php
index 55d3c1c6f..4eaf5868a 100644
--- a/data/bin/changelog.php
+++ b/data/bin/changelog.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -13,22 +13,22 @@
  *
  * Usage: php data/bin/changelog.php -r12345:67890 /branches/1.3
  *
- * @package    symfony
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 require_once __DIR__.'/../../lib/task/sfFilesystem.class.php';
 
-if (!isset($argv[1]))
-{
-  echo "You must provide a revision range (-r123:456)\n";
-  exit(1);
+if (!isset($argv[1])) {
+    echo "You must provide a revision range (-r123:456)\n";
+
+    exit(1);
 }
 
-if (!isset($argv[2]))
-{
-  echo "You must provide a repository path (/branches/1.4)\n";
-  exit(1);
+if (!isset($argv[2])) {
+    echo "You must provide a repository path (/branches/1.4)\n";
+
+    exit(1);
 }
 
 $filesystem = new sfFilesystem();
@@ -37,13 +37,12 @@
 $info = new SimpleXMLElement($out);
 
 list($out, $err) = $filesystem->execute(vsprintf('svn log %s --xml %s', array_map('escapeshellarg', array(
-  $argv[1],
-  (string) $info->entry->repository->root.$argv[2],
+    $argv[1],
+    (string) $info->entry->repository->root.$argv[2],
 ))));
 $log = new SimpleXMLElement($out);
 
-foreach ($log->logentry as $logentry)
-{
-  echo sprintf(' * [%d] %s', $logentry['revision'], trim(preg_replace('/\s*\[[\d\., ]+\]\s*/', '', (string) $logentry->msg)));
-  echo PHP_EOL;
+foreach ($log->logentry as $logentry) {
+    echo sprintf(' * [%d] %s', $logentry['revision'], trim(preg_replace('/\s*\[[\d\., ]+\]\s*/', '', (string) $logentry->msg)));
+    echo PHP_EOL;
 }
diff --git a/data/bin/check_configuration.php b/data/bin/check_configuration.php
index 0315489ba..10b10adc8 100644
--- a/data/bin/check_configuration.php
+++ b/data/bin/check_configuration.php
@@ -2,25 +2,28 @@
 
 function is_cli()
 {
-  return !isset($_SERVER['HTTP_HOST']);
+    return !isset($_SERVER['HTTP_HOST']);
 }
 
 /**
  * Checks a configuration.
+ *
+ * @param mixed $boolean
+ * @param mixed $message
+ * @param mixed $help
+ * @param mixed $fatal
  */
 function check($boolean, $message, $help = '', $fatal = false)
 {
-  echo $boolean ? "  OK        " : sprintf("[[%s]] ", $fatal ? ' ERROR ' : 'WARNING');
-  echo sprintf("$message%s\n", $boolean ? '' : ': FAILED');
+    echo $boolean ? '  OK        ' : sprintf('[[%s]] ', $fatal ? ' ERROR ' : 'WARNING');
+    echo sprintf("{$message}%s\n", $boolean ? '' : ': FAILED');
 
-  if (!$boolean)
-  {
-    echo "            *** $help ***\n";
-    if ($fatal)
-    {
-      die("You must fix this problem before resuming the check.\n");
+    if (!$boolean) {
+        echo "            *** {$help} ***\n";
+        if ($fatal) {
+            exit("You must fix this problem before resuming the check.\n");
+        }
     }
-  }
 }
 
 /**
@@ -30,17 +33,15 @@ function check($boolean, $message, $help = '', $fatal = false)
  */
 function get_ini_path()
 {
-  if ($path = get_cfg_var('cfg_file_path'))
-  {
-    return $path;
-  }
+    if ($path = get_cfg_var('cfg_file_path')) {
+        return $path;
+    }
 
-  return 'WARNING: not using a php.ini file';
+    return 'WARNING: not using a php.ini file';
 }
 
-if (!is_cli())
-{
-  echo '<html><body><pre>';
+if (!is_cli()) {
+    echo '<html><body><pre>';
 }
 
 echo "********************************\n";
@@ -51,18 +52,16 @@ function get_ini_path()
 
 echo sprintf("php.ini used by PHP: %s\n\n", get_ini_path());
 
-if (is_cli())
-{
-  echo "** WARNING **\n";
-  echo "*  The PHP CLI can use a different php.ini file\n";
-  echo "*  than the one used with your web server.\n";
-  if ('\\' == DIRECTORY_SEPARATOR)
-  {
-    echo "*  (especially on the Windows platform)\n";
-  }
-  echo "*  If this is the case, please launch this\n";
-  echo "*  utility from your web server.\n";
-  echo "** WARNING **\n";
+if (is_cli()) {
+    echo "** WARNING **\n";
+    echo "*  The PHP CLI can use a different php.ini file\n";
+    echo "*  than the one used with your web server.\n";
+    if ('\\' == DIRECTORY_SEPARATOR) {
+        echo "*  (especially on the Windows platform)\n";
+    }
+    echo "*  If this is the case, please launch this\n";
+    echo "*  utility from your web server.\n";
+    echo "** WARNING **\n";
 }
 
 // mandatory
@@ -72,10 +71,9 @@ function get_ini_path()
 // warnings
 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();
-  check(count($drivers), 'PDO has some drivers installed: '.implode(', ', $drivers), 'Install PDO drivers (mandatory for Doctrine)');
+if (class_exists('PDO')) {
+    $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);
 check(function_exists('mb_strlen'), 'The mb_strlen() function is available', 'Install and enable the mbstring extension', false);
@@ -85,10 +83,8 @@ function get_ini_path()
 
 $accelerator =
   (function_exists('apc_store') && ini_get('apc.enabled'))
-  ||
-  function_exists('eaccelerator_put') && ini_get('eaccelerator.enable')
-  ||
-  function_exists('xcache_set')
+  || function_exists('eaccelerator_put') && ini_get('eaccelerator.enable')
+  || function_exists('xcache_set')
 ;
 check($accelerator, 'A PHP accelerator is installed', 'Install a PHP accelerator like APC (highly recommended)', false);
 
@@ -99,7 +95,6 @@ function_exists('xcache_set')
 
 check(class_exists('Memcache'), 'Memcache is available', 'You must have memcache installed and enabled to use sfMemcacheCache class.', false);
 
-if (!is_cli())
-{
-  echo '</pre></body></html>';
+if (!is_cli()) {
+    echo '</pre></body></html>';
 }
diff --git a/data/bin/release.php b/data/bin/release.php
index 366510b48..df6dec94f 100644
--- a/data/bin/release.php
+++ b/data/bin/release.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2007 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -13,65 +13,59 @@
  *
  * Usage: php data/bin/release.php 1.3.0 stable
  *
- * @package    symfony
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
-require_once(__DIR__.'/../../lib/exception/sfException.class.php');
-require_once(__DIR__.'/../../lib/task/sfFilesystem.class.php');
-require_once(__DIR__.'/../../lib/util/sfFinder.class.php');
-require_once(__DIR__.'/../../lib/vendor/lime/lime.php');
-
-if (!isset($argv[1]))
-{
-  throw new Exception('You must provide version prefix.');
+require_once __DIR__.'/../../lib/exception/sfException.class.php';
+
+require_once __DIR__.'/../../lib/task/sfFilesystem.class.php';
+
+require_once __DIR__.'/../../lib/util/sfFinder.class.php';
+
+require_once __DIR__.'/../../lib/vendor/lime/lime.php';
+
+if (!isset($argv[1])) {
+    throw new Exception('You must provide version prefix.');
 }
 
-if (!isset($argv[2]))
-{
-  throw new Exception('You must provide stability status (alpha/beta/stable).');
+if (!isset($argv[2])) {
+    throw new Exception('You must provide stability status (alpha/beta/stable).');
 }
 
 $stability = $argv[2];
 
 $filesystem = new sfFilesystem();
 
-if (($stability == 'beta' || $stability == 'alpha') && count(explode('.', $argv[1])) < 2)
-{
-  $version_prefix = $argv[1];
+if (('beta' == $stability || 'alpha' == $stability) && count(explode('.', $argv[1])) < 2) {
+    $version_prefix = $argv[1];
 
-  list($result) = $filesystem->execute('svn status -u '.getcwd());
-  if (preg_match('/Status against revision\:\s+(\d+)\s*$/im', $result, $match))
-  {
-    $version = $match[1];
-  }
+    list($result) = $filesystem->execute('svn status -u '.getcwd());
+    if (preg_match('/Status against revision\:\s+(\d+)\s*$/im', $result, $match)) {
+        $version = $match[1];
+    }
 
-  if (!isset($version))
-  {
-    throw new Exception('Unable to find last SVN revision.');
-  }
+    if (!isset($version)) {
+        throw new Exception('Unable to find last SVN revision.');
+    }
 
-  // make a PEAR compatible version
-  $version = $version_prefix.'.'.$version;
-}
-else
-{
-  $version = $argv[1];
+    // make a PEAR compatible version
+    $version = $version_prefix.'.'.$version;
+} else {
+    $version = $argv[1];
 }
 
-print sprintf("Releasing symfony version \"%s\".\n", $version);
+echo sprintf("Releasing symfony version \"%s\".\n", $version);
 
 // tests
 list($result) = $filesystem->execute('php data/bin/symfony symfony:test');
 
-if (0 != $result)
-{
-  throw new Exception('Some tests failed. Release process aborted!');
+if (0 != $result) {
+    throw new Exception('Some tests failed. Release process aborted!');
 }
 
-if (is_file('package.xml'))
-{
-  $filesystem->remove(getcwd().DIRECTORY_SEPARATOR.'package.xml');
+if (is_file('package.xml')) {
+    $filesystem->remove(getcwd().DIRECTORY_SEPARATOR.'package.xml');
 }
 
 $filesystem->copy(getcwd().'/package.xml.tmpl', getcwd().'/package.xml');
@@ -80,21 +74,19 @@
 $finder = sfFinder::type('file')->relative();
 $xml_classes = '';
 $dirs = array('lib' => 'php', 'data' => 'data');
-foreach ($dirs as $dir => $role)
-{
-  $class_files = $finder->in($dir);
-  foreach ($class_files as $file)
-  {
-    $xml_classes .= '<file role="'.$role.'" baseinstalldir="symfony" install-as="'.$file.'" name="'.$dir.'/'.$file.'" />'."\n";
-  }
+foreach ($dirs as $dir => $role) {
+    $class_files = $finder->in($dir);
+    foreach ($class_files as $file) {
+        $xml_classes .= '<file role="'.$role.'" baseinstalldir="symfony" install-as="'.$file.'" name="'.$dir.'/'.$file.'" />'."\n";
+    }
 }
 
 // replace tokens
 $filesystem->replaceTokens(getcwd().DIRECTORY_SEPARATOR.'package.xml', '##', '##', array(
-  'SYMFONY_VERSION' => $version,
-  'CURRENT_DATE'    => date('Y-m-d'),
-  'CLASS_FILES'     => $xml_classes,
-  'STABILITY'       => $stability,
+    'SYMFONY_VERSION' => $version,
+    'CURRENT_DATE' => date('Y-m-d'),
+    'CLASS_FILES' => $xml_classes,
+    'STABILITY' => $stability,
 ));
 
 list($results) = $filesystem->execute('pear package');
diff --git a/data/bin/sandbox_installer.php b/data/bin/sandbox_installer.php
index c45891174..576b28c01 100644
--- a/data/bin/sandbox_installer.php
+++ b/data/bin/sandbox_installer.php
@@ -24,12 +24,10 @@
 
 $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)
-{
-  if (!isset($seen[$path]) && $item->isDir() && !$item->isLink())
-  {
-    touch($item->getRealPath().'/.sf');
-  }
-
-  $seen[$item->getPath()] = true;
+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');
+    }
+
+    $seen[$item->getPath()] = true;
 }
diff --git a/lib/action/sfAction.class.php b/lib/action/sfAction.class.php
index f796cd30d..5fdcc49c9 100644
--- a/lib/action/sfAction.class.php
+++ b/lib/action/sfAction.class.php
@@ -12,533 +12,514 @@
 /**
  * sfAction executes all the logic for the current request.
  *
- * @package    symfony
- * @subpackage action
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  *
  * @method sfWebController getController()
- * @method sfWebResponse getResponse()
+ * @method sfWebResponse   getResponse()
  */
 abstract class sfAction extends sfComponent
 {
-  protected
-    $security = array();
-
-  /**
-   * Initializes this action.
-   *
-   * @param sfContext $context    The current application context.
-   * @param string    $moduleName The module name.
-   * @param string    $actionName The action name.
-   *
-   * @return void
-   */
-  public function initialize($context, $moduleName, $actionName)
-  {
-    parent::initialize($context, $moduleName, $actionName);
-
-    // include security configuration
-    if ($file = $context->getConfigCache()->checkConfig('modules/'.$this->getModuleName().'/config/security.yml', true))
+    protected $security = array();
+
+    /**
+     * Initializes this action.
+     *
+     * @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)
+    {
+        parent::initialize($context, $moduleName, $actionName);
+
+        // include security configuration
+        if ($file = $context->getConfigCache()->checkConfig('modules/'.$this->getModuleName().'/config/security.yml', true)) {
+            require $file;
+        }
+    }
+
+    /**
+     * Executes an application defined process prior to execution of this sfAction object.
+     *
+     * By default, this method is empty.
+     */
+    public function preExecute()
+    {
+    }
+
+    /**
+     * Execute an application defined process immediately after execution of this sfAction object.
+     *
+     * By default, this method is empty.
+     */
+    public function postExecute()
+    {
+    }
+
+    /**
+     * Forwards current action to the default 404 error action.
+     *
+     * @param string $message Message of the generated exception
+     *
+     * @throws sfError404Exception
+     */
+    public function forward404($message = null)
+    {
+        throw new sfError404Exception($this->get404Message($message));
+    }
+
+    /**
+     * Forwards current action to the default 404 error action unless the specified condition is true.
+     *
+     * @param bool   $condition A condition that evaluates to true or false
+     * @param string $message   Message of the generated exception
+     *
+     * @throws sfError404Exception
+     */
+    public function forward404Unless($condition, $message = null)
+    {
+        if (!$condition) {
+            throw new sfError404Exception($this->get404Message($message));
+        }
+    }
+
+    /**
+     * Forwards current action to the default 404 error action if the specified condition is true.
+     *
+     * @param bool   $condition A condition that evaluates to true or false
+     * @param string $message   Message of the generated exception
+     *
+     * @throws sfError404Exception
+     */
+    public function forward404If($condition, $message = null)
+    {
+        if ($condition) {
+            throw new sfError404Exception($this->get404Message($message));
+        }
+    }
+
+    /**
+     * Redirects current action to the default 404 error action (with browser redirection).
+     *
+     * This method stops the current code flow.
+     */
+    public function redirect404()
     {
-      require($file);
+        return $this->redirect('/'.sfConfig::get('sf_error_404_module').'/'.sfConfig::get('sf_error_404_action'));
     }
-  }
-
-  /**
-   * Executes an application defined process prior to execution of this sfAction object.
-   *
-   * By default, this method is empty.
-   */
-  public function preExecute()
-  {
-  }
-
-  /**
-   * Execute an application defined process immediately after execution of this sfAction object.
-   *
-   * By default, this method is empty.
-   */
-  public function postExecute()
-  {
-  }
-
-  /**
-   * Forwards current action to the default 404 error action.
-   *
-   * @param string $message Message of the generated exception
-   *
-   * @throws sfError404Exception
-   *
-   */
-  public function forward404($message = null)
-  {
-    throw new sfError404Exception($this->get404Message($message));
-  }
-
-  /**
-   * Forwards current action to the default 404 error action unless the specified condition is true.
-   *
-   * @param bool    $condition  A condition that evaluates to true or false
-   * @param string  $message    Message of the generated exception
-   *
-   * @throws sfError404Exception
-   */
-  public function forward404Unless($condition, $message = null)
-  {
-    if (!$condition)
+
+    /**
+     * Forwards current action to a new one (without browser redirection).
+     *
+     * This method stops the action. So, no code is executed after a call to this method.
+     *
+     * @param string $module A module name
+     * @param string $action An action name
+     *
+     * @throws sfStopException
+     */
+    public function forward($module, $action)
     {
-      throw new sfError404Exception($this->get404Message($message));
+        if (sfConfig::get('sf_logging_enabled')) {
+            $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Forward to action "%s/%s"', $module, $action))));
+        }
+
+        $this->getController()->forward($module, $action);
+
+        throw new sfStopException();
     }
-  }
-
-  /**
-   * Forwards current action to the default 404 error action if the specified condition is true.
-   *
-   * @param bool    $condition  A condition that evaluates to true or false
-   * @param string  $message    Message of the generated exception
-   *
-   * @throws sfError404Exception
-   */
-  public function forward404If($condition, $message = null)
-  {
-    if ($condition)
+
+    /**
+     * If the condition is true, forwards current action to a new one (without browser redirection).
+     *
+     * This method stops the action. So, no code is executed after a call to this method.
+     *
+     * @param bool   $condition A condition that evaluates to true or false
+     * @param string $module    A module name
+     * @param string $action    An action name
+     *
+     * @throws sfStopException
+     */
+    public function forwardIf($condition, $module, $action)
     {
-      throw new sfError404Exception($this->get404Message($message));
+        if ($condition) {
+            $this->forward($module, $action);
+        }
     }
-  }
-
-  /**
-   * Redirects current action to the default 404 error action (with browser redirection).
-   *
-   * This method stops the current code flow.
-   */
-  public function redirect404()
-  {
-    return $this->redirect('/'.sfConfig::get('sf_error_404_module').'/'.sfConfig::get('sf_error_404_action'));
-  }
-
-  /**
-   * Forwards current action to a new one (without browser redirection).
-   *
-   * This method stops the action. So, no code is executed after a call to this method.
-   *
-   * @param  string  $module  A module name
-   * @param  string  $action  An action name
-   *
-   * @throws sfStopException
-   */
-  public function forward($module, $action)
-  {
-    if (sfConfig::get('sf_logging_enabled'))
+
+    /**
+     * Unless the condition is true, forwards current action to a new one (without browser redirection).
+     *
+     * This method stops the action. So, no code is executed after a call to this method.
+     *
+     * @param bool   $condition A condition that evaluates to true or false
+     * @param string $module    A module name
+     * @param string $action    An action name
+     *
+     * @throws sfStopException
+     */
+    public function forwardUnless($condition, $module, $action)
     {
-      $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Forward to action "%s/%s"', $module, $action))));
+        if (!$condition) {
+            $this->forward($module, $action);
+        }
     }
 
-    $this->getController()->forward($module, $action);
-
-    throw new sfStopException();
-  }
-
-  /**
-   * If the condition is true, forwards current action to a new one (without browser redirection).
-   *
-   * This method stops the action. So, no code is executed after a call to this method.
-   *
-   * @param  bool   $condition  A condition that evaluates to true or false
-   * @param  string $module     A module name
-   * @param  string $action     An action name
-   *
-   * @throws sfStopException
-   */
-  public function forwardIf($condition, $module, $action)
-  {
-    if ($condition)
+    /**
+     * Redirects current request to a new URL.
+     *
+     * 2 URL formats are accepted :
+     *  - a full URL: http://www.google.com/
+     *  - an internal URL (url_for() format): module/action
+     *
+     * This method stops the action. So, no code is executed after a call to this method.
+     *
+     * @param string $url        Url
+     * @param int    $statusCode Status code (default to 302)
+     *
+     * @throws sfStopException
+     */
+    public function redirect($url, $statusCode = 302)
     {
-      $this->forward($module, $action);
+        // 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);
+            $statusCode = func_num_args() >= 3 ? func_get_arg(2) : 302;
+        }
+
+        $this->getController()->redirect($url, 0, $statusCode);
+
+        throw new sfStopException();
     }
-  }
-
-  /**
-   * Unless the condition is true, forwards current action to a new one (without browser redirection).
-   *
-   * This method stops the action. So, no code is executed after a call to this method.
-   *
-   * @param  bool   $condition  A condition that evaluates to true or false
-   * @param  string $module     A module name
-   * @param  string $action     An action name
-   *
-   * @throws sfStopException
-   */
-  public function forwardUnless($condition, $module, $action)
-  {
-    if (!$condition)
+
+    /**
+     * Redirects current request to a new URL, only if specified condition is true.
+     *
+     * This method stops the action. So, no code is executed after a call to this method.
+     *
+     * @param bool   $condition  A condition that evaluates to true or false
+     * @param string $url        Url
+     * @param int    $statusCode Status code (default to 302)
+     *
+     * @throws sfStopException
+     *
+     * @see redirect
+     */
+    public function redirectIf($condition, $url, $statusCode = 302)
     {
-      $this->forward($module, $action);
+        if ($condition) {
+            // compatibility with url_for2() style signature
+            $arguments = func_get_args();
+            call_user_func_array(array($this, 'redirect'), array_slice($arguments, 1));
+        }
     }
-  }
-
-  /**
-   * Redirects current request to a new URL.
-   *
-   * 2 URL formats are accepted :
-   *  - a full URL: http://www.google.com/
-   *  - an internal URL (url_for() format): module/action
-   *
-   * This method stops the action. So, no code is executed after a call to this method.
-   *
-   * @param  string $url         Url
-   * @param  int    $statusCode  Status code (default to 302)
-   *
-   * @throws sfStopException
-   */
-  public function redirect($url, $statusCode = 302)
-  {
-    // compatibility with url_for2() style signature
-    if (is_object($statusCode) || is_array($statusCode))
+
+    /**
+     * Redirects current request to a new URL, unless specified condition is true.
+     *
+     * This method stops the action. So, no code is executed after a call to this method.
+     *
+     * @param bool   $condition  A condition that evaluates to true or false
+     * @param string $url        Url
+     * @param int    $statusCode Status code (default to 302)
+     *
+     * @throws sfStopException
+     *
+     * @see redirect
+     */
+    public function redirectUnless($condition, $url, $statusCode = 302)
     {
-      $url = array_merge(array('sf_route' => $url), is_object($statusCode) ? array('sf_subject' => $statusCode) : $statusCode);
-      $statusCode = func_num_args() >= 3 ? func_get_arg(2) : 302;
+        if (!$condition) {
+            // compatibility with url_for2() style signature
+            $arguments = func_get_args();
+            call_user_func_array(array($this, 'redirect'), array_slice($arguments, 1));
+        }
     }
 
-    $this->getController()->redirect($url, 0, $statusCode);
-
-    throw new sfStopException();
-  }
-
-  /**
-   * Redirects current request to a new URL, only if specified condition is true.
-   *
-   * This method stops the action. So, no code is executed after a call to this method.
-   *
-   * @param  bool   $condition  A condition that evaluates to true or false
-   * @param  string $url        Url
-   * @param  int    $statusCode Status code (default to 302)
-   *
-   * @throws sfStopException
-   *
-   * @see redirect
-   */
-  public function redirectIf($condition, $url, $statusCode = 302)
-  {
-    if ($condition)
+    /**
+     * Appends the given text to the response content and bypasses the built-in view system.
+     *
+     * This method must be called as with a return:
+     *
+     * <code>return $this->renderText('some text')</code>
+     *
+     * @param string $text Text to append to the response
+     *
+     * @return string sfView::NONE
+     */
+    public function renderText($text)
     {
-      // compatibility with url_for2() style signature
-      $arguments = func_get_args();
-      call_user_func_array(array($this, 'redirect'), array_slice($arguments, 1));
+        $this->getResponse()->setContent($this->getResponse()->getContent().$text);
+
+        return sfView::NONE;
     }
-  }
-
-  /**
-   * Redirects current request to a new URL, unless specified condition is true.
-   *
-   * This method stops the action. So, no code is executed after a call to this method.
-   *
-   * @param  bool   $condition  A condition that evaluates to true or false
-   * @param  string $url        Url
-   * @param  int    $statusCode Status code (default to 302)
-   *
-   * @throws sfStopException
-   *
-   * @see redirect
-   */
-  public function redirectUnless($condition, $url, $statusCode = 302)
-  {
-    if (!$condition)
+
+    /**
+     * Convert the given data into a JSON response.
+     *
+     * <code>return $this->renderJson(array('username' => 'john'))</code>
+     *
+     * @param mixed $data Data to encode as JSON
+     *
+     * @return string sfView::NONE
+     */
+    public function renderJson($data)
     {
-      // compatibility with url_for2() style signature
-      $arguments = func_get_args();
-      call_user_func_array(array($this, 'redirect'), array_slice($arguments, 1));
+        $this->getResponse()->setContentType('application/json');
+        $this->getResponse()->setContent(json_encode($data));
+
+        return sfView::NONE;
     }
-  }
-
-  /**
-   * Appends the given text to the response content and bypasses the built-in view system.
-   *
-   * This method must be called as with a return:
-   *
-   * <code>return $this->renderText('some text')</code>
-   *
-   * @param string $text Text to append to the response
-   *
-   * @return string sfView::NONE
-   */
-  public function renderText($text)
-  {
-    $this->getResponse()->setContent($this->getResponse()->getContent().$text);
-
-    return sfView::NONE;
-  }
-
-  /**
-   * Convert the given data into a JSON response.
-   *
-   * <code>return $this->renderJson(array('username' => 'john'))</code>
-   *
-   * @param mixed $data Data to encode as JSON
-   *
-   * @return string sfView::NONE
-   */
-  public function renderJson($data)
-  {
-    $this->getResponse()->setContentType('application/json');
-    $this->getResponse()->setContent(json_encode($data));
-
-    return sfView::NONE;
-  }
-
-  /**
-   * Returns the partial rendered content.
-   *
-   * If the vars parameter is omitted, the action's internal variables
-   * will be passed, just as it would to a normal template.
-   *
-   * If the vars parameter is set then only those values are
-   * available in the partial.
-   *
-   * @param  string $templateName partial name
-   * @param  array  $vars         vars
-   *
-   * @return string The partial content
-   */
-  public function getPartial($templateName, $vars = null)
-  {
-    $this->getContext()->getConfiguration()->loadHelpers('Partial');
-
-    $vars = null !== $vars ? $vars : $this->varHolder->getAll();
-
-    return get_partial($templateName, $vars);
-  }
-
-  /**
-   * Appends the result of the given partial execution to the response content.
-   *
-   * This method must be called as with a return:
-   *
-   * <code>return $this->renderPartial('foo/bar')</code>
-   *
-   * @param  string $templateName partial name
-   * @param  array  $vars         vars
-   *
-   * @return string sfView::NONE
-   *
-   * @see    getPartial
-   */
-  public function renderPartial($templateName, $vars = null)
-  {
-    return $this->renderText($this->getPartial($templateName, $vars));
-  }
-
-  /**
-   * Returns the component rendered content.
-   *
-   * If the vars parameter is omitted, the action's internal variables
-   * will be passed, just as it would to a normal template.
-   *
-   * If the vars parameter is set then only those values are
-   * available in the component.
-   *
-   * @param  string  $moduleName    module name
-   * @param  string  $componentName  component name
-   * @param  array   $vars          vars
-   *
-   * @return string  The component rendered content
-   */
-  public function getComponent($moduleName, $componentName, $vars = null)
-  {
-    $this->getContext()->getConfiguration()->loadHelpers('Partial');
-
-    $vars = null !== $vars ? $vars : $this->varHolder->getAll();
-
-    return get_component($moduleName, $componentName, $vars);
-  }
-
-  /**
-   * Appends the result of the given component execution to the response content.
-   *
-   * This method must be called as with a return:
-   *
-   * <code>return $this->renderComponent('foo', 'bar')</code>
-   *
-   * @param  string  $moduleName    module name
-   * @param  string  $componentName  component name
-   * @param  array   $vars          vars
-   *
-   * @return string  sfView::NONE
-   *
-   * @see    getComponent
-   */
-  public function renderComponent($moduleName, $componentName, $vars = null)
-  {
-    return $this->renderText($this->getComponent($moduleName, $componentName, $vars));
-  }
-
-  /**
-   * Returns the security configuration for this module.
-   *
-   * @return string Current security configuration as an array
-   */
-  public function getSecurityConfiguration()
-  {
-    return $this->security;
-  }
-
-  /**
-   * Overrides the current security configuration for this module.
-   *
-   * @param array $security The new security configuration
-   */
-  public function setSecurityConfiguration($security)
-  {
-    $this->security = $security;
-  }
-
-  /**
-   * Returns a value from security.yml.
-   *
-   * @param string $name    The name of the value to pull from security.yml
-   * @param mixed  $default The default value to return if none is found in security.yml
-   *
-   * @return mixed
-   */
-  public function getSecurityValue($name, $default = null)
-  {
-    $actionName = strtolower($this->getActionName());
-
-    if (isset($this->security[$actionName][$name]))
+
+    /**
+     * Returns the partial rendered content.
+     *
+     * If the vars parameter is omitted, the action's internal variables
+     * will be passed, just as it would to a normal template.
+     *
+     * If the vars parameter is set then only those values are
+     * available in the partial.
+     *
+     * @param string $templateName partial name
+     * @param array  $vars         vars
+     *
+     * @return string The partial content
+     */
+    public function getPartial($templateName, $vars = null)
     {
-      return $this->security[$actionName][$name];
+        $this->getContext()->getConfiguration()->loadHelpers('Partial');
+
+        $vars = null !== $vars ? $vars : $this->varHolder->getAll();
+
+        return get_partial($templateName, $vars);
     }
 
-    if (isset($this->security['all'][$name]))
+    /**
+     * Appends the result of the given partial execution to the response content.
+     *
+     * This method must be called as with a return:
+     *
+     * <code>return $this->renderPartial('foo/bar')</code>
+     *
+     * @param string $templateName partial name
+     * @param array  $vars         vars
+     *
+     * @return string sfView::NONE
+     *
+     * @see    getPartial
+     */
+    public function renderPartial($templateName, $vars = null)
     {
-      return $this->security['all'][$name];
+        return $this->renderText($this->getPartial($templateName, $vars));
     }
 
-    return $default;
-  }
-
-  /**
-   * Indicates that this action requires security.
-   *
-   * @return bool true, if this action requires security, otherwise false.
-   */
-  public function isSecure()
-  {
-    return $this->getSecurityValue('is_secure', false);
-  }
-
-  /**
-   * Gets credentials the user must have to access this action.
-   *
-   * @return mixed An array or a string describing the credentials the user must have to access this action
-   */
-  public function getCredential()
-  {
-    return $this->getSecurityValue('credentials');
-  }
-
-  /**
-   * Sets an alternate template for this sfAction.
-   *
-   * See 'Naming Conventions' in the 'Symfony View' documentation.
-   *
-   * @param string $name    Template name
-   * @param string $module  The module (current if null)
-   */
-  public function setTemplate($name, $module = null)
-  {
-    if (sfConfig::get('sf_logging_enabled'))
+    /**
+     * Returns the component rendered content.
+     *
+     * If the vars parameter is omitted, the action's internal variables
+     * will be passed, just as it would to a normal template.
+     *
+     * If the vars parameter is set then only those values are
+     * available in the component.
+     *
+     * @param string $moduleName    module name
+     * @param string $componentName component name
+     * @param array  $vars          vars
+     *
+     * @return string The component rendered content
+     */
+    public function getComponent($moduleName, $componentName, $vars = null)
     {
-      $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Change template to "%s/%s"', null === $module ? 'CURRENT' : $module, $name))));
+        $this->getContext()->getConfiguration()->loadHelpers('Partial');
+
+        $vars = null !== $vars ? $vars : $this->varHolder->getAll();
+
+        return get_component($moduleName, $componentName, $vars);
     }
 
-    if (null !== $module)
+    /**
+     * Appends the result of the given component execution to the response content.
+     *
+     * This method must be called as with a return:
+     *
+     * <code>return $this->renderComponent('foo', 'bar')</code>
+     *
+     * @param string $moduleName    module name
+     * @param string $componentName component name
+     * @param array  $vars          vars
+     *
+     * @return string sfView::NONE
+     *
+     * @see    getComponent
+     */
+    public function renderComponent($moduleName, $componentName, $vars = null)
     {
-      $dir = $this->context->getConfiguration()->getTemplateDir($module, $name.sfView::SUCCESS.'.php');
-      $name = $dir.'/'.$name;
+        return $this->renderText($this->getComponent($moduleName, $componentName, $vars));
     }
 
-    sfConfig::set('symfony.view.'.$this->getModuleName().'_'.$this->getActionName().'_template', $name);
-  }
-
-  /**
-   * Gets the name of the alternate template for this sfAction.
-   *
-   * WARNING: It only returns the template you set with the setTemplate() method,
-   *          and does not return the template that you configured in your view.yml.
-   *
-   * See 'Naming Conventions' in the 'Symfony View' documentation.
-   *
-   * @return string Template name. Returns null if no template has been set within the action
-   */
-  public function getTemplate()
-  {
-    return sfConfig::get('symfony.view.'.$this->getModuleName().'_'.$this->getActionName().'_template');
-  }
-
-  /**
-   * Sets an alternate layout for this sfAction.
-   *
-   * To de-activate the layout, set the layout name to false.
-   *
-   * To revert the layout to the one configured in the view.yml, set the template name to null.
-   *
-   * @param mixed $name Layout name or false to de-activate the layout
-   */
-  public function setLayout($name)
-  {
-    if (sfConfig::get('sf_logging_enabled'))
+    /**
+     * Returns the security configuration for this module.
+     *
+     * @return string Current security configuration as an array
+     */
+    public function getSecurityConfiguration()
     {
-      $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Change layout to "%s"', $name))));
+        return $this->security;
     }
 
-    sfConfig::set('symfony.view.'.$this->getModuleName().'_'.$this->getActionName().'_layout', $name);
-  }
-
-  /**
-   * Gets the name of the alternate layout for this sfAction.
-   *
-   * WARNING: It only returns the layout you set with the setLayout() method,
-   *          and does not return the layout that you configured in your view.yml.
-   *
-   * @return mixed Layout name. Returns null if no layout has been set within the action
-   */
-  public function getLayout()
-  {
-    return sfConfig::get('symfony.view.'.$this->getModuleName().'_'.$this->getActionName().'_layout');
-  }
-
-  /**
-   * Changes the default view class used for rendering the template associated with the current action.
-   *
-   * @param string $class View class name
-   */
-  public function setViewClass($class)
-  {
-    sfConfig::set('mod_'.strtolower($this->getModuleName()).'_view_class', $class);
-  }
-
-  /**
-   * Returns the current route for this request
-   *
-   * @return sfRoute The route for the request
-   */
-  public function getRoute()
-  {
-    return $this->getRequest()->getAttribute('sf_route');
-  }
-
-  /**
-   * Returns a formatted message for a 404 error.
-   *
-   * @param  string $message An error message (null by default)
-   *
-   * @return string The error message or a default one if null
-   */
-  protected function get404Message($message = null)
-  {
-    return null === $message ? sprintf('This request has been forwarded to a 404 error page by the action "%s/%s".', $this->getModuleName(), $this->getActionName()) : $message;
-  }
+    /**
+     * Overrides the current security configuration for this module.
+     *
+     * @param array $security The new security configuration
+     */
+    public function setSecurityConfiguration($security)
+    {
+        $this->security = $security;
+    }
+
+    /**
+     * Returns a value from security.yml.
+     *
+     * @param string $name    The name of the value to pull from security.yml
+     * @param mixed  $default The default value to return if none is found in security.yml
+     *
+     * @return mixed
+     */
+    public function getSecurityValue($name, $default = null)
+    {
+        $actionName = strtolower($this->getActionName());
+
+        if (isset($this->security[$actionName][$name])) {
+            return $this->security[$actionName][$name];
+        }
+
+        if (isset($this->security['all'][$name])) {
+            return $this->security['all'][$name];
+        }
+
+        return $default;
+    }
+
+    /**
+     * Indicates that this action requires security.
+     *
+     * @return bool true, if this action requires security, otherwise false
+     */
+    public function isSecure()
+    {
+        return $this->getSecurityValue('is_secure', false);
+    }
+
+    /**
+     * Gets credentials the user must have to access this action.
+     *
+     * @return mixed An array or a string describing the credentials the user must have to access this action
+     */
+    public function getCredential()
+    {
+        return $this->getSecurityValue('credentials');
+    }
+
+    /**
+     * Sets an alternate template for this sfAction.
+     *
+     * See 'Naming Conventions' in the 'Symfony View' documentation.
+     *
+     * @param string $name   Template name
+     * @param string $module The module (current if null)
+     */
+    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 (null !== $module) {
+            $dir = $this->context->getConfiguration()->getTemplateDir($module, $name.sfView::SUCCESS.'.php');
+            $name = $dir.'/'.$name;
+        }
+
+        sfConfig::set('symfony.view.'.$this->getModuleName().'_'.$this->getActionName().'_template', $name);
+    }
+
+    /**
+     * Gets the name of the alternate template for this sfAction.
+     *
+     * WARNING: It only returns the template you set with the setTemplate() method,
+     *          and does not return the template that you configured in your view.yml.
+     *
+     * See 'Naming Conventions' in the 'Symfony View' documentation.
+     *
+     * @return string Template name. Returns null if no template has been set within the action
+     */
+    public function getTemplate()
+    {
+        return sfConfig::get('symfony.view.'.$this->getModuleName().'_'.$this->getActionName().'_template');
+    }
+
+    /**
+     * Sets an alternate layout for this sfAction.
+     *
+     * To de-activate the layout, set the layout name to false.
+     *
+     * To revert the layout to the one configured in the view.yml, set the template name to null.
+     *
+     * @param mixed $name Layout name or false to de-activate the layout
+     */
+    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))));
+        }
+
+        sfConfig::set('symfony.view.'.$this->getModuleName().'_'.$this->getActionName().'_layout', $name);
+    }
+
+    /**
+     * Gets the name of the alternate layout for this sfAction.
+     *
+     * WARNING: It only returns the layout you set with the setLayout() method,
+     *          and does not return the layout that you configured in your view.yml.
+     *
+     * @return mixed Layout name. Returns null if no layout has been set within the action
+     */
+    public function getLayout()
+    {
+        return sfConfig::get('symfony.view.'.$this->getModuleName().'_'.$this->getActionName().'_layout');
+    }
+
+    /**
+     * Changes the default view class used for rendering the template associated with the current action.
+     *
+     * @param string $class View class name
+     */
+    public function setViewClass($class)
+    {
+        sfConfig::set('mod_'.strtolower($this->getModuleName()).'_view_class', $class);
+    }
+
+    /**
+     * Returns the current route for this request.
+     *
+     * @return sfRoute The route for the request
+     */
+    public function getRoute()
+    {
+        return $this->getRequest()->getAttribute('sf_route');
+    }
+
+    /**
+     * Returns a formatted message for a 404 error.
+     *
+     * @param string $message An error message (null by default)
+     *
+     * @return string The error message or a default one if null
+     */
+    protected function get404Message($message = null)
+    {
+        return null === $message ? sprintf('This request has been forwarded to a 404 error page by the action "%s/%s".', $this->getModuleName(), $this->getActionName()) : $message;
+    }
 }
diff --git a/lib/action/sfActionStack.class.php b/lib/action/sfActionStack.class.php
index 351117588..41c17e228 100644
--- a/lib/action/sfActionStack.class.php
+++ b/lib/action/sfActionStack.class.php
@@ -13,108 +13,103 @@
  * sfActionStack keeps a list of all requested actions and provides accessor
  * methods for retrieving individual entries.
  *
- * @package    symfony
- * @subpackage action
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 class sfActionStack
 {
-  /** @var sfActionStackEntry[] */
-  protected
-    $stack = array();
-
-  /**
-   * 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
-   *
-   * @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);
-
-    $this->stack[] = $actionEntry;
-
-    return $actionEntry;
-  }
-
-  /**
-   * Retrieves the entry at a specific index.
-   *
-   * @param int $index An entry index
-   *
-   * @return sfActionStackEntry An action stack entry implementation.
-   */
-  public function getEntry($index)
-  {
-    $retval = null;
-
-    if ($index > -1 && $index < count($this->stack))
+    /** @var sfActionStackEntry[] */
+    protected $stack = array();
+
+    /**
+     * 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
+     *
+     * @return sfActionStackEntry sfActionStackEntry instance
+     */
+    public function addEntry($moduleName, $actionName, $actionInstance)
     {
-      $retval = $this->stack[$index];
+        // create our action stack entry and add it to our stack
+        $actionEntry = new sfActionStackEntry($moduleName, $actionName, $actionInstance);
+
+        $this->stack[] = $actionEntry;
+
+        return $actionEntry;
     }
 
-    return $retval;
-  }
-
-  /**
-   * Removes the entry at a specific index.
-   *
-   * @return sfActionStackEntry An action stack entry implementation.
-   */
-  public function popEntry()
-  {
-    return array_pop($this->stack);
-  }
-
-  /**
-   * Retrieves the first entry.
-   *
-   * @return mixed An action stack entry implementation or null if there is no sfAction instance in the stack
-   */
-  public function getFirstEntry()
-  {
-    $retval = null;
-
-    if (isset($this->stack[0]))
+    /**
+     * Retrieves the entry at a specific index.
+     *
+     * @param int $index An entry index
+     *
+     * @return sfActionStackEntry an action stack entry implementation
+     */
+    public function getEntry($index)
     {
-      $retval = $this->stack[0];
+        $retval = null;
+
+        if ($index > -1 && $index < count($this->stack)) {
+            $retval = $this->stack[$index];
+        }
+
+        return $retval;
     }
 
-    return $retval;
-  }
+    /**
+     * Removes the entry at a specific index.
+     *
+     * @return sfActionStackEntry an action stack entry implementation
+     */
+    public function popEntry()
+    {
+        return array_pop($this->stack);
+    }
 
-  /**
-   * Retrieves the last entry.
-   *
-   * @return mixed An action stack entry implementation or null if there is no sfAction instance in the stack
-   */
-  public function getLastEntry()
-  {
-    $count  = count($this->stack);
-    $retval = null;
+    /**
+     * Retrieves the first entry.
+     *
+     * @return mixed An action stack entry implementation or null if there is no sfAction instance in the stack
+     */
+    public function getFirstEntry()
+    {
+        $retval = null;
 
-    if (isset($this->stack[0]))
+        if (isset($this->stack[0])) {
+            $retval = $this->stack[0];
+        }
+
+        return $retval;
+    }
+
+    /**
+     * Retrieves the last entry.
+     *
+     * @return mixed An action stack entry implementation or null if there is no sfAction instance in the stack
+     */
+    public function getLastEntry()
     {
-      $retval = $this->stack[$count - 1];
+        $count = count($this->stack);
+        $retval = null;
+
+        if (isset($this->stack[0])) {
+            $retval = $this->stack[$count - 1];
+        }
+
+        return $retval;
     }
 
-    return $retval;
-  }
-
-  /**
-   * Retrieves the size of this stack.
-   *
-   * @return int The size of this stack.
-   */
-  public function getSize()
-  {
-    return count($this->stack);
-  }
+    /**
+     * Retrieves the size of this stack.
+     *
+     * @return int the size of this stack
+     */
+    public function getSize()
+    {
+        return count($this->stack);
+    }
 }
diff --git a/lib/action/sfActionStackEntry.class.php b/lib/action/sfActionStackEntry.class.php
index 32f691126..1624e710b 100644
--- a/lib/action/sfActionStackEntry.class.php
+++ b/lib/action/sfActionStackEntry.class.php
@@ -4,7 +4,7 @@
  * 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>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -12,83 +12,81 @@
 /**
  * sfActionStackEntry represents information relating to a single sfAction request during a single HTTP request.
  *
- * @package    symfony
- * @subpackage action
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 class sfActionStackEntry
 {
-  protected
-    $actionInstance = null,
-    $actionName     = null,
-    $moduleName     = null,
-    $presentation   = null;
+    protected $actionInstance;
+    protected $actionName;
+    protected $moduleName;
+    protected $presentation;
 
-  /**
-   * Class constructor.
-   *
-   * @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)
-  {
-    $this->actionName     = $actionName;
-    $this->actionInstance = $actionInstance;
-    $this->moduleName     = $moduleName;
-  }
+    /**
+     * Class constructor.
+     *
+     * @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)
+    {
+        $this->actionName = $actionName;
+        $this->actionInstance = $actionInstance;
+        $this->moduleName = $moduleName;
+    }
 
-  /**
-   * Retrieves this entry's action name.
-   *
-   * @return string An action name
-   */
-  public function getActionName()
-  {
-    return $this->actionName;
-  }
+    /**
+     * Retrieves this entry's action name.
+     *
+     * @return string An action name
+     */
+    public function getActionName()
+    {
+        return $this->actionName;
+    }
 
-  /**
-   * Retrieves this entry's action instance.
-   *
-   * @return sfAction An sfAction implementation instance
-   */
-  public function getActionInstance()
-  {
-    return $this->actionInstance;
-  }
+    /**
+     * Retrieves this entry's action instance.
+     *
+     * @return sfAction An sfAction implementation instance
+     */
+    public function getActionInstance()
+    {
+        return $this->actionInstance;
+    }
 
-  /**
-   * Retrieves this entry's module name.
-   *
-   * @return string A module name
-   */
-  public function getModuleName()
-  {
-    return $this->moduleName;
-  }
+    /**
+     * Retrieves this entry's module name.
+     *
+     * @return string A module name
+     */
+    public function getModuleName()
+    {
+        return $this->moduleName;
+    }
 
-  /**
-   * Retrieves this entry's rendered view presentation.
-   *
-   * This will only exist if the view has processed and the render mode is set to sfView::RENDER_VAR.
-   *
-   * @return string Rendered view presentation
-   */
-  public function & getPresentation()
-  {
-    return $this->presentation;
-  }
+    /**
+     * Retrieves this entry's rendered view presentation.
+     *
+     * This will only exist if the view has processed and the render mode is set to sfView::RENDER_VAR.
+     *
+     * @return string Rendered view presentation
+     */
+    public function &getPresentation()
+    {
+        return $this->presentation;
+    }
 
-  /**
-   * Sets the rendered presentation for this action.
-   *
-   * @param string $presentation A rendered presentation.
-   */
-  public function setPresentation(&$presentation)
-  {
-    $this->presentation =& $presentation;
-  }
+    /**
+     * Sets the rendered presentation for this action.
+     *
+     * @param string $presentation a rendered presentation
+     */
+    public function setPresentation(&$presentation)
+    {
+        $this->presentation = &$presentation;
+    }
 }
diff --git a/lib/action/sfActions.class.php b/lib/action/sfActions.class.php
index fcc84b47c..2a2de62da 100644
--- a/lib/action/sfActions.class.php
+++ b/lib/action/sfActions.class.php
@@ -4,7 +4,7 @@
  * 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>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -12,51 +12,47 @@
 /**
  * sfActions executes all the logic for the current request.
  *
- * @package    symfony
- * @subpackage action
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfActions extends sfAction
 {
-  /**
-   * Dispatches to the action defined by the 'action' parameter of the sfRequest object.
-   *
-   * 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
-   *
-   * @return string    A string containing the view name associated with this action
-   *
-   * @throws sfInitializationException
-   *
-   * @see sfAction
-   */
-  public function execute($request)
-  {
-    // dispatch action
-    $actionToRun = 'execute'.ucfirst($this->getActionName());
-
-    if ($actionToRun === 'execute')
+    /**
+     * Dispatches to the action defined by the 'action' parameter of the sfRequest object.
+     *
+     * 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
+     *
+     * @return string A string containing the view name associated with this action
+     *
+     * @throws sfInitializationException
+     *
+     * @see sfAction
+     */
+    public function execute($request)
     {
-      // no action given
-      throw new sfInitializationException(sprintf('sfAction initialization failed for module "%s". There was no action given.', $this->getModuleName()));
-    }
+        // dispatch action
+        $actionToRun = 'execute'.ucfirst($this->getActionName());
 
-    if (!is_callable(array($this, $actionToRun)))
-    {
-      // action not found
-      throw new sfInitializationException(sprintf('sfAction initialization failed for module "%s", action "%s". You must create a "%s" method.', $this->getModuleName(), $this->getActionName(), $actionToRun));
-    }
+        if ('execute' === $actionToRun) {
+            // no action given
+            throw new sfInitializationException(sprintf('sfAction initialization failed for module "%s". There was no action given.', $this->getModuleName()));
+        }
 
-    if (sfConfig::get('sf_logging_enabled'))
-    {
-      $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Call "%s->%s()"', get_class($this), $actionToRun))));
-    }
+        if (!is_callable(array($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));
+        }
 
-    // run action
-    return $this->$actionToRun($request);
-  }
+        if (sfConfig::get('sf_logging_enabled')) {
+            $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Call "%s->%s()"', get_class($this), $actionToRun))));
+        }
+
+        // run action
+        return $this->{$actionToRun}($request);
+    }
 }
diff --git a/lib/action/sfComponent.class.php b/lib/action/sfComponent.class.php
index e76d8d689..b933f9a83 100644
--- a/lib/action/sfComponent.class.php
+++ b/lib/action/sfComponent.class.php
@@ -11,415 +11,418 @@
 /**
  * sfComponent.
  *
- * @package    symfony
- * @subpackage action
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfComponent
 {
-  /** @var string */
-  protected $moduleName             = '';
-  /** @var string */
-  protected $actionName             = '';
-  /** @var sfContext */
-  protected $context                = null;
-  /** @var sfEventDispatcher */
-  protected $dispatcher             = null;
-  /** @var sfRequest */
-  protected $request                = null;
-  /** @var sfResponse */
-  protected $response               = null;
-  /** @var sfParameterHolder */
-  protected $varHolder              = null;
-  /** @var sfParameterHolder */
-  protected $requestParameterHolder = null;
-
-  /**
-   * Class constructor.
-   *
-   * @see initialize()
-   *
-   * @param sfContext $context
-   * @param string $moduleName
-   * @param string $actionName
-   */
-  public function __construct($context, $moduleName, $actionName)
-  {
-    $this->initialize($context, $moduleName, $actionName);
-  }
-
-  /**
-   * Initializes this component.
-   *
-   * @param sfContext $context    The current application context.
-   * @param string    $moduleName The module name.
-   * @param string    $actionName The action name.
-   *
-   * @return void
-   */
-  public function initialize($context, $moduleName, $actionName)
-  {
-    $this->moduleName             = $moduleName;
-    $this->actionName             = $actionName;
-    $this->context                = $context;
-    $this->dispatcher             = $context->getEventDispatcher();
-    $this->varHolder              = new sfParameterHolder();
-    $this->request                = $context->getRequest();
-    $this->response               = $context->getResponse();
-    $this->requestParameterHolder = $this->request->getParameterHolder();
-  }
-
-  /**
-   * Execute any application/business logic for this component.
-   *
-   * In a typical database-driven application, execute() handles application
-   * logic itself and then proceeds to create a model instance. Once the model
-   * instance is initialized it handles all business logic for the action.
-   *
-   * A model should represent an entity in your application. This could be a
-   * user account, a shopping cart, or even a something as simple as a
-   * single product.
-   *
-   * @param sfRequest $request The current sfRequest object
-   *
-   * @return mixed     A string containing the view name associated with this action
-   */
-  abstract function execute($request);
-
-  /**
-   * Gets the module name associated with this component.
-   *
-   * @return string A module name
-   */
-  public function getModuleName()
-  {
-    return $this->moduleName;
-  }
-
-  /**
-   * Gets the action name associated with this component.
-   *
-   * @return string An action name
-   */
-  public function getActionName()
-  {
-    return $this->actionName;
-  }
-
-  /**
-   * Retrieves the current application context.
-   *
-   * @return sfContext The current sfContext instance
-   */
-  public final function getContext()
-  {
-    return $this->context;
-  }
-
-  /**
-   * Retrieves the current service container instance.
-   *
-   * @return sfServiceContainer The current sfServiceContainer instance
-   */
-  public final function getServiceContainer()
-  {
-    return $this->context->getServiceContainer();
-  }
-
-  /**
-   * Retrieves a service from the service container.
-   *
-   * @param  string $id The service identifier
-   *
-   * @return object The service instance
-   */
-  public function getService($id)
-  {
-    return $this->getServiceContainer()->getService($id);
-  }
-
-  /**
-   * Retrieves the current logger instance.
-   *
-   * @return sfLogger The current sfLogger instance
-   */
-  public final function getLogger()
-  {
-    return $this->context->getLogger();
-  }
-
-  /**
-   * Logs a message using the sfLogger object.
-   *
-   * @param mixed  $message  String or object containing the message to log
-   * @param string $priority The priority of the message
-   *                         (available priorities: emerg, alert, crit, err,
-   *                         warning, notice, info, debug)
-   *
-   * @see sfLogger
-   */
-  public function logMessage($message, $priority = 'info')
-  {
-    if (sfConfig::get('sf_logging_enabled'))
+    /** @var string */
+    protected $moduleName = '';
+
+    /** @var string */
+    protected $actionName = '';
+
+    /** @var sfContext */
+    protected $context;
+
+    /** @var sfEventDispatcher */
+    protected $dispatcher;
+
+    /** @var sfRequest */
+    protected $request;
+
+    /** @var sfResponse */
+    protected $response;
+
+    /** @var sfParameterHolder */
+    protected $varHolder;
+
+    /** @var sfParameterHolder */
+    protected $requestParameterHolder;
+
+    /**
+     * Class constructor.
+     *
+     * @see initialize()
+     *
+     * @param sfContext $context
+     * @param string    $moduleName
+     * @param string    $actionName
+     */
+    public function __construct($context, $moduleName, $actionName)
+    {
+        $this->initialize($context, $moduleName, $actionName);
+    }
+
+    /**
+     * Gets the translation for the given string.
+     *
+     * @param string $string    The string to translate
+     * @param array  $args      An array of arguments for the translation
+     * @param string $catalogue The catalogue name
+     *
+     * @return string The translated string
+     */
+    public function __($string, $args = array(), $catalogue = 'messages')
+    {
+        return $this->context->getI18N()->__($string, $args, $catalogue);
+    }
+
+    /**
+     * Sets a variable for the template.
+     *
+     * This is a shortcut for:
+     *
+     * <code>$this->setVar('name', 'value')</code>
+     *
+     * @param string $key   The variable name
+     * @param string $value The variable value
+     *
+     * @return bool always true
+     *
+     * @see setVar()
+     */
+    public function __set($key, $value)
+    {
+        return $this->varHolder->setByRef($key, $value);
+    }
+
+    /**
+     * Returns true if a variable for the template is set.
+     *
+     * This is a shortcut for:
+     *
+     * <code>$this->getVarHolder()->has('name')</code>
+     *
+     * @param string $name The variable name
+     *
+     * @return bool true if the variable is set
+     */
+    public function __isset($name)
+    {
+        return $this->varHolder->has($name);
+    }
+
+    /**
+     * Removes a variable for the template.
+     *
+     * This is just really a shortcut for:
+     *
+     * <code>$this->getVarHolder()->remove('name')</code>
+     *
+     * @param string $name The variable Name
+     */
+    public function __unset($name)
     {
-      $this->dispatcher->notify(new sfEvent($this, 'application.log', array($message, 'priority' => constant('sfLogger::'.strtoupper($priority)))));
+        $this->varHolder->remove($name);
     }
-  }
-
-  /**
-   * Gets the translation for the given string
-   *
-   * @param  string $string     The string to translate
-   * @param  array  $args       An array of arguments for the translation
-   * @param  string $catalogue  The catalogue name
-   *
-   * @return string The translated string
-   */
-  public function __($string, $args = array(), $catalogue = 'messages')
-  {
-    return $this->context->getI18N()->__($string, $args, $catalogue);
-  }
-
-  /**
-   * Returns the value of a request parameter.
-   *
-   * This is a proxy method equivalent to:
-   *
-   * <code>$this->getRequest()->getParameterHolder()->get($name)</code>
-   *
-   * @param string $name    The parameter name
-   * @param mixed  $default The default value if parameter does not exist
-   *
-   * @return string The request parameter value
-   */
-  public function getRequestParameter($name, $default = null)
-  {
-    return $this->requestParameterHolder->get($name, $default);
-  }
-
-  /**
-   * Returns true if a request parameter exists.
-   *
-   * This is a proxy method equivalent to:
-   *
-   * <code>$this->getRequest()->getParameterHolder()->has($name)</code>
-   *
-   * @param string $name The parameter name
-   * @return boolean true if the request parameter exists, false otherwise
-   */
-  public function hasRequestParameter($name)
-  {
-    return $this->requestParameterHolder->has($name);
-  }
-
-  /**
-   * Retrieves the current sfRequest object.
-   *
-   * This is a proxy method equivalent to:
-   *
-   * <code>$this->getContext()->getRequest()</code>
-   *
-   * @return sfRequest The current sfRequest implementation instance
-   */
-  public function getRequest()
-  {
-    return $this->request;
-  }
-
-  /**
-   * Retrieves the current sfResponse object.
-   *
-   * This is a proxy method equivalent to:
-   *
-   * <code>$this->getContext()->getResponse()</code>
-   *
-   * @return sfResponse The current sfResponse implementation instance
-   */
-  public function getResponse()
-  {
-    return $this->response;
-  }
-
-  /**
-   * Retrieves the current sfController object.
-   *
-   * This is a proxy method equivalent to:
-   *
-   * <code>$this->getContext()->getController()</code>
-   *
-   * @return sfController The current sfController implementation instance
-   */
-  public function getController()
-  {
-    return $this->context->getController();
-  }
-
-  /**
-   * Generates a URL for the given route and arguments.
-   *
-   * This is a proxy method equivalent to:
-   *
-   * <code>$this->getContext()->getRouting()->generate(...)</code>
-   *
-   * @param string  $route    The route name
-   * @param array   $params   An array of parameters for the route
-   * @param Boolean $absolute Whether to generate an absolute URL or not
-   *
-   * @return string  The URL
-   */
-  public function generateUrl($route, $params = array(), $absolute = false)
-  {
-    return $this->context->getRouting()->generate($route, $params, $absolute);
-  }
-
-  /**
-   * Retrieves the current sfUser object.
-   *
-   * This is a proxy method equivalent to:
-   *
-   * <code>$this->getContext()->getUser()</code>
-   *
-   * @return sfUser The current sfUser implementation instance
-   */
-  public function getUser()
-  {
-    return $this->context->getUser();
-  }
-
-  /**
-   * Gets the current mailer instance.
-   *
-   * @return sfMailer A sfMailer instance
-   */
-  public function getMailer()
-  {
-    return $this->getContext()->getMailer();
-  }
-
-  /**
-   * Sets a variable for the template.
-   *
-   * If you add a safe value, the variable won't be output escaped
-   * by symfony, so this is your responsability to ensure that the
-   * value is escaped properly.
-   *
-   * @param string  $name  The variable name
-   * @param mixed   $value The variable value
-   * @param Boolean $safe  true if the value is safe for output (false by default)
-   */
-  public function setVar($name, $value, $safe = false)
-  {
-    $this->varHolder->set($name, $safe ? new sfOutputEscaperSafe($value) : $value);
-  }
-
-  /**
-   * Gets a variable set for the template.
-   *
-   * @param string $name The variable name
-   *
-   * @return mixed  The variable value
-   */
-  public function getVar($name)
-  {
-    return $this->varHolder->get($name);
-  }
-
-  /**
-   * Gets the sfParameterHolder object that stores the template variables.
-   *
-   * @return sfParameterHolder The variable holder.
-   */
-  public function getVarHolder()
-  {
-    return $this->varHolder;
-  }
-
-  /**
-   * Sets a variable for the template.
-   *
-   * This is a shortcut for:
-   *
-   * <code>$this->setVar('name', 'value')</code>
-   *
-   * @param string $key   The variable name
-   * @param string $value The variable value
-   *
-   * @return boolean always true
-   *
-   * @see setVar()
-   */
-  public function __set($key, $value)
-  {
-    return $this->varHolder->setByRef($key, $value);
-  }
-
-  /**
-   * Gets a variable for the template.
-   *
-   * This is a shortcut for:
-   *
-   * <code>$this->getVar('name')</code>
-   *
-   * @param string $key The variable name
-   *
-   * @return mixed The variable value
-   *
-   * @see getVar()
-   */
-  public function & __get($key)
-  {
-    return $this->varHolder->get($key);
-  }
-
-  /**
-   * Returns true if a variable for the template is set.
-   *
-   * This is a shortcut for:
-   *
-   * <code>$this->getVarHolder()->has('name')</code>
-   *
-   * @param string $name The variable name
-   *
-   * @return boolean true if the variable is set
-   */
-  public function __isset($name)
-  {
-    return $this->varHolder->has($name);
-  }
-
-  /**
-   * Removes a variable for the template.
-   *
-   * This is just really a shortcut for:
-   *
-   * <code>$this->getVarHolder()->remove('name')</code>
-   *
-   * @param string $name The variable Name
-   */
-  public function __unset($name)
-  {
-    $this->varHolder->remove($name);
-  }
-
-  /**
-   * Calls methods defined via sfEventDispatcher.
-   *
-   * @param string $method The method name
-   * @param array  $arguments The method arguments
-   *
-   * @return mixed The returned value of the called method
-   *
-   * @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)));
-    if (!$event->isProcessed())
+
+    /**
+     * Calls methods defined via sfEventDispatcher.
+     *
+     * @param string $method    The method name
+     * @param array  $arguments The method arguments
+     *
+     * @return mixed The returned value of the called method
+     *
+     * @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)));
+        if (!$event->isProcessed()) {
+            throw new sfException(sprintf('Call to undefined method %s::%s.', get_class($this), $method));
+        }
+
+        return $event->getReturnValue();
+    }
+
+    /**
+     * Initializes this component.
+     *
+     * @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)
+    {
+        $this->moduleName = $moduleName;
+        $this->actionName = $actionName;
+        $this->context = $context;
+        $this->dispatcher = $context->getEventDispatcher();
+        $this->varHolder = new sfParameterHolder();
+        $this->request = $context->getRequest();
+        $this->response = $context->getResponse();
+        $this->requestParameterHolder = $this->request->getParameterHolder();
+    }
+
+    /**
+     * Execute any application/business logic for this component.
+     *
+     * In a typical database-driven application, execute() handles application
+     * logic itself and then proceeds to create a model instance. Once the model
+     * instance is initialized it handles all business logic for the action.
+     *
+     * A model should represent an entity in your application. This could be a
+     * user account, a shopping cart, or even a something as simple as a
+     * single product.
+     *
+     * @param sfRequest $request The current sfRequest object
+     *
+     * @return mixed A string containing the view name associated with this action
+     */
+    abstract public function execute($request);
+
+    /**
+     * Gets the module name associated with this component.
+     *
+     * @return string A module name
+     */
+    public function getModuleName()
+    {
+        return $this->moduleName;
+    }
+
+    /**
+     * Gets the action name associated with this component.
+     *
+     * @return string An action name
+     */
+    public function getActionName()
+    {
+        return $this->actionName;
+    }
+
+    /**
+     * Retrieves the current application context.
+     *
+     * @return sfContext The current sfContext instance
+     */
+    final public function getContext()
+    {
+        return $this->context;
+    }
+
+    /**
+     * Retrieves the current service container instance.
+     *
+     * @return sfServiceContainer The current sfServiceContainer instance
+     */
+    final public function getServiceContainer()
+    {
+        return $this->context->getServiceContainer();
+    }
+
+    /**
+     * Retrieves a service from the service container.
+     *
+     * @param string $id The service identifier
+     *
+     * @return object The service instance
+     */
+    public function getService($id)
     {
-      throw new sfException(sprintf('Call to undefined method %s::%s.', get_class($this), $method));
+        return $this->getServiceContainer()->getService($id);
     }
 
-    return $event->getReturnValue();
-  }
+    /**
+     * Retrieves the current logger instance.
+     *
+     * @return sfLogger The current sfLogger instance
+     */
+    final public function getLogger()
+    {
+        return $this->context->getLogger();
+    }
+
+    /**
+     * Logs a message using the sfLogger object.
+     *
+     * @param mixed  $message  String or object containing the message to log
+     * @param string $priority The priority of the message
+     *                         (available priorities: emerg, alert, crit, err,
+     *                         warning, notice, info, debug)
+     *
+     * @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)))));
+        }
+    }
+
+    /**
+     * Returns the value of a request parameter.
+     *
+     * This is a proxy method equivalent to:
+     *
+     * <code>$this->getRequest()->getParameterHolder()->get($name)</code>
+     *
+     * @param string $name    The parameter name
+     * @param mixed  $default The default value if parameter does not exist
+     *
+     * @return string The request parameter value
+     */
+    public function getRequestParameter($name, $default = null)
+    {
+        return $this->requestParameterHolder->get($name, $default);
+    }
+
+    /**
+     * Returns true if a request parameter exists.
+     *
+     * This is a proxy method equivalent to:
+     *
+     * <code>$this->getRequest()->getParameterHolder()->has($name)</code>
+     *
+     * @param string $name The parameter name
+     *
+     * @return bool true if the request parameter exists, false otherwise
+     */
+    public function hasRequestParameter($name)
+    {
+        return $this->requestParameterHolder->has($name);
+    }
+
+    /**
+     * Retrieves the current sfRequest object.
+     *
+     * This is a proxy method equivalent to:
+     *
+     * <code>$this->getContext()->getRequest()</code>
+     *
+     * @return sfRequest The current sfRequest implementation instance
+     */
+    public function getRequest()
+    {
+        return $this->request;
+    }
+
+    /**
+     * Retrieves the current sfResponse object.
+     *
+     * This is a proxy method equivalent to:
+     *
+     * <code>$this->getContext()->getResponse()</code>
+     *
+     * @return sfResponse The current sfResponse implementation instance
+     */
+    public function getResponse()
+    {
+        return $this->response;
+    }
+
+    /**
+     * Retrieves the current sfController object.
+     *
+     * This is a proxy method equivalent to:
+     *
+     * <code>$this->getContext()->getController()</code>
+     *
+     * @return sfController The current sfController implementation instance
+     */
+    public function getController()
+    {
+        return $this->context->getController();
+    }
+
+    /**
+     * Generates a URL for the given route and arguments.
+     *
+     * This is a proxy method equivalent to:
+     *
+     * <code>$this->getContext()->getRouting()->generate(...)</code>
+     *
+     * @param string $route    The route name
+     * @param array  $params   An array of parameters for the route
+     * @param bool   $absolute Whether to generate an absolute URL or not
+     *
+     * @return string The URL
+     */
+    public function generateUrl($route, $params = array(), $absolute = false)
+    {
+        return $this->context->getRouting()->generate($route, $params, $absolute);
+    }
+
+    /**
+     * Retrieves the current sfUser object.
+     *
+     * This is a proxy method equivalent to:
+     *
+     * <code>$this->getContext()->getUser()</code>
+     *
+     * @return sfUser The current sfUser implementation instance
+     */
+    public function getUser()
+    {
+        return $this->context->getUser();
+    }
+
+    /**
+     * Gets the current mailer instance.
+     *
+     * @return sfMailer A sfMailer instance
+     */
+    public function getMailer()
+    {
+        return $this->getContext()->getMailer();
+    }
+
+    /**
+     * Sets a variable for the template.
+     *
+     * If you add a safe value, the variable won't be output escaped
+     * by symfony, so this is your responsability to ensure that the
+     * value is escaped properly.
+     *
+     * @param string $name  The variable name
+     * @param mixed  $value The variable value
+     * @param bool   $safe  true if the value is safe for output (false by default)
+     */
+    public function setVar($name, $value, $safe = false)
+    {
+        $this->varHolder->set($name, $safe ? new sfOutputEscaperSafe($value) : $value);
+    }
+
+    /**
+     * Gets a variable set for the template.
+     *
+     * @param string $name The variable name
+     *
+     * @return mixed The variable value
+     */
+    public function getVar($name)
+    {
+        return $this->varHolder->get($name);
+    }
+
+    /**
+     * Gets the sfParameterHolder object that stores the template variables.
+     *
+     * @return sfParameterHolder the variable holder
+     */
+    public function getVarHolder()
+    {
+        return $this->varHolder;
+    }
+
+    /**
+     * Gets a variable for the template.
+     *
+     * This is a shortcut for:
+     *
+     * <code>$this->getVar('name')</code>
+     *
+     * @param string $key The variable name
+     *
+     * @return mixed The variable value
+     *
+     * @see getVar()
+     */
+    public function &__get($key)
+    {
+        return $this->varHolder->get($key);
+    }
 }
diff --git a/lib/action/sfComponents.class.php b/lib/action/sfComponents.class.php
index 2b6179955..967d7cbff 100644
--- a/lib/action/sfComponents.class.php
+++ b/lib/action/sfComponents.class.php
@@ -11,22 +11,23 @@
 /**
  * sfComponents.
  *
- * @package    symfony
- * @subpackage action
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfComponents extends sfComponent
 {
-  /**
-   * @param sfRequest $request
-   * @return mixed
-   * @throws sfInitializationException
-   *
-   * @see sfComponent
-   */
-  public function execute($request)
-  {
-    throw new sfInitializationException('sfComponents initialization failed.');
-  }
+    /**
+     * @param sfRequest $request
+     *
+     * @return mixed
+     *
+     * @throws sfInitializationException
+     *
+     * @see sfComponent
+     */
+    public function execute($request)
+    {
+        throw new sfInitializationException('sfComponents initialization failed.');
+    }
 }
diff --git a/lib/addon/sfData.class.php b/lib/addon/sfData.class.php
index 9741246cb..b03a4a55e 100644
--- a/lib/addon/sfData.class.php
+++ b/lib/addon/sfData.class.php
@@ -12,119 +12,107 @@
  * This class defines the interface for interacting with data, as well
  * as default implementations.
  *
- * @package    symfony
- * @subpackage addon
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfData
 {
-  protected
-    $deleteCurrentData = true,
-    $object_references = array();
+    protected $deleteCurrentData = true;
+    protected $object_references = array();
 
-  /**
-   * Sets a flag to indicate if the current data in the database
-   * should be deleted before new data is loaded.
-   *
-   * @param boolean $boolean The flag value
-   */
-  public function setDeleteCurrentData($boolean)
-  {
-    $this->deleteCurrentData = $boolean;
-  }
+    /**
+     * Sets a flag to indicate if the current data in the database
+     * should be deleted before new data is loaded.
+     *
+     * @param bool $boolean The flag value
+     */
+    public function setDeleteCurrentData($boolean)
+    {
+        $this->deleteCurrentData = $boolean;
+    }
 
-  /**
-   * Gets the current value of the flag that indicates whether
-   * current data is to be deleted or not.
-   *
-   * @return boolean
-   */
-  public function getDeleteCurrentData()
-  {
-    return $this->deleteCurrentData;
-  }
+    /**
+     * Gets the current value of the flag that indicates whether
+     * current data is to be deleted or not.
+     *
+     * @return bool
+     */
+    public function getDeleteCurrentData()
+    {
+        return $this->deleteCurrentData;
+    }
 
-  /**
-   * Loads data for the database from a YAML file
-   *
-   * @param string $file The path to the YAML file.
-   */
-  protected function doLoadDataFromFile($file)
-  {
-    // import new datas
-    $data = sfYaml::load($file, sfConfig::get('sf_charset', 'UTF-8'));
+    /**
+     * Manages the insertion of data into the data source.
+     *
+     * @param array $data The data to be inserted into the data source
+     */
+    abstract public function loadDataFromArray($data);
 
-    $this->loadDataFromArray($data);
-  }
+    /**
+     * Gets a list of one or more *.yml files and returns the list in an array.
+     *
+     * The returned array of files is sorted by alphabetical order.
+     *
+     * @param array|string $element A directory or file name or an array of directories and/or file names
+     *                              If null, then defaults to 'sf_data_dir'/fixtures
+     *
+     * @return array A list of *.yml files
+     *
+     * @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';
+        }
 
-  /**
-   * Manages the insertion of data into the data source
-   *
-   * @param array $data The data to be inserted into the data source
-   */
-  abstract public function loadDataFromArray($data);
+        $files = array();
+        if (is_array($element)) {
+            foreach ($element as $e) {
+                $files = array_merge($files, $this->getFiles($e));
+            }
+        } elseif (is_file($element)) {
+            $files[] = $element;
+        } elseif (is_dir($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));
+        }
 
-  /**
-   * Manages reading all of the fixture data files and
-   * loading them into the data source
-   *
-   * @param array $files The path names of the YAML data files
-   */
-  protected function doLoadData(array $files)
-  {
-    $this->object_references = array();
-    $this->maps = array();
+        $files = array_unique($files);
+        sort($files);
 
-    foreach ($files as $file)
-    {
-      $this->doLoadDataFromFile($file);
+        return $files;
     }
-  }
 
-  /**
-   * Gets a list of one or more *.yml files and returns the list in an array.
-   *
-   * The returned array of files is sorted by alphabetical order.
-   *
-   * @param string|array $element A directory or file name or an array of directories and/or file names
-   *                              If null, then defaults to 'sf_data_dir'/fixtures
-   *
-   * @return array A list of *.yml files
-   *
-   * @throws sfInitializationException If the directory or file does not exist.
-   */
-  public function getFiles($element = null)
-  {
-    if (null === $element)
+    /**
+     * Loads data for the database from a YAML file.
+     *
+     * @param string $file the path to the YAML file
+     */
+    protected function doLoadDataFromFile($file)
     {
-      $element = sfConfig::get('sf_data_dir').'/fixtures';
-    }
+        // import new datas
+        $data = sfYaml::load($file, sfConfig::get('sf_charset', 'UTF-8'));
 
-    $files = array();
-    if (is_array($element))
-    {
-      foreach ($element as $e)
-      {
-        $files = array_merge($files, $this->getFiles($e));
-      }
-    }
-    else if (is_file($element))
-    {
-      $files[] = $element;
-    }
-    else if (is_dir($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));
+        $this->loadDataFromArray($data);
     }
 
-    $files = array_unique($files);
-    sort($files);
+    /**
+     * Manages reading all of the fixture data files and
+     * loading them into the data source.
+     *
+     * @param array $files The path names of the YAML data files
+     */
+    protected function doLoadData(array $files)
+    {
+        $this->object_references = array();
+        $this->maps = array();
 
-    return $files;
-  }
+        foreach ($files as $file) {
+            $this->doLoadDataFromFile($file);
+        }
+    }
 }
diff --git a/lib/addon/sfPager.class.php b/lib/addon/sfPager.class.php
index 84a4cc5f1..9709060d7 100644
--- a/lib/addon/sfPager.class.php
+++ b/lib/addon/sfPager.class.php
@@ -11,611 +11,574 @@
 /**
  * sfPager class.
  *
- * @package    symfony
- * @subpackage addon
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfPager implements Iterator, Countable
 {
-  protected
-    $page            = 1,
-    $maxPerPage      = 0,
-    $lastPage        = 1,
-    $nbResults       = 0,
-    $class           = '',
-    $tableName       = '',
-    $objects         = null,
-    $cursor          = 1,
-    $parameters      = array(),
-    $currentMaxLink  = 1,
-    $parameterHolder = null,
-    $maxRecordLimit  = false,
-
+    protected $page = 1;
+    protected $maxPerPage = 0;
+    protected $lastPage = 1;
+    protected $nbResults = 0;
+    protected $class = '';
+    protected $tableName = '';
+    protected $objects;
+    protected $cursor = 1;
+    protected $parameters = array();
+    protected $currentMaxLink = 1;
+    protected $parameterHolder;
+    protected $maxRecordLimit = false;
     // used by iterator interface
-    $results         = null,
-    $resultsCounter  = 0;
-
-  /**
-   * Constructor.
-   *
-   * @param string  $class      The model class
-   * @param integer $maxPerPage Number of records to display per page
-   */
-  public function __construct($class, $maxPerPage = 10)
-  {
-    $this->setClass($class);
-    $this->setMaxPerPage($maxPerPage);
-    $this->parameterHolder = new sfParameterHolder();
-  }
-
-  /**
-   * Initialize the pager.
-   *
-   * Function to be called after parameters have been set.
-   */
-  abstract public function init();
-
-  /**
-   * Returns an array of results on the given page.
-   *
-   * @return array
-   */
-  abstract public function getResults();
-
-  /**
-   * Returns an object at a certain offset.
-   *
-   * Used internally by {@link getCurrent()}.
-   *
-   * @param int $offset
-   * @return mixed
-   */
-  abstract protected function retrieveObject($offset);
-
-  /**
-   * Returns the current pager's max link.
-   *
-   * @return integer
-   */
-  public function getCurrentMaxLink()
-  {
-    return $this->currentMaxLink;
-  }
-
-  /**
-   * Returns the current pager's max record limit.
-   *
-   * @return integer
-   */
-  public function getMaxRecordLimit()
-  {
-    return $this->maxRecordLimit;
-  }
-
-  /**
-   * Sets the current pager's max record limit.
-   *
-   * @param integer $limit
-   */
-  public function setMaxRecordLimit($limit)
-  {
-    $this->maxRecordLimit = $limit;
-  }
-
-  /**
-   * Returns an array of page numbers to use in pagination links.
-   *
-   * @param  integer $nb_links The maximum number of page numbers to return
-   *
-   * @return array
-   */
-  public function getLinks($nb_links = 5)
-  {
-    $links = array();
-    $tmp   = $this->page - floor($nb_links / 2);
-    $check = $this->lastPage - $nb_links + 1;
-    $limit = $check > 0 ? $check : 1;
-    $begin = $tmp > 0 ? ($tmp > $limit ? $limit : $tmp) : 1;
-
-    $i = (int) $begin;
-    while ($i < $begin + $nb_links && $i <= $this->lastPage)
-    {
-      $links[] = $i++;
-    }
-
-    $this->currentMaxLink = count($links) ? $links[count($links) - 1] : 1;
-
-    return $links;
-  }
-
-  /**
-   * Returns true if the current query requires pagination.
-   *
-   * @return boolean
-   */
-  public function haveToPaginate()
-  {
-    return $this->getMaxPerPage() && $this->getNbResults() > $this->getMaxPerPage();
-  }
-
-  /**
-   * Returns the current cursor.
-   *
-   * @return integer
-   */
-  public function getCursor()
-  {
-    return $this->cursor;
-  }
-
-  /**
-   * Sets the current cursor.
-   *
-   * @param integer $pos
-   */
-  public function setCursor($pos)
-  {
-    if ($pos < 1)
-    {
-      $this->cursor = 1;
-    }
-    else if ($pos > $this->nbResults)
-    {
-      $this->cursor = $this->nbResults;
-    }
-    else
-    {
-      $this->cursor = $pos;
-    }
-  }
-
-  /**
-   * Returns an object by cursor position.
-   *
-   * @param  integer $pos
-   *
-   * @return mixed
-   */
-  public function getObjectByCursor($pos)
-  {
-    $this->setCursor($pos);
-
-    return $this->getCurrent();
-  }
-
-  /**
-   * Returns the current object.
-   *
-   * @return mixed
-   */
-  public function getCurrent()
-  {
-    return $this->retrieveObject($this->cursor);
-  }
-
-  /**
-   * Returns the next object.
-   *
-   * @return mixed|null
-   */
-  public function getNext()
-  {
-    if ($this->cursor + 1 > $this->nbResults)
-    {
-      return null;
-    }
-    else
-    {
-      return $this->retrieveObject($this->cursor + 1);
-    }
-  }
-
-  /**
-   * Returns the previous object.
-   *
-   * @return mixed|null
-   */
-  public function getPrevious()
-  {
-    if ($this->cursor - 1 < 1)
+    protected $results;
+    protected $resultsCounter = 0;
+
+    /**
+     * Constructor.
+     *
+     * @param string $class      The model class
+     * @param int    $maxPerPage Number of records to display per page
+     */
+    public function __construct($class, $maxPerPage = 10)
     {
-      return null;
+        $this->setClass($class);
+        $this->setMaxPerPage($maxPerPage);
+        $this->parameterHolder = new sfParameterHolder();
     }
-    else
-    {
-      return $this->retrieveObject($this->cursor - 1);
-    }
-  }
-
-  /**
-   * Returns the first index on the current page.
-   *
-   * @return integer
-   */
-  public function getFirstIndice()
-  {
-    if ($this->page == 0)
-    {
-      return 1;
+
+    /**
+     * Initialize the pager.
+     *
+     * Function to be called after parameters have been set.
+     */
+    abstract public function init();
+
+    /**
+     * Returns an array of results on the given page.
+     *
+     * @return array
+     */
+    abstract public function getResults();
+
+    /**
+     * Returns the current pager's max link.
+     *
+     * @return int
+     */
+    public function getCurrentMaxLink()
+    {
+        return $this->currentMaxLink;
     }
-    else
-    {
-      return ($this->page - 1) * $this->maxPerPage + 1;
+
+    /**
+     * Returns the current pager's max record limit.
+     *
+     * @return int
+     */
+    public function getMaxRecordLimit()
+    {
+        return $this->maxRecordLimit;
     }
-  }
 
-  /**
-   * Returns the last index on the current page.
-   *
-   * @return integer
-   */
-  public function getLastIndice()
-  {
-    if ($this->page == 0)
+    /**
+     * Sets the current pager's max record limit.
+     *
+     * @param int $limit
+     */
+    public function setMaxRecordLimit($limit)
     {
-      return $this->nbResults;
+        $this->maxRecordLimit = $limit;
     }
-    else
+
+    /**
+     * Returns an array of page numbers to use in pagination links.
+     *
+     * @param int $nb_links The maximum number of page numbers to return
+     *
+     * @return array
+     */
+    public function getLinks($nb_links = 5)
     {
-      if ($this->page * $this->maxPerPage >= $this->nbResults)
-      {
-        return $this->nbResults;
-      }
-      else
-      {
+        $links = array();
+        $tmp = $this->page - floor($nb_links / 2);
+        $check = $this->lastPage - $nb_links + 1;
+        $limit = $check > 0 ? $check : 1;
+        $begin = $tmp > 0 ? ($tmp > $limit ? $limit : $tmp) : 1;
+
+        $i = (int) $begin;
+        while ($i < $begin + $nb_links && $i <= $this->lastPage) {
+            $links[] = $i++;
+        }
+
+        $this->currentMaxLink = count($links) ? $links[count($links) - 1] : 1;
+
+        return $links;
+    }
+
+    /**
+     * Returns true if the current query requires pagination.
+     *
+     * @return bool
+     */
+    public function haveToPaginate()
+    {
+        return $this->getMaxPerPage() && $this->getNbResults() > $this->getMaxPerPage();
+    }
+
+    /**
+     * Returns the current cursor.
+     *
+     * @return int
+     */
+    public function getCursor()
+    {
+        return $this->cursor;
+    }
+
+    /**
+     * Sets the current cursor.
+     *
+     * @param int $pos
+     */
+    public function setCursor($pos)
+    {
+        if ($pos < 1) {
+            $this->cursor = 1;
+        } elseif ($pos > $this->nbResults) {
+            $this->cursor = $this->nbResults;
+        } else {
+            $this->cursor = $pos;
+        }
+    }
+
+    /**
+     * Returns an object by cursor position.
+     *
+     * @param int $pos
+     *
+     * @return mixed
+     */
+    public function getObjectByCursor($pos)
+    {
+        $this->setCursor($pos);
+
+        return $this->getCurrent();
+    }
+
+    /**
+     * Returns the current object.
+     *
+     * @return mixed
+     */
+    public function getCurrent()
+    {
+        return $this->retrieveObject($this->cursor);
+    }
+
+    /**
+     * Returns the next object.
+     *
+     * @return mixed|null
+     */
+    public function getNext()
+    {
+        if ($this->cursor + 1 > $this->nbResults) {
+            return null;
+        }
+
+        return $this->retrieveObject($this->cursor + 1);
+    }
+
+    /**
+     * Returns the previous object.
+     *
+     * @return mixed|null
+     */
+    public function getPrevious()
+    {
+        if ($this->cursor - 1 < 1) {
+            return null;
+        }
+
+        return $this->retrieveObject($this->cursor - 1);
+    }
+
+    /**
+     * Returns the first index on the current page.
+     *
+     * @return int
+     */
+    public function getFirstIndice()
+    {
+        if (0 == $this->page) {
+            return 1;
+        }
+
+        return ($this->page - 1) * $this->maxPerPage + 1;
+    }
+
+    /**
+     * Returns the last index on the current page.
+     *
+     * @return int
+     */
+    public function getLastIndice()
+    {
+        if (0 == $this->page) {
+            return $this->nbResults;
+        }
+
+        if ($this->page * $this->maxPerPage >= $this->nbResults) {
+            return $this->nbResults;
+        }
+
         return $this->page * $this->maxPerPage;
-      }
-    }
-  }
-
-  /**
-   * Returns the current class.
-   *
-   * @return string
-   */
-  public function getClass()
-  {
-    return $this->class;
-  }
-
-  /**
-   * Sets the current class.
-   *
-   * @param string $class
-   */
-  public function setClass($class)
-  {
-    $this->class = $class;
-  }
-
-  /**
-   * Returns the number of results.
-   *
-   * @return integer
-   */
-  public function getNbResults()
-  {
-    return $this->nbResults;
-  }
-
-  /**
-   * Sets the number of results.
-   *
-   * @param integer $nb
-   */
-  protected function setNbResults($nb)
-  {
-    $this->nbResults = $nb;
-  }
-
-  /**
-   * Returns the first page number.
-   *
-   * @return integer
-   */
-  public function getFirstPage()
-  {
-    return 1;
-  }
-
-  /**
-   * Returns the last page number.
-   *
-   * @return integer
-   */
-  public function getLastPage()
-  {
-    return $this->lastPage;
-  }
-
-  /**
-   * Sets the last page number.
-   *
-   * @param integer $page
-   */
-  protected function setLastPage($page)
-  {
-    $this->lastPage = $page;
-
-    if ($this->getPage() > $page)
-    {
-      $this->setPage($page);
-    }
-  }
-
-  /**
-   * Returns the current page.
-   *
-   * @return integer
-   */
-  public function getPage()
-  {
-    return $this->page;
-  }
-
-  /**
-   * Returns the next page.
-   *
-   * @return integer
-   */
-  public function getNextPage()
-  {
-    return min($this->getPage() + 1, $this->getLastPage());
-  }
-
-  /**
-   * Returns the previous page.
-   *
-   * @return integer
-   */
-  public function getPreviousPage()
-  {
-    return max($this->getPage() - 1, $this->getFirstPage());
-  }
-
-  /**
-   * Sets the current page.
-   *
-   * @param integer $page
-   */
-  public function setPage($page)
-  {
-    $this->page = (int) $page;
-
-    if ($this->page <= 0)
-    {
-      // set first page, which depends on a maximum set
-      $this->page = $this->getMaxPerPage() ? 1 : 0;
-    }
-  }
-
-  /**
-   * Returns the maximum number of results per page.
-   *
-   * @return integer
-   */
-  public function getMaxPerPage()
-  {
-    return $this->maxPerPage;
-  }
-
-  /**
-   * Sets the maximum number of results per page.
-   *
-   * @param integer $max
-   */
-  public function setMaxPerPage($max)
-  {
-    if ($max > 0)
-    {
-      $this->maxPerPage = $max;
-      if ($this->page == 0)
-      {
-        $this->page = 1;
-      }
-    }
-    else if ($max == 0)
-    {
-      $this->maxPerPage = 0;
-      $this->page = 0;
-    }
-    else
-    {
-      $this->maxPerPage = 1;
-      if ($this->page == 0)
-      {
-        $this->page = 1;
-      }
-    }
-  }
-
-  /**
-   * Returns true if on the first page.
-   *
-   * @return boolean
-   */
-  public function isFirstPage()
-  {
-    return 1 == $this->page;
-  }
-
-  /**
-   * Returns true if on the last page.
-   *
-   * @return boolean
-   */
-  public function isLastPage()
-  {
-    return $this->page == $this->lastPage;
-  }
-
-  /**
-   * Returns the current pager's parameter holder.
-   *
-   * @return sfParameterHolder
-   */
-  public function getParameterHolder()
-  {
-    return $this->parameterHolder;
-  }
-
-  /**
-   * Returns a parameter.
-   *
-   * @param  string $name
-   * @param  mixed  $default
-   *
-   * @return mixed
-   */
-  public function getParameter($name, $default = null)
-  {
-    return $this->parameterHolder->get($name, $default);
-  }
-
-  /**
-   * Checks whether a parameter has been set.
-   *
-   * @param  string $name
-   *
-   * @return boolean
-   */
-  public function hasParameter($name)
-  {
-    return $this->parameterHolder->has($name);
-  }
-
-  /**
-   * Sets a parameter.
-   *
-   * @param  string $name
-   * @param  mixed  $value
-   */
-  public function setParameter($name, $value)
-  {
-    $this->parameterHolder->set($name, $value);
-  }
-
-  /**
-   * Returns true if the properties used for iteration have been initialized.
-   *
-   * @return boolean
-   */
-  protected function isIteratorInitialized()
-  {
-    return null !== $this->results;
-  }
-
-  /**
-   * Loads data into properties used for iteration.
-   */
-  protected function initializeIterator()
-  {
-    $this->results = $this->getResults();
-    $this->resultsCounter = count($this->results);
-  }
-
-  /**
-   * Empties properties used for iteration.
-   */
-  protected function resetIterator()
-  {
-    $this->results = null;
-    $this->resultsCounter = 0;
-  }
-
-  /**
-   * Returns the current result.
-   *
-   * @see Iterator
-   */
-  #[\ReturnTypeWillChange]
-  public function current()
-  {
-    if (!$this->isIteratorInitialized())
-    {
-      $this->initializeIterator();
-    }
-
-    return current($this->results);
-  }
-
-  /**
-   * Returns the current key.
-   *
-   * @see Iterator
-   */
-  #[\ReturnTypeWillChange]
-  public function key()
-  {
-    if (!$this->isIteratorInitialized())
-    {
-      $this->initializeIterator();
-    }
-
-    return key($this->results);
-  }
-
-  /**
-   * Advances the internal pointer and returns the current result.
-   *
-   * @see Iterator
-   */
-  #[\ReturnTypeWillChange]
-  public function next()
-  {
-    if (!$this->isIteratorInitialized())
-    {
-      $this->initializeIterator();
-    }
-
-    --$this->resultsCounter;
-
-    return next($this->results);
-  }
-
-  /**
-   * Resets the internal pointer and returns the current result.
-   *
-   * @see Iterator
-   */
-  #[\ReturnTypeWillChange]
-  public function rewind()
-  {
-    if (!$this->isIteratorInitialized())
-    {
-      $this->initializeIterator();
-    }
-
-    $this->resultsCounter = count($this->results);
-
-    return reset($this->results);
-  }
-
-  /**
-   * Returns true if pointer is within bounds.
-   *
-   * @see Iterator
-   */
-  #[\ReturnTypeWillChange]
-  public function valid()
-  {
-    if (!$this->isIteratorInitialized())
-    {
-      $this->initializeIterator();
-    }
-
-    return $this->resultsCounter > 0;
-  }
-
-  /**
-   * Returns the total number of results.
-   *
-   * @see Countable
-   */
-  #[\ReturnTypeWillChange]
-  public function count()
-  {
-    return $this->getNbResults();
-  }
+    }
+
+    /**
+     * Returns the current class.
+     *
+     * @return string
+     */
+    public function getClass()
+    {
+        return $this->class;
+    }
+
+    /**
+     * Sets the current class.
+     *
+     * @param string $class
+     */
+    public function setClass($class)
+    {
+        $this->class = $class;
+    }
+
+    /**
+     * Returns the number of results.
+     *
+     * @return int
+     */
+    public function getNbResults()
+    {
+        return $this->nbResults;
+    }
+
+    /**
+     * Returns the first page number.
+     *
+     * @return int
+     */
+    public function getFirstPage()
+    {
+        return 1;
+    }
+
+    /**
+     * Returns the last page number.
+     *
+     * @return int
+     */
+    public function getLastPage()
+    {
+        return $this->lastPage;
+    }
+
+    /**
+     * Returns the current page.
+     *
+     * @return int
+     */
+    public function getPage()
+    {
+        return $this->page;
+    }
+
+    /**
+     * Returns the next page.
+     *
+     * @return int
+     */
+    public function getNextPage()
+    {
+        return min($this->getPage() + 1, $this->getLastPage());
+    }
+
+    /**
+     * Returns the previous page.
+     *
+     * @return int
+     */
+    public function getPreviousPage()
+    {
+        return max($this->getPage() - 1, $this->getFirstPage());
+    }
+
+    /**
+     * Sets the current page.
+     *
+     * @param int $page
+     */
+    public function setPage($page)
+    {
+        $this->page = (int) $page;
+
+        if ($this->page <= 0) {
+            // set first page, which depends on a maximum set
+            $this->page = $this->getMaxPerPage() ? 1 : 0;
+        }
+    }
+
+    /**
+     * Returns the maximum number of results per page.
+     *
+     * @return int
+     */
+    public function getMaxPerPage()
+    {
+        return $this->maxPerPage;
+    }
+
+    /**
+     * Sets the maximum number of results per page.
+     *
+     * @param int $max
+     */
+    public function setMaxPerPage($max)
+    {
+        if ($max > 0) {
+            $this->maxPerPage = $max;
+            if (0 == $this->page) {
+                $this->page = 1;
+            }
+        } elseif (0 == $max) {
+            $this->maxPerPage = 0;
+            $this->page = 0;
+        } else {
+            $this->maxPerPage = 1;
+            if (0 == $this->page) {
+                $this->page = 1;
+            }
+        }
+    }
+
+    /**
+     * Returns true if on the first page.
+     *
+     * @return bool
+     */
+    public function isFirstPage()
+    {
+        return 1 == $this->page;
+    }
+
+    /**
+     * Returns true if on the last page.
+     *
+     * @return bool
+     */
+    public function isLastPage()
+    {
+        return $this->page == $this->lastPage;
+    }
+
+    /**
+     * Returns the current pager's parameter holder.
+     *
+     * @return sfParameterHolder
+     */
+    public function getParameterHolder()
+    {
+        return $this->parameterHolder;
+    }
+
+    /**
+     * Returns a parameter.
+     *
+     * @param string $name
+     * @param mixed  $default
+     *
+     * @return mixed
+     */
+    public function getParameter($name, $default = null)
+    {
+        return $this->parameterHolder->get($name, $default);
+    }
+
+    /**
+     * Checks whether a parameter has been set.
+     *
+     * @param string $name
+     *
+     * @return bool
+     */
+    public function hasParameter($name)
+    {
+        return $this->parameterHolder->has($name);
+    }
+
+    /**
+     * Sets a parameter.
+     *
+     * @param string $name
+     * @param mixed  $value
+     */
+    public function setParameter($name, $value)
+    {
+        $this->parameterHolder->set($name, $value);
+    }
+
+    /**
+     * Returns the current result.
+     *
+     * @see Iterator
+     */
+    #[\ReturnTypeWillChange]
+    public function current()
+    {
+        if (!$this->isIteratorInitialized()) {
+            $this->initializeIterator();
+        }
+
+        return current($this->results);
+    }
+
+    /**
+     * Returns the current key.
+     *
+     * @see Iterator
+     */
+    #[\ReturnTypeWillChange]
+    public function key()
+    {
+        if (!$this->isIteratorInitialized()) {
+            $this->initializeIterator();
+        }
+
+        return key($this->results);
+    }
+
+    /**
+     * Advances the internal pointer and returns the current result.
+     *
+     * @see Iterator
+     */
+    #[\ReturnTypeWillChange]
+    public function next()
+    {
+        if (!$this->isIteratorInitialized()) {
+            $this->initializeIterator();
+        }
+
+        --$this->resultsCounter;
+
+        return next($this->results);
+    }
+
+    /**
+     * Resets the internal pointer and returns the current result.
+     *
+     * @see Iterator
+     */
+    #[\ReturnTypeWillChange]
+    public function rewind()
+    {
+        if (!$this->isIteratorInitialized()) {
+            $this->initializeIterator();
+        }
+
+        $this->resultsCounter = count($this->results);
+
+        return reset($this->results);
+    }
+
+    /**
+     * Returns true if pointer is within bounds.
+     *
+     * @see Iterator
+     */
+    #[\ReturnTypeWillChange]
+    public function valid()
+    {
+        if (!$this->isIteratorInitialized()) {
+            $this->initializeIterator();
+        }
+
+        return $this->resultsCounter > 0;
+    }
+
+    /**
+     * Returns the total number of results.
+     *
+     * @see Countable
+     */
+    #[\ReturnTypeWillChange]
+    public function count()
+    {
+        return $this->getNbResults();
+    }
+
+    /**
+     * Returns an object at a certain offset.
+     *
+     * Used internally by {@link getCurrent()}.
+     *
+     * @param int $offset
+     *
+     * @return mixed
+     */
+    abstract protected function retrieveObject($offset);
+
+    /**
+     * Sets the number of results.
+     *
+     * @param int $nb
+     */
+    protected function setNbResults($nb)
+    {
+        $this->nbResults = $nb;
+    }
+
+    /**
+     * Sets the last page number.
+     *
+     * @param int $page
+     */
+    protected function setLastPage($page)
+    {
+        $this->lastPage = $page;
+
+        if ($this->getPage() > $page) {
+            $this->setPage($page);
+        }
+    }
+
+    /**
+     * Returns true if the properties used for iteration have been initialized.
+     *
+     * @return bool
+     */
+    protected function isIteratorInitialized()
+    {
+        return null !== $this->results;
+    }
+
+    /**
+     * Loads data into properties used for iteration.
+     */
+    protected function initializeIterator()
+    {
+        $this->results = $this->getResults();
+        $this->resultsCounter = count($this->results);
+    }
+
+    /**
+     * Empties properties used for iteration.
+     */
+    protected function resetIterator()
+    {
+        $this->results = null;
+        $this->resultsCounter = 0;
+    }
 }
diff --git a/lib/autoload/sfAutoload.class.php b/lib/autoload/sfAutoload.class.php
index 5f68f8039..f3e238e27 100644
--- a/lib/autoload/sfAutoload.class.php
+++ b/lib/autoload/sfAutoload.class.php
@@ -14,229 +14,195 @@
  * This class is a singleton as PHP seems to be unable to register 2 autoloaders that are instances
  * of the same class (why?).
  *
- * @package    symfony
- * @subpackage autoload
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfAutoload
 {
-  static protected
-    $freshCache = false,
-    $instance   = null;
-
-  protected
-    $overriden = array(),
-    $classes   = array();
-
-  protected function __construct()
-  {
-  }
-
-  /**
-   * Retrieves the singleton instance of this class.
-   *
-   * @return sfAutoload A sfAutoload implementation instance.
-   */
-  static public function getInstance()
-  {
-    if (!isset(self::$instance))
-    {
-      self::$instance = new sfAutoload();
-    }
+    protected static $freshCache = false;
+    protected static $instance;
 
-    return self::$instance;
-  }
-
-  /**
-   * Register sfAutoload in spl autoloader.
-   *
-   * @return void
-   *
-   * @throws sfException
-   */
-  static public 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())));
-    }
-  }
-
-  /**
-   * Unregister sfAutoload from spl autoloader.
-   *
-   * @return void
-   */
-  static public function unregister()
-  {
-    spl_autoload_unregister(array(self::getInstance(), 'autoload'));
-  }
-
-  /**
-   * Sets the path for a particular class.
-   *
-   * @param string $class A PHP class name
-   * @param string $path  An absolute path
-   */
-  public function setClassPath($class, $path)
-  {
-    $class = strtolower($class);
-
-    $this->overriden[$class] = $path;
-
-    $this->classes[$class] = $path;
-  }
-
-  /**
-   * Returns the path where a particular class can be found.
-   *
-   * @param string $class A PHP class name
-   *
-   * @return string|null An absolute path
-   */
-  public function getClassPath($class)
-  {
-    $class = strtolower($class);
-
-    return isset($this->classes[$class]) ? $this->classes[$class] : null;
-  }
-
-  /**
-   * Reloads the autoloader.
-   *
-   * @param  boolean $force Whether to force a reload
-   *
-   * @return boolean True if the reload was successful, otherwise false
-   */
-  public function reloadClasses($force = false)
-  {
-    // only (re)load the autoloading cache once per request
-    if (self::$freshCache && !$force)
-    {
-      return false;
-    }
+    protected $overriden = array();
+    protected $classes = array();
 
-    $configuration = sfProjectConfiguration::getActive();
-    if (!$configuration || !$configuration instanceof sfApplicationConfiguration)
+    protected function __construct()
     {
-      return false;
     }
 
-    self::$freshCache = true;
-    if (is_file($configuration->getConfigCache()->getCacheName('config/autoload.yml')))
+    /**
+     * Retrieves the singleton instance of this class.
+     *
+     * @return sfAutoload a sfAutoload implementation instance
+     */
+    public static function getInstance()
     {
-      self::$freshCache = false;
-      if ($force)
-      {
-        if (file_exists($configuration->getConfigCache()->getCacheName('config/autoload.yml')))
-        {
-          unlink($configuration->getConfigCache()->getCacheName('config/autoload.yml'));
+        if (!isset(self::$instance)) {
+            self::$instance = new sfAutoload();
         }
-      }
-    }
 
-    $file = $configuration->getConfigCache()->checkConfig('config/autoload.yml');
+        return self::$instance;
+    }
 
-    if ($force && defined('HHVM_VERSION'))
+    /**
+     * Register sfAutoload in spl autoloader.
+     *
+     * @throws sfException
+     */
+    public static function register()
     {
-      // workaround for https://github.com/facebook/hhvm/issues/1447
-      $this->classes = eval(str_replace('<?php', '', file_get_contents($file)));
+        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())));
+        }
     }
-    else
+
+    /**
+     * Unregister sfAutoload from spl autoloader.
+     */
+    public static function unregister()
     {
-      $this->classes = include $file;
+        spl_autoload_unregister(array(self::getInstance(), 'autoload'));
     }
 
-    foreach ($this->overriden as $class => $path)
+    /**
+     * Sets the path for a particular class.
+     *
+     * @param string $class A PHP class name
+     * @param string $path  An absolute path
+     */
+    public function setClassPath($class, $path)
     {
-      $this->classes[$class] = $path;
+        $class = strtolower($class);
+
+        $this->overriden[$class] = $path;
+
+        $this->classes[$class] = $path;
     }
 
-    return true;
-  }
-
-  /**
-   * Handles autoloading of classes that have been specified in autoload.yml.
-   *
-   * @param  string  $class  A class name.
-   *
-   * @return boolean Returns true if the class has been loaded
-   */
-  public function autoload($class)
-  {
-    // load the list of autoload classes
-    if (!$this->classes)
+    /**
+     * Returns the path where a particular class can be found.
+     *
+     * @param string $class A PHP class name
+     *
+     * @return string|null An absolute path
+     */
+    public function getClassPath($class)
     {
-      self::reloadClasses();
+        $class = strtolower($class);
+
+        return isset($this->classes[$class]) ? $this->classes[$class] : null;
     }
 
-    return self::loadClass($class);
-  }
-
-  /**
-   * Tries to load a class that has been specified in autoload.yml.
-   *
-   * @param  string  $class  A class name.
-   *
-   * @return boolean Returns true if the class has been loaded
-   */
-  public function loadClass($class)
-  {
-    $class = strtolower($class);
-
-    // class already exists
-    if (class_exists($class, false) || interface_exists($class, false) || (function_exists('trait_exists') && trait_exists($class, false)))
+    /**
+     * Reloads the autoloader.
+     *
+     * @param bool $force Whether to force a reload
+     *
+     * @return bool True if the reload was successful, otherwise false
+     */
+    public function reloadClasses($force = false)
     {
-      return true;
+        // only (re)load the autoloading cache once per request
+        if (self::$freshCache && !$force) {
+            return false;
+        }
+
+        $configuration = sfProjectConfiguration::getActive();
+        if (!$configuration || !$configuration instanceof sfApplicationConfiguration) {
+            return false;
+        }
+
+        self::$freshCache = true;
+        if (is_file($configuration->getConfigCache()->getCacheName('config/autoload.yml'))) {
+            self::$freshCache = false;
+            if ($force) {
+                if (file_exists($configuration->getConfigCache()->getCacheName('config/autoload.yml'))) {
+                    unlink($configuration->getConfigCache()->getCacheName('config/autoload.yml'));
+                }
+            }
+        }
+
+        $file = $configuration->getConfigCache()->checkConfig('config/autoload.yml');
+
+        if ($force && defined('HHVM_VERSION')) {
+            // workaround for https://github.com/facebook/hhvm/issues/1447
+            $this->classes = eval(str_replace('<?php', '', file_get_contents($file)));
+        } else {
+            $this->classes = include $file;
+        }
+
+        foreach ($this->overriden as $class => $path) {
+            $this->classes[$class] = $path;
+        }
+
+        return true;
     }
 
-    // we have a class path, let's include it
-    if (isset($this->classes[$class]))
+    /**
+     * Handles autoloading of classes that have been specified in autoload.yml.
+     *
+     * @param string $class a class name
+     *
+     * @return bool Returns true if the class has been loaded
+     */
+    public function autoload($class)
     {
-      try
-      {
-        require $this->classes[$class];
-      }
-      catch (sfException $e)
-      {
-        $e->printStackTrace();
-      }
-      catch (Exception $e)
-      {
-        sfException::createFromException($e)->printStackTrace();
-      }
-
-      return true;
+        // load the list of autoload classes
+        if (!$this->classes) {
+            self::reloadClasses();
+        }
+
+        return self::loadClass($class);
     }
 
-    // see if the file exists in the current module lib directory
-    if (
-      sfContext::hasInstance()
-      &&
-      ($module = sfContext::getInstance()->getModuleName())
-      &&
-      isset($this->classes[$module.'/'.$class])
-    )
+    /**
+     * Tries to load a class that has been specified in autoload.yml.
+     *
+     * @param string $class a class name
+     *
+     * @return bool Returns true if the class has been loaded
+     */
+    public function loadClass($class)
     {
-      try
-      {
-        require $this->classes[$module.'/'.$class];
-      }
-      catch (sfException $e)
-      {
-        $e->printStackTrace();
-      }
-      catch (Exception $e)
-      {
-        sfException::createFromException($e)->printStackTrace();
-      }
-
-      return true;
-    }
+        $class = strtolower($class);
 
-    return false;
-  }
+        // class already exists
+        if (class_exists($class, false) || interface_exists($class, false) || (function_exists('trait_exists') && trait_exists($class, false))) {
+            return true;
+        }
+
+        // we have a class path, let's include it
+        if (isset($this->classes[$class])) {
+            try {
+                require $this->classes[$class];
+            } catch (sfException $e) {
+                $e->printStackTrace();
+            } catch (Exception $e) {
+                sfException::createFromException($e)->printStackTrace();
+            }
+
+            return true;
+        }
+
+        // see if the file exists in the current module lib directory
+        if (
+            sfContext::hasInstance()
+            && ($module = sfContext::getInstance()->getModuleName())
+            && isset($this->classes[$module.'/'.$class])
+        ) {
+            try {
+                require $this->classes[$module.'/'.$class];
+            } catch (sfException $e) {
+                $e->printStackTrace();
+            } catch (Exception $e) {
+                sfException::createFromException($e)->printStackTrace();
+            }
+
+            return true;
+        }
+
+        return false;
+    }
 }
diff --git a/lib/autoload/sfAutoloadAgain.class.php b/lib/autoload/sfAutoloadAgain.class.php
index 6d61df830..edf0c9461 100644
--- a/lib/autoload/sfAutoloadAgain.class.php
+++ b/lib/autoload/sfAutoloadAgain.class.php
@@ -10,123 +10,111 @@
 
 /**
  * Autoload again for dev environments.
- * 
- * @package    symfony
- * @subpackage autoload
+ *
  * @author     Kris Wallsmith <kris.wallsmith@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfAutoloadAgain
 {
-  static protected
-    $instance = null;
-
-  protected
-    $registered = false,
-    $reloaded   = false;
-
-  /**
-   * Returns the singleton autoloader.
-   * 
-   * @return sfAutoloadAgain
-   */
-  static public function getInstance()
-  {
-    if (null === self::$instance)
+    protected static $instance;
+
+    protected $registered = false;
+    protected $reloaded = false;
+
+    /**
+     * Constructor.
+     */
+    protected function __construct()
     {
-      self::$instance = new self();
     }
 
-    return self::$instance;
-  }
-
-  /**
-   * Constructor.
-   */
-  protected function __construct()
-  {
-  }
-
-  /**
-   * Reloads the autoloader.
-   * 
-   * @param  string $class
-   * 
-   * @return boolean
-   */
-  public function autoload($class)
-  {
-    // only reload once
-    if ($this->reloaded)
+    /**
+     * Returns the singleton autoloader.
+     *
+     * @return sfAutoloadAgain
+     */
+    public static function getInstance()
     {
-      return false;
-    }
+        if (null === self::$instance) {
+            self::$instance = new self();
+        }
 
-    $autoloads = spl_autoload_functions();
+        return self::$instance;
+    }
 
-    // as of PHP 5.2.11, spl_autoload_functions() returns the object as the first element of the array instead of the class name
-    if (version_compare(PHP_VERSION, '5.2.11', '>='))
+    /**
+     * Reloads the autoloader.
+     *
+     * @param string $class
+     *
+     * @return bool
+     */
+    public function autoload($class)
     {
-      foreach ($autoloads as $position => $autoload)
-      {
-        if (is_array($autoload) && $this === $autoload[0])
-        {
-          break;
+        // only reload once
+        if ($this->reloaded) {
+            return false;
+        }
+
+        $autoloads = spl_autoload_functions();
+
+        // as of PHP 5.2.11, spl_autoload_functions() returns the object as the first element of the array instead of the class name
+        if (version_compare(PHP_VERSION, '5.2.11', '>=')) {
+            foreach ($autoloads as $position => $autoload) {
+                if (is_array($autoload) && $this === $autoload[0]) {
+                    break;
+                }
+            }
+        } else {
+            $position = array_search(array(__CLASS__, 'autoload'), $autoloads, true);
+        }
+
+        if (isset($autoloads[$position + 1])) {
+            $this->unregister();
+            $this->register();
+
+            // since we're rearranged things, call the chain again
+            spl_autoload_call($class);
+
+            return class_exists($class, false) || interface_exists($class, false);
         }
-      }
+
+        $autoload = sfAutoload::getInstance();
+        $autoload->reloadClasses(true);
+
+        $this->reloaded = true;
+
+        return $autoload->autoload($class);
     }
-    else
+
+    /**
+     * Returns true if the autoloader is registered.
+     *
+     * @return bool
+     */
+    public function isRegistered()
     {
-      $position  = array_search(array(__CLASS__, 'autoload'), $autoloads, true);
+        return $this->registered;
     }
 
-    if (isset($autoloads[$position + 1]))
+    /**
+     * Registers the autoloader function.
+     */
+    public function register()
     {
-      $this->unregister();
-      $this->register();
-
-      // since we're rearranged things, call the chain again
-      spl_autoload_call($class);
-
-      return class_exists($class, false) || interface_exists($class, false);
+        if (!$this->isRegistered()) {
+            spl_autoload_register(array($this, 'autoload'));
+            $this->registered = true;
+        }
     }
 
-    $autoload = sfAutoload::getInstance();
-    $autoload->reloadClasses(true);
-
-    $this->reloaded = true;
-
-    return $autoload->autoload($class);
-  }
-
-  /**
-   * Returns true if the autoloader is registered.
-   * 
-   * @return boolean
-   */
-  public function isRegistered()
-  {
-    return $this->registered;
-  }
-
-  /**
-   * Registers the autoloader function.
-   */
-  public function register()
-  {
-    if (!$this->isRegistered())
+    /**
+     * Unregisters the autoloader function.
+     */
+    public function unregister()
     {
-      spl_autoload_register(array($this, 'autoload'));
-      $this->registered = true;
+        spl_autoload_unregister(array($this, 'autoload'));
+        $this->registered = false;
     }
-  }
-
-  /**
-   * Unregisters the autoloader function.
-   */
-  public function unregister()
-  {
-    spl_autoload_unregister(array($this, 'autoload'));
-    $this->registered = false;
-  }
 }
diff --git a/lib/autoload/sfCoreAutoload.class.php b/lib/autoload/sfCoreAutoload.class.php
index ff6dfce1b..2b711629c 100755
--- a/lib/autoload/sfCoreAutoload.class.php
+++ b/lib/autoload/sfCoreAutoload.class.php
@@ -8,9 +8,7 @@
  * file that was distributed with this source code.
  */
 
-/**
- * The current symfony version.
- */
+// The current symfony version.
 define('SYMFONY_VERSION', '1.5.16-dev');
 
 /**
@@ -19,529 +17,515 @@
  * This class is a singleton as PHP seems to be unable to register 2 autoloaders that are instances
  * of the same class (why?).
  *
- * @package    symfony
- * @subpackage autoload
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfCoreAutoload.class.php 32415 2011-03-30 16:09:00Z Kris.Wallsmith
  *
+ * @version    SVN: $Id: sfCoreAutoload.class.php 32415 2011-03-30 16:09:00Z Kris.Wallsmith
  */
 class sfCoreAutoload
 {
-  static protected
-    $registered = false,
-    $instance   = null;
+    protected static $registered = false;
+    protected static $instance;
 
-  protected
-    $baseDir = null;
+    protected $baseDir;
 
-  protected function __construct()
-  {
-    $this->baseDir = realpath(__DIR__.'/..');
-  }
+    // Don't edit this property by hand.
+    // To update it, use sfCoreAutoload::make()
+    protected $classes = array(
+        'sfaction' => 'action/sfAction.class.php',
+        'sfactionstack' => 'action/sfActionStack.class.php',
+        'sfactionstackentry' => 'action/sfActionStackEntry.class.php',
+        'sfactions' => 'action/sfActions.class.php',
+        'sfcomponent' => 'action/sfComponent.class.php',
+        'sfcomponents' => 'action/sfComponents.class.php',
+        'sfdata' => 'addon/sfData.class.php',
+        'sfpager' => 'addon/sfPager.class.php',
+        'sfautoload' => 'autoload/sfAutoload.class.php',
+        'sfautoloadagain' => 'autoload/sfAutoloadAgain.class.php',
+        'sfcoreautoload' => 'autoload/sfCoreAutoload.class.php',
+        'sfsimpleautoload' => 'autoload/sfSimpleAutoload.class.php',
+        'sfapccache' => 'cache/sfAPCCache.class.php',
+        'sfcache' => 'cache/sfCache.class.php',
+        'sfeacceleratorcache' => 'cache/sfEAcceleratorCache.class.php',
+        'sffilecache' => 'cache/sfFileCache.class.php',
+        'sffunctioncache' => 'cache/sfFunctionCache.class.php',
+        'sfmemcachecache' => 'cache/sfMemcacheCache.class.php',
+        'sfnocache' => 'cache/sfNoCache.class.php',
+        'sfsqlitecache' => 'cache/sfSQLiteCache.class.php',
+        'sfxcachecache' => 'cache/sfXCacheCache.class.php',
+        'sfansicolorformatter' => 'command/sfAnsiColorFormatter.class.php',
+        'sfcommandapplication' => 'command/sfCommandApplication.class.php',
+        'sfcommandargument' => 'command/sfCommandArgument.class.php',
+        'sfcommandargumentset' => 'command/sfCommandArgumentSet.class.php',
+        'sfcommandargumentsexception' => 'command/sfCommandArgumentsException.class.php',
+        'sfcommandexception' => 'command/sfCommandException.class.php',
+        'sfcommandlogger' => 'command/sfCommandLogger.class.php',
+        'sfcommandmanager' => 'command/sfCommandManager.class.php',
+        'sfcommandoption' => 'command/sfCommandOption.class.php',
+        'sfcommandoptionset' => 'command/sfCommandOptionSet.class.php',
+        'sfformatter' => 'command/sfFormatter.class.php',
+        'sfsymfonycommandapplication' => 'command/sfSymfonyCommandApplication.class.php',
+        'sfapplicationconfiguration' => 'config/sfApplicationConfiguration.class.php',
+        'sfautoloadconfighandler' => 'config/sfAutoloadConfigHandler.class.php',
+        'sfcacheconfighandler' => 'config/sfCacheConfigHandler.class.php',
+        'sfcompileconfighandler' => 'config/sfCompileConfigHandler.class.php',
+        'sfconfig' => 'config/sfConfig.class.php',
+        'sfconfigcache' => 'config/sfConfigCache.class.php',
+        'sfconfighandler' => 'config/sfConfigHandler.class.php',
+        'sfdatabaseconfighandler' => 'config/sfDatabaseConfigHandler.class.php',
+        'sfdefineenvironmentconfighandler' => 'config/sfDefineEnvironmentConfigHandler.class.php',
+        'sffactoryconfighandler' => 'config/sfFactoryConfigHandler.class.php',
+        'sffilterconfighandler' => 'config/sfFilterConfigHandler.class.php',
+        'sfgeneratorconfighandler' => 'config/sfGeneratorConfigHandler.class.php',
+        'sfpluginconfiguration' => 'config/sfPluginConfiguration.class.php',
+        'sfpluginconfigurationgeneric' => 'config/sfPluginConfigurationGeneric.class.php',
+        'sfprojectconfiguration' => 'config/sfProjectConfiguration.class.php',
+        'sfrootconfighandler' => 'config/sfRootConfigHandler.class.php',
+        'sfroutingconfighandler' => 'config/sfRoutingConfigHandler.class.php',
+        'sfsecurityconfighandler' => 'config/sfSecurityConfigHandler.class.php',
+        'sfserviceconfighandler' => 'config/sfServiceConfigHandler.class.php',
+        'sfsimpleyamlconfighandler' => 'config/sfSimpleYamlConfigHandler.class.php',
+        'sfviewconfighandler' => 'config/sfViewConfigHandler.class.php',
+        'sfyamlconfighandler' => 'config/sfYamlConfigHandler.class.php',
+        'sfcontroller' => 'controller/sfController.class.php',
+        'sffrontwebcontroller' => 'controller/sfFrontWebController.class.php',
+        'sfwebcontroller' => 'controller/sfWebController.class.php',
+        'sfdatabase' => 'database/sfDatabase.class.php',
+        'sfdatabasemanager' => 'database/sfDatabaseManager.class.php',
+        'sfmysqldatabase' => 'database/sfMySQLDatabase.class.php',
+        'sfmysqlidatabase' => 'database/sfMySQLiDatabase.class.php',
+        'sfpdodatabase' => 'database/sfPDODatabase.class.php',
+        'sfpostgresqldatabase' => 'database/sfPostgreSQLDatabase.class.php',
+        'sfdebug' => 'debug/sfDebug.class.php',
+        'sftimer' => 'debug/sfTimer.class.php',
+        'sftimermanager' => 'debug/sfTimerManager.class.php',
+        'sfwebdebug' => 'debug/sfWebDebug.class.php',
+        'sfwebdebugpanel' => 'debug/sfWebDebugPanel.class.php',
+        'sfwebdebugpanelcache' => 'debug/sfWebDebugPanelCache.class.php',
+        'sfwebdebugpanelconfig' => 'debug/sfWebDebugPanelConfig.class.php',
+        'sfwebdebugpanellogs' => 'debug/sfWebDebugPanelLogs.class.php',
+        'sfwebdebugpanelmailer' => 'debug/sfWebDebugPanelMailer.class.php',
+        'sfwebdebugpanelmemory' => 'debug/sfWebDebugPanelMemory.class.php',
+        'sfwebdebugpanelsymfonyversion' => 'debug/sfWebDebugPanelSymfonyVersion.class.php',
+        'sfwebdebugpaneltimer' => 'debug/sfWebDebugPanelTimer.class.php',
+        'sfwebdebugpanelview' => 'debug/sfWebDebugPanelView.class.php',
+        'sfoutputescaper' => 'escaper/sfOutputEscaper.class.php',
+        'sfoutputescaperarraydecorator' => 'escaper/sfOutputEscaperArrayDecorator.class.php',
+        'sfoutputescapergetterdecorator' => 'escaper/sfOutputEscaperGetterDecorator.class.php',
+        'sfoutputescaperiteratordecorator' => 'escaper/sfOutputEscaperIteratorDecorator.class.php',
+        'sfoutputescaperobjectdecorator' => 'escaper/sfOutputEscaperObjectDecorator.class.php',
+        'sfoutputescapersafe' => 'escaper/sfOutputEscaperSafe.class.php',
+        'sfevent' => 'event/sfEvent.class.php',
+        'sfeventdispatcher' => 'event/sfEventDispatcher.class.php',
+        'sfcacheexception' => 'exception/sfCacheException.class.php',
+        'sfconfigurationexception' => 'exception/sfConfigurationException.class.php',
+        'sfcontrollerexception' => 'exception/sfControllerException.class.php',
+        'sfdatabaseexception' => 'exception/sfDatabaseException.class.php',
+        'sferror404exception' => 'exception/sfError404Exception.class.php',
+        'sfexception' => 'exception/sfException.class.php',
+        'sffactoryexception' => 'exception/sfFactoryException.class.php',
+        'sffileexception' => 'exception/sfFileException.class.php',
+        'sffilterexception' => 'exception/sfFilterException.class.php',
+        'sfforwardexception' => 'exception/sfForwardException.class.php',
+        'sfinitializationexception' => 'exception/sfInitializationException.class.php',
+        'sfparseexception' => 'exception/sfParseException.class.php',
+        'sfrenderexception' => 'exception/sfRenderException.class.php',
+        'sfsecurityexception' => 'exception/sfSecurityException.class.php',
+        'sfstopexception' => 'exception/sfStopException.class.php',
+        'sfstorageexception' => 'exception/sfStorageException.class.php',
+        'sfviewexception' => 'exception/sfViewException.class.php',
+        'sfbasicsecurityfilter' => 'filter/sfBasicSecurityFilter.class.php',
+        'sfcachefilter' => 'filter/sfCacheFilter.class.php',
+        'sfcommonfilter' => 'filter/sfCommonFilter.class.php',
+        'sfexecutionfilter' => 'filter/sfExecutionFilter.class.php',
+        'sffilter' => 'filter/sfFilter.class.php',
+        'sffilterchain' => 'filter/sfFilterChain.class.php',
+        'sfrenderingfilter' => 'filter/sfRenderingFilter.class.php',
+        'sfformfilter' => 'form/addon/sfFormFilter.class.php',
+        'sfformobject' => 'form/addon/sfFormObject.class.php',
+        'sfformsymfony' => 'form/addon/sfFormSymfony.class.php',
+        'sfform' => 'form/sfForm.class.php',
+        'sfformfield' => 'form/sfFormField.class.php',
+        'sfformfieldschema' => 'form/sfFormFieldSchema.class.php',
+        'sfgenerator' => 'generator/sfGenerator.class.php',
+        'sfgeneratormanager' => 'generator/sfGeneratorManager.class.php',
+        'sfmodelgenerator' => 'generator/sfModelGenerator.class.php',
+        'sfmodelgeneratorconfiguration' => 'generator/sfModelGeneratorConfiguration.class.php',
+        'sfmodelgeneratorconfigurationfield' => 'generator/sfModelGeneratorConfigurationField.class.php',
+        'sfmodelgeneratorhelper' => 'generator/sfModelGeneratorHelper.class.php',
+        'tgettext' => 'i18n/Gettext/TGettext.class.php',
+        'sfi18napplicationextract' => 'i18n/extract/sfI18nApplicationExtract.class.php',
+        'sfi18nextract' => 'i18n/extract/sfI18nExtract.class.php',
+        'sfi18nextractorinterface' => 'i18n/extract/sfI18nExtractorInterface.class.php',
+        'sfi18nmoduleextract' => 'i18n/extract/sfI18nModuleExtract.class.php',
+        'sfi18nphpextractor' => 'i18n/extract/sfI18nPhpExtractor.class.php',
+        'sfi18nyamlextractor' => 'i18n/extract/sfI18nYamlExtractor.class.php',
+        'sfi18nyamlgeneratorextractor' => 'i18n/extract/sfI18nYamlGeneratorExtractor.class.php',
+        'sfi18nyamlvalidateextractor' => 'i18n/extract/sfI18nYamlValidateExtractor.class.php',
+        'sfchoiceformat' => 'i18n/sfChoiceFormat.class.php',
+        'sfcultureinfo' => 'i18n/sfCultureInfo.class.php',
+        'sfdateformat' => 'i18n/sfDateFormat.class.php',
+        'sfdatetimeformatinfo' => 'i18n/sfDateTimeFormatInfo.class.php',
+        'sfi18n' => 'i18n/sfI18N.class.php',
+        'sfimessagesource' => 'i18n/sfIMessageSource.class.php',
+        'sfmessageformat' => 'i18n/sfMessageFormat.class.php',
+        'sfmessagesource' => 'i18n/sfMessageSource.class.php',
+        'sfmessagesource_aggregate' => 'i18n/sfMessageSource_Aggregate.class.php',
+        'sfmessagesource_database' => 'i18n/sfMessageSource_Database.class.php',
+        'sfmessagesource_file' => 'i18n/sfMessageSource_File.class.php',
+        'sfmessagesource_mysql' => 'i18n/sfMessageSource_MySQL.class.php',
+        'sfmessagesource_sqlite' => 'i18n/sfMessageSource_SQLite.class.php',
+        'sfmessagesource_sqlite3' => 'i18n/sfMessageSource_SQLite3.class.php',
+        'sfmessagesource_xliff' => 'i18n/sfMessageSource_XLIFF.class.php',
+        'sfmessagesource_gettext' => 'i18n/sfMessageSource_gettext.class.php',
+        'sfnumberformat' => 'i18n/sfNumberFormat.class.php',
+        'sfnumberformatinfo' => 'i18n/sfNumberFormatInfo.class.php',
+        'sfaggregatelogger' => 'log/sfAggregateLogger.class.php',
+        'sfconsolelogger' => 'log/sfConsoleLogger.class.php',
+        'sfeventlogger' => 'log/sfEventLogger.class.php',
+        'sffilelogger' => 'log/sfFileLogger.class.php',
+        'sflogger' => 'log/sfLogger.class.php',
+        'sfloggerinterface' => 'log/sfLoggerInterface.class.php',
+        'sfloggerwrapper' => 'log/sfLoggerWrapper.class.php',
+        'sfnologger' => 'log/sfNoLogger.class.php',
+        'sfpsrloggeradapter' => 'log/sfPsrLoggerAdapter.class.php',
+        'sfstreamlogger' => 'log/sfStreamLogger.class.php',
+        'sfvarlogger' => 'log/sfVarLogger.class.php',
+        'sfwebdebuglogger' => 'log/sfWebDebugLogger.class.php',
+        'sfmailer' => 'mailer/sfMailer.class.php',
+        'sfmailermessageloggerplugin' => 'mailer/sfMailerMessageLoggerPlugin.class.php',
+        'sfnomailer' => 'mailer/sfNoMailer.class.php',
+        'sfpearconfig' => 'plugin/sfPearConfig.class.php',
+        'sfpeardownloader' => 'plugin/sfPearDownloader.class.php',
+        'sfpearenvironment' => 'plugin/sfPearEnvironment.class.php',
+        'sfpearfrontendplugin' => 'plugin/sfPearFrontendPlugin.class.php',
+        'sfpearrest' => 'plugin/sfPearRest.class.php',
+        'sfpearrest10' => 'plugin/sfPearRest10.class.php',
+        'sfpearrest11' => 'plugin/sfPearRest11.class.php',
+        'sfpearrestplugin' => 'plugin/sfPearRestPlugin.class.php',
+        'sfplugindependencyexception' => 'plugin/sfPluginDependencyException.class.php',
+        'sfpluginexception' => 'plugin/sfPluginException.class.php',
+        'sfpluginmanager' => 'plugin/sfPluginManager.class.php',
+        'sfpluginrecursivedependencyexception' => 'plugin/sfPluginRecursiveDependencyException.class.php',
+        'sfpluginrestexception' => 'plugin/sfPluginRestException.class.php',
+        'sfsymfonypluginmanager' => 'plugin/sfSymfonyPluginManager.class.php',
+        'sfrequest' => 'request/sfRequest.class.php',
+        'sfwebrequest' => 'request/sfWebRequest.class.php',
+        'sfresponse' => 'response/sfResponse.class.php',
+        'sfwebresponse' => 'response/sfWebResponse.class.php',
+        'sfobjectroute' => 'routing/sfObjectRoute.class.php',
+        'sfobjectroutecollection' => 'routing/sfObjectRouteCollection.class.php',
+        'sfpatternrouting' => 'routing/sfPatternRouting.class.php',
+        'sfrequestroute' => 'routing/sfRequestRoute.class.php',
+        'sfroute' => 'routing/sfRoute.class.php',
+        'sfroutecollection' => 'routing/sfRouteCollection.class.php',
+        'sfrouting' => 'routing/sfRouting.class.php',
+        'sfservicecontainer' => 'service/sfServiceContainer.class.php',
+        'sfservicecontainerbuilder' => 'service/sfServiceContainerBuilder.class.php',
+        'sfservicecontainerdumper' => 'service/sfServiceContainerDumper.class.php',
+        'sfservicecontainerdumpergraphviz' => 'service/sfServiceContainerDumperGraphviz.class.php',
+        'sfservicecontainerdumperinterface' => 'service/sfServiceContainerDumperInterface.class.php',
+        'sfservicecontainerdumperphp' => 'service/sfServiceContainerDumperPhp.class.php',
+        'sfservicecontainerinterface' => 'service/sfServiceContainerInterface.class.php',
+        'sfservicecontainerloader' => 'service/sfServiceContainerLoader.class.php',
+        'sfservicecontainerloaderarray' => 'service/sfServiceContainerLoaderArray.class.php',
+        'sfservicecontainerloaderinterface' => 'service/sfServiceContainerLoaderInterface.class.php',
+        'sfservicedefinition' => 'service/sfServiceDefinition.class.php',
+        'sfserviceparameter' => 'service/sfServiceParameter.class.php',
+        'sfservicereference' => 'service/sfServiceReference.class.php',
+        'sfcachesessionstorage' => 'storage/sfCacheSessionStorage.class.php',
+        'sfdatabasesessionstorage' => 'storage/sfDatabaseSessionStorage.class.php',
+        'sfmysqlsessionstorage' => 'storage/sfMySQLSessionStorage.class.php',
+        'sfmysqlisessionstorage' => 'storage/sfMySQLiSessionStorage.class.php',
+        'sfnostorage' => 'storage/sfNoStorage.class.php',
+        'sfpdosessionstorage' => 'storage/sfPDOSessionStorage.class.php',
+        'sfpostgresqlsessionstorage' => 'storage/sfPostgreSQLSessionStorage.class.php',
+        'sfsessionstorage' => 'storage/sfSessionStorage.class.php',
+        'sfsessionteststorage' => 'storage/sfSessionTestStorage.class.php',
+        'sfstorage' => 'storage/sfStorage.class.php',
+        'sfapproutestask' => 'task/app/sfAppRoutesTask.class.php',
+        'sfcachecleartask' => 'task/cache/sfCacheClearTask.class.php',
+        'sfconfigureauthortask' => 'task/configure/sfConfigureAuthorTask.class.php',
+        'sfgenerateapptask' => 'task/generator/sfGenerateAppTask.class.php',
+        'sfgeneratemoduletask' => 'task/generator/sfGenerateModuleTask.class.php',
+        'sfgenerateprojecttask' => 'task/generator/sfGenerateProjectTask.class.php',
+        'sfgeneratetasktask' => 'task/generator/sfGenerateTaskTask.class.php',
+        'sfgeneratorbasetask' => 'task/generator/sfGeneratorBaseTask.class.php',
+        'sfhelptask' => 'task/help/sfHelpTask.class.php',
+        'sflisttask' => 'task/help/sfListTask.class.php',
+        'sfi18nextracttask' => 'task/i18n/sfI18nExtractTask.class.php',
+        'sfi18nfindtask' => 'task/i18n/sfI18nFindTask.class.php',
+        'sflogcleartask' => 'task/log/sfLogClearTask.class.php',
+        'sflogrotatetask' => 'task/log/sfLogRotateTask.class.php',
+        'sfpluginaddchanneltask' => 'task/plugin/sfPluginAddChannelTask.class.php',
+        'sfpluginbasetask' => 'task/plugin/sfPluginBaseTask.class.php',
+        'sfplugininstalltask' => 'task/plugin/sfPluginInstallTask.class.php',
+        'sfpluginlisttask' => 'task/plugin/sfPluginListTask.class.php',
+        'sfpluginpublishassetstask' => 'task/plugin/sfPluginPublishAssetsTask.class.php',
+        'sfpluginuninstalltask' => 'task/plugin/sfPluginUninstallTask.class.php',
+        'sfpluginupgradetask' => 'task/plugin/sfPluginUpgradeTask.class.php',
+        'sfprojectclearcontrollerstask' => 'task/project/sfProjectClearControllersTask.class.php',
+        'sfprojectdeploytask' => 'task/project/sfProjectDeployTask.class.php',
+        'sfprojectdisabletask' => 'task/project/sfProjectDisableTask.class.php',
+        'sfprojectenabletask' => 'task/project/sfProjectEnableTask.class.php',
+        'sfprojectoptimizetask' => 'task/project/sfProjectOptimizeTask.class.php',
+        'sfprojectpermissionstask' => 'task/project/sfProjectPermissionsTask.class.php',
+        'sfprojectsendemailstask' => 'task/project/sfProjectSendEmailsTask.class.php',
+        'sfdeprecatedclassesvalidation' => 'task/project/validation/sfDeprecatedClassesValidation.class.php',
+        'sfdeprecatedconfigurationfilesvalidation' => 'task/project/validation/sfDeprecatedConfigurationFilesValidation.class.php',
+        'sfdeprecatedhelpersvalidation' => 'task/project/validation/sfDeprecatedHelpersValidation.class.php',
+        'sfdeprecatedmethodsvalidation' => 'task/project/validation/sfDeprecatedMethodsValidation.class.php',
+        'sfdeprecatedpluginsvalidation' => 'task/project/validation/sfDeprecatedPluginsValidation.class.php',
+        'sfdeprecatedsettingsvalidation' => 'task/project/validation/sfDeprecatedSettingsValidation.class.php',
+        'sfparameterholdervalidation' => 'task/project/validation/sfParameterHolderValidation.class.php',
+        'sfvalidation' => 'task/project/validation/sfValidation.class.php',
+        'sfbasetask' => 'task/sfBaseTask.class.php',
+        'sfcommandapplicationtask' => 'task/sfCommandApplicationTask.class.php',
+        'sffilesystem' => 'task/sfFilesystem.class.php',
+        'sftask' => 'task/sfTask.class.php',
+        'lime_symfony' => 'task/symfony/lime_symfony.php',
+        'sfsymfonytesttask' => 'task/symfony/sfSymfonyTestTask.class.php',
+        'sflimeharness' => 'task/test/sfLimeHarness.class.php',
+        'sftestalltask' => 'task/test/sfTestAllTask.class.php',
+        'sftestbasetask' => 'task/test/sfTestBaseTask.class.php',
+        'sftestcoveragetask' => 'task/test/sfTestCoverageTask.class.php',
+        'sftestfunctionaltask' => 'task/test/sfTestFunctionalTask.class.php',
+        'sftestplugintask' => 'task/test/sfTestPluginTask.class.php',
+        'sftestunittask' => 'task/test/sfTestUnitTask.class.php',
+        'sftestbrowser' => 'test/sfTestBrowser.class.php',
+        'sftestfunctional' => 'test/sfTestFunctional.class.php',
+        'sftestfunctionalbase' => 'test/sfTestFunctionalBase.class.php',
+        'sftester' => 'test/sfTester.class.php',
+        'sftesterform' => 'test/sfTesterForm.class.php',
+        'sftestermailer' => 'test/sfTesterMailer.class.php',
+        'sftesterrequest' => 'test/sfTesterRequest.class.php',
+        'sftesterresponse' => 'test/sfTesterResponse.class.php',
+        'sftesteruser' => 'test/sfTesterUser.class.php',
+        'sftesterviewcache' => 'test/sfTesterViewCache.class.php',
+        'sfbasicsecurityuser' => 'user/sfBasicSecurityUser.class.php',
+        'sfsecurityuser' => 'user/sfSecurityUser.class.php',
+        'sfuser' => 'user/sfUser.class.php',
+        'sfbrowser' => 'util/sfBrowser.class.php',
+        'sfbrowserbase' => 'util/sfBrowserBase.class.php',
+        'sfcallable' => 'util/sfCallable.class.php',
+        'sfclassmanipulator' => 'util/sfClassManipulator.class.php',
+        'sfcontext' => 'util/sfContext.class.php',
+        'sfdomcssselector' => 'util/sfDomCssSelector.class.php',
+        'sffinder' => 'util/sfFinder.class.php',
+        'sfinflector' => 'util/sfInflector.class.php',
+        'sfnamespacedparameterholder' => 'util/sfNamespacedParameterHolder.class.php',
+        'sfparameterholder' => 'util/sfParameterHolder.class.php',
+        'sftoolkit' => 'util/sfToolkit.class.php',
+        'sfvalidatori18nchoicecountry' => 'validator/i18n/sfValidatorI18nChoiceCountry.class.php',
+        'sfvalidatori18nchoicelanguage' => 'validator/i18n/sfValidatorI18nChoiceLanguage.class.php',
+        'sfvalidatori18nchoicetimezone' => 'validator/i18n/sfValidatorI18nChoiceTimezone.class.php',
+        'sfvalidatedfile' => 'validator/sfValidatedFile.class.php',
+        'sfvalidatorand' => 'validator/sfValidatorAnd.class.php',
+        'sfvalidatorbase' => 'validator/sfValidatorBase.class.php',
+        'sfvalidatorboolean' => 'validator/sfValidatorBoolean.class.php',
+        'sfvalidatorcsrftoken' => 'validator/sfValidatorCSRFToken.class.php',
+        'sfvalidatorcallback' => 'validator/sfValidatorCallback.class.php',
+        'sfvalidatorchoice' => 'validator/sfValidatorChoice.class.php',
+        'sfvalidatordate' => 'validator/sfValidatorDate.class.php',
+        'sfvalidatordaterange' => 'validator/sfValidatorDateRange.class.php',
+        'sfvalidatordatetime' => 'validator/sfValidatorDateTime.class.php',
+        'sfvalidatordecorator' => 'validator/sfValidatorDecorator.class.php',
+        'sfvalidatoremail' => 'validator/sfValidatorEmail.class.php',
+        'sfvalidatorequal' => 'validator/sfValidatorEqual.class.php',
+        'sfvalidatorerror' => 'validator/sfValidatorError.class.php',
+        'sfvalidatorerrorschema' => 'validator/sfValidatorErrorSchema.class.php',
+        'sfvalidatorfile' => 'validator/sfValidatorFile.class.php',
+        'sfvalidatorfilemulti' => 'validator/sfValidatorFileMulti.class.php',
+        'sfvalidatorfromdescription' => 'validator/sfValidatorFromDescription.class.php',
+        'sfvalidatorinteger' => 'validator/sfValidatorInteger.class.php',
+        'sfvalidatorip' => 'validator/sfValidatorIp.class.php',
+        'sfvalidatornumber' => 'validator/sfValidatorNumber.class.php',
+        'sfvalidatoror' => 'validator/sfValidatorOr.class.php',
+        'sfvalidatorpass' => 'validator/sfValidatorPass.class.php',
+        'sfvalidatorregex' => 'validator/sfValidatorRegex.class.php',
+        'sfvalidatorschema' => 'validator/sfValidatorSchema.class.php',
+        'sfvalidatorschemacompare' => 'validator/sfValidatorSchemaCompare.class.php',
+        'sfvalidatorschemafilter' => 'validator/sfValidatorSchemaFilter.class.php',
+        'sfvalidatorstring' => 'validator/sfValidatorString.class.php',
+        'sfvalidatortime' => 'validator/sfValidatorTime.class.php',
+        'sfvalidatorurl' => 'validator/sfValidatorUrl.class.php',
+        'sfphpview' => 'view/sfPHPView.class.php',
+        'sfpartialview' => 'view/sfPartialView.class.php',
+        'sfview' => 'view/sfView.class.php',
+        'sfviewcachemanager' => 'view/sfViewCacheManager.class.php',
+        'sfviewparameterholder' => 'view/sfViewParameterHolder.class.php',
+        'sfwidgetformi18nchoicecountry' => 'widget/i18n/sfWidgetFormI18nChoiceCountry.class.php',
+        'sfwidgetformi18nchoicecurrency' => 'widget/i18n/sfWidgetFormI18nChoiceCurrency.class.php',
+        'sfwidgetformi18nchoicelanguage' => 'widget/i18n/sfWidgetFormI18nChoiceLanguage.class.php',
+        'sfwidgetformi18nchoicetimezone' => 'widget/i18n/sfWidgetFormI18nChoiceTimezone.class.php',
+        'sfwidgetformi18ndate' => 'widget/i18n/sfWidgetFormI18nDate.class.php',
+        'sfwidgetformi18ndatetime' => 'widget/i18n/sfWidgetFormI18nDateTime.class.php',
+        'sfwidgetformi18ntime' => 'widget/i18n/sfWidgetFormI18nTime.class.php',
+        'sfwidget' => 'widget/sfWidget.class.php',
+        'sfwidgetform' => 'widget/sfWidgetForm.class.php',
+        'sfwidgetformchoice' => 'widget/sfWidgetFormChoice.class.php',
+        'sfwidgetformchoicebase' => 'widget/sfWidgetFormChoiceBase.class.php',
+        'sfwidgetformdate' => 'widget/sfWidgetFormDate.class.php',
+        'sfwidgetformdaterange' => 'widget/sfWidgetFormDateRange.class.php',
+        'sfwidgetformdatetime' => 'widget/sfWidgetFormDateTime.class.php',
+        'sfwidgetformfilterdate' => 'widget/sfWidgetFormFilterDate.class.php',
+        'sfwidgetformfilterinput' => 'widget/sfWidgetFormFilterInput.class.php',
+        'sfwidgetforminput' => 'widget/sfWidgetFormInput.class.php',
+        'sfwidgetforminputcheckbox' => 'widget/sfWidgetFormInputCheckbox.class.php',
+        'sfwidgetforminputfile' => 'widget/sfWidgetFormInputFile.class.php',
+        'sfwidgetforminputfilemulti' => 'widget/sfWidgetFormInputFileMulti.class.php',
+        'sfwidgetforminputfileeditable' => 'widget/sfWidgetFormInputFileEditable.class.php',
+        'sfwidgetforminputhidden' => 'widget/sfWidgetFormInputHidden.class.php',
+        'sfwidgetforminputpassword' => 'widget/sfWidgetFormInputPassword.class.php',
+        'sfwidgetforminputread' => 'widget/sfWidgetFormInputRead.class.php',
+        'sfwidgetforminputtext' => 'widget/sfWidgetFormInputText.class.php',
+        'sfwidgetformschema' => 'widget/sfWidgetFormSchema.class.php',
+        'sfwidgetformschemadecorator' => 'widget/sfWidgetFormSchemaDecorator.class.php',
+        'sfwidgetformschemaformatter' => 'widget/sfWidgetFormSchemaFormatter.class.php',
+        'sfwidgetformschemaformatterlist' => 'widget/sfWidgetFormSchemaFormatterList.class.php',
+        'sfwidgetformschemaformattertable' => 'widget/sfWidgetFormSchemaFormatterTable.class.php',
+        'sfwidgetformselect' => 'widget/sfWidgetFormSelect.class.php',
+        'sfwidgetformselectcheckbox' => 'widget/sfWidgetFormSelectCheckbox.class.php',
+        'sfwidgetformselectmany' => 'widget/sfWidgetFormSelectMany.class.php',
+        'sfwidgetformselectradio' => 'widget/sfWidgetFormSelectRadio.class.php',
+        'sfwidgetformtextarea' => 'widget/sfWidgetFormTextarea.class.php',
+        'sfwidgetformtime' => 'widget/sfWidgetFormTime.class.php',
+        'sfyaml' => 'yaml/sfYaml.class.php',
+        'sfyamldumper' => 'yaml/sfYamlDumper.class.php',
+        'sfyamlinline' => 'yaml/sfYamlInline.class.php',
+        'sfyamlparser' => 'yaml/sfYamlParser.class.php',
+    );
 
-  /**
-   * Retrieves the singleton instance of this class.
-   *
-   * @return sfCoreAutoload A sfCoreAutoload implementation instance.
-   */
-  static public function getInstance()
-  {
-    if (!isset(self::$instance))
+    protected function __construct()
     {
-      self::$instance = new sfCoreAutoload();
+        $this->baseDir = realpath(__DIR__.'/..');
     }
 
-    return self::$instance;
-  }
-
-  /**
-   * Register sfCoreAutoload in spl autoloader.
-   *
-   * @return void
-   *
-   * @throws sfException If unable to register SPL autoload function
-   */
-  static public function register()
-  {
-    if (self::$registered)
+    /**
+     * Retrieves the singleton instance of this class.
+     *
+     * @return sfCoreAutoload a sfCoreAutoload implementation instance
+     */
+    public static function getInstance()
     {
-      return;
+        if (!isset(self::$instance)) {
+            self::$instance = new sfCoreAutoload();
+        }
+
+        return self::$instance;
     }
 
-    ini_set('unserialize_callback_func', 'spl_autoload_call');
-    if (false === spl_autoload_register(array(self::getInstance(), 'autoload')))
+    /**
+     * Register sfCoreAutoload in spl autoloader.
+     *
+     * @throws sfException If unable to register SPL autoload function
+     */
+    public static function register()
     {
-      throw new sfException(sprintf('Unable to register %s::autoload as an autoloading method.', get_class(self::getInstance())));
-    }
+        if (self::$registered) {
+            return;
+        }
 
-    self::$registered = true;
-  }
+        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())));
+        }
 
-  /**
-   * Unregister sfCoreAutoload from spl autoloader.
-   *
-   * @return void
-   */
-  static public function unregister()
-  {
-    spl_autoload_unregister(array(self::getInstance(), 'autoload'));
-    self::$registered = false;
-  }
+        self::$registered = true;
+    }
 
-  /**
-   * Handles autoloading of classes.
-   *
-   * @param  string  $class  A class name.
-   *
-   * @return boolean Returns true if the class has been loaded
-   */
-  public function autoload($class)
-  {
-    if ($path = $this->getClassPath($class))
+    /**
+     * Unregister sfCoreAutoload from spl autoloader.
+     */
+    public static function unregister()
     {
-      require $path;
-
-      return true;
+        spl_autoload_unregister(array(self::getInstance(), 'autoload'));
+        self::$registered = false;
     }
 
-    return false;
-  }
+    /**
+     * Handles autoloading of classes.
+     *
+     * @param string $class a class name
+     *
+     * @return bool Returns true if the class has been loaded
+     */
+    public function autoload($class)
+    {
+        if ($path = $this->getClassPath($class)) {
+            require $path;
 
-  /**
-   * Returns the filename of the supplied class.
-   *
-   * @param  string $class The class name (case insensitive)
-   *
-   * @return string|null An absolute path or null
-   */
-  public function getClassPath($class)
-  {
-    $class = strtolower($class);
+            return true;
+        }
 
-    if (!isset($this->classes[$class]))
-    {
-      return null;
+        return false;
     }
 
-    return $this->baseDir.'/'.$this->classes[$class];
-  }
-
-  /**
-   * Returns the base directory this autoloader is working on.
-   *
-   * @return string The path to the symfony core lib directory
-   */
-  public function getBaseDir()
-  {
-    return $this->baseDir;
-  }
+    /**
+     * Returns the filename of the supplied class.
+     *
+     * @param string $class The class name (case insensitive)
+     *
+     * @return string|null An absolute path or null
+     */
+    public function getClassPath($class)
+    {
+        $class = strtolower($class);
 
-  /**
-   * Rebuilds the association array between class names and paths.
-   *
-   * This method overrides this file (__FILE__)
-   */
-  static public function make()
-  {
-    $libDir = str_replace(DIRECTORY_SEPARATOR, '/', realpath(__DIR__.DIRECTORY_SEPARATOR.'..'));
-    require_once $libDir.'/util/sfFinder.class.php';
+        if (!isset($this->classes[$class])) {
+            return null;
+        }
 
-    $files = sfFinder::type('file')
-      ->prune('plugins')
-      ->prune('vendor')
-      ->prune('skeleton')
-      ->prune('default')
-      ->prune('helper')
-      ->name('*.php')
-      ->in($libDir)
-    ;
+        return $this->baseDir.'/'.$this->classes[$class];
+    }
 
-    sort($files, SORT_STRING);
+    /**
+     * Returns the base directory this autoloader is working on.
+     *
+     * @return string The path to the symfony core lib directory
+     */
+    public function getBaseDir()
+    {
+        return $this->baseDir;
+    }
 
-    $classes = '';
-    foreach ($files as $file)
+    /**
+     * Rebuilds the association array between class names and paths.
+     *
+     * This method overrides this file (__FILE__)
+     */
+    public static function make()
     {
-      $file  = str_replace(DIRECTORY_SEPARATOR, '/', $file);
-      $class = basename($file, false === strpos($file, '.class.php') ? '.php' : '.class.php');
+        $libDir = str_replace(DIRECTORY_SEPARATOR, '/', realpath(__DIR__.DIRECTORY_SEPARATOR.'..'));
 
-      $contents = file_get_contents($file);
-      if (false !== stripos($contents, 'class '.$class)
-          || false !== stripos($contents, 'interface '.$class)
-          || false !== stripos($contents, 'trait '.$class))
-      {
-        $classes .= sprintf("    '%s' => '%s',\n", strtolower($class), substr(str_replace($libDir, '', $file), 1));
-      }
-    }
+        require_once $libDir.'/util/sfFinder.class.php';
+
+        $files = sfFinder::type('file')
+            ->prune('plugins')
+            ->prune('vendor')
+            ->prune('skeleton')
+            ->prune('default')
+            ->prune('helper')
+            ->name('*.php')
+            ->in($libDir)
+        ;
+
+        sort($files, SORT_STRING);
 
-    $content = preg_replace('/protected \$classes = array *\(.*?\);/s', sprintf("protected \$classes = array(\n%s  );", $classes), file_get_contents(__FILE__));
+        $classes = '';
+        foreach ($files as $file) {
+            $file = str_replace(DIRECTORY_SEPARATOR, '/', $file);
+            $class = basename($file, false === strpos($file, '.class.php') ? '.php' : '.class.php');
 
-    file_put_contents(__FILE__, $content);
-  }
+            $contents = file_get_contents($file);
+            if (false !== stripos($contents, 'class '.$class)
+                || false !== stripos($contents, 'interface '.$class)
+                || false !== stripos($contents, 'trait '.$class)) {
+                $classes .= sprintf("    '%s' => '%s',\n", strtolower($class), substr(str_replace($libDir, '', $file), 1));
+            }
+        }
 
-  // Don't edit this property by hand.
-  // To update it, use sfCoreAutoload::make()
-  protected $classes = array(
-    'sfaction' => 'action/sfAction.class.php',
-    'sfactionstack' => 'action/sfActionStack.class.php',
-    'sfactionstackentry' => 'action/sfActionStackEntry.class.php',
-    'sfactions' => 'action/sfActions.class.php',
-    'sfcomponent' => 'action/sfComponent.class.php',
-    'sfcomponents' => 'action/sfComponents.class.php',
-    'sfdata' => 'addon/sfData.class.php',
-    'sfpager' => 'addon/sfPager.class.php',
-    'sfautoload' => 'autoload/sfAutoload.class.php',
-    'sfautoloadagain' => 'autoload/sfAutoloadAgain.class.php',
-    'sfcoreautoload' => 'autoload/sfCoreAutoload.class.php',
-    'sfsimpleautoload' => 'autoload/sfSimpleAutoload.class.php',
-    'sfapccache' => 'cache/sfAPCCache.class.php',
-    'sfcache' => 'cache/sfCache.class.php',
-    'sfeacceleratorcache' => 'cache/sfEAcceleratorCache.class.php',
-    'sffilecache' => 'cache/sfFileCache.class.php',
-    'sffunctioncache' => 'cache/sfFunctionCache.class.php',
-    'sfmemcachecache' => 'cache/sfMemcacheCache.class.php',
-    'sfnocache' => 'cache/sfNoCache.class.php',
-    'sfsqlitecache' => 'cache/sfSQLiteCache.class.php',
-    'sfxcachecache' => 'cache/sfXCacheCache.class.php',
-    'sfansicolorformatter' => 'command/sfAnsiColorFormatter.class.php',
-    'sfcommandapplication' => 'command/sfCommandApplication.class.php',
-    'sfcommandargument' => 'command/sfCommandArgument.class.php',
-    'sfcommandargumentset' => 'command/sfCommandArgumentSet.class.php',
-    'sfcommandargumentsexception' => 'command/sfCommandArgumentsException.class.php',
-    'sfcommandexception' => 'command/sfCommandException.class.php',
-    'sfcommandlogger' => 'command/sfCommandLogger.class.php',
-    'sfcommandmanager' => 'command/sfCommandManager.class.php',
-    'sfcommandoption' => 'command/sfCommandOption.class.php',
-    'sfcommandoptionset' => 'command/sfCommandOptionSet.class.php',
-    'sfformatter' => 'command/sfFormatter.class.php',
-    'sfsymfonycommandapplication' => 'command/sfSymfonyCommandApplication.class.php',
-    'sfapplicationconfiguration' => 'config/sfApplicationConfiguration.class.php',
-    'sfautoloadconfighandler' => 'config/sfAutoloadConfigHandler.class.php',
-    'sfcacheconfighandler' => 'config/sfCacheConfigHandler.class.php',
-    'sfcompileconfighandler' => 'config/sfCompileConfigHandler.class.php',
-    'sfconfig' => 'config/sfConfig.class.php',
-    'sfconfigcache' => 'config/sfConfigCache.class.php',
-    'sfconfighandler' => 'config/sfConfigHandler.class.php',
-    'sfdatabaseconfighandler' => 'config/sfDatabaseConfigHandler.class.php',
-    'sfdefineenvironmentconfighandler' => 'config/sfDefineEnvironmentConfigHandler.class.php',
-    'sffactoryconfighandler' => 'config/sfFactoryConfigHandler.class.php',
-    'sffilterconfighandler' => 'config/sfFilterConfigHandler.class.php',
-    'sfgeneratorconfighandler' => 'config/sfGeneratorConfigHandler.class.php',
-    'sfpluginconfiguration' => 'config/sfPluginConfiguration.class.php',
-    'sfpluginconfigurationgeneric' => 'config/sfPluginConfigurationGeneric.class.php',
-    'sfprojectconfiguration' => 'config/sfProjectConfiguration.class.php',
-    'sfrootconfighandler' => 'config/sfRootConfigHandler.class.php',
-    'sfroutingconfighandler' => 'config/sfRoutingConfigHandler.class.php',
-    'sfsecurityconfighandler' => 'config/sfSecurityConfigHandler.class.php',
-    'sfserviceconfighandler' => 'config/sfServiceConfigHandler.class.php',
-    'sfsimpleyamlconfighandler' => 'config/sfSimpleYamlConfigHandler.class.php',
-    'sfviewconfighandler' => 'config/sfViewConfigHandler.class.php',
-    'sfyamlconfighandler' => 'config/sfYamlConfigHandler.class.php',
-    'sfcontroller' => 'controller/sfController.class.php',
-    'sffrontwebcontroller' => 'controller/sfFrontWebController.class.php',
-    'sfwebcontroller' => 'controller/sfWebController.class.php',
-    'sfdatabase' => 'database/sfDatabase.class.php',
-    'sfdatabasemanager' => 'database/sfDatabaseManager.class.php',
-    'sfmysqldatabase' => 'database/sfMySQLDatabase.class.php',
-    'sfmysqlidatabase' => 'database/sfMySQLiDatabase.class.php',
-    'sfpdodatabase' => 'database/sfPDODatabase.class.php',
-    'sfpostgresqldatabase' => 'database/sfPostgreSQLDatabase.class.php',
-    'sfdebug' => 'debug/sfDebug.class.php',
-    'sftimer' => 'debug/sfTimer.class.php',
-    'sftimermanager' => 'debug/sfTimerManager.class.php',
-    'sfwebdebug' => 'debug/sfWebDebug.class.php',
-    'sfwebdebugpanel' => 'debug/sfWebDebugPanel.class.php',
-    'sfwebdebugpanelcache' => 'debug/sfWebDebugPanelCache.class.php',
-    'sfwebdebugpanelconfig' => 'debug/sfWebDebugPanelConfig.class.php',
-    'sfwebdebugpanellogs' => 'debug/sfWebDebugPanelLogs.class.php',
-    'sfwebdebugpanelmailer' => 'debug/sfWebDebugPanelMailer.class.php',
-    'sfwebdebugpanelmemory' => 'debug/sfWebDebugPanelMemory.class.php',
-    'sfwebdebugpanelsymfonyversion' => 'debug/sfWebDebugPanelSymfonyVersion.class.php',
-    'sfwebdebugpaneltimer' => 'debug/sfWebDebugPanelTimer.class.php',
-    'sfwebdebugpanelview' => 'debug/sfWebDebugPanelView.class.php',
-    'sfoutputescaper' => 'escaper/sfOutputEscaper.class.php',
-    'sfoutputescaperarraydecorator' => 'escaper/sfOutputEscaperArrayDecorator.class.php',
-    'sfoutputescapergetterdecorator' => 'escaper/sfOutputEscaperGetterDecorator.class.php',
-    'sfoutputescaperiteratordecorator' => 'escaper/sfOutputEscaperIteratorDecorator.class.php',
-    'sfoutputescaperobjectdecorator' => 'escaper/sfOutputEscaperObjectDecorator.class.php',
-    'sfoutputescapersafe' => 'escaper/sfOutputEscaperSafe.class.php',
-    'sfevent' => 'event/sfEvent.class.php',
-    'sfeventdispatcher' => 'event/sfEventDispatcher.class.php',
-    'sfcacheexception' => 'exception/sfCacheException.class.php',
-    'sfconfigurationexception' => 'exception/sfConfigurationException.class.php',
-    'sfcontrollerexception' => 'exception/sfControllerException.class.php',
-    'sfdatabaseexception' => 'exception/sfDatabaseException.class.php',
-    'sferror404exception' => 'exception/sfError404Exception.class.php',
-    'sfexception' => 'exception/sfException.class.php',
-    'sffactoryexception' => 'exception/sfFactoryException.class.php',
-    'sffileexception' => 'exception/sfFileException.class.php',
-    'sffilterexception' => 'exception/sfFilterException.class.php',
-    'sfforwardexception' => 'exception/sfForwardException.class.php',
-    'sfinitializationexception' => 'exception/sfInitializationException.class.php',
-    'sfparseexception' => 'exception/sfParseException.class.php',
-    'sfrenderexception' => 'exception/sfRenderException.class.php',
-    'sfsecurityexception' => 'exception/sfSecurityException.class.php',
-    'sfstopexception' => 'exception/sfStopException.class.php',
-    'sfstorageexception' => 'exception/sfStorageException.class.php',
-    'sfviewexception' => 'exception/sfViewException.class.php',
-    'sfbasicsecurityfilter' => 'filter/sfBasicSecurityFilter.class.php',
-    'sfcachefilter' => 'filter/sfCacheFilter.class.php',
-    'sfcommonfilter' => 'filter/sfCommonFilter.class.php',
-    'sfexecutionfilter' => 'filter/sfExecutionFilter.class.php',
-    'sffilter' => 'filter/sfFilter.class.php',
-    'sffilterchain' => 'filter/sfFilterChain.class.php',
-    'sfrenderingfilter' => 'filter/sfRenderingFilter.class.php',
-    'sfformfilter' => 'form/addon/sfFormFilter.class.php',
-    'sfformobject' => 'form/addon/sfFormObject.class.php',
-    'sfformsymfony' => 'form/addon/sfFormSymfony.class.php',
-    'sfform' => 'form/sfForm.class.php',
-    'sfformfield' => 'form/sfFormField.class.php',
-    'sfformfieldschema' => 'form/sfFormFieldSchema.class.php',
-    'sfgenerator' => 'generator/sfGenerator.class.php',
-    'sfgeneratormanager' => 'generator/sfGeneratorManager.class.php',
-    'sfmodelgenerator' => 'generator/sfModelGenerator.class.php',
-    'sfmodelgeneratorconfiguration' => 'generator/sfModelGeneratorConfiguration.class.php',
-    'sfmodelgeneratorconfigurationfield' => 'generator/sfModelGeneratorConfigurationField.class.php',
-    'sfmodelgeneratorhelper' => 'generator/sfModelGeneratorHelper.class.php',
-    'tgettext' => 'i18n/Gettext/TGettext.class.php',
-    'sfi18napplicationextract' => 'i18n/extract/sfI18nApplicationExtract.class.php',
-    'sfi18nextract' => 'i18n/extract/sfI18nExtract.class.php',
-    'sfi18nextractorinterface' => 'i18n/extract/sfI18nExtractorInterface.class.php',
-    'sfi18nmoduleextract' => 'i18n/extract/sfI18nModuleExtract.class.php',
-    'sfi18nphpextractor' => 'i18n/extract/sfI18nPhpExtractor.class.php',
-    'sfi18nyamlextractor' => 'i18n/extract/sfI18nYamlExtractor.class.php',
-    'sfi18nyamlgeneratorextractor' => 'i18n/extract/sfI18nYamlGeneratorExtractor.class.php',
-    'sfi18nyamlvalidateextractor' => 'i18n/extract/sfI18nYamlValidateExtractor.class.php',
-    'sfchoiceformat' => 'i18n/sfChoiceFormat.class.php',
-    'sfcultureinfo' => 'i18n/sfCultureInfo.class.php',
-    'sfdateformat' => 'i18n/sfDateFormat.class.php',
-    'sfdatetimeformatinfo' => 'i18n/sfDateTimeFormatInfo.class.php',
-    'sfi18n' => 'i18n/sfI18N.class.php',
-    'sfimessagesource' => 'i18n/sfIMessageSource.class.php',
-    'sfmessageformat' => 'i18n/sfMessageFormat.class.php',
-    'sfmessagesource' => 'i18n/sfMessageSource.class.php',
-    'sfmessagesource_aggregate' => 'i18n/sfMessageSource_Aggregate.class.php',
-    'sfmessagesource_database' => 'i18n/sfMessageSource_Database.class.php',
-    'sfmessagesource_file' => 'i18n/sfMessageSource_File.class.php',
-    'sfmessagesource_mysql' => 'i18n/sfMessageSource_MySQL.class.php',
-    'sfmessagesource_sqlite' => 'i18n/sfMessageSource_SQLite.class.php',
-    'sfmessagesource_sqlite3' => 'i18n/sfMessageSource_SQLite3.class.php',
-    'sfmessagesource_xliff' => 'i18n/sfMessageSource_XLIFF.class.php',
-    'sfmessagesource_gettext' => 'i18n/sfMessageSource_gettext.class.php',
-    'sfnumberformat' => 'i18n/sfNumberFormat.class.php',
-    'sfnumberformatinfo' => 'i18n/sfNumberFormatInfo.class.php',
-    'sfaggregatelogger' => 'log/sfAggregateLogger.class.php',
-    'sfconsolelogger' => 'log/sfConsoleLogger.class.php',
-    'sfeventlogger' => 'log/sfEventLogger.class.php',
-    'sffilelogger' => 'log/sfFileLogger.class.php',
-    'sflogger' => 'log/sfLogger.class.php',
-    'sfloggerinterface' => 'log/sfLoggerInterface.class.php',
-    'sfloggerwrapper' => 'log/sfLoggerWrapper.class.php',
-    'sfnologger' => 'log/sfNoLogger.class.php',
-    'sfpsrloggeradapter' => 'log/sfPsrLoggerAdapter.class.php',
-    'sfstreamlogger' => 'log/sfStreamLogger.class.php',
-    'sfvarlogger' => 'log/sfVarLogger.class.php',
-    'sfwebdebuglogger' => 'log/sfWebDebugLogger.class.php',
-    'sfmailer' => 'mailer/sfMailer.class.php',
-    'sfmailermessageloggerplugin' => 'mailer/sfMailerMessageLoggerPlugin.class.php',
-    'sfnomailer' => 'mailer/sfNoMailer.class.php',
-    'sfpearconfig' => 'plugin/sfPearConfig.class.php',
-    'sfpeardownloader' => 'plugin/sfPearDownloader.class.php',
-    'sfpearenvironment' => 'plugin/sfPearEnvironment.class.php',
-    'sfpearfrontendplugin' => 'plugin/sfPearFrontendPlugin.class.php',
-    'sfpearrest' => 'plugin/sfPearRest.class.php',
-    'sfpearrest10' => 'plugin/sfPearRest10.class.php',
-    'sfpearrest11' => 'plugin/sfPearRest11.class.php',
-    'sfpearrestplugin' => 'plugin/sfPearRestPlugin.class.php',
-    'sfplugindependencyexception' => 'plugin/sfPluginDependencyException.class.php',
-    'sfpluginexception' => 'plugin/sfPluginException.class.php',
-    'sfpluginmanager' => 'plugin/sfPluginManager.class.php',
-    'sfpluginrecursivedependencyexception' => 'plugin/sfPluginRecursiveDependencyException.class.php',
-    'sfpluginrestexception' => 'plugin/sfPluginRestException.class.php',
-    'sfsymfonypluginmanager' => 'plugin/sfSymfonyPluginManager.class.php',
-    'sfrequest' => 'request/sfRequest.class.php',
-    'sfwebrequest' => 'request/sfWebRequest.class.php',
-    'sfresponse' => 'response/sfResponse.class.php',
-    'sfwebresponse' => 'response/sfWebResponse.class.php',
-    'sfobjectroute' => 'routing/sfObjectRoute.class.php',
-    'sfobjectroutecollection' => 'routing/sfObjectRouteCollection.class.php',
-    'sfpatternrouting' => 'routing/sfPatternRouting.class.php',
-    'sfrequestroute' => 'routing/sfRequestRoute.class.php',
-    'sfroute' => 'routing/sfRoute.class.php',
-    'sfroutecollection' => 'routing/sfRouteCollection.class.php',
-    'sfrouting' => 'routing/sfRouting.class.php',
-    'sfservicecontainer' => 'service/sfServiceContainer.class.php',
-    'sfservicecontainerbuilder' => 'service/sfServiceContainerBuilder.class.php',
-    'sfservicecontainerdumper' => 'service/sfServiceContainerDumper.class.php',
-    'sfservicecontainerdumpergraphviz' => 'service/sfServiceContainerDumperGraphviz.class.php',
-    'sfservicecontainerdumperinterface' => 'service/sfServiceContainerDumperInterface.class.php',
-    'sfservicecontainerdumperphp' => 'service/sfServiceContainerDumperPhp.class.php',
-    'sfservicecontainerinterface' => 'service/sfServiceContainerInterface.class.php',
-    'sfservicecontainerloader' => 'service/sfServiceContainerLoader.class.php',
-    'sfservicecontainerloaderarray' => 'service/sfServiceContainerLoaderArray.class.php',
-    'sfservicecontainerloaderinterface' => 'service/sfServiceContainerLoaderInterface.class.php',
-    'sfservicedefinition' => 'service/sfServiceDefinition.class.php',
-    'sfserviceparameter' => 'service/sfServiceParameter.class.php',
-    'sfservicereference' => 'service/sfServiceReference.class.php',
-    'sfcachesessionstorage' => 'storage/sfCacheSessionStorage.class.php',
-    'sfdatabasesessionstorage' => 'storage/sfDatabaseSessionStorage.class.php',
-    'sfmysqlsessionstorage' => 'storage/sfMySQLSessionStorage.class.php',
-    'sfmysqlisessionstorage' => 'storage/sfMySQLiSessionStorage.class.php',
-    'sfnostorage' => 'storage/sfNoStorage.class.php',
-    'sfpdosessionstorage' => 'storage/sfPDOSessionStorage.class.php',
-    'sfpostgresqlsessionstorage' => 'storage/sfPostgreSQLSessionStorage.class.php',
-    'sfsessionstorage' => 'storage/sfSessionStorage.class.php',
-    'sfsessionteststorage' => 'storage/sfSessionTestStorage.class.php',
-    'sfstorage' => 'storage/sfStorage.class.php',
-    'sfapproutestask' => 'task/app/sfAppRoutesTask.class.php',
-    'sfcachecleartask' => 'task/cache/sfCacheClearTask.class.php',
-    'sfconfigureauthortask' => 'task/configure/sfConfigureAuthorTask.class.php',
-    'sfgenerateapptask' => 'task/generator/sfGenerateAppTask.class.php',
-    'sfgeneratemoduletask' => 'task/generator/sfGenerateModuleTask.class.php',
-    'sfgenerateprojecttask' => 'task/generator/sfGenerateProjectTask.class.php',
-    'sfgeneratetasktask' => 'task/generator/sfGenerateTaskTask.class.php',
-    'sfgeneratorbasetask' => 'task/generator/sfGeneratorBaseTask.class.php',
-    'sfhelptask' => 'task/help/sfHelpTask.class.php',
-    'sflisttask' => 'task/help/sfListTask.class.php',
-    'sfi18nextracttask' => 'task/i18n/sfI18nExtractTask.class.php',
-    'sfi18nfindtask' => 'task/i18n/sfI18nFindTask.class.php',
-    'sflogcleartask' => 'task/log/sfLogClearTask.class.php',
-    'sflogrotatetask' => 'task/log/sfLogRotateTask.class.php',
-    'sfpluginaddchanneltask' => 'task/plugin/sfPluginAddChannelTask.class.php',
-    'sfpluginbasetask' => 'task/plugin/sfPluginBaseTask.class.php',
-    'sfplugininstalltask' => 'task/plugin/sfPluginInstallTask.class.php',
-    'sfpluginlisttask' => 'task/plugin/sfPluginListTask.class.php',
-    'sfpluginpublishassetstask' => 'task/plugin/sfPluginPublishAssetsTask.class.php',
-    'sfpluginuninstalltask' => 'task/plugin/sfPluginUninstallTask.class.php',
-    'sfpluginupgradetask' => 'task/plugin/sfPluginUpgradeTask.class.php',
-    'sfprojectclearcontrollerstask' => 'task/project/sfProjectClearControllersTask.class.php',
-    'sfprojectdeploytask' => 'task/project/sfProjectDeployTask.class.php',
-    'sfprojectdisabletask' => 'task/project/sfProjectDisableTask.class.php',
-    'sfprojectenabletask' => 'task/project/sfProjectEnableTask.class.php',
-    'sfprojectoptimizetask' => 'task/project/sfProjectOptimizeTask.class.php',
-    'sfprojectpermissionstask' => 'task/project/sfProjectPermissionsTask.class.php',
-    'sfprojectsendemailstask' => 'task/project/sfProjectSendEmailsTask.class.php',
-    'sfdeprecatedclassesvalidation' => 'task/project/validation/sfDeprecatedClassesValidation.class.php',
-    'sfdeprecatedconfigurationfilesvalidation' => 'task/project/validation/sfDeprecatedConfigurationFilesValidation.class.php',
-    'sfdeprecatedhelpersvalidation' => 'task/project/validation/sfDeprecatedHelpersValidation.class.php',
-    'sfdeprecatedmethodsvalidation' => 'task/project/validation/sfDeprecatedMethodsValidation.class.php',
-    'sfdeprecatedpluginsvalidation' => 'task/project/validation/sfDeprecatedPluginsValidation.class.php',
-    'sfdeprecatedsettingsvalidation' => 'task/project/validation/sfDeprecatedSettingsValidation.class.php',
-    'sfparameterholdervalidation' => 'task/project/validation/sfParameterHolderValidation.class.php',
-    'sfvalidation' => 'task/project/validation/sfValidation.class.php',
-    'sfbasetask' => 'task/sfBaseTask.class.php',
-    'sfcommandapplicationtask' => 'task/sfCommandApplicationTask.class.php',
-    'sffilesystem' => 'task/sfFilesystem.class.php',
-    'sftask' => 'task/sfTask.class.php',
-    'lime_symfony' => 'task/symfony/lime_symfony.php',
-    'sfsymfonytesttask' => 'task/symfony/sfSymfonyTestTask.class.php',
-    'sflimeharness' => 'task/test/sfLimeHarness.class.php',
-    'sftestalltask' => 'task/test/sfTestAllTask.class.php',
-    'sftestbasetask' => 'task/test/sfTestBaseTask.class.php',
-    'sftestcoveragetask' => 'task/test/sfTestCoverageTask.class.php',
-    'sftestfunctionaltask' => 'task/test/sfTestFunctionalTask.class.php',
-    'sftestplugintask' => 'task/test/sfTestPluginTask.class.php',
-    'sftestunittask' => 'task/test/sfTestUnitTask.class.php',
-    'sftestbrowser' => 'test/sfTestBrowser.class.php',
-    'sftestfunctional' => 'test/sfTestFunctional.class.php',
-    'sftestfunctionalbase' => 'test/sfTestFunctionalBase.class.php',
-    'sftester' => 'test/sfTester.class.php',
-    'sftesterform' => 'test/sfTesterForm.class.php',
-    'sftestermailer' => 'test/sfTesterMailer.class.php',
-    'sftesterrequest' => 'test/sfTesterRequest.class.php',
-    'sftesterresponse' => 'test/sfTesterResponse.class.php',
-    'sftesteruser' => 'test/sfTesterUser.class.php',
-    'sftesterviewcache' => 'test/sfTesterViewCache.class.php',
-    'sfbasicsecurityuser' => 'user/sfBasicSecurityUser.class.php',
-    'sfsecurityuser' => 'user/sfSecurityUser.class.php',
-    'sfuser' => 'user/sfUser.class.php',
-    'sfbrowser' => 'util/sfBrowser.class.php',
-    'sfbrowserbase' => 'util/sfBrowserBase.class.php',
-    'sfcallable' => 'util/sfCallable.class.php',
-    'sfclassmanipulator' => 'util/sfClassManipulator.class.php',
-    'sfcontext' => 'util/sfContext.class.php',
-    'sfdomcssselector' => 'util/sfDomCssSelector.class.php',
-    'sffinder' => 'util/sfFinder.class.php',
-    'sfinflector' => 'util/sfInflector.class.php',
-    'sfnamespacedparameterholder' => 'util/sfNamespacedParameterHolder.class.php',
-    'sfparameterholder' => 'util/sfParameterHolder.class.php',
-    'sftoolkit' => 'util/sfToolkit.class.php',
-    'sfvalidatori18nchoicecountry' => 'validator/i18n/sfValidatorI18nChoiceCountry.class.php',
-    'sfvalidatori18nchoicelanguage' => 'validator/i18n/sfValidatorI18nChoiceLanguage.class.php',
-    'sfvalidatori18nchoicetimezone' => 'validator/i18n/sfValidatorI18nChoiceTimezone.class.php',
-    'sfvalidatedfile' => 'validator/sfValidatedFile.class.php',
-    'sfvalidatorand' => 'validator/sfValidatorAnd.class.php',
-    'sfvalidatorbase' => 'validator/sfValidatorBase.class.php',
-    'sfvalidatorboolean' => 'validator/sfValidatorBoolean.class.php',
-    'sfvalidatorcsrftoken' => 'validator/sfValidatorCSRFToken.class.php',
-    'sfvalidatorcallback' => 'validator/sfValidatorCallback.class.php',
-    'sfvalidatorchoice' => 'validator/sfValidatorChoice.class.php',
-    'sfvalidatordate' => 'validator/sfValidatorDate.class.php',
-    'sfvalidatordaterange' => 'validator/sfValidatorDateRange.class.php',
-    'sfvalidatordatetime' => 'validator/sfValidatorDateTime.class.php',
-    'sfvalidatordecorator' => 'validator/sfValidatorDecorator.class.php',
-    'sfvalidatoremail' => 'validator/sfValidatorEmail.class.php',
-    'sfvalidatorequal' => 'validator/sfValidatorEqual.class.php',
-    'sfvalidatorerror' => 'validator/sfValidatorError.class.php',
-    'sfvalidatorerrorschema' => 'validator/sfValidatorErrorSchema.class.php',
-    'sfvalidatorfile' => 'validator/sfValidatorFile.class.php',
-    'sfvalidatorfilemulti' => 'validator/sfValidatorFileMulti.class.php',
-    'sfvalidatorfromdescription' => 'validator/sfValidatorFromDescription.class.php',
-    'sfvalidatorinteger' => 'validator/sfValidatorInteger.class.php',
-    'sfvalidatorip' => 'validator/sfValidatorIp.class.php',
-    'sfvalidatornumber' => 'validator/sfValidatorNumber.class.php',
-    'sfvalidatoror' => 'validator/sfValidatorOr.class.php',
-    'sfvalidatorpass' => 'validator/sfValidatorPass.class.php',
-    'sfvalidatorregex' => 'validator/sfValidatorRegex.class.php',
-    'sfvalidatorschema' => 'validator/sfValidatorSchema.class.php',
-    'sfvalidatorschemacompare' => 'validator/sfValidatorSchemaCompare.class.php',
-    'sfvalidatorschemafilter' => 'validator/sfValidatorSchemaFilter.class.php',
-    'sfvalidatorstring' => 'validator/sfValidatorString.class.php',
-    'sfvalidatortime' => 'validator/sfValidatorTime.class.php',
-    'sfvalidatorurl' => 'validator/sfValidatorUrl.class.php',
-    'sfphpview' => 'view/sfPHPView.class.php',
-    'sfpartialview' => 'view/sfPartialView.class.php',
-    'sfview' => 'view/sfView.class.php',
-    'sfviewcachemanager' => 'view/sfViewCacheManager.class.php',
-    'sfviewparameterholder' => 'view/sfViewParameterHolder.class.php',
-    'sfwidgetformi18nchoicecountry' => 'widget/i18n/sfWidgetFormI18nChoiceCountry.class.php',
-    'sfwidgetformi18nchoicecurrency' => 'widget/i18n/sfWidgetFormI18nChoiceCurrency.class.php',
-    'sfwidgetformi18nchoicelanguage' => 'widget/i18n/sfWidgetFormI18nChoiceLanguage.class.php',
-    'sfwidgetformi18nchoicetimezone' => 'widget/i18n/sfWidgetFormI18nChoiceTimezone.class.php',
-    'sfwidgetformi18ndate' => 'widget/i18n/sfWidgetFormI18nDate.class.php',
-    'sfwidgetformi18ndatetime' => 'widget/i18n/sfWidgetFormI18nDateTime.class.php',
-    'sfwidgetformi18ntime' => 'widget/i18n/sfWidgetFormI18nTime.class.php',
-    'sfwidget' => 'widget/sfWidget.class.php',
-    'sfwidgetform' => 'widget/sfWidgetForm.class.php',
-    'sfwidgetformchoice' => 'widget/sfWidgetFormChoice.class.php',
-    'sfwidgetformchoicebase' => 'widget/sfWidgetFormChoiceBase.class.php',
-    'sfwidgetformdate' => 'widget/sfWidgetFormDate.class.php',
-    'sfwidgetformdaterange' => 'widget/sfWidgetFormDateRange.class.php',
-    'sfwidgetformdatetime' => 'widget/sfWidgetFormDateTime.class.php',
-    'sfwidgetformfilterdate' => 'widget/sfWidgetFormFilterDate.class.php',
-    'sfwidgetformfilterinput' => 'widget/sfWidgetFormFilterInput.class.php',
-    'sfwidgetforminput' => 'widget/sfWidgetFormInput.class.php',
-    'sfwidgetforminputcheckbox' => 'widget/sfWidgetFormInputCheckbox.class.php',
-    'sfwidgetforminputfile' => 'widget/sfWidgetFormInputFile.class.php',
-    'sfwidgetforminputfilemulti' => 'widget/sfWidgetFormInputFileMulti.class.php',
-    'sfwidgetforminputfileeditable' => 'widget/sfWidgetFormInputFileEditable.class.php',
-    'sfwidgetforminputhidden' => 'widget/sfWidgetFormInputHidden.class.php',
-    'sfwidgetforminputpassword' => 'widget/sfWidgetFormInputPassword.class.php',
-    'sfwidgetforminputread' => 'widget/sfWidgetFormInputRead.class.php',
-    'sfwidgetforminputtext' => 'widget/sfWidgetFormInputText.class.php',
-    'sfwidgetformschema' => 'widget/sfWidgetFormSchema.class.php',
-    'sfwidgetformschemadecorator' => 'widget/sfWidgetFormSchemaDecorator.class.php',
-    'sfwidgetformschemaformatter' => 'widget/sfWidgetFormSchemaFormatter.class.php',
-    'sfwidgetformschemaformatterlist' => 'widget/sfWidgetFormSchemaFormatterList.class.php',
-    'sfwidgetformschemaformattertable' => 'widget/sfWidgetFormSchemaFormatterTable.class.php',
-    'sfwidgetformselect' => 'widget/sfWidgetFormSelect.class.php',
-    'sfwidgetformselectcheckbox' => 'widget/sfWidgetFormSelectCheckbox.class.php',
-    'sfwidgetformselectmany' => 'widget/sfWidgetFormSelectMany.class.php',
-    'sfwidgetformselectradio' => 'widget/sfWidgetFormSelectRadio.class.php',
-    'sfwidgetformtextarea' => 'widget/sfWidgetFormTextarea.class.php',
-    'sfwidgetformtime' => 'widget/sfWidgetFormTime.class.php',
-    'sfyaml' => 'yaml/sfYaml.class.php',
-    'sfyamldumper' => 'yaml/sfYamlDumper.class.php',
-    'sfyamlinline' => 'yaml/sfYamlInline.class.php',
-    'sfyamlparser' => 'yaml/sfYamlParser.class.php',
-  );
+        $content = preg_replace('/protected \$classes = array *\(.*?\);/s', sprintf("protected \$classes = array(\n%s  );", $classes), file_get_contents(__FILE__));
+
+        file_put_contents(__FILE__, $content);
+    }
 }
diff --git a/lib/autoload/sfSimpleAutoload.class.php b/lib/autoload/sfSimpleAutoload.class.php
index 66ff5c1b4..05c3983c7 100755
--- a/lib/autoload/sfSimpleAutoload.class.php
+++ b/lib/autoload/sfSimpleAutoload.class.php
@@ -14,329 +14,288 @@
  * This class is a singleton as PHP seems to be unable to register 2 autoloaders that are instances
  * of the same class (why?).
  *
- * @package    symfony
- * @subpackage autoload
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfSimpleAutoload
 {
-  static protected
-    $registered = false,
-    $instance   = null;
-
-  protected
-    $cacheFile    = null,
-    $cacheLoaded  = false,
-    $cacheChanged = false,
-    $dirs         = array(),
-    $files        = array(),
-    $classes      = array(),
-    $overriden    = array();
-
-  protected function __construct($cacheFile = null)
-  {
-    if (null !== $cacheFile)
+    protected static $registered = false;
+    protected static $instance;
+
+    protected $cacheFile;
+    protected $cacheLoaded = false;
+    protected $cacheChanged = false;
+    protected $dirs = array();
+    protected $files = array();
+    protected $classes = array();
+    protected $overriden = array();
+
+    protected function __construct($cacheFile = null)
     {
-      $this->cacheFile = $cacheFile;
-    }
+        if (null !== $cacheFile) {
+            $this->cacheFile = $cacheFile;
+        }
 
-    $this->loadCache();
-  }
-
-  /**
-   * Retrieves the singleton instance of this class.
-   *
-   * @param  string $cacheFile  The file path to save the cache
-   *
-   * @return sfSimpleAutoload   A sfSimpleAutoload implementation instance.
-   */
-  static public function getInstance($cacheFile = null)
-  {
-    if (!isset(self::$instance))
-    {
-      self::$instance = new sfSimpleAutoload($cacheFile);
+        $this->loadCache();
     }
 
-    return self::$instance;
-  }
-
-  /**
-   * Register sfSimpleAutoload in spl autoloader.
-   *
-   * @return void
-   *
-   * @throws sfException
-   */
-  static public function register()
-  {
-    if (self::$registered)
+    /**
+     * Retrieves the singleton instance of this class.
+     *
+     * @param string $cacheFile The file path to save the cache
+     *
+     * @return sfSimpleAutoload a sfSimpleAutoload implementation instance
+     */
+    public static function getInstance($cacheFile = null)
     {
-      return;
-    }
+        if (!isset(self::$instance)) {
+            self::$instance = new sfSimpleAutoload($cacheFile);
+        }
 
-    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())));
+        return self::$instance;
     }
 
-    if (self::getInstance()->cacheFile)
+    /**
+     * Register sfSimpleAutoload in spl autoloader.
+     *
+     * @throws sfException
+     */
+    public static function register()
     {
-      register_shutdown_function(array(self::getInstance(), 'saveCache'));
-    }
+        if (self::$registered) {
+            return;
+        }
 
-    self::$registered = true;
-  }
-
-  /**
-   * Unregister sfSimpleAutoload from spl autoloader.
-   *
-   * @return void
-   */
-  static public function unregister()
-  {
-    spl_autoload_unregister(array(self::getInstance(), 'autoload'));
-    self::$registered = false;
-  }
-
-  /**
-   * Handles autoloading of classes.
-   *
-   * @param  string $class A class name.
-   *
-   * @return boolean Returns true if the class has been loaded
-   */
-  public function autoload($class)
-  {
-    $class = strtolower($class);
-
-    // class already exists
-    if (class_exists($class, false) || interface_exists($class, false))
-    {
-      return true;
-    }
+        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())));
+        }
 
-    // we have a class path, let's include it
-    if (isset($this->classes[$class]))
-    {
-      try
-      {
-        require $this->classes[$class];
-      }
-      catch (sfException $e)
-      {
-        $e->printStackTrace();
-      }
-      catch (Exception $e)
-      {
-        sfException::createFromException($e)->printStackTrace();
-      }
-
-      return true;
-    }
+        if (self::getInstance()->cacheFile) {
+            register_shutdown_function(array(self::getInstance(), 'saveCache'));
+        }
 
-    return false;
-  }
+        self::$registered = true;
+    }
 
-  /**
-   * Loads the cache.
-   */
-  public function loadCache()
-  {
-    if (!$this->cacheFile || !is_readable($this->cacheFile))
+    /**
+     * Unregister sfSimpleAutoload from spl autoloader.
+     */
+    public static function unregister()
     {
-      return;
+        spl_autoload_unregister(array(self::getInstance(), 'autoload'));
+        self::$registered = false;
     }
 
-    list($this->classes, $this->dirs, $this->files) = unserialize(file_get_contents($this->cacheFile));
-
-    $this->cacheLoaded = true;
-    $this->cacheChanged = false;
-  }
-
-  /**
-   * Saves the cache.
-   */
-  public function saveCache()
-  {
-    if ($this->cacheChanged)
+    /**
+     * Handles autoloading of classes.
+     *
+     * @param string $class a class name
+     *
+     * @return bool Returns true if the class has been loaded
+     */
+    public function autoload($class)
     {
-      if (is_writable(dirname($this->cacheFile)))
-      {
-        file_put_contents($this->cacheFile, serialize(array($this->classes, $this->dirs, $this->files)));
-      }
+        $class = strtolower($class);
 
-      $this->cacheChanged = false;
-    }
-  }
+        // class already exists
+        if (class_exists($class, false) || interface_exists($class, false)) {
+            return true;
+        }
 
-  /**
-   * Reloads cache.
-   */
-  public function reload()
-  {
-    $this->classes = array();
-    $this->cacheLoaded = false;
+        // we have a class path, let's include it
+        if (isset($this->classes[$class])) {
+            try {
+                require $this->classes[$class];
+            } catch (sfException $e) {
+                $e->printStackTrace();
+            } catch (Exception $e) {
+                sfException::createFromException($e)->printStackTrace();
+            }
+
+            return true;
+        }
 
-    foreach ($this->dirs as $dir)
-    {
-      $this->addDirectory($dir);
+        return false;
     }
 
-    foreach ($this->files as $file)
+    /**
+     * Loads the cache.
+     */
+    public function loadCache()
     {
-      $this->addFile($file);
+        if (!$this->cacheFile || !is_readable($this->cacheFile)) {
+            return;
+        }
+
+        list($this->classes, $this->dirs, $this->files) = unserialize(file_get_contents($this->cacheFile));
+
+        $this->cacheLoaded = true;
+        $this->cacheChanged = false;
     }
 
-    foreach ($this->overriden as $class => $path)
+    /**
+     * Saves the cache.
+     */
+    public function saveCache()
     {
-      $this->classes[$class] = $path;
+        if ($this->cacheChanged) {
+            if (is_writable(dirname($this->cacheFile))) {
+                file_put_contents($this->cacheFile, serialize(array($this->classes, $this->dirs, $this->files)));
+            }
+
+            $this->cacheChanged = false;
+        }
     }
 
-    $this->cacheLoaded = true;
-    $this->cacheChanged = true;
-  }
-
-  /**
-   * Removes the cache.
-   */
-  public function removeCache()
-  {
-    @unlink($this->cacheFile);
-  }
-
-  /**
-   * Adds a directory to the autoloading system if not yet present and give it the highest possible precedence.
-   *
-   * @param string $dir The directory to look for classes
-   * @param string $ext The extension to look for
-   */
-  public function addDirectory($dir, $ext = '.php')
-  {
-    $finder = sfFinder::type('file')->follow_link()->name('*'.$ext);
-
-    if ($dirs = glob($dir))
+    /**
+     * Reloads cache.
+     */
+    public function reload()
     {
-      foreach ($dirs as $dir)
-      {
-        if (false !== $key = array_search($dir, $this->dirs))
-        {
-          unset($this->dirs[$key]);
-          $this->dirs[] = $dir;
-
-          if ($this->cacheLoaded)
-          {
-            continue;
-          }
+        $this->classes = array();
+        $this->cacheLoaded = false;
+
+        foreach ($this->dirs as $dir) {
+            $this->addDirectory($dir);
+        }
+
+        foreach ($this->files as $file) {
+            $this->addFile($file);
         }
-        else
-        {
-          $this->dirs[] = $dir;
+
+        foreach ($this->overriden as $class => $path) {
+            $this->classes[$class] = $path;
         }
 
+        $this->cacheLoaded = true;
         $this->cacheChanged = true;
-        $this->addFiles($finder->in($dir), false);
-      }
     }
-  }
-
-  /**
-   * Adds files to the autoloading system.
-   *
-   * @param array   $files    An array of files
-   * @param Boolean $register Whether to register those files as single entities (used when reloading)
-   */
-  public function addFiles(array $files, $register = true)
-  {
-    foreach ($files as $file)
+
+    /**
+     * Removes the cache.
+     */
+    public function removeCache()
     {
-      $this->addFile($file, $register);
+        @unlink($this->cacheFile);
     }
-  }
-
-  /**
-   * Adds a file to the autoloading system.
-   *
-   * @param string  $file     A file path
-   * @param Boolean $register Whether to register those files as single entities (used when reloading)
-   */
-  public function addFile($file, $register = true)
-  {
-    if (!is_file($file))
+
+    /**
+     * Adds a directory to the autoloading system if not yet present and give it the highest possible precedence.
+     *
+     * @param string $dir The directory to look for classes
+     * @param string $ext The extension to look for
+     */
+    public function addDirectory($dir, $ext = '.php')
     {
-      return;
+        $finder = sfFinder::type('file')->follow_link()->name('*'.$ext);
+
+        if ($dirs = glob($dir)) {
+            foreach ($dirs as $dir) {
+                if (false !== $key = array_search($dir, $this->dirs)) {
+                    unset($this->dirs[$key]);
+                    $this->dirs[] = $dir;
+
+                    if ($this->cacheLoaded) {
+                        continue;
+                    }
+                } else {
+                    $this->dirs[] = $dir;
+                }
+
+                $this->cacheChanged = true;
+                $this->addFiles($finder->in($dir), false);
+            }
+        }
     }
 
-    if (in_array($file, $this->files))
+    /**
+     * Adds files to the autoloading system.
+     *
+     * @param array $files    An array of files
+     * @param bool  $register Whether to register those files as single entities (used when reloading)
+     */
+    public function addFiles(array $files, $register = true)
     {
-      if ($this->cacheLoaded)
-      {
-        return;
-      }
+        foreach ($files as $file) {
+            $this->addFile($file, $register);
+        }
     }
-    else
+
+    /**
+     * Adds a file to the autoloading system.
+     *
+     * @param string $file     A file path
+     * @param bool   $register Whether to register those files as single entities (used when reloading)
+     */
+    public function addFile($file, $register = true)
     {
-      if ($register)
-      {
-        $this->files[] = $file;
-      }
+        if (!is_file($file)) {
+            return;
+        }
+
+        if (in_array($file, $this->files)) {
+            if ($this->cacheLoaded) {
+                return;
+            }
+        } else {
+            if ($register) {
+                $this->files[] = $file;
+            }
+        }
+
+        if ($register) {
+            $this->cacheChanged = true;
+        }
+
+        preg_match_all('~^\s*(?:abstract\s+|final\s+)?(?:class|interface|trait)\s+(\w+)~mi', file_get_contents($file), $classes);
+        foreach ($classes[1] as $class) {
+            $this->classes[strtolower($class)] = $file;
+        }
     }
 
-    if ($register)
+    /**
+     * Sets the path for a particular class.
+     *
+     * @param string $class A PHP class name
+     * @param string $path  An absolute path
+     */
+    public function setClassPath($class, $path)
     {
-      $this->cacheChanged = true;
+        $class = strtolower($class);
+
+        $this->overriden[$class] = $path;
+
+        $this->classes[$class] = $path;
     }
 
-    preg_match_all('~^\s*(?:abstract\s+|final\s+)?(?:class|interface|trait)\s+(\w+)~mi', file_get_contents($file), $classes);
-    foreach ($classes[1] as $class)
+    /**
+     * Returns the path where a particular class can be found.
+     *
+     * @param string $class A PHP class name
+     *
+     * @return string|null An absolute path
+     */
+    public function getClassPath($class)
     {
-      $this->classes[strtolower($class)] = $file;
+        $class = strtolower($class);
+
+        return isset($this->classes[$class]) ? $this->classes[$class] : null;
     }
-  }
-
-  /**
-   * Sets the path for a particular class.
-   *
-   * @param string $class A PHP class name
-   * @param string $path  An absolute path
-   */
-  public function setClassPath($class, $path)
-  {
-    $class = strtolower($class);
-
-    $this->overriden[$class] = $path;
-
-    $this->classes[$class] = $path;
-  }
-
-  /**
-   * Returns the path where a particular class can be found.
-   *
-   * @param string $class A PHP class name
-   *
-   * @return string|null An absolute path
-   */
-  public function getClassPath($class)
-  {
-    $class = strtolower($class);
-
-    return isset($this->classes[$class]) ? $this->classes[$class] : null;
-  }
-
-  /**
-   * Loads configuration from the supplied files.
-   *
-   * @param array $files An array of autoload.yml files
-   *
-   * @see sfAutoloadConfigHandler
-   */
-  public function loadConfiguration(array $files)
-  {
-    $config = new sfAutoloadConfigHandler();
-    foreach ($config->evaluate($files) as $class => $file)
+
+    /**
+     * Loads configuration from the supplied files.
+     *
+     * @param array $files An array of autoload.yml files
+     *
+     * @see sfAutoloadConfigHandler
+     */
+    public function loadConfiguration(array $files)
     {
-      $this->setClassPath($class, $file);
+        $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 78376490b..41b65505c 100644
--- a/lib/cache/sfAPCCache.class.php
+++ b/lib/cache/sfAPCCache.class.php
@@ -11,210 +11,189 @@
 /**
  * Cache class that stores cached content in APC.
  *
- * @package    symfony
- * @subpackage cache
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfAPCCache extends sfCache
 {
-  protected $enabled;
-
-  /**
-   * Initializes this sfCache instance.
-   *
-   * Available options:
-   *
-   * * see sfCache for options available for all drivers
-   *
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function initialize($options = array())
-  {
-    parent::initialize($options);
-
-    $this->enabled = function_exists('apc_store') && ini_get('apc.enabled');
-  }
-
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function get($key, $default = null)
-  {
-    if (!$this->enabled)
+    protected $enabled;
+
+    /**
+     * Initializes this sfCache instance.
+     *
+     * Available options:
+     *
+     * * see sfCache for options available for all drivers
+     *
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function initialize($options = array())
     {
-      return $default;
-    }
-
-    $value = $this->fetch($this->getOption('prefix').$key, $has);
+        parent::initialize($options);
 
-    return $has ? $value : $default;
-  }
-
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function has($key)
-  {
-    if (!$this->enabled)
-    {
-      return false;
+        $this->enabled = function_exists('apc_store') && ini_get('apc.enabled');
     }
 
-    $this->fetch($this->getOption('prefix').$key, $has);
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function get($key, $default = null)
+    {
+        if (!$this->enabled) {
+            return $default;
+        }
 
-    return $has;
-  }
+        $value = $this->fetch($this->getOption('prefix').$key, $has);
 
-  private function fetch($key, &$success)
-  {
-    $has = null;
-    $value = apc_fetch($key, $has);
-    // the second argument was added in APC 3.0.17. If it is still null we fall back to the value returned
-    if (null !== $has)
-    {
-      $success = $has;
+        return $has ? $value : $default;
     }
-    else
+
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function has($key)
     {
-      $success = $value !== false;
-    }
+        if (!$this->enabled) {
+            return false;
+        }
 
-    return $value;
-  }
+        $this->fetch($this->getOption('prefix').$key, $has);
 
+        return $has;
+    }
 
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function set($key, $data, $lifetime = null)
-  {
-    if (!$this->enabled)
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function set($key, $data, $lifetime = null)
     {
-      return true;
-    }
+        if (!$this->enabled) {
+            return true;
+        }
 
-    return apc_store($this->getOption('prefix').$key, $data, $this->getLifetime($lifetime));
-  }
+        return apc_store($this->getOption('prefix').$key, $data, $this->getLifetime($lifetime));
+    }
 
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function remove($key)
-  {
-    if (!$this->enabled)
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function remove($key)
     {
-      return true;
-    }
+        if (!$this->enabled) {
+            return true;
+        }
 
-    return apc_delete($this->getOption('prefix').$key);
-  }
+        return apc_delete($this->getOption('prefix').$key);
+    }
 
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function clean($mode = sfCache::ALL)
-  {
-    if (!$this->enabled)
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function clean($mode = sfCache::ALL)
     {
-      return true;
+        if (!$this->enabled) {
+            return true;
+        }
+
+        if (sfCache::ALL === $mode) {
+            return apc_clear_cache('user');
+        }
     }
 
-    if (sfCache::ALL === $mode)
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function getLastModified($key)
     {
-      return apc_clear_cache('user');
+        if ($info = $this->getCacheInfo($key)) {
+            return $info['creation_time'] + $info['ttl'] > time() ? $info['mtime'] : 0;
+        }
+
+        return 0;
     }
-  }
-
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function getLastModified($key)
-  {
-    if ($info = $this->getCacheInfo($key))
+
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function getTimeout($key)
     {
-      return $info['creation_time'] + $info['ttl'] > time() ? $info['mtime'] : 0;
-    }
+        if ($info = $this->getCacheInfo($key)) {
+            return $info['creation_time'] + $info['ttl'] > time() ? $info['creation_time'] + $info['ttl'] : 0;
+        }
 
-    return 0;
-  }
+        return 0;
+    }
 
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function getTimeout($key)
-  {
-    if ($info = $this->getCacheInfo($key))
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function removePattern($pattern)
     {
-      return $info['creation_time'] + $info['ttl'] > time() ? $info['creation_time'] + $info['ttl'] : 0;
-    }
+        if (!$this->enabled) {
+            return true;
+        }
 
-    return 0;
-  }
+        $infos = apc_cache_info('user');
+        if (!is_array($infos['cache_list'])) {
+            return;
+        }
 
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function removePattern($pattern)
-  {
-    if (!$this->enabled)
-    {
-      return true;
+        $regexp = self::patternToRegexp($this->getOption('prefix').$pattern);
+
+        foreach ($infos['cache_list'] as $info) {
+            if (preg_match($regexp, $info['info'])) {
+                apc_delete($info['info']);
+            }
+        }
     }
 
-    $infos = apc_cache_info('user');
-    if (!is_array($infos['cache_list']))
+    /**
+     * Gets the cache info.
+     *
+     * @param string $key The cache key
+     *
+     * @return string
+     */
+    protected function getCacheInfo($key)
     {
-      return;
-    }
+        if (!$this->enabled) {
+            return false;
+        }
 
-    $regexp = self::patternToRegexp($this->getOption('prefix').$pattern);
+        $infos = apc_cache_info('user');
 
-    foreach ($infos['cache_list'] as $info)
-    {
-      if (preg_match($regexp, $info['info']))
-      {
-        apc_delete($info['info']);
-      }
-    }
-  }
-
-  /**
-   * Gets the cache info
-   *
-   * @param  string $key The cache key
-   *
-   * @return string
-   */
-  protected function getCacheInfo($key)
-  {
-    if (!$this->enabled)
-    {
-      return false;
-    }
+        if (is_array($infos['cache_list'])) {
+            foreach ($infos['cache_list'] as $info) {
+                if ($this->getOption('prefix').$key == $info['info']) {
+                    return $info;
+                }
+            }
+        }
 
-    $infos = apc_cache_info('user');
+        return null;
+    }
 
-    if (is_array($infos['cache_list']))
+    private function fetch($key, &$success)
     {
-      foreach ($infos['cache_list'] as $info)
-      {
-        if ($this->getOption('prefix').$key == $info['info'])
-        {
-          return $info;
+        $has = null;
+        $value = apc_fetch($key, $has);
+        // the second argument was added in APC 3.0.17. If it is still null we fall back to the value returned
+        if (null !== $has) {
+            $success = $has;
+        } else {
+            $success = false !== $value;
         }
-      }
-    }
 
-    return null;
-  }
+        return $value;
+    }
 }
diff --git a/lib/cache/sfCache.class.php b/lib/cache/sfCache.class.php
index 3be0e55c6..4668af3b5 100644
--- a/lib/cache/sfCache.class.php
+++ b/lib/cache/sfCache.class.php
@@ -11,227 +11,224 @@
 /**
  * sfCache is an abstract class for all cache classes in symfony.
  *
- * @package    symfony
- * @subpackage cache
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfCache
 {
-  const OLD = 1;
-  const ALL = 2;
-  const SEPARATOR = ':';
-
-  protected
-    $options = array();
-
-  /**
-   * Class constructor.
-   *
-   * @see initialize()
-   *
-   * @param array $options
-   */
-  public function __construct($options = array())
-  {
-    $this->initialize($options);
-  }
-
-  /**
-   * Initializes this sfCache instance.
-   *
-   * @param array $options An array of options.
-   *
-   * Available options:
-   *
-   * * automatic_cleaning_factor: The automatic cleaning process destroy too old (for the given life time) (default value: 1000)
-   *   cache files when a new cache file is written.
-   *     0               => no automatic cache cleaning
-   *     1               => systematic cache cleaning
-   *     x (integer) > 1 => automatic cleaning randomly 1 times on x cache write
-   *
-   * * lifetime (optional): The default life time (default value: 86400)
-   *
-   * @throws <b>sfInitializationException</b> If an error occurs while initializing this sfCache instance.
-   */
-  public function initialize($options = array())
-  {
-    $this->options = array_merge(array(
-      'automatic_cleaning_factor' => 1000,
-      'lifetime'                  => 86400,
-      'prefix'                    => md5(__DIR__),
-    ), $options);
-
-    $this->options['prefix'] .= self::SEPARATOR;
-  }
-
-  /**
-   * Gets the cache content for a given key.
-   *
-   * @param string $key     The cache key
-   * @param mixed  $default The default value is the key does not exist or not valid anymore
-   *
-   * @return string The data of the cache
-   */
-  abstract public function get($key, $default = null);
-
-  /**
-   * Returns true if there is a cache for the given key.
-   *
-   * @param string $key The cache key
-   *
-   * @return Boolean true if the cache exists, false otherwise
-   */
-  abstract public function has($key);
-
-  /**
-   * Saves some data in the cache.
-   *
-   * @param string $key      The cache key
-   * @param string $data     The data to put in cache
-   * @param int    $lifetime The lifetime
-   *
-   * @return Boolean true if no problem
-   */
-  abstract public function set($key, $data, $lifetime = null);
-
-  /**
-   * Removes a content from the cache.
-   *
-   * @param string $key The cache key
-   *
-   * @return Boolean true if no problem
-   */
-  abstract public function remove($key);
-
-  /**
-   * Removes content from the cache that matches the given pattern.
-   *
-   * @param string $pattern The cache key pattern
-   *
-   * @return Boolean true if no problem
-   *
-   * @see patternToRegexp
-   */
-  abstract public function removePattern($pattern);
-
-  /**
-   * Cleans the cache.
-   *
-   * @param int $mode The clean mode
-   *                  sfCache::ALL: remove all keys (default)
-   *                  sfCache::OLD: remove all expired keys
-   *
-   * @return Boolean true if no problem
-   */
-  abstract public function clean($mode = self::ALL);
-
-  /**
-   * Returns the timeout for the given key.
-   *
-   * @param string $key The cache key
-   *
-   * @return int The timeout time
-   */
-  abstract public function getTimeout($key);
-
-  /**
-   * Returns the last modification date of the given key.
-   *
-   * @param string $key The cache key
-   *
-   * @return int The last modified time (timestamp)
-   */
-  abstract public function getLastModified($key);
-
-  /**
-   * Gets many keys at once.
-   *
-   * @param array $keys An array of keys
-   *
-   * @return array An associative array of data from cache
-   */
-  public function getMany($keys)
-  {
-    $data = array();
-    foreach ($keys as $key)
+    public const OLD = 1;
+    public const ALL = 2;
+    public const SEPARATOR = ':';
+
+    protected $options = array();
+
+    /**
+     * Class constructor.
+     *
+     * @see initialize()
+     *
+     * @param array $options
+     */
+    public function __construct($options = array())
+    {
+        $this->initialize($options);
+    }
+
+    /**
+     * Initializes this sfCache instance.
+     *
+     * @param array $options An array of options.
+     *
+     * Available options:
+     *
+     * * automatic_cleaning_factor: The automatic cleaning process destroy too old (for the given life time) (default value: 1000)
+     *   cache files when a new cache file is written.
+     *     0               => no automatic cache cleaning
+     *     1               => systematic cache cleaning
+     *     x (integer) > 1 => automatic cleaning randomly 1 times on x cache write
+     *
+     * * lifetime (optional): The default life time (default value: 86400)
+     *
+     * @throws <b>sfInitializationException</b> If an error occurs while initializing this sfCache instance
+     */
+    public function initialize($options = array())
+    {
+        $this->options = array_merge(array(
+            'automatic_cleaning_factor' => 1000,
+            'lifetime' => 86400,
+            'prefix' => md5(__DIR__),
+        ), $options);
+
+        $this->options['prefix'] .= self::SEPARATOR;
+    }
+
+    /**
+     * Gets the cache content for a given key.
+     *
+     * @param string $key     The cache key
+     * @param mixed  $default The default value is the key does not exist or not valid anymore
+     *
+     * @return string The data of the cache
+     */
+    abstract public function get($key, $default = null);
+
+    /**
+     * Returns true if there is a cache for the given key.
+     *
+     * @param string $key The cache key
+     *
+     * @return bool true if the cache exists, false otherwise
+     */
+    abstract public function has($key);
+
+    /**
+     * Saves some data in the cache.
+     *
+     * @param string $key      The cache key
+     * @param string $data     The data to put in cache
+     * @param int    $lifetime The lifetime
+     *
+     * @return bool true if no problem
+     */
+    abstract public function set($key, $data, $lifetime = null);
+
+    /**
+     * Removes a content from the cache.
+     *
+     * @param string $key The cache key
+     *
+     * @return bool true if no problem
+     */
+    abstract public function remove($key);
+
+    /**
+     * Removes content from the cache that matches the given pattern.
+     *
+     * @param string $pattern The cache key pattern
+     *
+     * @return bool true if no problem
+     *
+     * @see patternToRegexp
+     */
+    abstract public function removePattern($pattern);
+
+    /**
+     * Cleans the cache.
+     *
+     * @param int $mode The clean mode
+     *                  sfCache::ALL: remove all keys (default)
+     *                  sfCache::OLD: remove all expired keys
+     *
+     * @return bool true if no problem
+     */
+    abstract public function clean($mode = self::ALL);
+
+    /**
+     * Returns the timeout for the given key.
+     *
+     * @param string $key The cache key
+     *
+     * @return int The timeout time
+     */
+    abstract public function getTimeout($key);
+
+    /**
+     * Returns the last modification date of the given key.
+     *
+     * @param string $key The cache key
+     *
+     * @return int The last modified time (timestamp)
+     */
+    abstract public function getLastModified($key);
+
+    /**
+     * Gets many keys at once.
+     *
+     * @param array $keys An array of keys
+     *
+     * @return array An associative array of data from cache
+     */
+    public function getMany($keys)
+    {
+        $data = array();
+        foreach ($keys as $key) {
+            $data[$key] = $this->get($key);
+        }
+
+        return $data;
+    }
+
+    /**
+     * Computes lifetime.
+     *
+     * @param int $lifetime Lifetime in seconds
+     *
+     * @return int Lifetime in seconds
+     */
+    public function getLifetime($lifetime)
     {
-      $data[$key] = $this->get($key);
+        return null === $lifetime ? $this->getOption('lifetime') : $lifetime;
     }
 
-    return $data;
-  }
-
-  /**
-   * Computes lifetime.
-   *
-   * @param integer $lifetime Lifetime in seconds
-   *
-   * @return integer Lifetime in seconds
-   */
-  public function getLifetime($lifetime)
-  {
-    return null === $lifetime ? $this->getOption('lifetime') : $lifetime;
-  }
-
-  /**
-   * Gets the backend object.
-   *
-   * @return mixed The backend object
-   *
-   * @throws sfException
-   */
-  public function getBackend()
-  {
-    throw new sfException('This cache class does not have a backend object.');
-  }
-
-  /**
-   * Gets an option value.
-   *
-   * @param string $name    The option name
-   * @param mixed  $default The default value
-   *
-   * @return mixed The option value
-   */
-  public function getOption($name, $default = null)
-  {
-    return isset($this->options[$name]) ? $this->options[$name] : $default;
-  }
-
-  /**
-   * Sets an option value.
-   *
-   * @param string $name  The option name
-   * @param mixed  $value The option value
-   *
-   * @return mixed
-   */
-  public function setOption($name, $value)
-  {
-    return $this->options[$name] = $value;
-  }
-
-  /**
-   * Converts a pattern to a regular expression.
-   *
-   * A pattern can use some special characters:
-   *
-   *  - * Matches a namespace (foo:*:bar)
-   *  - ** Matches one or more namespaces (foo:**:bar)
-   *
-   * @param string $pattern A pattern
-   *
-   * @return string A regular expression
-   */
-  protected function patternToRegexp($pattern)
-  {
-    $regexp = str_replace(
-      array('\\*\\*', '\\*'),
-      array('.+?',    '[^'.preg_quote(sfCache::SEPARATOR, '#').']+'),
-      preg_quote($pattern, '#')
-    );
-
-    return '#^'.$regexp.'$#';
-  }
+    /**
+     * Gets the backend object.
+     *
+     * @return mixed The backend object
+     *
+     * @throws sfException
+     */
+    public function getBackend()
+    {
+        throw new sfException('This cache class does not have a backend object.');
+    }
+
+    /**
+     * Gets an option value.
+     *
+     * @param string $name    The option name
+     * @param mixed  $default The default value
+     *
+     * @return mixed The option value
+     */
+    public function getOption($name, $default = null)
+    {
+        return isset($this->options[$name]) ? $this->options[$name] : $default;
+    }
+
+    /**
+     * Sets an option value.
+     *
+     * @param string $name  The option name
+     * @param mixed  $value The option value
+     *
+     * @return mixed
+     */
+    public function setOption($name, $value)
+    {
+        return $this->options[$name] = $value;
+    }
+
+    /**
+     * Converts a pattern to a regular expression.
+     *
+     * A pattern can use some special characters:
+     *
+     *  - * Matches a namespace (foo:*:bar)
+     *  - ** Matches one or more namespaces (foo:**:bar)
+     *
+     * @param string $pattern A pattern
+     *
+     * @return string A regular expression
+     */
+    protected function patternToRegexp($pattern)
+    {
+        $regexp = str_replace(
+            array('\\*\\*', '\\*'),
+            array('.+?', '[^'.preg_quote(sfCache::SEPARATOR, '#').']+'),
+            preg_quote($pattern, '#')
+        );
+
+        return '#^'.$regexp.'$#';
+    }
 }
diff --git a/lib/cache/sfEAcceleratorCache.class.php b/lib/cache/sfEAcceleratorCache.class.php
index ab08da295..88342cdbc 100644
--- a/lib/cache/sfEAcceleratorCache.class.php
+++ b/lib/cache/sfEAcceleratorCache.class.php
@@ -11,182 +11,167 @@
 /**
  * Cache class that stores cached content in EAccelerator.
  *
- * @package    symfony
- * @subpackage cache
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfEAcceleratorCache extends sfCache
 {
-  /**
-   * Initializes this sfCache instance.
-   *
-   * Available options:
-   *
-   * * see sfCache for options available for all drivers
-   *
-   * @see sfCache
-   *
-   * @param  array $options
-   *
-   * @throws sfInitializationException
-   */
-  public function initialize($options = array())
-  {
-    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).');
-    }
-  }
-
-  /**
-   * @see sfCache
-   *
-   * @param string $key
-   * @param mixed  $default
-   *
-   * @return null|string
-   */
-  public function get($key, $default = null)
-  {
-    $value = eaccelerator_get($this->getOption('prefix').$key);
-
-    return null === $value ? $default : $value;
-  }
-
-  /**
-   * @see sfCache
-   *
-   * @param string $key
-   *
-   * @return bool
-   */
-  public function has($key)
-  {
-    return null !== eaccelerator_get($this->getOption('prefix'.$key));
-  }
-
-  /**
-   * @see sfCache
-   *
-   * @param  string   $key
-   * @param  string   $data
-   * @param  int|null $lifetime
-   *
-   * @return bool
-   */
-  public function set($key, $data, $lifetime = null)
-  {
-    return eaccelerator_put($this->getOption('prefix').$key, $data, $this->getLifetime($lifetime));
-  }
-
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function remove($key)
-  {
-    return eaccelerator_rm($this->getOption('prefix').$key);
-  }
-
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function removePattern($pattern)
-  {
-    $infos = eaccelerator_list_keys();
-
-    if (is_array($infos))
+    /**
+     * Initializes this sfCache instance.
+     *
+     * Available options:
+     *
+     * * see sfCache for options available for all drivers
+     *
+     * @see sfCache
+     *
+     * @param array $options
+     *
+     * @throws sfInitializationException
+     */
+    public function initialize($options = array())
     {
-      $regexp = self::patternToRegexp($this->getOption('prefix').$pattern);
+        parent::initialize($options);
 
-      foreach ($infos as $info)
-      {
-        if (preg_match($regexp, $info['name']))
-        {
-          eaccelerator_rm($this->getOption('prefix').$key);
+        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).');
         }
-      }
     }
-  }
-
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function clean($mode = sfCache::ALL)
-  {
-    if (sfCache::OLD === $mode)
+
+    /**
+     * @see sfCache
+     *
+     * @param string $key
+     * @param mixed  $default
+     *
+     * @return string|null
+     */
+    public function get($key, $default = null)
     {
-      return eaccelerator_gc();
+        $value = eaccelerator_get($this->getOption('prefix').$key);
+
+        return null === $value ? $default : $value;
     }
 
-    $infos = eaccelerator_list_keys();
-    if (is_array($infos))
+    /**
+     * @see sfCache
+     *
+     * @param string $key
+     *
+     * @return bool
+     */
+    public function has($key)
     {
-      foreach ($infos as $info)
-      {
-        if (false !== strpos($info['name'], $this->getOption('prefix')))
-        {
-          // eaccelerator bug (http://eaccelerator.net/ticket/287)
-          $key = 0 === strpos($info['name'], ':') ? substr($info['name'], 1) : $info['name'];
-          if (!eaccelerator_rm($key))
-          {
-            return false;
-          }
-        }
-      }
+        return null !== eaccelerator_get($this->getOption('prefix'.$key));
     }
 
-    return true;
-  }
+    /**
+     * @see sfCache
+     *
+     * @param string   $key
+     * @param string   $data
+     * @param int|null $lifetime
+     *
+     * @return bool
+     */
+    public function set($key, $data, $lifetime = null)
+    {
+        return eaccelerator_put($this->getOption('prefix').$key, $data, $this->getLifetime($lifetime));
+    }
 
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function getLastModified($key)
-  {
-    if ($info = $this->getCacheInfo($key))
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function remove($key)
     {
-      return $info['created'];
+        return eaccelerator_rm($this->getOption('prefix').$key);
     }
 
-    return 0;
-  }
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function removePattern($pattern)
+    {
+        $infos = eaccelerator_list_keys();
+
+        if (is_array($infos)) {
+            $regexp = self::patternToRegexp($this->getOption('prefix').$pattern);
+
+            foreach ($infos as $info) {
+                if (preg_match($regexp, $info['name'])) {
+                    eaccelerator_rm($this->getOption('prefix').$key);
+                }
+            }
+        }
+    }
 
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function getTimeout($key)
-  {
-    if ($info = $this->getCacheInfo($key))
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function clean($mode = sfCache::ALL)
     {
-      return -1 == $info['ttl'] ? 0 : $info['created'] + $info['ttl'];
+        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'))) {
+                    // eaccelerator bug (http://eaccelerator.net/ticket/287)
+                    $key = 0 === strpos($info['name'], ':') ? substr($info['name'], 1) : $info['name'];
+                    if (!eaccelerator_rm($key)) {
+                        return false;
+                    }
+                }
+            }
+        }
+
+        return true;
     }
 
-    return 0;
-  }
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function getLastModified($key)
+    {
+        if ($info = $this->getCacheInfo($key)) {
+            return $info['created'];
+        }
 
-  protected function getCacheInfo($key)
-  {
-    $infos = eaccelerator_list_keys();
+        return 0;
+    }
 
-    if (is_array($infos))
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function getTimeout($key)
     {
-      foreach ($infos as $info)
-      {
-        if ($this->getOption('prefix').$key == $info['name'])
-        {
-          return $info;
+        if ($info = $this->getCacheInfo($key)) {
+            return -1 == $info['ttl'] ? 0 : $info['created'] + $info['ttl'];
         }
-      }
+
+        return 0;
     }
 
-    return null;
-  }
+    protected function getCacheInfo($key)
+    {
+        $infos = eaccelerator_list_keys();
+
+        if (is_array($infos)) {
+            foreach ($infos as $info) {
+                if ($this->getOption('prefix').$key == $info['name']) {
+                    return $info;
+                }
+            }
+        }
+
+        return null;
+    }
 }
diff --git a/lib/cache/sfFileCache.class.php b/lib/cache/sfFileCache.class.php
index f84be899f..9be20aadc 100644
--- a/lib/cache/sfFileCache.class.php
+++ b/lib/cache/sfFileCache.class.php
@@ -11,343 +11,310 @@
 /**
  * Cache class that stores content in files.
  *
- * @package    symfony
- * @subpackage cache
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfFileCache extends sfCache
 {
-  const READ_DATA = 1;
-  const READ_TIMEOUT = 2;
-  const READ_LAST_MODIFIED = 4;
-
-  const EXTENSION = '.cache';
-
-  /**
-   * Initializes this sfCache instance.
-   *
-   * Available options:
-   *
-   * * cache_dir: The directory where to put cache files
-   *
-   * * see sfCache for options available for all drivers
-   *
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function initialize($options = array())
-  {
-    parent::initialize($options);
-
-    if (!$this->getOption('cache_dir'))
+    public const READ_DATA = 1;
+    public const READ_TIMEOUT = 2;
+    public const READ_LAST_MODIFIED = 4;
+
+    public const EXTENSION = '.cache';
+
+    /**
+     * Initializes this sfCache instance.
+     *
+     * Available options:
+     *
+     * * cache_dir: The directory where to put cache files
+     *
+     * * see sfCache for options available for all drivers
+     *
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function initialize($options = array())
     {
-      throw new sfInitializationException('You must pass a "cache_dir" option to initialize a sfFileCache object.');
+        parent::initialize($options);
+
+        if (!$this->getOption('cache_dir')) {
+            throw new sfInitializationException('You must pass a "cache_dir" option to initialize a sfFileCache object.');
+        }
+
+        $this->setcache_dir($this->getOption('cache_dir'));
     }
 
-    $this->setcache_dir($this->getOption('cache_dir'));
-  }
-
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function get($key, $default = null)
-  {
-    $file_path = $this->getFilePath($key);
-    if (!is_file($file_path))
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function get($key, $default = null)
     {
-      return $default;
-    }
+        $file_path = $this->getFilePath($key);
+        if (!is_file($file_path)) {
+            return $default;
+        }
 
-    $data = $this->read($file_path, self::READ_DATA);
+        $data = $this->read($file_path, self::READ_DATA);
 
-    if ($data[self::READ_DATA] === null)
-    {
-      return $default;
+        if (null === $data[self::READ_DATA]) {
+            return $default;
+        }
+
+        return $data[self::READ_DATA];
     }
 
-    return $data[self::READ_DATA];
-  }
-
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function has($key)
-  {
-    $path = $this->getFilePath($key);
-
-    return is_file($path) && $this->isValid($path);
-  }
-
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function set($key, $data, $lifetime = null)
-  {
-    if ($this->getOption('automatic_cleaning_factor') > 0 && mt_rand(1, $this->getOption('automatic_cleaning_factor')) == 1)
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function has($key)
     {
-      $this->clean(sfCache::OLD);
+        $path = $this->getFilePath($key);
+
+        return is_file($path) && $this->isValid($path);
     }
 
-    return $this->write($this->getFilePath($key), $data, time() + $this->getLifetime($lifetime));
-  }
-
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function remove($key)
-  {
-    return @unlink($this->getFilePath($key));
-  }
-
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function removePattern($pattern)
-  {
-    if (false !== strpos($pattern, '**'))
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function set($key, $data, $lifetime = null)
     {
-      $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)
-      {
-        if (preg_match($regexp, str_replace($this->getOption('cache_dir').DIRECTORY_SEPARATOR, '', $path)))
-        {
-          $paths[] = $path;
+        if ($this->getOption('automatic_cleaning_factor') > 0 && 1 == mt_rand(1, $this->getOption('automatic_cleaning_factor'))) {
+            $this->clean(sfCache::OLD);
         }
-      }
+
+        return $this->write($this->getFilePath($key), $data, time() + $this->getLifetime($lifetime));
     }
-    else
+
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function remove($key)
     {
-      $paths = glob($this->getOption('cache_dir').DIRECTORY_SEPARATOR.str_replace(sfCache::SEPARATOR, DIRECTORY_SEPARATOR, $pattern).self::EXTENSION);
+        return @unlink($this->getFilePath($key));
     }
 
-    foreach ($paths as $path)
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function removePattern($pattern)
     {
-      if (is_dir($path))
-      {
-        sfToolkit::clearDirectory($path);
-      }
-      else
-      {
-        @unlink($path);
-      }
+        if (false !== strpos($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) {
+                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);
+        }
+
+        foreach ($paths as $path) {
+            if (is_dir($path)) {
+                sfToolkit::clearDirectory($path);
+            } else {
+                @unlink($path);
+            }
+        }
     }
-  }
-
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function clean($mode = sfCache::ALL)
-  {
-    if (!is_dir($this->getOption('cache_dir')))
+
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function clean($mode = sfCache::ALL)
     {
-      return true;
+        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)) {
+                $result = @unlink($file) && $result;
+            }
+        }
+
+        return $result;
     }
 
-    $result = true;
-    foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($this->getOption('cache_dir'))) as $file)
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function getTimeout($key)
     {
-      if (sfCache::ALL == $mode || !$this->isValid($file))
-      {
-        $result = @unlink($file) && $result;
-      }
-    }
+        $path = $this->getFilePath($key);
 
-    return $result;
-  }
+        if (!is_file($path)) {
+            return 0;
+        }
 
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function getTimeout($key)
-  {
-    $path = $this->getFilePath($key);
+        $data = $this->read($path, self::READ_TIMEOUT);
 
-    if (!is_file($path))
-    {
-      return 0;
+        return $data[self::READ_TIMEOUT] < time() ? 0 : $data[self::READ_TIMEOUT];
     }
 
-    $data = $this->read($path, self::READ_TIMEOUT);
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function getLastModified($key)
+    {
+        $path = $this->getFilePath($key);
 
-    return $data[self::READ_TIMEOUT] < time() ? 0 : $data[self::READ_TIMEOUT];
-  }
+        if (!is_file($path)) {
+            return 0;
+        }
 
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function getLastModified($key)
-  {
-    $path = $this->getFilePath($key);
+        $data = $this->read($path, self::READ_TIMEOUT | self::READ_LAST_MODIFIED);
 
-    if (!is_file($path))
-    {
-      return 0;
-    }
+        if ($data[self::READ_TIMEOUT] < time()) {
+            return 0;
+        }
 
-    $data = $this->read($path, self::READ_TIMEOUT | self::READ_LAST_MODIFIED);
+        return $data[self::READ_LAST_MODIFIED];
+    }
 
-    if ($data[self::READ_TIMEOUT] < time())
+    protected function isValid($path)
     {
-      return 0;
+        $data = $this->read($path, self::READ_TIMEOUT);
+
+        return time() < $data[self::READ_TIMEOUT];
     }
-    return $data[self::READ_LAST_MODIFIED];
-  }
-
-  protected function isValid($path)
-  {
-    $data = $this->read($path, self::READ_TIMEOUT);
-    return time() < $data[self::READ_TIMEOUT];
-  }
-
- /**
-  * Converts a cache key to a full path.
-  *
-  * @param string $key The cache key
-  *
-  * @return string The full path to the cache file
-  */
-  protected function getFilePath($key)
-  {
-    return $this->getOption('cache_dir').DIRECTORY_SEPARATOR.str_replace(sfCache::SEPARATOR, DIRECTORY_SEPARATOR, $key).self::EXTENSION;
-  }
-
- /**
-  * Reads the cache file and returns the content.
-  *
-  * @param string $path The file path
-  * @param mixed  $type The type of data you want to be returned
-  *                     sfFileCache::READ_DATA: The cache content
-  *                     sfFileCache::READ_TIMEOUT: The timeout
-  *                     sfFileCache::READ_LAST_MODIFIED: The last modification timestamp
-  *
-  * @return array the (meta)data of the cache file. E.g. $data[sfFileCache::READ_DATA]
-  *
-  * @throws sfCacheException
-  */
-  protected function read($path, $type = self::READ_DATA)
-  {
-    if (!$fp = @fopen($path, 'rb'))
+
+    /**
+     * Converts a cache key to a full path.
+     *
+     * @param string $key The cache key
+     *
+     * @return string The full path to the cache file
+     */
+    protected function getFilePath($key)
     {
-      throw new sfCacheException(sprintf('Unable to read cache file "%s".', $path));
+        return $this->getOption('cache_dir').DIRECTORY_SEPARATOR.str_replace(sfCache::SEPARATOR, DIRECTORY_SEPARATOR, $key).self::EXTENSION;
     }
 
-    @flock($fp, LOCK_SH);
-    $data[self::READ_TIMEOUT] = (int) @stream_get_contents($fp, 12, 0);
-    if ($type != self::READ_TIMEOUT && time() < $data[self::READ_TIMEOUT])
+    /**
+     * Reads the cache file and returns the content.
+     *
+     * @param string $path The file path
+     * @param mixed  $type The type of data you want to be returned
+     *                     sfFileCache::READ_DATA: The cache content
+     *                     sfFileCache::READ_TIMEOUT: The timeout
+     *                     sfFileCache::READ_LAST_MODIFIED: The last modification timestamp
+     *
+     * @return array the (meta)data of the cache file. E.g. $data[sfFileCache::READ_DATA]
+     *
+     * @throws sfCacheException
+     */
+    protected function read($path, $type = self::READ_DATA)
     {
-      if ($type & self::READ_LAST_MODIFIED)
-      {
-        $data[self::READ_LAST_MODIFIED] = (int) @stream_get_contents($fp, 12, 12);
-      }
-      if ($type & self::READ_DATA)
-      {
-        fseek($fp, 0, SEEK_END);
-        $length = ftell($fp) - 24;
-        fseek($fp, 24);
-
-        if ($length > 0)
-        {
-          $data[self::READ_DATA] = @fread($fp, $length);
+        if (!$fp = @fopen($path, 'rb')) {
+            throw new sfCacheException(sprintf('Unable to read cache file "%s".', $path));
         }
-        else
-        {
-          $data[self::READ_DATA] = '';
+
+        @flock($fp, LOCK_SH);
+        $data[self::READ_TIMEOUT] = (int) @stream_get_contents($fp, 12, 0);
+        if (self::READ_TIMEOUT != $type && time() < $data[self::READ_TIMEOUT]) {
+            if ($type & self::READ_LAST_MODIFIED) {
+                $data[self::READ_LAST_MODIFIED] = (int) @stream_get_contents($fp, 12, 12);
+            }
+            if ($type & self::READ_DATA) {
+                fseek($fp, 0, SEEK_END);
+                $length = ftell($fp) - 24;
+                fseek($fp, 24);
+
+                if ($length > 0) {
+                    $data[self::READ_DATA] = @fread($fp, $length);
+                } else {
+                    $data[self::READ_DATA] = '';
+                }
+            }
+        } else {
+            $data[self::READ_LAST_MODIFIED] = null;
+            $data[self::READ_DATA] = null;
         }
-      }
-    }
-    else
-    {
-      $data[self::READ_LAST_MODIFIED] = null;
-      $data[self::READ_DATA] = null;
+        @flock($fp, LOCK_UN);
+        @fclose($fp);
+
+        return $data;
     }
-    @flock($fp, LOCK_UN);
-    @fclose($fp);
-
-    return $data;
-  }
-
- /**
-  * Writes the given data in the cache file.
-  *
-  * @param string  $path    The file path
-  * @param string  $data    The data to put in cache
-  * @param integer $timeout The timeout timestamp
-  *
-  * @return boolean true if ok, otherwise false
-  *
-  * @throws sfCacheException
-  */
-  protected function write($path, $data, $timeout)
-  {
-    $current_umask = umask();
-    umask(0000);
-
-    $cacheDir = dirname($path);
-    if (!is_dir($cacheDir) && !@mkdir($cacheDir, 0777, true) && !is_dir($cacheDir))
+
+    /**
+     * Writes the given data in the cache file.
+     *
+     * @param string $path    The file path
+     * @param string $data    The data to put in cache
+     * @param int    $timeout The timeout timestamp
+     *
+     * @return bool true if ok, otherwise false
+     *
+     * @throws sfCacheException
+     */
+    protected function write($path, $data, $timeout)
     {
-      throw new \sfCacheException(sprintf('Cache was not able to create a directory "%s".', $cacheDir));
-    }
+        $current_umask = umask();
+        umask(0000);
 
-    $tmpFile = tempnam($cacheDir, basename($path));
+        $cacheDir = dirname($path);
+        if (!is_dir($cacheDir) && !@mkdir($cacheDir, 0777, true) && !is_dir($cacheDir)) {
+            throw new \sfCacheException(sprintf('Cache was not able to create a directory "%s".', $cacheDir));
+        }
 
-    if (!$fp = @fopen($tmpFile, 'wb'))
-    {
-       throw new sfCacheException(sprintf('Unable to write cache file "%s".', $tmpFile));
-    }
+        $tmpFile = tempnam($cacheDir, basename($path));
 
-    @fwrite($fp, str_pad($timeout, 12, 0, STR_PAD_LEFT));
-    @fwrite($fp, str_pad(time(), 12, 0, STR_PAD_LEFT));
-    @fwrite($fp, $data);
-    @fclose($fp);
+        if (!$fp = @fopen($tmpFile, 'wb')) {
+            throw new sfCacheException(sprintf('Unable to write cache file "%s".', $tmpFile));
+        }
 
-    // Hack from Agavi (http://trac.agavi.org/changeset/3979)
-    // With php < 5.2.6 on win32, renaming to an already existing file doesn't work, but copy does,
-    // so we simply assume that when rename() fails that we are on win32 and try to use copy()
-    if (!@rename($tmpFile, $path))
-    {
-      if (copy($tmpFile, $path))
-      {
-        unlink($tmpFile);
-      }
-    }
+        @fwrite($fp, str_pad($timeout, 12, 0, STR_PAD_LEFT));
+        @fwrite($fp, str_pad(time(), 12, 0, STR_PAD_LEFT));
+        @fwrite($fp, $data);
+        @fclose($fp);
+
+        // Hack from Agavi (http://trac.agavi.org/changeset/3979)
+        // With php < 5.2.6 on win32, renaming to an already existing file doesn't work, but copy does,
+        // so we simply assume that when rename() fails that we are on win32 and try to use copy()
+        if (!@rename($tmpFile, $path)) {
+            if (copy($tmpFile, $path)) {
+                unlink($tmpFile);
+            }
+        }
 
-    chmod($path, 0666);
-    umask($current_umask);
-
-    return true;
-  }
-
-  /**
-   * Sets the cache root directory.
-   *
-   * @param string $cache_dir The directory where to put the cache files
-   */
-  protected function setcache_dir($cache_dir)
-  {
-    // remove last DIRECTORY_SEPARATOR
-    if (DIRECTORY_SEPARATOR == substr($cache_dir, -1))
-    {
-      $cache_dir = substr($cache_dir, 0, -1);
+        chmod($path, 0666);
+        umask($current_umask);
+
+        return true;
     }
 
-    // create cache dir if needed
-    if (!is_dir($cache_dir))
+    /**
+     * Sets the cache root directory.
+     *
+     * @param string $cache_dir The directory where to put the cache files
+     */
+    protected function setcache_dir($cache_dir)
     {
-      $current_umask = umask(0000);
-      @mkdir($cache_dir, 0777, true);
-      umask($current_umask);
+        // remove last DIRECTORY_SEPARATOR
+        if (DIRECTORY_SEPARATOR == substr($cache_dir, -1)) {
+            $cache_dir = substr($cache_dir, 0, -1);
+        }
+
+        // create cache dir if needed
+        if (!is_dir($cache_dir)) {
+            $current_umask = umask(0000);
+            @mkdir($cache_dir, 0777, true);
+            umask($current_umask);
+        }
     }
-  }
 }
diff --git a/lib/cache/sfFunctionCache.class.php b/lib/cache/sfFunctionCache.class.php
index 109a8d1a4..08da5f124 100644
--- a/lib/cache/sfFunctionCache.class.php
+++ b/lib/cache/sfFunctionCache.class.php
@@ -11,104 +11,98 @@
 /**
  * This class can be used to cache the result and output of any PHP callable (function and method calls).
  *
- * @package    symfony
- * @subpackage cache
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfFunctionCache
 {
-  protected $cache = null;
-
-  /**
-   * Constructor.
-   *
-   * @param sfCache $cache An sfCache object instance
-   */
-  public function __construct(sfCache $cache)
-  {
-    $this->cache = $cache;
-  }
-
-  /**
-   * Calls a cacheable function or method (or not if there is already a cache for it).
-   *
-   * Arguments of this method are read with func_get_args. So it doesn't appear in the function definition.
-   *
-   * The first argument can be any PHP callable:
-   *
-   * $cache->call('functionName', array($arg1, $arg2));
-   * $cache->call(array($object, 'methodName'), array($arg1, $arg2));
-   *
-   * @param mixed $callable  A PHP callable
-   * @param array $arguments An array of arguments to pass to the callable
-   * @return mixed The result of the function/method
-   *
-   * @throws Exception
-   * @throws sfException
-   */
-  public function call($callable, $arguments = array())
-  {
-    // Generate a cache id
-    $key = $this->computeCacheKey($callable, $arguments);
+    protected $cache;
 
-    $serialized = $this->cache->get($key);
-    if ($serialized !== null)
+    /**
+     * Constructor.
+     *
+     * @param sfCache $cache An sfCache object instance
+     */
+    public function __construct(sfCache $cache)
     {
-      $data = unserialize($serialized);
+        $this->cache = $cache;
     }
-    else
+
+    /**
+     * Calls a cacheable function or method (or not if there is already a cache for it).
+     *
+     * Arguments of this method are read with func_get_args. So it doesn't appear in the function definition.
+     *
+     * The first argument can be any PHP callable:
+     *
+     * $cache->call('functionName', array($arg1, $arg2));
+     * $cache->call(array($object, 'methodName'), array($arg1, $arg2));
+     *
+     * @param mixed $callable  A PHP callable
+     * @param array $arguments An array of arguments to pass to the callable
+     *
+     * @return mixed The result of the function/method
+     *
+     * @throws Exception
+     * @throws sfException
+     */
+    public function call($callable, $arguments = array())
     {
-      $data = array();
+        // Generate a cache id
+        $key = $this->computeCacheKey($callable, $arguments);
 
-      if (!is_callable($callable))
-      {
-        throw new sfException('The first argument to call() must be a valid callable.');
-      }
+        $serialized = $this->cache->get($key);
+        if (null !== $serialized) {
+            $data = unserialize($serialized);
+        } else {
+            $data = array();
 
-      ob_start();
-      ob_implicit_flush(false);
+            if (!is_callable($callable)) {
+                throw new sfException('The first argument to call() must be a valid callable.');
+            }
 
-      try
-      {
-        $data['result'] = call_user_func_array($callable, $arguments);
-      }
-      catch (Exception $e)
-      {
-        ob_end_clean();
-        throw $e;
-      }
+            ob_start();
+            ob_implicit_flush(false);
 
-      $data['output'] = ob_get_clean();
+            try {
+                $data['result'] = call_user_func_array($callable, $arguments);
+            } catch (Exception $e) {
+                ob_end_clean();
 
-      $this->cache->set($key, serialize($data));
-    }
+                throw $e;
+            }
+
+            $data['output'] = ob_get_clean();
 
-    echo $data['output'];
+            $this->cache->set($key, serialize($data));
+        }
 
-    return $data['result'];
-  }
+        echo $data['output'];
 
-  /**
-   * Returns the cache instance.
-   *
-   * @return sfCache The sfCache instance
-   */
-  public function getCache()
-  {
-    return $this->cache;
-  }
+        return $data['result'];
+    }
+
+    /**
+     * Returns the cache instance.
+     *
+     * @return sfCache The sfCache instance
+     */
+    public function getCache()
+    {
+        return $this->cache;
+    }
 
-  /**
-   * Computes the cache key for a given callable and the arguments.
-   *
-   * @param mixed $callable  A PHP callable
-   * @param array $arguments An array of arguments to pass to the callable
-   *
-   * @return string The associated cache key
-   */
-  public function computeCacheKey($callable, $arguments = array())
-  {
-    return md5(serialize($callable).serialize($arguments));
-  }
+    /**
+     * Computes the cache key for a given callable and the arguments.
+     *
+     * @param mixed $callable  A PHP callable
+     * @param array $arguments An array of arguments to pass to the callable
+     *
+     * @return string The associated cache key
+     */
+    public function computeCacheKey($callable, $arguments = array())
+    {
+        return md5(serialize($callable).serialize($arguments));
+    }
 }
diff --git a/lib/cache/sfMemcacheCache.class.php b/lib/cache/sfMemcacheCache.class.php
index de611e9ed..be29229d9 100644
--- a/lib/cache/sfMemcacheCache.class.php
+++ b/lib/cache/sfMemcacheCache.class.php
@@ -11,297 +11,270 @@
 /**
  * Cache class that stores cached content in memcache.
  *
- * @package    symfony
- * @subpackage cache
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfMemcacheCache extends sfCache
 {
-  /** @var Memcache */
-  protected $memcache = null;
-
-  /**
-   * Initializes this sfCache instance.
-   *
-   * Available options:
-   *
-   * * memcache: A memcache object (optional)
-   *
-   * * host:       The default host (default to localhost)
-   * * port:       The port for the default server (default to 11211)
-   * * persistent: true if the connection must be persistent, false otherwise (true by default)
-   *
-   * * servers:    An array of additional servers (keys: host, port, persistent)
-   *
-   * * see sfCache for options available for all drivers
-   *
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function initialize($options = array())
-  {
-    parent::initialize($options);
-
-    if (!class_exists('Memcache'))
+    /** @var Memcache */
+    protected $memcache;
+
+    /**
+     * Initializes this sfCache instance.
+     *
+     * Available options:
+     *
+     * * memcache: A memcache object (optional)
+     *
+     * * host:       The default host (default to localhost)
+     * * port:       The port for the default server (default to 11211)
+     * * persistent: true if the connection must be persistent, false otherwise (true by default)
+     *
+     * * servers:    An array of additional servers (keys: host, port, persistent)
+     *
+     * * see sfCache for options available for all drivers
+     *
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function initialize($options = array())
     {
-      throw new sfInitializationException('You must have memcache installed and enabled to use sfMemcacheCache class.');
-    }
+        parent::initialize($options);
 
-    if ($this->getOption('memcache'))
-    {
-      $this->memcache = $this->getOption('memcache');
-    }
-    else
-    {
-      $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));
-          }
+        if (!class_exists('Memcache')) {
+            throw new sfInitializationException('You must have memcache installed and enabled to use sfMemcacheCache class.');
         }
-      }
-      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)));
+
+        if ($this->getOption('memcache')) {
+            $this->memcache = $this->getOption('memcache');
+        } else {
+            $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));
+                    }
+                }
+            } 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)));
+                }
+            }
         }
-      }
     }
-  }
-
-  /**
-   * @see sfCache
-   * @return Memcache
-   */
-  public function getBackend()
-  {
-    return $this->memcache;
-  }
-
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function get($key, $default = null)
-  {
-    $value = $this->memcache->get($this->getOption('prefix').$key);
-
-    return (false === $value && false === $this->getMetadata($key)) ? $default : $value;
-  }
-
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function has($key)
-  {
-    if (false === $this->memcache->get($this->getOption('prefix') . $key))
+
+    /**
+     * @see sfCache
+     *
+     * @return Memcache
+     */
+    public function getBackend()
     {
-      // if there is metadata, $key exists with a false value
-      return !(false === $this->getMetadata($key));
+        return $this->memcache;
     }
 
-    return true;
-  }
-
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function set($key, $data, $lifetime = null)
-  {
-    $lifetime = null === $lifetime ? $this->getOption('lifetime') : $lifetime;
-
-    // save metadata
-    $this->setMetadata($key, $lifetime);
-
-    // save key for removePattern()
-    if ($this->getOption('storeCacheInfo', false))
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function get($key, $default = null)
     {
-      $this->setCacheInfo($key);
+        $value = $this->memcache->get($this->getOption('prefix').$key);
+
+        return (false === $value && false === $this->getMetadata($key)) ? $default : $value;
     }
 
-    if (false !== $this->memcache->replace($this->getOption('prefix').$key, $data, false, time() + $lifetime))
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function has($key)
     {
-      return true;
+        if (false === $this->memcache->get($this->getOption('prefix').$key)) {
+            // if there is metadata, $key exists with a false value
+            return !(false === $this->getMetadata($key));
+        }
+
+        return true;
     }
 
-    return $this->memcache->set($this->getOption('prefix').$key, $data, false, time() + $lifetime);
-  }
-
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function remove($key)
-  {
-    // delete metadata
-    $this->memcache->delete($this->getOption('prefix').'_metadata'.self::SEPARATOR.$key, 0);
-    if ($this->getOption('storeCacheInfo', false))
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function set($key, $data, $lifetime = null)
     {
-      $this->setCacheInfo($key, true);
+        $lifetime = null === $lifetime ? $this->getOption('lifetime') : $lifetime;
+
+        // save metadata
+        $this->setMetadata($key, $lifetime);
+
+        // save key for removePattern()
+        if ($this->getOption('storeCacheInfo', false)) {
+            $this->setCacheInfo($key);
+        }
+
+        if (false !== $this->memcache->replace($this->getOption('prefix').$key, $data, false, time() + $lifetime)) {
+            return true;
+        }
+
+        return $this->memcache->set($this->getOption('prefix').$key, $data, false, time() + $lifetime);
     }
-    return $this->memcache->delete($this->getOption('prefix').$key, 0);
-  }
-
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function clean($mode = sfCache::ALL)
-  {
-    if (sfCache::ALL === $mode)
+
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function remove($key)
     {
-      return $this->memcache->flush();
+        // delete metadata
+        $this->memcache->delete($this->getOption('prefix').'_metadata'.self::SEPARATOR.$key, 0);
+        if ($this->getOption('storeCacheInfo', false)) {
+            $this->setCacheInfo($key, true);
+        }
+
+        return $this->memcache->delete($this->getOption('prefix').$key, 0);
     }
-  }
-
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function getLastModified($key)
-  {
-    if (false === ($retval = $this->getMetadata($key)))
+
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function clean($mode = sfCache::ALL)
     {
-      return 0;
+        if (sfCache::ALL === $mode) {
+            return $this->memcache->flush();
+        }
     }
 
-    return $retval['lastModified'];
-  }
-
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function getTimeout($key)
-  {
-    if (false === ($retval = $this->getMetadata($key)))
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function getLastModified($key)
     {
-      return 0;
+        if (false === ($retval = $this->getMetadata($key))) {
+            return 0;
+        }
+
+        return $retval['lastModified'];
     }
 
-    return $retval['timeout'];
-  }
-
-  /**
-   * @see sfCache
-   * @inheritdoc
-   *
-   * @throws sfCacheException
-   */
-  public function removePattern($pattern)
-  {
-    if (!$this->getOption('storeCacheInfo', false))
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function getTimeout($key)
     {
-      throw new sfCacheException('To use the "removePattern" method, you must set the "storeCacheInfo" option to "true".');
+        if (false === ($retval = $this->getMetadata($key))) {
+            return 0;
+        }
+
+        return $retval['timeout'];
     }
 
-    $regexp = self::patternToRegexp($this->getOption('prefix').$pattern);
-    foreach ($this->getCacheInfo() as $key)
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     *
+     * @throws sfCacheException
+     */
+    public function removePattern($pattern)
     {
-      if (preg_match($regexp, $key))
-      {
-        $this->remove(substr($key, strlen($this->getOption('prefix'))));
-      }
+        if (!$this->getOption('storeCacheInfo', false)) {
+            throw new sfCacheException('To use the "removePattern" method, you must set the "storeCacheInfo" option to "true".');
+        }
+
+        $regexp = self::patternToRegexp($this->getOption('prefix').$pattern);
+        foreach ($this->getCacheInfo() as $key) {
+            if (preg_match($regexp, $key)) {
+                $this->remove(substr($key, strlen($this->getOption('prefix'))));
+            }
+        }
     }
-  }
-
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function getMany($keys)
-  {
-    $values = array();
-    $prefix = $this->getOption('prefix');
-    $prefixed_keys = array_map(function($k) use ($prefix) { return $prefix . $k; }, $keys);
-
-    foreach ($this->memcache->get($prefixed_keys) as $key => $value)
+
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function getMany($keys)
     {
-      $values[str_replace($prefix, '', $key)] = $value;
+        $values = array();
+        $prefix = $this->getOption('prefix');
+        $prefixed_keys = array_map(function ($k) use ($prefix) { return $prefix.$k; }, $keys);
+
+        foreach ($this->memcache->get($prefixed_keys) as $key => $value) {
+            $values[str_replace($prefix, '', $key)] = $value;
+        }
+
+        return $values;
     }
 
-    return $values;
-  }
-
-  /**
-   * Gets metadata about a key in the cache.
-   *
-   * @param string $key A cache key
-   *
-   * @return array An array of metadata information
-   */
-  protected function getMetadata($key)
-  {
-    return $this->memcache->get($this->getOption('prefix').'_metadata'.self::SEPARATOR.$key);
-  }
-
-  /**
-   * Stores metadata about a key in the cache.
-   *
-   * @param string $key      A cache key
-   * @param string $lifetime The lifetime
-   */
-  protected function setMetadata($key, $lifetime)
-  {
-    $this->memcache->set($this->getOption('prefix').'_metadata'.self::SEPARATOR.$key, array('lastModified' => time(), 'timeout' => time() + $lifetime), false, time() + $lifetime);
-  }
-
-  /**
-   * Updates the cache information for the given cache key.
-   *
-   * @param string $key The cache key
-   * @param boolean $delete Delete key or not
-   */
-  protected function setCacheInfo($key, $delete = false)
-  {
-    $keys = $this->memcache->get($this->getOption('prefix').'_metadata');
-    if (!is_array($keys))
+    /**
+     * Gets metadata about a key in the cache.
+     *
+     * @param string $key A cache key
+     *
+     * @return array An array of metadata information
+     */
+    protected function getMetadata($key)
     {
-      $keys = array();
+        return $this->memcache->get($this->getOption('prefix').'_metadata'.self::SEPARATOR.$key);
     }
 
-    if ($delete)
+    /**
+     * Stores metadata about a key in the cache.
+     *
+     * @param string $key      A cache key
+     * @param string $lifetime The lifetime
+     */
+    protected function setMetadata($key, $lifetime)
     {
-       if (($k = array_search($this->getOption('prefix').$key, $keys)) !== false)
-       {
-         unset($keys[$k]);
-       }
+        $this->memcache->set($this->getOption('prefix').'_metadata'.self::SEPARATOR.$key, array('lastModified' => time(), 'timeout' => time() + $lifetime), false, time() + $lifetime);
     }
-    else
+
+    /**
+     * Updates the cache information for the given cache key.
+     *
+     * @param string $key    The cache key
+     * @param bool   $delete Delete key or not
+     */
+    protected function setCacheInfo($key, $delete = false)
     {
-      if (!in_array($this->getOption('prefix').$key, $keys))
-      {
-        $keys[] = $this->getOption('prefix').$key;
-      }
+        $keys = $this->memcache->get($this->getOption('prefix').'_metadata');
+        if (!is_array($keys)) {
+            $keys = array();
+        }
+
+        if ($delete) {
+            if (($k = array_search($this->getOption('prefix').$key, $keys)) !== false) {
+                unset($keys[$k]);
+            }
+        } else {
+            if (!in_array($this->getOption('prefix').$key, $keys)) {
+                $keys[] = $this->getOption('prefix').$key;
+            }
+        }
+
+        $this->memcache->set($this->getOption('prefix').'_metadata', $keys, 0);
     }
 
-    $this->memcache->set($this->getOption('prefix').'_metadata', $keys, 0);
-  }
-
-  /**
-   * Gets cache information.
-   *
-   * @return array
-   */
-  protected function getCacheInfo()
-  {
-    $keys = $this->memcache->get($this->getOption('prefix').'_metadata');
-    if (!is_array($keys))
+    /**
+     * Gets cache information.
+     *
+     * @return array
+     */
+    protected function getCacheInfo()
     {
-      return array();
-    }
+        $keys = $this->memcache->get($this->getOption('prefix').'_metadata');
+        if (!is_array($keys)) {
+            return array();
+        }
 
-    return $keys;
-  }
+        return $keys;
+    }
 }
diff --git a/lib/cache/sfNoCache.class.php b/lib/cache/sfNoCache.class.php
index 9891a98e4..8b08e5eba 100644
--- a/lib/cache/sfNoCache.class.php
+++ b/lib/cache/sfNoCache.class.php
@@ -11,82 +11,81 @@
 /**
  * Cache class that does nothing.
  *
- * @package    symfony
- * @subpackage cache
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfNoCache extends sfCache
 {
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function get($key, $default = null)
-  {
-    return $default;
-  }
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function get($key, $default = null)
+    {
+        return $default;
+    }
 
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function has($key)
-  {
-    return false;
-  }
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function has($key)
+    {
+        return false;
+    }
 
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function set($key, $data, $lifetime = null)
-  {
-    return true;
-  }
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function set($key, $data, $lifetime = null)
+    {
+        return true;
+    }
 
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function remove($key)
-  {
-    return true;
-  }
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function remove($key)
+    {
+        return true;
+    }
 
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function removePattern($pattern)
-  {
-    return true;
-  }
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function removePattern($pattern)
+    {
+        return true;
+    }
 
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function clean($mode = self::ALL)
-  {
-    return true;
-  }
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function clean($mode = self::ALL)
+    {
+        return true;
+    }
 
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function getLastModified($key)
-  {
-    return 0;
-  }
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function getLastModified($key)
+    {
+        return 0;
+    }
 
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function getTimeout($key)
-  {
-    return 0;
-  }
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function getTimeout($key)
+    {
+        return 0;
+    }
 }
diff --git a/lib/cache/sfSQLiteCache.class.php b/lib/cache/sfSQLiteCache.class.php
index 093e0a0db..fb81e4a4b 100644
--- a/lib/cache/sfSQLiteCache.class.php
+++ b/lib/cache/sfSQLiteCache.class.php
@@ -11,341 +11,312 @@
 /**
  * Cache class that stores cached content in a SQLite database.
  *
- * @package    symfony
- * @subpackage cache
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfSQLiteCache extends sfCache
 {
-  protected
-    $dbh            = null,
-    $sqlLiteVersion = null,
-    $database       = '';
-
-  /**
-   * Initializes this sfCache instance.
-   *
-   * Available options:
-   *
-   * * database: File where to put the cache database (or :memory: to store cache in memory)
-   *
-   * * see sfCache for options available for all drivers
-   *
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function initialize($options = array())
-  {
-    if (!extension_loaded('SQLite') && !extension_loaded('pdo_SQLite'))
+    protected $dbh;
+    protected $sqlLiteVersion;
+    protected $database = '';
+
+    /**
+     * Initializes this sfCache instance.
+     *
+     * Available options:
+     *
+     * * database: File where to put the cache database (or :memory: to store cache in memory)
+     *
+     * * see sfCache for options available for all drivers
+     *
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function initialize($options = array())
     {
-      throw new sfConfigurationException('sfSQLiteCache class needs "sqlite" or "pdo_sqlite" extension to be loaded.');
-    }
+        if (!extension_loaded('SQLite') && !extension_loaded('pdo_SQLite')) {
+            throw new sfConfigurationException('sfSQLiteCache class needs "sqlite" or "pdo_sqlite" extension to be loaded.');
+        }
 
-    parent::initialize($options);
+        parent::initialize($options);
 
-    if (!$this->getOption('database'))
-    {
-      throw new sfInitializationException('You must pass a "database" option to initialize a sfSQLiteCache object.');
-    }
+        if (!$this->getOption('database')) {
+            throw new sfInitializationException('You must pass a "database" option to initialize a sfSQLiteCache object.');
+        }
 
-    $this->setDatabase($this->getOption('database'));
-  }
-
-  /**
-   * @see sfCache
-   * @inheritdo
-   * @return SQLiteDatabase|SQLite3
-   */
-  public function getBackend()
-  {
-    return $this->dbh;
-  }
-
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function get($key, $default = null)
-  {
-    if ($this->isSqLite3())
-    {
-      $data = $this->dbh->querySingle(sprintf("SELECT data FROM cache WHERE key = '%s' AND timeout > %d", $this->dbh->escapeString($key), time()));
-    }
-    else
-    {
-      $data = $this->dbh->singleQuery(sprintf("SELECT data FROM cache WHERE key = '%s' AND timeout > %d", sqlite_escape_string($key), time()));
+        $this->setDatabase($this->getOption('database'));
     }
 
-    return null === $data ? $default : $data;
-  }
-
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function has($key)
-  {
-    if ($this->isSqLite3())
+    /**
+     * @see sfCache
+     *
+     * @inheritdo
+     *
+     * @return SQLite3|SQLiteDatabase
+     */
+    public function getBackend()
     {
-      return (integer) $this->dbh->querySingle(sprintf("SELECT count(*) FROM cache WHERE key = '%s' AND timeout > %d", $this->dbh->escapeString($key), time()));
+        return $this->dbh;
     }
 
-    return (boolean) $this->dbh->query(sprintf("SELECT key FROM cache WHERE key = '%s' AND timeout > %d", sqlite_escape_string($key), time()))->numRows();
-  }
-
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function set($key, $data, $lifetime = null)
-  {
-    if ($this->getOption('automatic_cleaning_factor') > 0 && mt_rand(1, $this->getOption('automatic_cleaning_factor')) == 1)
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function get($key, $default = null)
     {
-      $this->clean(sfCache::OLD);
+        if ($this->isSqLite3()) {
+            $data = $this->dbh->querySingle(sprintf("SELECT data FROM cache WHERE key = '%s' AND timeout > %d", $this->dbh->escapeString($key), time()));
+        } else {
+            $data = $this->dbh->singleQuery(sprintf("SELECT data FROM cache WHERE key = '%s' AND timeout > %d", sqlite_escape_string($key), time()));
+        }
+
+        return null === $data ? $default : $data;
     }
 
-    if ($this->isSqLite3())
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function has($key)
     {
-      return $this->dbh->exec(sprintf("INSERT OR REPLACE INTO cache (key, data, timeout, last_modified) VALUES ('%s', '%s', %d, %d)", $this->dbh->escapeString($key), $this->dbh->escapeString($data), time() + $this->getLifetime($lifetime), time()));
-    }
+        if ($this->isSqLite3()) {
+            return (int) $this->dbh->querySingle(sprintf("SELECT count(*) FROM cache WHERE key = '%s' AND timeout > %d", $this->dbh->escapeString($key), time()));
+        }
 
-    return (boolean) $this->dbh->query(sprintf("INSERT OR REPLACE INTO cache (key, data, timeout, last_modified) VALUES ('%s', '%s', %d, %d)", sqlite_escape_string($key), sqlite_escape_string($data), time() + $this->getLifetime($lifetime), time()));
-  }
+        return (bool) $this->dbh->query(sprintf("SELECT key FROM cache WHERE key = '%s' AND timeout > %d", sqlite_escape_string($key), time()))->numRows();
+    }
 
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function remove($key)
-  {
-    if ($this->isSqLite3())
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function set($key, $data, $lifetime = null)
     {
-      return $this->dbh->exec(sprintf("DELETE FROM cache WHERE key = '%s'", $this->dbh->escapeString($key)));
-    }
+        if ($this->getOption('automatic_cleaning_factor') > 0 && 1 == mt_rand(1, $this->getOption('automatic_cleaning_factor'))) {
+            $this->clean(sfCache::OLD);
+        }
 
-    return (boolean) $this->dbh->query(sprintf("DELETE FROM cache WHERE key = '%s'", sqlite_escape_string($key)));
-  }
+        if ($this->isSqLite3()) {
+            return $this->dbh->exec(sprintf("INSERT OR REPLACE INTO cache (key, data, timeout, last_modified) VALUES ('%s', '%s', %d, %d)", $this->dbh->escapeString($key), $this->dbh->escapeString($data), time() + $this->getLifetime($lifetime), time()));
+        }
 
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function removePattern($pattern)
-  {
-    if ($this->isSqLite3())
-    {
-      return $this->dbh->exec(sprintf("DELETE FROM cache WHERE REGEXP('%s', key)", $this->dbh->escapeString(self::patternToRegexp($pattern))));
+        return (bool) $this->dbh->query(sprintf("INSERT OR REPLACE INTO cache (key, data, timeout, last_modified) VALUES ('%s', '%s', %d, %d)", sqlite_escape_string($key), sqlite_escape_string($data), time() + $this->getLifetime($lifetime), time()));
     }
 
-    return (boolean) $this->dbh->query(sprintf("DELETE FROM cache WHERE REGEXP('%s', key)", sqlite_escape_string(self::patternToRegexp($pattern))));
-  }
-
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function clean($mode = sfCache::ALL)
-  {
-    if ($this->isSqLite3())
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function remove($key)
     {
-      $res = $this->dbh->exec("DELETE FROM cache".(sfCache::OLD == $mode ? sprintf(" WHERE timeout < '%s'", time()) : ''));
-
-      if ($res)
-      {
-        return (boolean) $this->dbh->changes();
-      }
+        if ($this->isSqLite3()) {
+            return $this->dbh->exec(sprintf("DELETE FROM cache WHERE key = '%s'", $this->dbh->escapeString($key)));
+        }
 
-      return false;
+        return (bool) $this->dbh->query(sprintf("DELETE FROM cache WHERE key = '%s'", sqlite_escape_string($key)));
     }
 
-    return (boolean) $this->dbh->query("DELETE FROM cache".(sfCache::OLD == $mode ? sprintf(" WHERE timeout < '%s'", time()) : ''))->numRows();
-  }
-
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function getTimeout($key)
-  {
-    if ($this->isSqLite3())
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function removePattern($pattern)
     {
-      $rs = $this->dbh->querySingle(sprintf("SELECT timeout FROM cache WHERE key = '%s' AND timeout > %d", $this->dbh->escapeString($key), time()));
+        if ($this->isSqLite3()) {
+            return $this->dbh->exec(sprintf("DELETE FROM cache WHERE REGEXP('%s', key)", $this->dbh->escapeString(self::patternToRegexp($pattern))));
+        }
 
-      return null === $rs ? 0 : $rs;
+        return (bool) $this->dbh->query(sprintf("DELETE FROM cache WHERE REGEXP('%s', key)", sqlite_escape_string(self::patternToRegexp($pattern))));
     }
 
-    $rs = $this->dbh->query(sprintf("SELECT timeout FROM cache WHERE key = '%s' AND timeout > %d", sqlite_escape_string($key), time()));
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function clean($mode = sfCache::ALL)
+    {
+        if ($this->isSqLite3()) {
+            $res = $this->dbh->exec('DELETE FROM cache'.(sfCache::OLD == $mode ? sprintf(" WHERE timeout < '%s'", time()) : ''));
 
-    return $rs->numRows() ? (int) $rs->fetchSingle() : 0;
-  }
+            if ($res) {
+                return (bool) $this->dbh->changes();
+            }
 
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function getLastModified($key)
-  {
-    if ($this->isSqLite3())
-    {
-      $rs = $this->dbh->querySingle(sprintf("SELECT last_modified FROM cache WHERE key = '%s' AND timeout > %d", $this->dbh->escapeString($key), time()));
+            return false;
+        }
 
-      return null === $rs ? 0 : $rs;
+        return (bool) $this->dbh->query('DELETE FROM cache'.(sfCache::OLD == $mode ? sprintf(" WHERE timeout < '%s'", time()) : ''))->numRows();
     }
 
-    $rs = $this->dbh->query(sprintf("SELECT last_modified FROM cache WHERE key = '%s' AND timeout > %d", sqlite_escape_string($key), time()));
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function getTimeout($key)
+    {
+        if ($this->isSqLite3()) {
+            $rs = $this->dbh->querySingle(sprintf("SELECT timeout FROM cache WHERE key = '%s' AND timeout > %d", $this->dbh->escapeString($key), time()));
 
-    return $rs->numRows() ? (int) $rs->fetchSingle() : 0;
-  }
+            return null === $rs ? 0 : $rs;
+        }
 
-  /**
-   * Sets the database name.
-   *
-   * @param string $database The database name where to store the cache
-   *
-   * @throws sfCacheException
-   */
-  protected function setDatabase($database)
-  {
-    $this->database = $database;
+        $rs = $this->dbh->query(sprintf("SELECT timeout FROM cache WHERE key = '%s' AND timeout > %d", sqlite_escape_string($key), time()));
 
-    $new = false;
-    if (':memory:' == $database)
-    {
-      $new = true;
+        return $rs->numRows() ? (int) $rs->fetchSingle() : 0;
     }
-    else if (!is_file($database))
+
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function getLastModified($key)
     {
-      $new = true;
-
-      // create cache dir if needed
-      $dir = dirname($database);
-      $current_umask = umask(0000);
-      if (!is_dir($dir))
-      {
-        @mkdir($dir, 0777, true);
-      }
-
-      touch($database);
-      umask($current_umask);
+        if ($this->isSqLite3()) {
+            $rs = $this->dbh->querySingle(sprintf("SELECT last_modified FROM cache WHERE key = '%s' AND timeout > %d", $this->dbh->escapeString($key), time()));
+
+            return null === $rs ? 0 : $rs;
+        }
+
+        $rs = $this->dbh->query(sprintf("SELECT last_modified FROM cache WHERE key = '%s' AND timeout > %d", sqlite_escape_string($key), time()));
+
+        return $rs->numRows() ? (int) $rs->fetchSingle() : 0;
     }
 
-    if ($this->isSqLite3())
+    /**
+     * Callback used when deleting keys from cache.
+     *
+     * @param string $regexp
+     * @param string $key
+     *
+     * @return int
+     */
+    public function removePatternRegexpCallback($regexp, $key)
     {
-      $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));
-      }
+        return preg_match($regexp, $key);
     }
-    else
+
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function getMany($keys)
     {
-      if (!$this->dbh = new SQLiteDatabase($this->database, 0644, $errmsg))
-      {
-        throw new sfCacheException(sprintf('Unable to connect to SQLite database: %s.', $errmsg));
-      }
-    }
+        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()))) {
+                while ($row = $results->fetchArray()) {
+                    $data[$row['key']] = $row['data'];
+                }
+            }
+
+            return $data;
+        }
 
-    $this->dbh->createFunction('regexp', array($this, 'removePatternRegexpCallback'), 2);
+        $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()));
 
-    if ($new)
-    {
-      $this->createSchema();
+        $data = array();
+        foreach ($rows as $row) {
+            $data[$row['key']] = $row['data'];
+        }
+
+        return $data;
     }
-  }
-
-  /**
-   * Callback used when deleting keys from cache.
-   * @param string $regexp
-   * @param string $key
-   * @return int
-   */
-  public function removePatternRegexpCallback($regexp, $key)
-  {
-    return preg_match($regexp, $key);
-  }
-
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function getMany($keys)
-  {
-    if ($this->isSqLite3())
+
+    /**
+     * Sets the database name.
+     *
+     * @param string $database The database name where to store the cache
+     *
+     * @throws sfCacheException
+     */
+    protected function setDatabase($database)
     {
-      $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())))
-      {
-        while ($row = $results->fetchArray())
-        {
-          $data[$row['key']] = $row['data'];
+        $this->database = $database;
+
+        $new = false;
+        if (':memory:' == $database) {
+            $new = true;
+        } elseif (!is_file($database)) {
+            $new = true;
+
+            // create cache dir if needed
+            $dir = dirname($database);
+            $current_umask = umask(0000);
+            if (!is_dir($dir)) {
+                @mkdir($dir, 0777, true);
+            }
+
+            touch($database);
+            umask($current_umask);
         }
-      }
 
-      return $data;
-    }
+        if ($this->isSqLite3()) {
+            $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));
+            }
+        } else {
+            if (!$this->dbh = new SQLiteDatabase($this->database, 0644, $errmsg)) {
+                throw new sfCacheException(sprintf('Unable to connect to SQLite database: %s.', $errmsg));
+            }
+        }
 
-    $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()));
+        $this->dbh->createFunction('regexp', array($this, 'removePatternRegexpCallback'), 2);
 
-    $data = array();
-    foreach ($rows as $row)
-    {
-      $data[$row['key']] = $row['data'];
+        if ($new) {
+            $this->createSchema();
+        }
     }
 
-    return $data;
-  }
-
-  /**
-   * Creates the database schema.
-   *
-   * @throws sfCacheException
-   */
-  protected function createSchema()
-  {
-    $statements = array(
-      'CREATE TABLE [cache] (
+    /**
+     * Creates the database schema.
+     *
+     * @throws sfCacheException
+     */
+    protected function createSchema()
+    {
+        $statements = array(
+            'CREATE TABLE [cache] (
         [key] VARCHAR(255),
         [data] LONGVARCHAR,
         [timeout] TIMESTAMP,
         [last_modified] TIMESTAMP
       )',
-      'CREATE UNIQUE INDEX [cache_unique] ON [cache] ([key])',
-    );
+            '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());
+        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);
+            }
+        }
     }
-  }
-
-  /**
-   * Checks if sqlite is version 3
-   *
-   * @return boolean
-   */
-  protected function isSqLite3()
-  {
-    return 3 === $this->getSqLiteVersion();
-  }
-
-  /**
-   * Get sqlite version number
-   *
-   * @return integer
-   */
-  protected function getSqLiteVersion()
-  {
-    if (null === $this->sqlLiteVersion)
+
+    /**
+     * Checks if sqlite is version 3.
+     *
+     * @return bool
+     */
+    protected function isSqLite3()
     {
-      $this->sqlLiteVersion = version_compare(PHP_VERSION, '5.3', '>') ? 3 : 2;
+        return 3 === $this->getSqLiteVersion();
     }
 
-    return $this->sqlLiteVersion;
-  }
+    /**
+     * Get sqlite version number.
+     *
+     * @return int
+     */
+    protected function getSqLiteVersion()
+    {
+        if (null === $this->sqlLiteVersion) {
+            $this->sqlLiteVersion = version_compare(PHP_VERSION, '5.3', '>') ? 3 : 2;
+        }
+
+        return $this->sqlLiteVersion;
+    }
 }
diff --git a/lib/cache/sfXCacheCache.class.php b/lib/cache/sfXCacheCache.class.php
index 5d2642270..9e8427364 100644
--- a/lib/cache/sfXCacheCache.class.php
+++ b/lib/cache/sfXCacheCache.class.php
@@ -11,219 +11,198 @@
 /**
  * Cache class that stores cached content in XCache.
  *
- * @package    symfony
- * @subpackage cache
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfXCacheCache extends sfCache
 {
-  /**
-   * Initializes this sfCache instance.
-   *
-   * Available options:
-   *
-   * * see sfCache for options available for all drivers
-   *
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function initialize($options = array())
-  {
-    parent::initialize($options);
-
-    if (!function_exists('xcache_set'))
+    /**
+     * Initializes this sfCache instance.
+     *
+     * Available options:
+     *
+     * * see sfCache for options available for all drivers
+     *
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function initialize($options = array())
     {
-      throw new sfInitializationException('You must have XCache installed and enabled to use sfXCacheCache class.');
+        parent::initialize($options);
+
+        if (!function_exists('xcache_set')) {
+            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.');
+        }
     }
 
-    if (!ini_get('xcache.var_size'))
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function get($key, $default = null)
     {
-      throw new sfInitializationException('You must set the "xcache.var_size" variable to a value greater than 0 to use sfXCacheCache class.');
-    }
-  }
+        $set = $this->getBaseValue($key);
 
- /**
-  * @see sfCache
-  * @inheritdoc
-  */
-  public function get($key, $default = null)
-  {
+        if (!is_array($set) || !array_key_exists('data', $set)) {
+            return $default;
+        }
 
-    $set = $this->getBaseValue($key);
+        return $set['data'];
+    }
 
-    if (!is_array($set) || !array_key_exists('data', $set))
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function has($key)
     {
-
-      return $default;
+        return xcache_isset($this->getOption('prefix').$key);
     }
 
-    return $set['data'];
-  }
-
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function has($key)
-  {
-    return xcache_isset($this->getOption('prefix').$key);
-  }
-
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function set($key, $data, $lifetime = null)
-  {
-    $lifetime = $this->getLifetime($lifetime);
-
-    $set = array(
-      'timeout' => time() + $lifetime,
-      'data'    => $data,
-      'ctime'   => time()
-    );
-
-    return xcache_set($this->getOption('prefix').$key, $set, $lifetime);
-  }
-
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function remove($key)
-  {
-    return xcache_unset($this->getOption('prefix').$key);
-  }
-
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function clean($mode = sfCache::ALL)
-  {
-    if ($mode !== sfCache::ALL)
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function set($key, $data, $lifetime = null)
     {
-      return true;
-    }
+        $lifetime = $this->getLifetime($lifetime);
 
-    $this->checkAuth();
+        $set = array(
+            'timeout' => time() + $lifetime,
+            'data' => $data,
+            'ctime' => time(),
+        );
+
+        return xcache_set($this->getOption('prefix').$key, $set, $lifetime);
+    }
 
-    for ($i = 0, $max = xcache_count(XC_TYPE_VAR); $i < $max; $i++)
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function remove($key)
     {
-      if (false === xcache_clear_cache(XC_TYPE_VAR, $i))
-      {
-        return false;
-      }
+        return xcache_unset($this->getOption('prefix').$key);
     }
 
-    return true;
-  }
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function clean($mode = sfCache::ALL)
+    {
+        if (sfCache::ALL !== $mode) {
+            return true;
+        }
 
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function getLastModified($key)
-  {
-    $set = $this->getBaseValue($key);
+        $this->checkAuth();
 
-    if (!is_array($set) || !array_key_exists('ctime', $set))
-    {
+        for ($i = 0, $max = xcache_count(XC_TYPE_VAR); $i < $max; ++$i) {
+            if (false === xcache_clear_cache(XC_TYPE_VAR, $i)) {
+                return false;
+            }
+        }
 
-      return 0;
+        return true;
     }
 
-    return $set['ctime'];
-  }
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function getLastModified($key)
+    {
+        $set = $this->getBaseValue($key);
 
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function getTimeout($key)
-  {
+        if (!is_array($set) || !array_key_exists('ctime', $set)) {
+            return 0;
+        }
 
-    $set = $this->getBaseValue($key);
+        return $set['ctime'];
+    }
 
-    if (!is_array($set) || !array_key_exists('timeout', $set))
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function getTimeout($key)
     {
+        $set = $this->getBaseValue($key);
+
+        if (!is_array($set) || !array_key_exists('timeout', $set)) {
+            return 0;
+        }
 
-      return 0;
+        return $set['timeout'];
     }
 
-    return $set['timeout'];
-  }
-
-  /**
-   * @param string $key
-   * @return mixed|null
-   */
-  public function getBaseValue($key)
-  {
-    return xcache_isset($this->getOption('prefix').$key) ? xcache_get($this->getOption('prefix').$key) : null;
-  }
-
-  /**
-   * @see sfCache
-   * @inheritdoc
-   */
-  public function removePattern($pattern)
-  {
-    $this->checkAuth();
-
-    $regexp = self::patternToRegexp($this->getOption('prefix').$pattern);
-
-    for ($i = 0, $max = xcache_count(XC_TYPE_VAR); $i < $max; $i++)
+    /**
+     * @param string $key
+     *
+     * @return mixed|null
+     */
+    public function getBaseValue($key)
     {
-      $infos = xcache_list(XC_TYPE_VAR, $i);
-      if (!is_array($infos['cache_list']))
-      {
-        return;
-      }
-
-      foreach ($infos['cache_list'] as $info)
-      {
-        if (preg_match($regexp, $info['name']))
-        {
-          xcache_unset($info['name']);
-        }
-      }
+        return xcache_isset($this->getOption('prefix').$key) ? xcache_get($this->getOption('prefix').$key) : null;
     }
-  }
 
-  /**
-   * @param string $key
-   * @return array|null
-   */
-  public function getCacheInfo($key)
-  {
-    $this->checkAuth();
-
-    for ($i = 0, $max = xcache_count(XC_TYPE_VAR); $i < $max; $i++)
+    /**
+     * @see sfCache
+     * {@inheritdoc}
+     */
+    public function removePattern($pattern)
     {
-      $infos = xcache_list(XC_TYPE_VAR, $i);
-
-      if (is_array($infos['cache_list']))
-      {
-        foreach ($infos['cache_list'] as $info)
-        {
-          if ($this->getOption('prefix').$key == $info['name'])
-          {
-            return $info;
-          }
+        $this->checkAuth();
+
+        $regexp = self::patternToRegexp($this->getOption('prefix').$pattern);
+
+        for ($i = 0, $max = xcache_count(XC_TYPE_VAR); $i < $max; ++$i) {
+            $infos = xcache_list(XC_TYPE_VAR, $i);
+            if (!is_array($infos['cache_list'])) {
+                return;
+            }
+
+            foreach ($infos['cache_list'] as $info) {
+                if (preg_match($regexp, $info['name'])) {
+                    xcache_unset($info['name']);
+                }
+            }
         }
-      }
     }
 
-    return null;
-  }
+    /**
+     * @param string $key
+     *
+     * @return array|null
+     */
+    public function getCacheInfo($key)
+    {
+        $this->checkAuth();
+
+        for ($i = 0, $max = xcache_count(XC_TYPE_VAR); $i < $max; ++$i) {
+            $infos = xcache_list(XC_TYPE_VAR, $i);
+
+            if (is_array($infos['cache_list'])) {
+                foreach ($infos['cache_list'] as $info) {
+                    if ($this->getOption('prefix').$key == $info['name']) {
+                        return $info;
+                    }
+                }
+            }
+        }
 
-  protected function checkAuth()
-  {
-    if (ini_get('xcache.admin.enable_auth'))
+        return null;
+    }
+
+    protected function checkAuth()
     {
-      throw new sfConfigurationException('To use all features of the "sfXCacheCache" class, you must set "xcache.admin.enable_auth" to "Off" in your php.ini.');
+        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.');
+        }
     }
-  }
 }
diff --git a/lib/command/cli.php b/lib/command/cli.php
index 37a4f635d..8b423443c 100644
--- a/lib/command/cli.php
+++ b/lib/command/cli.php
@@ -9,41 +9,33 @@
  */
 
 // Try autoloading using composer if available.
-if (!file_exists($autoload = __DIR__.'/../../../../autoload.php'))
-{
-  $autoload = __DIR__.'/../../autoload.php';
+if (!file_exists($autoload = __DIR__.'/../../../../autoload.php')) {
+    $autoload = __DIR__.'/../../autoload.php';
 }
 
 // Fall back to classic Symfony loading
-if (!file_exists($autoload))
-{
-  require_once(__DIR__.'/../autoload/sfCoreAutoload.class.php');
-  sfCoreAutoload::register();
-}
-else
-{
-  require_once $autoload;
+if (!file_exists($autoload)) {
+    require_once __DIR__.'/../autoload/sfCoreAutoload.class.php';
+    sfCoreAutoload::register();
+} else {
+    require_once $autoload;
 }
 
-try
-{
-  $dispatcher = new sfEventDispatcher();
-  $logger = new sfCommandLogger($dispatcher);
+try {
+    $dispatcher = new sfEventDispatcher();
+    $logger = new sfCommandLogger($dispatcher);
 
-  $application = new sfSymfonyCommandApplication($dispatcher, null, array('symfony_lib_dir' => realpath(__DIR__.'/..')));
-  $statusCode = $application->run();
-}
-catch (Exception $e)
-{
-  if (!isset($application))
-  {
-    throw $e;
-  }
+    $application = new sfSymfonyCommandApplication($dispatcher, null, array('symfony_lib_dir' => realpath(__DIR__.'/..')));
+    $statusCode = $application->run();
+} catch (Exception $e) {
+    if (!isset($application)) {
+        throw $e;
+    }
 
-  $application->renderException($e);
-  $statusCode = $e->getCode();
+    $application->renderException($e);
+    $statusCode = $e->getCode();
 
-  exit(is_numeric($statusCode) && $statusCode ? $statusCode : 1);
+    exit(is_numeric($statusCode) && $statusCode ? $statusCode : 1);
 }
 
 exit(is_numeric($statusCode) ? $statusCode : 0);
diff --git a/lib/command/sfAnsiColorFormatter.class.php b/lib/command/sfAnsiColorFormatter.class.php
index 2f6c29e14..bae2f2406 100644
--- a/lib/command/sfAnsiColorFormatter.class.php
+++ b/lib/command/sfAnsiColorFormatter.class.php
@@ -11,120 +11,109 @@
 /**
  * sfAnsiColorFormatter provides methods to colorize text to be displayed on a console.
  *
- * @package    symfony
- * @subpackage command
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 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),
-    ),
-    $options    = array('bold' => 1, 'underscore' => 4, 'blink' => 5, 'reverse' => 7, 'conceal' => 8),
-    $foreground = array('black' => 30, 'red' => 31, 'green' => 32, 'yellow' => 33, 'blue' => 34, 'magenta' => 35, 'cyan' => 36, 'white' => 37),
-    $background = array('black' => 40, 'red' => 41, 'green' => 42, 'yellow' => 43, 'blue' => 44, 'magenta' => 45, 'cyan' => 46, 'white' => 47);
-
-  /**
-   * Sets a new style.
-   *
-   * @param string $name    The style name
-   * @param array  $options An array of options
-   */
-  public function setStyle($name, $options = array())
-  {
-    $this->styles[$name] = $options;
-  }
+    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);
 
-  /**
-   * Formats a text according to the given style or parameters.
-   *
-   * @param  string   $text       The test to style
-   * @param  mixed    $parameters An array of options or a style name
-   *
-   * @return string The styled text
-   */
-  public function format($text = '', $parameters = array())
-  {
-    if (!is_array($parameters) && 'NONE' == $parameters)
+    /**
+     * Sets a new style.
+     *
+     * @param string $name    The style name
+     * @param array  $options An array of options
+     */
+    public function setStyle($name, $options = array())
     {
-      return $text;
+        $this->styles[$name] = $options;
     }
 
-    if (!is_array($parameters) && isset($this->styles[$parameters]))
+    /**
+     * Formats a text according to the given style or parameters.
+     *
+     * @param string $text       The test to style
+     * @param mixed  $parameters An array of options or a style name
+     *
+     * @return string The styled text
+     */
+    public function format($text = '', $parameters = array())
     {
-      $parameters = $this->styles[$parameters];
-    }
+        if (!is_array($parameters) && 'NONE' == $parameters) {
+            return $text;
+        }
 
-    $codes = array();
-    if (isset($parameters['fg']))
-    {
-      $codes[] = $this->foreground[$parameters['fg']];
-    }
-    if (isset($parameters['bg']))
-    {
-      $codes[] = $this->background[$parameters['bg']];
-    }
-    foreach ($this->options as $option => $value)
-    {
-      if (isset($parameters[$option]) && $parameters[$option])
-      {
-        $codes[] = $value;
-      }
-    }
+        if (!is_array($parameters) && isset($this->styles[$parameters])) {
+            $parameters = $this->styles[$parameters];
+        }
 
-    return "\033[".implode(';', $codes).'m'.$text."\033[0m";
-  }
-  
-  /**
-   * Formats a message within a section.
-   *
-   * @param string  $section The section name
-   * @param string  $text    The text message
-   * @param integer $size    The maximum size allowed for a line
-   * @param string  $style   The color scheme to apply to the section string (INFO, ERROR, COMMENT or QUESTION)
-   *
-   * @return string
-   */
-  public function formatSection($section, $text, $size = null, $style = 'INFO')
-  {
-    if (null === $size)
-    {
-      $size = $this->size;
+        $codes = array();
+        if (isset($parameters['fg'])) {
+            $codes[] = $this->foreground[$parameters['fg']];
+        }
+        if (isset($parameters['bg'])) {
+            $codes[] = $this->background[$parameters['bg']];
+        }
+        foreach ($this->options as $option => $value) {
+            if (isset($parameters[$option]) && $parameters[$option]) {
+                $codes[] = $value;
+            }
+        }
+
+        return "\033[".implode(';', $codes).'m'.$text."\033[0m";
     }
 
-    $style = array_key_exists($style, $this->styles) ? $style : 'INFO';
-    $width = 9 + strlen($this->format('', $style));
+    /**
+     * Formats a message within a section.
+     *
+     * @param string $section The section name
+     * @param string $text    The text message
+     * @param int    $size    The maximum size allowed for a line
+     * @param string $style   The color scheme to apply to the section string (INFO, ERROR, COMMENT or QUESTION)
+     *
+     * @return string
+     */
+    public function formatSection($section, $text, $size = null, $style = 'INFO')
+    {
+        if (null === $size) {
+            $size = $this->size;
+        }
 
-    return sprintf(">> %-{$width}s %s", $this->format($section, $style), $this->excerpt($text, $size - 4 - (strlen($section) > 9 ? strlen($section) : 9)));
-  }
+        $style = array_key_exists($style, $this->styles) ? $style : 'INFO';
+        $width = 9 + strlen($this->format('', $style));
 
-  /**
-   * Truncates a line.
-   *
-   * @param string  $text The text
-   * @param integer $size The maximum size of the returned string
-   *
-   * @return string The truncated string
-   */
-  public function excerpt($text, $size = null)
-  {
-    if (!$size)
-    {
-      $size = $this->size;
+        return sprintf(">> %-{$width}s %s", $this->format($section, $style), $this->excerpt($text, $size - 4 - (strlen($section) > 9 ? strlen($section) : 9)));
     }
 
-    if (strlen($text) < $size)
+    /**
+     * Truncates a line.
+     *
+     * @param string $text The text
+     * @param int    $size The maximum size of the returned string
+     *
+     * @return string The truncated string
+     */
+    public function excerpt($text, $size = null)
     {
-      return $text;
-    }
+        if (!$size) {
+            $size = $this->size;
+        }
 
-    $subsize = floor(($size - 3) / 2);
+        if (strlen($text) < $size) {
+            return $text;
+        }
 
-    return substr($text, 0, $subsize).$this->format('...', 'INFO').substr($text, -$subsize);
-  }
+        $subsize = floor(($size - 3) / 2);
+
+        return substr($text, 0, $subsize).$this->format('...', 'INFO').substr($text, -$subsize);
+    }
 }
diff --git a/lib/command/sfCommandApplication.class.php b/lib/command/sfCommandApplication.class.php
index 8a46d7db1..7d05b0eec 100644
--- a/lib/command/sfCommandApplication.class.php
+++ b/lib/command/sfCommandApplication.class.php
@@ -11,698 +11,655 @@
 /**
  * sfCommandApplication manages the lifecycle of a CLI application.
  *
- * @package    symfony
- * @subpackage command
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfCommandApplication
 {
-  /** @var sfCommandManager */
-  protected $commandManager = null;
-  /** @var bool */
-  protected $trace = false;
-  /** @var bool */
-  protected $verbose = true;
-  /** @var bool */
-  protected $debug = true;
-  /** @var bool */
-  protected $nowrite = false;
-  /** @var string */
-  protected $name = 'UNKNOWN';
-  /** @var string */
-  protected $version = 'UNKNOWN';
-  /** @var array */
-  protected $tasks = array();
-  /** @var sfTask */
-  protected $currentTask = null;
-  /** @var sfEventDispatcher */
-  protected $dispatcher = null;
-  /** @var array */
-  protected $options = array();
-  /** @var sfFormatter */
-  protected $formatter = null;
-  /** @var mixed */
-  protected $commandOptions;
-  /**
-   * Constructor.
-   *
-   * @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())
-  {
-    $this->dispatcher = $dispatcher;
-    $this->formatter = null === $formatter ? $this->guessBestFormatter(STDOUT) : $formatter;
-    $this->options = $options;
-
-    $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);
-
-    $this->configure();
-
-    $this->registerTasks();
-  }
-
-  /**
-   * Configures the current command application.
-   */
-  abstract public function configure();
-
-  /**
-   * Returns the value of a given option.
-   *
-   * @param  string  $name  The option name
-   *
-   * @return mixed  The option value
-   */
-  public function getOption($name)
-  {
-    return isset($this->options[$name]) ? $this->options[$name] : null;
-  }
-
-  /**
-   * Returns the formatter instance.
-   *
-   * @return sfFormatter The formatter instance
-   */
-  public function getFormatter()
-  {
-    return $this->formatter;
-  }
-
-  /**
-   * Sets the formatter instance.
-   *
-   * @param sfFormatter $formatter The formatter instance
-   */
-  public function setFormatter(sfFormatter $formatter)
-  {
-    $this->formatter = $formatter;
-
-    foreach ($this->getTasks() as $task)
-    {
-      $task->setFormatter($formatter);
-    }
-  }
-
-  public function clearTasks()
-  {
-    $this->tasks = array();
-  }
-
-  /**
-   * Registers an array of task objects.
-   *
-   * If you pass null, this method will register all available tasks.
-   *
-   * @param array  $tasks  An array of tasks
-   */
-  public function registerTasks($tasks = null)
-  {
-    if (null === $tasks)
-    {
-      $tasks = $this->autodiscoverTasks();
-    }
+    /** @var sfCommandManager */
+    protected $commandManager;
 
-    foreach ($tasks as $task)
-    {
-      $this->registerTask($task);
-    }
-  }
-
-  /**
-   * Registers a task object.
-   *
-   * @param sfTask $task An sfTask object
-   *
-   * @throws sfCommandException
-   */
-  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()])));
-    }
+    /** @var bool */
+    protected $trace = false;
 
-    $this->tasks[$task->getFullName()] = $task;
+    /** @var bool */
+    protected $verbose = true;
 
-    foreach ($task->getAliases() as $alias)
-    {
-      if (isset($this->tasks[$alias]))
-      {
-        throw new sfCommandException(sprintf('A task named "%s" is already registered.', $alias));
-      }
+    /** @var bool */
+    protected $debug = true;
 
-      $this->tasks[$alias] = $task;
-    }
-  }
-
-  /**
-   * Autodiscovers task classes.
-   *
-   * @return array An array of tasks instances
-   */
-  public function autodiscoverTasks()
-  {
-    $tasks = array();
-    foreach (get_declared_classes() as $class)
-    {
-      $r = new ReflectionClass($class);
+    /** @var bool */
+    protected $nowrite = false;
 
-      if ($r->isSubclassOf('sfTask') && !$r->isAbstract())
-      {
-        $tasks[] = new $class($this->dispatcher, $this->formatter);
-      }
-    }
+    /** @var string */
+    protected $name = 'UNKNOWN';
 
-    return $tasks;
-  }
-
-  /**
-   * Returns all registered tasks.
-   *
-   * @return array An array of sfTask objects
-   */
-  public function getTasks()
-  {
-    return $this->tasks;
-  }
-
-  /**
-   * Returns a registered task by name or alias.
-   *
-   * @param string $name The task name or alias
-   *
-   * @return sfTask An sfTask object
-   *
-   * @throws sfCommandException
-   */
-  public function getTask($name)
-  {
-    if (!isset($this->tasks[$name]))
-    {
-      throw new sfCommandException(sprintf('The task "%s" does not exist.', $name));
-    }
+    /** @var string */
+    protected $version = 'UNKNOWN';
 
-    return $this->tasks[$name];
-  }
-
-  /**
-   * Runs the current application.
-   *
-   * @param mixed $options The command line options
-   *
-   * @return integer 0 if everything went fine, or an error code
-   */
-  public function run($options = null)
-  {
-    $this->handleOptions($options);
-    $arguments = $this->commandManager->getArgumentValues();
-
-    $this->currentTask = $this->getTaskToExecute($arguments['task']);
-
-    $ret = $this->currentTask->runFromCLI($this->commandManager, $this->commandOptions);
-
-    $this->currentTask = null;
-
-    return $ret;
-  }
-
-  /**
-   * Gets the name of the application.
-   *
-   * @return string The application name
-   */
-  public function getName()
-  {
-    return $this->name;
-  }
-
-  /**
-   * Sets the application name.
-   *
-   * @param string $name The application name
-   */
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-
-  /**
-   * Gets the application version.
-   *
-   * @return string The application version
-   */
-  public function getVersion()
-  {
-    return $this->version;
-  }
-
-  /**
-   * Sets the application version.
-   *
-   * @param string $version The application version
-   */
-  public function setVersion($version)
-  {
-    $this->version = $version;
-  }
-
-  /**
-   * Returns the long version of the application.
-   *
-   * @return string The long application version
-   */
-  public function getLongVersion()
-  {
-    return sprintf('%s version %s', $this->getName(), $this->formatter->format($this->getVersion(), 'INFO'))."\n";
-  }
-
-  /**
-   * Returns whether the application must be verbose.
-   *
-   * @return Boolean true if the application must be verbose, false otherwise
-   */
-  public function isVerbose()
-  {
-    return $this->verbose;
-  }
-
-  /**
-   * Returns whether the application must activate the trace.
-   *
-   * @return Boolean true if the application must activate the trace, false otherwise
-   */
-  public function withTrace()
-  {
-    return $this->trace;
-  }
-
-  /**
-   * Returns whether the application must be verbose.
-   *
-   * @return Boolean true if the application is in debug mode, false otherwise
-   */
-  public function isDebug()
-  {
-    return $this->debug;
-  }
-
-  /**
-   * Outputs a help message for the current application.
-   */
-  public function help()
-  {
-    $messages = array(
-      $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('  %-24s %s  %s',
-        $this->formatter->format('--'.$option->getName(), 'INFO'),
-        $option->getShortcut() ? $this->formatter->format('-'.$option->getShortcut(), 'INFO') : '  ',
-        $option->getHelp()
-      );
-    }
+    /** @var array */
+    protected $tasks = array();
+
+    /** @var sfTask */
+    protected $currentTask;
 
-    $this->dispatcher->notify(new sfEvent($this, 'command.log', $messages));
-  }
+    /** @var sfEventDispatcher */
+    protected $dispatcher;
 
-  /**
-   * Parses and handles command line options.
-   *
-   * @param mixed $options The command line options
-   */
-  protected function handleOptions($options = null)
-  {
-    $this->commandManager->process($options);
-    $this->commandOptions = $options;
+    /** @var array */
+    protected $options = array();
 
-    // the order of option processing matters
+    /** @var sfFormatter */
+    protected $formatter;
 
-    if ($this->commandManager->getOptionSet()->hasOption('color') && false !== $this->commandManager->getOptionValue('color'))
+    /** @var mixed */
+    protected $commandOptions;
+
+    /**
+     * Constructor.
+     *
+     * @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())
     {
-      $this->setFormatter(new sfAnsiColorFormatter());
+        $this->dispatcher = $dispatcher;
+        $this->formatter = null === $formatter ? $this->guessBestFormatter(STDOUT) : $formatter;
+        $this->options = $options;
+
+        $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);
+
+        $this->configure();
+
+        $this->registerTasks();
     }
 
-    if ($this->commandManager->getOptionSet()->hasOption('quiet') && false !== $this->commandManager->getOptionValue('quiet'))
+    /**
+     * Configures the current command application.
+     */
+    abstract public function configure();
+
+    /**
+     * Returns the value of a given option.
+     *
+     * @param string $name The option name
+     *
+     * @return mixed The option value
+     */
+    public function getOption($name)
     {
-      $this->verbose = false;
+        return isset($this->options[$name]) ? $this->options[$name] : null;
     }
 
-    if ($this->commandManager->getOptionSet()->hasOption('no-debug') && false !== $this->commandManager->getOptionValue('no-debug'))
+    /**
+     * Returns the formatter instance.
+     *
+     * @return sfFormatter The formatter instance
+     */
+    public function getFormatter()
     {
-      $this->debug = false;
+        return $this->formatter;
     }
 
-    if ($this->commandManager->getOptionSet()->hasOption('trace') && false !== $this->commandManager->getOptionValue('trace'))
+    /**
+     * Sets the formatter instance.
+     *
+     * @param sfFormatter $formatter The formatter instance
+     */
+    public function setFormatter(sfFormatter $formatter)
     {
-      $this->verbose = true;
-      $this->trace   = true;
+        $this->formatter = $formatter;
+
+        foreach ($this->getTasks() as $task) {
+            $task->setFormatter($formatter);
+        }
     }
 
-    if ($this->commandManager->getOptionSet()->hasOption('help') && false !== $this->commandManager->getOptionValue('help'))
+    public function clearTasks()
     {
-      $this->help();
-      exit(0);
+        $this->tasks = array();
     }
 
-    if ($this->commandManager->getOptionSet()->hasOption('version') && false !== $this->commandManager->getOptionValue('version'))
+    /**
+     * Registers an array of task objects.
+     *
+     * If you pass null, this method will register all available tasks.
+     *
+     * @param array $tasks An array of tasks
+     */
+    public function registerTasks($tasks = null)
     {
-      echo $this->getLongVersion();
-      exit(0);
+        if (null === $tasks) {
+            $tasks = $this->autodiscoverTasks();
+        }
+
+        foreach ($tasks as $task) {
+            $this->registerTask($task);
+        }
     }
-  }
-
-  /**
-   * Renders an exception.
-   *
-   * @param Exception $e An exception object
-   */
-  public function renderException($e)
-  {
-    $title = sprintf('  [%s]  ', get_class($e));
-    $len = $this->strlen($title);
-    $lines = array();
-    foreach (explode("\n", $e->getMessage()) as $line)
+
+    /**
+     * Registers a task object.
+     *
+     * @param sfTask $task An sfTask object
+     *
+     * @throws sfCommandException
+     */
+    public function registerTask(sfTask $task)
     {
-      $lines[] = sprintf('  %s  ', $line);
-      $len = max($this->strlen($line) + 4, $len);
-    }
+        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()])));
+        }
 
-    $messages = array(str_repeat(' ', $len));
+        $this->tasks[$task->getFullName()] = $task;
 
-    if ($this->trace)
-    {
-      $messages[] = $title.str_repeat(' ', $len - $this->strlen($title));
+        foreach ($task->getAliases() as $alias) {
+            if (isset($this->tasks[$alias])) {
+                throw new sfCommandException(sprintf('A task named "%s" is already registered.', $alias));
+            }
+
+            $this->tasks[$alias] = $task;
+        }
     }
 
-    foreach ($lines as $line)
+    /**
+     * Autodiscovers task classes.
+     *
+     * @return array An array of tasks instances
+     */
+    public function autodiscoverTasks()
     {
-      $messages[] = $line.str_repeat(' ', $len - $this->strlen($line));
-    }
+        $tasks = array();
+        foreach (get_declared_classes() as $class) {
+            $r = new ReflectionClass($class);
 
-    $messages[] = str_repeat(' ', $len);
+            if ($r->isSubclassOf('sfTask') && !$r->isAbstract()) {
+                $tasks[] = new $class($this->dispatcher, $this->formatter);
+            }
+        }
 
-    fwrite(STDERR, "\n");
-    foreach ($messages as $message)
-    {
-      fwrite(STDERR, $this->formatter->format($message, 'ERROR', STDERR)."\n");
+        return $tasks;
     }
-    fwrite(STDERR, "\n");
 
-    if (null !== $this->currentTask && $e instanceof sfCommandArgumentsException)
+    /**
+     * Returns all registered tasks.
+     *
+     * @return array An array of sfTask objects
+     */
+    public function getTasks()
     {
-      fwrite(STDERR, $this->formatter->format(sprintf($this->currentTask->getSynopsis(), $this->getName()), 'INFO', STDERR)."\n");
-      fwrite(STDERR, "\n");
+        return $this->tasks;
     }
 
-    if ($this->trace)
+    /**
+     * Returns a registered task by name or alias.
+     *
+     * @param string $name The task name or alias
+     *
+     * @return sfTask An sfTask object
+     *
+     * @throws sfCommandException
+     */
+    public function getTask($name)
     {
-      fwrite(STDERR, $this->formatter->format("Exception trace:\n", 'COMMENT'));
-
-      // exception related properties
-      $trace = $e->getTrace();
-      array_unshift($trace, array(
-        'function' => '',
-        'file'     => $e->getFile() != null ? $e->getFile() : 'n/a',
-        'line'     => $e->getLine() != null ? $e->getLine() : 'n/a',
-        'args'     => array(),
-      ));
-
-      for ($i = 0, $count = count($trace); $i < $count; $i++)
-      {
-        $class = isset($trace[$i]['class']) ? $trace[$i]['class'] : '';
-        $type = isset($trace[$i]['type']) ? $trace[$i]['type'] : '';
-        $function = $trace[$i]['function'];
-        $file = isset($trace[$i]['file']) ? $trace[$i]['file'] : 'n/a';
-        $line = isset($trace[$i]['line']) ? $trace[$i]['line'] : 'n/a';
-
-        fwrite(STDERR, sprintf(" %s%s%s at %s:%s\n", $class, $type, $function, $this->formatter->format($file, 'INFO', STDERR), $this->formatter->format($line, 'INFO', STDERR)));
-      }
-
-      fwrite(STDERR, "\n");
+        if (!isset($this->tasks[$name])) {
+            throw new sfCommandException(sprintf('The task "%s" does not exist.', $name));
+        }
+
+        return $this->tasks[$name];
     }
 
-    $this->dispatcher->notify(new sfEvent($e, 'application.throw_exception'));
-  }
-
-  /**
-   * Gets a task from a task name or a shortcut.
-   *
-   * @param  string $name The task name or a task shortcut
-   *
-   * @return sfTask A sfTask object
-   *
-   * @throws sfCommandException
-   */
-  public function getTaskToExecute($name)
-  {
-    // namespace
-    if (false !== $pos = strpos($name, ':'))
+    /**
+     * Runs the current application.
+     *
+     * @param mixed $options The command line options
+     *
+     * @return int 0 if everything went fine, or an error code
+     */
+    public function run($options = null)
     {
-      $namespace = substr($name, 0, $pos);
-      $name = substr($name, $pos + 1);
-
-      $namespaces = array();
-      foreach ($this->tasks as $task)
-      {
-        if ($task->getNamespace() && !in_array($task->getNamespace(), $namespaces))
-        {
-          $namespaces[] = $task->getNamespace();
-        }
-      }
-      $abbrev = $this->getAbbreviations($namespaces);
-
-      if (!isset($abbrev[$namespace]))
-      {
-        throw new sfCommandException(sprintf('There are no tasks defined in the "%s" namespace.', $namespace));
-      }
-      else if (count($abbrev[$namespace]) > 1)
-      {
-        throw new sfCommandException(sprintf('The namespace "%s" is ambiguous (%s).', $namespace, implode(', ', $abbrev[$namespace])));
-      }
-      else
-      {
-        $namespace = $abbrev[$namespace][0];
-      }
+        $this->handleOptions($options);
+        $arguments = $this->commandManager->getArgumentValues();
+
+        $this->currentTask = $this->getTaskToExecute($arguments['task']);
+
+        $ret = $this->currentTask->runFromCLI($this->commandManager, $this->commandOptions);
+
+        $this->currentTask = null;
+
+        return $ret;
     }
-    else
+
+    /**
+     * Gets the name of the application.
+     *
+     * @return string The application name
+     */
+    public function getName()
     {
-      $namespace = '';
+        return $this->name;
     }
 
-    // name
-    $tasks = array();
-    foreach ($this->tasks as $taskName => $task)
+    /**
+     * Sets the application name.
+     *
+     * @param string $name The application name
+     */
+    public function setName($name)
     {
-      if ($taskName == $task->getFullName() && $task->getNamespace() == $namespace)
-      {
-        $tasks[] = $task->getName();
-      }
+        $this->name = $name;
     }
 
-    $abbrev = $this->getAbbreviations($tasks);
-    if (isset($abbrev[$name]) && count($abbrev[$name]) == 1)
+    /**
+     * Gets the application version.
+     *
+     * @return string The application version
+     */
+    public function getVersion()
     {
-      return $this->getTask($namespace ? $namespace.':'.$abbrev[$name][0] : $abbrev[$name][0]);
+        return $this->version;
     }
 
-    // aliases
-    $aliases = array();
-    foreach ($this->tasks as $taskName => $task)
+    /**
+     * Sets the application version.
+     *
+     * @param string $version The application version
+     */
+    public function setVersion($version)
     {
-      if ($taskName == $task->getFullName())
-      {
-        foreach ($task->getAliases() as $alias)
-        {
-          $aliases[] = $alias;
-        }
-      }
+        $this->version = $version;
     }
 
-    $abbrev = $this->getAbbreviations($aliases);
-    $fullName = $namespace ? $namespace.':'.$name : $name;
-    if (!isset($abbrev[$fullName]))
+    /**
+     * Returns the long version of the application.
+     *
+     * @return string The long application version
+     */
+    public function getLongVersion()
     {
-      throw new sfCommandException(sprintf('Task "%s" is not defined.', $fullName));
+        return sprintf('%s version %s', $this->getName(), $this->formatter->format($this->getVersion(), 'INFO'))."\n";
     }
-    else if (count($abbrev[$fullName]) > 1)
+
+    /**
+     * Returns whether the application must be verbose.
+     *
+     * @return bool true if the application must be verbose, false otherwise
+     */
+    public function isVerbose()
     {
-      throw new sfCommandException(sprintf('Task "%s" is ambiguous (%s).', $fullName, implode(', ', $abbrev[$fullName])));
+        return $this->verbose;
     }
-    else
+
+    /**
+     * Returns whether the application must activate the trace.
+     *
+     * @return bool true if the application must activate the trace, false otherwise
+     */
+    public function withTrace()
     {
-      return $this->getTask($abbrev[$fullName][0]);
+        return $this->trace;
     }
-  }
 
-  protected function strlen($string)
-  {
-    if (!function_exists('mb_strlen')) {
-        return strlen($string);
+    /**
+     * Returns whether the application must be verbose.
+     *
+     * @return bool true if the application is in debug mode, false otherwise
+     */
+    public function isDebug()
+    {
+        return $this->debug;
     }
 
-    if (false === $encoding = mb_detect_encoding($string)) {
-        return strlen($string);
+    /**
+     * Outputs a help message for the current application.
+     */
+    public function help()
+    {
+        $messages = array(
+            $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(
+                '  %-24s %s  %s',
+                $this->formatter->format('--'.$option->getName(), 'INFO'),
+                $option->getShortcut() ? $this->formatter->format('-'.$option->getShortcut(), 'INFO') : '  ',
+                $option->getHelp()
+            );
+        }
+
+        $this->dispatcher->notify(new sfEvent($this, 'command.log', $messages));
     }
 
-    return mb_strlen($string, $encoding);
-  }
-
-  /**
-   * Fixes php behavior if using cgi php.
-   *
-   * @see http://www.sitepoint.com/article/php-command-line-1/3
-   */
-  protected function fixCgi()
-  {
-    // handle output buffering
-    if (ob_get_level() > 0)
+    /**
+     * Renders an exception.
+     *
+     * @param Exception $e An exception object
+     */
+    public function renderException($e)
     {
-      @ob_end_flush();
-    }
+        $title = sprintf('  [%s]  ', get_class($e));
+        $len = $this->strlen($title);
+        $lines = array();
+        foreach (explode("\n", $e->getMessage()) as $line) {
+            $lines[] = sprintf('  %s  ', $line);
+            $len = max($this->strlen($line) + 4, $len);
+        }
+
+        $messages = array(str_repeat(' ', $len));
 
-    ob_implicit_flush(true);
+        if ($this->trace) {
+            $messages[] = $title.str_repeat(' ', $len - $this->strlen($title));
+        }
 
-    // PHP ini settings
-    set_time_limit(0);
-    ini_set('track_errors', true);
-    ini_set('html_errors', false);
-    ini_set('magic_quotes_runtime', false);
+        foreach ($lines as $line) {
+            $messages[] = $line.str_repeat(' ', $len - $this->strlen($line));
+        }
 
-    if (false === strpos(PHP_SAPI, 'cgi'))
-    {
-      return;
-    }
+        $messages[] = str_repeat(' ', $len);
 
-    // define stream constants
-    define('STDIN',  fopen('php://stdin',  'r'));
-    define('STDOUT', fopen('php://stdout', 'w'));
-    define('STDERR', fopen('php://stderr', 'w'));
+        fwrite(STDERR, "\n");
+        foreach ($messages as $message) {
+            fwrite(STDERR, $this->formatter->format($message, 'ERROR', STDERR)."\n");
+        }
+        fwrite(STDERR, "\n");
 
-    // change directory
-    if (isset($_SERVER['PWD']))
-    {
-      chdir($_SERVER['PWD']);
+        if (null !== $this->currentTask && $e instanceof sfCommandArgumentsException) {
+            fwrite(STDERR, $this->formatter->format(sprintf($this->currentTask->getSynopsis(), $this->getName()), 'INFO', STDERR)."\n");
+            fwrite(STDERR, "\n");
+        }
+
+        if ($this->trace) {
+            fwrite(STDERR, $this->formatter->format("Exception trace:\n", 'COMMENT'));
+
+            // exception related properties
+            $trace = $e->getTrace();
+            array_unshift($trace, array(
+                'function' => '',
+                'file' => null != $e->getFile() ? $e->getFile() : 'n/a',
+                'line' => null != $e->getLine() ? $e->getLine() : 'n/a',
+                'args' => array(),
+            ));
+
+            for ($i = 0, $count = count($trace); $i < $count; ++$i) {
+                $class = isset($trace[$i]['class']) ? $trace[$i]['class'] : '';
+                $type = isset($trace[$i]['type']) ? $trace[$i]['type'] : '';
+                $function = $trace[$i]['function'];
+                $file = isset($trace[$i]['file']) ? $trace[$i]['file'] : 'n/a';
+                $line = isset($trace[$i]['line']) ? $trace[$i]['line'] : 'n/a';
+
+                fwrite(STDERR, sprintf(" %s%s%s at %s:%s\n", $class, $type, $function, $this->formatter->format($file, 'INFO', STDERR), $this->formatter->format($line, 'INFO', STDERR)));
+            }
+
+            fwrite(STDERR, "\n");
+        }
+
+        $this->dispatcher->notify(new sfEvent($e, 'application.throw_exception'));
+    }
+
+    /**
+     * Gets a task from a task name or a shortcut.
+     *
+     * @param string $name The task name or a task shortcut
+     *
+     * @return sfTask A sfTask object
+     *
+     * @throws sfCommandException
+     */
+    public function getTaskToExecute($name)
+    {
+        // namespace
+        if (false !== $pos = strpos($name, ':')) {
+            $namespace = substr($name, 0, $pos);
+            $name = substr($name, $pos + 1);
+
+            $namespaces = array();
+            foreach ($this->tasks as $task) {
+                if ($task->getNamespace() && !in_array($task->getNamespace(), $namespaces)) {
+                    $namespaces[] = $task->getNamespace();
+                }
+            }
+            $abbrev = $this->getAbbreviations($namespaces);
+
+            if (!isset($abbrev[$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])));
+            }
+
+            $namespace = $abbrev[$namespace][0];
+        } else {
+            $namespace = '';
+        }
+
+        // name
+        $tasks = array();
+        foreach ($this->tasks as $taskName => $task) {
+            if ($taskName == $task->getFullName() && $task->getNamespace() == $namespace) {
+                $tasks[] = $task->getName();
+            }
+        }
+
+        $abbrev = $this->getAbbreviations($tasks);
+        if (isset($abbrev[$name]) && 1 == count($abbrev[$name])) {
+            return $this->getTask($namespace ? $namespace.':'.$abbrev[$name][0] : $abbrev[$name][0]);
+        }
+
+        // aliases
+        $aliases = array();
+        foreach ($this->tasks as $taskName => $task) {
+            if ($taskName == $task->getFullName()) {
+                foreach ($task->getAliases() as $alias) {
+                    $aliases[] = $alias;
+                }
+            }
+        }
+
+        $abbrev = $this->getAbbreviations($aliases);
+        $fullName = $namespace ? $namespace.':'.$name : $name;
+        if (!isset($abbrev[$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])));
+        }
+
+        return $this->getTask($abbrev[$fullName][0]);
     }
 
-    // close the streams on script termination
-    register_shutdown_function(function() {
-        fclose(STDIN);
-        fclose(STDOUT);
-        fclose(STDERR);
-        return true;
-    });
-  }
-
-  /**
-   * Returns an array of possible abbreviations given a set of names.
-   *
-   * @see Text::Abbrev perl module for the algorithm
-   *
-   * @param string[] $names
-   *
-   * @return string[]
-   */
-  protected function getAbbreviations($names)
-  {
-    $abbrevs = array();
-    $table   = array();
-
-    foreach ($names as $name)
+    /**
+     * Parses and handles command line options.
+     *
+     * @param mixed $options The command line options
+     */
+    protected function handleOptions($options = null)
     {
-      for ($len = strlen($name) - 1; $len > 0; --$len)
-      {
-        $abbrev = substr($name, 0, $len);
-        if (!array_key_exists($abbrev, $table))
-        {
-          $table[$abbrev] = 1;
-        }
-        else
-        {
-          ++$table[$abbrev];
-        }
-
-        $seen = $table[$abbrev];
-        if ($seen == 1)
-        {
-          // We're the first word so far to have this abbreviation.
-          $abbrevs[$abbrev] = array($name);
-        }
-        else if ($seen == 2)
-        {
-          // We're the second word to have this abbreviation, so we can't use it.
-          // unset($abbrevs[$abbrev]);
-          $abbrevs[$abbrev][] = $name;
-        }
-        else
-        {
-          // We're the third word to have this abbreviation, so skip to the next word.
-          continue;
-        }
-      }
+        $this->commandManager->process($options);
+        $this->commandOptions = $options;
+
+        // the order of option processing matters
+
+        if ($this->commandManager->getOptionSet()->hasOption('color') && false !== $this->commandManager->getOptionValue('color')) {
+            $this->setFormatter(new sfAnsiColorFormatter());
+        }
+
+        if ($this->commandManager->getOptionSet()->hasOption('quiet') && false !== $this->commandManager->getOptionValue('quiet')) {
+            $this->verbose = false;
+        }
+
+        if ($this->commandManager->getOptionSet()->hasOption('no-debug') && false !== $this->commandManager->getOptionValue('no-debug')) {
+            $this->debug = false;
+        }
+
+        if ($this->commandManager->getOptionSet()->hasOption('trace') && false !== $this->commandManager->getOptionValue('trace')) {
+            $this->verbose = true;
+            $this->trace = true;
+        }
+
+        if ($this->commandManager->getOptionSet()->hasOption('help') && false !== $this->commandManager->getOptionValue('help')) {
+            $this->help();
+
+            exit(0);
+        }
+
+        if ($this->commandManager->getOptionSet()->hasOption('version') && false !== $this->commandManager->getOptionValue('version')) {
+            echo $this->getLongVersion();
+
+            exit(0);
+        }
     }
 
-    // Non-abbreviations always get entered, even if they aren't unique
-    foreach ($names as $name)
+    protected function strlen($string)
     {
-      $abbrevs[$name] = array($name);
+        if (!function_exists('mb_strlen')) {
+            return strlen($string);
+        }
+
+        if (false === $encoding = mb_detect_encoding($string)) {
+            return strlen($string);
+        }
+
+        return mb_strlen($string, $encoding);
     }
 
-    return $abbrevs;
-  }
-
-  /**
-   * Returns true if the stream supports colorization.
-   *
-   * Colorization is disabled if not supported by the stream:
-   *
-   *  -  windows without ansicon
-   *  -  non tty consoles
-   *
-   * @param  mixed  $stream  A stream
-   *
-   * @return Boolean true if the stream supports colorization, false otherwise
-   */
-  protected function isStreamSupportsColors($stream)
-  {
-    if (DIRECTORY_SEPARATOR == '\\')
+    /**
+     * Fixes php behavior if using cgi php.
+     *
+     * @see http://www.sitepoint.com/article/php-command-line-1/3
+     */
+    protected function fixCgi()
     {
-      return false !== getenv('ANSICON');
+        // handle output buffering
+        if (ob_get_level() > 0) {
+            @ob_end_flush();
+        }
+
+        ob_implicit_flush(true);
+
+        // PHP ini settings
+        set_time_limit(0);
+        ini_set('track_errors', true);
+        ini_set('html_errors', false);
+        ini_set('magic_quotes_runtime', false);
+
+        if (false === strpos(PHP_SAPI, 'cgi')) {
+            return;
+        }
+
+        // define stream constants
+        define('STDIN', fopen('php://stdin', 'r'));
+        define('STDOUT', fopen('php://stdout', 'w'));
+        define('STDERR', fopen('php://stderr', 'w'));
+
+        // change directory
+        if (isset($_SERVER['PWD'])) {
+            chdir($_SERVER['PWD']);
+        }
+
+        // close the streams on script termination
+        register_shutdown_function(function () {
+            fclose(STDIN);
+            fclose(STDOUT);
+            fclose(STDERR);
+
+            return true;
+        });
+    }
+
+    /**
+     * Returns an array of possible abbreviations given a set of names.
+     *
+     * @see Text::Abbrev perl module for the algorithm
+     *
+     * @param string[] $names
+     *
+     * @return string[]
+     */
+    protected function getAbbreviations($names)
+    {
+        $abbrevs = array();
+        $table = array();
+
+        foreach ($names as $name) {
+            for ($len = strlen($name) - 1; $len > 0; --$len) {
+                $abbrev = substr($name, 0, $len);
+                if (!array_key_exists($abbrev, $table)) {
+                    $table[$abbrev] = 1;
+                } else {
+                    ++$table[$abbrev];
+                }
+
+                $seen = $table[$abbrev];
+                if (1 == $seen) {
+                    // We're the first word so far to have this abbreviation.
+                    $abbrevs[$abbrev] = array($name);
+                } elseif (2 == $seen) {
+                    // We're the second word to have this abbreviation, so we can't use it.
+                    // unset($abbrevs[$abbrev]);
+                    $abbrevs[$abbrev][] = $name;
+                } else {
+                    // We're the third word to have this abbreviation, so skip to the next word.
+                    continue;
+                }
+            }
+        }
+
+        // Non-abbreviations always get entered, even if they aren't unique
+        foreach ($names as $name) {
+            $abbrevs[$name] = array($name);
+        }
+
+        return $abbrevs;
+    }
+
+    /**
+     * Returns true if the stream supports colorization.
+     *
+     * Colorization is disabled if not supported by the stream:
+     *
+     *  -  windows without ansicon
+     *  -  non tty consoles
+     *
+     * @param mixed $stream A stream
+     *
+     * @return bool true if the stream supports colorization, false otherwise
+     */
+    protected function isStreamSupportsColors($stream)
+    {
+        if (DIRECTORY_SEPARATOR == '\\') {
+            return false !== getenv('ANSICON');
+        }
+
+        return function_exists('posix_isatty') && @posix_isatty($stream);
     }
-    else
+
+    /**
+     * Guesses the best formatter for the stream.
+     *
+     * @param mixed $stream A stream
+     *
+     * @return sfFormatter A formatter instance
+     */
+    protected function guessBestFormatter($stream)
     {
-      return function_exists('posix_isatty') && @posix_isatty($stream);
+        return $this->isStreamSupportsColors($stream) ? new sfAnsiColorFormatter() : new sfFormatter();
     }
-  }
-
-  /**
-   * Guesses the best formatter for the stream.
-   *
-   * @param  mixed       $stream  A stream
-   *
-   * @return sfFormatter A formatter instance
-   */
-  protected function guessBestFormatter($stream)
-  {
-    return $this->isStreamSupportsColors($stream) ? new sfAnsiColorFormatter() : new sfFormatter();
-  }
 }
diff --git a/lib/command/sfCommandArgument.class.php b/lib/command/sfCommandArgument.class.php
index db9a9b7bd..380590e80 100644
--- a/lib/command/sfCommandArgument.class.php
+++ b/lib/command/sfCommandArgument.class.php
@@ -11,128 +11,118 @@
 /**
  * Represents a command line argument.
  *
- * @package    symfony
- * @subpackage command
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfCommandArgument
 {
-  const REQUIRED = 1;
-  const OPTIONAL = 2;
+    public const REQUIRED = 1;
+    public const OPTIONAL = 2;
 
-  const IS_ARRAY = 4;
+    public const IS_ARRAY = 4;
 
-  protected
-    $name    = null,
-    $mode    = null,
-    $default = null,
-    $help    = '';
+    protected $name;
+    protected $mode;
+    protected $default;
+    protected $help = '';
 
-  /**
-   * Constructor.
-   *
-   * @param string  $name    The argument name
-   * @param integer $mode    The argument mode: self::REQUIRED or self::OPTIONAL
-   * @param string  $help    A help text
-   * @param mixed   $default The default value (for self::OPTIONAL mode only)
-   *
-   * @throws sfCommandException
-   */
-  public function __construct($name, $mode = null, $help = '', $default = null)
-  {
-    if (null === $mode)
+    /**
+     * Constructor.
+     *
+     * @param string $name    The argument name
+     * @param int    $mode    The argument mode: self::REQUIRED or self::OPTIONAL
+     * @param string $help    A help text
+     * @param mixed  $default The default value (for self::OPTIONAL mode only)
+     *
+     * @throws sfCommandException
+     */
+    public function __construct($name, $mode = null, $help = '', $default = null)
     {
-      $mode = self::OPTIONAL;
+        if (null === $mode) {
+            $mode = self::OPTIONAL;
+        } elseif (is_string($mode) || $mode > 7) {
+            throw new sfCommandException(sprintf('Argument mode "%s" is not valid.', $mode));
+        }
+
+        $this->name = $name;
+        $this->mode = $mode;
+        $this->help = $help;
+
+        $this->setDefault($default);
     }
-    else if (is_string($mode) || $mode > 7)
+
+    /**
+     * Returns the argument name.
+     *
+     * @return string The argument name
+     */
+    public function getName()
     {
-      throw new sfCommandException(sprintf('Argument mode "%s" is not valid.', $mode));
+        return $this->name;
     }
 
-    $this->name = $name;
-    $this->mode = $mode;
-    $this->help = $help;
+    /**
+     * Returns true if the argument is required.
+     *
+     * @return bool true if parameter mode is self::REQUIRED, false otherwise
+     */
+    public function isRequired()
+    {
+        return self::REQUIRED === (self::REQUIRED & $this->mode);
+    }
 
-    $this->setDefault($default);
-  }
+    /**
+     * Returns true if the argument can take multiple values.
+     *
+     * @return bool true if mode is self::IS_ARRAY, false otherwise
+     */
+    public function isArray()
+    {
+        return self::IS_ARRAY === (self::IS_ARRAY & $this->mode);
+    }
 
-  /**
-   * Returns the argument name.
-   *
-   * @return string The argument name
-   */
-  public function getName()
-  {
-    return $this->name;
-  }
+    /**
+     * Sets the default value.
+     *
+     * @param mixed $default The default value
+     *
+     * @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.');
+        }
 
-  /**
-   * Returns true if the argument is required.
-   *
-   * @return Boolean true if parameter mode is self::REQUIRED, false otherwise
-   */
-  public function isRequired()
-  {
-    return self::REQUIRED === (self::REQUIRED & $this->mode);
-  }
+        if ($this->isArray()) {
+            if (null === $default) {
+                $default = array();
+            } elseif (!is_array($default)) {
+                throw new sfCommandException('A default value for an array argument must be an array.');
+            }
+        }
 
-  /**
-   * Returns true if the argument can take multiple values.
-   *
-   * @return Boolean true if mode is self::IS_ARRAY, false otherwise
-   */
-  public function isArray()
-  {
-    return self::IS_ARRAY === (self::IS_ARRAY & $this->mode);
-  }
+        $this->default = $default;
+    }
 
-  /**
-   * Sets the default value.
-   *
-   * @param mixed $default The default value
-   *
-   * @throws sfCommandException
-   */
-  public function setDefault($default = null)
-  {
-    if (self::REQUIRED === $this->mode && null !== $default)
+    /**
+     * Returns the default value.
+     *
+     * @return mixed The default value
+     */
+    public function getDefault()
     {
-      throw new sfCommandException('Cannot set a default value except for sfCommandParameter::OPTIONAL mode.');
+        return $this->default;
     }
 
-    if ($this->isArray())
+    /**
+     * Returns the help text.
+     *
+     * @return string The help text
+     */
+    public function getHelp()
     {
-      if (null === $default)
-      {
-        $default = array();
-      }
-      else if (!is_array($default))
-      {
-        throw new sfCommandException('A default value for an array argument must be an array.');
-      }
+        return $this->help;
     }
-
-    $this->default = $default;
-  }
-
-  /**
-   * Returns the default value.
-   *
-   * @return mixed The default value
-   */
-  public function getDefault()
-  {
-    return $this->default;
-  }
-
-  /**
-   * Returns the help text.
-   *
-   * @return string The help text
-   */
-  public function getHelp()
-  {
-    return $this->help;
-  }
 }
diff --git a/lib/command/sfCommandArgumentSet.class.php b/lib/command/sfCommandArgumentSet.class.php
index d9a999c79..b641a8603 100644
--- a/lib/command/sfCommandArgumentSet.class.php
+++ b/lib/command/sfCommandArgumentSet.class.php
@@ -11,173 +11,160 @@
 /**
  * Represent a set of command line arguments.
  *
- * @package    symfony
- * @subpackage command
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfCommandArgumentSet
 {
-  protected
-    $arguments          = array(),
-    $requiredCount      = 0,
-    $hasAnArrayArgument = false,
-    $hasOptional        = false;
-
-  /**
-   * Constructor.
-   *
-   * @param array $arguments An array of sfCommandArgument objects
-   */
-  public function __construct($arguments = array())
-  {
-    $this->setArguments($arguments);
-  }
-
-  /**
-   * Sets the sfCommandArgument objects.
-   *
-   * @param array $arguments An array of sfCommandArgument objects
-   */
-  public function setArguments($arguments = array())
-  {
-    $this->arguments     = array();
-    $this->requiredCount = 0;
-    $this->hasOptional   = false;
-    $this->addArguments($arguments);
-  }
-
-  /**
-   * Add an array of sfCommandArgument objects.
-   *
-   * @param array $arguments An array of sfCommandArgument objects
-   */
-  public function addArguments($arguments = array())
-  {
-    if (null !== $arguments)
+    protected $arguments = array();
+    protected $requiredCount = 0;
+    protected $hasAnArrayArgument = false;
+    protected $hasOptional = false;
+
+    /**
+     * Constructor.
+     *
+     * @param array $arguments An array of sfCommandArgument objects
+     */
+    public function __construct($arguments = array())
     {
-      foreach ($arguments as $argument)
-      {
-        $this->addArgument($argument);
-      }
+        $this->setArguments($arguments);
     }
-  }
-
-  /**
-   * Add a sfCommandArgument objects.
-   *
-   * @param sfCommandArgument $argument A sfCommandArgument object
-   *
-   * @throws sfCommandException
-   */
-  public function addArgument(sfCommandArgument $argument)
-  {
-    if (isset($this->arguments[$argument->getName()]))
+
+    /**
+     * Sets the sfCommandArgument objects.
+     *
+     * @param array $arguments An array of sfCommandArgument objects
+     */
+    public function setArguments($arguments = array())
     {
-      throw new sfCommandException(sprintf('An argument with name "%s" already exist.', $argument->getName()));
+        $this->arguments = array();
+        $this->requiredCount = 0;
+        $this->hasOptional = false;
+        $this->addArguments($arguments);
     }
 
-    if ($this->hasAnArrayArgument)
+    /**
+     * Add an array of sfCommandArgument objects.
+     *
+     * @param array $arguments An array of sfCommandArgument objects
+     */
+    public function addArguments($arguments = array())
     {
-      throw new sfCommandException('Cannot add an argument after an array argument.');
+        if (null !== $arguments) {
+            foreach ($arguments as $argument) {
+                $this->addArgument($argument);
+            }
+        }
     }
 
-    if ($argument->isRequired() && $this->hasOptional)
+    /**
+     * Add a sfCommandArgument objects.
+     *
+     * @param sfCommandArgument $argument A sfCommandArgument object
+     *
+     * @throws sfCommandException
+     */
+    public function addArgument(sfCommandArgument $argument)
     {
-      throw new sfCommandException('Cannot add a required argument after an optional one.');
+        if (isset($this->arguments[$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.');
+        }
+
+        if ($argument->isRequired() && $this->hasOptional) {
+            throw new sfCommandException('Cannot add a required argument after an optional one.');
+        }
+
+        if ($argument->isArray()) {
+            $this->hasAnArrayArgument = true;
+        }
+
+        if ($argument->isRequired()) {
+            ++$this->requiredCount;
+        } else {
+            $this->hasOptional = true;
+        }
+
+        $this->arguments[$argument->getName()] = $argument;
     }
 
-    if ($argument->isArray())
+    /**
+     * Returns an argument by name.
+     *
+     * @param string $name The argument name
+     *
+     * @return sfCommandArgument A sfCommandArgument object
+     *
+     * @throws sfCommandException
+     */
+    public function getArgument($name)
     {
-      $this->hasAnArrayArgument = true;
+        if (!$this->hasArgument($name)) {
+            throw new sfCommandException(sprintf('The "%s" argument does not exist.', $name));
+        }
+
+        return $this->arguments[$name];
     }
 
-    if ($argument->isRequired())
+    /**
+     * Returns true if an argument object exists by name.
+     *
+     * @param string $name The argument name
+     *
+     * @return bool true if the argument object exists, false otherwise
+     */
+    public function hasArgument($name)
     {
-      ++$this->requiredCount;
+        return isset($this->arguments[$name]);
     }
-    else
+
+    /**
+     * Gets the array of sfCommandArgument objects.
+     *
+     * @return sfCommandArgument[] An array of sfCommandArgument objects
+     */
+    public function getArguments()
     {
-      $this->hasOptional = true;
+        return $this->arguments;
     }
 
-    $this->arguments[$argument->getName()] = $argument;
-  }
-
-  /**
-   * Returns an argument by name.
-   *
-   * @param string $name The argument name
-   *
-   * @return sfCommandArgument A sfCommandArgument object
-   *
-   * @throws sfCommandException
-   */
-  public function getArgument($name)
-  {
-    if (!$this->hasArgument($name))
+    /**
+     * Returns the number of arguments.
+     *
+     * @return int The number of arguments
+     */
+    public function getArgumentCount()
     {
-      throw new sfCommandException(sprintf('The "%s" argument does not exist.', $name));
+        return $this->hasAnArrayArgument ? PHP_INT_MAX : count($this->arguments);
     }
 
-    return $this->arguments[$name];
-  }
-
-  /**
-   * Returns true if an argument object exists by name.
-   *
-   * @param string $name The argument name
-   *
-   * @return Boolean true if the argument object exists, false otherwise
-   */
-  public function hasArgument($name)
-  {
-    return isset($this->arguments[$name]);
-  }
-
-  /**
-   * Gets the array of sfCommandArgument objects.
-   *
-   * @return sfCommandArgument[] An array of sfCommandArgument objects
-   */
-  public function getArguments()
-  {
-    return $this->arguments;
-  }
-
-  /**
-   * Returns the number of arguments.
-   *
-   * @return integer The number of arguments
-   */
-  public function getArgumentCount()
-  {
-    return $this->hasAnArrayArgument ? PHP_INT_MAX : count($this->arguments);
-  }
-
-  /**
-   * Returns the number of required arguments.
-   *
-   * @return integer The number of required arguments
-   */
-  public function getArgumentRequiredCount()
-  {
-    return $this->requiredCount;
-  }
-
-  /**
-   * Gets the default values.
-   *
-   * @return array An array of default values
-   */
-  public function getDefaults()
-  {
-    $values = array();
-    foreach ($this->arguments as $argument)
+    /**
+     * Returns the number of required arguments.
+     *
+     * @return int The number of required arguments
+     */
+    public function getArgumentRequiredCount()
     {
-      $values[$argument->getName()] = $argument->getDefault();
+        return $this->requiredCount;
     }
 
-    return $values;
-  }
+    /**
+     * Gets the default values.
+     *
+     * @return array An array of default values
+     */
+    public function getDefaults()
+    {
+        $values = array();
+        foreach ($this->arguments as $argument) {
+            $values[$argument->getName()] = $argument->getDefault();
+        }
+
+        return $values;
+    }
 }
diff --git a/lib/command/sfCommandArgumentsException.class.php b/lib/command/sfCommandArgumentsException.class.php
index 9b23616d6..0dff151aa 100644
--- a/lib/command/sfCommandArgumentsException.class.php
+++ b/lib/command/sfCommandArgumentsException.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -11,9 +11,8 @@
 /**
  * sfCommandException is thrown when an error occurs in a task.
  *
- * @package    symfony
- * @subpackage exception
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfCommandArgumentsException extends sfCommandException
diff --git a/lib/command/sfCommandException.class.php b/lib/command/sfCommandException.class.php
index 58d9b312b..5b7627482 100644
--- a/lib/command/sfCommandException.class.php
+++ b/lib/command/sfCommandException.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -11,9 +11,8 @@
 /**
  * sfCommandException is thrown when an error occurs in a task.
  *
- * @package    symfony
- * @subpackage exception
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfCommandException extends sfException
diff --git a/lib/command/sfCommandLogger.class.php b/lib/command/sfCommandLogger.class.php
index 3448f2dd6..b81347180 100644
--- a/lib/command/sfCommandLogger.class.php
+++ b/lib/command/sfCommandLogger.class.php
@@ -3,59 +3,54 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 /**
- *
- * @package    symfony
- * @subpackage log
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfCommandLogger extends sfConsoleLogger
 {
-  /**
-   * Initializes this logger.
-   *
-   * @param sfEventDispatcher $dispatcher A sfEventDispatcher instance
-   * @param array             $options    An array of options.
-   */
-  public function initialize(sfEventDispatcher $dispatcher, $options = array())
-  {
-    $dispatcher->connect('command.log', array($this, 'listenToLogEvent'));
-
-    return parent::initialize($dispatcher, $options);
-  }
-
-  /**
-   * Listens to command.log events.
-   *
-   * @param sfEvent $event An sfEvent instance
-   */
-  public function listenToLogEvent(sfEvent $event)
-  {
-    $priority = isset($event['priority']) ? $event['priority'] : self::INFO;
-
-    $prefix = '';
-    if ('application.log' == $event->getName())
+    /**
+     * Initializes this logger.
+     *
+     * @param sfEventDispatcher $dispatcher A sfEventDispatcher instance
+     * @param array             $options    an array of options
+     */
+    public function initialize(sfEventDispatcher $dispatcher, $options = array())
     {
-      $subject  = $event->getSubject();
-      $subject  = is_object($subject) ? get_class($subject) : (is_string($subject) ? $subject : 'main');
+        $dispatcher->connect('command.log', array($this, 'listenToLogEvent'));
 
-      $prefix = '>> '.$subject.' ';
+        return parent::initialize($dispatcher, $options);
     }
 
-    foreach ($event->getParameters() as $key => $message)
+    /**
+     * Listens to command.log events.
+     *
+     * @param sfEvent $event An sfEvent instance
+     */
+    public function listenToLogEvent(sfEvent $event)
     {
-      if ('priority' === $key)
-      {
-        continue;
-      }
+        $priority = isset($event['priority']) ? $event['priority'] : self::INFO;
+
+        $prefix = '';
+        if ('application.log' == $event->getName()) {
+            $subject = $event->getSubject();
+            $subject = is_object($subject) ? get_class($subject) : (is_string($subject) ? $subject : 'main');
+
+            $prefix = '>> '.$subject.' ';
+        }
+
+        foreach ($event->getParameters() as $key => $message) {
+            if ('priority' === $key) {
+                continue;
+            }
 
-      $this->log(sprintf('%s%s', $prefix, $message), $priority);
+            $this->log(sprintf('%s%s', $prefix, $message), $priority);
+        }
     }
-  }
 }
diff --git a/lib/command/sfCommandManager.class.php b/lib/command/sfCommandManager.class.php
index 4858664f0..7d148ada3 100644
--- a/lib/command/sfCommandManager.class.php
+++ b/lib/command/sfCommandManager.class.php
@@ -11,383 +11,346 @@
 /**
  * Class to manage command line arguments and options.
  *
- * @package    symfony
- * @subpackage command
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfCommandManager
 {
-  /** @var array */
-  protected $arguments = '';
-  /** @var string[] */
-  protected $errors = array();
-  /** @var sfCommandOptionSet */
-  protected $optionSet = null;
-  /** @var sfCommandArgumentSet */
-  protected $argumentSet = array();
-  /** @var array */
-  protected $optionValues = array();
-  /** @var array */
-  protected $argumentValues = array();
-  /** @var array */
-  protected $parsedArgumentValues = array();
-
-  /**
-   * Constructor.
-   *
-   * @param sfCommandArgumentSet $argumentSet A sfCommandArgumentSet object
-   * @param sfCommandOptionSet   $optionSet   A setOptionSet object
-   */
-  public function __construct(sfCommandArgumentSet $argumentSet = null, sfCommandOptionSet $optionSet = null)
-  {
-    if (null === $argumentSet)
+    /** @var array */
+    protected $arguments = '';
+
+    /** @var string[] */
+    protected $errors = array();
+
+    /** @var sfCommandOptionSet */
+    protected $optionSet;
+
+    /** @var sfCommandArgumentSet */
+    protected $argumentSet = array();
+
+    /** @var array */
+    protected $optionValues = array();
+
+    /** @var array */
+    protected $argumentValues = array();
+
+    /** @var array */
+    protected $parsedArgumentValues = array();
+
+    /**
+     * Constructor.
+     *
+     * @param sfCommandArgumentSet $argumentSet A sfCommandArgumentSet object
+     * @param sfCommandOptionSet   $optionSet   A setOptionSet object
+     */
+    public function __construct(sfCommandArgumentSet $argumentSet = null, sfCommandOptionSet $optionSet = null)
     {
-      $argumentSet = new sfCommandArgumentSet();
+        if (null === $argumentSet) {
+            $argumentSet = new sfCommandArgumentSet();
+        }
+        $this->setArgumentSet($argumentSet);
+
+        if (null === $optionSet) {
+            $optionSet = new sfCommandOptionSet();
+        }
+        $this->setOptionSet($optionSet);
     }
-    $this->setArgumentSet($argumentSet);
 
-    if (null === $optionSet)
+    /**
+     * Sets the argument set.
+     *
+     * @param sfCommandArgumentSet $argumentSet A sfCommandArgumentSet object
+     */
+    public function setArgumentSet(sfCommandArgumentSet $argumentSet)
     {
-      $optionSet = new sfCommandOptionSet();
+        $this->argumentSet = $argumentSet;
     }
-    $this->setOptionSet($optionSet);
-  }
-
-  /**
-   * Sets the argument set.
-   *
-   * @param sfCommandArgumentSet $argumentSet A sfCommandArgumentSet object
-   */
-  public function setArgumentSet(sfCommandArgumentSet $argumentSet)
-  {
-    $this->argumentSet = $argumentSet;
-  }
-
-  /**
-   * Gets the argument set.
-   *
-   * @return sfCommandArgumentSet A sfCommandArgumentSet object
-   */
-  public function getArgumentSet()
-  {
-    return $this->argumentSet;
-  }
-
-  /**
-   * Sets the option set.
-   *
-   * @param sfCommandOptionSet $optionSet A sfCommandOptionSet object
-   */
-  public function setOptionSet(sfCommandOptionSet $optionSet)
-  {
-    $this->optionSet = $optionSet;
-  }
-
-  /**
-   * Gets the option set.
-   *
-   * @return sfCommandOptionSet A sfCommandOptionSet object
-   */
-  public function getOptionSet()
-  {
-    return $this->optionSet;
-  }
-
-  /**
-   * Processes command line arguments.
-   *
-   * @param mixed $arguments A string or an array of command line parameters
-   */
-  public function process($arguments = null)
-  {
-    if (null === $arguments)
-    {
-      $arguments = $_SERVER['argv'];
 
-      // we strip command line program
-      if (isset($arguments[0]) && '-' != $arguments[0][0])
-      {
-        array_shift($arguments);
-      }
-    }
-    else if (!is_array($arguments))
+    /**
+     * Gets the argument set.
+     *
+     * @return sfCommandArgumentSet A sfCommandArgumentSet object
+     */
+    public function getArgumentSet()
     {
-      // hack to split arguments with spaces : --test="with some spaces"
-      $arguments = preg_replace_callback('/(\'|")(.+?)\\1/', function ($match) {
-        return str_replace(' ', '=PLACEHOLDER=', $match[2]);
-      }, $arguments);
-      $arguments = preg_split('/\s+/', $arguments);
-      $arguments = str_replace('=PLACEHOLDER=', ' ', $arguments);
+        return $this->argumentSet;
     }
 
-    $this->arguments            = $arguments;
-    $this->optionValues         = $this->optionSet->getDefaults();
-    $this->argumentValues       = $this->argumentSet->getDefaults();
-    $this->parsedArgumentValues = array();
-    $this->errors               = array();
+    /**
+     * Sets the option set.
+     *
+     * @param sfCommandOptionSet $optionSet A sfCommandOptionSet object
+     */
+    public function setOptionSet(sfCommandOptionSet $optionSet)
+    {
+        $this->optionSet = $optionSet;
+    }
 
-    while (!in_array($argument = array_shift($this->arguments), array('', null)))
+    /**
+     * Gets the option set.
+     *
+     * @return sfCommandOptionSet A sfCommandOptionSet object
+     */
+    public function getOptionSet()
     {
-      if ('--' == $argument)
-      {
-        // stop options parsing
-        $this->parsedArgumentValues = array_merge($this->parsedArgumentValues, $this->arguments);
-        break;
-      }
-
-      if ('--' == substr($argument, 0, 2))
-      {
-        $this->parseLongOption(substr($argument, 2));
-      }
-      else if ('-' == $argument[0])
-      {
-        $this->parseShortOption(substr($argument, 1));
-      }
-      else
-      {
-        $this->parsedArgumentValues[] = $argument;
-      }
+        return $this->optionSet;
     }
 
-    $position = 0;
-    foreach ($this->argumentSet->getArguments() as $argument)
+    /**
+     * Processes command line arguments.
+     *
+     * @param mixed $arguments A string or an array of command line parameters
+     */
+    public function process($arguments = null)
     {
-      if (array_key_exists($position, $this->parsedArgumentValues))
-      {
-        if ($argument->isArray())
-        {
-          $this->argumentValues[$argument->getName()] = array_slice($this->parsedArgumentValues, $position);
-          break;
+        if (null === $arguments) {
+            $arguments = $_SERVER['argv'];
+
+            // we strip command line program
+            if (isset($arguments[0]) && '-' != $arguments[0][0]) {
+                array_shift($arguments);
+            }
+        } elseif (!is_array($arguments)) {
+            // hack to split arguments with spaces : --test="with some spaces"
+            $arguments = preg_replace_callback('/(\'|")(.+?)\\1/', function ($match) {
+                return str_replace(' ', '=PLACEHOLDER=', $match[2]);
+            }, $arguments);
+            $arguments = preg_split('/\s+/', $arguments);
+            $arguments = str_replace('=PLACEHOLDER=', ' ', $arguments);
+        }
+
+        $this->arguments = $arguments;
+        $this->optionValues = $this->optionSet->getDefaults();
+        $this->argumentValues = $this->argumentSet->getDefaults();
+        $this->parsedArgumentValues = array();
+        $this->errors = array();
+
+        while (!in_array($argument = array_shift($this->arguments), array('', null))) {
+            if ('--' == $argument) {
+                // stop options parsing
+                $this->parsedArgumentValues = array_merge($this->parsedArgumentValues, $this->arguments);
+
+                break;
+            }
+
+            if ('--' == substr($argument, 0, 2)) {
+                $this->parseLongOption(substr($argument, 2));
+            } elseif ('-' == $argument[0]) {
+                $this->parseShortOption(substr($argument, 1));
+            } else {
+                $this->parsedArgumentValues[] = $argument;
+            }
         }
-        else
-        {
-          $this->argumentValues[$argument->getName()] = $this->parsedArgumentValues[$position];
+
+        $position = 0;
+        foreach ($this->argumentSet->getArguments() as $argument) {
+            if (array_key_exists($position, $this->parsedArgumentValues)) {
+                if ($argument->isArray()) {
+                    $this->argumentValues[$argument->getName()] = array_slice($this->parsedArgumentValues, $position);
+
+                    break;
+                }
+
+                $this->argumentValues[$argument->getName()] = $this->parsedArgumentValues[$position];
+            }
+            ++$position;
+        }
+
+        $this->arguments = $arguments;
+
+        if (count($this->parsedArgumentValues) < $this->argumentSet->getArgumentRequiredCount()) {
+            $this->errors[] = 'Not enough arguments.';
+        } elseif (count($this->parsedArgumentValues) > $this->argumentSet->getArgumentCount()) {
+            $this->errors[] = sprintf('Too many arguments ("%s" given).', implode(' ', $this->parsedArgumentValues));
         }
-      }
-      ++$position;
     }
 
-    $this->arguments = $arguments;
+    /**
+     * Returns true if the current command line options validate the argument and option sets.
+     *
+     * @return true if there are some validation errors, false otherwise
+     */
+    public function isValid()
+    {
+        return count($this->errors) ? false : true;
+    }
 
-    if (count($this->parsedArgumentValues) < $this->argumentSet->getArgumentRequiredCount())
+    /**
+     * Gets the current errors.
+     *
+     * @return array An array of errors
+     */
+    public function getErrors()
     {
-      $this->errors[] = 'Not enough arguments.';
+        return $this->errors;
     }
-    else if (count($this->parsedArgumentValues) > $this->argumentSet->getArgumentCount())
+
+    /**
+     * Returns the argument values.
+     *
+     * @return array An array of argument values
+     */
+    public function getArgumentValues()
     {
-      $this->errors[] = sprintf('Too many arguments ("%s" given).', implode(' ', $this->parsedArgumentValues));
+        return $this->argumentValues;
     }
-  }
-
-  /**
-   * Returns true if the current command line options validate the argument and option sets.
-   *
-   * @return true if there are some validation errors, false otherwise
-   */
-  public function isValid()
-  {
-    return count($this->errors) ? false : true;
-  }
-
-  /**
-   * Gets the current errors.
-   *
-   * @return array An array of errors
-   */
-  public function getErrors()
-  {
-    return $this->errors;
-  }
-
-  /**
-   * Returns the argument values.
-   *
-   * @return array An array of argument values
-   */
-  public function getArgumentValues()
-  {
-    return $this->argumentValues;
-  }
-
-  /**
-   * Returns the argument value for a given argument name.
-   *
-   * @param string $name The argument name
-   *
-   * @return mixed The argument value
-   *
-   * @throws sfCommandException
-   */
-  public function getArgumentValue($name)
-  {
-    if (!$this->argumentSet->hasArgument($name))
+
+    /**
+     * Returns the argument value for a given argument name.
+     *
+     * @param string $name The argument name
+     *
+     * @return mixed The argument value
+     *
+     * @throws sfCommandException
+     */
+    public function getArgumentValue($name)
     {
-      throw new sfCommandException(sprintf('The "%s" argument does not exist.', $name));
+        if (!$this->argumentSet->hasArgument($name)) {
+            throw new sfCommandException(sprintf('The "%s" argument does not exist.', $name));
+        }
+
+        return $this->argumentValues[$name];
     }
 
-    return $this->argumentValues[$name];
-  }
-
-  /**
-   * Returns the options values.
-   *
-   * @return array An array of option values
-   */
-  public function getOptionValues()
-  {
-    return $this->optionValues;
-  }
-
-  /**
-   * Returns the option value for a given option name.
-   *
-   * @param string $name The option name
-   *
-   * @return mixed The option value
-   *
-   * @throws sfCommandException
-   */
-  public function getOptionValue($name)
-  {
-    if (!$this->optionSet->hasOption($name))
+    /**
+     * Returns the options values.
+     *
+     * @return array An array of option values
+     */
+    public function getOptionValues()
     {
-      throw new sfCommandException(sprintf('The "%s" option does not exist.', $name));
+        return $this->optionValues;
     }
 
-    return $this->optionValues[$name];
-  }
-
-  /**
-   * Parses a short option.
-   *
-   * @param string $argument The option argument
-   */
-  protected function parseShortOption($argument)
-  {
-    // short option can be aggregated like in -vd (== -v -d)
-    for ($i = 0, $count = strlen($argument); $i < $count; $i++)
+    /**
+     * Returns the option value for a given option name.
+     *
+     * @param string $name The option name
+     *
+     * @return mixed The option value
+     *
+     * @throws sfCommandException
+     */
+    public function getOptionValue($name)
     {
-      $shortcut = $argument[$i];
-      $value    = true;
-
-      if (!$this->optionSet->hasShortcut($shortcut))
-      {
-        $this->errors[] = sprintf('The option "-%s" does not exist.', $shortcut);
-        continue;
-      }
-
-      $option = $this->optionSet->getOptionForShortcut($shortcut);
-
-      // required argument?
-      if ($option->isParameterRequired())
-      {
-        if ($i + 1 < strlen($argument))
-        {
-          $value = substr($argument, $i + 1);
-          $this->setOption($option, $value);
-          break;
+        if (!$this->optionSet->hasOption($name)) {
+            throw new sfCommandException(sprintf('The "%s" option does not exist.', $name));
         }
-        else
-        {
-          // take next element as argument (if it doesn't start with a -)
-          if (count($this->arguments) && $this->arguments[0][0] != '-')
-          {
-            $value = array_shift($this->arguments);
-            $this->setOption($option, $value);
-            break;
-          }
-          else
-          {
-            $this->errors[] = sprintf('Option "-%s" requires an argument', $shortcut);
-            $value = null;
-          }
-        }
-      }
-      else if ($option->isParameterOptional())
-      {
-        if (substr($argument, $i + 1) != '')
-        {
-          $value = substr($argument, $i + 1);
-        }
-        else
-        {
-          // take next element as argument (if it doesn't start with a -)
-          if (count($this->arguments) && $this->arguments[0][0] != '-')
-          {
-            $value = array_shift($this->arguments);
-          }
-          else
-          {
-            $value = $option->getDefault();
-          }
+
+        return $this->optionValues[$name];
+    }
+
+    public function setOption(sfCommandOption $option, $value)
+    {
+        if ($option->isArray()) {
+            $this->optionValues[$option->getName()][] = $value;
+        } else {
+            $this->optionValues[$option->getName()] = $value;
         }
+    }
 
-        $this->setOption($option, $value);
-        break;
-      }
+    /**
+     * Parses a short option.
+     *
+     * @param string $argument The option argument
+     */
+    protected function parseShortOption($argument)
+    {
+        // short option can be aggregated like in -vd (== -v -d)
+        for ($i = 0, $count = strlen($argument); $i < $count; ++$i) {
+            $shortcut = $argument[$i];
+            $value = true;
+
+            if (!$this->optionSet->hasShortcut($shortcut)) {
+                $this->errors[] = sprintf('The option "-%s" does not exist.', $shortcut);
+
+                continue;
+            }
+
+            $option = $this->optionSet->getOptionForShortcut($shortcut);
+
+            // required argument?
+            if ($option->isParameterRequired()) {
+                if ($i + 1 < strlen($argument)) {
+                    $value = substr($argument, $i + 1);
+                    $this->setOption($option, $value);
+
+                    break;
+                }
+
+                // take next element as argument (if it doesn't start with a -)
+                if (count($this->arguments) && '-' != $this->arguments[0][0]) {
+                    $value = array_shift($this->arguments);
+                    $this->setOption($option, $value);
+
+                    break;
+                }
+
+                $this->errors[] = sprintf('Option "-%s" requires an argument', $shortcut);
+                $value = null;
+            } elseif ($option->isParameterOptional()) {
+                if ('' != substr($argument, $i + 1)) {
+                    $value = substr($argument, $i + 1);
+                } else {
+                    // take next element as argument (if it doesn't start with a -)
+                    if (count($this->arguments) && '-' != $this->arguments[0][0]) {
+                        $value = array_shift($this->arguments);
+                    } else {
+                        $value = $option->getDefault();
+                    }
+                }
+
+                $this->setOption($option, $value);
+
+                break;
+            }
 
-      $this->setOption($option, $value);
+            $this->setOption($option, $value);
+        }
     }
-  }
-
-  /**
-   * Parses a long option.
-   *
-   * @param string $argument The option argument
-   */
-  protected function parseLongOption($argument)
-  {
-    if (false !== strpos($argument, '='))
+
+    /**
+     * Parses a long option.
+     *
+     * @param string $argument The option argument
+     */
+    protected function parseLongOption($argument)
     {
-      list($name, $value) = explode('=', $argument, 2);
+        if (false !== strpos($argument, '=')) {
+            list($name, $value) = explode('=', $argument, 2);
 
-      if (!$this->optionSet->hasOption($name))
-      {
-        $this->errors[] = sprintf('The "--%s" option does not exist.', $name);
-        return;
-      }
+            if (!$this->optionSet->hasOption($name)) {
+                $this->errors[] = sprintf('The "--%s" option does not exist.', $name);
 
-      $option = $this->optionSet->getOption($name);
+                return;
+            }
 
-      if (!$option->acceptParameter())
-      {
-        $this->errors[] = sprintf('Option "--%s" does not take an argument.', $name);
-        $value = true;
-      }
-    }
-    else
-    {
-      $name = $argument;
+            $option = $this->optionSet->getOption($name);
 
-      if (!$this->optionSet->hasOption($name))
-      {
-        $this->errors[] = sprintf('The "--%s" option does not exist.', $name);
-        return;
-      }
+            if (!$option->acceptParameter()) {
+                $this->errors[] = sprintf('Option "--%s" does not take an argument.', $name);
+                $value = true;
+            }
+        } else {
+            $name = $argument;
 
-      $option = $this->optionSet->getOption($name);
+            if (!$this->optionSet->hasOption($name)) {
+                $this->errors[] = sprintf('The "--%s" option does not exist.', $name);
 
-      if ($option->isParameterRequired())
-      {
-        $this->errors[] = sprintf('Option "--%s" requires an argument.', $name);
-      }
+                return;
+            }
 
-      $value = $option->acceptParameter() ? $option->getDefault() : true;
-    }
+            $option = $this->optionSet->getOption($name);
 
-    $this->setOption($option, $value);
-  }
+            if ($option->isParameterRequired()) {
+                $this->errors[] = sprintf('Option "--%s" requires an argument.', $name);
+            }
 
-  public function setOption(sfCommandOption $option, $value)
-  {
-    if ($option->isArray())
-    {
-      $this->optionValues[$option->getName()][] = $value;
-    }
-    else
-    {
-      $this->optionValues[$option->getName()] = $value;
+            $value = $option->acceptParameter() ? $option->getDefault() : true;
+        }
+
+        $this->setOption($option, $value);
     }
-  }
 }
diff --git a/lib/command/sfCommandOption.class.php b/lib/command/sfCommandOption.class.php
index 028cc6bcd..43e1f91d3 100644
--- a/lib/command/sfCommandOption.class.php
+++ b/lib/command/sfCommandOption.class.php
@@ -11,180 +11,166 @@
 /**
  * Represents a command line option.
  *
- * @package    symfony
- * @subpackage command
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfCommandOption
 {
-  const PARAMETER_NONE     = 1;
-  const PARAMETER_REQUIRED = 2;
-  const PARAMETER_OPTIONAL = 4;
-
-  const IS_ARRAY = 8;
-
-  protected
-    $name     = null,
-    $shortcut = null,
-    $mode     = null,
-    $default  = null,
-    $help     = '';
-
-  /**
-   * Constructor.
-   *
-   * @param string  $name     The option name
-   * @param string  $shortcut The shortcut (can be null)
-   * @param integer $mode     The option mode: self::PARAMETER_REQUIRED, self::PARAMETER_NONE or self::PARAMETER_OPTIONAL
-   * @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
-   */
-  public function __construct($name, $shortcut = null, $mode = null, $help = '', $default = null)
-  {
-    if ('--' == substr($name, 0, 2))
+    public const PARAMETER_NONE = 1;
+    public const PARAMETER_REQUIRED = 2;
+    public const PARAMETER_OPTIONAL = 4;
+
+    public const IS_ARRAY = 8;
+
+    protected $name;
+    protected $shortcut;
+    protected $mode;
+    protected $default;
+    protected $help = '';
+
+    /**
+     * Constructor.
+     *
+     * @param string $name     The option name
+     * @param string $shortcut The shortcut (can be null)
+     * @param int    $mode     The option mode: self::PARAMETER_REQUIRED, self::PARAMETER_NONE or self::PARAMETER_OPTIONAL
+     * @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
+     */
+    public function __construct($name, $shortcut = null, $mode = null, $help = '', $default = null)
+    {
+        if ('--' == substr($name, 0, 2)) {
+            $name = substr($name, 2);
+        }
+
+        if (empty($shortcut)) {
+            $shortcut = null;
+        }
+
+        if (null !== $shortcut) {
+            if ('-' == $shortcut[0]) {
+                $shortcut = substr($shortcut, 1);
+            }
+        }
+
+        if (null === $mode) {
+            $mode = self::PARAMETER_NONE;
+        } elseif (is_string($mode) || $mode > 15) {
+            throw new sfCommandException(sprintf('Option mode "%s" is not valid.', $mode));
+        }
+
+        $this->name = $name;
+        $this->shortcut = $shortcut;
+        $this->mode = $mode;
+        $this->help = $help;
+
+        $this->setDefault($default);
+    }
+
+    /**
+     * Returns the shortcut.
+     *
+     * @return string The shortcut
+     */
+    public function getShortcut()
+    {
+        return $this->shortcut;
+    }
+
+    /**
+     * Returns the name.
+     *
+     * @return string The name
+     */
+    public function getName()
     {
-      $name = substr($name, 2);
+        return $this->name;
     }
 
-    if (empty($shortcut))
+    /**
+     * Returns true if the option accept a parameter.
+     *
+     * @return bool true if parameter mode is not self::PARAMETER_NONE, false otherwise
+     */
+    public function acceptParameter()
     {
-      $shortcut = null;
+        return $this->isParameterRequired() || $this->isParameterOptional();
     }
 
-    if (null !== $shortcut)
+    /**
+     * Returns true if the option requires a parameter.
+     *
+     * @return bool true if parameter mode is self::PARAMETER_REQUIRED, false otherwise
+     */
+    public function isParameterRequired()
     {
-      if ('-' == $shortcut[0])
-      {
-        $shortcut = substr($shortcut, 1);
-      }
+        return self::PARAMETER_REQUIRED === (self::PARAMETER_REQUIRED & $this->mode);
     }
 
-    if (null === $mode)
+    /**
+     * Returns true if the option takes an optional parameter.
+     *
+     * @return bool true if parameter mode is self::PARAMETER_OPTIONAL, false otherwise
+     */
+    public function isParameterOptional()
     {
-      $mode = self::PARAMETER_NONE;
+        return self::PARAMETER_OPTIONAL === (self::PARAMETER_OPTIONAL & $this->mode);
     }
-    else if (is_string($mode) || $mode > 15)
+
+    /**
+     * Returns true if the option can take multiple values.
+     *
+     * @return bool true if mode is self::IS_ARRAY, false otherwise
+     */
+    public function isArray()
     {
-      throw new sfCommandException(sprintf('Option mode "%s" is not valid.', $mode));
+        return self::IS_ARRAY === (self::IS_ARRAY & $this->mode);
     }
 
-    $this->name     = $name;
-    $this->shortcut = $shortcut;
-    $this->mode     = $mode;
-    $this->help     = $help;
-
-    $this->setDefault($default);
-  }
-
-  /**
-   * Returns the shortcut.
-   *
-   * @return string The shortcut
-   */
-  public function getShortcut()
-  {
-    return $this->shortcut;
-  }
-
-  /**
-   * Returns the name.
-   *
-   * @return string The name
-   */
-  public function getName()
-  {
-    return $this->name;
-  }
-
-  /**
-   * Returns true if the option accept a parameter.
-   *
-   * @return Boolean true if parameter mode is not self::PARAMETER_NONE, false otherwise
-   */
-  public function acceptParameter()
-  {
-    return $this->isParameterRequired() || $this->isParameterOptional();
-  }
-
-  /**
-   * Returns true if the option requires a parameter.
-   *
-   * @return Boolean true if parameter mode is self::PARAMETER_REQUIRED, false otherwise
-   */
-  public function isParameterRequired()
-  {
-    return self::PARAMETER_REQUIRED === (self::PARAMETER_REQUIRED & $this->mode);
-  }
-
-  /**
-   * Returns true if the option takes an optional parameter.
-   *
-   * @return Boolean true if parameter mode is self::PARAMETER_OPTIONAL, false otherwise
-   */
-  public function isParameterOptional()
-  {
-    return self::PARAMETER_OPTIONAL === (self::PARAMETER_OPTIONAL & $this->mode);
-  }
-
-  /**
-   * Returns true if the option can take multiple values.
-   *
-   * @return Boolean true if mode is self::IS_ARRAY, false otherwise
-   */
-  public function isArray()
-  {
-    return self::IS_ARRAY === (self::IS_ARRAY & $this->mode);
-  }
-
-  /**
-   * Sets the default value.
-   *
-   * @param mixed $default The default value
-   *
-   * @throws sfCommandException
-   */
-  public function setDefault($default = null)
-  {
-    if (self::PARAMETER_NONE === (self::PARAMETER_NONE & $this->mode) && null !== $default)
+    /**
+     * Sets the default value.
+     *
+     * @param mixed $default The default value
+     *
+     * @throws sfCommandException
+     */
+    public function setDefault($default = null)
     {
-      throw new sfCommandException('Cannot set a default value when using sfCommandOption::PARAMETER_NONE mode.');
+        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.');
+        }
+
+        if ($this->isArray()) {
+            if (null === $default) {
+                $default = array();
+            } elseif (!is_array($default)) {
+                throw new sfCommandException('A default value for an array option must be an array.');
+            }
+        }
+
+        $this->default = $this->acceptParameter() ? $default : false;
     }
 
-    if ($this->isArray())
+    /**
+     * Returns the default value.
+     *
+     * @return mixed The default value
+     */
+    public function getDefault()
     {
-      if (null === $default)
-      {
-        $default = array();
-      }
-      else if (!is_array($default))
-      {
-        throw new sfCommandException('A default value for an array option must be an array.');
-      }
+        return $this->default;
     }
 
-    $this->default = $this->acceptParameter() ? $default : false;
-  }
-
-  /**
-   * Returns the default value.
-   *
-   * @return mixed The default value
-   */
-  public function getDefault()
-  {
-    return $this->default;
-  }
-
-  /**
-   * Returns the help text.
-   *
-   * @return string The help text
-   */
-  public function getHelp()
-  {
-    return $this->help;
-  }
+    /**
+     * Returns the help text.
+     *
+     * @return string The help text
+     */
+    public function getHelp()
+    {
+        return $this->help;
+    }
 }
diff --git a/lib/command/sfCommandOptionSet.class.php b/lib/command/sfCommandOptionSet.class.php
index ffa332eba..49792f5db 100644
--- a/lib/command/sfCommandOptionSet.class.php
+++ b/lib/command/sfCommandOptionSet.class.php
@@ -11,174 +11,165 @@
 /**
  * Represent a set of command line options.
  *
- * @package    symfony
- * @subpackage command
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfCommandOptionSet
 {
-  protected
-    $options   = array(),
-    $shortcuts = array();
-
-  /**
-   * Constructor.
-   *
-   * @param array $options An array of sfCommandOption objects
-   */
-  public function __construct($options = array())
-  {
-    $this->setOptions($options);
-  }
-
-  /**
-   * Sets the sfCommandOption objects.
-   *
-   * @param array $options An array of sfCommandOption objects
-   */
-  public function setOptions($options = array())
-  {
-    $this->options = array();
-    $this->shortcuts = array();
-    $this->addOptions($options);
-  }
-
-  /**
-   * Add an array of sfCommandOption objects.
-   *
-   * @param array $options An array of sfCommandOption objects
-   */
-  public function addOptions($options = array())
-  {
-    foreach ($options as $option)
+    protected $options = array();
+    protected $shortcuts = array();
+
+    /**
+     * Constructor.
+     *
+     * @param array $options An array of sfCommandOption objects
+     */
+    public function __construct($options = array())
+    {
+        $this->setOptions($options);
+    }
+
+    /**
+     * Sets the sfCommandOption objects.
+     *
+     * @param array $options An array of sfCommandOption objects
+     */
+    public function setOptions($options = array())
+    {
+        $this->options = array();
+        $this->shortcuts = array();
+        $this->addOptions($options);
+    }
+
+    /**
+     * Add an array of sfCommandOption objects.
+     *
+     * @param array $options An array of sfCommandOption objects
+     */
+    public function addOptions($options = array())
+    {
+        foreach ($options as $option) {
+            $this->addOption($option);
+        }
+    }
+
+    /**
+     * Add a sfCommandOption objects.
+     *
+     * @param sfCommandOption $option A sfCommandOption object
+     *
+     * @throws sfCommandException
+     */
+    public function addOption(sfCommandOption $option)
     {
-      $this->addOption($option);
+        if (isset($this->options[$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()));
+        }
+
+        $this->options[$option->getName()] = $option;
+        if ($option->getShortcut()) {
+            $this->shortcuts[$option->getShortcut()] = $option->getName();
+        }
     }
-  }
-
-  /**
-   * Add a sfCommandOption objects.
-   *
-   * @param sfCommandOption $option A sfCommandOption object
-   *
-   * @throws sfCommandException
-   */
-  public function addOption(sfCommandOption $option)
-  {
-    if (isset($this->options[$option->getName()]))
+
+    /**
+     * Returns an option by name.
+     *
+     * @param string $name The option name
+     *
+     * @return sfCommandOption A sfCommandOption object
+     *
+     * @throws sfCommandException
+     */
+    public function getOption($name)
     {
-      throw new sfCommandException(sprintf('An option named "%s" already exist.', $option->getName()));
+        if (!$this->hasOption($name)) {
+            throw new sfCommandException(sprintf('The "--%s" option does not exist.', $name));
+        }
+
+        return $this->options[$name];
     }
-    else if (isset($this->shortcuts[$option->getShortcut()]))
+
+    /**
+     * Returns true if an option object exists by name.
+     *
+     * @param string $name The option name
+     *
+     * @return bool true if the option object exists, false otherwise
+     */
+    public function hasOption($name)
     {
-      throw new sfCommandException(sprintf('An option with shortcut "%s" already exist.', $option->getShortcut()));
+        return isset($this->options[$name]);
     }
 
-    $this->options[$option->getName()] = $option;
-    if ($option->getShortcut())
+    /**
+     * Gets the array of sfCommandOption objects.
+     *
+     * @return sfCommandOption[] An array of sfCommandOption objects
+     */
+    public function getOptions()
     {
-      $this->shortcuts[$option->getShortcut()] = $option->getName();
+        return $this->options;
     }
-  }
-
-  /**
-   * Returns an option by name.
-   *
-   * @param string $name The option name
-   *
-   * @return sfCommandOption A sfCommandOption object
-   *
-   * @throws sfCommandException
-   */
-  public function getOption($name)
-  {
-    if (!$this->hasOption($name))
+
+    /**
+     * Returns true if an option object exists by shortcut.
+     *
+     * @param string $name The option shortcut
+     *
+     * @return bool true if the option object exists, false otherwise
+     */
+    public function hasShortcut($name)
     {
-      throw new sfCommandException(sprintf('The "--%s" option does not exist.', $name));
+        return isset($this->shortcuts[$name]);
     }
 
-    return $this->options[$name];
-  }
-
-  /**
-   * Returns true if an option object exists by name.
-   *
-   * @param string $name The option name
-   *
-   * @return Boolean true if the option object exists, false otherwise
-   */
-  public function hasOption($name)
-  {
-    return isset($this->options[$name]);
-  }
-
-  /**
-   * Gets the array of sfCommandOption objects.
-   *
-   * @return sfCommandOption[] An array of sfCommandOption objects
-   */
-  public function getOptions()
-  {
-    return $this->options;
-  }
-
-  /**
-   * Returns true if an option object exists by shortcut.
-   *
-   * @param string $name The option shortcut
-   *
-   * @return Boolean true if the option object exists, false otherwise
-   */
-  public function hasShortcut($name)
-  {
-    return isset($this->shortcuts[$name]);
-  }
-
-  /**
-   * Gets an option by shortcut.
-   *
-   * @param string $shortcut
-   *
-   * @return sfCommandOption A sfCommandOption object
-   */
-  public function getOptionForShortcut($shortcut)
-  {
-    return $this->getOption($this->shortcutToName($shortcut));
-  }
-
-  /**
-   * Gets an array of default values.
-   *
-   * @return array An array of all default values
-   */
-  public function getDefaults()
-  {
-    $values = array();
-    foreach ($this->options as $option)
+    /**
+     * Gets an option by shortcut.
+     *
+     * @param string $shortcut
+     *
+     * @return sfCommandOption A sfCommandOption object
+     */
+    public function getOptionForShortcut($shortcut)
     {
-      $values[$option->getName()] = $option->getDefault();
+        return $this->getOption($this->shortcutToName($shortcut));
     }
 
-    return $values;
-  }
-
-  /**
-   * Returns the option name given a shortcut.
-   *
-   * @param string $shortcut The shortcut
-   *
-   * @return string The option name
-   *
-   * @throws sfCommandException
-   */
-  protected function shortcutToName($shortcut)
-  {
-    if (!isset($this->shortcuts[$shortcut]))
+    /**
+     * Gets an array of default values.
+     *
+     * @return array An array of all default values
+     */
+    public function getDefaults()
     {
-      throw new sfCommandException(sprintf('The "-%s" option does not exist.', $shortcut));
+        $values = array();
+        foreach ($this->options as $option) {
+            $values[$option->getName()] = $option->getDefault();
+        }
+
+        return $values;
     }
 
-    return $this->shortcuts[$shortcut];
-  }
+    /**
+     * Returns the option name given a shortcut.
+     *
+     * @param string $shortcut The shortcut
+     *
+     * @return string The option name
+     *
+     * @throws sfCommandException
+     */
+    protected function shortcutToName($shortcut)
+    {
+        if (!isset($this->shortcuts[$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 0367bad82..c5b776ff0 100644
--- a/lib/command/sfFormatter.class.php
+++ b/lib/command/sfFormatter.class.php
@@ -11,110 +11,101 @@
 /**
  * sfFormatter provides methods to format text to be displayed on a console.
  *
- * @package    symfony
- * @subpackage command
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfFormatter
 {
-  protected
-    $size = null;
+    protected $size;
 
-  function __construct($maxLineSize = null)
-  {
-    if (null === $maxLineSize)
+    public function __construct($maxLineSize = null)
     {
-      if (function_exists('shell_exec'))
-      {
-        // this is tricky because "tput cols 2>&1" is not accurate
-        $maxLineSize = ctype_digit(trim(shell_exec('tput cols 2>&1'))) ? (integer) shell_exec('tput cols') : 78;
-      }
-      else
-      {
-        $maxLineSize = 78;
-      }
-    }
+        if (null === $maxLineSize) {
+            if (function_exists('shell_exec')) {
+                // this is tricky because "tput cols 2>&1" is not accurate
+                $maxLineSize = ctype_digit(trim(shell_exec('tput cols 2>&1'))) ? (int) shell_exec('tput cols') : 78;
+            } else {
+                $maxLineSize = 78;
+            }
+        }
 
-    $this->size = $maxLineSize;
-  }
-
-  /**
-   * Sets a new style.
-   *
-   * @param string $name    The style name
-   * @param array  $options An array of options
-   */
-  public function setStyle($name, $options = array())
-  {
-  }
+        $this->size = $maxLineSize;
+    }
 
-  /**
-   * Formats a text according to the given parameters.
-   *
-   * @param  string $text         The test to style
-   * @param  mixed  $parameters   An array of parameters
-   *
-   * @return string The formatted text
-   */
-  public function format($text = '', $parameters = array())
-  {
-    return $text;
-  }
+    /**
+     * Sets a new style.
+     *
+     * @param string $name    The style name
+     * @param array  $options An array of options
+     */
+    public function setStyle($name, $options = array())
+    {
+    }
 
-  /**
-   * Formats a message within a section.
-   *
-   * @param string  $section The section name
-   * @param string  $text    The text message
-   * @param integer $size    The maximum size allowed for a line
-   *
-   * @return string
-   */
-  public function formatSection($section, $text, $size = null)
-  {
-    if (!$size)
+    /**
+     * Formats a text according to the given parameters.
+     *
+     * @param string $text       The test to style
+     * @param mixed  $parameters An array of parameters
+     *
+     * @return string The formatted text
+     */
+    public function format($text = '', $parameters = array())
     {
-      $size = $this->size;
+        return $text;
     }
 
-    $section = sprintf('>> %-9s ', $section);
+    /**
+     * Formats a message within a section.
+     *
+     * @param string $section The section name
+     * @param string $text    The text message
+     * @param int    $size    The maximum size allowed for a line
+     *
+     * @return string
+     */
+    public function formatSection($section, $text, $size = null)
+    {
+        if (!$size) {
+            $size = $this->size;
+        }
 
-    return $section.$this->excerpt($text, $size - strlen($section));
-  }
+        $section = sprintf('>> %-9s ', $section);
 
-  /**
-   * Truncates a line.
-   *
-   * @param string  $text The text
-   * @param integer $size The maximum size of the returned string
-   *
-   * @return string The truncated string
-   */
-  public function excerpt($text, $size = null)
-  {
-    if (!$size)
-    {
-      $size = $this->size;
+        return $section.$this->excerpt($text, $size - strlen($section));
     }
 
-    if (strlen($text) < $size)
+    /**
+     * Truncates a line.
+     *
+     * @param string $text The text
+     * @param int    $size The maximum size of the returned string
+     *
+     * @return string The truncated string
+     */
+    public function excerpt($text, $size = null)
     {
-      return $text;
-    }
+        if (!$size) {
+            $size = $this->size;
+        }
+
+        if (strlen($text) < $size) {
+            return $text;
+        }
 
-    $subsize = floor(($size - 3) / 2);
+        $subsize = floor(($size - 3) / 2);
 
-    return substr($text, 0, $subsize).'...'.substr($text, -$subsize);
-  }
+        return substr($text, 0, $subsize).'...'.substr($text, -$subsize);
+    }
 
-  /**
-   * Sets the maximum line size.
-   *
-   * @param integer $size The maximum line size for a message
-   */
-  public function setMaxLineSize($size)
-  {
-    $this->size = $size;
-  }
+    /**
+     * Sets the maximum line size.
+     *
+     * @param int $size The maximum line size for a message
+     */
+    public function setMaxLineSize($size)
+    {
+        $this->size = $size;
+    }
 }
diff --git a/lib/command/sfSymfonyCommandApplication.class.php b/lib/command/sfSymfonyCommandApplication.class.php
index 2282275a5..11caf20f8 100644
--- a/lib/command/sfSymfonyCommandApplication.class.php
+++ b/lib/command/sfSymfonyCommandApplication.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -11,143 +11,131 @@
 /**
  * sfSymfonyCommandApplication manages the symfony CLI.
  *
- * @package    symfony
- * @subpackage command
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfSymfonyCommandApplication extends sfCommandApplication
 {
-  protected $taskFiles = array();
-  
-  /**
-   * Configures the current symfony command application.
-   */
-  public function configure()
-  {
-    if (!isset($this->options['symfony_lib_dir']))
-    {
-      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);
-    }
-    else
+    protected $taskFiles = array();
+
+    /**
+     * Configures the current symfony command application.
+     */
+    public function configure()
     {
-      $configuration = new sfProjectConfiguration(getcwd(), $this->dispatcher);
+        if (!isset($this->options['symfony_lib_dir'])) {
+            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);
+        } else {
+            $configuration = new sfProjectConfiguration(getcwd(), $this->dispatcher);
+        }
+
+        // application
+        $this->setName('symfony');
+        $this->setVersion(SYMFONY_VERSION);
+
+        $this->loadTasks($configuration);
     }
 
-    // application
-    $this->setName('symfony');
-    $this->setVersion(SYMFONY_VERSION);
-
-    $this->loadTasks($configuration);
-  }
-
-  /**
-   * Runs the current application.
-   *
-   * @param mixed $options The command line options
-   *
-   * @return integer 0 if everything went fine, or an error code
-   */
-  public function run($options = null)
-  {
-    $this->handleOptions($options);
-    $arguments = $this->commandManager->getArgumentValues();
-
-    if (!isset($arguments['task']))
+    /**
+     * Runs the current application.
+     *
+     * @param mixed $options The command line options
+     *
+     * @return int 0 if everything went fine, or an error code
+     */
+    public function run($options = null)
     {
-      $arguments['task'] = 'list';
-      $this->commandOptions .= $arguments['task'];
-    }
+        $this->handleOptions($options);
+        $arguments = $this->commandManager->getArgumentValues();
 
-    $this->currentTask = $this->getTaskToExecute($arguments['task']);
+        if (!isset($arguments['task'])) {
+            $arguments['task'] = 'list';
+            $this->commandOptions .= $arguments['task'];
+        }
 
-    if ($this->currentTask instanceof sfCommandApplicationTask)
-    {
-      $this->currentTask->setCommandApplication($this);
-    }
+        $this->currentTask = $this->getTaskToExecute($arguments['task']);
 
-    $ret = $this->currentTask->runFromCLI($this->commandManager, $this->commandOptions);
+        if ($this->currentTask instanceof sfCommandApplicationTask) {
+            $this->currentTask->setCommandApplication($this);
+        }
 
-    $this->currentTask = null;
+        $ret = $this->currentTask->runFromCLI($this->commandManager, $this->commandOptions);
 
-    return $ret;
-  }
+        $this->currentTask = null;
 
-  /**
-   * Loads all available tasks.
-   *
-   * Looks for tasks in the symfony core, the current project and all project plugins.
-   *
-   * @param sfProjectConfiguration $configuration The project configuration
-   */
-  public function loadTasks(sfProjectConfiguration $configuration)
-  {
-    // Symfony core tasks
-    $dirs = array(sfConfig::get('sf_symfony_lib_dir').'/task');
+        return $ret;
+    }
 
-    // Plugin tasks
-    foreach ($configuration->getPluginPaths() as $path)
+    /**
+     * Loads all available tasks.
+     *
+     * Looks for tasks in the symfony core, the current project and all project plugins.
+     *
+     * @param sfProjectConfiguration $configuration The project configuration
+     */
+    public function loadTasks(sfProjectConfiguration $configuration)
     {
-      if (is_dir($taskPath = $path.'/lib/task'))
-      {
-        $dirs[] = $taskPath;
-      }
+        // Symfony core tasks
+        $dirs = array(sfConfig::get('sf_symfony_lib_dir').'/task');
+
+        // Plugin tasks
+        foreach ($configuration->getPluginPaths() as $path) {
+            if (is_dir($taskPath = $path.'/lib/task')) {
+                $dirs[] = $taskPath;
+            }
+        }
+
+        // project tasks
+        $dirs[] = sfConfig::get('sf_lib_dir').'/task';
+
+        $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'));
+
+        // require tasks
+        foreach ($this->taskFiles as $task => $file) {
+            // forces autoloading of each task class
+            class_exists($task, true);
+        }
+
+        // unregister local autoloader
+        spl_autoload_unregister(array($this, 'autoloadTask'));
     }
 
-    // project tasks
-    $dirs[] = sfConfig::get('sf_lib_dir').'/task';
-
-    $finder = sfFinder::type('file')->name('*Task.class.php');
-    foreach ($finder->in($dirs) as $file)
+    /**
+     * Autoloads a task class.
+     *
+     * @param string $class The task class name
+     *
+     * @return bool
+     */
+    public function autoloadTask($class)
     {
-      $this->taskFiles[basename($file, '.class.php')] = $file;
-    }
+        if (isset($this->taskFiles[$class])) {
+            require_once $this->taskFiles[$class];
 
-    // register local autoloader for tasks
-    spl_autoload_register(array($this, 'autoloadTask'));
+            return true;
+        }
 
-    // require tasks
-    foreach ($this->taskFiles as $task => $file)
-    {
-      // forces autoloading of each task class
-      class_exists($task, true);
+        return false;
     }
 
-    // unregister local autoloader
-    spl_autoload_unregister(array($this, 'autoloadTask'));
-  }
-
-  /**
-   * Autoloads a task class
-   *
-   * @param  string  $class  The task class name
-   *
-   * @return Boolean
-   */
-  public function autoloadTask($class)
-  {
-    if (isset($this->taskFiles[$class]))
+    /**
+     * @see sfCommandApplication
+     */
+    public function getLongVersion()
     {
-      require_once $this->taskFiles[$class];
-
-      return true;
+        return sprintf('%s version %s (%s)', $this->getName(), $this->formatter->format($this->getVersion(), 'INFO'), sfConfig::get('sf_symfony_lib_dir'))."\n";
     }
-
-    return false;
-  }
-
-  /**
-   * @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";
-  }
 }
diff --git a/lib/config/sfApplicationConfiguration.class.php b/lib/config/sfApplicationConfiguration.class.php
index 9c401e189..f89b42735 100644
--- a/lib/config/sfApplicationConfiguration.class.php
+++ b/lib/config/sfApplicationConfiguration.class.php
@@ -11,691 +11,634 @@
 /**
  * sfConfiguration represents a configuration for a symfony application.
  *
- * @package    symfony
- * @subpackage config
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfApplicationConfiguration extends ProjectConfiguration
 {
-  static protected
-    $coreLoaded    = false,
-    $loadedHelpers = array();
-
-  protected
-    $configCache = null,
-    $application = null,
-    $environment = null,
-    $debug       = false,
-    $config      = array(),
-    $cache       = null;
-
-  /**
-   * Constructor.
-   *
-   * @param string            $environment    The environment name
-   * @param Boolean           $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)
-  {
-    $this->environment = $environment;
-    $this->debug       = (boolean) $debug;
-    $this->application = str_replace('Configuration', '', get_class($this));
-
-    parent::__construct($rootDir, $dispatcher);
-
-    $this->configure();
-
-    $this->initConfiguration();
-
-    if (sfConfig::get('sf_check_lock'))
+    protected static $coreLoaded = false;
+    protected static $loadedHelpers = array();
+
+    protected $configCache;
+    protected $application;
+    protected $environment;
+    protected $debug = false;
+    protected $config = array();
+    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
+     */
+    public function __construct($environment, $debug, $rootDir = null, sfEventDispatcher $dispatcher = null)
     {
-      $this->checkLock();
-    }
+        $this->environment = $environment;
+        $this->debug = (bool) $debug;
+        $this->application = str_replace('Configuration', '', get_class($this));
 
-    if (is_file($file = sfConfig::get('sf_app_cache_dir').'/config/configuration.php'))
-    {
-      $this->cache = require $file;
+        parent::__construct($rootDir, $dispatcher);
+
+        $this->configure();
+
+        $this->initConfiguration();
+
+        if (sfConfig::get('sf_check_lock')) {
+            $this->checkLock();
+        }
+
+        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->initialize();
-
-    // store current sfConfig values
-    $this->config = sfConfig::getAll();
-  }
-
-  /**
-   * Configures the current configuration.
-   *
-   * Override this method if you want to customize your application configuration.
-   */
-  public function configure()
-  {
-  }
-
-  /**
-   * Initialized the current configuration.
-   *
-   * Override this method if you want to customize your application initialization.
-   */
-  public function initialize()
-  {
-  }
-
-  public function activate()
-  {
-    sfConfig::clear();
-    sfConfig::add($this->config);
-  }
-
-  /**
-   * Various initializations.
-   */
-  public function initConfiguration()
-  {
-    $configCache = $this->getConfigCache();
-
-    // in debug mode, start global timer
-    if ($this->isDebug() && !sfConfig::get('sf_cli') && !sfWebDebugPanelTimer::isStarted())
+    /**
+     * Configures the current configuration.
+     *
+     * Override this method if you want to customize your application configuration.
+     */
+    public function configure()
     {
-      sfWebDebugPanelTimer::startTime();
     }
 
-    // required core classes for the framework
-    if (!$this->isDebug() && !sfConfig::get('sf_test') && !sfConfig::get('sf_cli') && !self::$coreLoaded)
+    /**
+     * Initialized the current configuration.
+     *
+     * Override this method if you want to customize your application initialization.
+     */
+    public function initialize()
     {
-      $configCache->import('config/core_compile.yml', false);
     }
 
-    // autoloader(s)
-    $this->dispatcher->connect('autoload.filter_config', array($this, 'filterAutoloadConfig'));
-    sfAutoload::getInstance()->register();
-    if ($this->isDebug())
+    public function activate()
     {
-      sfAutoloadAgain::getInstance()->register();
+        sfConfig::clear();
+        sfConfig::add($this->config);
     }
 
-    // load base settings
-    include($configCache->checkConfig('config/settings.yml'));
-    if ($file = $configCache->checkConfig('config/app.yml', true))
+    /**
+     * Various initializations.
+     */
+    public function initConfiguration()
     {
-      include($file);
+        $configCache = $this->getConfigCache();
+
+        // in debug mode, start global timer
+        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) {
+            $configCache->import('config/core_compile.yml', false);
+        }
+
+        // autoloader(s)
+        $this->dispatcher->connect('autoload.filter_config', array($this, 'filterAutoloadConfig'));
+        sfAutoload::getInstance()->register();
+        if ($this->isDebug()) {
+            sfAutoloadAgain::getInstance()->register();
+        }
+
+        // load base settings
+        include $configCache->checkConfig('config/settings.yml');
+        if ($file = $configCache->checkConfig('config/app.yml', true)) {
+            include $file;
+        }
+
+        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'));
+
+        // force setting default timezone if not set
+        if ($default_timezone = sfConfig::get('sf_default_timezone')) {
+            date_default_timezone_set($default_timezone);
+        } 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'));
+
+        // initialize plugin configuration objects
+        $this->initializePlugins();
+
+        // compress output
+        if (!self::$coreLoaded && sfConfig::get('sf_compressed')) {
+            ob_start('ob_gzhandler');
+        }
+
+        self::$coreLoaded = true;
     }
 
-    if (!sfConfig::get('sf_cli') && false !== sfConfig::get('sf_csrf_secret'))
+    /**
+     * Adds enabled plugins to autoload config.
+     *
+     * @return array
+     */
+    public function filterAutoloadConfig(sfEvent $event, array $config)
     {
-      sfForm::enableCSRFProtection(sfConfig::get('sf_csrf_secret'));
-    }
+        foreach ($this->pluginConfigurations as $name => $configuration) {
+            $config = $configuration->filterAutoloadConfig($event, $config);
+        }
 
-    sfWidget::setCharset(sfConfig::get('sf_charset'));
-    sfValidatorBase::setCharset(sfConfig::get('sf_charset'));
+        return $config;
+    }
 
-    // force setting default timezone if not set
-    if ($default_timezone = sfConfig::get('sf_default_timezone'))
+    /**
+     * Returns a configuration cache object for the current configuration.
+     *
+     * @return sfConfigCache A sfConfigCache instance
+     */
+    public function getConfigCache()
     {
-      date_default_timezone_set($default_timezone);
+        if (null === $this->configCache) {
+            $this->configCache = new sfConfigCache($this);
+        }
+
+        return $this->configCache;
     }
-    else if (sfConfig::get('sf_force_default_timezone', true))
+
+    /**
+     * Check lock files to see if we're not in a cache cleaning process.
+     */
+    public function checkLock()
     {
-      date_default_timezone_set(@date_default_timezone_get());
+        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')
+        ) {
+            // 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',
+                $this->getSymfonyLibDir().'/exception/data/unavailable.php',
+            );
+
+            foreach ($files as $file) {
+                if (is_readable($file)) {
+                    header('HTTP/1.1 503 Service Temporarily Unavailable');
+                    header('Status: 503 Service Temporarily Unavailable');
+
+                    include $file;
+
+                    break;
+                }
+            }
+
+            exit(1);
+        }
     }
 
-    // error settings
-    ini_set('display_errors', $this->isDebug() ? 'on' : 'off');
-    error_reporting(sfConfig::get('sf_error_reporting'));
+    /**
+     * Sets the project root directory.
+     *
+     * @param string $rootDir The project root directory
+     */
+    public function setRootDir($rootDir)
+    {
+        parent::setRootDir($rootDir);
 
-    // initialize plugin configuration objects
-    $this->initializePlugins();
+        sfConfig::add(array(
+            'sf_app' => $this->getApplication(),
+            'sf_environment' => $this->getEnvironment(),
+            'sf_debug' => $this->isDebug(),
+            'sf_cli' => PHP_SAPI === 'cli',
+        ));
 
-    // compress output
-    if (!self::$coreLoaded && sfConfig::get('sf_compressed'))
-    {
-      ob_start('ob_gzhandler');
+        $this->setAppDir(sfConfig::get('sf_apps_dir').DIRECTORY_SEPARATOR.$this->getApplication());
     }
 
-    self::$coreLoaded = true;
-  }
-
-  /**
-   * Initializes plugin configuration objects.
-   */
-  protected function initializePlugins()
-  {
-    foreach ($this->pluginConfigurations as $name => $configuration)
+    /**
+     * Sets the app directory.
+     *
+     * @param string $appDir the absolute path to the app dir
+     */
+    public function setAppDir($appDir)
     {
-      if (
-        false === $configuration->initialize()
-        &&
-        is_readable($config = $configuration->getRootDir().'/config/config.php')
-      )
-      {
-        require $config;
-      }
+        sfConfig::add(array(
+            'sf_app_dir' => $appDir,
+
+            // SF_APP_DIR directory structure
+            'sf_app_config_dir' => $appDir.DIRECTORY_SEPARATOR.'config',
+            'sf_app_lib_dir' => $appDir.DIRECTORY_SEPARATOR.'lib',
+            'sf_app_module_dir' => $appDir.DIRECTORY_SEPARATOR.'modules',
+            'sf_app_template_dir' => $appDir.DIRECTORY_SEPARATOR.'templates',
+            'sf_app_i18n_dir' => $appDir.DIRECTORY_SEPARATOR.'i18n',
+        ));
     }
-  }
-
-  /**
-   * Adds enabled plugins to autoload config.
-   *
-   * @param   sfEvent $event
-   * @param   array   $config
-   *
-   * @return  array
-   */
-  public function filterAutoloadConfig(sfEvent $event, array $config)
-  {
-    foreach ($this->pluginConfigurations as $name => $configuration)
+
+    /**
+     * @see sfProjectConfiguration
+     *
+     * @param mixed $cacheDir
+     */
+    public function setCacheDir($cacheDir)
     {
-      $config = $configuration->filterAutoloadConfig($event, $config);
+        parent::setCacheDir($cacheDir);
+
+        sfConfig::add(array(
+            'sf_app_base_cache_dir' => $cacheDir.DIRECTORY_SEPARATOR.$this->getApplication(),
+            'sf_app_cache_dir' => $appCacheDir = $cacheDir.DIRECTORY_SEPARATOR.$this->getApplication().DIRECTORY_SEPARATOR.$this->getEnvironment(),
+
+            // SF_CACHE_DIR directory structure
+            'sf_template_cache_dir' => $appCacheDir.DIRECTORY_SEPARATOR.'template',
+            'sf_i18n_cache_dir' => $appCacheDir.DIRECTORY_SEPARATOR.'i18n',
+            'sf_config_cache_dir' => $appCacheDir.DIRECTORY_SEPARATOR.'config',
+            'sf_test_cache_dir' => $appCacheDir.DIRECTORY_SEPARATOR.'test',
+            'sf_module_cache_dir' => $appCacheDir.DIRECTORY_SEPARATOR.'modules',
+        ));
     }
 
-    return $config;
-  }
-
-  /**
-   * Returns a configuration cache object for the current configuration.
-   *
-   * @return sfConfigCache A sfConfigCache instance
-   */
-  public function getConfigCache()
-  {
-    if (null === $this->configCache)
+    /**
+     * Gets directories where controller classes are stored for a given module.
+     *
+     * @param string $moduleName The module name
+     *
+     * @return array An array of directories
+     */
+    public function getControllerDirs($moduleName)
     {
-      $this->configCache = new sfConfigCache($this);
+        if (!isset($this->cache['getControllerDirs'][$moduleName])) {
+            $dirs = array();
+
+            $dirs[sfConfig::get('sf_app_module_dir').'/'.$moduleName.'/actions'] = false; // application
+
+            foreach ($this->getPluginPaths() as $path) {
+                if (is_dir($dir = $path.'/modules/'.$moduleName.'/actions')) {
+                    $dirs[$dir] = true; // plugins
+                }
+            }
+
+            if (is_dir($dir = $this->getSymfonyLibDir().'/controller/'.$moduleName.'/actions')) {
+                $dirs[$dir] = true; // core modules
+            }
+
+            $this->cache['getControllerDirs'][$moduleName] = $dirs;
+        }
+
+        return $this->cache['getControllerDirs'][$moduleName];
     }
 
-    return $this->configCache;
-  }
-
-  /**
-   * Check lock files to see if we're not in a cache cleaning process.
-   *
-   * @return void
-   */
-  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')
-    )
+    /**
+     * Gets directories where lib files are stored for a given module.
+     *
+     * @param string $moduleName The module name
+     *
+     * @return array An array of directories
+     */
+    public function getLibDirs($moduleName)
     {
-      // 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',
-        $this->getSymfonyLibDir().'/exception/data/unavailable.php',
-      );
-
-      foreach ($files as $file)
-      {
-        if (is_readable($file))
-        {
-          header("HTTP/1.1 503 Service Temporarily Unavailable");
-          header("Status: 503 Service Temporarily Unavailable");
-
-          include $file;
-          break;
-        }
-      }
+        $dirs = array();
+
+        $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
 
-      die(1);
+        return $dirs;
     }
-  }
-
-  /**
-   * Determines if a lock file is present.
-   *
-   * @param  string  $lockFile             Name of the lock file.
-   * @param  integer $maxLockFileLifeTime  A max amount of life time for the lock file.
-   *
-   * @return bool true, if the lock file is present, otherwise false.
-   */
-  protected function hasLockFile($lockFile, $maxLockFileLifeTime = 0)
-  {
-    $isLocked = false;
-    if (is_readable($lockFile) && ($last_access = fileatime($lockFile)))
+
+    /**
+     * Gets directories where template files are stored for a given module.
+     *
+     * @param string $moduleName The module name
+     *
+     * @return array An array of directories
+     */
+    public function getTemplateDirs($moduleName)
     {
-      $now = time();
-      $timeDiff = $now - $last_access;
-
-      if (!$maxLockFileLifeTime || $timeDiff < $maxLockFileLifeTime)
-      {
-        $isLocked = true;
-      }
-      else
-      {
-        $isLocked = @unlink($lockFile) ? false : true;
-      }
+        $dirs = array();
+
+        $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
+
+        return $dirs;
     }
 
-    return $isLocked;
-  }
-
-  /**
-   * Sets the project root directory.
-   *
-   * @param string $rootDir The project root directory
-   */
-  public function setRootDir($rootDir)
-  {
-    parent::setRootDir($rootDir);
-
-    sfConfig::add(array(
-      '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());
-  }
-
-  /**
-   * Sets the app directory.
-   *
-   * @param string $appDir The absolute path to the app dir.
-   */
-  public function setAppDir($appDir)
-  {
-    sfConfig::add(array(
-      'sf_app_dir' => $appDir,
-
-      // SF_APP_DIR directory structure
-      'sf_app_config_dir'   => $appDir.DIRECTORY_SEPARATOR.'config',
-      'sf_app_lib_dir'      => $appDir.DIRECTORY_SEPARATOR.'lib',
-      '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
-   */
-  public function setCacheDir($cacheDir)
-  {
-    parent::setCacheDir($cacheDir);
-
-    sfConfig::add(array(
-      'sf_app_base_cache_dir' => $cacheDir.DIRECTORY_SEPARATOR.$this->getApplication(),
-      'sf_app_cache_dir'      => $appCacheDir = $cacheDir.DIRECTORY_SEPARATOR.$this->getApplication().DIRECTORY_SEPARATOR.$this->getEnvironment(),
-
-      // SF_CACHE_DIR directory structure
-      'sf_template_cache_dir' => $appCacheDir.DIRECTORY_SEPARATOR.'template',
-      'sf_i18n_cache_dir'     => $appCacheDir.DIRECTORY_SEPARATOR.'i18n',
-      'sf_config_cache_dir'   => $appCacheDir.DIRECTORY_SEPARATOR.'config',
-      'sf_test_cache_dir'     => $appCacheDir.DIRECTORY_SEPARATOR.'test',
-      'sf_module_cache_dir'   => $appCacheDir.DIRECTORY_SEPARATOR.'modules',
-    ));
-  }
-
-  /**
-   * Gets directories where controller classes are stored for a given module.
-   *
-   * @param string $moduleName The module name
-   *
-   * @return array An array of directories
-   */
-  public function getControllerDirs($moduleName)
-  {
-    if (!isset($this->cache['getControllerDirs'][$moduleName]))
+    /**
+     * Gets the helper directories for a given module name.
+     *
+     * @param string $moduleName The module name
+     *
+     * @return array An array of directories
+     */
+    public function getHelperDirs($moduleName = '')
     {
-      $dirs = array();
+        $dirs = array();
 
-      $dirs[sfConfig::get('sf_app_module_dir').'/'.$moduleName.'/actions'] = false; // application
+        if ($moduleName) {
+            $dirs[] = sfConfig::get('sf_app_module_dir').'/'.$moduleName.'/lib/helper'; // module
 
-      foreach ($this->getPluginPaths() as $path)
-      {
-        if (is_dir($dir = $path.'/modules/'.$moduleName.'/actions'))
-        {
-          $dirs[$dir] = true; // plugins
+            $dirs = array_merge($dirs, $this->getPluginSubPaths('/modules/'.$moduleName.'/lib/helper'));
         }
-      }
 
-      if (is_dir($dir = $this->getSymfonyLibDir().'/controller/'.$moduleName.'/actions'))
-      {
-        $dirs[$dir] = true; // core modules
-      }
+        return array_merge(
+            $dirs,
+            array(
+                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->cache['getControllerDirs'][$moduleName] = $dirs;
+    /**
+     * Gets the template directory to use for a given module and template file.
+     *
+     * @param string $moduleName   The module name
+     * @param string $templateFile The template file
+     *
+     * @return string A template directory
+     */
+    public function getTemplateDir($moduleName, $templateFile)
+    {
+        if (!isset($this->cache['getTemplateDir'][$moduleName][$templateFile])) {
+            $this->cache['getTemplateDir'][$moduleName][$templateFile] = null;
+            foreach ($this->getTemplateDirs($moduleName) as $dir) {
+                if (is_readable($dir.'/'.$templateFile)) {
+                    $this->cache['getTemplateDir'][$moduleName][$templateFile] = $dir;
+
+                    break;
+                }
+            }
+        }
+
+        return $this->cache['getTemplateDir'][$moduleName][$templateFile];
     }
 
-    return $this->cache['getControllerDirs'][$moduleName];
-  }
-
-  /**
-   * Gets directories where lib files are stored for a given module.
-   *
-   * @param string $moduleName The module name
-   *
-   * @return array An array of directories
-   */
-  public function getLibDirs($moduleName)
-  {
-    $dirs = array();
-
-    $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
-
-    return $dirs;
-  }
-
-  /**
-   * Gets directories where template files are stored for a given module.
-   *
-   * @param string $moduleName The module name
-   *
-   * @return array An array of directories
-   */
-  public function getTemplateDirs($moduleName)
-  {
-    $dirs = array();
-
-    $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
-
-    return $dirs;
-  }
-
-  /**
-   * Gets the helper directories for a given module name.
-   *
-   * @param  string $moduleName The module name
-   *
-   * @return array  An array of directories
-   */
-  public function getHelperDirs($moduleName = '')
-  {
-    $dirs = array();
-
-    if ($moduleName)
+    /**
+     * Gets the template to use for a given module and template file.
+     *
+     * @param string $moduleName   The module name
+     * @param string $templateFile The template file
+     *
+     * @return string A template path
+     */
+    public function getTemplatePath($moduleName, $templateFile)
     {
-      $dirs[] = sfConfig::get('sf_app_module_dir').'/'.$moduleName.'/lib/helper'; // module
+        $dir = $this->getTemplateDir($moduleName, $templateFile);
 
-      $dirs = array_merge($dirs, $this->getPluginSubPaths('/modules/'.$moduleName.'/lib/helper'));
+        return $dir ? $dir.'/'.$templateFile : null;
     }
 
-    return array_merge(
-      $dirs,
-      array(
-        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
-    );
-  }
-
-  /**
-   * Gets the template directory to use for a given module and template file.
-   *
-   * @param string $moduleName    The module name
-   * @param string $templateFile  The template file
-   *
-   * @return string A template directory
-   */
-  public function getTemplateDir($moduleName, $templateFile)
-  {
-    if (!isset($this->cache['getTemplateDir'][$moduleName][$templateFile]))
+    /**
+     * @see sfProjectConfiguration
+     */
+    public function getPluginPaths()
     {
-      $this->cache['getTemplateDir'][$moduleName][$templateFile] = null;
-      foreach ($this->getTemplateDirs($moduleName) as $dir)
-      {
-        if (is_readable($dir.'/'.$templateFile))
-        {
-          $this->cache['getTemplateDir'][$moduleName][$templateFile] = $dir;
-          break;
+        if (!isset($this->cache['getPluginPaths'])) {
+            $this->cache['getPluginPaths'] = parent::getPluginPaths();
         }
-      }
+
+        return $this->cache['getPluginPaths'];
     }
 
-    return $this->cache['getTemplateDir'][$moduleName][$templateFile];
-  }
-
-  /**
-   * Gets the template to use for a given module and template file.
-   *
-   * @param string $moduleName    The module name
-   * @param string $templateFile  The template file
-   *
-   * @return string A template path
-   */
-  public function getTemplatePath($moduleName, $templateFile)
-  {
-    $dir = $this->getTemplateDir($moduleName, $templateFile);
-
-    return $dir ? $dir.'/'.$templateFile : null;
-  }
-  /**
-   * @see sfProjectConfiguration
-   */
-  public function getPluginPaths()
-  {
-    if (!isset($this->cache['getPluginPaths']))
+    /**
+     * Gets the decorator directories.
+     *
+     * @return array An array of the decorator directories
+     */
+    public function getDecoratorDirs()
     {
-      $this->cache['getPluginPaths'] = parent::getPluginPaths();
+        return array(sfConfig::get('sf_app_template_dir'));
     }
 
-    return $this->cache['getPluginPaths'];
-  }
-
-  /**
-   * Gets the decorator directories.
-   *
-   * @return array  An array of the decorator directories
-   */
-  public function getDecoratorDirs()
-  {
-    return array(sfConfig::get('sf_app_template_dir'));
-  }
-
-  /**
-   * Gets the decorator directory for a given template.
-   *
-   * @param  string $template The template file
-   *
-   * @return string A template directory
-   */
-  public function getDecoratorDir($template)
-  {
-    foreach ($this->getDecoratorDirs() as $dir)
+    /**
+     * Gets the decorator directory for a given template.
+     *
+     * @param string $template The template file
+     *
+     * @return string A template directory
+     */
+    public function getDecoratorDir($template)
     {
-      if (is_readable($dir.'/'.$template))
-      {
-        return $dir;
-      }
+        foreach ($this->getDecoratorDirs() as $dir) {
+            if (is_readable($dir.'/'.$template)) {
+                return $dir;
+            }
+        }
     }
-  }
-
-  /**
-   * Gets the i18n directories to use globally.
-   *
-   * @return array An array of i18n directories
-   */
-  public function getI18NGlobalDirs()
-  {
-    $dirs = array();
-
-    // application
-    if (is_dir($dir = sfConfig::get('sf_app_i18n_dir')))
+
+    /**
+     * Gets the i18n directories to use globally.
+     *
+     * @return array An array of i18n directories
+     */
+    public function getI18NGlobalDirs()
     {
-      $dirs[] = $dir;
+        $dirs = array();
+
+        // application
+        if (is_dir($dir = sfConfig::get('sf_app_i18n_dir'))) {
+            $dirs[] = $dir;
+        }
+
+        // plugins
+        return array_merge($dirs, $this->getPluginSubPaths('/i18n'));
     }
 
-    // plugins
-    return array_merge($dirs, $this->getPluginSubPaths('/i18n'));
-  }
-
-  /**
-   * Gets the i18n directories to use for a given module.
-   *
-   * @param string $moduleName The module name
-   *
-   * @return array An array of i18n directories
-   */
-  public function getI18NDirs($moduleName)
-  {
-    $dirs = array();
-
-    // module
-    if (is_dir($dir = sfConfig::get('sf_app_module_dir').'/'.$moduleName.'/i18n'))
+    /**
+     * Gets the i18n directories to use for a given module.
+     *
+     * @param string $moduleName The module name
+     *
+     * @return array An array of i18n directories
+     */
+    public function getI18NDirs($moduleName)
     {
-      $dirs[] = $dir;
+        $dirs = array();
+
+        // module
+        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'))) {
+            $dirs[] = $dir;
+        }
+
+        return array_merge(
+            $dirs,
+            $this->getPluginSubPaths('/modules/'.$moduleName.'/i18n'), // module in plugins
+            $this->getPluginSubPaths('/i18n')                          // plugins
+        );
     }
 
-    // application
-    if (is_dir($dir = sfConfig::get('sf_app_i18n_dir')))
+    /**
+     * Gets the configuration file paths for a given relative configuration path.
+     *
+     * @param string $configPath The configuration path
+     *
+     * @return array An array of paths
+     */
+    public function getConfigPaths($configPath)
     {
-      $dirs[] = $dir;
+        $globalConfigPath = basename(dirname($configPath)).'/'.basename($configPath);
+
+        $files = array(
+            $this->getSymfonyLibDir().'/config/'.$globalConfigPath, // symfony
+        );
+
+        foreach ($this->getPluginPaths() as $path) {
+            if (is_file($file = $path.'/'.$globalConfigPath)) {
+                $files[] = $file;                                     // plugins
+            }
+        }
+
+        $files = array_merge($files, array(
+            $this->getRootDir().'/'.$globalConfigPath,              // project
+            $this->getRootDir().'/'.$configPath,                    // project
+            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)) {
+                $files[] = $file;                                     // plugins
+            }
+        }
+
+        $files[] = sfConfig::get('sf_app_dir').'/'.$configPath;   // module
+
+        $configs = array();
+        foreach (array_unique($files) as $file) {
+            if (is_readable($file)) {
+                $configs[] = $file;
+            }
+        }
+
+        return $configs;
     }
 
-    return array_merge(
-      $dirs,
-      $this->getPluginSubPaths('/modules/'.$moduleName.'/i18n'), // module in plugins
-      $this->getPluginSubPaths('/i18n')                          // plugins
-    );
-  }
-
-  /**
-   * Gets the configuration file paths for a given relative configuration path.
-   *
-   * @param string $configPath The configuration path
-   *
-   * @return array An array of paths
-   */
-  public function getConfigPaths($configPath)
-  {
-    $globalConfigPath = basename(dirname($configPath)).'/'.basename($configPath);
-
-    $files = array(
-      $this->getSymfonyLibDir().'/config/'.$globalConfigPath, // symfony
-    );
-
-    foreach ($this->getPluginPaths() as $path)
+    /**
+     * Loads helpers.
+     *
+     * @param array|string $helpers    An array of helpers to load
+     * @param string       $moduleName A module name (optional)
+     */
+    public function loadHelpers($helpers, $moduleName = '')
     {
-      if (is_file($file = $path.'/'.$globalConfigPath))
-      {
-        $files[] = $file;                                     // plugins
-      }
+        foreach ((array) $helpers as $helperName) {
+            if (isset(self::$loadedHelpers[$helperName])) {
+                continue;
+            }
+
+            if (isset($this->cache['loadedHelpers'][$moduleName][$helperName])) {
+                include_once $this->cache['loadedHelpers'][$moduleName][$helperName];
+            } elseif (isset($this->cache['loadedHelpers'][''][$helperName])) {
+                include_once $this->cache['loadedHelpers'][''][$helperName];
+            } else {
+                $fileName = $helperName.'Helper.php';
+
+                if (!isset($dirs)) {
+                    $dirs = $this->getHelperDirs($moduleName);
+                }
+
+                foreach ($dirs as $dir) {
+                    $included = false;
+                    if (is_readable($dir.'/'.$fileName)) {
+                        include_once $dir.'/'.$fileName;
+                        $included = true;
+
+                        break;
+                    }
+                }
+
+                if (!$included) {
+                    throw new InvalidArgumentException(sprintf('Unable to load "%sHelper.php" helper in: %s.', $helperName, implode(', ', array_map(array('sfDebug', 'shortenFilePath'), $dirs))));
+                }
+            }
+
+            self::$loadedHelpers[$helperName] = true;
+        }
     }
 
-    $files = array_merge($files, array(
-      $this->getRootDir().'/'.$globalConfigPath,              // project
-      $this->getRootDir().'/'.$configPath,                    // project
-      sfConfig::get('sf_app_dir').'/'.$globalConfigPath,      // application
-      sfConfig::get('sf_app_cache_dir').'/'.$configPath,      // generated modules
-    ));
-
-    foreach ($this->getPluginPaths() as $path)
+    /**
+     * Returns the application name.
+     *
+     * @return string The application name
+     */
+    public function getApplication()
     {
-      if (is_file($file = $path.'/'.$configPath))
-      {
-        $files[] = $file;                                     // plugins
-      }
+        return $this->application;
     }
 
-    $files[] = sfConfig::get('sf_app_dir').'/'.$configPath;   // module
-
-    $configs = array();
-    foreach (array_unique($files) as $file)
+    /**
+     * Returns the environment name.
+     *
+     * @return string The environment name
+     */
+    public function getEnvironment()
     {
-      if (is_readable($file))
-      {
-        $configs[] = $file;
-      }
+        return $this->environment;
     }
 
-    return $configs;
-  }
-
-  /**
-   * Loads helpers.
-   *
-   * @param array|string $helpers    An array of helpers to load
-   * @param string       $moduleName A module name (optional)
-   */
-  public function loadHelpers($helpers, $moduleName = '')
-  {
-    foreach ((array) $helpers as $helperName)
+    /**
+     * Returns true if this configuration has debug enabled.
+     *
+     * @return bool true if the configuration has debug enabled, false otherwise
+     */
+    public function isDebug()
     {
-      if (isset(self::$loadedHelpers[$helperName]))
-      {
-        continue;
-      }
-
-      if (isset($this->cache['loadedHelpers'][$moduleName][$helperName]))
-      {
-        include_once $this->cache['loadedHelpers'][$moduleName][$helperName];
-      }
-      else if (isset($this->cache['loadedHelpers'][''][$helperName]))
-      {
-        include_once $this->cache['loadedHelpers'][''][$helperName];
-      }
-      else
-      {
-        $fileName = $helperName.'Helper.php';
-
-        if (!isset($dirs))
-        {
-          $dirs = $this->getHelperDirs($moduleName);
-        }
+        return $this->debug;
+    }
 
-        foreach ($dirs as $dir)
-        {
-          $included = false;
-          if (is_readable($dir.'/'.$fileName))
-          {
-            include_once $dir.'/'.$fileName;
-            $included = true;
-            break;
-          }
+    /**
+     * Initializes plugin configuration objects.
+     */
+    protected function initializePlugins()
+    {
+        foreach ($this->pluginConfigurations as $name => $configuration) {
+            if (
+                false === $configuration->initialize()
+                && is_readable($config = $configuration->getRootDir().'/config/config.php')
+            ) {
+                require $config;
+            }
         }
+    }
 
-        if (!$included)
-        {
-          throw new InvalidArgumentException(sprintf('Unable to load "%sHelper.php" helper in: %s.', $helperName, implode(', ', array_map(array('sfDebug', 'shortenFilePath'), $dirs))));
+    /**
+     * Determines if a lock file is present.
+     *
+     * @param string $lockFile            name of the lock file
+     * @param int    $maxLockFileLifeTime a max amount of life time for the lock file
+     *
+     * @return bool true, if the lock file is present, otherwise false
+     */
+    protected function hasLockFile($lockFile, $maxLockFileLifeTime = 0)
+    {
+        $isLocked = false;
+        if (is_readable($lockFile) && ($last_access = fileatime($lockFile))) {
+            $now = time();
+            $timeDiff = $now - $last_access;
+
+            if (!$maxLockFileLifeTime || $timeDiff < $maxLockFileLifeTime) {
+                $isLocked = true;
+            } else {
+                $isLocked = @unlink($lockFile) ? false : true;
+            }
         }
-      }
 
-      self::$loadedHelpers[$helperName] = true;
+        return $isLocked;
     }
-  }
-
-  /**
-   * Returns the application name.
-   *
-   * @return string The application name
-   */
-  public function getApplication()
-  {
-    return $this->application;
-  }
-
-  /**
-   * Returns the environment name.
-   *
-   * @return string The environment name
-   */
-  public function getEnvironment()
-  {
-    return $this->environment;
-  }
-
-  /**
-   * Returns true if this configuration has debug enabled.
-   *
-   * @return Boolean true if the configuration has debug enabled, false otherwise
-   */
-  public function isDebug()
-  {
-    return $this->debug;
-  }
 }
diff --git a/lib/config/sfAutoloadConfigHandler.class.php b/lib/config/sfAutoloadConfigHandler.class.php
index 9132e5ce1..ece3fea65 100755
--- a/lib/config/sfAutoloadConfigHandler.class.php
+++ b/lib/config/sfAutoloadConfigHandler.class.php
@@ -10,180 +10,161 @@
  */
 
 /**
- *
- * @package    symfony
- * @subpackage config
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 class sfAutoloadConfigHandler extends sfYamlConfigHandler
 {
-  /**
-   * Executes this configuration handler.
-   *
-   * @param array $configFiles An array of absolute filesystem path to a configuration file
-   *
-   * @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
-   */
-  public function execute($configFiles)
-  {
-    // set our required categories list and initialize our handler
-    $this->initialize(array('required_categories' => array('autoload')));
-
-    $data = array();
-    foreach ($this->parse($configFiles) as $name => $mapping)
+    /**
+     * Executes this configuration handler.
+     *
+     * @param array $configFiles An array of absolute filesystem path to a configuration file
+     *
+     * @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
+     */
+    public function execute($configFiles)
     {
-      $data[] = sprintf("\n  // %s", $name);
-
-      foreach ($mapping as $class => $file)
-      {
-        $data[] = sprintf("  '%s' => '%s',", $class, str_replace('\\', '\\\\', $file));
-      }
-    }
+        // set our required categories list and initialize our handler
+        $this->initialize(array('required_categories' => array('autoload')));
 
-    // compile data
-    return sprintf("<?php\n".
-                      "// auto-generated by sfAutoloadConfigHandler\n".
-                      "// date: %s\nreturn array(\n%s\n);\n",
-                      date('Y/m/d H:i:s'), implode("\n", $data));
-  }
-
-  public function evaluate($configFiles)
-  {
-    $mappings = array();
-    foreach ($this->parse($configFiles) as $mapping)
-    {
-      foreach ($mapping as $class => $file)
-      {
-        $mappings[$class] = $file;
-      }
-    }
+        $data = array();
+        foreach ($this->parse($configFiles) as $name => $mapping) {
+            $data[] = sprintf("\n  // %s", $name);
 
-    return $mappings;
-  }
+            foreach ($mapping as $class => $file) {
+                $data[] = sprintf("  '%s' => '%s',", $class, str_replace('\\', '\\\\', $file));
+            }
+        }
 
-  protected function parse(array $configFiles)
-  {
-    // parse the yaml
-    $config = static::getConfiguration($configFiles);
+        // compile data
+        return sprintf(
+            "<?php\n".
+                          "// auto-generated by sfAutoloadConfigHandler\n".
+                          "// date: %s\nreturn array(\n%s\n);\n",
+            date('Y/m/d H:i:s'),
+            implode("\n", $data)
+        );
+    }
 
-    $mappings = array();
-    foreach ($config['autoload'] as $name => $entry)
+    public function evaluate($configFiles)
     {
-      $mapping = array();
-
-      // file mapping or directory mapping?
-      if (isset($entry['files']))
-      {
-        // file mapping
-        foreach ($entry['files'] as $class => $file)
-        {
-          $mapping[strtolower($class)] = $file;
-        }
-      }
-      else
-      {
-        // directory mapping
-        $ext  = isset($entry['ext']) ? $entry['ext'] : '.php';
-        $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();
-
-        // recursive mapping?
-        $recursive = isset($entry['recursive']) ? $entry['recursive'] : false;
-        if (!$recursive)
-        {
-          $finder->maxdepth(0);
+        $mappings = array();
+        foreach ($this->parse($configFiles) as $mapping) {
+            foreach ($mapping as $class => $file) {
+                $mappings[$class] = $file;
+            }
         }
 
-        // exclude files or directories?
-        if (isset($entry['exclude']) && is_array($entry['exclude']))
-        {
-          $finder->prune($entry['exclude'])->discard($entry['exclude']);
-        }
+        return $mappings;
+    }
 
-        if ($matches = glob($path))
-        {
-          foreach ($finder->in($matches) as $file)
-          {
-            $mapping = array_merge($mapping, $this->parseFile($path, $file, isset($entry['prefix']) ? $entry['prefix'] : ''));
-          }
+    public static function parseFile($path, $file, $prefix)
+    {
+        $mapping = array();
+        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 = '';
+            if ($prefix) {
+                // FIXME: does not work for plugins installed with a symlink
+                preg_match('~^'.str_replace('\*', '(.+?)', preg_quote(str_replace('/', DIRECTORY_SEPARATOR, $path), '~')).'~', str_replace('/', DIRECTORY_SEPARATOR, $file), $match);
+                if (isset($match[$prefix])) {
+                    $localPrefix = $match[$prefix].'/';
+                }
+            }
+
+            $mapping[$localPrefix.strtolower($class)] = $file;
         }
-      }
 
-      $mappings[$name] = $mapping;
+        return $mapping;
     }
 
-    return $mappings;
-  }
-
-  static public function parseFile($path, $file, $prefix)
-  {
-    $mapping = array();
-    preg_match_all('~^\s*(?:abstract\s+|final\s+)?(?:class|interface|trait)\s+(\w+)~mi', file_get_contents($file), $classes);
-    foreach ($classes[1] as $class)
+    /**
+     * @see sfConfigHandler
+     * {@inheritdoc}
+     */
+    public static function getConfiguration(array $configFiles)
     {
-      $localPrefix = '';
-      if ($prefix)
-      {
-        // FIXME: does not work for plugins installed with a symlink
-        preg_match('~^'.str_replace('\*', '(.+?)', preg_quote(str_replace('/', DIRECTORY_SEPARATOR, $path), '~')).'~', str_replace('/', DIRECTORY_SEPARATOR, $file), $match);
-        if (isset($match[$prefix]))
-        {
-          $localPrefix = $match[$prefix].'/';
+        $configuration = sfProjectConfiguration::getActive();
+
+        $pluginPaths = $configuration->getPluginPaths();
+        $pluginConfigFiles = array();
+
+        // move plugin files to front
+        foreach ($configFiles as $i => $configFile) {
+            $configFilePath = str_replace(DIRECTORY_SEPARATOR, '/', $configFile);
+            $path = str_replace(DIRECTORY_SEPARATOR, '/', realpath(implode('/', array_slice(explode('/', $configFilePath), 0, -2))));
+            if (in_array($path, $pluginPaths)) {
+                $pluginConfigFiles[] = $configFile;
+                unset($configFiles[$i]);
+            }
         }
-      }
 
-      $mapping[$localPrefix.strtolower($class)] = $file;
-    }
+        $configFiles = array_merge($pluginConfigFiles, $configFiles);
 
-    return $mapping;
-  }
+        $config = static::replaceConstants(static::parseYamls($configFiles));
 
-  /**
-   * @see sfConfigHandler
-   * @inheritdoc
-   */
-  static public function getConfiguration(array $configFiles)
-  {
-    $configuration = sfProjectConfiguration::getActive();
+        foreach ($config['autoload'] as $name => $values) {
+            if (isset($values['path'])) {
+                $config['autoload'][$name]['path'] = static::replacePath($values['path']);
+            }
+        }
 
-    $pluginPaths = $configuration->getPluginPaths();
-    $pluginConfigFiles = array();
+        $event = $configuration->getEventDispatcher()->filter(new sfEvent(__CLASS__, 'autoload.filter_config'), $config);
+        $config = $event->getReturnValue();
 
-    // move plugin files to front
-    foreach ($configFiles as $i => $configFile)
-    {
-      $configFilePath = str_replace(DIRECTORY_SEPARATOR, '/', $configFile);
-      $path = str_replace(DIRECTORY_SEPARATOR, '/', realpath(implode('/', array_slice(explode('/', $configFilePath), 0, -2))));
-      if (in_array($path, $pluginPaths))
-      {
-        $pluginConfigFiles[] = $configFile;
-        unset($configFiles[$i]);
-      }
+        return $config;
     }
 
-    $configFiles = array_merge($pluginConfigFiles, $configFiles);
-
-    $config = static::replaceConstants(static::parseYamls($configFiles));
-
-    foreach ($config['autoload'] as $name => $values)
+    protected function parse(array $configFiles)
     {
-      if (isset($values['path']))
-      {
-        $config['autoload'][$name]['path'] = static::replacePath($values['path']);
-      }
-    }
-
-    $event = $configuration->getEventDispatcher()->filter(new sfEvent(__CLASS__, 'autoload.filter_config'), $config);
-    $config = $event->getReturnValue();
+        // parse the yaml
+        $config = static::getConfiguration($configFiles);
+
+        $mappings = array();
+        foreach ($config['autoload'] as $name => $entry) {
+            $mapping = array();
+
+            // file mapping or directory mapping?
+            if (isset($entry['files'])) {
+                // file mapping
+                foreach ($entry['files'] as $class => $file) {
+                    $mapping[strtolower($class)] = $file;
+                }
+            } else {
+                // directory mapping
+                $ext = isset($entry['ext']) ? $entry['ext'] : '.php';
+                $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();
+
+                // recursive mapping?
+                $recursive = isset($entry['recursive']) ? $entry['recursive'] : false;
+                if (!$recursive) {
+                    $finder->maxdepth(0);
+                }
+
+                // exclude files or directories?
+                if (isset($entry['exclude']) && is_array($entry['exclude'])) {
+                    $finder->prune($entry['exclude'])->discard($entry['exclude']);
+                }
+
+                if ($matches = glob($path)) {
+                    foreach ($finder->in($matches) as $file) {
+                        $mapping = array_merge($mapping, $this->parseFile($path, $file, isset($entry['prefix']) ? $entry['prefix'] : ''));
+                    }
+                }
+            }
+
+            $mappings[$name] = $mapping;
+        }
 
-    return $config;
-  }
+        return $mappings;
+    }
 }
diff --git a/lib/config/sfCacheConfigHandler.class.php b/lib/config/sfCacheConfigHandler.class.php
index ae826c8d0..4e64bf451 100644
--- a/lib/config/sfCacheConfigHandler.class.php
+++ b/lib/config/sfCacheConfigHandler.class.php
@@ -11,105 +11,110 @@
 /**
  * sfCacheConfigHandler allows you to configure cache.
  *
- * @package    symfony
- * @subpackage config
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfCacheConfigHandler extends sfYamlConfigHandler
 {
-  protected
-    $cacheConfig = array();
-
-  /**
-   * Executes this configuration handler.
-   *
-   * @param array $configFiles An array of absolute filesystem path to a configuration file
-   *
-   * @return string Data to be written to a cache file
-   *
-   * @throws <b>sfConfigurationException</b> If a requested configuration file does not exist or is not readable
-   * @throws <b>sfParseException</b> If a requested configuration file is improperly formatted
-   * @throws <b>sfInitializationException</b> If a cache.yml key check fails
-   */
-  public function execute($configFiles)
-  {
-    // parse the yaml
-    $this->yamlConfig = static::getConfiguration($configFiles);
-
-    // iterate through all action names
-    $data  = array();
-    $first = true;
-    foreach ($this->yamlConfig as $actionName => $values)
+    protected $cacheConfig = array();
+
+    /**
+     * Executes this configuration handler.
+     *
+     * @param array $configFiles An array of absolute filesystem path to a configuration file
+     *
+     * @return string Data to be written to a cache file
+     *
+     * @throws <b>sfConfigurationException</b> If a requested configuration file does not exist or is not readable
+     * @throws <b>sfParseException</b> If a requested configuration file is improperly formatted
+     * @throws <b>sfInitializationException</b> If a cache.yml key check fails
+     */
+    public function execute($configFiles)
     {
-      if ($actionName == 'all')
-      {
-        continue;
-      }
-
-      $data[] = $this->addCache($actionName);
-
-      $first = false;
+        // parse the yaml
+        $this->yamlConfig = static::getConfiguration($configFiles);
+
+        // iterate through all action names
+        $data = array();
+        $first = true;
+        foreach ($this->yamlConfig as $actionName => $values) {
+            if ('all' == $actionName) {
+                continue;
+            }
+
+            $data[] = $this->addCache($actionName);
+
+            $first = false;
+        }
+
+        // general cache configuration
+        $data[] = $this->addCache('DEFAULT');
+
+        // compile data
+        $retval = sprintf(
+            "<?php\n".
+                          "// auto-generated by sfCacheConfigHandler\n".
+                          "// date: %s\n%s\n",
+            date('Y/m/d H:i:s'),
+            implode('', $data)
+        );
+
+        return $retval;
     }
 
-    // general cache configuration
-    $data[] = $this->addCache('DEFAULT');
+    /**
+     * @see sfConfigHandler
+     * {@inheritdoc}
+     */
+    public static function getConfiguration(array $configFiles)
+    {
+        return static::flattenConfiguration(static::parseYamls($configFiles));
+    }
 
-    // compile data
-    $retval = sprintf("<?php\n".
-                      "// auto-generated by sfCacheConfigHandler\n".
-                      "// date: %s\n%s\n",
-                      date('Y/m/d H:i:s'), implode('', $data));
+    /**
+     * Returns a single addCache statement.
+     *
+     * @param string $actionName The action name
+     *
+     * @return string PHP code for the addCache statement
+     */
+    protected function addCache($actionName = '')
+    {
+        $data = array();
 
-    return $retval;
-  }
+        // enabled?
+        $enabled = $this->getConfigValue('enabled', $actionName);
 
-  /**
-   * Returns a single addCache statement.
-   *
-   * @param string $actionName The action name
-   *
-   * @return string PHP code for the addCache statement
-   */
-  protected function addCache($actionName = '')
-  {
-    $data = array();
+        // cache with or without loayout
+        $withLayout = $this->getConfigValue('with_layout', $actionName) ? 'true' : 'false';
 
-    // enabled?
-    $enabled = $this->getConfigValue('enabled', $actionName);
+        // lifetime
+        $lifeTime = !$enabled ? '0' : $this->getConfigValue('lifetime', $actionName, '0');
 
-    // cache with or without loayout
-    $withLayout = $this->getConfigValue('with_layout', $actionName) ? 'true' : 'false';
+        // client_lifetime
+        $clientLifetime = !$enabled ? '0' : $this->getConfigValue('client_lifetime', $actionName, $lifeTime, '0');
 
-    // lifetime
-    $lifeTime = !$enabled ? '0' : $this->getConfigValue('lifetime', $actionName, '0');
+        // contextual
+        $contextual = $this->getConfigValue('contextual', $actionName) ? 'true' : 'false';
 
-    // client_lifetime
-    $clientLifetime = !$enabled ? '0' : $this->getConfigValue('client_lifetime', $actionName, $lifeTime, '0');
+        // vary
+        $vary = $this->getConfigValue('vary', $actionName, array());
+        if (!is_array($vary)) {
+            $vary = array($vary);
+        }
 
-    // contextual
-    $contextual = $this->getConfigValue('contextual', $actionName) ? 'true' : 'false';
+        // add cache information to cache manager
+        $data[] = sprintf(
+            "\$this->addCache(\$moduleName, '%s', array('withLayout' => %s, 'lifeTime' => %s, 'clientLifeTime' => %s, 'contextual' => %s, 'vary' => %s));\n",
+            $actionName,
+            $withLayout,
+            $lifeTime,
+            $clientLifetime,
+            $contextual,
+            str_replace("\n", '', var_export($vary, true))
+        );
 
-    // vary
-    $vary = $this->getConfigValue('vary', $actionName, array());
-    if (!is_array($vary))
-    {
-      $vary = array($vary);
+        return implode("\n", $data);
     }
-
-    // add cache information to cache manager
-    $data[] = sprintf("\$this->addCache(\$moduleName, '%s', array('withLayout' => %s, 'lifeTime' => %s, 'clientLifeTime' => %s, 'contextual' => %s, 'vary' => %s));\n",
-                      $actionName, $withLayout, $lifeTime, $clientLifetime, $contextual, str_replace("\n", '', var_export($vary, true)));
-
-    return implode("\n", $data);
-  }
-
-  /**
-   * @see sfConfigHandler
-   * @inheritdoc
-   */
-  static public function getConfiguration(array $configFiles)
-  {
-    return static::flattenConfiguration(static::parseYamls($configFiles));
-  }
 }
diff --git a/lib/config/sfCompileConfigHandler.class.php b/lib/config/sfCompileConfigHandler.class.php
index bac091ef4..149156991 100644
--- a/lib/config/sfCompileConfigHandler.class.php
+++ b/lib/config/sfCompileConfigHandler.class.php
@@ -13,82 +13,80 @@
  * sfCompileConfigHandler gathers multiple files and puts them into a single file.
  * Upon creation of the new file, all comments and blank lines are removed.
  *
- * @package    symfony
- * @subpackage config
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 class sfCompileConfigHandler extends sfYamlConfigHandler
 {
-  /**
-   * Executes this configuration handler.
-   *
-   * @param array $configFiles An array of absolute filesystem path to a configuration file
-   *
-   * @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
-   */
-  public function execute($configFiles)
-  {
-    // parse the yaml
-    $config = static::getConfiguration($configFiles);
+    /**
+     * Executes this configuration handler.
+     *
+     * @param array $configFiles An array of absolute filesystem path to a configuration file
+     *
+     * @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
+     */
+    public function execute($configFiles)
+    {
+        // parse the yaml
+        $config = static::getConfiguration($configFiles);
 
-    // init our data
-    $data = '';
+        // init our data
+        $data = '';
 
-    // let's do our fancy work
-    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));
-      }
+        // let's do our fancy work
+        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));
+            }
 
-      $contents = file_get_contents($file);
+            $contents = file_get_contents($file);
 
-      // strip comments (not in debug mode)
-      if (!sfConfig::get('sf_debug'))
-      {
-        $contents = sfToolkit::stripComments($contents);
-      }
+            // strip comments (not in debug mode)
+            if (!sfConfig::get('sf_debug')) {
+                $contents = sfToolkit::stripComments($contents);
+            }
 
-      // strip php tags
-      $contents = sfToolkit::pregtr($contents, array('/^\s*<\?(php\s*)?/m' => '', '/^\s*\?>/m' => ''));
+            // strip php tags
+            $contents = sfToolkit::pregtr($contents, array('/^\s*<\?(php\s*)?/m' => '', '/^\s*\?>/m' => ''));
 
-      // replace windows and mac format with unix format
-      $contents = str_replace("\r", "\n", $contents);
+            // 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);
+            // replace multiple new lines with a single newline
+            $contents = preg_replace(array('/\s+$/Sm', '/\n+/S'), "\n", $contents);
 
-      // append file data
-      $data .= "\n".$contents;
-    }
+            // append file data
+            $data .= "\n".$contents;
+        }
 
-    // compile data
-    return sprintf("<?php\n".
-                      "// auto-generated by sfCompileConfigHandler\n".
-                      "// date: %s\n".
-                      "%s\n",
-                      date('Y/m/d H:i:s'), $data);
-  }
+        // compile data
+        return sprintf(
+            "<?php\n".
+                          "// auto-generated by sfCompileConfigHandler\n".
+                          "// date: %s\n".
+                          "%s\n",
+            date('Y/m/d H:i:s'),
+            $data
+        );
+    }
 
-  /**
-   * @see sfConfigHandler
-   * @inheritdoc
-   */
-  static public function getConfiguration(array $configFiles)
-  {
-    $config = array();
-    foreach ($configFiles as $configFile)
+    /**
+     * @see sfConfigHandler
+     * {@inheritdoc}
+     */
+    public static function getConfiguration(array $configFiles)
     {
-      $config = array_merge($config, static::parseYaml($configFile));
-    }
+        $config = array();
+        foreach ($configFiles as $configFile) {
+            $config = array_merge($config, static::parseYaml($configFile));
+        }
 
-    return static::replacePath(static::replaceConstants($config));
-  }
+        return static::replacePath(static::replaceConstants($config));
+    }
 }
diff --git a/lib/config/sfConfig.class.php b/lib/config/sfConfig.class.php
index ffea69db6..7be4530bd 100644
--- a/lib/config/sfConfig.class.php
+++ b/lib/config/sfConfig.class.php
@@ -11,82 +11,80 @@
 /**
  * sfConfig stores all configuration information for a symfony application.
  *
- * @package    symfony
- * @subpackage config
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfConfig
 {
-  protected static
-    $config = array();
+    protected static $config = array();
 
-  /**
-   * Retrieves a config parameter.
-   *
-   * @param string $name    A config parameter name
-   * @param mixed  $default A default config parameter value
-   *
-   * @return mixed A config parameter value, if the config parameter exists, otherwise null
-   */
-  public static function get($name, $default = null)
-  {
-    return isset(self::$config[$name]) ? self::$config[$name] : $default;
-  }
+    /**
+     * Retrieves a config parameter.
+     *
+     * @param string $name    A config parameter name
+     * @param mixed  $default A default config parameter value
+     *
+     * @return mixed A config parameter value, if the config parameter exists, otherwise null
+     */
+    public static function get($name, $default = null)
+    {
+        return isset(self::$config[$name]) ? self::$config[$name] : $default;
+    }
 
-  /**
-   * Indicates whether or not a config parameter exists.
-   *
-   * @param string $name A config parameter name
-   *
-   * @return bool true, if the config parameter exists, otherwise false
-   */
-  public static function has($name)
-  {
-    return array_key_exists($name, self::$config);
-  }
+    /**
+     * Indicates whether or not a config parameter exists.
+     *
+     * @param string $name A config parameter name
+     *
+     * @return bool true, if the config parameter exists, otherwise false
+     */
+    public static function has($name)
+    {
+        return array_key_exists($name, self::$config);
+    }
 
-  /**
-   * Sets a config parameter.
-   *
-   * If a config parameter with the name already exists the value will be overridden.
-   *
-   * @param string $name  A config parameter name
-   * @param mixed  $value A config parameter value
-   */
-  public static function set($name, $value)
-  {
-    self::$config[$name] = $value;
-  }
+    /**
+     * Sets a config parameter.
+     *
+     * If a config parameter with the name already exists the value will be overridden.
+     *
+     * @param string $name  A config parameter name
+     * @param mixed  $value A config parameter value
+     */
+    public static function set($name, $value)
+    {
+        self::$config[$name] = $value;
+    }
 
-  /**
-   * Sets an array of config parameters.
-   *
-   * If an existing config parameter name matches any of the keys in the supplied
-   * array, the associated value will be overridden.
-   *
-   * @param array $parameters An associative array of config parameters and their associated values
-   */
-  public static function add($parameters = array())
-  {
-    self::$config = array_merge(self::$config, $parameters);
-  }
+    /**
+     * Sets an array of config parameters.
+     *
+     * If an existing config parameter name matches any of the keys in the supplied
+     * array, the associated value will be overridden.
+     *
+     * @param array $parameters An associative array of config parameters and their associated values
+     */
+    public static function add($parameters = array())
+    {
+        self::$config = array_merge(self::$config, $parameters);
+    }
 
-  /**
-   * Retrieves all configuration parameters.
-   *
-   * @return array An associative array of configuration parameters.
-   */
-  public static function getAll()
-  {
-    return self::$config;
-  }
+    /**
+     * Retrieves all configuration parameters.
+     *
+     * @return array an associative array of configuration parameters
+     */
+    public static function getAll()
+    {
+        return self::$config;
+    }
 
-  /**
-   * Clears all current config parameters.
-   */
-  public static function clear()
-  {
-    self::$config = array();
-  }
+    /**
+     * Clears all current config parameters.
+     */
+    public static function clear()
+    {
+        self::$config = array();
+    }
 }
diff --git a/lib/config/sfConfigCache.class.php b/lib/config/sfConfigCache.class.php
index 7486bf06d..975eae7e2 100644
--- a/lib/config/sfConfigCache.class.php
+++ b/lib/config/sfConfigCache.class.php
@@ -14,379 +14,341 @@
  * make it easy-to-use, yet still provide a PHP formatted result for direct
  * inclusion into your modules.
  *
- * @package    symfony
- * @subpackage config
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 class sfConfigCache
 {
-  protected
-    $configuration = null,
-    $handlers      = array(),
-    $userHandlers  = array();
-
-  /**
-   * Constructor
-   *
-   * @param sfApplicationConfiguration $configuration A sfApplicationConfiguration instance
-   */
-  public function __construct(sfApplicationConfiguration $configuration)
-  {
-    $this->configuration = $configuration;
-  }
-
-  /**
-   * Loads a configuration handler.
-   *
-   * @param string $handler The handler to use when parsing a configuration file
-   * @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 <b>sfConfigurationException</b> If a requested configuration file does not have an associated configuration handler
-   */
-  protected function callHandler($handler, $configs, $cache)
-  {
-    if (count($this->handlers) == 0)
+    protected $configuration;
+    protected $handlers = array();
+    protected $userHandlers = array();
+
+    /**
+     * Constructor.
+     *
+     * @param sfApplicationConfiguration $configuration A sfApplicationConfiguration instance
+     */
+    public function __construct(sfApplicationConfiguration $configuration)
     {
-      // we need to load the handlers first
-      $this->loadConfigHandlers();
+        $this->configuration = $configuration;
     }
 
-    if (count($this->userHandlers) != 0)
+    /**
+     * Checks to see if a configuration file has been modified and if so
+     * recompile the cache file associated with it.
+     *
+     * The recompilation only occurs in a non debug environment.
+     *
+     * If the configuration file path is relative, symfony will look in directories
+     * defined in the sfConfiguration::getConfigPaths() method.
+     *
+     * @param string $configPath A filesystem path to a configuration file
+     * @param bool   $optional   If true, config path does not need to exist
+     *
+     * @return string An absolute filesystem path to the cache filename associated with this specified configuration file
+     *
+     * @throws <b>sfConfigurationException</b> If a requested configuration file does not exist
+     *
+     * @see sfConfiguration::getConfigPaths()
+     */
+    public function checkConfig($configPath, $optional = false)
     {
-      // we load user defined handlers
-      $this->mergeUserConfigHandlers();
-    }
+        if (sfConfig::get('sf_debug') && sfConfig::get('sf_logging_enabled')) {
+            $timer = sfTimerManager::getTimer('Configuration');
+        }
 
-    // handler instance to call for this configuration file
-    $handlerInstance = null;
+        // the cache filename we'll be using
+        $cache = $this->getCacheName($configPath);
 
-    $handler = str_replace(DIRECTORY_SEPARATOR, '/', $handler);
+        if (!sfConfig::get('sf_debug') && !sfConfig::get('sf_test') && is_readable($cache)) {
+            return $cache;
+        }
 
-    // grab the base name of the handler
-    $basename = basename($handler);
-    if (isset($this->handlers[$handler]))
-    {
-      // we have a handler associated with the full configuration path
-      $handlerInstance = $this->getHandler($handler);
-    }
-    else if (isset($this->handlers[$basename]))
-    {
-      // we have a handler associated with the configuration base name
-      $handlerInstance = $this->getHandler($basename);
-    }
-    else
-    {
-      // 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();
-
-        // create pattern from config
-        if (preg_match('#'.$pattern.'$#', $handler, $matches))
-        {
-          $handlerInstance = $this->getHandler($key);
-          array_shift($matches);
-          $handlerInstance->getParameterHolder()->set('wildcardValues', $matches);
-
-          break;
+        if (!sfToolkit::isPathAbsolute($configPath)) {
+            $files = $this->configuration->getConfigPaths($configPath);
+        } else {
+            $files = is_readable($configPath) ? array($configPath) : array();
         }
-      }
-    }
 
-    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)));
-    }
+        if (!isset($files[0])) {
+            if ($optional) {
+                return null;
+            }
 
-    // call the handler and retrieve the cache data
-    $data = $handlerInstance->execute($configs);
-
-    $this->writeCacheFile($handler, $cache, $data);
-  }
-
-  /**
-   * Returns the config handler configured for the given name
-   *
-   * @param string $name The config handler name
-   *
-   * @return sfConfigHandler A sfConfigHandler instance
-   */
-  protected function getHandler($name)
-  {
-    if (is_array($this->handlers[$name]))
-    {
-      $class = $this->handlers[$name][0];
-      $this->handlers[$name] = new $class($this->handlers[$name][1]);
-    }
+            // configuration does not exist
+            throw new sfConfigurationException(sprintf('Configuration "%s" does not exist or is unreadable.', $configPath));
+        }
 
-    return $this->handlers[$name];
-  }
-
-  /**
-   * Checks to see if a configuration file has been modified and if so
-   * recompile the cache file associated with it.
-   *
-   * The recompilation only occurs in a non debug environment.
-   *
-   * If the configuration file path is relative, symfony will look in directories
-   * defined in the sfConfiguration::getConfigPaths() method.
-   *
-   * @param string  $configPath A filesystem path to a configuration file
-   * @param boolean $optional   If true, config path does not need to exist
-   *
-   * @return string An absolute filesystem path to the cache filename associated with this specified configuration file
-   *
-   * @throws <b>sfConfigurationException</b> 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');
-    }
+        // find the more recent configuration file last modification time
+        $mtime = 0;
+        foreach ($files as $file) {
+            if (filemtime($file) > $mtime) {
+                $mtime = filemtime($file);
+            }
+        }
 
-    // the cache filename we'll be using
-    $cache = $this->getCacheName($configPath);
+        if (!is_readable($cache) || $mtime > filemtime($cache)) {
+            // configuration has changed so we need to reparse it
+            $this->callHandler($configPath, $files, $cache);
+        }
 
-    if (!sfConfig::get('sf_debug') && !sfConfig::get('sf_test') && is_readable($cache))
-    {
-      return $cache;
-    }
+        if (sfConfig::get('sf_debug') && sfConfig::get('sf_logging_enabled')) {
+            // @var $timer sfTimer
+            $timer->addTime();
+        }
 
-    if (!sfToolkit::isPathAbsolute($configPath))
-    {
-      $files = $this->configuration->getConfigPaths($configPath);
+        return $cache;
     }
-    else
+
+    /**
+     * Clears all configuration cache files.
+     */
+    public function clear()
     {
-      $files = is_readable($configPath) ? array($configPath) : array();
+        sfToolkit::clearDirectory(sfConfig::get('sf_config_cache_dir'));
     }
 
-    if (!isset($files[0]))
+    /**
+     * Converts a normal filename into a cache filename.
+     *
+     * @param string $config A normal filename
+     *
+     * @return string An absolute filesystem path to a cache filename
+     */
+    public function getCacheName($config)
     {
-      if ($optional)
-      {
-        return null;
-      }
+        if (strlen($config) > 3 && ctype_alpha($config[0]) && ':' == $config[1] && ('\\' == $config[2] || '/' == $config[2])) {
+            // file is a windows absolute path, strip off the drive letter
+            $config = substr($config, 3);
+        }
 
-      // configuration does not exist
-      throw new sfConfigurationException(sprintf('Configuration "%s" does not exist or is unreadable.', $configPath));
-    }
+        // replace unfriendly filename characters with an underscore
+        $config = str_replace(array('\\', '/', ' '), '_', $config);
+        $config .= '.php';
 
-    // find the more recent configuration file last modification time
-    $mtime = 0;
-    foreach ($files as $file)
-    {
-      if (filemtime($file) > $mtime)
-      {
-        $mtime = filemtime($file);
-      }
+        return sfConfig::get('sf_config_cache_dir').'/'.$config;
     }
 
-    if (!is_readable($cache) || $mtime > filemtime($cache))
+    /**
+     * Imports a configuration file.
+     *
+     * @param string $config   A filesystem path to a configuration file
+     * @param bool   $once     Only allow this configuration file to be included once per request?
+     * @param bool   $optional Only include if true
+     *
+     * @see checkConfig()
+     */
+    public function import($config, $once = true, $optional = false)
     {
-      // configuration has changed so we need to reparse it
-      $this->callHandler($configPath, $files, $cache);
-    }
+        $cache = $this->checkConfig($config, $optional);
 
-    if (sfConfig::get('sf_debug') && sfConfig::get('sf_logging_enabled'))
-    {
-      /** @var $timer sfTimer */
-      $timer->addTime();
+        if ($optional && !$cache) {
+            return;
+        }
+
+        // include cache file
+        if ($once) {
+            include_once $cache;
+        } else {
+            include $cache;
+        }
     }
 
-    return $cache;
-  }
-
-  /**
-   * Clears all configuration cache files.
-   */
-  public function clear()
-  {
-    sfToolkit::clearDirectory(sfConfig::get('sf_config_cache_dir'));
-  }
-
-  /**
-   * Converts a normal filename into a cache filename.
-   *
-   * @param string $config A normal filename
-   *
-   * @return string An absolute filesystem path to a cache filename
-   */
-  public function getCacheName($config)
-  {
-    if (strlen($config) > 3 && ctype_alpha($config[0]) && $config[1] == ':' && ($config[2] == '\\' || $config[2] == '/'))
+    /**
+     * Registers a configuration handler.
+     *
+     * @param string $handler The handler to use when parsing a configuration file
+     * @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())
     {
-      // file is a windows absolute path, strip off the drive letter
-      $config = substr($config, 3);
+        $this->userHandlers[$handler] = new $class($params);
     }
 
-    // replace unfriendly filename characters with an underscore
-    $config  = str_replace(array('\\', '/', ' '), '_', $config);
-    $config .= '.php';
-
-    return sfConfig::get('sf_config_cache_dir').'/'.$config;
-  }
-
-  /**
-   * Imports a configuration file.
-   *
-   * @param string $config   A filesystem path to a configuration file
-   * @param bool   $once     Only allow this configuration file to be included once per request?
-   * @param bool   $optional Only include if true
-   *
-   * @see checkConfig()
-   */
-  public function import($config, $once = true, $optional = false)
-  {
-    $cache = $this->checkConfig($config, $optional);
-
-    if ($optional && !$cache)
+    /**
+     * Loads a configuration handler.
+     *
+     * @param string $handler The handler to use when parsing a configuration file
+     * @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 <b>sfConfigurationException</b> If a requested configuration file does not have an associated configuration handler
+     */
+    protected function callHandler($handler, $configs, $cache)
     {
-      return;
+        if (0 == count($this->handlers)) {
+            // we need to load the handlers first
+            $this->loadConfigHandlers();
+        }
+
+        if (0 != count($this->userHandlers)) {
+            // we load user defined handlers
+            $this->mergeUserConfigHandlers();
+        }
+
+        // handler instance to call for this configuration file
+        $handlerInstance = null;
+
+        $handler = str_replace(DIRECTORY_SEPARATOR, '/', $handler);
+
+        // grab the base name of the handler
+        $basename = basename($handler);
+        if (isset($this->handlers[$handler])) {
+            // we have a handler associated with the full configuration path
+            $handlerInstance = $this->getHandler($handler);
+        } elseif (isset($this->handlers[$basename])) {
+            // we have a handler associated with the configuration base name
+            $handlerInstance = $this->getHandler($basename);
+        } else {
+            // 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();
+
+                // create pattern from config
+                if (preg_match('#'.$pattern.'$#', $handler, $matches)) {
+                    $handlerInstance = $this->getHandler($key);
+                    array_shift($matches);
+                    $handlerInstance->getParameterHolder()->set('wildcardValues', $matches);
+
+                    break;
+                }
+            }
+        }
+
+        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)));
+        }
+
+        // call the handler and retrieve the cache data
+        $data = $handlerInstance->execute($configs);
+
+        $this->writeCacheFile($handler, $cache, $data);
     }
 
-    // include cache file
-    if ($once)
+    /**
+     * Returns the config handler configured for the given name.
+     *
+     * @param string $name The config handler name
+     *
+     * @return sfConfigHandler A sfConfigHandler instance
+     */
+    protected function getHandler($name)
     {
-      include_once($cache);
+        if (is_array($this->handlers[$name])) {
+            $class = $this->handlers[$name][0];
+            $this->handlers[$name] = new $class($this->handlers[$name][1]);
+        }
+
+        return $this->handlers[$name];
     }
-    else
+
+    /**
+     * Loads all configuration application and module level handlers.
+     *
+     * @throws <b>sfConfigurationException</b> If a configuration related error occurs
+     */
+    protected function loadConfigHandlers()
     {
-      include($cache);
-    }
-  }
+        // manually create our config_handlers.yml handler
+        $this->handlers['config_handlers.yml'] = new sfRootConfigHandler();
 
-  /**
-   * Loads all configuration application and module level handlers.
-   *
-   * @throws <b>sfConfigurationException</b> If a configuration related error occurs.
-   */
-  protected function loadConfigHandlers()
-  {
-    // manually create our config_handlers.yml handler
-    $this->handlers['config_handlers.yml'] = new sfRootConfigHandler();
+        // application configuration handlers
 
-    // application configuration handlers
+        require $this->checkConfig('config/config_handlers.yml');
 
-    require $this->checkConfig('config/config_handlers.yml');
+        // module level configuration handlers
 
-    // module level configuration handlers
+        // checks modules directory exists
+        if (!is_readable($sf_app_module_dir = sfConfig::get('sf_app_module_dir'))) {
+            return;
+        }
 
-    // checks modules directory exists
-    if (!is_readable($sf_app_module_dir = sfConfig::get('sf_app_module_dir')))
-    {
-      return;
-    }
+        // ignore names
+        $ignore = array('.', '..', 'CVS', '.svn');
 
-    // ignore names
-    $ignore = array('.', '..', 'CVS', '.svn');
+        // create a file pointer to the module dir
+        $fp = opendir($sf_app_module_dir);
 
-    // create a file pointer to the module dir
-    $fp = opendir($sf_app_module_dir);
+        // loop through the directory and grab the modules
+        while (($directory = readdir($fp)) !== false) {
+            if (in_array($directory, $ignore)) {
+                continue;
+            }
 
-    // loop through the directory and grab the modules
-    while (($directory = readdir($fp)) !== false)
-    {
-      if (in_array($directory, $ignore))
-      {
-        continue;
-      }
+            $configPath = $sf_app_module_dir.'/'.$directory.'/config/config_handlers.yml';
 
-      $configPath = $sf_app_module_dir.'/'.$directory.'/config/config_handlers.yml';
+            if (is_readable($configPath)) {
+                // initialize the root configuration handler with this module name
+                $params = array('module_level' => true, 'module_name' => $directory);
 
-      if (is_readable($configPath))
-      {
-        // initialize the root configuration handler with this module name
-        $params = array('module_level' => true, 'module_name' => $directory);
+                $this->handlers['config_handlers.yml']->initialize($params);
 
-        $this->handlers['config_handlers.yml']->initialize($params);
+                // replace module dir path with a special keyword that
+                // checkConfig knows how to use
+                $configPath = 'modules/'.$directory.'/config/config_handlers.yml';
 
-        // replace module dir path with a special keyword that
-        // checkConfig knows how to use
-        $configPath = 'modules/'.$directory.'/config/config_handlers.yml';
+                require $this->checkConfig($configPath);
+            }
+        }
 
-        require $this->checkConfig($configPath);
-      }
+        // close file pointer
+        closedir($fp);
     }
 
-    // close file pointer
-    closedir($fp);
-  }
-
-  /**
-   * Writes a cache file.
-   *
-   * @param string $config An absolute filesystem path to a configuration file
-   * @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
-   */
-  protected function writeCacheFile($config, $cache, $data)
-  {
-    $current_umask = umask(0000);
-    $cacheDir      = dirname($cache);
-    if (!is_dir($cacheDir) && !@mkdir($cacheDir, 0777, true) && !is_dir($cacheDir))
+    /**
+     * Writes a cache file.
+     *
+     * @param string $config An absolute filesystem path to a configuration file
+     * @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
+     */
+    protected function writeCacheFile($config, $cache, $data)
     {
-        throw new \sfCacheException(sprintf('Failed to make cache directory "%s" while generating cache for configuration file "%s".', $cacheDir, $config));
-    }
+        $current_umask = umask(0000);
+        $cacheDir = dirname($cache);
+        if (!is_dir($cacheDir) && !@mkdir($cacheDir, 0777, true) && !is_dir($cacheDir)) {
+            throw new \sfCacheException(sprintf('Failed to make cache directory "%s" while generating cache for configuration file "%s".', $cacheDir, $config));
+        }
 
-    $tmpFile = tempnam($cacheDir, basename($cache));
+        $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));
-    }
+        if (!$fp = @fopen($tmpFile, 'wb')) {
+            throw new sfCacheException(sprintf('Failed to write cache file "%s" generated from configuration file "%s".', $tmpFile, $config));
+        }
 
-    @fwrite($fp, $data);
-    @fclose($fp);
+        @fwrite($fp, $data);
+        @fclose($fp);
 
-    // Hack from Agavi (http://trac.agavi.org/changeset/3979)
-    // With php < 5.2.6 on win32, renaming to an already existing file doesn't work, but copy does,
-    // so we simply assume that when rename() fails that we are on win32 and try to use copy()
-    if (!@rename($tmpFile, $cache))
-    {
-      if (copy($tmpFile, $cache))
-      {
-        unlink($tmpFile);
-      }
+        // Hack from Agavi (http://trac.agavi.org/changeset/3979)
+        // With php < 5.2.6 on win32, renaming to an already existing file doesn't work, but copy does,
+        // so we simply assume that when rename() fails that we are on win32 and try to use copy()
+        if (!@rename($tmpFile, $cache)) {
+            if (copy($tmpFile, $cache)) {
+                unlink($tmpFile);
+            }
+        }
+
+        chmod($cache, 0666);
+        umask($current_umask);
     }
 
-    chmod($cache, 0666);
-    umask($current_umask);
-  }
-
-  /**
-   * Registers a configuration handler.
-   *
-   * @param string $handler The handler to use when parsing a configuration file
-   * @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())
-  {
-    $this->userHandlers[$handler] = new $class($params);
-  }
-
-  /**
-   * Merges configuration handlers from the config_handlers.yml
-   * and the ones defined with registerConfigHandler()
-   *
-   */
-  protected function mergeUserConfigHandlers()
-  {
-    // user defined configuration handlers
-    $this->handlers = array_merge($this->handlers, $this->userHandlers);
-
-    $this->userHandlers = array();
-  }
+    /**
+     * Merges configuration handlers from the config_handlers.yml
+     * and the ones defined with registerConfigHandler().
+     */
+    protected function mergeUserConfigHandlers()
+    {
+        // user defined configuration handlers
+        $this->handlers = array_merge($this->handlers, $this->userHandlers);
+
+        $this->userHandlers = array();
+    }
 }
diff --git a/lib/config/sfConfigHandler.class.php b/lib/config/sfConfigHandler.class.php
index 40b650759..728033f8f 100644
--- a/lib/config/sfConfigHandler.class.php
+++ b/lib/config/sfConfigHandler.class.php
@@ -14,122 +14,113 @@
  * file pertaining to any information they like and still have it auto-generate
  * PHP code.
  *
- * @package    symfony
- * @subpackage config
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfConfigHandler
 {
-  /** @var sfParameterHolder */
-  protected
-    $parameterHolder = null;
-
-  /**
-   * Class constructor.
-   *
-   * @see initialize()
-   * @param array|null $parameters
-   */
-  public function __construct($parameters = null)
-  {
-    $this->initialize($parameters);
-  }
-
-  /**
-   * Initializes this configuration handler.
-   *
-   * @param array $parameters An associative array of initialization parameters
-   *
-   * @return void
-   *
-   * @throws <b>sfInitializationException</b> If an error occurs while initializing this ConfigHandler
-   */
-  public function initialize($parameters = null)
-  {
-    $this->parameterHolder = new sfParameterHolder();
-    $this->parameterHolder->add($parameters);
-  }
-
-  /**
-   * Executes this configuration handler
-   *
-   * @param array $configFiles An array of filesystem path to a configuration file
-   *
-   * @return string Data to be written to a cache file
-   *
-   * @throws <b>sfConfigurationException</b> If a requested configuration file does not exist or is not readable
-   * @throws <b>sfParseException</b> If a requested configuration file is improperly formatted
-   */
-  abstract public function execute($configFiles);
+    /** @var sfParameterHolder */
+    protected $parameterHolder;
 
-  /**
-   * Replaces constant identifiers in a value.
-   *
-   * If the value is an array replacements are made recursively.
-   *
-   * @param mixed $value The value on which to run the replacement procedure
-   *
-   * @return string|mixed|array The new value
-   */
-  static public function replaceConstants($value)
-  {
-    if (is_array($value))
+    /**
+     * Class constructor.
+     *
+     * @see initialize()
+     *
+     * @param array|null $parameters
+     */
+    public function __construct($parameters = null)
     {
-      array_walk_recursive($value, function(& $value) { $value = sfToolkit::replaceConstants($value); });
+        $this->initialize($parameters);
     }
-    else
+
+    /**
+     * Initializes this configuration handler.
+     *
+     * @param array $parameters An associative array of initialization parameters
+     *
+     * @throws <b>sfInitializationException</b> If an error occurs while initializing this ConfigHandler
+     */
+    public function initialize($parameters = null)
     {
-      $value = sfToolkit::replaceConstants($value);
+        $this->parameterHolder = new sfParameterHolder();
+        $this->parameterHolder->add($parameters);
     }
 
-    return $value;
-  }
+    /**
+     * Executes this configuration handler.
+     *
+     * @param array $configFiles An array of filesystem path to a configuration file
+     *
+     * @return string Data to be written to a cache file
+     *
+     * @throws <b>sfConfigurationException</b> If a requested configuration file does not exist or is not readable
+     * @throws <b>sfParseException</b> If a requested configuration file is improperly formatted
+     */
+    abstract public function execute($configFiles);
 
-  /**
-   * Replaces a relative filesystem path with an absolute one.
-   *
-   * @param string $path A relative filesystem path
-   *
-   * @return string The new path
-   */
-  static public function replacePath($path)
-  {
-    if (is_array($path))
+    /**
+     * Replaces constant identifiers in a value.
+     *
+     * If the value is an array replacements are made recursively.
+     *
+     * @param mixed $value The value on which to run the replacement procedure
+     *
+     * @return array|mixed|string The new value
+     */
+    public static function replaceConstants($value)
     {
-      array_walk_recursive($path, function(&$path) { $path = sfConfigHandler::replacePath($path); });
+        if (is_array($value)) {
+            array_walk_recursive($value, function (&$value) { $value = sfToolkit::replaceConstants($value); });
+        } else {
+            $value = sfToolkit::replaceConstants($value);
+        }
+
+        return $value;
     }
-    else
+
+    /**
+     * Replaces a relative filesystem path with an absolute one.
+     *
+     * @param string $path A relative filesystem path
+     *
+     * @return string The new path
+     */
+    public static function replacePath($path)
     {
-      if (!sfToolkit::isPathAbsolute($path))
-      {
-        // not an absolute path so we'll prepend to it
-        $path = sfConfig::get('sf_app_dir').'/'.$path;
-      }
-    }
+        if (is_array($path)) {
+            array_walk_recursive($path, function (&$path) { $path = sfConfigHandler::replacePath($path); });
+        } else {
+            if (!sfToolkit::isPathAbsolute($path)) {
+                // not an absolute path so we'll prepend to it
+                $path = sfConfig::get('sf_app_dir').'/'.$path;
+            }
+        }
 
-    return $path;
-  }
+        return $path;
+    }
 
-  /**
-   * Gets the parameter holder for this configuration handler.
-   *
-   * @return sfParameterHolder A sfParameterHolder instance
-   */
-  public function getParameterHolder()
-  {
-    return $this->parameterHolder;
-  }
+    /**
+     * Gets the parameter holder for this configuration handler.
+     *
+     * @return sfParameterHolder A sfParameterHolder instance
+     */
+    public function getParameterHolder()
+    {
+        return $this->parameterHolder;
+    }
 
-  /**
-   * Returns the configuration for the current config handler.
-   *
-   * @param array $configFiles An array of ordered configuration files
-   * @throws LogicException no matter what
-   */
-  static public function getConfiguration(array $configFiles)
-  {
-    throw new LogicException('You must call the ::getConfiguration() method on a concrete config handler class');
-  }
+    /**
+     * Returns the configuration for the current config handler.
+     *
+     * @param array $configFiles An array of ordered configuration files
+     *
+     * @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');
+    }
 }
diff --git a/lib/config/sfDatabaseConfigHandler.class.php b/lib/config/sfDatabaseConfigHandler.class.php
index 224f8cdb0..027d861d4 100644
--- a/lib/config/sfDatabaseConfigHandler.class.php
+++ b/lib/config/sfDatabaseConfigHandler.class.php
@@ -14,137 +14,128 @@
  * configuration file that will be created for you automatically upon first
  * request.
  *
- * @package    symfony
- * @subpackage config
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 class sfDatabaseConfigHandler extends sfYamlConfigHandler
 {
-  /**
-   * Executes this configuration handler.
-   *
-   * @param array $configFiles An array of absolute filesystem path to a configuration file
-   *
-   * @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
-   */
-  public function execute($configFiles)
-  {
-    list($includes, $data) = $this->parse($configFiles);
-
-    foreach ($includes as $i => $include)
+    /**
+     * Executes this configuration handler.
+     *
+     * @param array $configFiles An array of absolute filesystem path to a configuration file
+     *
+     * @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
+     */
+    public function execute($configFiles)
     {
-      $includes[$i] = sprintf("require_once('%s');", $include);
-    }
-
-    foreach ($data as $name => $database)
-    {
-      $data[$name] = sprintf("\n'%s' => new %s(%s),", $name, $database[0], var_export($database[1], true));
-    }
+        list($includes, $data) = $this->parse($configFiles);
 
-    // compile data
-    return sprintf("<?php\n".
-                      "// auto-generated by sfDatabaseConfigHandler\n".
-                      "// date: %s\n%s\nreturn array(%s);\n",
-                      date('Y/m/d H:i:s'), implode("\n", $includes), implode("\n", $data));
-  }
+        foreach ($includes as $i => $include) {
+            $includes[$i] = sprintf("require_once('%s');", $include);
+        }
 
-  public function evaluate($configFiles)
-  {
-    list($includes, $data) = $this->parse($configFiles);
+        foreach ($data as $name => $database) {
+            $data[$name] = sprintf("\n'%s' => new %s(%s),", $name, $database[0], var_export($database[1], true));
+        }
 
-    foreach ($includes as $i => $include)
-    {
-      require_once($include);
+        // compile data
+        return sprintf(
+            "<?php\n".
+                          "// auto-generated by sfDatabaseConfigHandler\n".
+                          "// date: %s\n%s\nreturn array(%s);\n",
+            date('Y/m/d H:i:s'),
+            implode("\n", $includes),
+            implode("\n", $data)
+        );
     }
 
-    $databases = array();
-    foreach ($data as $name => $database)
+    public function evaluate($configFiles)
     {
-      $databases[$name] = new $database[0]($database[1]);
-    }
+        list($includes, $data) = $this->parse($configFiles);
 
-    return $databases;
-  }
+        foreach ($includes as $i => $include) {
+            require_once $include;
+        }
 
-  protected function parse($configFiles)
-  {
-    // parse the yaml
-    $config = static::getConfiguration($configFiles);
+        $databases = array();
+        foreach ($data as $name => $database) {
+            $databases[$name] = new $database[0]($database[1]);
+        }
 
-    // init our data and includes arrays
-    $data      = array();
-    $databases = array();
-    $includes  = array();
+        return $databases;
+    }
 
-    // get a list of database connections
-    foreach ($config as $name => $dbConfig)
+    /**
+     * @see sfConfigHandler
+     * {@inheritdoc}
+     */
+    public static function getConfiguration(array $configFiles)
     {
-      // 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));
-      }
-
-      // add this database
-      $databases[] = $name;
-
-      // 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));
-      }
-
-      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']));
-        }
+        $config = static::replaceConstants(static::flattenConfigurationWithEnvironment(static::parseYamls($configFiles)));
 
-        // append our data
-        $includes[] = $dbConfig['file'];
-      }
-
-      // parse parameters
-      $parameters = array();
-      if (isset($dbConfig['param']))
-      {
-        $parameters = $dbConfig['param'];
-      }
-      $parameters['name'] = $name;
+        foreach ($config as $name => $dbConfig) {
+            if (isset($dbConfig['file'])) {
+                $config[$name]['file'] = static::replacePath($dbConfig['file']);
+            }
+        }
 
-      // append new data
-      $data[$name] = array($dbConfig['class'], $parameters);
+        return $config;
     }
 
-    return array($includes, $data);
-  }
-
-  /**
-   * @see sfConfigHandler
-   * @inheritdoc
-   */
-  static public function getConfiguration(array $configFiles)
-  {
-    $config = static::replaceConstants(static::flattenConfigurationWithEnvironment(static::parseYamls($configFiles)));
-
-    foreach ($config as $name => $dbConfig)
+    protected function parse($configFiles)
     {
-      if (isset($dbConfig['file']))
-      {
-        $config[$name]['file'] = static::replacePath($dbConfig['file']);
-      }
-    }
+        // parse the yaml
+        $config = static::getConfiguration($configFiles);
+
+        // init our data and includes arrays
+        $data = array();
+        $databases = array();
+        $includes = array();
+
+        // 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));
+            }
+
+            // add this database
+            $databases[] = $name;
+
+            // 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));
+            }
+
+            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']));
+                }
+
+                // append our data
+                $includes[] = $dbConfig['file'];
+            }
+
+            // parse parameters
+            $parameters = array();
+            if (isset($dbConfig['param'])) {
+                $parameters = $dbConfig['param'];
+            }
+            $parameters['name'] = $name;
+
+            // append new data
+            $data[$name] = array($dbConfig['class'], $parameters);
+        }
 
-    return $config;
-  }
+        return array($includes, $data);
+    }
 }
diff --git a/lib/config/sfDefineEnvironmentConfigHandler.class.php b/lib/config/sfDefineEnvironmentConfigHandler.class.php
index 224dc2525..9fe7c7e19 100644
--- a/lib/config/sfDefineEnvironmentConfigHandler.class.php
+++ b/lib/config/sfDefineEnvironmentConfigHandler.class.php
@@ -9,141 +9,130 @@
  */
 
 /**
- *
- * @package    symfony
- * @subpackage config
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfDefineEnvironmentConfigHandler extends sfYamlConfigHandler
 {
-  /**
-   * Executes this configuration handler.
-   *
-   * @param string $configFiles An absolute filesystem path to a configuration file
-   *
-   * @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
-   */
-  public function execute($configFiles)
-  {
-    // get our prefix
-    $prefix = strtolower($this->getParameterHolder()->get('prefix', ''));
-
-    // add module prefix if needed
-    if ($this->getParameterHolder()->get('module', false))
-    {
-      $wildcardValues = $this->getParameterHolder()->get('wildcardValues');
-      // either the module name is in wildcard values, or it needs to be inserted on runtime
-      $moduleName = $wildcardValues ? strtolower($wildcardValues[0]) : "'.strtolower(\$moduleName).'";
-      $prefix .= $moduleName."_";
-    }
-
-    // parse the yaml
-    $config = static::getConfiguration($configFiles);
-
-    $values = array();
-    foreach ($config as $category => $keys)
+    /**
+     * Executes this configuration handler.
+     *
+     * @param string $configFiles An absolute filesystem path to a configuration file
+     *
+     * @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
+     */
+    public function execute($configFiles)
     {
-      $values = array_merge($values, $this->getValues($prefix, $category, $keys));
+        // get our prefix
+        $prefix = strtolower($this->getParameterHolder()->get('prefix', ''));
+
+        // add module prefix if needed
+        if ($this->getParameterHolder()->get('module', false)) {
+            $wildcardValues = $this->getParameterHolder()->get('wildcardValues');
+            // either the module name is in wildcard values, or it needs to be inserted on runtime
+            $moduleName = $wildcardValues ? strtolower($wildcardValues[0]) : "'.strtolower(\$moduleName).'";
+            $prefix .= $moduleName.'_';
+        }
+
+        // parse the yaml
+        $config = static::getConfiguration($configFiles);
+
+        $values = array();
+        foreach ($config as $category => $keys) {
+            $values = array_merge($values, $this->getValues($prefix, $category, $keys));
+        }
+
+        $data = '';
+        foreach ($values as $key => $value) {
+            $data .= sprintf("  '%s' => %s,\n", $key, var_export($value, true));
+        }
+
+        // compile data
+        $retval = '';
+        if ($values) {
+            $retval = "<?php\n".
+                      "// auto-generated by sfDefineEnvironmentConfigHandler\n".
+                      "// date: %s\nsfConfig::add(array(\n%s));\n";
+            $retval = sprintf($retval, date('Y/m/d H:i:s'), $data);
+        }
+
+        return $retval;
     }
 
-    $data = '';
-    foreach ($values as $key => $value)
+    /**
+     * @see sfConfigHandler
+     * {@inheritdoc}
+     */
+    public static function getConfiguration(array $configFiles)
     {
-      $data .= sprintf("  '%s' => %s,\n", $key, var_export($value, true));
+        return static::replaceConstants(static::flattenConfigurationWithEnvironment(static::parseYamls($configFiles)));
     }
 
-    // compile data
-    $retval = '';
-    if ($values)
+    /**
+     * Gets values from the configuration array.
+     *
+     * @param string $prefix   The prefix name
+     * @param string $category The category name
+     * @param mixed  $keys     The key/value array
+     *
+     * @return array The new key/value array
+     */
+    protected function getValues($prefix, $category, $keys)
     {
-      $retval = "<?php\n".
-                "// auto-generated by sfDefineEnvironmentConfigHandler\n".
-                "// date: %s\nsfConfig::add(array(\n%s));\n";
-      $retval = sprintf($retval, date('Y/m/d H:i:s'), $data);
-    }
+        if (!is_array($keys)) {
+            list($key, $value) = $this->fixCategoryValue($prefix.strtolower($category), '', $keys);
 
-    return $retval;
-  }
-
-  /**
-   * Gets values from the configuration array.
-   *
-   * @param string $prefix   The prefix name
-   * @param string $category The category name
-   * @param mixed  $keys      The key/value array
-   *
-   * @return array The new key/value array
-   */
-  protected function getValues($prefix, $category, $keys)
-  {
-    if (!is_array($keys))
-    {
-      list($key, $value) = $this->fixCategoryValue($prefix.strtolower($category), '', $keys);
+            return array($key => $value);
+        }
 
-      return array($key => $value);
-    }
+        $values = array();
 
-    $values = array();
+        $category = $this->fixCategoryName($category, $prefix);
 
-    $category = $this->fixCategoryName($category, $prefix);
+        // loop through all key/value pairs
+        foreach ($keys as $key => $value) {
+            list($key, $value) = $this->fixCategoryValue($category, $key, $value);
+            $values[$key] = $value;
+        }
 
-    // loop through all key/value pairs
-    foreach ($keys as $key => $value)
-    {
-      list($key, $value) = $this->fixCategoryValue($category, $key, $value);
-      $values[$key] = $value;
+        return $values;
     }
 
-    return $values;
-  }
-
-  /**
-   * Fixes the category name and replaces constants in the value.
-   *
-   * @param string $category The category name
-   * @param string $key      The key name
-   * @param string $value    The value
-   *
-   * @return string Return the new key and value
-   */
-  protected function fixCategoryValue($category, $key, $value)
-  {
-    return array($category.$key, $value);
-  }
-
-  /**
-   * Fixes the category name.
-   *
-   * @param string $category The category name
-   * @param string $prefix   The prefix
-   *
-   * @return string The fixed category name
-   */
-  protected function fixCategoryName($category, $prefix)
-  {
-    // categories starting without a period will be prepended to the key
-    if ($category[0] != '.')
+    /**
+     * Fixes the category name and replaces constants in the value.
+     *
+     * @param string $category The category name
+     * @param string $key      The key name
+     * @param string $value    The value
+     *
+     * @return string Return the new key and value
+     */
+    protected function fixCategoryValue($category, $key, $value)
     {
-      $category = $prefix.$category.'_';
+        return array($category.$key, $value);
     }
-    else
+
+    /**
+     * Fixes the category name.
+     *
+     * @param string $category The category name
+     * @param string $prefix   The prefix
+     *
+     * @return string The fixed category name
+     */
+    protected function fixCategoryName($category, $prefix)
     {
-      $category = $prefix;
+        // categories starting without a period will be prepended to the key
+        if ('.' != $category[0]) {
+            $category = $prefix.$category.'_';
+        } else {
+            $category = $prefix;
+        }
+
+        return $category;
     }
-
-    return $category;
-  }
-
-  /**
-   * @see sfConfigHandler
-   * @inheritdoc
-   */
-  static public function getConfiguration(array $configFiles)
-  {
-    return static::replaceConstants(static::flattenConfigurationWithEnvironment(static::parseYamls($configFiles)));
-  }
 }
diff --git a/lib/config/sfFactoryConfigHandler.class.php b/lib/config/sfFactoryConfigHandler.class.php
index c42b0e992..8e0ddc3c6 100644
--- a/lib/config/sfFactoryConfigHandler.class.php
+++ b/lib/config/sfFactoryConfigHandler.class.php
@@ -13,257 +13,265 @@
  * sfFactoryConfigHandler allows you to specify which factory implementation the
  * system will use.
  *
- * @package    symfony
- * @subpackage config
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 class sfFactoryConfigHandler extends sfYamlConfigHandler
 {
-  /**
-   * Executes this configuration handler.
-   *
-   * @param array $configFiles An array of absolute filesystem path to a configuration file
-   *
-   * @return string Data to be written to a cache file
-   *
-   * @throws <b>sfConfigurationException</b> If a requested configuration file does not exist or is not readable
-   * @throws <b>sfParseException</b> If a requested configuration file is improperly formatted
-   */
-  public function execute($configFiles)
-  {
-    // parse the yaml
-    $config = static::getConfiguration($configFiles);
-
-    // init our data and includes arrays
-    $includes  = array();
-    $instances = array();
-
-    // available list of factories
-    $factories = array('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)
+    /**
+     * Executes this configuration handler.
+     *
+     * @param array $configFiles An array of absolute filesystem path to a configuration file
+     *
+     * @return string Data to be written to a cache file
+     *
+     * @throws <b>sfConfigurationException</b> If a requested configuration file does not exist or is not readable
+     * @throws <b>sfParseException</b> If a requested configuration file is improperly formatted
+     */
+    public function execute($configFiles)
     {
-      // see if the factory exists for this controller
-      $keys = $config[$factory];
-
-      if (!isset($keys['class']))
-      {
-        // missing class key
-        throw new sfParseException(sprintf('Configuration file "%s" specifies category "%s" with missing class key.', $configFiles[0], $factory));
-      }
-
-      $class = $keys['class'];
-
-      if (isset($keys['file']))
-      {
-        // 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']));
-        }
+        // parse the yaml
+        $config = static::getConfiguration($configFiles);
 
-        // append our data
-        $includes[] = sprintf("require_once('%s');", $keys['file']);
-      }
-
-      // parse parameters
-      $parameters = array();
-      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]));
-        }
+        // init our data and includes arrays
+        $includes = array();
+        $instances = array();
+
+        // available list of factories
+        $factories = array('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) {
+            // see if the factory exists for this controller
+            $keys = $config[$factory];
 
-        $parameters = $keys['param'];
-      }
-
-      // append new data
-      switch ($factory)
-      {
-        case 'controller':
-          $instances[] = sprintf("  \$class = sfConfig::get('sf_factory_controller', '%s');\n   \$this->factories['controller'] = new \$class(\$this);", $class);
-          break;
-
-        case 'request':
-          $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;
-
-        case 'response':
-          $instances[] = sprintf("  \$class = sfConfig::get('sf_factory_response', '%s');\n  \$this->factories['response'] = new \$class(\$this->dispatcher, sfConfig::get('sf_factory_response_parameters', array_merge(array('http_protocol' => isset(\$_SERVER['SERVER_PROTOCOL']) ? \$_SERVER['SERVER_PROTOCOL'] : null), %s)));", $class, var_export($parameters, true));
-          // TODO: this is a bit ugly, as it only works for sfWebRequest & sfWebResponse combination. see #3397
-          $instances[] = sprintf("  if (\$this->factories['request'] instanceof sfWebRequest \n      && \$this->factories['response'] instanceof sfWebResponse \n      && 'HEAD' == \$this->factories['request']->getMethod())\n  {  \n    \$this->factories['response']->setHeaderOnly(true);\n  }\n");
-          break;
-
-        case 'storage':
-          $defaultParameters = array();
-          $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');
-            unset($parameters['database']);
-          }
-
-          if (isset($config['user']['param']['timeout'])) {
-            $defaultParameters[] = sprintf("'gc_maxlifetime' => %d,", $config['user']['param']['timeout']);
-          }
-
-          $instances[] = sprintf("  \$class = sfConfig::get('sf_factory_storage', '%s');\n  \$this->factories['storage'] = new \$class(array_merge(array(\n%s\n), sfConfig::get('sf_factory_storage_parameters', %s)));", $class, implode("\n", $defaultParameters), var_export($parameters, true));
-          break;
-
-        case 'user':
-          $instances[] = sprintf("  \$class = sfConfig::get('sf_factory_user', '%s');\n  \$this->factories['user'] = new \$class(\$this->dispatcher, \$this->factories['storage'], array_merge(array('auto_shutdown' => false, 'culture' => \$this->factories['request']->getParameter('sf_culture')), sfConfig::get('sf_factory_user_parameters', %s)));", $class, var_export($parameters, true));
-          break;
-
-        case 'view_cache':
-          $instances[] = sprintf("\n  if (sfConfig::get('sf_cache'))\n  {\n".
-                             "    \$class = sfConfig::get('sf_factory_view_cache', '%s');\n".
-                             "    \$cache = new \$class(sfConfig::get('sf_factory_view_cache_parameters', %s));\n".
-                             "    \$this->factories['viewCacheManager'] = new %s(\$this, \$cache, %s);\n".
-                             "  }\n".
-                             "  else\n".
-                             "  {\n".
-                             "    \$this->factories['viewCacheManager'] = null;\n".
-                             "  }\n",
-                             $class, var_export($parameters, true), $config['view_cache_manager']['class'], var_export($config['view_cache_manager']['param'], true));
-          break;
-
-        case 'i18n':
-          if (isset($parameters['cache']))
-          {
-            $cache = sprintf("    \$cache = new %s(%s);\n", $parameters['cache']['class'], var_export($parameters['cache']['param'], true));
-            unset($parameters['cache']);
-          }
-          else
-          {
-            $cache = "    \$cache = null;\n";
-          }
-
-          $instances[] = sprintf("\n  if (sfConfig::get('sf_i18n'))\n  {\n".
-                     "    \$class = sfConfig::get('sf_factory_i18n', '%s');\n".
-                     "%s".
-                     "    \$this->factories['i18n'] = new \$class(\$this->configuration, \$cache, %s);\n".
-                     "    sfWidgetFormSchemaFormatter::setTranslationCallable(array(\$this->factories['i18n'], '__'));\n".
-                     "  }\n"
-                     , $class, $cache, var_export($parameters, true)
-                     );
-          break;
-
-        case 'routing':
-          if (isset($parameters['cache']))
-          {
-            $cache = sprintf("    \$cache = new %s(%s);\n", $parameters['cache']['class'], var_export($parameters['cache']['param'], true));
-            unset($parameters['cache']);
-          }
-          else
-          {
-            $cache = "    \$cache = null;\n";
-          }
-
-          $instances[] = sprintf("  \$class = sfConfig::get('sf_factory_routing', '%s');\n".
-                           "  %s\n".
-                           "\$this->factories['routing'] = new \$class(\$this->dispatcher, \$cache, array_merge(array('auto_shutdown' => false, 'context' => \$this->factories['request']->getRequestContext()), sfConfig::get('sf_factory_routing_parameters', %s)));\n".
-                           "if (\$parameters = \$this->factories['routing']->parse(\$this->factories['request']->getPathInfo()))\n".
-                           "{\n".
-                           "  \$this->factories['request']->addRequestParameters(\$parameters);\n".
-                           "}\n",
-                           $class, $cache, var_export($parameters, true)
-                         );
-          break;
-
-        case 'logger':
-          $loggers = '';
-          if (isset($parameters['loggers']))
-          {
-            foreach ($parameters['loggers'] as $name => $keys)
-            {
-              if (isset($keys['enabled']) && !$keys['enabled'])
-              {
-                continue;
-              }
-
-              if (!isset($keys['class']))
-              {
+            if (!isset($keys['class'])) {
                 // missing class key
-                throw new sfParseException(sprintf('Configuration file "%s" specifies logger "%s" with missing class key.', $configFiles[0], $name));
-              }
-
-              $condition = true;
-              if (isset($keys['param']['condition']))
-              {
-                $condition = $keys['param']['condition'];
-                unset($keys['param']['condition']);
-              }
-
-              if ($condition)
-              {
-                // create logger instance
-                $loggers .= sprintf("\n\$logger = new %s(\$this->dispatcher, array_merge(array('auto_shutdown' => false), %s));\n\$this->factories['logger']->addLogger(\$logger);\n",
-                              $keys['class'],
-                              isset($keys['param']) ? var_export($keys['param'], true) : 'array()'
-                            );
-              }
+                throw new sfParseException(sprintf('Configuration file "%s" specifies category "%s" with missing class key.', $configFiles[0], $factory));
             }
 
-            unset($parameters['loggers']);
-          }
+            $class = $keys['class'];
 
-          $instances[] = sprintf(
-                         "  \$class = sfConfig::get('sf_factory_logger', '%s');\n  \$this->factories['logger'] = new \$class(\$this->dispatcher, array_merge(array('auto_shutdown' => false), sfConfig::get('sf_factory_logger_parameters', %s)));\n".
-                         "  %s"
-                         , $class, var_export($parameters, true), $loggers);
-          break;
+            if (isset($keys['file'])) {
+                // 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']));
+                }
+
+                // append our data
+                $includes[] = sprintf("require_once('%s');", $keys['file']);
+            }
+
+            // parse parameters
+            $parameters = array();
+            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]));
+                }
+
+                $parameters = $keys['param'];
+            }
 
-        case 'mailer':
-          $instances[] = sprintf(
+            // append new data
+            switch ($factory) {
+                case 'controller':
+                    $instances[] = sprintf("  \$class = sfConfig::get('sf_factory_controller', '%s');\n   \$this->factories['controller'] = new \$class(\$this);", $class);
+
+                    break;
+
+                case 'request':
+                    $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;
+
+                case 'response':
+                    $instances[] = sprintf("  \$class = sfConfig::get('sf_factory_response', '%s');\n  \$this->factories['response'] = new \$class(\$this->dispatcher, sfConfig::get('sf_factory_response_parameters', array_merge(array('http_protocol' => isset(\$_SERVER['SERVER_PROTOCOL']) ? \$_SERVER['SERVER_PROTOCOL'] : null), %s)));", $class, var_export($parameters, true));
+                    // TODO: this is a bit ugly, as it only works for sfWebRequest & sfWebResponse combination. see #3397
+                    $instances[] = sprintf("  if (\$this->factories['request'] instanceof sfWebRequest \n      && \$this->factories['response'] instanceof sfWebResponse \n      && 'HEAD' == \$this->factories['request']->getMethod())\n  {  \n    \$this->factories['response']->setHeaderOnly(true);\n  }\n");
+
+                    break;
+
+                case 'storage':
+                    $defaultParameters = array();
+                    $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');
+                        unset($parameters['database']);
+                    }
+
+                    if (isset($config['user']['param']['timeout'])) {
+                        $defaultParameters[] = sprintf("'gc_maxlifetime' => %d,", $config['user']['param']['timeout']);
+                    }
+
+                    $instances[] = sprintf("  \$class = sfConfig::get('sf_factory_storage', '%s');\n  \$this->factories['storage'] = new \$class(array_merge(array(\n%s\n), sfConfig::get('sf_factory_storage_parameters', %s)));", $class, implode("\n", $defaultParameters), var_export($parameters, true));
+
+                    break;
+
+                case 'user':
+                    $instances[] = sprintf("  \$class = sfConfig::get('sf_factory_user', '%s');\n  \$this->factories['user'] = new \$class(\$this->dispatcher, \$this->factories['storage'], array_merge(array('auto_shutdown' => false, 'culture' => \$this->factories['request']->getParameter('sf_culture')), sfConfig::get('sf_factory_user_parameters', %s)));", $class, var_export($parameters, true));
+
+                    break;
+
+                case 'view_cache':
+                    $instances[] = sprintf(
+                        "\n  if (sfConfig::get('sf_cache'))\n  {\n".
+                                       "    \$class = sfConfig::get('sf_factory_view_cache', '%s');\n".
+                                       "    \$cache = new \$class(sfConfig::get('sf_factory_view_cache_parameters', %s));\n".
+                                       "    \$this->factories['viewCacheManager'] = new %s(\$this, \$cache, %s);\n".
+                                       "  }\n".
+                                       "  else\n".
+                                       "  {\n".
+                                       "    \$this->factories['viewCacheManager'] = null;\n".
+                                       "  }\n",
+                        $class,
+                        var_export($parameters, true),
+                        $config['view_cache_manager']['class'],
+                        var_export($config['view_cache_manager']['param'], true)
+                    );
+
+                    break;
+
+                case 'i18n':
+                    if (isset($parameters['cache'])) {
+                        $cache = sprintf("    \$cache = new %s(%s);\n", $parameters['cache']['class'], var_export($parameters['cache']['param'], true));
+                        unset($parameters['cache']);
+                    } else {
+                        $cache = "    \$cache = null;\n";
+                    }
+
+                    $instances[] = sprintf(
+                        "\n  if (sfConfig::get('sf_i18n'))\n  {\n".
+                               "    \$class = sfConfig::get('sf_factory_i18n', '%s');\n".
+                               '%s'.
+                               "    \$this->factories['i18n'] = new \$class(\$this->configuration, \$cache, %s);\n".
+                               "    sfWidgetFormSchemaFormatter::setTranslationCallable(array(\$this->factories['i18n'], '__'));\n".
+                               "  }\n",
+                        $class,
+                        $cache,
+                        var_export($parameters, true)
+                    );
+
+                    break;
+
+                case 'routing':
+                    if (isset($parameters['cache'])) {
+                        $cache = sprintf("    \$cache = new %s(%s);\n", $parameters['cache']['class'], var_export($parameters['cache']['param'], true));
+                        unset($parameters['cache']);
+                    } else {
+                        $cache = "    \$cache = null;\n";
+                    }
+
+                    $instances[] = sprintf(
+                        "  \$class = sfConfig::get('sf_factory_routing', '%s');\n".
+                                     "  %s\n".
+                                     "\$this->factories['routing'] = new \$class(\$this->dispatcher, \$cache, array_merge(array('auto_shutdown' => false, 'context' => \$this->factories['request']->getRequestContext()), sfConfig::get('sf_factory_routing_parameters', %s)));\n".
+                                     "if (\$parameters = \$this->factories['routing']->parse(\$this->factories['request']->getPathInfo()))\n".
+                                     "{\n".
+                                     "  \$this->factories['request']->addRequestParameters(\$parameters);\n".
+                                     "}\n",
+                        $class,
+                        $cache,
+                        var_export($parameters, true)
+                    );
+
+                    break;
+
+                case 'logger':
+                    $loggers = '';
+                    if (isset($parameters['loggers'])) {
+                        foreach ($parameters['loggers'] as $name => $keys) {
+                            if (isset($keys['enabled']) && !$keys['enabled']) {
+                                continue;
+                            }
+
+                            if (!isset($keys['class'])) {
+                                // missing class key
+                                throw new sfParseException(sprintf('Configuration file "%s" specifies logger "%s" with missing class key.', $configFiles[0], $name));
+                            }
+
+                            $condition = true;
+                            if (isset($keys['param']['condition'])) {
+                                $condition = $keys['param']['condition'];
+                                unset($keys['param']['condition']);
+                            }
+
+                            if ($condition) {
+                                // create logger instance
+                                $loggers .= sprintf(
+                                    "\n\$logger = new %s(\$this->dispatcher, array_merge(array('auto_shutdown' => false), %s));\n\$this->factories['logger']->addLogger(\$logger);\n",
+                                    $keys['class'],
+                                    isset($keys['param']) ? var_export($keys['param'], true) : 'array()'
+                                );
+                            }
+                        }
+
+                        unset($parameters['loggers']);
+                    }
+
+                    $instances[] = sprintf(
+                        "  \$class = sfConfig::get('sf_factory_logger', '%s');\n  \$this->factories['logger'] = new \$class(\$this->dispatcher, array_merge(array('auto_shutdown' => false), sfConfig::get('sf_factory_logger_parameters', %s)));\n".
+                        '  %s',
+                        $class,
+                        var_export($parameters, true),
+                        $loggers
+                    );
+
+                    break;
+
+                case 'mailer':
+                    $instances[] = sprintf(
                         "if (!class_exists('Swift')) {\n".
                         "  \$swift_dir = sfConfig::get('sf_swiftmailer_dir', sfConfig::get('sf_symfony_lib_dir').'/vendor/swiftmailer/lib');\n".
                         "  require_once \$swift_dir.'/swift_required.php';\n".
                         "}\n".
-                        "\$this->setMailerConfiguration(array_merge(array('class' => sfConfig::get('sf_factory_mailer', '%s')), sfConfig::get('sf_factory_mailer_parameters', %s)));\n"
-                        , $class, var_export($parameters, true));
-          break;
+                        "\$this->setMailerConfiguration(array_merge(array('class' => sfConfig::get('sf_factory_mailer', '%s')), sfConfig::get('sf_factory_mailer_parameters', %s)));\n",
+                        $class,
+                        var_export($parameters, true)
+                    );
 
-        case 'service_container':
-          $instances[] = (
+                    break;
+
+                case 'service_container':
+                    $instances[] = (
                         "\$class = require \$this->configuration->getConfigCache()->checkConfig('config/services.yml', true);\n".
                         "\$this->setServiceContainerConfiguration(array('class' => \$class));\n"
-                        );
-        break;
-      }
+                    );
+
+                    break;
+            }
+        }
+
+        // compile data
+        $retval = sprintf(
+            "<?php\n".
+                          "// auto-generated by sfFactoryConfigHandler\n".
+                          "// date: %s\n%s\n%s\n",
+            date('Y/m/d H:i:s'),
+            implode("\n", $includes),
+            implode("\n", $instances)
+        );
+
+        return $retval;
     }
 
-    // compile data
-    $retval = sprintf("<?php\n".
-                      "// auto-generated by sfFactoryConfigHandler\n".
-                      "// date: %s\n%s\n%s\n",
-                      date('Y/m/d H:i:s'), implode("\n", $includes),
-                      implode("\n", $instances));
-
-    return $retval;
-  }
-
-  /**
-   * @see sfConfigHandler
-   * @inheritdoc
-   */
-  static public function getConfiguration(array $configFiles)
-  {
-    $config = static::replaceConstants(static::flattenConfigurationWithEnvironment(static::parseYamls($configFiles)));
-
-    foreach ($config as $factory => $values)
+    /**
+     * @see sfConfigHandler
+     * {@inheritdoc}
+     */
+    public static function getConfiguration(array $configFiles)
     {
-      if (isset($values['file']))
-      {
-        $config[$factory]['file'] = static::replacePath($values['file']);
-      }
-    }
+        $config = static::replaceConstants(static::flattenConfigurationWithEnvironment(static::parseYamls($configFiles)));
 
-    return $config;
-  }
+        foreach ($config as $factory => $values) {
+            if (isset($values['file'])) {
+                $config[$factory]['file'] = static::replacePath($values['file']);
+            }
+        }
+
+        return $config;
+    }
 }
diff --git a/lib/config/sfFilterConfigHandler.class.php b/lib/config/sfFilterConfigHandler.class.php
index f0976a4ff..2eccac23b 100644
--- a/lib/config/sfFilterConfigHandler.class.php
+++ b/lib/config/sfFilterConfigHandler.class.php
@@ -12,149 +12,178 @@
 /**
  * sfFilterConfigHandler allows you to register filters with the system.
  *
- * @package    symfony
- * @subpackage config
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 class sfFilterConfigHandler extends sfYamlConfigHandler
 {
-  /**
-   * Executes this configuration handler
-   *
-   * @param array $configFiles An array of absolute filesystem path to a configuration file
-   *
-   * @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
-   */
-  public function execute($configFiles)
-  {
-    // parse the yaml
-    $config = static::getConfiguration($configFiles);
-
-    // init our data and includes arrays
-    $data     = array();
-    $includes = array();
-
-    $execution = false;
-    $rendering = false;
-
-    // let's do our fancy work
-    foreach ($config as $category => $keys)
+    /**
+     * Executes this configuration handler.
+     *
+     * @param array $configFiles An array of absolute filesystem path to a configuration file
+     *
+     * @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
+     */
+    public function execute($configFiles)
     {
-      if (isset($keys['enabled']) && !$keys['enabled'])
-      {
-        continue;
-      }
-
-      if (!isset($keys['class']))
-      {
-        // missing class key
-        throw new sfParseException(sprintf('Configuration file "%s" specifies category "%s" with missing class key.', $configFiles[0], $category));
-      }
-
-      $class = $keys['class'];
-
-      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']));
+        // parse the yaml
+        $config = static::getConfiguration($configFiles);
+
+        // init our data and includes arrays
+        $data = array();
+        $includes = array();
+
+        $execution = false;
+        $rendering = false;
+
+        // let's do our fancy work
+        foreach ($config as $category => $keys) {
+            if (isset($keys['enabled']) && !$keys['enabled']) {
+                continue;
+            }
+
+            if (!isset($keys['class'])) {
+                // missing class key
+                throw new sfParseException(sprintf('Configuration file "%s" specifies category "%s" with missing class key.', $configFiles[0], $category));
+            }
+
+            $class = $keys['class'];
+
+            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']));
+                }
+
+                // append our data
+                $includes[] = sprintf("require_once('%s');\n", $keys['file']);
+            }
+
+            $condition = true;
+            if (isset($keys['param']['condition'])) {
+                $condition = $keys['param']['condition'];
+                unset($keys['param']['condition']);
+            }
+
+            $type = isset($keys['param']['type']) ? $keys['param']['type'] : null;
+            unset($keys['param']['type']);
+
+            if ($condition) {
+                // parse parameters
+                $parameters = isset($keys['param']) ? var_export($keys['param'], true) : 'null';
+
+                // append new data
+                if ('security' == $type) {
+                    $data[] = $this->addSecurityFilter($category, $class, $parameters);
+                } else {
+                    $data[] = $this->addFilter($category, $class, $parameters);
+                }
+
+                if ('rendering' == $type) {
+                    $rendering = true;
+                }
+
+                if ('execution' == $type) {
+                    $execution = true;
+                }
+            }
         }
 
-        // append our data
-        $includes[] = sprintf("require_once('%s');\n", $keys['file']);
-      }
-
-      $condition = true;
-      if (isset($keys['param']['condition']))
-      {
-        $condition = $keys['param']['condition'];
-        unset($keys['param']['condition']);
-      }
-
-      $type = isset($keys['param']['type']) ? $keys['param']['type'] : null;
-      unset($keys['param']['type']);
-
-      if ($condition)
-      {
-        // parse parameters
-        $parameters = isset($keys['param']) ? var_export($keys['param'], true) : 'null';
-
-        // append new data
-        if ('security' == $type)
-        {
-          $data[] = $this->addSecurityFilter($category, $class, $parameters);
-        }
-        else
-        {
-          $data[] = $this->addFilter($category, $class, $parameters);
+        if (!$rendering) {
+            throw new sfParseException(sprintf('Configuration file "%s" must register a filter of type "rendering".', $configFiles[0]));
         }
 
-        if ('rendering' == $type)
-        {
-          $rendering = true;
+        if (!$execution) {
+            throw new sfParseException(sprintf('Configuration file "%s" must register a filter of type "execution".', $configFiles[0]));
         }
 
-        if ('execution' == $type)
-        {
-          $execution = true;
-        }
-      }
+        // compile data
+        $retval = sprintf(
+            "<?php\n".
+                          "// auto-generated by sfFilterConfigHandler\n".
+                          "// date: %s\n%s\n%s\n\n",
+            date('Y/m/d H:i:s'),
+            implode("\n", $includes),
+            implode("\n", $data)
+        );
+
+        return $retval;
     }
 
-    if (!$rendering)
+    /**
+     * @see sfConfigHandler
+     * {@inheritdoc}
+     */
+    public static function getConfiguration(array $configFiles)
     {
-      throw new sfParseException(sprintf('Configuration file "%s" must register a filter of type "rendering".', $configFiles[0]));
+        $config = static::parseYaml($configFiles[0]);
+        foreach (array_slice($configFiles, 1) as $i => $configFile) {
+            // we get the order of the new file and merge with the previous configurations
+            $previous = $config;
+
+            $config = array();
+            foreach (static::parseYaml($configFile) as $key => $value) {
+                $value = (array) $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));
+                }
+            }
+        }
+
+        $config = static::replaceConstants($config);
+
+        foreach ($config as $category => $keys) {
+            if (isset($keys['file'])) {
+                $config[$category]['file'] = static::replacePath($keys['file']);
+            }
+        }
+
+        return $config;
     }
 
-    if (!$execution)
+    /**
+     * Adds a filter statement to the data.
+     *
+     * @param string $category   The category name
+     * @param string $class      The filter class name
+     * @param array  $parameters Filter default parameters
+     *
+     * @return string The PHP statement
+     */
+    protected function addFilter($category, $class, $parameters)
     {
-      throw new sfParseException(sprintf('Configuration file "%s" must register a filter of type "execution".', $configFiles[0]));
+        return sprintf(
+            "\nlist(\$class, \$parameters) = (array) sfConfig::get('sf_%s_filter', array('%s', %s));\n".
+                          "\$filter = new \$class(sfContext::getInstance(), \$parameters);\n".
+                          '$this->register($filter);',
+            $category,
+            $class,
+            $parameters
+        );
     }
 
-    // compile data
-    $retval = sprintf("<?php\n".
-                      "// auto-generated by sfFilterConfigHandler\n".
-                      "// date: %s\n%s\n%s\n\n", date('Y/m/d H:i:s'),
-                      implode("\n", $includes), implode("\n", $data));
-
-    return $retval;
-  }
-
-  /**
-   * Adds a filter statement to the data.
-   *
-   * @param string $category   The category name
-   * @param string $class      The filter class name
-   * @param array  $parameters Filter default parameters
-   *
-   * @return string The PHP statement
-   */
-  protected function addFilter($category, $class, $parameters)
-  {
-    return sprintf("\nlist(\$class, \$parameters) = (array) sfConfig::get('sf_%s_filter', array('%s', %s));\n".
-                      "\$filter = new \$class(sfContext::getInstance(), \$parameters);\n".
-                      "\$this->register(\$filter);",
-                      $category, $class, $parameters);
-  }
-
-  /**
-   * Adds a security filter statement to the data.
-   *
-   * @param string $category   The category name
-   * @param string $class      The filter class name
-   * @param array  $parameters Filter default parameters
-   *
-   * @return string The PHP statement
-   */
-  protected function addSecurityFilter($category, $class, $parameters)
-  {
-    return <<<EOF
+    /**
+     * Adds a security filter statement to the data.
+     *
+     * @param string $category   The category name
+     * @param string $class      The filter class name
+     * @param array  $parameters Filter default parameters
+     *
+     * @return string The PHP statement
+     */
+    protected function addSecurityFilter($category, $class, $parameters)
+    {
+        return <<<EOF
 
 // does this action require security?
 if (\$actionInstance->isSecure())
@@ -162,47 +191,5 @@ protected function addSecurityFilter($category, $class, $parameters)
   {$this->addFilter($category, $class, $parameters)}
 }
 EOF;
-  }
-
-  /**
-   * @see sfConfigHandler
-   * @inheritdoc
-   */
-  static public function getConfiguration(array $configFiles)
-  {
-    $config = static::parseYaml($configFiles[0]);
-    foreach (array_slice($configFiles, 1) as $i => $configFile)
-    {
-      // we get the order of the new file and merge with the previous configurations
-      $previous = $config;
-
-      $config = array();
-      foreach (static::parseYaml($configFile) as $key => $value)
-      {
-        $value = (array) $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));
-        }
-      }
-    }
-
-    $config = static::replaceConstants($config);
-
-    foreach ($config as $category => $keys)
-    {
-      if (isset($keys['file']))
-      {
-        $config[$category]['file'] = static::replacePath($keys['file']);
-      }
     }
-
-    return $config;
-  }
 }
diff --git a/lib/config/sfGeneratorConfigHandler.class.php b/lib/config/sfGeneratorConfigHandler.class.php
index 430658215..e79827ff9 100644
--- a/lib/config/sfGeneratorConfigHandler.class.php
+++ b/lib/config/sfGeneratorConfigHandler.class.php
@@ -11,83 +11,77 @@
 /**
  * sfGeneratorConfigHandler.
  *
- * @package    symfony
- * @subpackage config
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfGeneratorConfigHandler extends sfYamlConfigHandler
 {
-  /**
-   * Executes this configuration handler.
-   *
-   * @param array $configFiles An array of absolute filesystem path to a configuration file
-   *
-   * @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
-   */
-  public function execute($configFiles)
-  {
-    // parse the yaml
-    $config = static::getConfiguration($configFiles);
-    if (!$config)
+    /**
+     * Executes this configuration handler.
+     *
+     * @param array $configFiles An array of absolute filesystem path to a configuration file
+     *
+     * @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
+     */
+    public function execute($configFiles)
     {
-      return '';
-    }
+        // parse the yaml
+        $config = static::getConfiguration($configFiles);
+        if (!$config) {
+            return '';
+        }
 
-    if (!isset($config['generator']))
-    {
-      throw new sfParseException(sprintf('Configuration file "%s" must specify a generator section.', isset($configFiles[1]) ? $configFiles[1] : $configFiles[0]));
-    }
+        if (!isset($config['generator'])) {
+            throw new sfParseException(sprintf('Configuration file "%s" must specify a generator section.', isset($configFiles[1]) ? $configFiles[1] : $configFiles[0]));
+        }
 
-    $config = $config['generator'];
+        $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]));
-    }
+        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]));
+        }
 
-    foreach (array('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));
-      }
-    }
+        foreach (array('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));
+            }
+        }
 
-    // generate class and add a reference to it
-    $generatorManager = new sfGeneratorManager(sfContext::getInstance()->getConfiguration());
+        // generate class and add a reference to it
+        $generatorManager = new sfGeneratorManager(sfContext::getInstance()->getConfiguration());
 
-    // generator parameters
-    $generatorParam = (isset($config['param']) ? $config['param'] : array());
+        // generator parameters
+        $generatorParam = (isset($config['param']) ? $config['param'] : array());
 
-    // hack to find the module name (look for the last /modules/ in path)
-    preg_match('#.*/modules/([^/]+)/#', str_replace('\\', '/', $configFiles[0]), $match);
-    $generatorParam['moduleName'] = $match[1];
+        // hack to find the module name (look for the last /modules/ in path)
+        preg_match('#.*/modules/([^/]+)/#', str_replace('\\', '/', $configFiles[0]), $match);
+        $generatorParam['moduleName'] = $match[1];
 
-    // compile data
-    $retval = "<?php\n".
-              "// auto-generated by sfGeneratorConfigHandler\n".
-              "// date: %s\n%s\n";
-    $retval = sprintf($retval, date('Y/m/d H:i:s'), static::getContent($generatorManager, $config['class'], $generatorParam));
+        // compile data
+        $retval = "<?php\n".
+                  "// auto-generated by sfGeneratorConfigHandler\n".
+                  "// date: %s\n%s\n";
+        $retval = sprintf($retval, date('Y/m/d H:i:s'), static::getContent($generatorManager, $config['class'], $generatorParam));
 
-    return $retval;
-  }
+        return $retval;
+    }
 
-  static public function getContent(sfGeneratorManager $generatorManager, $class, $parameters)
-  {
-    return $generatorManager->generate($class, $parameters);
-  }
+    public static function getContent(sfGeneratorManager $generatorManager, $class, $parameters)
+    {
+        return $generatorManager->generate($class, $parameters);
+    }
 
-  /**
-   * @see sfConfigHandler
-   * @inheritdoc
-   */
-  static public function getConfiguration(array $configFiles)
-  {
-    return static::parseYamls($configFiles);
-  }
+    /**
+     * @see sfConfigHandler
+     * {@inheritdoc}
+     */
+    public static function getConfiguration(array $configFiles)
+    {
+        return static::parseYamls($configFiles);
+    }
 }
diff --git a/lib/config/sfPluginConfiguration.class.php b/lib/config/sfPluginConfiguration.class.php
index 028261837..babc1c5f1 100644
--- a/lib/config/sfPluginConfiguration.class.php
+++ b/lib/config/sfPluginConfiguration.class.php
@@ -11,222 +11,204 @@
 /**
  * sfPluginConfiguration represents a configuration for a symfony plugin.
  *
- * @package    symfony
- * @subpackage config
  * @author     Kris Wallsmith <kris.wallsmith@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfPluginConfiguration
 {
-  protected
-    $configuration = null,
-    $dispatcher    = null,
-    $name          = null,
-    $rootDir       = null;
-
-  /**
-   * Constructor.
-   *
-   * @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)
-  {
-    $this->configuration = $configuration;
-    $this->dispatcher = $configuration->getEventDispatcher();
-    $this->rootDir = null === $rootDir ? $this->guessRootDir() : realpath($rootDir);
-    $this->name = null === $name ? $this->guessName() : $name;
-
-    $this->setup();
-    $this->configure();
-
-    if (!$this->configuration instanceof sfApplicationConfiguration)
+    protected $configuration;
+    protected $dispatcher;
+    protected $name;
+    protected $rootDir;
+
+    /**
+     * Constructor.
+     *
+     * @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)
     {
-      $this->initializeAutoload();
-      $this->initialize();
+        $this->configuration = $configuration;
+        $this->dispatcher = $configuration->getEventDispatcher();
+        $this->rootDir = null === $rootDir ? $this->guessRootDir() : realpath($rootDir);
+        $this->name = null === $name ? $this->guessName() : $name;
+
+        $this->setup();
+        $this->configure();
+
+        if (!$this->configuration instanceof sfApplicationConfiguration) {
+            $this->initializeAutoload();
+            $this->initialize();
+        }
     }
-  }
-
-  /**
-   * Sets up the plugin.
-   *
-   * This method can be used when creating a base plugin configuration class for other plugins to extend.
-   */
-  public function setup()
-  {
-  }
-
-  /**
-   * Configures the plugin.
-   *
-   * This method is called before the plugin's classes have been added to sfAutoload.
-   */
-  public function configure()
-  {
-  }
-
-  /**
-   * Initializes the plugin.
-   *
-   * This method is called after the plugin's classes have been added to sfAutoload.
-   *
-   * @return boolean|null If false sfApplicationConfiguration will look for a config.php (maintains BC with symfony < 1.2)
-   */
-  public function initialize()
-  {
-  }
-
-  /**
-   * Returns the plugin root directory.
-   *
-   * @return string
-   */
-  public function getRootDir()
-  {
-    return $this->rootDir;
-  }
-
-  /**
-   * Returns the plugin name.
-   *
-   * @return string
-   */
-  public function getName()
-  {
-    return $this->name;
-  }
-
-  /**
-   * Initializes autoloading for the plugin.
-   *
-   * This method is called when a plugin is initialized in a project
-   * configuration. Otherwise, autoload is handled in
-   * {@link sfApplicationConfiguration} using {@link sfAutoload}.
-   *
-   * @see sfSimpleAutoload
-   */
-  public function initializeAutoload()
-  {
-    $autoload = sfSimpleAutoload::getInstance(sfConfig::get('sf_cache_dir').'/project_autoload.cache');
-
-    if (is_readable($file = $this->rootDir.'/config/autoload.yml'))
+
+    /**
+     * Sets up the plugin.
+     *
+     * This method can be used when creating a base plugin configuration class for other plugins to extend.
+     */
+    public function setup()
     {
-      $this->configuration->getEventDispatcher()->connect('autoload.filter_config', array($this, 'filterAutoloadConfig'));
-      $autoload->loadConfiguration(array($file));
-      $this->configuration->getEventDispatcher()->disconnect('autoload.filter_config', array($this, 'filterAutoloadConfig'));
     }
-    else
+
+    /**
+     * Configures the plugin.
+     *
+     * This method is called before the plugin's classes have been added to sfAutoload.
+     */
+    public function configure()
     {
-      $autoload->addDirectory($this->rootDir.'/lib');
     }
 
-    $autoload->register();
-  }
-
-  /**
-   * Filters sfAutoload configuration values.
-   *
-   * @param sfEvent $event
-   * @param array   $config
-   *
-   * @return array
-   */
-  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']))
+    /**
+     * Initializes the plugin.
+     *
+     * 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)
+     */
+    public function initialize()
     {
-      $config['autoload'] = array_merge(array(
-        $this->name.'_lib' => array(
-          'path'      => $this->rootDir.'/lib',
-          'recursive' => true,
-        ),
-      ), $config['autoload']);
     }
 
-    if (!isset($config['autoload'][$this->name.'_module_libs']))
+    /**
+     * Returns the plugin root directory.
+     *
+     * @return string
+     */
+    public function getRootDir()
     {
-      $config['autoload'] = array_merge(array(
-        $this->name.'_module_libs' => array(
-          'path'      => $this->rootDir.'/modules/*/lib',
-          'recursive' => true,
-          'prefix'    => 1,
-        ),
-      ), $config['autoload']);
+        return $this->rootDir;
     }
 
-    return $config;
-  }
-
-  /**
-   * Connects the current plugin's tests to the "test:*" tasks.
-   */
-  public function connectTests()
-  {
-    $this->dispatcher->connect('task.test.filter_test_files', array($this, 'filterTestFiles'));
-  }
-
-  /**
-   * Listens for the "task.test.filter_test_files" event and adds tests from the current plugin.
-   *
-   * @param  sfEvent $event
-   * @param  array   $files
-   *
-   * @return array An array of files with the appropriate tests from the current plugin merged in
-   */
-  public function filterTestFiles(sfEvent $event, $files)
-  {
-    $task = $event->getSubject();
-
-    if ($task instanceof sfTestAllTask)
+    /**
+     * Returns the plugin name.
+     *
+     * @return string
+     */
+    public function getName()
     {
-      $directory = $this->rootDir.'/test';
-      $names = array();
+        return $this->name;
     }
-    else if ($task instanceof sfTestFunctionalTask)
+
+    /**
+     * Initializes autoloading for the plugin.
+     *
+     * This method is called when a plugin is initialized in a project
+     * configuration. Otherwise, autoload is handled in
+     * {@link sfApplicationConfiguration} using {@link sfAutoload}.
+     *
+     * @see sfSimpleAutoload
+     */
+    public function initializeAutoload()
     {
-      $directory = $this->rootDir.'/test/functional';
-      $names = $event['arguments']['controller'];
+        $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'));
+        } else {
+            $autoload->addDirectory($this->rootDir.'/lib');
+        }
+
+        $autoload->register();
     }
-    else if ($task instanceof sfTestUnitTask)
+
+    /**
+     * Filters sfAutoload configuration values.
+     *
+     * @return array
+     */
+    public function filterAutoloadConfig(sfEvent $event, array $config)
     {
-      $directory = $this->rootDir.'/test/unit';
-      $names = $event['arguments']['name'];
+        // 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(
+                    'path' => $this->rootDir.'/lib',
+                    'recursive' => true,
+                ),
+            ), $config['autoload']);
+        }
+
+        if (!isset($config['autoload'][$this->name.'_module_libs'])) {
+            $config['autoload'] = array_merge(array(
+                $this->name.'_module_libs' => array(
+                    'path' => $this->rootDir.'/modules/*/lib',
+                    'recursive' => true,
+                    'prefix' => 1,
+                ),
+            ), $config['autoload']);
+        }
+
+        return $config;
     }
 
-    if (!count($names))
+    /**
+     * Connects the current plugin's tests to the "test:*" tasks.
+     */
+    public function connectTests()
     {
-      $names = array('*');
+        $this->dispatcher->connect('task.test.filter_test_files', array($this, 'filterTestFiles'));
     }
 
-    foreach ($names as $name)
+    /**
+     * Listens for the "task.test.filter_test_files" event and adds tests from the current plugin.
+     *
+     * @param array $files
+     *
+     * @return array An array of files with the appropriate tests from the current plugin merged in
+     */
+    public function filterTestFiles(sfEvent $event, $files)
     {
-      $finder = sfFinder::type('file')->follow_link()->name(basename($name).'Test.php');
-      $files = array_merge($files, $finder->in($directory.'/'.dirname($name)));
+        $task = $event->getSubject();
+
+        if ($task instanceof sfTestAllTask) {
+            $directory = $this->rootDir.'/test';
+            $names = array();
+        } elseif ($task instanceof sfTestFunctionalTask) {
+            $directory = $this->rootDir.'/test/functional';
+            $names = $event['arguments']['controller'];
+        } elseif ($task instanceof sfTestUnitTask) {
+            $directory = $this->rootDir.'/test/unit';
+            $names = $event['arguments']['name'];
+        }
+
+        if (!count($names)) {
+            $names = array('*');
+        }
+
+        foreach ($names as $name) {
+            $finder = sfFinder::type('file')->follow_link()->name(basename($name).'Test.php');
+            $files = array_merge($files, $finder->in($directory.'/'.dirname($name)));
+        }
+
+        return array_unique($files);
     }
 
-    return array_unique($files);
-  }
-
-  /**
-   * Guesses the plugin root directory.
-   *
-   * @return string
-   */
-  protected function guessRootDir()
-  {
-    $r = new ReflectionClass(get_class($this));
-    return realpath(dirname($r->getFileName()).'/..');
-  }
-
-  /**
-   * Guesses the plugin name.
-   *
-   * @return string
-   */
-  protected function guessName()
-  {
-    return substr(get_class($this), 0, -13);
-  }
+    /**
+     * Guesses the plugin root directory.
+     *
+     * @return string
+     */
+    protected function guessRootDir()
+    {
+        $r = new ReflectionClass(get_class($this));
+
+        return realpath(dirname($r->getFileName()).'/..');
+    }
+
+    /**
+     * Guesses the plugin name.
+     *
+     * @return string
+     */
+    protected function guessName()
+    {
+        return substr(get_class($this), 0, -13);
+    }
 }
diff --git a/lib/config/sfPluginConfigurationGeneric.class.php b/lib/config/sfPluginConfigurationGeneric.class.php
index 127210c13..d7d9eff99 100644
--- a/lib/config/sfPluginConfigurationGeneric.class.php
+++ b/lib/config/sfPluginConfigurationGeneric.class.php
@@ -11,18 +11,17 @@
 /**
  * sfPluginConfigurationGeneric represents a configuration for a plugin with no configuration class.
  *
- * @package    symfony
- * @subpackage config
  * @author     Kris Wallsmith <kris.wallsmith@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfPluginConfigurationGeneric extends sfPluginConfiguration
 {
-  /**
-   * @see sfPluginConfiguration
-   */
-  public function initialize()
-  {
-    return false;
-  }
+    /**
+     * @see sfPluginConfiguration
+     */
+    public function initialize()
+    {
+        return false;
+    }
 }
diff --git a/lib/config/sfProjectConfiguration.class.php b/lib/config/sfProjectConfiguration.class.php
index 93a4baeb6..0f8c12fed 100644
--- a/lib/config/sfProjectConfiguration.class.php
+++ b/lib/config/sfProjectConfiguration.class.php
@@ -11,635 +11,600 @@
 /**
  * sfProjectConfiguration represents a configuration for a symfony project.
  *
- * @package    symfony
- * @subpackage config
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfProjectConfiguration
 {
-  /** @var string */
-  protected $rootDir = null;
-  /** @var string */
-  protected $symfonyLibDir = null;
-  /** @var sfEventDispatcher */
-  protected $dispatcher = null;
-  /** @var array */
-  protected $plugins = array();
-  /** @var array */
-  protected $pluginPaths = array();
-  /** @var array */
-  protected $overriddenPluginPaths = array();
-  /** @var sfPluginConfiguration[] */
-  protected $pluginConfigurations = array();
-  /** @var bool */
-  protected $pluginsLoaded = false;
-
-  /** @var sfApplicationConfiguration */
-  static protected $active = null;
-
-  /**
-   * Constructor.
-   *
-   * @param string              $rootDir    The project root directory
-   * @param sfEventDispatcher   $dispatcher The event dispatcher
-   */
-  public function __construct($rootDir = null, sfEventDispatcher $dispatcher = null)
-  {
-    if (null === self::$active || $this instanceof sfApplicationConfiguration)
+    /** @var string */
+    protected $rootDir;
+
+    /** @var string */
+    protected $symfonyLibDir;
+
+    /** @var sfEventDispatcher */
+    protected $dispatcher;
+
+    /** @var array */
+    protected $plugins = array();
+
+    /** @var array */
+    protected $pluginPaths = array();
+
+    /** @var array */
+    protected $overriddenPluginPaths = array();
+
+    /** @var sfPluginConfiguration[] */
+    protected $pluginConfigurations = array();
+
+    /** @var bool */
+    protected $pluginsLoaded = false;
+
+    /** @var sfApplicationConfiguration */
+    protected static $active;
+
+    /**
+     * Constructor.
+     *
+     * @param string            $rootDir    The project root directory
+     * @param sfEventDispatcher $dispatcher The event dispatcher
+     */
+    public function __construct($rootDir = null, sfEventDispatcher $dispatcher = null)
     {
-      self::$active = $this;
+        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;
+
+        ini_set('magic_quotes_runtime', 'off');
+
+        sfConfig::set('sf_symfony_lib_dir', $this->symfonyLibDir);
+
+        $this->setRootDir($this->rootDir);
+
+        // provide forms the dispatcher
+        sfFormSymfony::setEventDispatcher($this->dispatcher);
+
+        $this->setup();
+
+        $this->loadPlugins();
+        $this->setupPlugins();
     }
 
-    $this->rootDir = null === $rootDir ? static::guessRootDir() : realpath($rootDir);
-    $this->symfonyLibDir = realpath(__DIR__.'/..');
-    $this->dispatcher = null === $dispatcher ? new sfEventDispatcher() : $dispatcher;
+    /**
+     * Calls methods defined via sfEventDispatcher.
+     *
+     * @param string $method    The method name
+     * @param array  $arguments The method arguments
+     *
+     * @return mixed The returned value of the called method
+     *
+     * @throws sfException
+     */
+    public function __call($method, $arguments)
+    {
+        $event = $this->dispatcher->notifyUntil(new sfEvent($this, 'configuration.method_not_found', array('method' => $method, 'arguments' => $arguments)));
+        if (!$event->isProcessed()) {
+            throw new sfException(sprintf('Call to undefined method %s::%s.', get_class($this), $method));
+        }
 
-    ini_set('magic_quotes_runtime', 'off');
+        return $event->getReturnValue();
+    }
 
-    sfConfig::set('sf_symfony_lib_dir', $this->symfonyLibDir);
+    /**
+     * Setups the current configuration.
+     *
+     * Override this method if you want to customize your project configuration.
+     */
+    public function setup()
+    {
+    }
 
-    $this->setRootDir($this->rootDir);
+    /**
+     * Loads the project's plugin configurations.
+     */
+    public function loadPlugins()
+    {
+        foreach ($this->getPluginPaths() as $path) {
+            if (false === $plugin = array_search($path, $this->overriddenPluginPaths)) {
+                $plugin = basename($path);
+            }
+            $class = $plugin.'Configuration';
+
+            if (is_readable($file = sprintf('%s/config/%s.class.php', $path, $class))) {
+                require_once $file;
+                $configuration = new $class($this, $path, $plugin);
+            } else {
+                $configuration = new sfPluginConfigurationGeneric($this, $path, $plugin);
+            }
+
+            $this->pluginConfigurations[$plugin] = $configuration;
+        }
 
-    // provide forms the dispatcher
-    sfFormSymfony::setEventDispatcher($this->dispatcher);
+        $this->pluginsLoaded = true;
+    }
 
-    $this->setup();
+    /**
+     * Sets up plugin configurations.
+     *
+     * Override this method if you want to customize plugin configurations.
+     */
+    public function setupPlugins()
+    {
+    }
 
-    $this->loadPlugins();
-    $this->setupPlugins();
-  }
+    /**
+     * Sets the project root directory.
+     *
+     * @param string $rootDir The project root directory
+     */
+    public function setRootDir($rootDir)
+    {
+        $this->rootDir = $rootDir;
+
+        sfConfig::add(array(
+            'sf_root_dir' => $rootDir,
+
+            // global directory structure
+            'sf_apps_dir' => $rootDir.DIRECTORY_SEPARATOR.'apps',
+            'sf_lib_dir' => $rootDir.DIRECTORY_SEPARATOR.'lib',
+            'sf_log_dir' => $rootDir.DIRECTORY_SEPARATOR.'log',
+            'sf_data_dir' => $rootDir.DIRECTORY_SEPARATOR.'data',
+            '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');
+    }
 
-  /**
-   * Setups the current configuration.
-   *
-   * Override this method if you want to customize your project configuration.
-   */
-  public function setup()
-  {
-  }
+    /**
+     * Returns the project root directory.
+     *
+     * @return string The project root directory
+     */
+    public function getRootDir()
+    {
+        return $this->rootDir;
+    }
 
-  /**
-   * Loads the project's plugin configurations.
-   */
-  public function loadPlugins()
-  {
-    foreach ($this->getPluginPaths() as $path)
+    /**
+     * Sets the cache root directory.
+     *
+     * @param string $cacheDir the absolute path to the cache dir
+     */
+    public function setCacheDir($cacheDir)
     {
-      if (false === $plugin = array_search($path, $this->overriddenPluginPaths))
-      {
-        $plugin = basename($path);
-      }
-      $class = $plugin.'Configuration';
-
-      if (is_readable($file = sprintf('%s/config/%s.class.php', $path, $class)))
-      {
-        require_once $file;
-        $configuration = new $class($this, $path, $plugin);
-      }
-      else
-      {
-        $configuration = new sfPluginConfigurationGeneric($this, $path, $plugin);
-      }
-
-      $this->pluginConfigurations[$plugin] = $configuration;
+        sfConfig::set('sf_cache_dir', $cacheDir);
     }
 
-    $this->pluginsLoaded = true;
-  }
-
-  /**
-   * Sets up plugin configurations.
-   *
-   * Override this method if you want to customize plugin configurations.
-   */
-  public function setupPlugins()
-  {
-  }
-
-  /**
-   * Sets the project root directory.
-   *
-   * @param string $rootDir The project root directory
-   */
-  public function setRootDir($rootDir)
-  {
-    $this->rootDir = $rootDir;
-
-    sfConfig::add(array(
-      'sf_root_dir' => $rootDir,
-
-      // global directory structure
-      'sf_apps_dir'    => $rootDir.DIRECTORY_SEPARATOR.'apps',
-      'sf_lib_dir'     => $rootDir.DIRECTORY_SEPARATOR.'lib',
-      'sf_log_dir'     => $rootDir.DIRECTORY_SEPARATOR.'log',
-      'sf_data_dir'    => $rootDir.DIRECTORY_SEPARATOR.'data',
-      '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');
-  }
-
-  /**
-   * Returns the project root directory.
-   *
-   * @return string The project root directory
-   */
-  public function getRootDir()
-  {
-    return $this->rootDir;
-  }
-
-  /**
-   * Sets the cache root directory.
-   *
-   * @param string $cacheDir The absolute path to the cache dir.
-   */
-  public function setCacheDir($cacheDir)
-  {
-    sfConfig::set('sf_cache_dir', $cacheDir);
-  }
-
-  /**
-   * Sets the log directory.
-   *
-   * @param string $logDir The absolute path to the log dir.
-   */
-  public function setLogDir($logDir)
-  {
-    sfConfig::set('sf_log_dir', $logDir);
-  }
-
-  /**
-   * Sets the web root directory.
-   *
-   * @param string $webDir The absolute path to the web dir.
-   */
-  public function setWebDir($webDir)
-  {
-    sfConfig::add(array(
-      'sf_web_dir'         => $webDir,
-      'sf_upload_dir_name' => $uploadDirName = 'uploads',
-      'sf_upload_dir'      => $webDir.DIRECTORY_SEPARATOR.$uploadDirName,
-    ));
-  }
-
-  /**
-   * Gets directories where model classes are stored. The order of returned paths is lowest precedence
-   * to highest precedence.
-   *
-   * @return array An array of directories
-   */
-  public function getModelDirs()
-  {
-    return array_merge(
-      $this->getPluginSubPaths('/lib/model'),     // plugins
-      array(sfConfig::get('sf_lib_dir').'/model') // project
-    );
-  }
-
-  /**
-   * Gets directories where template files are stored for a generator class and a specific theme.
-   *
-   * @param string $class  The generator class name
-   * @param string $theme  The theme name
-   *
-   * @return array An array of directories
-   */
-  public function getGeneratorTemplateDirs($class, $theme)
-  {
-    return array_merge(
-      array(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)
-      $this->getPluginSubPaths('/data/generator/'.$class.'/default/template')          // plugins (default theme)
-    );
-  }
-
-  /**
-   * Gets directories where the skeleton is stored for a generator class and a specific theme.
-   *
-   * @param string $class   The generator class name
-   * @param string $theme   The theme name
-   *
-   * @return array An array of directories
-   */
-  public function getGeneratorSkeletonDirs($class, $theme)
-  {
-    return array_merge(
-      array(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)
-      $this->getPluginSubPaths('/data/generator/'.$class.'/default/skeleton')          // plugins (default theme)
-    );
-  }
-
-  /**
-   * Gets the template to use for a generator class.
-   *
-   * @param string $class   The generator class name
-   * @param string $theme   The theme name
-   * @param string $path    The template path
-   *
-   * @return string A template path
-   *
-   * @throws sfException
-   */
-  public function getGeneratorTemplate($class, $theme, $path)
-  {
-    $dirs = $this->getGeneratorTemplateDirs($class, $theme);
-    foreach ($dirs as $dir)
+    /**
+     * Sets the log directory.
+     *
+     * @param string $logDir the absolute path to the log dir
+     */
+    public function setLogDir($logDir)
     {
-      if (is_readable($dir.'/'.$path))
-      {
-        return $dir.'/'.$path;
-      }
+        sfConfig::set('sf_log_dir', $logDir);
     }
 
-    throw new sfException(sprintf('Unable to load "%s" generator template in: %s.', $path, implode(', ', $dirs)));
-  }
-
-  /**
-   * Gets the configuration file paths for a given relative configuration path.
-   *
-   * @param string $configPath The configuration path
-   *
-   * @return array An array of paths
-   */
-  public function getConfigPaths($configPath)
-  {
-    $globalConfigPath = basename(dirname($configPath)).'/'.basename($configPath);
-
-    $files = array(
-      $this->getSymfonyLibDir().'/config/'.$globalConfigPath, // symfony
-    );
-
-    foreach ($this->getPluginPaths() as $path)
+    /**
+     * Sets the web root directory.
+     *
+     * @param string $webDir the absolute path to the web dir
+     */
+    public function setWebDir($webDir)
     {
-      if (is_file($file = $path.'/'.$globalConfigPath))
-      {
-        $files[] = $file;                                     // plugins
-      }
+        sfConfig::add(array(
+            'sf_web_dir' => $webDir,
+            'sf_upload_dir_name' => $uploadDirName = 'uploads',
+            'sf_upload_dir' => $webDir.DIRECTORY_SEPARATOR.$uploadDirName,
+        ));
     }
 
-    $files = array_merge($files, array(
-      $this->getRootDir().'/'.$globalConfigPath,              // project
-      $this->getRootDir().'/'.$configPath,                    // project
-    ));
+    /**
+     * Gets directories where model classes are stored. The order of returned paths is lowest precedence
+     * to highest precedence.
+     *
+     * @return array An array of directories
+     */
+    public function getModelDirs()
+    {
+        return array_merge(
+            $this->getPluginSubPaths('/lib/model'),     // plugins
+            array(sfConfig::get('sf_lib_dir').'/model') // project
+        );
+    }
 
-    foreach ($this->getPluginPaths() as $path)
+    /**
+     * Gets directories where template files are stored for a generator class and a specific theme.
+     *
+     * @param string $class The generator class name
+     * @param string $theme The theme name
+     *
+     * @return array An array of directories
+     */
+    public function getGeneratorTemplateDirs($class, $theme)
     {
-      if (is_file($file = $path.'/'.$configPath))
-      {
-        $files[] = $file;                                     // plugins
-      }
+        return array_merge(
+            array(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)
+            $this->getPluginSubPaths('/data/generator/'.$class.'/default/template')          // plugins (default theme)
+        );
     }
 
-    $configs = array();
-    foreach (array_unique($files) as $file)
+    /**
+     * Gets directories where the skeleton is stored for a generator class and a specific theme.
+     *
+     * @param string $class The generator class name
+     * @param string $theme The theme name
+     *
+     * @return array An array of directories
+     */
+    public function getGeneratorSkeletonDirs($class, $theme)
     {
-      if (is_readable($file))
-      {
-        $configs[] = $file;
-      }
+        return array_merge(
+            array(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)
+            $this->getPluginSubPaths('/data/generator/'.$class.'/default/skeleton')          // plugins (default theme)
+        );
     }
 
-    return $configs;
-  }
-
-  /**
-   * Sets the enabled plugins.
-   *
-   * @param array $plugins An array of plugin names
-   *
-   * @throws LogicException If plugins have already been loaded
-   */
-  public function setPlugins(array $plugins)
-  {
-    if ($this->pluginsLoaded)
+    /**
+     * Gets the template to use for a generator class.
+     *
+     * @param string $class The generator class name
+     * @param string $theme The theme name
+     * @param string $path  The template path
+     *
+     * @return string A template path
+     *
+     * @throws sfException
+     */
+    public function getGeneratorTemplate($class, $theme, $path)
     {
-      throw new LogicException('Plugins have already been loaded.');
+        $dirs = $this->getGeneratorTemplateDirs($class, $theme);
+        foreach ($dirs as $dir) {
+            if (is_readable($dir.'/'.$path)) {
+                return $dir.'/'.$path;
+            }
+        }
+
+        throw new sfException(sprintf('Unable to load "%s" generator template in: %s.', $path, implode(', ', $dirs)));
     }
 
-    $this->plugins = $plugins;
+    /**
+     * Gets the configuration file paths for a given relative configuration path.
+     *
+     * @param string $configPath The configuration path
+     *
+     * @return array An array of paths
+     */
+    public function getConfigPaths($configPath)
+    {
+        $globalConfigPath = basename(dirname($configPath)).'/'.basename($configPath);
+
+        $files = array(
+            $this->getSymfonyLibDir().'/config/'.$globalConfigPath, // symfony
+        );
+
+        foreach ($this->getPluginPaths() as $path) {
+            if (is_file($file = $path.'/'.$globalConfigPath)) {
+                $files[] = $file;                                     // plugins
+            }
+        }
+
+        $files = array_merge($files, array(
+            $this->getRootDir().'/'.$globalConfigPath,              // project
+            $this->getRootDir().'/'.$configPath,                    // project
+        ));
 
-    $this->pluginPaths = array();
-  }
+        foreach ($this->getPluginPaths() as $path) {
+            if (is_file($file = $path.'/'.$configPath)) {
+                $files[] = $file;                                     // plugins
+            }
+        }
+
+        $configs = array();
+        foreach (array_unique($files) as $file) {
+            if (is_readable($file)) {
+                $configs[] = $file;
+            }
+        }
 
-  /**
-   * Enables a plugin or a list of plugins.
-   *
-   * @param array|string $plugins A plugin name or a plugin list
-   */
-  public function enablePlugins($plugins)
-  {
-    if (!is_array($plugins))
+        return $configs;
+    }
+
+    /**
+     * Sets the enabled plugins.
+     *
+     * @param array $plugins An array of plugin names
+     *
+     * @throws LogicException If plugins have already been loaded
+     */
+    public function setPlugins(array $plugins)
     {
-      if (func_num_args() > 1)
-      {
-        $plugins = func_get_args();
-      }
-      else
-      {
-        $plugins = array($plugins);
-      }
+        if ($this->pluginsLoaded) {
+            throw new LogicException('Plugins have already been loaded.');
+        }
+
+        $this->plugins = $plugins;
+
+        $this->pluginPaths = array();
     }
 
-    $this->setPlugins(array_merge($this->plugins, $plugins));
-  }
-
-  /**
-   * Disables a plugin.
-   *
-   * @param array|string $plugins A plugin name or a plugin list
-   *
-   * @throws LogicException If plugins have already been loaded
-   */
-  public function disablePlugins($plugins)
-  {
-    if ($this->pluginsLoaded)
+    /**
+     * Enables a plugin or a list of plugins.
+     *
+     * @param array|string $plugins A plugin name or a plugin list
+     */
+    public function enablePlugins($plugins)
     {
-      throw new LogicException('Plugins have already been loaded.');
+        if (!is_array($plugins)) {
+            if (func_num_args() > 1) {
+                $plugins = func_get_args();
+            } else {
+                $plugins = array($plugins);
+            }
+        }
+
+        $this->setPlugins(array_merge($this->plugins, $plugins));
     }
 
-    if (!is_array($plugins))
+    /**
+     * Disables a plugin.
+     *
+     * @param array|string $plugins A plugin name or a plugin list
+     *
+     * @throws LogicException If plugins have already been loaded
+     */
+    public function disablePlugins($plugins)
     {
-      $plugins = array($plugins);
+        if ($this->pluginsLoaded) {
+            throw new LogicException('Plugins have already been loaded.');
+        }
+
+        if (!is_array($plugins)) {
+            $plugins = array($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));
+            }
+        }
+
+        $this->pluginPaths = array();
     }
 
-    foreach ($plugins as $plugin)
+    /**
+     * Enabled all installed plugins except the one given as argument.
+     *
+     * @param array|string $plugins A plugin name or a plugin list
+     *
+     * @throws LogicException If plugins have already been loaded
+     */
+    public function enableAllPluginsExcept($plugins = array())
     {
-      if (false !== $pos = array_search($plugin, $this->plugins))
-      {
-        unset($this->plugins[$pos]);
-      }
-      else
-      {
-        throw new InvalidArgumentException(sprintf('The plugin "%s" does not exist.', $plugin));
-      }
+        if ($this->pluginsLoaded) {
+            throw new LogicException('Plugins have already been loaded.');
+        }
+
+        $this->plugins = array_keys($this->getAllPluginPaths());
+
+        sort($this->plugins);
+
+        $this->disablePlugins($plugins);
     }
 
-    $this->pluginPaths = array();
-  }
-
-  /**
-   * Enabled all installed plugins except the one given as argument.
-   *
-   * @param array|string $plugins A plugin name or a plugin list
-   *
-   * @throws LogicException If plugins have already been loaded
-   */
-  public function enableAllPluginsExcept($plugins = array())
-  {
-    if ($this->pluginsLoaded)
+    /**
+     * Gets the list of enabled plugins.
+     *
+     * @return array An array of enabled plugins
+     */
+    public function getPlugins()
     {
-      throw new LogicException('Plugins have already been loaded.');
+        return $this->plugins;
     }
 
-    $this->plugins = array_keys($this->getAllPluginPaths());
-
-    sort($this->plugins);
-
-    $this->disablePlugins($plugins);
-  }
-
-  /**
-   * Gets the list of enabled plugins.
-   *
-   * @return array An array of enabled plugins
-   */
-  public function getPlugins()
-  {
-    return $this->plugins;
-  }
-
-  /**
-   * Gets the paths plugin sub-directories, minding overloaded plugins.
-   *
-   * @param  string $subPath The subdirectory to look for
-   *
-   * @return array The plugin paths.
-   */
-  public function getPluginSubPaths($subPath = '')
-  {
-    if (array_key_exists($subPath, $this->pluginPaths))
+    /**
+     * Gets the paths plugin sub-directories, minding overloaded plugins.
+     *
+     * @param string $subPath The subdirectory to look for
+     *
+     * @return array the plugin paths
+     */
+    public function getPluginSubPaths($subPath = '')
     {
-      return $this->pluginPaths[$subPath];
+        if (array_key_exists($subPath, $this->pluginPaths)) {
+            return $this->pluginPaths[$subPath];
+        }
+
+        $this->pluginPaths[$subPath] = array();
+        $pluginPaths = $this->getPluginPaths();
+        foreach ($pluginPaths as $pluginPath) {
+            if (is_dir($pluginPath.$subPath)) {
+                $this->pluginPaths[$subPath][] = $pluginPath.$subPath;
+            }
+        }
+
+        return $this->pluginPaths[$subPath];
     }
 
-    $this->pluginPaths[$subPath] = array();
-    $pluginPaths = $this->getPluginPaths();
-    foreach ($pluginPaths as $pluginPath)
+    /**
+     * Gets the paths to plugins root directories, minding overloaded plugins.
+     *
+     * @return array the plugin root paths
+     *
+     * @throws InvalidArgumentException If an enabled plugin does not exist
+     */
+    public function getPluginPaths()
     {
-      if (is_dir($pluginPath.$subPath))
-      {
-        $this->pluginPaths[$subPath][] = $pluginPath.$subPath;
-      }
+        if (!isset($this->pluginPaths[''])) {
+            $pluginPaths = $this->getAllPluginPaths();
+
+            $this->pluginPaths[''] = array();
+            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));
+                }
+            }
+        }
+
+        return $this->pluginPaths[''];
     }
 
-    return $this->pluginPaths[$subPath];
-  }
-
-  /**
-   * Gets the paths to plugins root directories, minding overloaded plugins.
-   *
-   * @return array The plugin root paths.
-   *
-   * @throws InvalidArgumentException If an enabled plugin does not exist
-   */
-  public function getPluginPaths()
-  {
-    if (!isset($this->pluginPaths['']))
+    /**
+     * Returns an array of paths for all available plugins.
+     *
+     * @return array
+     */
+    public function getAllPluginPaths()
     {
-      $pluginPaths = $this->getAllPluginPaths();
-
-      $this->pluginPaths[''] = array();
-      foreach ($this->getPlugins() as $plugin)
-      {
-        if (isset($pluginPaths[$plugin]))
-        {
-          $this->pluginPaths[''][] = $pluginPaths[$plugin];
+        $pluginPaths = array();
+
+        // 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(
+            $this->getSymfonyLibDir().'/plugins',
+            sfConfig::get('sf_plugins_dir'),
+        );
+
+        foreach ($finder->in($dirs) as $path) {
+            $pluginPaths[basename($path)] = $path;
         }
-        else
-        {
-          throw new InvalidArgumentException(sprintf('The plugin "%s" does not exist.', $plugin));
+
+        foreach ($this->overriddenPluginPaths as $plugin => $path) {
+            $pluginPaths[$plugin] = $path;
         }
-      }
+
+        return $pluginPaths;
     }
 
-    return $this->pluginPaths[''];
-  }
-
-  /**
-   * Returns an array of paths for all available plugins.
-   *
-   * @return array
-   */
-  public function getAllPluginPaths()
-  {
-    $pluginPaths = array();
-
-    // 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(
-      $this->getSymfonyLibDir().'/plugins',
-      sfConfig::get('sf_plugins_dir'),
-    );
-
-    foreach ($finder->in($dirs) as $path)
+    /**
+     * Manually sets the location of a particular plugin.
+     *
+     * This method can be used to ease functional testing of plugins. It is not
+     * intended to support sharing plugins between projects, as many plugins
+     * save project specific code (to /lib/form/base, for example).
+     *
+     * @param string $plugin
+     * @param string $path
+     */
+    public function setPluginPath($plugin, $path)
     {
-      $pluginPaths[basename($path)] = $path;
+        $this->overriddenPluginPaths[$plugin] = realpath($path);
     }
 
-    foreach ($this->overriddenPluginPaths as $plugin => $path)
+    /**
+     * Returns the configuration for the requested plugin.
+     *
+     * @param string $name
+     *
+     * @return sfPluginConfiguration
+     */
+    public function getPluginConfiguration($name)
     {
-      $pluginPaths[$plugin] = $path;
+        if (!isset($this->pluginConfigurations[$name])) {
+            throw new InvalidArgumentException(sprintf('There is no configuration object for the "%s" object.', $name));
+        }
+
+        return $this->pluginConfigurations[$name];
     }
 
-    return $pluginPaths;
-  }
-
-  /**
-   * Manually sets the location of a particular plugin.
-   *
-   * This method can be used to ease functional testing of plugins. It is not
-   * intended to support sharing plugins between projects, as many plugins
-   * save project specific code (to /lib/form/base, for example).
-   *
-   * @param string $plugin
-   * @param string $path
-   */
-  public function setPluginPath($plugin, $path)
-  {
-    $this->overriddenPluginPaths[$plugin] = realpath($path);
-  }
-
-  /**
-   * Returns the configuration for the requested plugin.
-   *
-   * @param   string $name
-   *
-   * @return  sfPluginConfiguration
-   */
-  public function getPluginConfiguration($name)
-  {
-    if (!isset($this->pluginConfigurations[$name]))
+    /**
+     * Returns the event dispatcher.
+     *
+     * @return sfEventDispatcher A sfEventDispatcher instance
+     */
+    public function getEventDispatcher()
     {
-      throw new InvalidArgumentException(sprintf('There is no configuration object for the "%s" object.', $name));
+        return $this->dispatcher;
     }
 
-    return $this->pluginConfigurations[$name];
-  }
-
-  /**
-   * Returns the event dispatcher.
-   *
-   * @return sfEventDispatcher A sfEventDispatcher instance
-   */
-  public function getEventDispatcher()
-  {
-    return $this->dispatcher;
-  }
-
-  /**
-   * Returns the symfony lib directory.
-   *
-   * @return string The symfony lib directory
-   */
-  public function getSymfonyLibDir()
-  {
-    return $this->symfonyLibDir;
-  }
-
-  /**
-   * Returns the active configuration.
-   *
-   * @return sfApplicationConfiguration The current sfProjectConfiguration instance
-   */
-  static public function getActive()
-  {
-    if (!static::hasActive())
+    /**
+     * Returns the symfony lib directory.
+     *
+     * @return string The symfony lib directory
+     */
+    public function getSymfonyLibDir()
     {
-      throw new RuntimeException('There is no active configuration.');
+        return $this->symfonyLibDir;
     }
 
-    return self::$active;
-  }
-
-  /**
-   * Returns true if these is an active configuration.
-   *
-   * @return boolean
-   */
-  static public function hasActive()
-  {
-    return null !== self::$active;
-  }
-
-  /**
-   * Guesses the project root directory.
-   *
-   * @return string The project root directory
-   */
-  static public function guessRootDir()
-  {
-    $r = new ReflectionClass('ProjectConfiguration');
-
-    return realpath(dirname($r->getFileName()).'/..');
-  }
-
-  /**
-   * Returns a sfApplicationConfiguration configuration for a given application.
-   *
-   * @param string            $application    An application name
-   * @param string            $environment    The environment name
-   * @param Boolean           $debug          true to enable debug mode
-   * @param string            $rootDir        The project root directory
-   * @param sfEventDispatcher $dispatcher     An event dispatcher
-   *
-   * @return sfApplicationConfiguration A sfApplicationConfiguration instance
-   */
-  static public function getApplicationConfiguration($application, $environment, $debug, $rootDir = null, sfEventDispatcher $dispatcher = null)
-  {
-    $class = $application.'Configuration';
-
-    if (null === $rootDir)
+    /**
+     * Returns the active configuration.
+     *
+     * @return sfApplicationConfiguration The current sfProjectConfiguration instance
+     */
+    public static function getActive()
     {
-      $rootDir = static::guessRootDir();
+        if (!static::hasActive()) {
+            throw new RuntimeException('There is no active configuration.');
+        }
+
+        return self::$active;
     }
 
-    if (!is_file($file = $rootDir.'/apps/'.$application.'/config/'.$class.'.class.php'))
+    /**
+     * Returns true if these is an active configuration.
+     *
+     * @return bool
+     */
+    public static function hasActive()
     {
-      throw new InvalidArgumentException(sprintf('The application "%s" does not exist.', $application));
+        return null !== self::$active;
     }
 
-    require_once $file;
-
-    return new $class($environment, $debug, $rootDir, $dispatcher);
-  }
-
-  /**
-   * Calls methods defined via sfEventDispatcher.
-   *
-   * @param string $method    The method name
-   * @param array  $arguments The method arguments
-   *
-   * @return mixed The returned value of the called method
-   *
-   * @throws sfException
-   */
-  public function __call($method, $arguments)
-  {
-    $event = $this->dispatcher->notifyUntil(new sfEvent($this, 'configuration.method_not_found', array('method' => $method, 'arguments' => $arguments)));
-    if (!$event->isProcessed())
+    /**
+     * Guesses the project root directory.
+     *
+     * @return string The project root directory
+     */
+    public static function guessRootDir()
     {
-      throw new sfException(sprintf('Call to undefined method %s::%s.', get_class($this), $method));
+        $r = new ReflectionClass('ProjectConfiguration');
+
+        return realpath(dirname($r->getFileName()).'/..');
     }
 
-    return $event->getReturnValue();
-  }
+    /**
+     * 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
+     *
+     * @return sfApplicationConfiguration A sfApplicationConfiguration instance
+     */
+    public static function getApplicationConfiguration($application, $environment, $debug, $rootDir = null, sfEventDispatcher $dispatcher = null)
+    {
+        $class = $application.'Configuration';
+
+        if (null === $rootDir) {
+            $rootDir = static::guessRootDir();
+        }
+
+        if (!is_file($file = $rootDir.'/apps/'.$application.'/config/'.$class.'.class.php')) {
+            throw new InvalidArgumentException(sprintf('The application "%s" does not exist.', $application));
+        }
+
+        require_once $file;
+
+        return new $class($environment, $debug, $rootDir, $dispatcher);
+    }
 }
diff --git a/lib/config/sfRootConfigHandler.class.php b/lib/config/sfRootConfigHandler.class.php
index c48102988..e4837cae6 100644
--- a/lib/config/sfRootConfigHandler.class.php
+++ b/lib/config/sfRootConfigHandler.class.php
@@ -12,102 +12,97 @@
  * sfRootConfigHandler allows you to specify configuration handlers for the
  * application or on a module level.
  *
- * @package    symfony
- * @subpackage config
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfRootConfigHandler extends sfYamlConfigHandler
 {
-  /**
-   * Executes this configuration handler
-   *
-   * @param array $configFiles An array of absolute filesystem path to a configuration file
-   *
-   * @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
-   */
-  public function execute($configFiles)
-  {
-    // parse the yaml
-    $config = static::getConfiguration($configFiles);
-
-    // determine if we're loading the system config_handlers.yml or a module config_handlers.yml
-    $moduleLevel = ($this->getParameterHolder()->get('module_level') === true);
-
-    if ($moduleLevel)
+    /**
+     * Executes this configuration handler.
+     *
+     * @param array $configFiles An array of absolute filesystem path to a configuration file
+     *
+     * @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
+     */
+    public function execute($configFiles)
     {
-      // get the current module name
-      $moduleName = $this->getParameterHolder()->get('module_name');
-    }
+        // parse the yaml
+        $config = static::getConfiguration($configFiles);
 
-    // init our data and includes arrays
-    $data     = array();
-    $includes = array();
+        // determine if we're loading the system config_handlers.yml or a module config_handlers.yml
+        $moduleLevel = (true === $this->getParameterHolder()->get('module_level'));
 
-    // let's do our fancy work
-    foreach ($config as $category => $keys)
-    {
-      if ($moduleLevel)
-      {
-        // module-level registration, so we must prepend the module
-        // root to the category
-        $category = 'modules/'.$moduleName.'/'.$category;
-      }
-
-      if (!isset($keys['class']))
-      {
-        // missing class key
-        throw new sfParseException(sprintf('Configuration file "%s" specifies category "%s" with missing class key.', $configFiles[0], $category));
-      }
-
-      $class = $keys['class'];
-
-      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']));
+        if ($moduleLevel) {
+            // get the current module name
+            $moduleName = $this->getParameterHolder()->get('module_name');
         }
 
-        // append our data
-        $includes[] = sprintf("require_once('%s');", $keys['file']);
-      }
+        // init our data and includes arrays
+        $data = array();
+        $includes = array();
 
-      // parse parameters
-      $parameters = (isset($keys['param']) ? var_export($keys['param'], true) : null);
+        // let's do our fancy work
+        foreach ($config as $category => $keys) {
+            if ($moduleLevel) {
+                // module-level registration, so we must prepend the module
+                // root to the category
+                $category = 'modules/'.$moduleName.'/'.$category;
+            }
 
-      // append new data
-      $data[] = sprintf("\$this->handlers['%s'] = new %s(%s);", $category, $class, $parameters);
-    }
+            if (!isset($keys['class'])) {
+                // missing class key
+                throw new sfParseException(sprintf('Configuration file "%s" specifies category "%s" with missing class key.', $configFiles[0], $category));
+            }
 
-    // compile data
-    $retval = sprintf("<?php\n" .
-                      "// auto-generated by sfRootConfigHandler\n".
-                      "// date: %s\n%s\n%s\n",
-                      date('Y/m/d H:i:s'), implode("\n", $includes), implode("\n", $data));
+            $class = $keys['class'];
 
-    return $retval;
-  }
+            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']));
+                }
 
-  /**
-   * @see sfConfigHandler
-   */
-  static public function getConfiguration(array $configFiles)
-  {
-    $config = static::replaceConstants(static::parseYamls($configFiles));
+                // append our data
+                $includes[] = sprintf("require_once('%s');", $keys['file']);
+            }
 
-    foreach ($config as $category => $keys)
-    {
-      if (isset($keys['file']))
-      {
-        $config[$category]['file'] = static::replacePath($keys['file']);
-      }
+            // parse parameters
+            $parameters = (isset($keys['param']) ? var_export($keys['param'], true) : null);
+
+            // append new data
+            $data[] = sprintf("\$this->handlers['%s'] = new %s(%s);", $category, $class, $parameters);
+        }
+
+        // compile data
+        $retval = sprintf(
+            "<?php\n".
+                          "// auto-generated by sfRootConfigHandler\n".
+                          "// date: %s\n%s\n%s\n",
+            date('Y/m/d H:i:s'),
+            implode("\n", $includes),
+            implode("\n", $data)
+        );
+
+        return $retval;
     }
 
-    return $config;
-  }
+    /**
+     * @see sfConfigHandler
+     */
+    public static function getConfiguration(array $configFiles)
+    {
+        $config = static::replaceConstants(static::parseYamls($configFiles));
+
+        foreach ($config as $category => $keys) {
+            if (isset($keys['file'])) {
+                $config[$category]['file'] = static::replacePath($keys['file']);
+            }
+        }
+
+        return $config;
+    }
 }
diff --git a/lib/config/sfRoutingConfigHandler.class.php b/lib/config/sfRoutingConfigHandler.class.php
index 9e75fa955..ac82d5cc9 100644
--- a/lib/config/sfRoutingConfigHandler.class.php
+++ b/lib/config/sfRoutingConfigHandler.class.php
@@ -9,109 +9,105 @@
  */
 
 /**
- * @package    symfony
- * @subpackage config
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfRoutingConfigHandler extends sfYamlConfigHandler
 {
-  /**
-   * Executes this configuration handler.
-   *
-   * @param array $configFiles An array of absolute filesystem path to a configuration file
-   *
-   * @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
-   */
-  public function execute($configFiles)
-  {
-    $options = $this->getOptions();
-    unset($options['cache']);
-
-    $data = array();
-    foreach ($this->parse($configFiles) as $name => $routeConfig)
+    /**
+     * Executes this configuration handler.
+     *
+     * @param array $configFiles An array of absolute filesystem path to a configuration file
+     *
+     * @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
+     */
+    public function execute($configFiles)
     {
-      $r = new ReflectionClass($routeConfig[0]);
-      /** @var sfRoute $route */
-      $route = $r->newInstanceArgs($routeConfig[1]);
-
-      $routes = $route instanceof sfRouteCollection ? $route : array($name => $route);
-      foreach (sfPatternRouting::flattenRoutes($routes) as $name => $route)
-      {
-        $route->setDefaultOptions($options);
-        $data[] = sprintf('$this->routes[\'%s\'] = %s;', $name, var_export(serialize($route), true));
-      }
+        $options = $this->getOptions();
+        unset($options['cache']);
+
+        $data = array();
+        foreach ($this->parse($configFiles) as $name => $routeConfig) {
+            $r = new ReflectionClass($routeConfig[0]);
+
+            /** @var sfRoute $route */
+            $route = $r->newInstanceArgs($routeConfig[1]);
+
+            $routes = $route instanceof sfRouteCollection ? $route : array($name => $route);
+            foreach (sfPatternRouting::flattenRoutes($routes) as $name => $route) {
+                $route->setDefaultOptions($options);
+                $data[] = sprintf('$this->routes[\'%s\'] = %s;', $name, var_export(serialize($route), true));
+            }
+        }
+
+        return sprintf(
+            "<?php\n".
+                       "// auto-generated by sfRoutingConfigHandler\n".
+                       "// date: %s\n%s\n",
+            date('Y/m/d H:i:s'),
+            implode("\n", $data)
+        );
     }
 
-    return sprintf("<?php\n".
-                   "// auto-generated by sfRoutingConfigHandler\n".
-                   "// date: %s\n%s\n", date('Y/m/d H:i:s'), implode("\n", $data)
-    );
-  }
+    public function evaluate($configFiles)
+    {
+        $routeDefinitions = $this->parse($configFiles);
 
-  protected function getOptions()
-  {
-    $config = sfFactoryConfigHandler::getConfiguration(sfContext::getInstance()->getConfiguration()->getConfigPaths('config/factories.yml'));
-    return $config['routing']['param'];
-  }
+        $routes = array();
+        foreach ($routeDefinitions as $name => $route) {
+            $r = new ReflectionClass($route[0]);
+            $routes[$name] = $r->newInstanceArgs($route[1]);
+        }
 
-  public function evaluate($configFiles)
-  {
-    $routeDefinitions = $this->parse($configFiles);
+        return $routes;
+    }
 
-    $routes = array();
-    foreach ($routeDefinitions as $name => $route)
+    /**
+     * @see sfConfigHandler
+     */
+    public static function getConfiguration(array $configFiles)
     {
-      $r = new ReflectionClass($route[0]);
-      $routes[$name] = $r->newInstanceArgs($route[1]);
+        return static::parseYamls($configFiles);
     }
 
-    return $routes;
-  }
+    protected function getOptions()
+    {
+        $config = sfFactoryConfigHandler::getConfiguration(sfContext::getInstance()->getConfiguration()->getConfigPaths('config/factories.yml'));
 
-  protected function parse($configFiles)
-  {
-    // parse the yaml
-    $config = static::getConfiguration($configFiles);
+        return $config['routing']['param'];
+    }
 
-    // collect routes
-    $routes = array();
-    foreach ($config as $name => $params)
+    protected function parse($configFiles)
     {
-      if (
-        (isset($params['type']) && 'collection' == $params['type'])
-        ||
-        (isset($params['class']) && false !== strpos($params['class'], 'Collection'))
-      )
-      {
-        $options = isset($params['options']) ? $params['options'] : array();
-        $options['name'] = $name;
-        $options['requirements'] = isset($params['requirements']) ? $params['requirements'] : array();
-
-        $routes[$name] = array(isset($params['class']) ? $params['class'] : 'sfRouteCollection', array($options));
-      }
-      else
-      {
-        $routes[$name] = array(isset($params['class']) ? $params['class'] : 'sfRoute', array(
-          $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(),
-        ));
-      }
-    }
+        // parse the yaml
+        $config = static::getConfiguration($configFiles);
+
+        // collect routes
+        $routes = array();
+        foreach ($config as $name => $params) {
+            if (
+                (isset($params['type']) && 'collection' == $params['type'])
+                || (isset($params['class']) && false !== strpos($params['class'], 'Collection'))
+            ) {
+                $options = isset($params['options']) ? $params['options'] : array();
+                $options['name'] = $name;
+                $options['requirements'] = isset($params['requirements']) ? $params['requirements'] : array();
 
-    return $routes;
-  }
+                $routes[$name] = array(isset($params['class']) ? $params['class'] : 'sfRouteCollection', array($options));
+            } else {
+                $routes[$name] = array(isset($params['class']) ? $params['class'] : 'sfRoute', array(
+                    $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(),
+                ));
+            }
+        }
 
-  /**
-   * @see sfConfigHandler
-   */
-  static public function getConfiguration(array $configFiles)
-  {
-    return static::parseYamls($configFiles);
-  }
+        return $routes;
+    }
 }
diff --git a/lib/config/sfSecurityConfigHandler.class.php b/lib/config/sfSecurityConfigHandler.class.php
index 57efcfb27..6c4dccb01 100644
--- a/lib/config/sfSecurityConfigHandler.class.php
+++ b/lib/config/sfSecurityConfigHandler.class.php
@@ -11,49 +11,51 @@
 /**
  * sfSecurityConfigHandler allows you to configure action security.
  *
- * @package    symfony
- * @subpackage config
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfSecurityConfigHandler extends sfYamlConfigHandler
 {
-  /**
-   * Executes this configuration handler.
-   *
-   * @param array $configFiles An array of absolute filesystem path to a configuration file
-   *
-   * @return string Data to be written to a cache file
-   *
-   * @throws <b>sfConfigurationException</b> If a requested configuration file does not exist or is not readable
-   * @throws <b>sfParseException</b> If a requested configuration file is improperly formatted
-   * @throws <b>sfInitializationException</b> If a view.yml key check fails
-   */
-  public function execute($configFiles)
-  {
-    // parse the yaml
-    $config = static::getConfiguration($configFiles);
+    /**
+     * Executes this configuration handler.
+     *
+     * @param array $configFiles An array of absolute filesystem path to a configuration file
+     *
+     * @return string Data to be written to a cache file
+     *
+     * @throws <b>sfConfigurationException</b> If a requested configuration file does not exist or is not readable
+     * @throws <b>sfParseException</b> If a requested configuration file is improperly formatted
+     * @throws <b>sfInitializationException</b> If a view.yml key check fails
+     */
+    public function execute($configFiles)
+    {
+        // parse the yaml
+        $config = static::getConfiguration($configFiles);
 
-    // compile data
-    $retval = sprintf("<?php\n".
-                      "// auto-generated by sfSecurityConfigHandler\n".
-                      "// date: %s\n\$this->security = %s;\n",
-                      date('Y/m/d H:i:s'), var_export($config, true));
+        // compile data
+        $retval = sprintf(
+            "<?php\n".
+                          "// auto-generated by sfSecurityConfigHandler\n".
+                          "// date: %s\n\$this->security = %s;\n",
+            date('Y/m/d H:i:s'),
+            var_export($config, true)
+        );
 
-    return $retval;
-  }
+        return $retval;
+    }
 
-  /**
-   * @see sfConfigHandler
-   * @inheritdoc
-   */
-  static public function getConfiguration(array $configFiles)
-  {
-    $config = static::flattenConfiguration(static::parseYamls($configFiles));
+    /**
+     * @see sfConfigHandler
+     * {@inheritdoc}
+     */
+    public static function getConfiguration(array $configFiles)
+    {
+        $config = static::flattenConfiguration(static::parseYamls($configFiles));
 
-    // change all of the keys to lowercase
-    $config = array_change_key_case($config);
+        // change all of the keys to lowercase
+        $config = array_change_key_case($config);
 
-    return $config;
-  }
+        return $config;
+    }
 }
diff --git a/lib/config/sfServiceConfigHandler.class.php b/lib/config/sfServiceConfigHandler.class.php
index f4ecc74c9..55e3935bb 100644
--- a/lib/config/sfServiceConfigHandler.class.php
+++ b/lib/config/sfServiceConfigHandler.class.php
@@ -11,59 +11,61 @@
 /**
  * sfSecurityConfigHandler allows you to configure action security.
  *
- * @package    symfony
- * @subpackage config
  * @author     Jerome Tamarelle <jtamarelle@groupe-exp.com>
+ *
  * @version    SVN: $Id$
  */
 class sfServiceConfigHandler extends sfYamlConfigHandler
 {
-  /**
-   * Executes this configuration handler.
-   *
-   * @param array $configFiles An array of absolute filesystem path to a configuration file
-   *
-   * @return string Data to be written to a cache file
-   */
-  public function execute($configFiles)
-  {
-    $class = sfConfig::get('sf_app').'_'.sfConfig::get('sf_environment').'ServiceContainer';
+    /**
+     * Executes this configuration handler.
+     *
+     * @param array $configFiles An array of absolute filesystem path to a configuration file
+     *
+     * @return string Data to be written to a cache file
+     */
+    public function execute($configFiles)
+    {
+        $class = sfConfig::get('sf_app').'_'.sfConfig::get('sf_environment').'ServiceContainer';
 
-    $serviceContainerBuilder = new sfServiceContainerBuilder();
+        $serviceContainerBuilder = new sfServiceContainerBuilder();
 
-    $loader = new sfServiceContainerLoaderArray($serviceContainerBuilder);
-    $loader->load(static::getConfiguration($configFiles));
+        $loader = new sfServiceContainerLoaderArray($serviceContainerBuilder);
+        $loader->load(static::getConfiguration($configFiles));
 
-    $dumper = new sfServiceContainerDumperPhp($serviceContainerBuilder);
-    $code = $dumper->dump(array(
-      'class'       => $class,
-      'base_class'  => $this->parameterHolder->get('base_class'),
-    ));
+        $dumper = new sfServiceContainerDumperPhp($serviceContainerBuilder);
+        $code = $dumper->dump(array(
+            'class' => $class,
+            'base_class' => $this->parameterHolder->get('base_class'),
+        ));
 
-    // compile data
-    $retval = sprintf(
-      "<?php\n".
-      "// auto-generated by sfServiceConfigHandler\n".
-      "// date: %s\n\n".
-      "\$class = '%s';\n".
-      "if (!class_exists(\$class, false)) {\n".
-      "%s\n".
-      "}\n".
-      "return \$class;\n\n",
-      date('Y/m/d H:i:s'), $class, $code);
+        // compile data
+        $retval = sprintf(
+            "<?php\n".
+            "// auto-generated by sfServiceConfigHandler\n".
+            "// date: %s\n\n".
+            "\$class = '%s';\n".
+            "if (!class_exists(\$class, false)) {\n".
+            "%s\n".
+            "}\n".
+            "return \$class;\n\n",
+            date('Y/m/d H:i:s'),
+            $class,
+            $code
+        );
 
-    return $retval;
-  }
+        return $retval;
+    }
 
-  /**
-   * @see sfConfigHandler
-   * @inheritdoc
-   */
-  static public function getConfiguration(array $configFiles)
-  {
-    $config = static::parseYamls($configFiles);
-    $config = static::flattenConfigurationWithEnvironment($config);
+    /**
+     * @see sfConfigHandler
+     * {@inheritdoc}
+     */
+    public static function getConfiguration(array $configFiles)
+    {
+        $config = static::parseYamls($configFiles);
+        $config = static::flattenConfigurationWithEnvironment($config);
 
-    return $config;
-  }
+        return $config;
+    }
 }
diff --git a/lib/config/sfSimpleYamlConfigHandler.class.php b/lib/config/sfSimpleYamlConfigHandler.class.php
index d90a32d3b..56e8d336e 100644
--- a/lib/config/sfSimpleYamlConfigHandler.class.php
+++ b/lib/config/sfSimpleYamlConfigHandler.class.php
@@ -11,39 +11,38 @@
 /**
  * sfSimpleYamlConfigHandler allows you to load simple configuration files formatted as YAML.
  *
- * @package    symfony
- * @subpackage config
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfSimpleYamlConfigHandler extends sfYamlConfigHandler
 {
-  /**
-   * Executes this configuration handler.
-   *
-   * @param array $configFiles An array of absolute filesystem path to a configuration file
-   *
-   * @return string Data to be written to a cache file
-   */
-  public function execute($configFiles)
-  {
-    $config = static::getConfiguration($configFiles);
+    /**
+     * Executes this configuration handler.
+     *
+     * @param array $configFiles An array of absolute filesystem path to a configuration file
+     *
+     * @return string Data to be written to a cache file
+     */
+    public function execute($configFiles)
+    {
+        $config = static::getConfiguration($configFiles);
 
-    // compile data
-    $retval = "<?php\n".
-              "// auto-generated by %s\n".
-              "// date: %s\nreturn %s;\n";
-    $retval = sprintf($retval, __CLASS__, date('Y/m/d H:i:s'), var_export($config, true));
+        // compile data
+        $retval = "<?php\n".
+                  "// auto-generated by %s\n".
+                  "// date: %s\nreturn %s;\n";
+        $retval = sprintf($retval, __CLASS__, date('Y/m/d H:i:s'), var_export($config, true));
 
-    return $retval;
-  }
+        return $retval;
+    }
 
-  /**
-   * @see sfConfigHandler
-   * @inheritdoc
-   */
-  static public function getConfiguration(array $configFiles)
-  {
-    return static::parseYamls($configFiles);
-  }
+    /**
+     * @see sfConfigHandler
+     * {@inheritdoc}
+     */
+    public static function getConfiguration(array $configFiles)
+    {
+        return static::parseYamls($configFiles);
+    }
 }
diff --git a/lib/config/sfViewConfigHandler.class.php b/lib/config/sfViewConfigHandler.class.php
index 8068fd57c..af565b723 100644
--- a/lib/config/sfViewConfigHandler.class.php
+++ b/lib/config/sfViewConfigHandler.class.php
@@ -11,337 +11,319 @@
 /**
  * sfViewConfigHandler allows you to configure views.
  *
- * @package    symfony
- * @subpackage config
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfViewConfigHandler extends sfYamlConfigHandler
 {
-  /**
-   * Executes this configuration handler.
-   *
-   * @param array $configFiles An array of absolute filesystem path to a configuration file
-   *
-   * @return string Data to be written to a cache file
-   *
-   * @throws <b>sfConfigurationException</b> If a requested configuration file does not exist or is not readable
-   * @throws <b>sfParseException</b> If a requested configuration file is improperly formatted
-   * @throws <b>sfInitializationException</b> If a view.yml key check fails
-   */
-  public function execute($configFiles)
-  {
-    // parse the yaml
-    $this->yamlConfig = static::getConfiguration($configFiles);
+    /**
+     * Executes this configuration handler.
+     *
+     * @param array $configFiles An array of absolute filesystem path to a configuration file
+     *
+     * @return string Data to be written to a cache file
+     *
+     * @throws <b>sfConfigurationException</b> If a requested configuration file does not exist or is not readable
+     * @throws <b>sfParseException</b> If a requested configuration file is improperly formatted
+     * @throws <b>sfInitializationException</b> If a view.yml key check fails
+     */
+    public function execute($configFiles)
+    {
+        // parse the yaml
+        $this->yamlConfig = static::getConfiguration($configFiles);
 
-    // init our data array
-    $data = array();
+        // init our data array
+        $data = array();
 
-    $data[] = "\$response = \$this->context->getResponse();\n\n";
+        $data[] = "\$response = \$this->context->getResponse();\n\n";
 
-    // first pass: iterate through all view names to determine the real view name
-    $first = true;
-    foreach ($this->yamlConfig as $viewName => $values)
-    {
-      if ($viewName == 'all')
-      {
-        continue;
-      }
+        // first pass: iterate through all view names to determine the real view name
+        $first = true;
+        foreach ($this->yamlConfig as $viewName => $values) {
+            if ('all' == $viewName) {
+                continue;
+            }
 
-      $data[] = ($first ? '' : 'else ')."if (\$this->actionName.\$this->viewName == '$viewName')\n".
-                "{\n";
-      $data[] = $this->addTemplate($viewName);
-      $data[] = "}\n";
+            $data[] = ($first ? '' : 'else ')."if (\$this->actionName.\$this->viewName == '{$viewName}')\n".
+                      "{\n";
+            $data[] = $this->addTemplate($viewName);
+            $data[] = "}\n";
 
-      $first = false;
-    }
+            $first = false;
+        }
 
-    // general view configuration
-    $data[] = ($first ? '' : "else\n{")."\n";
-    $data[] = $this->addTemplate($viewName);
-    $data[] = ($first ? '' : "}")."\n\n";
+        // general view configuration
+        $data[] = ($first ? '' : "else\n{")."\n";
+        $data[] = $this->addTemplate($viewName);
+        $data[] = ($first ? '' : '}')."\n\n";
 
-    // second pass: iterate through all real view names
-    $first = true;
-    foreach ($this->yamlConfig as $viewName => $values)
-    {
-      if ($viewName == 'all')
-      {
-        continue;
-      }
+        // second pass: iterate through all real view names
+        $first = true;
+        foreach ($this->yamlConfig as $viewName => $values) {
+            if ('all' == $viewName) {
+                continue;
+            }
 
-      $data[] = ($first ? '' : 'else ')."if (\$templateName.\$this->viewName == '$viewName')\n".
-                "{\n";
+            $data[] = ($first ? '' : 'else ')."if (\$templateName.\$this->viewName == '{$viewName}')\n".
+                      "{\n";
 
-      $data[] = $this->addLayout($viewName);
-      $data[] = $this->addComponentSlots($viewName);
-      $data[] = $this->addHtmlHead($viewName);
-      $data[] = $this->addEscaping($viewName);
+            $data[] = $this->addLayout($viewName);
+            $data[] = $this->addComponentSlots($viewName);
+            $data[] = $this->addHtmlHead($viewName);
+            $data[] = $this->addEscaping($viewName);
 
-      $data[] = $this->addHtmlAsset($viewName);
+            $data[] = $this->addHtmlAsset($viewName);
 
-      $data[] = "}\n";
+            $data[] = "}\n";
 
-      $first = false;
-    }
+            $first = false;
+        }
 
-    // general view configuration
-    $data[] = ($first ? '' : "else\n{")."\n";
+        // general view configuration
+        $data[] = ($first ? '' : "else\n{")."\n";
 
-    $data[] = $this->addLayout();
-    $data[] = $this->addComponentSlots();
-    $data[] = $this->addHtmlHead();
-    $data[] = $this->addEscaping();
+        $data[] = $this->addLayout();
+        $data[] = $this->addComponentSlots();
+        $data[] = $this->addHtmlHead();
+        $data[] = $this->addEscaping();
 
-    $data[] = $this->addHtmlAsset();
-    $data[] = ($first ? '' : "}")."\n";
+        $data[] = $this->addHtmlAsset();
+        $data[] = ($first ? '' : '}')."\n";
 
-    // compile data
-    $retval = sprintf("<?php\n".
-                      "// auto-generated by sfViewConfigHandler\n".
-                      "// date: %s\n%s\n",
-                      date('Y/m/d H:i:s'), implode('', $data));
+        // compile data
+        $retval = sprintf(
+            "<?php\n".
+                          "// auto-generated by sfViewConfigHandler\n".
+                          "// date: %s\n%s\n",
+            date('Y/m/d H:i:s'),
+            implode('', $data)
+        );
 
-    return $retval;
-  }
+        return $retval;
+    }
 
-  /**
-   * Adds a component slot statement to the data.
-   *
-   * @param string $viewName The view name
-   *
-   * @return string The PHP statement
-   */
-  protected function addComponentSlots($viewName = '')
-  {
-    $data = '';
+    /**
+     * @see sfConfigHandler
+     * {@inheritdoc}
+     */
+    public static function getConfiguration(array $configFiles)
+    {
+        return static::mergeConfig(static::parseYamls($configFiles));
+    }
 
-    $components = $this->mergeConfigValue('components', $viewName);
-    foreach ($components as $name => $component)
+    /**
+     * Adds a component slot statement to the data.
+     *
+     * @param string $viewName The view name
+     *
+     * @return string The PHP statement
+     */
+    protected function addComponentSlots($viewName = '')
     {
-      if (!is_array($component) || count($component) < 1)
-      {
-        $component = array(null, null);
-      }
+        $data = '';
 
-      $data .= "  \$this->setComponentSlot('$name', '{$component[0]}', '{$component[1]}');\n";
-      $data .= "  if (sfConfig::get('sf_logging_enabled')) \$this->context->getEventDispatcher()->notify(new sfEvent(\$this, 'application.log', array(sprintf('Set component \"%s\" (%s/%s)', '$name', '{$component[0]}', '{$component[1]}'))));\n";
-    }
+        $components = $this->mergeConfigValue('components', $viewName);
+        foreach ($components as $name => $component) {
+            if (!is_array($component) || count($component) < 1) {
+                $component = array(null, null);
+            }
 
-    return $data;
-  }
+            $data .= "  \$this->setComponentSlot('{$name}', '{$component[0]}', '{$component[1]}');\n";
+            $data .= "  if (sfConfig::get('sf_logging_enabled')) \$this->context->getEventDispatcher()->notify(new sfEvent(\$this, 'application.log', array(sprintf('Set component \"%s\" (%s/%s)', '{$name}', '{$component[0]}', '{$component[1]}'))));\n";
+        }
 
-  /**
-   * Adds a template setting statement to the data.
-   *
-   * @param string $viewName The view name
-   *
-   * @return string The PHP statement
-   */
-  protected function addTemplate($viewName = '')
-  {
-    $data = '';
+        return $data;
+    }
 
-    $templateName = $this->getConfigValue('template', $viewName);
-    $defaultTemplateName = $templateName ? "'$templateName'" : '$this->actionName';
+    /**
+     * Adds a template setting statement to the data.
+     *
+     * @param string $viewName The view name
+     *
+     * @return string The PHP statement
+     */
+    protected function addTemplate($viewName = '')
+    {
+        $data = '';
 
-    $data .= "  \$templateName = sfConfig::get('symfony.view.'.\$this->moduleName.'_'.\$this->actionName.'_template', $defaultTemplateName);\n";
-    $data .= "  \$this->setTemplate(\$templateName.\$this->viewName.\$this->getExtension());\n";
+        $templateName = $this->getConfigValue('template', $viewName);
+        $defaultTemplateName = $templateName ? "'{$templateName}'" : '$this->actionName';
 
-    return $data;
-  }
+        $data .= "  \$templateName = sfConfig::get('symfony.view.'.\$this->moduleName.'_'.\$this->actionName.'_template', {$defaultTemplateName});\n";
+        $data .= "  \$this->setTemplate(\$templateName.\$this->viewName.\$this->getExtension());\n";
 
-  /**
-   * Adds a layout statement statement to the data.
-   *
-   * @param string $viewName The view name
-   *
-   * @return string The PHP statement
-   */
-  protected function addLayout($viewName = '')
-  {
-    // true if the user set 'has_layout' to true or set a 'layout' name for this specific action
-    $hasLocalLayout = isset($this->yamlConfig[$viewName]['layout']) || (isset($this->yamlConfig[$viewName]) && array_key_exists('has_layout', $this->yamlConfig[$viewName]));
+        return $data;
+    }
 
-    // the layout value
-    $layout = $this->getConfigValue('has_layout', $viewName) ? $this->getConfigValue('layout', $viewName) : false;
+    /**
+     * Adds a layout statement statement to the data.
+     *
+     * @param string $viewName The view name
+     *
+     * @return string The PHP statement
+     */
+    protected function addLayout($viewName = '')
+    {
+        // true if the user set 'has_layout' to true or set a 'layout' name for this specific action
+        $hasLocalLayout = isset($this->yamlConfig[$viewName]['layout']) || (isset($this->yamlConfig[$viewName]) && array_key_exists('has_layout', $this->yamlConfig[$viewName]));
 
-    // the user set a decorator in the action
-    $data = <<<EOF
-  if (null !== \$layout = sfConfig::get('symfony.view.'.\$this->moduleName.'_'.\$this->actionName.'_layout'))
+        // the layout value
+        $layout = $this->getConfigValue('has_layout', $viewName) ? $this->getConfigValue('layout', $viewName) : false;
+
+        // the user set a decorator in the action
+        $data = <<<'EOF'
+  if (null !== $layout = sfConfig::get('symfony.view.'.$this->moduleName.'_'.$this->actionName.'_layout'))
   {
-    \$this->setDecoratorTemplate(false === \$layout ? false : \$layout.\$this->getExtension());
+    $this->setDecoratorTemplate(false === $layout ? false : $layout.$this->getExtension());
   }
 EOF;
 
-    if ($hasLocalLayout)
-    {
-      // the user set a decorator in view.yml for this action
-      $data .= <<<EOF
+        if ($hasLocalLayout) {
+            // the user set a decorator in view.yml for this action
+            $data .= <<<EOF
 
   else
   {
-    \$this->setDecoratorTemplate('' == '$layout' ? false : '$layout'.\$this->getExtension());
+    \$this->setDecoratorTemplate('' == '{$layout}' ? false : '{$layout}'.\$this->getExtension());
   }
 
 EOF;
-    }
-    else
-    {
-      // no specific configuration
-      // set the layout to the 'all' view.yml value except if:
-      //   * the decorator template has already been set by "someone" (via view.configure_format for example)
-      //   * the request is an XMLHttpRequest request
-      $data .= <<<EOF
+        } else {
+            // no specific configuration
+            // set the layout to the 'all' view.yml value except if:
+            //   * the decorator template has already been set by "someone" (via view.configure_format for example)
+            //   * the request is an XMLHttpRequest request
+            $data .= <<<EOF
 
   else if (null === \$this->getDecoratorTemplate() && !\$this->context->getRequest()->isXmlHttpRequest())
   {
-    \$this->setDecoratorTemplate('' == '$layout' ? false : '$layout'.\$this->getExtension());
+    \$this->setDecoratorTemplate('' == '{$layout}' ? false : '{$layout}'.\$this->getExtension());
   }
 
 EOF;
+        }
+
+        return $data;
     }
 
-    return $data;
-  }
+    /**
+     * Adds http metas and metas statements to the data.
+     *
+     * @param string $viewName The view name
+     *
+     * @return string The PHP statement
+     */
+    protected function addHtmlHead($viewName = '')
+    {
+        $data = array();
 
-  /**
-   * Adds http metas and metas statements to the data.
-   *
-   * @param string $viewName The view name
-   *
-   * @return string The PHP statement
-   */
-  protected function addHtmlHead($viewName = '')
-  {
-    $data = array();
+        foreach ($this->mergeConfigValue('http_metas', $viewName) as $httpequiv => $content) {
+            $data[] = sprintf("  \$response->addHttpMeta('%s', '%s', false);", $httpequiv, str_replace('\'', '\\\'', $content));
+        }
 
-    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')))));
+        }
 
-    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')))));
+        return implode("\n", $data)."\n";
     }
 
-    return implode("\n", $data)."\n";
-  }
-
-  /**
-   * Adds stylesheets and javascripts statements to the data.
-   *
-   * @param string $viewName The view name
-   *
-   * @return string The PHP statement
-   */
-  protected function addHtmlAsset($viewName = '')
-  {
-    // Merge the current view's stylesheets with the app's default stylesheets
-    $stylesheets = $this->mergeConfigValue('stylesheets', $viewName);
-    $css = $this->addAssets('Stylesheet', $stylesheets);
+    /**
+     * Adds stylesheets and javascripts statements to the data.
+     *
+     * @param string $viewName The view name
+     *
+     * @return string The PHP statement
+     */
+    protected function addHtmlAsset($viewName = '')
+    {
+        // Merge the current view's stylesheets with the app's default stylesheets
+        $stylesheets = $this->mergeConfigValue('stylesheets', $viewName);
+        $css = $this->addAssets('Stylesheet', $stylesheets);
 
-    // Merge the current view's javascripts with the app's default javascripts
-    $javascripts = $this->mergeConfigValue('javascripts', $viewName);
-    $js = $this->addAssets('Javascript', $javascripts);
+        // Merge the current view's javascripts with the app's default javascripts
+        $javascripts = $this->mergeConfigValue('javascripts', $viewName);
+        $js = $this->addAssets('Javascript', $javascripts);
 
-    return implode("\n", array_merge($css, $js))."\n";
-  }
+        return implode("\n", array_merge($css, $js))."\n";
+    }
 
-  /**
-   * Creates a list of add$Type PHP statements for the given type and config.
-   *
-   * @param string $type of asset. Requires an sfWebResponse->add$Type(string, string, array) method
-   * @param array  $assets
-   *
-   * @return array ist of add$Type PHP statements
-   */
-  private function addAssets($type, $assets){
-    $tmp = array();
-    foreach ((array) $assets as $asset)
+    /**
+     * Adds an escaping statement to the data.
+     *
+     * @param string $viewName The view name
+     *
+     * @return string The PHP statement
+     */
+    protected function addEscaping($viewName = '')
     {
-      $position = '';
-      if (is_array($asset))
-      {
-        reset($asset);
-        $key = key($asset);
-        $options = $asset[$key];
-        if (isset($options['position']))
-        {
-          $position = $options['position'];
-          unset($options['position']);
-        }
-      }
-      else
-      {
-        $key = $asset;
-        $options = array();
-      }
-
-      if ('-*' == $key)
-      {
-        $tmp = array();
-      }
-      else if ('-' == $key[0])
-      {
-        unset($tmp[substr($key, 1)]);
-      }
-      else
-      {
-        $tmp[$key] = sprintf("  \$response->add%s('%s', '%s', %s);", $type, $key, $position, str_replace("\n", '', var_export($options, true)));
-      }
-    }
-    return array_values($tmp);
-  }
+        $data = array();
 
-  /**
-   * Adds an escaping statement to the data.
-   *
-   * @param string $viewName The view name
-   *
-   * @return string The PHP statement
-   */
-  protected function addEscaping($viewName = '')
-  {
-    $data = array();
+        $escaping = $this->getConfigValue('escaping', $viewName);
 
-    $escaping = $this->getConfigValue('escaping', $viewName);
+        if (isset($escaping['method'])) {
+            $data[] = sprintf('  $this->getAttributeHolder()->setEscapingMethod(%s);', var_export($escaping['method'], true));
+        }
 
-    if (isset($escaping['method']))
-    {
-      $data[] = sprintf("  \$this->getAttributeHolder()->setEscapingMethod(%s);", var_export($escaping['method'], true));
+        return implode("\n", $data)."\n";
     }
 
-    return implode("\n", $data)."\n";
-  }
+    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());
+        unset($config['default']['stylesheets']);
 
-  /**
-   * @see sfConfigHandler
-   * @inheritdoc
-   */
-  static public function getConfiguration(array $configFiles)
-  {
-    return static::mergeConfig(static::parseYamls($configFiles));
-  }
+        $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());
+        unset($config['default']['javascripts']);
 
-  static protected 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());
-    unset($config['default']['stylesheets']);
+        // 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']['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());
-    unset($config['default']['javascripts']);
+        unset($config['default']);
 
-    // 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()
-    );
+        return static::replaceConstants($config);
+    }
 
-    unset($config['default']);
+    /**
+     * Creates a list of add$Type PHP statements for the given type and config.
+     *
+     * @param string $type   of asset. Requires an sfWebResponse->add$Type(string, string, array) method
+     * @param array  $assets
+     *
+     * @return array ist of add$Type PHP statements
+     */
+    private function addAssets($type, $assets)
+    {
+        $tmp = array();
+        foreach ((array) $assets as $asset) {
+            $position = '';
+            if (is_array($asset)) {
+                reset($asset);
+                $key = key($asset);
+                $options = $asset[$key];
+                if (isset($options['position'])) {
+                    $position = $options['position'];
+                    unset($options['position']);
+                }
+            } else {
+                $key = $asset;
+                $options = array();
+            }
+
+            if ('-*' == $key) {
+                $tmp = array();
+            } elseif ('-' == $key[0]) {
+                unset($tmp[substr($key, 1)]);
+            } else {
+                $tmp[$key] = sprintf("  \$response->add%s('%s', '%s', %s);", $type, $key, $position, str_replace("\n", '', var_export($options, true)));
+            }
+        }
 
-    return static::replaceConstants($config);
-  }
+        return array_values($tmp);
+    }
 }
diff --git a/lib/config/sfYamlConfigHandler.class.php b/lib/config/sfYamlConfigHandler.class.php
index 5a41f6045..c2993a80f 100644
--- a/lib/config/sfYamlConfigHandler.class.php
+++ b/lib/config/sfYamlConfigHandler.class.php
@@ -12,147 +12,137 @@
  * sfYamlConfigHandler is a base class for YAML (.yml) configuration handlers. This class
  * provides a central location for parsing YAML files.
  *
- * @package    symfony
- * @subpackage config
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfYamlConfigHandler extends sfConfigHandler
 {
-  /** @var array */
-  protected $yamlConfig = null;
-
-  /**
-   * Parses an array of YAMLs files and merges them in one configuration array.
-   *
-   * @param array $configFiles An array of configuration file paths
-   *
-   * @return array A merged configuration array
-   */
-  static public function parseYamls($configFiles)
-  {
-    $config = array();
-    foreach ($configFiles as $configFile)
+    /** @var array */
+    protected $yamlConfig;
+
+    /**
+     * Parses an array of YAMLs files and merges them in one configuration array.
+     *
+     * @param array $configFiles An array of configuration file paths
+     *
+     * @return array A merged configuration array
+     */
+    public static function parseYamls($configFiles)
     {
-      // the first level is an environment and its value must be an array
-      $values = array();
-      foreach (static::parseYaml($configFile) as $env => $value)
-      {
-        if (null !== $value)
-        {
-          $values[$env] = $value;
+        $config = array();
+        foreach ($configFiles as $configFile) {
+            // the first level is an environment and its value must be an array
+            $values = array();
+            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;
     }
 
-    return $config;
-  }
-
-  /**
-   * Parses a YAML (.yml) configuration file.
-   *
-   * @param string $configFile An absolute filesystem path to a configuration file
-   *
-   * @return string|array 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
-   */
-  static public function parseYaml($configFile)
-  {
-    if (!is_readable($configFile))
+    /**
+     * Parses a YAML (.yml) configuration file.
+     *
+     * @param string $configFile An absolute filesystem path to a configuration file
+     *
+     * @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
+     */
+    public static function parseYaml($configFile)
     {
-      // can't read the configuration
-      throw new sfConfigurationException(sprintf('Configuration file "%s" does not exist or is not readable.', $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));
+        }
 
-    // parse our config
-    $config = sfYaml::load($configFile, sfConfig::get('sf_charset', 'UTF-8'));
+        // parse our config
+        $config = sfYaml::load($configFile, sfConfig::get('sf_charset', 'UTF-8'));
 
-    if ($config === false)
-    {
-      // configuration couldn't be parsed
-      throw new sfParseException(sprintf('Configuration file "%s" could not be parsed', $configFile));
+        if (false === $config) {
+            // configuration couldn't be parsed
+            throw new sfParseException(sprintf('Configuration file "%s" could not be parsed', $configFile));
+        }
+
+        return null === $config ? array() : $config;
     }
 
-    return null === $config ? array() : $config;
-  }
-
-  /**
-   * Merges configuration values for a given key and category.
-   *
-   * @param string $keyName  The key name
-   * @param string $category The category name
-   *
-   * @return array The value associated with this key name and category
-   */
-  protected function mergeConfigValue($keyName, $category)
-  {
-    $values = array();
-
-    if (isset($this->yamlConfig['all'][$keyName]) && is_array($this->yamlConfig['all'][$keyName]))
+    public static function flattenConfiguration($config)
     {
-      $values = $this->yamlConfig['all'][$keyName];
+        $config['all'] = sfToolkit::arrayDeepMerge(
+            isset($config['default']) && is_array($config['default']) ? $config['default'] : array(),
+            isset($config['all']) && is_array($config['all']) ? $config['all'] : array()
+        );
+
+        unset($config['default']);
+
+        return $config;
     }
 
-    if ($category && isset($this->yamlConfig[$category][$keyName]) && is_array($this->yamlConfig[$category][$keyName]))
+    /**
+     * Merges default, all and current environment configurations.
+     *
+     * @param array $config The main configuratino array
+     *
+     * @return array The merged configuration
+     */
+    public static function flattenConfigurationWithEnvironment($config)
     {
-      $values = array_merge($values, $this->yamlConfig[$category][$keyName]);
+        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 $values;
-  }
-
-  /**
-   * Gets a configuration value for a given key and category.
-   *
-   * @param string $keyName      The key name
-   * @param string $category     The category name
-   * @param string $defaultValue The default value
-   *
-   * @return string The value associated with this key name and category
-   */
-  protected function getConfigValue($keyName, $category, $defaultValue = null)
-  {
-    if (isset($this->yamlConfig[$category][$keyName]))
+    /**
+     * Merges configuration values for a given key and category.
+     *
+     * @param string $keyName  The key name
+     * @param string $category The category name
+     *
+     * @return array The value associated with this key name and category
+     */
+    protected function mergeConfigValue($keyName, $category)
     {
-      return $this->yamlConfig[$category][$keyName];
+        $values = array();
+
+        if (isset($this->yamlConfig['all'][$keyName]) && is_array($this->yamlConfig['all'][$keyName])) {
+            $values = $this->yamlConfig['all'][$keyName];
+        }
+
+        if ($category && isset($this->yamlConfig[$category][$keyName]) && is_array($this->yamlConfig[$category][$keyName])) {
+            $values = array_merge($values, $this->yamlConfig[$category][$keyName]);
+        }
+
+        return $values;
     }
-    else if (isset($this->yamlConfig['all'][$keyName]))
+
+    /**
+     * Gets a configuration value for a given key and category.
+     *
+     * @param string $keyName      The key name
+     * @param string $category     The category name
+     * @param string $defaultValue The default value
+     *
+     * @return string The value associated with this key name and category
+     */
+    protected function getConfigValue($keyName, $category, $defaultValue = null)
     {
-      return $this->yamlConfig['all'][$keyName];
-    }
+        if (isset($this->yamlConfig[$category][$keyName])) {
+            return $this->yamlConfig[$category][$keyName];
+        }
+        if (isset($this->yamlConfig['all'][$keyName])) {
+            return $this->yamlConfig['all'][$keyName];
+        }
 
-    return $defaultValue;
-  }
-
-  static public 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()
-    );
-
-    unset($config['default']);
-
-    return $config;
-  }
-
-  /**
-   * Merges default, all and current environment configurations.
-   *
-   * @param array $config The main configuratino array
-   *
-   * @return array The merged configuration
-   */
-  static public 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 $defaultValue;
+    }
 }
diff --git a/lib/controller/default/actions/actions.class.php b/lib/controller/default/actions/actions.class.php
index 09784acdc..5dfa30554 100644
--- a/lib/controller/default/actions/actions.class.php
+++ b/lib/controller/default/actions/actions.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -11,58 +11,51 @@
 /**
  * defaultActions module.
  *
- * @package    symfony
- * @subpackage action
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class defaultActions extends sfActions
 {
-  /**
-   * Congratulations page for creating an application
-   *
-   */
-  public function executeIndex()
-  {
-  }
+    /**
+     * Congratulations page for creating an application.
+     */
+    public function executeIndex()
+    {
+    }
 
-  /**
-   * Congratulations page for creating a module
-   *
-   */
-  public function executeModule()
-  {
-  }
+    /**
+     * Congratulations page for creating a module.
+     */
+    public function executeModule()
+    {
+    }
 
-  /**
-   * Error page for page not found (404) error
-   *
-   */
-  public function executeError404()
-  {
-  }
+    /**
+     * Error page for page not found (404) error.
+     */
+    public function executeError404()
+    {
+    }
 
-  /**
-   * Warning page for restricted area - requires login
-   *
-   */
-  public function executeSecure()
-  {
-  }
+    /**
+     * Warning page for restricted area - requires login.
+     */
+    public function executeSecure()
+    {
+    }
 
-  /**
-   * Warning page for restricted area - requires credentials
-   *
-   */
-  public function executeLogin()
-  {
-  }
+    /**
+     * Warning page for restricted area - requires credentials.
+     */
+    public function executeLogin()
+    {
+    }
 
-  /**
-   * Module disabled in settings.yml
-   *
-   */
-  public function executeDisabled()
-  {
-  }
+    /**
+     * Module disabled in settings.yml.
+     */
+    public function executeDisabled()
+    {
+    }
 }
diff --git a/lib/controller/default/templates/defaultLayout.php b/lib/controller/default/templates/defaultLayout.php
index 08b4eb2c9..1898f65a8 100644
--- a/lib/controller/default/templates/defaultLayout.php
+++ b/lib/controller/default/templates/defaultLayout.php
@@ -2,24 +2,24 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 
-<?php include_http_metas() ?>
-<?php include_metas() ?>
-<?php include_title() ?>
-<?php use_stylesheet('/sf/sf_default/css/screen.css', 'last') ?>
-<?php include_stylesheets() ?>
-<?php include_javascripts() ?>
+<?php include_http_metas(); ?>
+<?php include_metas(); ?>
+<?php include_title(); ?>
+<?php use_stylesheet('/sf/sf_default/css/screen.css', 'last'); ?>
+<?php include_stylesheets(); ?>
+<?php include_javascripts(); ?>
 
 <link rel="shortcut icon" href="/favicon.ico" />
 
 <!--[if lt IE 7.]>
-<?php echo stylesheet_tag('/sf/sf_default/css/ie.css') ?>
+<?php echo stylesheet_tag('/sf/sf_default/css/ie.css'); ?>
 <![endif]-->
 
 </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 $sf_content ?>
+  <?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 $sf_content; ?>
 </div>
 </body>
 </html>
diff --git a/lib/controller/default/templates/disabledSuccess.php b/lib/controller/default/templates/disabledSuccess.php
index b9cb12c1b..1f76fbff2 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') ?>
+<?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', array('alt' => 'module disabled', 'class' => 'sfTMessageIcon', 'size' => '48x48')); ?>
   <div class="sfTMessageWrap">
     <h1>This Module is Unavailable</h1>
     <h5>This module has been disabled.</h5>
@@ -13,7 +13,7 @@
   <dd>
     <ul class="sfTIconList">
       <li class="sfTLinkMessage"><a href="javascript:history.go(-1)">Back to previous page</a></li>
-      <li class="sfTLinkMessage"><?php echo link_to('Go to Homepage', '@homepage') ?></li>
+      <li class="sfTLinkMessage"><?php echo link_to('Go to Homepage', '@homepage'); ?></li>
     </ul>
   </dd>
 </dl>
diff --git a/lib/controller/default/templates/error404Success.php b/lib/controller/default/templates/error404Success.php
index a836b757e..919af7520 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') ?>
+<?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', array('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>
@@ -12,16 +12,16 @@
   <dd>You may have typed the address (URL) incorrectly. Check it to make sure you've got the exact right spelling, capitalization, etc.</dd>
 
   <dt>Did you follow a link from somewhere else at this site?</dt>
-  <dd>If you reached this page from another part of this site, please email us at <?php echo mail_to('[email]') ?> so we can correct our mistake.</dd>
+  <dd>If you reached this page from another part of this site, please email us at <?php echo mail_to('[email]'); ?> so we can correct our mistake.</dd>
 
   <dt>Did you follow a link from another site?</dt>
-  <dd>Links from other sites can sometimes be outdated or misspelled. Email us at <?php echo mail_to('[email]') ?> where you came from and we can try to contact the other site in order to fix the problem.</dd>
+  <dd>Links from other sites can sometimes be outdated or misspelled. Email us at <?php echo mail_to('[email]'); ?> where you came from and we can try to contact the other site in order to fix the problem.</dd>
 
   <dt>What's next</dt>
   <dd>
     <ul class="sfTIconList">
       <li class="sfTLinkMessage"><a href="javascript:history.go(-1)">Back to previous page</a></li>
-      <li class="sfTLinkMessage"><?php echo link_to('Go to Homepage', '@homepage') ?></li>
+      <li class="sfTLinkMessage"><?php echo link_to('Go to Homepage', '@homepage'); ?></li>
     </ul>
   </dd>
 </dl>
diff --git a/lib/controller/default/templates/indexSuccess.php b/lib/controller/default/templates/indexSuccess.php
index c4fcb9e8f..b50638f39 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') ?>
+<?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', array('alt' => 'ok', 'class' => 'sfTMessageIcon', 'size' => '48x48')); ?>
   <div class="sfTMessageWrap">
     <h1>Symfony Project Created</h1>
     <h5>Congratulations! You have successfully created your symfony project.</h5>
@@ -19,7 +19,7 @@
     <ul class="sfTIconList">
       <li class="sfTDatabaseMessage">Create your data model</li>
       <li class="sfTColorMessage">Customize the layout of the generated templates</li>
-      <li class="sfTLinkMessage"><?php echo link_to('Learn more from the online documentation', 'http://www.symfony-project.org/doc') ?></li>
+      <li class="sfTLinkMessage"><?php echo link_to('Learn more from the online documentation', 'http://www.symfony-project.org/doc'); ?></li>
     </ul>
   </dd>
 </dl>
diff --git a/lib/controller/default/templates/loginSuccess.php b/lib/controller/default/templates/loginSuccess.php
index 0c064b08b..f1b5c7e0e 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') ?>
+<?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', array('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 cacd8cb74..b4dc0bdcd 100644
--- a/lib/controller/default/templates/moduleSuccess.php
+++ b/lib/controller/default/templates/moduleSuccess.php
@@ -1,9 +1,9 @@
-<?php decorate_with(__DIR__.'/defaultLayout.php') ?>
+<?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', array('alt' => 'module created', 'class' => 'sfTMessageIcon', 'size' => '48x48')); ?>
   <div class="sfTMessageWrap">
-    <h1>Module "<?php echo $sf_params->get('module') ?>" created</h1>
+    <h1>Module "<?php echo $sf_params->get('module'); ?>" created</h1>
     <h5>Congratulations! You have successfully created a symfony module.</h5>
   </div>
 </div>
@@ -14,10 +14,10 @@
   <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>
+      <li class="sfTLinkMessage"><?php echo link_to('Learn more from the online documentation', 'http://www.symfony-project.org/doc'); ?></li>
     </ul>
   </dd>
 </dl>
diff --git a/lib/controller/default/templates/secureSuccess.php b/lib/controller/default/templates/secureSuccess.php
index 19d893378..3151ff665 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') ?>
+<?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', array('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 6b69b857d..c654d3e38 100644
--- a/lib/controller/sfController.class.php
+++ b/lib/controller/sfController.class.php
@@ -12,515 +12,481 @@
 /**
  * sfController directs application flow.
  *
- * @package    symfony
- * @subpackage controller
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfController
 {
-  /** @var sfContext */
-  protected $context = null;
-  /** @var sfEventDispatcher */
-  protected $dispatcher = null;
-  /** @var string[] */
-  protected $controllerClasses = array();
-  /** @var int */
-  protected $renderMode = sfView::RENDER_CLIENT;
-  /** @var int */
-  protected $maxForwards = 5;
-
-  /**
-   * Class constructor.
-   *
-   * @see initialize()
-   * @param sfContext $context A sfContext implementation instance
-   */
-  public function __construct($context)
-  {
-    $this->initialize($context);
-  }
-
-  /**
-   * Initializes this controller.
-   *
-   * @param sfContext $context A sfContext implementation instance
-   */
-  public function initialize($context)
-  {
-    $this->context    = $context;
-    $this->dispatcher = $context->getEventDispatcher();
-  }
-
-  /**
-   * Indicates whether or not a module has a specific component.
-   *
-   * @param string $moduleName    A module name
-   * @param string $componentName An component name
-   *
-   * @return bool true, if the component exists, otherwise false
-   */
-  public function componentExists($moduleName, $componentName)
-  {
-    return $this->controllerExists($moduleName, $componentName, 'component', false);
-  }
-
-  /**
-   * Indicates whether or not a module has a specific action.
-   *
-   * @param string $moduleName A module name
-   * @param string $actionName An action name
-   *
-   * @return bool true, if the action exists, otherwise false
-   */
-  public function actionExists($moduleName, $actionName)
-  {
-    return $this->controllerExists($moduleName, $actionName, 'action', false);
-  }
-
-  /**
-   * Looks for a controller and optionally throw exceptions if existence is required (i.e.
-   * in the case of {@link getController()}).
-   *
-   * @param string  $moduleName      The name of the module
-   * @param string  $controllerName  The name of the controller within the module
-   * @param string  $extension       Either 'action' or 'component' depending on the type of controller to look for
-   * @param boolean $throwExceptions Whether to throw exceptions if the controller doesn't exist
-   *
-   * @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
-   *
-   * @return boolean true if the controller exists, false otherwise
-   */
-  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));
-      }
-
-      // check for a module generator config file
-      $this->context->getConfigCache()->import('modules/'.$moduleName.'/config/generator.yml', false, true);
-
-      // one action per file or one file for all actions
-      $classFile   = strtolower($extension);
-      $classSuffix = ucfirst(strtolower($extension));
-      $file        = $dir.'/'.$controllerName.$classSuffix.'.class.php';
-      if (is_readable($file))
-      {
-        // action class exists
-        require_once($file);
-
-        $this->controllerClasses[$moduleName.'_'.$controllerName.'_'.$classSuffix] = $controllerName.$classSuffix;
-
-        return true;
-      }
-
-      $module_file = $dir.'/'.$classFile.'s.class.php';
-      if (is_readable($module_file))
-      {
-        // module class exists
-        require_once($module_file);
-
-        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));
-          }
-
-          return false;
-        }
+    /** @var sfContext */
+    protected $context;
 
-        // 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'));
-          }
+    /** @var sfEventDispatcher */
+    protected $dispatcher;
 
-          return false;
-        }
+    /** @var string[] */
+    protected $controllerClasses = array();
+
+    /** @var int */
+    protected $renderMode = sfView::RENDER_CLIENT;
 
-        $this->controllerClasses[$moduleName.'_'.$controllerName.'_'.$classSuffix] = $moduleName.$classSuffix.'s';
-        return true;
-      }
+    /** @var int */
+    protected $maxForwards = 5;
+
+    /**
+     * Class constructor.
+     *
+     * @see initialize()
+     *
+     * @param sfContext $context A sfContext implementation instance
+     */
+    public function __construct($context)
+    {
+        $this->initialize($context);
     }
 
-    // send an exception if debug
-    if ($throwExceptions && sfConfig::get('sf_debug'))
+    /**
+     * Calls methods defined via sfEventDispatcher.
+     *
+     * @param string $method    The method name
+     * @param array  $arguments The method arguments
+     *
+     * @return mixed The returned value of the called method
+     *
+     * @throws sfException
+     */
+    public function __call($method, $arguments)
     {
-      $dirs = array_map(array('sfDebug', 'shortenFilePath'), array_keys($dirs));
+        $event = $this->dispatcher->notifyUntil(new sfEvent($this, 'controller.method_not_found', array('method' => $method, 'arguments' => $arguments)));
+        if (!$event->isProcessed()) {
+            throw new sfException(sprintf('Call to undefined method %s::%s.', get_class($this), $method));
+        }
 
-      throw new sfControllerException(sprintf('Controller "%s/%s" does not exist in: %s.', $moduleName, $controllerName, implode(', ', $dirs)));
+        return $event->getReturnValue();
     }
 
-    return false;
-  }
-
-  /**
-   * Forwards the request to another action.
-   *
-   * @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
-   */
-  public function forward($moduleName, $actionName)
-  {
-    // replace unwanted characters
-    $moduleName = preg_replace('/[^a-z0-9_]+/i', '', $moduleName);
-    $actionName = preg_replace('/[^a-z0-9_]+/i', '', $actionName);
-
-    if ($this->getActionStack()->getSize() >= $this->maxForwards)
+    /**
+     * Initializes this controller.
+     *
+     * @param sfContext $context A sfContext implementation instance
+     */
+    public function initialize($context)
     {
-      // let's kill this party before it turns into cpu cycle hell
-      throw new sfForwardException('Too many forwards have been detected for this request.');
+        $this->context = $context;
+        $this->dispatcher = $context->getEventDispatcher();
     }
 
-    // check for a module generator config file
-    $this->context->getConfigCache()->import('modules/'.$moduleName.'/config/generator.yml', false, true);
-
-    if (!$this->actionExists($moduleName, $actionName))
+    /**
+     * Indicates whether or not a module has a specific component.
+     *
+     * @param string $moduleName    A module name
+     * @param string $componentName An component name
+     *
+     * @return bool true, if the component exists, otherwise false
+     */
+    public function componentExists($moduleName, $componentName)
     {
-      // 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))));
-      }
-
-      throw new sfError404Exception(sprintf('Action "%s/%s" does not exist.', $moduleName, $actionName));
+        return $this->controllerExists($moduleName, $componentName, 'component', false);
     }
 
-    // create an instance of the action
-    $actionInstance = $this->getAction($moduleName, $actionName);
-
-    // add a new action stack entry
-    $this->getActionStack()->addEntry($moduleName, $actionName, $actionInstance);
-
-    // include module configuration
-    $viewClass = sfConfig::get('mod_'.strtolower($moduleName).'_view_class', false);
-    require($this->context->getConfigCache()->checkConfig('modules/'.$moduleName.'/config/module.yml'));
-    if (false !== $viewClass)
+    /**
+     * Indicates whether or not a module has a specific action.
+     *
+     * @param string $moduleName A module name
+     * @param string $actionName An action name
+     *
+     * @return bool true, if the action exists, otherwise false
+     */
+    public function actionExists($moduleName, $actionName)
     {
-      sfConfig::set('mod_'.strtolower($moduleName).'_view_class', $viewClass);
+        return $this->controllerExists($moduleName, $actionName, 'action', false);
     }
 
-    // module enabled?
-    if (sfConfig::get('mod_'.strtolower($moduleName).'_enabled'))
+    /**
+     * Forwards the request to another action.
+     *
+     * @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
+     */
+    public function forward($moduleName, $actionName)
     {
-      // check for a module config.php
-      $moduleConfig = sfConfig::get('sf_app_module_dir').'/'.$moduleName.'/config/config.php';
-      if (is_readable($moduleConfig))
-      {
-        require_once($moduleConfig);
-      }
+        // replace unwanted characters
+        $moduleName = preg_replace('/[^a-z0-9_]+/i', '', $moduleName);
+        $actionName = preg_replace('/[^a-z0-9_]+/i', '', $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.');
+        }
 
-      // create a new filter chain
-      $filterChain = new sfFilterChain();
-      $filterChain->loadConfiguration($actionInstance);
+        // check for a module generator config file
+        $this->context->getConfigCache()->import('modules/'.$moduleName.'/config/generator.yml', false, true);
 
-      $this->context->getEventDispatcher()->notify(new sfEvent($this, 'controller.change_action', array('module' => $moduleName, 'action' => $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 ($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');
+            throw new sfError404Exception(sprintf('Action "%s/%s" does not exist.', $moduleName, $actionName));
+        }
 
-        $this->dispatcher->notify(new sfEvent($this, 'controller.page_not_found', array('module' => $moduleName, 'action' => $actionName)));
-      }
+        // create an instance of the action
+        $actionInstance = $this->getAction($moduleName, $actionName);
 
-      // process the filter chain
-      $filterChain->execute();
-    }
-    else
-    {
-      $moduleName = sfConfig::get('sf_module_disabled_module');
-      $actionName = sfConfig::get('sf_module_disabled_action');
+        // add a new action stack entry
+        $this->getActionStack()->addEntry($moduleName, $actionName, $actionInstance);
 
-      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));
-      }
+        // include module configuration
+        $viewClass = sfConfig::get('mod_'.strtolower($moduleName).'_view_class', false);
 
-      $this->forward($moduleName, $actionName);
+        require $this->context->getConfigCache()->checkConfig('modules/'.$moduleName.'/config/module.yml');
+        if (false !== $viewClass) {
+            sfConfig::set('mod_'.strtolower($moduleName).'_view_class', $viewClass);
+        }
+
+        // module 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';
+            if (is_readable($moduleConfig)) {
+                require_once $moduleConfig;
+            }
+
+            // create a new filter chain
+            $filterChain = new sfFilterChain();
+            $filterChain->loadConfiguration($actionInstance);
+
+            $this->context->getEventDispatcher()->notify(new sfEvent($this, 'controller.change_action', array('module' => $moduleName, 'action' => $actionName)));
+
+            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)));
+            }
+
+            // process the filter chain
+            $filterChain->execute();
+        } else {
+            $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));
+            }
+
+            $this->forward($moduleName, $actionName);
+        }
     }
-  }
-
-  /**
-   * Retrieves an sfAction implementation instance.
-   *
-   * @param string $moduleName A module name
-   * @param string $actionName An action name
-   *
-   * @return sfAction An sfAction implementation instance, if the action exists, otherwise null
-   */
-  public function getAction($moduleName, $actionName)
-  {
-    return $this->getController($moduleName, $actionName, 'action');
-  }
-
-  /**
-   * Retrieves a sfComponent implementation instance.
-   *
-   * @param string $moduleName    A module name
-   * @param string $componentName A component name
-   *
-   * @return sfComponent A sfComponent implementation instance, if the component exists, otherwise null
-   */
-  public function getComponent($moduleName, $componentName)
-  {
-    return $this->getController($moduleName, $componentName, 'component');
-  }
-
-  /**
-   * Retrieves a controller implementation instance.
-   *
-   * @param string $moduleName     A module name
-   * @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
-   *
-   * @see getComponent(), getAction()
-   */
-  protected function getController($moduleName, $controllerName, $extension)
-  {
-    $classSuffix = ucfirst(strtolower($extension));
-    if (!isset($this->controllerClasses[$moduleName.'_'.$controllerName.'_'.$classSuffix]))
+
+    /**
+     * Retrieves an sfAction implementation instance.
+     *
+     * @param string $moduleName A module name
+     * @param string $actionName An action name
+     *
+     * @return sfAction An sfAction implementation instance, if the action exists, otherwise null
+     */
+    public function getAction($moduleName, $actionName)
     {
-      if (!$this->controllerExists($moduleName, $controllerName, $extension, true))
-      {
-        return null;
-      }
+        return $this->getController($moduleName, $actionName, 'action');
     }
 
-    $class = $this->controllerClasses[$moduleName.'_'.$controllerName.'_'.$classSuffix];
+    /**
+     * Retrieves a sfComponent implementation instance.
+     *
+     * @param string $moduleName    A module name
+     * @param string $componentName A component name
+     *
+     * @return sfComponent A sfComponent implementation instance, if the component exists, otherwise null
+     */
+    public function getComponent($moduleName, $componentName)
+    {
+        return $this->getController($moduleName, $componentName, 'component');
+    }
 
-    // fix for same name classes
-    $moduleClass = $moduleName.'_'.$class;
+    /**
+     * Retrieves the action stack.
+     *
+     * @return sfActionStack An sfActionStack instance, if the action stack is enabled, otherwise null
+     */
+    public function getActionStack()
+    {
+        return $this->context->getActionStack();
+    }
 
-    if (class_exists($moduleClass, false))
+    /**
+     * Retrieves the presentation rendering mode.
+     *
+     * @return int One of the following:
+     *             - sfView::RENDER_CLIENT
+     *             - sfView::RENDER_VAR
+     */
+    public function getRenderMode()
     {
-      $class = $moduleClass;
+        return $this->renderMode;
     }
 
-    return new $class($this->context, $moduleName, $controllerName);
-  }
-
-  /**
-   * Retrieves the action stack.
-   *
-   * @return sfActionStack An sfActionStack instance, if the action stack is enabled, otherwise null
-   */
-  public function getActionStack()
-  {
-    return $this->context->getActionStack();
-  }
-
-  /**
-   * Retrieves the presentation rendering mode.
-   *
-   * @return int One of the following:
-   *             - sfView::RENDER_CLIENT
-   *             - sfView::RENDER_VAR
-   */
-  public function getRenderMode()
-  {
-    return $this->renderMode;
-  }
-
-  /**
-   * Retrieves a sfView implementation instance.
-   *
-   * @param string $moduleName A module name
-   * @param string $actionName An action name
-   * @param string $viewName   A view name
-   *
-   * @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';
-
-    if (is_readable($file))
+    /**
+     * Retrieves a sfView implementation instance.
+     *
+     * @param string $moduleName A module name
+     * @param string $actionName An action name
+     * @param string $viewName   A view name
+     *
+     * @return sfView A sfView implementation instance, if the view exists, otherwise null
+     */
+    public function getView($moduleName, $actionName, $viewName)
     {
-      require_once($file);
+        // user view exists?
+        $file = sfConfig::get('sf_app_module_dir').'/'.$moduleName.'/view/'.$actionName.$viewName.'View.class.php';
 
-      $class = $actionName.$viewName.'View';
+        if (is_readable($file)) {
+            require_once $file;
 
-      // fix for same name classes
-      $moduleClass = $moduleName.'_'.$class;
+            $class = $actionName.$viewName.'View';
 
-      if (class_exists($moduleClass, false))
-      {
-        $class = $moduleClass;
-      }
-    }
-    else
-    {
-      // view class (as configured in module.yml or defined in action)
-      $class = sfConfig::get('mod_'.strtolower($moduleName).'_view_class', 'sfPHP').'View';
+            // fix for same name classes
+            $moduleClass = $moduleName.'_'.$class;
+
+            if (class_exists($moduleClass, false)) {
+                $class = $moduleClass;
+            }
+        } else {
+            // view class (as configured in module.yml or defined in action)
+            $class = sfConfig::get('mod_'.strtolower($moduleName).'_view_class', 'sfPHP').'View';
+        }
+
+        return new $class($this->context, $moduleName, $actionName, $viewName);
     }
 
-    return new $class($this->context, $moduleName, $actionName, $viewName);
-  }
-
-  /**
-   * Returns the rendered view presentation of a given module/action.
-   *
-   * @param string $module   A module name
-   * @param string $action   An action name
-   * @param string $viewName A View class name
-   *
-   * @return string The generated content
-   *
-   * @throws Exception
-   * @throws sfException
-   */
-  public function getPresentationFor($module, $action, $viewName = null)
-  {
-    if (sfConfig::get('sf_logging_enabled'))
+    /**
+     * Returns the rendered view presentation of a given module/action.
+     *
+     * @param string $module   A module name
+     * @param string $action   An action name
+     * @param string $viewName A View class name
+     *
+     * @return string The generated content
+     *
+     * @throws Exception
+     * @throws sfException
+     */
+    public function getPresentationFor($module, $action, $viewName = null)
     {
-      $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', array(sprintf('Get presentation for action "%s/%s" (view class: "%s")', $module, $action, $viewName))));
+        }
 
-    // get original render mode
-    $renderMode = $this->getRenderMode();
+        // get original render mode
+        $renderMode = $this->getRenderMode();
 
-    // set render mode to var
-    $this->setRenderMode(sfView::RENDER_VAR);
+        // set render mode to var
+        $this->setRenderMode(sfView::RENDER_VAR);
 
-    // grab the action stack
-    $actionStack = $this->getActionStack();
+        // grab the action stack
+        $actionStack = $this->getActionStack();
 
-    // grab this next forward's action stack index
-    $index = $actionStack->getSize();
+        // grab this next forward's action stack index
+        $index = $actionStack->getSize();
 
-    // set viewName if needed
-    if ($viewName)
-    {
-      $currentViewName = sfConfig::get('mod_'.strtolower($module).'_view_class');
-      sfConfig::set('mod_'.strtolower($module).'_view_class', $viewName);
-    }
+        // set viewName if needed
+        if ($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)
-    {
-      // put render mode back
-      $this->setRenderMode($renderMode);
+        try {
+            // forward to the action
+            $this->forward($module, $action);
+        } catch (Exception $e) {
+            // put render mode back
+            $this->setRenderMode($renderMode);
 
-      // remove viewName
-      if ($viewName)
-      {
-        sfConfig::set('mod_'.strtolower($module).'_view_class', $currentViewName);
-      }
+            // remove viewName
+            if ($viewName) {
+                sfConfig::set('mod_'.strtolower($module).'_view_class', $currentViewName);
+            }
 
-      throw $e;
-    }
+            throw $e;
+        }
+
+        // grab the action entry from this forward
+        $actionEntry = $actionStack->getEntry($index);
+
+        // get raw content
+        $presentation = &$actionEntry->getPresentation();
+
+        // put render mode back
+        $this->setRenderMode($renderMode);
+
+        // remove the action entry
+        $nb = $actionStack->getSize() - $index;
+        while ($nb-- > 0) {
+            $actionEntry = $actionStack->popEntry();
 
-    // grab the action entry from this forward
-    $actionEntry = $actionStack->getEntry($index);
+            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.');
+            }
+        }
 
-    // get raw content
-    $presentation =& $actionEntry->getPresentation();
+        // remove viewName
+        if ($viewName) {
+            sfConfig::set('mod_'.strtolower($module).'_view_class', $currentViewName);
+        }
 
-    // put render mode back
-    $this->setRenderMode($renderMode);
+        return $presentation;
+    }
 
-    // remove the action entry
-    $nb = $actionStack->getSize() - $index;
-    while ($nb-- > 0)
+    /**
+     * Sets the presentation rendering mode.
+     *
+     * @param int $mode A rendering mode one of the following:
+     *                  - sfView::RENDER_CLIENT
+     *                  - sfView::RENDER_VAR
+     *                  - sfView::RENDER_NONE
+     *
+     * @throws sfRenderException If an invalid render mode has been set
+     */
+    public function setRenderMode($mode)
     {
-      $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.');
-      }
-      else 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 (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));
     }
 
-    // remove viewName
-    if ($viewName)
+    /**
+     * Indicates whether or not we were called using the CLI version of PHP.
+     *
+     * @return bool true, if using cli, otherwise false
+     */
+    public function inCLI()
     {
-      sfConfig::set('mod_'.strtolower($module).'_view_class', $currentViewName);
+        return 'cli' == PHP_SAPI;
     }
 
-    return $presentation;
-  }
-
-  /**
-   * Sets the presentation rendering mode.
-   *
-   * @param int $mode A rendering mode one of the following:
-   *                  - sfView::RENDER_CLIENT
-   *                  - sfView::RENDER_VAR
-   *                  - sfView::RENDER_NONE
-   *
-   * @return void
-   *
-   * @throws sfRenderException If an invalid render mode has been set
-   */
-  public function setRenderMode($mode)
-  {
-    if ($mode == sfView::RENDER_CLIENT || $mode == sfView::RENDER_VAR || $mode == sfView::RENDER_NONE)
+    /**
+     * Looks for a controller and optionally throw exceptions if existence is required (i.e.
+     * in the case of {@link getController()}).
+     *
+     * @param string $moduleName      The name of the module
+     * @param string $controllerName  The name of the controller within the module
+     * @param string $extension       Either 'action' or 'component' depending on the type of controller to look for
+     * @param bool   $throwExceptions Whether to throw exceptions if the controller doesn't exist
+     *
+     * @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
+     */
+    protected function controllerExists($moduleName, $controllerName, $extension, $throwExceptions)
     {
-      $this->renderMode = $mode;
+        $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));
+            }
+
+            // check for a module generator config file
+            $this->context->getConfigCache()->import('modules/'.$moduleName.'/config/generator.yml', false, true);
+
+            // one action per file or one file for all actions
+            $classFile = strtolower($extension);
+            $classSuffix = ucfirst(strtolower($extension));
+            $file = $dir.'/'.$controllerName.$classSuffix.'.class.php';
+            if (is_readable($file)) {
+                // action class exists
+                require_once $file;
+
+                $this->controllerClasses[$moduleName.'_'.$controllerName.'_'.$classSuffix] = $controllerName.$classSuffix;
+
+                return true;
+            }
+
+            $module_file = $dir.'/'.$classFile.'s.class.php';
+            if (is_readable($module_file)) {
+                // module class exists
+                require_once $module_file;
+
+                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));
+                    }
+
+                    return false;
+                }
+
+                // 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'));
+                    }
+
+                    return false;
+                }
+
+                $this->controllerClasses[$moduleName.'_'.$controllerName.'_'.$classSuffix] = $moduleName.$classSuffix.'s';
+
+                return true;
+            }
+        }
 
-      return;
+        // send an exception if debug
+        if ($throwExceptions && sfConfig::get('sf_debug')) {
+            $dirs = array_map(array('sfDebug', 'shortenFilePath'), array_keys($dirs));
+
+            throw new sfControllerException(sprintf('Controller "%s/%s" does not exist in: %s.', $moduleName, $controllerName, implode(', ', $dirs)));
+        }
+
+        return false;
     }
 
-    // invalid rendering mode type
-    throw new sfRenderException(sprintf('Invalid rendering mode: %s.', $mode));
-  }
-
-  /**
-   * Indicates whether or not we were called using the CLI version of PHP.
-   *
-   * @return bool true, if using cli, otherwise false.
-   */
-  public function inCLI()
-  {
-    return 'cli' == PHP_SAPI;
-  }
-
-  /**
-   * Calls methods defined via sfEventDispatcher.
-   *
-   * @param string $method    The method name
-   * @param array  $arguments The method arguments
-   *
-   * @return mixed The returned value of the called method
-   *
-   * @throws sfException
-   */
-  public function __call($method, $arguments)
-  {
-    $event = $this->dispatcher->notifyUntil(new sfEvent($this, 'controller.method_not_found', array('method' => $method, 'arguments' => $arguments)));
-    if (!$event->isProcessed())
+    /**
+     * Retrieves a controller implementation instance.
+     *
+     * @param string $moduleName     A module name
+     * @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
+     *
+     * @see getComponent(), getAction()
+     */
+    protected function getController($moduleName, $controllerName, $extension)
     {
-      throw new sfException(sprintf('Call to undefined method %s::%s.', get_class($this), $method));
-    }
+        $classSuffix = ucfirst(strtolower($extension));
+        if (!isset($this->controllerClasses[$moduleName.'_'.$controllerName.'_'.$classSuffix])) {
+            if (!$this->controllerExists($moduleName, $controllerName, $extension, true)) {
+                return null;
+            }
+        }
+
+        $class = $this->controllerClasses[$moduleName.'_'.$controllerName.'_'.$classSuffix];
 
-    return $event->getReturnValue();
-  }
+        // fix for same name classes
+        $moduleClass = $moduleName.'_'.$class;
+
+        if (class_exists($moduleClass, false)) {
+            $class = $moduleClass;
+        }
+
+        return new $class($this->context, $moduleName, $controllerName);
+    }
 }
diff --git a/lib/controller/sfFrontWebController.class.php b/lib/controller/sfFrontWebController.class.php
index aa2b52197..5e2becdd5 100644
--- a/lib/controller/sfFrontWebController.class.php
+++ b/lib/controller/sfFrontWebController.class.php
@@ -14,47 +14,40 @@
  * application, but at the same time allow for any module and action combination
  * to be requested.
  *
- * @package    symfony
- * @subpackage controller
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 class sfFrontWebController extends sfWebController
 {
-  /**
-   * Dispatches a request.
-   *
-   * This will determine which module and action to use by request parameters specified by the user.
-   */
-  public function dispatch()
-  {
-    try
+    /**
+     * Dispatches a request.
+     *
+     * This will determine which module and action to use by request parameters specified by the user.
+     */
+    public function dispatch()
     {
-      // reinitialize filters (needed for unit and functional tests)
-      sfFilter::$filterCalled = array();
+        try {
+            // reinitialize filters (needed for unit and functional tests)
+            sfFilter::$filterCalled = array();
 
-      // determine our module and action
-      /** @var sfWebRequest $request */
-      $request    = $this->context->getRequest();
-      $moduleName = $request->getParameter('module');
-      $actionName = $request->getParameter('action');
+            // determine our module and action
+            /** @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));
-      }
+            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));
+            }
 
-      // make the first request
-      $this->forward($moduleName, $actionName);
-    }
-    catch (sfException $e)
-    {
-      $e->printStackTrace();
-    }
-    catch (Exception $e)
-    {
-      sfException::createFromException($e)->printStackTrace();
+            // make the first request
+            $this->forward($moduleName, $actionName);
+        } catch (sfException $e) {
+            $e->printStackTrace();
+        } catch (Exception $e) {
+            sfException::createFromException($e)->printStackTrace();
+        }
     }
-  }
 }
diff --git a/lib/controller/sfWebController.class.php b/lib/controller/sfWebController.class.php
index ebf54500f..b4ca30b67 100644
--- a/lib/controller/sfWebController.class.php
+++ b/lib/controller/sfWebController.class.php
@@ -12,137 +12,116 @@
 /**
  * sfWebController provides web specific methods to sfController such as, url redirection.
  *
- * @package    symfony
- * @subpackage controller
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfWebController extends sfController
 {
-  /**
-   * Generates an URL from an array of parameters.
-   *
-   * @param string|array  $parameters An associative array of URL parameters or an internal URI as a string.
-   * @param boolean       $absolute   Whether to generate an absolute URL
-   *
-   * @return string A URL to a symfony resource
-   */
-  public function genUrl($parameters = array(), $absolute = false)
-  {
-    $route = '';
-    $fragment = '';
-
-    if (is_string($parameters))
-    {
-      // absolute URL or symfony URL?
-      if (preg_match('#^[a-z][a-z0-9\+.\-]*\://#i', $parameters))
-      {
-        return $parameters;
-      }
-
-      // relative URL?
-      if (0 === strpos($parameters, '/'))
-      {
-        return $parameters;
-      }
-
-      if ($parameters == '#')
-      {
-        return $parameters;
-      }
-
-      // strip fragment
-      if (false !== ($pos = strpos($parameters, '#')))
-      {
-        $fragment = substr($parameters, $pos + 1);
-        $parameters = substr($parameters, 0, $pos);
-      }
-
-      list($route, $parameters) = $this->convertUrlStringToParameters($parameters);
-    }
-    else if (is_array($parameters))
-    {
-      if (isset($parameters['sf_route']))
-      {
-        $route = $parameters['sf_route'];
-        unset($parameters['sf_route']);
-      }
-    }
-
-    // routing to generate path
-    $url = $this->context->getRouting()->generate($route, $parameters, $absolute);
-
-    if ($fragment)
-    {
-      $url .= '#'.$fragment;
-    }
-
-    return $url;
-  }
-
-  /**
-   * Converts an internal URI string to an array of parameters.
-   *
-   * @param string $url An internal URI
-   *
-   * @return array An array of parameters
-   *
-   * @throws sfParseException
-   */
-  public function convertUrlStringToParameters($url)
-  {
-    $givenUrl = $url;
-
-    $params = array();
-    $queryString = '';
-    $route = '';
-
-    // empty url?
-    if (!$url)
-    {
-      $url = '/';
-    }
-
-    // we get the query string out of the url
-    if ($pos = strpos($url, '?'))
-    {
-      $queryString = substr($url, $pos + 1);
-      $url = substr($url, 0, $pos);
-    }
-
-    // 2 url forms
-    // @routeName?key1=value1&key2=value2...
-    // module/action?key1=value1&key2=value2...
-
-    // first slash optional
-    if ($url[0] == '/')
+    /**
+     * Generates an URL from an array of parameters.
+     *
+     * @param array|string $parameters an associative array of URL parameters or an internal URI as a string
+     * @param bool         $absolute   Whether to generate an absolute URL
+     *
+     * @return string A URL to a symfony resource
+     */
+    public function genUrl($parameters = array(), $absolute = false)
     {
-      $url = substr($url, 1);
+        $route = '';
+        $fragment = '';
+
+        if (is_string($parameters)) {
+            // absolute URL or symfony URL?
+            if (preg_match('#^[a-z][a-z0-9\+.\-]*\://#i', $parameters)) {
+                return $parameters;
+            }
+
+            // relative URL?
+            if (0 === strpos($parameters, '/')) {
+                return $parameters;
+            }
+
+            if ('#' == $parameters) {
+                return $parameters;
+            }
+
+            // strip fragment
+            if (false !== ($pos = strpos($parameters, '#'))) {
+                $fragment = substr($parameters, $pos + 1);
+                $parameters = substr($parameters, 0, $pos);
+            }
+
+            list($route, $parameters) = $this->convertUrlStringToParameters($parameters);
+        } elseif (is_array($parameters)) {
+            if (isset($parameters['sf_route'])) {
+                $route = $parameters['sf_route'];
+                unset($parameters['sf_route']);
+            }
+        }
+
+        // routing to generate path
+        $url = $this->context->getRouting()->generate($route, $parameters, $absolute);
+
+        if ($fragment) {
+            $url .= '#'.$fragment;
+        }
+
+        return $url;
     }
 
-    // routeName?
-    if ($url && $url[0] == '@')
+    /**
+     * Converts an internal URI string to an array of parameters.
+     *
+     * @param string $url An internal URI
+     *
+     * @return array An array of parameters
+     *
+     * @throws sfParseException
+     */
+    public function convertUrlStringToParameters($url)
     {
-      $route = substr($url, 1);
-    }
-    else if (false !== strpos($url, '/'))
-    {
-      list($params['module'], $params['action']) = explode('/', $url);
-    }
-    else if (!$queryString)
-    {
-      $route = $givenUrl;
-    }
-    else
-    {
-      throw new InvalidArgumentException(sprintf('An internal URI must contain a module and an action (module/action) ("%s" given).', $givenUrl));
-    }
-
-    // split the query string
-    if ($queryString)
-    {
-      $matched = preg_match_all('/
+        $givenUrl = $url;
+
+        $params = array();
+        $queryString = '';
+        $route = '';
+
+        // empty url?
+        if (!$url) {
+            $url = '/';
+        }
+
+        // we get the query string out of the url
+        if ($pos = strpos($url, '?')) {
+            $queryString = substr($url, $pos + 1);
+            $url = substr($url, 0, $pos);
+        }
+
+        // 2 url forms
+        // @routeName?key1=value1&key2=value2...
+        // module/action?key1=value1&key2=value2...
+
+        // first slash optional
+        if ('/' == $url[0]) {
+            $url = substr($url, 1);
+        }
+
+        // routeName?
+        if ($url && '@' == $url[0]) {
+            $route = substr($url, 1);
+        } elseif (false !== strpos($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));
+        }
+
+        // split the query string
+        if ($queryString) {
+            $matched = preg_match_all('/
         ([^&=]+)            # key
         =                   # =
         (.*?)               # value
@@ -150,61 +129,56 @@ public function convertUrlStringToParameters($url)
           (?=&[^&=]+=) | $  # followed by another key= or the end of the string
         )
       /x', $queryString, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE);
-      foreach ($matches as $match)
-      {
-        $params[urldecode($match[1][0])] = urldecode($match[2][0]);
-      }
-
-      // check that all string is matched
-      if (!$matched)
-      {
-        throw new sfParseException(sprintf('Unable to parse query string "%s".', $queryString));
-      }
-    }
-
-    return array($route, $params);
-  }
-
-  /**
-   * Redirects the request to another URL.
-   *
-   * @param string|array  $url        An associative array of URL parameters or an internal URI as a string
-   * @param int           $delay      A delay in seconds before redirecting. This is only needed on
-   *                                  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
-   */
-  public function redirect($url, $delay = 0, $statusCode = 302)
-  {
-    if (empty($url))
-    {
-      throw new InvalidArgumentException('Cannot redirect to an empty URL.');
-    }
+            foreach ($matches as $match) {
+                $params[urldecode($match[1][0])] = urldecode($match[2][0]);
+            }
 
-    $url = $this->genUrl($url, true);
-    // see #8083
-    $url = str_replace('&amp;', '&', $url);
+            // check that all string is matched
+            if (!$matched) {
+                throw new sfParseException(sprintf('Unable to parse query string "%s".', $queryString));
+            }
+        }
 
-    if (sfConfig::get('sf_logging_enabled'))
-    {
-      $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Redirect to "%s"', $url))));
+        return array($route, $params);
     }
 
-    // redirect
-    /** @var sfWebResponse $response */
-    $response = $this->context->getResponse();
-    $response->clearHttpHeaders();
-    $response->setStatusCode($statusCode);
-
-    // The Location header should only be used for status codes 201 and 3..
-    // For other code, only the refresh meta tag is used
-    if ($statusCode == 201 || ($statusCode >= 300 && $statusCode < 400))
+    /**
+     * Redirects the request to another URL.
+     *
+     * @param array|string $url        An associative array of URL parameters or an internal URI as a string
+     * @param int          $delay      A delay in seconds before redirecting. This is only needed on
+     *                                 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
+     */
+    public function redirect($url, $delay = 0, $statusCode = 302)
     {
-      $response->setHttpHeader('Location', $url);
+        if (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))));
+        }
+
+        // redirect
+        /** @var sfWebResponse $response */
+        $response = $this->context->getResponse();
+        $response->clearHttpHeaders();
+        $response->setStatusCode($statusCode);
+
+        // The Location header should only be used for status codes 201 and 3..
+        // For other code, only the refresh meta tag is used
+        if (201 == $statusCode || ($statusCode >= 300 && $statusCode < 400)) {
+            $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->send();
     }
-
-    $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 628ba6eff..9034b2e27 100644
--- a/lib/database/sfDatabase.class.php
+++ b/lib/database/sfDatabase.class.php
@@ -13,162 +13,157 @@
  * sfDatabase is a base abstraction class that allows you to setup any type of
  * database connection via a configuration file.
  *
- * @package    symfony
- * @subpackage database
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfDatabase
 {
-  /** @var sfParameterHolder */
-  protected $parameterHolder = null;
-  /** @var resource|PDO */
-  protected $connection = null;
-  /** @var resource|PDO (It's interchangeable with $connection. Can be dropped at all.) */
-  protected $resource = null;
-  
-  /**
-   * Class constructor.
-   *
-   * @see initialize()
-   *
-   * @param array $parameters An associative array of initialization parameters
-   */
-  public function __construct($parameters = array())
-  {
-    $this->initialize($parameters);
-  }
-
-  /**
-   * Initializes this sfDatabase object.
-   *
-   * @param array $parameters An associative array of initialization parameters
-   *
-   * @return void
-   *
-   * @throws <b>sfInitializationException</b> If an error occurs while initializing this sfDatabase object
-   */
-  public function initialize($parameters = array())
-  {
-    $this->parameterHolder = new sfParameterHolder();
-    $this->parameterHolder->add($parameters);
-  }
-
-  /**
-   * Connects to the database.
-   *
-   * @throws <b>sfDatabaseException</b> If a connection could not be created
-   */
-  abstract function connect();
-
-  /**
-   * Retrieves the database connection associated with this sfDatabase implementation.
-   *
-   * When this is executed on a Database implementation that isn't an
-   * abstraction layer, a copy of the resource will be returned.
-   *
-   * @return mixed A database connection
-   *
-   * @throws <b>sfDatabaseException</b> If a connection could not be retrieved
-   */
-  public function getConnection()
-  {
-    if (null === $this->connection)
+    /** @var sfParameterHolder */
+    protected $parameterHolder;
+
+    /** @var PDO|resource */
+    protected $connection;
+
+    /** @var PDO|resource (It's interchangeable with. Can be dropped at all.) */
+    protected $resource;
+
+    /**
+     * Class constructor.
+     *
+     * @see initialize()
+     *
+     * @param array $parameters An associative array of initialization parameters
+     */
+    public function __construct($parameters = array())
+    {
+        $this->initialize($parameters);
+    }
+
+    /**
+     * Initializes this sfDatabase object.
+     *
+     * @param array $parameters An associative array of initialization parameters
+     *
+     * @throws <b>sfInitializationException</b> If an error occurs while initializing this sfDatabase object
+     */
+    public function initialize($parameters = array())
+    {
+        $this->parameterHolder = new sfParameterHolder();
+        $this->parameterHolder->add($parameters);
+    }
+
+    /**
+     * Connects to the database.
+     *
+     * @throws <b>sfDatabaseException</b> If a connection could not be created
+     */
+    abstract public function connect();
+
+    /**
+     * Retrieves the database connection associated with this sfDatabase implementation.
+     *
+     * When this is executed on a Database implementation that isn't an
+     * abstraction layer, a copy of the resource will be returned.
+     *
+     * @return mixed A database connection
+     *
+     * @throws <b>sfDatabaseException</b> If a connection could not be retrieved
+     */
+    public function getConnection()
+    {
+        if (null === $this->connection) {
+            $this->connect();
+        }
+
+        return $this->connection;
+    }
+
+    /**
+     * Retrieves a raw database resource associated with this sfDatabase implementation.
+     *
+     * @return mixed A database resource
+     *
+     * @throws <b>sfDatabaseException</b> If a resource could not be retrieved
+     */
+    public function getResource()
+    {
+        if (null === $this->resource) {
+            $this->connect();
+        }
+
+        return $this->resource;
+    }
+
+    /**
+     * Gets the parameter holder for this object.
+     *
+     * @return sfParameterHolder A sfParameterHolder instance
+     */
+    public function getParameterHolder()
+    {
+        return $this->parameterHolder;
+    }
+
+    /**
+     * Gets the parameter associated with the given key.
+     *
+     * This is a shortcut for:
+     *
+     * <code>$this->getParameterHolder()->get()</code>
+     *
+     * @param string $name    The key name
+     * @param string $default The default value
+     *
+     * @return string The value associated with the key
+     *
+     * @see sfParameterHolder
+     */
+    public function getParameter($name, $default = null)
+    {
+        return $this->parameterHolder->get($name, $default);
+    }
+
+    /**
+     * Returns true if the given key exists in the parameter holder.
+     *
+     * This is a shortcut for:
+     *
+     * <code>$this->getParameterHolder()->has()</code>
+     *
+     * @param string $name The key name
+     *
+     * @return bool true if the given key exists, false otherwise
+     *
+     * @see sfParameterHolder
+     */
+    public function hasParameter($name)
     {
-      $this->connect();
+        return $this->parameterHolder->has($name);
     }
 
-    return $this->connection;
-  }
-
-  /**
-   * Retrieves a raw database resource associated with this sfDatabase implementation.
-   *
-   * @return mixed A database resource
-   *
-   * @throws <b>sfDatabaseException</b> If a resource could not be retrieved
-   */
-  public function getResource()
-  {
-    if (null === $this->resource)
+    /**
+     * Sets the value for the given key.
+     *
+     * This is a shortcut for:
+     *
+     * <code>$this->getParameterHolder()->set()</code>
+     *
+     * @param string $name  The key name
+     * @param string $value The value
+     *
+     * @see sfParameterHolder
+     */
+    public function setParameter($name, $value)
     {
-      $this->connect();
+        $this->parameterHolder->set($name, $value);
     }
 
-    return $this->resource;
-  }
-
-  /**
-   * Gets the parameter holder for this object.
-   *
-   * @return sfParameterHolder A sfParameterHolder instance
-   */
-  public function getParameterHolder()
-  {
-    return $this->parameterHolder;
-  }
-
-  /**
-   * Gets the parameter associated with the given key.
-   *
-   * This is a shortcut for:
-   *
-   * <code>$this->getParameterHolder()->get()</code>
-   *
-   * @param string $name    The key name
-   * @param string $default The default value
-   *
-   * @return string The value associated with the key
-   *
-   * @see sfParameterHolder
-   */
-  public function getParameter($name, $default = null)
-  {
-    return $this->parameterHolder->get($name, $default);
-  }
-
-  /**
-   * Returns true if the given key exists in the parameter holder.
-   *
-   * This is a shortcut for:
-   *
-   * <code>$this->getParameterHolder()->has()</code>
-   *
-   * @param string $name The key name
-   *
-   * @return boolean true if the given key exists, false otherwise
-   *
-   * @see sfParameterHolder
-   */
-  public function hasParameter($name)
-  {
-    return $this->parameterHolder->has($name);
-  }
-
-  /**
-   * Sets the value for the given key.
-   *
-   * This is a shortcut for:
-   *
-   * <code>$this->getParameterHolder()->set()</code>
-   *
-   * @param string $name  The key name
-   * @param string $value The value
-   *
-   * @see sfParameterHolder
-   */
-  public function setParameter($name, $value)
-  {
-    $this->parameterHolder->set($name, $value);
-  }
-
-  /**
-   * Executes the shutdown procedure.
-   *
-   * @return void
-   *
-   * @throws <b>sfDatabaseException</b> If an error occurs while shutting down this database
-   */
-  abstract function shutdown();
+    /**
+     * Executes the shutdown procedure.
+     *
+     * @throws <b>sfDatabaseException</b> 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 ddb377db2..d1313aeae 100644
--- a/lib/database/sfDatabaseManager.class.php
+++ b/lib/database/sfDatabaseManager.class.php
@@ -14,127 +14,114 @@
  * request is handled. This eliminates the need for a filter to manage database
  * connections.
  *
- * @package    symfony
- * @subpackage database
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 class sfDatabaseManager
 {
-  /** @var sfProjectConfiguration */
-  protected $configuration = null;
-  protected $databases = array();
-
-  /**
-   * Class constructor.
-   *
-   * @see initialize()
-   *
-   * @param sfProjectConfiguration $configuration
-   * @param array                  $options
-   */
-  public function __construct(sfProjectConfiguration $configuration, $options = array())
-  {
-    $this->initialize($configuration);
+    /** @var sfProjectConfiguration */
+    protected $configuration;
+    protected $databases = array();
 
-    if (!isset($options['auto_shutdown']) || $options['auto_shutdown'])
+    /**
+     * Class constructor.
+     *
+     * @see initialize()
+     *
+     * @param array $options
+     */
+    public function __construct(sfProjectConfiguration $configuration, $options = array())
     {
-      register_shutdown_function(array($this, 'shutdown'));
+        $this->initialize($configuration);
+
+        if (!isset($options['auto_shutdown']) || $options['auto_shutdown']) {
+            register_shutdown_function(array($this, 'shutdown'));
+        }
     }
-  }
 
-  /**
-   * Initializes this sfDatabaseManager object
-   *
-   * @param sfProjectConfiguration $configuration A sfProjectConfiguration instance
-   *
-   * @return void
-   *
-   * @throws <b>sfInitializationException</b> If an error occurs while initializing this sfDatabaseManager object
-   */
-  public function initialize(sfProjectConfiguration $configuration)
-  {
-    $this->configuration = $configuration;
+    /**
+     * Initializes this sfDatabaseManager object.
+     *
+     * @param sfProjectConfiguration $configuration A sfProjectConfiguration instance
+     *
+     * @throws <b>sfInitializationException</b> If an error occurs while initializing this sfDatabaseManager object
+     */
+    public function initialize(sfProjectConfiguration $configuration)
+    {
+        $this->configuration = $configuration;
 
-    $this->loadConfiguration();
-  }
+        $this->loadConfiguration();
+    }
 
-  /**
-   * Loads database configuration.
-   */
-  public function loadConfiguration()
-  {
-    if ($this->configuration instanceof sfApplicationConfiguration)
+    /**
+     * Loads database configuration.
+     */
+    public function loadConfiguration()
     {
-      $databases = include($this->configuration->getConfigCache()->checkConfig('config/databases.yml'));
+        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'));
+        }
+
+        foreach ($databases as $name => $database) {
+            $this->setDatabase($name, $database);
+        }
     }
-    else
+
+    /**
+     * Sets a database connection.
+     *
+     * @param string     $name     The database name
+     * @param sfDatabase $database A sfDatabase instance
+     */
+    public function setDatabase($name, sfDatabase $database)
     {
-      $configHandler = new sfDatabaseConfigHandler();
-      $databases = $configHandler->evaluate(array($this->configuration->getRootDir().'/config/databases.yml'));
+        $this->databases[$name] = $database;
     }
 
-    foreach ($databases as $name => $database)
+    /**
+     * Retrieves the database connection associated with this sfDatabase implementation.
+     *
+     * @param string $name A database name
+     *
+     * @return mixed A Database instance
+     *
+     * @throws <b>sfDatabaseException</b> If the requested database name does not exist
+     */
+    public function getDatabase($name = 'default')
     {
-      $this->setDatabase($name, $database);
-    }
-  }
+        if (isset($this->databases[$name])) {
+            return $this->databases[$name];
+        }
 
-  /**
-   * Sets a database connection.
-   *
-   * @param string     $name     The database name
-   * @param sfDatabase $database A sfDatabase instance
-   */
-  public function setDatabase($name, sfDatabase $database)
-  {
-    $this->databases[$name] = $database;
-  }
+        // nonexistent database name
+        throw new sfDatabaseException(sprintf('Database "%s" does not exist.', $name));
+    }
 
-  /**
-   * Retrieves the database connection associated with this sfDatabase implementation.
-   *
-   * @param string $name A database name
-   *
-   * @return mixed A Database instance
-   *
-   * @throws <b>sfDatabaseException</b> If the requested database name does not exist
-   */
-  public function getDatabase($name = 'default')
-  {
-    if (isset($this->databases[$name]))
+    /**
+     * Returns the names of all database connections.
+     *
+     * @return array An array containing all database connection names
+     */
+    public function getNames()
     {
-      return $this->databases[$name];
+        return array_keys($this->databases);
     }
 
-    // nonexistent database name
-    throw new sfDatabaseException(sprintf('Database "%s" does not exist.', $name));
-  }
-
-  /**
-   * Returns the names of all database connections.
-   *
-   * @return array An array containing all database connection names
-   */
-  public function getNames()
-  {
-    return array_keys($this->databases);
-  }
-
-  /**
-   * Executes the shutdown procedure
-   *
-   * @return void
-   *
-   * @throws <b>sfDatabaseException</b> If an error occurs while shutting down this DatabaseManager
-   */
-  public function shutdown()
-  {
-    // loop through databases and shutdown connections
-    foreach ($this->databases as $database)
+    /**
+     * Executes the shutdown procedure.
+     *
+     * @throws <b>sfDatabaseException</b> If an error occurs while shutting down this DatabaseManager
+     */
+    public function shutdown()
     {
-      $database->shutdown();
+        // loop through databases and shutdown connections
+        foreach ($this->databases as $database) {
+            $database->shutdown();
+        }
     }
-  }
 }
diff --git a/lib/database/sfMySQLDatabase.class.php b/lib/database/sfMySQLDatabase.class.php
index a72260a47..fac1ccd9f 100644
--- a/lib/database/sfMySQLDatabase.class.php
+++ b/lib/database/sfMySQLDatabase.class.php
@@ -20,105 +20,93 @@
  * # <b>password</b>   - [none]      - The database password.
  * # <b>persistent</b> - [No]        - Indicates that the connection should be persistent.
  *
- * @package    symfony
- * @subpackage database
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 class sfMySQLDatabase extends sfDatabase
 {
-  /**
-   * Connects to the database.
-   *
-   * @throws <b>sfDatabaseException</b> If a connection could not be created
-   */
-  public function connect()
-  {
-    $database = $this->getParameter('database');
-    $host     = $this->getParameter('host', 'localhost');
-    $password = $this->getParameter('password');
-    $username = $this->getParameter('username');
-    $encoding = $this->getParameter('encoding');
-
-    // let's see if we need a persistent connection
-    $connect = $this->getConnectMethod($this->getParameter('persistent', false));
-    if ($password == null)
-    {
-      if ($username == null)
-      {
-        $this->connection = @$connect($host);
-      }
-      else
-      {
-        $this->connection = @$connect($host, $username);
-      }
-    }
-    else
+    /**
+     * Connects to the database.
+     *
+     * @throws <b>sfDatabaseException</b> If a connection could not be created
+     */
+    public function connect()
     {
-      $this->connection = @$connect($host, $username, $password);
-    }
+        $database = $this->getParameter('database');
+        $host = $this->getParameter('host', 'localhost');
+        $password = $this->getParameter('password');
+        $username = $this->getParameter('username');
+        $encoding = $this->getParameter('encoding');
 
-    // make sure the connection went through
-    if ($this->connection === false)
-    {
-      // the connection's foobar'd
-      throw new sfDatabaseException('Failed to create a MySQLDatabase connection.');
+        // let's see if we need a persistent connection
+        $connect = $this->getConnectMethod($this->getParameter('persistent', false));
+        if (null == $password) {
+            if (null == $username) {
+                $this->connection = @$connect($host);
+            } else {
+                $this->connection = @$connect($host, $username);
+            }
+        } else {
+            $this->connection = @$connect($host, $username, $password);
+        }
+
+        // make sure the connection went through
+        if (false === $this->connection) {
+            // the connection's foobar'd
+            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));
+        }
+
+        // set encoding if specified
+        if ($encoding) {
+            @mysql_query("SET NAMES '".$encoding."'", $this->connection);
+        }
+
+        // since we're not an abstraction layer, we copy the connection
+        // to the resource
+        $this->resource = $this->connection;
     }
 
-    // select our database
-    if ($this->selectDatabase($database))
+    /**
+     * Execute the shutdown procedure.
+     *
+     * @throws <b>sfDatabaseException</b> If an error occurs while shutting down this database
+     */
+    public function shutdown()
     {
-      // can't select the database
-      throw new sfDatabaseException(sprintf('Failed to select MySQLDatabase "%s".', $database));
+        if (null != $this->connection) {
+            @mysql_close($this->connection);
+        }
     }
 
-    // set encoding if specified
-    if ($encoding)
+    /**
+     * Returns the appropriate connect method.
+     *
+     * @param bool $persistent wether persistent connections are use or not
+     *
+     * @return string name of connect method
+     */
+    protected function getConnectMethod($persistent)
     {
-      @mysql_query("SET NAMES '".$encoding."'", $this->connection);
+        return $persistent ? 'mysql_pconnect' : 'mysql_connect';
     }
 
-    // since we're not an abstraction layer, we copy the connection
-    // to the resource
-    $this->resource = $this->connection;
-  }
-
-  /**
-   * Returns the appropriate connect method.
-   * 
-   * @param bool $persistent wether persistent connections are use or not
-   * @return string name of connect method.
-   */
-  protected function getConnectMethod($persistent)
-  {
-    return $persistent ? 'mysql_pconnect' : 'mysql_connect';
-  }
-  
-  /**
-   * Selects the database to be used in this connection
-   * 
-   * @param string $database Name of database to be connected
-   *
-   * @return bool true if this was successful
-   */
-  protected function selectDatabase($database)
-  {
-   return ($database != null && !@mysql_select_db($database, $this->connection));
-  }
-
-  /**
-   * Execute the shutdown procedure
-   *
-   * @return void
-   *
-   * @throws <b>sfDatabaseException</b> If an error occurs while shutting down this database
-   */
-  public function shutdown()
-  {
-    if ($this->connection != null)
+    /**
+     * Selects the database to be used in this connection.
+     *
+     * @param string $database Name of database to be connected
+     *
+     * @return bool true if this was successful
+     */
+    protected function selectDatabase($database)
     {
-      @mysql_close($this->connection);
+        return null != $database && !@mysql_select_db($database, $this->connection);
     }
-  }
 }
diff --git a/lib/database/sfMySQLiDatabase.class.php b/lib/database/sfMySQLiDatabase.class.php
index cb13c1edc..3fb6554e8 100644
--- a/lib/database/sfMySQLiDatabase.class.php
+++ b/lib/database/sfMySQLiDatabase.class.php
@@ -11,61 +11,59 @@
 
 /**
  * sfMySQLiDatabase provides connectivity for the MySQL brand database.
+ *
  * @see sfMySQLDatabase
  *
  * @property $connection mysqli
  */
 class sfMySQLiDatabase extends sfMySQLDatabase
 {
+    /**
+     * @throws sfDatabaseException
+     */
+    public function connect()
+    {
+        // PHP 8.1 Activate Exception per default, revert behavior to "return false"
+        mysqli_report(MYSQLI_REPORT_OFF);
 
-  /**
-   * @return void
-   * @throws sfDatabaseException
-   */
-  public function connect()
-  {
-    // PHP 8.1 Activate Exception per default, revert behavior to "return false"
-    mysqli_report(MYSQLI_REPORT_OFF);
-
-    parent::connect();
-  }
+        parent::connect();
+    }
 
-  /**
-   * Returns the appropriate connect method.
-   *
-   * @param bool $persistent Whether persistent connections are use or not
-   *                         The MySQLi driver does not support persistent
-   *                         connections so this argument is ignored.
-   *
-   * @return string name of connect method
-   */
-  protected function getConnectMethod($persistent)
-  {
-    return 'mysqli_connect';
-  }
+    /**
+     * Execute the shutdown procedure.
+     *
+     * @throws <b>sfDatabaseException</b> If an error occurs while shutting down this database
+     */
+    public function shutdown()
+    {
+        if (null != $this->connection) {
+            @mysqli_close($this->connection);
+        }
+    }
 
-  /**
-   * Selects the database to be used in this connection
-   *
-   * @param string $database Name of database to be connected
-   *
-   * @return bool true if this was successful
-   */
-  protected function selectDatabase($database)
-  {
-   return ($database != null && !@mysqli_select_db($this->connection, $database));
-  }
+    /**
+     * Returns the appropriate connect method.
+     *
+     * @param bool $persistent whether persistent connections are use or not
+     *                         The MySQLi driver does not support persistent
+     *                         connections so this argument is ignored
+     *
+     * @return string name of connect method
+     */
+    protected function getConnectMethod($persistent)
+    {
+        return 'mysqli_connect';
+    }
 
-  /**
-   * Execute the shutdown procedure
-   *
-   * @throws <b>sfDatabaseException</b> If an error occurs while shutting down this database
-   */
-  public function shutdown()
-  {
-    if ($this->connection != null)
+    /**
+     * Selects the database to be used in this connection.
+     *
+     * @param string $database Name of database to be connected
+     *
+     * @return bool true if this was successful
+     */
+    protected function selectDatabase($database)
     {
-      @mysqli_close($this->connection);
+        return null != $database && !@mysqli_select_db($this->connection, $database);
     }
-  }
 }
diff --git a/lib/database/sfPDODatabase.class.php b/lib/database/sfPDODatabase.class.php
index 886d19d0c..b648a6ee2 100644
--- a/lib/database/sfPDODatabase.class.php
+++ b/lib/database/sfPDODatabase.class.php
@@ -12,103 +12,88 @@
 /**
  * sfPDODatabase provides connectivity for the PDO database abstraction layer.
  *
- * @package    symfony
- * @subpackage database
  * @author     Daniel Swarbrick (daniel@pressure.net.nz)
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
  * @author     Dustin Whittle <dustin.whittle@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfPDODatabase extends sfDatabase
 {
-  /**
-   * Connects to the database.
-   *
-   * @throws <b>sfDatabaseException</b> If a connection could not be created
-   */
-  public function connect()
-  {
-    if (!$dsn = $this->getParameter('dsn'))
+    /**
+     * Magic method for calling PDO directly via sfPDODatabase.
+     *
+     * @param string $method
+     * @param array  $arguments
+     *
+     * @return mixed
+     */
+    public function __call($method, $arguments)
     {
-      // missing required dsn parameter
-      throw new sfDatabaseException('Database configuration is missing the "dsn" parameter.');
+        return call_user_func_array(array($this->getConnection(), $method), $arguments);
     }
 
-    try
+    /**
+     * Connects to the database.
+     *
+     * @throws <b>sfDatabaseException</b> If a connection could not be created
+     */
+    public function connect()
     {
-      $pdo_class  = $this->getParameter('class', 'PDO');
-      $username   = $this->getParameter('username');
-      $password   = $this->getParameter('password');
-      $persistent = $this->getParameter('persistent');
+        if (!$dsn = $this->getParameter('dsn')) {
+            // missing required dsn parameter
+            throw new sfDatabaseException('Database configuration is missing the "dsn" parameter.');
+        }
 
-      $options = $persistent ? array(PDO::ATTR_PERSISTENT => true) : array();
+        try {
+            $pdo_class = $this->getParameter('class', 'PDO');
+            $username = $this->getParameter('username');
+            $password = $this->getParameter('password');
+            $persistent = $this->getParameter('persistent');
 
-      $this->connection = new $pdo_class($dsn, $username, $password, $options);
+            $options = $persistent ? array(PDO::ATTR_PERSISTENT => true) : array();
 
-    }
-    catch (PDOException $e)
-    {
-      throw new sfDatabaseException($e->getMessage());
-    }
+            $this->connection = new $pdo_class($dsn, $username, $password, $options);
+        } 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);
-    }
-    else
-    {
-      $this->connection->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_SILENT);
-    }
+        // lets generate exceptions instead of silent failures
+        if (sfConfig::get('sf_debug')) {
+            $this->connection->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+        } else {
+            $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);
-    }
-
-    // nulls
-    $nulls = $this->getParameter('nulls');
-    if ($nulls)
-    {
-      $this->connection->setAttribute(PDO::ATTR_ORACLE_NULLS, PDO::NULL_EMPTY_STRING);
-    }
+        // compatability
+        $compatability = $this->getParameter('compat');
+        if ($compatability) {
+            $this->connection->setAttribute(PDO::ATTR_CASE, PDO::CASE_NATURAL);
+        }
 
-    // auto commit
-    $autocommit = $this->getParameter('autocommit');
-    if ($autocommit)
-    {
-      $this->connection->setAttribute(PDO::ATTR_AUTOCOMMIT, true);
-    }
+        // nulls
+        $nulls = $this->getParameter('nulls');
+        if ($nulls) {
+            $this->connection->setAttribute(PDO::ATTR_ORACLE_NULLS, PDO::NULL_EMPTY_STRING);
+        }
 
-    $this->resource = $this->connection;
+        // auto commit
+        $autocommit = $this->getParameter('autocommit');
+        if ($autocommit) {
+            $this->connection->setAttribute(PDO::ATTR_AUTOCOMMIT, true);
+        }
 
-  }
+        $this->resource = $this->connection;
+    }
 
-  /**
-   * Execute the shutdown procedure.
-   *
-   * @return void
-   */
-  public function shutdown()
-  {
-    if ($this->connection !== null)
+    /**
+     * Execute the shutdown procedure.
+     */
+    public function shutdown()
     {
-      @$this->connection = null;
+        if (null !== $this->connection) {
+            @$this->connection = null;
+        }
     }
-  }
-
-  /**
-   * Magic method for calling PDO directly via sfPDODatabase
-   *
-   * @param string $method
-   * @param array $arguments
-   * @return mixed
-   */
-  public function __call($method, $arguments)
-  {
-    return call_user_func_array(array($this->getConnection(), $method), $arguments);
-  }
 }
diff --git a/lib/database/sfPostgreSQLDatabase.class.php b/lib/database/sfPostgreSQLDatabase.class.php
index 0bbf8abf3..3ebe5e30c 100644
--- a/lib/database/sfPostgreSQLDatabase.class.php
+++ b/lib/database/sfPostgreSQLDatabase.class.php
@@ -21,62 +21,59 @@
  * # <b>persistent</b> - [No]        - Indicates that the connection should be persistent.
  * # <b>port</b>       - [none]      - TCP/IP port on which PostgreSQL is listening.
  *
- * @package    symfony
- * @subpackage database
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 class sfPostgreSQLDatabase extends sfDatabase
 {
-  /**
-   * Connects to the database.
-   *
-   * @throws <b>sfDatabaseException</b> If a connection could not be created
-   */
-  public function connect()
-  {
-    $database = $this->getParameter('database');
-    $host     = $this->getParameter('host');
-    $password = $this->getParameter('password');
-    $port     = $this->getParameter('port');
-    $username = $this->getParameter('username');
+    /**
+     * Connects to the database.
+     *
+     * @throws <b>sfDatabaseException</b> If a connection could not be created
+     */
+    public function connect()
+    {
+        $database = $this->getParameter('database');
+        $host = $this->getParameter('host');
+        $password = $this->getParameter('password');
+        $port = $this->getParameter('port');
+        $username = $this->getParameter('username');
 
-    // construct connection string
-    $string = ($database != null ? (' dbname='   .$database) : '').
-              ($host != null     ? (' host='     .$host)     : '').
-              ($password != null ? (' password=' .$password) : '').
-              ($port != null     ? (' port='     .$port)     : '').
-              ($username != null ? (' user='     .$username) : '');
+        // construct connection string
+        $string = (null != $database ? (' dbname='.$database) : '').
+                  (null != $host ? (' host='.$host) : '').
+                  (null != $password ? (' password='.$password) : '').
+                  (null != $port ? (' port='.$port) : '').
+                  (null != $username ? (' user='.$username) : '');
 
-    // let's see if we need a persistent connection
-    $persistent = $this->getParameter('persistent', false);
-    $connect    = $persistent ? 'pg_pconnect' : 'pg_connect';
+        // let's see if we need a persistent connection
+        $persistent = $this->getParameter('persistent', false);
+        $connect = $persistent ? 'pg_pconnect' : 'pg_connect';
 
-    $this->connection = @$connect($string);
+        $this->connection = @$connect($string);
 
-    // make sure the connection went through
-    if ($this->connection === false)
-    {
-      // the connection's foobar'd
-      throw new sfDatabaseException('Failed to create a PostgreSQLDatabase connection.');
-    }
+        // make sure the connection went through
+        if (false === $this->connection) {
+            // the connection's foobar'd
+            throw new sfDatabaseException('Failed to create a PostgreSQLDatabase connection.');
+        }
 
-    // since we're not an abstraction layer, we copy the connection
-    // to the resource
-    $this->resource = $this->connection;
-  }
+        // since we're not an abstraction layer, we copy the connection
+        // to the resource
+        $this->resource = $this->connection;
+    }
 
-  /**
-   * Executes the shutdown procedure.
-   *
-   * @throws <b>sfDatabaseException</b> If an error occurs while shutting down this database
-   */
-  public function shutdown()
-  {
-    if ($this->connection != null)
+    /**
+     * Executes the shutdown procedure.
+     *
+     * @throws <b>sfDatabaseException</b> If an error occurs while shutting down this database
+     */
+    public function shutdown()
     {
-      @pg_close($this->connection);
+        if (null != $this->connection) {
+            @pg_close($this->connection);
+        }
     }
-  }
 }
diff --git a/lib/debug/sfDebug.class.php b/lib/debug/sfDebug.class.php
index fda40d5c1..4a564d140 100644
--- a/lib/debug/sfDebug.class.php
+++ b/lib/debug/sfDebug.class.php
@@ -11,262 +11,238 @@
 /**
  * sfDebug provides some method to help debugging a symfony application.
  *
- * @package    symfony
- * @subpackage debug
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfDebug
 {
-  /**
-   * Returns symfony information as an array.
-   *
-   * @return array An array of symfony information
-   */
-  public static function symfonyInfoAsArray()
-  {
-    return array(
-      'version' => SYMFONY_VERSION,
-      'path'    => sfConfig::get('sf_symfony_lib_dir'),
-    );
-  }
-
-  /**
-   * Returns PHP information as an array.
-   *
-   * @return array An array of php information
-   */
-  public static function phpInfoAsArray()
-  {
-    $values = array(
-      'php'        => phpversion(),
-      'os'         => php_uname(),
-      'extensions' => get_loaded_extensions(),
-    );
-
-    natcasesort($values['extensions']);
-
-    // assign extension version
-    if ($values['extensions'])
+    /**
+     * Returns symfony information as an array.
+     *
+     * @return array An array of symfony information
+     */
+    public static function symfonyInfoAsArray()
     {
-      foreach($values['extensions'] as $key => $extension)
-      {
-        $values['extensions'][$key] = phpversion($extension) ? sprintf('%s (%s)', $extension, phpversion($extension)) : $extension;
-      }
+        return array(
+            'version' => SYMFONY_VERSION,
+            'path' => sfConfig::get('sf_symfony_lib_dir'),
+        );
     }
 
-    return $values;
-  }
-
-  /**
-   * Returns PHP globals variables as a sorted array.
-   *
-   * @return array PHP globals
-   */
-  public static function globalsAsArray()
-  {
-    $values = array();
-    foreach (array('cookie', 'server', 'get', 'post', 'files', 'env', 'session') as $name)
+    /**
+     * Returns PHP information as an array.
+     *
+     * @return array An array of php information
+     */
+    public static function phpInfoAsArray()
     {
-      if (!isset($GLOBALS['_'.strtoupper($name)]))
-      {
-        continue;
-      }
+        $values = array(
+            'php' => phpversion(),
+            'os' => php_uname(),
+            'extensions' => get_loaded_extensions(),
+        );
+
+        natcasesort($values['extensions']);
+
+        // assign extension version
+        if ($values['extensions']) {
+            foreach ($values['extensions'] as $key => $extension) {
+                $values['extensions'][$key] = phpversion($extension) ? sprintf('%s (%s)', $extension, phpversion($extension)) : $extension;
+            }
+        }
 
-      $values[$name] = array();
-      foreach ($GLOBALS['_'.strtoupper($name)] as $key => $value)
-      {
-        $values[$name][$key] = $value;
-      }
-      ksort($values[$name]);
+        return $values;
     }
 
-    ksort($values);
-
-    return $values;
-  }
-
-  /**
-   * Returns sfConfig variables as a sorted array.
-   *
-   * @return array sfConfig variables
-   */
-  public static function settingsAsArray()
-  {
-    $config = sfConfig::getAll();
-
-    ksort($config);
+    /**
+     * Returns PHP globals variables as a sorted array.
+     *
+     * @return array PHP globals
+     */
+    public static function globalsAsArray()
+    {
+        $values = array();
+        foreach (array('cookie', 'server', 'get', 'post', 'files', 'env', 'session') as $name) {
+            if (!isset($GLOBALS['_'.strtoupper($name)])) {
+                continue;
+            }
+
+            $values[$name] = array();
+            foreach ($GLOBALS['_'.strtoupper($name)] as $key => $value) {
+                $values[$name][$key] = $value;
+            }
+            ksort($values[$name]);
+        }
 
-    return $config;
-  }
+        ksort($values);
 
-  /**
-   * Returns request parameter holders as an array.
-   *
-   * @param sfRequest $request A sfRequest instance
-   *
-   * @return array The request parameter holders
-   */
-  public static function requestAsArray(sfRequest $request = null)
-  {
-    if (!$request)
-    {
-      return array();
+        return $values;
     }
 
-    return array(
-      '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
-   *
-   * @return array The response parameters
-   */
-  public static function responseAsArray(sfResponse $response = null)
-  {
-    if (!$response)
+    /**
+     * Returns sfConfig variables as a sorted array.
+     *
+     * @return array sfConfig variables
+     */
+    public static function settingsAsArray()
     {
-      return array();
-    }
+        $config = sfConfig::getAll();
 
-    return array(
-      'status'      => array('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(),
-    );
-  }
+        ksort($config);
 
-  /**
-   * Returns user parameters as an array.
-   *
-   * @param sfUser $user A sfUser instance
-   *
-   * @return array The user parameters
-   */
-  public static function userAsArray(sfUser $user = null)
-  {
-    if (!$user)
-    {
-      return array();
+        return $config;
     }
 
-    $data = array(
-      'options'         => $user->getOptions(),
-      'attributeHolder' => self::flattenParameterHolder($user->getAttributeHolder(), true),
-      'culture'         => $user->getCulture(),
-    );
-
-    if ($user instanceof sfBasicSecurityUser)
+    /**
+     * Returns request parameter holders as an array.
+     *
+     * @param sfRequest $request A sfRequest instance
+     *
+     * @return array The request parameter holders
+     */
+    public static function requestAsArray(sfRequest $request = null)
     {
-      $data = array_merge($data, array(
-          'authenticated'   => $user->isAuthenticated(),
-          'credentials'     => $user->getCredentials(),
-          'lastRequest'     => $user->getLastRequestTime(),
-      ));
-    }
+        if (!$request) {
+            return array();
+        }
 
-    return $data;
-  }
+        return array(
+            'options' => $request->getOptions(),
+            'parameterHolder' => self::flattenParameterHolder($request->getParameterHolder(), true),
+            'attributeHolder' => self::flattenParameterHolder($request->getAttributeHolder(), true),
+        );
+    }
 
-  /**
-   * Returns a parameter holder as an array.
-   *
-   * @param sfParameterHolder $parameterHolder A sfParameterHolder instance
-   * @param boolean $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)
+    /**
+     * Returns response parameters as an array.
+     *
+     * @param sfWebResponse $response A sfResponse instance
+     *
+     * @return array The response parameters
+     */
+    public static function responseAsArray(sfResponse $response = null)
     {
-      foreach ($parameterHolder->getNamespaces() as $ns)
-      {
-        $values[$ns] = array();
-        foreach ($parameterHolder->getAll($ns) as $key => $value)
-        {
-          $values[$ns][$key] = $value;
+        if (!$response) {
+            return array();
         }
-        ksort($values[$ns]);
-      }
+
+        return array(
+            'status' => array('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(),
+        );
     }
-    else
+
+    /**
+     * Returns user parameters as an array.
+     *
+     * @param sfUser $user A sfUser instance
+     *
+     * @return array The user parameters
+     */
+    public static function userAsArray(sfUser $user = null)
     {
-      foreach ($parameterHolder->getAll() as $key => $value)
-      {
-        $values[$key] = $value;
-      }
+        if (!$user) {
+            return array();
+        }
+
+        $data = array(
+            'options' => $user->getOptions(),
+            'attributeHolder' => self::flattenParameterHolder($user->getAttributeHolder(), true),
+            'culture' => $user->getCulture(),
+        );
+
+        if ($user instanceof sfBasicSecurityUser) {
+            $data = array_merge($data, array(
+                'authenticated' => $user->isAuthenticated(),
+                'credentials' => $user->getCredentials(),
+                'lastRequest' => $user->getLastRequestTime(),
+            ));
+        }
+
+        return $data;
     }
 
-    if ($removeObjects)
+    /**
+     * 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.
+     *
+     * @return array The parameter holder as an array
+     */
+    public static function flattenParameterHolder($parameterHolder, $removeObjects = false)
     {
-      $values = self::removeObjects($values);
-    }
+        $values = array();
+        if ($parameterHolder instanceof sfNamespacedParameterHolder) {
+            foreach ($parameterHolder->getNamespaces() as $ns) {
+                $values[$ns] = array();
+                foreach ($parameterHolder->getAll($ns) as $key => $value) {
+                    $values[$ns][$key] = $value;
+                }
+                ksort($values[$ns]);
+            }
+        } else {
+            foreach ($parameterHolder->getAll() as $key => $value) {
+                $values[$key] = $value;
+            }
+        }
+
+        if ($removeObjects) {
+            $values = self::removeObjects($values);
+        }
 
-    ksort($values);
+        ksort($values);
 
-    return $values;
-  }
+        return $values;
+    }
 
-  /**
-   * Removes objects from the array by replacing them with a String containing the class name.
-   *
-   * @param array $values an array
-   *
-   * @return array The array without objects
-   */
-  public static function removeObjects($values)
-  {
-    $nvalues = array();
-    foreach ($values as $key => $value)
+    /**
+     * Removes objects from the array by replacing them with a String containing the class name.
+     *
+     * @param array $values an array
+     *
+     * @return array The array without objects
+     */
+    public static function removeObjects($values)
     {
-      if (is_array($value))
-      {
-        $nvalues[$key] = self::removeObjects($value);
-      }
-      else if (is_object($value))
-      {
-        $nvalues[$key] = sprintf('%s Object()', get_class($value));
-      }
-      else
-      {
-        $nvalues[$key] = $value;
-      }
-    }
+        $nvalues = array();
+        foreach ($values as $key => $value) {
+            if (is_array($value)) {
+                $nvalues[$key] = self::removeObjects($value);
+            } elseif (is_object($value)) {
+                $nvalues[$key] = sprintf('%s Object()', get_class($value));
+            } else {
+                $nvalues[$key] = $value;
+            }
+        }
 
-    return $nvalues;
-  }
+        return $nvalues;
+    }
 
-  /**
-   * Shortens a file path by replacing symfony directory constants.
-   *
-   * @param  string $file
-   *
-   * @return string
-   */
-  static public function shortenFilePath($file)
-  {
-    foreach (array('sf_root_dir', 'sf_symfony_lib_dir') as $key)
+    /**
+     * Shortens a file path by replacing symfony directory constants.
+     *
+     * @param string $file
+     *
+     * @return string
+     */
+    public static function shortenFilePath($file)
     {
-      if (0 === strpos($file, $value = sfConfig::get($key)))
-      {
-        $file = str_replace($value, strtoupper($key), $file);
-        break;
-      }
-    }
+        foreach (array('sf_root_dir', 'sf_symfony_lib_dir') as $key) {
+            if (0 === strpos($file, $value = sfConfig::get($key))) {
+                $file = str_replace($value, strtoupper($key), $file);
+
+                break;
+            }
+        }
 
-    return $file;
-  }
+        return $file;
+    }
 }
diff --git a/lib/debug/sfTimer.class.php b/lib/debug/sfTimer.class.php
index a08037784..8b85e0e9a 100644
--- a/lib/debug/sfTimer.class.php
+++ b/lib/debug/sfTimer.class.php
@@ -11,74 +11,71 @@
 /**
  * sfTimer class allows to time some PHP code.
  *
- * @package    symfony
- * @subpackage util
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfTimer
 {
-  protected
-    $startTime = null,
-    $totalTime = null,
-    $name = '',
-    $calls = 0;
-
-  /**
-   * Creates a new sfTimer instance.
-   *
-   * @param string $name The name of the timer
-   */
-  public function __construct($name = '')
-  {
-    $this->name = $name;
-    $this->startTimer();
-  }
+    protected $startTime;
+    protected $totalTime;
+    protected $name = '';
+    protected $calls = 0;
 
-  /**
-   * Starts the timer.
-   */
-  public function startTimer()
-  {
-    $this->startTime = microtime(true);
-  }
+    /**
+     * Creates a new sfTimer instance.
+     *
+     * @param string $name The name of the timer
+     */
+    public function __construct($name = '')
+    {
+        $this->name = $name;
+        $this->startTimer();
+    }
 
-  /**
-   * Stops the timer and add the amount of time since the start to the total time.
-   *
-   * @return float Time spend for the last call
-   */
-  public function addTime()
-  {
-    $spend = microtime(true) - $this->startTime;
-    $this->totalTime += $spend;
-    ++$this->calls;
+    /**
+     * Starts the timer.
+     */
+    public function startTimer()
+    {
+        $this->startTime = microtime(true);
+    }
 
-    return $spend;
-  }
+    /**
+     * Stops the timer and add the amount of time since the start to the total time.
+     *
+     * @return float Time spend for the last call
+     */
+    public function addTime()
+    {
+        $spend = microtime(true) - $this->startTime;
+        $this->totalTime += $spend;
+        ++$this->calls;
 
-  /**
-   * Gets the number of calls this timer has been called to time code.
-   *
-   * @return integer Number of calls
-   */
-  public function getCalls()
-  {
-    return $this->calls;
-  }
+        return $spend;
+    }
 
-  /**
-   * Gets the total time elapsed for all calls of this timer.
-   *
-   * @return float Time in seconds
-   */
-  public function getElapsedTime()
-  {
-    if (null === $this->totalTime)
+    /**
+     * Gets the number of calls this timer has been called to time code.
+     *
+     * @return int Number of calls
+     */
+    public function getCalls()
     {
-      $this->addTime();
+        return $this->calls;
     }
 
-    return $this->totalTime;
-  }
+    /**
+     * Gets the total time elapsed for all calls of this timer.
+     *
+     * @return float Time in seconds
+     */
+    public function getElapsedTime()
+    {
+        if (null === $this->totalTime) {
+            $this->addTime();
+        }
+
+        return $this->totalTime;
+    }
 }
diff --git a/lib/debug/sfTimerManager.class.php b/lib/debug/sfTimerManager.class.php
index 0f06d09a8..110939ca8 100644
--- a/lib/debug/sfTimerManager.class.php
+++ b/lib/debug/sfTimerManager.class.php
@@ -11,57 +11,53 @@
 /**
  * sfTimerManager is a container for sfTimer objects.
  *
- * @package    symfony
- * @subpackage util
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfTimerManager
 {
-  /** @var sfTimer[] */
-  static public $timers = array();
+    /** @var sfTimer[] */
+    public static $timers = array();
 
-  /**
-   * Gets a sfTimer instance.
-   *
-   * It returns the timer named $name or create a new one if it does not exist.
-   *
-   * @param string $name The name of the timer
-   *
-   * @param bool   $reset
-   *
-   * @return sfTimer The timer instance
-   */
-  public static function getTimer($name, $reset=true)
-  {
-    if (!isset(self::$timers[$name]))
+    /**
+     * Gets a sfTimer instance.
+     *
+     * It returns the timer named $name or create a new one if it does not exist.
+     *
+     * @param string $name  The name of the timer
+     * @param bool   $reset
+     *
+     * @return sfTimer The timer instance
+     */
+    public static function getTimer($name, $reset = true)
     {
-      self::$timers[$name] = new sfTimer($name);
+        if (!isset(self::$timers[$name])) {
+            self::$timers[$name] = new sfTimer($name);
+        }
+
+        if ($reset) {
+            self::$timers[$name]->startTimer();
+        }
+
+        return self::$timers[$name];
     }
 
-    if ($reset)
+    /**
+     * Gets all sfTimer instances stored in sfTimerManager.
+     *
+     * @return sfTimer[] An array of all sfTimer instances
+     */
+    public static function getTimers()
     {
-       self::$timers[$name]->startTimer();
+        return self::$timers;
     }
 
-    return self::$timers[$name];
-  }
-
-  /**
-   * Gets all sfTimer instances stored in sfTimerManager.
-   *
-   * @return sfTimer[] An array of all sfTimer instances
-   */
-  public static function getTimers()
-  {
-    return self::$timers;
-  }
-
-  /**
-   * Clears all sfTimer instances stored in sfTimerManager.
-   */
-  public static function clearTimers()
-  {
-    self::$timers = array();
-  }
+    /**
+     * Clears all sfTimer instances stored in sfTimerManager.
+     */
+    public static function clearTimers()
+    {
+        self::$timers = array();
+    }
 }
diff --git a/lib/debug/sfWebDebug.class.php b/lib/debug/sfWebDebug.class.php
index e7b7eea82..5f6a71508 100644
--- a/lib/debug/sfWebDebug.class.php
+++ b/lib/debug/sfWebDebug.class.php
@@ -11,222 +11,205 @@
 /**
  * sfWebDebug creates debug information for easy debugging in the browser.
  *
- * @package    symfony
- * @subpackage debug
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfWebDebug
 {
-  protected
-    $dispatcher = null,
-    $logger     = null,
-    $options    = array(),
-    $panels     = array();
-
-  /**
-   * Constructor.
-   *
-   * Available options:
-   *
-   *  * 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
-   */
-  public function __construct(sfEventDispatcher $dispatcher, sfVarLogger $logger, array $options = array())
-  {
-    $this->dispatcher = $dispatcher;
-    $this->logger     = $logger;
-    $this->options    = $options;
-
-    if (!isset($this->options['image_root_path']))
+    protected $dispatcher;
+    protected $logger;
+    protected $options = array();
+    protected $panels = array();
+
+    /**
+     * Constructor.
+     *
+     * Available options:
+     *
+     *  * 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
+     */
+    public function __construct(sfEventDispatcher $dispatcher, sfVarLogger $logger, array $options = array())
     {
-      $this->options['image_root_path'] = '';
-    }
+        $this->dispatcher = $dispatcher;
+        $this->logger = $logger;
+        $this->options = $options;
 
-    if (!isset($this->options['request_parameters']))
-    {
-      $this->options['request_parameters'] = array();
-    }
+        if (!isset($this->options['image_root_path'])) {
+            $this->options['image_root_path'] = '';
+        }
 
-    $this->configure();
+        if (!isset($this->options['request_parameters'])) {
+            $this->options['request_parameters'] = array();
+        }
 
-    $this->dispatcher->notify(new sfEvent($this, 'debug.web.load_panels'));
-  }
+        $this->configure();
 
-  /**
-   * Configures the web debug toolbar.
-   */
-  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->dispatcher->notify(new sfEvent($this, 'debug.web.load_panels'));
     }
-    if (sfConfig::get('sf_logging_enabled'))
+
+    /**
+     * Configures the web debug toolbar.
+     */
+    public function configure()
     {
-      $this->setPanel('config', new sfWebDebugPanelConfig($this));
-      $this->setPanel('view', new sfWebDebugPanelView($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));
+        }
+        $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('logs', new sfWebDebugPanelLogs($this));
-    $this->setPanel('memory', new sfWebDebugPanelMemory($this));
-    if (sfConfig::get('sf_debug'))
+
+    /**
+     * Gets the logger.
+     *
+     * @return sfVarLogger The logger instance
+     */
+    public function getLogger()
     {
-      $this->setPanel('time', new sfWebDebugPanelTimer($this));
+        return $this->logger;
     }
 
-    $this->setPanel('mailer', new sfWebDebugPanelMailer($this));
-  }
-
-  /**
-   * Gets the logger.
-   *
-   * @return sfVarLogger The logger instance
-   */
-  public function getLogger()
-  {
-    return $this->logger;
-  }
-
-  /**
-   * Gets the event dispatcher.
-   *
-   * @return sfEventDispatcher The event dispatcher
-   */
-  public function getEventDispatcher()
-  {
-    return $this->dispatcher;
-  }
-
-  /**
-   * Gets the registered panels.
-   *
-   * @return array The panels
-   */
-  public function getPanels()
-  {
-    return $this->panels;
-  }
-
-  /**
-   * Sets a panel by name.
-   *
-   * @param string          $name  The panel name
-   * @param sfWebDebugPanel $panel The panel
-   */
-  public function setPanel($name, sfWebDebugPanel $panel)
-  {
-    $this->panels[$name] = $panel;
-  }
-
-  /**
-   * Removes a panel by name.
-   *
-   * @param string $name The panel name
-   */
-  public function removePanel($name)
-  {
-    unset($this->panels[$name]);
-  }
-
-  /**
-   * Gets an option value by name.
-   *
-   * @param string $name The option name
-   * @param mixed  $default
-   *
-   * @return mixed The option value
-   */
-  public function getOption($name, $default = null)
-  {
-    return isset($this->options[$name]) ? $this->options[$name] : $default;
-  }
-
-  /**
-   * Injects the web debug toolbar into a given HTML string.
-   *
-   * @param string $content The HTML content
-   *
-   * @return string The content with the web debug toolbar injected
-   */
-  public function injectToolbar($content)
-  {
-    if (function_exists('mb_stripos'))
+    /**
+     * Gets the event dispatcher.
+     *
+     * @return sfEventDispatcher The event dispatcher
+     */
+    public function getEventDispatcher()
     {
-      $posFunction = 'mb_stripos';
-      $posrFunction = 'mb_strripos';
-      $substrFunction = 'mb_substr';
+        return $this->dispatcher;
     }
-    else
+
+    /**
+     * Gets the registered panels.
+     *
+     * @return array The panels
+     */
+    public function getPanels()
     {
-      $posFunction = 'stripos';
-      $posrFunction = 'strripos';
-      $substrFunction = 'substr';
+        return $this->panels;
     }
 
-    if (false !== $pos = $posFunction($content, '</head>'))
+    /**
+     * Sets a panel by name.
+     *
+     * @param string          $name  The panel name
+     * @param sfWebDebugPanel $panel The panel
+     */
+    public function setPanel($name, sfWebDebugPanel $panel)
     {
-      $styles = '<style type="text/css">'.str_replace(array("\r", "\n"), ' ', $this->getStylesheet()).'</style>';
-      $content = $substrFunction($content, 0, $pos).$styles.$substrFunction($content, $pos);
+        $this->panels[$name] = $panel;
     }
 
-    $debug = $this->asHtml();
-    if (false === $pos = $posrFunction($content, '</body>'))
+    /**
+     * Removes a panel by name.
+     *
+     * @param string $name The panel name
+     */
+    public function removePanel($name)
     {
-      $content .= $debug;
+        unset($this->panels[$name]);
     }
-    else
+
+    /**
+     * Gets an option value by name.
+     *
+     * @param string $name    The option name
+     * @param mixed  $default
+     *
+     * @return mixed The option value
+     */
+    public function getOption($name, $default = null)
     {
-      $content = $substrFunction($content, 0, $pos).'<script type="text/javascript">'.$this->getJavascript().'</script>'.$debug.$substrFunction($content, $pos);
+        return isset($this->options[$name]) ? $this->options[$name] : $default;
     }
 
-    return $content;
-  }
-
-  /**
-   * Returns the web debug toolbar as HTML.
-   *
-   * @return string The web debug toolbar HTML
-   */
-  public function asHtml()
-  {
-    $current = isset($this->options['request_parameters']['sfWebDebugPanel']) ? $this->options['request_parameters']['sfWebDebugPanel'] : null;
-
-    $titles = array();
-    $panels = array();
-    foreach ($this->panels as $name => $panel)
+    /**
+     * Injects the web debug toolbar into a given HTML string.
+     *
+     * @param string $content The HTML content
+     *
+     * @return string The content with the web debug toolbar injected
+     */
+    public function injectToolbar($content)
     {
-      if ($title = $panel->getTitle())
-      {
-        if (($content = $panel->getPanelContent()) || $panel->getTitleUrl())
-        {
-          $id = sprintf('sfWebDebug%sDetails', $name);
-          $titles[] = sprintf('<li%s><a title="%s" href="%s"%s>%s</a></li>',
-            $panel->getStatus() ? ' class="sfWebDebug'.ucfirst($this->getPriority($panel->getStatus())).'"' : '',
-            $panel->getPanelTitle(),
-            $panel->getTitleUrl() ?: '#',
-            $panel->getTitleUrl() ? '' : ' onclick="sfWebDebugShowDetailsFor(\''.$id.'\'); return false;"',
-            $title
-          );
-          $panels[] = sprintf('<div id="%s" class="sfWebDebugTop" style="display:%s"><h1>%s</h1>%s</div>',
-            $id,
-            $name == $current ? 'block' : 'none',
-            $panel->getPanelTitle(),
-            $content
-          );
+        if (function_exists('mb_stripos')) {
+            $posFunction = 'mb_stripos';
+            $posrFunction = 'mb_strripos';
+            $substrFunction = 'mb_substr';
+        } else {
+            $posFunction = 'stripos';
+            $posrFunction = 'strripos';
+            $substrFunction = 'substr';
         }
-        else
-        {
-          $titles[] = sprintf('<li>%s</li>', $title);
+
+        if (false !== $pos = $posFunction($content, '</head>')) {
+            $styles = '<style type="text/css">'.str_replace(array("\r", "\n"), ' ', $this->getStylesheet()).'</style>';
+            $content = $substrFunction($content, 0, $pos).$styles.$substrFunction($content, $pos);
         }
-      }
+
+        $debug = $this->asHtml();
+        if (false === $pos = $posrFunction($content, '</body>')) {
+            $content .= $debug;
+        } else {
+            $content = $substrFunction($content, 0, $pos).'<script type="text/javascript">'.$this->getJavascript().'</script>'.$debug.$substrFunction($content, $pos);
+        }
+
+        return $content;
     }
 
-    return '
+    /**
+     * Returns the web debug toolbar as HTML.
+     *
+     * @return string The web debug toolbar HTML
+     */
+    public function asHtml()
+    {
+        $current = isset($this->options['request_parameters']['sfWebDebugPanel']) ? $this->options['request_parameters']['sfWebDebugPanel'] : null;
+
+        $titles = array();
+        $panels = array();
+        foreach ($this->panels as $name => $panel) {
+            if ($title = $panel->getTitle()) {
+                if (($content = $panel->getPanelContent()) || $panel->getTitleUrl()) {
+                    $id = sprintf('sfWebDebug%sDetails', $name);
+                    $titles[] = sprintf(
+                        '<li%s><a title="%s" href="%s"%s>%s</a></li>',
+                        $panel->getStatus() ? ' class="sfWebDebug'.ucfirst($this->getPriority($panel->getStatus())).'"' : '',
+                        $panel->getPanelTitle(),
+                        $panel->getTitleUrl() ?: '#',
+                        $panel->getTitleUrl() ? '' : ' onclick="sfWebDebugShowDetailsFor(\''.$id.'\'); return false;"',
+                        $title
+                    );
+                    $panels[] = sprintf(
+                        '<div id="%s" class="sfWebDebugTop" style="display:%s"><h1>%s</h1>%s</div>',
+                        $id,
+                        $name == $current ? 'block' : 'none',
+                        $panel->getPanelTitle(),
+                        $content
+                    );
+                } else {
+                    $titles[] = sprintf('<li>%s</li>', $title);
+                }
+            }
+        }
+
+        return '
       <div id="sfWebDebug">
         <div id="sfWebDebugBar">
           <a href="#" onclick="sfWebDebugToggleMenu(); return false;"><img src="'.$this->options['image_root_path'].'/sf.png" alt="Debug toolbar" /></a>
@@ -242,39 +225,35 @@ public function asHtml()
         '.implode("\n", $panels).'
       </div>
     ';
-  }
-
-  /**
-   * Converts a priority value to a string.
-   *
-   * @param integer $value The priority value
-   *
-   * @return string The priority as a string
-   */
-  public function getPriority($value)
-  {
-    if ($value >= sfLogger::INFO)
-    {
-      return 'info';
-    }
-    else if ($value >= sfLogger::WARNING)
-    {
-      return 'warning';
     }
-    else
+
+    /**
+     * Converts a priority value to a string.
+     *
+     * @param int $value The priority value
+     *
+     * @return string The priority as a string
+     */
+    public function getPriority($value)
     {
-      return 'error';
+        if ($value >= sfLogger::INFO) {
+            return 'info';
+        }
+        if ($value >= sfLogger::WARNING) {
+            return 'warning';
+        }
+
+        return 'error';
     }
-  }
 
-  /**
-   * Gets the javascript code to inject in the head tag.
-   *
-   * @return string The javascript code
-   */
-  public function getJavascript()
-  {
-    return <<<EOF
+    /**
+     * Gets the javascript code to inject in the head tag.
+     *
+     * @return string The javascript code
+     */
+    public function getJavascript()
+    {
+        return <<<'EOF'
 /* <![CDATA[ */
 function sfWebDebugGetElementsByClassName(strClass, strTag, objContElm)
 {
@@ -419,16 +398,16 @@ function sfWebDebugShowOnlyLogLines(type)
 }
 /* ]]> */
 EOF;
-  }
+    }
 
-  /**
-   * Gets the stylesheet code to inject in the head tag.
-   *
-   * @return string The stylesheet code
-   */
-  public function getStylesheet()
-  {
-    return <<<EOF
+    /**
+     * Gets the stylesheet code to inject in the head tag.
+     *
+     * @return string The stylesheet code
+     */
+    public function getStylesheet()
+    {
+        return <<<'EOF'
 #sfWebDebug
 {
   padding: 0;
@@ -817,5 +796,5 @@ public function getStylesheet()
   background: #FFC;
 }
 EOF;
-  }
+    }
 }
diff --git a/lib/debug/sfWebDebugPanel.class.php b/lib/debug/sfWebDebugPanel.class.php
index 387a1310c..61a8495e0 100644
--- a/lib/debug/sfWebDebugPanel.class.php
+++ b/lib/debug/sfWebDebugPanel.class.php
@@ -11,193 +11,184 @@
 /**
  * sfWebDebugPanel represents a web debug panel.
  *
- * @package    symfony
- * @subpackage debug
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfWebDebugPanel
 {
-  protected
-    $webDebug = null,
-    $status   = sfLogger::INFO;
-
-  /**
-   * Constructor.
-   *
-   * @param sfWebDebug $webDebug The web debug toolbar instance
-   */
-  public function __construct(sfWebDebug $webDebug)
-  {
-    $this->webDebug = $webDebug;
-  }
-
-  /**
-   * Gets the link URL for the link.
-   *
-   * @return string The URL link
-   */
-  public function getTitleUrl()
-  {
-  }
-
-  /**
-   * Gets the text for the link.
-   *
-   * @return string The link text
-   */
-  abstract public function getTitle();
-
-  /**
-   * Gets the title of the panel.
-   *
-   * @return string The panel title
-   */
-  abstract public function getPanelTitle();
-
-  /**
-   * Gets the panel HTML content.
-   *
-   * @return string The panel HTML content
-   */
-  abstract public function getPanelContent();
-
-  /**
-   * Returns the current status.
-   *
-   * @return integer A {@link sfLogger} priority constant
-   */
-  public function getStatus()
-  {
-    return $this->status;
-  }
-
-  /**
-   * Sets the current panel's status.
-   *
-   * @param integer $status A {@link sfLogger} priority constant
-   */
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-
-  /**
-   * Returns a toggler element.
-   *
-   * @param  string $element The value of an element's DOM id attribute
-   * @param  string $title   A title attribute
-   *
-   * @return string
-   */
-  public function getToggler($element, $title = 'Toggle details')
-  {
-    return '<a href="#" onclick="sfWebDebugToggle(\''.$element.'\'); return false;" title="'.$title.'"><img src="'.$this->webDebug->getOption('image_root_path').'/toggle.gif" alt="'.$title.'"/></a>';
-  }
-
-  /**
-   * Returns a toggleable presentation of a debug stack.
-   *
-   * @param  array $debugStack
-   *
-   * @return string
-   */
-  public function getToggleableDebugStack($debugStack)
-  {
-    static $i = 1;
-
-    if (!$debugStack)
+    protected $webDebug;
+    protected $status = sfLogger::INFO;
+
+    /**
+     * Constructor.
+     *
+     * @param sfWebDebug $webDebug The web debug toolbar instance
+     */
+    public function __construct(sfWebDebug $webDebug)
     {
-      return '';
+        $this->webDebug = $webDebug;
     }
 
-    $element = get_class($this).'Debug'.$i++;
-    $keys = array_reverse(array_keys($debugStack));
-
-    $html  = $this->getToggler($element, 'Toggle debug stack');
-    $html .= '<div class="sfWebDebugDebugInfo" id="'.$element.'" style="display:none">';
-    foreach ($debugStack as $j => $trace)
+    /**
+     * Gets the link URL for the link.
+     *
+     * @return string The URL link
+     */
+    public function getTitleUrl()
     {
-      $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);
-
-      $html .= sprintf('<span%s>#%s &raquo; ', $isProjectFile ? ' class="sfWebDebugHighlight"' : '', $keys[$j] + 1);
-
-      if (isset($trace['function']))
-      {
-        $html .= sprintf('in <span class="sfWebDebugLogInfo">%s%s%s()</span> ',
-          isset($trace['class']) ? $trace['class'] : '',
-          isset($trace['type']) ? $trace['type'] : '',
-          $trace['function']
-        );
-      }
+    }
 
-      $html .= sprintf('from %s line %s', $this->formatFileLink($file, $line), $line);
-      $html .= '</span><br/>';
+    /**
+     * Gets the text for the link.
+     *
+     * @return string The link text
+     */
+    abstract public function getTitle();
+
+    /**
+     * Gets the title of the panel.
+     *
+     * @return string The panel title
+     */
+    abstract public function getPanelTitle();
+
+    /**
+     * Gets the panel HTML content.
+     *
+     * @return string The panel HTML content
+     */
+    abstract public function getPanelContent();
+
+    /**
+     * Returns the current status.
+     *
+     * @return int A {@link sfLogger} priority constant
+     */
+    public function getStatus()
+    {
+        return $this->status;
     }
-    $html .= "</div>\n";
-
-    return $html;
-  }
-
-  /**
-   * Formats a file link.
-   *
-   * @param  string  $file A file path or class name
-   * @param  integer $line
-   * @param  string  $text Text to use for the link
-   *
-   * @return string
-   */
-  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))
+
+    /**
+     * Sets the current panel's status.
+     *
+     * @param int $status A {@link sfLogger} priority constant
+     */
+    public function setStatus($status)
     {
-      if (null === $text)
-      {
-        $text = $file;
-      }
-
-      // translate class to file name
-      $r = new ReflectionClass($file);
-      $file = $r->getFileName();
+        $this->status = $status;
     }
 
-    $shortFile = sfDebug::shortenFilePath($file);
+    /**
+     * Returns a toggler element.
+     *
+     * @param string $element The value of an element's DOM id attribute
+     * @param string $title   A title attribute
+     *
+     * @return string
+     */
+    public function getToggler($element, $title = 'Toggle details')
+    {
+        return '<a href="#" onclick="sfWebDebugToggle(\''.$element.'\'); return false;" title="'.$title.'"><img src="'.$this->webDebug->getOption('image_root_path').'/toggle.gif" alt="'.$title.'"/></a>';
+    }
 
-    if ($linkFormat = sfConfig::get('sf_file_link_format', ini_get('xdebug.file_link_format')))
+    /**
+     * Returns a toggleable presentation of a debug stack.
+     *
+     * @param array $debugStack
+     *
+     * @return string
+     */
+    public function getToggleableDebugStack($debugStack)
     {
-      // 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')),
-        null === $text ? $shortFile : $text);
+        static $i = 1;
+
+        if (!$debugStack) {
+            return '';
+        }
+
+        $element = get_class($this).'Debug'.$i++;
+        $keys = array_reverse(array_keys($debugStack));
+
+        $html = $this->getToggler($element, 'Toggle debug stack');
+        $html .= '<div class="sfWebDebugDebugInfo" id="'.$element.'" style="display:none">';
+        foreach ($debugStack as $j => $trace) {
+            $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);
+
+            $html .= sprintf('<span%s>#%s &raquo; ', $isProjectFile ? ' class="sfWebDebugHighlight"' : '', $keys[$j] + 1);
+
+            if (isset($trace['function'])) {
+                $html .= sprintf(
+                    'in <span class="sfWebDebugLogInfo">%s%s%s()</span> ',
+                    isset($trace['class']) ? $trace['class'] : '',
+                    isset($trace['type']) ? $trace['type'] : '',
+                    $trace['function']
+                );
+            }
+
+            $html .= sprintf('from %s line %s', $this->formatFileLink($file, $line), $line);
+            $html .= '</span><br/>';
+        }
+        $html .= "</div>\n";
+
+        return $html;
     }
-    else if (null === $text)
+
+    /**
+     * Formats a file link.
+     *
+     * @param string $file A file path or class name
+     * @param int    $line
+     * @param string $text Text to use for the link
+     *
+     * @return string
+     */
+    public function formatFileLink($file, $line = null, $text = null)
     {
-      // return the shortened file path
-      return $shortFile;
+        // this method is called a lot so we avoid calling class_exists()
+        if ($file && !sfToolkit::isPathAbsolute($file)) {
+            if (null === $text) {
+                $text = $file;
+            }
+
+            // translate class to file name
+            $r = new ReflectionClass($file);
+            $file = $r->getFileName();
+        }
+
+        $shortFile = sfDebug::shortenFilePath($file);
+
+        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')),
+                null === $text ? $shortFile : $text
+            );
+        }
+        if (null === $text) {
+            // return the shortened file path
+            return $shortFile;
+        }
+
+        // return the provided text with the shortened file path as a tooltip
+        return sprintf('<span title="%s">%s</span>', $shortFile, $text);
     }
-    else
+
+    /**
+     * Format a SQL string with some colors on SQL keywords to make it more readable.
+     *
+     * @param string $sql SQL string to format
+     *
+     * @return string $newSql The new formatted SQL string
+     */
+    public function formatSql($sql)
     {
-      // return the provided text with the shortened file path as a tooltip
-      return sprintf('<span title="%s">%s</span>', $shortFile, $text);
+        return preg_replace('/\b(UPDATE|SET|SELECT|FROM|AS|LIMIT|ASC|COUNT|DESC|WHERE|LEFT JOIN|INNER JOIN|RIGHT JOIN|ORDER BY|GROUP BY|IN|LIKE|DISTINCT|DELETE|INSERT|INTO|VALUES)\b/', '<span class="sfWebDebugLogInfo">\\1</span>', $sql);
     }
-  }
-
-  /**
-   * Format a SQL string with some colors on SQL keywords to make it more readable.
-   *
-   * @param  string $sql    SQL string to format
-   *
-   * @return string $newSql The new formatted SQL string
-   */
-  public function formatSql($sql)
-  {
-    return preg_replace('/\b(UPDATE|SET|SELECT|FROM|AS|LIMIT|ASC|COUNT|DESC|WHERE|LEFT JOIN|INNER JOIN|RIGHT JOIN|ORDER BY|GROUP BY|IN|LIKE|DISTINCT|DELETE|INSERT|INTO|VALUES)\b/', '<span class="sfWebDebugLogInfo">\\1</span>', $sql);
-  }
 }
diff --git a/lib/debug/sfWebDebugPanelCache.class.php b/lib/debug/sfWebDebugPanelCache.class.php
index dce7f206d..ba8fb9805 100644
--- a/lib/debug/sfWebDebugPanelCache.class.php
+++ b/lib/debug/sfWebDebugPanelCache.class.php
@@ -12,38 +12,34 @@
  * sfWebDebugPanelCache adds a panel to the web debug toolbar with a link to ignore the cache
  * on the next request.
  *
- * @package    symfony
- * @subpackage debug
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfWebDebugPanelCache extends sfWebDebugPanel
 {
-  public function getTitle()
-  {
-    return '<img src="'.$this->webDebug->getOption('image_root_path').'/reload.png" alt="Reload" />';
-  }
-
-  public function getTitleUrl()
-  {
-    $queryString = parse_url($_SERVER['REQUEST_URI'], PHP_URL_QUERY);
-
-    if (false === strpos($queryString, '_sf_ignore_cache'))
+    public function getTitle()
     {
-      return sprintf('?%s_sf_ignore_cache=1', $queryString ? $queryString.'&' : '');
+        return '<img src="'.$this->webDebug->getOption('image_root_path').'/reload.png" alt="Reload" />';
     }
-    else
+
+    public function getTitleUrl()
     {
-      return '?'.$queryString;
+        $queryString = parse_url($_SERVER['REQUEST_URI'], PHP_URL_QUERY);
+
+        if (false === strpos($queryString, '_sf_ignore_cache')) {
+            return sprintf('?%s_sf_ignore_cache=1', $queryString ? $queryString.'&' : '');
+        }
+
+        return '?'.$queryString;
     }
-  }
 
-  public function getPanelTitle()
-  {
-    return 'reload and ignore cache';
-  }
+    public function getPanelTitle()
+    {
+        return 'reload and ignore cache';
+    }
 
-  public function getPanelContent()
-  {
-  }
+    public function getPanelContent()
+    {
+    }
 }
diff --git a/lib/debug/sfWebDebugPanelConfig.class.php b/lib/debug/sfWebDebugPanelConfig.class.php
index 5e212203b..c0bee63e4 100644
--- a/lib/debug/sfWebDebugPanelConfig.class.php
+++ b/lib/debug/sfWebDebugPanelConfig.class.php
@@ -11,71 +11,69 @@
 /**
  * sfWebDebugPanelConfig adds a panel to the web debug toolbar with the current configuration.
  *
- * @package    symfony
- * @subpackage debug
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfWebDebugPanelConfig extends sfWebDebugPanel
 {
-  public function getTitle()
-  {
-    return '<img src="'.$this->webDebug->getOption('image_root_path').'/config.png" alt="Config" /> config';
-  }
-
-  public function getPanelTitle()
-  {
-    return 'Configuration';
-  }
-
-  public function getPanelContent()
-  {
-    $config = array(
-      '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',
-      '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',
-    );
+    public function getTitle()
+    {
+        return '<img src="'.$this->webDebug->getOption('image_root_path').'/config.png" alt="Config" /> config';
+    }
 
-    $html = '<ul id="sfWebDebugConfigSummary">';
-    foreach ($config as $key => $value)
+    public function getPanelTitle()
     {
-      $html .= '<li class="is'.$value.($key == 'xcache' ? ' last' : '').'">'.$key.'</li>';
+        return 'Configuration';
     }
-    $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());
+    public function getPanelContent()
+    {
+        $config = array(
+            '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',
+            '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',
+        );
 
-    return $html;
-  }
+        $html = '<ul id="sfWebDebugConfigSummary">';
+        foreach ($config as $key => $value) {
+            $html .= '<li class="is'.$value.('xcache' == $key ? ' last' : '').'">'.$key.'</li>';
+        }
+        $html .= '</ul>';
 
-  /**
-   * Converts an array to HTML.
-   *
-   * @param string $id     The identifier to use
-   * @param array  $values The array of values
-   *
-   * @return string An HTML string
-   */
-  protected function formatArrayAsHtml($id, $values)
-  {
-    $id = ucfirst(strtolower($id));
+        $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 '
+        return $html;
+    }
+
+    /**
+     * Converts an array to HTML.
+     *
+     * @param string $id     The identifier to use
+     * @param array  $values The array of values
+     *
+     * @return string An HTML string
+     */
+    protected function formatArrayAsHtml($id, $values)
+    {
+        $id = ucfirst(strtolower($id));
+
+        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>
     ';
-  }
+    }
 }
diff --git a/lib/debug/sfWebDebugPanelLogs.class.php b/lib/debug/sfWebDebugPanelLogs.class.php
index 805b89a5e..58802582c 100644
--- a/lib/debug/sfWebDebugPanelLogs.class.php
+++ b/lib/debug/sfWebDebugPanelLogs.class.php
@@ -11,65 +11,62 @@
 /**
  * sfWebDebugPanelLogs adds a panel to the web debug toolbar with log messages.
  *
- * @package    symfony
- * @subpackage debug
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfWebDebugPanelLogs extends sfWebDebugPanel
 {
-  public function getTitle()
-  {
-    return '<img src="'.$this->webDebug->getOption('image_root_path').'/log.png" alt="Log" /> logs';
-  }
-
-  public function getPanelTitle()
-  {
-    return 'Logs';
-  }
-
-  public function getPanelContent()
-  {
-    $event = $this->webDebug->getEventDispatcher()->filter(new sfEvent($this, 'debug.web.filter_logs'), $this->webDebug->getLogger()->getLogs());
-    $logs = $event->getReturnValue();
-
-    $html = '<table class="sfWebDebugLogs">
-      <tr>
-        <th>#</th>
-        <th>type</th>
-        <th>message</th>
-      </tr>'."\n";
-    $line_nb = 0;
-    foreach ($logs as $log)
+    public function getTitle()
     {
-      $priority = $this->webDebug->getPriority($log['priority']);
-
-      // increase status
-      if ($log['priority'] < $this->getStatus())
-      {
-        $this->setStatus($log['priority']);
-      }
-
-      ++$line_nb;
-      $html .= sprintf("<tr class='sfWebDebugLogLine sfWebDebug%s %s'><td class=\"sfWebDebugLogNumber\">%s</td><td class=\"sfWebDebugLogType\">%s&nbsp;%s</td><td>%s %s</td></tr>\n",
-        ucfirst($priority),
-        $log['type'],
-        $line_nb,
-        '<img src="'.$this->webDebug->getOption('image_root_path').'/'.$priority.'.png" alt="'.ucfirst($priority).'"/>',
-        class_exists($log['type'], false) ? $this->formatFileLink($log['type']) : $log['type'],
-        $this->formatLogLine($log['message']),
-        $this->getToggleableDebugStack($log['debug_backtrace'])
-      );
+        return '<img src="'.$this->webDebug->getOption('image_root_path').'/log.png" alt="Log" /> logs';
     }
-    $html .= '</table>';
 
-    $types = array();
-    foreach ($this->webDebug->getLogger()->getTypes() as $type)
+    public function getPanelTitle()
     {
-      $types[] = '<a href="#" onclick="sfWebDebugToggleMessages(\''.$type.'\'); return false;">'.$type.'</a>';
+        return 'Logs';
     }
 
-    return '
+    public function getPanelContent()
+    {
+        $event = $this->webDebug->getEventDispatcher()->filter(new sfEvent($this, 'debug.web.filter_logs'), $this->webDebug->getLogger()->getLogs());
+        $logs = $event->getReturnValue();
+
+        $html = '<table class="sfWebDebugLogs">
+      <tr>
+        <th>#</th>
+        <th>type</th>
+        <th>message</th>
+      </tr>'."\n";
+        $line_nb = 0;
+        foreach ($logs as $log) {
+            $priority = $this->webDebug->getPriority($log['priority']);
+
+            // increase status
+            if ($log['priority'] < $this->getStatus()) {
+                $this->setStatus($log['priority']);
+            }
+
+            ++$line_nb;
+            $html .= sprintf(
+                "<tr class='sfWebDebugLogLine sfWebDebug%s %s'><td class=\"sfWebDebugLogNumber\">%s</td><td class=\"sfWebDebugLogType\">%s&nbsp;%s</td><td>%s %s</td></tr>\n",
+                ucfirst($priority),
+                $log['type'],
+                $line_nb,
+                '<img src="'.$this->webDebug->getOption('image_root_path').'/'.$priority.'.png" alt="'.ucfirst($priority).'"/>',
+                class_exists($log['type'], false) ? $this->formatFileLink($log['type']) : $log['type'],
+                $this->formatLogLine($log['message']),
+                $this->getToggleableDebugStack($log['debug_backtrace'])
+            );
+        }
+        $html .= '</table>';
+
+        $types = array();
+        foreach ($this->webDebug->getLogger()->getTypes() as $type) {
+            $types[] = '<a href="#" onclick="sfWebDebugToggleMessages(\''.$type.'\'); return false;">'.$type.'</a>';
+        }
+
+        return '
       <ul id="sfWebDebugLogMenu">
         <li><a href="#" onclick="sfWebDebugToggleAllLogLines(true, \'sfWebDebugLogLine\'); return false;">[all]</a></li>
         <li><a href="#" onclick="sfWebDebugToggleAllLogLines(false, \'sfWebDebugLogLine\'); return false;">[none]</a></li>
@@ -80,46 +77,43 @@ class_exists($log['type'], false) ? $this->formatFileLink($log['type']) : $log['
       </ul>
       <div id="sfWebDebugLogLines">'.$html.'</div>
     ';
-  }
-
-  /**
-   * Formats a log line.
-   *
-   * @param string $logLine The log line to format
-   *
-   * @return string The formatted log lin
-   */
-  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;
-      }
     }
 
-    // escape HTML
-    $logLine = htmlspecialchars($logLine, ENT_QUOTES, sfConfig::get('sf_charset'));
+    /**
+     * Formats a log line.
+     *
+     * @param string $logLine The log line to format
+     *
+     * @return string The formatted log lin
+     */
+    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;
+            }
+        }
 
-    // replace constants value with constant name
-    $logLine = str_replace(array_keys($constants), array_values($constants), $logLine);
+        // escape HTML
+        $logLine = htmlspecialchars($logLine, ENT_QUOTES, sfConfig::get('sf_charset'));
 
-    $logLine = sfToolkit::pregtr($logLine, array('/&quot;(.+?)&quot;/s' => '"<span class="sfWebDebugLogInfo">\\1</span>"',
-                                                   '/^(.+?)\(\)\:/S'      => '<span class="sfWebDebugLogInfo">\\1()</span>:',
-                                                   '/line (\d+)$/'        => 'line <span class="sfWebDebugLogInfo">\\1</span>'));
+        // replace constants value with constant name
+        $logLine = str_replace(array_keys($constants), array_values($constants), $logLine);
 
-    // special formatting for SQL lines
-    $logLine = $this->formatSql($logLine);
+        $logLine = sfToolkit::pregtr($logLine, array('/&quot;(.+?)&quot;/s' => '"<span class="sfWebDebugLogInfo">\\1</span>"',
+            '/^(.+?)\(\)\:/S' => '<span class="sfWebDebugLogInfo">\\1()</span>:',
+            '/line (\d+)$/' => 'line <span class="sfWebDebugLogInfo">\\1</span>'));
 
-    // remove username/password from DSN
-    if (strpos($logLine, 'DSN') !== false)
-    {
-      $logLine = preg_replace("/=&gt;\s+'?[^'\s,]+'?/", "=&gt; '****'", $logLine);
-    }
+        // special formatting for SQL lines
+        $logLine = $this->formatSql($logLine);
 
-    return $logLine;
-  }
+        // remove username/password from DSN
+        if (false !== strpos($logLine, 'DSN')) {
+            $logLine = preg_replace("/=&gt;\\s+'?[^'\\s,]+'?/", "=&gt; '****'", $logLine);
+        }
+
+        return $logLine;
+    }
 }
diff --git a/lib/debug/sfWebDebugPanelMailer.class.php b/lib/debug/sfWebDebugPanelMailer.class.php
index 6b4ce3e7f..ab31b24be 100644
--- a/lib/debug/sfWebDebugPanelMailer.class.php
+++ b/lib/debug/sfWebDebugPanelMailer.class.php
@@ -11,96 +11,89 @@
 /**
  * sfWebDebugPanelMailer adds a panel to the web debug toolbar with sent emails.
  *
- * @package    symfony
- * @subpackage debug
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfWebDebugPanelMailer extends sfWebDebugPanel
 {
-  /** @var sfMailer */
-  protected $mailer = null;
-
-  /**
-   * Constructor.
-   *
-   * @param sfWebDebug $webDebug The web debug toolbar instance
-   */
-  public function __construct(sfWebDebug $webDebug)
-  {
-    parent::__construct($webDebug);
-
-    $this->webDebug->getEventDispatcher()->connect('mailer.configure', array($this, 'listenForMailerConfigure'));
-  }
-
-  public function getTitle()
-  {
-    if ($this->mailer && ($logger = $this->mailer->getLogger()) && $logger->countMessages())
+    /** @var sfMailer */
+    protected $mailer;
+
+    /**
+     * Constructor.
+     *
+     * @param sfWebDebug $webDebug The web debug toolbar instance
+     */
+    public function __construct(sfWebDebug $webDebug)
     {
-      return '<img src="'.$this->webDebug->getOption('image_root_path').'/email.png" alt="Emailer" /> '.$logger->countMessages();
-    }
-  }
+        parent::__construct($webDebug);
 
-  public function getPanelTitle()
-  {
-    return 'Emails';
-  }
+        $this->webDebug->getEventDispatcher()->connect('mailer.configure', array($this, 'listenForMailerConfigure'));
+    }
 
-  public function getPanelContent()
-  {
-    $logger = $this->mailer->getLogger();
+    public function getTitle()
+    {
+        if ($this->mailer && ($logger = $this->mailer->getLogger()) && $logger->countMessages()) {
+            return '<img src="'.$this->webDebug->getOption('image_root_path').'/email.png" alt="Emailer" /> '.$logger->countMessages();
+        }
+    }
 
-    if (!$logger || !$messages = $logger->getMessages())
+    public function getPanelTitle()
     {
-      return false;
+        return 'Emails';
     }
 
-    $html = array();
+    public function getPanelContent()
+    {
+        $logger = $this->mailer->getLogger();
+
+        if (!$logger || !$messages = $logger->getMessages()) {
+            return false;
+        }
 
-    // configuration information
-    $strategy = $this->mailer->getDeliveryStrategy();
-    $html[] = '<h2>Configuration</h2>';
-    $html[] = '<em>Delivery strategy</em>: '.$strategy;
+        $html = array();
 
-    if (sfMailer::SINGLE_ADDRESS == $strategy)
-    {
-      $html[] = ' - <em>all emails are delivered to</em>: '.$this->mailer->getDeliveryAddress();
+        // configuration information
+        $strategy = $this->mailer->getDeliveryStrategy();
+        $html[] = '<h2>Configuration</h2>';
+        $html[] = '<em>Delivery strategy</em>: '.$strategy;
+
+        if (sfMailer::SINGLE_ADDRESS == $strategy) {
+            $html[] = ' - <em>all emails are delivered to</em>: '.$this->mailer->getDeliveryAddress();
+        }
+
+        // email sent
+        $html[] = '<h2>Email sent</h2>';
+        foreach ($messages as $message) {
+            $html[] = $this->renderMessageInformation($message);
+        }
+
+        return implode("\n", $html);
     }
 
-    // email sent
-    $html[] = '<h2>Email sent</h2>';
-    foreach ($messages as $message)
+    /**
+     * Listens for the mailer.configure event and captures a reference to the mailer.
+     */
+    public function listenForMailerConfigure(sfEvent $event)
     {
-      $html[] = $this->renderMessageInformation($message);
+        $this->mailer = $event->getSubject();
     }
 
-    return implode("\n", $html);
-  }
-
-  protected function renderMessageInformation(Swift_Message $message)
-  {
-    static $i = 0;
-
-    $i++;
+    protected function renderMessageInformation(Swift_Message $message)
+    {
+        static $i = 0;
 
-    $to = null === $message->getTo() ? '' : implode(', ', array_keys($message->getTo()));
+        ++$i;
 
-    $html = array();
-    $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>';
-    $html[] = '</div>';
+        $to = null === $message->getTo() ? '' : implode(', ', array_keys($message->getTo()));
 
-    return implode("\n", $html);
-  }
+        $html = array();
+        $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>';
+        $html[] = '</div>';
 
-  /**
-   * Listens for the mailer.configure event and captures a reference to the mailer.
-   *
-   * @param sfEvent $event
-   */
-  public function listenForMailerConfigure(sfEvent $event)
-  {
-    $this->mailer = $event->getSubject();
-  }
+        return implode("\n", $html);
+    }
 }
diff --git a/lib/debug/sfWebDebugPanelMemory.class.php b/lib/debug/sfWebDebugPanelMemory.class.php
index 2a37073ab..dc1ffe2b9 100644
--- a/lib/debug/sfWebDebugPanelMemory.class.php
+++ b/lib/debug/sfWebDebugPanelMemory.class.php
@@ -11,25 +11,24 @@
 /**
  * sfWebDebugPanelMemory adds a panel to the web debug toolbar with the memory used by the script.
  *
- * @package    symfony
- * @subpackage debug
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfWebDebugPanelMemory extends sfWebDebugPanel
 {
-  public function getTitle()
-  {
-    $totalMemory = sprintf('%.1f', memory_get_peak_usage(true) / 1024);
+    public function getTitle()
+    {
+        $totalMemory = sprintf('%.1f', memory_get_peak_usage(true) / 1024);
 
-    return '<img src="'.$this->webDebug->getOption('image_root_path').'/memory.png" alt="Memory" /> '.$totalMemory.' KB';
-  }
+        return '<img src="'.$this->webDebug->getOption('image_root_path').'/memory.png" alt="Memory" /> '.$totalMemory.' KB';
+    }
 
-  public function getPanelTitle()
-  {
-  }
+    public function getPanelTitle()
+    {
+    }
 
-  public function getPanelContent()
-  {
-  }
+    public function getPanelContent()
+    {
+    }
 }
diff --git a/lib/debug/sfWebDebugPanelSymfonyVersion.class.php b/lib/debug/sfWebDebugPanelSymfonyVersion.class.php
index 02b9ad1d5..e97bbd8ee 100644
--- a/lib/debug/sfWebDebugPanelSymfonyVersion.class.php
+++ b/lib/debug/sfWebDebugPanelSymfonyVersion.class.php
@@ -11,23 +11,22 @@
 /**
  * sfWebDebugPanelSymfonyVersion adds a panel to the web debug toolbar with the symfony version.
  *
- * @package    symfony
- * @subpackage debug
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfWebDebugPanelSymfonyVersion extends sfWebDebugPanel
 {
-  public function getTitle()
-  {
-    return '<span id="sfWebDebugSymfonyVersion">'.SYMFONY_VERSION.'</span>';
-  }
+    public function getTitle()
+    {
+        return '<span id="sfWebDebugSymfonyVersion">'.SYMFONY_VERSION.'</span>';
+    }
 
-  public function getPanelTitle()
-  {
-  }
+    public function getPanelTitle()
+    {
+    }
 
-  public function getPanelContent()
-  {
-  }
+    public function getPanelContent()
+    {
+    }
 }
diff --git a/lib/debug/sfWebDebugPanelTimer.class.php b/lib/debug/sfWebDebugPanelTimer.class.php
index e9e039a59..dc932edc5 100644
--- a/lib/debug/sfWebDebugPanelTimer.class.php
+++ b/lib/debug/sfWebDebugPanelTimer.class.php
@@ -11,80 +11,74 @@
 /**
  * sfWebDebugPanelTimer adds a panel to the web debug toolbar with timer information.
  *
- * @package    symfony
- * @subpackage debug
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfWebDebugPanelTimer extends sfWebDebugPanel
 {
-  static protected
-    $startTime = null;
+    protected static $startTime;
 
-  /**
-   * Constructor.
-   *
-   * @param sfWebDebug $webDebug The web debug toolbar instance
-   */
-  public function __construct(sfWebDebug $webDebug)
-  {
-    parent::__construct($webDebug);
+    /**
+     * Constructor.
+     *
+     * @param sfWebDebug $webDebug The web debug toolbar instance
+     */
+    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', array($this, 'filterLogs'));
+    }
 
-  public function getTitle()
-  {
-    return '<img src="'.$this->webDebug->getOption('image_root_path').'/time.png" alt="Time" /> '.$this->getTotalTime().' ms';
-  }
+    public function getTitle()
+    {
+        return '<img src="'.$this->webDebug->getOption('image_root_path').'/time.png" alt="Time" /> '.$this->getTotalTime().' ms';
+    }
 
-  public function getPanelTitle()
-  {
-    return 'Timers';
-  }
+    public function getPanelTitle()
+    {
+        return 'Timers';
+    }
 
-  public function getPanelContent()
-  {
-    if (sfTimerManager::getTimers())
+    public function getPanelContent()
     {
-      $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)
-      {
-        $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>';
+        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) {
+                $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>';
 
-      return $panel;
+            return $panel;
+        }
     }
-  }
 
-  public function filterLogs(sfEvent $event, $logs)
-  {
-    $newLogs = array();
-    foreach ($logs as $log)
+    public function filterLogs(sfEvent $event, $logs)
     {
-      if ('sfWebDebugLogger' != $log['type'])
-      {
-        $newLogs[] = $log;
-      }
-    }
+        $newLogs = array();
+        foreach ($logs as $log) {
+            if ('sfWebDebugLogger' != $log['type']) {
+                $newLogs[] = $log;
+            }
+        }
 
-    return $newLogs;
-  }
+        return $newLogs;
+    }
 
-  static public function startTime()
-  {
-    self::$startTime = microtime(true);
-  }
+    public static function startTime()
+    {
+        self::$startTime = microtime(true);
+    }
 
-  static public function isStarted()
-  {
-    return null !== self::$startTime;
-  }
+    public static function isStarted()
+    {
+        return null !== self::$startTime;
+    }
 
-  protected function getTotalTime()
-  {
-    return null !== self::$startTime ? sprintf('%.0f', (microtime(true) - self::$startTime) * 1000) : 0;
-  }
+    protected function getTotalTime()
+    {
+        return null !== self::$startTime ? sprintf('%.0f', (microtime(true) - self::$startTime) * 1000) : 0;
+    }
 }
diff --git a/lib/debug/sfWebDebugPanelView.class.php b/lib/debug/sfWebDebugPanelView.class.php
index bab2b3712..3ff51c3a6 100644
--- a/lib/debug/sfWebDebugPanelView.class.php
+++ b/lib/debug/sfWebDebugPanelView.class.php
@@ -11,356 +11,321 @@
 /**
  * sfWebDebugPanelView adds a panel to the web debug toolbar with information about the view layer.
  *
- * @package     symfony
- * @subpackage  debug
  * @author      Kris Wallsmith <kris.wallsmith@symfony-project.com>
+ *
  * @version     SVN: $Id$
  */
 class sfWebDebugPanelView extends sfWebDebugPanel
 {
-  protected
-    $actions  = array(),
-    $partials = array();
-
-  /**
-   * Constructor.
-   *
-   * @param sfWebDebug $webDebug The web debug toolbar instance
-   */
-  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'));
-  }
-
-  /**
-   * Resets the parameter collections.
-   *
-   * @param sfEvent $event
-   */
-  public function listenForChangeAction(sfEvent $event)
-  {
-    $this->actions  = array();
-    $this->partials = array();
-  }
-
-  /**
-   * Stacks action and partial parameters in the template.filter_parameters event.
-   *
-   * @param  sfEvent $event
-   * @param  array   $parameters
-   *
-   * @return array
-   */
-  public function filterTemplateParameters(sfEvent $event, $parameters)
-  {
-    $entry = array('parameters' => $parameters);
-
-    if ('action' == $parameters['sf_type'] && $file = $this->getLastTemplate())
-    {
-      $this->actions[] = $entry + array('file' => $file);
-    }
-    else if ('partial' == $parameters['sf_type'] && $file = $this->getLastTemplate('sfPartialView'))
+    protected $actions = array();
+    protected $partials = array();
+
+    /**
+     * Constructor.
+     *
+     * @param sfWebDebug $webDebug The web debug toolbar instance
+     */
+    public function __construct(sfWebDebug $webDebug)
     {
-      $this->partials[] = $entry + array('file' => $file);
+        parent::__construct($webDebug);
+
+        $this->webDebug->getEventDispatcher()->connect('controller.change_action', array($this, 'listenForChangeAction'));
+        $this->webDebug->getEventDispatcher()->connect('template.filter_parameters', array($this, 'filterTemplateParameters'));
     }
 
-    return $parameters;
-  }
-
-  /**
-   * Returns the path to the last template rendered.
-   *
-   * @param  string $class Name of the rendering view class
-   *
-   * @return string|null
-   */
-  protected function getLastTemplate($class = 'sfPHPView')
-  {
-    foreach (array_reverse($this->webDebug->getLogger()->getLogs()) as $log)
+    /**
+     * Resets the parameter collections.
+     */
+    public function listenForChangeAction(sfEvent $event)
     {
-      if (
-        ($class == $log['type'] || (class_exists($log['type'], false) && is_subclass_of($log['type'], $class)))
-        &&
-        preg_match('/^Render "(.*)"$/', $log['message'], $match)
-      )
-      {
-        return $match[1];
-      }
+        $this->actions = array();
+        $this->partials = array();
     }
-  }
-
-  /**
-   * @see sfWebDebugPanel
-   */
-  public function getTitle()
-  {
-    if (count($this->actions) || count($this->partials))
+
+    /**
+     * Stacks action and partial parameters in the template.filter_parameters event.
+     *
+     * @param array $parameters
+     *
+     * @return array
+     */
+    public function filterTemplateParameters(sfEvent $event, $parameters)
     {
-      return '<img src="'.$this->webDebug->getOption('image_root_path').'/view.png" alt="View Layer" /> view';
+        $entry = array('parameters' => $parameters);
+
+        if ('action' == $parameters['sf_type'] && $file = $this->getLastTemplate()) {
+            $this->actions[] = $entry + array('file' => $file);
+        } elseif ('partial' == $parameters['sf_type'] && $file = $this->getLastTemplate('sfPartialView')) {
+            $this->partials[] = $entry + array('file' => $file);
+        }
+
+        return $parameters;
     }
-  }
-
-  /**
-   * @see sfWebDebugPanel
-   */
-  public function getPanelTitle()
-  {
-    return 'View Layer';
-  }
-
-  /**
-   * @see sfWebDebugPanel
-   */
-  public function getPanelContent()
-  {
-    $html = array();
-
-    foreach ($this->actions as $action)
+
+    /**
+     * @see sfWebDebugPanel
+     */
+    public function getTitle()
     {
-      $html[] = $this->renderTemplateInformation($action['file'], $action['parameters']);
+        if (count($this->actions) || count($this->partials)) {
+            return '<img src="'.$this->webDebug->getOption('image_root_path').'/view.png" alt="View Layer" /> view';
+        }
     }
 
-    foreach ($this->partials as $partial)
+    /**
+     * @see sfWebDebugPanel
+     */
+    public function getPanelTitle()
     {
-      $html[] = $this->renderTemplateInformation($partial['file'], $partial['parameters'], 'Partial');
+        return 'View Layer';
     }
 
-    return implode("\n", $html);
-  }
-
-  /**
-   * Renders information about the passed template and its parameters.
-   *
-   * The rendered HTML for each parameter is filtered through the "debug.web.view.filter_parameter_html" event.
-   *
-   * @param  string $file       The template file path
-   * @param  array  $parameters
-   * @param  string $label
-   *
-   * @return string
-   */
-  protected function renderTemplateInformation($file, $parameters, $label = 'Template')
-  {
-    static $i = 0;
-
-    $parameters = $this->filterCoreParameters($parameters);
-    $i++;
-
-    $html = array();
-    $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))
+    /**
+     * @see sfWebDebugPanel
+     */
+    public function getPanelContent()
     {
-      $html[] = '<p>Parameters:</p>';
-      $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[] = '</ul>';
+        $html = array();
+
+        foreach ($this->actions as $action) {
+            $html[] = $this->renderTemplateInformation($action['file'], $action['parameters']);
+        }
+
+        foreach ($this->partials as $partial) {
+            $html[] = $this->renderTemplateInformation($partial['file'], $partial['parameters'], 'Partial');
+        }
+
+        return implode("\n", $html);
     }
-    else
+
+    /**
+     * Returns the path to the last template rendered.
+     *
+     * @param string $class Name of the rendering view class
+     *
+     * @return string|null
+     */
+    protected function getLastTemplate($class = 'sfPHPView')
     {
-      $html[] = '<p>No parameters were passed to this template.</p>';
+        foreach (array_reverse($this->webDebug->getLogger()->getLogs()) as $log) {
+            if (
+                ($class == $log['type'] || (class_exists($log['type'], false) && is_subclass_of($log['type'], $class)))
+                && preg_match('/^Render "(.*)"$/', $log['message'], $match)
+            ) {
+                return $match[1];
+            }
+        }
     }
-    $html[] = '</div>';
-
-    return implode("\n", $html);
-  }
-
-  /**
-   * Formats information about a parameter as HTML.
-   *
-   * @param  string $name
-   * @param  mixed  $parameter
-   *
-   * @return string
-   */
-  protected function formatParameterAsHtml($name, $parameter)
-  {
-    if (!method_exists($this, $method = 'format'.ucwords(gettype($parameter)).'AsHtml'))
+
+    /**
+     * Renders information about the passed template and its parameters.
+     *
+     * The rendered HTML for each parameter is filtered through the "debug.web.view.filter_parameter_html" event.
+     *
+     * @param string $file       The template file path
+     * @param array  $parameters
+     * @param string $label
+     *
+     * @return string
+     */
+    protected function renderTemplateInformation($file, $parameters, $label = 'Template')
     {
-      $method = 'getParameterDescription';
+        static $i = 0;
+
+        $parameters = $this->filterCoreParameters($parameters);
+        ++$i;
+
+        $html = array();
+        $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)) {
+            $html[] = '<p>Parameters:</p>';
+            $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[] = '</ul>';
+        } else {
+            $html[] = '<p>No parameters were passed to this template.</p>';
+        }
+        $html[] = '</div>';
+
+        return implode("\n", $html);
     }
 
-    return $this->$method($name, $parameter);
-  }
-
-  /**
-   * Formats object information as HTML.
-   *
-   * @param  string $name
-   * @param  object $parameter
-   *
-   * @return string
-   */
-  protected function formatObjectAsHtml($name, $parameter)
-  {
-    if ($parameter instanceof sfForm)
+    /**
+     * Formats information about a parameter as HTML.
+     *
+     * @param string $name
+     * @param mixed  $parameter
+     *
+     * @return string
+     */
+    protected function formatParameterAsHtml($name, $parameter)
     {
-      return $this->formatFormAsHtml($name, $parameter);
+        if (!method_exists($this, $method = 'format'.ucwords(gettype($parameter)).'AsHtml')) {
+            $method = 'getParameterDescription';
+        }
+
+        return $this->{$method}($name, $parameter);
     }
-    else
+
+    /**
+     * Formats object information as HTML.
+     *
+     * @param string $name
+     * @param object $parameter
+     *
+     * @return string
+     */
+    protected function formatObjectAsHtml($name, $parameter)
     {
-      return $this->getParameterDescription($name, $parameter);
+        if ($parameter instanceof sfForm) {
+            return $this->formatFormAsHtml($name, $parameter);
+        }
+
+        return $this->getParameterDescription($name, $parameter);
     }
-  }
-
-  /**
-   * Formats form information as HTML.
-   *
-   * @param  string $name
-   * @param  sfForm $form
-   *
-   * @return string
-   */
-  protected function formatFormAsHtml($name, sfForm $form)
-  {
-    static $i = 0;
-
-    $i++;
-
-    if ($form->hasErrors() && sfLogger::NOTICE < $this->getStatus())
+
+    /**
+     * Formats form information as HTML.
+     *
+     * @param string $name
+     *
+     * @return string
+     */
+    protected function formatFormAsHtml($name, sfForm $form)
     {
-      $this->setStatus(sfLogger::NOTICE);
-    }
+        static $i = 0;
 
-    $html = array();
-    $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">';
+        ++$i;
 
-    foreach ($form->getGlobalErrors() as $error)
-    {
-      $html[] = sprintf('<p><span class="sfWebDebugWarning">%s</span></p>', $error);
-    }
+        if ($form->hasErrors() && sfLogger::NOTICE < $this->getStatus()) {
+            $this->setStatus(sfLogger::NOTICE);
+        }
 
-    $html[] = '<ul>'.$this->formatFormFieldSchemaAsHtml($form->getFormFieldSchema(), $name.'[%s]').'</ul>';
-    $html[] = '</div>';
-
-    return implode("\n", $html);
-  }
-
-  /**
-   * Formats form field schema information as HTML.
-   *
-   * @param  sfFormFieldSchema $fieldSchema
-   * @param  string            $nameFormat
-   *
-   * @return string
-   */
-  protected function formatFormFieldSchemaAsHtml(sfFormFieldSchema $fieldSchema, $nameFormat = '%s')
-  {
-    $html = array();
-
-    foreach ($fieldSchema as $field)
-    {
-      $name = sprintf($nameFormat, $this->varExport($field->getName()));
-      if ($field instanceof sfFormFieldSchema)
-      {
-        $html[] = $this->formatFormFieldSchemaAsHtml($field, $name.'[%s]');
-      }
-      else
-      {
-        $html[] = '<li>';
-        $html[] = $this->getParameterDescription($name, $field->getWidget());
-
-        if ($field->hasError())
-        {
-          $html[] = sprintf('<p><span class="sfWebDebugWarning">%s</span></p>', $field->getError());
+        $html = array();
+        $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">';
+
+        foreach ($form->getGlobalErrors() as $error) {
+            $html[] = sprintf('<p><span class="sfWebDebugWarning">%s</span></p>', $error);
         }
 
-        $html[] = '</li>';
-      }
+        $html[] = '<ul>'.$this->formatFormFieldSchemaAsHtml($form->getFormFieldSchema(), $name.'[%s]').'</ul>';
+        $html[] = '</div>';
+
+        return implode("\n", $html);
     }
 
-    return implode("\n", $html);
-  }
-
-  /**
-   * Formats information about a parameter as HTML.
-   *
-   * @param  string $name
-   * @param  mixed  $parameter
-   *
-   * @return string
-   */
-  protected function getParameterDescription($name, $parameter, $nameFormat = null, $typeFormat = null)
-  {
-    if (null === $nameFormat)
+    /**
+     * Formats form field schema information as HTML.
+     *
+     * @param string $nameFormat
+     *
+     * @return string
+     */
+    protected function formatFormFieldSchemaAsHtml(sfFormFieldSchema $fieldSchema, $nameFormat = '%s')
     {
-      $nameFormat = '<code>$%s</code>';
+        $html = array();
+
+        foreach ($fieldSchema as $field) {
+            $name = sprintf($nameFormat, $this->varExport($field->getName()));
+            if ($field instanceof sfFormFieldSchema) {
+                $html[] = $this->formatFormFieldSchemaAsHtml($field, $name.'[%s]');
+            } else {
+                $html[] = '<li>';
+                $html[] = $this->getParameterDescription($name, $field->getWidget());
+
+                if ($field->hasError()) {
+                    $html[] = sprintf('<p><span class="sfWebDebugWarning">%s</span></p>', $field->getError());
+                }
+
+                $html[] = '</li>';
+            }
+        }
+
+        return implode("\n", $html);
     }
 
-    if (null === $typeFormat)
+    /**
+     * Formats information about a parameter as HTML.
+     *
+     * @param string     $name
+     * @param mixed      $parameter
+     * @param mixed|null $nameFormat
+     * @param mixed|null $typeFormat
+     *
+     * @return string
+     */
+    protected function getParameterDescription($name, $parameter, $nameFormat = null, $typeFormat = null)
     {
-      $typeFormat = '<span class="sfWebDebugDataType">(%s)</span>';
+        if (null === $nameFormat) {
+            $nameFormat = '<code>$%s</code>';
+        }
+
+        if (null === $typeFormat) {
+            $typeFormat = '<span class="sfWebDebugDataType">(%s)</span>';
+        }
+
+        return sprintf($nameFormat.' '.$typeFormat, $name, is_object($parameter) ? $this->formatFileLink(get_class($parameter)) : gettype($parameter));
     }
 
-    return sprintf($nameFormat.' '.$typeFormat, $name, is_object($parameter) ? $this->formatFileLink(get_class($parameter)) : gettype($parameter));
-  }
-
-  /**
-   * Shortens an action's template path.
-   *
-   * @param  string $path
-   *
-   * @return string
-   */
-  protected function shortenTemplatePath($path)
-  {
-    $path = realpath($path);
-
-    // application module
-    $sep = preg_quote(DIRECTORY_SEPARATOR);
-    if (preg_match('#modules'.$sep.'(\w+)'.$sep.'templates'.$sep.'(.*)$#', $path, $match))
+    /**
+     * Shortens an action's template path.
+     *
+     * @param string $path
+     *
+     * @return string
+     */
+    protected function shortenTemplatePath($path)
     {
-      return $match[1].'&nbsp;&hellip;&nbsp;'.$match[2];
+        $path = realpath($path);
+
+        // application module
+        $sep = preg_quote(DIRECTORY_SEPARATOR);
+        if (preg_match('#modules'.$sep.'(\w+)'.$sep.'templates'.$sep.'(.*)$#', $path, $match)) {
+            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));
-  }
-
-  /**
-   * Removes parameters prefixed with "sf_" from the array.
-   *
-   * @param  array $parameters
-   *
-   * @return array
-   */
-  protected function filterCoreParameters($parameters)
-  {
-    $filtered = array();
-
-    foreach ($parameters as $name => $value)
+    /**
+     * Removes parameters prefixed with "sf_" from the array.
+     *
+     * @param array $parameters
+     *
+     * @return array
+     */
+    protected function filterCoreParameters($parameters)
     {
-      if (0 !== strpos($name, 'sf_'))
-      {
-        $filtered[$name] = $value;
-      }
+        $filtered = array();
+
+        foreach ($parameters as $name => $value) {
+            if (0 !== strpos($name, 'sf_')) {
+                $filtered[$name] = $value;
+            }
+        }
+
+        return $filtered;
     }
 
-    return $filtered;
-  }
-
-  /**
-   * Returns a string representation of a value.
-   *
-   * @param  string $value
-   *
-   * @return string
-   */
-  protected function varExport($value)
-  {
-    if (is_numeric($value))
+    /**
+     * Returns a string representation of a value.
+     *
+     * @param string $value
+     *
+     * @return string
+     */
+    protected function varExport($value)
     {
-      $value = (integer) $value;
-    }
+        if (is_numeric($value)) {
+            $value = (int) $value;
+        }
 
-    return var_export($value, true);
-  }
+        return var_export($value, true);
+    }
 }
diff --git a/lib/escaper/sfOutputEscaper.class.php b/lib/escaper/sfOutputEscaper.class.php
index 6eeec7dcd..4ff181c4a 100644
--- a/lib/escaper/sfOutputEscaper.class.php
+++ b/lib/escaper/sfOutputEscaper.class.php
@@ -11,233 +11,214 @@
 /**
  * Abstract class that provides an interface for escaping of output.
  *
- * @package    symfony
- * @subpackage view
  * @author     Mike Squire <mike@somosis.co.uk>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfOutputEscaper
 {
-  /**
-   * The value that is to be escaped.
-   *
-   * @var mixed
-   */
-  protected $value;
-
-  /**
-   * The escaping method that is going to be applied to the value and its
-   * children. This is actually the name of a PHP callable.
-   *
-   * @var string
-   */
-  protected $escapingMethod;
-
-  static protected $safeClasses = array();
-
-  /**
-   * Constructor stores the escaping method and value.
-   *
-   * Since sfOutputEscaper is an abstract class, instances cannot be created
-   * directly but the constructor will be inherited by sub-classes.
-   *
-   * @param string $escapingMethod  Escaping method
-   * @param string $value           Escaping value
-   */
-  public function __construct($escapingMethod, $value)
-  {
-    $this->value          = $value;
-    $this->escapingMethod = $escapingMethod;
-  }
-
-  /**
-   * Decorates a PHP variable with something that will escape any data obtained
-   * from it.
-   *
-   * The following cases are dealt with:
-   *
-   *    - The value is null or false: null or false is returned.
-   *    - The value is scalar: the result of applying the escaping method is
-   *      returned.
-   *    - The value is an array or an object that implements the ArrayAccess
-   *      interface: the array is decorated such that accesses to elements yield
-   *      an escaped value.
-   *    - The value implements the Traversable interface (either an Iterator, an
-   *      IteratorAggregate or an internal PHP class that implements
-   *      Traversable): decorated much like the array.
-   *    - The value is another type of object: decorated such that the result of
-   *      method calls is escaped.
-   *
-   * The escaping method is actually the name of a PHP callable. There are a set
-   * of standard escaping methods listed in the escaping helper
-   * (EscapingHelper.php).
-   *
-   * @param  string $escapingMethod  The escaping method (a PHP callable) to apply to the value
-   * @param  mixed  $value           The value to escape
-   *
-   * @return mixed Escaping value
-   *
-   * @throws InvalidArgumentException If the escaping fails
-   */
-  public static function escape($escapingMethod, $value)
-  {
-    if (null === $value)
+    /**
+     * The value that is to be escaped.
+     *
+     * @var mixed
+     */
+    protected $value;
+
+    /**
+     * The escaping method that is going to be applied to the value and its
+     * children. This is actually the name of a PHP callable.
+     *
+     * @var string
+     */
+    protected $escapingMethod;
+
+    protected static $safeClasses = array();
+
+    /**
+     * Constructor stores the escaping method and value.
+     *
+     * Since sfOutputEscaper is an abstract class, instances cannot be created
+     * directly but the constructor will be inherited by sub-classes.
+     *
+     * @param string $escapingMethod Escaping method
+     * @param string $value          Escaping value
+     */
+    public function __construct($escapingMethod, $value)
     {
-      return $value;
+        $this->value = $value;
+        $this->escapingMethod = $escapingMethod;
     }
 
-    // Scalars are anything other than arrays, objects and resources.
-    if (is_scalar($value))
+    /**
+     * Gets a value from the escaper.
+     *
+     * @param string $var Value to get
+     *
+     * @return mixed Value
+     */
+    public function __get($var)
     {
-      return call_user_func($escapingMethod, $value);
+        return $this->escape($this->escapingMethod, $this->value->{$var});
     }
 
-    if (is_array($value))
+    /**
+     * Decorates a PHP variable with something that will escape any data obtained
+     * from it.
+     *
+     * The following cases are dealt with:
+     *
+     *    - The value is null or false: null or false is returned.
+     *    - The value is scalar: the result of applying the escaping method is
+     *      returned.
+     *    - The value is an array or an object that implements the ArrayAccess
+     *      interface: the array is decorated such that accesses to elements yield
+     *      an escaped value.
+     *    - The value implements the Traversable interface (either an Iterator, an
+     *      IteratorAggregate or an internal PHP class that implements
+     *      Traversable): decorated much like the array.
+     *    - The value is another type of object: decorated such that the result of
+     *      method calls is escaped.
+     *
+     * The escaping method is actually the name of a PHP callable. There are a set
+     * of standard escaping methods listed in the escaping helper
+     * (EscapingHelper.php).
+     *
+     * @param string $escapingMethod The escaping method (a PHP callable) to apply to the value
+     * @param mixed  $value          The value to escape
+     *
+     * @return mixed Escaping value
+     *
+     * @throws InvalidArgumentException If the escaping fails
+     */
+    public static function escape($escapingMethod, $value)
     {
-      return new sfOutputEscaperArrayDecorator($escapingMethod, $value);
+        if (null === $value) {
+            return $value;
+        }
+
+        // Scalars are anything other than arrays, objects and resources.
+        if (is_scalar($value)) {
+            return call_user_func($escapingMethod, $value);
+        }
+
+        if (is_array($value)) {
+            return new sfOutputEscaperArrayDecorator($escapingMethod, $value);
+        }
+
+        if (is_object($value)) {
+            if ($value instanceof sfOutputEscaper) {
+                // avoid double decoration
+                $copy = clone $value;
+
+                $copy->escapingMethod = $escapingMethod;
+
+                return $copy;
+            }
+            if (self::isClassMarkedAsSafe(get_class($value))) {
+                // the class or one of its children is marked as safe
+                // return the unescaped object
+                return $value;
+            }
+            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);
+            }
+
+            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)));
     }
 
-    if (is_object($value))
+    /**
+     * Unescapes a value that has been escaped previously with the escape() method.
+     *
+     * @param mixed $value The value to unescape
+     *
+     * @return mixed Unescaped value
+     *
+     * @throws InvalidArgumentException If the escaping fails
+     */
+    public static function unescape($value)
     {
-      if ($value instanceof sfOutputEscaper)
-      {
-        // avoid double decoration
-        $copy = clone $value;
-
-        $copy->escapingMethod = $escapingMethod;
-
-        return $copy;
-      }
-      else if (self::isClassMarkedAsSafe(get_class($value)))
-      {
-        // the class or one of its children is marked as safe
-        // return the unescaped object
+        if (null === $value || is_bool($value)) {
+            return $value;
+        }
+
+        if (is_scalar($value)) {
+            return html_entity_decode($value, ENT_QUOTES, sfConfig::get('sf_charset'));
+        }
+        if (is_array($value)) {
+            foreach ($value as $name => $v) {
+                $value[$name] = self::unescape($v);
+            }
+
+            return $value;
+        }
+        if (is_object($value)) {
+            return $value instanceof sfOutputEscaper ? $value->getRawValue() : $value;
+        }
+
         return $value;
-      }
-      else if ($value instanceof sfOutputEscaperSafe)
-      {
-        // do not escape objects marked as safe
-        // return the original object
-        return $value->getValue();
-      }
-      else if ($value instanceof Traversable)
-      {
-        return new sfOutputEscaperIteratorDecorator($escapingMethod, $value);
-      }
-      else
-      {
-        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)));
-  }
-
-  /**
-   * Unescapes a value that has been escaped previously with the escape() method.
-   *
-   * @param  mixed $value The value to unescape
-   *
-   * @return mixed Unescaped value
-   *
-   * @throws InvalidArgumentException If the escaping fails
-   */
-  static public function unescape($value)
-  {
-    if (null === $value || is_bool($value))
+    /**
+     * Returns true if the class if marked as safe.
+     *
+     * @param string $class A class name
+     *
+     * @return bool true if the class if safe, false otherwise
+     */
+    public static function isClassMarkedAsSafe($class)
     {
-      return $value;
-    }
+        if (in_array($class, self::$safeClasses)) {
+            return true;
+        }
 
-    if (is_scalar($value))
-    {
-      return html_entity_decode($value, ENT_QUOTES, sfConfig::get('sf_charset'));
-    }
-    elseif (is_array($value))
-    {
-      foreach ($value as $name => $v)
-      {
-        $value[$name] = self::unescape($v);
-      }
+        foreach (self::$safeClasses as $safeClass) {
+            if (is_subclass_of($class, $safeClass)) {
+                return true;
+            }
+        }
 
-      return $value;
+        return false;
     }
-    elseif (is_object($value))
+
+    /**
+     * Marks an array of classes (and all its children) as being safe for output.
+     *
+     * @param array $classes An array of class names
+     */
+    public static function markClassesAsSafe(array $classes)
     {
-      return $value instanceof sfOutputEscaper ? $value->getRawValue() : $value;
+        self::$safeClasses = array_unique(array_merge(self::$safeClasses, $classes));
     }
 
-    return $value;
-  }
-
-  /**
-   * Returns true if the class if marked as safe.
-   *
-   * @param  string  $class  A class name
-   *
-   * @return bool true if the class if safe, false otherwise
-   */
-  static public function isClassMarkedAsSafe($class)
-  {
-    if (in_array($class, self::$safeClasses))
+    /**
+     * Marks a class (and all its children) as being safe for output.
+     *
+     * @param string $class A class name
+     */
+    public static function markClassAsSafe($class)
     {
-      return true;
+        self::markClassesAsSafe(array($class));
     }
 
-    foreach (self::$safeClasses as $safeClass)
+    /**
+     * Returns the raw value associated with this instance.
+     *
+     * Concrete instances of sfOutputEscaper classes decorate a value which is
+     * stored by the constructor. This returns that original, unescaped, value.
+     *
+     * @return mixed The original value used to construct the decorator
+     */
+    public function getRawValue()
     {
-      if (is_subclass_of($class, $safeClass))
-      {
-        return true;
-      }
+        return $this->value;
     }
-
-    return false;
-  }
-
-  /**
-   * Marks an array of classes (and all its children) as being safe for output.
-   *
-   * @param array $classes  An array of class names
-   */
-  static public function markClassesAsSafe(array $classes)
-  {
-    self::$safeClasses = array_unique(array_merge(self::$safeClasses, $classes));
-  }
-
-  /**
-   * Marks a class (and all its children) as being safe for output.
-   *
-   * @param string $class  A class name
-   */
-  static public function markClassAsSafe($class)
-  {
-    self::markClassesAsSafe(array($class));
-  }
-
-  /**
-   * Returns the raw value associated with this instance.
-   *
-   * Concrete instances of sfOutputEscaper classes decorate a value which is
-   * stored by the constructor. This returns that original, unescaped, value.
-   *
-   * @return mixed The original value used to construct the decorator
-   */
-  public function getRawValue()
-  {
-    return $this->value;
-  }
-
-  /**
-   * Gets a value from the escaper.
-   *
-   * @param  string $var  Value to get
-   *
-   * @return mixed Value
-   */
-  public function __get($var)
-  {
-    return $this->escape($this->escapingMethod, $this->value->$var);
-  }
 }
diff --git a/lib/escaper/sfOutputEscaperArrayDecorator.class.php b/lib/escaper/sfOutputEscaperArrayDecorator.class.php
index 5cc37aaf6..d4d483b98 100644
--- a/lib/escaper/sfOutputEscaperArrayDecorator.class.php
+++ b/lib/escaper/sfOutputEscaperArrayDecorator.class.php
@@ -12,177 +12,177 @@
  * Output escaping decorator class for arrays.
  *
  * @see        sfOutputEscaper
- * @package    symfony
- * @subpackage view
+ *
  * @author     Mike Squire <mike@somosis.co.uk>
+ *
  * @version    SVN: $Id$
  */
 class sfOutputEscaperArrayDecorator extends sfOutputEscaperGetterDecorator implements Iterator, ArrayAccess, Countable
 {
-  /**
-   * Used by the iterator to know if the current element is valid.
-   *
-   * @var int
-   */
-  private $count;
-
-  /**
-   * Constructor.
-   *
-   * @see sfOutputEscaper
-   * @inheritdoc
-   */
-  public function __construct($escapingMethod, $value)
-  {
-    parent::__construct($escapingMethod, $value);
-
-    $this->count = count($this->value);
-  }
-
-  /**
-   * Reset the array to the beginning (as required for the Iterator interface).
-   */
-  #[\ReturnTypeWillChange]
-  public function rewind()
-  {
-    reset($this->value);
-
-    $this->count = count($this->value);
-  }
-
-  /**
-   * Get the key associated with the current value (as required by the Iterator interface).
-   *
-   * @return string The key
-   */
-  #[\ReturnTypeWillChange]
-  public function key()
-  {
-    return key($this->value);
-  }
-
-  /**
-   * Escapes and return the current value (as required by the Iterator interface).
-   *
-   * This escapes the value using {@link sfOutputEscaper::escape()} with
-   * whatever escaping method is set for this instance.
-   *
-   * @return mixed The escaped value
-   */
-  #[\ReturnTypeWillChange]
-  public function current()
-  {
-    return sfOutputEscaper::escape($this->escapingMethod, current($this->value));
-  }
-
-  /**
-   * Moves to the next element (as required by the Iterator interface).
-   */
-  #[\ReturnTypeWillChange]
-  public function next()
-  {
-    next($this->value);
-
-    $this->count--;
-  }
-
-  /**
-   * Returns true if the current element is valid (as required by the Iterator interface).
-   *
-   * The current element will not be valid if {@link next()} has fallen off the
-   * end of the array or if there are no elements in the array and {@link
-   * rewind()} was called.
-   *
-   * @return bool The validity of the current element; true if it is valid
-   */
-  #[\ReturnTypeWillChange]
-  public function valid()
-  {
-    return $this->count > 0;
-  }
-
-  /**
-   * Returns true if the supplied offset isset in the array (as required by the ArrayAccess interface).
-   *
-   * @param  string $offset  The offset of the value to check existance of
-   *
-   * @return bool true if the offset isset; false otherwise
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetExists($offset)
-  {
-    return isset($this->value[$offset]);
-  }
-
-  /**
-   * Returns the element associated with the offset supplied (as required by the ArrayAccess interface).
-   *
-   * @param  string $offset  The offset of the value to get
-   *
-   * @return mixed The escaped value
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetGet($offset)
-  {
-    $value = isset($this->value[$offset]) ? $this->value[$offset] : null;
-    return sfOutputEscaper::escape($this->escapingMethod, $value);
-  }
-
-  /**
-   * Throws an exception saying that values cannot be set (this method is
-   * required for the ArrayAccess interface).
-   *
-   * This (and the other sfOutputEscaper classes) are designed to be read only
-   * so this is an illegal operation.
-   *
-   * @param  string $offset  (ignored)
-   * @param  string $value   (ignored)
-   *
-   * @throws sfException
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetSet($offset, $value)
-  {
-    throw new sfException('Cannot set values.');
-  }
-
-  /**
-   * Throws an exception saying that values cannot be unset (this method is
-   * required for the ArrayAccess interface).
-   *
-   * This (and the other sfOutputEscaper classes) are designed to be read only
-   * so this is an illegal operation.
-   *
-   * @param  string $offset  (ignored)
-   *
-   * @throws sfException
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetUnset($offset)
-  {
-    throw new sfException('Cannot unset values.');
-  }
-
-  /**
-   * Returns the size of the array (are required by the Countable interface).
-   *
-   * @return int The size of the array
-   */
-  #[\ReturnTypeWillChange]
-  public function count()
-  {
-    return count($this->value);
-  }
-
-  /**
-   * Returns the (unescaped) value from the array associated with the key supplied.
-   *
-   * @param  string $key  The key into the array to use
-   *
-   * @return mixed The value
-   */
-  public function getRaw($key)
-  {
-    return $this->value[$key];
-  }
+    /**
+     * Used by the iterator to know if the current element is valid.
+     *
+     * @var int
+     */
+    private $count;
+
+    /**
+     * Constructor.
+     *
+     * @see sfOutputEscaper
+     * {@inheritdoc}
+     */
+    public function __construct($escapingMethod, $value)
+    {
+        parent::__construct($escapingMethod, $value);
+
+        $this->count = count($this->value);
+    }
+
+    /**
+     * Reset the array to the beginning (as required for the Iterator interface).
+     */
+    #[\ReturnTypeWillChange]
+    public function rewind()
+    {
+        reset($this->value);
+
+        $this->count = count($this->value);
+    }
+
+    /**
+     * Get the key associated with the current value (as required by the Iterator interface).
+     *
+     * @return string The key
+     */
+    #[\ReturnTypeWillChange]
+    public function key()
+    {
+        return key($this->value);
+    }
+
+    /**
+     * Escapes and return the current value (as required by the Iterator interface).
+     *
+     * This escapes the value using {@link sfOutputEscaper::escape()} with
+     * whatever escaping method is set for this instance.
+     *
+     * @return mixed The escaped value
+     */
+    #[\ReturnTypeWillChange]
+    public function current()
+    {
+        return sfOutputEscaper::escape($this->escapingMethod, current($this->value));
+    }
+
+    /**
+     * Moves to the next element (as required by the Iterator interface).
+     */
+    #[\ReturnTypeWillChange]
+    public function next()
+    {
+        next($this->value);
+
+        --$this->count;
+    }
+
+    /**
+     * Returns true if the current element is valid (as required by the Iterator interface).
+     *
+     * The current element will not be valid if {@link next()} has fallen off the
+     * end of the array or if there are no elements in the array and {@link * rewind()} was called.
+     *
+     * @return bool The validity of the current element; true if it is valid
+     */
+    #[\ReturnTypeWillChange]
+    public function valid()
+    {
+        return $this->count > 0;
+    }
+
+    /**
+     * Returns true if the supplied offset isset in the array (as required by the ArrayAccess interface).
+     *
+     * @param string $offset The offset of the value to check existance of
+     *
+     * @return bool true if the offset isset; false otherwise
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetExists($offset)
+    {
+        return isset($this->value[$offset]);
+    }
+
+    /**
+     * Returns the element associated with the offset supplied (as required by the ArrayAccess interface).
+     *
+     * @param string $offset The offset of the value to get
+     *
+     * @return mixed The escaped value
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetGet($offset)
+    {
+        $value = isset($this->value[$offset]) ? $this->value[$offset] : null;
+
+        return sfOutputEscaper::escape($this->escapingMethod, $value);
+    }
+
+    /**
+     * Throws an exception saying that values cannot be set (this method is
+     * required for the ArrayAccess interface).
+     *
+     * This (and the other sfOutputEscaper classes) are designed to be read only
+     * so this is an illegal operation.
+     *
+     * @param string $offset (ignored)
+     * @param string $value  (ignored)
+     *
+     * @throws sfException
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetSet($offset, $value)
+    {
+        throw new sfException('Cannot set values.');
+    }
+
+    /**
+     * Throws an exception saying that values cannot be unset (this method is
+     * required for the ArrayAccess interface).
+     *
+     * This (and the other sfOutputEscaper classes) are designed to be read only
+     * so this is an illegal operation.
+     *
+     * @param string $offset (ignored)
+     *
+     * @throws sfException
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetUnset($offset)
+    {
+        throw new sfException('Cannot unset values.');
+    }
+
+    /**
+     * Returns the size of the array (are required by the Countable interface).
+     *
+     * @return int The size of the array
+     */
+    #[\ReturnTypeWillChange]
+    public function count()
+    {
+        return count($this->value);
+    }
+
+    /**
+     * Returns the (unescaped) value from the array associated with the key supplied.
+     *
+     * @param string $key The key into the array to use
+     *
+     * @return mixed The value
+     */
+    public function getRaw($key)
+    {
+        return $this->value[$key];
+    }
 }
diff --git a/lib/escaper/sfOutputEscaperGetterDecorator.class.php b/lib/escaper/sfOutputEscaperGetterDecorator.class.php
index 7ff241f64..e3cac0665 100644
--- a/lib/escaper/sfOutputEscaperGetterDecorator.class.php
+++ b/lib/escaper/sfOutputEscaperGetterDecorator.class.php
@@ -12,43 +12,42 @@
  * Abstract output escaping decorator class for "getter" objects.
  *
  * @see        sfOutputEscaper
- * @package    symfony
- * @subpackage view
+ *
  * @author     Mike Squire <mike@somosis.co.uk>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfOutputEscaperGetterDecorator extends sfOutputEscaper
 {
-  /**
-   * Returns the raw, unescaped value associated with the key supplied.
-   *
-   * The key might be an index into an array or a value to be passed to the 
-   * decorated object's get() method.
-   *
-   * @param  string $key  The key to retrieve
-   *
-   * @return mixed The value
-   */
-  public abstract function getRaw($key);
+    /**
+     * Returns the raw, unescaped value associated with the key supplied.
+     *
+     * The key might be an index into an array or a value to be passed to the
+     * decorated object's get() method.
+     *
+     * @param string $key The key to retrieve
+     *
+     * @return mixed The value
+     */
+    abstract public function getRaw($key);
 
-  /**
-   * Returns the escaped value associated with the key supplied.
-   *
-   * Typically (using this implementation) the raw value is obtained using the
-   * {@link getRaw()} method, escaped and the result returned.
-   *
-   * @param  string $key             The key to retieve
-   * @param  string $escapingMethod  The escaping method (a PHP function) to use
-   *
-   * @return mixed The escaped value
-   */
-  public function get($key, $escapingMethod = null)
-  {
-    if (!$escapingMethod)
+    /**
+     * Returns the escaped value associated with the key supplied.
+     *
+     * Typically (using this implementation) the raw value is obtained using the
+     * {@link getRaw()} method, escaped and the result returned.
+     *
+     * @param string $key            The key to retieve
+     * @param string $escapingMethod The escaping method (a PHP function) to use
+     *
+     * @return mixed The escaped value
+     */
+    public function get($key, $escapingMethod = null)
     {
-      $escapingMethod = $this->escapingMethod;
-    }
+        if (!$escapingMethod) {
+            $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 68ed43dfd..3712f626e 100644
--- a/lib/escaper/sfOutputEscaperIteratorDecorator.class.php
+++ b/lib/escaper/sfOutputEscaperIteratorDecorator.class.php
@@ -21,150 +21,146 @@
  * exception.
  *
  * @see        sfOutputEscaper
- * @package    symfony
- * @subpackage view
+ *
  * @author     Mike Squire <mike@somosis.co.uk>
+ *
  * @version    SVN: $Id$
  */
 class sfOutputEscaperIteratorDecorator extends sfOutputEscaperObjectDecorator implements Iterator, ArrayAccess
 {
-  /**
-   * The iterator to be used.
-   *
-   * @var IteratorIterator
-   */
-  private $iterator;
+    /**
+     * The iterator to be used.
+     *
+     * @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
-   */
-  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.
+    /**
+     * 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
+     */
+    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);
+        parent::__construct($escapingMethod, $value);
 
-    $this->iterator = new IteratorIterator($value);
-  }
+        $this->iterator = new IteratorIterator($value);
+    }
 
-  /**
-   * Resets the iterator (as required by the Iterator interface).
-   *
-   * @return void
-   */
-  #[\ReturnTypeWillChange]
-  public function rewind()
-  {
-    return $this->iterator->rewind();
-  }
+    /**
+     * Resets the iterator (as required by the Iterator interface).
+     */
+    #[\ReturnTypeWillChange]
+    public function rewind()
+    {
+        return $this->iterator->rewind();
+    }
 
-  /**
-   * Escapes and gets the current element (as required by the Iterator interface).
-   *
-   * @return mixed The escaped value
-   */
-  #[\ReturnTypeWillChange]
-  public function current()
-  {
-    return sfOutputEscaper::escape($this->escapingMethod, $this->iterator->current());
-  }
+    /**
+     * Escapes and gets the current element (as required by the Iterator interface).
+     *
+     * @return mixed The escaped value
+     */
+    #[\ReturnTypeWillChange]
+    public function current()
+    {
+        return sfOutputEscaper::escape($this->escapingMethod, $this->iterator->current());
+    }
 
-  /**
-   * Gets the current key (as required by the Iterator interface).
-   *
-   * @return string Iterator key
-   */
-  #[\ReturnTypeWillChange]
-  public function key()
-  {
-    return $this->iterator->key();
-  }
+    /**
+     * Gets the current key (as required by the Iterator interface).
+     *
+     * @return string Iterator key
+     */
+    #[\ReturnTypeWillChange]
+    public function key()
+    {
+        return $this->iterator->key();
+    }
 
-  /**
-   * Moves to the next element in the iterator (as required by the Iterator interface).
-   *
-   * @return void
-   */
-  #[\ReturnTypeWillChange]
-  public function next()
-  {
-    return $this->iterator->next();
-  }
+    /**
+     * Moves to the next element in the iterator (as required by the Iterator interface).
+     */
+    #[\ReturnTypeWillChange]
+    public function next()
+    {
+        return $this->iterator->next();
+    }
 
-  /**
-   * Returns whether the current element is valid or not (as required by the
-   * Iterator interface).
-   *
-   * @return bool true if the current element is valid; false otherwise
-   */
-  #[\ReturnTypeWillChange]
-  public function valid()
-  {
-    return $this->iterator->valid();
-  }
+    /**
+     * Returns whether the current element is valid or not (as required by the
+     * Iterator interface).
+     *
+     * @return bool true if the current element is valid; false otherwise
+     */
+    #[\ReturnTypeWillChange]
+    public function valid()
+    {
+        return $this->iterator->valid();
+    }
 
-  /**
-   * Returns true if the supplied offset isset in the array (as required by the ArrayAccess interface).
-   *
-   * @param  string $offset  The offset of the value to check existance of
-   *
-   * @return bool true if the offset isset; false otherwise
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetExists($offset)
-  {
-    return isset($this->value[$offset]);
-  }
+    /**
+     * Returns true if the supplied offset isset in the array (as required by the ArrayAccess interface).
+     *
+     * @param string $offset The offset of the value to check existance of
+     *
+     * @return bool true if the offset isset; false otherwise
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetExists($offset)
+    {
+        return isset($this->value[$offset]);
+    }
 
-  /**
-   * Returns the element associated with the offset supplied (as required by the ArrayAccess interface).
-   *
-   * @param  string $offset  The offset of the value to get
-   *
-   * @return mixed The escaped value
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetGet($offset)
-  {
-    return sfOutputEscaper::escape($this->escapingMethod, $this->value[$offset]);
-  }
+    /**
+     * Returns the element associated with the offset supplied (as required by the ArrayAccess interface).
+     *
+     * @param string $offset The offset of the value to get
+     *
+     * @return mixed The escaped value
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetGet($offset)
+    {
+        return sfOutputEscaper::escape($this->escapingMethod, $this->value[$offset]);
+    }
 
-  /**
-   * Throws an exception saying that values cannot be set (this method is
-   * required for the ArrayAccess interface).
-   *
-   * This (and the other sfOutputEscaper classes) are designed to be read only
-   * so this is an illegal operation.
-   *
-   * @param  string $offset  (ignored)
-   * @param  string $value   (ignored)
-   *
-   * @throws sfException
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetSet($offset, $value)
-  {
-    throw new sfException('Cannot set values.');
-  }
+    /**
+     * Throws an exception saying that values cannot be set (this method is
+     * required for the ArrayAccess interface).
+     *
+     * This (and the other sfOutputEscaper classes) are designed to be read only
+     * so this is an illegal operation.
+     *
+     * @param string $offset (ignored)
+     * @param string $value  (ignored)
+     *
+     * @throws sfException
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetSet($offset, $value)
+    {
+        throw new sfException('Cannot set values.');
+    }
 
-  /**
-   * Throws an exception saying that values cannot be unset (this method is
-   * required for the ArrayAccess interface).
-   *
-   * This (and the other sfOutputEscaper classes) are designed to be read only
-   * so this is an illegal operation.
-   *
-   * @param  string $offset  (ignored)
-   *
-   * @throws sfException
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetUnset($offset)
-  {
-    throw new sfException('Cannot unset values.');
-  }
+    /**
+     * Throws an exception saying that values cannot be unset (this method is
+     * required for the ArrayAccess interface).
+     *
+     * This (and the other sfOutputEscaper classes) are designed to be read only
+     * so this is an illegal operation.
+     *
+     * @param string $offset (ignored)
+     *
+     * @throws sfException
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetUnset($offset)
+    {
+        throw new sfException('Cannot unset values.');
+    }
 }
diff --git a/lib/escaper/sfOutputEscaperObjectDecorator.class.php b/lib/escaper/sfOutputEscaperObjectDecorator.class.php
index ea4adcc57..c063a4dbc 100644
--- a/lib/escaper/sfOutputEscaperObjectDecorator.class.php
+++ b/lib/escaper/sfOutputEscaperObjectDecorator.class.php
@@ -13,116 +13,111 @@
  * their return values.
  *
  * @see        sfOutputEscaper
- * @package    symfony
- * @subpackage view
+ *
  * @author     Mike Squire <mike@somosis.co.uk>
+ *
  * @version    SVN: $Id$
  */
 class sfOutputEscaperObjectDecorator extends sfOutputEscaperGetterDecorator implements Countable
 {
-  /**
-   * Magic PHP method that intercepts method calls, calls them on the objects
-   * that is being escaped and escapes the result.
-   *
-   * The calling of the method is changed slightly to accommodate passing a
-   * specific escaping strategy. An additional parameter is appended to the
-   * argument list which is the escaping strategy. The decorator will remove
-   * and use this parameter as the escaping strategy if it begins with 'esc_'
-   * (the prefix all escaping helper functions have).
-   *
-   * For example if an object, $o, implements methods a() and b($arg):
-   *
-   *   $o->a()                // Escapes the return value of a()
-   *   $o->a(ESC_RAW)         // Uses the escaping method ESC_RAW with a()
-   *   $o->b('a')             // Escapes the return value of b('a')
-   *   $o->b('a', ESC_RAW);   // Uses the escaping method ESC_RAW with b('a')
-   *
-   * @param  string $method  The method on the object to be called
-   * @param  array  $args    An array of arguments to be passed to the method
-   *
-   * @return mixed The escaped value returned by the method
-   */
-  public function __call($method, $args)
-  {
-    if (count($args) > 0)
-    {
-      $escapingMethod = $args[count($args) - 1];
-      if (is_string($escapingMethod) && substr($escapingMethod, 0, 4) === 'esc_')
-      {
-        array_pop($args);
-      }
-      else
-      {
-        $escapingMethod = $this->escapingMethod;
-      }
-    }
-    else
+    /**
+     * Magic PHP method that intercepts method calls, calls them on the objects
+     * that is being escaped and escapes the result.
+     *
+     * The calling of the method is changed slightly to accommodate passing a
+     * specific escaping strategy. An additional parameter is appended to the
+     * argument list which is the escaping strategy. The decorator will remove
+     * and use this parameter as the escaping strategy if it begins with 'esc_'
+     * (the prefix all escaping helper functions have).
+     *
+     * For example if an object, $o, implements methods a() and b($arg):
+     *
+     *   $o->a()                // Escapes the return value of a()
+     *   $o->a(ESC_RAW)         // Uses the escaping method ESC_RAW with a()
+     *   $o->b('a')             // Escapes the return value of b('a')
+     *   $o->b('a', ESC_RAW);   // Uses the escaping method ESC_RAW with b('a')
+     *
+     * @param string $method The method on the object to be called
+     * @param array  $args   An array of arguments to be passed to the method
+     *
+     * @return mixed The escaped value returned by the method
+     */
+    public function __call($method, $args)
     {
-      $escapingMethod = $this->escapingMethod;
-    }
+        if (count($args) > 0) {
+            $escapingMethod = $args[count($args) - 1];
+            if (is_string($escapingMethod) && 'esc_' === substr($escapingMethod, 0, 4)) {
+                array_pop($args);
+            } else {
+                $escapingMethod = $this->escapingMethod;
+            }
+        } else {
+            $escapingMethod = $this->escapingMethod;
+        }
 
-    $value = call_user_func_array(array($this->value, $method), $args);
+        $value = call_user_func_array(array($this->value, $method), $args);
 
-    return sfOutputEscaper::escape($escapingMethod, $value);
-  }
+        return sfOutputEscaper::escape($escapingMethod, $value);
+    }
 
-  /**
-   * Returns the result of calling the get() method on the object, bypassing
-   * any escaping, if that method exists.
-   *
-   * If there is not a callable get() method this will throw an exception.
-   *
-   * @param  string $key  The parameter to be passed to the get() get method
-   *
-   * @return mixed The unescaped value returned
-   *
-   * @throws sfException if the object does not have a callable get() method
-   */
-  public function getRaw($key)
-  {
-    if (!is_callable(array($this->value, 'get')))
+    /**
+     * Try to call decorated object __toString() method if exists.
+     *
+     * @return string
+     */
+    public function __toString()
     {
-      throw new sfException('Object does not have a callable get() method.');
+        return $this->escape($this->escapingMethod, (string) $this->value);
     }
 
-    return $this->value->get($key);
-  }
+    /**
+     * Asks the wrapped object whether a property is set.
+     *
+     * @param mixed $key
+     *
+     * @return bool
+     */
+    public function __isset($key)
+    {
+        return isset($this->value->{$key});
+    }
 
-  /**
-   * Try to call decorated object __toString() method if exists.
-   *
-   * @return string
-   */
-  public function __toString()
-  {
-    return $this->escape($this->escapingMethod, (string) $this->value);
-  }
+    /**
+     * Returns the result of calling the get() method on the object, bypassing
+     * any escaping, if that method exists.
+     *
+     * If there is not a callable get() method this will throw an exception.
+     *
+     * @param string $key The parameter to be passed to the get() get method
+     *
+     * @return mixed The unescaped value returned
+     *
+     * @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.');
+        }
 
-  /**
-   * Asks the wrapped object whether a property is set.
-   *
-   * @return boolean
-   */
-  public function __isset($key)
-  {
-    return isset($this->value->$key);
-  }
+        return $this->value->get($key);
+    }
 
-  /**
-   * Returns the size of the object if it implements Countable (is required by the Countable interface).
-   *
-   * It returns 1 if other cases (which was the default PHP behavior in such a case before php 7.3).
-   *
-   * @return int The size of the object
-   */
-  #[\ReturnTypeWillChange]
-  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)
+    /**
+     * Returns the size of the object if it implements Countable (is required by the Countable interface).
+     *
+     * It returns 1 if other cases (which was the default PHP behavior in such a case before php 7.3).
+     *
+     * @return int The size of the object
+     */
+    #[\ReturnTypeWillChange]
+    public function count()
     {
-      return count($this->value);
+        // 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) {
+            return count($this->value);
+        }
+
+        return 1;
     }
-    return 1;
-  }
 }
diff --git a/lib/escaper/sfOutputEscaperSafe.class.php b/lib/escaper/sfOutputEscaperSafe.class.php
index c4ddba4c2..788c02574 100644
--- a/lib/escaper/sfOutputEscaperSafe.class.php
+++ b/lib/escaper/sfOutputEscaperSafe.class.php
@@ -11,68 +11,65 @@
 /**
  * Marks a variable as being safe for output.
  *
- * @package    symfony
- * @subpackage view
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfOutputEscaperSafe extends ArrayIterator
 {
-  protected
-    $value = null;
-
-  /**
-   * Constructor.
-   *
-   * @param mixed $value  The value to mark as safe
-   */
-  public function __construct($value)
-  {
-    $this->value = $value;
+    protected $value;
 
-    if (is_array($value) || is_object($value))
+    /**
+     * Constructor.
+     *
+     * @param mixed $value The value to mark as safe
+     */
+    public function __construct($value)
     {
-      parent::__construct($value);
+        $this->value = $value;
+
+        if (is_array($value) || is_object($value)) {
+            parent::__construct($value);
+        }
     }
-  }
 
-  public function __toString()
-  {
-    return (string) $this->value;
-  }
+    public function __toString()
+    {
+        return (string) $this->value;
+    }
 
-  public function __get($key)
-  {
-    return $this->value->$key;
-  }
+    public function __get($key)
+    {
+        return $this->value->{$key};
+    }
 
-  public function __set($key, $value)
-  {
-    $this->value->$key = $value;
-  }
+    public function __set($key, $value)
+    {
+        $this->value->{$key} = $value;
+    }
 
-  public function __call($method, $arguments)
-  {
-    return call_user_func_array(array($this->value, $method), $arguments);
-  }
+    public function __call($method, $arguments)
+    {
+        return call_user_func_array(array($this->value, $method), $arguments);
+    }
 
-  public function __isset($key)
-  {
-    return isset($this->value->$key);
-  }
+    public function __isset($key)
+    {
+        return isset($this->value->{$key});
+    }
 
-  public function __unset($key)
-  {
-    unset($this->value->$key);
-  }
+    public function __unset($key)
+    {
+        unset($this->value->{$key});
+    }
 
-  /**
-   * Returns the embedded value.
-   *
-   * @return mixed The embedded value
-   */
-  public function getValue()
-  {
-    return $this->value;
-  }
+    /**
+     * Returns the embedded value.
+     *
+     * @return mixed The embedded value
+     */
+    public function getValue()
+    {
+        return $this->value;
+    }
 }
diff --git a/lib/event/sfEvent.class.php b/lib/event/sfEvent.class.php
index 67415e7ee..018b74cc5 100644
--- a/lib/event/sfEvent.class.php
+++ b/lib/event/sfEvent.class.php
@@ -11,156 +11,153 @@
 /**
  * sfEvent.
  *
- * @package    symfony
- * @subpackage event
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id: sfEvent.class.php 8698 2008-04-30 16:35:28Z fabien $
  */
 class sfEvent implements ArrayAccess
 {
-  protected
-    $value      = null,
-    $processed  = false,
-    $subject    = null,
-    $name       = '',
-    $parameters = null;
-
-  /**
-   * Constructs a new sfEvent.
-   *
-   * @param mixed   $subject      The subject
-   * @param string  $name         The event name
-   * @param array   $parameters   An array of parameters
-   */
-  public function __construct($subject, $name, $parameters = array())
-  {
-    $this->subject = $subject;
-    $this->name = $name;
-
-    $this->parameters = $parameters;
-  }
-
-  /**
-   * Returns the subject.
-   *
-   * @return mixed The subject
-   */
-  public function getSubject()
-  {
-    return $this->subject;
-  }
-
-  /**
-   * Returns the event name.
-   *
-   * @return string The event name
-   */
-  public function getName()
-  {
-    return $this->name;
-  }
-
-  /**
-   * Sets the return value for this event.
-   *
-   * @param mixed $value The return value
-   */
-  public function setReturnValue($value)
-  {
-    $this->value = $value;
-  }
-
-  /**
-   * Returns the return value.
-   *
-   * @return mixed The return value
-   */
-  public function getReturnValue()
-  {
-    return $this->value;
-  }
-
-  /**
-   * Sets the processed flag.
-   *
-   * @param bool $processed The processed flag value
-   */
-  public function setProcessed($processed)
-  {
-    $this->processed = (boolean) $processed;
-  }
-
-  /**
-   * Returns whether the event has been processed by a listener or not.
-   *
-   * @return Boolean true if the event has been processed, false otherwise
-   */
-  public function isProcessed()
-  {
-    return $this->processed;
-  }
-
-  /**
-   * Returns the event parameters.
-   *
-   * @return array The event parameters
-   */
-  public function getParameters()
-  {
-    return $this->parameters;
-  }
-
-  /**
-   * Returns true if the parameter exists (implements the ArrayAccess interface).
-   *
-   * @param  string  $name  The parameter name
-   *
-   * @return Boolean true if the parameter exists, false otherwise
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetExists($name)
-  {
-    return array_key_exists($name, $this->parameters);
-  }
-
-  /**
-   * Returns a parameter value (implements the ArrayAccess interface).
-   *
-   * @param  string  $name  The parameter name
-   *
-   * @return mixed  The parameter value
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetGet($name)
-  {
-    if (!array_key_exists($name, $this->parameters))
+    protected $value;
+    protected $processed = false;
+    protected $subject;
+    protected $name = '';
+    protected $parameters;
+
+    /**
+     * Constructs a new sfEvent.
+     *
+     * @param mixed  $subject    The subject
+     * @param string $name       The event name
+     * @param array  $parameters An array of parameters
+     */
+    public function __construct($subject, $name, $parameters = array())
+    {
+        $this->subject = $subject;
+        $this->name = $name;
+
+        $this->parameters = $parameters;
+    }
+
+    /**
+     * Returns the subject.
+     *
+     * @return mixed The subject
+     */
+    public function getSubject()
+    {
+        return $this->subject;
+    }
+
+    /**
+     * Returns the event name.
+     *
+     * @return string The event name
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * Sets the return value for this event.
+     *
+     * @param mixed $value The return value
+     */
+    public function setReturnValue($value)
+    {
+        $this->value = $value;
+    }
+
+    /**
+     * Returns the return value.
+     *
+     * @return mixed The return value
+     */
+    public function getReturnValue()
     {
-      throw new InvalidArgumentException(sprintf('The event "%s" has no "%s" parameter.', $this->name, $name));
+        return $this->value;
     }
 
-    return $this->parameters[$name];
-  }
-
-  /**
-   * Sets a parameter (implements the ArrayAccess interface).
-   *
-   * @param string  $name   The parameter name
-   * @param mixed   $value  The parameter value
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetSet($name, $value)
-  {
-    $this->parameters[$name] = $value;
-  }
-
-  /**
-   * Removes a parameter (implements the ArrayAccess interface).
-   *
-   * @param string $name    The parameter name
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetUnset($name)
-  {
-    unset($this->parameters[$name]);
-  }
+    /**
+     * Sets the processed flag.
+     *
+     * @param bool $processed The processed flag value
+     */
+    public function setProcessed($processed)
+    {
+        $this->processed = (bool) $processed;
+    }
+
+    /**
+     * Returns whether the event has been processed by a listener or not.
+     *
+     * @return bool true if the event has been processed, false otherwise
+     */
+    public function isProcessed()
+    {
+        return $this->processed;
+    }
+
+    /**
+     * Returns the event parameters.
+     *
+     * @return array The event parameters
+     */
+    public function getParameters()
+    {
+        return $this->parameters;
+    }
+
+    /**
+     * Returns true if the parameter exists (implements the ArrayAccess interface).
+     *
+     * @param string $name The parameter name
+     *
+     * @return bool true if the parameter exists, false otherwise
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetExists($name)
+    {
+        return array_key_exists($name, $this->parameters);
+    }
+
+    /**
+     * Returns a parameter value (implements the ArrayAccess interface).
+     *
+     * @param string $name The parameter name
+     *
+     * @return mixed The parameter value
+     */
+    #[\ReturnTypeWillChange]
+    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));
+        }
+
+        return $this->parameters[$name];
+    }
+
+    /**
+     * Sets a parameter (implements the ArrayAccess interface).
+     *
+     * @param string $name  The parameter name
+     * @param mixed  $value The parameter value
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetSet($name, $value)
+    {
+        $this->parameters[$name] = $value;
+    }
+
+    /**
+     * Removes a parameter (implements the ArrayAccess interface).
+     *
+     * @param string $name The parameter name
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetUnset($name)
+    {
+        unset($this->parameters[$name]);
+    }
 }
diff --git a/lib/event/sfEventDispatcher.class.php b/lib/event/sfEventDispatcher.class.php
index 1a4d38819..8a00dda1a 100644
--- a/lib/event/sfEventDispatcher.class.php
+++ b/lib/event/sfEventDispatcher.class.php
@@ -13,145 +13,134 @@
  *
  * @see http://developer.apple.com/documentation/Cocoa/Conceptual/Notifications/index.html Apple's Cocoa framework
  *
- * @package    symfony
- * @subpackage event
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id: sfEventDispatcher.class.php 10631 2008-08-03 16:50:47Z fabien $
  */
 class sfEventDispatcher
 {
-  protected
-    $listeners = array();
-
-  /**
-   * Connects a listener to a given event name.
-   *
-   * @param string  $name      An event name
-   * @param mixed   $listener  A PHP callable
-   */
-  public function connect($name, $listener)
-  {
-    if (!isset($this->listeners[$name]))
+    protected $listeners = array();
+
+    /**
+     * Connects a listener to a given event name.
+     *
+     * @param string $name     An event name
+     * @param mixed  $listener A PHP callable
+     */
+    public function connect($name, $listener)
     {
-      $this->listeners[$name] = array();
-    }
+        if (!isset($this->listeners[$name])) {
+            $this->listeners[$name] = array();
+        }
 
-    $this->listeners[$name][] = $listener;
-  }
-
-  /**
-   * Disconnects a listener for a given event name.
-   *
-   * @param string   $name      An event name
-   * @param mixed    $listener  A PHP callable
-   *
-   * @return mixed false if listener does not exist, null otherwise
-   */
-  public function disconnect($name, $listener)
-  {
-    if (!isset($this->listeners[$name]))
-    {
-      return false;
+        $this->listeners[$name][] = $listener;
     }
 
-    foreach ($this->listeners[$name] as $i => $callable)
+    /**
+     * Disconnects a listener for a given event name.
+     *
+     * @param string $name     An event name
+     * @param mixed  $listener A PHP callable
+     *
+     * @return mixed false if listener does not exist, null otherwise
+     */
+    public function disconnect($name, $listener)
     {
-      if ($listener === $callable)
-      {
-        unset($this->listeners[$name][$i]);
-      }
+        if (!isset($this->listeners[$name])) {
+            return false;
+        }
+
+        foreach ($this->listeners[$name] as $i => $callable) {
+            if ($listener === $callable) {
+                unset($this->listeners[$name][$i]);
+            }
+        }
     }
-  }
-
-  /**
-   * Notifies all listeners of a given event.
-   *
-   * @param sfEvent $event A sfEvent instance
-   *
-   * @return sfEvent The sfEvent instance
-   */
-  public function notify(sfEvent $event)
-  {
-    foreach ($this->getListeners($event->getName()) as $listener)
+
+    /**
+     * Notifies all listeners of a given event.
+     *
+     * @param sfEvent $event A sfEvent instance
+     *
+     * @return sfEvent The sfEvent instance
+     */
+    public function notify(sfEvent $event)
     {
-      call_user_func($listener, $event);
+        foreach ($this->getListeners($event->getName()) as $listener) {
+            call_user_func($listener, $event);
+        }
+
+        return $event;
     }
 
-    return $event;
-  }
-
-  /**
-   * Notifies all listeners of a given event until one returns a non null value.
-   *
-   * @param  sfEvent $event A sfEvent instance
-   *
-   * @return sfEvent The sfEvent instance
-   */
-  public function notifyUntil(sfEvent $event)
-  {
-    foreach ($this->getListeners($event->getName()) as $listener)
+    /**
+     * Notifies all listeners of a given event until one returns a non null value.
+     *
+     * @param sfEvent $event A sfEvent instance
+     *
+     * @return sfEvent The sfEvent instance
+     */
+    public function notifyUntil(sfEvent $event)
     {
-      if (call_user_func($listener, $event))
-      {
-        $event->setProcessed(true);
-        break;
-      }
+        foreach ($this->getListeners($event->getName()) as $listener) {
+            if (call_user_func($listener, $event)) {
+                $event->setProcessed(true);
+
+                break;
+            }
+        }
+
+        return $event;
     }
 
-    return $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
-   *
-   * @return sfEvent The sfEvent instance
-   */
-  public function filter(sfEvent $event, $value)
-  {
-    foreach ($this->getListeners($event->getName()) as $listener)
+    /**
+     * 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
+     *
+     * @return sfEvent The sfEvent instance
+     */
+    public function filter(sfEvent $event, $value)
     {
-      $value = call_user_func_array($listener, array($event, $value));
+        foreach ($this->getListeners($event->getName()) as $listener) {
+            $value = call_user_func_array($listener, array($event, $value));
+        }
+
+        $event->setReturnValue($value);
+
+        return $event;
     }
 
-    $event->setReturnValue($value);
-
-    return $event;
-  }
-
-  /**
-   * Returns true if the given event name has some listeners.
-   *
-   * @param  string   $name    The event name
-   *
-   * @return Boolean true if some listeners are connected, false otherwise
-   */
-  public function hasListeners($name)
-  {
-    if (!isset($this->listeners[$name]))
+    /**
+     * Returns true if the given event name has some listeners.
+     *
+     * @param string $name The event name
+     *
+     * @return bool true if some listeners are connected, false otherwise
+     */
+    public function hasListeners($name)
     {
-      $this->listeners[$name] = array();
+        if (!isset($this->listeners[$name])) {
+            $this->listeners[$name] = array();
+        }
+
+        return (bool) count($this->listeners[$name]);
     }
 
-    return (boolean) count($this->listeners[$name]);
-  }
-
-  /**
-   * Returns all listeners associated with a given event name.
-   *
-   * @param  string   $name    The event name
-   *
-   * @return array  An array of listeners
-   */
-  public function getListeners($name)
-  {
-    if (!isset($this->listeners[$name]))
+    /**
+     * Returns all listeners associated with a given event name.
+     *
+     * @param string $name The event name
+     *
+     * @return array An array of listeners
+     */
+    public function getListeners($name)
     {
-      return array();
-    }
+        if (!isset($this->listeners[$name])) {
+            return array();
+        }
 
-    return $this->listeners[$name];
-  }
+        return $this->listeners[$name];
+    }
 }
diff --git a/lib/exception/data/error.atom.php b/lib/exception/data/error.atom.php
index 43cc506c3..7f2a14d27 100644
--- a/lib/exception/data/error.atom.php
+++ b/lib/exception/data/error.atom.php
@@ -1 +1,3 @@
-<?php include sfException::getTemplatePathForError('xml', false) ?>
+<?php
+
+include sfException::getTemplatePathForError('xml', false);
diff --git a/lib/exception/data/error.css.php b/lib/exception/data/error.css.php
index 9f4ae4d34..740604b51 100644
--- a/lib/exception/data/error.css.php
+++ b/lib/exception/data/error.css.php
@@ -1,3 +1,3 @@
 /*
-  <?php echo $code.' '.$text."\n" ?>
+  <?php echo $code.' '.$text."\n"; ?>
 */
diff --git a/lib/exception/data/error.html.php b/lib/exception/data/error.html.php
index 1ef93c050..a8c3acb9c 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>
@@ -14,20 +14,20 @@
 <title>symfony project</title>
 
 <link rel="shortcut icon" href="/favicon.ico" />
-<link rel="stylesheet" type="text/css" media="screen" href="<?php echo $path ?>/sf/sf_default/css/screen.css" />
+<link rel="stylesheet" type="text/css" media="screen" href="<?php echo $path; ?>/sf/sf_default/css/screen.css" />
 <!--[if lt IE 7.]>
-<link rel="stylesheet" type="text/css" media="screen" href="<?php echo $path ?>/sf/sf_default/css/ie.css" />
+<link rel="stylesheet" type="text/css" media="screen" href="<?php echo $path; ?>/sf/sf_default/css/ie.css" />
 <![endif]-->
 
 </head>
 <body>
 <div class="sfTContainer">
-  <a title="symfony website" href="http://www.symfony-project.org/"><img alt="symfony PHP Framework" class="sfTLogo" src="<?php echo $path ?>/sf/sf_default/images/sfTLogo.png" height="39" width="186" /></a>
+  <a title="symfony website" href="http://www.symfony-project.org/"><img alt="symfony PHP Framework" class="sfTLogo" src="<?php echo $path; ?>/sf/sf_default/images/sfTLogo.png" height="39" width="186" /></a>
   <div class="sfTMessageContainer sfTAlert">
-    <img alt="page not found" class="sfTMessageIcon" src="<?php echo $path ?>/sf/sf_default/images/icons/tools48.png" height="48" width="48" />
+    <img alt="page not found" class="sfTMessageIcon" src="<?php echo $path; ?>/sf/sf_default/images/icons/tools48.png" height="48" width="48" />
     <div class="sfTMessageWrap">
       <h1>Oops! An Error Occurred</h1>
-      <h5>The server returned a "<?php echo $code ?> <?php echo $text ?>".</h5>
+      <h5>The server returned a "<?php echo $code; ?> <?php echo $text; ?>".</h5>
     </div>
   </div>
 
diff --git a/lib/exception/data/error.js.php b/lib/exception/data/error.js.php
index 9f4ae4d34..740604b51 100644
--- a/lib/exception/data/error.js.php
+++ b/lib/exception/data/error.js.php
@@ -1,3 +1,3 @@
 /*
-  <?php echo $code.' '.$text."\n" ?>
+  <?php echo $code.' '.$text."\n"; ?>
 */
diff --git a/lib/exception/data/error.json.php b/lib/exception/data/error.json.php
index 7d2374bed..fc6951883 100644
--- a/lib/exception/data/error.json.php
+++ b/lib/exception/data/error.json.php
@@ -1,5 +1,7 @@
-<?php echo json_encode(array(
-  'error'       => array(
-    'code'      => $code,
-    'message'   => $text,
-))) ?>
+<?php
+
+echo json_encode(array(
+    'error' => array(
+        'code' => $code,
+        'message' => $text,
+    )));
diff --git a/lib/exception/data/error.rdf.php b/lib/exception/data/error.rdf.php
index 43cc506c3..7f2a14d27 100644
--- a/lib/exception/data/error.rdf.php
+++ b/lib/exception/data/error.rdf.php
@@ -1 +1,3 @@
-<?php include sfException::getTemplatePathForError('xml', false) ?>
+<?php
+
+include sfException::getTemplatePathForError('xml', false);
diff --git a/lib/exception/data/error.txt.php b/lib/exception/data/error.txt.php
index f53d4fa29..a3572ccd7 100644
--- a/lib/exception/data/error.txt.php
+++ b/lib/exception/data/error.txt.php
@@ -1,7 +1,7 @@
 Oops! An Error Occurred
 =======================
 
-The server returned a "<?php echo $code ?> <?php echo $text ?>".
+The server returned a "<?php echo $code; ?> <?php echo $text; ?>".
 
 Please e-mail us at [email] and let us know what you were doing when this
 error occurred. We will fix it as soon as possible. Sorry for any
diff --git a/lib/exception/data/error.xml.php b/lib/exception/data/error.xml.php
index a039c5bc8..128a17b7e 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" ?>
-<error code="<?php echo $code ?>" message="<?php echo $text ?>" />
+<?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 35e80548c..503c53f19 100644
--- a/lib/exception/data/exception.atom.php
+++ b/lib/exception/data/exception.atom.php
@@ -1 +1,3 @@
-<?php include sfException::getTemplatePathForError('xml', true) ?>
+<?php
+
+include sfException::getTemplatePathForError('xml', true);
diff --git a/lib/exception/data/exception.css.php b/lib/exception/data/exception.css.php
index a2eecdeed..3d58dcb90 100644
--- a/lib/exception/data/exception.css.php
+++ b/lib/exception/data/exception.css.php
@@ -1,10 +1,10 @@
 /*
-  <?php echo $code.' '.$text."\n" ?>
+  <?php echo $code.' '.$text."\n"; ?>
 
-  <?php echo $name."\n" ?>
-  <?php echo $message."\n" ?>
+  <?php echo $name."\n"; ?>
+  <?php echo $message."\n"; ?>
 
-<?php foreach ($traces as $trace): ?>
-    <?php echo $trace."\n" ?>
-<?php endforeach; ?>
+<?php foreach ($traces as $trace) { ?>
+    <?php echo $trace."\n"; ?>
+<?php } ?>
 */
diff --git a/lib/exception/data/exception.html.php b/lib/exception/data/exception.html.php
index 029b82b52..8e47ef618 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 }
@@ -35,28 +35,28 @@ function toggle(id)
 <body>
   <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>
+  <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>stack trace</h2>
-  <ul><li><?php echo implode('</li><li>', $traces) ?></li></ul>
+  <ul><li><?php echo implode('</li><li>', $traces); ?></li></ul>
 
   <h2>symfony settings <a href="#" onclick="toggle('sf_settings'); return false;">...</a></h2>
-  <div id="sf_settings" style="display: none"><?php echo $settingsTable ?></div>
+  <div id="sf_settings" style="display: none"><?php echo $settingsTable; ?></div>
 
   <h2>request <a href="#" onclick="toggle('sf_request'); return false;">...</a></h2>
-  <div id="sf_request" style="display: none"><?php echo $requestTable ?></div>
+  <div id="sf_request" style="display: none"><?php echo $requestTable; ?></div>
 
   <h2>response <a href="#" onclick="toggle('sf_response'); return false;">...</a></h2>
-  <div id="sf_response" style="display: none"><?php echo $responseTable ?></div>
+  <div id="sf_response" style="display: none"><?php echo $responseTable; ?></div>
 
   <h2>user <a href="#" onclick="toggle('sf_user'); return false;">...</a></h2>
-  <div id="sf_user" style="display: none"><?php echo $userTable ?></div>
+  <div id="sf_user" style="display: none"><?php echo $userTable; ?></div>
 
   <h2>global vars <a href="#" onclick="toggle('sf_globals'); return false;">...</a></h2>
-  <div id="sf_globals" style="display: none"><?php echo $globalsTable ?></div>
+  <div id="sf_globals" style="display: none"><?php echo $globalsTable; ?></div>
 
   <p id="footer">
-    symfony v.<?php echo SYMFONY_VERSION ?> - php <?php echo PHP_VERSION ?><br />
+    symfony v.<?php echo SYMFONY_VERSION; ?> - php <?php echo PHP_VERSION; ?><br />
     for help resolving this issue, please visit <a href="http://www.symfony-project.org/">http://www.symfony-project.org/</a>.
   </p>
   </div></center>
diff --git a/lib/exception/data/exception.js.php b/lib/exception/data/exception.js.php
index a2eecdeed..3d58dcb90 100644
--- a/lib/exception/data/exception.js.php
+++ b/lib/exception/data/exception.js.php
@@ -1,10 +1,10 @@
 /*
-  <?php echo $code.' '.$text."\n" ?>
+  <?php echo $code.' '.$text."\n"; ?>
 
-  <?php echo $name."\n" ?>
-  <?php echo $message."\n" ?>
+  <?php echo $name."\n"; ?>
+  <?php echo $message."\n"; ?>
 
-<?php foreach ($traces as $trace): ?>
-    <?php echo $trace."\n" ?>
-<?php endforeach; ?>
+<?php foreach ($traces as $trace) { ?>
+    <?php echo $trace."\n"; ?>
+<?php } ?>
 */
diff --git a/lib/exception/data/exception.json.php b/lib/exception/data/exception.json.php
index bc7ce288d..2a7c24840 100644
--- a/lib/exception/data/exception.json.php
+++ b/lib/exception/data/exception.json.php
@@ -1,10 +1,12 @@
-<?php echo json_encode(array(
-  'error'       => array(
-    'code'      => $code,
-    'message'   => $message,
-    'debug'     => array(
-      'name'    => $name,
-      'message' => $message,
-      'traces'  => $traces,
-    ),
-))) ?>
+<?php
+
+echo json_encode(array(
+    'error' => array(
+        'code' => $code,
+        'message' => $message,
+        'debug' => array(
+            'name' => $name,
+            'message' => $message,
+            'traces' => $traces,
+        ),
+    )));
diff --git a/lib/exception/data/exception.rdf.php b/lib/exception/data/exception.rdf.php
index 35e80548c..503c53f19 100644
--- a/lib/exception/data/exception.rdf.php
+++ b/lib/exception/data/exception.rdf.php
@@ -1 +1,3 @@
-<?php include sfException::getTemplatePathForError('xml', true) ?>
+<?php
+
+include sfException::getTemplatePathForError('xml', true);
diff --git a/lib/exception/data/exception.txt.php b/lib/exception/data/exception.txt.php
index c936eb1ce..2e5bea7f0 100644
--- a/lib/exception/data/exception.txt.php
+++ b/lib/exception/data/exception.txt.php
@@ -1,11 +1,11 @@
-[exception]   <?php echo $code.' | '.$text.' | '.$name ?>
-[message]     <?php echo $message ?>
-<?php if (isset($traces) && count($traces) > 0): ?>
+[exception]   <?php echo $code.' | '.$text.' | '.$name; ?>
+[message]     <?php echo $message; ?>
+<?php if (isset($traces) && count($traces) > 0) { ?>
 [stack trace]
-<?php foreach ($traces as $line): ?>
-  <?php echo $line ?>
+<?php foreach ($traces as $line) { ?>
+  <?php echo $line; ?>
 
-<?php endforeach; ?>
-<?php endif; ?>
-[symfony]     v. <?php echo SYMFONY_VERSION ?> (symfony-project.org)
-[PHP]         v. <?php echo PHP_VERSION ?>
+<?php } ?>
+<?php } ?>
+[symfony]     v. <?php echo SYMFONY_VERSION; ?> (symfony-project.org)
+[PHP]         v. <?php echo PHP_VERSION; ?>
diff --git a/lib/exception/data/exception.xml.php b/lib/exception/data/exception.xml.php
index f4df3e1f4..6315d92ed 100644
--- a/lib/exception/data/exception.xml.php
+++ b/lib/exception/data/exception.xml.php
@@ -1,12 +1,12 @@
-<?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 ?>">
+<?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>
+    <name><?php echo $name; ?></name>
+    <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>
-<?php endforeach; ?>
+<?php foreach ($traces as $trace) { ?>
+        <trace><?php echo $trace; ?></trace>
+<?php } ?>
     </traces>
   </debug>
 </error>
diff --git a/lib/exception/data/unavailable.php b/lib/exception/data/unavailable.php
index 08eae993d..13b33e378 100644
--- a/lib/exception/data/unavailable.php
+++ b/lib/exception/data/unavailable.php
@@ -1,11 +1,11 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
-<?php $path = preg_replace('#/[^/]+\.php5?$#', '', isset($_SERVER['SCRIPT_NAME']) ? $_SERVER['SCRIPT_NAME'] : (isset($_SERVER['ORIG_SCRIPT_NAME']) ? $_SERVER['ORIG_SCRIPT_NAME'] : '')) ?>
+<?php $path = 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>
 
-<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" />
@@ -14,17 +14,17 @@
 <title>symfony project</title>
 
 <link rel="shortcut icon" href="/favicon.ico" />
-<link rel="stylesheet" type="text/css" media="screen" href="<?php echo $path ?>/sf/sf_default/css/screen.css" />
+<link rel="stylesheet" type="text/css" media="screen" href="<?php echo $path; ?>/sf/sf_default/css/screen.css" />
 <!--[if lt IE 7.]>
-<link rel="stylesheet" type="text/css" media="screen" href="<?php echo $path ?>/sf/sf_default/css/ie.css" />
+<link rel="stylesheet" type="text/css" media="screen" href="<?php echo $path; ?>/sf/sf_default/css/ie.css" />
 <![endif]-->
 
 </head>
 <body>
 <div class="sfTContainer">
-  <a title="symfony website" href="http://www.symfony-project.org/"><img alt="symfony PHP Framework" class="sfTLogo" src="<?php echo $path ?>/sf/sf_default/images/sfTLogo.png" height="39" width="186" /></a>
+  <a title="symfony website" href="http://www.symfony-project.org/"><img alt="symfony PHP Framework" class="sfTLogo" src="<?php echo $path; ?>/sf/sf_default/images/sfTLogo.png" height="39" width="186" /></a>
   <div class="sfTMessageContainer sfTAlert">
-    <img alt="page not found" class="sfTMessageIcon" src="<?php echo $path ?>/sf/sf_default/images/icons/tools48.png" height="48" width="48" />
+    <img alt="page not found" class="sfTMessageIcon" src="<?php echo $path; ?>/sf/sf_default/images/icons/tools48.png" height="48" width="48" />
     <div class="sfTMessageWrap">
       <h1>Website Temporarily Unavailable</h1>
       <h5>Please try again in a few seconds...</h5>
diff --git a/lib/exception/sfCacheException.class.php b/lib/exception/sfCacheException.class.php
index e6b490de3..3080e585d 100644
--- a/lib/exception/sfCacheException.class.php
+++ b/lib/exception/sfCacheException.class.php
@@ -4,7 +4,7 @@
  * 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>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -12,10 +12,9 @@
 /**
  * sfCacheException is thrown when ConfigCache fails to execute properly.
  *
- * @package    symfony
- * @subpackage exception
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 class sfCacheException extends sfException
diff --git a/lib/exception/sfConfigurationException.class.php b/lib/exception/sfConfigurationException.class.php
index deb916ee7..d8dc79ef8 100644
--- a/lib/exception/sfConfigurationException.class.php
+++ b/lib/exception/sfConfigurationException.class.php
@@ -4,7 +4,7 @@
  * 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>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -13,10 +13,9 @@
  * sfConfigurationException is thrown when the framework finds an error in a
  * configuration setting.
  *
- * @package    symfony
- * @subpackage exception
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 class sfConfigurationException extends sfException
diff --git a/lib/exception/sfControllerException.class.php b/lib/exception/sfControllerException.class.php
index 97a21a93c..2c1d92e65 100644
--- a/lib/exception/sfControllerException.class.php
+++ b/lib/exception/sfControllerException.class.php
@@ -4,7 +4,7 @@
  * 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>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -13,10 +13,9 @@
  * sfControllerException is thrown when a requested Controller implementation
  * doesn't exist.
  *
- * @package    symfony
- * @subpackage exception
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 class sfControllerException extends sfException
diff --git a/lib/exception/sfDatabaseException.class.php b/lib/exception/sfDatabaseException.class.php
index af07b3e51..c428803b9 100644
--- a/lib/exception/sfDatabaseException.class.php
+++ b/lib/exception/sfDatabaseException.class.php
@@ -4,7 +4,7 @@
  * 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>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -12,10 +12,9 @@
 /**
  * sfDatabaseException is thrown when a database related error occurs.
  *
- * @package    symfony
- * @subpackage exception
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 class sfDatabaseException extends sfException
diff --git a/lib/exception/sfError404Exception.class.php b/lib/exception/sfError404Exception.class.php
index bec7a9903..ebca947f0 100644
--- a/lib/exception/sfError404Exception.class.php
+++ b/lib/exception/sfError404Exception.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -11,42 +11,36 @@
 /**
  * sfError404Exception is thrown when a 404 error occurs in an action.
  *
- * @package    symfony
- * @subpackage exception
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfError404Exception extends sfException
 {
-  /**
-   * Forwards to the 404 action.
-   */
-  public function printStackTrace()
-  {
-    $exception = null === $this->wrappedException ? $this : $this->wrappedException;
-
-    if (sfConfig::get('sf_debug'))
+    /**
+     * Forwards to the 404 action.
+     */
+    public function printStackTrace()
     {
-      $response = sfContext::getInstance()->getResponse();
-      if (null === $response)
-      {
-        $response = new sfWebResponse(sfContext::getInstance()->getEventDispatcher());
-        sfContext::getInstance()->setResponse($response);
-      }
+        $exception = null === $this->wrappedException ? $this : $this->wrappedException;
 
-      $response->setStatusCode(404);
+        if (sfConfig::get('sf_debug')) {
+            $response = sfContext::getInstance()->getResponse();
+            if (null === $response) {
+                $response = new sfWebResponse(sfContext::getInstance()->getEventDispatcher());
+                sfContext::getInstance()->setResponse($response);
+            }
 
-      return parent::printStackTrace();
-    }
-    else
-    {
-      // log all exceptions in php log
-      if (!sfConfig::get('sf_test'))
-      {
-        error_log($this->getMessage());
-      }
+            $response->setStatusCode(404);
+
+            return parent::printStackTrace();
+        }
+
+        // log all exceptions in php log
+        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 9ade775db..72a928bb3 100644
--- a/lib/exception/sfException.class.php
+++ b/lib/exception/sfException.class.php
@@ -14,462 +14,405 @@
  * provides an additional method for printing up a detailed view of an
  * throwable.
  *
- * @package    symfony
- * @subpackage exception
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 class sfException extends Exception
 {
-  /** @var Exception|Throwable|null */
-  protected
-    $wrappedException = null;
-
-  static protected
-    $lastException = null;
-
-  /**
-   * Wraps an Throwable.
-   *
-   * @param Exception|Throwable $e An Throwable instance
-   *
-   * @return sfException An sfException instance that wraps the given Throwable object
-   */
-  static public function createFromException($e)
-  {
-    $exception = new sfException(sprintf('Wrapped %s: %s', get_class($e), $e->getMessage()));
-    $exception->setWrappedException($e);
-    self::$lastException = $e;
-
-    return $exception;
-  }
-
-  /**
-   * Sets the wrapped exception.
-   *
-   * @param Exception|Throwable $e A Throwable instance
-   */
-  public function setWrappedException($e)
-  {
-    $this->wrappedException = $e;
-
-    self::$lastException = $e;
-  }
-
-  /**
-   * Gets the last wrapped throwable.
-   *
-   * @return Exception|Throwable An Throwable instance
-   */
-  static public function getLastException()
-  {
-    return self::$lastException;
-  }
-
-  /**
-   * Clears the $lastException property (added for #6342)
-   */
-  static public function clearLastException()
-  {
-    self::$lastException = null;
-  }
-
-  /**
-   * Prints the stack trace for this exception.
-   */
-  public function printStackTrace()
-  {
-    if (null === $this->wrappedException)
+    /** @var Exception|Throwable|null */
+    protected $wrappedException;
+
+    protected static $lastException;
+
+    /**
+     * Wraps an Throwable.
+     *
+     * @param Exception|Throwable $e An Throwable instance
+     *
+     * @return sfException An sfException instance that wraps the given Throwable object
+     */
+    public static function createFromException($e)
     {
-      $this->setWrappedException($this);
-    }
+        $exception = new sfException(sprintf('Wrapped %s: %s', get_class($e), $e->getMessage()));
+        $exception->setWrappedException($e);
+        self::$lastException = $e;
 
-    $exception = $this->wrappedException;
+        return $exception;
+    }
 
-    if (!sfConfig::get('sf_test'))
+    /**
+     * Sets the wrapped exception.
+     *
+     * @param Exception|Throwable $e A Throwable instance
+     */
+    public function setWrappedException($e)
     {
-      // log all exceptions in php log
-      error_log($exception->getMessage());
-
-      // clean current output buffer
-      while (ob_get_level())
-      {
-        if (!ob_end_clean())
-        {
-          break;
-        }
-      }
+        $this->wrappedException = $e;
 
-      if (sfConfig::get('sf_compressed')) {
-        ob_start('ob_gzhandler');
-      }
-
-      header('HTTP/1.0 500 Internal Server Error');
+        self::$lastException = $e;
     }
 
-    if (version_compare(PHP_VERSION, '7.0.0') >= 0)
-    {
-      try
-      {
-        $this->outputStackTrace($exception);
-      }
-      catch (Throwable $e)
-      {
-      }
-    }
-    else
+    /**
+     * Gets the last wrapped throwable.
+     *
+     * @return Exception|Throwable An Throwable instance
+     */
+    public static function getLastException()
     {
-      try
-      {
-        $this->outputStackTrace($exception);
-      }
-      catch (Exception $e)
-      {
-      }
+        return self::$lastException;
     }
 
-    if (!sfConfig::get('sf_test'))
+    /**
+     * Clears the $lastException property (added for #6342).
+     */
+    public static function clearLastException()
     {
-      exit(1);
+        self::$lastException = null;
     }
-  }
-
-  /**
-   * Gets the stack trace for this exception.
-   * @param Exception|Throwable $exception
-   */
-  static protected function outputStackTrace($exception)
-  {
-    $format = 'html';
-    $code   = '500';
-    $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()))
+
+    /**
+     * Prints the stack trace for this exception.
+     */
+    public function printStackTrace()
     {
-      /** @var $request sfWebRequest */
-      /** @var $response sfWebResponse */
-
-      $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)));
-      }
-
-      $event = $dispatcher->notifyUntil(new sfEvent($exception, 'application.throw_exception'));
-      if ($event->isProcessed())
-      {
-        return;
-      }
-
-      if ($response->getStatusCode() < 300)
-      {
-        // status code has already been sent, but is included here for the purpose of testing
-        $response->setStatusCode(500);
-      }
-
-      $response->setContentType('text/html');
-
-      if (!sfConfig::get('sf_test'))
-      {
-        foreach ($response->getHttpHeaders() as $name => $value)
-        {
-          header($name.': '.$value);
+        if (null === $this->wrappedException) {
+            $this->setWrappedException($this);
         }
-      }
 
-      $code = $response->getStatusCode();
-      $text = $response->getStatusText();
+        $exception = $this->wrappedException;
 
-      $format = $request->getRequestFormat();
-      if (!$format)
-      {
-        $format = 'html';
-      }
+        if (!sfConfig::get('sf_test')) {
+            // log all exceptions in php log
+            error_log($exception->getMessage());
 
-      if ($mimeType = $request->getMimeType($format))
-      {
-        $response->setContentType($mimeType);
-      }
-    }
-    else
-    {
-      // a backward compatible default
-      if (!sfConfig::get('sf_test'))
-      {
-        header('Content-Type: text/html; charset='.sfConfig::get('sf_charset', 'utf-8'));
-      }
-    }
+            // clean current output buffer
+            while (ob_get_level()) {
+                if (!ob_end_clean()) {
+                    break;
+                }
+            }
 
-    // send an error 500 if not in debug mode
-    if (!sfConfig::get('sf_debug'))
-    {
-      if ($template = self::getTemplatePathForError($format, false))
-      {
-        include $template;
-        return;
-      }
-    }
+            if (sfConfig::get('sf_compressed')) {
+                ob_start('ob_gzhandler');
+            }
 
-    // when using CLI, we force the format to be TXT. Compare exactly to
-    // the string 'cli' because the php 5.4 server is identified by 'cli-server'
-    if ('cli' == PHP_SAPI)
-    {
-      $format = 'txt';
-    }
+            header('HTTP/1.0 500 Internal Server Error');
+        }
 
-    $message = null === $exception->getMessage() ? 'n/a' : $exception->getMessage();
-    $name    = get_class($exception);
-    $traces  = self::getTraces($exception, $format);
+        if (version_compare(PHP_VERSION, '7.0.0') >= 0) {
+            try {
+                $this->outputStackTrace($exception);
+            } catch (Throwable $e) {
+            }
+        } else {
+            try {
+                $this->outputStackTrace($exception);
+            } catch (Exception $e) {
+            }
+        }
 
-    // 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 (!sfConfig::get('sf_test')) {
+            exit(1);
+        }
     }
 
-    if (isset($response) && $response)
+    /**
+     * Returns the path for the template error message.
+     *
+     * @param string $format The request format
+     * @param bool   $debug  Whether to return a template for the debug mode or not
+     *
+     * @return bool|string false if the template cannot be found for the given format,
+     *                     the absolute path to the template otherwise
+     */
+    public static function getTemplatePathForError($format, $debug)
     {
-      $response->sendHttpHeaders();
-    }
+        $templatePaths = array(
+            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) {
+            if (null !== $path && is_readable($file = $path.'/'.$template)) {
+                return $file;
+            }
+        }
 
-    if ($template = self::getTemplatePathForError($format, true))
-    {
-      if (isset($dispatcher))
-      {
-        ob_start();
-        include $template;
-        $content = ob_get_clean();
-
-        $event = $dispatcher->filter(new sfEvent($response, 'response.filter_content'), $content);
-
-        echo $event->getReturnValue();
-      }
-      else
-      {
-        include $template;
-      }
-
-      return;
+        return false;
     }
 
-  }
-
-  /**
-   * Returns the path for the template error message.
-   *
-   * @param  string  $format The request format
-   * @param  Boolean $debug  Whether to return a template for the debug mode or not
-   *
-   * @return string|Boolean  false if the template cannot be found for the given format,
-   *                         the absolute path to the template otherwise
-   */
-  static public function getTemplatePathForError($format, $debug)
-  {
-    $templatePaths = array(
-      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)
+    /**
+     * Gets the stack trace for this exception.
+     *
+     * @param Exception|Throwable $exception
+     */
+    protected static function outputStackTrace($exception)
     {
-      if (null !== $path && is_readable($file = $path.'/'.$template))
-      {
-        return $file;
-      }
-    }
+        $format = 'html';
+        $code = '500';
+        $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)));
+            }
+
+            $event = $dispatcher->notifyUntil(new sfEvent($exception, 'application.throw_exception'));
+            if ($event->isProcessed()) {
+                return;
+            }
+
+            if ($response->getStatusCode() < 300) {
+                // status code has already been sent, but is included here for the purpose of testing
+                $response->setStatusCode(500);
+            }
+
+            $response->setContentType('text/html');
+
+            if (!sfConfig::get('sf_test')) {
+                foreach ($response->getHttpHeaders() as $name => $value) {
+                    header($name.': '.$value);
+                }
+            }
+
+            $code = $response->getStatusCode();
+            $text = $response->getStatusText();
+
+            $format = $request->getRequestFormat();
+            if (!$format) {
+                $format = 'html';
+            }
+
+            if ($mimeType = $request->getMimeType($format)) {
+                $response->setContentType($mimeType);
+            }
+        } else {
+            // a backward compatible default
+            if (!sfConfig::get('sf_test')) {
+                header('Content-Type: text/html; charset='.sfConfig::get('sf_charset', 'utf-8'));
+            }
+        }
 
-    return false;
-  }
-
-  /**
-   * Returns an array of exception traces.
-   *
-   * @param Exception|Throwable $exception  An Throwable implementation instance
-   * @param string              $format     The trace format (txt or html)
-   *
-   * @return array An array of traces
-   */
-  static protected function getTraces($exception, $format = 'txt')
-  {
-    $traceData = $exception->getTrace();
-    array_unshift($traceData, array(
-      'function' => '',
-      'file'     => $exception->getFile() != null ? $exception->getFile() : null,
-      'line'     => $exception->getLine() != null ? $exception->getLine() : null,
-      'args'     => array(),
-    ));
-
-    $traces = array();
-    if ($format == 'html')
-    {
-      $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
-    {
-      $lineFormat = 'at %s%s%s(%s) in %s line %s';
+        // send an error 500 if not in debug mode
+        if (!sfConfig::get('sf_debug')) {
+            if ($template = self::getTemplatePathForError($format, false)) {
+                include $template;
+
+                return;
+            }
+        }
+
+        // when using CLI, we force the format to be TXT. Compare exactly to
+        // the string 'cli' because the php 5.4 server is identified by 'cli-server'
+        if ('cli' == PHP_SAPI) {
+            $format = 'txt';
+        }
+
+        $message = null === $exception->getMessage() ? 'n/a' : $exception->getMessage();
+        $name = get_class($exception);
+        $traces = self::getTraces($exception, $format);
+
+        // 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 (isset($response) && $response) {
+            $response->sendHttpHeaders();
+        }
+
+        if ($template = self::getTemplatePathForError($format, true)) {
+            if (isset($dispatcher)) {
+                ob_start();
+
+                include $template;
+                $content = ob_get_clean();
+
+                $event = $dispatcher->filter(new sfEvent($response, 'response.filter_content'), $content);
+
+                echo $event->getReturnValue();
+            } else {
+                include $template;
+            }
+
+            return;
+        }
     }
 
-    for ($i = 0, $count = count($traceData); $i < $count; $i++)
+    /**
+     * Returns an array of exception traces.
+     *
+     * @param Exception|Throwable $exception An Throwable implementation instance
+     * @param string              $format    The trace format (txt or html)
+     *
+     * @return array An array of traces
+     */
+    protected static function getTraces($exception, $format = 'txt')
     {
-      $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();
-      $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)),
-        null === $line ? 'n/a' : $line,
-        'trace_'.$i,
-        'trace_'.$i,
-        $i == 0 ? 'block' : 'none',
-        self::fileExcerpt($file, $line)
-      );
+        $traceData = $exception->getTrace();
+        array_unshift($traceData, array(
+            'function' => '',
+            'file' => null != $exception->getFile() ? $exception->getFile() : null,
+            'line' => null != $exception->getLine() ? $exception->getLine() : null,
+            'args' => array(),
+        ));
+
+        $traces = array();
+        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 {
+            $lineFormat = 'at %s%s%s(%s) in %s line %s';
+        }
+
+        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();
+            $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)),
+                null === $line ? 'n/a' : $line,
+                'trace_'.$i,
+                'trace_'.$i,
+                0 == $i ? 'block' : 'none',
+                self::fileExcerpt($file, $line)
+            );
+        }
+
+        return $traces;
     }
 
-    return $traces;
-  }
-
-  /**
-   * Returns an HTML version of an array as YAML.
-   *
-   * @param array $values The values array
-   *
-   * @return string An HTML string
-   */
-  static protected function formatArrayAsHtml($values)
-  {
-    return '<pre>'.self::escape(@sfYaml::dump($values)).'</pre>';
-  }
-
-  /**
-   * Returns an excerpt of a code file around the given line number.
-   *
-   * @param string $file  A file path
-   * @param int    $line  The selected line number
-   *
-   * @return string An HTML string
-   */
-  static protected function fileExcerpt($file, $line)
-  {
-    // $file can be null for RuntimeException
-    if (null === $file)
+    /**
+     * Returns an HTML version of an array as YAML.
+     *
+     * @param array $values The values array
+     *
+     * @return string An HTML string
+     */
+    protected static function formatArrayAsHtml($values)
     {
-      return '';
+        return '<pre>'.self::escape(@sfYaml::dump($values)).'</pre>';
     }
 
-    if (is_readable($file))
+    /**
+     * Returns an excerpt of a code file around the given line number.
+     *
+     * @param string $file A file path
+     * @param int    $line The selected line number
+     *
+     * @return string An HTML string
+     */
+    protected static function fileExcerpt($file, $line)
     {
-      $content = preg_split('#<br />#', preg_replace('/^<code>(.*)<\/code>$/s', '$1', highlight_file($file, true)));
+        // $file can be null for RuntimeException
+        if (null === $file) {
+            return '';
+        }
 
-      $lines = array();
-      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>';
-      }
+        if (is_readable($file)) {
+            $content = preg_split('#<br />#', preg_replace('/^<code>(.*)<\/code>$/s', '$1', highlight_file($file, true)));
 
-      return '<ol start="'.max($line - 3, 1).'">'.implode("\n", $lines).'</ol>';
-    }
-  }
-
-  /**
-   * Formats an array as a string.
-   *
-   * @param array   $args     The argument array
-   * @param boolean $single
-   * @param string  $format   The format string (html or txt)
-   *
-   * @return string
-   */
-  static protected function formatArgs($args, $single = false, $format = 'html')
-  {
-    $result = array();
-
-    $single and $args = array($args);
-
-    foreach ($args as $key => $value)
-    {
-      if (is_object($value))
-      {
-        $formattedValue = ($format == 'html' ? '<em>object</em>' : 'object').sprintf("('%s')", get_class($value));
-      }
-      else if (is_array($value))
-      {
-        $formattedValue = ($format == 'html' ? '<em>array</em>' : 'array').sprintf("(%s)", self::formatArgs($value));
-      }
-      else if (is_string($value))
-      {
-        $formattedValue = ($format == 'html' ? sprintf("'%s'", self::escape($value)) : "'$value'");
-      }
-      else if (null === $value)
-      {
-        $formattedValue = ($format == 'html' ? '<em>null</em>' : 'null');
-      }
-      else
-      {
-        $formattedValue = $value;
-      }
-
-      $result[] = is_int($key) ? $formattedValue : sprintf("'%s' => %s", self::escape($key), $formattedValue);
+            $lines = array();
+            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>';
+            }
+
+            return '<ol start="'.max($line - 3, 1).'">'.implode("\n", $lines).'</ol>';
+        }
     }
 
-    return implode(', ', $result);
-  }
-
-  /**
-   * Formats a file path.
-   *
-   * @param  string  $file   An absolute file path
-   * @param  integer $line   The line number
-   * @param  string  $format The output format (txt or html)
-   * @param  string  $text   Use this text for the link rather than the file path
-   *
-   * @return string
-   */
-  static protected function formatFile($file, $line, $format = 'html', $text = null)
-  {
-    if (null === $text)
+    /**
+     * Formats an array as a string.
+     *
+     * @param array  $args   The argument array
+     * @param bool   $single
+     * @param string $format The format string (html or txt)
+     *
+     * @return string
+     */
+    protected static function formatArgs($args, $single = false, $format = 'html')
     {
-      $text = $file;
+        $result = array();
+
+        $single and $args = array($args);
+
+        foreach ($args as $key => $value) {
+            if (is_object($value)) {
+                $formattedValue = ('html' == $format ? '<em>object</em>' : 'object').sprintf("('%s')", get_class($value));
+            } elseif (is_array($value)) {
+                $formattedValue = ('html' == $format ? '<em>array</em>' : 'array').sprintf('(%s)', self::formatArgs($value));
+            } elseif (is_string($value)) {
+                $formattedValue = ('html' == $format ? sprintf("'%s'", self::escape($value)) : "'{$value}'");
+            } elseif (null === $value) {
+                $formattedValue = ('html' == $format ? '<em>null</em>' : 'null');
+            } else {
+                $formattedValue = $value;
+            }
+
+            $result[] = is_int($key) ? $formattedValue : sprintf("'%s' => %s", self::escape($key), $formattedValue);
+        }
+
+        return implode(', ', $result);
     }
 
-    if ('html' == $format && $file && $line && $linkFormat = sfConfig::get('sf_file_link_format', ini_get('xdebug.file_link_format')))
+    /**
+     * Formats a file path.
+     *
+     * @param string $file   An absolute file path
+     * @param int    $line   The line number
+     * @param string $format The output format (txt or html)
+     * @param string $text   Use this text for the link rather than the file path
+     *
+     * @return string
+     */
+    protected static function formatFile($file, $line, $format = 'html', $text = null)
     {
-      $link = strtr($linkFormat, array('%f' => $file, '%l' => $line));
-      $text = sprintf('<a href="%s" title="Click to open this file" class="file_link">%s</a>', $link, $text);
+        if (null === $text) {
+            $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));
+            $text = sprintf('<a href="%s" title="Click to open this file" class="file_link">%s</a>', $link, $text);
+        }
+
+        return $text;
     }
 
-    return $text;
-  }
-
-  /**
-   * Escapes a string value with html entities
-   *
-   * @param  string  $value
-   *
-   * @return string
-   */
-  static protected function escape($value)
-  {
-    if (!is_string($value))
+    /**
+     * Escapes a string value with html entities.
+     *
+     * @param string $value
+     *
+     * @return string
+     */
+    protected static function escape($value)
     {
-      return $value;
-    }
+        if (!is_string($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 e882c49fd..09ace8583 100644
--- a/lib/exception/sfFactoryException.class.php
+++ b/lib/exception/sfFactoryException.class.php
@@ -4,7 +4,7 @@
  * 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>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -13,10 +13,9 @@
  * sfFactoryException is thrown when an error occurs while attempting to create
  * a new factory implementation instance.
  *
- * @package    symfony
- * @subpackage exception
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 class sfFactoryException extends sfException
diff --git a/lib/exception/sfFileException.class.php b/lib/exception/sfFileException.class.php
index b31fc58d0..6d208aa90 100644
--- a/lib/exception/sfFileException.class.php
+++ b/lib/exception/sfFileException.class.php
@@ -4,7 +4,7 @@
  * 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>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -12,10 +12,9 @@
 /**
  * sfFileException is thrown when an error occurs while moving an uploaded file.
  *
- * @package    symfony
- * @subpackage exception
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 class sfFileException extends sfException
diff --git a/lib/exception/sfFilterException.class.php b/lib/exception/sfFilterException.class.php
index 11946230d..57205203f 100644
--- a/lib/exception/sfFilterException.class.php
+++ b/lib/exception/sfFilterException.class.php
@@ -4,7 +4,7 @@
  * 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>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -13,10 +13,9 @@
  * sfFilterException is thrown when an error occurs while attempting to initialize
  * or execute a filter.
  *
- * @package    symfony
- * @subpackage exception
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 class sfFilterException extends sfException
diff --git a/lib/exception/sfForwardException.class.php b/lib/exception/sfForwardException.class.php
index b8537d986..55daadb99 100644
--- a/lib/exception/sfForwardException.class.php
+++ b/lib/exception/sfForwardException.class.php
@@ -4,7 +4,7 @@
  * 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>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -13,10 +13,9 @@
  * sfForwardException is thrown when an error occurs while attempting to forward
  * the request.
  *
- * @package    symfony
- * @subpackage exception
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 class sfForwardException extends sfException
diff --git a/lib/exception/sfInitializationException.class.php b/lib/exception/sfInitializationException.class.php
index e6db11094..72ffedc22 100644
--- a/lib/exception/sfInitializationException.class.php
+++ b/lib/exception/sfInitializationException.class.php
@@ -4,7 +4,7 @@
  * 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>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -12,10 +12,9 @@
 /**
  * sfInitializationException is thrown when an initialization procedure fails.
  *
- * @package    symfony
- * @subpackage exception
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 class sfInitializationException extends sfException
diff --git a/lib/exception/sfParseException.class.php b/lib/exception/sfParseException.class.php
index 768821640..2ac7cccd6 100644
--- a/lib/exception/sfParseException.class.php
+++ b/lib/exception/sfParseException.class.php
@@ -4,7 +4,7 @@
  * 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>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -13,10 +13,9 @@
  * sfParseException is thrown when a parsing procedure fails to complete
  * successfully.
  *
- * @package    symfony
- * @subpackage exception
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 class sfParseException extends sfException
diff --git a/lib/exception/sfRenderException.class.php b/lib/exception/sfRenderException.class.php
index 94496e55c..d37d578a3 100644
--- a/lib/exception/sfRenderException.class.php
+++ b/lib/exception/sfRenderException.class.php
@@ -4,7 +4,7 @@
  * 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>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -12,10 +12,9 @@
 /**
  * sfRenderException is thrown when a view's pre-render check fails.
  *
- * @package    symfony
- * @subpackage exception
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 class sfRenderException extends sfException
diff --git a/lib/exception/sfSecurityException.class.php b/lib/exception/sfSecurityException.class.php
index 529f54011..65de552a5 100644
--- a/lib/exception/sfSecurityException.class.php
+++ b/lib/exception/sfSecurityException.class.php
@@ -4,7 +4,7 @@
  * 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>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -12,10 +12,9 @@
 /**
  * sfSecurityException is thrown when a security related error occurs.
  *
- * @package    symfony
- * @subpackage exception
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 class sfSecurityException extends sfException
diff --git a/lib/exception/sfStopException.class.php b/lib/exception/sfStopException.class.php
index 41b3cb52d..2a93e279f 100644
--- a/lib/exception/sfStopException.class.php
+++ b/lib/exception/sfStopException.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -11,17 +11,16 @@
 /**
  * sfStopException is thrown when you want to stop action flow.
  *
- * @package    symfony
- * @subpackage exception
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfStopException extends sfException
 {
-  /**
-   * Stops the current action.
-   */
-  public function printStackTrace()
-  {
-  }
+    /**
+     * Stops the current action.
+     */
+    public function printStackTrace()
+    {
+    }
 }
diff --git a/lib/exception/sfStorageException.class.php b/lib/exception/sfStorageException.class.php
index 16e85f71b..7bf258518 100644
--- a/lib/exception/sfStorageException.class.php
+++ b/lib/exception/sfStorageException.class.php
@@ -4,7 +4,7 @@
  * 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>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -13,10 +13,9 @@
  * sfStorageException is thrown when a requested sfStorage implementation doesn't
  * exist or data cannot be read from or written to the storage.
  *
- * @package    symfony
- * @subpackage exception
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 class sfStorageException extends sfException
diff --git a/lib/exception/sfViewException.class.php b/lib/exception/sfViewException.class.php
index 6b9f8964e..4715fd95d 100644
--- a/lib/exception/sfViewException.class.php
+++ b/lib/exception/sfViewException.class.php
@@ -4,7 +4,7 @@
  * 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>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -12,10 +12,9 @@
 /**
  * sfViewException is thrown when an error occurs in a view.
  *
- * @package    symfony
- * @subpackage exception
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 class sfViewException extends sfException
diff --git a/lib/filter/sfBasicSecurityFilter.class.php b/lib/filter/sfBasicSecurityFilter.class.php
index bbd22332a..98de43078 100644
--- a/lib/filter/sfBasicSecurityFilter.class.php
+++ b/lib/filter/sfBasicSecurityFilter.class.php
@@ -4,7 +4,7 @@
  * 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>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -15,94 +15,87 @@
  * verifies the user has the same credential by calling the hasCredential()
  * method of SecurityUser.
  *
- * @package    symfony
- * @subpackage filter
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 class sfBasicSecurityFilter extends sfFilter
 {
-  /**
-   * Executes this filter.
-   *
-   * @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())
-    )
+    /**
+     * Executes this filter.
+     *
+     * @param sfFilterChain $filterChain A sfFilterChain instance
+     */
+    public function execute($filterChain)
     {
-      $filterChain->execute();
+        // 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())
+        ) {
+            $filterChain->execute();
 
-      return;
-    }
+            return;
+        }
 
-    // NOTE: the nice thing about the Action class is that getCredential()
+        // NOTE: the nice thing about the Action class is that getCredential()
     //       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')))));
-      }
-     
-      // the user is not authenticated
-      $this->forwardToLoginAction();
-    }
+        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')))));
+            }
 
-    // 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')))));
-      }
-    
-      // the user doesn't have access
-      $this->forwardToSecureAction();
-    }
+            // the user is not authenticated
+            $this->forwardToLoginAction();
+        }
 
-    // the user has access, continue
-    $filterChain->execute();
-  }
+        // 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')))));
+            }
 
-  /**
-   * Forwards the current request to the secure action.
-   *
-   * @throws sfStopException
-   */
-  protected function forwardToSecureAction()
-  {    
-    $this->context->getController()->forward(sfConfig::get('sf_secure_module'), sfConfig::get('sf_secure_action'));
+            // the user doesn't have access
+            $this->forwardToSecureAction();
+        }
 
-    throw new sfStopException();
-  }
+        // the user has access, continue
+        $filterChain->execute();
+    }
 
-  /**
-   * Forwards the current request to the login action.
-   *
-   * @throws sfStopException
-   */
-  protected function forwardToLoginAction()
-  {
-    $this->context->getController()->forward(sfConfig::get('sf_login_module'), sfConfig::get('sf_login_action'));
+    /**
+     * Forwards the current request to the secure action.
+     *
+     * @throws sfStopException
+     */
+    protected function forwardToSecureAction()
+    {
+        $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
+     */
+    protected function forwardToLoginAction()
+    {
+        $this->context->getController()->forward(sfConfig::get('sf_login_module'), sfConfig::get('sf_login_action'));
 
-  /**
-   * Returns the credential required for this action.
-   *
-   * @return mixed The credential required for this action
-   */
-  protected function getUserCredential()
-  {
-    return $this->context->getController()->getActionStack()->getLastEntry()->getActionInstance()->getCredential();
-  }
+        throw new sfStopException();
+    }
+
+    /**
+     * Returns the credential required for this action.
+     *
+     * @return mixed The credential required for this action
+     */
+    protected function getUserCredential()
+    {
+        return $this->context->getController()->getActionStack()->getLastEntry()->getActionInstance()->getCredential();
+    }
 }
diff --git a/lib/filter/sfCacheFilter.class.php b/lib/filter/sfCacheFilter.class.php
index 9d0420a3b..6a6352737 100644
--- a/lib/filter/sfCacheFilter.class.php
+++ b/lib/filter/sfCacheFilter.class.php
@@ -11,217 +11,192 @@
 /**
  * sfCacheFilter deals with page caching and action caching.
  *
- * @package    symfony
- * @subpackage filter
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfCacheFilter extends sfFilter
 {
-  protected
-    $cacheManager = null,
-    $request      = null,
-    $response     = null,
-    $routing      = null,
-    $cache        = array();
-
-  /**
-   * Initializes this Filter.
-   *
-   * @param sfContext $context    The current application context
-   * @param array     $parameters An associative array of initialization parameters
-   *
-   * @return void
-   *
-   * @throws <b>sfInitializationException</b> If an error occurs while initializing this Filter
-   */
-  public function initialize($context, $parameters = array())
-  {
-    parent::initialize($context, $parameters);
-
-    $this->cacheManager = $context->getViewCacheManager();
-    $this->request      = $context->getRequest();
-    $this->response     = $context->getResponse();
-    $this->routing      = $context->getRouting();
-  }
-
-  /**
-   * Executes this filter.
-   *
-   * @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'))
+    protected $cacheManager;
+    protected $request;
+    protected $response;
+    protected $routing;
+    protected $cache = array();
+
+    /**
+     * Initializes this Filter.
+     *
+     * @param sfContext $context    The current application context
+     * @param array     $parameters An associative array of initialization parameters
+     *
+     * @throws <b>sfInitializationException</b> If an error occurs while initializing this Filter
+     */
+    public function initialize($context, $parameters = array())
     {
-      $filterChain->execute();
+        parent::initialize($context, $parameters);
 
-      return;
+        $this->cacheManager = $context->getViewCacheManager();
+        $this->request = $context->getRequest();
+        $this->response = $context->getResponse();
+        $this->routing = $context->getRouting();
     }
 
-    if ($this->executeBeforeExecution())
+    /**
+     * Executes this filter.
+     *
+     * @param sfFilterChain $filterChain A sfFilterChain instance
+     */
+    public function execute($filterChain)
     {
-      $filterChain->execute();
-    }
+        // execute this filter only once, if cache is set and no GET or POST parameters
+        if (!sfConfig::get('sf_cache')) {
+            $filterChain->execute();
 
-    $this->executeBeforeRendering();
-  }
+            return;
+        }
 
-  public function executeBeforeExecution()
-  {
-    $uri = $this->cacheManager->getCurrentCacheKey();
+        if ($this->executeBeforeExecution()) {
+            $filterChain->execute();
+        }
 
-    if (null === $uri)
-    {
-      return true;
+        $this->executeBeforeRendering();
     }
 
-    // page cache
-    $cacheable = $this->cacheManager->isCacheable($uri);
-    if ($cacheable && $this->cacheManager->withLayout($uri))
+    public function executeBeforeExecution()
     {
-      $inCache = $this->cacheManager->getPageCache($uri);
-      $this->cache[$uri] = $inCache;
+        $uri = $this->cacheManager->getCurrentCacheKey();
 
-      if ($inCache)
-      {
-        // update the local response reference with the one pulled from the cache
-        $this->response = $this->context->getResponse();
+        if (null === $uri) {
+            return true;
+        }
 
-        // page is in cache, so no need to run execution filter
-        return false;
-      }
-    }
+        // page cache
+        $cacheable = $this->cacheManager->isCacheable($uri);
+        if ($cacheable && $this->cacheManager->withLayout($uri)) {
+            $inCache = $this->cacheManager->getPageCache($uri);
+            $this->cache[$uri] = $inCache;
 
-    return true;
-  }
+            if ($inCache) {
+                // update the local response reference with the one pulled from the cache
+                $this->response = $this->context->getResponse();
 
-  /**
-   * Executes this filter.
-   */
-  public function executeBeforeRendering()
-  {
-    // cache only 200 HTTP status
-    if (200 != $this->response->getStatusCode())
-    {
-      return;
-    }
+                // page is in cache, so no need to run execution filter
+                return false;
+            }
+        }
 
-    $uri = $this->cacheManager->getCurrentCacheKey();
+        return true;
+    }
 
-    // save page in cache
-    if (isset($this->cache[$uri]) && false === $this->cache[$uri])
+    /**
+     * Executes this filter.
+     */
+    public function executeBeforeRendering()
     {
-      $this->setCacheExpiration($uri);
-      $this->setCacheValidation($uri);
+        // cache only 200 HTTP status
+        if (200 != $this->response->getStatusCode()) {
+            return;
+        }
 
-      // set Vary headers
-      foreach ($this->cacheManager->getVary($uri, 'page') as $vary)
-      {
-        $this->response->addVaryHttpHeader($vary);
-      }
+        $uri = $this->cacheManager->getCurrentCacheKey();
 
-      $this->cacheManager->setPageCache($uri);
-    }
+        // save page in cache
+        if (isset($this->cache[$uri]) && false === $this->cache[$uri]) {
+            $this->setCacheExpiration($uri);
+            $this->setCacheValidation($uri);
 
-    // cache validation
-    $this->checkCacheValidation();
-  }
-
-  /**
-   * Sets cache expiration headers.
-   *
-   * @param string $uri An internal URI
-   */
-  protected function setCacheExpiration($uri)
-  {
-    // don't add cache expiration (Expires) if
-    //   * the client lifetime is not set
-    //   * the response already has a cache validation (Last-Modified header)
-    //   * the Expires header has already been set
-    if (!$lifetime = $this->cacheManager->getClientLifeTime($uri, 'page'))
-    {
-      return;
-    }
+            // set Vary headers
+            foreach ($this->cacheManager->getVary($uri, 'page') as $vary) {
+                $this->response->addVaryHttpHeader($vary);
+            }
 
-    if ($this->response->hasHttpHeader('Last-Modified'))
-    {
-      return;
-    }
+            $this->cacheManager->setPageCache($uri);
+        }
 
-    if (!$this->response->hasHttpHeader('Expires'))
-    {
-      $this->response->setHttpHeader('Expires', $this->response->getDate(time() + $lifetime), false);
-      $this->response->addCacheControlHttpHeader('max-age', $lifetime);
-    }
-  }
-
-  /**
-   * Sets cache validation headers.
-   *
-   * @param string $uri An internal URI
-   */
-
-  protected function setCacheValidation($uri)
-  {
-    // don't add cache validation (Last-Modified) if
-    //   * the client lifetime is set (cache.yml)
-    //   * the response already has a Last-Modified header
-    if ($this->cacheManager->getClientLifeTime($uri, 'page'))
-    {
-      return;
+        // cache validation
+        $this->checkCacheValidation();
     }
 
-    if (!$this->response->hasHttpHeader('Last-Modified'))
+    /**
+     * Sets cache expiration headers.
+     *
+     * @param string $uri An internal URI
+     */
+    protected function setCacheExpiration($uri)
     {
-      $this->response->setHttpHeader('Last-Modified', $this->response->getDate(time()), false);
-    }
+        // don't add cache expiration (Expires) if
+        //   * the client lifetime is not set
+        //   * the response already has a cache validation (Last-Modified header)
+        //   * the Expires header has already been set
+        if (!$lifetime = $this->cacheManager->getClientLifeTime($uri, 'page')) {
+            return;
+        }
 
-    if (sfConfig::get('sf_etag'))
-    {
-      $etag = '"'.md5($this->response->getContent()).'"';
-      $this->response->setHttpHeader('ETag', $etag);
+        if ($this->response->hasHttpHeader('Last-Modified')) {
+            return;
+        }
+
+        if (!$this->response->hasHttpHeader('Expires')) {
+            $this->response->setHttpHeader('Expires', $this->response->getDate(time() + $lifetime), false);
+            $this->response->addCacheControlHttpHeader('max-age', $lifetime);
+        }
     }
-  }
-
-  /**
-   * Checks cache validation headers.
-   */
-  protected function checkCacheValidation()
-  {
-    // Etag support
-    if (sfConfig::get('sf_etag'))
+
+    /**
+     * Sets cache validation headers.
+     *
+     * @param string $uri An internal URI
+     */
+    protected function setCacheValidation($uri)
     {
-      $etag = '"'.md5($this->response->getContent()).'"';
+        // don't add cache validation (Last-Modified) if
+        //   * the client lifetime is set (cache.yml)
+        //   * the response already has a Last-Modified header
+        if ($this->cacheManager->getClientLifeTime($uri, 'page')) {
+            return;
+        }
 
-      if ($this->request->getHttpHeader('IF_NONE_MATCH') == $etag)
-      {
-        $this->response->setStatusCode(304);
-        $this->response->setHeaderOnly(true);
+        if (!$this->response->hasHttpHeader('Last-Modified')) {
+            $this->response->setHttpHeader('Last-Modified', $this->response->getDate(time()), false);
+        }
 
-        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_etag')) {
+            $etag = '"'.md5($this->response->getContent()).'"';
+            $this->response->setHttpHeader('ETag', $etag);
         }
-      }
     }
 
-    // conditional GET support
-    // never in debug mode
-    if ($this->response->hasHttpHeader('Last-Modified') && (!sfConfig::get('sf_debug') || sfConfig::get('sf_test')))
+    /**
+     * Checks cache validation headers.
+     */
+    protected function checkCacheValidation()
     {
-      $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)')));
+        // Etag support
+        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)')));
+                }
+            }
+        }
+
+        // conditional GET support
+        // never in debug mode
+        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)')));
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/lib/filter/sfCommonFilter.class.php b/lib/filter/sfCommonFilter.class.php
index 8e872d538..c308633f7 100644
--- a/lib/filter/sfCommonFilter.class.php
+++ b/lib/filter/sfCommonFilter.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -11,48 +11,43 @@
 /**
  * sfCommonFilter automatically adds javascripts and stylesheets information in the sfResponse content.
  *
- * @package    symfony
- * @subpackage filter
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfCommonFilter extends sfFilter
 {
-  /**
-   * Executes this filter.
-   *
-   * @param sfFilterChain $filterChain A sfFilterChain instance
-   */
-  public function execute($filterChain)
-  {
-    // execute next filter
-    $filterChain->execute();
+    /**
+     * Executes this filter.
+     *
+     * @param sfFilterChain $filterChain A sfFilterChain instance
+     */
+    public function execute($filterChain)
+    {
+        // execute next filter
+        $filterChain->execute();
 
-    // execute this filter only once
-    $response = $this->context->getResponse();
+        // execute this filter only once
+        $response = $this->context->getResponse();
 
-    // include javascripts and stylesheets
-    $content = $response->getContent();
-    if (false !== ($pos = strpos($content, '</head>')))
-    {
-      $this->context->getConfiguration()->loadHelpers(array('Tag', 'Asset'));
-      $html = '';
-      if (!sfConfig::get('symfony.asset.javascripts_included', false))
-      {
-        $html .= get_javascripts($response);
-      }
-      if (!sfConfig::get('symfony.asset.stylesheets_included', false))
-      {
-        $html .= get_stylesheets($response);
-      }
+        // include javascripts and stylesheets
+        $content = $response->getContent();
+        if (false !== ($pos = strpos($content, '</head>'))) {
+            $this->context->getConfiguration()->loadHelpers(array('Tag', 'Asset'));
+            $html = '';
+            if (!sfConfig::get('symfony.asset.javascripts_included', false)) {
+                $html .= get_javascripts($response);
+            }
+            if (!sfConfig::get('symfony.asset.stylesheets_included', false)) {
+                $html .= get_stylesheets($response);
+            }
 
-      if ($html)
-      {
-        $response->setContent(substr($content, 0, $pos).$html.substr($content, $pos));
-      }
-    }
+            if ($html) {
+                $response->setContent(substr($content, 0, $pos).$html.substr($content, $pos));
+            }
+        }
 
-    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 828c04db2..96f58bec0 100644
--- a/lib/filter/sfExecutionFilter.class.php
+++ b/lib/filter/sfExecutionFilter.class.php
@@ -13,154 +13,150 @@
  * sfExecutionFilter is the last filter registered for each filter chain. This
  * filter does all action and view execution.
  *
- * @package    symfony
- * @subpackage filter
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 class sfExecutionFilter extends sfFilter
 {
-  /**
-   * Executes this filter.
-   *
-   * @param sfFilterChain $filterChain The filter chain
-   *
-   * @throws <b>sfInitializeException</b> If an error occurs during view initialization.
-   * @throws <b>sfViewException</b>       If an error occurs while executing the view.
-   */
-  public function execute($filterChain)
-  {
-    // get the current action instance
-    /** @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'))
+    /**
+     * Executes this filter.
+     *
+     * @param sfFilterChain $filterChain The filter chain
+     *
+     * @throws <b>sfInitializeException</b> If an error occurs during view initialization
+     * @throws <b>sfViewException</b>       If an error occurs while executing the view
+     */
+    public function execute($filterChain)
     {
-      $timer = sfTimerManager::getTimer(sprintf('Action "%s/%s"', $actionInstance->getModuleName(), $actionInstance->getActionName()));
+        // get the current action instance
+        /** @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()));
 
-      $viewName = $this->handleAction($filterChain, $actionInstance);
+            $viewName = $this->handleAction($filterChain, $actionInstance);
 
-      $timer->addTime();
-      $timer = sfTimerManager::getTimer(sprintf('View "%s" for "%s/%s"', $viewName, $actionInstance->getModuleName(), $actionInstance->getActionName()));
+            $timer->addTime();
+            $timer = sfTimerManager::getTimer(sprintf('View "%s" for "%s/%s"', $viewName, $actionInstance->getModuleName(), $actionInstance->getActionName()));
 
-      $this->handleView($filterChain, $actionInstance, $viewName);
+            $this->handleView($filterChain, $actionInstance, $viewName);
 
-      $timer->addTime();
+            $timer->addTime();
+        } else {
+            $viewName = $this->handleAction($filterChain, $actionInstance);
+            $this->handleView($filterChain, $actionInstance, $viewName);
+        }
     }
-    else
+
+    /**
+     * Handles the action.
+     *
+     * @param sfFilterChain $filterChain    The current filter chain
+     * @param sfAction      $actionInstance An sfAction instance
+     *
+     * @return string The view type
+     */
+    protected function handleAction($filterChain, $actionInstance)
     {
-      $viewName = $this->handleAction($filterChain, $actionInstance);
-      $this->handleView($filterChain, $actionInstance, $viewName);
+        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 $this->executeAction($actionInstance);
     }
-  }
-
-  /**
-   * Handles the action.
-   *
-   * @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'))
+
+    /**
+     * Executes the execute method of an action.
+     *
+     * @param sfAction $actionInstance An sfAction instance
+     *
+     * @return string The view type
+     */
+    protected function executeAction($actionInstance)
     {
-      $uri = $this->context->getViewCacheManager()->getCurrentCacheKey();
-      if (null !== $uri && $this->context->getViewCacheManager()->hasActionCache($uri))
-      {
-        // action in cache, so go to the view
-        return sfView::SUCCESS;
-      }
+        // execute the action
+        $actionInstance->preExecute();
+        $viewName = $actionInstance->execute($this->context->getRequest());
+        $actionInstance->postExecute();
+
+        return null === $viewName ? sfView::SUCCESS : $viewName;
     }
 
-    return $this->executeAction($actionInstance);
-  }
-
-  /**
-   * Executes the execute method of an action.
-   *
-   * @param sfAction $actionInstance An sfAction instance
-   *
-   * @return string The view type
-   */
-  protected function executeAction($actionInstance)
-  {
-    // execute the action
-    $actionInstance->preExecute();
-    $viewName = $actionInstance->execute($this->context->getRequest());
-    $actionInstance->postExecute();
-
-    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
-   */
-  protected function handleView($filterChain, $actionInstance, $viewName)
-  {
-    switch ($viewName)
+    /**
+     * Handles the view.
+     *
+     * @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)
     {
-      case sfView::HEADER_ONLY:
-        $this->context->getResponse()->setHeaderOnly(true);
-        return;
-      case sfView::NONE:
-        return;
+        switch ($viewName) {
+            case sfView::HEADER_ONLY:
+                $this->context->getResponse()->setHeaderOnly(true);
+
+                return;
+
+            case sfView::NONE:
+                return;
+        }
+
+        $this->executeView($actionInstance->getModuleName(), $actionInstance->getActionName(), $viewName, $actionInstance->getVarHolder()->getAll());
     }
 
-    $this->executeView($actionInstance->getModuleName(), $actionInstance->getActionName(), $viewName, $actionInstance->getVarHolder()->getAll());
-  }
-
-  /**
-   * Executes and renders the view.
-   *
-   * The behavior of this method depends on the controller render mode:
-   *
-   *   - sfView::NONE: Nothing happens.
-   *   - sfView::RENDER_CLIENT: View data populates the response content.
-   *   - sfView::RENDER_VAR: View data populates the data presentation variable.
-   *
-   * @param string $moduleName     The module name
-   * @param string $actionName     The action name
-   * @param string $viewName       The view name
-   * @param array  $viewAttributes An array of view attributes
-   *
-   * @return string The view data
-   */
-  protected function executeView($moduleName, $actionName, $viewName, $viewAttributes)
-  {
-    $controller = $this->context->getController();
-
-    // get the view instance
-    $view = $controller->getView($moduleName, $actionName, $viewName);
-
-    // execute the view
-    $view->execute();
-
-    // pass attributes to the view
-    $view->getAttributeHolder()->add($viewAttributes);
-
-    // render the view
-    switch ($controller->getRenderMode())
+    /**
+     * Executes and renders the view.
+     *
+     * The behavior of this method depends on the controller render mode:
+     *
+     *   - sfView::NONE: Nothing happens.
+     *   - sfView::RENDER_CLIENT: View data populates the response content.
+     *   - sfView::RENDER_VAR: View data populates the data presentation variable.
+     *
+     * @param string $moduleName     The module name
+     * @param string $actionName     The action name
+     * @param string $viewName       The view name
+     * @param array  $viewAttributes An array of view attributes
+     *
+     * @return string The view data
+     */
+    protected function executeView($moduleName, $actionName, $viewName, $viewAttributes)
     {
-      case sfView::RENDER_NONE:
-        break;
-
-      case sfView::RENDER_CLIENT:
-        $viewData = $view->render();
-        $this->context->getResponse()->setContent($viewData);
-        break;
-
-      case sfView::RENDER_VAR:
-        $viewData = $view->render();
-        $controller->getActionStack()->getLastEntry()->setPresentation($viewData);
-        break;
+        $controller = $this->context->getController();
+
+        // get the view instance
+        $view = $controller->getView($moduleName, $actionName, $viewName);
+
+        // execute the view
+        $view->execute();
+
+        // pass attributes to the view
+        $view->getAttributeHolder()->add($viewAttributes);
+
+        // render the view
+        switch ($controller->getRenderMode()) {
+            case sfView::RENDER_NONE:
+                break;
+
+            case sfView::RENDER_CLIENT:
+                $viewData = $view->render();
+                $this->context->getResponse()->setContent($viewData);
+
+                break;
+
+            case sfView::RENDER_VAR:
+                $viewData = $view->render();
+                $controller->getActionStack()->getLastEntry()->setPresentation($viewData);
+
+                break;
+        }
     }
-  }
 }
diff --git a/lib/filter/sfFilter.class.php b/lib/filter/sfFilter.class.php
index 8fbeecbe6..81dc19cb5 100644
--- a/lib/filter/sfFilter.class.php
+++ b/lib/filter/sfFilter.class.php
@@ -12,145 +12,141 @@
 /**
  * sfFilter provides a way for you to intercept incoming requests or outgoing responses.
  *
- * @package    symfony
- * @subpackage filter
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfFilter
 {
-  /** @var sfParameterHolder */
-  protected $parameterHolder = null;
-  /** @var sfContext */
-  protected $context = null;
-
-  /** @var bool[] */
-  public static
-    $filterCalled    = array();
-
-  /**
-   * Class constructor.
-   *
-   * @see initialize()
-   *
-   * @param sfContext $context
-   * @param array     $parameters
-   */
-  public function __construct($context, $parameters = array())
-  {
-    $this->initialize($context, $parameters);
-  }
-
-  /**
-   * Initializes this Filter.
-   *
-   * @param sfContext $context    The current application context
-   * @param array     $parameters An associative array of initialization parameters
-   *
-   * @return boolean|void true
-   */
-  public function initialize($context, $parameters = array())
-  {
-    $this->context = $context;
-
-    $this->parameterHolder = new sfParameterHolder();
-    $this->parameterHolder->add($parameters);
-
-    return true;
-  }
-
-  /**
-   * Returns true if this is the first call to the sfFilter instance.
-   *
-   * @return boolean true if this is the first call to the sfFilter instance, false otherwise
-   */
-  protected function isFirstCall()
-  {
-    $class = get_class($this);
-    if (isset(self::$filterCalled[$class]))
+    /** @var bool[] */
+    public static $filterCalled = array();
+
+    /** @var sfParameterHolder */
+    protected $parameterHolder;
+
+    /** @var sfContext */
+    protected $context;
+
+    /**
+     * Class constructor.
+     *
+     * @see initialize()
+     *
+     * @param sfContext $context
+     * @param array     $parameters
+     */
+    public function __construct($context, $parameters = array())
+    {
+        $this->initialize($context, $parameters);
+    }
+
+    /**
+     * Initializes this Filter.
+     *
+     * @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())
+    {
+        $this->context = $context;
+
+        $this->parameterHolder = new sfParameterHolder();
+        $this->parameterHolder->add($parameters);
+
+        return true;
+    }
+
+    /**
+     * Retrieves the current application context.
+     *
+     * @return sfContext The current sfContext instance
+     */
+    final public function getContext()
+    {
+        return $this->context;
+    }
+
+    /**
+     * Gets the parameter holder for this object.
+     *
+     * @return sfParameterHolder A sfParameterHolder instance
+     */
+    public function getParameterHolder()
     {
-      return false;
+        return $this->parameterHolder;
     }
-    else
+
+    /**
+     * Gets the parameter associated with the given key.
+     *
+     * This is a shortcut for:
+     *
+     * <code>$this->getParameterHolder()->get()</code>
+     *
+     * @param string $name    The key name
+     * @param string $default The default value
+     *
+     * @return string The value associated with the key
+     *
+     * @see sfParameterHolder
+     */
+    public function getParameter($name, $default = null)
     {
-      self::$filterCalled[$class] = true;
+        return $this->parameterHolder->get($name, $default);
+    }
+
+    /**
+     * Returns true if the given key exists in the parameter holder.
+     *
+     * This is a shortcut for:
+     *
+     * <code>$this->getParameterHolder()->has()</code>
+     *
+     * @param string $name The key name
+     *
+     * @return bool true if the given key exists, false otherwise
+     *
+     * @see sfParameterHolder
+     */
+    public function hasParameter($name)
+    {
+        return $this->parameterHolder->has($name);
+    }
+
+    /**
+     * Sets the value for the given key.
+     *
+     * This is a shortcut for:
+     *
+     * <code>$this->getParameterHolder()->set()</code>
+     *
+     * @param string $name  The key name
+     * @param string $value The value
+     *
+     * @see sfParameterHolder
+     */
+    public function setParameter($name, $value)
+    {
+        return $this->parameterHolder->set($name, $value);
+    }
+
+    /**
+     * Returns true if this is the first call to the sfFilter instance.
+     *
+     * @return bool true if this is the first call to the sfFilter instance, false otherwise
+     */
+    protected function isFirstCall()
+    {
+        $class = get_class($this);
+        if (isset(self::$filterCalled[$class])) {
+            return false;
+        }
+
+        self::$filterCalled[$class] = true;
 
-      return true;
+        return true;
     }
-  }
-
-  /**
-   * Retrieves the current application context.
-   *
-   * @return sfContext The current sfContext instance
-   */
-  public final function getContext()
-  {
-    return $this->context;
-  }
-
-  /**
-   * Gets the parameter holder for this object.
-   *
-   * @return sfParameterHolder A sfParameterHolder instance
-   */
-  public function getParameterHolder()
-  {
-    return $this->parameterHolder;
-  }
-
-  /**
-   * Gets the parameter associated with the given key.
-   *
-   * This is a shortcut for:
-   *
-   * <code>$this->getParameterHolder()->get()</code>
-   *
-   * @param string $name    The key name
-   * @param string $default The default value
-   *
-   * @return string The value associated with the key
-   *
-   * @see sfParameterHolder
-   */
-  public function getParameter($name, $default = null)
-  {
-    return $this->parameterHolder->get($name, $default);
-  }
-
-  /**
-   * Returns true if the given key exists in the parameter holder.
-   *
-   * This is a shortcut for:
-   *
-   * <code>$this->getParameterHolder()->has()</code>
-   *
-   * @param string $name The key name
-   *
-   * @return boolean true if the given key exists, false otherwise
-   *
-   * @see sfParameterHolder
-   */
-  public function hasParameter($name)
-  {
-    return $this->parameterHolder->has($name);
-  }
-
-  /**
-   * Sets the value for the given key.
-   *
-   * This is a shortcut for:
-   *
-   * <code>$this->getParameterHolder()->set()</code>
-   *
-   * @param string $name  The key name
-   * @param string $value The value
-   *
-   * @see sfParameterHolder
-   */
-  public function setParameter($name, $value)
-  {
-    return $this->parameterHolder->set($name, $value);
-  }
 }
diff --git a/lib/filter/sfFilterChain.class.php b/lib/filter/sfFilterChain.class.php
index e2aa748dc..2cdaec93e 100644
--- a/lib/filter/sfFilterChain.class.php
+++ b/lib/filter/sfFilterChain.class.php
@@ -4,7 +4,7 @@
  * 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>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -12,75 +12,69 @@
 /**
  * sfFilterChain manages registered filters for a specific context.
  *
- * @package    symfony
- * @subpackage filter
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 class sfFilterChain
 {
-  protected
-    $chain = array(),
-    $index = -1;
-
-  /**
-   * Loads filters configuration for a given action instance.
-   *
-   * @param sfComponent $actionInstance A sfComponent instance
-   */
-  public function loadConfiguration($actionInstance)
-  {
-    require(sfContext::getInstance()->getConfigCache()->checkConfig('modules/'.$actionInstance->getModuleName().'/config/filters.yml'));
-  }
+    protected $chain = array();
+    protected $index = -1;
 
-  /**
-   * Executes the next filter in this chain.
-   */
-  public function execute()
-  {
-    // skip to the next filter
-    ++$this->index;
+    /**
+     * Loads filters configuration for a given action instance.
+     *
+     * @param sfComponent $actionInstance A sfComponent instance
+     */
+    public function loadConfiguration($actionInstance)
+    {
+        require sfContext::getInstance()->getConfigCache()->checkConfig('modules/'.$actionInstance->getModuleName().'/config/filters.yml');
+    }
 
-    if ($this->index < count($this->chain))
+    /**
+     * Executes the next filter in this chain.
+     */
+    public function execute()
     {
-      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])))));
-      }
+        // skip to the next filter
+        ++$this->index;
 
-      // execute the next filter
-      $this->chain[$this->index]->execute($this);
+        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])))));
+            }
+
+            // execute the next filter
+            $this->chain[$this->index]->execute($this);
+        }
     }
-  }
 
-  /**
-   * Returns true if the filter chain contains a filter of a given class.
-   *
-   * @param string $class The class name of the filter
-   *
-   * @return boolean true if the filter exists, false otherwise
-   */
-  public function hasFilter($class)
-  {
-    foreach ($this->chain as $filter)
+    /**
+     * Returns true if the filter chain contains a filter of a given class.
+     *
+     * @param string $class The class name of the filter
+     *
+     * @return bool true if the filter exists, false otherwise
+     */
+    public function hasFilter($class)
     {
-      if ($filter instanceof $class)
-      {
-        return true;
-      }
-    }
+        foreach ($this->chain as $filter) {
+            if ($filter instanceof $class) {
+                return true;
+            }
+        }
 
-    return false;
-  }
+        return false;
+    }
 
-  /**
-   * Registers a filter with this chain.
-   *
-   * @param sfFilter $filter A sfFilter implementation instance.
-   */
-  public function register($filter)
-  {
-    $this->chain[] = $filter;
-  }
+    /**
+     * Registers a filter with this chain.
+     *
+     * @param sfFilter $filter a sfFilter implementation instance
+     */
+    public function register($filter)
+    {
+        $this->chain[] = $filter;
+    }
 }
diff --git a/lib/filter/sfRenderingFilter.class.php b/lib/filter/sfRenderingFilter.class.php
index e77001101..84559ec96 100644
--- a/lib/filter/sfRenderingFilter.class.php
+++ b/lib/filter/sfRenderingFilter.class.php
@@ -12,43 +12,39 @@
  * sfRenderingFilter is the last filter registered for each filter chain. This
  * filter does the rendering.
  *
- * @package    symfony
- * @subpackage filter
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfRenderingFilter extends sfFilter
 {
-  /**
-   * Executes this filter.
-   *
-   * @param sfFilterChain $filterChain The filter chain.
-   *
-   * @throws <b>sfInitializeException</b> If an error occurs during view initialization
-   * @throws <b>sfViewException</b>       If an error occurs while executing the view
-   */
-  public function execute($filterChain)
-  {
-    // execute next filter
-    $filterChain->execute();
+    /**
+     * Executes this filter.
+     *
+     * @param sfFilterChain $filterChain the filter chain
+     *
+     * @throws <b>sfInitializeException</b> If an error occurs during view initialization
+     * @throws <b>sfViewException</b>       If an error occurs while executing the view
+     */
+    public function execute($filterChain)
+    {
+        // execute next filter
+        $filterChain->execute();
 
-    // get response object
-    $response = $this->context->getResponse();
+        // get response object
+        $response = $this->context->getResponse();
 
-    // hack to rethrow sfForm and|or sfFormField __toString() exceptions (see sfForm and sfFormField)
-    if (sfForm::hasToStringException())
-    {
-      throw sfForm::getToStringException();
-    }
-    else if (sfFormField::hasToStringException())
-    {
-      throw sfFormField::getToStringException();
-    }
+        // hack to rethrow sfForm and|or sfFormField __toString() exceptions (see sfForm and sfFormField)
+        if (sfForm::hasToStringException()) {
+            throw sfForm::getToStringException();
+        }
+        if (sfFormField::hasToStringException()) {
+            throw sfFormField::getToStringException();
+        }
 
-    // send headers + content
-    if (sfView::RENDER_VAR != $this->context->getController()->getRenderMode())
-    {
-        $response->send();
+        // send headers + content
+        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 a670db69a..24be7b5bf 100644
--- a/lib/form/addon/sfFormFilter.class.php
+++ b/lib/form/addon/sfFormFilter.class.php
@@ -13,9 +13,8 @@
  *
  * This class extends BaseForm, a class generated automatically with each new project.
  *
- * @package    symfony
- * @subpackage form
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfFormFilter extends BaseForm
diff --git a/lib/form/addon/sfFormObject.class.php b/lib/form/addon/sfFormObject.class.php
index ec7ef5ca4..1b85fa003 100644
--- a/lib/form/addon/sfFormObject.class.php
+++ b/lib/form/addon/sfFormObject.class.php
@@ -11,281 +11,258 @@
 /**
  * Base class for forms that deal with a single object.
  *
- * @package    symfony
- * @subpackage form
  * @author     Kris Wallsmith <kris.wallsmith@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfFormObject extends BaseForm
 {
-  protected
-    $isNew  = true,
-    $object = null;
-
-  /**
-   * Returns the current model name.
-   *
-   * @return string
-   */
-  abstract public function getModelName();
-
-  /**
-   * Returns the default connection for the current model.
-   *
-   * @return mixed A database connection
-   */
-  abstract public function getConnection();
-
-  /**
-   * Updates the values of the object with the cleaned up values.
-   *
-   * If you want to add some logic before updating or update other associated
-   * objects, this is the method to override.
-   *
-   * @param array $values An array of values
-   */
-  abstract protected function doUpdateObject($values);
-
-  /**
-   * Processes cleaned up values.
-   *
-   * @param  array $values An array of values
-   *
-   * @return array An array of cleaned up values
-   */
-  abstract public function processValues($values);
-
-  /**
-   * Returns true if the current form embeds a new object.
-   *
-   * @return Boolean true if the current form embeds a new object, false otherwise
-   */
-  public function isNew()
-  {
-    return $this->isNew;
-  }
-
-  /**
-   * Returns the current object for this form.
-   *
-   * @return mixed The current object
-   */
-  public function getObject()
-  {
-    return $this->object;
-  }
-
-  /**
-   * Binds the current form and saves the object to the database in one step.
-   *
-   * @param  array $taintedValues An array of tainted values to use to bind the form
-   * @param  array $taintedFiles An array of uploaded files (in the $_FILES or $_GET format)
-   * @param  mixed $con An optional connection object
-   *
-   * @return Boolean true if the form is valid, false otherwise
-   */
-  public function bindAndSave($taintedValues, $taintedFiles = null, $con = null)
-  {
-    $this->bind($taintedValues, $taintedFiles);
-    if ($this->isValid())
+    protected $isNew = true;
+    protected $object;
+
+    /**
+     * Returns the current model name.
+     *
+     * @return string
+     */
+    abstract public function getModelName();
+
+    /**
+     * Returns the default connection for the current model.
+     *
+     * @return mixed A database connection
+     */
+    abstract public function getConnection();
+
+    /**
+     * Processes cleaned up values.
+     *
+     * @param array $values An array of values
+     *
+     * @return array An array of cleaned up values
+     */
+    abstract public function processValues($values);
+
+    /**
+     * Returns true if the current form embeds a new object.
+     *
+     * @return bool true if the current form embeds a new object, false otherwise
+     */
+    public function isNew()
     {
-      $this->save($con);
-
-      return true;
+        return $this->isNew;
     }
 
-    return false;
-  }
-
-
-  /**
-   * Saves the current object to the database.
-   *
-   * The object saving is done in a transaction and handled by the doSave() method.
-   *
-   * @param mixed $con An optional connection object
-   *
-   * @return mixed The current saved object
-   *
-   * @throws Exception
-   * @throws sfValidatorErrorSchema
-   *
-   * @see doSave()
-   */
-  public function save($con = null)
-  {
-    if (!$this->isValid())
+    /**
+     * Returns the current object for this form.
+     *
+     * @return mixed The current object
+     */
+    public function getObject()
     {
-      throw $this->getErrorSchema();
+        return $this->object;
     }
 
-    if (null === $con)
+    /**
+     * Binds the current form and saves the object to the database in one step.
+     *
+     * @param array $taintedValues An array of tainted values to use to bind the form
+     * @param array $taintedFiles  An array of uploaded files (in the $_FILES or $_GET format)
+     * @param mixed $con           An optional connection object
+     *
+     * @return bool true if the form is valid, false otherwise
+     */
+    public function bindAndSave($taintedValues, $taintedFiles = null, $con = null)
     {
-      $con = $this->getConnection();
-    }
+        $this->bind($taintedValues, $taintedFiles);
+        if ($this->isValid()) {
+            $this->save($con);
 
-    $con->beginTransaction();
-    try
-    {
-      $this->doSave($con);
+            return true;
+        }
 
-      $con->commit();
+        return false;
     }
-    catch (Exception $e)
+
+    /**
+     * Saves the current object to the database.
+     *
+     * The object saving is done in a transaction and handled by the doSave() method.
+     *
+     * @param mixed $con An optional connection object
+     *
+     * @return mixed The current saved object
+     *
+     * @throws Exception
+     * @throws sfValidatorErrorSchema
+     *
+     * @see doSave()
+     */
+    public function save($con = null)
     {
-      $con->rollBack();
+        if (!$this->isValid()) {
+            throw $this->getErrorSchema();
+        }
 
-      throw $e;
-    }
+        if (null === $con) {
+            $con = $this->getConnection();
+        }
 
-    return $this->getObject();
-  }
-
-  /**
-   * Updates and saves the current object.
-   *
-   * If you want to add some logic before saving or save other associated
-   * objects, this is the method to override.
-   *
-   * @param mixed $con An optional connection object
-   */
-  protected function doSave($con = null)
-  {
-    $this->updateObject();
-    $this->saveObject($con);
-  }
-
-  /**
-   * Save form object
-   *
-   * @param  mixed $con An optional connection object
-   */
-  public function saveObject($con = null)
-  {
-    if (null === $con)
-    {
-      $con = $this->getConnection();
+        $con->beginTransaction();
+
+        try {
+            $this->doSave($con);
+
+            $con->commit();
+        } catch (Exception $e) {
+            $con->rollBack();
+
+            throw $e;
+        }
+
+        return $this->getObject();
     }
 
-    $this->getObject()->save($con);
-
-    // embedded forms
-    $this->saveObjectEmbeddedForms($con);
-  }
-
-  /**
-   * Updates the values of the object with the cleaned up values.
-   *
-   * @param  array $values An array of values
-   *
-   * @return mixed The current updated object
-   */
-  public function updateObject($values = null)
-  {
-    if (null === $values)
+    /**
+     * Save form object.
+     *
+     * @param mixed $con An optional connection object
+     */
+    public function saveObject($con = null)
     {
-      $values = $this->values;
+        if (null === $con) {
+            $con = $this->getConnection();
+        }
+
+        $this->getObject()->save($con);
+
+        // embedded forms
+        $this->saveObjectEmbeddedForms($con);
     }
 
-    $values = $this->processValues($values);
+    /**
+     * Updates the values of the object with the cleaned up values.
+     *
+     * @param array $values An array of values
+     *
+     * @return mixed The current updated object
+     */
+    public function updateObject($values = null)
+    {
+        if (null === $values) {
+            $values = $this->values;
+        }
 
-    $this->doUpdateObject($values);
+        $values = $this->processValues($values);
 
-    // embedded forms
-    $this->updateObjectEmbeddedForms($values);
+        $this->doUpdateObject($values);
 
-    return $this->getObject();
-  }
+        // embedded forms
+        $this->updateObjectEmbeddedForms($values);
 
-  /**
-   * Updates the values of the objects in embedded forms.
-   *
-   * @param array $values An array of values
-   * @param array $forms  An array of forms
-   */
-  public function updateObjectEmbeddedForms($values, $forms = null)
-  {
-    if (null === $forms)
-    {
-      $forms = $this->embeddedForms;
+        return $this->getObject();
     }
 
-    foreach ($forms as $name => $form)
+    /**
+     * Updates the values of the objects in embedded forms.
+     *
+     * @param array $values An array of values
+     * @param array $forms  An array of forms
+     */
+    public function updateObjectEmbeddedForms($values, $forms = null)
     {
-      if (!isset($values[$name]) || !is_array($values[$name]))
-      {
-        continue;
-      }
-
-      if ($form instanceof sfFormObject)
-      {
-        $form->updateObject($values[$name]);
-      }
-      else
-      {
-        $this->updateObjectEmbeddedForms($values[$name], $form->getEmbeddedForms());
-      }
+        if (null === $forms) {
+            $forms = $this->embeddedForms;
+        }
+
+        foreach ($forms as $name => $form) {
+            if (!isset($values[$name]) || !is_array($values[$name])) {
+                continue;
+            }
+
+            if ($form instanceof sfFormObject) {
+                $form->updateObject($values[$name]);
+            } else {
+                $this->updateObjectEmbeddedForms($values[$name], $form->getEmbeddedForms());
+            }
+        }
     }
-  }
-
-  /**
-   * Saves embedded form objects.
-   *
-   * @param mixed $con   An optional connection object
-   * @param array $forms An array of forms
-   */
-  public function saveObjectEmbeddedForms($con = null, $forms = null)
-  {
-    if (null === $con)
+
+    /**
+     * Saves embedded form objects.
+     *
+     * @param mixed $con   An optional connection object
+     * @param array $forms An array of forms
+     */
+    public function saveObjectEmbeddedForms($con = null, $forms = null)
     {
-      $con = $this->getConnection();
+        if (null === $con) {
+            $con = $this->getConnection();
+        }
+
+        if (null === $forms) {
+            $forms = $this->embeddedForms;
+        }
+
+        foreach ($forms as $form) {
+            if ($form instanceof sfFormObject) {
+                $form->saveObject($con);
+            } else {
+                $this->saveObjectEmbeddedForms($con, $form->getEmbeddedForms());
+            }
+        }
     }
 
-    if (null === $forms)
+    /**
+     * Renders a form tag suitable for the related object.
+     *
+     * The method is automatically guessed based on the Doctrine object:
+     *
+     *  * if the object is new, the method is POST
+     *  * if the object already exists, the method is PUT
+     *
+     * @param string $url        The URL for the action
+     * @param array  $attributes An array of HTML attributes
+     *
+     * @return string An HTML representation of the opening form tag
+     *
+     * @see sfForm
+     */
+    public function renderFormTag($url, array $attributes = array())
     {
-      $forms = $this->embeddedForms;
+        if (!isset($attributes['method'])) {
+            $attributes['method'] = $this->isNew() ? 'post' : 'put';
+        }
+
+        return parent::renderFormTag($url, $attributes);
     }
 
-    foreach ($forms as $form)
+    /**
+     * Updates the values of the object with the cleaned up values.
+     *
+     * If you want to add some logic before updating or update other associated
+     * objects, this is the method to override.
+     *
+     * @param array $values An array of values
+     */
+    abstract protected function doUpdateObject($values);
+
+    /**
+     * Updates and saves the current object.
+     *
+     * If you want to add some logic before saving or save other associated
+     * objects, this is the method to override.
+     *
+     * @param mixed $con An optional connection object
+     */
+    protected function doSave($con = null)
     {
-      if ($form instanceof sfFormObject)
-      {
-        $form->saveObject($con);
-      }
-      else
-      {
-        $this->saveObjectEmbeddedForms($con, $form->getEmbeddedForms());
-      }
+        $this->updateObject();
+        $this->saveObject($con);
     }
-  }
-
-  /**
-   * Renders a form tag suitable for the related object.
-   *
-   * The method is automatically guessed based on the Doctrine object:
-   *
-   *  * if the object is new, the method is POST
-   *  * if the object already exists, the method is PUT
-   *
-   * @param  string $url         The URL for the action
-   * @param  array  $attributes  An array of HTML attributes
-   *
-   * @return string An HTML representation of the opening form tag
-   *
-   * @see sfForm
-   */
-  public function renderFormTag($url, array $attributes = array())
-  {
-    if (!isset($attributes['method']))
+
+    protected function camelize($text)
     {
-      $attributes['method'] = $this->isNew() ? 'post' : 'put';
+        return strtr(ucwords(strtr($text, array('/' => ':: ', '_' => ' ', '-' => ' '))), array(' ' => ''));
     }
-
-    return parent::renderFormTag($url, $attributes);
-  }
-
-  protected function camelize($text)
-  {
-    return strtr(ucwords(strtr($text, array('/' => ':: ', '_' => ' ', '-' => ' '))), array(' ' => ''));
-  }
 }
diff --git a/lib/form/addon/sfFormSymfony.class.php b/lib/form/addon/sfFormSymfony.class.php
index 27989cfd5..31efc2e54 100644
--- a/lib/form/addon/sfFormSymfony.class.php
+++ b/lib/form/addon/sfFormSymfony.class.php
@@ -11,104 +11,94 @@
 /**
  * Extends the form component with symfony-specific functionality.
  *
- * @package    symfony
- * @subpackage form
  * @author     Kris Wallsmith <kris.wallsmith@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfFormSymfony extends sfForm
 {
-  /** @var sfEventDispatcher|null */
-  static protected
-    $dispatcher = null;
-
-  /**
-   * Constructor.
-   *
-   * Notifies the 'form.post_configure' event.
-   *
-   * @see sfForm
-   * @inheritdoc
-   */
-  public function __construct($defaults = array(), $options = array(), $CSRFSecret = null)
-  {
-    parent::__construct($defaults, $options, $CSRFSecret);
+    /** @var sfEventDispatcher|null */
+    protected static $dispatcher;
 
-    if (self::$dispatcher)
+    /**
+     * Constructor.
+     *
+     * Notifies the 'form.post_configure' event.
+     *
+     * @see sfForm
+     * {@inheritdoc}
+     */
+    public function __construct($defaults = array(), $options = array(), $CSRFSecret = null)
     {
-      self::$dispatcher->notify(new sfEvent($this, 'form.post_configure'));
+        parent::__construct($defaults, $options, $CSRFSecret);
+
+        if (self::$dispatcher) {
+            self::$dispatcher->notify(new sfEvent($this, 'form.post_configure'));
+        }
     }
-  }
 
-  /**
-   * Sets the event dispatcher to be used by all forms.
-   *
-   * @param sfEventDispatcher $dispatcher
-   */
-  static public function setEventDispatcher(sfEventDispatcher $dispatcher = null)
-  {
-    self::$dispatcher = $dispatcher;
-  }
+    /**
+     * Calls methods defined via sfEventDispatcher.
+     *
+     * @param string $method    The method name
+     * @param array  $arguments The method arguments
+     *
+     * @return mixed The returned value of the called method
+     *
+     * @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)));
+            if ($event->isProcessed()) {
+                return $event->getReturnValue();
+            }
+        }
 
-  /**
-   * Returns the event dispatcher.
-   *
-   * @return sfEventDispatcher
-   */
-  static public function getEventDispatcher()
-  {
-    return self::$dispatcher;
-  }
+        throw new sfException(sprintf('Call to undefined method %s::%s.', get_class($this), $method));
+    }
 
-  /**
-   * Notifies the 'form.filter_values' and 'form.validation_error' events.
-   *
-   * @see sfForm
-   * @inheritdoc
-   */
-  protected function doBind(array $values)
-  {
-    if (self::$dispatcher)
+    /**
+     * Sets the event dispatcher to be used by all forms.
+     *
+     * @param sfEventDispatcher $dispatcher
+     */
+    public static function setEventDispatcher(sfEventDispatcher $dispatcher = null)
     {
-      $values = self::$dispatcher->filter(new sfEvent($this, 'form.filter_values'), $values)->getReturnValue();
+        self::$dispatcher = $dispatcher;
     }
 
-    try
+    /**
+     * Returns the event dispatcher.
+     *
+     * @return sfEventDispatcher
+     */
+    public static function getEventDispatcher()
     {
-      parent::doBind($values);
+        return self::$dispatcher;
     }
-    catch (sfValidatorError $error)
+
+    /**
+     * Notifies the 'form.filter_values' and 'form.validation_error' events.
+     *
+     * @see sfForm
+     * {@inheritdoc}
+     */
+    protected function doBind(array $values)
     {
-      if (self::$dispatcher)
-      {
-        self::$dispatcher->notify(new sfEvent($this, 'form.validation_error', array('error' => $error)));
-      }
+        if (self::$dispatcher) {
+            $values = self::$dispatcher->filter(new sfEvent($this, 'form.filter_values'), $values)->getReturnValue();
+        }
 
-      throw $error;
-    }
-  }
+        try {
+            parent::doBind($values);
+        } catch (sfValidatorError $error) {
+            if (self::$dispatcher) {
+                self::$dispatcher->notify(new sfEvent($this, 'form.validation_error', array('error' => $error)));
+            }
 
-  /**
-   * Calls methods defined via sfEventDispatcher.
-   *
-   * @param string $method    The method name
-   * @param array  $arguments The method arguments
-   *
-   * @return mixed The returned value of the called method
-   *
-   * @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)));
-      if ($event->isProcessed())
-      {
-        return $event->getReturnValue();
-      }
+            throw $error;
+        }
     }
-
-    throw new sfException(sprintf('Call to undefined method %s::%s.', get_class($this), $method));
-  }
 }
diff --git a/lib/form/sfForm.class.php b/lib/form/sfForm.class.php
index 2db45bbde..89b21de26 100644
--- a/lib/form/sfForm.class.php
+++ b/lib/form/sfForm.class.php
@@ -20,1425 +20,1352 @@
  * CSRF secret. If the global CSRF secret is also null, then a random one
  * is generated on the fly.
  *
- * @package    symfony
- * @subpackage form
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfForm implements ArrayAccess, Iterator, Countable
 {
-  protected static
-    $CSRFSecret        = false,
-    $CSRFFieldName     = '_csrf_token',
-    $toStringException = null;
-
-  /** @var sfWidgetFormSchema|sfWidget[]|sfWidgetFormSchemaDecorator[] */
-  protected $widgetSchema    = null;
-  /** @var sfValidatorSchema|sfValidatorBase[] */
-  protected $validatorSchema = null;
-  /** @var sfValidatorErrorSchema|sfValidatorError[] */
-  protected $errorSchema     = null;
-  /** @var sfFormFieldSchema|null */
-  protected $formFieldSchema = null;
-  /** @var sfFormField[] */
-  protected $formFields      = array();
-  protected $isBound         = false;
-  protected $taintedValues   = array();
-  protected $taintedFiles    = array();
-  protected $values          = null;
-  protected $defaults        = array();
-  protected $fieldNames      = array();
-  protected $options         = array();
-  protected $count           = 0;
-  protected $localCSRFSecret = null;
-  /** @var sfForm[] */
-  protected $embeddedForms   = array();
-
-  /**
-   * Constructor.
-   *
-   * @param array  $defaults    An array of field default values
-   * @param array  $options     An array of options
-   * @param string $CSRFSecret  A CSRF secret
-   */
-  public function __construct($defaults = array(), $options = array(), $CSRFSecret = null)
-  {
-    $this->options = $options;
-    $this->localCSRFSecret = $CSRFSecret;
-
-    $this->validatorSchema = new sfValidatorSchema();
-    $this->widgetSchema    = new sfWidgetFormSchema();
-    $this->errorSchema     = new sfValidatorErrorSchema($this->validatorSchema);
-
-    $this->setDefaults($defaults);
-    $this->setup();
-    $this->configure();
-
-    $this->addCSRFProtection($this->localCSRFSecret);
-    $this->resetFormFields();
-  }
-
-  /**
-   * Returns a string representation of the form.
-   *
-   * @return string A string representation of the form
-   *
-   * @see render()
-   */
-  public function __toString()
-  {
-    try
-    {
-      return $this->render();
-    }
-    catch (Exception $e)
-    {
-      self::setToStringException($e);
-
-      // we return a simple Exception message in case the form framework is used out of symfony.
-      return 'Exception: '.$e->getMessage();
-    }
-  }
-
-  /**
-   * Configures the current form.
-   */
-  public function configure()
-  {
-  }
-
-  /**
-   * Setups the current form.
-   *
-   * This method is overridden by generator.
-   *
-   * If you want to do something at initialization, you have to override the configure() method.
-   *
-   * @see configure()
-   */
-  public function setup()
-  {
-  }
-
-  /**
-   * Renders the widget schema associated with this form.
-   *
-   * @param  array  $attributes  An array of HTML attributes
-   *
-   * @return string The rendered widget schema
-   */
-  public function render($attributes = array())
-  {
-    return $this->getFormFieldSchema()->render($attributes);
-  }
-
-  /**
-   * Renders the widget schema using a specific form formatter
-   *
-   * @param  string  $formatterName  The form formatter name
-   * @param  array   $attributes     An array of HTML attributes
-   *
-   * @return string The rendered widget schema
-   */
-  public function renderUsing($formatterName, $attributes = array())
-  {
-    $currentFormatterName = $this->widgetSchema->getFormFormatterName();
-
-    $this->widgetSchema->setFormFormatterName($formatterName);
-
-    $output = $this->render($attributes);
-
-    $this->widgetSchema->setFormFormatterName($currentFormatterName);
-
-    return $output;
-  }
-
-  /**
-   * Renders hidden form fields.
-   *
-   * @param boolean $recursive False will prevent hidden fields from embedded forms from rendering
-   *
-   * @return string
-   *
-   * @see sfFormFieldSchema
-   */
-  public function renderHiddenFields($recursive = true)
-  {
-    return $this->getFormFieldSchema()->renderHiddenFields($recursive);
-  }
-
-  /**
-   * Renders global errors associated with this form.
-   *
-   * @return string The rendered global errors
-   */
-  public function renderGlobalErrors()
-  {
-    return $this->widgetSchema->getFormFormatter()->formatErrorsForRow($this->getGlobalErrors());
-  }
-
-  /**
-   * Returns true if the form has some global errors.
-   *
-   * @return Boolean true if the form has some global errors, false otherwise
-   */
-  public function hasGlobalErrors()
-  {
-    return (Boolean) count($this->getGlobalErrors());
-  }
-
-  /**
-   * Gets the global errors associated with the form.
-   *
-   * @return array An array of global errors
-   */
-  public function getGlobalErrors()
-  {
-    return $this->widgetSchema->getGlobalErrors($this->getErrorSchema());
-  }
-
-  /**
-   * Binds the form with input values.
-   *
-   * It triggers the validator schema validation.
-   *
-   * @param array $taintedValues  An array of input values
-   * @param array $taintedFiles   An array of uploaded files (in the $_FILES or $_GET format)
-   */
-  public function bind(array $taintedValues = null, array $taintedFiles = null)
-  {
-    $this->taintedValues = $taintedValues;
-    $this->taintedFiles  = $taintedFiles;
-    $this->isBound = true;
-    $this->resetFormFields();
-
-    if (null === $this->taintedValues)
-    {
-      $this->taintedValues = array();
-    }
-
-    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.');
-      }
-
-      $this->taintedFiles = array();
-    }
-
-    $this->checkTaintedValues($this->taintedValues);
-
-    try
-    {
-      $this->doBind(self::deepArrayUnion($this->taintedValues, self::convertFileInformation($this->taintedFiles)));
-      $this->errorSchema = new sfValidatorErrorSchema($this->validatorSchema);
-
-      // remove CSRF token
-      unset($this->values[self::$CSRFFieldName]);
-    }
-    catch (sfValidatorErrorSchema $e)
-    {
-      $this->values = array();
-      $this->errorSchema = $e;
-    }
-
-    if ($this->embeddedForms)
-    {
-      $this->bindEmbeddedForms($this->taintedValues, $this->taintedFiles);
-    }
-  }
-
-  /**
-   * Cleans and binds values to the current form.
-   *
-   * @param array $values A merged array of values and files
-   */
-  protected function doBind(array $values)
-  {
-    $this->values = $this->validatorSchema->clean($values);
-  }
-
-  /**
-   * Bind embedded forms (recursivly)
-   *
-   * @param array $taintedValues
-   * @param array $taintedFiles
-   */
-  public function bindEmbeddedForms(array $taintedValues = null, array $taintedFiles = null)
-  {
-    foreach ($this->embeddedForms as $name => $form)
-    {
-      // remove CSRF token
-      unset($form[self::$CSRFFieldName]);
-
-      // bind
-      $form->bind(
-        isset($taintedValues[$name]) ? $taintedValues[$name] : array(),
-        isset($taintedFiles[$name]) ? $taintedFiles[$name] : array()
-      );
-
-      // set values for current form
-      $this->values[$name] = $form->getValues();
-
-      // set widget schema for current form
-      $widgetSchema = $form->getWidgetSchema();
-      $decorator = $widgetSchema->getFormFormatter()->getDecoratorFormat();
-      $this->widgetSchema[$name] = new sfWidgetFormSchemaDecorator($widgetSchema, $decorator);
-
-      // keep widgetSchema synchronized
-      $form->setWidgetSchema($this->widgetSchema[$name]->getWidget());
-
-      // update errorSchema
-      if ($form->hasErrors())
-      {
-        $this->errorSchema->addError($form->getErrorSchema(), $name);
-      }
-    }
-  }
-
-  /**
-   * Returns true if the form is bound to input values.
-   *
-   * @return Boolean true if the form is bound to input values, false otherwise
-   */
-  public function isBound()
-  {
-    return $this->isBound;
-  }
-
-  /**
-   * Directly updates form (and embbeded forms) values
-   *
-   * USE WITH CAUTION !!!!
-   *
-   * @param array $values
-   */
-  public function updateValues(array $values)
-  {
-    $this->values = $values + $this->values;
-
-    $this->updateValuesEmbeddedForms($values);
-  }
-
-  /**
-   * Directly updates embedded form values
-   *
-   * @param array $values
-   */
-  public function updateValuesEmbeddedForms(array $values)
-  {
-    foreach ($this->embeddedForms as $name => $form)
-    {
-      if (isset($values[$name]))
-      {
-        $form->updateValues($values[$name]);
-        $this->values[$name] = $form->getValues();
-      }
-    }
-  }
-
-  /**
-   * Returns the submitted tainted values.
-   *
-   * @return array An array of tainted values
-   */
-  public function getTaintedValues()
-  {
-    if (!$this->isBound)
-    {
-      return array();
-    }
-
-    return $this->taintedValues;
-  }
-
-  /**
-   * Returns true if the form is valid.
-   *
-   * It returns false if the form is not bound.
-   *
-   * @return Boolean true if the form is valid, false otherwise
-   */
-  public function isValid()
-  {
-    if (!$this->isBound)
-    {
-      return false;
-    }
-
-    return 0 == count($this->errorSchema);
-  }
-
-  /**
-   * Returns true if the form has some errors.
-   *
-   * It returns false if the form is not bound.
-   *
-   * @return Boolean true if the form has some errors, false otherwise
-   */
-  public function hasErrors()
-  {
-    if (!$this->isBound)
-    {
-      return false;
-    }
-
-    return count($this->errorSchema) > 0;
-  }
-
-  /**
-   * Returns the array of cleaned values.
-   *
-   * If the form is not bound, it returns an empty array.
-   *
-   * @return array An array of cleaned values
-   */
-  public function getValues()
-  {
-    return $this->isBound ? $this->values : array();
-  }
-
-  /**
-   * Returns a cleaned value by field name.
-   *
-   * If the form is not bound, it will return null.
-   *
-   * @param  string  $field  The name of the value required
-   * @return string  The cleaned value
-   */
-  public function getValue($field)
-  {
-    return ($this->isBound && isset($this->values[$field])) ? $this->values[$field] : null;
-  }
-
-  /**
-   * Returns the array name under which user data can retrieved.
-   *
-   * If the user data is not stored under an array, it returns false.
-   *
-   * @return string|boolean The name or false if the name format is not an array format
-   */
-  public function getName()
-  {
-    if ('[%s]' != substr($nameFormat = $this->widgetSchema->getNameFormat(), -4))
-    {
-      return false;
-    }
-
-    return str_replace('[%s]', '', $nameFormat);
-  }
-
-  /**
-   * Gets the error schema associated with the form.
-   *
-   * @return sfValidatorErrorSchema A sfValidatorErrorSchema instance
-   */
-  public function getErrorSchema()
-  {
-    return $this->errorSchema;
-  }
-
-  /**
-   * 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
-   */
-  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');
-    }
-
-    unset($form[self::$CSRFFieldName]);
-
-    $this->embeddedForms[$name] = $form;
+    protected static $CSRFSecret = false;
+    protected static $CSRFFieldName = '_csrf_token';
+    protected static $toStringException;
+
+    /** @var sfWidget[]|sfWidgetFormSchema|sfWidgetFormSchemaDecorator[] */
+    protected $widgetSchema;
+
+    /** @var sfValidatorBase[]|sfValidatorSchema */
+    protected $validatorSchema;
+
+    /** @var sfValidatorError[]|sfValidatorErrorSchema */
+    protected $errorSchema;
+
+    /** @var sfFormFieldSchema|null */
+    protected $formFieldSchema;
+
+    /** @var sfFormField[] */
+    protected $formFields = array();
+    protected $isBound = false;
+    protected $taintedValues = array();
+    protected $taintedFiles = array();
+    protected $values;
+    protected $defaults = array();
+    protected $fieldNames = array();
+    protected $options = array();
+    protected $count = 0;
+    protected $localCSRFSecret;
+
+    /** @var sfForm[] */
+    protected $embeddedForms = array();
+
+    /**
+     * Constructor.
+     *
+     * @param array  $defaults   An array of field default values
+     * @param array  $options    An array of options
+     * @param string $CSRFSecret A CSRF secret
+     */
+    public function __construct($defaults = array(), $options = array(), $CSRFSecret = null)
+    {
+        $this->options = $options;
+        $this->localCSRFSecret = $CSRFSecret;
+
+        $this->validatorSchema = new sfValidatorSchema();
+        $this->widgetSchema = new sfWidgetFormSchema();
+        $this->errorSchema = new sfValidatorErrorSchema($this->validatorSchema);
+
+        $this->setDefaults($defaults);
+        $this->setup();
+        $this->configure();
+
+        $this->addCSRFProtection($this->localCSRFSecret);
+        $this->resetFormFields();
+    }
+
+    /**
+     * Returns a string representation of the form.
+     *
+     * @return string A string representation of the form
+     *
+     * @see render()
+     */
+    public function __toString()
+    {
+        try {
+            return $this->render();
+        } catch (Exception $e) {
+            self::setToStringException($e);
+
+            // we return a simple Exception message in case the form framework is used out of symfony.
+            return 'Exception: '.$e->getMessage();
+        }
+    }
+
+    public function __clone()
+    {
+        $this->widgetSchema = clone $this->widgetSchema;
+        $this->validatorSchema = clone $this->validatorSchema;
+
+        // we rebind the cloned form because Exceptions are not clonable
+        if ($this->isBound()) {
+            $this->bind($this->taintedValues, $this->taintedFiles);
+        }
+    }
+
+    /**
+     * Setups the current form.
+     *
+     * This method is overridden by generator.
+     *
+     * If you want to do something at initialization, you have to override the configure() method.
+     *
+     * @see configure()
+     */
+    public function setup()
+    {
+    }
+
+    /**
+     * Configures the current form.
+     */
+    public function configure()
+    {
+    }
+
+    /**
+     * Renders the widget schema associated with this form.
+     *
+     * @param array $attributes An array of HTML attributes
+     *
+     * @return string The rendered widget schema
+     */
+    public function render($attributes = array())
+    {
+        return $this->getFormFieldSchema()->render($attributes);
+    }
+
+    /**
+     * Renders the widget schema using a specific form formatter.
+     *
+     * @param string $formatterName The form formatter name
+     * @param array  $attributes    An array of HTML attributes
+     *
+     * @return string The rendered widget schema
+     */
+    public function renderUsing($formatterName, $attributes = array())
+    {
+        $currentFormatterName = $this->widgetSchema->getFormFormatterName();
+
+        $this->widgetSchema->setFormFormatterName($formatterName);
+
+        $output = $this->render($attributes);
+
+        $this->widgetSchema->setFormFormatterName($currentFormatterName);
+
+        return $output;
+    }
+
+    /**
+     * Renders hidden form fields.
+     *
+     * @param bool $recursive False will prevent hidden fields from embedded forms from rendering
+     *
+     * @return string
+     *
+     * @see sfFormFieldSchema
+     */
+    public function renderHiddenFields($recursive = true)
+    {
+        return $this->getFormFieldSchema()->renderHiddenFields($recursive);
+    }
+
+    /**
+     * Renders global errors associated with this form.
+     *
+     * @return string The rendered global errors
+     */
+    public function renderGlobalErrors()
+    {
+        return $this->widgetSchema->getFormFormatter()->formatErrorsForRow($this->getGlobalErrors());
+    }
+
+    /**
+     * Returns true if the form has some global errors.
+     *
+     * @return bool true if the form has some global errors, false otherwise
+     */
+    public function hasGlobalErrors()
+    {
+        return (bool) count($this->getGlobalErrors());
+    }
+
+    /**
+     * Gets the global errors associated with the form.
+     *
+     * @return array An array of global errors
+     */
+    public function getGlobalErrors()
+    {
+        return $this->widgetSchema->getGlobalErrors($this->getErrorSchema());
+    }
+
+    /**
+     * Binds the form with input values.
+     *
+     * It triggers the validator schema validation.
+     *
+     * @param array $taintedValues An array of input values
+     * @param array $taintedFiles  An array of uploaded files (in the $_FILES or $_GET format)
+     */
+    public function bind(array $taintedValues = null, array $taintedFiles = null)
+    {
+        $this->taintedValues = $taintedValues;
+        $this->taintedFiles = $taintedFiles;
+        $this->isBound = true;
+        $this->resetFormFields();
+
+        if (null === $this->taintedValues) {
+            $this->taintedValues = array();
+        }
+
+        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.');
+            }
+
+            $this->taintedFiles = array();
+        }
+
+        $this->checkTaintedValues($this->taintedValues);
+
+        try {
+            $this->doBind(self::deepArrayUnion($this->taintedValues, self::convertFileInformation($this->taintedFiles)));
+            $this->errorSchema = new sfValidatorErrorSchema($this->validatorSchema);
+
+            // remove CSRF token
+            unset($this->values[self::$CSRFFieldName]);
+        } catch (sfValidatorErrorSchema $e) {
+            $this->values = array();
+            $this->errorSchema = $e;
+        }
+
+        if ($this->embeddedForms) {
+            $this->bindEmbeddedForms($this->taintedValues, $this->taintedFiles);
+        }
+    }
+
+    /**
+     * Bind embedded forms (recursivly).
+     *
+     * @param array $taintedValues
+     * @param array $taintedFiles
+     */
+    public function bindEmbeddedForms(array $taintedValues = null, array $taintedFiles = null)
+    {
+        foreach ($this->embeddedForms as $name => $form) {
+            // remove CSRF token
+            unset($form[self::$CSRFFieldName]);
+
+            // bind
+            $form->bind(
+                isset($taintedValues[$name]) ? $taintedValues[$name] : array(),
+                isset($taintedFiles[$name]) ? $taintedFiles[$name] : array()
+            );
+
+            // set values for current form
+            $this->values[$name] = $form->getValues();
+
+            // set widget schema for current form
+            $widgetSchema = $form->getWidgetSchema();
+            $decorator = $widgetSchema->getFormFormatter()->getDecoratorFormat();
+            $this->widgetSchema[$name] = new sfWidgetFormSchemaDecorator($widgetSchema, $decorator);
+
+            // keep widgetSchema synchronized
+            $form->setWidgetSchema($this->widgetSchema[$name]->getWidget());
+
+            // update errorSchema
+            if ($form->hasErrors()) {
+                $this->errorSchema->addError($form->getErrorSchema(), $name);
+            }
+        }
+    }
+
+    /**
+     * Returns true if the form is bound to input values.
+     *
+     * @return bool true if the form is bound to input values, false otherwise
+     */
+    public function isBound()
+    {
+        return $this->isBound;
+    }
+
+    /**
+     * Directly updates form (and embbeded forms) values.
+     *
+     * USE WITH CAUTION !!!!
+     */
+    public function updateValues(array $values)
+    {
+        $this->values = $values + $this->values;
+
+        $this->updateValuesEmbeddedForms($values);
+    }
+
+    /**
+     * Directly updates embedded form values.
+     */
+    public function updateValuesEmbeddedForms(array $values)
+    {
+        foreach ($this->embeddedForms as $name => $form) {
+            if (isset($values[$name])) {
+                $form->updateValues($values[$name]);
+                $this->values[$name] = $form->getValues();
+            }
+        }
+    }
+
+    /**
+     * Returns the submitted tainted values.
+     *
+     * @return array An array of tainted values
+     */
+    public function getTaintedValues()
+    {
+        if (!$this->isBound) {
+            return array();
+        }
+
+        return $this->taintedValues;
+    }
+
+    /**
+     * Returns true if the form is valid.
+     *
+     * It returns false if the form is not bound.
+     *
+     * @return bool true if the form is valid, false otherwise
+     */
+    public function isValid()
+    {
+        if (!$this->isBound) {
+            return false;
+        }
+
+        return 0 == count($this->errorSchema);
+    }
+
+    /**
+     * Returns true if the form has some errors.
+     *
+     * It returns false if the form is not bound.
+     *
+     * @return bool true if the form has some errors, false otherwise
+     */
+    public function hasErrors()
+    {
+        if (!$this->isBound) {
+            return false;
+        }
 
-    $widgetSchema = $form->getWidgetSchema();
+        return count($this->errorSchema) > 0;
+    }
 
-    $this->setDefault($name, $form->getDefaults());
+    /**
+     * Returns the array of cleaned values.
+     *
+     * If the form is not bound, it returns an empty array.
+     *
+     * @return array An array of cleaned values
+     */
+    public function getValues()
+    {
+        return $this->isBound ? $this->values : array();
+    }
 
-    $decorator = null === $decorator ? $widgetSchema->getFormFormatter()->getDecoratorFormat() : $decorator;
+    /**
+     * Returns a cleaned value by field name.
+     *
+     * If the form is not bound, it will return null.
+     *
+     * @param string $field The name of the value required
+     *
+     * @return string The cleaned value
+     */
+    public function getValue($field)
+    {
+        return ($this->isBound && isset($this->values[$field])) ? $this->values[$field] : null;
+    }
 
-    $this->widgetSchema[$name] = new sfWidgetFormSchemaDecorator($widgetSchema, $decorator);
-    $this->validatorSchema[$name] = new sfValidatorPass();
+    /**
+     * Returns the array name under which user data can retrieved.
+     *
+     * If the user data is not stored under an array, it returns false.
+     *
+     * @return bool|string The name or false if the name format is not an array format
+     */
+    public function getName()
+    {
+        if ('[%s]' != substr($nameFormat = $this->widgetSchema->getNameFormat(), -4)) {
+            return false;
+        }
 
-    // keep widgetSchema synchronized
-    $form->setWidgetSchema($this->widgetSchema[$name]->getWidget());
+        return str_replace('[%s]', '', $nameFormat);
+    }
 
-    $this->resetFormFields();
-  }
-
-  /**
-   * Gets the list of embedded forms.
-   *
-   * @return sfForm[] An array of embedded forms
-   */
-  public function getEmbeddedForms()
-  {
-    return $this->embeddedForms;
-  }
+    /**
+     * Gets the error schema associated with the form.
+     *
+     * @return sfValidatorErrorSchema A sfValidatorErrorSchema instance
+     */
+    public function getErrorSchema()
+    {
+        return $this->errorSchema;
+    }
 
-  /**
-   * Returns an embedded form.
-   *
-   * @param  string $name The name used to embed the form
-   *
-   * @return sfForm
-   *
-   * @throws InvalidArgumentException If there is no form embedded with the supplied name
-   */
-  public function getEmbeddedForm($name)
-  {
-    if (!isset($this->embeddedForms[$name]))
+    /**
+     * 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
+     */
+    public function embedForm($name, sfForm $form, $decorator = null)
     {
-      throw new InvalidArgumentException(sprintf('There is no embedded "%s" form.', $name));
+        $name = (string) $name;
+        if (true === $this->isBound() || true === $form->isBound()) {
+            throw new LogicException('A bound form cannot be embedded');
+        }
+
+        unset($form[self::$CSRFFieldName]);
+
+        $this->embeddedForms[$name] = $form;
+
+        $widgetSchema = $form->getWidgetSchema();
+
+        $this->setDefault($name, $form->getDefaults());
+
+        $decorator = null === $decorator ? $widgetSchema->getFormFormatter()->getDecoratorFormat() : $decorator;
+
+        $this->widgetSchema[$name] = new sfWidgetFormSchemaDecorator($widgetSchema, $decorator);
+        $this->validatorSchema[$name] = new sfValidatorPass();
+
+        // keep widgetSchema synchronized
+        $form->setWidgetSchema($this->widgetSchema[$name]->getWidget());
+
+        $this->resetFormFields();
+    }
+
+    /**
+     * Gets the list of embedded forms.
+     *
+     * @return sfForm[] An array of embedded forms
+     */
+    public function getEmbeddedForms()
+    {
+        return $this->embeddedForms;
+    }
+
+    /**
+     * Returns an embedded form.
+     *
+     * @param string $name The name used to embed the form
+     *
+     * @return sfForm
+     *
+     * @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));
+        }
+
+        return $this->embeddedForms[$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
+     *
+     * @throws LogicException If one of the form has already been bound
+     */
+    public function mergeForm(sfForm $form)
+    {
+        if (true === $this->isBound() || true === $form->isBound()) {
+            throw new LogicException('A bound form cannot be merged');
+        }
+
+        $form = clone $form;
+        unset($form[self::$CSRFFieldName]);
+
+        $this->defaults = $form->getDefaults() + $this->defaults;
+
+        foreach ($form->getWidgetSchema()->getPositions() as $field) {
+            $this->widgetSchema[$field] = $form->getWidget($field);
+        }
+
+        foreach ($form->getValidatorSchema()->getFields() as $field => $validator) {
+            $this->validatorSchema[$field] = $validator;
+        }
+
+        $this->getWidgetSchema()->setLabels($form->getWidgetSchema()->getLabels() + $this->getWidgetSchema()->getLabels());
+        $this->getWidgetSchema()->setHelps($form->getWidgetSchema()->getHelps() + $this->getWidgetSchema()->getHelps());
+
+        $this->mergePreValidator($form->getValidatorSchema()->getPreValidator());
+        $this->mergePostValidator($form->getValidatorSchema()->getPostValidator());
+
+        $this->resetFormFields();
     }
 
-    return $this->embeddedForms[$name];
-  }
+    /**
+     * Merges a validator with the current pre validators.
+     *
+     * @param sfValidatorBase $validator A validator to be merged
+     */
+    public function mergePreValidator(sfValidatorBase $validator = null)
+    {
+        if (null === $validator) {
+            return;
+        }
+
+        if (null === $this->validatorSchema->getPreValidator()) {
+            $this->validatorSchema->setPreValidator($validator);
+        } else {
+            $this->validatorSchema->setPreValidator(new sfValidatorAnd(array(
+                $this->validatorSchema->getPreValidator(),
+                $validator,
+            )));
+        }
+    }
 
-  /**
-   * 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
-   *
-   * @throws LogicException      If one of the form has already been bound
-   */
-  public function mergeForm(sfForm $form)
-  {
-    if (true === $this->isBound() || true === $form->isBound())
+    /**
+     * Merges a validator with the current post validators.
+     *
+     * @param sfValidatorBase $validator A validator to be merged
+     */
+    public function mergePostValidator(sfValidatorBase $validator = null)
     {
-      throw new LogicException('A bound form cannot be merged');
+        if (null === $validator) {
+            return;
+        }
+
+        if (null === $this->validatorSchema->getPostValidator()) {
+            $this->validatorSchema->setPostValidator($validator);
+        } else {
+            $this->validatorSchema->setPostValidator(new sfValidatorAnd(array(
+                $this->validatorSchema->getPostValidator(),
+                $validator,
+            )));
+        }
     }
 
-    $form = clone $form;
-    unset($form[self::$CSRFFieldName]);
+    /**
+     * Sets the validators associated with this form.
+     *
+     * @param array $validators An array of named validators
+     *
+     * @return sfForm The current form instance
+     */
+    public function setValidators(array $validators)
+    {
+        $this->setValidatorSchema(new sfValidatorSchema($validators));
 
-    $this->defaults = $form->getDefaults() + $this->defaults;
+        return $this;
+    }
 
-    foreach ($form->getWidgetSchema()->getPositions() as $field)
+    /**
+     * Set a validator for the given field name.
+     *
+     * @param string          $name      The field name
+     * @param sfValidatorBase $validator The validator
+     *
+     * @return sfForm The current form instance
+     */
+    public function setValidator($name, sfValidatorBase $validator)
     {
-      $this->widgetSchema[$field] = $form->getWidget($field);
+        if (isset($this->embeddedForms[$name])) {
+            throw new LogicException('You cannot set a validator for an embedded form.');
+        }
+
+        $this->validatorSchema[$name] = $validator;
+
+        $this->resetFormFields();
+
+        return $this;
     }
 
-    foreach ($form->getValidatorSchema()->getFields() as $field => $validator)
+    /**
+     * Gets a validator for the given field name.
+     *
+     * @param string $name The field name
+     *
+     * @return sfValidatorBase $validator The validator
+     */
+    public function getValidator($name)
     {
-      $this->validatorSchema[$field] = $validator;
+        if (!isset($this->validatorSchema[$name])) {
+            throw new InvalidArgumentException(sprintf('The validator "%s" does not exist.', $name));
+        }
+
+        if (isset($this->embeddedForms[$name])) {
+            return $this->embeddedForms[$name]->getValidatorSchema();
+        }
+
+        return $this->validatorSchema[$name];
     }
 
-    $this->getWidgetSchema()->setLabels($form->getWidgetSchema()->getLabels() + $this->getWidgetSchema()->getLabels());
-    $this->getWidgetSchema()->setHelps($form->getWidgetSchema()->getHelps() + $this->getWidgetSchema()->getHelps());
+    /**
+     * Sets the validator schema associated with this form.
+     *
+     * @param sfValidatorSchema $validatorSchema A sfValidatorSchema instance
+     *
+     * @return sfForm The current form instance
+     */
+    public function setValidatorSchema(sfValidatorSchema $validatorSchema)
+    {
+        $this->validatorSchema = $validatorSchema;
 
-    $this->mergePreValidator($form->getValidatorSchema()->getPreValidator());
-    $this->mergePostValidator($form->getValidatorSchema()->getPostValidator());
+        $this->resetFormFields();
 
-    $this->resetFormFields();
-  }
+        return $this;
+    }
 
-  /**
-   * Merges a validator with the current pre validators.
-   *
-   * @param sfValidatorBase $validator A validator to be merged
-   */
-  public function mergePreValidator(sfValidatorBase $validator = null)
-  {
-    if (null === $validator)
+    /**
+     * Gets the validator schema associated with this form.
+     *
+     * @return sfValidatorSchema A sfValidatorSchema instance
+     */
+    public function getValidatorSchema()
     {
-      return;
+        return $this->validatorSchema;
     }
 
-    if (null === $this->validatorSchema->getPreValidator())
+    /**
+     * Sets the widgets associated with this form.
+     *
+     * @param array $widgets An array of named widgets
+     *
+     * @return sfForm The current form instance
+     */
+    public function setWidgets(array $widgets)
     {
-      $this->validatorSchema->setPreValidator($validator);
+        $this->setWidgetSchema(new sfWidgetFormSchema($widgets));
+
+        return $this;
     }
-    else
+
+    /**
+     * Set a widget for the given field name.
+     *
+     * @param string       $name   The field name
+     * @param sfWidgetForm $widget The widget
+     *
+     * @return sfForm The current form instance
+     */
+    public function setWidget($name, sfWidgetForm $widget)
     {
-      $this->validatorSchema->setPreValidator(new sfValidatorAnd(array(
-        $this->validatorSchema->getPreValidator(),
-        $validator,
-      )));
+        $this->widgetSchema[$name] = $widget;
+
+        $this->resetFormFields();
+
+        return $this;
     }
-  }
 
-  /**
-   * Merges a validator with the current post validators.
-   *
-   * @param sfValidatorBase $validator A validator to be merged
-   */
-  public function mergePostValidator(sfValidatorBase $validator = null)
-  {
-    if (null === $validator)
+    /**
+     * Gets a widget for the given field name.
+     *
+     * @param string $name The field name
+     *
+     * @return sfWidgetForm $widget The widget
+     */
+    public function getWidget($name)
     {
-      return;
+        if (!isset($this->widgetSchema[$name])) {
+            throw new InvalidArgumentException(sprintf('The widget "%s" does not exist.', $name));
+        }
+
+        return $this->widgetSchema[$name];
+    }
+
+    /**
+     * Sets the widget schema associated with this form.
+     *
+     * @param sfWidgetFormSchema $widgetSchema A sfWidgetFormSchema instance
+     *
+     * @return sfForm The current form instance
+     */
+    public function setWidgetSchema(sfWidgetFormSchema $widgetSchema)
+    {
+        $this->widgetSchema = $widgetSchema;
+
+        $this->resetFormFields();
+
+        return $this;
     }
 
-    if (null === $this->validatorSchema->getPostValidator())
+    /**
+     * Gets the widget schema associated with this form.
+     *
+     * @return sfWidgetFormSchema A sfWidgetFormSchema instance
+     */
+    public function getWidgetSchema()
     {
-      $this->validatorSchema->setPostValidator($validator);
+        return $this->widgetSchema;
     }
-    else
+
+    /**
+     * Gets the stylesheet paths associated with the form.
+     *
+     * @return array An array of stylesheet paths
+     */
+    public function getStylesheets()
     {
-      $this->validatorSchema->setPostValidator(new sfValidatorAnd(array(
-        $this->validatorSchema->getPostValidator(),
-        $validator,
-      )));
+        return $this->widgetSchema->getStylesheets();
     }
-  }
 
-  /**
-   * Sets the validators associated with this form.
-   *
-   * @param array $validators An array of named validators
-   *
-   * @return sfForm The current form instance
-   */
-  public function setValidators(array $validators)
-  {
-    $this->setValidatorSchema(new sfValidatorSchema($validators));
+    /**
+     * Gets the JavaScript paths associated with the form.
+     *
+     * @return array An array of JavaScript paths
+     */
+    public function getJavaScripts()
+    {
+        return $this->widgetSchema->getJavaScripts();
+    }
 
-    return $this;
-  }
+    /**
+     * Returns the current form's options.
+     *
+     * @return array The current form's options
+     */
+    public function getOptions()
+    {
+        return $this->options;
+    }
 
-  /**
-   * Set a validator for the given field name.
-   *
-   * @param string          $name      The field name
-   * @param sfValidatorBase $validator The validator
-   *
-   * @return sfForm The current form instance
-   */
-  public function setValidator($name, sfValidatorBase $validator)
-  {
-    if (isset($this->embeddedForms[$name]))
+    /**
+     * Sets an option value.
+     *
+     * @param string $name  The option name
+     * @param mixed  $value The default value
+     *
+     * @return sfForm The current form instance
+     */
+    public function setOption($name, $value)
     {
-      throw new LogicException('You cannot set a validator for an embedded form.');
+        $this->options[$name] = $value;
+
+        return $this;
     }
 
-    $this->validatorSchema[$name] = $validator;
+    /**
+     * Gets an option value.
+     *
+     * @param string $name    The option name
+     * @param mixed  $default The default value (null by default)
+     *
+     * @return mixed
+     */
+    public function getOption($name, $default = null)
+    {
+        return isset($this->options[$name]) ? $this->options[$name] : $default;
+    }
 
-    $this->resetFormFields();
+    /**
+     * Sets a default value for a form field.
+     *
+     * @param string $name    The field name
+     * @param mixed  $default The default value
+     *
+     * @return sfForm The current form instance
+     */
+    public function setDefault($name, $default)
+    {
+        $this->defaults[$name] = $default;
 
-    return $this;
-  }
+        $this->resetFormFields();
 
-  /**
-   * Gets a validator for the given field name.
-   *
-   * @param  string      $name      The field name
-   *
-   * @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));
-    }
-
-    if (isset($this->embeddedForms[$name]))
-    {
-      return $this->embeddedForms[$name]->getValidatorSchema();
-    }
-
-    return $this->validatorSchema[$name];
-  }
-
-  /**
-   * Sets the validator schema associated with this form.
-   *
-   * @param sfValidatorSchema $validatorSchema A sfValidatorSchema instance
-   *
-   * @return sfForm The current form instance
-   */
-  public function setValidatorSchema(sfValidatorSchema $validatorSchema)
-  {
-    $this->validatorSchema = $validatorSchema;
-
-    $this->resetFormFields();
-
-    return $this;
-  }
-
-  /**
-   * Gets the validator schema associated with this form.
-   *
-   * @return sfValidatorSchema A sfValidatorSchema instance
-   */
-  public function getValidatorSchema()
-  {
-    return $this->validatorSchema;
-  }
-
-  /**
-   * Sets the widgets associated with this form.
-   *
-   * @param array $widgets An array of named widgets
-   *
-   * @return sfForm The current form instance
-   */
-  public function setWidgets(array $widgets)
-  {
-    $this->setWidgetSchema(new sfWidgetFormSchema($widgets));
-
-    return $this;
-  }
-
-  /**
-   * Set a widget for the given field name.
-   *
-   * @param string       $name   The field name
-   * @param sfWidgetForm $widget The widget
-   *
-   * @return sfForm The current form instance
-   */
-  public function setWidget($name, sfWidgetForm $widget)
-  {
-    $this->widgetSchema[$name] = $widget;
-
-    $this->resetFormFields();
-
-    return $this;
-  }
-
-  /**
-   * Gets a widget for the given field name.
-   *
-   * @param  string       $name      The field name
-   *
-   * @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));
-    }
-
-    return $this->widgetSchema[$name];
-  }
-
-  /**
-   * Sets the widget schema associated with this form.
-   *
-   * @param sfWidgetFormSchema $widgetSchema A sfWidgetFormSchema instance
-   *
-   * @return sfForm The current form instance
-   */
-  public function setWidgetSchema(sfWidgetFormSchema $widgetSchema)
-  {
-    $this->widgetSchema = $widgetSchema;
-
-    $this->resetFormFields();
-
-    return $this;
-  }
-
-  /**
-   * Gets the widget schema associated with this form.
-   *
-   * @return sfWidgetFormSchema A sfWidgetFormSchema instance
-   */
-  public function getWidgetSchema()
-  {
-    return $this->widgetSchema;
-  }
-
-  /**
-   * Gets the stylesheet paths associated with the form.
-   *
-   * @return array An array of stylesheet paths
-   */
-  public function getStylesheets()
-  {
-    return $this->widgetSchema->getStylesheets();
-  }
-
-  /**
-   * Gets the JavaScript paths associated with the form.
-   *
-   * @return array An array of JavaScript paths
-   */
-  public function getJavaScripts()
-  {
-    return $this->widgetSchema->getJavaScripts();
-  }
-
-  /**
-   * Returns the current form's options.
-   *
-   * @return array The current form's options
-   */
-  public function getOptions()
-  {
-    return $this->options;
-  }
-
-  /**
-   * Sets an option value.
-   *
-   * @param string $name  The option name
-   * @param mixed  $value The default value
-   *
-   * @return sfForm The current form instance
-   */
-  public function setOption($name, $value)
-  {
-    $this->options[$name] = $value;
-
-    return $this;
-  }
-
-  /**
-   * Gets an option value.
-   *
-   * @param string $name    The option name
-   * @param mixed  $default The default value (null by default)
-   *
-   * @return mixed
-   */
-  public function getOption($name, $default = null)
-  {
-    return isset($this->options[$name]) ? $this->options[$name] : $default;
-  }
-
-  /**
-   * Sets a default value for a form field.
-   *
-   * @param string $name    The field name
-   * @param mixed  $default The default value
-   *
-   * @return sfForm The current form instance
-   */
-  public function setDefault($name, $default)
-  {
-    $this->defaults[$name] = $default;
-
-    $this->resetFormFields();
-
-    return $this;
-  }
-
-  /**
-   * Gets a default value for a form field.
-   *
-   * @param string $name The field name
-   *
-   * @return mixed The default value
-   */
-  public function getDefault($name)
-  {
-    return isset($this->defaults[$name]) ? $this->defaults[$name] : null;
-  }
-
-  /**
-   * Returns true if the form has a default value for a form field.
-   *
-   * @param string $name   The field name
-   *
-   * @return Boolean true if the form has a default value for this field, false otherwise
-   */
-  public function hasDefault($name)
-  {
-    return array_key_exists($name, $this->defaults);
-  }
-
-  /**
-   * Sets the default values for the form.
-   *
-   * The default values are only used if the form is not bound.
-   *
-   * @param array $defaults An array of default values
-   *
-   * @return sfForm The current form instance
-   */
-  public function setDefaults($defaults)
-  {
-    $this->defaults = null === $defaults ? array() : $defaults;
-
-    if ($this->isCSRFProtected())
-    {
-      $this->setDefault(self::$CSRFFieldName, $this->getCSRFToken($this->localCSRFSecret ?: self::$CSRFSecret));
-    }
-
-    $this->resetFormFields();
-
-    return $this;
-  }
-
-  /**
-   * Gets the default values for the form.
-   *
-   * @return array An array of default values
-   */
-  public function getDefaults()
-  {
-    return $this->defaults;
-  }
-
-  /**
-   * Adds CSRF protection to the current form.
-   *
-   * @param string $secret The secret to use to compute the CSRF token
-   *
-   * @return sfForm The current form instance
-   */
-  public function addCSRFProtection($secret = null)
-  {
-    if (null === $secret)
-    {
-      $secret = $this->localCSRFSecret;
-    }
-
-    if (false === $secret || (null === $secret && false === self::$CSRFSecret))
-    {
-      return $this;
-    }
-
-    if (null === $secret)
-    {
-      if (null === self::$CSRFSecret)
-      {
-        self::$CSRFSecret = md5(__FILE__.php_uname());
-      }
-
-      $secret = self::$CSRFSecret;
-    }
-
-    $token = $this->getCSRFToken($secret);
-
-    $this->validatorSchema[self::$CSRFFieldName] = new sfValidatorCSRFToken(array('token' => $token));
-    $this->widgetSchema[self::$CSRFFieldName] = new sfWidgetFormInputHidden();
-    $this->setDefault(self::$CSRFFieldName, $token);
-
-    return $this;
-  }
-
-  /**
-   * Returns a CSRF token, given a secret.
-   *
-   * If you want to change the algorithm used to compute the token, you
-   * can override this method.
-   *
-   * @param  string $secret The secret string to use (null to use the current secret)
-   *
-   * @return string A token string
-   */
-  public function getCSRFToken($secret = null)
-  {
-    if (null === $secret)
-    {
-      $secret = $this->localCSRFSecret ?: self::$CSRFSecret;
-    }
-
-    return md5($secret.session_id().get_class($this));
-  }
-
-  /**
-   * @return true if this form is CSRF protected
-   */
-  public function isCSRFProtected()
-  {
-    return null !== $this->validatorSchema[self::$CSRFFieldName];
-  }
-
-  /**
-   * Sets the CSRF field name.
-   *
-   * @param string $name The CSRF field name
-   */
-  static public function setCSRFFieldName($name)
-  {
-    self::$CSRFFieldName = $name;
-  }
-
-  /**
-   * Gets the CSRF field name.
-   *
-   * @return string The CSRF field name
-   */
-  static public function getCSRFFieldName()
-  {
-    return self::$CSRFFieldName;
-  }
-
-  /**
-   * Enables CSRF protection for this form.
-   *
-   * @param string $secret A secret to use when computing the CSRF token
-   */
-  public function enableLocalCSRFProtection($secret = null)
-  {
-    $this->localCSRFSecret = null === $secret ? true : $secret;
-  }
-
-  /**
-   * Disables CSRF protection for this form.
-   */
-  public function disableLocalCSRFProtection()
-  {
-    $this->localCSRFSecret = false;
-  }
-
-  /**
-   * Enables CSRF protection for all forms.
-   *
-   * The given secret will be used for all forms, except if you pass a secret in the constructor.
-   * Even if a secret is automatically generated if you don't provide a secret, you're strongly advised
-   * to provide one by yourself.
-   *
-   * @param string $secret A secret to use when computing the CSRF token
-   */
-  static public function enableCSRFProtection($secret = null)
-  {
-    self::$CSRFSecret = $secret;
-  }
-
-  /**
-   * Disables CSRF protection for all forms.
-   */
-  static public function disableCSRFProtection()
-  {
-    self::$CSRFSecret = false;
-  }
-
-  /**
-   * Returns true if the form is multipart.
-   *
-   * @return Boolean true if the form is multipart
-   */
-  public function isMultipart()
-  {
-    return $this->widgetSchema->needsMultipartForm();
-  }
-
-  /**
-   * Renders the form tag.
-   *
-   * This methods only renders the opening form tag.
-   * You need to close it after the form rendering.
-   *
-   * This method takes into account the multipart widgets
-   * and converts PUT and DELETE methods to a hidden field
-   * for later processing.
-   *
-   * @param  string $url         The URL for the action
-   * @param  array  $attributes  An array of HTML attributes
-   *
-   * @return string An HTML representation of the opening form tag
-   */
-  public function renderFormTag($url, array $attributes = array())
-  {
-    $attributes['action'] = $url;
-    $attributes['method'] = isset($attributes['method']) ? strtolower($attributes['method']) : 'post';
-    if ($this->isMultipart())
-    {
-      $attributes['enctype'] = 'multipart/form-data';
-    }
-
-    $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));
-      $attributes['method'] = 'post';
-    }
-
-    return sprintf('<form%s>', $this->getWidgetSchema()->attributesToHtml($attributes)).$html;
-  }
-
-  public function resetFormFields()
-  {
-    $this->formFields = array();
-    $this->formFieldSchema = null;
-  }
-
-  /**
-   * Returns true if the bound field exists (implements the ArrayAccess interface).
-   *
-   * @param  string $name The name of the bound field
-   *
-   * @return Boolean true if the widget exists, false otherwise
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetExists($name)
-  {
-    return isset($this->widgetSchema[$name]);
-  }
-
-  /**
-   * Returns the form field associated with the name (implements the ArrayAccess interface).
-   *
-   * @param  string $name  The offset of the value to get
-   *
-   * @return sfFormField|sfFormFieldSchema A form field instance
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetGet($name)
-  {
-    if (!isset($this->formFields[$name]))
-    {
-      if (!$widget = $this->widgetSchema[$name])
-      {
-        throw new InvalidArgumentException(sprintf('Widget "%s" does not exist.', $name));
-      }
-
-      if ($this->isBound)
-      {
-        $value = isset($this->taintedValues[$name]) ? $this->taintedValues[$name] : null;
-      }
-      else if (isset($this->defaults[$name]))
-      {
-        $value = $this->defaults[$name];
-      }
-      else
-      {
-        $value = $widget instanceof sfWidgetFormSchema ? $widget->getDefaults() : $widget->getDefault();
-      }
-
-      $class = $widget instanceof sfWidgetFormSchema ? 'sfFormFieldSchema' : 'sfFormField';
-
-      $this->formFields[$name] = new $class($widget, $this->getFormFieldSchema(), $name, $value, $this->errorSchema[$name]);
-    }
-
-    return $this->formFields[$name];
-  }
-
-  /**
-   * Throws an exception saying that values cannot be set (implements the ArrayAccess interface).
-   *
-   * @param string $offset (ignored)
-   * @param string $value (ignored)
-   *
-   * @throws <b>LogicException</b>
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetSet($offset, $value)
-  {
-    throw new LogicException('Cannot update form fields.');
-  }
-
-  /**
-   * Removes a field from the form.
-   *
-   * It removes the widget and the validator for the given field.
-   *
-   * @param string $offset The field name
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetUnset($offset)
-  {
-    unset(
-      $this->widgetSchema[$offset],
-      $this->validatorSchema[$offset],
-      $this->defaults[$offset],
-      $this->taintedValues[$offset],
-      $this->values[$offset],
-      $this->embeddedForms[$offset]
-    );
-
-    $this->resetFormFields();
-  }
-
-  /**
-   * Removes all visible fields from the form except the ones given as an argument.
-   *
-   * Hidden fields are not affected.
-   *
-   * @param array   $fields  An array of field names
-   * @param Boolean $ordered Whether to use the array of field names to reorder the fields
-   */
-  public function useFields(array $fields = array(), $ordered = true)
-  {
-    $hidden = array();
-
-    foreach ($this as $name => $field)
-    {
-      if ($field->isHidden())
-      {
-        $hidden[] = $name;
-      }
-      else if (!in_array($name, $fields))
-      {
-        unset($this[$name]);
-      }
-    }
-
-    if ($ordered)
-    {
-      $this->widgetSchema->setPositions(array_merge($fields, $hidden));
-    }
-  }
-
-  /**
-   * Returns a form field for the main widget schema.
-   *
-   * @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);
-    }
-
-    return $this->formFieldSchema;
-  }
-
-  /**
-   * Get all errors (included embedded forms errors)
-   *
-   * @return array
-   */
-  public function getErrors()
-  {
-    $errors = array();
-
-    if ($this->hasGlobalErrors())
-    {
-      $errors['_globals'] = array();
-      foreach ($this->getGlobalErrors() as $name => $error)
-      {
-        $errors['_globals'][$name] = $error->getMessage();
-      }
-    }
-
-    foreach ($this as $name => $field)
-    {
-      if (!($field instanceof sfFormFieldSchema) && $field->hasError())
-      {
-        $errors[$this->widgetSchema->getFormFormatter()->generateLabelName($name)] = $field->getError()->getMessage();
-      }
-    }
-
-    foreach ($this->getEmbeddedForms() as $name => $form)
-    {
-      if ($form->hasErrors())
-      {
-        $errors[$name] = $form->getErrors();
-      }
-    }
-
-    return $errors;
-  }
-
-  /**
-   * Resets the field names array to the beginning (implements the Iterator interface).
-   */
-  #[\ReturnTypeWillChange]
-  public function rewind()
-  {
-    $this->fieldNames = $this->widgetSchema->getPositions();
-
-    reset($this->fieldNames);
-    $this->count = count($this->fieldNames);
-  }
-
-  /**
-   * Gets the key associated with the current form field (implements the Iterator interface).
-   *
-   * @return string The key
-   */
-  #[\ReturnTypeWillChange]
-  public function key()
-  {
-    return current($this->fieldNames);
-  }
-
-  /**
-   * Returns the current form field (implements the Iterator interface).
-   *
-   * @return mixed The escaped value
-   */
-  #[\ReturnTypeWillChange]
-  public function current()
-  {
-    return $this[current($this->fieldNames)];
-  }
-
-  /**
-   * Moves to the next form field (implements the Iterator interface).
-   */
-  #[\ReturnTypeWillChange]
-  public function next()
-  {
-    next($this->fieldNames);
-    --$this->count;
-  }
-
-  /**
-   * Returns true if the current form field is valid (implements the Iterator interface).
-   *
-   * @return boolean The validity of the current element; true if it is valid
-   */
-  #[\ReturnTypeWillChange]
-  public function valid()
-  {
-    return $this->count > 0;
-  }
-
-  /**
-   * Returns the number of form fields (implements the Countable interface).
-   *
-   * @return integer The number of embedded form fields
-   */
-  #[\ReturnTypeWillChange]
-  public function count()
-  {
-    return count($this->getFormFieldSchema());
-  }
-
-  /**
-   * Converts uploaded file array to a format following the $_GET and $POST naming convention.
-   *
-   * It's safe to pass an already converted array, in which case this method just returns the original array unmodified.
-   *
-   * @param  array $taintedFiles An array representing uploaded file information
-   *
-   * @return array An array of re-ordered uploaded file information
-   */
-  static public function convertFileInformation(array $taintedFiles)
-  {
-    $files = array();
-    foreach ($taintedFiles as $key => $data)
-    {
-      $files[$key] = self::fixPhpFilesArray($data);
-    }
-
-    return $files;
-  }
-
-  static protected function fixPhpFilesArray($data)
-  {
-    $fileKeys = array('error', 'name', 'size', 'tmp_name', 'type');
-    $keys = array_keys($data);
-    sort($keys);
-
-    if ($fileKeys != $keys || !isset($data['name']) || !is_array($data['name']))
-    {
-      return $data;
-    }
-
-    $files = $data;
-    foreach ($fileKeys as $k)
-    {
-      unset($files[$k]);
-    }
-    foreach (array_keys($data['name']) as $key)
-    {
-      $files[$key] = self::fixPhpFilesArray(array(
-        'error'    => $data['error'][$key],
-        'name'     => $data['name'][$key],
-        'type'     => $data['type'][$key],
-        'tmp_name' => $data['tmp_name'][$key],
-        'size'     => $data['size'][$key],
-      ));
-    }
-
-    return $files;
-  }
-
-  /**
-   * Returns true if a form thrown an exception in the __toString() method
-   *
-   * This is a hack needed because PHP does not allow to throw exceptions in __toString() magic method.
-   *
-   * @return boolean
-   */
-  static public function hasToStringException()
-  {
-    return null !== self::$toStringException;
-  }
-
-  /**
-   * Gets the exception if one was thrown in the __toString() method.
-   *
-   * This is a hack needed because PHP does not allow to throw exceptions in __toString() magic method.
-   *
-   * @return Exception
-   */
-  static public function getToStringException()
-  {
-    return self::$toStringException;
-  }
-
-  /**
-   * Sets an exception thrown by the __toString() method.
-   *
-   * 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()
-   */
-  static public function setToStringException(Exception $e)
-  {
-    if (null === self::$toStringException)
-    {
-      self::$toStringException = $e;
-    }
-  }
-
-  public function __clone()
-  {
-    $this->widgetSchema    = clone $this->widgetSchema;
-    $this->validatorSchema = clone $this->validatorSchema;
-
-    // we rebind the cloned form because Exceptions are not clonable
-    if ($this->isBound())
-    {
-      $this->bind($this->taintedValues, $this->taintedFiles);
-    }
-  }
-
-  /**
-   * Merges two arrays without reindexing numeric keys.
-   *
-   * @param array $array1 An array to merge
-   * @param array $array2 An array to merge
-   *
-   * @return array The merged array
-   */
-  static protected function deepArrayUnion($array1, $array2)
-  {
-    foreach ($array2 as $key => $value)
-    {
-      if (is_array($value) && isset($array1[$key]) && is_array($array1[$key]))
-      {
-        $array1[$key] = self::deepArrayUnion($array1[$key], $value);
-      }
-      else
-      {
-        $array1[$key] = $value;
-      }
-    }
-
-    return $array1;
-  }
-
-  /**
-   * Checks that the $_POST values do not contain something that
-   * looks like a file upload (coming from $_FILE).
-   *
-   * @param array $values
-   */
-  protected function checkTaintedValues($values)
-  {
-    foreach ($values as $name => $value)
-    {
-      if (!is_array($value)) {
-        continue;
-      }
-
-      if (isset($value['tmp_name'])) {
-        throw new InvalidArgumentException('Do not try to fake a file upload.');
-      }
-
-      $this->checkTaintedValues($value);
-    }
-  }
+        return $this;
+    }
+
+    /**
+     * Gets a default value for a form field.
+     *
+     * @param string $name The field name
+     *
+     * @return mixed The default value
+     */
+    public function getDefault($name)
+    {
+        return isset($this->defaults[$name]) ? $this->defaults[$name] : null;
+    }
+
+    /**
+     * Returns true if the form has a default value for a form field.
+     *
+     * @param string $name The field name
+     *
+     * @return bool true if the form has a default value for this field, false otherwise
+     */
+    public function hasDefault($name)
+    {
+        return array_key_exists($name, $this->defaults);
+    }
+
+    /**
+     * Sets the default values for the form.
+     *
+     * The default values are only used if the form is not bound.
+     *
+     * @param array $defaults An array of default values
+     *
+     * @return sfForm The current form instance
+     */
+    public function setDefaults($defaults)
+    {
+        $this->defaults = null === $defaults ? array() : $defaults;
+
+        if ($this->isCSRFProtected()) {
+            $this->setDefault(self::$CSRFFieldName, $this->getCSRFToken($this->localCSRFSecret ?: self::$CSRFSecret));
+        }
+
+        $this->resetFormFields();
+
+        return $this;
+    }
+
+    /**
+     * Gets the default values for the form.
+     *
+     * @return array An array of default values
+     */
+    public function getDefaults()
+    {
+        return $this->defaults;
+    }
+
+    /**
+     * Adds CSRF protection to the current form.
+     *
+     * @param string $secret The secret to use to compute the CSRF token
+     *
+     * @return sfForm The current form instance
+     */
+    public function addCSRFProtection($secret = null)
+    {
+        if (null === $secret) {
+            $secret = $this->localCSRFSecret;
+        }
+
+        if (false === $secret || (null === $secret && false === self::$CSRFSecret)) {
+            return $this;
+        }
+
+        if (null === $secret) {
+            if (null === self::$CSRFSecret) {
+                self::$CSRFSecret = md5(__FILE__.php_uname());
+            }
+
+            $secret = self::$CSRFSecret;
+        }
+
+        $token = $this->getCSRFToken($secret);
+
+        $this->validatorSchema[self::$CSRFFieldName] = new sfValidatorCSRFToken(array('token' => $token));
+        $this->widgetSchema[self::$CSRFFieldName] = new sfWidgetFormInputHidden();
+        $this->setDefault(self::$CSRFFieldName, $token);
+
+        return $this;
+    }
+
+    /**
+     * Returns a CSRF token, given a secret.
+     *
+     * If you want to change the algorithm used to compute the token, you
+     * can override this method.
+     *
+     * @param string $secret The secret string to use (null to use the current secret)
+     *
+     * @return string A token string
+     */
+    public function getCSRFToken($secret = null)
+    {
+        if (null === $secret) {
+            $secret = $this->localCSRFSecret ?: self::$CSRFSecret;
+        }
+
+        return md5($secret.session_id().get_class($this));
+    }
+
+    /**
+     * @return true if this form is CSRF protected
+     */
+    public function isCSRFProtected()
+    {
+        return null !== $this->validatorSchema[self::$CSRFFieldName];
+    }
+
+    /**
+     * Sets the CSRF field name.
+     *
+     * @param string $name The CSRF field name
+     */
+    public static function setCSRFFieldName($name)
+    {
+        self::$CSRFFieldName = $name;
+    }
+
+    /**
+     * Gets the CSRF field name.
+     *
+     * @return string The CSRF field name
+     */
+    public static function getCSRFFieldName()
+    {
+        return self::$CSRFFieldName;
+    }
+
+    /**
+     * Enables CSRF protection for this form.
+     *
+     * @param string $secret A secret to use when computing the CSRF token
+     */
+    public function enableLocalCSRFProtection($secret = null)
+    {
+        $this->localCSRFSecret = null === $secret ? true : $secret;
+    }
+
+    /**
+     * Disables CSRF protection for this form.
+     */
+    public function disableLocalCSRFProtection()
+    {
+        $this->localCSRFSecret = false;
+    }
+
+    /**
+     * Enables CSRF protection for all forms.
+     *
+     * The given secret will be used for all forms, except if you pass a secret in the constructor.
+     * Even if a secret is automatically generated if you don't provide a secret, you're strongly advised
+     * to provide one by yourself.
+     *
+     * @param string $secret A secret to use when computing the CSRF token
+     */
+    public static function enableCSRFProtection($secret = null)
+    {
+        self::$CSRFSecret = $secret;
+    }
+
+    /**
+     * Disables CSRF protection for all forms.
+     */
+    public static function disableCSRFProtection()
+    {
+        self::$CSRFSecret = false;
+    }
+
+    /**
+     * Returns true if the form is multipart.
+     *
+     * @return bool true if the form is multipart
+     */
+    public function isMultipart()
+    {
+        return $this->widgetSchema->needsMultipartForm();
+    }
+
+    /**
+     * Renders the form tag.
+     *
+     * This methods only renders the opening form tag.
+     * You need to close it after the form rendering.
+     *
+     * This method takes into account the multipart widgets
+     * and converts PUT and DELETE methods to a hidden field
+     * for later processing.
+     *
+     * @param string $url        The URL for the action
+     * @param array  $attributes An array of HTML attributes
+     *
+     * @return string An HTML representation of the opening form tag
+     */
+    public function renderFormTag($url, array $attributes = array())
+    {
+        $attributes['action'] = $url;
+        $attributes['method'] = isset($attributes['method']) ? strtolower($attributes['method']) : 'post';
+        if ($this->isMultipart()) {
+            $attributes['enctype'] = 'multipart/form-data';
+        }
+
+        $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));
+            $attributes['method'] = 'post';
+        }
+
+        return sprintf('<form%s>', $this->getWidgetSchema()->attributesToHtml($attributes)).$html;
+    }
+
+    public function resetFormFields()
+    {
+        $this->formFields = array();
+        $this->formFieldSchema = null;
+    }
+
+    /**
+     * Returns true if the bound field exists (implements the ArrayAccess interface).
+     *
+     * @param string $name The name of the bound field
+     *
+     * @return bool true if the widget exists, false otherwise
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetExists($name)
+    {
+        return isset($this->widgetSchema[$name]);
+    }
+
+    /**
+     * Returns the form field associated with the name (implements the ArrayAccess interface).
+     *
+     * @param string $name The offset of the value to get
+     *
+     * @return sfFormField|sfFormFieldSchema A form field instance
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetGet($name)
+    {
+        if (!isset($this->formFields[$name])) {
+            if (!$widget = $this->widgetSchema[$name]) {
+                throw new InvalidArgumentException(sprintf('Widget "%s" does not exist.', $name));
+            }
+
+            if ($this->isBound) {
+                $value = isset($this->taintedValues[$name]) ? $this->taintedValues[$name] : null;
+            } elseif (isset($this->defaults[$name])) {
+                $value = $this->defaults[$name];
+            } else {
+                $value = $widget instanceof sfWidgetFormSchema ? $widget->getDefaults() : $widget->getDefault();
+            }
+
+            $class = $widget instanceof sfWidgetFormSchema ? 'sfFormFieldSchema' : 'sfFormField';
+
+            $this->formFields[$name] = new $class($widget, $this->getFormFieldSchema(), $name, $value, $this->errorSchema[$name]);
+        }
+
+        return $this->formFields[$name];
+    }
+
+    /**
+     * Throws an exception saying that values cannot be set (implements the ArrayAccess interface).
+     *
+     * @param string $offset (ignored)
+     * @param string $value  (ignored)
+     *
+     * @throws <b>LogicException</b>
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetSet($offset, $value)
+    {
+        throw new LogicException('Cannot update form fields.');
+    }
+
+    /**
+     * Removes a field from the form.
+     *
+     * It removes the widget and the validator for the given field.
+     *
+     * @param string $offset The field name
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetUnset($offset)
+    {
+        unset(
+            $this->widgetSchema[$offset],
+            $this->validatorSchema[$offset],
+            $this->defaults[$offset],
+            $this->taintedValues[$offset],
+            $this->values[$offset],
+            $this->embeddedForms[$offset]
+        );
+
+        $this->resetFormFields();
+    }
+
+    /**
+     * Removes all visible fields from the form except the ones given as an argument.
+     *
+     * Hidden fields are not affected.
+     *
+     * @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)
+    {
+        $hidden = array();
+
+        foreach ($this as $name => $field) {
+            if ($field->isHidden()) {
+                $hidden[] = $name;
+            } elseif (!in_array($name, $fields)) {
+                unset($this[$name]);
+            }
+        }
+
+        if ($ordered) {
+            $this->widgetSchema->setPositions(array_merge($fields, $hidden));
+        }
+    }
+
+    /**
+     * Returns a form field for the main widget schema.
+     *
+     * @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);
+        }
+
+        return $this->formFieldSchema;
+    }
+
+    /**
+     * Get all errors (included embedded forms errors).
+     *
+     * @return array
+     */
+    public function getErrors()
+    {
+        $errors = array();
+
+        if ($this->hasGlobalErrors()) {
+            $errors['_globals'] = array();
+            foreach ($this->getGlobalErrors() as $name => $error) {
+                $errors['_globals'][$name] = $error->getMessage();
+            }
+        }
+
+        foreach ($this as $name => $field) {
+            if (!($field instanceof sfFormFieldSchema) && $field->hasError()) {
+                $errors[$this->widgetSchema->getFormFormatter()->generateLabelName($name)] = $field->getError()->getMessage();
+            }
+        }
+
+        foreach ($this->getEmbeddedForms() as $name => $form) {
+            if ($form->hasErrors()) {
+                $errors[$name] = $form->getErrors();
+            }
+        }
+
+        return $errors;
+    }
+
+    /**
+     * Resets the field names array to the beginning (implements the Iterator interface).
+     */
+    #[\ReturnTypeWillChange]
+    public function rewind()
+    {
+        $this->fieldNames = $this->widgetSchema->getPositions();
+
+        reset($this->fieldNames);
+        $this->count = count($this->fieldNames);
+    }
+
+    /**
+     * Gets the key associated with the current form field (implements the Iterator interface).
+     *
+     * @return string The key
+     */
+    #[\ReturnTypeWillChange]
+    public function key()
+    {
+        return current($this->fieldNames);
+    }
+
+    /**
+     * Returns the current form field (implements the Iterator interface).
+     *
+     * @return mixed The escaped value
+     */
+    #[\ReturnTypeWillChange]
+    public function current()
+    {
+        return $this[current($this->fieldNames)];
+    }
+
+    /**
+     * Moves to the next form field (implements the Iterator interface).
+     */
+    #[\ReturnTypeWillChange]
+    public function next()
+    {
+        next($this->fieldNames);
+        --$this->count;
+    }
+
+    /**
+     * Returns true if the current form field is valid (implements the Iterator interface).
+     *
+     * @return bool The validity of the current element; true if it is valid
+     */
+    #[\ReturnTypeWillChange]
+    public function valid()
+    {
+        return $this->count > 0;
+    }
+
+    /**
+     * Returns the number of form fields (implements the Countable interface).
+     *
+     * @return int The number of embedded form fields
+     */
+    #[\ReturnTypeWillChange]
+    public function count()
+    {
+        return count($this->getFormFieldSchema());
+    }
+
+    /**
+     * Converts uploaded file array to a format following the $_GET and $POST naming convention.
+     *
+     * It's safe to pass an already converted array, in which case this method just returns the original array unmodified.
+     *
+     * @param array $taintedFiles An array representing uploaded file information
+     *
+     * @return array An array of re-ordered uploaded file information
+     */
+    public static function convertFileInformation(array $taintedFiles)
+    {
+        $files = array();
+        foreach ($taintedFiles as $key => $data) {
+            $files[$key] = self::fixPhpFilesArray($data);
+        }
+
+        return $files;
+    }
+
+    /**
+     * Returns true if a form thrown an exception in the __toString() method.
+     *
+     * This is a hack needed because PHP does not allow to throw exceptions in __toString() magic method.
+     *
+     * @return bool
+     */
+    public static function hasToStringException()
+    {
+        return null !== self::$toStringException;
+    }
+
+    /**
+     * Gets the exception if one was thrown in the __toString() method.
+     *
+     * This is a hack needed because PHP does not allow to throw exceptions in __toString() magic method.
+     *
+     * @return Exception
+     */
+    public static function getToStringException()
+    {
+        return self::$toStringException;
+    }
+
+    /**
+     * Sets an exception thrown by the __toString() method.
+     *
+     * 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()
+     */
+    public static function setToStringException(Exception $e)
+    {
+        if (null === self::$toStringException) {
+            self::$toStringException = $e;
+        }
+    }
+
+    /**
+     * Cleans and binds values to the current form.
+     *
+     * @param array $values A merged array of values and files
+     */
+    protected function doBind(array $values)
+    {
+        $this->values = $this->validatorSchema->clean($values);
+    }
+
+    protected static function fixPhpFilesArray($data)
+    {
+        $fileKeys = array('error', 'name', 'size', 'tmp_name', 'type');
+        $keys = array_keys($data);
+        sort($keys);
+
+        if ($fileKeys != $keys || !isset($data['name']) || !is_array($data['name'])) {
+            return $data;
+        }
+
+        $files = $data;
+        foreach ($fileKeys as $k) {
+            unset($files[$k]);
+        }
+        foreach (array_keys($data['name']) as $key) {
+            $files[$key] = self::fixPhpFilesArray(array(
+                'error' => $data['error'][$key],
+                'name' => $data['name'][$key],
+                'type' => $data['type'][$key],
+                'tmp_name' => $data['tmp_name'][$key],
+                'size' => $data['size'][$key],
+            ));
+        }
+
+        return $files;
+    }
+
+    /**
+     * Merges two arrays without reindexing numeric keys.
+     *
+     * @param array $array1 An array to merge
+     * @param array $array2 An array to merge
+     *
+     * @return array The merged array
+     */
+    protected static function deepArrayUnion($array1, $array2)
+    {
+        foreach ($array2 as $key => $value) {
+            if (is_array($value) && isset($array1[$key]) && is_array($array1[$key])) {
+                $array1[$key] = self::deepArrayUnion($array1[$key], $value);
+            } else {
+                $array1[$key] = $value;
+            }
+        }
+
+        return $array1;
+    }
+
+    /**
+     * Checks that the $_POST values do not contain something that
+     * looks like a file upload (coming from $_FILE).
+     *
+     * @param array $values
+     */
+    protected function checkTaintedValues($values)
+    {
+        foreach ($values as $name => $value) {
+            if (!is_array($value)) {
+                continue;
+            }
+
+            if (isset($value['tmp_name'])) {
+                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 81b378fde..a0d226a76 100644
--- a/lib/form/sfFormField.class.php
+++ b/lib/form/sfFormField.class.php
@@ -11,323 +11,311 @@
 /**
  * sfFormField represents a widget bind to a name and a value.
  *
- * @package    symfony
- * @subpackage form
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfFormField
 {
-  protected static
-    $toStringException = null;
-  
-  /** @var sfWidgetForm */
-  protected $widget = null;
-  /** @var null|sfFormField */
-  protected $parent = null;
-  /** @var string */
-  protected $name = '';
-  /** @var string */
-  protected $value = null;
-  /** @var null|sfValidatorError|sfValidatorErrorSchema */
-  protected $error = null;
-
-  /**
-   * 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
-   */
-  public function __construct(sfWidgetForm $widget, sfFormField $parent = null, $name, $value, sfValidatorError $error = null)
-  {
-    $this->widget = $widget;
-    $this->parent = $parent;
-    $this->name   = $name;
-    $this->value  = $value;
-    $this->error  = $error;
-  }
-
-  /**
-   * Returns the string representation of this form field.
-   *
-   * @return string The rendered field
-   */
-  public function __toString()
-  {
-    try
+    protected static $toStringException;
+
+    /** @var sfWidgetForm */
+    protected $widget;
+
+    /** @var sfFormField|null */
+    protected $parent;
+
+    /** @var string */
+    protected $name = '';
+
+    /** @var string */
+    protected $value;
+
+    /** @var sfValidatorError|sfValidatorErrorSchema|null */
+    protected $error;
+
+    /**
+     * 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
+     */
+    public function __construct(sfWidgetForm $widget, sfFormField $parent = null, $name, $value, sfValidatorError $error = null)
+    {
+        $this->widget = $widget;
+        $this->parent = $parent;
+        $this->name = $name;
+        $this->value = $value;
+        $this->error = $error;
+    }
+
+    /**
+     * Returns the string representation of this form field.
+     *
+     * @return string The rendered field
+     */
+    public function __toString()
     {
-      return $this->render();
+        try {
+            return $this->render();
+        } catch (Exception $e) {
+            self::setToStringException($e);
+
+            // we return a simple Exception message in case the form framework is used out of symfony.
+            return 'Exception: '.$e->getMessage();
+        }
     }
-    catch (Exception $e)
+
+    /**
+     * Returns true if a form thrown an exception in the __toString() method.
+     *
+     * This is a hack needed because PHP does not allow to throw exceptions in __toString() magic method.
+     *
+     * @return bool
+     */
+    public static function hasToStringException()
     {
-      self::setToStringException($e);
+        return null !== self::$toStringException;
+    }
+
+    /**
+     * Gets the exception if one was thrown in the __toString() method.
+     *
+     * This is a hack needed because PHP does not allow to throw exceptions in __toString() magic method.
+     *
+     * @return Exception
+     */
+    public static function getToStringException()
+    {
+        return self::$toStringException;
+    }
 
-      // we return a simple Exception message in case the form framework is used out of symfony.
-      return 'Exception: '.$e->getMessage();
+    /**
+     * Sets an exception thrown by the __toString() method.
+     *
+     * 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()
+     */
+    public static function setToStringException(Exception $e)
+    {
+        if (null === self::$toStringException) {
+            self::$toStringException = $e;
+        }
     }
-  }
-
-  /**
-   * Returns true if a form thrown an exception in the __toString() method
-   *
-   * This is a hack needed because PHP does not allow to throw exceptions in __toString() magic method.
-   *
-   * @return boolean
-   */
-  static public function hasToStringException()
-  {
-    return null !== self::$toStringException;
-  }
-
-  /**
-   * Gets the exception if one was thrown in the __toString() method.
-   *
-   * This is a hack needed because PHP does not allow to throw exceptions in __toString() magic method.
-   *
-   * @return Exception
-   */
-  static public function getToStringException()
-  {
-    return self::$toStringException;
-  }
-
-  /**
-   * Sets an exception thrown by the __toString() method.
-   *
-   * 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()
-   */
-  static public function setToStringException(Exception $e)
-  {
-    if (null === self::$toStringException)
+
+    /**
+     * Renders the form field.
+     *
+     * @param array $attributes An array of HTML attributes
+     *
+     * @return string The rendered widget
+     */
+    public function render($attributes = array())
     {
-      self::$toStringException = $e;
+        if ($this->parent) {
+            return $this->parent->getWidget()->renderField($this->name, $this->value, $attributes, $this->error);
+        }
+
+        return $this->widget->render($this->name, $this->value, $attributes, $this->error);
     }
-  }
-
-  /**
-   * Renders the form field.
-   *
-   * @param array $attributes An array of HTML attributes
-   *
-   * @return string The rendered widget
-   */
-  function render($attributes = array())
-  {
-    if ($this->parent)
+
+    /**
+     * Returns a formatted row.
+     *
+     * The formatted row will use the parent widget schema formatter.
+     * The formatted row contains the label, the field, the error and
+     * the help message.
+     *
+     * @param array  $attributes An array of HTML attributes to merge with the current attributes
+     * @param string $label      The label name (not null to override the current value)
+     * @param string $help       The help text (not null to override the current value)
+     *
+     * @return string The formatted row
+     */
+    public function renderRow($attributes = array(), $label = null, $help = null)
     {
-      return $this->parent->getWidget()->renderField($this->name, $this->value, $attributes, $this->error);
+        if (null === $this->parent) {
+            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);
+
+        $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%' => ''));
     }
-    else
+
+    /**
+     * Returns a formatted error list.
+     *
+     * The formatted list will use the parent widget schema formatter.
+     *
+     * @return string The formatted error list
+     */
+    public function renderError()
     {
-      return $this->widget->render($this->name, $this->value, $attributes, $this->error);
+        if (null === $this->parent) {
+            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;
+
+        return $this->parent->getWidget()->getFormFormatter()->formatErrorsForRow($error);
     }
-  }
-
-  /**
-   * Returns a formatted row.
-   *
-   * The formatted row will use the parent widget schema formatter.
-   * The formatted row contains the label, the field, the error and
-   * the help message.
-   *
-   * @param array  $attributes An array of HTML attributes to merge with the current attributes
-   * @param string $label      The label name (not null to override the current value)
-   * @param string $help       The help text (not null to override the current value)
-   *
-   * @return string The formatted row
-   */
-  public function renderRow($attributes = array(), $label = null, $help = null)
-  {
-    if (null === $this->parent)
+
+    /**
+     * Returns the help text.
+     *
+     * @return string The help text
+     */
+    public function renderHelp()
     {
-      throw new LogicException(sprintf('Unable to render the row for "%s".', $this->name));
+        if (null === $this->parent) {
+            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));
     }
 
-    $field = $this->parent->getWidget()->renderField($this->name, $this->value, !is_array($attributes) ? array() : $attributes, $this->error);
+    /**
+     * Returns the label tag.
+     *
+     * @param string $label      The label name (not null to override the current value)
+     * @param array  $attributes Optional html attributes
+     *
+     * @return string The label tag
+     */
+    public function renderLabel($label = null, $attributes = array())
+    {
+        if (null === $this->parent) {
+            throw new LogicException(sprintf('Unable to render the label for "%s".', $this->name));
+        }
+
+        if (null !== $label) {
+            $currentLabel = $this->parent->getWidget()->getLabel($this->name);
+            $this->parent->getWidget()->setLabel($this->name, $label);
+        }
 
-    $error = $this->error instanceof sfValidatorErrorSchema ? $this->error->getGlobalErrors() : $this->error;
+        $html = $this->parent->getWidget()->getFormFormatter()->generateLabel($this->name, $attributes);
 
-    $help = null === $help ? $this->parent->getWidget()->getHelp($this->name) : $help;
+        if (null !== $label) {
+            $this->parent->getWidget()->setLabel($this->name, $currentLabel);
+        }
 
-    return strtr($this->parent->getWidget()->getFormFormatter()->formatRow($this->renderLabel($label), $field, $error, $help), array('%hidden_fields%' => ''));
-  }
+        return $html;
+    }
 
-  /**
-   * Returns a formatted error list.
-   *
-   * The formatted list will use the parent widget schema formatter.
-   *
-   * @return string The formatted error list
-   */
-  public function renderError()
-  {
-    if (null === $this->parent)
+    /**
+     * Returns the label name given a widget name.
+     *
+     * @return string The label name
+     */
+    public function renderLabelName()
     {
-      throw new LogicException(sprintf('Unable to render the error for "%s".', $this->name));
+        if (null === $this->parent) {
+            throw new LogicException(sprintf('Unable to render the label name for "%s".', $this->name));
+        }
+
+        return $this->parent->getWidget()->getFormFormatter()->generateLabelName($this->name);
     }
 
-    $error = $this->getWidget() instanceof sfWidgetFormSchema ? $this->getWidget()->getGlobalErrors($this->error) : $this->error;
+    /**
+     * Returns the name attribute of the widget.
+     *
+     * @return string The name attribute of the widget
+     */
+    public function renderName()
+    {
+        return $this->parent ? $this->parent->getWidget()->generateName($this->name) : $this->name;
+    }
 
-    return $this->parent->getWidget()->getFormFormatter()->formatErrorsForRow($error);
-  }
+    /**
+     * Returns the id attribute of the widget.
+     *
+     * @return string The id attribute of the widget
+     */
+    public function renderId()
+    {
+        return $this->widget->generateId($this->parent ? $this->parent->getWidget()->generateName($this->name) : $this->name, $this->value);
+    }
 
-  /**
-   * Returns the help text.
-   *
-   * @return string The help text
-   */
-  public function renderHelp()
-  {
-    if (null === $this->parent)
+    /**
+     * Returns true if the widget is hidden.
+     *
+     * @return bool true if the widget is hidden, false otherwise
+     */
+    public function isHidden()
     {
-      throw new LogicException(sprintf('Unable to render the help for "%s".', $this->name));
+        return $this->widget->isHidden();
     }
 
-    return $this->parent->getWidget()->getFormFormatter()->formatHelp($this->parent->getWidget()->getHelp($this->name));
-  }
-
-  /**
-   * Returns the label tag.
-   *
-   * @param string $label      The label name (not null to override the current value)
-   * @param array  $attributes Optional html attributes
-   *
-   * @return string The label tag
-   */
-  public function renderLabel($label = null, $attributes = array())
-  {
-    if (null === $this->parent)
+    /**
+     * Returns the widget name.
+     *
+     * @return mixed The widget name
+     */
+    public function getName()
     {
-      throw new LogicException(sprintf('Unable to render the label for "%s".', $this->name));
+        return $this->name;
     }
 
-    if (null !== $label)
+    /**
+     * Returns the widget value.
+     *
+     * @return mixed The widget value
+     */
+    public function getValue()
     {
-      $currentLabel = $this->parent->getWidget()->getLabel($this->name);
-      $this->parent->getWidget()->setLabel($this->name, $label);
+        return $this->value;
     }
 
-    $html = $this->parent->getWidget()->getFormFormatter()->generateLabel($this->name, $attributes);
+    /**
+     * Returns the wrapped widget.
+     *
+     * @return sfWidget|sfWidgetFormSchemaDecorator A sfWidget instance
+     */
+    public function getWidget()
+    {
+        return $this->widget;
+    }
 
-    if (null !== $label)
+    /**
+     * Returns the parent form field.
+     *
+     * @return sfFormField A sfFormField instance
+     */
+    public function getParent()
     {
-      $this->parent->getWidget()->setLabel($this->name, $currentLabel);
+        return $this->parent;
     }
 
-    return $html;
-  }
-
-  /**
-   * Returns the label name given a widget name.
-   *
-   * @return string The label name
-   */
-  public function renderLabelName()
-  {
-    if (null === $this->parent)
+    /**
+     * Returns the error for this field.
+     *
+     * @return sfValidatorError A sfValidatorError instance
+     */
+    public function getError()
     {
-      throw new LogicException(sprintf('Unable to render the label name for "%s".', $this->name));
+        return $this->error;
     }
 
-    return $this->parent->getWidget()->getFormFormatter()->generateLabelName($this->name);
-  }
-
-  /**
-   * Returns the name attribute of the widget.
-   *
-   * @return string The name attribute of the widget
-   */
-  public function renderName()
-  {
-    return $this->parent ? $this->parent->getWidget()->generateName($this->name) : $this->name;
-  }
-
-  /**
-   * Returns the id attribute of the widget.
-   *
-   * @return string The id attribute of the widget
-   */
-  public function renderId()
-  {
-    return $this->widget->generateId($this->parent ? $this->parent->getWidget()->generateName($this->name) : $this->name, $this->value);
-  }
-
-  /**
-   * Returns true if the widget is hidden.
-   *
-   * @return Boolean true if the widget is hidden, false otherwise
-   */
-  public function isHidden()
-  {
-    return $this->widget->isHidden();
-  }
-
-  /**
-   * Returns the widget name.
-   *
-   * @return mixed The widget name
-   */
-  public function getName()
-  {
-    return $this->name;
-  }
-
-  /**
-   * Returns the widget value.
-   *
-   * @return mixed The widget value
-   */
-  public function getValue()
-  {
-    return $this->value;
-  }
-
-  /**
-   * Returns the wrapped widget.
-   *
-   * @return sfWidget|sfWidgetFormSchemaDecorator A sfWidget instance
-   */
-  public function getWidget()
-  {
-    return $this->widget;
-  }
-
-  /**
-   * Returns the parent form field.
-   *
-   * @return sfFormField A sfFormField instance
-   */
-  public function getParent()
-  {
-    return $this->parent;
-  }
-
-  /**
-   * Returns the error for this field.
-   *
-   * @return sfValidatorError A sfValidatorError instance
-   */
-  public function getError()
-  {
-    return $this->error;
-  }
-
-  /**
-   * Returns true is the field has an error.
-   *
-   * @return Boolean true if the field has some errors, false otherwise
-   */
-  public function hasError()
-  {
-    if ($this->error instanceof sfValidatorErrorSchema) {
-      return $this->error->count() > 0;
+    /**
+     * Returns true is the field has an error.
+     *
+     * @return bool true if the field has some errors, false otherwise
+     */
+    public function hasError()
+    {
+        if ($this->error instanceof sfValidatorErrorSchema) {
+            return $this->error->count() > 0;
+        }
+
+        return null !== $this->error;
     }
-    
-    return $this->error !== null;
-  }
 }
diff --git a/lib/form/sfFormFieldSchema.class.php b/lib/form/sfFormFieldSchema.class.php
index 2e9407ad5..df5545120 100644
--- a/lib/form/sfFormFieldSchema.class.php
+++ b/lib/form/sfFormFieldSchema.class.php
@@ -11,221 +11,208 @@
 /**
  * sfFormFieldSchema represents an array of widgets bind to names and values.
  *
- * @package    symfony
- * @subpackage form
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfFormFieldSchema extends sfFormField implements ArrayAccess, Iterator, Countable
 {
-  protected
-    $count      = 0,
-    $fieldNames = array(),
-    $fields     = array();
-
-  /**
-   * 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
-   */
-  public function __construct(sfWidgetFormSchema $widget, sfFormField $parent = null, $name, $value, sfValidatorError $error = null)
-  {
-    parent::__construct($widget, $parent, $name, $value, $error);
-
-    $this->fieldNames = $widget->getPositions();
-  }
-
-  /**
-   * Renders hidden form fields.
-   *
-   * @param boolean $recursive False will prevent hidden fields from embedded forms from rendering
-   *
-   * @return string
-   */
-  public function renderHiddenFields($recursive = true)
-  {
-    $output = '';
-
-    foreach ($this->getHiddenFields($recursive) as $field)
+    protected $count = 0;
+    protected $fieldNames = array();
+    protected $fields = array();
+
+    /**
+     * 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
+     */
+    public function __construct(sfWidgetFormSchema $widget, sfFormField $parent = null, $name, $value, sfValidatorError $error = null)
+    {
+        parent::__construct($widget, $parent, $name, $value, $error);
+
+        $this->fieldNames = $widget->getPositions();
+    }
+
+    /**
+     * Renders hidden form fields.
+     *
+     * @param bool $recursive False will prevent hidden fields from embedded forms from rendering
+     *
+     * @return string
+     */
+    public function renderHiddenFields($recursive = true)
+    {
+        $output = '';
+
+        foreach ($this->getHiddenFields($recursive) as $field) {
+            $output .= $field->render();
+        }
+
+        return $output;
+    }
+
+    /**
+     * Returns an array of hidden fields from the current schema.
+     *
+     * @param bool $recursive Whether to recur through embedded schemas
+     *
+     * @return array
+     */
+    public function getHiddenFields($recursive = true)
     {
-      $output .= $field->render();
+        $fields = array();
+
+        foreach ($this as $name => $field) {
+            if ($field instanceof sfFormFieldSchema && $recursive) {
+                $fields = array_merge($fields, $field->getHiddenFields($recursive));
+            } elseif ($field->isHidden()) {
+                $fields[] = $field;
+            }
+        }
+
+        return $fields;
     }
 
-    return $output;
-  }
-
-  /**
-   * Returns an array of hidden fields from the current schema.
-   *
-   * @param boolean $recursive Whether to recur through embedded schemas
-   *
-   * @return array
-   */
-  public function getHiddenFields($recursive = true)
-  {
-    $fields = array();
-
-    foreach ($this as $name => $field)
+    /**
+     * Returns true if the bound field exists (implements the ArrayAccess interface).
+     *
+     * @param string $name The name of the bound field
+     *
+     * @return bool true if the widget exists, false otherwise
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetExists($name)
     {
-      if ($field instanceof sfFormFieldSchema && $recursive)
-      {
-        $fields = array_merge($fields, $field->getHiddenFields($recursive));
-      }
-      else if ($field->isHidden())
-      {
-        $fields[] = $field;
-      }
+        return isset($this->widget[$name]);
     }
 
-    return $fields;
-  }
-
-  /**
-   * Returns true if the bound field exists (implements the ArrayAccess interface).
-   *
-   * @param string $name The name of the bound field
-   *
-   * @return Boolean true if the widget exists, false otherwise
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetExists($name)
-  {
-    return isset($this->widget[$name]);
-  }
-
-  /**
-   * Returns the form field associated with the name (implements the ArrayAccess interface).
-   *
-   * @param string $name The offset of the value to get
-   *
-   * @return sfFormField A form field instance
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetGet($name)
-  {
-    if (!isset($this->fields[$name]))
+    /**
+     * Returns the form field associated with the name (implements the ArrayAccess interface).
+     *
+     * @param string $name The offset of the value to get
+     *
+     * @return sfFormField A form field instance
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetGet($name)
     {
-      if (null === $widget = $this->widget[$name])
-      {
-        throw new InvalidArgumentException(sprintf('Widget "%s" does not exist.', $name));
-      }
-
-      $error = isset($this->error[$name]) ? $this->error[$name] : null;
-
-      if ($widget instanceof sfWidgetFormSchema)
-      {
-        $class = 'sfFormFieldSchema';
-
-        if ($error && !$error instanceof sfValidatorErrorSchema)
-        {
-          $current = $error;
-          $error = new sfValidatorErrorSchema($error->getValidator());
-          $error->addError($current);
+        if (!isset($this->fields[$name])) {
+            if (null === $widget = $this->widget[$name]) {
+                throw new InvalidArgumentException(sprintf('Widget "%s" does not exist.', $name));
+            }
+
+            $error = isset($this->error[$name]) ? $this->error[$name] : null;
+
+            if ($widget instanceof sfWidgetFormSchema) {
+                $class = 'sfFormFieldSchema';
+
+                if ($error && !$error instanceof sfValidatorErrorSchema) {
+                    $current = $error;
+                    $error = new sfValidatorErrorSchema($error->getValidator());
+                    $error->addError($current);
+                }
+            } else {
+                $class = 'sfFormField';
+            }
+
+            $this->fields[$name] = new $class($widget, $this, $name, isset($this->value[$name]) ? $this->value[$name] : null, $error);
         }
-      }
-      else
-      {
-        $class = 'sfFormField';
-      }
 
-      $this->fields[$name] = new $class($widget, $this, $name, isset($this->value[$name]) ? $this->value[$name] : null, $error);
+        return $this->fields[$name];
+    }
+
+    /**
+     * Throws an exception saying that values cannot be set (implements the ArrayAccess interface).
+     *
+     * @param string $offset (ignored)
+     * @param string $value  (ignored)
+     *
+     * @throws LogicException
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetSet($offset, $value)
+    {
+        throw new LogicException('Cannot update form fields (read-only).');
+    }
+
+    /**
+     * Throws an exception saying that values cannot be unset (implements the ArrayAccess interface).
+     *
+     * @param string $offset (ignored)
+     *
+     * @throws LogicException
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetUnset($offset)
+    {
+        throw new LogicException('Cannot remove form fields (read-only).');
+    }
+
+    /**
+     * Resets the field names array to the beginning (implements the Iterator interface).
+     */
+    #[\ReturnTypeWillChange]
+    public function rewind()
+    {
+        reset($this->fieldNames);
+        $this->count = count($this->fieldNames);
+    }
+
+    /**
+     * Gets the key associated with the current form field (implements the Iterator interface).
+     *
+     * @return string The key
+     */
+    #[\ReturnTypeWillChange]
+    public function key()
+    {
+        return current($this->fieldNames);
+    }
+
+    /**
+     * Returns the current form field (implements the Iterator interface).
+     *
+     * @return mixed The escaped value
+     */
+    #[\ReturnTypeWillChange]
+    public function current()
+    {
+        return $this[current($this->fieldNames)];
     }
 
-    return $this->fields[$name];
-  }
-
-  /**
-   * Throws an exception saying that values cannot be set (implements the ArrayAccess interface).
-   *
-   * @param string $offset (ignored)
-   * @param string $value (ignored)
-   *
-   * @throws LogicException
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetSet($offset, $value)
-  {
-    throw new LogicException('Cannot update form fields (read-only).');
-  }
-
-  /**
-   * Throws an exception saying that values cannot be unset (implements the ArrayAccess interface).
-   *
-   * @param string $offset (ignored)
-   *
-   * @throws LogicException
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetUnset($offset)
-  {
-    throw new LogicException('Cannot remove form fields (read-only).');
-  }
-
-  /**
-   * Resets the field names array to the beginning (implements the Iterator interface).
-   */
-  #[\ReturnTypeWillChange]
-  public function rewind()
-  {
-    reset($this->fieldNames);
-    $this->count = count($this->fieldNames);
-  }
-
-  /**
-   * Gets the key associated with the current form field (implements the Iterator interface).
-   *
-   * @return string The key
-   */
-  #[\ReturnTypeWillChange]
-  public function key()
-  {
-    return current($this->fieldNames);
-  }
-
-  /**
-   * Returns the current form field (implements the Iterator interface).
-   *
-   * @return mixed The escaped value
-   */
-  #[\ReturnTypeWillChange]
-  public function current()
-  {
-    return $this[current($this->fieldNames)];
-  }
-
-  /**
-   * Moves to the next form field (implements the Iterator interface).
-   */
-  #[\ReturnTypeWillChange]
-  public function next()
-  {
-    next($this->fieldNames);
-    --$this->count;
-  }
-
-  /**
-   * Returns true if the current form field is valid (implements the Iterator interface).
-   *
-   * @return boolean The validity of the current element; true if it is valid
-   */
-  #[\ReturnTypeWillChange]
-  public function valid()
-  {
-    return $this->count > 0;
-  }
-
-  /**
-   * Returns the number of form fields (implements the Countable interface).
-   *
-   * @return integer The number of embedded form fields
-   */
-  #[\ReturnTypeWillChange]
-  public function count()
-  {
-    return count($this->fieldNames);
-  }
+    /**
+     * Moves to the next form field (implements the Iterator interface).
+     */
+    #[\ReturnTypeWillChange]
+    public function next()
+    {
+        next($this->fieldNames);
+        --$this->count;
+    }
+
+    /**
+     * Returns true if the current form field is valid (implements the Iterator interface).
+     *
+     * @return bool The validity of the current element; true if it is valid
+     */
+    #[\ReturnTypeWillChange]
+    public function valid()
+    {
+        return $this->count > 0;
+    }
+
+    /**
+     * Returns the number of form fields (implements the Countable interface).
+     *
+     * @return int The number of embedded form fields
+     */
+    #[\ReturnTypeWillChange]
+    public function count()
+    {
+        return count($this->fieldNames);
+    }
 }
diff --git a/lib/generator/sfGenerator.class.php b/lib/generator/sfGenerator.class.php
index b44b774d1..c2262acf8 100644
--- a/lib/generator/sfGenerator.class.php
+++ b/lib/generator/sfGenerator.class.php
@@ -11,185 +11,183 @@
 /**
  * sfGenerator is the abstract base class for all generators.
  *
- * @package    symfony
- * @subpackage generator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfGenerator
 {
-  protected $generatorClass = '';
-  /** @var sfGeneratorManager */
-  protected $generatorManager = null;
-  protected $generatedModuleName = '';
-  protected $theme = 'default';
-  protected $moduleName = '';
-  
-  /**
-   * Class constructor.
-   *
-   * @see initialize()
-   *
-   * @param sfGeneratorManager $generatorManager
-   */
-  public function __construct(sfGeneratorManager $generatorManager)
-  {
-    $this->initialize($generatorManager);
-  }
-
-  /**
-   * Initializes the current sfGenerator instance.
-   *
-   * @param sfGeneratorManager $generatorManager A sfGeneratorManager instance
-   */
-  public function initialize(sfGeneratorManager $generatorManager)
-  {
-    $this->generatorManager = $generatorManager;
-  }
-
-  /**
-   * Generates classes and templates.
-   *
-   * @param array $params An array of parameters
-   *
-   * @return string The cache for the configuration file
-   */
-  abstract public function generate($params = array());
-
-  /**
-   * Generates PHP files for a given module name.
-   *
-   * @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())
-  {
-    foreach ($files as $file)
+    protected $generatorClass = '';
+
+    /** @var sfGeneratorManager */
+    protected $generatorManager;
+    protected $generatedModuleName = '';
+    protected $theme = 'default';
+    protected $moduleName = '';
+
+    /**
+     * Class constructor.
+     *
+     * @see initialize()
+     */
+    public function __construct(sfGeneratorManager $generatorManager)
+    {
+        $this->initialize($generatorManager);
+    }
+
+    /**
+     * Initializes the current sfGenerator instance.
+     *
+     * @param sfGeneratorManager $generatorManager A sfGeneratorManager instance
+     */
+    public function initialize(sfGeneratorManager $generatorManager)
+    {
+        $this->generatorManager = $generatorManager;
+    }
+
+    /**
+     * Generates classes and templates.
+     *
+     * @param array $params An array of parameters
+     *
+     * @return string The cache for the configuration file
+     */
+    abstract public function generate($params = array());
+
+    /**
+     * Gets the generator class.
+     *
+     * @return string The generator class
+     */
+    public function getGeneratorClass()
+    {
+        return $this->generatorClass;
+    }
+
+    /**
+     * Sets the generator class.
+     *
+     * @param string $generatorClass The generator class
+     */
+    public function setGeneratorClass($generatorClass)
+    {
+        $this->generatorClass = $generatorClass;
+    }
+
+    /**
+     * Gets the module name of the generated module.
+     *
+     * @return string The module name
+     */
+    public function getGeneratedModuleName()
+    {
+        return $this->generatedModuleName;
+    }
+
+    /**
+     * Sets the module name of the generated module.
+     *
+     * @param string $moduleName The module name
+     */
+    public function setGeneratedModuleName($moduleName)
+    {
+        $this->generatedModuleName = $moduleName;
+    }
+
+    /**
+     * Gets the module name.
+     *
+     * @return string The module name
+     */
+    public function getModuleName()
+    {
+        return $this->moduleName;
+    }
+
+    /**
+     * Sets the module name.
+     *
+     * @param string $moduleName The module name
+     */
+    public function setModuleName($moduleName)
+    {
+        $this->moduleName = $moduleName;
+    }
+
+    /**
+     * Gets the theme name.
+     *
+     * @return string The theme name
+     */
+    public function getTheme()
+    {
+        return $this->theme;
+    }
+
+    /**
+     * Sets the theme name.
+     *
+     * @param string $theme The theme name
+     */
+    public function setTheme($theme)
+    {
+        $this->theme = $theme;
+    }
+
+    /**
+     * Generates PHP files for a given module name.
+     *
+     * @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())
+    {
+        foreach ($files as $file) {
+            $this->getGeneratorManager()->save($generatedModuleName.'/'.$file, $this->evalTemplate($file));
+        }
+    }
+
+    /**
+     * Evaluates a template file.
+     *
+     * @param string $templateFile The template file path
+     *
+     * @return string The evaluated template
+     */
+    protected function evalTemplate($templateFile)
+    {
+        $templateFile = $this->generatorManager->getConfiguration()->getGeneratorTemplate($this->getGeneratorClass(), $this->getTheme(), $templateFile);
+
+        // eval template file
+        ob_start();
+
+        require $templateFile;
+        $content = ob_get_clean();
+
+        // replace [?php and ?]
+        return $this->replacePhpMarks($content);
+    }
+
+    /**
+     * Replaces PHP marks by <?php ?>.
+     *
+     * @param string $text The PHP code
+     *
+     * @return string The converted PHP code
+     */
+    protected function replacePhpMarks($text)
+    {
+        // replace [?php and ?]
+        return str_replace(array('[?php', '[?=', '?]'), array('<?php', '<?php echo', '?>'), $text);
+    }
+
+    /**
+     * Gets the sfGeneratorManager instance.
+     *
+     * @return sfGeneratorManager The sfGeneratorManager instance
+     */
+    protected function getGeneratorManager()
     {
-      $this->getGeneratorManager()->save($generatedModuleName.'/'.$file, $this->evalTemplate($file));
+        return $this->generatorManager;
     }
-  }
-
-  /**
-   * Evaluates a template file.
-   *
-   * @param string $templateFile The template file path
-   *
-   * @return string The evaluated template
-   */
-  protected function evalTemplate($templateFile)
-  {
-    $templateFile = $this->generatorManager->getConfiguration()->getGeneratorTemplate($this->getGeneratorClass(), $this->getTheme(), $templateFile);
-
-    // eval template file
-    ob_start();
-    require($templateFile);
-    $content = ob_get_clean();
-
-    // replace [?php and ?]
-    return $this->replacePhpMarks($content);
-  }
-
-  /**
-   * Replaces PHP marks by <?php ?>.
-   *
-   * @param string $text The PHP code
-   *
-   * @return string The converted PHP code
-   */
-  protected function replacePhpMarks($text)
-  {
-    // replace [?php and ?]
-    return str_replace(array('[?php', '[?=', '?]'), array('<?php', '<?php echo', '?>'), $text);
-  }
-
-  /**
-   * Gets the generator class.
-   *
-   * @return string The generator class
-   */
-  public function getGeneratorClass()
-  {
-    return $this->generatorClass;
-  }
-
-  /**
-   * Sets the generator class.
-   *
-   * @param string $generatorClass The generator class
-   */
-  public function setGeneratorClass($generatorClass)
-  {
-    $this->generatorClass = $generatorClass;
-  }
-
-  /**
-   * Gets the sfGeneratorManager instance.
-   *
-   * @return sfGeneratorManager The sfGeneratorManager instance
-   */
-  protected function getGeneratorManager()
-  {
-    return $this->generatorManager;
-  }
-
-  /**
-   * Gets the module name of the generated module.
-   *
-   * @return string The module name
-   */
-  public function getGeneratedModuleName()
-  {
-    return $this->generatedModuleName;
-  }
-
-  /**
-   * Sets the module name of the generated module.
-   *
-   * @param string $moduleName The module name
-   */
-  public function setGeneratedModuleName($moduleName)
-  {
-    $this->generatedModuleName = $moduleName;
-  }
-
-  /**
-   * Gets the module name.
-   *
-   * @return string The module name
-   */
-  public function getModuleName()
-  {
-    return $this->moduleName;
-  }
-
-  /**
-   * Sets the module name.
-   *
-   * @param string $moduleName The module name
-   */
-  public function setModuleName($moduleName)
-  {
-    $this->moduleName = $moduleName;
-  }
-
-  /**
-   * Gets the theme name.
-   *
-   * @return string The theme name
-   */
-  public function getTheme()
-  {
-    return $this->theme;
-  }
-
-  /**
-   * Sets the theme name.
-   *
-   * @param string $theme The theme name
-   */
-  public function setTheme($theme)
-  {
-    $this->theme = $theme;
-  }
 }
diff --git a/lib/generator/sfGeneratorManager.class.php b/lib/generator/sfGeneratorManager.class.php
index 0df8bc2da..88c3055c1 100644
--- a/lib/generator/sfGeneratorManager.class.php
+++ b/lib/generator/sfGeneratorManager.class.php
@@ -11,111 +11,105 @@
 /**
  * sfGeneratorManager helps generate classes, views and templates for scaffolding, admin interface, ...
  *
- * @package    symfony
- * @subpackage generator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfGeneratorManager
 {
-  protected
-    $configuration = null,
-    $basePath      = null;
-
-  /**
-   * Class constructor.
-   *
-   * @param sfProjectConfiguration $configuration A sfProjectConfiguration instance
-   * @param string                 $basePath      The base path for file generation
-   */
-  public function __construct(sfProjectConfiguration $configuration, $basePath = null)
-  {
-    $this->configuration = $configuration;
-    $this->basePath = $basePath;
-  }
+    protected $configuration;
+    protected $basePath;
 
-  /**
-   * Returns the current configuration instance.
-   *
-   * @return sfProjectConfiguration A sfProjectConfiguration instance
-   */
-  public function getConfiguration()
-  {
-    return $this->configuration;
-  }
-
-  /**
-   * Gets the base path to use when generating files.
-   *
-   * @return string The base path
-   */
-  public function getBasePath()
-  {
-    if (null === $this->basePath)
+    /**
+     * Class constructor.
+     *
+     * @param sfProjectConfiguration $configuration A sfProjectConfiguration instance
+     * @param string                 $basePath      The base path for file generation
+     */
+    public function __construct(sfProjectConfiguration $configuration, $basePath = null)
     {
-      // for BC
-      $this->basePath = sfConfig::get('sf_module_cache_dir');
+        $this->configuration = $configuration;
+        $this->basePath = $basePath;
     }
 
-    return $this->basePath;
-  }
+    /**
+     * Returns the current configuration instance.
+     *
+     * @return sfProjectConfiguration A sfProjectConfiguration instance
+     */
+    public function getConfiguration()
+    {
+        return $this->configuration;
+    }
 
-  /**
-   * Sets the base path to use when generating files.
-   *
-   * @param string $basePath The base path
-   */
-  public function setBasePath($basePath)
-  {
-    $this->basePath = $basePath;
-  }
+    /**
+     * Gets the base path to use when generating files.
+     *
+     * @return string The base path
+     */
+    public function getBasePath()
+    {
+        if (null === $this->basePath) {
+            // for BC
+            $this->basePath = sfConfig::get('sf_module_cache_dir');
+        }
 
-  /**
-   * Saves some content.
-   *
-   * @param string $path    The relative path
-   * @param string $content The content
-   *
-   * @return int
-   *
-   * @throws sfCacheException
-   */
-  public function save($path, $content)
-  {
-    $path = $this->getBasePath().DIRECTORY_SEPARATOR.$path;
+        return $this->basePath;
+    }
 
-    $cacheDir = dirname($path);
-    if (!is_dir($cacheDir))
+    /**
+     * Sets the base path to use when generating files.
+     *
+     * @param string $basePath The base path
+     */
+    public function setBasePath($basePath)
     {
-      $current_umask = umask(0000);
-      if (!@mkdir($cacheDir, 0777, true) && !is_dir($cacheDir))
-      {
-        throw new \sfCacheException(sprintf('Failed to make cache directory "%s".', $cacheDir));
-      }
-      umask($current_umask);
+        $this->basePath = $basePath;
     }
 
-    if (false === $ret = @file_put_contents($path, $content))
+    /**
+     * Saves some content.
+     *
+     * @param string $path    The relative path
+     * @param string $content The content
+     *
+     * @return int
+     *
+     * @throws sfCacheException
+     */
+    public function save($path, $content)
     {
-      throw new sfCacheException(sprintf('Failed to write cache file "%s".', $path));
-    }
+        $path = $this->getBasePath().DIRECTORY_SEPARATOR.$path;
+
+        $cacheDir = dirname($path);
+        if (!is_dir($cacheDir)) {
+            $current_umask = umask(0000);
+            if (!@mkdir($cacheDir, 0777, true) && !is_dir($cacheDir)) {
+                throw new \sfCacheException(sprintf('Failed to make cache directory "%s".', $cacheDir));
+            }
+            umask($current_umask);
+        }
+
+        if (false === $ret = @file_put_contents($path, $content)) {
+            throw new sfCacheException(sprintf('Failed to write cache file "%s".', $path));
+        }
 
-    return $ret;
-  }
+        return $ret;
+    }
 
-  /**
-   * Generates classes and templates for a given generator class.
-   *
-   * @param string $generatorClass The generator class name
-   * @param array  $param          An array of parameters
-   *
-   * @return string The cache for the configuration file
-   */
-  public function generate($generatorClass, $param)
-  {
-    /** @var sfGenerator $generator */
-    $generator = new $generatorClass($this);
+    /**
+     * Generates classes and templates for a given generator class.
+     *
+     * @param string $generatorClass The generator class name
+     * @param array  $param          An array of parameters
+     *
+     * @return string The cache for the configuration file
+     */
+    public function generate($generatorClass, $param)
+    {
+        /** @var sfGenerator $generator */
+        $generator = new $generatorClass($this);
 
-    return $generator->generate($param);
-  }
+        return $generator->generate($param);
+    }
 }
diff --git a/lib/generator/sfModelGenerator.class.php b/lib/generator/sfModelGenerator.class.php
index e84a7e1fc..cbb13fd2b 100644
--- a/lib/generator/sfModelGenerator.class.php
+++ b/lib/generator/sfModelGenerator.class.php
@@ -11,455 +11,415 @@
 /**
  * Model generator.
  *
- * @package    symfony
- * @subpackage generator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfModelGenerator extends sfGenerator
 {
-  /** @var sfModelGeneratorConfiguration */
-  protected $configuration = null;
-  protected $primaryKey = array();
-  protected $modelClass = '';
-  protected $params = array();
-  protected $config = array();
-  protected $formObject = null;
-
-  /**
-   * Generates classes and templates in cache.
-   *
-   * @param array $params The parameters
-   *
-   * @return string The data to put in configuration cache
-   *
-   * @throws sfConfigurationException
-   */
-  public function generate($params = array())
-  {
-    $this->validateParameters($params);
-
-    $this->modelClass = $this->params['model_class'];
-
-    // generated module name
-    $this->setModuleName($this->params['moduleName']);
-    $this->setGeneratedModuleName('auto'.ucfirst($this->params['moduleName']));
-
-    // theme exists?
-    $theme = isset($this->params['theme']) ? $this->params['theme'] : 'default';
-    $this->setTheme($theme);
-    $themeDir = $this->generatorManager->getConfiguration()->getGeneratorTemplate($this->getGeneratorClass(), $theme, '');
-    if (!is_dir($themeDir))
+    /** @var sfModelGeneratorConfiguration */
+    protected $configuration;
+    protected $primaryKey = array();
+    protected $modelClass = '';
+    protected $params = array();
+    protected $config = array();
+    protected $formObject;
+
+    /**
+     * Generates classes and templates in cache.
+     *
+     * @param array $params The parameters
+     *
+     * @return string The data to put in configuration cache
+     *
+     * @throws sfConfigurationException
+     */
+    public function generate($params = array())
     {
-      throw new sfConfigurationException(sprintf('The theme "%s" does not exist.', $theme));
-    }
+        $this->validateParameters($params);
 
-    // configure the model
-    $this->configure();
+        $this->modelClass = $this->params['model_class'];
 
-    $this->configuration = $this->loadConfiguration();
+        // generated module name
+        $this->setModuleName($this->params['moduleName']);
+        $this->setGeneratedModuleName('auto'.ucfirst($this->params['moduleName']));
 
-    // generate files
-    $this->generatePhpFiles($this->generatedModuleName, sfFinder::type('file')->relative()->in($themeDir));
+        // theme exists?
+        $theme = isset($this->params['theme']) ? $this->params['theme'] : 'default';
+        $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));
+        }
 
-    // move helper file
-    if (file_exists($file = $this->generatorManager->getBasePath().'/'.$this->getGeneratedModuleName().'/lib/helper.php'))
-    {
-      @rename($file, $this->generatorManager->getBasePath().'/'.$this->getGeneratedModuleName().'/lib/Base'.ucfirst($this->moduleName).'GeneratorHelper.class.php');
-    }
+        // configure the model
+        $this->configure();
 
-    return "require_once(sfConfig::get('sf_module_cache_dir').'/".$this->generatedModuleName."/actions/actions.class.php');";
-  }
-
-  /**
-   * Gets the actions base class for the generated module.
-   *
-   * @return string The actions base class
-   */
-  public function getActionsBaseClass()
-  {
-    return isset($this->params['actions_base_class']) ? $this->params['actions_base_class'] : 'sfActions';
-  }
-
-  /**
-   * Gets the class name for current model.
-   *
-   * @return string
-   */
-  public function getModelClass()
-  {
-    return $this->modelClass;
-  }
-
-  /**
-   * Gets the primary key name.
-   *
-   * @param Boolean $firstOne Whether to return the first PK or not
-   *
-   * @return array An array of primary keys
-   */
-  public function getPrimaryKeys($firstOne = false)
-  {
-    return $firstOne ? $this->primaryKey[0] : $this->primaryKey;
-  }
-
-  /**
-   * Gets the singular name for current model.
-   *
-   * @return string
-   */
-  public function getSingularName()
-  {
-    return isset($this->params['singular']) ? $this->params['singular'] : sfInflector::underscore($this->getModelClass());
-  }
-
-  /**
-   * Gets the plural name for current model.
-   *
-   * @return string
-   */
-  public function getPluralName()
-  {
-    return isset($this->params['plural']) ? $this->params['plural'] : $this->getSingularName().'_list';
-  }
-
-  /**
-   * Gets the i18n catalogue to use for user strings.
-   *
-   * @return string The i18n catalogue
-   */
-  public function getI18nCatalogue()
-  {
-    return isset($this->params['i18n_catalogue']) ? $this->params['i18n_catalogue'] : 'messages';
-  }
-
-  /**
-   * Returns PHP code for primary keys parameters.
-   *
-   * @param integer $indent The indentation value
-   *
-   * @return string The PHP code
-   */
-  public function getRetrieveByPkParamsForAction($indent)
-  {
-    $params = array();
-    foreach ($this->getPrimaryKeys() as $pk)
-    {
-      $params[] = sprintf("\$request->getParameter('%s')", sfInflector::underscore($pk));
-    }
+        $this->configuration = $this->loadConfiguration();
 
-    return implode(",\n".str_repeat(' ', max(0, $indent - strlen($this->getSingularName().$this->modelClass))), $params);
-  }
-
-  /**
-   * Returns PHP code to add to a URL for primary keys.
-   *
-   * @param string $prefix The prefix value
-   * @param bool   $full
-   *
-   * @return string PHP code
-   */
-  public function getPrimaryKeyUrlParams($prefix = '', $full = false)
-  {
-    $params = array();
-    foreach ($this->getPrimaryKeys() as $pk)
-    {
-      $fieldName = sfInflector::underscore($pk);
-
-      if ($full)
-      {
-        $params[] = sprintf("%s='.%s->%s()", $fieldName, $prefix, $this->getColumnGetter($fieldName, false));
-      }
-      else
-      {
-        $params[] = sprintf("%s='.%s", $fieldName, $this->getColumnGetter($fieldName, true, $prefix));
-      }
-    }
-
-    return implode(".'&", $params);
-  }
-
-  /**
-   * Configures this generator.
-   */
-  abstract protected function configure();
-
-  abstract public function getType($column);
-
-  abstract public function getAllFieldNames();
-
-  /**
-   * Returns the getter either non-developped: 'getFoo' or developped: '$class->getFoo()'.
-   *
-   * This method is ORM dependant.
-   *
-   * @param string  $column    The column name
-   * @param boolean $developed true if you want developped method names, false otherwise
-   * @param string  $prefix    The prefix value
-   *
-   * @return string PHP code
-   */
-  abstract public function getColumnGetter($column, $developed = false , $prefix = '');
-
-  abstract public function getManyToManyTables();
-
-  /**
-   * Returns HTML code for an action link.
-   *
-   * @param string  $actionName The action name
-   * @param array   $params     The parameters
-   * @param boolean $pk_link    Whether to add a primary key link or not
-   *
-   * @return string HTML code
-   */
-  public function getLinkToAction($actionName, $params, $pk_link = false)
-  {
-    $action = isset($params['action']) ? $params['action'] : 'List'.sfInflector::camelize($actionName);
-
-    $url_params = $pk_link ? '?'.$this->getPrimaryKeyUrlParams() : '\'';
-
-    return '[?php echo link_to(__(\''.$params['label'].'\', array(), \''.$this->getI18nCatalogue().'\'), \''.$this->getModuleName().'/'.$action.$url_params.', '.$this->asPhp($params['params']).') ?]';
-  }
-
-  /**
-   * Wraps content with a credential condition.
-   *
-   * @param string $content The content
-   * @param array  $params  The parameters
-   *
-   * @return string HTML code
-   */
-  public function addCredentialCondition($content, $params = array())
-  {
-    if (isset($params['credentials']))
-    {
-      $credentials = $this->asPhp($params['credentials']);
+        // generate files
+        $this->generatePhpFiles($this->generatedModuleName, sfFinder::type('file')->relative()->in($themeDir));
 
-      return <<<EOF
-[?php if (\$sf_user->hasCredential($credentials)): ?]
-$content
-[?php endif; ?]
+        // move helper file
+        if (file_exists($file = $this->generatorManager->getBasePath().'/'.$this->getGeneratedModuleName().'/lib/helper.php')) {
+            @rename($file, $this->generatorManager->getBasePath().'/'.$this->getGeneratedModuleName().'/lib/Base'.ucfirst($this->moduleName).'GeneratorHelper.class.php');
+        }
 
-EOF;
+        return "require_once(sfConfig::get('sf_module_cache_dir').'/".$this->generatedModuleName."/actions/actions.class.php');";
     }
-    else
+
+    /**
+     * Gets the actions base class for the generated module.
+     *
+     * @return string The actions base class
+     */
+    public function getActionsBaseClass()
     {
-      return $content;
+        return isset($this->params['actions_base_class']) ? $this->params['actions_base_class'] : 'sfActions';
     }
-  }
-
-  /**
-   * Returns HTML code for a field.
-   *
-   * @param sfModelGeneratorConfigurationField $field The field
-   *
-   * @return string HTML code
-   */
-  public function renderField($field)
-  {
-    $html = $this->getColumnGetter($field->getName(), true);
-
-    if ($renderer = $field->getRenderer())
+
+    /**
+     * Gets the class name for current model.
+     *
+     * @return string
+     */
+    public function getModelClass()
     {
-      $html = sprintf("$html ? call_user_func_array(%s, array_merge(array(%s), %s)) : '&nbsp;'", $this->asPhp($renderer), $html, $this->asPhp($field->getRendererArguments()));
+        return $this->modelClass;
     }
-    else if ($field->isComponent())
+
+    /**
+     * Gets the primary key name.
+     *
+     * @param bool $firstOne Whether to return the first PK or not
+     *
+     * @return array An array of primary keys
+     */
+    public function getPrimaryKeys($firstOne = false)
     {
-      return sprintf("get_component('%s', '%s', array('type' => 'list', '%s' => \$%s))", $this->getModuleName(), $field->getName(), $this->getSingularName(), $this->getSingularName());
+        return $firstOne ? $this->primaryKey[0] : $this->primaryKey;
     }
-    else if ($field->isPartial())
+
+    /**
+     * Gets the singular name for current model.
+     *
+     * @return string
+     */
+    public function getSingularName()
     {
-      return sprintf("get_partial('%s/%s', array('type' => 'list', '%s' => \$%s))", $this->getModuleName(), $field->getName(), $this->getSingularName(), $this->getSingularName());
+        return isset($this->params['singular']) ? $this->params['singular'] : sfInflector::underscore($this->getModelClass());
     }
-    else if ('Date' == $field->getType())
+
+    /**
+     * Gets the plural name for current model.
+     *
+     * @return string
+     */
+    public function getPluralName()
     {
-      $html = sprintf("is_string($html) && false !== strtotime($html) ? format_date(%s, \"%s\") : '&nbsp;'", $html, $field->getConfig('date_format', 'f'));
+        return isset($this->params['plural']) ? $this->params['plural'] : $this->getSingularName().'_list';
     }
-    else if ('Boolean' == $field->getType())
+
+    /**
+     * Gets the i18n catalogue to use for user strings.
+     *
+     * @return string The i18n catalogue
+     */
+    public function getI18nCatalogue()
     {
-      $html = sprintf("get_partial('%s/list_field_boolean', array('value' => %s))", $this->getModuleName(), $html);
+        return isset($this->params['i18n_catalogue']) ? $this->params['i18n_catalogue'] : 'messages';
     }
 
-    if ($field->isLink())
+    /**
+     * Returns PHP code for primary keys parameters.
+     *
+     * @param int $indent The indentation value
+     *
+     * @return string The PHP code
+     */
+    public function getRetrieveByPkParamsForAction($indent)
     {
-      $html = sprintf("link_to(%s, '%s', \$%s)", $html, $this->getUrlForAction('edit'), $this->getSingularName());
+        $params = array();
+        foreach ($this->getPrimaryKeys() as $pk) {
+            $params[] = sprintf("\$request->getParameter('%s')", sfInflector::underscore($pk));
+        }
+
+        return implode(",\n".str_repeat(' ', max(0, $indent - strlen($this->getSingularName().$this->modelClass))), $params);
     }
 
-    return $html;
-  }
-
-  /**
-   * Wraps a content for I18N.
-   *
-   * @param string $key The configuration key name
-   *
-   * @return string HTML code
-   */
-  public function getI18NString($key)
-  {
-    $value = $this->configuration->getValue($key, '', true);
-
-    $parts = explode('.', $key);
-    $context = $parts[0];
-
-    // find %%xx%% strings
-    preg_match_all('/%%([^%]+)%%/', $value, $matches, PREG_PATTERN_ORDER);
-    $fields = array();
-    foreach ($matches[1] as $name)
+    /**
+     * Returns PHP code to add to a URL for primary keys.
+     *
+     * @param string $prefix The prefix value
+     * @param bool   $full
+     *
+     * @return string PHP code
+     */
+    public function getPrimaryKeyUrlParams($prefix = '', $full = false)
     {
-      $fields[] = $name;
+        $params = array();
+        foreach ($this->getPrimaryKeys() as $pk) {
+            $fieldName = sfInflector::underscore($pk);
+
+            if ($full) {
+                $params[] = sprintf("%s='.%s->%s()", $fieldName, $prefix, $this->getColumnGetter($fieldName, false));
+            } else {
+                $params[] = sprintf("%s='.%s", $fieldName, $this->getColumnGetter($fieldName, true, $prefix));
+            }
+        }
+
+        return implode(".'&", $params);
     }
 
-    $vars = array();
-    foreach ($this->configuration->getContextConfiguration($context, $fields) as $field)
+    abstract public function getType($column);
+
+    abstract public function getAllFieldNames();
+
+    /**
+     * Returns the getter either non-developped: 'getFoo' or developped: '$class->getFoo()'.
+     *
+     * This method is ORM dependant.
+     *
+     * @param string $column    The column name
+     * @param bool   $developed true if you want developped method names, false otherwise
+     * @param string $prefix    The prefix value
+     *
+     * @return string PHP code
+     */
+    abstract public function getColumnGetter($column, $developed = false, $prefix = '');
+
+    abstract public function getManyToManyTables();
+
+    /**
+     * Returns HTML code for an action link.
+     *
+     * @param string $actionName The action name
+     * @param array  $params     The parameters
+     * @param bool   $pk_link    Whether to add a primary key link or not
+     *
+     * @return string HTML code
+     */
+    public function getLinkToAction($actionName, $params, $pk_link = false)
     {
-      $vars[] = '\'%%'.$field->getName().'%%\' => '.$this->renderField($field);
+        $action = isset($params['action']) ? $params['action'] : 'List'.sfInflector::camelize($actionName);
+
+        $url_params = $pk_link ? '?'.$this->getPrimaryKeyUrlParams() : '\'';
+
+        return '[?php echo link_to(__(\''.$params['label'].'\', array(), \''.$this->getI18nCatalogue().'\'), \''.$this->getModuleName().'/'.$action.$url_params.', '.$this->asPhp($params['params']).') ?]';
     }
 
-    return sprintf("__('%s', array(%s), '%s')", $value, implode(', ', $vars), $this->getI18nCatalogue());
-  }
-
-  /**
-   * Gets the form object
-   *
-   * @return sfForm
-   */
-  public function getFormObject()
-  {
-    if (null === $this->formObject)
+    /**
+     * Wraps content with a credential condition.
+     *
+     * @param string $content The content
+     * @param array  $params  The parameters
+     *
+     * @return string HTML code
+     */
+    public function addCredentialCondition($content, $params = array())
     {
-      $class = null === $this->configuration ? $this->getModelClass().'Form' : $this->configuration->getFormClass();
+        if (isset($params['credentials'])) {
+            $credentials = $this->asPhp($params['credentials']);
+
+            return <<<EOF
+[?php if (\$sf_user->hasCredential({$credentials})): ?]
+{$content}
+[?php endif; ?]
+
+EOF;
+        }
 
-      $this->formObject = new $class();
+        return $content;
     }
 
-    return $this->formObject;
-  }
-
-  /**
-   * Gets the HTML to add to the form tag if the form is multipart.
-   *
-   * @return string
-   */
-  public function getFormMultipartHtml()
-  {
-    if (isset($this->params['non_verbose_templates']) && $this->params['non_verbose_templates'])
+    /**
+     * Returns HTML code for a field.
+     *
+     * @param sfModelGeneratorConfigurationField $field The field
+     *
+     * @return string HTML code
+     */
+    public function renderField($field)
     {
-      return '[?php $form->isMultipart() and print \' enctype="multipart/form-data"\' ?]';
+        $html = $this->getColumnGetter($field->getName(), true);
+
+        if ($renderer = $field->getRenderer()) {
+            $html = sprintf("{$html} ? call_user_func_array(%s, array_merge(array(%s), %s)) : '&nbsp;'", $this->asPhp($renderer), $html, $this->asPhp($field->getRendererArguments()));
+        } elseif ($field->isComponent()) {
+            return sprintf("get_component('%s', '%s', array('type' => 'list', '%s' => \$%s))", $this->getModuleName(), $field->getName(), $this->getSingularName(), $this->getSingularName());
+        } elseif ($field->isPartial()) {
+            return sprintf("get_partial('%s/%s', array('type' => 'list', '%s' => \$%s))", $this->getModuleName(), $field->getName(), $this->getSingularName(), $this->getSingularName());
+        } elseif ('Date' == $field->getType()) {
+            $html = sprintf("is_string({$html}) && false !== strtotime({$html}) ? format_date(%s, \"%s\") : '&nbsp;'", $html, $field->getConfig('date_format', 'f'));
+        } elseif ('Boolean' == $field->getType()) {
+            $html = sprintf("get_partial('%s/list_field_boolean', array('value' => %s))", $this->getModuleName(), $html);
+        }
+
+        if ($field->isLink()) {
+            $html = sprintf("link_to(%s, '%s', \$%s)", $html, $this->getUrlForAction('edit'), $this->getSingularName());
+        }
+
+        return $html;
     }
-    else
+
+    /**
+     * Wraps a content for I18N.
+     *
+     * @param string $key The configuration key name
+     *
+     * @return string HTML code
+     */
+    public function getI18NString($key)
     {
-      return $this->getFormObject()->isMultipart() ? ' enctype="multipart/form-data"' : '';
+        $value = $this->configuration->getValue($key, '', true);
+
+        $parts = explode('.', $key);
+        $context = $parts[0];
+
+        // find %%xx%% strings
+        preg_match_all('/%%([^%]+)%%/', $value, $matches, PREG_PATTERN_ORDER);
+        $fields = array();
+        foreach ($matches[1] as $name) {
+            $fields[] = $name;
+        }
+
+        $vars = array();
+        foreach ($this->configuration->getContextConfiguration($context, $fields) as $field) {
+            $vars[] = '\'%%'.$field->getName().'%%\' => '.$this->renderField($field);
+        }
+
+        return sprintf("__('%s', array(%s), '%s')", $value, implode(', ', $vars), $this->getI18nCatalogue());
     }
-  }
-
-  /**
-   * Validates the basic structure of the parameters.
-   *
-   * @param array $params An array of parameters
-   *
-   * @throws sfInitializationException
-   * @throws sfParseException
-   */
-  protected function validateParameters($params)
-  {
-    foreach (array('model_class', 'moduleName') as $key)
+
+    /**
+     * Gets the form object.
+     *
+     * @return sfForm
+     */
+    public function getFormObject()
     {
-      if (!isset($params[$key]))
-      {
-        throw new sfParseException(sprintf('sfModelGenerator must have a "%s" parameter.', $key));
-      }
+        if (null === $this->formObject) {
+            $class = null === $this->configuration ? $this->getModelClass().'Form' : $this->configuration->getFormClass();
+
+            $this->formObject = new $class();
+        }
+
+        return $this->formObject;
     }
 
-    if (!class_exists($params['model_class']))
+    /**
+     * Gets the HTML to add to the form tag if the form is multipart.
+     *
+     * @return string
+     */
+    public function getFormMultipartHtml()
     {
-      throw new sfInitializationException(sprintf('Unable to generate a module for non-existent model "%s".', $params['model_class']));
+        if (isset($this->params['non_verbose_templates']) && $this->params['non_verbose_templates']) {
+            return '[?php $form->isMultipart() and print \' enctype="multipart/form-data"\' ?]';
+        }
+
+        return $this->getFormObject()->isMultipart() ? ' enctype="multipart/form-data"' : '';
     }
 
-    $this->config = isset($params['config']) ? $params['config'] : array();
+    /**
+     * Returns the URL for a given action.
+     *
+     * @param string $action
+     *
+     * @return string The URL related to a given action
+     */
+    public function getUrlForAction($action)
+    {
+        if (isset($this->params['route_prefix'])) {
+            return 'list' == $action ? $this->params['route_prefix'] : $this->params['route_prefix'].'_'.$action;
+        }
 
-    unset($params['config']);
-    $this->params = $params;
-  }
+        return $this->getModuleName().'/'.$action;
+    }
 
-  /**
-   * Loads the configuration for this generated module.
-   */
-  protected function loadConfiguration()
-  {
-    try
+    public function asPhp($variable)
     {
-      $this->generatorManager->getConfiguration()->getGeneratorTemplate($this->getGeneratorClass(), $this->getTheme(), '../parts/configuration.php');
+        return str_replace(array("\n", 'array ('), array('', 'array('), var_export($variable, true));
     }
-    catch (sfException $e)
+
+    public function escapeString($string)
     {
-      return null;
+        return str_replace("'", "\\'", $string);
     }
 
-    $config = $this->getGeneratorManager()->getConfiguration();
-    if (!$config instanceof sfApplicationConfiguration)
+    /**
+     * Configures this generator.
+     */
+    abstract protected function configure();
+
+    /**
+     * Validates the basic structure of the parameters.
+     *
+     * @param array $params An array of parameters
+     *
+     * @throws sfInitializationException
+     * @throws sfParseException
+     */
+    protected function validateParameters($params)
     {
-      throw new LogicException('The sfModelGenerator can only operates with an application configuration.');
-    }
+        foreach (array('model_class', 'moduleName') as $key) {
+            if (!isset($params[$key])) {
+                throw new sfParseException(sprintf('sfModelGenerator must have a "%s" parameter.', $key));
+            }
+        }
 
-    $basePath = $this->getGeneratedModuleName().'/lib/Base'.ucfirst($this->getModuleName()).'GeneratorConfiguration.class.php';
-    $this->getGeneratorManager()->save($basePath, $this->evalTemplate('../parts/configuration.php'));
+        if (!class_exists($params['model_class'])) {
+            throw new sfInitializationException(sprintf('Unable to generate a module for non-existent model "%s".', $params['model_class']));
+        }
 
-    require_once $this->getGeneratorManager()->getBasePath().'/'.$basePath;
+        $this->config = isset($params['config']) ? $params['config'] : array();
 
-    $class = 'Base'.ucfirst($this->getModuleName()).'GeneratorConfiguration';
-    foreach ($config->getLibDirs($this->getModuleName()) as $dir)
-    {
-      if (!is_file($configuration = $dir.'/'.$this->getModuleName().'GeneratorConfiguration.class.php'))
-      {
-        continue;
-      }
-
-      require_once $configuration;
-      $class = $this->getModuleName().'GeneratorConfiguration';
-      break;
+        unset($params['config']);
+        $this->params = $params;
     }
 
-    // validate configuration
-    foreach ($this->config as $context => $value)
+    /**
+     * Loads the configuration for this generated module.
+     */
+    protected function loadConfiguration()
     {
-      if (!$value)
-      {
-        continue;
-      }
+        try {
+            $this->generatorManager->getConfiguration()->getGeneratorTemplate($this->getGeneratorClass(), $this->getTheme(), '../parts/configuration.php');
+        } catch (sfException $e) {
+            return null;
+        }
 
-      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)));
-    }
+        $config = $this->getGeneratorManager()->getConfiguration();
+        if (!$config instanceof sfApplicationConfiguration) {
+            throw new LogicException('The sfModelGenerator can only operates with an application configuration.');
+        }
 
-    return new $class();
-  }
-
-  /**
-   * Returns the URL for a given action.
-   *
-   * @param string $action
-   *
-   * @return string The URL related to a given action
-   */
-  public function getUrlForAction($action)
-  {
-    if (isset($this->params['route_prefix']))
-    {
-      return 'list' == $action ? $this->params['route_prefix'] : $this->params['route_prefix'].'_'.$action;
-    }
-    else
-    {
-      return $this->getModuleName().'/'.$action;
-    }
-  }
+        $basePath = $this->getGeneratedModuleName().'/lib/Base'.ucfirst($this->getModuleName()).'GeneratorConfiguration.class.php';
+        $this->getGeneratorManager()->save($basePath, $this->evalTemplate('../parts/configuration.php'));
 
-  public function asPhp($variable)
-  {
-    return str_replace(array("\n", 'array ('), array('', 'array('), var_export($variable, true));
-  }
+        require_once $this->getGeneratorManager()->getBasePath().'/'.$basePath;
 
-  public function escapeString($string)
-  {
-    return str_replace("'", "\\'", $string);
-  }
+        $class = 'Base'.ucfirst($this->getModuleName()).'GeneratorConfiguration';
+        foreach ($config->getLibDirs($this->getModuleName()) as $dir) {
+            if (!is_file($configuration = $dir.'/'.$this->getModuleName().'GeneratorConfiguration.class.php')) {
+                continue;
+            }
+
+            require_once $configuration;
+            $class = $this->getModuleName().'GeneratorConfiguration';
+
+            break;
+        }
+
+        // validate configuration
+        foreach ($this->config as $context => $value) {
+            if (!$value) {
+                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)));
+        }
+
+        return new $class();
+    }
 }
diff --git a/lib/generator/sfModelGeneratorConfiguration.class.php b/lib/generator/sfModelGeneratorConfiguration.class.php
index e0af00105..b9bc723e8 100644
--- a/lib/generator/sfModelGeneratorConfiguration.class.php
+++ b/lib/generator/sfModelGeneratorConfiguration.class.php
@@ -3,578 +3,525 @@
 /**
  * Model generator configuration.
  *
- * @package    symfony
- * @subpackage generator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfModelGeneratorConfiguration
 {
-  /** @var sfModelGeneratorConfigurationField[][][] */
-  protected
-    $configuration = array();
+    /** @var sfModelGeneratorConfigurationField[][][] */
+    protected $configuration = array();
 
-  abstract public function getActionsDefault();
+    /**
+     * Constructor.
+     */
+    public function __construct()
+    {
+        $this->compile();
+    }
 
-  abstract public function getFormActions();
+    abstract public function getActionsDefault();
 
-  abstract public function getNewActions();
+    abstract public function getFormActions();
 
-  abstract public function getEditActions();
+    abstract public function getNewActions();
 
-  abstract public function getListObjectActions();
+    abstract public function getEditActions();
 
-  abstract public function getListActions();
+    abstract public function getListObjectActions();
 
-  abstract public function getListBatchActions();
+    abstract public function getListActions();
 
-  abstract public function getListParams();
+    abstract public function getListBatchActions();
 
-  abstract public function getListLayout();
+    abstract public function getListParams();
 
-  abstract public function getListTitle();
+    abstract public function getListLayout();
 
-  abstract public function getEditTitle();
+    abstract public function getListTitle();
 
-  abstract public function getNewTitle();
+    abstract public function getEditTitle();
 
-  abstract public function getFilterDisplay();
+    abstract public function getNewTitle();
 
-  abstract public function getFormDisplay();
+    abstract public function getFilterDisplay();
 
-  abstract public function getNewDisplay();
+    abstract public function getFormDisplay();
 
-  abstract public function getEditDisplay();
+    abstract public function getNewDisplay();
 
-  abstract public function getListDisplay();
+    abstract public function getEditDisplay();
 
-  abstract public function getFieldsDefault();
+    abstract public function getListDisplay();
 
-  abstract public function getFieldsList();
+    abstract public function getFieldsDefault();
 
-  abstract public function getFieldsFilter();
+    abstract public function getFieldsList();
 
-  abstract public function getFieldsForm();
+    abstract public function getFieldsFilter();
 
-  abstract public function getFieldsEdit();
+    abstract public function getFieldsForm();
 
-  abstract public function getFieldsNew();
+    abstract public function getFieldsEdit();
 
-  abstract public function getFormClass();
+    abstract public function getFieldsNew();
 
-  abstract public function hasFilterForm();
+    abstract public function getFormClass();
 
-  abstract public function getFilterFormClass();
+    abstract public function hasFilterForm();
 
-  /**
-   * Constructor.
-   */
-  public function __construct()
-  {
-    $this->compile();
-  }
+    abstract public function getFilterFormClass();
 
-  protected function compile()
-  {
-    $config = $this->getConfig();
+    /**
+     * @param string        $context
+     * @param string[]|null $fields
+     *
+     * @return array|sfModelGeneratorConfigurationField[]
+     */
+    public function getContextConfiguration($context, $fields = null)
+    {
+        if (!isset($this->configuration[$context])) {
+            throw new InvalidArgumentException(sprintf('The context "%s" does not exist.', $context));
+        }
 
-    // inheritance rules:
-    // new|edit < form < default
-    // list < default
-    // filter < default
-    $this->configuration = array(
-      'list'   => array(
-        'fields'         => array(),
-        '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(),
-        'title'   => $this->getNewTitle(),
-        'actions' => $this->getNewActions() ?: $this->getFormActions(),
-      ),
-      'edit'   => array(
-        'fields'  => array(),
-        'title'   => $this->getEditTitle(),
-        'actions' => $this->getEditActions() ?: $this->getFormActions(),
-      ),
-    );
+        if (null === $fields) {
+            return $this->configuration[$context];
+        }
 
-    foreach (array_keys($config['default']) as $field)
-    {
-      $formConfig = array_merge($config['default'][$field], isset($config['form'][$field]) ? $config['form'][$field] : array());
+        $f = array();
+        foreach ($fields as $field) {
+            $f[$field] = $this->configuration[$context]['fields'][$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()));
+        return $f;
     }
 
-    // "virtual" fields for list
-    foreach ($this->getListDisplay() as $field)
+    public function getFieldConfiguration($context, $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)
-      ));
-    }
+        if (!isset($this->configuration[$context])) {
+            throw new InvalidArgumentException(sprintf('The context "%s" does not exist.', $context));
+        }
 
-    // form actions
-    foreach (array('edit', 'new') as $context)
-    {
-      foreach ($this->configuration[$context]['actions'] as $action => $parameters)
-      {
-        $this->configuration[$context]['actions'][$action] = $this->fixActionParameters($action, $parameters);
-      }
+        if (!isset($this->configuration[$context]['fields'][$field])) {
+            throw new InvalidArgumentException(sprintf('Field "%s" does not exist.', $field));
+        }
+
+        return $this->configuration[$context]['fields'][$field];
     }
 
-    // list actions
-    foreach ($this->configuration['list']['actions'] as $action => $parameters)
+    /**
+     * Gets the configuration for a given field.
+     *
+     * @param string $key     The configuration key (title.list.name for example)
+     * @param mixed  $default The default value if none has been defined
+     * @param bool   $escaped Whether to escape single quote (false by default)
+     *
+     * @return mixed The configuration value
+     */
+    public function getValue($key, $default = null, $escaped = false)
     {
-      $this->configuration['list']['actions'][$action] = $this->fixActionParameters($action, $parameters);
+        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);
+        } else {
+            throw new InvalidArgumentException(sprintf('Configuration key "%s" is invalid.', $key));
+        }
+
+        return $escaped ? str_replace("'", "\\'", $v) : $v;
     }
 
-    // list batch actions
-    $this->configuration['list']['batch_actions'] = array();
-    foreach ($this->getListBatchActions() as $action => $parameters)
+    /**
+     * Gets the fields that represents the filters.
+     *
+     * 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
+     *
+     * @return array
+     */
+    public function getFormFilterFields(sfForm $form)
     {
-      $parameters = $this->fixActionParameters($action, $parameters);
+        $config = $this->getConfig();
+
+        if ($this->getFilterDisplay()) {
+            $fields = array();
+            foreach ($this->getFilterDisplay() as $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)
+                    ));
+                }
+                $field = $this->configuration['filter']['fields'][$name];
+                $field->setFlag($flag);
+                $fields[$name] = $field;
+            }
+
+            return $fields;
+        }
 
-      $action = 'batch'.ucfirst(0 === strpos($action, '_') ? substr($action, 1) : $action);
+        $fields = array();
+        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)
+            ));
+        }
 
-      $this->configuration['list']['batch_actions'][$action] = $parameters;
+        return $fields;
     }
 
-    // list object actions
-    foreach ($this->configuration['list']['object_actions'] as $action => $parameters)
+    /**
+     * Gets the fields that represents the 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
+     *
+     * @return array
+     */
+    public function getFormFields(sfForm $form, $context)
     {
-      $this->configuration['list']['object_actions'][$action] = $this->fixActionParameters($action, $parameters);
-    }
+        $config = $this->getConfig();
 
-    // list field configuration
-    $this->configuration['list']['display'] = array();
-    foreach ($this->getListDisplay() as $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));
-      }
-      $field = $this->configuration['list']['fields'][$name];
-      $field->setFlag($flag);
-      $this->configuration['list']['display'][$name] = $field;
-    }
+        $method = sprintf('get%sDisplay', ucfirst($context));
+        if (!$fieldsets = $this->{$method}()) {
+            $fieldsets = $this->getFormDisplay();
+        }
 
-    // parse the %%..%% variables, remove flags and add default fields where
-    // necessary (fixes #7578)
-    $this->parseVariables('list', 'params');
-    $this->parseVariables('edit', 'title');
-    $this->parseVariables('list', 'title');
-    $this->parseVariables('new', 'title');
-
-    // action credentials
-    $this->configuration['credentials'] = array(
-      'list'   => array(),
-      'new'    => array(),
-      'create' => array(),
-      'edit'   => array(),
-      'update' => array(),
-      'delete' => array(),
-    );
-    foreach ($this->getActionsDefault() as $action => $params)
-    {
-      if (0 === strpos($action, '_'))
-      {
-        $action = substr($action, 1);
-      }
+        if ($fieldsets) {
+            $fields = array();
+
+            // with fieldsets?
+            if (!is_array(reset($fieldsets))) {
+                $fieldsets = array('NONE' => $fieldsets);
+            }
+
+            foreach ($fieldsets as $fieldset => $names) {
+                if (!$names) {
+                    continue;
+                }
+
+                $fields[$fieldset] = array();
+
+                foreach ($names as $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)
+                        ));
+                    }
+
+                    $field = $this->configuration[$context]['fields'][$name];
+                    $field->setFlag($flag);
+                    $fields[$fieldset][$name] = $field;
+                }
+            }
+
+            return $fields;
+        }
 
-      $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']['create'] = $this->configuration['credentials']['new'];
-    $this->configuration['credentials']['update'] = $this->configuration['credentials']['edit'];
-  }
-
-  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);
-      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)
-        ));
-      }
-      else
-      {
-        $this->configuration[$context]['fields'][$name]->setFlag($flag);
-      }
-
-      $this->configuration[$context][$key] = str_replace('%%'.$flag.$name.'%%', '%%'.$name.'%%', $this->configuration[$context][$key]);
-    }
-  }
-
-  /**
-   * @param string        $context
-   * @param string[]|null $fields
-   * @return array|sfModelGeneratorConfigurationField[]
-   */
-  public function getContextConfiguration($context, $fields = null)
-  {
-    if (!isset($this->configuration[$context]))
-    {
-      throw new InvalidArgumentException(sprintf('The context "%s" does not exist.', $context));
-    }
+        $fields = array();
+        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)
+            ));
+        }
 
-    if (null === $fields)
-    {
-      return $this->configuration[$context];
+        return array('NONE' => $fields);
     }
 
-    $f = array();
-    foreach ($fields as $field)
+    /**
+     * Gets the value for a given key.
+     *
+     * @param array  $config  The configuration
+     * @param string $key     The key name
+     * @param mixed  $default The default value
+     *
+     * @return mixed The key value
+     */
+    public static function getFieldConfigValue($config, $key, $default = null)
     {
-      $f[$field] = $this->configuration[$context]['fields'][$field];
-    }
-
-    return $f;
-  }
+        $ref = &$config;
+        $parts = explode('.', $key);
+        $count = count($parts);
+        for ($i = 0; $i < $count; ++$i) {
+            $partKey = $parts[$i];
+            if (!isset($ref[$partKey])) {
+                return $default;
+            }
+
+            if ($count == $i + 1) {
+                return $ref[$partKey];
+            }
+
+            $ref = &$ref[$partKey];
+        }
 
-  public function getFieldConfiguration($context, $field)
-  {
-    if (!isset($this->configuration[$context]))
-    {
-      throw new InvalidArgumentException(sprintf('The context "%s" does not exist.', $context));
+        return $default;
     }
 
-    if (!isset($this->configuration[$context]['fields'][$field]))
+    public function getCredentials($action)
     {
-      throw new InvalidArgumentException(sprintf('Field "%s" does not exist.', $field));
+        if (0 === strpos($action, '_')) {
+            $action = substr($action, 1);
+        }
+
+        return isset($this->configuration['credentials'][$action]) ? $this->configuration['credentials'][$action] : array();
     }
 
-    return $this->configuration[$context]['fields'][$field];
-  }
-
-  /**
-   * Gets the configuration for a given field.
-   *
-   * @param string  $key     The configuration key (title.list.name for example)
-   * @param mixed   $default The default value if none has been defined
-   * @param Boolean $escaped Whether to escape single quote (false by default)
-   *
-   * @return mixed The configuration value
-   */
-  public function getValue($key, $default = null, $escaped = false)
-  {
-    if (preg_match('/^(?P<context>[^\.]+)\.fields\.(?P<field>[^\.]+)\.(?P<key>.+)$/', $key, $matches))
+    public function getPager($model)
     {
-      $v = $this->getFieldConfiguration($matches['context'], $matches['field'])->getConfig($matches['key'], $default);
+        // TODO: Probably `getPagerClass()` method should be abstract here. As well as `getPagerMaxPerPage`
+        $class = $this->getPagerClass();
+
+        return new $class($model, $this->getPagerMaxPerPage());
     }
-    else if (preg_match('/^(?P<context>[^\.]+)\.(?P<key>.+)$/', $key, $matches))
+
+    /**
+     * Gets a new form object.
+     *
+     * @param mixed $object
+     * @param array $options An array of options to merge with the options returned by getFormOptions()
+     *
+     * @return sfForm
+     */
+    public function getForm($object = null, $options = array())
     {
-      $v = sfModelGeneratorConfiguration::getFieldConfigValue($this->getContextConfiguration($matches['context']), $matches['key'], $default);
+        $class = $this->getFormClass();
+
+        return new $class($object, array_merge($this->getFormOptions(), $options));
     }
-    else
+
+    public function getFormOptions()
     {
-      throw new InvalidArgumentException(sprintf('Configuration key "%s" is invalid.', $key));
+        return array();
     }
 
-    return $escaped ? str_replace("'", "\\'", $v) : $v;
-  }
-
-  /**
-   * Gets the fields that represents the filters.
-   *
-   * 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
-   *
-   * @return array
-   */
-  public function getFormFilterFields(sfForm $form)
-  {
-    $config = $this->getConfig();
-
-    if ($this->getFilterDisplay())
+    public function getFilterForm($filters)
     {
-      $fields = array();
-      foreach ($this->getFilterDisplay() as $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)
-          ));
-        }
-        $field = $this->configuration['filter']['fields'][$name];
-        $field->setFlag($flag);
-        $fields[$name] = $field;
-      }
+        $class = $this->getFilterFormClass();
 
-      return $fields;
+        return new $class($filters, $this->getFilterFormOptions());
     }
 
-    $fields = array();
-    foreach ($form->getWidgetSchema()->getPositions() as $name)
+    public function getFilterFormOptions()
     {
-      $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)
-      ));
+        return array();
     }
 
-    return $fields;
-  }
-
-  /**
-   * Gets the fields that represents the 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
-   *
-   * @return array
-   */
-  public function getFormFields(sfForm $form, $context)
-  {
-    $config = $this->getConfig();
-
-    $method = sprintf('get%sDisplay', ucfirst($context));
-    if (!$fieldsets = $this->$method())
+    public function getFilterDefaults()
     {
-      $fieldsets = $this->getFormDisplay();
+        return array();
     }
 
-    if ($fieldsets)
+    protected function compile()
     {
-      $fields = array();
-
-      // with fieldsets?
-      if (!is_array(reset($fieldsets)))
-      {
-        $fieldsets = array('NONE' => $fieldsets);
-      }
-
-      foreach ($fieldsets as $fieldset => $names)
-      {
-        if (!$names)
-        {
-          continue;
+        $config = $this->getConfig();
+
+        // inheritance rules:
+        // new|edit < form < default
+        // list < default
+        // filter < default
+        $this->configuration = array(
+            'list' => array(
+                'fields' => array(),
+                '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(),
+                'title' => $this->getNewTitle(),
+                'actions' => $this->getNewActions() ?: $this->getFormActions(),
+            ),
+            'edit' => array(
+                'fields' => array(),
+                '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());
+
+            $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()));
         }
 
-        $fields[$fieldset] = array();
-
-        foreach ($names as $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)
+        // "virtual" fields for list
+        foreach ($this->getListDisplay() as $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)
             ));
-          }
+        }
 
-          $field = $this->configuration[$context]['fields'][$name];
-          $field->setFlag($flag);
-          $fields[$fieldset][$name] = $field;
+        // form actions
+        foreach (array('edit', 'new') as $context) {
+            foreach ($this->configuration[$context]['actions'] as $action => $parameters) {
+                $this->configuration[$context]['actions'][$action] = $this->fixActionParameters($action, $parameters);
+            }
         }
-      }
 
-      return $fields;
-    }
+        // list actions
+        foreach ($this->configuration['list']['actions'] as $action => $parameters) {
+            $this->configuration['list']['actions'][$action] = $this->fixActionParameters($action, $parameters);
+        }
 
-    $fields = array();
-    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)
-      ));
-    }
+        // list batch actions
+        $this->configuration['list']['batch_actions'] = array();
+        foreach ($this->getListBatchActions() as $action => $parameters) {
+            $parameters = $this->fixActionParameters($action, $parameters);
 
-    return array('NONE' => $fields);
-  }
-
-  /**
-   * Gets the value for a given key.
-   *
-   * @param array  $config  The configuration
-   * @param string $key     The key name
-   * @param mixed  $default The default value
-   *
-   * @return mixed The key value
-   */
-  static public function getFieldConfigValue($config, $key, $default = null)
-  {
-    $ref   =& $config;
-    $parts =  explode('.', $key);
-    $count =  count($parts);
-    for ($i = 0; $i < $count; $i++)
-    {
-      $partKey = $parts[$i];
-      if (!isset($ref[$partKey]))
-      {
-        return $default;
-      }
-
-      if ($count == $i + 1)
-      {
-        return $ref[$partKey];
-      }
-      else
-      {
-        $ref =& $ref[$partKey];
-      }
-    }
+            $action = 'batch'.ucfirst(0 === strpos($action, '_') ? substr($action, 1) : $action);
+
+            $this->configuration['list']['batch_actions'][$action] = $parameters;
+        }
 
-    return $default;
-  }
+        // list object actions
+        foreach ($this->configuration['list']['object_actions'] as $action => $parameters) {
+            $this->configuration['list']['object_actions'][$action] = $this->fixActionParameters($action, $parameters);
+        }
 
-  public function getCredentials($action)
-  {
-    if (0 === strpos($action, '_'))
-    {
-      $action = substr($action, 1);
+        // list field configuration
+        $this->configuration['list']['display'] = array();
+        foreach ($this->getListDisplay() as $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));
+            }
+            $field = $this->configuration['list']['fields'][$name];
+            $field->setFlag($flag);
+            $this->configuration['list']['display'][$name] = $field;
+        }
+
+        // parse the %%..%% variables, remove flags and add default fields where
+        // necessary (fixes #7578)
+        $this->parseVariables('list', 'params');
+        $this->parseVariables('edit', 'title');
+        $this->parseVariables('list', 'title');
+        $this->parseVariables('new', 'title');
+
+        // action credentials
+        $this->configuration['credentials'] = array(
+            'list' => array(),
+            'new' => array(),
+            'create' => array(),
+            'edit' => array(),
+            'update' => array(),
+            'delete' => array(),
+        );
+        foreach ($this->getActionsDefault() as $action => $params) {
+            if (0 === strpos($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']['create'] = $this->configuration['credentials']['new'];
+        $this->configuration['credentials']['update'] = $this->configuration['credentials']['edit'];
     }
 
-    return isset($this->configuration['credentials'][$action]) ? $this->configuration['credentials'][$action] : array();
-  }
-
-  public function getPager($model)
-  {
-    // TODO: Probably `getPagerClass()` method should be abstract here. As well as `getPagerMaxPerPage`
-    $class = $this->getPagerClass();
-
-    return new $class($model, $this->getPagerMaxPerPage());
-  }
-
-  /**
-   * Gets a new form object.
-   *
-   * @param  mixed $object
-   * @param  array $options An array of options to merge with the options returned by getFormOptions()
-   *
-   * @return sfForm
-   */
-  public function getForm($object = null, $options = array())
-  {
-    $class = $this->getFormClass();
-
-    return new $class($object, array_merge($this->getFormOptions(), $options));
-  }
-
-  public function getFormOptions()
-  {
-    return array();
-  }
-
-  public function getFilterForm($filters)
-  {
-    $class = $this->getFilterFormClass();
-
-    return new $class($filters, $this->getFilterFormOptions());
-  }
-
-  public function getFilterFormOptions()
-  {
-    return array();
-  }
-
-  public function getFilterDefaults()
-  {
-    return array();
-  }
-
-  protected function mapFieldName(sfModelGeneratorConfigurationField $field)
-  {
-    return $field->getName();
-  }
-
-  protected function fixActionParameters($action, $parameters)
-  {
-    if (null === $parameters)
+    protected function parseVariables($context, $key)
     {
-      $parameters = array();
+        preg_match_all('/%%([^%]+)%%/', $this->configuration[$context][$key], $matches, PREG_PATTERN_ORDER);
+        foreach ($matches[1] as $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)
+                ));
+            } else {
+                $this->configuration[$context]['fields'][$name]->setFlag($flag);
+            }
+
+            $this->configuration[$context][$key] = str_replace('%%'.$flag.$name.'%%', '%%'.$name.'%%', $this->configuration[$context][$key]);
+        }
     }
 
-    if (!isset($parameters['params']))
+    protected function mapFieldName(sfModelGeneratorConfigurationField $field)
     {
-      $parameters['params'] = array();
+        return $field->getName();
     }
 
-    if ('_delete' == $action && !isset($parameters['confirm']))
+    protected function fixActionParameters($action, $parameters)
     {
-      $parameters['confirm'] = 'Are you sure?';
-    }
+        if (null === $parameters) {
+            $parameters = array();
+        }
 
-    $parameters['class_suffix'] = strtolower('_' == $action[0] ? substr($action, 1) : $action);
+        if (!isset($parameters['params'])) {
+            $parameters['params'] = array();
+        }
 
-    // merge with defaults
-    $defaults = $this->getActionsDefault();
-    if (isset($defaults[$action]))
-    {
-      $parameters = array_merge($defaults[$action], $parameters);
-    }
+        if ('_delete' == $action && !isset($parameters['confirm'])) {
+            $parameters['confirm'] = 'Are you sure?';
+        }
 
-    if (isset($parameters['label']))
-    {
-      $label = $parameters['label'];
-    }
-    else if ('_' != $action[0])
-    {
-      $label = $action;
+        $parameters['class_suffix'] = strtolower('_' == $action[0] ? substr($action, 1) : $action);
+
+        // merge with defaults
+        $defaults = $this->getActionsDefault();
+        if (isset($defaults[$action])) {
+            $parameters = array_merge($defaults[$action], $parameters);
+        }
+
+        if (isset($parameters['label'])) {
+            $label = $parameters['label'];
+        } elseif ('_' != $action[0]) {
+            $label = $action;
+        } else {
+            $label = '_list' == $action ? 'Back to list' : substr($action, 1);
+        }
+
+        $parameters['label'] = sfInflector::humanize($label);
+
+        return $parameters;
     }
-    else
+
+    protected function getConfig()
     {
-      $label = '_list' == $action ? 'Back to list' : substr($action, 1);
+        return array(
+            'default' => $this->getFieldsDefault(),
+            'list' => $this->getFieldsList(),
+            'filter' => $this->getFieldsFilter(),
+            'form' => $this->getFieldsForm(),
+            'new' => $this->getFieldsNew(),
+            'edit' => $this->getFieldsEdit(),
+        );
     }
-
-    $parameters['label'] = sfInflector::humanize($label);
-
-    return $parameters;
-  }
-
-  protected function getConfig()
-  {
-    return array(
-      '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 70c92c1b4..2cd958d2c 100644
--- a/lib/generator/sfModelGeneratorConfigurationField.class.php
+++ b/lib/generator/sfModelGeneratorConfigurationField.class.php
@@ -3,258 +3,252 @@
 /**
  * Model generator field.
  *
- * @package    symfony
- * @subpackage generator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfModelGeneratorConfigurationField
 {
-  protected
-    $name   = null,
-    $config = null;
-
-  /**
-   * Constructor.
-   *
-   * @param string $name   The field name
-   * @param array  $config The configuration for this field
-   */
-  public function __construct($name, $config)
-  {
-    $this->name = $name;
-    $this->config = $config;
-
-    if (isset($this->config['flag']))
+    protected $name;
+    protected $config;
+
+    /**
+     * Constructor.
+     *
+     * @param string $name   The field name
+     * @param array  $config The configuration for this field
+     */
+    public function __construct($name, $config)
     {
-      $this->setFlag($this->config['flag']);
-      unset($this->config['flag']);
-    }
-  }
+        $this->name = $name;
+        $this->config = $config;
 
-  /**
-   * Returns the name of the field.
-   *
-   * @return string The field name
-   */
-  public function getName()
-  {
-    return $this->name;
-  }
+        if (isset($this->config['flag'])) {
+            $this->setFlag($this->config['flag']);
+            unset($this->config['flag']);
+        }
+    }
 
-  /**
-   * Returns the configuration value for a given key.
-   *
-   * If the key is null, the method returns all the configuration array.
-   *
-   * @param string  $key     A key string
-   * @param mixed   $default The default value if the key does not exist
-   * @param Boolean $escaped Whether to escape single quote (false by default)
-   *
-   * @return mixed The configuration value associated with the key
-   */
-  public function getConfig($key = null, $default = null, $escaped = false)
-  {
-    if (null === $key)
+    /**
+     * Returns the name of the field.
+     *
+     * @return string The field name
+     */
+    public function getName()
     {
-      return $this->config;
+        return $this->name;
     }
 
-    $value = sfModelGeneratorConfiguration::getFieldConfigValue($this->config, $key, $default);
-
-    return $escaped ? str_replace("'", "\\'", $value) : $value;
-  }
-
-  /**
-   * Returns the type of the field.
-   *
-   * @return string The field type
-   */
-  public function getType()
-  {
-    return $this->config['type'];
-  }
-
-  /**
-   * Returns true if the column maps a database column.
-   *
-   * @return boolean true if the column maps a database column, false otherwise
-   */
-  public function isReal()
-  {
-    return isset($this->config['is_real']) ? $this->config['is_real'] : false;
-  }
-
-  /**
-   * Returns true if the column is a partial.
-   *
-   * @return boolean true if the column is a partial, false otherwise
-   */
-  public function isPartial()
-  {
-    return isset($this->config['is_partial']) ? $this->config['is_partial'] : false;
-  }
-
-  /**
-   * Sets or unsets the partial flag.
-   *
-   * @param Boolean $boolean true if the field is a partial, false otherwise
-   */
-  public function setPartial($boolean)
-  {
-    $this->config['is_partial'] = $boolean;
-  }
+    /**
+     * Returns the configuration value for a given key.
+     *
+     * If the key is null, the method returns all the configuration array.
+     *
+     * @param string $key     A key string
+     * @param mixed  $default The default value if the key does not exist
+     * @param bool   $escaped Whether to escape single quote (false by default)
+     *
+     * @return mixed The configuration value associated with the key
+     */
+    public function getConfig($key = null, $default = null, $escaped = false)
+    {
+        if (null === $key) {
+            return $this->config;
+        }
 
-  /**
-   * Returns true if the column is a component.
-   *
-   * @return boolean true if the column is a component, false otherwise
-   */
-  public function isComponent()
-  {
-    return isset($this->config['is_component']) ? $this->config['is_component'] : false;
-  }
+        $value = sfModelGeneratorConfiguration::getFieldConfigValue($this->config, $key, $default);
 
-  /**
-   * Sets or unsets the component flag.
-   *
-   * @param Boolean $boolean true if the field is a component, false otherwise
-   */
-  public function setComponent($boolean)
-  {
-    $this->config['is_component'] = $boolean;
-  }
+        return $escaped ? str_replace("'", "\\'", $value) : $value;
+    }
 
-  /**
-   * Returns true if the column has a link.
-   *
-   * @return boolean true if the column has a link, false otherwise
-   */
-  public function isLink()
-  {
-    return isset($this->config['is_link']) ? $this->config['is_link'] : false;
-  }
+    /**
+     * Returns the type of the field.
+     *
+     * @return string The field type
+     */
+    public function getType()
+    {
+        return $this->config['type'];
+    }
 
-  /**
-   * Sets or unsets the link flag.
-   *
-   * @param Boolean $boolean true if the field is a link, false otherwise
-   */
-  public function setLink($boolean)
-  {
-    $this->config['is_link'] = $boolean;
-  }
+    /**
+     * Returns true if the column maps a database column.
+     *
+     * @return bool true if the column maps a database column, false otherwise
+     */
+    public function isReal()
+    {
+        return isset($this->config['is_real']) ? $this->config['is_real'] : false;
+    }
 
-  /**
-   * Sets the list renderer for the field.
-   *
-   * @param mixed $renderer A PHP callable
-   */
-  public function setRenderer($renderer)
-  {
-    $this->config['renderer'] = $renderer;
-  }
+    /**
+     * Returns true if the column is a partial.
+     *
+     * @return bool true if the column is a partial, false otherwise
+     */
+    public function isPartial()
+    {
+        return isset($this->config['is_partial']) ? $this->config['is_partial'] : false;
+    }
 
-  /**
-   * Gets the list renderer for the field.
-   *
-   * @return mixed A PHP callable
-   */
-  public function getRenderer()
-  {
-    return isset($this->config['renderer']) ? $this->config['renderer'] : null;
-  }
+    /**
+     * Sets or unsets the partial flag.
+     *
+     * @param bool $boolean true if the field is a partial, false otherwise
+     */
+    public function setPartial($boolean)
+    {
+        $this->config['is_partial'] = $boolean;
+    }
 
-  /**
-   * Sets the list renderer arguments for the field.
-   *
-   * @param array $arguments An array of arguments to pass to the renderer
-   */
-  public function setRendererArguments(array $arguments)
-  {
-    $this->config['renderer_arguments'] = $arguments;
-  }
+    /**
+     * Returns true if the column is a component.
+     *
+     * @return bool true if the column is a component, false otherwise
+     */
+    public function isComponent()
+    {
+        return isset($this->config['is_component']) ? $this->config['is_component'] : false;
+    }
 
-  /**
-   * Gets the list renderer arguments for the field.
-   *
-   * @return array An array of arguments to pass to the renderer
-   */
-  public function getRendererArguments()
-  {
-    return isset($this->config['renderer_arguments']) ? $this->config['renderer_arguments'] : array();
-  }
+    /**
+     * Sets or unsets the component flag.
+     *
+     * @param bool $boolean true if the field is a component, false otherwise
+     */
+    public function setComponent($boolean)
+    {
+        $this->config['is_component'] = $boolean;
+    }
 
-  static public function splitFieldWithFlag($field)
-  {
-    if (in_array($flag = $field[0], array('=', '_', '~')))
+    /**
+     * Returns true if the column has a link.
+     *
+     * @return bool true if the column has a link, false otherwise
+     */
+    public function isLink()
     {
-      $field = substr($field, 1);
+        return isset($this->config['is_link']) ? $this->config['is_link'] : false;
     }
-    else
+
+    /**
+     * Sets or unsets the link flag.
+     *
+     * @param bool $boolean true if the field is a link, false otherwise
+     */
+    public function setLink($boolean)
     {
-      $flag = null;
+        $this->config['is_link'] = $boolean;
     }
 
-    return array($field, $flag);
-  }
+    /**
+     * Sets the list renderer for the field.
+     *
+     * @param mixed $renderer A PHP callable
+     */
+    public function setRenderer($renderer)
+    {
+        $this->config['renderer'] = $renderer;
+    }
 
-  /**
-   * Sets a flag.
-   *
-   * The flag can be =, _, or ~.
-   *
-   * @param string $flag The flag
-   */
-  public function setFlag($flag)
-  {
-    if (null === $flag)
+    /**
+     * Gets the list renderer for the field.
+     *
+     * @return mixed A PHP callable
+     */
+    public function getRenderer()
     {
-      return;
+        return isset($this->config['renderer']) ? $this->config['renderer'] : null;
     }
 
-    switch ($flag)
+    /**
+     * Sets the list renderer arguments for the field.
+     *
+     * @param array $arguments An array of arguments to pass to the renderer
+     */
+    public function setRendererArguments(array $arguments)
     {
-      case '=':
-        $this->setLink(true);
-        break;
-      case '_':
-        $this->setPartial(true);
-        break;
-      case '~':
-        $this->setComponent(true);
-        break;
-      default:
-        throw new InvalidArgumentException(sprintf('Flag "%s" does not exist.', $flag));
+        $this->config['renderer_arguments'] = $arguments;
     }
-  }
 
-  /**
-   * Gets the flag associated with the field.
-   *
-   * The flag will be
-   *
-   *   * = for a link
-   *   * _ for a partial
-   *   * ~ for a component
-   *
-   * @return string The flag
-   */
-  public function getFlag()
-  {
-    if ($this->isLink())
+    /**
+     * Gets the list renderer arguments for the field.
+     *
+     * @return array An array of arguments to pass to the renderer
+     */
+    public function getRendererArguments()
     {
-      return '=';
+        return isset($this->config['renderer_arguments']) ? $this->config['renderer_arguments'] : array();
     }
-    else if ($this->isPartial())
+
+    public static function splitFieldWithFlag($field)
     {
-      return '_';
+        if (in_array($flag = $field[0], array('=', '_', '~'))) {
+            $field = substr($field, 1);
+        } else {
+            $flag = null;
+        }
+
+        return array($field, $flag);
     }
-    else if ($this->isComponent())
+
+    /**
+     * Sets a flag.
+     *
+     * The flag can be =, _, or ~.
+     *
+     * @param string $flag The flag
+     */
+    public function setFlag($flag)
     {
-      return '~';
+        if (null === $flag) {
+            return;
+        }
+
+        switch ($flag) {
+            case '=':
+                $this->setLink(true);
+
+                break;
+
+            case '_':
+                $this->setPartial(true);
+
+                break;
+
+            case '~':
+                $this->setComponent(true);
+
+                break;
+
+            default:
+                throw new InvalidArgumentException(sprintf('Flag "%s" does not exist.', $flag));
+        }
     }
 
-    return '';
-  }
+    /**
+     * Gets the flag associated with the field.
+     *
+     * The flag will be
+     *
+     *   * = for a link
+     *   * _ for a partial
+     *   * ~ for a component
+     *
+     * @return string The flag
+     */
+    public function getFlag()
+    {
+        if ($this->isLink()) {
+            return '=';
+        }
+        if ($this->isPartial()) {
+            return '_';
+        }
+        if ($this->isComponent()) {
+            return '~';
+        }
+
+        return '';
+    }
 }
diff --git a/lib/generator/sfModelGeneratorHelper.class.php b/lib/generator/sfModelGeneratorHelper.class.php
index 5e0d056ee..5c9e66a0d 100644
--- a/lib/generator/sfModelGeneratorHelper.class.php
+++ b/lib/generator/sfModelGeneratorHelper.class.php
@@ -3,62 +3,61 @@
 /**
  * Model generator helper.
  *
- * @package    symfony
- * @subpackage generator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfModelGeneratorHelper
 {
-  abstract public function getUrlForAction($action);
+    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>';
-  }
+    public function linkToNew($params)
+    {
+        return '<li class="sf_admin_action_new">'.link_to(__($params['label'], array(), '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>';
-  }
-  
-  /**
-   * @param Persistent|mixed $object
-   * @param array $params
-   * @return string
-   */
-  public function linkToDelete($object, $params)
-  {
-    if ($object->isNew())
+    public function linkToEdit($object, $params)
     {
-      return '';
+        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_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>';
-  }
+    /**
+     * @param mixed|Persistent $object
+     * @param array            $params
+     *
+     * @return string
+     */
+    public function linkToDelete($object, $params)
+    {
+        if ($object->isNew()) {
+            return '';
+        }
 
-  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_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>';
+    }
 
-  public function linkToSave($object, $params)
-  {
-    return '<li class="sf_admin_action_save"><input type="submit" value="'.__($params['label'], array(), 'sf_admin').'" /></li>';
-  }
-  
-  /**
-   * @param Persistent|mixed $object
-   * @param array $params
-   * @return string
-   */
-  public function linkToSaveAndAdd($object, $params)
-  {
-    if (!$object->isNew())
+    public function linkToList($params)
     {
-      return '';
+        return '<li class="sf_admin_action_list">'.link_to(__($params['label'], array(), 'sf_admin'), '@'.$this->getUrlForAction('list')).'</li>';
     }
 
-    return '<li class="sf_admin_action_save_and_add"><input type="submit" value="'.__($params['label'], array(), 'sf_admin').'" name="_save_and_add" /></li>';
-  }
+    public function linkToSave($object, $params)
+    {
+        return '<li class="sf_admin_action_save"><input type="submit" value="'.__($params['label'], array(), 'sf_admin').'" /></li>';
+    }
+
+    /**
+     * @param mixed|Persistent $object
+     * @param array            $params
+     *
+     * @return string
+     */
+    public function linkToSaveAndAdd($object, $params)
+    {
+        if (!$object->isNew()) {
+            return '';
+        }
+
+        return '<li class="sf_admin_action_save_and_add"><input type="submit" value="'.__($params['label'], array(), 'sf_admin').'" name="_save_and_add" /></li>';
+    }
 }
diff --git a/lib/helper/AssetHelper.php b/lib/helper/AssetHelper.php
index 2812cf6c6..57fe9b612 100644
--- a/lib/helper/AssetHelper.php
+++ b/lib/helper/AssetHelper.php
@@ -12,11 +12,14 @@
 /**
  * AssetHelper.
  *
- * @package    symfony
- * @subpackage helper
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     David Heinemeier Hansson
+ *
  * @version    SVN: $Id$
+ *
+ * @param mixed $type
+ * @param mixed $url
+ * @param mixed $tag_options
  */
 
 /**
@@ -45,12 +48,12 @@
  */
 function auto_discovery_link_tag($type = 'rss', $url = '', $tag_options = array())
 {
-  return tag('link', array(
-    '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)
-  ));
+    return tag('link', array(
+        '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 +74,12 @@ function auto_discovery_link_tag($type = 'rss', $url = '', $tag_options = array(
  * @param bool   $absolute return absolute path ?
  *
  * @return string file path to the JavaScript file
+ *
  * @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);
 }
 
 /**
@@ -94,51 +98,45 @@ function javascript_path($source, $absolute = false)
  * @param array additional HTML compliant <link> tag parameters
  *
  * @return string XHTML compliant <script> tag(s)
+ *
  * @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();
-
-  $html = '';
-  foreach ($sources as $source)
-  {
-    $absolute = false;
-    if (isset($sourceOptions['absolute']))
-    {
-      unset($sourceOptions['absolute']);
-      $absolute = true;
-    }
-
-    $condition = null;
-    if (isset($sourceOptions['condition']))
-    {
-      $condition = $sourceOptions['condition'];
-      unset($sourceOptions['condition']);
-    }
-
-    if (!isset($sourceOptions['raw_name']))
-    {
-      $source = javascript_path($source, $absolute);
-    }
-    else
-    {
-      unset($sourceOptions['raw_name']);
-    }
-
-    $options = array_merge(array('type' => 'text/javascript', 'src' => $source), $sourceOptions);
-    $tag = content_tag('script', '', $options);
-
-    if (null !== $condition)
-    {
-      $tag = comment_as_conditional($condition, $tag);
+    $sources = func_get_args();
+    $sourceOptions = (func_num_args() > 1 && is_array($sources[func_num_args() - 1])) ? array_pop($sources) : array();
+
+    $html = '';
+    foreach ($sources as $source) {
+        $absolute = false;
+        if (isset($sourceOptions['absolute'])) {
+            unset($sourceOptions['absolute']);
+            $absolute = true;
+        }
+
+        $condition = null;
+        if (isset($sourceOptions['condition'])) {
+            $condition = $sourceOptions['condition'];
+            unset($sourceOptions['condition']);
+        }
+
+        if (!isset($sourceOptions['raw_name'])) {
+            $source = javascript_path($source, $absolute);
+        } else {
+            unset($sourceOptions['raw_name']);
+        }
+
+        $options = array_merge(array('type' => 'text/javascript', 'src' => $source), $sourceOptions);
+        $tag = content_tag('script', '', $options);
+
+        if (null !== $condition) {
+            $tag = comment_as_conditional($condition, $tag);
+        }
+
+        $html .= $tag."\n";
     }
 
-    $html .= $tag."\n";
-  }
-
-  return $html;
+    return $html;
 }
 
 /**
@@ -159,11 +157,12 @@ function javascript_include_tag()
  * @param bool   $absolute return absolute path ?
  *
  * @return string file path to the stylesheet file
+ *
  * @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);
 }
 
 /**
@@ -192,71 +191,73 @@ function stylesheet_path($source, $absolute = false)
  * @param array  additional HTML compliant <link> tag parameters
  *
  * @return string XHTML compliant <link> tag(s)
+ *
  * @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();
-
-  $html = '';
-  foreach ($sources as $source)
-  {
-    $absolute = false;
-    if (isset($sourceOptions['absolute']))
-    {
-      unset($sourceOptions['absolute']);
-      $absolute = true;
-    }
-
-    $condition = null;
-    if (isset($sourceOptions['condition']))
-    {
-      $condition = $sourceOptions['condition'];
-      unset($sourceOptions['condition']);
-    }
-
-    if (!isset($sourceOptions['raw_name']))
-    {
-      $source = stylesheet_path($source, $absolute);
-    }
-    else
-    {
-      unset($sourceOptions['raw_name']);
-    }
-
-    $options = array_merge(array('rel' => 'stylesheet', 'type' => 'text/css', 'media' => 'screen', 'href' => $source), $sourceOptions);
-    $tag = tag('link', $options);
-
-    if (null !== $condition)
-    {
-      $tag = comment_as_conditional($condition, $tag);
+    $sources = func_get_args();
+    $sourceOptions = (func_num_args() > 1 && is_array($sources[func_num_args() - 1])) ? array_pop($sources) : array();
+
+    $html = '';
+    foreach ($sources as $source) {
+        $absolute = false;
+        if (isset($sourceOptions['absolute'])) {
+            unset($sourceOptions['absolute']);
+            $absolute = true;
+        }
+
+        $condition = null;
+        if (isset($sourceOptions['condition'])) {
+            $condition = $sourceOptions['condition'];
+            unset($sourceOptions['condition']);
+        }
+
+        if (!isset($sourceOptions['raw_name'])) {
+            $source = stylesheet_path($source, $absolute);
+        } else {
+            unset($sourceOptions['raw_name']);
+        }
+
+        $options = array_merge(array('rel' => 'stylesheet', 'type' => 'text/css', 'media' => 'screen', 'href' => $source), $sourceOptions);
+        $tag = tag('link', $options);
+
+        if (null !== $condition) {
+            $tag = comment_as_conditional($condition, $tag);
+        }
+
+        $html .= $tag."\n";
     }
 
-    $html .= $tag."\n";
-  }
-
-  return $html;
+    return $html;
 }
 
 /**
  * Adds a stylesheet to the response object.
  *
  * @see sfResponse->addStylesheet()
+ *
+ * @param mixed $css
+ * @param mixed $position
+ * @param mixed $options
  */
 function use_stylesheet($css, $position = '', $options = array())
 {
-  sfContext::getInstance()->getResponse()->addStylesheet($css, $position, $options);
+    sfContext::getInstance()->getResponse()->addStylesheet($css, $position, $options);
 }
 
 /**
  * Adds a javascript to the response object.
  *
  * @see sfResponse->addJavascript()
+ *
+ * @param mixed $js
+ * @param mixed $position
+ * @param mixed $options
  */
 function use_javascript($js, $position = '', $options = array())
 {
-  sfContext::getInstance()->getResponse()->addJavascript($js, $position, $options);
+    sfContext::getInstance()->getResponse()->addJavascript($js, $position, $options);
 }
 
 /**
@@ -266,14 +267,11 @@ function use_javascript($js, $position = '', $options = array())
  */
 function decorate_with($layout)
 {
-  if (false === $layout)
-  {
-    sfContext::getInstance()->get('view_instance')->setDecorator(false);
-  }
-  else
-  {
-    sfContext::getInstance()->get('view_instance')->setDecoratorTemplate($layout);
-  }
+    if (false === $layout) {
+        sfContext::getInstance()->get('view_instance')->setDecorator(false);
+    } else {
+        sfContext::getInstance()->get('view_instance')->setDecoratorTemplate($layout);
+    }
 }
 
 /**
@@ -294,11 +292,12 @@ function decorate_with($layout)
  * @param bool   $absolute return absolute path ?
  *
  * @return string file path to the image file
+ *
  * @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);
 }
 
 /**
@@ -321,96 +320,82 @@ function image_path($source, $absolute = false)
  * @param array  $options additional HTML compliant <img> tag parameters
  *
  * @return string XHTML compliant <img> tag
+ *
  * @see    image_path
  */
 function image_tag($source, $options = array())
 {
-  if (!$source)
-  {
-    return '';
-  }
-
-  $options = _parse_attributes($options);
-
-  $absolute = false;
-  if (isset($options['absolute']))
-  {
-    unset($options['absolute']);
-    $absolute = true;
-  }
-
-  if (!isset($options['raw_name']))
-  {
-    $options['src'] = image_path($source, $absolute);
-  }
-  else
-  {
-    $options['src'] = $source;
-    unset($options['raw_name']);
-  }
-
-  if (isset($options['alt_title']))
-  {
-    // set as alt and title but do not overwrite explicitly set
-    if (!isset($options['alt']))
-    {
-      $options['alt'] = $options['alt_title'];
+    if (!$source) {
+        return '';
+    }
+
+    $options = _parse_attributes($options);
+
+    $absolute = false;
+    if (isset($options['absolute'])) {
+        unset($options['absolute']);
+        $absolute = true;
     }
-    if (!isset($options['title']))
-    {
-      $options['title'] = $options['alt_title'];
+
+    if (!isset($options['raw_name'])) {
+        $options['src'] = image_path($source, $absolute);
+    } else {
+        $options['src'] = $source;
+        unset($options['raw_name']);
+    }
+
+    if (isset($options['alt_title'])) {
+        // set as alt and title but do not overwrite explicitly set
+        if (!isset($options['alt'])) {
+            $options['alt'] = $options['alt_title'];
+        }
+        if (!isset($options['title'])) {
+            $options['title'] = $options['alt_title'];
+        }
+        unset($options['alt_title']);
     }
-    unset($options['alt_title']);
-  }
-
-  if (isset($options['size']))
-  {
-    list($width, $height) = explode('x', $options['size'], 2);
-    $options['height'] = $height;
-    $options['width'] = $width;
-    unset($options['size']);
-  }
-
-  return tag('img', $options);
+
+    if (isset($options['size'])) {
+        list($width, $height) = explode('x', $options['size'], 2);
+        $options['height'] = $height;
+        $options['width'] = $width;
+        unset($options['size']);
+    }
+
+    return tag('img', $options);
 }
 
 function _compute_public_path($source, $dir, $ext, $absolute = false)
 {
-  if (strpos($source, '://') || strpos($source, '//') === 0)
-  {
-    return $source;
-  }
-
-  $request = sfContext::getInstance()->getRequest();
-  $sf_relative_url_root = $request->getRelativeUrlRoot();
-  if (0 !== strpos($source, '/'))
-  {
-    $source = $sf_relative_url_root.'/'.$dir.'/'.$source;
-  }
-
-  $query_string = '';
-  if (false !== $pos = strpos($source, '?'))
-  {
-    $query_string = substr($source, $pos);
-    $source = substr($source, 0, $pos);
-  }
-
-  if (false === strpos(basename($source), '.'))
-  {
-    $source .= '.'.$ext;
-  }
-
-  if ($sf_relative_url_root && 0 !== strpos($source, $sf_relative_url_root))
-  {
-    $source = $sf_relative_url_root.$source;
-  }
-
-  if ($absolute)
-  {
-    $source = 'http'.($request->isSecure() ? 's' : '').'://'.$request->getHost().$source;
-  }
-
-  return $source.$query_string;
+    if (strpos($source, '://') || 0 === strpos($source, '//')) {
+        return $source;
+    }
+
+    $request = sfContext::getInstance()->getRequest();
+    $sf_relative_url_root = $request->getRelativeUrlRoot();
+    if (0 !== strpos($source, '/')) {
+        $source = $sf_relative_url_root.'/'.$dir.'/'.$source;
+    }
+
+    $query_string = '';
+    if (false !== $pos = strpos($source, '?')) {
+        $query_string = substr($source, $pos);
+        $source = substr($source, 0, $pos);
+    }
+
+    if (false === strpos(basename($source), '.')) {
+        $source .= '.'.$ext;
+    }
+
+    if ($sf_relative_url_root && 0 !== strpos($source, $sf_relative_url_root)) {
+        $source = $sf_relative_url_root.$source;
+    }
+
+    if ($absolute) {
+        $source = 'http'.($request->isSecure() ? 's' : '').'://'.$request->getHost().$source;
+    }
+
+    return $source.$query_string;
 }
 
 /**
@@ -430,17 +415,17 @@ function _compute_public_path($source, $dir, $ext, $absolute = false)
  * <b>Note:</b> Modify the view.yml or use sfWebResponse::addMeta() to change, add or remove metas.
  *
  * @return string XHTML compliant <meta> tag(s)
+ *
  * @see    include_http_metas
  * @see    sfWebResponse::addMeta()
  */
 function include_metas()
 {
-  $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";
-  }
+    $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";
+    }
 }
 
 /**
@@ -456,15 +441,15 @@ function include_metas()
  * <b>Note:</b> Modify the view.yml or use sfWebResponse::addHttpMeta() to change, add or remove HTTP metas.
  *
  * @return string XHTML compliant <meta> tag(s)
+ *
  * @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', array('http-equiv' => $httpequiv, 'content' => $value))."\n";
+    }
 }
 
 /**
@@ -477,9 +462,9 @@ function include_http_metas()
  */
 function include_title()
 {
-  $title = sfContext::getInstance()->getResponse()->getTitle();
+    $title = sfContext::getInstance()->getResponse()->getTitle();
 
-  echo content_tag('title', $title)."\n";
+    echo content_tag('title', $title)."\n";
 }
 
 /**
@@ -493,16 +478,15 @@ 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)
-  {
-    $html .= javascript_include_tag($file, $options);
-  }
+    $html = '';
+    foreach ($response->getJavascripts() as $file => $options) {
+        $html .= javascript_include_tag($file, $options);
+    }
 
-  return $html;
+    return $html;
 }
 
 /**
@@ -512,7 +496,7 @@ function get_javascripts()
  */
 function include_javascripts()
 {
-  echo get_javascripts();
+    echo get_javascripts();
 }
 
 /**
@@ -522,7 +506,7 @@ function include_javascripts()
  */
 function clear_javascripts()
 {
-  sfContext::getInstance()->getResponse()->clearJavascripts();
+    sfContext::getInstance()->getResponse()->clearJavascripts();
 }
 
 /**
@@ -536,16 +520,15 @@ 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)
-  {
-    $html .= stylesheet_tag($file, $options);
-  }
+    $html = '';
+    foreach ($response->getStylesheets() as $file => $options) {
+        $html .= stylesheet_tag($file, $options);
+    }
 
-  return $html;
+    return $html;
 }
 
 /**
@@ -555,7 +538,7 @@ function get_stylesheets()
  */
 function include_stylesheets()
 {
-  echo get_stylesheets();
+    echo get_stylesheets();
 }
 
 /* Clear all stylesheets of the response object.
@@ -564,7 +547,7 @@ function include_stylesheets()
  */
 function clear_stylesheets()
 {
-  sfContext::getInstance()->getResponse()->clearStylesheets();
+    sfContext::getInstance()->getResponse()->clearStylesheets();
 }
 
 /**
@@ -577,13 +560,14 @@ function clear_stylesheets()
  * @param array  $options  An array of options
  *
  * @return string XHTML compliant <script> tag(s)
+ *
  * @see    javascript_include_tag
  */
 function dynamic_javascript_include_tag($uri, $absolute = false, $options = array())
 {
-  $options['raw_name'] = true;
+    $options['raw_name'] = true;
 
-  return javascript_include_tag(_dynamic_path($uri, 'js', $absolute), $options);
+    return javascript_include_tag(_dynamic_path($uri, 'js', $absolute), $options);
 }
 
 /**
@@ -593,12 +577,16 @@ function dynamic_javascript_include_tag($uri, $absolute = false, $options = arra
  * The helper automatically adds the sf_format to the internal URI, so you don't have to.
  *
  * @see sfResponse->addJavascript()
+ *
+ * @param mixed $js
+ * @param mixed $position
+ * @param mixed $options
  */
 function use_dynamic_javascript($js, $position = '', $options = array())
 {
-  $options['raw_name'] = true;
+    $options['raw_name'] = true;
 
-  return use_javascript(_dynamic_path($js, 'js'), $position, $options);
+    return use_javascript(_dynamic_path($js, 'js'), $position, $options);
 }
 
 /**
@@ -608,17 +596,21 @@ function use_dynamic_javascript($js, $position = '', $options = array())
  * The helper automatically adds the sf_format to the internal URI, so you don't have to.
  *
  * @see sfResponse->addStylesheet()
+ *
+ * @param mixed $css
+ * @param mixed $position
+ * @param mixed $options
  */
 function use_dynamic_stylesheet($css, $position = '', $options = array())
 {
-  $options['raw_name'] = true;
+    $options['raw_name'] = true;
 
-  return use_stylesheet(_dynamic_path($css, 'css'), $position, $options);
+    return use_stylesheet(_dynamic_path($css, 'css'), $position, $options);
 }
 
 function _dynamic_path($uri, $format, $absolute = false)
 {
-  return url_for($uri.(false === strpos($uri, '?') ? '?' : '&').'sf_format='.$format, $absolute);
+    return url_for($uri.(false === strpos($uri, '?') ? '?' : '&').'sf_format='.$format, $absolute);
 }
 
 /**
@@ -641,13 +633,12 @@ function _dynamic_path($uri, $format, $absolute = false)
  */
 function get_javascripts_for_form(sfForm $form)
 {
-  $html = '';
-  foreach ($form->getJavaScripts() as $file)
-  {
-    $html .= javascript_include_tag($file);
-  }
+    $html = '';
+    foreach ($form->getJavaScripts() as $file) {
+        $html .= javascript_include_tag($file);
+    }
 
-  return $html;
+    return $html;
 }
 
 /**
@@ -657,22 +648,19 @@ function get_javascripts_for_form(sfForm $form)
  */
 function include_javascripts_for_form(sfForm $form)
 {
-  echo get_javascripts_for_form($form);
+    echo get_javascripts_for_form($form);
 }
 
 /**
  * Adds javascripts from the supplied form to the response object.
- *
- * @param 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);
-  }
+    foreach ($form->getJavaScripts() as $file) {
+        $response->addJavascript($file);
+    }
 }
 
 /**
@@ -695,13 +683,12 @@ function use_javascripts_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 = '';
+    foreach ($form->getStylesheets() as $file => $media) {
+        $html .= stylesheet_tag($file, array('media' => $media));
+    }
 
-  return $html;
+    return $html;
 }
 
 /**
@@ -711,20 +698,17 @@ function get_stylesheets_for_form(sfForm $form)
  */
 function include_stylesheets_for_form(sfForm $form)
 {
-  echo get_stylesheets_for_form($form);
+    echo get_stylesheets_for_form($form);
 }
 
 /**
  * Adds stylesheets from the supplied form to the response object.
- *
- * @param 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));
-  }
+    foreach ($form->getStylesheets() as $file => $media) {
+        $response->addStylesheet($file, '', array('media' => $media));
+    }
 }
diff --git a/lib/helper/CacheHelper.php b/lib/helper/CacheHelper.php
index 71ba2d569..08a6ba5a3 100644
--- a/lib/helper/CacheHelper.php
+++ b/lib/helper/CacheHelper.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -11,10 +11,12 @@
 /**
  * CacheHelper.
  *
- * @package    symfony
- * @subpackage helper
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
+ *
+ * @param mixed $name
+ * @param mixed $lifeTime
  */
 
 /* Usage
@@ -29,51 +31,44 @@
 */
 function cache($name, $lifeTime = 86400)
 {
-  if (!sfConfig::get('sf_cache'))
-  {
-    return null;
-  }
+    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);
+    $data = $cache->start($name, $lifeTime);
 
-  if (null === $data)
-  {
-    sfConfig::set('symfony.cache.started', true);
-    sfConfig::set('symfony.cache.current_name', $name);
+    if (null === $data) {
+        sfConfig::set('symfony.cache.started', true);
+        sfConfig::set('symfony.cache.current_name', $name);
+
+        return false;
+    }
 
-    return false;
-  }
-  else
-  {
     echo $data;
 
     return true;
-  }
 }
 
 function cache_save()
 {
-  if (!sfConfig::get('sf_cache'))
-  {
-    return null;
-  }
+    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;
+    echo $data;
 }
diff --git a/lib/helper/DateHelper.php b/lib/helper/DateHelper.php
index 51265f48e..75ec5cb53 100644
--- a/lib/helper/DateHelper.php
+++ b/lib/helper/DateHelper.php
@@ -11,160 +11,124 @@
 /**
  * DateHelper.
  *
- * @package    symfony
- * @subpackage helper
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
+ *
+ * @param mixed      $start_date
+ * @param mixed      $end_date
+ * @param mixed      $format
+ * @param mixed      $full_text
+ * @param mixed      $start_text
+ * @param mixed      $end_text
+ * @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)
 {
-  if ($start_date != '' && $end_date != '')
-  {
-    return sprintf($full_text, format_date($start_date, $format, $culture, $charset), format_date($end_date, $format, $culture, $charset));
-  }
-  else if ($start_date != '')
-  {
-    return sprintf($start_text, format_date($start_date, $format, $culture, $charset));
-  }
-  else if ($end_date != '')
-  {
-    return sprintf($end_text, format_date($end_date, $format, $culture, $charset));
-  }
+    if ('' != $start_date && '' != $end_date) {
+        return sprintf($full_text, format_date($start_date, $format, $culture, $charset), format_date($end_date, $format, $culture, $charset));
+    }
+    if ('' != $start_date) {
+        return sprintf($start_text, format_date($start_date, $format, $culture, $charset));
+    }
+    if ('' != $end_date) {
+        return sprintf($end_text, format_date($end_date, $format, $culture, $charset));
+    }
 }
 
 function format_date($date, $format = 'd', $culture = null, $charset = null)
 {
-  static $dateFormats = array();
+    static $dateFormats = array();
 
-  if (null === $date)
-  {
-    return null;
-  }
+    if (null === $date) {
+        return null;
+    }
 
-  if (!$culture)
-  {
-    $culture = sfContext::getInstance()->getUser()->getCulture();
-  }
+    if (!$culture) {
+        $culture = sfContext::getInstance()->getUser()->getCulture();
+    }
 
-  if (!$charset)
-  {
-    $charset = sfConfig::get('sf_charset');
-  }
+    if (!$charset) {
+        $charset = sfConfig::get('sf_charset');
+    }
 
-  if (!isset($dateFormats[$culture]))
-  {
-    $dateFormats[$culture] = new sfDateFormat($culture);
-  }
+    if (!isset($dateFormats[$culture])) {
+        $dateFormats[$culture] = new sfDateFormat($culture);
+    }
 
-  return $dateFormats[$culture]->format($date, $format, null, $charset);
+    return $dateFormats[$culture]->format($date, $format, null, $charset);
 }
 
 function format_datetime($date, $format = 'F', $culture = null, $charset = null)
 {
-  return format_date($date, $format, $culture, $charset);
+    return format_date($date, $format, $culture, $charset);
 }
 
 function distance_of_time_in_words($from_time, $to_time = null, $include_seconds = false)
 {
-  $to_time = $to_time ?: time();
-
-  $distance_in_minutes = floor(abs($to_time - $from_time) / 60);
-  $distance_in_seconds = floor(abs($to_time - $from_time));
+    $to_time = $to_time ?: time();
+
+    $distance_in_minutes = floor(abs($to_time - $from_time) / 60);
+    $distance_in_seconds = floor(abs($to_time - $from_time));
+
+    $string = '';
+    $parameters = array();
+
+    if ($distance_in_minutes <= 1) {
+        if (!$include_seconds) {
+            $string = 0 == $distance_in_minutes ? 'less than a minute' : '1 minute';
+        } else {
+            if ($distance_in_seconds <= 5) {
+                $string = 'less than 5 seconds';
+            } elseif ($distance_in_seconds >= 6 && $distance_in_seconds <= 10) {
+                $string = 'less than 10 seconds';
+            } elseif ($distance_in_seconds >= 11 && $distance_in_seconds <= 20) {
+                $string = 'less than 20 seconds';
+            } elseif ($distance_in_seconds >= 21 && $distance_in_seconds <= 40) {
+                $string = 'half a minute';
+            } elseif ($distance_in_seconds >= 41 && $distance_in_seconds <= 59) {
+                $string = 'less than a minute';
+            } else {
+                $string = '1 minute';
+            }
+        }
+    } elseif ($distance_in_minutes >= 2 && $distance_in_minutes <= 44) {
+        $string = '%minutes% minutes';
+        $parameters['%minutes%'] = $distance_in_minutes;
+    } elseif ($distance_in_minutes >= 45 && $distance_in_minutes <= 89) {
+        $string = 'about 1 hour';
+    } elseif ($distance_in_minutes >= 90 && $distance_in_minutes <= 1439) {
+        $string = 'about %hours% hours';
+        $parameters['%hours%'] = round($distance_in_minutes / 60);
+    } elseif ($distance_in_minutes >= 1440 && $distance_in_minutes <= 2879) {
+        $string = '1 day';
+    } elseif ($distance_in_minutes >= 2880 && $distance_in_minutes <= 43199) {
+        $string = '%days% days';
+        $parameters['%days%'] = round($distance_in_minutes / 1440);
+    } elseif ($distance_in_minutes >= 43200 && $distance_in_minutes <= 86399) {
+        $string = 'about 1 month';
+    } elseif ($distance_in_minutes >= 86400 && $distance_in_minutes <= 525959) {
+        $string = '%months% months';
+        $parameters['%months%'] = round($distance_in_minutes / 43200);
+    } elseif ($distance_in_minutes >= 525960 && $distance_in_minutes <= 1051919) {
+        $string = 'about 1 year';
+    } else {
+        $string = 'over %years% years';
+        $parameters['%years%'] = floor($distance_in_minutes / 525960);
+    }
 
-  $string = '';
-  $parameters = array();
+    if (sfConfig::get('sf_i18n')) {
+        require_once __DIR__.'/I18NHelper.php';
 
-  if ($distance_in_minutes <= 1)
-  {
-    if (!$include_seconds)
-    {
-      $string = $distance_in_minutes == 0 ? 'less than a minute' : '1 minute';
-    }
-    else
-    {
-      if ($distance_in_seconds <= 5)
-      {
-        $string = 'less than 5 seconds';
-      }
-      else if ($distance_in_seconds >= 6 && $distance_in_seconds <= 10)
-      {
-        $string = 'less than 10 seconds';
-      }
-      else if ($distance_in_seconds >= 11 && $distance_in_seconds <= 20)
-      {
-        $string = 'less than 20 seconds';
-      }
-      else if ($distance_in_seconds >= 21 && $distance_in_seconds <= 40)
-      {
-        $string = 'half a minute';
-      }
-      else if ($distance_in_seconds >= 41 && $distance_in_seconds <= 59)
-      {
-        $string = 'less than a minute';
-      }
-      else
-      {
-        $string = '1 minute';
-      }
+        return __($string, $parameters);
     }
-  }
-  else if ($distance_in_minutes >= 2 && $distance_in_minutes <= 44)
-  {
-    $string = '%minutes% minutes';
-    $parameters['%minutes%'] = $distance_in_minutes;
-  }
-  else if ($distance_in_minutes >= 45 && $distance_in_minutes <= 89)
-  {
-    $string = 'about 1 hour';
-  }
-  else if ($distance_in_minutes >= 90 && $distance_in_minutes <= 1439)
-  {
-    $string = 'about %hours% hours';
-    $parameters['%hours%'] = round($distance_in_minutes / 60);
-  }
-  else if ($distance_in_minutes >= 1440 && $distance_in_minutes <= 2879)
-  {
-    $string = '1 day';
-  }
-  else if ($distance_in_minutes >= 2880 && $distance_in_minutes <= 43199)
-  {
-    $string = '%days% days';
-    $parameters['%days%'] = round($distance_in_minutes / 1440);
-  }
-  else if ($distance_in_minutes >= 43200 && $distance_in_minutes <= 86399)
-  {
-    $string = 'about 1 month';
-  }
-  else if ($distance_in_minutes >= 86400 && $distance_in_minutes <= 525959)
-  {
-    $string = '%months% months';
-    $parameters['%months%'] = round($distance_in_minutes / 43200);
-  }
-  else if ($distance_in_minutes >= 525960 && $distance_in_minutes <= 1051919)
-  {
-    $string = 'about 1 year';
-  }
-  else
-  {
-    $string = 'over %years% years';
-    $parameters['%years%'] = floor($distance_in_minutes / 525960);
-  }
-
-  if (sfConfig::get('sf_i18n'))
-  {
-    require_once __DIR__.'/I18NHelper.php';
-
-    return __($string, $parameters);
-  }
-  else
-  {
+
     return strtr($string, $parameters);
-  }
 }
 
 // Like distance_of_time_in_words, but where to_time is fixed to time()
 function time_ago_in_words($from_time, $include_seconds = false)
 {
-  return distance_of_time_in_words($from_time, time(), $include_seconds);
+    return distance_of_time_in_words($from_time, time(), $include_seconds);
 }
diff --git a/lib/helper/DebugHelper.php b/lib/helper/DebugHelper.php
index b409d594e..68c81fa56 100644
--- a/lib/helper/DebugHelper.php
+++ b/lib/helper/DebugHelper.php
@@ -2,8 +2,7 @@
 
 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', array($message, 'priority' => constant('sfLogger::'.strtoupper($priority)))));
+    }
 }
diff --git a/lib/helper/EscapingHelper.php b/lib/helper/EscapingHelper.php
index ee4aeeea2..bb57f79d8 100644
--- a/lib/helper/EscapingHelper.php
+++ b/lib/helper/EscapingHelper.php
@@ -25,23 +25,25 @@
  * For each function there is a define to avoid problems with strings being
  * incorrectly specified.
  *
- * @package    symfony
- * @subpackage helper
  * @author     Mike Squire <mike@somosis.co.uk>
+ *
  * @version    SVN: $Id$
+ *
+ * @param mixed $value
  */
 
 /**
  * Runs the PHP function htmlentities on the value passed.
  *
  * @param string $value the value to escape
+ *
  * @return string the escaped value
  */
 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;
+    // 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;
 }
 
 define('ESC_ENTITIES', 'esc_entities');
@@ -50,13 +52,14 @@ function esc_entities($value)
  * Runs the PHP function htmlspecialchars on the value passed.
  *
  * @param string $value the value to escape
+ *
  * @return string the escaped value
  */
 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;
+    // 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;
 }
 
 define('ESC_SPECIALCHARS', 'esc_specialchars');
@@ -66,11 +69,12 @@ function esc_specialchars($value)
  * being to be able to specify that the value is not to be escaped in any way.
  *
  * @param string $value the value to escape
+ *
  * @return string the escaped value
  */
 function esc_raw($value)
 {
-  return $value;
+    return $value;
 }
 
 define('ESC_RAW', 'esc_raw');
@@ -85,11 +89,12 @@ function esc_raw($value)
  * that is ultimately not going to end up as text in an HTML document.
  *
  * @param string $value the value to escape
+ *
  * @return string the escaped value
  */
 function esc_js($value)
 {
-  return esc_js_no_entities(esc_entities($value));
+    return esc_js_no_entities(esc_entities($value));
 }
 
 define('ESC_JS', 'esc_js');
@@ -99,13 +104,16 @@ function esc_js($value)
  * JavaScript string.
  *
  * @param string $value the value to escape
+ *
  * @return string the escaped value
  */
 function esc_js_no_entities($value)
 {
-  return str_replace(array("\\"  , "\n"  , "\r" , "\""  , "'"  ),
-                     array("\\\\", "\\n" , "\\r", "\\\"", "\\'"),
-                     $value);
+    return str_replace(
+        array('\\', "\n", "\r", '"', "'"),
+        array('\\\\', '\\n', '\\r', '\\"', "\\'"),
+        $value
+    );
 }
 
 define('ESC_JS_NO_ENTITIES', 'esc_js_no_entities');
diff --git a/lib/helper/HelperHelper.php b/lib/helper/HelperHelper.php
index 9e573a403..2d4499281 100644
--- a/lib/helper/HelperHelper.php
+++ b/lib/helper/HelperHelper.php
@@ -11,15 +11,13 @@
 /**
  * HelperHelper.
  *
- * @package    symfony
- * @subpackage helper
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
-
 function use_helper()
 {
-  $context = sfContext::getInstance();
+    $context = sfContext::getInstance();
 
-  $context->getConfiguration()->loadHelpers(func_get_args(), $context->getModuleName());
+    $context->getConfiguration()->loadHelpers(func_get_args(), $context->getModuleName());
 }
diff --git a/lib/helper/I18NHelper.php b/lib/helper/I18NHelper.php
index 95d285a32..e3768f7b7 100644
--- a/lib/helper/I18NHelper.php
+++ b/lib/helper/I18NHelper.php
@@ -11,36 +11,32 @@
 /**
  * I18NHelper.
  *
- * @package    symfony
- * @subpackage helper
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
+ *
+ * @param mixed $text
+ * @param mixed $args
+ * @param mixed $catalogue
  */
-
 function __($text, $args = array(), $catalogue = 'messages')
 {
-  if (sfConfig::get('sf_i18n'))
-  {
-    return sfContext::getInstance()->getI18N()->__($text, $args, $catalogue);
-  }
-  else
-  {
-    if (empty($args))
-    {
-      $args = array();
+    if (sfConfig::get('sf_i18n')) {
+        return sfContext::getInstance()->getI18N()->__($text, $args, $catalogue);
+    }
+
+    if (empty($args)) {
+        $args = array();
     }
 
     // replace object with strings
-    foreach ($args as $key => $value)
-    {
-      if (is_object($value) && method_exists($value, '__toString'))
-      {
-        $args[$key] = $value->__toString();
-      }
+    foreach ($args as $key => $value) {
+        if (is_object($value) && method_exists($value, '__toString')) {
+            $args[$key] = $value->__toString();
+        }
     }
 
     return strtr($text, $args);
-  }
 }
 
 /**
@@ -62,32 +58,31 @@ function __($text, $args = array(), $catalogue = 'messages')
  */
 function format_number_choice($text, $args = array(), $number = null, $catalogue = 'messages')
 {
-  $translated = __($text, $args, $catalogue);
+    $translated = __($text, $args, $catalogue);
 
-  $choice = new sfChoiceFormat();
+    $choice = new sfChoiceFormat();
 
-  $retval = $choice->format($translated, $number);
+    $retval = $choice->format($translated, $number);
 
-  if ($retval === false)
-  {
-    throw new sfException(sprintf('Unable to parse your choice "%s".', $translated));
-  }
+    if (false === $retval) {
+        throw new sfException(sprintf('Unable to parse your choice "%s".', $translated));
+    }
 
-  return $retval;
+    return $retval;
 }
 
 function format_country($country_iso, $culture = null)
 {
-  $c = sfCultureInfo::getInstance($culture === null ? sfContext::getInstance()->getUser()->getCulture() : $culture);
-  $countries = $c->getCountries();
+    $c = sfCultureInfo::getInstance(null === $culture ? sfContext::getInstance()->getUser()->getCulture() : $culture);
+    $countries = $c->getCountries();
 
-  return isset($countries[$country_iso]) ? $countries[$country_iso] : '';
+    return isset($countries[$country_iso]) ? $countries[$country_iso] : '';
 }
 
 function format_language($language_iso, $culture = null)
 {
-  $c = sfCultureInfo::getInstance($culture === null ? sfContext::getInstance()->getUser()->getCulture() : $culture);
-  $languages = $c->getLanguages();
+    $c = sfCultureInfo::getInstance(null === $culture ? sfContext::getInstance()->getUser()->getCulture() : $culture);
+    $languages = $c->getLanguages();
 
-  return isset($languages[$language_iso]) ? $languages[$language_iso] : '';
+    return isset($languages[$language_iso]) ? $languages[$language_iso] : '';
 }
diff --git a/lib/helper/JavascriptBaseHelper.php b/lib/helper/JavascriptBaseHelper.php
index 54b66d569..003fd877f 100644
--- a/lib/helper/JavascriptBaseHelper.php
+++ b/lib/helper/JavascriptBaseHelper.php
@@ -12,18 +12,19 @@
 /**
  * JavascriptBaseHelper.
  *
- * @package    symfony
- * @subpackage helper
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     John Christopher <john.christopher@symfony-project.com>
  * @author     David Heinemeier Hansson
  * @author     Fabian Lange <fabian.lange@symfony-project.com>
+ *
  * @version    SVN: $Id$
+ *
+ * @param mixed $name
+ * @param mixed $function
+ * @param mixed $html_options
  */
 
-/*
- * Provides a set basic of helpers for calling JavaScript functions.
- */
+// Provides a set basic of helpers for calling JavaScript functions.
 
 /**
  * Returns a link that will trigger a javascript function using the
@@ -35,18 +36,17 @@
  */
 function link_to_function($name, $function, $html_options = array())
 {
-  $html_options = _parse_attributes($html_options);
-
-  $html_options['href'] = isset($html_options['href']) ? $html_options['href'] : '#';
-  if ( isset($html_options['confirm']) )
-  {
-    $confirm = escape_javascript($html_options['confirm']);
-    unset($html_options['confirm']);
-    $function = "if(window.confirm('$confirm')){ $function;}";
-  }
-  $html_options['onclick'] = $function.'; return false;';
-
-  return content_tag('a', $name, $html_options);
+    $html_options = _parse_attributes($html_options);
+
+    $html_options['href'] = isset($html_options['href']) ? $html_options['href'] : '#';
+    if (isset($html_options['confirm'])) {
+        $confirm = escape_javascript($html_options['confirm']);
+        unset($html_options['confirm']);
+        $function = "if(window.confirm('{$confirm}')){ {$function};}";
+    }
+    $html_options['onclick'] = $function.'; return false;';
+
+    return content_tag('a', $name, $html_options);
 }
 
 /**
@@ -55,16 +55,20 @@ function link_to_function($name, $function, $html_options = array())
  *
  * Examples:
  *   <?php echo button_to_function('Greeting', "alert('Hello world!')") ?>
+ *
+ * @param mixed $name
+ * @param mixed $function
+ * @param mixed $html_options
  */
 function button_to_function($name, $function, $html_options = array())
 {
-  $html_options = _parse_attributes($html_options);
+    $html_options = _parse_attributes($html_options);
 
-  $html_options['onclick'] = $function.'; return false;';
-  $html_options['type']    = 'button';
-  $html_options['value']   = $name;
+    $html_options['onclick'] = $function.'; return false;';
+    $html_options['type'] = 'button';
+    $html_options['value'] = $name;
 
-  return tag('input', $html_options);
+    return tag('input', $html_options);
 }
 
 /**
@@ -73,28 +77,27 @@ function button_to_function($name, $function, $html_options = array())
  * Example:
  *   <?php echo javascript_tag("alert('All is good')") ?>
  *   => <script type="text/javascript">alert('All is good')</script>
- *   <?php javascript_tag() ?>alert('All is good')<?php end_javascript_tag() ?>
+ *   <?php javascript_tag() ?>alert('All is good')<?php end_javascript_tag() ?>.
+ *
+ * @param mixed|null $content
  */
 function javascript_tag($content = null)
 {
-  if (null !== $content)
-  {
-    return content_tag('script', javascript_cdata_section($content), array('type' => 'text/javascript'));
-  }
-  else
-  {
+    if (null !== $content) {
+        return content_tag('script', javascript_cdata_section($content), array('type' => 'text/javascript'));
+    }
+
     ob_start();
-  }
 }
 
 function end_javascript_tag()
 {
-  echo javascript_tag(ob_get_clean());
+    echo javascript_tag(ob_get_clean());
 }
 
 function javascript_cdata_section($content)
 {
-  return "\n//".cdata_section("\n$content\n//")."\n";
+    return "\n//".cdata_section("\n{$content}\n//")."\n";
 }
 
 /**
@@ -103,10 +106,9 @@ function javascript_cdata_section($content)
  */
 function if_javascript()
 {
-  if (!sfContext::getInstance()->getRequest()->isXmlHttpRequest())
-  {
-    ob_start();
-  }
+    if (!sfContext::getInstance()->getRequest()->isXmlHttpRequest()) {
+        ob_start();
+    }
 }
 
 /**
@@ -115,11 +117,10 @@ function if_javascript()
  */
 function end_if_javascript()
 {
-  if (!sfContext::getInstance()->getRequest()->isXmlHttpRequest())
-  {
-    $content = ob_get_clean();
-    echo javascript_tag("document.write('" . esc_js_no_entities($content) . "');");
-  }
+    if (!sfContext::getInstance()->getRequest()->isXmlHttpRequest()) {
+        $content = ob_get_clean();
+        echo javascript_tag("document.write('".esc_js_no_entities($content)."');");
+    }
 }
 
 /**
@@ -127,41 +128,42 @@ function end_if_javascript()
  * javascript strings need to be single quoted.
  *
  * @param option (typically from option array)
+ * @param mixed $option
+ *
  * @return string javascript string or array equivalent
  */
 function array_or_string_for_javascript($option)
 {
-  if (is_array($option))
-  {
-    return "['".implode('\',\'', $option)."']";
-  }
-  else if (is_string($option) && $option[0] != "'")
-  {
-    return "'$option'";
-  }
-  return $option;
+    if (is_array($option)) {
+        return "['".implode('\',\'', $option)."']";
+    }
+    if (is_string($option) && "'" != $option[0]) {
+        return "'{$option}'";
+    }
+
+    return $option;
 }
 
 /**
-* converts the the PHP options array into a javscript array
+ * converts the the PHP options array into a javscript array.
  *
  * @param array
+ * @param mixed $options
+ *
  * @return string javascript arry equivalent
-*/
+ */
 function options_for_javascript($options)
 {
-  $opts = array();
-  foreach ($options as $key => $value)
-  {
-    if (is_array($value))
-    {
-     $value = options_for_javascript($value);
+    $opts = array();
+    foreach ($options as $key => $value) {
+        if (is_array($value)) {
+            $value = options_for_javascript($value);
+        }
+        $opts[] = $key.':'.boolean_for_javascript($value);
     }
-    $opts[] = $key.":".boolean_for_javascript($value);
-  }
-  sort($opts);
+    sort($opts);
 
-  return '{'.implode(', ', $opts).'}';
+    return '{'.implode(', ', $opts).'}';
 }
 
 /**
@@ -169,13 +171,15 @@ function options_for_javascript($options)
  * booleans need to be true or false (php would print 1 or nothing).
  *
  * @param bool (typically from option array)
+ * @param mixed $bool
+ *
  * @return string javascript boolean equivalent
  */
 function boolean_for_javascript($bool)
 {
-  if (is_bool($bool))
-  {
-    return ($bool===true ? 'true' : 'false');
-  }
-  return $bool;
+    if (is_bool($bool)) {
+        return true === $bool ? 'true' : 'false';
+    }
+
+    return $bool;
 }
diff --git a/lib/helper/NumberHelper.php b/lib/helper/NumberHelper.php
index 2f5482c90..8d49784c0 100644
--- a/lib/helper/NumberHelper.php
+++ b/lib/helper/NumberHelper.php
@@ -11,37 +11,36 @@
 /**
  * NumberHelper.
  *
- * @package    symfony
- * @subpackage helper
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
+ *
+ * @param mixed      $number
+ * @param mixed|null $culture
  */
-
 function format_number($number, $culture = null)
 {
-  if (null === $number)
-  {
-    return null;
-  }
+    if (null === $number) {
+        return null;
+    }
 
-  $numberFormat = new sfNumberFormat(_current_language($culture));
+    $numberFormat = new sfNumberFormat(_current_language($culture));
 
-  return $numberFormat->format($number);
+    return $numberFormat->format($number);
 }
 
 function format_currency($amount, $currency = null, $culture = null)
 {
-  if (null === $amount)
-  {
-    return null;
-  }
+    if (null === $amount) {
+        return null;
+    }
 
-  $numberFormat = new sfNumberFormat(_current_language($culture));
+    $numberFormat = new sfNumberFormat(_current_language($culture));
 
-  return $numberFormat->format($amount, 'c', $currency);
+    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 e20d0b9c2..e3d687eda 100644
--- a/lib/helper/PartialHelper.php
+++ b/lib/helper/PartialHelper.php
@@ -11,10 +11,12 @@
 /**
  * PartialHelper.
  *
- * @package    symfony
- * @subpackage helper
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
+ *
+ * @param mixed $name
+ * @param mixed $vars
  */
 
 /**
@@ -35,7 +37,7 @@
  */
 function include_component_slot($name, $vars = array())
 {
-  echo get_component_slot($name, $vars);
+    echo get_component_slot($name, $vars);
 }
 
 /**
@@ -47,51 +49,50 @@ function include_component_slot($name, $vars = array())
  *  echo get_component_slot('sidebar', array('myvar' => 12345));
  * </code>
  *
- * @param  string $name  slot name
- * @param  array  $vars  variables to be made accessible to the component
+ * @param string $name slot name
+ * @param array  $vars variables to be made accessible to the component
  *
  * @return string result of the component execution
+ *
  * @see    get_component_slot, include_partial, include_component
  */
 function get_component_slot($name, $vars = array())
 {
-  $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));
-  }
-
-  if ($componentSlot = $viewInstance->getComponentSlot($name))
-  {
-    return get_component($componentSlot[0], $componentSlot[1], $vars);
-  }
+    $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));
+    }
+
+    if ($componentSlot = $viewInstance->getComponentSlot($name)) {
+        return get_component($componentSlot[0], $componentSlot[1], $vars);
+    }
 }
 
 /**
  * Returns true if component slot exists.
  *
  * @param  string slot name
+ * @param mixed $name
+ *
  * @return bool true if component slot exists, false otherwise
  */
 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)) {
+        return false;
+    }
+
+    // check to see if component slot is empty (null)
+    if ($viewInstance->getComponentSlot($name)) {
+        return true;
+    }
 
-  // check to see if one is defined
-  if (!$viewInstance->hasComponentSlot($name))
-  {
     return false;
-  }
-  
-  // check to see if component slot is empty (null)
-  if ($viewInstance->getComponentSlot($name))
-  {
-    return true;
-  }
-
-  return false;
 }
 
 /**
@@ -104,15 +105,15 @@ function has_component_slot($name)
  *  include_component('mymodule', 'mypartial', array('myvar' => 12345));
  * </code>
  *
- * @param  string $moduleName     module name
- * @param  string $componentName  component name
- * @param  array  $vars           variables to be made accessible to the component
+ * @param string $moduleName    module name
+ * @param string $componentName component name
+ * @param array  $vars          variables to be made accessible to the component
  *
  * @see    get_component, include_partial, include_component_slot
  */
 function include_component($moduleName, $componentName, $vars = array())
 {
-  echo get_component($moduleName, $componentName, $vars);
+    echo get_component($moduleName, $componentName, $vars);
 }
 
 /**
@@ -124,38 +125,37 @@ function include_component($moduleName, $componentName, $vars = array())
  *  echo get_component('mymodule', 'mypartial', array('myvar' => 12345));
  * </code>
  *
- * @param  string $moduleName     module name
- * @param  string $componentName  component name
- * @param  array  $vars           variables to be made accessible to the component
+ * @param string $moduleName    module name
+ * @param string $componentName component name
+ * @param array  $vars          variables to be made accessible to the component
  *
  * @return string result of the component execution
+ *
  * @see    include_component
  */
 function get_component($moduleName, $componentName, $vars = array())
 {
-  $context = sfContext::getInstance();
-  $actionName = '_'.$componentName;
+    $context = sfContext::getInstance();
+    $actionName = '_'.$componentName;
 
-  require($context->getConfigCache()->checkConfig('modules/'.$moduleName.'/config/module.yml'));
+    require $context->getConfigCache()->checkConfig('modules/'.$moduleName.'/config/module.yml');
 
-  $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);
+    $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);
 
-  if ($retval = $view->getCache())
-  {
-    return $retval;
-  }
+    if ($retval = $view->getCache()) {
+        return $retval;
+    }
 
-  $allVars = _call_component($moduleName, $componentName, $vars);
+    $allVars = _call_component($moduleName, $componentName, $vars);
 
-  if (null !== $allVars)
-  {
-    // render
-    $view->getAttributeHolder()->add($allVars);
+    if (null !== $allVars) {
+        // render
+        $view->getAttributeHolder()->add($allVars);
 
-    return $view->render();
-  }
+        return $view->render();
+    }
 }
 
 /**
@@ -172,92 +172,87 @@ function get_component($moduleName, $componentName, $vars = array())
  *  include_partial('mypartial', array('myvar' => 12345));
  * </code>
  *
- * @param  string $templateName  partial name
- * @param  array  $vars          variables to be made accessible to the partial
+ * @param string $templateName partial name
+ * @param array  $vars         variables to be made accessible to the partial
  *
  * @see    get_partial, include_component
  */
 function include_partial($templateName, $vars = array())
 {
-  echo get_partial($templateName, $vars);
+    echo get_partial($templateName, $vars);
 }
 
 /**
  * Evaluates and returns a partial.
- * The syntax is similar to the one of include_partial
+ * The syntax is similar to the one of include_partial.
  *
  * <b>Example:</b>
  * <code>
  *  echo get_partial('mypartial', array('myvar' => 12345));
  * </code>
  *
- * @param  string $templateName  partial name
- * @param  array  $vars          variables to be made accessible to the partial
+ * @param string $templateName partial name
+ * @param array  $vars         variables to be made accessible to the partial
  *
  * @return string result of the partial execution
+ *
  * @see    include_partial
  */
 function get_partial($templateName, $vars = array())
 {
-  $context = sfContext::getInstance();
-
-  // partial is in another module?
-  if (false !== $sep = strpos($templateName, '/'))
-  {
-    $moduleName   = substr($templateName, 0, $sep);
-    $templateName = substr($templateName, $sep + 1);
-  }
-  else
-  {
-    $moduleName = $context->getActionStack()->getLastEntry()->getModuleName();
-  }
-  $actionName = '_'.$templateName;
-
-  $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);
-
-  return $view->render();
+    $context = sfContext::getInstance();
+
+    // partial is in another module?
+    if (false !== $sep = strpos($templateName, '/')) {
+        $moduleName = substr($templateName, 0, $sep);
+        $templateName = substr($templateName, $sep + 1);
+    } else {
+        $moduleName = $context->getActionStack()->getLastEntry()->getModuleName();
+    }
+    $actionName = '_'.$templateName;
+
+    $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);
+
+    return $view->render();
 }
 
 /**
  * Begins the capturing of the slot.
  *
- * @param  string $name   slot name
- * @param  string $value  The slot content
+ * @param string $name  slot name
+ * @param string $value The slot content
  *
  * @see    end_slot
  */
 function slot($name, $value = null)
 {
-  $context = sfContext::getInstance();
-  $response = $context->getResponse();
+    $context = sfContext::getInstance();
+    $response = $context->getResponse();
 
-  $slot_names = sfConfig::get('symfony.view.slot_names', array());
-  if (in_array($name, $slot_names))
-  {
-    throw new sfCacheException(sprintf('A slot named "%s" is already started.', $name));
-  }
+    $slot_names = sfConfig::get('symfony.view.slot_names', array());
+    if (in_array($name, $slot_names)) {
+        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', array(sprintf('Set slot "%s"', $name))));
+    }
 
-  if (null !== $value)
-  {
-    $response->setSlot($name, $value);
+    if (null !== $value) {
+        $response->setSlot($name, $value);
 
-    return;
-  }
+        return;
+    }
 
-  $slot_names[] = $name;
+    $slot_names[] = $name;
 
-  $response->setSlot($name, '');
-  sfConfig::set('symfony.view.slot_names', $slot_names);
+    $response->setSlot($name, '');
+    sfConfig::set('symfony.view.slot_names', $slot_names);
 
-  ob_start();
-  ob_implicit_flush(0);
+    ob_start();
+    ob_implicit_flush(0);
 }
 
 /**
@@ -267,32 +262,32 @@ function slot($name, $value = null)
  */
 function end_slot()
 {
-  $content = ob_get_clean();
+    $content = ob_get_clean();
 
-  $response = sfContext::getInstance()->getResponse();
-  $slot_names = sfConfig::get('symfony.view.slot_names', array());
-  if (!$slot_names)
-  {
-    throw new sfCacheException('No slot started.');
-  }
+    $response = sfContext::getInstance()->getResponse();
+    $slot_names = sfConfig::get('symfony.view.slot_names', array());
+    if (!$slot_names) {
+        throw new sfCacheException('No slot started.');
+    }
 
-  $name = array_pop($slot_names);
+    $name = array_pop($slot_names);
 
-  $response->setSlot($name, $content);
-  sfConfig::set('symfony.view.slot_names', $slot_names);
+    $response->setSlot($name, $content);
+    sfConfig::set('symfony.view.slot_names', $slot_names);
 }
 
 /**
  * Returns true if the slot exists.
  *
- * @param  string $name  slot name
+ * @param string $name slot name
  *
  * @return bool true, if the slot exists
+ *
  * @see    get_slot, include_slot
  */
 function has_slot($name)
 {
-  return array_key_exists($name, sfContext::getInstance()->getResponse()->getSlots());
+    return array_key_exists($name, sfContext::getInstance()->getResponse()->getSlots());
 }
 
 /**
@@ -303,14 +298,14 @@ function has_slot($name)
  *  include_slot('navigation');
  * </code>
  *
- * @param  string $name     slot name
- * @param  string $default  default content to return if slot is unexistent
+ * @param string $name    slot name
+ * @param string $default default content to return if slot is unexistent
  *
  * @see    has_slot, get_slot
  */
 function include_slot($name, $default = '')
 {
-  return ($v = get_slot($name, $default)) ? print $v : false;
+    return ($v = get_slot($name, $default)) ? print $v : false;
 }
 
 /**
@@ -321,76 +316,70 @@ function include_slot($name, $default = '')
  *  echo get_slot('navigation');
  * </code>
  *
- * @param  string $name     slot name
- * @param  string $default  default content to return if slot is unexistent
+ * @param string $name    slot name
+ * @param string $default default content to return if slot is unexistent
  *
  * @return string content of the slot
+ *
  * @see    has_slot, include_slot
  */
 function get_slot($name, $default = '')
 {
-  $context = sfContext::getInstance();
-  $slots = $context->getResponse()->getSlots();
+    $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', array(sprintf('Get slot "%s"', $name))));
+    }
 
-  return isset($slots[$name]) ? $slots[$name] : $default;
+    return isset($slots[$name]) ? $slots[$name] : $default;
 }
 
 function _call_component($moduleName, $componentName, $vars)
 {
-  $context = sfContext::getInstance();
+    $context = sfContext::getInstance();
 
-  $controller = $context->getController();
+    $controller = $context->getController();
 
-  if (!$controller->componentExists($moduleName, $componentName))
-  {
-    // cannot find component
-    throw new sfConfigurationException(sprintf('The component does not exist: "%s", "%s".', $moduleName, $componentName));
-  }
+    if (!$controller->componentExists($moduleName, $componentName)) {
+        // cannot find component
+        throw new sfConfigurationException(sprintf('The component does not exist: "%s", "%s".', $moduleName, $componentName));
+    }
 
-  // create an instance of the action
-  $componentInstance = $controller->getComponent($moduleName, $componentName);
+    // create an instance of the action
+    $componentInstance = $controller->getComponent($moduleName, $componentName);
 
-  // load component's module config file
-  require($context->getConfigCache()->checkConfig('modules/'.$moduleName.'/config/module.yml'));
+    // load component's module config file
+    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);
+    // 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);
 
-  // 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));
-    }
+    // 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));
+        }
 
-    $componentToRun = 'execute';
-  }
+        $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', array(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));
-  }
+    // run component
+    if (sfConfig::get('sf_debug') && sfConfig::get('sf_logging_enabled')) {
+        $timer = sfTimerManager::getTimer(sprintf('Component "%s/%s"', $moduleName, $componentName));
+    }
 
-  $retval = $componentInstance->$componentToRun($context->getRequest());
+    $retval = $componentInstance->{$componentToRun}($context->getRequest());
 
-  if (sfConfig::get('sf_debug') && sfConfig::get('sf_logging_enabled'))
-  {
-    $timer->addTime();
-  }
+    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 848895109..0e0769ac6 100644
--- a/lib/helper/TagHelper.php
+++ b/lib/helper/TagHelper.php
@@ -12,51 +12,53 @@
 /**
  * TagHelper defines some base helpers to construct html tags.
  *
- * @package    symfony
- * @subpackage helper
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     David Heinemeier Hansson
+ *
  * @version    SVN: $Id$
+ *
+ * @param mixed $name
+ * @param mixed $options
+ * @param mixed $open
  */
 
 /**
  * Constructs an html tag.
  *
- * @param  string $name     tag name
- * @param  array  $options  tag options
- * @param  bool   $open     true to leave tag open
+ * @param string $name    tag name
+ * @param array  $options tag options
+ * @param bool   $open    true to leave tag open
+ *
  * @return string
  */
 function tag($name, $options = array(), $open = false)
 {
-  if (!$name)
-  {
-    return '';
-  }
+    if (!$name) {
+        return '';
+    }
 
-  return '<'.$name._tag_options($options).($open ? '>' : ' />');
+    return '<'.$name._tag_options($options).($open ? '>' : ' />');
 }
 
 function content_tag($name, $content = '', $options = array())
 {
-  if (!$name)
-  {
-    return '';
-  }
+    if (!$name) {
+        return '';
+    }
 
-  return '<'.$name._tag_options($options).'>'.$content.'</'.$name.'>';
+    return '<'.$name._tag_options($options).'>'.$content.'</'.$name.'>';
 }
 
 function cdata_section($content)
 {
-  return "<![CDATA[$content]]>";
+    return "<![CDATA[{$content}]]>";
 }
 
 /**
  * Wraps the content in conditional comments.
  *
- * @param  string $condition
- * @param  string $content
+ * @param string $condition
+ * @param string $content
  *
  * @return string
  *
@@ -64,73 +66,72 @@ function cdata_section($content)
  */
 function comment_as_conditional($condition, $content)
 {
-  return "<!--[if $condition]>$content<![endif]-->";
+    return "<!--[if {$condition}]>{$content}<![endif]-->";
 }
 
 /**
  * Escape carrier returns and single and double quotes for Javascript segments.
+ *
+ * @param mixed $javascript
  */
 function escape_javascript($javascript = '')
 {
-  $javascript = preg_replace('/\r\n|\n|\r/', "\\n", $javascript);
-  $javascript = preg_replace('/(["\'])/', '\\\\\1', $javascript);
+    $javascript = preg_replace('/\r\n|\n|\r/', '\\n', $javascript);
 
-  return $javascript;
+    return preg_replace('/(["\'])/', '\\\\\1', $javascript);
 }
 
 /**
  * Escapes an HTML string.
  *
- * @param  string $html HTML string to escape
+ * @param string $html HTML string to escape
+ *
  * @return string escaped string
  */
 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')));
 }
 
 /**
  * Fixes double escaped strings.
  *
- * @param  string $escaped HTML string to fix
+ * @param string $escaped HTML string to fix
+ *
  * @return string fixed escaped string
  */
 function fix_double_escape($escaped)
 {
-  return preg_replace('/&amp;([a-z]+|(#\d+)|(#x[\da-f]+));/i', '&$1;', $escaped);
+    return preg_replace('/&amp;([a-z]+|(#\d+)|(#x[\da-f]+));/i', '&$1;', $escaped);
 }
 
 function _tag_options($options = array())
 {
-  $options = _parse_attributes($options);
+    $options = _parse_attributes($options);
 
-  $html = '';
-  foreach ($options as $key => $value)
-  {
-    $html .= ' '.$key.'="'.escape_once($value).'"';
-  }
+    $html = '';
+    foreach ($options as $key => $value) {
+        $html .= ' '.$key.'="'.escape_once($value).'"';
+    }
 
-  return $html;
+    return $html;
 }
 
 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)
 {
-  if (array_key_exists($name, $options))
-  {
-    $value = $options[$name];
-    unset($options[$name]);
-  }
-  else
-  {
-    $value = $default;
-  }
-
-  return $value;
+    if (array_key_exists($name, $options)) {
+        $value = $options[$name];
+        unset($options[$name]);
+    } else {
+        $value = $default;
+    }
+
+    return $value;
 }
 
 /**
@@ -150,46 +151,41 @@ function _get_option(&$options, $name, $default = null)
  *  echo get_id_from_name('status[]', '1');
  * </code>
  *
- * @param  string $name   field name
- * @param  string $value  field value
+ * @param string $name  field name
+ * @param string $value field value
  *
- * @return string <select> tag populated with all the languages in the world.
+ * @return string <select> tag populated with all the languages in the world
  */
 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((($value != null) ? '_'.$value : ''), '_', '_', ''), $name);
-  }
+    // 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);
+    }
 
-  return $name;
+    return $name;
 }
 
 /**
- * Converts specific <i>$options</i> to their correct HTML format
+ * Converts specific <i>$options</i> to their correct HTML format.
+ *
+ * @param array $options
  *
- * @param  array $options
  * @return array returns properly formatted options
  */
 function _convert_options($options)
 {
-  $options = _parse_attributes($options);
-
-  foreach (array('disabled', 'readonly', 'multiple') as $attribute)
-  {
-    if (array_key_exists($attribute, $options))
-    {
-      if ($options[$attribute])
-      {
-        $options[$attribute] = $attribute;
-      }
-      else
-      {
-        unset($options[$attribute]);
-      }
+    $options = _parse_attributes($options);
+
+    foreach (array('disabled', 'readonly', 'multiple') as $attribute) {
+        if (array_key_exists($attribute, $options)) {
+            if ($options[$attribute]) {
+                $options[$attribute] = $attribute;
+            } else {
+                unset($options[$attribute]);
+            }
+        }
     }
-  }
 
-  return $options;
+    return $options;
 }
diff --git a/lib/helper/TextHelper.php b/lib/helper/TextHelper.php
index 5109b7798..6ea35986e 100644
--- a/lib/helper/TextHelper.php
+++ b/lib/helper/TextHelper.php
@@ -12,80 +12,76 @@
 /**
  * TextHelper.
  *
- * @package    symfony
- * @subpackage helper
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     David Heinemeier Hansson
+ *
  * @version    SVN: $Id$
+ *
+ * @param mixed      $text
+ * @param mixed      $length
+ * @param mixed      $truncate_string
+ * @param mixed      $truncate_lastspace
+ * @param mixed|null $truncate_pattern
+ * @param mixed|null $length_max
  */
 
 /**
  * Truncates +text+ to the length of +length+ and replaces the last three characters with the +truncate_string+
  * if the +text+ is longer than +length+.
  *
- * @param string $text The original text
- * @param integer $length The length for truncate
- * @param string $truncate_string The string to add after truncated text
+ * @param string $text               The original text
+ * @param int    $length             The length for truncate
+ * @param string $truncate_string    The string to add after truncated text
  * @param string $truncate_lastspace Remove or not last space after truncate
- * @param string $truncate_pattern Pattern
- * @param integer $length_max Used only with truncate_patter
+ * @param string $truncate_pattern   Pattern
+ * @param int    $length_max         Used only with truncate_patter
  *
  * @return string
  */
 function truncate_text($text, $length = 30, $truncate_string = '...', $truncate_lastspace = false, $truncate_pattern = null, $length_max = null)
 {
-  if ('' == $text)
-  {
-    return '';
-  }
-
-  $mbstring = extension_loaded('mbstring');
-  if ($mbstring)
-  {
-    $old_encoding = mb_internal_encoding();
-    @mb_internal_encoding(mb_detect_encoding($text));
-  }
-  $strlen = $mbstring ? 'mb_strlen' : 'strlen';
-  $substr = $mbstring ? 'mb_substr' : 'substr';
-
-  if ($strlen($text) > $length)
-  {
-    if ($truncate_pattern)
-    {
-      $length_min = null !== $length_max && (0 == $length_max || $length_max > $length) ? $length : null;
-
-      preg_match($truncate_pattern, $text, $matches, PREG_OFFSET_CAPTURE, $length_min);
-
-      if ($matches)
-      {
-        if ($length_min)
-        {
-          $truncate_string = $matches[0][0].$truncate_string;
-          $length = $matches[0][1] + $strlen($truncate_string);
+    if ('' == $text) {
+        return '';
+    }
+
+    $mbstring = extension_loaded('mbstring');
+    if ($mbstring) {
+        $old_encoding = mb_internal_encoding();
+        @mb_internal_encoding(mb_detect_encoding($text));
+    }
+    $strlen = $mbstring ? 'mb_strlen' : 'strlen';
+    $substr = $mbstring ? 'mb_substr' : 'substr';
+
+    if ($strlen($text) > $length) {
+        if ($truncate_pattern) {
+            $length_min = null !== $length_max && (0 == $length_max || $length_max > $length) ? $length : null;
+
+            preg_match($truncate_pattern, $text, $matches, PREG_OFFSET_CAPTURE, $length_min);
+
+            if ($matches) {
+                if ($length_min) {
+                    $truncate_string = $matches[0][0].$truncate_string;
+                    $length = $matches[0][1] + $strlen($truncate_string);
+                } else {
+                    $match = end($matches);
+                    $truncate_string = $match[0].$truncate_string;
+                    $length = $match[1] + $strlen($truncate_string);
+                }
+            }
         }
-        else
-        {
-          $match = end($matches);
-          $truncate_string = $match[0].$truncate_string;
-          $length = $match[1] + $strlen($truncate_string);
+
+        $truncate_text = $substr($text, 0, $length - $strlen($truncate_string));
+        if ($truncate_lastspace) {
+            $truncate_text = preg_replace('/\s+?(\S+)?$/', '', $truncate_text);
         }
-      }
+        $text = $truncate_text.$truncate_string;
     }
 
-    $truncate_text = $substr($text, 0, $length - $strlen($truncate_string));
-    if ($truncate_lastspace)
-    {
-      $truncate_text = preg_replace('/\s+?(\S+)?$/', '', $truncate_text);
+    if ($mbstring) {
+        @mb_internal_encoding($old_encoding);
     }
-    $text = $truncate_text.$truncate_string;
-  }
-
-  if ($mbstring)
-  {
-    @mb_internal_encoding($old_encoding);
-  }
 
-  return $text;
+    return $text;
 }
 
 /**
@@ -94,39 +90,33 @@ function truncate_text($text, $length = 30, $truncate_string = '...', $truncate_
  * passing +highlighter+ as single-quoted string with \1 where the phrase is supposed to be inserted.
  * N.B.: The +phrase+ is sanitized to include only letters, digits, and spaces before use.
  *
- * @param string $text subject input to preg_replace.
- * @param mixed $phrase string, array or sfOutputEscaperArrayDecorator instance of words to highlight
- * @param string $highlighter regex replacement input to preg_replace.
+ * @param string $text        subject input to preg_replace
+ * @param mixed  $phrase      string, array or sfOutputEscaperArrayDecorator instance of words to highlight
+ * @param string $highlighter regex replacement input to preg_replace
  *
  * @return string
  */
 function highlight_text($text, $phrase, $highlighter = '<strong class="highlight">\\1</strong>')
 {
-  if (empty($text))
-  {
-    return '';
-  }
+    if (empty($text)) {
+        return '';
+    }
 
-  if (empty($phrase))
-  {
-    return $text;
-  }
-
-  if (is_array($phrase) or ($phrase instanceof sfOutputEscaperArrayDecorator))
-  {
-    foreach ($phrase as $word)
-    {
-      $pattern[] = '/('.preg_quote($word, '/').')/i';
-      $replacement[] = $highlighter;
+    if (empty($phrase)) {
+        return $text;
     }
-  }
-  else
-  {
-    $pattern = '/('.preg_quote($phrase, '/').')/i';
-    $replacement = $highlighter;
-  }
-
-  return preg_replace($pattern, $replacement, $text);
+
+    if (is_array($phrase) or ($phrase instanceof sfOutputEscaperArrayDecorator)) {
+        foreach ($phrase as $word) {
+            $pattern[] = '/('.preg_quote($word, '/').')/i';
+            $replacement[] = $highlighter;
+        }
+    } else {
+        $pattern = '/('.preg_quote($phrase, '/').')/i';
+        $replacement = $highlighter;
+    }
+
+    return preg_replace($pattern, $replacement, $text);
 }
 
 /**
@@ -135,83 +125,90 @@ function highlight_text($text, $phrase, $highlighter = '<strong class="highlight
  *   excerpt("hello my world", "my", 3) => "...lo my wo..."
  * If +excerpt_space+ is true the text will only be truncated on whitespace, never inbetween words.
  * This might return a smaller radius than specified.
- *   excerpt("hello my world", "my", 3, "...", true) => "... my ..."
+ *   excerpt("hello my world", "my", 3, "...", true) => "... my ...".
+ *
+ * @param mixed $text
+ * @param mixed $phrase
+ * @param mixed $radius
+ * @param mixed $excerpt_string
+ * @param mixed $excerpt_space
  */
 function excerpt_text($text, $phrase, $radius = 100, $excerpt_string = '...', $excerpt_space = false)
 {
-  if ($text == '' || $phrase == '')
-  {
-    return '';
-  }
-
-  $mbstring = extension_loaded('mbstring');
-  if($mbstring)
-  {
-    $old_encoding = mb_internal_encoding();
-    @mb_internal_encoding(mb_detect_encoding($text));
-  }
-  $strlen = ($mbstring) ? 'mb_strlen' : 'strlen';
-  $strpos = ($mbstring) ? 'mb_strpos' : 'strpos';
-  $strtolower = ($mbstring) ? 'mb_strtolower' : 'strtolower';
-  $substr = ($mbstring) ? 'mb_substr' : 'substr';
-
-  $found_pos = $strpos($strtolower($text), $strtolower($phrase));
-  $return_string = '';
-  if ($found_pos !== false)
-  {
-    $start_pos = max($found_pos - $radius, 0);
-    $end_pos = min($found_pos + $strlen($phrase) + $radius, $strlen($text));
-    $excerpt = $substr($text, $start_pos, $end_pos - $start_pos);
-    $prefix = ($start_pos > 0) ? $excerpt_string : '';
-    $postfix = $end_pos < $strlen($text) ? $excerpt_string : '';
-
-    if ($excerpt_space)
-    {
-      // only cut off at ends where $exceprt_string is added
-      if($prefix)
-      {
-        $excerpt = preg_replace('/^(\S+)?\s+?/', ' ', $excerpt);
-      }
-      if($postfix)
-      {
-        $excerpt = preg_replace('/\s+?(\S+)?$/', ' ', $excerpt);
-      }
+    if ('' == $text || '' == $phrase) {
+        return '';
     }
 
-    $return_string = $prefix.$excerpt.$postfix;
-  }
+    $mbstring = extension_loaded('mbstring');
+    if ($mbstring) {
+        $old_encoding = mb_internal_encoding();
+        @mb_internal_encoding(mb_detect_encoding($text));
+    }
+    $strlen = ($mbstring) ? 'mb_strlen' : 'strlen';
+    $strpos = ($mbstring) ? 'mb_strpos' : 'strpos';
+    $strtolower = ($mbstring) ? 'mb_strtolower' : 'strtolower';
+    $substr = ($mbstring) ? 'mb_substr' : 'substr';
+
+    $found_pos = $strpos($strtolower($text), $strtolower($phrase));
+    $return_string = '';
+    if (false !== $found_pos) {
+        $start_pos = max($found_pos - $radius, 0);
+        $end_pos = min($found_pos + $strlen($phrase) + $radius, $strlen($text));
+        $excerpt = $substr($text, $start_pos, $end_pos - $start_pos);
+        $prefix = ($start_pos > 0) ? $excerpt_string : '';
+        $postfix = $end_pos < $strlen($text) ? $excerpt_string : '';
+
+        if ($excerpt_space) {
+            // only cut off at ends where $exceprt_string is added
+            if ($prefix) {
+                $excerpt = preg_replace('/^(\S+)?\s+?/', ' ', $excerpt);
+            }
+            if ($postfix) {
+                $excerpt = preg_replace('/\s+?(\S+)?$/', ' ', $excerpt);
+            }
+        }
 
-  if($mbstring)
-  {
-   @mb_internal_encoding($old_encoding);
-  }
-  return $return_string;
+        $return_string = $prefix.$excerpt.$postfix;
+    }
+
+    if ($mbstring) {
+        @mb_internal_encoding($old_encoding);
+    }
+
+    return $return_string;
 }
 
 /**
  * Word wrap long lines to line_width.
+ *
+ * @param mixed $text
+ * @param mixed $line_width
  */
 function wrap_text($text, $line_width = 80)
 {
-  return preg_replace('/(.{1,'.$line_width.'})(\s+|$)/s', "\\1\n", preg_replace("/\n/", "\n\n", $text));
+    return preg_replace('/(.{1,'.$line_width.'})(\s+|$)/s', "\\1\n", preg_replace("/\n/", "\n\n", $text));
 }
 
 /**
  * Returns +text+ transformed into html using very simple formatting rules
  * Surrounds paragraphs with <tt>&lt;p&gt;</tt> tags, and converts line breaks into <tt>&lt;br /&gt;</tt>
  * 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
+ * considered a linebreak, three or more consecutive newlines are turned into two newlines.
+ *
+ * @param mixed $text
+ * @param mixed $options
  */
 function simple_format_text($text, $options = array())
 {
-  $css = (isset($options['class'])) ? ' class="'.$options['class'].'"' : '';
+    $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, array("/(\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);
-  return '<p'.$css.'>'.$text.'</p>'; // wrap the first and last line in paragraphs before we're done
+    // turn single newline into <br/>
+    $text = str_replace("\n", "\n<br />", $text);
+
+    return '<p'.$css.'>'.$text.'</p>'; // wrap the first and last line in paragraphs before we're done
 }
 
 /**
@@ -222,34 +219,39 @@ function simple_format_text($text, $options = array())
  *   auto_link("Go to http://www.symfony-project.com and say hello to fabien.potencier@example.com") =>
  *     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>
+ *
+ * @param mixed $text
+ * @param mixed $link
+ * @param mixed $href_options
+ * @param mixed $truncate
+ * @param mixed $truncate_len
+ * @param mixed $pad
  */
 function auto_link_text($text, $link = 'all', $href_options = array(), $truncate = false, $truncate_len = 35, $pad = '...')
 {
-  if ($link == 'all')
-  {
-    return _auto_link_urls(_auto_link_email_addresses($text), $href_options, $truncate, $truncate_len, $pad);
-  }
-  else if ($link == 'email_addresses')
-  {
-    return _auto_link_email_addresses($text);
-  }
-  else if ($link == 'urls')
-  {
-    return _auto_link_urls($text, $href_options, $truncate, $truncate_len, $pad);
-  }
+    if ('all' == $link) {
+        return _auto_link_urls(_auto_link_email_addresses($text), $href_options, $truncate, $truncate_len, $pad);
+    }
+    if ('email_addresses' == $link) {
+        return _auto_link_email_addresses($text);
+    }
+    if ('urls' == $link) {
+        return _auto_link_urls($text, $href_options, $truncate, $truncate_len, $pad);
+    }
 }
 
 /**
  * Turns all links into words, like "<a href="something">else</a>" to "else".
+ *
+ * @param mixed $text
  */
 function strip_links_text($text)
 {
-  return preg_replace('/<a[^>]*>(.*?)<\/a>/s', '\\1', $text);
+    return preg_replace('/<a[^>]*>(.*?)<\/a>/s', '\\1', $text);
 }
 
-if (!defined('SF_AUTO_LINK_RE'))
-{
-  define('SF_AUTO_LINK_RE', '~
+if (!defined('SF_AUTO_LINK_RE')) {
+    define('SF_AUTO_LINK_RE', '~
     (                       # leading text
       <\w+.*?>|             #   leading HTML tag, or
       [^=!:\'"/]|           #   leading punctuation, or
@@ -273,44 +275,49 @@ function strip_links_text($text)
 
 /**
  * Turns all urls into clickable links.
+ *
+ * @param mixed $text
+ * @param mixed $href_options
+ * @param mixed $truncate
+ * @param mixed $truncate_len
+ * @param mixed $pad
  */
 function _auto_link_urls($text, $href_options = array(), $truncate = false, $truncate_len = 40, $pad = '...')
 {
-  $href_options = _tag_options($href_options);
+    $href_options = _tag_options($href_options);
 
-  $callback_function = function($matches) use ($href_options, $truncate, $truncate_len, $pad) {
-      if (preg_match("/<a\s/i", $matches[1]))
-      {
-          return $matches[0];
-      }
+    $callback_function = function ($matches) use ($href_options, $truncate, $truncate_len, $pad) {
+        if (preg_match('/<a\\s/i', $matches[1])) {
+            return $matches[0];
+        }
 
-      $text = $matches[2] . $matches[3];
-      $href = ($matches[2] == "www." ? "http://www." : $matches[2]) . $matches[3];
+        $text = $matches[2].$matches[3];
+        $href = ('www.' == $matches[2] ? 'http://www.' : $matches[2]).$matches[3];
 
-      if ($truncate && strlen($text) > $truncate_len)
-      {
-          $text = substr($text, 0, $truncate_len).$pad;
-      }
+        if ($truncate && strlen($text) > $truncate_len) {
+            $text = substr($text, 0, $truncate_len).$pad;
+        }
 
-      return sprintf('%s<a href="%s"%s>%s</a>%s', $matches[1], $href, $href_options, $text, $matches[4]);
-  };
+        return sprintf('%s<a href="%s"%s>%s</a>%s', $matches[1], $href, $href_options, $text, $matches[4]);
+    };
 
-  return preg_replace_callback(
-    SF_AUTO_LINK_RE,
-    $callback_function,
-    $text
+    return preg_replace_callback(
+        SF_AUTO_LINK_RE,
+        $callback_function,
+        $text
     );
 }
 
 /**
  * Turns all email addresses into clickable links.
+ *
+ * @param mixed $text
  */
 function _auto_link_email_addresses($text)
 {
-  // Taken from http://snippets.dzone.com/posts/show/6156
-  return preg_replace("#(^|[\n ])([a-z0-9&\-_\.]+?)@([\w\-]+\.([\w\-\.]+\.)*[\w]+)#i", "\\1<a href=\"mailto:\\2@\\3\">\\2@\\3</a>", $text);
-
-  // Removed since it destroys already linked emails
-  // Example:   <a href="mailto:me@example.com">bar</a> gets <a href="mailto:me@example.com">bar</a> gets <a href="mailto:<a href="mailto:me@example.com">bar</a>
-  //return preg_replace('/([\w\.!#\$%\-+.]+@[A-Za-z0-9\-]+(\.[A-Za-z0-9\-]+)+)/', '<a href="mailto:\\1">\\1</a>', $text);
+    // Taken from http://snippets.dzone.com/posts/show/6156
+    return preg_replace("#(^|[\n ])([a-z0-9&\\-_\\.]+?)@([\\w\\-]+\\.([\\w\\-\\.]+\\.)*[\\w]+)#i", '\\1<a href="mailto:\\2@\\3">\\2@\\3</a>', $text);
+    // Removed since it destroys already linked emails
+    // Example:   <a href="mailto:me@example.com">bar</a> gets <a href="mailto:me@example.com">bar</a> gets <a href="mailto:<a href="mailto:me@example.com">bar</a>
+    // return preg_replace('/([\w\.!#\$%\-+.]+@[A-Za-z0-9\-]+(\.[A-Za-z0-9\-]+)+)/', '<a href="mailto:\\1">\\1</a>', $text);
 }
diff --git a/lib/helper/UrlHelper.php b/lib/helper/UrlHelper.php
index de61246d2..c30195b29 100644
--- a/lib/helper/UrlHelper.php
+++ b/lib/helper/UrlHelper.php
@@ -11,10 +11,14 @@
 /**
  * UrlHelper.
  *
- * @package    symfony
- * @subpackage helper
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
+ *
+ * @param mixed $name
+ * @param mixed $routeName
+ * @param mixed $params
+ * @param mixed $options
  */
 
 /**
@@ -22,82 +26,84 @@
  */
 function link_to2($name, $routeName, $params, $options = array())
 {
-  $params = array_merge(array('sf_route' => $routeName), is_object($params) ? array('sf_subject' => $params) : $params);
+    $params = array_merge(array('sf_route' => $routeName), is_object($params) ? array('sf_subject' => $params) : $params);
 
-  return link_to1($name, $params, $options);
+    return link_to1($name, $params, $options);
 }
 
 /**
  * @ignore
+ *
+ * @param mixed $name
+ * @param mixed $internal_uri
+ * @param mixed $options
  */
 function link_to1($name, $internal_uri, $options = array())
 {
-  $html_options = _parse_attributes($options);
-
-  $html_options = _convert_options_to_javascript($html_options);
-
-  $absolute = false;
-  if (isset($html_options['absolute_url']))
-  {
-    $html_options['absolute'] = $html_options['absolute_url'];
-    unset($html_options['absolute_url']);
-  }
-  if (isset($html_options['absolute']))
-  {
-    $absolute = (boolean) $html_options['absolute'];
-    unset($html_options['absolute']);
-  }
-
-  $html_options['href'] = url_for($internal_uri, $absolute);
-
-  if (isset($html_options['query_string']))
-  {
-    $html_options['href'] .= '?'.$html_options['query_string'];
-    unset($html_options['query_string']);
-  }
-
-  if (isset($html_options['anchor']))
-  {
-    $html_options['href'] .= '#'.$html_options['anchor'];
-    unset($html_options['anchor']);
-  }
-
-  if (is_object($name))
-  {
-    if (method_exists($name, '__toString'))
-    {
-      $name = $name->__toString();
+    $html_options = _parse_attributes($options);
+
+    $html_options = _convert_options_to_javascript($html_options);
+
+    $absolute = false;
+    if (isset($html_options['absolute_url'])) {
+        $html_options['absolute'] = $html_options['absolute_url'];
+        unset($html_options['absolute_url']);
+    }
+    if (isset($html_options['absolute'])) {
+        $absolute = (bool) $html_options['absolute'];
+        unset($html_options['absolute']);
+    }
+
+    $html_options['href'] = url_for($internal_uri, $absolute);
+
+    if (isset($html_options['query_string'])) {
+        $html_options['href'] .= '?'.$html_options['query_string'];
+        unset($html_options['query_string']);
+    }
+
+    if (isset($html_options['anchor'])) {
+        $html_options['href'] .= '#'.$html_options['anchor'];
+        unset($html_options['anchor']);
     }
-    else
-    {
-      throw new sfException(sprintf('Object of class "%s" cannot be converted to string (Please create a __toString() method).', get_class($name)));
+
+    if (is_object($name)) {
+        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)));
+        }
     }
-  }
 
-  if ('' === $name)
-  {
-    $name = $html_options['href'];
-  }
+    if ('' === $name) {
+        $name = $html_options['href'];
+    }
 
-  return content_tag('a', $name, $html_options);
+    return content_tag('a', $name, $html_options);
 }
 
 /**
  * @ignore
+ *
+ * @param mixed $routeName
+ * @param mixed $params
+ * @param mixed $absolute
  */
 function url_for2($routeName, $params = array(), $absolute = false)
 {
-  $params = array_merge(array('sf_route' => $routeName), is_object($params) ? array('sf_subject' => $params) : $params);
+    $params = array_merge(array('sf_route' => $routeName), is_object($params) ? array('sf_subject' => $params) : $params);
 
-  return url_for1($params, $absolute);
+    return url_for1($params, $absolute);
 }
 
 /**
  * @ignore
+ *
+ * @param mixed $internal_uri
+ * @param mixed $absolute
  */
 function url_for1($internal_uri, $absolute = false)
 {
-  return sfContext::getInstance()->getController()->genUrl($internal_uri, $absolute);
+    return sfContext::getInstance()->getController()->genUrl($internal_uri, $absolute);
 }
 
 /**
@@ -114,22 +120,20 @@ function url_for1($internal_uri, $absolute = false)
  *    => http://myapp.example.com/path/to/my/action
  * </code>
  *
- * @param  string $internal_uri  'module/action' or '@rule' of the action
- * @param  bool   $absolute      return absolute path?
+ * @param string $internal_uri 'module/action' or '@rule' of the action
+ * @param bool   $absolute     return absolute path?
+ *
  * @return string routed URL
  */
 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], '/'))
-  {
-    return call_user_func_array('url_for1', $arguments);
-  }
-  else
-  {
+    // for BC with 1.1
+    $arguments = func_get_args();
+    if (is_array($arguments[0]) || '@' == substr($arguments[0], 0, 1) || false !== strpos($arguments[0], '/')) {
+        return call_user_func_array('url_for1', $arguments);
+    }
+
     return call_user_func_array('url_for2', $arguments);
-  }
 }
 
 /**
@@ -165,54 +169,52 @@ function url_for()
  *    => <a href="http://myapp.example.com/path/to/my/action" id="myid" onclick="return confirm('Are you sure?');">Delete this page</a>
  * </code>
  *
- * @param  string $name          name of the link, i.e. string to appear between the <a> tags
- * @param  string $internal_uri  'module/action' or '@rule' of the action
- * @param  array  $options       additional HTML compliant <a> tag parameters
+ * @param string $name         name of the link, i.e. string to appear between the <a> tags
+ * @param string $internal_uri 'module/action' or '@rule' of the action
+ * @param array  $options      additional HTML compliant <a> tag parameters
+ *
  * @return string XHTML compliant <a href> tag
+ *
  * @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], '/'))
-  {
-    return call_user_func_array('link_to1', $arguments);
-  }
-  else
-  {
-    if (!array_key_exists(2, $arguments))
-    {
-      $arguments[2] = array();
+    // 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], '/')) {
+        return call_user_func_array('link_to1', $arguments);
+    }
+
+    if (!array_key_exists(2, $arguments)) {
+        $arguments[2] = array();
     }
+
     return call_user_func_array('link_to2', $arguments);
-  }
 }
 
 function url_for_form(sfFormObject $form, $routePrefix)
 {
-  $format = '%s/%s';
-  if ('@' == $routePrefix[0])
-  {
-    $format = '%s_%s';
-    $routePrefix = substr($routePrefix, 1);
-  }
+    $format = '%s/%s';
+    if ('@' == $routePrefix[0]) {
+        $format = '%s_%s';
+        $routePrefix = substr($routePrefix, 1);
+    }
 
-  $uri = sprintf($format, $routePrefix, $form->getObject()->isNew() ? 'create' : 'update');
+    $uri = sprintf($format, $routePrefix, $form->getObject()->isNew() ? 'create' : 'update');
 
-  return url_for($uri, $form->getObject());
+    return url_for($uri, $form->getObject());
 }
 
 function form_tag_for(sfForm $form, $routePrefix, $attributes = array())
 {
-  return $form->renderFormTag(url_for_form($form, $routePrefix), $attributes);
+    return $form->renderFormTag(url_for_form($form, $routePrefix), $attributes);
 }
 
 /**
  * If the condition passed as first argument is true,
  * creates a <a> link tag of the given name using a routed URL
  * based on the module/action passed as argument and the routing configuration.
- * If the condition is false, the given name is returned between <span> tags
+ * If the condition is false, the given name is returned between <span> tags.
  *
  * <b>Options:</b>
  * - 'tag' - the HTML tag that must enclose the name if the condition is false, defaults to <span>
@@ -231,10 +233,10 @@ function form_tag_for(sfForm $form, $routePrefix, $attributes = array())
  *    => <span>Delete this page</span>
  * </code>
  *
- * @param  bool   $condition     condition
- * @param  string $name          name of the link, i.e. string to appear between the <a> tags
- * @param  string $internal_uri  'module/action' or '@rule' of the action
- * @param  array  $options       additional HTML compliant <a> tag parameters
+ * @param bool   $condition    condition
+ * @param string $name         name of the link, i.e. string to appear between the <a> tags
+ * @param string $internal_uri 'module/action' or '@rule' of the action
+ * @param array  $options      additional HTML compliant <a> tag parameters
  *
  * @return string XHTML compliant <a href> tag or name
  *
@@ -242,38 +244,33 @@ function form_tag_for(sfForm $form, $routePrefix, $attributes = array())
  */
 function link_to_if()
 {
-  $arguments = func_get_args();
-  if (empty($arguments[2]) || '@' == substr($arguments[2], 0, 1) || false !== strpos($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);
-  }
-
-  $html_options = _parse_attributes($options);
-  if ($condition)
-  {
-    unset($html_options['tag']);
-    return link_to1($name, $params, $html_options);
-  }
-  else
-  {
+    $arguments = func_get_args();
+    if (empty($arguments[2]) || '@' == substr($arguments[2], 0, 1) || false !== strpos($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);
+    }
+
+    $html_options = _parse_attributes($options);
+    if ($condition) {
+        unset($html_options['tag']);
+
+        return link_to1($name, $params, $html_options);
+    }
+
     unset($html_options['query_string'], $html_options['absolute_url'], $html_options['absolute']);
 
     $tag = _get_option($html_options, 'tag', 'span');
 
     return content_tag($tag, $name, $html_options);
-  }
 }
 
 /**
  * If the condition passed as first argument is false,
  * creates a <a> link tag of the given name using a routed URL
  * based on the module/action passed as argument and the routing configuration.
- * If the condition is true, the given name is returned between <span> tags
+ * If the condition is true, the given name is returned between <span> tags.
  *
  * <b>Options:</b>
  * - 'tag' - the HTML tag that must enclose the name if the condition is true, defaults to <span>
@@ -292,10 +289,10 @@ function link_to_if()
  *    => <a href="/path/to/my/action">Delete this page</a>
  * </code>
  *
- * @param  bool   $condition     condition
- * @param  string $name          name of the link, i.e. string to appear between the <a> tags
- * @param  string $internal_uri  'module/action' or '@rule' of the action
- * @param  array  $options       additional HTML compliant <a> tag parameters
+ * @param bool   $condition    condition
+ * @param string $name         name of the link, i.e. string to appear between the <a> tags
+ * @param string $internal_uri 'module/action' or '@rule' of the action
+ * @param array  $options      additional HTML compliant <a> tag parameters
  *
  * @return string XHTML compliant <a href> tag or name
  *
@@ -303,43 +300,40 @@ function link_to_if()
  */
 function link_to_unless()
 {
-  $arguments = func_get_args();
-  $arguments[0] = !$arguments[0];
-  return call_user_func_array('link_to_if', $arguments);
+    $arguments = func_get_args();
+    $arguments[0] = !$arguments[0];
+
+    return call_user_func_array('link_to_if', $arguments);
 }
 
 /**
- * Returns a URL rooted at the web root
+ * Returns a URL rooted at the web root.
+ *
+ * @param string $path     The route to append
+ * @param bool   $absolute If true, an absolute path is returned (optional)
  *
- * @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();
-  $root = $request->getRelativeUrlRoot();
-
-  if ($absolute)
-  {
-    $source = 'http';
-    if ($request->isSecure())
-    {
-      $source .= 's';
+    $request = sfContext::getInstance()->getRequest();
+    $root = $request->getRelativeUrlRoot();
+
+    if ($absolute) {
+        $source = 'http';
+        if ($request->isSecure()) {
+            $source .= 's';
+        }
+        $source .= '://'.$request->getHost().$root;
+    } else {
+        $source = $root;
     }
-    $source .='://'.$request->getHost().$root;
-  }
-  else
-  {
-    $source = $root;
-  }
-
-  if (substr($path, 0, 1) != '/')
-  {
-    $path = '/'.$path;
-  }
-
-  return $source.$path;
+
+    if ('/' != substr($path, 0, 1)) {
+        $path = '/'.$path;
+    }
+
+    return $source.$path;
 }
 
 /**
@@ -361,56 +355,51 @@ function public_path($path, $absolute = false)
  *    => <input value="Delete this page" type="button" onclick="document.location.href='/path/to/my/action';" />
  * </code>
  *
- * @param  string $name          name of the button
- * @param  string $internal_uri  'module/action' or '@rule' of the action
- * @param  array  $options       additional HTML compliant <input> tag parameters
+ * @param string $name         name of the button
+ * @param string $internal_uri 'module/action' or '@rule' of the action
+ * @param array  $options      additional HTML compliant <input> tag parameters
+ *
  * @return string XHTML compliant <input> tag
+ *
  * @see    url_for, link_to
  */
 function button_to($name, $internal_uri, $options = array())
 {
-  $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.');
+    $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.');
+        }
+        $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>';
     }
-    $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>';
-  }
-
-  $url = url_for($internal_uri);
-  if (isset($html_options['query_string']))
-  {
-    $url = $url.'?'.$html_options['query_string'];
-    unset($html_options['query_string']);
-  }
-  if (isset($html_options['anchor']))
-  {
-    $url = $url.'#'.$html_options['anchor'];
-    unset($html_options['anchor']);
-  }
-  $url = "'".$url."'";
-  $html_options['type'] = 'button';
-
-  if (isset($html_options['popup']))
-  {
-    $html_options = _convert_options_to_javascript($html_options, $url);
-    unset($html_options['popup']);
-  }
-  else
-  {
-    $html_options['onclick'] = "document.location.href=".$url.";";
-    $html_options = _convert_options_to_javascript($html_options);
-  }
+    $url = url_for($internal_uri);
+    if (isset($html_options['query_string'])) {
+        $url = $url.'?'.$html_options['query_string'];
+        unset($html_options['query_string']);
+    }
+    if (isset($html_options['anchor'])) {
+        $url = $url.'#'.$html_options['anchor'];
+        unset($html_options['anchor']);
+    }
+    $url = "'".$url."'";
+    $html_options['type'] = 'button';
+
+    if (isset($html_options['popup'])) {
+        $html_options = _convert_options_to_javascript($html_options, $url);
+        unset($html_options['popup']);
+    } else {
+        $html_options['onclick'] = 'document.location.href='.$url.';';
+        $html_options = _convert_options_to_javascript($html_options);
+    }
 
-  return tag('input', $html_options);
+    return tag('input', $html_options);
 }
 
 /**
@@ -427,34 +416,32 @@ function button_to($name, $internal_uri, $options = array())
  *   <code><?php echo form_tag('@myroute'); ?></code>
  *   <code><?php echo form_tag('/module/action', array('name' => 'myformname', 'multipart' => true)); ?></code>
  *
- * @param  string $url_for_options  valid action, route or URL
- * @param  array  $options          optional HTML parameters for the <form> tag
+ * @param string $url_for_options valid action, route or URL
+ * @param array  $options         optional HTML parameters for the <form> tag
  *
  * @return string opening HTML <form> tag with options
  */
 function form_tag($url_for_options = '', $options = array())
 {
-  $options = _parse_attributes($options);
+    $options = _parse_attributes($options);
 
-  $html_options = $options;
+    $html_options = $options;
 
-  $html_options['method'] = isset($html_options['method']) ? strtolower($html_options['method']) : 'post';
+    $html_options['method'] = isset($html_options['method']) ? strtolower($html_options['method']) : 'post';
 
-  if (_get_option($html_options, 'multipart'))
-  {
-    $html_options['enctype'] = 'multipart/form-data';
-  }
+    if (_get_option($html_options, 'multipart')) {
+        $html_options['enctype'] = 'multipart/form-data';
+    }
 
-  $html_options['action'] = url_for($url_for_options);
+    $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']));
-    $html_options['method'] = 'post';
-  }
+    $html = '';
+    if (!in_array($html_options['method'], array('get', 'post'))) {
+        $html = tag('input', array('type' => 'hidden', 'name' => 'sf_method', 'value' => $html_options['method']));
+        $html_options['method'] = 'post';
+    }
 
-  return tag('form', $html_options, true).$html;
+    return tag('form', $html_options, true).$html;
 }
 
 /**
@@ -474,180 +461,149 @@ function form_tag($url_for_options = '', $options = array())
  *    => <a href="mailto:webmaster@example.com">send us an email</a>
  *  echo mail_to('webmaster@example.com', 'send us an email', array('encode' => true));
  *    => <a href="
-            &#x6d;a&#x69;&#x6c;&#x74;&#111;&#58;&#x77;&#x65;b&#x6d;as&#116;&#x65;&#114;
-            &#64;&#101;&#x78;&#x61;&#x6d;&#x70;&#108;&#x65;&#46;&#99;&#x6f;&#109;
-          ">send us an email</a>
+ * &#x6d;a&#x69;&#x6c;&#x74;&#111;&#58;&#x77;&#x65;b&#x6d;as&#116;&#x65;&#114;
+ * &#64;&#101;&#x78;&#x61;&#x6d;&#x70;&#108;&#x65;&#46;&#99;&#x6f;&#109;
+ * ">send us an email</a>
  * </code>
  *
- * @param  string $email          target email
- * @param  string $name           name of the link, i.e. string to appear between the <a> tags
- * @param  array  $options        additional HTML compliant <a> tag parameters
- * @param  array  $default_value
+ * @param string $email         target email
+ * @param string $name          name of the link, i.e. string to appear between the <a> tags
+ * @param array  $options       additional HTML compliant <a> tag parameters
+ * @param array  $default_value
+ *
  * @return string XHTML compliant <a href> tag
+ *
  * @see    link_to
  */
 function mail_to($email, $name = '', $options = array(), $default_value = array())
 {
-  $html_options = _parse_attributes($options);
-
-  $html_options = _convert_options_to_javascript($html_options);
-
-  $default_tmp = _parse_attributes($default_value);
-  $default = array();
-  foreach ($default_tmp as $key => $value)
-  {
-    $default[] = urlencode($key).'='.urlencode($value);
-  }
-  $options = count($default) ? '?'.implode('&', $default) : '';
-
-  if (isset($html_options['encode']) && $html_options['encode'])
-  {
-    unset($html_options['encode']);
-    $html_options['href'] = _encodeText('mailto:'.$email.$options);
-    if (!$name)
-    {
-      $name = _encodeText($email);
+    $html_options = _parse_attributes($options);
+
+    $html_options = _convert_options_to_javascript($html_options);
+
+    $default_tmp = _parse_attributes($default_value);
+    $default = array();
+    foreach ($default_tmp as $key => $value) {
+        $default[] = urlencode($key).'='.urlencode($value);
     }
-  }
-  else
-  {
-    $html_options['href'] = 'mailto:'.$email.$options;
-    if (!$name)
-    {
-      $name = $email;
+    $options = count($default) ? '?'.implode('&', $default) : '';
+
+    if (isset($html_options['encode']) && $html_options['encode']) {
+        unset($html_options['encode']);
+        $html_options['href'] = _encodeText('mailto:'.$email.$options);
+        if (!$name) {
+            $name = _encodeText($email);
+        }
+    } else {
+        $html_options['href'] = 'mailto:'.$email.$options;
+        if (!$name) {
+            $name = $email;
+        }
     }
-  }
 
-  return content_tag('a', $name, $html_options);
+    return content_tag('a', $name, $html_options);
 }
 
 function _convert_options_to_javascript($html_options, $url = 'this.href')
 {
-  // confirm
-  $confirm = isset($html_options['confirm']) ? $html_options['confirm'] : '';
-  unset($html_options['confirm']);
-
-  // popup
-  $popup = isset($html_options['popup']) ? $html_options['popup'] : '';
-  unset($html_options['popup']);
-
-  // method
-  $method = isset($html_options['method']) ? $html_options['method'] : (isset($html_options['post']) && $html_options['post'] ? 'post' : false);
-  unset($html_options['post'], $html_options['method']);
-
-  $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.');
-  }
-  else if ($confirm && $popup)
-  {
-    $html_options['onclick'] = $onclick.'if ('._confirm_javascript_function($confirm).') { '._popup_javascript_function($popup, $url).' };return false;';
-  }
-  else if ($confirm && $method)
-  {
-    $html_options['onclick'] = $onclick.'if ('._confirm_javascript_function($confirm).') { '._method_javascript_function($method).' };return false;';
-  }
-  else if ($confirm)
-  {
-    if ($onclick)
-    {
-      $html_options['onclick'] = 'if ('._confirm_javascript_function($confirm).') { return '.$onclick.'} else return false;';
+    // confirm
+    $confirm = isset($html_options['confirm']) ? $html_options['confirm'] : '';
+    unset($html_options['confirm']);
+
+    // popup
+    $popup = isset($html_options['popup']) ? $html_options['popup'] : '';
+    unset($html_options['popup']);
+
+    // method
+    $method = isset($html_options['method']) ? $html_options['method'] : (isset($html_options['post']) && $html_options['post'] ? 'post' : false);
+    unset($html_options['post'], $html_options['method']);
+
+    $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.');
     }
-    else
-    {
-      $html_options['onclick'] = 'return '._confirm_javascript_function($confirm).';';
+    if ($confirm && $popup) {
+        $html_options['onclick'] = $onclick.'if ('._confirm_javascript_function($confirm).') { '._popup_javascript_function($popup, $url).' };return false;';
+    } elseif ($confirm && $method) {
+        $html_options['onclick'] = $onclick.'if ('._confirm_javascript_function($confirm).') { '._method_javascript_function($method).' };return false;';
+    } elseif ($confirm) {
+        if ($onclick) {
+            $html_options['onclick'] = 'if ('._confirm_javascript_function($confirm).') { return '.$onclick.'} else return false;';
+        } else {
+            $html_options['onclick'] = 'return '._confirm_javascript_function($confirm).';';
+        }
+    } elseif ($method) {
+        $html_options['onclick'] = $onclick._method_javascript_function($method).'return false;';
+    } elseif ($popup) {
+        $html_options['onclick'] = $onclick._popup_javascript_function($popup, $url).'return false;';
     }
-  }
-  else if ($method)
-  {
-    $html_options['onclick'] = $onclick._method_javascript_function($method).'return false;';
-  }
-  else if ($popup)
-  {
-    $html_options['onclick'] = $onclick._popup_javascript_function($popup, $url).'return false;';
-  }
-
-  return $html_options;
+
+    return $html_options;
 }
 
 function _confirm_javascript_function($confirm)
 {
-  return "confirm('".escape_javascript($confirm)."')";
+    return "confirm('".escape_javascript($confirm)."')";
 }
 
 function _popup_javascript_function($popup, $url = '')
 {
-  if (is_array($popup))
-  {
-    if (isset($popup[1]))
-    {
-      return "var w=window.open(".$url.",'".$popup[0]."','".$popup[1]."');w.focus();";
-    }
-    else
-    {
-      return "var w=window.open(".$url.",'".$popup[0]."');w.focus();";
+    if (is_array($popup)) {
+        if (isset($popup[1])) {
+            return 'var w=window.open('.$url.",'".$popup[0]."','".$popup[1]."');w.focus();";
+        }
+
+        return 'var w=window.open('.$url.",'".$popup[0]."');w.focus();";
     }
-  }
-  else
-  {
-    return "var w=window.open(".$url.");w.focus();";
-  }
+
+    return 'var w=window.open('.$url.');w.focus();';
 }
 
 function _post_javascript_function()
 {
-  return _method_javascript_function('POST');
+    return _method_javascript_function('POST');
 }
 
 function _method_javascript_function($method)
 {
-  $function = "var f = document.createElement('form'); f.style.display = 'none'; this.parentNode.appendChild(f); f.method = 'post'; f.action = this.href;";
+    $function = "var f = document.createElement('form'); f.style.display = 'none'; this.parentNode.appendChild(f); f.method = 'post'; f.action = this.href;";
 
-  if ('post' != strtolower($method))
-  {
-    $function .= "var m = document.createElement('input'); m.setAttribute('type', 'hidden'); ";
-    $function .= sprintf("m.setAttribute('name', 'sf_method'); m.setAttribute('value', '%s'); f.appendChild(m);", strtolower($method));
-  }
+    if ('post' != strtolower($method)) {
+        $function .= "var m = document.createElement('input'); m.setAttribute('type', 'hidden'); ";
+        $function .= sprintf("m.setAttribute('name', 'sf_method'); m.setAttribute('value', '%s'); f.appendChild(m);", strtolower($method));
+    }
 
-  // CSRF protection
-  $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());
-  }
+    // CSRF protection
+    $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());
+    }
 
-  $function .= "f.submit();";
+    $function .= 'f.submit();';
 
-  return $function;
+    return $function;
 }
 
 function _encodeText($text)
 {
-  $encoded_text = '';
-
-  for ($i = 0; $i < strlen($text); $i++)
-  {
-    $char = $text[$i];
-    $r = mt_rand(0, 100);
-
-    # roughly 10% raw, 45% hex, 45% dec
-    # '@' *must* be encoded. I insist.
-    if ($r > 90 && $char != '@')
-    {
-      $encoded_text .= $char;
-    }
-    else if ($r < 45)
-    {
-      $encoded_text .= '&#x'.dechex(ord($char)).';';
-    }
-    else
-    {
-      $encoded_text .= '&#'.ord($char).';';
+    $encoded_text = '';
+
+    for ($i = 0; $i < strlen($text); ++$i) {
+        $char = $text[$i];
+        $r = mt_rand(0, 100);
+
+        // roughly 10% raw, 45% hex, 45% dec
+        // '@' *must* be encoded. I insist.
+        if ($r > 90 && '@' != $char) {
+            $encoded_text .= $char;
+        } elseif ($r < 45) {
+            $encoded_text .= '&#x'.dechex(ord($char)).';';
+        } else {
+            $encoded_text .= '&#'.ord($char).';';
+        }
     }
-  }
 
-  return $encoded_text;
+    return $encoded_text;
 }
diff --git a/lib/i18n/Gettext/MO.php b/lib/i18n/Gettext/MO.php
index 6df1a4b82..900fdde60 100644
--- a/lib/i18n/Gettext/MO.php
+++ b/lib/i18n/Gettext/MO.php
@@ -15,50 +15,46 @@
 // $Id$
 
 /**
- * File::Gettext::MO
+ * File::Gettext::MO.
  *
  * @author      Michael Wallner <mike@php.net>
  * @license     PHP License
  */
-
 require_once __DIR__.'/TGettext.class.php';
 
 /**
- * File_Gettext_MO
+ * File_Gettext_MO.
  *
  * GNU MO file reader and writer.
  *
  * @author      Michael Wallner <mike@php.net>
+ *
  * @version     $Revision: 9856 $
- * @access      public
- * @package System.I18N.core
  */
 class TGettext_MO extends TGettext
 {
     /**
-     * file handle
+     * file handle.
      *
-     * @access  private
-     * @var     resource
+     * @var resource
      */
-    protected $_handle = null;
+    protected $_handle;
 
     /**
-     * big endianess
+     * big endianess.
      *
      * Whether to write with big endian byte order.
      *
-     * @access  public
-     * @var     bool
+     * @var bool
      */
     protected $writeBigEndian = false;
 
     /**
-     * Constructor
+     * Constructor.
+     *
+     * @param string $file path to GNU MO file
      *
-     * @access  public
-     * @return  object      File_Gettext_MO
-     * @param   string      $file   path to GNU MO file
+     * @return object File_Gettext_MO
      */
     public function __construct($file = '')
     {
@@ -66,92 +62,95 @@ public function __construct($file = '')
     }
 
     /**
-     * _read
+     * _read.
      *
-     * @access  private
-     * @return  mixed
-     * @param   int     $bytes
+     * @param int $bytes
+     *
+     * @return mixed
      */
-    function _read($bytes = 1)
+    public function _read($bytes = 1)
     {
         if (0 < $bytes = abs($bytes)) {
             return fread($this->_handle, $bytes);
         }
+
         return null;
     }
 
     /**
-     * _readInt
+     * _readInt.
      *
-     * @access  private
-     * @return  int
-     * @param   bool    $bigendian
+     * @param bool $bigendian
+     *
+     * @return int
      */
-    function _readInt($bigendian = false)
+    public function _readInt($bigendian = false)
     {
-		//unpack returns a reference????
-		$unpacked = unpack($bigendian ? 'N' : 'V', $this->_read(4));
+        // unpack returns a reference????
+        $unpacked = unpack($bigendian ? 'N' : 'V', $this->_read(4));
+
         return array_shift($unpacked);
     }
 
     /**
-     * _writeInt
+     * _writeInt.
+     *
+     * @param int $int
      *
-     * @access  private
-     * @return  int
-     * @param   int     $int
+     * @return int
      */
-    function _writeInt($int)
+    public function _writeInt($int)
     {
         return $this->_write(pack($this->writeBigEndian ? 'N' : 'V', (int) $int));
     }
 
     /**
-     * _write
+     * _write.
      *
-     * @access  private
-     * @return  int
-     * @param   string  $data
+     * @param string $data
+     *
+     * @return int
      */
-    function _write($data)
+    public function _write($data)
     {
         return fwrite($this->_handle, $data);
     }
 
     /**
-     * _writeStr
+     * _writeStr.
+     *
+     * @param string $string
      *
-     * @access  private
-     * @return  int
-     * @param   string  $string
+     * @return int
      */
-    function _writeStr($string)
+    public function _writeStr($string)
     {
-        return $this->_write($string . "\0");
+        return $this->_write($string."\0");
     }
 
     /**
-     * _readStr
+     * _readStr.
      *
-     * @access  private
-     * @return  string
-     * @param   array   $params     associative array with offset and length
-     *                              of the string
+     * @param array $params associative array with offset and length
+     *                      of the string
+     *
+     * @return string
      */
-    function _readStr($params)
+    public function _readStr($params)
     {
         fseek($this->_handle, $params['offset']);
+
         return $this->_read($params['length']);
     }
 
     /**
-     * Load MO file
+     * Load MO file.
+     *
+     * @param string $file
      *
-     * @access   public
-     * @return   mixed   Returns true on success or PEAR_Error on failure.
-     * @param    string  $file
+     * @return mixed returns true on success or PEAR_Error on failure
      */
-    function load($file = null)
+    public function load($file = null)
     {
         if (!isset($file)) {
             $file = $this->file;
@@ -164,22 +163,25 @@ function load($file = null)
         // lock MO file shared
         if (!@flock($this->_handle, LOCK_SH)) {
             @fclose($this->_handle);
+
             return false;
         }
 
         // read (part of) magic number from MO file header and define endianess
 
-		//unpack returns a reference????
-		$unpacked = unpack('c', $this->_read(4));
-        switch ($magic = array_shift($unpacked))
-        {
+        // unpack returns a reference????
+        $unpacked = unpack('c', $this->_read(4));
+
+        switch ($magic = array_shift($unpacked)) {
             case -34:
                 $be = false;
-            break;
+
+                break;
 
             case -107:
                 $be = true;
-            break;
+
+                break;
 
             default:
                 return false;
@@ -202,10 +204,10 @@ function load($file = null)
         fseek($this->_handle, $offset_original);
         // read lengths and offsets of msgids
         $original = array();
-        for ($i = 0; $i < $count; $i++) {
+        for ($i = 0; $i < $count; ++$i) {
             $original[$i] = array(
                 'length' => $this->_readInt($be),
-                'offset' => $this->_readInt($be)
+                'offset' => $this->_readInt($be),
             );
         }
 
@@ -213,15 +215,15 @@ function load($file = null)
         fseek($this->_handle, $offset_translat);
         // read lengths and offsets of msgstrs
         $translat = array();
-        for ($i = 0; $i < $count; $i++) {
+        for ($i = 0; $i < $count; ++$i) {
             $translat[$i] = array(
                 'length' => $this->_readInt($be),
-                'offset' => $this->_readInt($be)
+                'offset' => $this->_readInt($be),
             );
         }
 
         // read all
-        for ($i = 0; $i < $count; $i++) {
+        for ($i = 0; $i < $count; ++$i) {
             $this->strings[$this->_readStr($original[$i])] =
                 $this->_readStr($translat[$i]);
         }
@@ -241,13 +243,13 @@ function load($file = null)
     }
 
     /**
-     * Save MO file
+     * Save MO file.
+     *
+     * @param string $file
      *
-     * @access  public
-     * @return  mixed   Returns true on success or PEAR_Error on failure.
-     * @param   string  $file
+     * @return mixed returns true on success or PEAR_Error on failure
      */
-    function save($file = null)
+    public function save($file = null)
     {
         if (!isset($file)) {
             $file = $this->file;
@@ -260,14 +262,15 @@ function save($file = null)
         // lock MO file exclusively
         if (!@flock($this->_handle, LOCK_EX)) {
             @fclose($this->_handle);
+
             return false;
         }
 
         // write magic number
         if ($this->writeBigEndian) {
-            $this->_write(pack('c*', 0x95, 0x04, 0x12, 0xde));
+            $this->_write(pack('c*', 0x95, 0x04, 0x12, 0xDE));
         } else {
-            $this->_write(pack('c*', 0xde, 0x12, 0x04, 0x95));
+            $this->_write(pack('c*', 0xDE, 0x12, 0x04, 0x95));
         }
 
         // write file format revision
@@ -296,7 +299,7 @@ function save($file = null)
         if ($meta) {
             $meta = '';
             foreach ($this->meta as $key => $val) {
-                $meta .= $key . ': ' . $val . "\n";
+                $meta .= $key.': '.$val."\n";
             }
             $strings = array('' => $meta) + $this->strings;
         } else {
@@ -332,6 +335,7 @@ function save($file = null)
         // done
         @flock($this->_handle, LOCK_UN);
         @fclose($this->_handle);
+
         return true;
     }
 }
diff --git a/lib/i18n/Gettext/PO.php b/lib/i18n/Gettext/PO.php
index 079828c6a..fda62f5b7 100644
--- a/lib/i18n/Gettext/PO.php
+++ b/lib/i18n/Gettext/PO.php
@@ -15,32 +15,31 @@
 // $Id$
 
 /**
- * File::Gettext::PO
+ * File::Gettext::PO.
  *
  * @author      Michael Wallner <mike@php.net>
  * @license     PHP License
  */
-
 require_once __DIR__.'/TGettext.class.php';
 
 /**
- * File_Gettext_PO
+ * File_Gettext_PO.
  *
  * GNU PO file reader and writer.
  *
  * @author      Michael Wallner <mike@php.net>
+ *
  * @version     $Revision: 9856 $
- * @access      public
- * @package System.I18N.core
  */
 class TGettext_PO extends TGettext
 {
     /**
-     * Constructor
+     * Constructor.
      *
-     * @access  public
-     * @return  object      File_Gettext_PO
      * @param   string      path to GNU PO file
+     * @param mixed $file
+     *
+     * @return object File_Gettext_PO
      */
     public function __construct($file = '')
     {
@@ -48,13 +47,13 @@ public function __construct($file = '')
     }
 
     /**
-     * Load PO file
+     * Load PO file.
      *
-     * @access  public
-     * @return  mixed   Returns true on success or PEAR_Error on failure.
-     * @param   string  $file
+     * @param string $file
+     *
+     * @return mixed returns true on success or PEAR_Error on failure
      */
-    function load($file = null)
+    public function load($file = null)
     {
         if (!isset($file)) {
             $file = $this->file;
@@ -68,9 +67,10 @@ function load($file = null)
 
         // match all msgid/msgstr entries
         $matched = preg_match_all(
-            '/(msgid\s+("([^"]|\\\\")*?"\s*)+)\s+' .
+            '/(msgid\s+("([^"]|\\\\")*?"\s*)+)\s+'.
             '(msgstr\s+("([^"]|\\\\")*?"\s*)+)/',
-            $contents, $matches
+            $contents,
+            $matches
         );
         unset($contents);
 
@@ -79,11 +79,17 @@ function load($file = null)
         }
 
         // get all msgids and msgtrs
-        for ($i = 0; $i < $matched; $i++) {
+        for ($i = 0; $i < $matched; ++$i) {
             $msgid = preg_replace(
-                '/\s*msgid\s*"(.*)"\s*/s', '\\1', $matches[1][$i]);
-            $msgstr= preg_replace(
-                '/\s*msgstr\s*"(.*)"\s*/s', '\\1', $matches[4][$i]);
+                '/\s*msgid\s*"(.*)"\s*/s',
+                '\\1',
+                $matches[1][$i]
+            );
+            $msgstr = preg_replace(
+                '/\s*msgstr\s*"(.*)"\s*/s',
+                '\\1',
+                $matches[4][$i]
+            );
             $this->strings[parent::prepare($msgid)] = parent::prepare($msgstr);
         }
 
@@ -97,13 +103,13 @@ function load($file = null)
     }
 
     /**
-     * Save PO file
+     * Save PO file.
+     *
+     * @param string $file
      *
-     * @access  public
-     * @return  mixed   Returns true on success or PEAR_Error on failure.
-     * @param   string  $file
+     * @return mixed returns true on success or PEAR_Error on failure
      */
-    function save($file = null)
+    public function save($file = null)
     {
         if (!isset($file)) {
             $file = $this->file;
@@ -117,27 +123,30 @@ function save($file = null)
         // lock PO file exclusively
         if (!flock($fh, LOCK_EX)) {
             fclose($fh);
+
             return false;
         }
         // write meta info
         if (count($this->meta)) {
-            $meta = 'msgid ""' . "\nmsgstr " . '""' . "\n";
+            $meta = 'msgid ""'."\nmsgstr ".'""'."\n";
             foreach ($this->meta as $k => $v) {
-                $meta .= '"' . $k . ': ' . $v . '\n"' . "\n";
+                $meta .= '"'.$k.': '.$v.'\n"'."\n";
             }
-            fwrite($fh, $meta . "\n");
+            fwrite($fh, $meta."\n");
         }
         // write strings
         foreach ($this->strings as $o => $t) {
-            fwrite($fh,
-                'msgid "'  . parent::prepare($o, true) . '"' . "\n" .
-                'msgstr "' . parent::prepare($t, true) . '"' . "\n\n"
+            fwrite(
+                $fh,
+                'msgid "'.parent::prepare($o, true).'"'."\n".
+                'msgstr "'.parent::prepare($t, true).'"'."\n\n"
             );
         }
 
-        //done
+        // done
         @flock($fh, LOCK_UN);
         @fclose($fh);
+
         return true;
     }
 }
diff --git a/lib/i18n/Gettext/TGettext.class.php b/lib/i18n/Gettext/TGettext.class.php
index 4d137e538..73c33f011 100644
--- a/lib/i18n/Gettext/TGettext.class.php
+++ b/lib/i18n/Gettext/TGettext.class.php
@@ -15,19 +15,19 @@
 // $Id$
 
 /**
- * File::Gettext
+ * File::Gettext.
  *
  * @author      Michael Wallner <mike@php.net>
  * @license     PHP License
  */
 
 /**
- * Use PHPs builtin error messages
+ * Use PHPs builtin error messages.
  */
-//ini_set('track_errors', true);
+// ini_set('track_errors', true);
 
 /**
- * File_Gettext
+ * File_Gettext.
  *
  * GNU gettext file reader and writer.
  *
@@ -36,80 +36,79 @@
  * #################################################################
  *
  * @author      Michael Wallner <mike@php.net>
+ *
  * @version     $Revision: 9856 $
- * @access      public
- * @package System.I18N.core
  */
 class TGettext
 {
     /**
-     * strings
+     * strings.
      *
      * associative array with all [msgid => msgstr] entries
      *
-     * @access  protected
-     * @var     array
-    */
+     * @var array
+     */
     protected $strings = array();
 
     /**
-     * meta
+     * meta.
      *
      * associative array containing meta
      * information like project name or content type
      *
-     * @access  protected
-     * @var     array
+     * @var array
      */
     protected $meta = array();
 
     /**
-     * file path
+     * file path.
      *
-     * @access  protected
-     * @var     string
+     * @var string
      */
     protected $file = '';
 
     /**
-     * Factory
+     * Factory.
      *
      * @static
-     * @access  public
-     * @return  object  Returns File_Gettext_PO or File_Gettext_MO on success
-     *                  or PEAR_Error on failure.
-     * @param   string  $format MO or PO
-     * @param   string  $file   path to GNU gettext file
+     *
+     * @param string $format MO or PO
+     * @param string $file   path to GNU gettext file
+     *
+     * @return object returns File_Gettext_PO or File_Gettext_MO on success
+     *                or PEAR_Error on failure
      */
-    static function factory($format, $file = '')
+    public static function factory($format, $file = '')
     {
         $format = strtoupper($format);
         $filename = __DIR__.'/'.$format.'.php';
-        if (is_file($filename) == false)
-        	throw new Exception ("Class file $file not found");
+        if (false == is_file($filename)) {
+            throw new Exception("Class file {$file} not found");
+        }
 
         include_once $filename;
-        $class = 'TGettext_' . $format;
+        $class = 'TGettext_'.$format;
 
         return new $class($file);
     }
 
     /**
-     * poFile2moFile
+     * poFile2moFile.
      *
      * That's a simple fake of the 'msgfmt' console command.  It reads the
      * contents of a GNU PO file and saves them to a GNU MO file.
      *
      * @static
-     * @access  public
-     * @return  mixed   Returns true on success or PEAR_Error on failure.
-     * @param   string  $pofile path to GNU PO file
-     * @param   string  $mofile path to GNU MO file
+     *
+     * @param string $pofile path to GNU PO file
+     * @param string $mofile path to GNU MO file
+     *
+     * @return mixed returns true on success or PEAR_Error on failure
      */
-    function poFile2moFile($pofile, $mofile)
+    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';
@@ -129,37 +128,40 @@ function poFile2moFile($pofile, $mofile)
     }
 
     /**
-     * prepare
+     * prepare.
      *
      * @static
-     * @access  protected
-     * @return  string
-     * @param   string  $string
-     * @param   bool    $reverse
+     *
+     * @param string $string
+     * @param bool   $reverse
+     *
+     * @return string
      */
-    function prepare($string, $reverse = false)
+    public function prepare($string, $reverse = false)
     {
         if ($reverse) {
             $smap = array('"', "\n", "\t", "\r");
-            $rmap = array('\"', '\\n"' . "\n" . '"', '\\t', '\\r');
-            return (string) str_replace($smap, $rmap, $string);
-        } else {
-        	$string = preg_replace('/"\s+"/', '', $string);
-            $smap = array('\\n', '\\r', '\\t', '\"');
-            $rmap = array("\n", "\r", "\t", '"');
+            $rmap = array('\"', '\\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", '"');
+
+        return (string) str_replace($smap, $rmap, $string);
     }
 
     /**
-     * meta2array
+     * meta2array.
      *
      * @static
-     * @access  public
-     * @return  array
-     * @param   string  $meta
+     *
+     * @param string $meta
+     *
+     * @return array
      */
-    function meta2array($meta)
+    public function meta2array($meta)
     {
         $array = array();
         foreach (explode("\n", $meta) as $info) {
@@ -168,11 +170,12 @@ function meta2array($meta)
                 $array[trim($key)] = trim($value);
             }
         }
+
         return $array;
     }
 
     /**
-     * toArray
+     * toArray.
      *
      * Returns meta info and strings as an array of a structure like that:
      * <code>
@@ -192,16 +195,16 @@ function meta2array($meta)
      * </code>
      *
      * @see     fromArray()
-     * @access  protected
-     * @return  array
+     *
+     * @return array
      */
-    function toArray()
+    public function toArray()
     {
-    	return array('meta' => $this->meta, 'strings' => $this->strings);
+        return array('meta' => $this->meta, 'strings' => $this->strings);
     }
 
     /**
-     * fromArray
+     * fromArray.
      *
      * Assigns meta info and strings from an array of a structure like that:
      * <code>
@@ -221,50 +224,51 @@ function toArray()
      * </code>
      *
      * @see     toArray()
-     * @access  protected
-     * @return  bool
-     * @param   array       $array
+     *
+     * @param array $array
+     *
+     * @return bool
      */
-    function fromArray($array)
+    public function fromArray($array)
     {
-    	if (!array_key_exists('strings', $array)) {
-    	    if (count($array) != 2) {
+        if (!array_key_exists('strings', $array)) {
+            if (2 != count($array)) {
                 return false;
-    	    } else {
-    	        list($this->meta, $this->strings) = $array;
             }
-    	} else {
+            list($this->meta, $this->strings) = $array;
+        } else {
             $this->meta = @$array['meta'];
             $this->strings = @$array['strings'];
         }
+
         return true;
     }
 
     /**
-     * toMO
+     * toMO.
      *
-     * @access  protected
-     * @return  object  File_Gettext_MO
+     * @return object File_Gettext_MO
      */
-    function toMO()
+    public function toMO()
     {
         include_once __DIR__.'/MO.php';
-        $MO = new TGettext_MO;
+        $MO = new TGettext_MO();
         $MO->fromArray($this->toArray());
+
         return $MO;
     }
 
     /**
-     * toPO
+     * toPO.
      *
-     * @access  protected
-     * @return  object      File_Gettext_PO
+     * @return object File_Gettext_PO
      */
-    function toPO()
+    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 8b9feb830..1e5bd9d66 100644
--- a/lib/i18n/extract/sfI18nApplicationExtract.class.php
+++ b/lib/i18n/extract/sfI18nApplicationExtract.class.php
@@ -9,73 +9,69 @@
  */
 
 /**
- * @package    symfony
- * @subpackage i18n
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfI18nApplicationExtract extends sfI18nExtract
 {
-  protected $extractObjects = array();
-
-  /**
-   * Configures the current extract object.
-   */
-  public function configure()
-  {
-    $this->extractObjects = array();
+    protected $extractObjects = array();
 
-    // Modules
-    $moduleNames = sfFinder::type('dir')->maxdepth(0)->relative()->in(sfConfig::get('sf_app_module_dir'));
-    foreach ($moduleNames as $moduleName)
+    /**
+     * Configures the current extract object.
+     */
+    public function configure()
     {
-      $this->extractObjects[] = new sfI18nModuleExtract($this->i18n, $this->culture, array('module' => $moduleName));
-    }
-  }
+        $this->extractObjects = array();
 
-  /**
-   * Extracts i18n strings.
-   *
-   * This class must be implemented by subclasses.
-   */
-  public function extract()
-  {
-    foreach ($this->extractObjects as $extractObject)
-    {
-      $extractObject->extract();
+        // Modules
+        $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));
+        }
     }
 
-    // Add global templates
-    $this->extractFromPhpFiles(sfConfig::get('sf_app_template_dir'));
+    /**
+     * Extracts i18n strings.
+     *
+     * This class must be implemented by subclasses.
+     */
+    public function extract()
+    {
+        foreach ($this->extractObjects as $extractObject) {
+            $extractObject->extract();
+        }
 
-    // Add global librairies
-    $this->extractFromPhpFiles(sfConfig::get('sf_app_lib_dir'));
-  }
+        // Add global templates
+        $this->extractFromPhpFiles(sfConfig::get('sf_app_template_dir'));
 
-  /**
-   * Gets the current i18n strings.
-   */
-  public function getCurrentMessages()
-  {
-    return array_unique(array_merge($this->currentMessages, $this->aggregateMessages('getCurrentMessages')));
-  }
+        // Add global librairies
+        $this->extractFromPhpFiles(sfConfig::get('sf_app_lib_dir'));
+    }
 
-  /**
-   * Gets all i18n strings seen during the extraction process.
-   */
-  public function getAllSeenMessages()
-  {
-    return array_unique(array_merge($this->allSeenMessages, $this->aggregateMessages('getAllSeenMessages')));
-  }
+    /**
+     * Gets the current i18n strings.
+     */
+    public function getCurrentMessages()
+    {
+        return array_unique(array_merge($this->currentMessages, $this->aggregateMessages('getCurrentMessages')));
+    }
 
-  protected function aggregateMessages($method)
-  {
-    $messages = array();
-    foreach ($this->extractObjects as $extractObject)
+    /**
+     * Gets all i18n strings seen during the extraction process.
+     */
+    public function getAllSeenMessages()
     {
-      $messages = array_merge($messages, $extractObject->$method());
+        return array_unique(array_merge($this->allSeenMessages, $this->aggregateMessages('getAllSeenMessages')));
     }
 
-    return array_unique($messages);
-  }
+    protected function aggregateMessages($method)
+    {
+        $messages = array();
+        foreach ($this->extractObjects as $extractObject) {
+            $messages = array_merge($messages, $extractObject->{$method}());
+        }
+
+        return array_unique($messages);
+    }
 }
diff --git a/lib/i18n/extract/sfI18nExtract.class.php b/lib/i18n/extract/sfI18nExtract.class.php
index 2fb037d01..69f2469cb 100644
--- a/lib/i18n/extract/sfI18nExtract.class.php
+++ b/lib/i18n/extract/sfI18nExtract.class.php
@@ -9,194 +9,190 @@
  */
 
 /**
- * @package    symfony
- * @subpackage i18n
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfI18nExtract
 {
-  protected
-    $currentMessages = array(),
-    $newMessages     = array(),
-    $allSeenMessages = array(),
-    $culture         = null,
-    $parameters      = array(),
-    $i18n            = null;
-
-  /**
-   * Class constructor.
-   *
-   * @see initialize()
-   */
-  public function __construct(sfI18N $i18n, $culture, $parameters = array())
-  {
-    $this->initialize($i18n, $culture, $parameters);
-  }
-
-  /**
-   * Initializes the current extract object.
-   *
-   * @param sfI18N $i18n        A sfI18N instance
-   * @param string $culture     The culture
-   * @param array  $parameters  An array of parameters
-   */
-  function initialize(sfI18N $i18n, $culture, $parameters = array())
-  {
-    $this->allSeenMessages = array();
-    $this->newMessages = array();
-    $this->currentMessages = array();
-
-    $this->culture = $culture;
-    $this->parameters = $parameters;
-
-    $this->i18n = $i18n;
-
-    $this->configure();
-
-    $this->loadMessageSources();
-    $this->loadCurrentMessages();
-  }
-
-  /**
-   * Configures the current extract object.
-   */
-  public function configure()
-  {
-  }
-
-  /**
-   * Extracts i18n strings.
-   *
-   * This class must be implemented by subclasses.
-   */
-  abstract public function extract();
-
-  /**
-   * Saves the new messages.
-   *
-   * Current limitations:
-   *  - For file backends (XLIFF and gettext), it only saves in the "most global" file
-   */
-  public function saveNewMessages()
-  {
-    $messageSource = $this->i18n->getMessageSource();
-    foreach ($this->getNewMessages() as $message)
+    protected $currentMessages = array();
+    protected $newMessages = array();
+    protected $allSeenMessages = array();
+    protected $culture;
+    protected $parameters = array();
+    protected $i18n;
+
+    /**
+     * Class constructor.
+     *
+     * @see initialize()
+     *
+     * @param mixed $culture
+     * @param mixed $parameters
+     */
+    public function __construct(sfI18N $i18n, $culture, $parameters = array())
+    {
+        $this->initialize($i18n, $culture, $parameters);
+    }
+
+    /**
+     * Initializes the current extract object.
+     *
+     * @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())
+    {
+        $this->allSeenMessages = array();
+        $this->newMessages = array();
+        $this->currentMessages = array();
+
+        $this->culture = $culture;
+        $this->parameters = $parameters;
+
+        $this->i18n = $i18n;
+
+        $this->configure();
+
+        $this->loadMessageSources();
+        $this->loadCurrentMessages();
+    }
+
+    /**
+     * Configures the current extract object.
+     */
+    public function configure()
+    {
+    }
+
+    /**
+     * Extracts i18n strings.
+     *
+     * This class must be implemented by subclasses.
+     */
+    abstract public function extract();
+
+    /**
+     * Saves the new messages.
+     *
+     * Current limitations:
+     *  - For file backends (XLIFF and gettext), it only saves in the "most global" file
+     */
+    public function saveNewMessages()
+    {
+        $messageSource = $this->i18n->getMessageSource();
+        foreach ($this->getNewMessages() as $message) {
+            $messageSource->append($message);
+        }
+
+        $messageSource->save();
+    }
+
+    /**
+     * Deletes old messages.
+     *
+     * Current limitations:
+     *  - For file backends (XLIFF and gettext), it only deletes in the "most global" file
+     */
+    public function deleteOldMessages()
     {
-      $messageSource->append($message);
+        $messageSource = $this->i18n->getMessageSource();
+        foreach ($this->getOldMessages() as $message) {
+            $messageSource->delete($message);
+        }
     }
 
-    $messageSource->save();
-  }
-
-  /**
-   * Deletes old messages.
-   *
-   * Current limitations:
-   *  - For file backends (XLIFF and gettext), it only deletes in the "most global" file
-   */
-  public function deleteOldMessages()
-  {
-    $messageSource = $this->i18n->getMessageSource();
-    foreach ($this->getOldMessages() as $message)
+    /**
+     * Gets the new i18n strings.
+     *
+     * @return array An array of i18n strings
+     */
+    final public function getNewMessages()
     {
-      $messageSource->delete($message);
+        return array_diff($this->getAllSeenMessages(), $this->getCurrentMessages());
     }
-  }
-
-  /**
-   * Gets the new i18n strings.
-   *
-   * @return array An array of i18n strings
-   */
-  final public function getNewMessages()
-  {
-    return array_diff($this->getAllSeenMessages(), $this->getCurrentMessages());
-  }
-
-  /**
-   * Gets the current i18n strings.
-   *
-   * @return array An array of i18n strings
-   */
-  public function getCurrentMessages()
-  {
-    return $this->currentMessages;
-  }
-
-  /**
-   * Gets all i18n strings seen during the extraction process.
-   *
-   * @return array An array of i18n strings
-   */
-  public function getAllSeenMessages()
-  {
-    return $this->allSeenMessages;
-  }
-
-  /**
-   * Gets old i18n strings.
-   *
-   * This returns all strings that weren't seen during the extraction process
-   * and are in the current messages.
-   *
-   * @return array An array of i18n strings
-   */
-  final public function getOldMessages()
-  {
-    return array_diff($this->getCurrentMessages(), $this->getAllSeenMessages());
-  }
-
-  /**
-   * Loads message sources objects and sets the culture.
-   */
-  protected function loadMessageSources()
-  {
-    $this->i18n->getMessageSource()->setCulture($this->culture);
-    $this->i18n->getMessageSource()->load();
-  }
-
-  /**
-   * Loads messages already saved in the message sources.
-   */
-  protected function loadCurrentMessages()
-  {
-    $this->currentMessages = array();
-    foreach ($this->i18n->getMessageSource()->read() as $catalogue => $translations)
+
+    /**
+     * Gets the current i18n strings.
+     *
+     * @return array An array of i18n strings
+     */
+    public function getCurrentMessages()
+    {
+        return $this->currentMessages;
+    }
+
+    /**
+     * Gets all i18n strings seen during the extraction process.
+     *
+     * @return array An array of i18n strings
+     */
+    public function getAllSeenMessages()
+    {
+        return $this->allSeenMessages;
+    }
+
+    /**
+     * Gets old i18n strings.
+     *
+     * This returns all strings that weren't seen during the extraction process
+     * and are in the current messages.
+     *
+     * @return array An array of i18n strings
+     */
+    final public function getOldMessages()
+    {
+        return array_diff($this->getCurrentMessages(), $this->getAllSeenMessages());
+    }
+
+    /**
+     * Loads message sources objects and sets the culture.
+     */
+    protected function loadMessageSources()
     {
-      foreach ($translations as $key => $values)
-      {
-        $this->currentMessages[] = $key;
-      }
+        $this->i18n->getMessageSource()->setCulture($this->culture);
+        $this->i18n->getMessageSource()->load();
     }
-  }
-
-  /**
-   * Extracts i18n strings from PHP files.
-   *
-   * @param string $dir The PHP full path name
-   */
-  protected function extractFromPhpFiles($dir)
-  {
-    $phpExtractor = new sfI18nPhpExtractor();
-
-    $files = sfFinder::type('file')->name('*.php');
-    $messages = array();
-    foreach ($files->in($dir) as $file)
+
+    /**
+     * Loads messages already saved in the message sources.
+     */
+    protected function loadCurrentMessages()
     {
-      $messages = array_merge($messages, $phpExtractor->extract(file_get_contents($file)));
+        $this->currentMessages = array();
+        foreach ($this->i18n->getMessageSource()->read() as $catalogue => $translations) {
+            foreach ($translations as $key => $values) {
+                $this->currentMessages[] = $key;
+            }
+        }
     }
 
-    $this->updateMessages($messages);
-  }
-
-  /**
-   * Updates the internal arrays with new messages.
-   *
-   * @param array $messages An array of new i18n strings
-   */
-  protected function updateMessages($messages)
-  {
-    $this->allSeenMessages = array_unique(array_merge($this->allSeenMessages, $messages));
-  }
+    /**
+     * Extracts i18n strings from PHP files.
+     *
+     * @param string $dir The PHP full path name
+     */
+    protected function extractFromPhpFiles($dir)
+    {
+        $phpExtractor = new sfI18nPhpExtractor();
+
+        $files = sfFinder::type('file')->name('*.php');
+        $messages = array();
+        foreach ($files->in($dir) as $file) {
+            $messages = array_merge($messages, $phpExtractor->extract(file_get_contents($file)));
+        }
+
+        $this->updateMessages($messages);
+    }
+
+    /**
+     * Updates the internal arrays with new messages.
+     *
+     * @param array $messages An array of new i18n strings
+     */
+    protected function updateMessages($messages)
+    {
+        $this->allSeenMessages = array_unique(array_merge($this->allSeenMessages, $messages));
+    }
 }
diff --git a/lib/i18n/extract/sfI18nExtractorInterface.class.php b/lib/i18n/extract/sfI18nExtractorInterface.class.php
index d32d3560f..75082385f 100644
--- a/lib/i18n/extract/sfI18nExtractorInterface.class.php
+++ b/lib/i18n/extract/sfI18nExtractorInterface.class.php
@@ -9,19 +9,18 @@
  */
 
 /**
- * @package    symfony
- * @subpackage i18n
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 interface sfI18nExtractorInterface
 {
-  /**
-   * Extract i18n strings for the given content.
-   *
-   * @param  string $content The content
-   *
-   * @return array An array of i18n strings
-   */
-  public function extract($content);
+    /**
+     * Extract i18n strings for the given content.
+     *
+     * @param string $content The content
+     *
+     * @return array An array of i18n strings
+     */
+    public function extract($content);
 }
diff --git a/lib/i18n/extract/sfI18nModuleExtract.class.php b/lib/i18n/extract/sfI18nModuleExtract.class.php
index 3179545b4..8ac605b87 100644
--- a/lib/i18n/extract/sfI18nModuleExtract.class.php
+++ b/lib/i18n/extract/sfI18nModuleExtract.class.php
@@ -9,64 +9,59 @@
  */
 
 /**
- * @package    symfony
- * @subpackage i18n
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfI18nModuleExtract extends sfI18nExtract
 {
-  protected $module = '';
+    protected $module = '';
 
-  /**
-   * Configures the current extract object.
-   */
-  public function configure()
-  {
-    if (!isset($this->parameters['module']))
+    /**
+     * Configures the current extract object.
+     */
+    public function configure()
     {
-      throw new sfException('You must give a "module" parameter when extracting for a module.');
-    }
-
-    $this->module = $this->parameters['module'];
-
-    $options = $this->i18n->getOptions();
-    $dirs = $this->i18n->isMessageSourceFileBased($options['source']) ? $this->i18n->getConfiguration()->getI18NDirs($this->module) : null;
-    $this->i18n->setMessageSource($dirs, $this->culture);
-  }
+        if (!isset($this->parameters['module'])) {
+            throw new sfException('You must give a "module" parameter when extracting for a module.');
+        }
 
-  /**
-   * Extracts i18n strings.
-   *
-   * This class must be implemented by subclasses.
-   */
-  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.'/actions',
-      $moduleDir.'/lib',
-      $moduleDir.'/templates',
-    ));
+        $this->module = $this->parameters['module'];
 
-    // Extract from generator.yml files
-    $generator = $moduleDir.'/config/generator.yml';
-    if (file_exists($generator))
-    {
-      $yamlExtractor = new sfI18nYamlGeneratorExtractor();
-      $this->updateMessages($yamlExtractor->extract(file_get_contents($generator)));
+        $options = $this->i18n->getOptions();
+        $dirs = $this->i18n->isMessageSourceFileBased($options['source']) ? $this->i18n->getConfiguration()->getI18NDirs($this->module) : null;
+        $this->i18n->setMessageSource($dirs, $this->culture);
     }
 
-    // Extract from validate/*.yml files
-    $validateFiles = glob($moduleDir.'/validate/*.yml');
-    if (is_array($validateFiles))
+    /**
+     * Extracts i18n strings.
+     *
+     * This class must be implemented by subclasses.
+     */
+    public function extract()
     {
-      foreach ($validateFiles as $validateFile)
-      {
-        $yamlExtractor = new sfI18nYamlValidateExtractor();
-        $this->updateMessages($yamlExtractor->extract(file_get_contents($validateFile)));
-      }
+        // 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.'/actions',
+            $moduleDir.'/lib',
+            $moduleDir.'/templates',
+        ));
+
+        // Extract from generator.yml files
+        $generator = $moduleDir.'/config/generator.yml';
+        if (file_exists($generator)) {
+            $yamlExtractor = new sfI18nYamlGeneratorExtractor();
+            $this->updateMessages($yamlExtractor->extract(file_get_contents($generator)));
+        }
+
+        // Extract from validate/*.yml files
+        $validateFiles = glob($moduleDir.'/validate/*.yml');
+        if (is_array($validateFiles)) {
+            foreach ($validateFiles as $validateFile) {
+                $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 b4e6e2291..4051795a1 100644
--- a/lib/i18n/extract/sfI18nPhpExtractor.class.php
+++ b/lib/i18n/extract/sfI18nPhpExtractor.class.php
@@ -9,97 +9,91 @@
  */
 
 /**
- * @package    symfony
- * @subpackage i18n
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfI18nPhpExtractor implements sfI18nExtractorInterface
 {
-  /**
-   * Extract i18n strings for the given content.
-   *
-   * @param  string $content The content
-   *
-   * @return array An array of i18n strings
-   */
-  public function extract($content)
-  {
-    $tokens = token_get_all($content);
-
-    $strings = array();
-    $i18n_function = 0;
-    $line = 0;
-    $heredoc = false;
-    $buffer = '';
-    foreach ($tokens as $token)
+    /**
+     * Extract i18n strings for the given content.
+     *
+     * @param string $content The content
+     *
+     * @return array An array of i18n strings
+     */
+    public function extract($content)
     {
-      if (is_string($token))
-      {
-        switch ($token)
-        {
-          case '(':
-            if (1 == $i18n_function)
-            {
-              $i18n_function = 2;
-            }
+        $tokens = token_get_all($content);
 
-            break;
-          default:
-            $i18n_function = 0;
-        }
-      }
-      else
-      {
-        list($id, $text) = $token;
-
-        switch ($id)
-        {
-          case T_STRING:
-            if ($heredoc && 2 == $i18n_function)
-            {
-              $buffer .= $text;
-            }
-            else
-            {
-              $i18n_function = ('__' == $text || 'format_number_choice' == $text) ? 1 : 0;
-            }
-            break;
-          case T_WHITESPACE:
-            break;
-          case T_START_HEREDOC:
-            $heredoc = true;
-            break;
-          case T_END_HEREDOC:
-            $heredoc = false;
-            if ($buffer)
-            {
-              $strings[] = $buffer;
-              $buffer = '';
-            }
-            $i18n_function = 0;
-            break;
-          case T_CONSTANT_ENCAPSED_STRING:
-            if (2 == $i18n_function)
-            {
-              $delimiter = $text[0];
-              $strings[] = str_replace('\\'.$delimiter, $delimiter, substr($text, 1, -1));
-            }
-            $i18n_function = 0;
-            break;
-          default:
-            if ($heredoc && 2 == $i18n_function)
-            {
-              $buffer .= $text;
-            }
-            else
-            {
-              $i18n_function = 0;
+        $strings = array();
+        $i18n_function = 0;
+        $line = 0;
+        $heredoc = false;
+        $buffer = '';
+        foreach ($tokens as $token) {
+            if (is_string($token)) {
+                switch ($token) {
+                    case '(':
+                        if (1 == $i18n_function) {
+                            $i18n_function = 2;
+                        }
+
+                        break;
+
+                    default:
+                        $i18n_function = 0;
+                }
+            } else {
+                list($id, $text) = $token;
+
+                switch ($id) {
+                    case T_STRING:
+                        if ($heredoc && 2 == $i18n_function) {
+                            $buffer .= $text;
+                        } else {
+                            $i18n_function = ('__' == $text || 'format_number_choice' == $text) ? 1 : 0;
+                        }
+
+                        break;
+
+                    case T_WHITESPACE:
+                        break;
+
+                    case T_START_HEREDOC:
+                        $heredoc = true;
+
+                        break;
+
+                    case T_END_HEREDOC:
+                        $heredoc = false;
+                        if ($buffer) {
+                            $strings[] = $buffer;
+                            $buffer = '';
+                        }
+                        $i18n_function = 0;
+
+                        break;
+
+                    case T_CONSTANT_ENCAPSED_STRING:
+                        if (2 == $i18n_function) {
+                            $delimiter = $text[0];
+                            $strings[] = str_replace('\\'.$delimiter, $delimiter, substr($text, 1, -1));
+                        }
+                        $i18n_function = 0;
+
+                        break;
+
+                    default:
+                        if ($heredoc && 2 == $i18n_function) {
+                            $buffer .= $text;
+                        } else {
+                            $i18n_function = 0;
+                        }
+                }
             }
         }
-      }
-    }
 
-    return $strings;
-  }
+        return $strings;
+    }
 }
diff --git a/lib/i18n/extract/sfI18nYamlExtractor.class.php b/lib/i18n/extract/sfI18nYamlExtractor.class.php
index 48757ffe7..c11f3b48c 100644
--- a/lib/i18n/extract/sfI18nYamlExtractor.class.php
+++ b/lib/i18n/extract/sfI18nYamlExtractor.class.php
@@ -9,9 +9,8 @@
  */
 
 /**
- * @package    symfony
- * @subpackage i18n
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfI18nYamlExtractor implements sfI18nExtractorInterface
diff --git a/lib/i18n/extract/sfI18nYamlGeneratorExtractor.class.php b/lib/i18n/extract/sfI18nYamlGeneratorExtractor.class.php
index bd077455a..2f6b14d32 100644
--- a/lib/i18n/extract/sfI18nYamlGeneratorExtractor.class.php
+++ b/lib/i18n/extract/sfI18nYamlGeneratorExtractor.class.php
@@ -9,101 +9,85 @@
  */
 
 /**
- * @package    symfony
- * @subpackage i18n
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfI18nYamlGeneratorExtractor extends sfI18nYamlExtractor
 {
-  protected $strings = array();
-
-  /**
-   * Extract i18n strings for the given content.
-   *
-   * @param  string $content The content
-   *
-   * @return array An array of i18n strings
-   */
-  public function extract($content)
-  {
-    $this->strings = array();
-
-    $config = sfYaml::load($content, sfConfig::get('sf_charset', 'UTF-8'));
-
-    if (!isset($config['generator']['param']['config']))
+    protected $strings = array();
+
+    /**
+     * Extract i18n strings for the given content.
+     *
+     * @param string $content The content
+     *
+     * @return array An array of i18n strings
+     */
+    public function extract($content)
     {
-      return array();
-    }
+        $this->strings = array();
 
-    $params = $config['generator']['param']['config'];
+        $config = sfYaml::load($content, sfConfig::get('sf_charset', 'UTF-8'));
 
-    // titles
-    foreach (array('list', 'edit', 'new') as $section)
-    {
-      if (isset($params[$section]['title']))
-      {
-        $this->strings[] = $params[$section]['title'];
-      }
-    }
+        if (!isset($config['generator']['param']['config'])) {
+            return array();
+        }
 
-    // names and help messages
-    if (isset($params['fields']))
-    {
-      $this->getFromFields($params['fields']);
-    }
+        $params = $config['generator']['param']['config'];
 
-    if (isset($params['list']['fields']))
-    {
-      $this->getFromFields($params['list']['fields']);
-    }
+        // titles
+        foreach (array('list', 'edit', 'new') as $section) {
+            if (isset($params[$section]['title'])) {
+                $this->strings[] = $params[$section]['title'];
+            }
+        }
 
-    if (isset($params['edit']['fields']))
-    {
-      $this->getFromFields($params['edit']['fields']);
-    }
+        // names and help messages
+        if (isset($params['fields'])) {
+            $this->getFromFields($params['fields']);
+        }
 
-    if (isset($params['new']['fields']))
-    {
-      $this->getFromFields($params['new']['fields']);
-    }
+        if (isset($params['list']['fields'])) {
+            $this->getFromFields($params['list']['fields']);
+        }
 
-    // form categories
-    foreach (array('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)
-          {
-            $this->strings[] = $string;
-          }
+        if (isset($params['edit']['fields'])) {
+            $this->getFromFields($params['edit']['fields']);
         }
-      }
-    }
 
-    return $this->strings;
-  }
+        if (isset($params['new']['fields'])) {
+            $this->getFromFields($params['new']['fields']);
+        }
+
+        // form categories
+        foreach (array('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) {
+                        $this->strings[] = $string;
+                    }
+                }
+            }
+        }
 
-  protected function getFromFields($fields)
-  {
-    foreach ($fields as $field => $options)
+        return $this->strings;
+    }
+
+    protected function getFromFields($fields)
     {
-      if (isset($options['name']))
-      {
-        $this->strings[] = $options['name'];
-      }
-
-      if (isset($options['label']))
-      {
-        $this->strings[] = $options['label'];
-      }
-
-      if (isset($options['help']))
-      {
-        $this->strings[] = $options['help'];
-      }
+        foreach ($fields as $field => $options) {
+            if (isset($options['name'])) {
+                $this->strings[] = $options['name'];
+            }
+
+            if (isset($options['label'])) {
+                $this->strings[] = $options['label'];
+            }
+
+            if (isset($options['help'])) {
+                $this->strings[] = $options['help'];
+            }
+        }
     }
-  }
 }
diff --git a/lib/i18n/extract/sfI18nYamlValidateExtractor.class.php b/lib/i18n/extract/sfI18nYamlValidateExtractor.class.php
index d8a7fbf8d..1b337ab3a 100644
--- a/lib/i18n/extract/sfI18nYamlValidateExtractor.class.php
+++ b/lib/i18n/extract/sfI18nYamlValidateExtractor.class.php
@@ -9,100 +9,81 @@
  */
 
 /**
- * @package    symfony
- * @subpackage i18n
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfI18nYamlValidateExtractor extends sfI18nYamlExtractor
 {
-  /**
-   * Extract i18n strings for the given content.
-   *
-   * @param  string $content The content
-   *
-   * @return array An array of i18n strings
-   */
-  public function extract($content)
-  {
-    $strings = array();
+    /**
+     * Extract i18n strings for the given content.
+     *
+     * @param string $content The content
+     *
+     * @return array An array of i18n strings
+     */
+    public function extract($content)
+    {
+        $strings = array();
 
-    $config = sfYaml::load($content, sfConfig::get('sf_charset', 'UTF-8'));
+        $config = sfYaml::load($content, sfConfig::get('sf_charset', 'UTF-8'));
 
-    // New validate.yml format
+        // New validate.yml format
 
-    // fields
-    if (isset($config['fields']))
-    {
-      foreach ($config['fields'] as $field => $validation)
-      {
-        foreach ($validation as $type => $parameters)
-        {
-          if (!is_array($parameters))
-          {
-            continue;
-          }
+        // fields
+        if (isset($config['fields'])) {
+            foreach ($config['fields'] as $field => $validation) {
+                foreach ($validation as $type => $parameters) {
+                    if (!is_array($parameters)) {
+                        continue;
+                    }
 
-          foreach ($parameters as $key => $value)
-          {
-            if (preg_match('/(msg|error)$/', $key))
-            {
-              $strings[] = $value;
+                    foreach ($parameters as $key => $value) {
+                        if (preg_match('/(msg|error)$/', $key)) {
+                            $strings[] = $value;
+                        }
+                    }
+                }
             }
-          }
         }
-      }
-    }
 
-    // validators
-    if (isset($config['validators']))
-    {
-      foreach (array_keys($config['validators']) as $name)
-      {
-        if (!isset($config['validators'][$name]['param']))
-        {
-          continue;
-        }
+        // validators
+        if (isset($config['validators'])) {
+            foreach (array_keys($config['validators']) as $name) {
+                if (!isset($config['validators'][$name]['param'])) {
+                    continue;
+                }
 
-        foreach ($config['validators'][$name]['param'] as $key => $value)
-        {
-          if (preg_match('/(msg|error)$/', $key))
-          {
-            $strings[] = $value;
-          }
+                foreach ($config['validators'][$name]['param'] as $key => $value) {
+                    if (preg_match('/(msg|error)$/', $key)) {
+                        $strings[] = $value;
+                    }
+                }
+            }
         }
-      }
-    }
 
-    // Old validate.yml format
+        // Old validate.yml format
 
-    // required messages
-    if (isset($config['names']))
-    {
-      foreach ($config['names'] as $key => $value)
-      {
-        if (isset($value['required_msg']))
-        {
-          $strings[] = $value['required_msg'];
+        // required messages
+        if (isset($config['names'])) {
+            foreach ($config['names'] as $key => $value) {
+                if (isset($value['required_msg'])) {
+                    $strings[] = $value['required_msg'];
+                }
+            }
         }
-      }
-    }
 
-    // validators
-    foreach ($config as $key => $value)
-    {
-      if (isset($value['param']) && isset($value['class']))
-      {
-        foreach ($value['param'] as $key => $value)
-        {
-          if (preg_match('/(msg|error)$/', $key))
-          {
-            $strings[] = $value;
-          }
+        // validators
+        foreach ($config as $key => $value) {
+            if (isset($value['param'], $value['class'])) {
+                foreach ($value['param'] as $key => $value) {
+                    if (preg_match('/(msg|error)$/', $key)) {
+                        $strings[] = $value;
+                    }
+                }
+            }
         }
-      }
-    }
 
-    return $strings;
-  }
+        return $strings;
+    }
 }
diff --git a/lib/i18n/sfChoiceFormat.class.php b/lib/i18n/sfChoiceFormat.class.php
index 64b93bb0c..6d922f1bb 100644
--- a/lib/i18n/sfChoiceFormat.class.php
+++ b/lib/i18n/sfChoiceFormat.class.php
@@ -13,12 +13,10 @@
  * {@link http://prado.sourceforge.net/}
  *
  * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
+ *
  * @version    $Id$
- * @package    symfony
- * @subpackage i18n
  */
 
-
 /**
  * sfChoiceFormat class.
  *
@@ -51,178 +49,157 @@
  * are acceptable.
  *
  * @author Xiang Wei Zhuo <weizhuo[at]gmail[dot]com>
+ *
  * @version v1.0, last update on Fri Dec 24 20:46:16 EST 2004
- * @package    symfony
- * @subpackage i18n
  */
 class sfChoiceFormat
 {
-  /**
-   * The pattern to validate a set notation
-   */
-  protected $validate = '/[\(\[\{]|[-Inf\d:\s]+|,|[\+Inf\d\s:\?\-=!><%\|&\(\)]+|[\)\]\}]/ms';
-
-  /**
-   * The pattern to parse the formatting string.
-   */
-  protected $parse = '/(?:^\s*|\s*\|)([\(\[\{]([-Inf\d:\s]+,?[\+Inf\d\s:\?\-=!><%\|&\(\)]*)+[\)\]\}])\s*/';
-
-  /**
-   * The value for positive infinity.
-   */
-  protected $inf;
-
-  /**
-   * Constructor.
-   */
-  public function __construct()
-  {
-    $this->inf = -log(0);
-  }
-
-  /**
-   * Determines if the given number belongs to a given set
-   *
-   * @param  float  $number the number to test.
-   * @param  string $set    the set, in set notation.
-   *
-   * @return bool true if number is in the set, false otherwise.
-   * @throws sfException
-   */
-  public function isValid($number, $set)
-  {
-    $n = preg_match_all($this->validate, $set, $matches, PREG_SET_ORDER);
-
-    if ($n < 3)
+    /**
+     * The pattern to validate a set notation.
+     */
+    protected $validate = '/[\(\[\{]|[-Inf\d:\s]+|,|[\+Inf\d\s:\?\-=!><%\|&\(\)]+|[\)\]\}]/ms';
+
+    /**
+     * The pattern to parse the formatting string.
+     */
+    protected $parse = '/(?:^\s*|\s*\|)([\(\[\{]([-Inf\d:\s]+,?[\+Inf\d\s:\?\-=!><%\|&\(\)]*)+[\)\]\}])\s*/';
+
+    /**
+     * The value for positive infinity.
+     */
+    protected $inf;
+
+    /**
+     * Constructor.
+     */
+    public function __construct()
     {
-      throw new sfException(sprintf('Invalid set "%s".', $set));
+        $this->inf = -log(0);
     }
 
-    if (preg_match('/\{\s*n:([^\}]+)\}/', $set, $def))
+    /**
+     * Determines if the given number belongs to a given set.
+     *
+     * @param float  $number the number to test
+     * @param string $set    the set, in set notation
+     *
+     * @return bool true if number is in the set, false otherwise
+     *
+     * @throws sfException
+     */
+    public function isValid($number, $set)
     {
-      return $this->isValidSetNotation($number, $def[1]);
-    }
+        $n = preg_match_all($this->validate, $set, $matches, PREG_SET_ORDER);
 
-    $leftBracket = $matches[0][0];
-    $rightBracket = $matches[$n - 1][0];
+        if ($n < 3) {
+            throw new sfException(sprintf('Invalid set "%s".', $set));
+        }
 
-    $i = 0;
-    $elements = array();
+        if (preg_match('/\{\s*n:([^\}]+)\}/', $set, $def)) {
+            return $this->isValidSetNotation($number, $def[1]);
+        }
 
-    foreach ($matches as $match)
-    {
-      $string = $match[0];
-      if ($i != 0 && $i != $n - 1 && $string !== ',')
-      {
-        if ($string == '-Inf')
-        {
-          $elements[] = -1 * $this->inf;
+        $leftBracket = $matches[0][0];
+        $rightBracket = $matches[$n - 1][0];
+
+        $i = 0;
+        $elements = array();
+
+        foreach ($matches as $match) {
+            $string = $match[0];
+            if (0 != $i && $i != $n - 1 && ',' !== $string) {
+                if ('-Inf' == $string) {
+                    $elements[] = -1 * $this->inf;
+                } elseif ('+Inf' == $string || 'Inf' == $string) {
+                    $elements[] = $this->inf;
+                } else {
+                    $elements[] = (float) $string;
+                }
+            }
+            ++$i;
         }
-        else if ($string == '+Inf' || $string == 'Inf')
-        {
-          $elements[] = $this->inf;
+        $total = count($elements);
+        $number = (float) $number;
+
+        if ('{' == $leftBracket && '}' == $rightBracket) {
+            return in_array($number, $elements);
         }
-        else
-        {
-          $elements[] = (float) $string;
+
+        $left = false;
+        if ('[' == $leftBracket) {
+            $left = $number >= $elements[0];
+        } elseif ('(' == $leftBracket) {
+            $left = $number > $elements[0];
         }
-      }
-      $i++;
-    }
-    $total = count($elements);
-    $number = (float) $number;
 
-    if ($leftBracket == '{' && $rightBracket == '}')
-    {
-      return in_array($number, $elements);
-    }
+        $right = false;
+        if (']' == $rightBracket) {
+            $right = $number <= $elements[$total - 1];
+        } elseif (')' == $rightBracket) {
+            $right = $number < $elements[$total - 1];
+        }
 
-    $left = false;
-    if ($leftBracket == '[')
-    {
-      $left = $number >= $elements[0];
-    }
-    else if ($leftBracket == '(')
-    {
-      $left = $number > $elements[0];
+        return $left && $right;
     }
 
-    $right = false;
-    if ($rightBracket == ']')
+    /**
+     * Parses a choice string and get a list of sets and a list of strings corresponding to the sets.
+     *
+     * @param string $string the string containing the choices
+     *
+     * @return array array($sets, $strings)
+     */
+    public function parse($string)
     {
-      $right = $number <= $elements[$total - 1];
-    }
-    else if ($rightBracket == ')')
-    {
-      $right = $number < $elements[$total - 1];
-    }
+        $n = preg_match_all($this->parse, $string, $matches, PREG_OFFSET_CAPTURE);
+        $sets = array();
+        foreach ($matches[1] as $match) {
+            $sets[] = $match[0];
+        }
 
-    return $left && $right;
-  }
+        $offset = $matches[0];
+        $strings = array();
+        for ($i = 0; $i < $n; ++$i) {
+            $len = strlen($offset[$i][0]);
+            $begin = 0 == $i ? $len : $offset[$i][1] + $len;
+            $end = $i == $n - 1 ? strlen($string) : $offset[$i + 1][1];
+            $strings[] = substr($string, $begin, $end - $begin);
+        }
 
-  protected function isValidSetNotation($number, $set)
-  {
-    $str = '$result = '.str_replace('n', '$number', $set).';';
-    try
-    {
-      eval($str);
-      return $result;
-    }
-    catch (Exception $e)
-    {
-      return false;
-    }
-  }
-
-  /**
-   * Parses a choice string and get a list of sets and a list of strings corresponding to the sets.
-   *
-   * @param  string $string the string containing the choices
-   *
-   * @return array array($sets, $strings)
-   */
-  public function parse($string)
-  {
-    $n = preg_match_all($this->parse, $string, $matches, PREG_OFFSET_CAPTURE);
-    $sets = array();
-    foreach ($matches[1] as $match)
-    {
-      $sets[] = $match[0];
+        return array($sets, $strings);
     }
 
-    $offset = $matches[0];
-    $strings = array();
-    for ($i = 0; $i < $n; $i++)
+    /**
+     * For the choice string, and a number, find and return the string that satisfied the set within the choices.
+     *
+     * @param string $string the choices string
+     * @param float  $number the number to test
+     *
+     * @return string the chosen string
+     */
+    public function format($string, $number)
     {
-      $len = strlen($offset[$i][0]);
-      $begin = $i == 0 ? $len : $offset[$i][1] + $len;
-      $end = $i == $n - 1 ? strlen($string) : $offset[$i + 1][1];
-      $strings[] = substr($string, $begin, $end - $begin);
+        list($sets, $strings) = $this->parse($string);
+        $total = count($sets);
+        for ($i = 0; $i < $total; ++$i) {
+            if ($this->isValid($number, $sets[$i])) {
+                return $strings[$i];
+            }
+        }
+
+        return false;
     }
 
-    return array($sets, $strings);
-  }
-
-  /**
-   * For the choice string, and a number, find and return the string that satisfied the set within the choices.
-   *
-   * @param  string $string   the choices string.
-   * @param  float  $number   the number to test.
-   *
-   * @return string the chosen string.
-   */
-  public function format($string, $number)
-  {
-    list($sets, $strings) = $this->parse($string);
-    $total = count($sets);
-    for ($i = 0; $i < $total; $i++)
+    protected function isValidSetNotation($number, $set)
     {
-      if ($this->isValid($number, $sets[$i]))
-      {
-        return $strings[$i];
-      }
-    }
+        $str = '$result = '.str_replace('n', '$number', $set).';';
+
+        try {
+            eval($str);
 
-    return false;
-  }
+            return $result;
+        } catch (Exception $e) {
+            return false;
+        }
+    }
 }
diff --git a/lib/i18n/sfCultureInfo.class.php b/lib/i18n/sfCultureInfo.class.php
index aaf8d3bb7..f8c980c16 100644
--- a/lib/i18n/sfCultureInfo.class.php
+++ b/lib/i18n/sfCultureInfo.class.php
@@ -13,9 +13,8 @@
  * {@link http://prado.sourceforge.net/}
  *
  * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
+ *
  * @version    $Id$
- * @package    symfony
- * @subpackage i18n
  */
 
 /**
@@ -45,821 +44,794 @@
  * For example, Australian English is "en_AU".
  *
  * @author Xiang Wei Zhuo <weizhuo[at]gmail[dot]com>
+ *
  * @version v1.0, last update on Sat Dec 04 13:41:46 EST 2004
- * @package    symfony
- * @subpackage i18n
  */
 class sfCultureInfo
 {
-  /**
-   * ICU data filename extension.
-   * @var string
-   */
-  protected $dataFileExt = '.dat';
-
-  /**
-   * The ICU data array.
-   * @var array
-   */
-  protected $data = array();
-
-  /**
-   * The current culture.
-   * @var string
-   */
-  protected $culture;
-
-  /**
-   * Directory where the ICU data is stored.
-   * @var string
-   */
-  protected $dataDir;
-
-  /**
-   * A list of ICU date files loaded.
-   * @var array
-   */
-  protected $dataFiles = array();
-
-  /**
-   * The current date time format info.
-   * @var sfDateTimeFormatInfo
-   */
-  protected $dateTimeFormat;
-
-  /**
-   * The current number format info.
-   * @var sfNumberFormatInfo
-   */
-  protected $numberFormat;
-
-  /**
-   * A list of properties that are accessable/writable.
-   * @var array
-   */
-  protected $properties = array();
-
-  /**
-   * Culture type, all.
-   * @see getCultures()
-   * @var int
-   */
-  const ALL = 0;
-
-  /**
-   * Culture type, neutral.
-   * @see getCultures()
-   * @var int
-   */
-  const NEUTRAL = 1;
-
-  /**
-   * Culture type, specific.
-   *
-   * @see getCultures()
-   * @var int
-   */
-  const SPECIFIC = 2;
-
-  /**
-   * Gets the sfCultureInfo that for this culture string.
-   *
-   * @param string  $culture The culture for this instance
-   * @return sfCultureInfo Invariant culture info is "en"
-   */
-  public static function getInstance($culture = 'en')
-  {
-    static $instances = array();
-
-    if (!isset($instances[$culture]))
-    {
-      $instances[$culture] = new sfCultureInfo($culture);
-    }
-
-    return $instances[$culture];
-  }
-
-  /**
-   * Displays the culture name.
-   *
-   * @return string the culture name.
-   * @see getName()
-   */
-  public function __toString()
-  {
-    return $this->getName();
-  }
-
-  /**
-   * Allows functions that begins with 'set' to be called directly
-   * as an attribute/property to retrieve the value.
-   *
-   * @param string $name The property to get
-   * @return mixed
-   */
-  public function __get($name)
-  {
-    $getProperty = 'get'.$name;
-    if (in_array($getProperty, $this->properties))
-    {
-      return $this->$getProperty();
-    }
-    else
-    {
-      throw new sfException(sprintf('Property %s does not exists.', $name));
-    }
-  }
-
-  /**
-   * Allows functions that begins with 'set' to be called directly
-   * as an attribute/property to set the value.
-   *
-   * @param string $name  The property to set
-   * @param string $value The property value
-   */
-  public function __set($name, $value)
-  {
-    $setProperty = 'set'.$name;
-    if (in_array($setProperty, $this->properties))
-    {
-      $this->$setProperty($value);
-    }
-    else
-    {
-      throw new sfException(sprintf('Property %s can not be set.', $name));
-    }
-  }
-
-  /**
-   * Initializes a new instance of the sfCultureInfo class based on the
-   * culture specified by name. E.g. <code>new sfCultureInfo('en_AU');</code>
-   * The culture indentifier must be of the form
-   * "<language>_(country/region/variant)".
-   *
-   * @param string $culture a culture name, e.g. "en_AU".
-   * @return return new sfCultureInfo.
-   */
-  public function __construct($culture = 'en')
-  {
-    $this->properties = get_class_methods($this);
-
-    if (empty($culture))
-    {
-      $culture = 'en';
-    }
-
-    $this->dataDir = self::dataDir();
-    $this->dataFileExt = self::fileExt();
-
-    $this->setCulture($culture);
-
-    $this->loadCultureData('root');
-    $this->loadCultureData($culture);
-  }
-
-  /**
-   * Gets the default directory for the ICU data.
-   * The default is the "data" directory for this class.
-   *
-   * @return string directory containing the ICU data.
-   */
-  protected static function dataDir()
-  {
-    return __DIR__.'/data/';
-  }
-
-  /**
-   * Gets the filename extension for ICU data. Default is ".dat".
-   *
-   * @return string filename extension for ICU data.
-   */
-  protected static function fileExt()
-  {
-    return '.dat';
-  }
-
-  /**
-   * Determines if a given culture is valid. Simply checks that the
-   * culture data exists.
-   *
-   * @param string $culture a culture
-   * @return boolean true if valid, false otherwise.
-   */
-  static public function validCulture($culture)
-  {
-    if (preg_match('/^[a-z]{2}(_[A-Z]{2,5}){0,2}$/', $culture))
-    {
-      return is_file(self::dataDir().$culture.self::fileExt());
-    }
-
-    return false;
-  }
-
-  /**
-   * Sets the culture for the current instance. The culture indentifier
-   * must be of the form "<language>_(country/region)".
-   *
-   * @param string $culture culture identifier, e.g. "fr_FR_EURO".
-   */
-  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));
-      }
-    }
-
-    $this->culture = $culture;
-  }
-
-  /**
-   * Loads the ICU culture data for the specific culture identifier.
-   *
-   * @param string $culture the culture identifier.
-   */
-  protected function loadCultureData($culture)
-  {
-    $file_parts = explode('_', $culture);
-    $current_part = $file_parts[0];
-
-    $files = array($current_part);
-
-    for ($i = 1, $max = count($file_parts); $i < $max; $i++)
-    {
-      $current_part .= '_'.$file_parts[$i];
-      $files[] = $current_part;
-    }
-
-    foreach ($files as $file)
-    {
-      $filename = $this->dataDir.$file.$this->dataFileExt;
-
-      if (is_file($filename) == false)
-      {
-        throw new sfException(sprintf('Data file for "%s" was not found.', $file));
-      }
+    /**
+     * Culture type, all.
+     *
+     * @see getCultures()
+     *
+     * @var int
+     */
+    public const ALL = 0;
+
+    /**
+     * Culture type, neutral.
+     *
+     * @see getCultures()
+     *
+     * @var int
+     */
+    public const NEUTRAL = 1;
+
+    /**
+     * Culture type, specific.
+     *
+     * @see getCultures()
+     *
+     * @var int
+     */
+    public const SPECIFIC = 2;
+
+    /**
+     * ICU data filename extension.
+     *
+     * @var string
+     */
+    protected $dataFileExt = '.dat';
+
+    /**
+     * The ICU data array.
+     *
+     * @var array
+     */
+    protected $data = array();
+
+    /**
+     * The current culture.
+     *
+     * @var string
+     */
+    protected $culture;
+
+    /**
+     * Directory where the ICU data is stored.
+     *
+     * @var string
+     */
+    protected $dataDir;
+
+    /**
+     * A list of ICU date files loaded.
+     *
+     * @var array
+     */
+    protected $dataFiles = array();
+
+    /**
+     * The current date time format info.
+     *
+     * @var sfDateTimeFormatInfo
+     */
+    protected $dateTimeFormat;
+
+    /**
+     * The current number format info.
+     *
+     * @var sfNumberFormatInfo
+     */
+    protected $numberFormat;
+
+    /**
+     * A list of properties that are accessable/writable.
+     *
+     * @var array
+     */
+    protected $properties = array();
+
+    /**
+     * Initializes a new instance of the sfCultureInfo class based on the
+     * culture specified by name. E.g. <code>new sfCultureInfo('en_AU');</code>
+     * The culture indentifier must be of the form
+     * "<language>_(country/region/variant)".
+     *
+     * @param string $culture a culture name, e.g. "en_AU".
+     *
+     * @return return new sfCultureInfo
+     */
+    public function __construct($culture = 'en')
+    {
+        $this->properties = get_class_methods($this);
+
+        if (empty($culture)) {
+            $culture = 'en';
+        }
+
+        $this->dataDir = self::dataDir();
+        $this->dataFileExt = self::fileExt();
+
+        $this->setCulture($culture);
 
-      if (in_array($filename, $this->dataFiles) == false)
-      {
-        array_unshift($this->dataFiles, $file);
+        $this->loadCultureData('root');
+        $this->loadCultureData($culture);
+    }
+
+    /**
+     * Displays the culture name.
+     *
+     * @return string the culture name
+     *
+     * @see getName()
+     */
+    public function __toString()
+    {
+        return $this->getName();
+    }
 
-        $data = &$this->getData($filename);
-        $this->data[$file] = &$data;
-
-        if (isset($data['__ALIAS']))
-        {
-          $this->loadCultureData($data['__ALIAS']);
+    /**
+     * Allows functions that begins with 'set' to be called directly
+     * as an attribute/property to retrieve the value.
+     *
+     * @param string $name The property to get
+     *
+     * @return mixed
+     */
+    public function __get($name)
+    {
+        $getProperty = 'get'.$name;
+        if (in_array($getProperty, $this->properties)) {
+            return $this->{$getProperty}();
         }
-        unset($data);
-      }
-    }
-  }
-
-  /**
-   * Gets the data by unserializing the ICU data from disk.
-   * The data files are cached in a static variable inside
-   * this function.
-   *
-   * @param string $filename the ICU data filename
-   * @return array ICU data
-   */
-  protected function &getData($filename)
-  {
-    static $data  = array();
-    static $files = array();
-
-    if (!in_array($filename, $files))
-    {
-      $data[$filename] = unserialize(file_get_contents($filename));
-      $files[] = $filename;
-    }
-
-    return $data[$filename];
-  }
-
-  /**
-   * Finds the specific ICU data information from the data.
-   * The path to the specific ICU data is separated with a slash "/".
-   * E.g. To find the default calendar used by the culture, the path
-   * "calendar/default" will return the corresponding default calendar.
-   * Use merge=true to return the ICU including the parent culture.
-   * E.g. The currency data for a variant, say "en_AU" contains one
-   * entry, the currency for AUD, the other currency data are stored
-   * in the "en" data file. Thus to retrieve all the data regarding
-   * currency for "en_AU", you need to use findInfo("Currencies,true);.
-   *
-   * @param string  $path   the data you want to find.
-   * @param boolean $merge  merge the data from its parents.
-   * @return mixed the specific ICU data.
-   */
-  protected function findInfo($path = '/', $merge = false)
-  {
-    $result = array();
-    foreach ($this->dataFiles as $section)
-    {
-      $info = $this->searchArray($this->data[$section], $path);
-
-      if ($info)
-      {
-        if ($merge)
-        {
-          $result = $this->array_add($result, $info);
+
+        throw new sfException(sprintf('Property %s does not exists.', $name));
+    }
+
+    /**
+     * Allows functions that begins with 'set' to be called directly
+     * as an attribute/property to set the value.
+     *
+     * @param string $name  The property to set
+     * @param string $value The property value
+     */
+    public function __set($name, $value)
+    {
+        $setProperty = 'set'.$name;
+        if (in_array($setProperty, $this->properties)) {
+            $this->{$setProperty}($value);
+        } else {
+            throw new sfException(sprintf('Property %s can not be set.', $name));
         }
-        else
-        {
-          return $info;
+    }
+
+    /**
+     * Gets the sfCultureInfo that for this culture string.
+     *
+     * @param string $culture The culture for this instance
+     *
+     * @return sfCultureInfo Invariant culture info is "en"
+     */
+    public static function getInstance($culture = 'en')
+    {
+        static $instances = array();
+
+        if (!isset($instances[$culture])) {
+            $instances[$culture] = new sfCultureInfo($culture);
         }
-      }
-    }
-
-    return $result;
-  }
-
-  /**
-   * Adds an array to an already existing array.
-   * If an element is already existing in array1 it is not overwritten.
-   * If this element is an array this logic will be applied recursively.
-   */
-  private function array_add($array1, $array2)
-  {
-    foreach ($array2 as $key => $value)
-    {
-      if (isset($array1[$key]))
-      {
-        if(is_array($array1[$key]) && is_array($value))
-        {
-          $array1[$key] = $this->array_add($array1[$key], $value);
+
+        return $instances[$culture];
+    }
+
+    /**
+     * Determines if a given culture is valid. Simply checks that the
+     * culture data exists.
+     *
+     * @param string $culture a culture
+     *
+     * @return bool true if valid, false otherwise
+     */
+    public static function validCulture($culture)
+    {
+        if (preg_match('/^[a-z]{2}(_[A-Z]{2,5}){0,2}$/', $culture)) {
+            return is_file(self::dataDir().$culture.self::fileExt());
         }
-      }
-      else
-      {
-        $array1[$key] = $value;
-      }
-    }
-    return $array1;
-  }
-
-  /**
-   * Searches the array for a specific value using a path separated using
-   * slash "/" separated path. e.g to find $info['hello']['world'],
-   * the path "hello/world" will return the corresponding value.
-   *
-   * @param array   $info  the array for search
-   * @param string  $path  slash "/" separated array path.
-   * @return mixed the value array using the path
-   */
-  protected function searchArray($info, $path = '/')
-  {
-    $index = explode('/', $path);
-
-    $array = $info;
-
-    for ($i = 0, $max = count($index); $i < $max; $i++)
-    {
-      $k = $index[$i];
-      if ($i < $max - 1 && isset($array[$k]))
-      {
-        $array = $array[$k];
-      }
-      else if ($i == $max - 1 && isset($array[$k]))
-      {
-        return $array[$k];
-      }
-    }
-  }
-
-  /**
-   * Gets the culture name in the format
-   * "<languagecode2>_(country/regioncode2)".
-   *
-   * @return string culture name.
-   */
-  public function getName()
-  {
-    return $this->culture;
-  }
-
-  /**
-   * Gets the sfDateTimeFormatInfo that defines the culturally appropriate
-   * format of displaying dates and times.
-   *
-   * @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));
-    }
-
-    return $this->dateTimeFormat;
-  }
-
-  /**
-   * Sets the date time format information.
-   *
-   * @param sfDateTimeFormatInfo $dateTimeFormat the new date time format info.
-   */
-  public function setDateTimeFormat($dateTimeFormat)
-  {
-    $this->dateTimeFormat = $dateTimeFormat;
-  }
-
-  /**
-   * Gets the default calendar used by the culture, e.g. "gregorian".
-   *
-   * @return string the default calendar.
-   */
-  public function getCalendar()
-  {
-    return $this->findInfo('calendar/default');
-  }
-
-  /**
-   * Gets the culture name in the language that the culture is set
-   * to display. Returns <code>array('Language','Country');</code>
-   * 'Country' is omitted if the culture is neutral.
-   *
-   * @return array array with language and country as elements, localized.
-   */
-  public function getNativeName()
-  {
-    $lang = substr($this->culture, 0, 2);
-    $reg = substr($this->culture, 3, 2);
-    $language = $this->findInfo("Languages/{$lang}");
-    $region = $this->findInfo("Countries/{$reg}");
-    if ($region)
-    {
-      return $language.' ('.$region.')';
-    }
-    else
-    {
-      return $language;
-    }
-  }
-
-  /**
-   * Gets the culture name in English.
-   * Returns <code>array('Language','Country');</code>
-   * 'Country' is omitted if the culture is neutral.
-   *
-   * @return array array with language and country as elements.
-   */
-  public function getEnglishName()
-  {
-    $lang = substr($this->culture, 0, 2);
-    $reg = substr($this->culture, 3, 2);
-    $culture = $this->getInvariantCulture();
-
-    $language = $culture->findInfo("Languages/{$lang}");
-    if (is_array($language) && count($language) == 0)
-    {
-      return $this->culture;
-    }
-
-    $region = $culture->findInfo("Countries/{$reg}");
-
-    return $region ? $language.' ('.$region.')' : $language;
-  }
-
-  /**
-   * Gets the sfCultureInfo that is culture-independent (invariant).
-   * Any changes to the invariant culture affects all other
-   * instances of the invariant culture.
-   * The invariant culture is assumed to be "en";
-   *
-   * @return sfCultureInfo invariant culture info is "en".
-   */
-  static function getInvariantCulture()
-  {
-    static $invariant;
-
-    if (null === $invariant)
-    {
-      $invariant = new sfCultureInfo();
-    }
-
-    return $invariant;
-  }
-
-  /**
-   * Gets a value indicating whether the current sfCultureInfo
-   * represents a neutral culture. Returns true if the culture
-   * only contains two characters.
-   *
-   * @return boolean true if culture is neutral, false otherwise.
-   */
-  public function getIsNeutralCulture()
-  {
-    return strlen($this->culture) == 2;
-  }
-
-  /**
-   * Gets the sfNumberFormatInfo that defines the culturally appropriate
-   * format of displaying numbers, currency, and percentage.
-   *
-   * @return sfNumberFormatInfo the number format info for current culture.
-   */
-  public function getNumberFormat()
-  {
-    if (null === $this->numberFormat)
-    {
-      $elements = $this->findInfo('NumberElements');
-      $patterns = $this->findInfo('NumberPatterns');
-      $currencies = $this->getCurrencies(null, true);
-      $data = array('NumberElements' => $elements, 'NumberPatterns' => $patterns, 'Currencies' => $currencies);
-
-      $this->setNumberFormat(new sfNumberFormatInfo($data));
-    }
-
-    return $this->numberFormat;
-  }
-
-  /**
-   * Sets the number format information.
-   *
-   * @param sfNumberFormatInfo $numberFormat the new number format info.
-   */
-  public function setNumberFormat($numberFormat)
-  {
-    $this->numberFormat = $numberFormat;
-  }
-
-  /**
-   * Gets the sfCultureInfo that represents the parent culture of the
-   * current sfCultureInfo
-   *
-   * @return sfCultureInfo parent culture information.
-   */
-  public function getParent()
-  {
-    if (strlen($this->culture) == 2)
-    {
-      return $this->getInvariantCulture();
-    }
-
-    return new sfCultureInfo(substr($this->culture, 0, 2));
-  }
-
-  /**
-   * Gets the list of supported cultures filtered by the specified
-   * culture type. This is an EXPENSIVE function, it needs to traverse
-   * a list of ICU files in the data directory.
-   * This function can be called statically.
-   *
-   * @param int $type culture type, sfCultureInfo::ALL, sfCultureInfo::NEUTRAL
-   * or sfCultureInfo::SPECIFIC.
-   * @return array list of culture information available.
-   */
-  static function getCultures($type = sfCultureInfo::ALL)
-  {
-    $dataDir = sfCultureInfo::dataDir();
-    $dataExt = sfCultureInfo::fileExt();
-    $dir = dir($dataDir);
-
-    $neutral = array();
-    $specific = array();
-
-    while (false !== ($entry = $dir->read()))
-    {
-      if (is_file($dataDir.$entry) && substr($entry, -4) == $dataExt && $entry != 'root'.$dataExt)
-      {
-        $culture = substr($entry, 0, -4);
-        if (strlen($culture) == 2)
-        {
-          $neutral[] = $culture;
+
+        return false;
+    }
+
+    /**
+     * Gets the culture name in the format
+     * "<languagecode2>_(country/regioncode2)".
+     *
+     * @return string culture name
+     */
+    public function getName()
+    {
+        return $this->culture;
+    }
+
+    /**
+     * Gets the sfDateTimeFormatInfo that defines the culturally appropriate
+     * format of displaying dates and times.
+     *
+     * @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));
         }
-        else
-        {
-          $specific[] = $culture;
+
+        return $this->dateTimeFormat;
+    }
+
+    /**
+     * Sets the date time format information.
+     *
+     * @param sfDateTimeFormatInfo $dateTimeFormat the new date time format info
+     */
+    public function setDateTimeFormat($dateTimeFormat)
+    {
+        $this->dateTimeFormat = $dateTimeFormat;
+    }
+
+    /**
+     * Gets the default calendar used by the culture, e.g. "gregorian".
+     *
+     * @return string the default calendar
+     */
+    public function getCalendar()
+    {
+        return $this->findInfo('calendar/default');
+    }
+
+    /**
+     * Gets the culture name in the language that the culture is set
+     * to display. Returns <code>array('Language','Country');</code>
+     * 'Country' is omitted if the culture is neutral.
+     *
+     * @return array array with language and country as elements, localized
+     */
+    public function getNativeName()
+    {
+        $lang = substr($this->culture, 0, 2);
+        $reg = substr($this->culture, 3, 2);
+        $language = $this->findInfo("Languages/{$lang}");
+        $region = $this->findInfo("Countries/{$reg}");
+        if ($region) {
+            return $language.' ('.$region.')';
+        }
+
+        return $language;
+    }
+
+    /**
+     * Gets the culture name in English.
+     * Returns <code>array('Language','Country');</code>
+     * 'Country' is omitted if the culture is neutral.
+     *
+     * @return array array with language and country as elements
+     */
+    public function getEnglishName()
+    {
+        $lang = substr($this->culture, 0, 2);
+        $reg = substr($this->culture, 3, 2);
+        $culture = $this->getInvariantCulture();
+
+        $language = $culture->findInfo("Languages/{$lang}");
+        if (is_array($language) && 0 == count($language)) {
+            return $this->culture;
         }
-      }
-    }
-    $dir->close();
-
-    switch ($type)
+
+        $region = $culture->findInfo("Countries/{$reg}");
+
+        return $region ? $language.' ('.$region.')' : $language;
+    }
+
+    /**
+     * Gets the sfCultureInfo that is culture-independent (invariant).
+     * Any changes to the invariant culture affects all other
+     * instances of the invariant culture.
+     * The invariant culture is assumed to be "en";.
+     *
+     * @return sfCultureInfo invariant culture info is "en"
+     */
+    public static function getInvariantCulture()
     {
-      case sfCultureInfo::ALL:
-        $all =  array_merge($neutral, $specific);
-        sort($all);
-        return $all;
-        break;
-      case sfCultureInfo::NEUTRAL:
-        return $neutral;
-        break;
-      case sfCultureInfo::SPECIFIC:
-        return $specific;
-        break;
+        static $invariant;
+
+        if (null === $invariant) {
+            $invariant = new sfCultureInfo();
+        }
+
+        return $invariant;
+    }
+
+    /**
+     * Gets a value indicating whether the current sfCultureInfo
+     * represents a neutral culture. Returns true if the culture
+     * only contains two characters.
+     *
+     * @return bool true if culture is neutral, false otherwise
+     */
+    public function getIsNeutralCulture()
+    {
+        return 2 == strlen($this->culture);
+    }
+
+    /**
+     * Gets the sfNumberFormatInfo that defines the culturally appropriate
+     * format of displaying numbers, currency, and percentage.
+     *
+     * @return sfNumberFormatInfo the number format info for current culture
+     */
+    public function getNumberFormat()
+    {
+        if (null === $this->numberFormat) {
+            $elements = $this->findInfo('NumberElements');
+            $patterns = $this->findInfo('NumberPatterns');
+            $currencies = $this->getCurrencies(null, true);
+            $data = array('NumberElements' => $elements, 'NumberPatterns' => $patterns, 'Currencies' => $currencies);
+
+            $this->setNumberFormat(new sfNumberFormatInfo($data));
+        }
+
+        return $this->numberFormat;
+    }
+
+    /**
+     * Sets the number format information.
+     *
+     * @param sfNumberFormatInfo $numberFormat the new number format info
+     */
+    public function setNumberFormat($numberFormat)
+    {
+        $this->numberFormat = $numberFormat;
+    }
+
+    /**
+     * Gets the sfCultureInfo that represents the parent culture of the
+     * current sfCultureInfo.
+     *
+     * @return sfCultureInfo parent culture information
+     */
+    public function getParent()
+    {
+        if (2 == strlen($this->culture)) {
+            return $this->getInvariantCulture();
+        }
+
+        return new sfCultureInfo(substr($this->culture, 0, 2));
+    }
+
+    /**
+     * Gets the list of supported cultures filtered by the specified
+     * culture type. This is an EXPENSIVE function, it needs to traverse
+     * a list of ICU files in the data directory.
+     * This function can be called statically.
+     *
+     * @param int $type culture type, sfCultureInfo::ALL, sfCultureInfo::NEUTRAL
+     *                  or sfCultureInfo::SPECIFIC
+     *
+     * @return array list of culture information available
+     */
+    public static function getCultures($type = sfCultureInfo::ALL)
+    {
+        $dataDir = sfCultureInfo::dataDir();
+        $dataExt = sfCultureInfo::fileExt();
+        $dir = dir($dataDir);
+
+        $neutral = array();
+        $specific = array();
+
+        while (false !== ($entry = $dir->read())) {
+            if (is_file($dataDir.$entry) && substr($entry, -4) == $dataExt && $entry != 'root'.$dataExt) {
+                $culture = substr($entry, 0, -4);
+                if (2 == strlen($culture)) {
+                    $neutral[] = $culture;
+                } else {
+                    $specific[] = $culture;
+                }
+            }
+        }
+        $dir->close();
+
+        switch ($type) {
+            case sfCultureInfo::ALL:
+                $all = array_merge($neutral, $specific);
+                sort($all);
+
+                return $all;
+
+                break;
+
+            case sfCultureInfo::NEUTRAL:
+                return $neutral;
+
+                break;
+
+            case sfCultureInfo::SPECIFIC:
+                return $specific;
+
+                break;
+        }
     }
-  }
-
-  /**
-   * Get the country name in the current culture for the given code.
-   *
-   * @param  string $code A valid country code
-   *
-   * @return string The country name in the current culture
-   */
-  public function getCountry($code)
-  {
-    $countries = $this->findInfo('Countries', true);
-
-    if (!isset($countries[$code]))
-    {
-      throw new InvalidArgumentException(sprintf('The country %s does not exist.', $code));
+
+    /**
+     * Get the country name in the current culture for the given code.
+     *
+     * @param string $code A valid country code
+     *
+     * @return string The country name in the current culture
+     */
+    public function getCountry($code)
+    {
+        $countries = $this->findInfo('Countries', true);
+
+        if (!isset($countries[$code])) {
+            throw new InvalidArgumentException(sprintf('The country %s does not exist.', $code));
+        }
+
+        return $countries[$code];
     }
 
-    return $countries[$code];
-  }
+    /**
+     * Get the currency name in the current culture for the given code.
+     *
+     * @param string $code A valid currency code
+     *
+     * @return string The currency name in the current culture
+     */
+    public function getCurrency($code)
+    {
+        $currencies = $this->findInfo('Currencies', true);
 
-  /**
-   * Get the currency name in the current culture for the given code.
-   *
-   * @param  string $code A valid currency code
-   *
-   * @return string The currency name in the current culture
-   */
-  public function getCurrency($code)
-  {
-    $currencies = $this->findInfo('Currencies', true);
+        if (!isset($currencies[$code])) {
+            throw new InvalidArgumentException(sprintf('The currency %s does not exist.', $code));
+        }
 
-    if (!isset($currencies[$code]))
+        return $currencies[$code][1];
+    }
+
+    /**
+     * Get the language name in the current culture for the given code.
+     *
+     * @param string $code A valid language code
+     *
+     * @return string The language name in the current culture
+     */
+    public function getLanguage($code)
     {
-      throw new InvalidArgumentException(sprintf('The currency %s does not exist.', $code));
+        $languages = $this->findInfo('Languages', true);
+
+        if (!isset($languages[$code])) {
+            throw new InvalidArgumentException(sprintf('The language %s does not exist.', $code));
+        }
+
+        return $languages[$code];
     }
 
-    return $currencies[$code][1];
-  }
+    /**
+     * Gets a list of countries in the language of the localized version.
+     *
+     * @param array $countries An array of countries used to restrict the returned array (null by default, which means all countries)
+     *
+     * @return array a list of localized country names
+     */
+    public function getCountries($countries = null)
+    {
+        // remove integer keys as they do not represent countries
+        $allCountries = array();
+        foreach ($this->findInfo('Countries', true) as $key => $value) {
+            if (!is_int($key)) {
+                $allCountries[$key] = $value;
+            }
+        }
 
-  /**
-   * Get the language name in the current culture for the given code.
-   *
-   * @param  string $code A valid language code
-   *
-   * @return string The language name in the current culture
-   */
-  public function getLanguage($code)
-  {
-    $languages = $this->findInfo('Languages', true);
+        // 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)));
+            }
+
+            $allCountries = array_intersect_key($allCountries, array_flip($countries));
+        }
 
-    if (!isset($languages[$code]))
+        $this->sortArray($allCountries);
+
+        return $allCountries;
+    }
+
+    /**
+     * Gets a list of currencies in the language of the localized version.
+     *
+     * @param array $currencies An array of currencies used to restrict the returned array (null by default, which means all currencies)
+     * @param bool  $full       Whether to return the symbol and the name or not (false by default)
+     *
+     * @return array a list of localized currencies
+     */
+    public function getCurrencies($currencies = null, $full = false)
     {
-      throw new InvalidArgumentException(sprintf('The language %s does not exist.', $code));
+        $allCurrencies = $this->findInfo('Currencies', true);
+
+        // 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)));
+            }
+
+            $allCurrencies = array_intersect_key($allCurrencies, array_flip($currencies));
+        }
+
+        $tmp = array();
+        foreach ($allCurrencies as $key => $value) {
+            $allCurrencies[$key] = $value[1];
+            $tmp[$key] = $value[0];
+        }
+
+        $this->sortArray($allCurrencies);
+
+        if ($full) {
+            foreach ($allCurrencies as $key => $value) {
+                $allCurrencies[$key] = array($tmp[$key], $value);
+            }
+        }
+
+        return $allCurrencies;
     }
 
-    return $languages[$code];
-  }
+    /**
+     * Gets a list of languages in the language of the localized version.
+     *
+     * @param array $languages An array of languages used to restrict the returned array (null by default, which means all languages)
+     *
+     * @return array list of localized language names
+     */
+    public function getLanguages($languages = null)
+    {
+        $allLanguages = $this->findInfo('Languages', true);
 
-  /**
-   * Gets a list of countries in the language of the localized version.
-   *
-   * @param  array $countries An array of countries used to restrict the returned array (null by default, which means all countries)
-   *
-   * @return array a list of localized country names.
-   */
-  public function getCountries($countries = null)
-  {
-    // remove integer keys as they do not represent countries
-    $allCountries = array();
-    foreach ($this->findInfo('Countries', true) as $key => $value)
+        // 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)));
+            }
+
+            $allLanguages = array_intersect_key($allLanguages, array_flip($languages));
+        }
+
+        $this->sortArray($allLanguages);
+
+        return $allLanguages;
+    }
+
+    /**
+     * Gets a list of scripts in the language of the localized version.
+     *
+     * @return array list of localized script names
+     */
+    public function getScripts()
     {
-      if (!is_int($key))
-      {
-        $allCountries[$key] = $value;
-      }
+        return $this->findInfo('Scripts', true);
     }
 
-    // restrict countries to a sub-set
-    if (null !== $countries)
+    /**
+     * Gets a list of timezones in the language of the localized version.
+     *
+     * @return array list of localized timezones
+     */
+    public function getTimeZones()
     {
-      if ($problems = array_diff($countries, array_keys($allCountries)))
-      {
-        throw new InvalidArgumentException(sprintf('The following countries do not exist: %s.', implode(', ', $problems)));
-      }
+        // new format since ICU 3.8
+        // zoneStrings contains metaTimezones
+        $metadata = $this->findInfo('zoneStrings', true);
+        // TimeZones contains the Timezone name => metaTimezone identifier
+        $timeZones = $this->findInfo('TimeZones', true);
+        foreach ($timeZones as $key => $value) {
+            $timeZones[$key] = $metadata['meta:'.$value];
+            $timeZones[$key]['identifier'] = $key;
+            $timeZones[$key]['city'] = str_replace('_', ' ', substr($key, strpos($key, '/') + 1));
+        }
 
-      $allCountries = array_intersect_key($allCountries, array_flip($countries));
+        return $timeZones;
     }
 
-    $this->sortArray($allCountries);
+    /**
+     * sorts the passed array according to the locale of this sfCultureInfo class.
+     *
+     * @param  array the array to be sorted with "asort" and this locale
+     * @param mixed $array
+     */
+    public function sortArray(&$array)
+    {
+        $oldLocale = setlocale(LC_COLLATE, 0);
+        setlocale(LC_COLLATE, $this->getName());
+        asort($array, SORT_LOCALE_STRING);
+        setlocale(LC_COLLATE, $oldLocale);
+    }
 
-    return $allCountries;
-  }
+    /**
+     * Gets the default directory for the ICU data.
+     * The default is the "data" directory for this class.
+     *
+     * @return string directory containing the ICU data
+     */
+    protected static function dataDir()
+    {
+        return __DIR__.'/data/';
+    }
 
-  /**
-   * Gets a list of currencies in the language of the localized version.
-   *
-   * @param  array   $currencies An array of currencies used to restrict the returned array (null by default, which means all currencies)
-   * @param  Boolean $full       Whether to return the symbol and the name or not (false by default)
-   *
-   * @return array a list of localized currencies.
-   */
-  public function getCurrencies($currencies = null, $full = false)
-  {
-    $allCurrencies = $this->findInfo('Currencies', true);
+    /**
+     * Gets the filename extension for ICU data. Default is ".dat".
+     *
+     * @return string filename extension for ICU data
+     */
+    protected static function fileExt()
+    {
+        return '.dat';
+    }
 
-    // restrict countries to a sub-set
-    if (null !== $currencies)
+    /**
+     * Sets the culture for the current instance. The culture indentifier
+     * must be of the form "<language>_(country/region)".
+     *
+     * @param string $culture culture identifier, e.g. "fr_FR_EURO".
+     */
+    protected function setCulture($culture)
     {
-      if ($problems = array_diff($currencies, array_keys($allCurrencies)))
-      {
-        throw new InvalidArgumentException(sprintf('The following currencies do not exist: %s.', implode(', ', $problems)));
-      }
+        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));
+            }
+        }
 
-      $allCurrencies = array_intersect_key($allCurrencies, array_flip($currencies));
+        $this->culture = $culture;
     }
 
-    $tmp = array();
-    foreach ($allCurrencies as $key => $value)
+    /**
+     * Loads the ICU culture data for the specific culture identifier.
+     *
+     * @param string $culture the culture identifier
+     */
+    protected function loadCultureData($culture)
     {
-      $allCurrencies[$key] = $value[1];
-      $tmp[$key] = $value[0];
+        $file_parts = explode('_', $culture);
+        $current_part = $file_parts[0];
+
+        $files = array($current_part);
+
+        for ($i = 1, $max = count($file_parts); $i < $max; ++$i) {
+            $current_part .= '_'.$file_parts[$i];
+            $files[] = $current_part;
+        }
+
+        foreach ($files as $file) {
+            $filename = $this->dataDir.$file.$this->dataFileExt;
+
+            if (false == is_file($filename)) {
+                throw new sfException(sprintf('Data file for "%s" was not found.', $file));
+            }
+
+            if (false == in_array($filename, $this->dataFiles)) {
+                array_unshift($this->dataFiles, $file);
+
+                $data = &$this->getData($filename);
+                $this->data[$file] = &$data;
+
+                if (isset($data['__ALIAS'])) {
+                    $this->loadCultureData($data['__ALIAS']);
+                }
+                unset($data);
+            }
+        }
     }
 
-    $this->sortArray($allCurrencies);
+    /**
+     * Gets the data by unserializing the ICU data from disk.
+     * The data files are cached in a static variable inside
+     * this function.
+     *
+     * @param string $filename the ICU data filename
+     *
+     * @return array ICU data
+     */
+    protected function &getData($filename)
+    {
+        static $data = array();
+        static $files = array();
+
+        if (!in_array($filename, $files)) {
+            $data[$filename] = unserialize(file_get_contents($filename));
+            $files[] = $filename;
+        }
 
-    if ($full)
+        return $data[$filename];
+    }
+
+    /**
+     * Finds the specific ICU data information from the data.
+     * The path to the specific ICU data is separated with a slash "/".
+     * E.g. To find the default calendar used by the culture, the path
+     * "calendar/default" will return the corresponding default calendar.
+     * Use merge=true to return the ICU including the parent culture.
+     * E.g. The currency data for a variant, say "en_AU" contains one
+     * entry, the currency for AUD, the other currency data are stored
+     * in the "en" data file. Thus to retrieve all the data regarding
+     * currency for "en_AU", you need to use findInfo("Currencies,true);.
+     *
+     * @param string $path  the data you want to find
+     * @param bool   $merge merge the data from its parents
+     *
+     * @return mixed the specific ICU data
+     */
+    protected function findInfo($path = '/', $merge = false)
+    {
+        $result = array();
+        foreach ($this->dataFiles as $section) {
+            $info = $this->searchArray($this->data[$section], $path);
+
+            if ($info) {
+                if ($merge) {
+                    $result = $this->array_add($result, $info);
+                } else {
+                    return $info;
+                }
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Searches the array for a specific value using a path separated using
+     * slash "/" separated path. e.g to find $info['hello']['world'],
+     * the path "hello/world" will return the corresponding value.
+     *
+     * @param array  $info the array for search
+     * @param string $path slash "/" separated array path
+     *
+     * @return mixed the value array using the path
+     */
+    protected function searchArray($info, $path = '/')
     {
-        foreach ($allCurrencies as $key => $value)
-        {
-          $allCurrencies[$key] = array($tmp[$key], $value);
+        $index = explode('/', $path);
+
+        $array = $info;
+
+        for ($i = 0, $max = count($index); $i < $max; ++$i) {
+            $k = $index[$i];
+            if ($i < $max - 1 && isset($array[$k])) {
+                $array = $array[$k];
+            } elseif ($i == $max - 1 && isset($array[$k])) {
+                return $array[$k];
+            }
         }
     }
 
-    return $allCurrencies;
-  }
-
-  /**
-   * Gets a list of languages in the language of the localized version.
-   *
-   * @param  array $languages An array of languages used to restrict the returned array (null by default, which means all languages)
-   *
-   * @return array list of localized language names.
-   */
-  public function getLanguages($languages = null)
-  {
-    $allLanguages = $this->findInfo('Languages', true);
-
-    // 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)));
-      }
-
-      $allLanguages = array_intersect_key($allLanguages, array_flip($languages));
-    }
-
-    $this->sortArray($allLanguages);
-
-    return $allLanguages;
-  }
-
-  /**
-   * Gets a list of scripts in the language of the localized version.
-   *
-   * @return array list of localized script names.
-   */
-  public function getScripts()
-  {
-    return $this->findInfo('Scripts', true);
-  }
-
-  /**
-   * Gets a list of timezones in the language of the localized version.
-   *
-   * @return array list of localized timezones.
-   */
-  public function getTimeZones()
-  {
-    //new format since ICU 3.8
-    //zoneStrings contains metaTimezones
-    $metadata = $this->findInfo('zoneStrings', true);
-    //TimeZones contains the Timezone name => metaTimezone identifier
-    $timeZones = $this->findInfo('TimeZones', true);
-    foreach ($timeZones as $key => $value)
-    {
-      $timeZones[$key] = $metadata['meta:'.$value];
-      $timeZones[$key]['identifier'] = $key;
-      $timeZones[$key]['city'] = str_replace('_', ' ', substr($key, strpos($key, '/') + 1));
-    }
-    return $timeZones;
-  }
-
-  /**
-   * sorts the passed array according to the locale of this sfCultureInfo class
-   *
-   * @param  array the array to be sorted with "asort" and this locale
-   */
-  public function sortArray(&$array)
-  {
-    $oldLocale = setlocale(LC_COLLATE, 0);
-    setlocale(LC_COLLATE, $this->getName());
-    asort($array, SORT_LOCALE_STRING);
-    setlocale(LC_COLLATE, $oldLocale);
-  }
+    /**
+     * Adds an array to an already existing array.
+     * If an element is already existing in array1 it is not overwritten.
+     * If this element is an array this logic will be applied recursively.
+     *
+     * @param mixed $array1
+     * @param mixed $array2
+     */
+    private function array_add($array1, $array2)
+    {
+        foreach ($array2 as $key => $value) {
+            if (isset($array1[$key])) {
+                if (is_array($array1[$key]) && is_array($value)) {
+                    $array1[$key] = $this->array_add($array1[$key], $value);
+                }
+            } else {
+                $array1[$key] = $value;
+            }
+        }
+
+        return $array1;
+    }
 }
diff --git a/lib/i18n/sfDateFormat.class.php b/lib/i18n/sfDateFormat.class.php
index 91f827081..51b8a6242 100644
--- a/lib/i18n/sfDateFormat.class.php
+++ b/lib/i18n/sfDateFormat.class.php
@@ -12,9 +12,8 @@
  * {@link http://prado.sourceforge.net/}
  *
  * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
+ *
  * @version    $Id$
- * @package    symfony
- * @subpackage i18n
  */
 
 /**
@@ -33,785 +32,819 @@
  * in the properties of a DateTimeFormatInfo.
  *
  * @author Xiang Wei Zhuo <weizhuo[at]gmail[dot]com>
+ *
  * @version v1.0, last update on Sat Dec 04 14:10:49 EST 2004
- * @package    symfony
- * @subpackage i18n
  */
 class sfDateFormat
 {
-  /**
-   * A list of tokens and their function call.
-   * @var array
-   */
-  protected $tokens = array(
-    'G' => 'Era',
-    'y' => 'year',
-    'M' => 'mon',
-    'd' => 'mday',
-    'h' => 'Hour12',
-    'H' => 'hours',
-    'm' => 'minutes',
-    's' => 'seconds',
-    'E' => 'wday',
-    'D' => 'yday',
-    'F' => 'DayInMonth',
-    'w' => 'WeekInYear',
-    'W' => 'WeekInMonth',
-    'a' => 'AMPM',
-    'k' => 'HourInDay',
-    'K' => 'HourInAMPM',
-    'z' => 'TimeZone'
-  );
-
-  /**
-   * A list of methods, to be used by the token function calls.
-   * @var array
-   */
-  protected $methods = array();
-
-  /**
-   * The sfDateTimeFormatInfo, containing culture specific patterns and names.
-   * @var sfDateTimeFormatInfo
-   */
-  protected $formatInfo;
-
-  /**
-   * Initializes a new sfDateFormat.
-   *
-   * @param mixed $formatInfo either, null, a sfCultureInfo instance, a DateTimeFormatInfo instance, or a locale.
-   * @return sfDateFormat instance
-   */
-  function __construct($formatInfo = null)
-  {
-    if (null === $formatInfo)
-    {
-      $this->formatInfo = sfDateTimeFormatInfo::getInvariantInfo();
-    }
-    else if ($formatInfo instanceof sfCultureInfo)
-    {
-      $this->formatInfo = $formatInfo->DateTimeFormat;
-    }
-    else if ($formatInfo instanceof sfDateTimeFormatInfo)
-    {
-      $this->formatInfo = $formatInfo;
-    }
-    else
-    {
-      $this->formatInfo = sfDateTimeFormatInfo::getInstance($formatInfo);
-    }
+    /**
+     * A list of tokens and their function call.
+     *
+     * @var array
+     */
+    protected $tokens = array(
+        'G' => 'Era',
+        'y' => 'year',
+        'M' => 'mon',
+        'd' => 'mday',
+        'h' => 'Hour12',
+        'H' => 'hours',
+        'm' => 'minutes',
+        's' => 'seconds',
+        'E' => 'wday',
+        'D' => 'yday',
+        'F' => 'DayInMonth',
+        'w' => 'WeekInYear',
+        'W' => 'WeekInMonth',
+        'a' => 'AMPM',
+        'k' => 'HourInDay',
+        'K' => 'HourInAMPM',
+        'z' => 'TimeZone',
+    );
+
+    /**
+     * A list of methods, to be used by the token function calls.
+     *
+     * @var array
+     */
+    protected $methods = array();
+
+    /**
+     * The sfDateTimeFormatInfo, containing culture specific patterns and names.
+     *
+     * @var sfDateTimeFormatInfo
+     */
+    protected $formatInfo;
+
+    /**
+     * Initializes a new sfDateFormat.
+     *
+     * @param mixed $formatInfo either, null, a sfCultureInfo instance, a DateTimeFormatInfo instance, or a locale
+     *
+     * @return sfDateFormat instance
+     */
+    public function __construct($formatInfo = null)
+    {
+        if (null === $formatInfo) {
+            $this->formatInfo = sfDateTimeFormatInfo::getInvariantInfo();
+        } elseif ($formatInfo instanceof sfCultureInfo) {
+            $this->formatInfo = $formatInfo->DateTimeFormat;
+        } elseif ($formatInfo instanceof sfDateTimeFormatInfo) {
+            $this->formatInfo = $formatInfo;
+        } else {
+            $this->formatInfo = sfDateTimeFormatInfo::getInstance($formatInfo);
+        }
 
-    $this->methods = get_class_methods($this);
-  }
-
-  /**
-   * Guesses a date without calling strtotime.
-   *
-   * @author Olivier Verdier <Olivier.Verdier@gmail.com>
-   * @param mixed  $time    the time as integer or string in strtotime format.
-   * @param string $pattern the input pattern; default is sql date or timestamp
-   * @return array same array as the getdate function
-   */
-  public function getDate($time, $pattern = null)
-  {
-    if (null === $time)
-    {
-      return null;
+        $this->methods = get_class_methods($this);
     }
 
-    // if the type is not a php timestamp
-    $isString = (string) $time !== (string) (int) $time;
-
-    if ($isString)
+    /**
+     * Guesses a date without calling strtotime.
+     *
+     * @author Olivier Verdier <Olivier.Verdier@gmail.com>
+     *
+     * @param mixed  $time    the time as integer or string in strtotime format
+     * @param string $pattern the input pattern; default is sql date or timestamp
+     *
+     * @return array same array as the getdate function
+     */
+    public function getDate($time, $pattern = null)
     {
-      if (!$pattern)
-      {
-        if (strlen($time) == 10)
-        {
-          $pattern = 'i';
-        }
-        else   // otherwise, default:
-        {
-          $pattern = 'I';
-        }
-      }
-
-      $pattern = $this->getPattern($pattern);
-      $tokens = $this->getTokens($pattern);
-      $pregPattern = '';
-      $matchNames = array();
-      // current regex allows any char at the end. avoids duplicating [^\d]+ pattern
-      // this could cause issues with utf character width
-      $allowsAllChars=true;
-      foreach ($tokens as $token)
-      {
-        if ($matchName = $this->getFunctionName($token))
-        {
-          $allowsAllChars = false;
-          $pregPattern .= '(\d+)';
-          $matchNames[] = $matchName;
+        if (null === $time) {
+            return null;
         }
-        else
-        {
-          if (!$allowsAllChars)
-          {
+
+        // if the type is not a php timestamp
+        $isString = (string) $time !== (string) (int) $time;
+
+        if ($isString) {
+            if (!$pattern) {
+                if (10 == strlen($time)) {
+                    $pattern = 'i';
+                } else { // otherwise, default:
+                    $pattern = 'I';
+                }
+            }
+
+            $pattern = $this->getPattern($pattern);
+            $tokens = $this->getTokens($pattern);
+            $pregPattern = '';
+            $matchNames = array();
+            // current regex allows any char at the end. avoids duplicating [^\d]+ pattern
+            // this could cause issues with utf character width
             $allowsAllChars = true;
-            $pregPattern .= '[^\d]+';
-          }
+            foreach ($tokens as $token) {
+                if ($matchName = $this->getFunctionName($token)) {
+                    $allowsAllChars = false;
+                    $pregPattern .= '(\d+)';
+                    $matchNames[] = $matchName;
+                } else {
+                    if (!$allowsAllChars) {
+                        $allowsAllChars = true;
+                        $pregPattern .= '[^\d]+';
+                    }
+                }
+            }
+            preg_match('@'.$pregPattern.'@', $time, $matches);
+
+            array_shift($matches);
+
+            if (count($matchNames) == count($matches)) {
+                $date = array_combine($matchNames, $matches);
+                // guess the date if input with two digits
+                if (2 == strlen($date['year'])) {
+                    $date['year'] = date('Y', mktime(0, 0, 0, 1, 1, $date['year']));
+                }
+                $date = array_map('intval', $date);
+            }
         }
-      }
-      preg_match('@'.$pregPattern.'@', $time, $matches);
-
-      array_shift($matches);
-
-      if (count($matchNames) == count($matches))
-      {
-        $date = array_combine($matchNames, $matches);
-        // guess the date if input with two digits
-        if (strlen($date['year']) == 2)
-        {
-          $date['year'] = date('Y', mktime(0, 0, 0, 1, 1, $date['year']));
+
+        // the last attempt has failed we fall back on the default method
+        if (!isset($date)) {
+            if ($isString) {
+                $numericalTime = @strtotime($time);
+                if (false === $numericalTime) {
+                    throw new sfException(sprintf('Impossible to parse date "%s" with format "%s".', $time, $pattern));
+                }
+            } else {
+                $numericalTime = $time;
+            }
+            $date = @getdate($numericalTime);
         }
-        $date = array_map('intval', $date);
-      }
-    }
 
-    // the last attempt has failed we fall back on the default method
-    if (!isset($date))
-    {
-      if ($isString)
-      {
-        $numericalTime = @strtotime($time);
-        if ($numericalTime === false)
-        {
-          throw new sfException(sprintf('Impossible to parse date "%s" with format "%s".', $time, $pattern));
+        // we set default values for the time
+        foreach (array('hours', 'minutes', 'seconds') as $timeDiv) {
+            if (!isset($date[$timeDiv])) {
+                $date[$timeDiv] = 0;
+            }
         }
-      }
-      else
-      {
-        $numericalTime = $time;
-      }
-      $date = @getdate($numericalTime);
-    }
 
-    // we set default values for the time
-    foreach (array('hours', 'minutes', 'seconds') as $timeDiv)
-    {
-      if (!isset($date[$timeDiv]))
-      {
-        $date[$timeDiv] = 0;
-      }
+        return $date;
     }
 
-    return $date;
-  }
-
-  /**
-   * Formats a date according to the pattern.
-   *
-   * @param mixed   $time           the time as integer or string in strtotime format.
-   * @param string  $pattern        the pattern
-   * @param string  $inputPattern   the input pattern
-   * @param string  $charset        the charset
-   * @return string formatted date time.
-   */
-  public function format($time, $pattern = 'F', $inputPattern = null, $charset = 'UTF-8')
-  {
-    $date = $this->getDate($time, $inputPattern);
-
-    if (null === $pattern)
+    /**
+     * Formats a date according to the pattern.
+     *
+     * @param mixed  $time         the time as integer or string in strtotime format
+     * @param string $pattern      the pattern
+     * @param string $inputPattern the input pattern
+     * @param string $charset      the charset
+     *
+     * @return string formatted date time
+     */
+    public function format($time, $pattern = 'F', $inputPattern = null, $charset = 'UTF-8')
     {
-      $pattern = 'F';
-    }
+        $date = $this->getDate($time, $inputPattern);
 
-    $pattern = $this->getPattern($pattern);
-    $tokens = $this->getTokens($pattern);
+        if (null === $pattern) {
+            $pattern = 'F';
+        }
 
-    for ($i = 0, $max = count($tokens); $i < $max; $i++)
-    {
-      $pattern = $tokens[$i];
-      if ($pattern[0] == "'" && $pattern[strlen($pattern) - 1] == "'")
-      {
-        $tokens[$i] = str_replace('``````', '\'', preg_replace('/(^\')|(\'$)/', '', $pattern));
-      }
-      else if ($pattern == '``````')
-      {
-        $tokens[$i] = '\'';
-      }
-      else
-      {
-        if (null !== $function = $this->getFunctionName($pattern))
-        {
-          $function = ucfirst($function);
-          $fName = 'get'.$function;
-          if (in_array($fName, $this->methods))
-          {
-            $tokens[$i] = $this->$fName($date, $pattern);
-          }
-          else
-          {
-            throw new sfException(sprintf('Function %s not found.', $function));
-          }
+        $pattern = $this->getPattern($pattern);
+        $tokens = $this->getTokens($pattern);
+
+        for ($i = 0, $max = count($tokens); $i < $max; ++$i) {
+            $pattern = $tokens[$i];
+            if ("'" == $pattern[0] && "'" == $pattern[strlen($pattern) - 1]) {
+                $tokens[$i] = str_replace('``````', '\'', preg_replace('/(^\')|(\'$)/', '', $pattern));
+            } elseif ('``````' == $pattern) {
+                $tokens[$i] = '\'';
+            } else {
+                if (null !== $function = $this->getFunctionName($pattern)) {
+                    $function = ucfirst($function);
+                    $fName = 'get'.$function;
+                    if (in_array($fName, $this->methods)) {
+                        $tokens[$i] = $this->{$fName}($date, $pattern);
+                    } else {
+                        throw new sfException(sprintf('Function %s not found.', $function));
+                    }
+                }
+            }
         }
-      }
-    }
 
-    return sfToolkit::I18N_toEncoding(implode('', $tokens), $charset);
-  }
-
-  /**
-   * For a particular token, get the corresponding function to call.
-   *
-   * @param string $token token
-   * @return mixed the function if good token, null otherwise.
-   */
-  protected function getFunctionName($token)
-  {
-    if (isset($this->tokens[$token[0]]))
-    {
-      return $this->tokens[$token[0]];
+        return sfToolkit::I18N_toEncoding(implode('', $tokens), $charset);
+    }
+
+    /**
+     * Gets the pattern from DateTimeFormatInfo or some predefined patterns.
+     * If the $pattern parameter is an array of 2 element, it will assume
+     * that the first element is the date, and second the time
+     * and try to find an appropriate pattern and apply
+     * DateTimeFormatInfo::formatDateTime
+     * See the tutorial documentation for futher details on the patterns.
+     *
+     * @param mixed $pattern a pattern
+     *
+     * @return string a pattern
+     *
+     * @see DateTimeFormatInfo::formatDateTime()
+     */
+    public function getPattern($pattern)
+    {
+        if (is_array($pattern) && 2 == count($pattern)) {
+            return $this->formatInfo->formatDateTime($this->getPattern($pattern[0]), $this->getPattern($pattern[1]));
+        }
+
+        switch ($pattern) {
+            case 'd':
+                return $this->formatInfo->ShortDatePattern;
+
+                break;
+
+            case 'D':
+                return $this->formatInfo->LongDatePattern;
+
+                break;
+
+            case 'p':
+                return $this->formatInfo->MediumDatePattern;
+
+                break;
+
+            case 'P':
+                return $this->formatInfo->FullDatePattern;
+
+                break;
+
+            case 't':
+                return $this->formatInfo->ShortTimePattern;
+
+                break;
+
+            case 'T':
+                return $this->formatInfo->LongTimePattern;
+
+                break;
+
+            case 'q':
+                return $this->formatInfo->MediumTimePattern;
+
+                break;
+
+            case 'Q':
+                return $this->formatInfo->FullTimePattern;
+
+                break;
+
+            case 'f':
+                return $this->formatInfo->formatDateTime($this->formatInfo->LongDatePattern, $this->formatInfo->ShortTimePattern);
+
+                break;
+
+            case 'F':
+                return $this->formatInfo->formatDateTime($this->formatInfo->LongDatePattern, $this->formatInfo->LongTimePattern);
+
+                break;
+
+            case 'g':
+                return $this->formatInfo->formatDateTime($this->formatInfo->ShortDatePattern, $this->formatInfo->ShortTimePattern);
+
+                break;
+
+            case 'G':
+                return $this->formatInfo->formatDateTime($this->formatInfo->ShortDatePattern, $this->formatInfo->LongTimePattern);
+
+                break;
+
+            case 'i':
+                return 'yyyy-MM-dd';
+
+                break;
+
+            case 'I':
+                return 'yyyy-MM-dd HH:mm:ss';
+
+                break;
+
+            case 'M':
+            case 'm':
+                return 'MMMM dd';
+
+                break;
+
+            case 'R':
+            case 'r':
+                return 'EEE, dd MMM yyyy HH:mm:ss';
+
+                break;
+
+            case 's':
+                return 'yyyy-MM-ddTHH:mm:ss';
+
+                break;
+
+            case 'u':
+                return 'yyyy-MM-dd HH:mm:ss z';
+
+                break;
+
+            case 'U':
+                return 'EEEE dd MMMM yyyy HH:mm:ss';
+
+                break;
+
+            case 'Y':
+            case 'y':
+                return 'yyyy MMMM';
+
+                break;
+
+            default:
+                return $pattern;
+        }
     }
-  }
-
-  /**
-   * Gets the pattern from DateTimeFormatInfo or some predefined patterns.
-   * If the $pattern parameter is an array of 2 element, it will assume
-   * that the first element is the date, and second the time
-   * and try to find an appropriate pattern and apply
-   * DateTimeFormatInfo::formatDateTime
-   * See the tutorial documentation for futher details on the patterns.
-   *
-   * @param mixed $pattern a pattern.
-   * @return string a pattern.
-   * @see DateTimeFormatInfo::formatDateTime()
-   */
-  public function getPattern($pattern)
-  {
-    if (is_array($pattern) && count($pattern) == 2)
+
+    /**
+     * Returns an easy to parse input pattern
+     * yy is replaced by yyyy and h by H.
+     *
+     * @param string $pattern pattern
+     *
+     * @return string input pattern
+     */
+    public function getInputPattern($pattern)
     {
-      return $this->formatInfo->formatDateTime($this->getPattern($pattern[0]), $this->getPattern($pattern[1]));
+        $pattern = $this->getPattern($pattern);
+
+        $pattern = strtr($pattern, array('yyyy' => 'Y', 'h' => 'H', 'z' => '', 'a' => ''));
+        $pattern = strtr($pattern, array('yy' => 'yyyy', 'Y' => 'yyyy'));
+
+        return trim($pattern);
     }
 
-    switch ($pattern)
+    /**
+     * For a particular token, get the corresponding function to call.
+     *
+     * @param string $token token
+     *
+     * @return mixed the function if good token, null otherwise
+     */
+    protected function getFunctionName($token)
     {
-      case 'd':
-        return $this->formatInfo->ShortDatePattern;
-        break;
-      case 'D':
-        return $this->formatInfo->LongDatePattern;
-        break;
-      case 'p':
-        return $this->formatInfo->MediumDatePattern;
-        break;
-      case 'P':
-        return $this->formatInfo->FullDatePattern;
-        break;
-      case 't':
-        return $this->formatInfo->ShortTimePattern;
-        break;
-      case 'T':
-        return $this->formatInfo->LongTimePattern;
-        break;
-      case 'q':
-        return $this->formatInfo->MediumTimePattern;
-        break;
-      case 'Q':
-        return $this->formatInfo->FullTimePattern;
-        break;
-      case 'f':
-        return $this->formatInfo->formatDateTime($this->formatInfo->LongDatePattern, $this->formatInfo->ShortTimePattern);
-        break;
-      case 'F':
-        return $this->formatInfo->formatDateTime($this->formatInfo->LongDatePattern, $this->formatInfo->LongTimePattern);
-        break;
-      case 'g':
-        return $this->formatInfo->formatDateTime($this->formatInfo->ShortDatePattern, $this->formatInfo->ShortTimePattern);
-        break;
-      case 'G':
-        return $this->formatInfo->formatDateTime($this->formatInfo->ShortDatePattern, $this->formatInfo->LongTimePattern);
-        break;
-      case 'i':
-        return 'yyyy-MM-dd';
-        break;
-      case 'I':
-        return 'yyyy-MM-dd HH:mm:ss';
-        break;
-      case 'M':
-      case 'm':
-        return 'MMMM dd';
-        break;
-      case 'R':
-      case 'r':
-        return 'EEE, dd MMM yyyy HH:mm:ss';
-        break;
-      case 's':
-        return 'yyyy-MM-ddTHH:mm:ss';
-        break;
-      case 'u':
-        return 'yyyy-MM-dd HH:mm:ss z';
-        break;
-      case 'U':
-        return 'EEEE dd MMMM yyyy HH:mm:ss';
-        break;
-      case 'Y':
-      case 'y':
-        return 'yyyy MMMM';
-        break;
-      default :
-        return $pattern;
+        if (isset($this->tokens[$token[0]])) {
+            return $this->tokens[$token[0]];
+        }
     }
-  }
-
-  /**
-   * Returns an easy to parse input pattern
-   * yy is replaced by yyyy and h by H
-   *
-   * @param string $pattern pattern.
-   * @return string input pattern
-   */
-  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'));
-
-    return trim($pattern);
-  }
-
-  /**
-   * Tokenizes the pattern. The tokens are delimited by group of
-   * similar characters, e.g. 'aabb' will form 2 tokens of 'aa' and 'bb'.
-   * Any substrings, starting and ending with a single quote (')
-   * will be treated as a single token.
-   *
-   * @param string $pattern pattern.
-   * @return array string tokens in an array.
-   */
-  protected function getTokens($pattern)
-  {
-    $char = null;
-    $tokens = array();
-    $token = null;
-
-    $text = false;
-
-    for ($i = 0, $max = strlen($pattern); $i < $max; $i++)
+
+    /**
+     * Tokenizes the pattern. The tokens are delimited by group of
+     * similar characters, e.g. 'aabb' will form 2 tokens of 'aa' and 'bb'.
+     * Any substrings, starting and ending with a single quote (')
+     * will be treated as a single token.
+     *
+     * @param string $pattern pattern
+     *
+     * @return array string tokens in an array
+     */
+    protected function getTokens($pattern)
     {
-      if ($char == null || $pattern[$i] == $char || $text)
-      {
-        $token .= $pattern[$i];
-      }
-      else
-      {
-        $tokens[] = str_replace("''", "'", $token);
-        $token = $pattern[$i];
-      }
-
-      if ($pattern[$i] == "'" && $text == false)
-      {
-        $text = true;
-      }
-      else if ($text && $pattern[$i] == "'" && $char == "'")
-      {
-        $text = true;
-      }
-      else if ($text && $char != "'" && $pattern[$i] == "'")
-      {
+        $char = null;
+        $tokens = array();
+        $token = null;
+
         $text = false;
-      }
 
-      $char = $pattern[$i];
+        for ($i = 0, $max = strlen($pattern); $i < $max; ++$i) {
+            if (null == $char || $pattern[$i] == $char || $text) {
+                $token .= $pattern[$i];
+            } else {
+                $tokens[] = str_replace("''", "'", $token);
+                $token = $pattern[$i];
+            }
+
+            if ("'" == $pattern[$i] && false == $text) {
+                $text = true;
+            } elseif ($text && "'" == $pattern[$i] && "'" == $char) {
+                $text = true;
+            } elseif ($text && "'" != $char && "'" == $pattern[$i]) {
+                $text = false;
+            }
+
+            $char = $pattern[$i];
+        }
+        $tokens[] = $token;
 
+        return $tokens;
     }
-    $tokens[] = $token;
-
-    return $tokens;
-  }
-
-  // makes a unix date from our incomplete $date array
-  protected function getUnixDate($date)
-  {
-    return getdate(mktime($date['hours'], $date['minutes'], $date['seconds'], $date['mon'], $date['mday'], $date['year']));
-  }
-
-  /**
-   * Gets the year.
-   * "yy" will return the last two digits of year.
-   * "y", "yyy" and "yyyy" will return the full integer year.
-   *
-   * @param array  $date    getdate format.
-   * @param string $pattern a pattern.
-   * @return string year
-   */
-  protected function getYear($date, $pattern = 'yyyy')
-  {
-    $year = $date['year'];
-    switch ($pattern)
+
+    // makes a unix date from our incomplete $date array
+    protected function getUnixDate($date)
     {
-      case 'yy':
-        return substr($year, 2);
-      case 'y':
-      case 'yyy':
-      case 'yyyy':
-        return $year;
-      default:
-        throw new sfException('The pattern for year is either "y", "yy", "yyy" or "yyyy".');
+        return getdate(mktime($date['hours'], $date['minutes'], $date['seconds'], $date['mon'], $date['mday'], $date['year']));
     }
-  }
-
-  /**
-   * Gets the month.
-   * "M" will return integer 1 through 12
-   * "MM" will return integer 1 through 12 padded with 0 to two characters width
-   * "MMM" will return the abrreviated month name, e.g. "Jan"
-   * "MMMM" will return the month name, e.g. "January"
-   * "MMMMM" will return the narrow month name, e.g. "J"
-   *
-   * @param array   $date     getdate format.
-   * @param string  $pattern  a pattern.
-   * @return string month name
-   */
-  protected function getMon($date, $pattern = 'M')
-  {
-    $month = $date['mon'];
-
-    switch ($pattern)
+
+    /**
+     * Gets the year.
+     * "yy" will return the last two digits of year.
+     * "y", "yyy" and "yyyy" will return the full integer year.
+     *
+     * @param array  $date    getdate format
+     * @param string $pattern a pattern
+     *
+     * @return string year
+     */
+    protected function getYear($date, $pattern = 'yyyy')
     {
-      case 'M':
-        return $month;
-      case 'MM':
-        return str_pad($month, 2, '0', STR_PAD_LEFT);
-      case 'MMM':
-        return $this->formatInfo->AbbreviatedMonthNames[$month - 1];
-      case 'MMMM':
-        return $this->formatInfo->MonthNames[$month - 1];
-      case 'MMMMM':
-        return $this->formatInfo->NarrowMonthNames[$month - 1];
-      default:
-        throw new sfException('The pattern for month is "M", "MM", "MMM", "MMMM", "MMMMM".');
+        $year = $date['year'];
+
+        switch ($pattern) {
+            case 'yy':
+                return substr($year, 2);
+
+            case 'y':
+            case 'yyy':
+            case 'yyyy':
+                return $year;
+
+            default:
+                throw new sfException('The pattern for year is either "y", "yy", "yyy" or "yyyy".');
+        }
     }
-  }
-
-  /**
-   * Gets the day of the week.
-   * "E" will return integer 0 (for Sunday) through 6 (for Saturday).
-   * "EE" will return the narrow day of the week, e.g. "M"
-   * "EEE" will return the abrreviated day of the week, e.g. "Mon"
-   * "EEEE" will return the day of the week, e.g. "Monday"
-   *
-   * @param array   $date     getdate format.
-   * @param string  $pattern  a pattern.
-   * @return string day of the week.
-   */
-  protected function getWday($date, $pattern = 'EEEE')
-  {
-    // if the $date comes from our home-made get date
-    if (!isset($date['wday']))
+
+    /**
+     * Gets the month.
+     * "M" will return integer 1 through 12
+     * "MM" will return integer 1 through 12 padded with 0 to two characters width
+     * "MMM" will return the abrreviated month name, e.g. "Jan"
+     * "MMMM" will return the month name, e.g. "January"
+     * "MMMMM" will return the narrow month name, e.g. "J".
+     *
+     * @param array  $date    getdate format
+     * @param string $pattern a pattern
+     *
+     * @return string month name
+     */
+    protected function getMon($date, $pattern = 'M')
     {
-      $date = $this->getUnixDate($date);
+        $month = $date['mon'];
+
+        switch ($pattern) {
+            case 'M':
+                return $month;
+
+            case 'MM':
+                return str_pad($month, 2, '0', STR_PAD_LEFT);
+
+            case 'MMM':
+                return $this->formatInfo->AbbreviatedMonthNames[$month - 1];
+
+            case 'MMMM':
+                return $this->formatInfo->MonthNames[$month - 1];
+
+            case 'MMMMM':
+                return $this->formatInfo->NarrowMonthNames[$month - 1];
+
+            default:
+                throw new sfException('The pattern for month is "M", "MM", "MMM", "MMMM", "MMMMM".');
+        }
     }
-    $day = $date['wday'];
 
-    switch ($pattern)
-    {
-      case 'E':
-        return $day;
-        break;
-      case 'EE':
-        return $this->formatInfo->NarrowDayNames[$day];
-      case 'EEE':
-        return $this->formatInfo->AbbreviatedDayNames[$day];
-        break;
-      case 'EEEE':
-        return $this->formatInfo->DayNames[$day];
-        break;
-      default:
-        throw new sfException('The pattern for day of the week is "E", "EE", "EEE", or "EEEE".');
+    /**
+     * Gets the day of the week.
+     * "E" will return integer 0 (for Sunday) through 6 (for Saturday).
+     * "EE" will return the narrow day of the week, e.g. "M"
+     * "EEE" will return the abrreviated day of the week, e.g. "Mon"
+     * "EEEE" will return the day of the week, e.g. "Monday".
+     *
+     * @param array  $date    getdate format
+     * @param string $pattern a pattern
+     *
+     * @return string day of the week
+     */
+    protected function getWday($date, $pattern = 'EEEE')
+    {
+        // if the $date comes from our home-made get date
+        if (!isset($date['wday'])) {
+            $date = $this->getUnixDate($date);
+        }
+        $day = $date['wday'];
+
+        switch ($pattern) {
+            case 'E':
+                return $day;
+
+                break;
+
+            case 'EE':
+                return $this->formatInfo->NarrowDayNames[$day];
+
+            case 'EEE':
+                return $this->formatInfo->AbbreviatedDayNames[$day];
+
+                break;
+
+            case 'EEEE':
+                return $this->formatInfo->DayNames[$day];
+
+                break;
+
+            default:
+                throw new sfException('The pattern for day of the week is "E", "EE", "EEE", or "EEEE".');
+        }
     }
-  }
-
-  /**
-   * Gets the day of the month.
-   * "d" for non-padding, "dd" will always return 2 characters.
-   *
-   * @param array   $date     getdate format.
-   * @param string  $pattern  a pattern.
-   * @return string day of the month
-   */
-  protected function getMday($date, $pattern = 'd')
-  {
-    $day = $date['mday'];
-
-    switch ($pattern)
+
+    /**
+     * Gets the day of the month.
+     * "d" for non-padding, "dd" will always return 2 characters.
+     *
+     * @param array  $date    getdate format
+     * @param string $pattern a pattern
+     *
+     * @return string day of the month
+     */
+    protected function getMday($date, $pattern = 'd')
     {
-      case 'd':
-        return $day;
-      case 'dd':
-        return str_pad($day, 2, '0', STR_PAD_LEFT);
-      case 'dddd':
-        return $this->getWday($date);
-      default:
-        throw new sfException('The pattern for day of the month is "d", "dd" or "dddd".');
+        $day = $date['mday'];
+
+        switch ($pattern) {
+            case 'd':
+                return $day;
+
+            case 'dd':
+                return str_pad($day, 2, '0', STR_PAD_LEFT);
+
+            case 'dddd':
+                return $this->getWday($date);
+
+            default:
+                throw new sfException('The pattern for day of the month is "d", "dd" or "dddd".');
+        }
     }
-  }
-
-  /**
-   * Gets the era. i.e. in gregorian, year > 0 is AD, else BC.
-   *
-   * @todo How to support multiple Eras?, e.g. Japanese.
-   * @param array   $date     getdate format.
-   * @param string  $pattern  a pattern.
-   * @return string era
-   */
-  protected function getEra($date, $pattern = 'G')
-  {
-    if ($pattern != 'G')
-    {
-      throw new sfException('The pattern for era is "G".');
+
+    /**
+     * Gets the era. i.e. in gregorian, year > 0 is AD, else BC.
+     *
+     * @todo How to support multiple Eras?, e.g. Japanese.
+     *
+     * @param array  $date    getdate format
+     * @param string $pattern a pattern
+     *
+     * @return string era
+     */
+    protected function getEra($date, $pattern = 'G')
+    {
+        if ('G' != $pattern) {
+            throw new sfException('The pattern for era is "G".');
+        }
+
+        return $this->formatInfo->getEra($date['year'] > 0 ? 1 : 0);
     }
 
-    return $this->formatInfo->getEra($date['year'] > 0 ? 1 : 0);
-  }
-
-  /**
-   * Gets the hours in 24 hour format, i.e. [0-23].
-   * "H" for non-padding, "HH" will always return 2 characters.
-   *
-   * @param array   $date     getdate format.
-   * @param string  $pattern  a pattern.
-   * @return string hours in 24 hour format.
-   */
-  protected function getHours($date, $pattern = 'H')
-  {
-    $hour = $date['hours'];
-
-    switch ($pattern)
+    /**
+     * Gets the hours in 24 hour format, i.e. [0-23].
+     * "H" for non-padding, "HH" will always return 2 characters.
+     *
+     * @param array  $date    getdate format
+     * @param string $pattern a pattern
+     *
+     * @return string hours in 24 hour format
+     */
+    protected function getHours($date, $pattern = 'H')
     {
-      case 'H':
-        return $hour;
-      case 'HH':
-        return str_pad($hour, 2, '0', STR_PAD_LEFT);
-      default:
-        throw new sfException('The pattern for 24 hour format is "H" or "HH".');
+        $hour = $date['hours'];
+
+        switch ($pattern) {
+            case 'H':
+                return $hour;
+
+            case 'HH':
+                return str_pad($hour, 2, '0', STR_PAD_LEFT);
+
+            default:
+                throw new sfException('The pattern for 24 hour format is "H" or "HH".');
+        }
     }
-  }
-
-  /**
-   * Get the AM/PM designator, 12 noon is PM, 12 midnight is AM.
-   *
-   * @param array   $date     getdate format.
-   * @param string  $pattern  a pattern.
-   * @return string AM or PM designator
-   */
-  protected function getAMPM($date, $pattern = 'a')
-  {
-    if ($pattern != 'a')
+
+    /**
+     * Get the AM/PM designator, 12 noon is PM, 12 midnight is AM.
+     *
+     * @param array  $date    getdate format
+     * @param string $pattern a pattern
+     *
+     * @return string AM or PM designator
+     */
+    protected function getAMPM($date, $pattern = 'a')
     {
-      throw new sfException('The pattern for AM/PM marker is "a".');
+        if ('a' != $pattern) {
+            throw new sfException('The pattern for AM/PM marker is "a".');
+        }
+
+        return $this->formatInfo->AMPMMarkers[(int) ($date['hours'] / 12)];
     }
 
-    return $this->formatInfo->AMPMMarkers[(int) ($date['hours'] / 12)];
-  }
-
-  /**
-   * Gets the hours in 12 hour format.
-   * "h" for non-padding, "hh" will always return 2 characters.
-   *
-   * @param array   $date     getdate format.
-   * @param string  $pattern  a pattern.
-   * @return string hours in 12 hour format.
-   */
-  protected function getHour12($date, $pattern = 'h')
-  {
-    $hour = $date['hours'];
-    $hour = ($hour == 12 | $hour == 0) ? 12 : $hour % 12;
-
-    switch ($pattern)
+    /**
+     * Gets the hours in 12 hour format.
+     * "h" for non-padding, "hh" will always return 2 characters.
+     *
+     * @param array  $date    getdate format
+     * @param string $pattern a pattern
+     *
+     * @return string hours in 12 hour format
+     */
+    protected function getHour12($date, $pattern = 'h')
     {
-      case 'h':
-        return $hour;
-      case 'hh':
-        return str_pad($hour, 2, '0', STR_PAD_LEFT);
-      default:
-        throw new sfException('The pattern for 24 hour format is "H" or "HH".');
+        $hour = $date['hours'];
+        $hour = (12 == $hour | 0 == $hour) ? 12 : $hour % 12;
+
+        switch ($pattern) {
+            case 'h':
+                return $hour;
+
+            case 'hh':
+                return str_pad($hour, 2, '0', STR_PAD_LEFT);
+
+            default:
+                throw new sfException('The pattern for 24 hour format is "H" or "HH".');
+        }
     }
-  }
-
-  /**
-   * Gets the minutes.
-   * "m" for non-padding, "mm" will always return 2 characters.
-   *
-   * @param array   $date     getdate format.
-   * @param string  $pattern  a pattern.
-   * @return string minutes.
-   */
-  protected function getMinutes($date, $pattern = 'm')
-  {
-    $minutes = $date['minutes'];
-
-    switch ($pattern)
+
+    /**
+     * Gets the minutes.
+     * "m" for non-padding, "mm" will always return 2 characters.
+     *
+     * @param array  $date    getdate format
+     * @param string $pattern a pattern
+     *
+     * @return string minutes
+     */
+    protected function getMinutes($date, $pattern = 'm')
     {
-      case 'm':
-        return $minutes;
-      case 'mm':
-        return str_pad($minutes, 2, '0', STR_PAD_LEFT);
-      default:
-        throw new sfException('The pattern for minutes is "m" or "mm".');
+        $minutes = $date['minutes'];
+
+        switch ($pattern) {
+            case 'm':
+                return $minutes;
+
+            case 'mm':
+                return str_pad($minutes, 2, '0', STR_PAD_LEFT);
+
+            default:
+                throw new sfException('The pattern for minutes is "m" or "mm".');
+        }
     }
-  }
-
-  /**
-   * Gets the seconds.
-   * "s" for non-padding, "ss" will always return 2 characters.
-   *
-   * @param array   $date     getdate format.
-   * @param string  $pattern  a pattern.
-   * @return string seconds
-   */
-  protected function getSeconds($date, $pattern = 's')
-  {
-    $seconds = $date['seconds'];
-
-    switch ($pattern)
+
+    /**
+     * Gets the seconds.
+     * "s" for non-padding, "ss" will always return 2 characters.
+     *
+     * @param array  $date    getdate format
+     * @param string $pattern a pattern
+     *
+     * @return string seconds
+     */
+    protected function getSeconds($date, $pattern = 's')
     {
-      case 's':
-        return $seconds;
-      case 'ss':
-        return str_pad($seconds, 2, '0', STR_PAD_LEFT);
-      default:
-        throw new sfException('The pattern for seconds is "s" or "ss".');
+        $seconds = $date['seconds'];
+
+        switch ($pattern) {
+            case 's':
+                return $seconds;
+
+            case 'ss':
+                return str_pad($seconds, 2, '0', STR_PAD_LEFT);
+
+            default:
+                throw new sfException('The pattern for seconds is "s" or "ss".');
+        }
     }
-  }
-
-  /**
-   * Gets the timezone from the server machine.
-   *
-   * @todo How to get the timezone for a different region?
-   * @param array   $date     getdate format.
-   * @param string  $pattern  a pattern.
-   * @return string time zone
-   */
-  protected function getTimeZone($date, $pattern = 'z')
-  {
-    //mapping to PHP pattern symbols
-    switch ($pattern)
-    {
-      case 'z':
-        $pattern = 'T';
-        break;
-      case 'Z':
-        $pattern = 'O';
-      default:
-        throw new sfException('The pattern for time zone is "z" or "Z".');
+
+    /**
+     * Gets the timezone from the server machine.
+     *
+     * @todo How to get the timezone for a different region?
+     *
+     * @param array  $date    getdate format
+     * @param string $pattern a pattern
+     *
+     * @return string time zone
+     */
+    protected function getTimeZone($date, $pattern = 'z')
+    {
+        // mapping to PHP pattern symbols
+        switch ($pattern) {
+            case 'z':
+                $pattern = 'T';
+
+                break;
+
+            case 'Z':
+                $pattern = 'O';
+                // no break
+            default:
+                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']));
     }
 
-    return @date($pattern, @mktime($date['hours'], $date['minutes'], $date['seconds'], $date['mon'], $date['mday'], $date['year']));
-  }
-
-  /**
-   * Gets the day in the year, e.g. [1-366]
-   *
-   * @param array   $date     getdate format.
-   * @param string  $pattern  a pattern.
-   * @return int hours in AM/PM format.
-   */
-  protected function getYday($date, $pattern = 'D')
-  {
-    if ($pattern != 'D')
+    /**
+     * Gets the day in the year, e.g. [1-366].
+     *
+     * @param array  $date    getdate format
+     * @param string $pattern a pattern
+     *
+     * @return int hours in AM/PM format
+     */
+    protected function getYday($date, $pattern = 'D')
     {
-      throw new sfException('The pattern for day in year is "D".');
+        if ('D' != $pattern) {
+            throw new sfException('The pattern for day in year is "D".');
+        }
+
+        return $date['yday'];
     }
 
-    return $date['yday'];
-  }
-
-  /**
-   * Gets day in the month.
-   *
-   * @param array   $date     getdate format.
-   * @param string  $pattern  a pattern.
-   * @return int day in month
-   */
-  protected function getDayInMonth($date, $pattern = 'FF')
-  {
-    switch ($pattern)
+    /**
+     * Gets day in the month.
+     *
+     * @param array  $date    getdate format
+     * @param string $pattern a pattern
+     *
+     * @return int day in month
+     */
+    protected function getDayInMonth($date, $pattern = 'FF')
     {
-      case 'F':
-        return @date('j', @mktime(0, 0, 0, $date['mon'], $date['mday'], $date['year']));
-        break;
-      case 'FF':
-        return @date('d', @mktime(0, 0, 0, $date['mon'], $date['mday'], $date['year']));
-        break;
-      default:
-        throw new sfException('The pattern for day in month is "F" or "FF".');
+        switch ($pattern) {
+            case 'F':
+                return @date('j', @mktime(0, 0, 0, $date['mon'], $date['mday'], $date['year']));
+
+                break;
+
+            case 'FF':
+                return @date('d', @mktime(0, 0, 0, $date['mon'], $date['mday'], $date['year']));
+
+                break;
+
+            default:
+                throw new sfException('The pattern for day in month is "F" or "FF".');
+        }
     }
-  }
-
-  /**
-   * Gets the week in the year.
-   *
-   * @param array   $date     getdate format.
-   * @param string  $pattern  a pattern.
-   * @return int week in year
-   */
-  protected function getWeekInYear($date, $pattern = 'w')
-  {
-    if ($pattern != 'w')
+
+    /**
+     * Gets the week in the year.
+     *
+     * @param array  $date    getdate format
+     * @param string $pattern a pattern
+     *
+     * @return int week in year
+     */
+    protected function getWeekInYear($date, $pattern = 'w')
     {
-      throw new sfException('The pattern for week in year is "w".');
+        if ('w' != $pattern) {
+            throw new sfException('The pattern for week in year is "w".');
+        }
+
+        return @date('W', @mktime(0, 0, 0, $date['mon'], $date['mday'], $date['year']));
     }
 
-    return @date('W', @mktime(0, 0, 0, $date['mon'], $date['mday'], $date['year']));
-  }
-
-  /**
-   * Gets week in the month.
-   *
-   * @param array   $date     getdate format.
-   * @param string  $pattern  a pattern
-   * @return int week in month
-   */
-  protected function getWeekInMonth($date, $pattern = 'W')
-  {
-    if ($pattern != 'W')
+    /**
+     * Gets week in the month.
+     *
+     * @param array  $date    getdate format
+     * @param string $pattern a pattern
+     *
+     * @return int week in month
+     */
+    protected function getWeekInMonth($date, $pattern = 'W')
     {
-      throw new sfException('The pattern for week in month is "W".');
+        if ('W' != $pattern) {
+            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']));
     }
 
-    return @date('W', @mktime(0, 0, 0, $date['mon'], $date['mday'], $date['year'])) - date('W', mktime(0, 0, 0, $date['mon'], 1, $date['year']));
-  }
-
-  /**
-   * Gets the hours [1-24].
-   *
-   * @param array   $date     getdate format.
-   * @param string  $pattern  a pattern.
-   * @return int hours [1-24]
-   */
-  protected function getHourInDay($date, $pattern = 'k')
-  {
-    if ($pattern != 'k')
+    /**
+     * Gets the hours [1-24].
+     *
+     * @param array  $date    getdate format
+     * @param string $pattern a pattern
+     *
+     * @return int hours [1-24]
+     */
+    protected function getHourInDay($date, $pattern = 'k')
     {
-      throw new sfException('The pattern for hour in day is "k".');
+        if ('k' != $pattern) {
+            throw new sfException('The pattern for hour in day is "k".');
+        }
+
+        return $date['hours'] + 1;
     }
 
-    return $date['hours'] + 1;
-  }
-
-  /**
-   * Gets the hours in AM/PM format, e.g [1-12]
-   *
-   * @param array   $date     getdate format.
-   * @param string  $pattern  a pattern.
-   * @return int hours in AM/PM format.
-   */
-  protected function getHourInAMPM($date, $pattern = 'K')
-  {
-    if ($pattern != 'K')
+    /**
+     * Gets the hours in AM/PM format, e.g [1-12].
+     *
+     * @param array  $date    getdate format
+     * @param string $pattern a pattern
+     *
+     * @return int hours in AM/PM format
+     */
+    protected function getHourInAMPM($date, $pattern = 'K')
     {
-      throw new sfException('The pattern for hour in AM/PM is "K".');
-    }
+        if ('K' != $pattern) {
+            throw new sfException('The pattern for hour in AM/PM is "K".');
+        }
 
-    return ($date['hours'] + 1) % 12;
-  }
+        return ($date['hours'] + 1) % 12;
+    }
 }
diff --git a/lib/i18n/sfDateTimeFormatInfo.class.php b/lib/i18n/sfDateTimeFormatInfo.class.php
index 1c7d6d399..874faaede 100644
--- a/lib/i18n/sfDateTimeFormatInfo.class.php
+++ b/lib/i18n/sfDateTimeFormatInfo.class.php
@@ -13,540 +13,537 @@
  * {@link http://prado.sourceforge.net/}
  *
  * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
+ *
  * @version    $Id$
- * @package    symfony
- * @subpackage i18n
  */
 
 /**
- * Defines how DateTime values are formatted and displayed, depending 
+ * Defines how DateTime values are formatted and displayed, depending
  * on the culture.
- * 
- * This class contains information, such as date patterns, time patterns, 
- * and AM/PM designators. 
  *
- * To create a sfDateTimeFormatInfo for a specific culture, create a 
- * sfCultureInfo for that culture and retrieve the sfCultureInfo.sfDateTimeFormat 
+ * This class contains information, such as date patterns, time patterns,
+ * and AM/PM designators.
+ *
+ * To create a sfDateTimeFormatInfo for a specific culture, create a
+ * sfCultureInfo for that culture and retrieve the sfCultureInfo.sfDateTimeFormat
  * property. For example:
  * <code>
  * $culture = new sfCultureInfo('en_AU');
  * $dtfi = $culture->DateTimeFormat;
  * </code>
- * 
- * To create a sfDateTimeFormatInfo for the invariant culture, use 
+ *
+ * To create a sfDateTimeFormatInfo for the invariant culture, use
  * <code>
  * sfDateTimeFormatInfo::getInstance($culture=null);
  * </code>
  * you may pass a sfCultureInfo parameter $culture to get the sfDateTimeFormatInfo
  * for a specific culture.
  *
- * sfDateTime values are formatted using standard or custom patterns stored in 
+ * sfDateTime values are formatted using standard or custom patterns stored in
  * the properties of a sfDateTimeFormatInfo.
- * 
- * The standard patterns can be replaced with custom patterns by setting the 
+ *
+ * The standard patterns can be replaced with custom patterns by setting the
  * associated properties of sfDateTimeFormatInfo.
  *
- * The following table lists the standard format characters for each standard 
- * pattern and the associated sfDateTimeFormatInfo property that can be set to 
+ * The following table lists the standard format characters for each standard
+ * pattern and the associated sfDateTimeFormatInfo property that can be set to
  * modify the standard pattern. The format characters are case-sensitive;
  * for example, 'g' and 'G' represent slightly different patterns.
  *
  * <code>
  *  Format Character    Associated Property     Example Format Pattern (en-US)
  *  --------------------------------------------------------------------------
- *  d                   ShortDatePattern        MM/dd/yyyy 
- *  D                   LongDatePattern         dddd, dd MMMM yyyy 
+ *  d                   ShortDatePattern        MM/dd/yyyy
+ *  D                   LongDatePattern         dddd, dd MMMM yyyy
  *  F                   FullDateTimePattern     dddd, dd MMMM yyyy HH:mm:ss
- *  m, M                MonthDayPattern         MMMM dd 
+ *  m, M                MonthDayPattern         MMMM dd
  *  r, R                RFC1123Pattern          ddd, dd MMM yyyy HH':'mm':'ss 'GMT'
- *  s                   SortableDateTimePattern yyyy'-'MM'-'dd'T'HH':'mm':'ss 
- *  t                   ShortTimePattern        HH:mm 
- *  T                   LongTimePattern         HH:mm:ss 
- *  Y                   YearMonthPattern        yyyy MMMM 
+ *  s                   SortableDateTimePattern yyyy'-'MM'-'dd'T'HH':'mm':'ss
+ *  t                   ShortTimePattern        HH:mm
+ *  T                   LongTimePattern         HH:mm:ss
+ *  Y                   YearMonthPattern        yyyy MMMM
  *  --------------------------------------------------------------------------
  * </code>
  *
  * @author Xiang Wei Zhuo <weizhuo[at]gmail[dot]com>
+ *
  * @version v1.0, last update on Fri Dec 03 22:30:31 EST 2004
- * @package    symfony
- * @subpackage i18n
  */
 class sfDateTimeFormatInfo
 {
-  /**
-   * ICU date time formatting data.
-   */
-  protected $data = array();
-
-  /**
-   * A list of properties that are accessable/writable.
-   */
-  protected $properties = array();
-
-  /**
-   * Allows functions that begins with 'set' to be called directly
-   * as an attribute/property to retrieve the value.
-   *
-   * @return mixed
-   */
-  function __get($name)
-  {
-    $getProperty = 'get'.$name;
-    if (in_array($getProperty, $this->properties))
+    /**
+     * ICU date time formatting data.
+     */
+    protected $data = array();
+
+    /**
+     * A list of properties that are accessable/writable.
+     */
+    protected $properties = array();
+
+    /**
+     * Initializes a new writable instance of the sfDateTimeFormatInfo class
+     * that is dependent on the ICU data for date time formatting
+     * information. <b>N.B.</b>You should not initialize this class directly
+     * unless you know what you are doing. Please use use
+     * sfDateTimeFormatInfo::getInstance() to create an instance.
+     *
+     * @param array $data ICU data for date time formatting
+     *
+     * @see getInstance()
+     */
+    public function __construct($data = array())
+    {
+        $this->properties = get_class_methods($this);
+
+        if (empty($data)) {
+            throw new sfException('Please provide the ICU data to initialize.');
+        }
+
+        $this->data = $data;
+    }
+
+    /**
+     * Allows functions that begins with 'set' to be called directly
+     * as an attribute/property to retrieve the value.
+     *
+     * @param mixed $name
+     *
+     * @return mixed
+     */
+    public function __get($name)
+    {
+        $getProperty = 'get'.$name;
+        if (in_array($getProperty, $this->properties)) {
+            return $this->{$getProperty}();
+        }
+
+        throw new sfException(sprintf('Property %s does not exists.', $name));
+    }
+
+    /**
+     * Allows functions that begins with 'set' to be called directly
+     * as an attribute/property to set the value.
+     *
+     * @param mixed $name
+     * @param mixed $value
+     */
+    public function __set($name, $value)
+    {
+        $setProperty = 'set'.$name;
+        if (in_array($setProperty, $this->properties)) {
+            $this->{$setProperty}($value);
+        } else {
+            throw new sfException(sprintf('Property %s can not be set.', $name));
+        }
+    }
+
+    /**
+     * Gets the default sfDateTimeFormatInfo that is culture-independent (invariant).
+     *
+     * @return sfDateTimeFormatInfo default sfDateTimeFormatInfo
+     */
+    public static function getInvariantInfo()
+    {
+        static $invariant;
+
+        if (null === $invariant) {
+            $invariant = sfCultureInfo::getInvariantCulture()->DateTimeFormat;
+        }
+
+        return $invariant;
+    }
+
+    /**
+     * Returns the sfDateTimeFormatInfo associated with the specified culture.
+     *
+     * @param sfCultureInfo $culture the culture that gets the sfDateTimeFormat property
+     *
+     * @return sfDateTimeFormatInfo sfDateTimeFormatInfo for the specified
+     *                              culture
+     */
+    public static function getInstance($culture = null)
+    {
+        if ($culture instanceof sfCultureInfo) {
+            return $culture->DateTimeFormat;
+        }
+        if (is_string($culture)) {
+            return sfCultureInfo::getInstance($culture)->DateTimeFormat;
+        }
+
+        return sfCultureInfo::getInvariantCulture()->DateTimeFormat;
+    }
+
+    /**
+     * A one-dimensional array of type String containing
+     * the culture-specific abbreviated names of the days
+     * of the week. The array for InvariantInfo contains
+     * "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", and "Sat".
+     *
+     * @return array abbreviated day names
+     */
+    public function getAbbreviatedDayNames()
+    {
+        return $this->data['dayNames']['format']['abbreviated'];
+    }
+
+    /**
+     * Sets the abbreviated day names. The value should be
+     * an array of string starting with Sunday and ends in Saturady.
+     * For example,
+     * <code>array("Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat");</code>.
+     *
+     * @param array $value abbreviated day names
+     */
+    public function setAbbreviatedDayNames($value)
+    {
+        $this->data['dayNames']['format']['abbreviated'] = $value;
+    }
+
+    /**
+     * A one-dimensional array of type String containing
+     * the culture-specific narrow names of the days
+     * of the week. The array for InvariantInfo contains
+     * "S", "M", "T", "W", "T", "F", and "S".
+     *
+     * @return array narrow day names
+     */
+    public function getNarrowDayNames()
+    {
+        return $this->data['dayNames']['stand-alone']['narrow'];
+    }
+
+    /**
+     * Sets the narrow day names. The value should be
+     * an array of string starting with Sunday and ends in Saturady.
+     * For example,
+     * <code>array("S", "M", "T", "W", "T", "F", "S");</code>.
+     *
+     * @param array $value narrow day names
+     */
+    public function setNarrowDayNames($value)
+    {
+        $this->data['dayNames']['stand-alone']['narrow'] = $value;
+    }
+
+    /**
+     * A one-dimensional array of type String containing the
+     * culture-specific full names of the days of the week.
+     * The array for InvariantInfo contains "Sunday", "Monday",
+     * "Tuesday", "Wednesday", "Thursday", "Friday", and "Saturday".
+     *
+     * @return array day names
+     */
+    public function getDayNames()
+    {
+        return $this->data['dayNames']['format']['wide'];
+    }
+
+    /**
+     * Sets the day names. The value should be
+     * an array of string starting with Sunday and ends in Saturady.
+     * For example,
+     * <code>array("Sunday", "Monday", "Tuesday", "Wednesday", "Thursday",
+     * "Friday", "Saturday".);</code>.
+     *
+     * @param array $value day names
+     */
+    public function setDayNames($value)
+    {
+        $this->data['dayNames']['format']['wide'] = $value;
+    }
+
+    /**
+     * A one-dimensional array of type String containing the
+     * culture-specific narrow names of the months. The array
+     * for InvariantInfo contains "J", "F", "M", "A", "M", "J",
+     * "J", "A", "S", "O", "N", and "D".
+     *
+     * @return array narrow month names
+     */
+    public function getNarrowMonthNames()
+    {
+        return $this->data['monthNames']['stand-alone']['narrow'];
+    }
+
+    /**
+     * Sets the narrow month names. The value should be
+     * an array of string starting with J and ends in D.
+     * For example,
+     * <code>array("J","F","M","A","M","J","J","A","S","O","N","D");</code>.
+     *
+     * @param array $value month names
+     */
+    public function setNarrowMonthNames($value)
+    {
+        $this->data['monthNames']['stand-alone']['narrow'] = $value;
+    }
+
+    /**
+     * A one-dimensional array of type String containing the
+     * culture-specific abbreviated names of the months. The array
+     * for InvariantInfo contains "Jan", "Feb", "Mar", "Apr", "May",
+     * "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", and "Dec".
+     *
+     * Returns wide names if abbreviated names doesn't exist.
+     *
+     * @return array abbreviated month names
+     */
+    public function getAbbreviatedMonthNames()
+    {
+        if (isset($this->data['monthNames']['format']['abbreviated'])) {
+            return $this->data['monthNames']['format']['abbreviated'];
+        }
+
+        return $this->data['monthNames']['format']['wide'];
+    }
+
+    /**
+     * Sets the abbreviated month names. The value should be
+     * an array of string starting with Jan and ends in Dec.
+     * For example,
+     * <code>array("Jan", "Feb", "Mar", "Apr", "May", "Jun",
+     * "Jul", "Aug", "Sep","Oct","Nov","Dec");</code>.
+     *
+     * @param array $value month names
+     */
+    public function setAbbreviatedMonthNames($value)
+    {
+        $this->data['monthNames']['format']['abbreviated'] = $value;
+    }
+
+    /**
+     * A one-dimensional array of type String containing the
+     * culture-specific full names of the months. The array for
+     * InvariantInfo contains "January", "February", "March", "April",
+     * "May", "June", "July", "August", "September", "October", "November",
+     * and "December".
+     *
+     * @return array month names
+     */
+    public function getMonthNames()
+    {
+        return $this->data['monthNames']['format']['wide'];
+    }
+
+    /**
+     * Sets the month names. The value should be
+     * an array of string starting with Janurary and ends in December.
+     * For example,
+     * <code>array("January", "February", "March", "April", "May", "June",
+     * "July", "August", "September","October","November","December");</code>.
+     *
+     * @param array $value month names
+     */
+    public function setMonthNames($value)
+    {
+        $this->data['monthNames']['format']['wide'] = $value;
+    }
+
+    /**
+     * A string containing the name of the era.
+     *
+     * @param int $era era The integer representing the era
+     *
+     * @return string the era name
+     */
+    public function getEra($era)
+    {
+        return $this->data['eras']['abbreviated'][$era];
+    }
+
+    /**
+     * The string designator for hours that are "ante meridiem" (before noon).
+     * The default for InvariantInfo is "AM".
+     *
+     * @return string AM designator
+     */
+    public function getAMDesignator()
+    {
+        $result = $this->getAMPMMarkers();
+
+        return $result[0];
+    }
+
+    /**
+     * Sets the AM Designator. For example, 'AM'.
+     *
+     * @param string $value AM designator
+     */
+    public function setAMDesignator($value)
+    {
+        $markers = $this->getAMPMMarkers();
+        $markers[0] = $value;
+        $this->setAMPMMarkers($markers);
+    }
+
+    /**
+     * The string designator for hours that are "post meridiem" (after noon).
+     * The default for InvariantInfo is "PM".
+     *
+     * @return string PM designator
+     */
+    public function getPMDesignator()
+    {
+        $result = $this->getAMPMMarkers();
+
+        return $result[1];
+    }
+
+    /**
+     * Sets the PM Designator. For example, 'PM'.
+     *
+     * @param string $value PM designator
+     */
+    public function setPMDesignator($value)
+    {
+        $markers = $this->getAMPMMarkers();
+        $markers[1] = $value;
+        $this->setAMPMMarkers($markers);
+    }
+
+    /**
+     * Gets the AM and PM markers array.
+     * Default InvariantInfo for AM and PM is <code>array('AM','PM');</code>.
+     *
+     * @return array AM and PM markers
+     */
+    public function getAMPMMarkers()
+    {
+        return $this->data['AmPmMarkers'];
+    }
+
+    /**
+     * Sets the AM and PM markers array.
+     * For example <code>array('AM','PM');</code>.
+     *
+     * @param array $value AM and PM markers
+     */
+    public function setAMPMMarkers($value)
+    {
+        $this->data['AmPmMarkers'] = $value;
+    }
+
+    /**
+     * Returns the full time pattern "HH:mm:ss z" (default).
+     * This is culture sensitive.
+     *
+     * @return string pattern "HH:mm:ss z"
+     */
+    public function getFullTimePattern()
+    {
+        return $this->data['DateTimePatterns'][0];
+    }
+
+    /**
+     * Returns the long time pattern "HH:mm:ss z" (default).
+     * This is culture sensitive.
+     *
+     * @return string pattern "HH:mm:ss z"
+     */
+    public function getLongTimePattern()
+    {
+        return $this->data['DateTimePatterns'][1];
+    }
+
+    /**
+     * Returns the medium time pattern "HH:mm:ss" (default).
+     * This is culture sensitive.
+     *
+     * @return string pattern "HH:mm:ss"
+     */
+    public function getMediumTimePattern()
+    {
+        return $this->data['DateTimePatterns'][2];
+    }
+
+    /**
+     * Returns the short time pattern "HH:mm" (default).
+     * This is culture sensitive.
+     *
+     * @return string pattern "HH:mm"
+     */
+    public function getShortTimePattern()
+    {
+        return $this->data['DateTimePatterns'][3];
+    }
+
+    /**
+     * Returns the full date pattern "EEEE, yyyy MMMM dd" (default).
+     * This is culture sensitive.
+     *
+     * @return string pattern "EEEE, yyyy MMMM dd"
+     */
+    public function getFullDatePattern()
+    {
+        return $this->data['DateTimePatterns'][4];
+    }
+
+    /**
+     * Returns the long date pattern "yyyy MMMM d" (default).
+     * This is culture sensitive.
+     *
+     * @return string pattern "yyyy MMMM d"
+     */
+    public function getLongDatePattern()
+    {
+        return $this->data['DateTimePatterns'][5];
+    }
+
+    /**
+     * Returns the medium date pattern "yyyy MMMM d" (default).
+     * This is culture sensitive.
+     *
+     * @return string pattern "yyyy MMM d"
+     */
+    public function getMediumDatePattern()
+    {
+        return $this->data['DateTimePatterns'][6];
+    }
+
+    /**
+     * Returns the short date pattern "yy/MM/dd" (default).
+     * This is culture sensitive.
+     *
+     * @return string pattern "yy/MM/dd"
+     */
+    public function getShortDatePattern()
+    {
+        return $this->data['DateTimePatterns'][7];
+    }
+
+    /**
+     * Returns the date time order pattern, "{1} {0}" (default).
+     * This is culture sensitive.
+     *
+     * @return string pattern "{1} {0}"
+     */
+    public function getDateTimeOrderPattern()
+    {
+        return $this->data['DateTimePatterns'][8];
+    }
+
+    /**
+     * Formats the date and time in a culture sensitive paterrn.
+     * The default is "Date Time".
+     *
+     * @param mixed $date
+     * @param mixed $time
+     *
+     * @return string date and time formated
+     */
+    public function formatDateTime($date, $time)
+    {
+        return str_replace(array('{0}', '{1}'), array($time, $date), $this->getDateTimeOrderPattern());
+    }
+
+    /**
+     * Gets the internal ICU data for date time formatting.
+     *
+     * @return array ICU date time formatting data
+     */
+    protected function getData()
     {
-      return $this->$getProperty();
+        return $this->data;
     }
-    else
-    {
-      throw new sfException(sprintf('Property %s does not exists.', $name));
-    }
-  }
-
-  /**
-   * Allows functions that begins with 'set' to be called directly
-   * as an attribute/property to set the value.
-   */
-  function __set($name, $value)
-  {
-    $setProperty = 'set'.$name;
-    if (in_array($setProperty, $this->properties))
-    {
-      $this->$setProperty($value);
-    }
-    else
-    {
-      throw new sfException(sprintf('Property %s can not be set.', $name));
-    }
-  }
-
-  /**
-   * Initializes a new writable instance of the sfDateTimeFormatInfo class 
-   * that is dependent on the ICU data for date time formatting 
-   * information. <b>N.B.</b>You should not initialize this class directly
-   * unless you know what you are doing. Please use use 
-   * sfDateTimeFormatInfo::getInstance() to create an instance.
-   *
-   * @param array   $data ICU data for date time formatting.
-   * @see getInstance()
-   */
-  function __construct($data = array())
-  {
-    $this->properties = get_class_methods($this);
-
-    if (empty($data))
-    {
-      throw new sfException('Please provide the ICU data to initialize.');
-    }
-
-    $this->data = $data;
-  }
-
-  /**
-   * Gets the internal ICU data for date time formatting.
-   *
-   * @return array ICU date time formatting data.
-   */
-  protected function getData()
-  {
-    return $this->data;
-  }
-
-  /**
-   * Gets the default sfDateTimeFormatInfo that is culture-independent (invariant).
-   *
-   * @return sfDateTimeFormatInfo default sfDateTimeFormatInfo. 
-   */
-  static function getInvariantInfo()
-  {
-    static $invariant;
-
-    if (null === $invariant)
-    {
-      $invariant = sfCultureInfo::getInvariantCulture()->DateTimeFormat;
-    }
-
-    return $invariant;
-  }
-
-  /**
-   * Returns the sfDateTimeFormatInfo associated with the specified culture.
-   *
-   * @param sfCultureInfo   $culture  the culture that gets the sfDateTimeFormat property.
-   * @return sfDateTimeFormatInfo sfDateTimeFormatInfo for the specified
-   * culture.
-   */
-  static function getInstance($culture = null)
-  {
-    if ($culture instanceof sfCultureInfo)
-    {
-      return $culture->DateTimeFormat;
-    }
-    else if (is_string($culture))
-    {
-      return sfCultureInfo::getInstance($culture)->DateTimeFormat;
-    }
-    else
-    {
-      return sfCultureInfo::getInvariantCulture()->DateTimeFormat;
-    }
-  }
-
-  /**
-   * A one-dimensional array of type String containing
-   * the culture-specific abbreviated names of the days
-   * of the week. The array for InvariantInfo contains
-   * "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", and "Sat".
-   *
-   * @return array abbreviated day names
-   */
-  function getAbbreviatedDayNames()
-  {
-    return $this->data['dayNames']['format']['abbreviated'];
-  }
-
-  /**
-   * Sets the abbreviated day names. The value should be
-   * an array of string starting with Sunday and ends in Saturady.
-   * For example,
-   * <code>array("Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat");</code>
-   *
-   * @param array $value abbreviated day names.
-   */
-  function setAbbreviatedDayNames($value)
-  {
-    $this->data['dayNames']['format']['abbreviated'] = $value;
-  }
-
-  /**
-   * A one-dimensional array of type String containing
-   * the culture-specific narrow names of the days
-   * of the week. The array for InvariantInfo contains
-   * "S", "M", "T", "W", "T", "F", and "S".
-   *
-   * @return array narrow day names
-   */
-  function getNarrowDayNames()
-  {
-    return $this->data['dayNames']['stand-alone']['narrow'];
-  }
-
-  /**
-   * Sets the narrow day names. The value should be
-   * an array of string starting with Sunday and ends in Saturady.
-   * For example,
-   * <code>array("S", "M", "T", "W", "T", "F", "S");</code>
-   *
-   * @param array $value narrow day names.
-   */
-  function setNarrowDayNames($value)
-  {
-    $this->data['dayNames']['stand-alone']['narrow'] = $value;
-  }
-
-  /**
-   * A one-dimensional array of type String containing the
-   * culture-specific full names of the days of the week.
-   * The array for InvariantInfo contains "Sunday", "Monday",
-   * "Tuesday", "Wednesday", "Thursday", "Friday", and "Saturday".
-   *
-   * @return array day names
-   */
-  function getDayNames()
-  {
-    return $this->data['dayNames']['format']['wide'];
-  }
-
-  /**
-   * Sets the day names. The value should be
-   * an array of string starting with Sunday and ends in Saturady.
-   * For example,
-   * <code>array("Sunday", "Monday", "Tuesday", "Wednesday", "Thursday",
-   * "Friday", "Saturday".);</code>
-   *
-   * @param array $value day names.
-   */
-  function setDayNames($value)
-  {
-    $this->data['dayNames']['format']['wide'] = $value;
-  }
-
-  /**
-   * A one-dimensional array of type String containing the
-   * culture-specific narrow names of the months. The array
-   * for InvariantInfo contains "J", "F", "M", "A", "M", "J",
-   * "J", "A", "S", "O", "N", and "D".
-   *
-   * @return array narrow month names.
-   */
-  function getNarrowMonthNames()
-  {
-    return $this->data['monthNames']['stand-alone']['narrow'];
-  }
-
-  /**
-   * Sets the narrow month names. The value should be
-   * an array of string starting with J and ends in D.
-   * For example,
-   * <code>array("J","F","M","A","M","J","J","A","S","O","N","D");</code>
-   *
-   * @param array $value month names.
-   */
-  function setNarrowMonthNames($value)
-  {
-    $this->data['monthNames']['stand-alone']['narrow'] = $value;
-  }
-
-  /**
-   * A one-dimensional array of type String containing the 
-   * culture-specific abbreviated names of the months. The array 
-   * for InvariantInfo contains "Jan", "Feb", "Mar", "Apr", "May", 
-   * "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", and "Dec".
-   *
-   * Returns wide names if abbreviated names doesn't exist.
-   *
-   * @return array abbreviated month names.
-   */
-  function getAbbreviatedMonthNames()
-  {
-    if (isset($this->data['monthNames']['format']['abbreviated']))
-    {
-      return $this->data['monthNames']['format']['abbreviated'];
-    }
-    else
-    {
-      return $this->data['monthNames']['format']['wide'];
-    }
-  }
-
-  /**
-   * Sets the abbreviated month names. The value should be
-   * an array of string starting with Jan and ends in Dec.
-   * For example,
-   * <code>array("Jan", "Feb", "Mar", "Apr", "May", "Jun",
-   * "Jul", "Aug", "Sep","Oct","Nov","Dec");</code>
-   *
-   * @param array $value month names.
-   */
-  function setAbbreviatedMonthNames($value)
-  {
-    $this->data['monthNames']['format']['abbreviated'] = $value;
-  }
-
-  /**
-   * A one-dimensional array of type String containing the 
-   * culture-specific full names of the months. The array for 
-   * InvariantInfo contains "January", "February", "March", "April",
-   * "May", "June", "July", "August", "September", "October", "November",
-   * and "December"
-   *
-   * @return array month names.
-   */
-  function getMonthNames()
-  {
-    return $this->data['monthNames']['format']['wide'];
-  }
-
-  /**
-   * Sets the month names. The value should be
-   * an array of string starting with Janurary and ends in December.
-   * For example,
-   * <code>array("January", "February", "March", "April", "May", "June",
-   * "July", "August", "September","October","November","December");</code>
-   *
-   * @param array $value month names.
-   */
-  function setMonthNames($value)
-  {
-    $this->data['monthNames']['format']['wide'] = $value;
-  }
-
-  /**
-   * A string containing the name of the era.
-   *
-   * @param int $era era The integer representing the era. 
-   * @return string the era name.
-   */
-  function getEra($era)
-  {
-    return $this->data['eras']['abbreviated'][$era];
-  }
-
-  /**
-   * The string designator for hours that are "ante meridiem" (before noon).
-   * The default for InvariantInfo is "AM".
-   *
-   * @return string AM designator.
-   */
-  function getAMDesignator()
-  {
-    $result = $this->getAMPMMarkers();
-
-    return $result[0];
-  }
-
-  /**
-   * Sets the AM Designator. For example, 'AM'.
-   *
-   * @param string $value AM designator.
-   */
-  function setAMDesignator($value)
-  {
-    $markers = $this->getAMPMMarkers();
-    $markers[0] = $value;
-    $this->setAMPMMarkers($markers);
-  }
-
-  /**
-   * The string designator for hours that are "post meridiem" (after noon).
-   * The default for InvariantInfo is "PM".
-   *
-   * @return string PM designator.
-   */
-  function getPMDesignator()
-  {
-    $result = $this->getAMPMMarkers();
-
-    return $result[1];
-  }
-
-  /**
-   * Sets the PM Designator. For example, 'PM'.
-   *
-   * @param string $value PM designator.
-   */
-  function setPMDesignator($value)
-  {
-    $markers = $this->getAMPMMarkers();
-    $markers[1] = $value;
-    $this->setAMPMMarkers($markers);
-  }
-
-  /**
-   * Gets the AM and PM markers array.
-   * Default InvariantInfo for AM and PM is <code>array('AM','PM');</code>
-   *
-   * @return array AM and PM markers
-   */
-  function getAMPMMarkers()
-  {
-    return $this->data['AmPmMarkers'];
-  }
-
-  /**
-   * Sets the AM and PM markers array.
-   * For example <code>array('AM','PM');</code>
-   *
-   * @param array $value AM and PM markers
-   */
-  function setAMPMMarkers($value)
-  {
-    $this->data['AmPmMarkers'] = $value;
-  }
-
-  /**
-   * Returns the full time pattern "HH:mm:ss z" (default).
-   * This is culture sensitive.
-   *
-   * @return string pattern "HH:mm:ss z".
-   */
-  function getFullTimePattern()
-  {
-    return $this->data['DateTimePatterns'][0];
-  }
-
-  /**
-   * Returns the long time pattern "HH:mm:ss z" (default).
-   * This is culture sensitive.
-   *
-   * @return string pattern "HH:mm:ss z".
-   */
-  function getLongTimePattern()
-  {
-    return $this->data['DateTimePatterns'][1];
-  }
-
-  /**
-   * Returns the medium time pattern "HH:mm:ss" (default).
-   * This is culture sensitive.
-   *
-   * @return string pattern "HH:mm:ss".
-   */
-  function getMediumTimePattern()
-  {
-    return $this->data['DateTimePatterns'][2];
-  }
-
-  /**
-   * Returns the short time pattern "HH:mm" (default).
-   * This is culture sensitive.
-   *
-   * @return string pattern "HH:mm".
-   */
-  function getShortTimePattern()
-  {
-    return $this->data['DateTimePatterns'][3];
-  }
-
-  /**
-   * Returns the full date pattern "EEEE, yyyy MMMM dd" (default).
-   * This is culture sensitive.
-   * @return string pattern "EEEE, yyyy MMMM dd".
-   */
-  function getFullDatePattern()
-  {
-    return $this->data['DateTimePatterns'][4];
-  }
-
-  /**
-   * Returns the long date pattern "yyyy MMMM d" (default).
-   * This is culture sensitive.
-   * @return string pattern "yyyy MMMM d".
-   */
-  function getLongDatePattern()
-  {
-    return $this->data['DateTimePatterns'][5];
-  }
-
-  /**
-   * Returns the medium date pattern "yyyy MMMM d" (default).
-   * This is culture sensitive.
-   * @return string pattern "yyyy MMM d".
-   */
-  function getMediumDatePattern()
-  {
-    return $this->data['DateTimePatterns'][6];
-  }
-
-  /**
-   * Returns the short date pattern "yy/MM/dd" (default).
-   * This is culture sensitive.
-   *
-   * @return string pattern "yy/MM/dd".
-   */
-  function getShortDatePattern()
-  {
-    return $this->data['DateTimePatterns'][7];
-  }
-
-  /**
-   * Returns the date time order pattern, "{1} {0}" (default).
-   * This is culture sensitive.
-   *
-   * @return string pattern "{1} {0}".
-   */
-  function getDateTimeOrderPattern()
-  {
-    return $this->data['DateTimePatterns'][8];
-  }
-
-  /**
-   * Formats the date and time in a culture sensitive paterrn.
-   * The default is "Date Time".
-   *
-   * @return string date and time formated
-   */
-  function formatDateTime($date, $time)
-  {
-    return str_replace(array('{0}','{1}'), array($time, $date), $this->getDateTimeOrderPattern());
-  }
 }
diff --git a/lib/i18n/sfI18N.class.php b/lib/i18n/sfI18N.class.php
index c236c9d2a..0a9803db3 100644
--- a/lib/i18n/sfI18N.class.php
+++ b/lib/i18n/sfI18N.class.php
@@ -11,428 +11,400 @@
 /**
  * sfI18N wraps the core i18n classes for a symfony context.
  *
- * @package    symfony
- * @subpackage i18n
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfI18N
 {
-  protected
-    $configuration = null,
-    $dispatcher    = null,
-    $cache         = null,
-    $options       = array(),
-    $culture       = 'en',
-    $messageSource = null,
-    $messageFormat = null;
-
-  /**
-   * Class constructor.
-   *
-   * @see initialize()
-   */
-  public function __construct(sfApplicationConfiguration $configuration, sfCache $cache = null, $options = array())
-  {
-    $this->initialize($configuration, $cache, $options);
-  }
-
-  /**
-   * Initializes this class.
-   *
-   * Available options:
-   *
-   *  * culture:             The culture
-   *  * source:              The i18n source (XLIFF by default)
-   *  * debug:               Whether to enable debug or not (false by default)
-   *  * database:            The database name (default by default)
-   *  * 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
-   */
-  public function initialize(sfApplicationConfiguration $configuration, sfCache $cache = null, $options = array())
-  {
-    $this->configuration = $configuration;
-    $this->dispatcher = $configuration->getEventDispatcher();
-    $this->cache = $cache;
-
-    if (isset($options['culture']))
+    protected $configuration;
+    protected $dispatcher;
+    protected $cache;
+    protected $options = array();
+    protected $culture = 'en';
+    protected $messageSource;
+    protected $messageFormat;
+
+    /**
+     * Class constructor.
+     *
+     * @see initialize()
+     *
+     * @param mixed $options
+     */
+    public function __construct(sfApplicationConfiguration $configuration, sfCache $cache = null, $options = array())
     {
-      $this->setCulture($options['culture']);
-      unset($options['culture']);
+        $this->initialize($configuration, $cache, $options);
     }
 
-    $this->options = array_merge(array(
-      'source'              => 'XLIFF',
-      'debug'               => false,
-      'database'            => 'default',
-      'untranslated_prefix' => '[T]',
-      'untranslated_suffix' => '[/T]',
-    ), $options);
-
-    $this->dispatcher->connect('user.change_culture', array($this, 'listenToChangeCultureEvent'));
+    /**
+     * Gets the translation for the given string.
+     *
+     * @param string $string    The string to translate
+     * @param array  $args      An array of arguments for the translation
+     * @param string $catalogue The catalogue name
+     *
+     * @return string The translated string
+     */
+    public function __($string, $args = array(), $catalogue = 'messages')
+    {
+        return $this->getMessageFormat()->format($string, $args, $catalogue);
+    }
 
-    if($this->isMessageSourceFileBased($this->options['source']))
+    /**
+     * Initializes this class.
+     *
+     * Available options:
+     *
+     *  * culture:             The culture
+     *  * source:              The i18n source (XLIFF by default)
+     *  * debug:               Whether to enable debug or not (false by default)
+     *  * database:            The database name (default by default)
+     *  * 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
+     */
+    public function initialize(sfApplicationConfiguration $configuration, sfCache $cache = null, $options = array())
     {
-      $this->dispatcher->connect('controller.change_action', array($this, 'listenToChangeActionEvent'));
+        $this->configuration = $configuration;
+        $this->dispatcher = $configuration->getEventDispatcher();
+        $this->cache = $cache;
+
+        if (isset($options['culture'])) {
+            $this->setCulture($options['culture']);
+            unset($options['culture']);
+        }
+
+        $this->options = array_merge(array(
+            'source' => 'XLIFF',
+            'debug' => false,
+            'database' => 'default',
+            'untranslated_prefix' => '[T]',
+            'untranslated_suffix' => '[/T]',
+        ), $options);
+
+        $this->dispatcher->connect('user.change_culture', array($this, 'listenToChangeCultureEvent'));
+
+        if ($this->isMessageSourceFileBased($this->options['source'])) {
+            $this->dispatcher->connect('controller.change_action', array($this, 'listenToChangeActionEvent'));
+        }
     }
-  }
-
-  /**
-   * Returns the initialization options
-   *
-   * @return array The options used to initialize sfI18n
-   */
-  public function getOptions()
-  {
-    return $this->options;
-  }
-
-  /**
-   * Returns the configuration instance.
-   *
-   * @return sfApplicationConfiguration An sfApplicationConfiguration instance
-   */
-  public function getConfiguration()
-  {
-    return $this->configuration;
-  }
-
-  /**
-   * Sets the message source.
-   *
-   * @param mixed  $dirs    An array of i18n directories if message source is a sfMessageSource_File subclass, null otherwise
-   * @param string $culture The culture
-   */
-  public function setMessageSource($dirs, $culture = null)
-  {
-    if (null === $dirs)
+
+    /**
+     * Returns the initialization options.
+     *
+     * @return array The options used to initialize sfI18n
+     */
+    public function getOptions()
     {
-      $this->messageSource = $this->createMessageSource();
+        return $this->options;
     }
-    else
+
+    /**
+     * Returns the configuration instance.
+     *
+     * @return sfApplicationConfiguration An sfApplicationConfiguration instance
+     */
+    public function getConfiguration()
     {
-      $this->messageSource = sfMessageSource::factory('Aggregate', array_map(array($this, 'createMessageSource'), $dirs));
+        return $this->configuration;
     }
 
-    if (null !== $this->cache)
+    /**
+     * Sets the message source.
+     *
+     * @param mixed  $dirs    An array of i18n directories if message source is a sfMessageSource_File subclass, null otherwise
+     * @param string $culture The culture
+     */
+    public function setMessageSource($dirs, $culture = null)
     {
-      $this->messageSource->setCache($this->cache);
+        if (null === $dirs) {
+            $this->messageSource = $this->createMessageSource();
+        } else {
+            $this->messageSource = sfMessageSource::factory('Aggregate', array_map(array($this, 'createMessageSource'), $dirs));
+        }
+
+        if (null !== $this->cache) {
+            $this->messageSource->setCache($this->cache);
+        }
+
+        if (null !== $culture) {
+            $this->setCulture($culture);
+        } else {
+            $this->messageSource->setCulture($this->culture);
+        }
+
+        $this->messageFormat = null;
     }
 
-    if (null !== $culture)
+    /**
+     * Returns a new message source.
+     *
+     * @param mixed $dir An array of i18n directories to create a XLIFF or gettext message source, null otherwise
+     *
+     * @return sfMessageSource A sfMessageSource object
+     */
+    public function createMessageSource($dir = null)
     {
-      $this->setCulture($culture);
+        return sfMessageSource::factory($this->options['source'], self::isMessageSourceFileBased($this->options['source']) ? $dir : $this->options['database']);
     }
-    else
+
+    /**
+     * Gets the current culture for i18n format objects.
+     *
+     * @return string The culture
+     */
+    public function getCulture()
     {
-      $this->messageSource->setCulture($this->culture);
+        return $this->culture;
     }
 
-    $this->messageFormat = null;
-  }
-
-  /**
-   * Returns a new message source.
-   *
-   * @param  mixed $dir An array of i18n directories to create a XLIFF or gettext message source, null otherwise
-   *
-   * @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']);
-  }
-
-  /**
-   * Gets the current culture for i18n format objects.
-   *
-   * @return string The culture
-   */
-  public function getCulture()
-  {
-    return $this->culture;
-  }
-
-  /**
-   * Sets the current culture for i18n format objects.
-   *
-   * @param string $culture The culture
-   */
-  public function setCulture($culture)
-  {
-    $this->culture = $culture;
-
-    // change user locale for formatting, collation, and internal error messages
-    setlocale(LC_ALL, 'en_US.utf8', 'en_US.UTF8', 'en_US.utf-8', 'en_US.UTF-8');
-    setlocale(LC_COLLATE, $culture.'.utf8', $culture.'.UTF8', $culture.'.utf-8', $culture.'.UTF-8');
-    setlocale(LC_CTYPE, $culture.'.utf8', $culture.'.UTF8', $culture.'.utf-8', $culture.'.UTF-8');
-    setlocale(LC_MONETARY, $culture.'.utf8', $culture.'.UTF8', $culture.'.utf-8', $culture.'.UTF-8');
-    setlocale(LC_TIME, $culture.'.utf8', $culture.'.UTF8', $culture.'.utf-8', $culture.'.UTF-8');
-
-    if ($this->messageSource)
+    /**
+     * Sets the current culture for i18n format objects.
+     *
+     * @param string $culture The culture
+     */
+    public function setCulture($culture)
     {
-      $this->messageSource->setCulture($culture);
-      $this->messageFormat = null;
+        $this->culture = $culture;
+
+        // change user locale for formatting, collation, and internal error messages
+        setlocale(LC_ALL, 'en_US.utf8', 'en_US.UTF8', 'en_US.utf-8', 'en_US.UTF-8');
+        setlocale(LC_COLLATE, $culture.'.utf8', $culture.'.UTF8', $culture.'.utf-8', $culture.'.UTF-8');
+        setlocale(LC_CTYPE, $culture.'.utf8', $culture.'.UTF8', $culture.'.utf-8', $culture.'.UTF-8');
+        setlocale(LC_MONETARY, $culture.'.utf8', $culture.'.UTF8', $culture.'.utf-8', $culture.'.UTF-8');
+        setlocale(LC_TIME, $culture.'.utf8', $culture.'.UTF8', $culture.'.utf-8', $culture.'.UTF-8');
+
+        if ($this->messageSource) {
+            $this->messageSource->setCulture($culture);
+            $this->messageFormat = null;
+        }
     }
-  }
-
-  /**
-   * Gets the message source.
-   *
-   * @return sfMessageSource A sfMessageSource object
-   */
-  public function getMessageSource()
-  {
-    if (!isset($this->messageSource))
+
+    /**
+     * Gets the message source.
+     *
+     * @return sfMessageSource A sfMessageSource object
+     */
+    public function getMessageSource()
     {
-      $dirs = ($this->isMessageSourceFileBased($this->options['source'])) ? $this->configuration->getI18NGlobalDirs() : null;
-      $this->setMessageSource($dirs, $this->culture);
+        if (!isset($this->messageSource)) {
+            $dirs = ($this->isMessageSourceFileBased($this->options['source'])) ? $this->configuration->getI18NGlobalDirs() : null;
+            $this->setMessageSource($dirs, $this->culture);
+        }
+
+        return $this->messageSource;
     }
 
-    return $this->messageSource;
-  }
-
-  /**
-   * Gets the message format.
-   *
-   * @return sfMessageFormat A sfMessageFormat object
-   */
-  public function getMessageFormat()
-  {
-    if (!isset($this->messageFormat))
+    /**
+     * Gets the message format.
+     *
+     * @return sfMessageFormat A sfMessageFormat object
+     */
+    public function getMessageFormat()
     {
-      $this->messageFormat = new sfMessageFormat($this->getMessageSource(), sfConfig::get('sf_charset'));
+        if (!isset($this->messageFormat)) {
+            $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']));
-      }
+            if ($this->options['debug']) {
+                $this->messageFormat->setUntranslatedPS(array($this->options['untranslated_prefix'], $this->options['untranslated_suffix']));
+            }
+        }
+
+        return $this->messageFormat;
     }
 
-    return $this->messageFormat;
-  }
-
-  /**
-   * Gets the translation for the given string
-   *
-   * @param  string $string     The string to translate
-   * @param  array  $args       An array of arguments for the translation
-   * @param  string $catalogue  The catalogue name
-   *
-   * @return string The translated string
-   */
-  public function __($string, $args = array(), $catalogue = 'messages')
-  {
-    return $this->getMessageFormat()->format($string, $args, $catalogue);
-  }
-
-  /**
-   * Gets a country name.
-   *
-   * @param  string $iso      The ISO code
-   * @param  string $culture  The culture for the translation
-   *
-   * @return string The country name
-   */
-  public function getCountry($iso, $culture = null)
-  {
-    $c = sfCultureInfo::getInstance(null === $culture ? $this->culture : $culture);
-    $countries = $c->getCountries();
-
-    return (array_key_exists($iso, $countries)) ? $countries[$iso] : '';
-  }
-
-  /**
-   * Gets a native culture name.
-   *
-   * @param  string $culture The culture
-   *
-   * @return string The culture name
-   */
-  public function getNativeName($culture)
-  {
-    return sfCultureInfo::getInstance($culture)->getNativeName();
-  }
-
-  /**
-   * Returns a timestamp from a date with time formatted with a given culture.
-   *
-   * @param  string  $dateTime  The formatted date with time as string
-   * @param  string  $culture The culture
-   *
-   * @return integer The timestamp
-   */
-  public function getTimestampForCulture($dateTime, $culture = null)
-  {
-    list($day, $month, $year) = $this->getDateForCulture($dateTime, null === $culture ? $this->culture : $culture);
-    list($hour, $minute) = $this->getTimeForCulture($dateTime, null === $culture ? $this->culture : $culture);
-
-    // mktime behavior change with php8
-    $hour = null !== $hour ? $hour : 0;
-    $minute = null !== $minute ? $minute : 0;
-    return null === $day ? null : mktime($hour, $minute, 0, $month, $day, $year);
-  }
-
-  /**
-   * Returns the day, month and year from a date formatted with a given culture.
-   *
-   * @param  string  $date    The formatted date as string
-   * @param  string  $culture The culture
-   *
-   * @return array   An array with the day, month and year
-   */
-  public function getDateForCulture($date, $culture = null)
-  {
-    if (!$date)
+    /**
+     * Gets a country name.
+     *
+     * @param string $iso     The ISO code
+     * @param string $culture The culture for the translation
+     *
+     * @return string The country name
+     */
+    public function getCountry($iso, $culture = null)
     {
-      return null;
+        $c = sfCultureInfo::getInstance(null === $culture ? $this->culture : $culture);
+        $countries = $c->getCountries();
+
+        return (array_key_exists($iso, $countries)) ? $countries[$iso] : '';
     }
 
-    $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(
-      'd' => strpos($dateFormat, 'd'),
-      'm' => strpos($dateFormat, 'M'),
-      'y' => strpos($dateFormat, 'y'),
-    );
-    $tmp = array_flip($a);
-    ksort($tmp);
-    $i = 0;
-    $c = array();
-    foreach ($tmp as $value) $c[++$i] = $value;
-    $datePositions = array_flip($c);
-
-    // We find all elements
-    if (preg_match("~$dateRegexp~", $date, $matches))
+    /**
+     * Gets a native culture name.
+     *
+     * @param string $culture The culture
+     *
+     * @return string The culture name
+     */
+    public function getNativeName($culture)
     {
-      // We get matching timestamp
-      return array($matches[$datePositions['d']], $matches[$datePositions['m']], $matches[$datePositions['y']]);
+        return sfCultureInfo::getInstance($culture)->getNativeName();
     }
-    else
+
+    /**
+     * Returns a timestamp from a date with time formatted with a given culture.
+     *
+     * @param string $dateTime The formatted date with time as string
+     * @param string $culture  The culture
+     *
+     * @return int The timestamp
+     */
+    public function getTimestampForCulture($dateTime, $culture = null)
     {
-      return null;
+        list($day, $month, $year) = $this->getDateForCulture($dateTime, null === $culture ? $this->culture : $culture);
+        list($hour, $minute) = $this->getTimeForCulture($dateTime, null === $culture ? $this->culture : $culture);
+
+        // mktime behavior change with php8
+        $hour = null !== $hour ? $hour : 0;
+        $minute = null !== $minute ? $minute : 0;
+
+        return null === $day ? null : mktime($hour, $minute, 0, $month, $day, $year);
     }
-  }
-
-  /**
-   * Returns the hour, minute from a date formatted with a given culture.
-   *
-   * @param  string  $time    The formatted date as string
-   * @param  string  $culture The culture
-   *
-   * @return array   An array with the hour and minute
-   */
-  public function getTimeForCulture($time, $culture = null)
-  {
-    if (!$time) return 0;
-
-    $culture = null === $culture ? $this->culture : $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));
-
-    // We parse time format to see where things are (h, m)
-    $timePositions = array(
-      'h' => strpos($timeFormat, 'H') !== false ? strpos($timeFormat, 'H') : strpos($timeFormat, 'h'),
-      'm' => strpos($timeFormat, 'm'),
-      'a' => strpos($timeFormat, 'a')
-    );
-    asort($timePositions);
-    $i = 0;
-
-    // normalize positions to 0, 1, ...
-    // positions that don't exist in the pattern remain false
-    foreach ($timePositions as $key => $value)
+
+    /**
+     * Returns the day, month and year from a date formatted with a given culture.
+     *
+     * @param string $date    The formatted date as string
+     * @param string $culture The culture
+     *
+     * @return array An array with the day, month and year
+     */
+    public function getDateForCulture($date, $culture = null)
     {
-      if ($value !== false)
-      {
-        $timePositions[$key] = ++$i;
-      }
+        if (!$date) {
+            return null;
+        }
+
+        $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(
+            'd' => strpos($dateFormat, 'd'),
+            'm' => strpos($dateFormat, 'M'),
+            'y' => strpos($dateFormat, 'y'),
+        );
+        $tmp = array_flip($a);
+        ksort($tmp);
+        $i = 0;
+        $c = array();
+        foreach ($tmp as $value) {
+            $c[++$i] = $value;
+        }
+        $datePositions = array_flip($c);
+
+        // 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 null;
     }
 
-    // We find all elements
-    if (preg_match("~$timeRegexp~", $time, $matches))
+    /**
+     * Returns the hour, minute from a date formatted with a given culture.
+     *
+     * @param string $time    The formatted date as string
+     * @param string $culture The culture
+     *
+     * @return array An array with the hour and minute
+     */
+    public function getTimeForCulture($time, $culture = null)
     {
-      // repect am/pm setting if present
-      if ($timePositions['a'] !== false)
-      {
-        if (strcasecmp($matches[$timePositions['a']], $timeFormatInfo->getAMDesignator()) == 0)
-        {
-          $hour = $matches[$timePositions['h']];
+        if (!$time) {
+            return 0;
         }
-        else if (strcasecmp($matches[$timePositions['a']], $timeFormatInfo->getPMDesignator()) == 0)
-        {
-          $hour = $matches[$timePositions['h']] + 12;
+
+        $culture = null === $culture ? $this->culture : $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));
+
+        // We parse time format to see where things are (h, m)
+        $timePositions = array(
+            'h' => false !== strpos($timeFormat, 'H') ? strpos($timeFormat, 'H') : strpos($timeFormat, 'h'),
+            'm' => strpos($timeFormat, 'm'),
+            'a' => strpos($timeFormat, 'a'),
+        );
+        asort($timePositions);
+        $i = 0;
+
+        // normalize positions to 0, 1, ...
+        // positions that don't exist in the pattern remain false
+        foreach ($timePositions as $key => $value) {
+            if (false !== $value) {
+                $timePositions[$key] = ++$i;
+            }
         }
-        else
-        {
-          // am/pm marker is invalid
-          // return null; would be the preferred solution but this might break a lot of code
-          $hour = $matches[$timePositions['h']];
+
+        // We find all elements
+        if (preg_match("~{$timeRegexp}~", $time, $matches)) {
+            // repect am/pm setting if present
+            if (false !== $timePositions['a']) {
+                if (0 == strcasecmp($matches[$timePositions['a']], $timeFormatInfo->getAMDesignator())) {
+                    $hour = $matches[$timePositions['h']];
+                } elseif (0 == strcasecmp($matches[$timePositions['a']], $timeFormatInfo->getPMDesignator())) {
+                    $hour = $matches[$timePositions['h']] + 12;
+                } else {
+                    // am/pm marker is invalid
+                    // return null; would be the preferred solution but this might break a lot of code
+                    $hour = $matches[$timePositions['h']];
+                }
+            } else {
+                $hour = $matches[$timePositions['h']];
+            }
+
+            // We get matching timestamp
+            return array($hour, $matches[$timePositions['m']]);
         }
-      }
-      else
-      {
-        $hour = $matches[$timePositions['h']];
-      }
-
-      // We get matching timestamp
-      return array($hour, $matches[$timePositions['m']]);
+
+        return null;
     }
-    else
+
+    /**
+     * Returns true if messages are stored in a file.
+     *
+     * @param string $source The source name
+     *
+     * @return bool true if messages are stored in a file, false otherwise
+     */
+    public static function isMessageSourceFileBased($source)
     {
-      return null;
+        $class = 'sfMessageSource_'.$source;
+
+        return class_exists($class) && is_subclass_of($class, 'sfMessageSource_File');
     }
-  }
-
-  /**
-   * Returns true if messages are stored in a file.
-   *
-   * @param  string  $source  The source name
-   *
-   * @return Boolean true if messages are stored in a file, false otherwise
-   */
-  static public function isMessageSourceFileBased($source)
-  {
-    $class = 'sfMessageSource_'.$source;
-
-    return class_exists($class) && is_subclass_of($class, 'sfMessageSource_File');
-  }
-
-  /**
-   * Listens to the user.change_culture event.
-   *
-   * @param sfEvent $event  An sfEvent instance
-   *
-   */
-  public function listenToChangeCultureEvent(sfEvent $event)
-  {
-    // change the message format object with the new culture
-    $this->setCulture($event['culture']);
-  }
-
-  /**
-   * Listens to the controller.change_action event.
-   *
-   * @param sfEvent $event An sfEvent instance
-   *
-   */
-  public function listenToChangeActionEvent(sfEvent $event)
-  {
-    // change message source directory to our module
-    $this->setMessageSource($this->configuration->getI18NDirs($event['module']));
-  }
 
+    /**
+     * Listens to the user.change_culture event.
+     *
+     * @param sfEvent $event An sfEvent instance
+     */
+    public function listenToChangeCultureEvent(sfEvent $event)
+    {
+        // change the message format object with the new culture
+        $this->setCulture($event['culture']);
+    }
+
+    /**
+     * Listens to the controller.change_action event.
+     *
+     * @param sfEvent $event An sfEvent instance
+     */
+    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 cd6178f7c..8b2bc6316 100644
--- a/lib/i18n/sfIMessageSource.class.php
+++ b/lib/i18n/sfIMessageSource.class.php
@@ -13,120 +13,121 @@
  * {@link http://prado.sourceforge.net/}
  *
  * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
+ *
  * @version    $Id$
- * @package    symfony
- * @subpackage i18n
  */
- 
+
 /**
  * sfIMessageSource interface.
- * 
+ *
  * All messages source used by MessageFormat must be of sfIMessageSource.
  * It defines a set of operations to add and retrieve messages from the
- * message source. In addition, message source can load a particular 
+ * message source. In addition, message source can load a particular
  * catalogue.
  *
  * @author Xiang Wei Zhuo <weizhuo[at]gmail[dot]com>
+ *
  * @version v1.0, last update on Fri Dec 24 17:40:19 EST 2004
- * @package    symfony
- * @subpackage i18n
  */
 interface sfIMessageSource
 {
-  /**
-   * Loads the translation table for this particular catalogue.
-   * The translation should be loaded in the following order.
-   *  # [1] call getCatalogueList($catalogue) to get a list of variants for for the specified $catalogue.
-   *  # [2] for each of the variants, call getSource($variant) to get the resource, could be a file or catalogue ID.
-   *  # [3] verify that this resource is valid by calling isValidSource($source)
-   *  # [4] try to get the messages from the cache
-   *  # [5] if a cache miss, call load($source) to load the message array
-   *  # [6] store the messages to cache.
-   *  # [7] continue with the foreach loop, e.g. goto [2].
-   *
-   * @param string $catalogue a catalogue to load
-   * @return boolean true if loaded, false otherwise.
-   */
-  function load($catalogue = 'messages');
+    /**
+     * Loads the translation table for this particular catalogue.
+     * The translation should be loaded in the following order.
+     *  # [1] call getCatalogueList($catalogue) to get a list of variants for for the specified $catalogue.
+     *  # [2] for each of the variants, call getSource($variant) to get the resource, could be a file or catalogue ID.
+     *  # [3] verify that this resource is valid by calling isValidSource($source)
+     *  # [4] try to get the messages from the cache
+     *  # [5] if a cache miss, call load($source) to load the message array
+     *  # [6] store the messages to cache.
+     *  # [7] continue with the foreach loop, e.g. goto [2].
+     *
+     * @param string $catalogue a catalogue to load
+     *
+     * @return bool true if loaded, false otherwise
+     */
+    public function load($catalogue = 'messages');
 
-  /**
-   * Gets the translation table. This includes all the loaded sections.
-   * It must return a 2 level array of translation strings.
-   * # "catalogue+variant" the catalogue and its variants.
-   * # "source string" translation keys, and its translations.
-   * <code>
-   *   array('catalogue+variant' => 
-   *       array('source string' => 'target string', ...)
-   *             ...),
-   *        ...);
-   * </code>
-   *
-   * @return array 2 level array translation table.
-   */
-  function read();
+    /**
+     * Gets the translation table. This includes all the loaded sections.
+     * It must return a 2 level array of translation strings.
+     * # "catalogue+variant" the catalogue and its variants.
+     * # "source string" translation keys, and its translations.
+     * <code>
+     *   array('catalogue+variant' =>
+     *       array('source string' => 'target string', ...)
+     *             ...),
+     *        ...);
+     * </code>.
+     *
+     * @return array 2 level array translation table
+     */
+    public function read();
 
-  /**
-   * Saves the list of untranslated blocks to the translation source. 
-   * If the translation was not found, you should add those
-   * strings to the translation source via the <b>append()</b> method.
-   *
-   * @param string $catalogue the catalogue to add to
-   * @return boolean true if saved successfuly, false otherwise.
-   */
-  function save($catalogue = 'messages');
+    /**
+     * Saves the list of untranslated blocks to the translation source.
+     * If the translation was not found, you should add those
+     * strings to the translation source via the <b>append()</b> method.
+     *
+     * @param string $catalogue the catalogue to add to
+     *
+     * @return bool true if saved successfuly, false otherwise
+     */
+    public function save($catalogue = 'messages');
 
-  /**
-   * Adds a untranslated message to the source. Need to call save()
-   * to save the messages to source.
-   *
-   * @param string $message message to add
-   * @return void
-   */
-  function append($message);
+    /**
+     * Adds a untranslated message to the source. Need to call save()
+     * to save the messages to source.
+     *
+     * @param string $message message to add
+     */
+    public function append($message);
 
-  /**
-   * Deletes a particular message from the specified catalogue.
-   *
-   * @param string $message   the source message to delete.
-   * @param string $catalogue the catalogue to delete from.
-   * @return boolean true if deleted, false otherwise. 
-   */
-  function delete($message, $catalogue = 'messages');
+    /**
+     * Deletes a particular message from the specified catalogue.
+     *
+     * @param string $message   the source message to delete
+     * @param string $catalogue the catalogue to delete from
+     *
+     * @return bool true if deleted, false otherwise
+     */
+    public function delete($message, $catalogue = 'messages');
 
-  /**
-   * Updates the translation.
-   *
-   * @param string $text      the source string.
-   * @param string $target    the new translation string.
-   * @param string $comments  comments
-   * @param string $catalogue the catalogue of the translation.
-   * @return boolean true if translation was updated, false otherwise. 
-   */
-  function update($text, $target, $comments, $catalogue = 'messages');
+    /**
+     * Updates the translation.
+     *
+     * @param string $text      the source string
+     * @param string $target    the new translation string
+     * @param string $comments  comments
+     * @param string $catalogue the catalogue of the translation
+     *
+     * @return bool true if translation was updated, false otherwise
+     */
+    public function update($text, $target, $comments, $catalogue = 'messages');
 
-  /**
-   * Returns a list of catalogue as key and all it variants as value.
-   *
-   * @return array list of catalogues 
-   */
-  function catalogues();
+    /**
+     * Returns a list of catalogue as key and all it variants as value.
+     *
+     * @return array list of catalogues
+     */
+    public function catalogues();
 
-  /**
-   * Set the culture for this particular message source.
-   *
-   * @param string $culture the Culture name.
-   */
-  function setCulture($culture);
+    /**
+     * Set the culture for this particular message source.
+     *
+     * @param string $culture the Culture name
+     */
+    public function setCulture($culture);
 
-  /**
-   * Get the culture identifier for the source.
-   *
-   * @return string culture identifier. 
-   */
-  function getCulture();
+    /**
+     * Get the culture identifier for the source.
+     *
+     * @return string culture identifier
+     */
+    public function getCulture();
 
-  /**
-   * Returns a unique identifier for the current message source.
-   */
-  function getId();
+    /**
+     * Returns a unique identifier for the current message source.
+     */
+    public function getId();
 }
diff --git a/lib/i18n/sfMessageFormat.class.php b/lib/i18n/sfMessageFormat.class.php
index fb95f1573..92cb42966 100644
--- a/lib/i18n/sfMessageFormat.class.php
+++ b/lib/i18n/sfMessageFormat.class.php
@@ -13,17 +13,16 @@
  * {@link http://prado.sourceforge.net/}
  *
  * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
+ *
  * @version    $Id$
- * @package    symfony
- * @subpackage i18n
  */
 
 /**
  * sfMessageFormat class.
- * 
- * Format a message, that is, for a particular message find the 
- * translated message. The following is an example using 
- * a SQLite database to store the translation message. 
+ *
+ * Format a message, that is, for a particular message find the
+ * translated message. The following is an example using
+ * a SQLite database to store the translation message.
  * Create a new message format instance and echo "Hello"
  * in simplified Chinese. This assumes that the world "Hello"
  * is translated in the database.
@@ -33,230 +32,227 @@
  *  $source->setCulture('zh_CN');
  *  $source->setCache(new sfMessageCache('./tmp'));
  *
- *  $formatter = new sfMessageFormat($source); 
- *  
+ *  $formatter = new sfMessageFormat($source);
+ *
  *  echo $formatter->format('Hello');
  * </code>
  *
  * @author Xiang Wei Zhuo <weizhuo[at]gmail[dot]com>
+ *
  * @version v1.0, last update on Fri Dec 24 20:46:16 EST 2004
- * @package    symfony
- * @subpackage i18n
  */
 class sfMessageFormat
 {
-  /**
-   * The message source.
-   * @var sfMessageSource
-   */
-  protected $source;
+    /**
+     * Set the default catalogue.
+     *
+     * @var string
+     */
+    public $catalogue;
 
-  /**
-   * A list of loaded message catalogues.
-   * @var array
-   */
-  protected $catalogues = array();
+    /**
+     * The message source.
+     *
+     * @var sfMessageSource
+     */
+    protected $source;
 
-  /**
-   * The translation messages.
-   * @var array
-   */
-  protected $messages = array();
+    /**
+     * A list of loaded message catalogues.
+     *
+     * @var array
+     */
+    protected $catalogues = array();
 
-  /**
-   * A list of untranslated messages.
-   * @var array
-   */
-  protected $untranslated = array();
+    /**
+     * The translation messages.
+     *
+     * @var array
+     */
+    protected $messages = array();
 
-  /**
-   * The prefix and suffix to append to untranslated messages.
-   * @var array
-   */
-  protected $postscript = array('', '');
+    /**
+     * A list of untranslated messages.
+     *
+     * @var array
+     */
+    protected $untranslated = array();
 
-  /**
-   * Set the default catalogue.
-   * @var string 
-   */
-  public $catalogue;
+    /**
+     * The prefix and suffix to append to untranslated messages.
+     *
+     * @var array
+     */
+    protected $postscript = array('', '');
 
-  /**
-   * Output encoding charset
-   * @var string
-   */
-  protected $charset = 'UTF-8';
+    /**
+     * Output encoding charset.
+     *
+     * @var string
+     */
+    protected $charset = 'UTF-8';
 
-  /**
-   * Constructor.
-   * 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.
-   */
-  function __construct(sfIMessageSource $source, $charset = 'UTF-8')
-  {
-    $this->source = $source;
-    $this->setCharset($charset);
-  }
-
-  /**
-   * Sets the charset for message output.
-   *
-   * @param string $charset charset, default is UTF-8
-   */
-  public function setCharset($charset)
-  {
-    $this->charset = $charset;
-  }
-
-  /**
-   * Gets the charset for message output. Default is UTF-8.
-   *
-   * @return string charset, default UTF-8
-   */
-  public function getCharset()
-  {
-    return $this->charset;
-  }
-  
-  /**
-   * Loads the message from a particular catalogue. A listed
-   * loaded catalogues is kept to prevent reload of the same
-   * catalogue. The load catalogue messages are stored
-   * in the $this->message array.
-   *
-   * @param string $catalogue message catalogue to load.
-   */
-  protected function loadCatalogue($catalogue)
-  {
-    if (in_array($catalogue, $this->catalogues))
+    /**
+     * Constructor.
+     * 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
+     */
+    public function __construct(sfIMessageSource $source, $charset = 'UTF-8')
     {
-      return;
+        $this->source = $source;
+        $this->setCharset($charset);
     }
 
-    if ($this->source->load($catalogue))
+    /**
+     * Sets the charset for message output.
+     *
+     * @param string $charset charset, default is UTF-8
+     */
+    public function setCharset($charset)
     {
-      $this->messages[$catalogue] = $this->source->read();
-      $this->catalogues[] = $catalogue;
+        $this->charset = $charset;
     }
-  }
 
-  /**
-   * Formats the string. That is, for a particular string find
-   * the corresponding translation. Variable subsitution is performed
-   * for the $args parameter. A different catalogue can be specified
-   * using the $catalogue parameter.
-   * The output charset is determined by $this->getCharset();
-   *
-   * @param string  $string     the string to translate.
-   * @param array   $args       a list of string to substitute.
-   * @param string  $catalogue  get the translation from a particular message
-   * @param string  $charset    charset, the input AND output charset catalogue.
-   * @return string translated string.
-   */
-  public function format($string, $args = array(), $catalogue = null, $charset = null)
-  {
-    // make sure that objects with __toString() are converted to strings
-    $string = (string) $string;
-    if (empty($charset))
+    /**
+     * Gets the charset for message output. Default is UTF-8.
+     *
+     * @return string charset, default UTF-8
+     */
+    public function getCharset()
     {
-      $charset = $this->getCharset();
+        return $this->charset;
     }
 
-    $s = $this->formatString(sfToolkit::I18N_toUTF8($string, $charset), $args, $catalogue);
+    /**
+     * Formats the string. That is, for a particular string find
+     * the corresponding translation. Variable subsitution is performed
+     * for the $args parameter. A different catalogue can be specified
+     * using the $catalogue parameter.
+     * The output charset is determined by $this->getCharset();.
+     *
+     * @param string $string    the string to translate
+     * @param array  $args      a list of string to substitute
+     * @param string $catalogue get the translation from a particular message
+     * @param string $charset   charset, the input AND output charset catalogue
+     *
+     * @return string translated string
+     */
+    public function format($string, $args = array(), $catalogue = null, $charset = null)
+    {
+        // make sure that objects with __toString() are converted to strings
+        $string = (string) $string;
+        if (empty($charset)) {
+            $charset = $this->getCharset();
+        }
+
+        $s = $this->formatString(sfToolkit::I18N_toUTF8($string, $charset), $args, $catalogue);
 
-    return sfToolkit::I18N_toEncoding($s, $charset);
-  }
+        return sfToolkit::I18N_toEncoding($s, $charset);
+    }
 
-  /**
-   * Do string translation.
-   *
-   * @param string  $string     the string to translate.
-   * @param array   $args       a list of string to substitute.
-   * @param string  $catalogue  get the translation from a particular message catalogue.
-   * @return string translated string.
-   */
-  protected function formatString($string, $args = array(), $catalogue = null)
-  {
-    if (empty($args))
+    /**
+     * Gets the message source.
+     *
+     * @return MessageSource
+     */
+    public function getSource()
     {
-      $args = array();
+        return $this->source;
     }
 
-    if (empty($catalogue))
+    /**
+     * Sets the prefix and suffix to append to untranslated messages.
+     * e.g. $postscript=array('[T]','[/T]'); will output
+     * "[T]Hello[/T]" if the translation for "Hello" can not be determined.
+     *
+     * @param array $postscript first element is the prefix, second element the suffix
+     */
+    public function setUntranslatedPS($postscript)
     {
-      $catalogue = empty($this->catalogue) ? 'messages' : $this->catalogue;
+        if (is_array($postscript) && count($postscript) >= 2) {
+            $this->postscript[0] = $postscript[0];
+            $this->postscript[1] = $postscript[1];
+        }
     }
 
-    $this->loadCatalogue($catalogue);
-
-    foreach ($this->messages[$catalogue] as $variant)
+    /**
+     * Loads the message from a particular catalogue. A listed
+     * loaded catalogues is kept to prevent reload of the same
+     * catalogue. The load catalogue messages are stored
+     * in the $this->message array.
+     *
+     * @param string $catalogue message catalogue to load
+     */
+    protected function loadCatalogue($catalogue)
     {
-      // we found it, so return the target translation
-      if (isset($variant[$string]))
-      {
-        $target = $variant[$string]; 
-
-        // check if it contains only strings.
-        if (is_array($target))
-        {
-          $target = array_shift($target);
+        if (in_array($catalogue, $this->catalogues)) {
+            return;
         }
 
-        // found, but untranslated
-        if (empty($target))
-        {
-          return $this->postscript[0].$this->replaceArgs($string, $args).$this->postscript[1];
+        if ($this->source->load($catalogue)) {
+            $this->messages[$catalogue] = $this->source->read();
+            $this->catalogues[] = $catalogue;
         }
-        return $this->replaceArgs($target, $args);
-      }
     }
 
-    // well we did not find the translation string.
-    $this->source->append($string);
+    /**
+     * Do string translation.
+     *
+     * @param string $string    the string to translate
+     * @param array  $args      a list of string to substitute
+     * @param string $catalogue get the translation from a particular message catalogue
+     *
+     * @return string translated string
+     */
+    protected function formatString($string, $args = array(), $catalogue = null)
+    {
+        if (empty($args)) {
+            $args = array();
+        }
 
-    return $this->postscript[0].$this->replaceArgs($string, $args).$this->postscript[1];
-  }
+        if (empty($catalogue)) {
+            $catalogue = empty($this->catalogue) ? 'messages' : $this->catalogue;
+        }
 
-  protected function replaceArgs($string, $args)
-  {
-    // replace object with strings
-    foreach ($args as $key => $value)
-    {
-      if (is_object($value) && method_exists($value, '__toString'))
-      {
-        $args[$key] = $value->__toString();
-      }
-    }
+        $this->loadCatalogue($catalogue);
 
-    return strtr($string, $args);
-  }
+        foreach ($this->messages[$catalogue] as $variant) {
+            // we found it, so return the target translation
+            if (isset($variant[$string])) {
+                $target = $variant[$string];
 
-  /**
-   * Gets the message source.
-   *
-   * @return MessageSource 
-   */
-  function getSource()
-  {
-    return $this->source;
-  }
-  
-  /**
-   * Sets the prefix and suffix to append to untranslated messages.
-   * e.g. $postscript=array('[T]','[/T]'); will output 
-   * "[T]Hello[/T]" if the translation for "Hello" can not be determined.
-   *
-   * @param array $postscript first element is the prefix, second element the suffix.
-   */
-  function setUntranslatedPS($postscript)
-  {
-    if (is_array($postscript) && count($postscript) >= 2)
+                // check if it contains only strings.
+                if (is_array($target)) {
+                    $target = array_shift($target);
+                }
+
+                // found, but untranslated
+                if (empty($target)) {
+                    return $this->postscript[0].$this->replaceArgs($string, $args).$this->postscript[1];
+                }
+
+                return $this->replaceArgs($target, $args);
+            }
+        }
+
+        // well we did not find the translation string.
+        $this->source->append($string);
+
+        return $this->postscript[0].$this->replaceArgs($string, $args).$this->postscript[1];
+    }
+
+    protected function replaceArgs($string, $args)
     {
-      $this->postscript[0] = $postscript[0];
-      $this->postscript[1] = $postscript[1];
+        // replace object with strings
+        foreach ($args as $key => $value) {
+            if (is_object($value) && method_exists($value, '__toString')) {
+                $args[$key] = $value->__toString();
+            }
+        }
+
+        return strtr($string, $args);
     }
-  }
 }
diff --git a/lib/i18n/sfMessageSource.class.php b/lib/i18n/sfMessageSource.class.php
index 0192a7673..8163bfc71 100644
--- a/lib/i18n/sfMessageSource.class.php
+++ b/lib/i18n/sfMessageSource.class.php
@@ -13,9 +13,8 @@
  * {@link http://prado.sourceforge.net/}
  *
  * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
+ *
  * @version    $Id$
- * @package    symfony
- * @subpackage i18n
  */
 
 /**
@@ -57,279 +56,278 @@
  * </code>
  *
  * @author Xiang Wei Zhuo <weizhuo[at]gmail[dot]com>
+ *
  * @version v1.0, last update on Fri Dec 24 19:55:49 EST 2004
- * @package    symfony
- * @subpackage i18n
  */
 abstract class sfMessageSource implements sfIMessageSource
 {
-  /**
-   * The culture name for this message source.
-   * @var string
-   */
-  protected $culture;
-
-  /**
-   * Array of translation messages.
-   * @var array
-   */
-  protected $messages = array();
-
-  /**
-   * The source of message translations.
-   * @var string
-   */
-  protected $source;
-
-  /**
-   * The translation cache.
-   * @var sfMessageCache
-   */
-  protected $cache;
-
-  protected $untranslated = array();
-
-  /**
-   * Private constructor. sfMessageSource must be initialized using
-   * the factory method.
-   */
-  private function __construct()
-  {
-    //throw new sfException('Please use the factory method to instantiate.');
-  }
-
-  /**
-   * Factory method to instantiate a new sfMessageSource depending on the
-   * source type. The built-in source types are 'XLIFF', 'SQLite',
-   * 'MySQL', 'gettext', and 'Aggregate'.
-   * The source parameter is dependent on the source type.
-   * For 'gettext' and 'XLIFF', it should point to the directory
-   * where the messages are stored. For database types, e.g. 'SQLite' and
-   * 'MySQL', it should be a PEAR DB style DSN string.
-   *
-   * Custom message source are possible by supplying the a filename parameter
-   * in the factory method.
-   *
-   * @param string $type      the message source type.
-   * @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.
-   * @throws sfException
-   */
-  static function factory($type, $source = '.', $filename = '')
-  {
-    if ($filename)
+    /**
+     * The culture name for this message source.
+     *
+     * @var string
+     */
+    protected $culture;
+
+    /**
+     * Array of translation messages.
+     *
+     * @var array
+     */
+    protected $messages = array();
+
+    /**
+     * The source of message translations.
+     *
+     * @var string
+     */
+    protected $source;
+
+    /**
+     * The translation cache.
+     *
+     * @var sfMessageCache
+     */
+    protected $cache;
+
+    protected $untranslated = array();
+
+    /**
+     * Private constructor. sfMessageSource must be initialized using
+     * the factory method.
+     */
+    private function __construct()
+    {
+        // throw new sfException('Please use the factory method to instantiate.');
+    }
+
+    /**
+     * Factory method to instantiate a new sfMessageSource depending on the
+     * source type. The built-in source types are 'XLIFF', 'SQLite',
+     * 'MySQL', 'gettext', and 'Aggregate'.
+     * The source parameter is dependent on the source type.
+     * For 'gettext' and 'XLIFF', it should point to the directory
+     * where the messages are stored. For database types, e.g. 'SQLite' and
+     * 'MySQL', it should be a PEAR DB style DSN string.
+     *
+     * Custom message source are possible by supplying the a filename parameter
+     * in the factory method.
+     *
+     * @param string $type     the message source type
+     * @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
+     *
+     * @throws sfException
+     */
+    public static function factory($type, $source = '.', $filename = '')
     {
-      if (!is_file($filename))
-      {
-        throw new sfException(sprintf("File %s not found.", $filename));
-      }
+        if ($filename) {
+            if (!is_file($filename)) {
+                throw new sfException(sprintf('File %s not found.', $filename));
+            }
+
+            include_once $filename;
+        }
+
+        if (('SQLite' == $type) && version_compare(PHP_VERSION, '5.3', '>')) {
+            $type .= '3';
+        }
+
+        $class = 'sfMessageSource_'.$type;
+        if (!class_exists($class)) {
+            throw new sfException(sprintf('Unable to find type "%s".', $type));
+        }
 
-      include_once($filename);
+        return new $class($source);
     }
 
-    if (('SQLite' == $type) && version_compare(PHP_VERSION, '5.3', '>'))
+    /**
+     * Loads a particular message catalogue. Use read() to
+     * to get the array of messages. The catalogue loading sequence
+     * is as follows:.
+     *
+     *  # [1] Call getCatalogueList($catalogue) to get a list of variants for for the specified $catalogue.
+     *  # [2] For each of the variants, call getSource($variant) to get the resource, could be a file or catalogue ID.
+     *  # [3] Verify that this resource is valid by calling isValidSource($source)
+     *  # [4] Try to get the messages from the cache
+     *  # [5] If a cache miss, call load($source) to load the message array
+     *  # [6] Store the messages to cache.
+     *  # [7] Continue with the foreach loop, e.g. goto [2].
+     *
+     * @param string $catalogue a catalogue to load
+     *
+     * @return bool always true
+     *
+     * @see    read()
+     */
+    public function load($catalogue = 'messages')
     {
-      $type .= '3';
+        $variants = $this->getCatalogueList($catalogue);
+
+        $this->messages = array();
+
+        foreach ($variants as $variant) {
+            $source = $this->getSource($variant);
+
+            if (false == $this->isValidSource($source)) {
+                continue;
+            }
+
+            $loadData = true;
+
+            if ($this->cache) {
+                $lastModified = $this->getLastModified($source);
+                if ($lastModified >= 0 && $lastModified < $this->cache->getLastModified($variant.':'.$this->culture)) {
+                    $data = unserialize($this->cache->get($variant.':'.$this->culture));
+
+                    if (is_array($data)) {
+                        $this->messages[$variant] = $data;
+                        $loadData = false;
+                    }
+
+                    unset($data);
+                }
+            }
+
+            if ($loadData) {
+                $data = &$this->loadData($source);
+                if (is_array($data)) {
+                    $this->messages[$variant] = $data;
+                    if ($this->cache) {
+                        $this->cache->set($variant.':'.$this->culture, serialize($data));
+                    }
+                }
+
+                unset($data);
+            }
+        }
+
+        return true;
     }
 
-    $class = 'sfMessageSource_'.$type;
-    if (!class_exists($class))
+    /**
+     * Gets the array of messages.
+     *
+     * @return array translation messages
+     */
+    public function read()
     {
-      throw new sfException(sprintf('Unable to find type "%s".', $type));
+        return $this->messages;
     }
 
-    return new $class($source);
-  }
-
-  /**
-   * Loads a particular message catalogue. Use read() to
-   * to get the array of messages. The catalogue loading sequence
-   * is as follows:
-   *
-   *  # [1] Call getCatalogueList($catalogue) to get a list of variants for for the specified $catalogue.
-   *  # [2] For each of the variants, call getSource($variant) to get the resource, could be a file or catalogue ID.
-   *  # [3] Verify that this resource is valid by calling isValidSource($source)
-   *  # [4] Try to get the messages from the cache
-   *  # [5] If a cache miss, call load($source) to load the message array
-   *  # [6] Store the messages to cache.
-   *  # [7] Continue with the foreach loop, e.g. goto [2].
-   *
-   * @param  string  $catalogue a catalogue to load
-   * @return boolean always true
-   * @see    read()
-   */
-  function load($catalogue = 'messages')
-  {
-    $variants = $this->getCatalogueList($catalogue);
-
-    $this->messages = array();
-
-    foreach ($variants as $variant)
+    /**
+     * Gets the cache handler for this source.
+     *
+     * @return sfMessageCache cache handler
+     */
+    public function getCache()
     {
-      $source = $this->getSource($variant);
+        return $this->cache;
+    }
 
-      if ($this->isValidSource($source) == false)
-      {
-        continue;
-      }
+    /**
+     * Sets the cache handler for caching the messages.
+     *
+     * @param sfCache $cache the cache handler
+     */
+    public function setCache(sfCache $cache)
+    {
+        $this->cache = $cache;
+    }
 
-      $loadData = true;
+    /**
+     * Adds a untranslated message to the source. Need to call save()
+     * to save the messages to source.
+     *
+     * @param string $message message to add
+     */
+    public function append($message)
+    {
+        if (!in_array($message, $this->untranslated)) {
+            $this->untranslated[] = $message;
+        }
+    }
 
-      if ($this->cache)
-      {
-        $lastModified = $this->getLastModified($source);
-        if ($lastModified >= 0 && $lastModified < $this->cache->getLastModified($variant.':'.$this->culture))
-        {
-          $data = unserialize($this->cache->get($variant.':'.$this->culture));
+    /**
+     * Sets the culture for this message source.
+     *
+     * @param string $culture culture name
+     */
+    public function setCulture($culture)
+    {
+        $this->culture = $culture;
+    }
 
-          if (is_array($data))
-          {
-            $this->messages[$variant] = $data;
-            $loadData = false;
-          }
+    /**
+     * Gets the culture identifier for the source.
+     *
+     * @return string culture identifier
+     */
+    public function getCulture()
+    {
+        return $this->culture;
+    }
 
-          unset($data);
-        }
-      }
-
-      if ($loadData)
-      {
-        $data = &$this->loadData($source);
-        if (is_array($data))
-        {
-          $this->messages[$variant] = $data;
-          if ($this->cache)
-          {
-            $this->cache->set($variant.':'.$this->culture, serialize($data));
-          }
-        }
+    /**
+     * Loads the message for a particular catalogue+variant.
+     * This methods needs to implemented by subclasses.
+     *
+     * @param string $variant catalogue+variant
+     *
+     * @return array of translation messages
+     */
+    public function &loadData($variant)
+    {
+        return array();
+    }
+
+    /**
+     * Gets the source, this could be a filename or database ID.
+     *
+     * @param string $variant catalogue+variant
+     *
+     * @return string the resource key
+     */
+    public function getSource($variant)
+    {
+        return $variant;
+    }
 
-        unset($data);
-      }
+    /**
+     * Determines if the source is valid.
+     *
+     * @param string $source catalogue+variant
+     *
+     * @return bool true if valid, false otherwise
+     */
+    public function isValidSource($source)
+    {
+        return false;
+    }
+
+    /**
+     * Gets all the variants of a particular catalogue.
+     * This method must be implemented by subclasses.
+     *
+     * @param string $catalogue catalogue name
+     *
+     * @return array list of all variants for this catalogue
+     */
+    public function getCatalogueList($catalogue)
+    {
+        return array();
     }
 
-    return true;
-  }
-
-  /**
-   * Gets the array of messages.
-   *
-   * @return array translation messages.
-   */
-  public function read()
-  {
-    return $this->messages;
-  }
-
-  /**
-   * Gets the cache handler for this source.
-   *
-   * @return sfMessageCache cache handler
-   */
-  public function getCache()
-  {
-    return $this->cache;
-  }
-
-  /**
-   * Sets the cache handler for caching the messages.
-   *
-   * @param sfCache $cache the cache handler.
-   */
-  public function setCache(sfCache $cache)
-  {
-    $this->cache = $cache;
-  }
-
-  /**
-   * Adds a untranslated message to the source. Need to call save()
-   * to save the messages to source.
-   *
-   * @param string $message message to add
-   */
-  public function append($message)
-  {
-    if (!in_array($message, $this->untranslated))
+    /**
+     * Gets the last modified unix-time for this particular catalogue+variant.
+     *
+     * @param string $source catalogue+variant
+     *
+     * @return int last modified in unix-time format
+     */
+    protected function getLastModified($source)
     {
-      $this->untranslated[] = $message;
+        return 0;
     }
-  }
-
-  /**
-   * Sets the culture for this message source.
-   *
-   * @param string $culture culture name
-   */
-  public function setCulture($culture)
-  {
-    $this->culture = $culture;
-  }
-
-  /**
-   * Gets the culture identifier for the source.
-   *
-   * @return string culture identifier.
-   */
-  public function getCulture()
-  {
-    return $this->culture;
-  }
-
-  /**
-   * Gets the last modified unix-time for this particular catalogue+variant.
-   *
-   * @param string $source catalogue+variant
-   * @return int last modified in unix-time format.
-   */
-  protected function getLastModified($source)
-  {
-    return 0;
-  }
-
-  /**
-   * Loads the message for a particular catalogue+variant.
-   * This methods needs to implemented by subclasses.
-   *
-   * @param string $variant catalogue+variant.
-   * @return array of translation messages.
-   */
-  public function &loadData($variant)
-  {
-    return array();
-  }
-
-  /**
-   * Gets the source, this could be a filename or database ID.
-   *
-   * @param string $variant catalogue+variant
-   * @return string the resource key
-   */
-  public function getSource($variant)
-  {
-    return $variant;
-  }
-
-  /**
-   * Determines if the source is valid.
-   *
-   * @param string $source catalogue+variant
-   * @return boolean true if valid, false otherwise.
-   */
-  public function isValidSource($source)
-  {
-    return false;
-  }
-
-  /**
-   * Gets all the variants of a particular catalogue.
-   * This method must be implemented by subclasses.
-   *
-   * @param string $catalogue catalogue name
-   * @return array list of all variants for this catalogue.
-   */
-  public function getCatalogueList($catalogue)
-  {
-    return array();
-  }
 }
diff --git a/lib/i18n/sfMessageSource_Aggregate.class.php b/lib/i18n/sfMessageSource_Aggregate.class.php
index 3270f76d9..c8d64141d 100644
--- a/lib/i18n/sfMessageSource_Aggregate.class.php
+++ b/lib/i18n/sfMessageSource_Aggregate.class.php
@@ -11,244 +11,235 @@
 /**
  * sfMessageSource_Aggregate aggregates several message source objects.
  *
- * @package    symfony
- * @subpackage i18n
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfMessageSource_Aggregate extends sfMessageSource
 {
-  protected $messageSources = array();
-
-  /**
-   * Constructor.
-   *
-   * The order of the messages sources in the array is important.
-   * This class will take the first translation found in the message sources.
-   *
-   * @param array $messageSources An array of message sources.
-   *
-   * @see   MessageSource::factory();
-   */
-  function __construct($messageSources)
-  {
-    $this->messageSources = $messageSources;
-  }
-
-  public function setCulture($culture)
-  {
-    parent::setCulture($culture);
-
-    foreach ($this->messageSources as $messageSource)
+    protected $messageSources = array();
+
+    /**
+     * Constructor.
+     *
+     * The order of the messages sources in the array is important.
+     * This class will take the first translation found in the message sources.
+     *
+     * @param array $messageSources an array of message sources
+     *
+     * @see   MessageSource::factory();
+     */
+    public function __construct($messageSources)
     {
-      $messageSource->setCulture($culture);
+        $this->messageSources = $messageSources;
     }
-  }
-
-  /**
-   * Gets the last modified unix-time for this particular catalogue+variant.
-   *
-   * @param string $source catalogue+variant
-   * @return int last modified in unix-time format.
-   */
-  protected function getLastModified($sources)
-  {
-    $lastModified = time();
-    foreach ($sources as $source)
+
+    public function setCulture($culture)
     {
-      if (0 !== $sourceLastModified = $source[0]->getLastModified($source[1]))
-      {
-        $lastModified = min($lastModified, $sourceLastModified);
-      }
+        parent::setCulture($culture);
+
+        foreach ($this->messageSources as $messageSource) {
+            $messageSource->setCulture($culture);
+        }
     }
 
-    return $lastModified;
-  }
-
-  /**
-   * Determines if the source is valid.
-   *
-   * @param string $source catalogue+variant
-   * @return boolean true if valid, false otherwise.
-   */
-  public function isValidSource($sources)
-  {
-    foreach ($sources as $source)
+    /**
+     * Determines if the source is valid.
+     *
+     * @param string $source  catalogue+variant
+     * @param mixed  $sources
+     *
+     * @return bool true if valid, false otherwise
+     */
+    public function isValidSource($sources)
     {
-      if (false === $source[0]->isValidSource($source[1]))
-      {
-        continue;
-      }
+        foreach ($sources as $source) {
+            if (false === $source[0]->isValidSource($source[1])) {
+                continue;
+            }
 
-      return true;
+            return true;
+        }
+
+        return false;
     }
 
-    return false;
-  }
-
-  /**
-   * Gets the source, this could be a filename or database ID.
-   *
-   * @param string $variant catalogue+variant
-   * @return string the resource key
-   */
-  public function getSource($variant)
-  {
-    $sources = array();
-    foreach ($this->messageSources as $messageSource)
+    /**
+     * Gets the source, this could be a filename or database ID.
+     *
+     * @param string $variant catalogue+variant
+     *
+     * @return string the resource key
+     */
+    public function getSource($variant)
     {
-      $sources[] = array($messageSource, $messageSource->getSource(str_replace($messageSource->getId(), '', $variant)));
+        $sources = array();
+        foreach ($this->messageSources as $messageSource) {
+            $sources[] = array($messageSource, $messageSource->getSource(str_replace($messageSource->getId(), '', $variant)));
+        }
+
+        return $sources;
     }
 
-    return $sources;
-  }
-
-  /**
-   * Loads the message for a particular catalogue+variant.
-   * This methods needs to implemented by subclasses.
-   *
-   * @return array of translation messages.
-   */
-  public function &loadData($sources)
-  {
-    $messages = array();
-    foreach ($sources as $source)
+    /**
+     * Loads the message for a particular catalogue+variant.
+     * This methods needs to implemented by subclasses.
+     *
+     * @param mixed $sources
+     *
+     * @return array of translation messages
+     */
+    public function &loadData($sources)
     {
-      if (false === $source[0]->isValidSource($source[1]))
-      {
-        continue;
-      }
-
-      $data = $source[0]->loadData($source[1]);
-      if (is_array($data))
-      {
-        $messages = array_merge($data, $messages);
-      }
+        $messages = array();
+        foreach ($sources as $source) {
+            if (false === $source[0]->isValidSource($source[1])) {
+                continue;
+            }
+
+            $data = $source[0]->loadData($source[1]);
+            if (is_array($data)) {
+                $messages = array_merge($data, $messages);
+            }
+        }
+
+        return $messages;
     }
 
-    return $messages;
-  }
-
-  /**
-   * Gets all the variants of a particular catalogue.
-   * This method must be implemented by subclasses.
-   *
-   * @param string $catalogue catalogue name
-   * @return array list of all variants for this catalogue.
-   */
-  public function getCatalogueList($catalogue)
-  {
-    $variants = array();
-    foreach ($this->messageSources as $messageSource)
+    /**
+     * Gets all the variants of a particular catalogue.
+     * This method must be implemented by subclasses.
+     *
+     * @param string $catalogue catalogue name
+     *
+     * @return array list of all variants for this catalogue
+     */
+    public function getCatalogueList($catalogue)
     {
-      foreach ($messageSource->getCatalogueList($catalogue) as $variant)
-      {
-        $variants[] = $messageSource->getId().$variant;
-      }
+        $variants = array();
+        foreach ($this->messageSources as $messageSource) {
+            foreach ($messageSource->getCatalogueList($catalogue) as $variant) {
+                $variants[] = $messageSource->getId().$variant;
+            }
+        }
+
+        return $variants;
     }
 
-    return $variants;
-  }
-
-  /**
-   * Adds a untranslated message to the source. Need to call save()
-   * to save the messages to source.
-   *
-   * @param string $message message to add
-   */
-  public function append($message)
-  {
-    // Append to the first message source only
-    if (count($this->messageSources))
+    /**
+     * Adds a untranslated message to the source. Need to call save()
+     * to save the messages to source.
+     *
+     * @param string $message message to add
+     */
+    public function append($message)
     {
-      $this->messageSources[0]->append($message);
+        // Append to the first message source only
+        if (count($this->messageSources)) {
+            $this->messageSources[0]->append($message);
+        }
     }
-  }
-
-  /**
-   * Updates the translation.
-   *
-   * @param string $text      the source string.
-   * @param string $target    the new translation string.
-   * @param string $comments  comments
-   * @param string $catalogue the catalogue of the translation.
-   * @return boolean true if translation was updated, false otherwise.
-   */
-  public function update($text, $target, $comments, $catalogue = 'messages')
-  {
-    // Only update one message source
-    foreach ($this->messageSources as $messageSource)
+
+    /**
+     * Updates the translation.
+     *
+     * @param string $text      the source string
+     * @param string $target    the new translation string
+     * @param string $comments  comments
+     * @param string $catalogue the catalogue of the translation
+     *
+     * @return bool true if translation was updated, false otherwise
+     */
+    public function update($text, $target, $comments, $catalogue = 'messages')
     {
-      if ($messageSource->update($text, $target, $comments, $catalogue))
-      {
-        return true;
-      }
+        // Only update one message source
+        foreach ($this->messageSources as $messageSource) {
+            if ($messageSource->update($text, $target, $comments, $catalogue)) {
+                return true;
+            }
+        }
+
+        return false;
     }
 
-    return false;
-  }
-
-  /**
-   * Deletes a particular message from the specified catalogue.
-   *
-   * @param string $message   the source message to delete.
-   * @param string $catalogue the catalogue to delete from.
-   * @return boolean true if deleted, false otherwise.
-   */
-  public function delete($message, $catalogue = 'messages')
-  {
-    $retval = false;
-    foreach ($this->messageSources as $messageSource)
+    /**
+     * Deletes a particular message from the specified catalogue.
+     *
+     * @param string $message   the source message to delete
+     * @param string $catalogue the catalogue to delete from
+     *
+     * @return bool true if deleted, false otherwise
+     */
+    public function delete($message, $catalogue = 'messages')
     {
-      if ($messageSource->delete($message, $catalogue))
-      {
-        $retval = true;
-      }
+        $retval = false;
+        foreach ($this->messageSources as $messageSource) {
+            if ($messageSource->delete($message, $catalogue)) {
+                $retval = true;
+            }
+        }
+
+        return $retval;
     }
 
-    return $retval;
-  }
-
-  /**
-   * Saves the list of untranslated blocks to the translation source.
-   * If the translation was not found, you should add those
-   * strings to the translation source via the <b>append()</b> method.
-   *
-   * @param string $catalogue the catalogue to add to
-   * @return boolean true if saved successfuly, false otherwise.
-   */
-  public function save($catalogue = 'messages')
-  {
-    $retval = false;
-    foreach ($this->messageSources as $messageSource)
+    /**
+     * Saves the list of untranslated blocks to the translation source.
+     * If the translation was not found, you should add those
+     * strings to the translation source via the <b>append()</b> method.
+     *
+     * @param string $catalogue the catalogue to add to
+     *
+     * @return bool true if saved successfuly, false otherwise
+     */
+    public function save($catalogue = 'messages')
     {
-      if ($messageSource->save($catalogue))
-      {
-        $retval = true;
-      }
+        $retval = false;
+        foreach ($this->messageSources as $messageSource) {
+            if ($messageSource->save($catalogue)) {
+                $retval = true;
+            }
+        }
+
+        return $retval;
     }
 
-    return $retval;
-  }
+    public function getId()
+    {
+        $id = '';
+        foreach ($this->messageSources as $messageSource) {
+            $id .= $messageSource->getId();
+        }
+
+        return md5($id);
+    }
 
-  public function getId()
-  {
-    $id = '';
-    foreach ($this->messageSources as $messageSource)
+    /**
+     * Returns a list of catalogue as key and all it variants as value.
+     *
+     * @return array list of catalogues
+     */
+    public function catalogues()
     {
-      $id .= $messageSource->getId();
+        throw new sfException('The "catalogues()" method is not implemented for this message source.');
     }
 
-    return md5($id);
-  }
-
-  /**
-   * Returns a list of catalogue as key and all it variants as value.
-   *
-   * @return array list of catalogues
-   */
-  public function catalogues()
-  {
-    throw new sfException('The "catalogues()" method is not implemented for this message source.');
-  }
+    /**
+     * Gets the last modified unix-time for this particular catalogue+variant.
+     *
+     * @param string $source  catalogue+variant
+     * @param mixed  $sources
+     *
+     * @return int last modified in unix-time format
+     */
+    protected function getLastModified($sources)
+    {
+        $lastModified = time();
+        foreach ($sources as $source) {
+            if (0 !== $sourceLastModified = $source[0]->getLastModified($source[1])) {
+                $lastModified = min($lastModified, $sourceLastModified);
+            }
+        }
+
+        return $lastModified;
+    }
 }
diff --git a/lib/i18n/sfMessageSource_Database.class.php b/lib/i18n/sfMessageSource_Database.class.php
index d1add0119..448f163b5 100644
--- a/lib/i18n/sfMessageSource_Database.class.php
+++ b/lib/i18n/sfMessageSource_Database.class.php
@@ -13,9 +13,8 @@
  * {@link http://prado.sourceforge.net/}
  *
  * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
+ *
  * @version    $Id$
- * @package    symfony
- * @subpackage i18n
  */
 
 /**
@@ -24,196 +23,161 @@
  * This is the base class for database based message sources like MySQL or SQLite.
  *
  * @author Xiang Wei Zhuo <weizhuo[at]gmail[dot]com>
+ *
  * @version v1.0, last update on Fri Dec 24 16:18:44 EST 2004
- * @package    symfony
- * @subpackage i18n
  */
 abstract class sfMessageSource_Database extends sfMessageSource
 {
-  /**
-   * For a given DSN (database connection string), return some information about the DSN.
-   *
-   * This function comes from PEAR's DB package.
-   *
-   * @param string $dsn DSN format, similar to PEAR's DB
-   * @return array DSN information. 
-   */
-  protected function parseDSN($dsn)
-  {
-    if (is_array($dsn))
+    /**
+     * Gets all the variants of a particular catalogue.
+     *
+     * @param string $catalogue catalogue name
+     *
+     * @return array list of all variants for this catalogue
+     */
+    public function getCatalogueList($catalogue)
     {
-      return $dsn;
-    }
+        $variants = explode('_', $this->culture);
 
-    $parsed = array(
-      'phptype'  => false,
-      'dbsyntax' => false,
-      'username' => false,
-      'password' => false,
-      'protocol' => false,
-      'hostspec' => false,
-      'port'     => false,
-      'socket'   => false,
-      'database' => false
-    );
-
-    // Find phptype and dbsyntax
-    if (($pos = strpos($dsn, '://')) !== false)
-    {
-      $str = substr($dsn, 0, $pos);
-      $dsn = substr($dsn, $pos + 3);
-    }
-    else
-    {
-      $str = $dsn;
-      $dsn = NULL;
-    }
+        $catalogues = array($catalogue);
 
-    // Get phptype and dbsyntax
-    // $str => phptype(dbsyntax)
-    if (preg_match('|^(.+?)\((.*?)\)$|', $str, $arr))
-    {
-      $parsed['phptype']  = $arr[1];
-      $parsed['dbsyntax'] = (empty($arr[2])) ? $arr[1] : $arr[2];
-    }
-    else
-    {
-      $parsed['phptype']  = $str;
-      $parsed['dbsyntax'] = $str;
-    }
+        $variant = null;
 
-    if (empty($dsn))
-    {
-      return $parsed;
-    }
+        for ($i = 0, $max = count($variants); $i < $max; ++$i) {
+            if (strlen($variants[$i]) > 0) {
+                $variant .= $variant ? '_'.$variants[$i] : $variants[$i];
+                $catalogues[] = $catalogue.'.'.$variant;
+            }
+        }
 
-    // Get (if found): username and password
-    // $dsn => username:password@protocol+hostspec/database
-    if (($at = strrpos($dsn,'@')) !== false)
-    {
-      $str = substr($dsn, 0, $at);
-      $dsn = substr($dsn, $at + 1);
-      if (($pos = strpos($str, ':')) !== false)
-      {
-        $parsed['username'] = rawurldecode(substr($str, 0, $pos));
-        $parsed['password'] = rawurldecode(substr($str, $pos + 1));
-      }
-      else
-      {
-        $parsed['username'] = rawurldecode($str);
-      }
+        return array_reverse($catalogues);
     }
 
-    // Find protocol and hostspec
-
-    // $dsn => proto(proto_opts)/database
-    if (preg_match('|^([^(]+)\((.*?)\)/?(.*?)$|', $dsn, $match))
+    public function getId()
     {
-      $proto       = $match[1];
-      $proto_opts  = (!empty($match[2])) ? $match[2] : false;
-      $dsn         = $match[3];
-    // $dsn => protocol+hostspec/database (old format)
-    }
-    else
-    {
-      if (strpos($dsn, '+') !== false)
-      {
-        list($proto, $dsn) = explode('+', $dsn, 2);
-      }
-      if (strpos($dsn, '/') !== false)
-      {
-        list($proto_opts, $dsn) = explode('/', $dsn, 2);
-      }
-      else
-      {
-        $proto_opts = $dsn;
-        $dsn = null;
-      }
+        return md5($this->source);
     }
 
-    // process the different protocol options
-    $parsed['protocol'] = (!empty($proto)) ? $proto : 'tcp';
-    $proto_opts = rawurldecode($proto_opts);
-    if ($parsed['protocol'] == 'tcp')
-    {
-      if (strpos($proto_opts, ':') !== false)
-      {
-        list($parsed['hostspec'], $parsed['port']) = explode(':', $proto_opts);
-      }
-      else
-      {
-        $parsed['hostspec'] = $proto_opts;
-      }
-    }
-    else if ($parsed['protocol'] == 'unix')
+    /**
+     * For a given DSN (database connection string), return some information about the DSN.
+     *
+     * This function comes from PEAR's DB package.
+     *
+     * @param string $dsn DSN format, similar to PEAR's DB
+     *
+     * @return array DSN information
+     */
+    protected function parseDSN($dsn)
     {
-      $parsed['socket'] = $proto_opts;
-    }
+        if (is_array($dsn)) {
+            return $dsn;
+        }
 
-    // Get dabase if any
-    // $dsn => database
-    if (!empty($dsn))
-    {
-      // /database
-      if (($pos = strpos($dsn, '?')) === false)
-      {
-        $parsed['database'] = $dsn;
-      // /database?param1=value1&param2=value2
-      }
-      else
-      {
-        $parsed['database'] = substr($dsn, 0, $pos);
-        $dsn = substr($dsn, $pos + 1);
-        if (strpos($dsn, '&') !== false)
-        {
-          $opts = explode('&', $dsn);
+        $parsed = array(
+            'phptype' => false,
+            'dbsyntax' => false,
+            'username' => false,
+            'password' => false,
+            'protocol' => false,
+            'hostspec' => false,
+            'port' => false,
+            'socket' => false,
+            'database' => false,
+        );
+
+        // Find phptype and dbsyntax
+        if (($pos = strpos($dsn, '://')) !== false) {
+            $str = substr($dsn, 0, $pos);
+            $dsn = substr($dsn, $pos + 3);
+        } else {
+            $str = $dsn;
+            $dsn = null;
         }
-        else
-        { // database?param1=value1
-          $opts = array($dsn);
+
+        // Get phptype and dbsyntax
+        // $str => phptype(dbsyntax)
+        if (preg_match('|^(.+?)\((.*?)\)$|', $str, $arr)) {
+            $parsed['phptype'] = $arr[1];
+            $parsed['dbsyntax'] = (empty($arr[2])) ? $arr[1] : $arr[2];
+        } else {
+            $parsed['phptype'] = $str;
+            $parsed['dbsyntax'] = $str;
         }
-        foreach ($opts as $opt)
-        {
-          list($key, $value) = explode('=', $opt);
-          if (!isset($parsed[$key]))
-          { // don't allow params overwrite
-            $parsed[$key] = rawurldecode($value);
-          }
+
+        if (empty($dsn)) {
+            return $parsed;
         }
-      }
-    }
 
-    return $parsed;
-  }
+        // Get (if found): username and password
+        // $dsn => username:password@protocol+hostspec/database
+        if (($at = strrpos($dsn, '@')) !== false) {
+            $str = substr($dsn, 0, $at);
+            $dsn = substr($dsn, $at + 1);
+            if (($pos = strpos($str, ':')) !== false) {
+                $parsed['username'] = rawurldecode(substr($str, 0, $pos));
+                $parsed['password'] = rawurldecode(substr($str, $pos + 1));
+            } else {
+                $parsed['username'] = rawurldecode($str);
+            }
+        }
 
-  /**
-   * Gets all the variants of a particular catalogue.
-   *
-   * @param string $catalogue catalogue name
-   * @return array list of all variants for this catalogue.
-   */
-  public function getCatalogueList($catalogue)
-  {
-    $variants = explode('_', $this->culture);
+        // Find protocol and hostspec
+
+        // $dsn => proto(proto_opts)/database
+        if (preg_match('|^([^(]+)\((.*?)\)/?(.*?)$|', $dsn, $match)) {
+            $proto = $match[1];
+            $proto_opts = (!empty($match[2])) ? $match[2] : false;
+            $dsn = $match[3];
+        // $dsn => protocol+hostspec/database (old format)
+        } else {
+            if (false !== strpos($dsn, '+')) {
+                list($proto, $dsn) = explode('+', $dsn, 2);
+            }
+            if (false !== strpos($dsn, '/')) {
+                list($proto_opts, $dsn) = explode('/', $dsn, 2);
+            } else {
+                $proto_opts = $dsn;
+                $dsn = null;
+            }
+        }
 
-    $catalogues = array($catalogue);
+        // process the different protocol options
+        $parsed['protocol'] = (!empty($proto)) ? $proto : 'tcp';
+        $proto_opts = rawurldecode($proto_opts);
+        if ('tcp' == $parsed['protocol']) {
+            if (false !== strpos($proto_opts, ':')) {
+                list($parsed['hostspec'], $parsed['port']) = explode(':', $proto_opts);
+            } else {
+                $parsed['hostspec'] = $proto_opts;
+            }
+        } elseif ('unix' == $parsed['protocol']) {
+            $parsed['socket'] = $proto_opts;
+        }
 
-    $variant = null;
+        // Get dabase if any
+        // $dsn => database
+        if (!empty($dsn)) {
+            // /database
+            if (($pos = strpos($dsn, '?')) === false) {
+                $parsed['database'] = $dsn;
+            // /database?param1=value1&param2=value2
+            } else {
+                $parsed['database'] = substr($dsn, 0, $pos);
+                $dsn = substr($dsn, $pos + 1);
+                if (false !== strpos($dsn, '&')) {
+                    $opts = explode('&', $dsn);
+                } else { // database?param1=value1
+                    $opts = array($dsn);
+                }
+                foreach ($opts as $opt) {
+                    list($key, $value) = explode('=', $opt);
+                    if (!isset($parsed[$key])) { // don't allow params overwrite
+                        $parsed[$key] = rawurldecode($value);
+                    }
+                }
+            }
+        }
 
-    for ($i = 0, $max = count($variants); $i < $max; $i++)
-    {
-      if (strlen($variants[$i]) > 0)
-      {
-        $variant .= $variant ? '_'.$variants[$i] : $variants[$i];
-        $catalogues[] = $catalogue.'.'.$variant;
-      }
+        return $parsed;
     }
-
-    return array_reverse($catalogues);
-  }
-
-  public function getId()
-  {
-    return md5($this->source);
-  }
 }
diff --git a/lib/i18n/sfMessageSource_File.class.php b/lib/i18n/sfMessageSource_File.class.php
index d40164315..ad33dd3f9 100644
--- a/lib/i18n/sfMessageSource_File.class.php
+++ b/lib/i18n/sfMessageSource_File.class.php
@@ -13,9 +13,8 @@
  * {@link http://prado.sourceforge.net/}
  *
  * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
+ *
  * @version    $Id$
- * @package    symfony
- * @subpackage i18n
  */
 
 /**
@@ -24,178 +23,180 @@
  * This is the base class for file based message sources like XLIFF or gettext.
  *
  * @author Xiang Wei Zhuo <weizhuo[at]gmail[dot]com>
+ *
  * @version v1.0, last update on Fri Dec 24 16:18:44 EST 2004
- * @package    symfony
- * @subpackage i18n
  */
 abstract class sfMessageSource_File extends sfMessageSource
 {
-  /**
-   * Separator between culture name and source.
-   * @var string
-   */
-  protected $dataSeparator = '.';
-
-  /**
-   * Constructor.
-   *
-   * @param string $source the directory where the messages are stored.
-   * @see MessageSource::factory();
-   */
-  function __construct($source)
-  {
-    $this->source = (string) $source;
-  }
-
-  /**
-   * Gets the last modified unix-time for this particular catalogue+variant.
-   * Just use the file modified time.
-   *
-   * @param string $source catalogue+variant
-   * @return int last modified in unix-time format.
-   */
-  public function getLastModified($source)
-  {
-    return is_file($source) ? filemtime($source) : 0;
-  }
-
-  /**
-   * Gets the message file for a specific message catalogue and cultural variant.
-   *
-   * @param string $variant message catalogue
-   * @return string full path to the message file.
-   */
-  public function getSource($variant)
-  {
-    return $this->source.'/'.$variant;
-  }
-
-  /**
-   * Determines if the message file source is valid.
-   *
-   * @param string $source message file
-   * @return boolean true if valid, false otherwise.
-   */
-  public function isValidSource($source)
-  {
-    return is_file($source);
-  }
-
-  /**
-   * Gets all the variants of a particular catalogue.
-   *
-   * @param string $catalogue catalogue name
-   * @return array list of all variants for this catalogue.
-   */
-  public function getCatalogueList($catalogue)
-  {
-    $variants = explode('_', $this->culture);
-    $source = $catalogue.$this->dataExt;
-
-    $catalogues = array($source);
-
-    $variant = null;
-
-    for ($i = 0, $max = count($variants); $i < $max; $i++)
+    /**
+     * Separator between culture name and source.
+     *
+     * @var string
+     */
+    protected $dataSeparator = '.';
+
+    /**
+     * Constructor.
+     *
+     * @param string $source the directory where the messages are stored
+     *
+     * @see MessageSource::factory();
+     */
+    public function __construct($source)
+    {
+        $this->source = (string) $source;
+    }
+
+    /**
+     * Gets the last modified unix-time for this particular catalogue+variant.
+     * Just use the file modified time.
+     *
+     * @param string $source catalogue+variant
+     *
+     * @return int last modified in unix-time format
+     */
+    public function getLastModified($source)
+    {
+        return is_file($source) ? filemtime($source) : 0;
+    }
+
+    /**
+     * Gets the message file for a specific message catalogue and cultural variant.
+     *
+     * @param string $variant message catalogue
+     *
+     * @return string full path to the message file
+     */
+    public function getSource($variant)
+    {
+        return $this->source.'/'.$variant;
+    }
+
+    /**
+     * Determines if the message file source is valid.
+     *
+     * @param string $source message file
+     *
+     * @return bool true if valid, false otherwise
+     */
+    public function isValidSource($source)
     {
-      if (strlen($variants[$i]) > 0)
-      {
-        $variant .= $variant ? '_'.$variants[$i] : $variants[$i];
-        $catalogues[] = $catalogue.$this->dataSeparator.$variant.$this->dataExt;
-      }
+        return is_file($source);
     }
 
-    $byDir = $this->getCatalogueByDir($catalogue);
-    $catalogues = array_merge($byDir, array_reverse($catalogues));
+    /**
+     * Gets all the variants of a particular catalogue.
+     *
+     * @param string $catalogue catalogue name
+     *
+     * @return array list of all variants for this catalogue
+     */
+    public function getCatalogueList($catalogue)
+    {
+        $variants = explode('_', $this->culture);
+        $source = $catalogue.$this->dataExt;
+
+        $catalogues = array($source);
+
+        $variant = null;
+
+        for ($i = 0, $max = count($variants); $i < $max; ++$i) {
+            if (strlen($variants[$i]) > 0) {
+                $variant .= $variant ? '_'.$variants[$i] : $variants[$i];
+                $catalogues[] = $catalogue.$this->dataSeparator.$variant.$this->dataExt;
+            }
+        }
 
-    return $catalogues;
-  }
+        $byDir = $this->getCatalogueByDir($catalogue);
 
-  /**
-   * Traverses through the directory structure to find the catalogues.
-   * This should only be called by getCatalogueList()
-   *
-   * @param string $catalogue a particular catalogue.
-   * @return array a list of catalogues.
-   * @see getCatalogueList()
-   */
-  protected function getCatalogueByDir($catalogue)
-  {
-    $variants = explode('_', $this->culture);
-    $catalogues = array();
+        return array_merge($byDir, array_reverse($catalogues));
+    }
 
-    $variant = null;
+    /**
+     * Returns a list of catalogue and its culture ID.
+     * E.g. array('messages', 'en_AU').
+     *
+     * @return array list of catalogues
+     *
+     * @see getCatalogues()
+     */
+    public function catalogues()
+    {
+        return $this->getCatalogues();
+    }
 
-    for ($i = 0, $max = count($variants); $i < $max; $i++)
+    public function getId()
     {
-      if (strlen($variants[$i]) > 0)
-      {
-        $variant .= $variant ? '_'.$variants[$i] : $variants[$i];
-        $catalogues[] = $variant.'/'.$catalogue.$this->dataExt;
-      }
+        return md5($this->source);
     }
 
-    return array_reverse($catalogues);
-  }
-
-  /**
-   * Returns a list of catalogue and its culture ID.
-   * E.g. array('messages', 'en_AU')
-   *
-   * @return array list of catalogues
-   * @see getCatalogues()
-   */
-  public function catalogues()
-  {
-    return $this->getCatalogues();
-  }
-
-  /**
-   * Returns a list of catalogue and its culture ID. This takes care
-   * of directory structures.
-   * E.g. array('messages', 'en_AU')
-   *
-   * @return array list of catalogues
-   */
-  protected function getCatalogues($dir = null, $variant = null)
-  {
-    $dir = $dir ?: $this->getSource($variant);
-    $files = scandir($dir);
-
-    $catalogue = array();
-
-    foreach ($files as $file)
+    /**
+     * Traverses through the directory structure to find the catalogues.
+     * This should only be called by getCatalogueList().
+     *
+     * @param string $catalogue a particular catalogue
+     *
+     * @return array a list of catalogues
+     *
+     * @see getCatalogueList()
+     */
+    protected function getCatalogueByDir($catalogue)
     {
-      if (is_dir($dir.'/'.$file) && preg_match('/^[a-z]{2}(_[A-Z]{2,3})?$/', $file))
-      {
-        $catalogue = array_merge($catalogue, $this->getCatalogues($dir.'/'.$file, $file));
-      }
-
-      $pos = strpos($file, $this->dataExt);
-      if ($pos > 0 && substr($file, -1 * strlen($this->dataExt)) == $this->dataExt)
-      {
-        $name = substr($file, 0, $pos);
-        $dot = strrpos($name, $this->dataSeparator);
-        $culture = $variant;
-        $cat = $name;
-        if (is_int($dot))
-        {
-          $culture = substr($name, $dot + 1,strlen($name));
-          $cat = substr($name, 0, $dot);
+        $variants = explode('_', $this->culture);
+        $catalogues = array();
+
+        $variant = null;
+
+        for ($i = 0, $max = count($variants); $i < $max; ++$i) {
+            if (strlen($variants[$i]) > 0) {
+                $variant .= $variant ? '_'.$variants[$i] : $variants[$i];
+                $catalogues[] = $variant.'/'.$catalogue.$this->dataExt;
+            }
         }
-        $details[0] = $cat;
-        $details[1] = $culture;
 
-        $catalogue[] = $details;
-      }
+        return array_reverse($catalogues);
     }
-    sort($catalogue);
 
-    return $catalogue;
-  }
+    /**
+     * Returns a list of catalogue and its culture ID. This takes care
+     * of directory structures.
+     * E.g. array('messages', 'en_AU').
+     *
+     * @param mixed|null $dir
+     * @param mixed|null $variant
+     *
+     * @return array list of catalogues
+     */
+    protected function getCatalogues($dir = null, $variant = null)
+    {
+        $dir = $dir ?: $this->getSource($variant);
+        $files = scandir($dir);
+
+        $catalogue = array();
+
+        foreach ($files as $file) {
+            if (is_dir($dir.'/'.$file) && preg_match('/^[a-z]{2}(_[A-Z]{2,3})?$/', $file)) {
+                $catalogue = array_merge($catalogue, $this->getCatalogues($dir.'/'.$file, $file));
+            }
+
+            $pos = strpos($file, $this->dataExt);
+            if ($pos > 0 && substr($file, -1 * strlen($this->dataExt)) == $this->dataExt) {
+                $name = substr($file, 0, $pos);
+                $dot = strrpos($name, $this->dataSeparator);
+                $culture = $variant;
+                $cat = $name;
+                if (is_int($dot)) {
+                    $culture = substr($name, $dot + 1, strlen($name));
+                    $cat = substr($name, 0, $dot);
+                }
+                $details[0] = $cat;
+                $details[1] = $culture;
+
+                $catalogue[] = $details;
+            }
+        }
+        sort($catalogue);
 
-  public function getId()
-  {
-    return md5($this->source);
-  }
+        return $catalogue;
+    }
 }
diff --git a/lib/i18n/sfMessageSource_MySQL.class.php b/lib/i18n/sfMessageSource_MySQL.class.php
index 5fbfec015..381808c8e 100644
--- a/lib/i18n/sfMessageSource_MySQL.class.php
+++ b/lib/i18n/sfMessageSource_MySQL.class.php
@@ -13,9 +13,8 @@
  * {@link http://prado.sourceforge.net/}
  *
  * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
+ *
  * @version    $Id$
- * @package    symfony
- * @subpackage i18n
  */
 
 /**
@@ -85,398 +84,374 @@
  *  </database>
  *
  * @author Xiang Wei Zhuo <weizhuo[at]gmail[dot]com>
+ *
  * @version v1.0, last update on Fri Dec 24 16:58:58 EST 2004
- * @package    symfony
- * @subpackage i18n
  */
 class sfMessageSource_MySQL extends sfMessageSource_Database
 {
-  /**
-   * The datasource string, full DSN to the database.
-   * @var string
-   */
-  protected $source;
-
-  /**
-   * The DSN array property, parsed by PEAR's DB DSN parser.
-   * @var array
-   */
-  protected $dsn;
-
-  /**
-   * A resource link to the database
-   * @var db
-   */
-  protected $db;
-
-  /**
-   * Constructor.
-   * Creates a new message source using MySQL.
-   *
-   * @param string $source  MySQL datasource, in PEAR's DB DSN format.
-   * @see MessageSource::factory();
-   */
-  function __construct($source)
-  {
-    $this->source = (string) $source;
-    $this->dsn = $this->parseDSN($this->source);
-    $this->db = $this->connect();
-  }
-
-  /**
-   * Destructor, closes the database connection.
-   */
-  function __destruct()
-  {
-    @mysql_close($this->db);
-  }
-
-  /**
-   * Connects to the MySQL datasource
-   *
-   * @return resource MySQL connection.
-   * @throws sfException, connection and database errors.
-   */
-  protected function connect()
-  {
-    $dsninfo = $this->dsn;
-
-    if (isset($dsninfo['protocol']) && $dsninfo['protocol'] == 'unix')
-    {
-      $dbhost = ':'.$dsninfo['socket'];
-    }
-    else
-    {
-      $dbhost = $dsninfo['hostspec'] ?: 'localhost';
-      if (!empty($dsninfo['port']))
-      {
-        $dbhost .= ':'.$dsninfo['port'];
-      }
-    }
-    $user = $dsninfo['username'];
-    $pw = $dsninfo['password'];
-
-    $connect_function = 'mysql_connect';
-
-    if (!function_exists($connect_function))
+    /**
+     * The datasource string, full DSN to the database.
+     *
+     * @var string
+     */
+    protected $source;
+
+    /**
+     * The DSN array property, parsed by PEAR's DB DSN parser.
+     *
+     * @var array
+     */
+    protected $dsn;
+
+    /**
+     * A resource link to the database.
+     *
+     * @var db
+     */
+    protected $db;
+
+    /**
+     * Constructor.
+     * Creates a new message source using MySQL.
+     *
+     * @param string $source mySQL datasource, in PEAR's DB DSN format
+     *
+     * @see MessageSource::factory();
+     */
+    public function __construct($source)
     {
-      throw new RuntimeException('The function mysql_connect() does not exist. Please confirm MySQL is enabled in php.ini');
+        $this->source = (string) $source;
+        $this->dsn = $this->parseDSN($this->source);
+        $this->db = $this->connect();
     }
 
-    if ($dbhost && $user && $pw)
-    {
-      $conn = @$connect_function($dbhost, $user, $pw);
-    }
-    elseif ($dbhost && $user)
-    {
-      $conn = @$connect_function($dbhost, $user);
-    }
-    elseif ($dbhost)
-    {
-      $conn = @$connect_function($dbhost);
-    }
-    else
+    /**
+     * Destructor, closes the database connection.
+     */
+    public function __destruct()
     {
-      $conn = false;
+        @mysql_close($this->db);
     }
 
-    if (empty($conn))
+    /**
+     * Gets the database connection.
+     *
+     * @return db database connection
+     */
+    public function connection()
     {
-      throw new sfException(sprintf('Error in connecting to %s.', $dsninfo));
+        return $this->db;
     }
 
-    if ($dsninfo['database'])
+    /**
+     * Gets an array of messages for a particular catalogue and cultural variant.
+     *
+     * @param string $variant the catalogue name + variant
+     *
+     * @return array translation messages
+     */
+    public function &loadData($variant)
     {
-      if (!@mysql_select_db($dsninfo['database'], $conn))
-      {
-        throw new sfException(sprintf('Error in connecting database, dsn: %s.', $dsninfo));
-      }
-    }
-    else
-    {
-      throw new sfException('Please provide a database for message translation.');
-    }
+        $variant = mysql_real_escape_string($variant, $this->db);
 
-    return $conn;
-  }
-
-  /**
-   * Gets the database connection.
-   *
-   * @return db database connection.
-   */
-  public function connection()
-  {
-    return $this->db;
-  }
-
-  /**
-   * Gets an array of messages for a particular catalogue and cultural variant.
-   *
-   * @param string $variant the catalogue name + variant
-   * @return array translation messages.
-   */
-  public function &loadData($variant)
-  {
-    $variant = mysql_real_escape_string($variant, $this->db);
-
-    $statement =
-      "SELECT t.id, t.source, t.target, t.comments
+        $statement =
+          "SELECT t.id, t.source, t.target, t.comments
         FROM trans_unit t, catalogue c
         WHERE c.cat_id =  t.cat_id
           AND c.name = '{$variant}'
         ORDER BY id ASC";
 
-    $rs = mysql_query($statement, $this->db);
+        $rs = mysql_query($statement, $this->db);
 
-    $result = array();
+        $result = array();
 
-    while ($row = mysql_fetch_array($rs, MYSQL_NUM))
-    {
-      $source = $row[1];
-      $result[$source][] = $row[2]; //target
-      $result[$source][] = $row[0]; //id
-      $result[$source][] = $row[3]; //comments
-    }
+        while ($row = mysql_fetch_array($rs, MYSQL_NUM)) {
+            $source = $row[1];
+            $result[$source][] = $row[2]; // target
+            $result[$source][] = $row[0]; // id
+            $result[$source][] = $row[3]; // comments
+        }
 
-    return $result;
-  }
-
-  /**
-   * Gets the last modified unix-time for this particular catalogue+variant.
-   * We need to query the database to get the date_modified.
-   *
-   * @param string $source catalogue+variant
-   * @return int last modified in unix-time format.
-   */
-  protected function getLastModified($source)
-  {
-    $source = mysql_real_escape_string($source, $this->db);
-
-    $rs = mysql_query("SELECT date_modified FROM catalogue WHERE name = '{$source}'", $this->db);
-
-    return $rs ? (int)mysql_result($rs, 0) : 0;
-  }
-
-  /**
-   * Checks if a particular catalogue+variant exists in the database.
-   *
-   * @param string $variant catalogue+variant
-   * @return boolean true if the catalogue+variant is in the database, false otherwise.
-   */
-  public function isValidSource($variant)
-  {
-    $variant = mysql_real_escape_string ($variant, $this->db);
-
-    $rs = mysql_query("SELECT COUNT(*) FROM catalogue WHERE name = '{$variant}'", $this->db);
-
-    $row = mysql_fetch_array($rs, MYSQL_NUM);
-
-    return $row && $row[0] == '1';
-  }
-
-  /**
-   * Retrieves catalogue details, array($cat_id, $variant, $count).
-   *
-   * @param string $catalogue catalogue
-   * @return array catalogue details, array($cat_id, $variant, $count).
-   */
-  protected function getCatalogueDetails($catalogue = 'messages')
-  {
-    if (empty($catalogue))
-    {
-      $catalogue = 'messages';
+        return $result;
     }
 
-    $variant = $catalogue.'.'.$this->culture;
+    /**
+     * Checks if a particular catalogue+variant exists in the database.
+     *
+     * @param string $variant catalogue+variant
+     *
+     * @return bool true if the catalogue+variant is in the database, false otherwise
+     */
+    public function isValidSource($variant)
+    {
+        $variant = mysql_real_escape_string($variant, $this->db);
 
-    $name = mysql_real_escape_string($this->getSource($variant), $this->db);
+        $rs = mysql_query("SELECT COUNT(*) FROM catalogue WHERE name = '{$variant}'", $this->db);
 
-    $rs = mysql_query("SELECT cat_id FROM catalogue WHERE name = '{$name}'", $this->db);
+        $row = mysql_fetch_array($rs, MYSQL_NUM);
 
-    if (mysql_num_rows($rs) != 1)
-    {
-      return false;
+        return $row && '1' == $row[0];
     }
 
-    $cat_id = (int) mysql_result($rs, 0);
+    /**
+     * Saves the list of untranslated blocks to the translation source.
+     * If the translation was not found, you should add those
+     * strings to the translation source via the <b>append()</b> method.
+     *
+     * @param string $catalogue the catalogue to add to
+     *
+     * @return bool true if saved successfuly, false otherwise
+     */
+    public function save($catalogue = 'messages')
+    {
+        $messages = $this->untranslated;
 
-    // first get the catalogue ID
-    $rs = mysql_query("SELECT COUNT(*) FROM trans_unit WHERE cat_id = {$cat_id}", $this->db);
+        if (count($messages) <= 0) {
+            return false;
+        }
 
-    $count = (int) mysql_result($rs, 0);
+        $details = $this->getCatalogueDetails($catalogue);
 
-    return array($cat_id, $variant, $count);
-  }
+        if ($details) {
+            list($cat_id, $variant, $count) = $details;
+        } else {
+            return false;
+        }
 
-  /**
-   * Updates the catalogue last modified time.
-   *
-   * @return boolean true if updated, false otherwise.
-   */
-  protected function updateCatalogueTime($cat_id, $variant)
-  {
-    $time = time();
+        if ($cat_id <= 0) {
+            return false;
+        }
+        $inserted = 0;
 
-    $result = mysql_query("UPDATE catalogue SET date_modified = {$time} WHERE cat_id = {$cat_id}", $this->db);
+        $time = time();
 
-    if ($this->cache)
-    {
-      $this->cache->remove($variant.':'.$this->culture);
+        foreach ($messages as $message) {
+            ++$count;
+            ++$inserted;
+            $message = mysql_real_escape_string($message, $this->db);
+            $statement = "INSERT INTO trans_unit
+        (cat_id,id,source,date_added) VALUES
+        ({$cat_id}, {$count},'{$message}',{$time})";
+            mysql_query($statement, $this->db);
+        }
+        if ($inserted > 0) {
+            $this->updateCatalogueTime($cat_id, $variant);
+        }
+
+        return $inserted > 0;
     }
 
-    return $result;
-  }
-
-  /**
-   * Saves the list of untranslated blocks to the translation source.
-   * If the translation was not found, you should add those
-   * strings to the translation source via the <b>append()</b> method.
-   *
-   * @param string $catalogue the catalogue to add to
-   * @return boolean true if saved successfuly, false otherwise.
-   */
-  function save($catalogue = 'messages')
-  {
-    $messages = $this->untranslated;
-
-    if (count($messages) <= 0)
+    /**
+     * Deletes a particular message from the specified catalogue.
+     *
+     * @param string $message   the source message to delete
+     * @param string $catalogue the catalogue to delete from
+     *
+     * @return bool true if deleted, false otherwise
+     */
+    public function delete($message, $catalogue = 'messages')
     {
-      return false;
-    }
+        $details = $this->getCatalogueDetails($catalogue);
+        if ($details) {
+            list($cat_id, $variant, $count) = $details;
+        } else {
+            return false;
+        }
 
-    $details = $this->getCatalogueDetails($catalogue);
+        $text = mysql_real_escape_string($message, $this->db);
 
-    if ($details)
-    {
-      list($cat_id, $variant, $count) = $details;
-    }
-    else
-    {
-      return false;
-    }
+        $statement = "DELETE FROM trans_unit WHERE cat_id = {$cat_id} AND source = '{$message}'";
+        $deleted = false;
 
-    if ($cat_id <= 0)
-    {
-      return false;
-    }
-    $inserted = 0;
+        mysql_query($statement, $this->db);
 
-    $time = time();
+        if (1 == mysql_affected_rows($this->db)) {
+            $deleted = $this->updateCatalogueTime($cat_id, $variant);
+        }
 
-    foreach ($messages as $message)
-    {
-      $count++;
-      $inserted++;
-      $message = mysql_real_escape_string($message, $this->db);
-      $statement = "INSERT INTO trans_unit
-        (cat_id,id,source,date_added) VALUES
-        ({$cat_id}, {$count},'{$message}',$time)";
-      mysql_query($statement, $this->db);
-    }
-    if ($inserted > 0)
-    {
-      $this->updateCatalogueTime($cat_id, $variant);
+        return $deleted;
     }
 
-    return $inserted > 0;
-  }
-
-  /**
-   * Deletes a particular message from the specified catalogue.
-   *
-   * @param string $message   the source message to delete.
-   * @param string $catalogue the catalogue to delete from.
-   * @return boolean true if deleted, false otherwise.
-   */
-  function delete($message, $catalogue = 'messages')
-  {
-    $details = $this->getCatalogueDetails($catalogue);
-    if ($details)
-    {
-      list($cat_id, $variant, $count) = $details;
-    }
-    else
+    /**
+     * Updates the translation.
+     *
+     * @param string $text      the source string
+     * @param string $target    the new translation string
+     * @param string $comments  comments
+     * @param string $catalogue the catalogue of the translation
+     *
+     * @return bool true if translation was updated, false otherwise
+     */
+    public function update($text, $target, $comments, $catalogue = 'messages')
     {
-      return false;
-    }
+        $details = $this->getCatalogueDetails($catalogue);
+        if ($details) {
+            list($cat_id, $variant, $count) = $details;
+        } else {
+            return false;
+        }
 
-    $text = mysql_real_escape_string($message, $this->db);
+        $comments = mysql_real_escape_string($comments, $this->db);
+        $target = mysql_real_escape_string($target, $this->db);
+        $text = mysql_real_escape_string($text, $this->db);
 
-    $statement = "DELETE FROM trans_unit WHERE cat_id = {$cat_id} AND source = '{$message}'";
-    $deleted = false;
+        $time = time();
 
-    mysql_query($statement, $this->db);
+        $statement = "UPDATE trans_unit SET target = '{$target}', comments = '{$comments}', date_modified = '{$time}' WHERE cat_id = {$cat_id} AND source = '{$text}'";
 
-    if (mysql_affected_rows($this->db) == 1)
+        $updated = false;
+
+        mysql_query($statement, $this->db);
+        if (1 == mysql_affected_rows($this->db)) {
+            $updated = $this->updateCatalogueTime($cat_id, $variant);
+        }
+
+        return $updated;
+    }
+
+    /**
+     * Returns a list of catalogue as key and all it variants as value.
+     *
+     * @return array list of catalogues
+     */
+    public function catalogues()
     {
-      $deleted = $this->updateCatalogueTime($cat_id, $variant);
+        $statement = 'SELECT name FROM catalogue ORDER BY name';
+        $rs = mysql_query($statement, $this->db);
+        $result = array();
+        while ($row = mysql_fetch_array($rs, MYSQL_NUM)) {
+            $details = explode('.', $row[0]);
+            if (!isset($details[1])) {
+                $details[1] = null;
+            }
+
+            $result[] = $details;
+        }
+
+        return $result;
     }
 
-    return $deleted;
-  }
-
-  /**
-   * Updates the translation.
-   *
-   * @param string $text      the source string.
-   * @param string $target    the new translation string.
-   * @param string $comments  comments
-   * @param string $catalogue the catalogue of the translation.
-   * @return boolean true if translation was updated, false otherwise.
-   */
-  function update($text, $target, $comments, $catalogue = 'messages')
-  {
-    $details = $this->getCatalogueDetails($catalogue);
-    if ($details)
+    /**
+     * Connects to the MySQL datasource.
+     *
+     * @return resource mySQL connection
+     *
+     * @throws sfException, connection and database errors
+     */
+    protected function connect()
     {
-      list($cat_id, $variant, $count) = $details;
+        $dsninfo = $this->dsn;
+
+        if (isset($dsninfo['protocol']) && 'unix' == $dsninfo['protocol']) {
+            $dbhost = ':'.$dsninfo['socket'];
+        } else {
+            $dbhost = $dsninfo['hostspec'] ?: 'localhost';
+            if (!empty($dsninfo['port'])) {
+                $dbhost .= ':'.$dsninfo['port'];
+            }
+        }
+        $user = $dsninfo['username'];
+        $pw = $dsninfo['password'];
+
+        $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');
+        }
+
+        if ($dbhost && $user && $pw) {
+            $conn = @$connect_function($dbhost, $user, $pw);
+        } elseif ($dbhost && $user) {
+            $conn = @$connect_function($dbhost, $user);
+        } elseif ($dbhost) {
+            $conn = @$connect_function($dbhost);
+        } else {
+            $conn = false;
+        }
+
+        if (empty($conn)) {
+            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));
+            }
+        } else {
+            throw new sfException('Please provide a database for message translation.');
+        }
+
+        return $conn;
     }
-    else
+
+    /**
+     * Gets the last modified unix-time for this particular catalogue+variant.
+     * We need to query the database to get the date_modified.
+     *
+     * @param string $source catalogue+variant
+     *
+     * @return int last modified in unix-time format
+     */
+    protected function getLastModified($source)
     {
-      return false;
+        $source = mysql_real_escape_string($source, $this->db);
+
+        $rs = mysql_query("SELECT date_modified FROM catalogue WHERE name = '{$source}'", $this->db);
+
+        return $rs ? (int) mysql_result($rs, 0) : 0;
     }
 
-    $comments = mysql_real_escape_string($comments, $this->db);
-    $target = mysql_real_escape_string($target, $this->db);
-    $text = mysql_real_escape_string($text, $this->db);
+    /**
+     * Retrieves catalogue details, array($cat_id, $variant, $count).
+     *
+     * @param string $catalogue catalogue
+     *
+     * @return array catalogue details, array($cat_id, $variant, $count)
+     */
+    protected function getCatalogueDetails($catalogue = 'messages')
+    {
+        if (empty($catalogue)) {
+            $catalogue = 'messages';
+        }
 
-    $time = time();
+        $variant = $catalogue.'.'.$this->culture;
 
-    $statement = "UPDATE trans_unit SET target = '{$target}', comments = '{$comments}', date_modified = '{$time}' WHERE cat_id = {$cat_id} AND source = '{$text}'";
+        $name = mysql_real_escape_string($this->getSource($variant), $this->db);
 
-    $updated = false;
+        $rs = mysql_query("SELECT cat_id FROM catalogue WHERE name = '{$name}'", $this->db);
 
-    mysql_query($statement, $this->db);
-    if (mysql_affected_rows($this->db) == 1)
-    {
-      $updated = $this->updateCatalogueTime($cat_id, $variant);
+        if (1 != mysql_num_rows($rs)) {
+            return false;
+        }
+
+        $cat_id = (int) mysql_result($rs, 0);
+
+        // first get the catalogue ID
+        $rs = mysql_query("SELECT COUNT(*) FROM trans_unit WHERE cat_id = {$cat_id}", $this->db);
+
+        $count = (int) mysql_result($rs, 0);
+
+        return array($cat_id, $variant, $count);
     }
 
-    return $updated;
-  }
-
-  /**
-   * Returns a list of catalogue as key and all it variants as value.
-   *
-   * @return array list of catalogues
-   */
-  function catalogues()
-  {
-    $statement = 'SELECT name FROM catalogue ORDER BY name';
-    $rs = mysql_query($statement, $this->db);
-    $result = array();
-    while($row = mysql_fetch_array($rs, MYSQL_NUM))
+    /**
+     * Updates the catalogue last modified time.
+     *
+     * @param mixed $cat_id
+     * @param mixed $variant
+     *
+     * @return bool true if updated, false otherwise
+     */
+    protected function updateCatalogueTime($cat_id, $variant)
     {
-      $details = explode('.', $row[0]);
-      if (!isset($details[1]))
-      {
-        $details[1] = null;
-      }
+        $time = time();
 
-      $result[] = $details;
-    }
+        $result = mysql_query("UPDATE catalogue SET date_modified = {$time} WHERE cat_id = {$cat_id}", $this->db);
+
+        if ($this->cache) {
+            $this->cache->remove($variant.':'.$this->culture);
+        }
 
-    return $result;
-  }
+        return $result;
+    }
 }
diff --git a/lib/i18n/sfMessageSource_SQLite.class.php b/lib/i18n/sfMessageSource_SQLite.class.php
index f4295cacb..c6b268f8e 100644
--- a/lib/i18n/sfMessageSource_SQLite.class.php
+++ b/lib/i18n/sfMessageSource_SQLite.class.php
@@ -13,9 +13,8 @@
  * {@link http://prado.sourceforge.net/}
  *
  * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
+ *
  * @version    $Id$
- * @package    symfony
- * @subpackage i18n
  */
 
 /**
@@ -81,325 +80,312 @@
  *  </database>
  *
  * @author Xiang Wei Zhuo <weizhuo[at]gmail[dot]com>
+ *
  * @version v1.0, last update on Fri Dec 24 16:58:58 EST 2004
- * @package    symfony
- * @subpackage i18n
  */
 class sfMessageSource_SQLite extends sfMessageSource_Database
 {
-  /**
-   * The SQLite datasource, the filename of the database.
-   * @var string
-   */
-  protected $source;
-
-  /**
-   * Constructor.
-   * Creates a new message source using SQLite.
-   * @see MessageSource::factory();
-   * @param string $source SQLite datasource, in PEAR's DB DSN format.
-   */
-  function __construct($source)
-  {
-    $dsn = $this->parseDSN((string) $source);
-    $this->source = $dsn['database'];
-  }
-
-  /**
-   * Gets an array of messages for a particular catalogue and cultural variant.
-   *
-   * @param string $variant the catalogue name + variant
-   * @return array translation messages.
-   */
-  public function &loadData($variant)
-  {
-    $variant = sqlite_escape_string($variant);
-
-    $statement =
-      "SELECT t.id, t.source, t.target, t.comments
+    /**
+     * The SQLite datasource, the filename of the database.
+     *
+     * @var string
+     */
+    protected $source;
+
+    /**
+     * Constructor.
+     * Creates a new message source using SQLite.
+     *
+     * @see MessageSource::factory();
+     *
+     * @param string $source SQLite datasource, in PEAR's DB DSN format
+     */
+    public function __construct($source)
+    {
+        $dsn = $this->parseDSN((string) $source);
+        $this->source = $dsn['database'];
+    }
+
+    /**
+     * Gets an array of messages for a particular catalogue and cultural variant.
+     *
+     * @param string $variant the catalogue name + variant
+     *
+     * @return array translation messages
+     */
+    public function &loadData($variant)
+    {
+        $variant = sqlite_escape_string($variant);
+
+        $statement =
+          "SELECT t.id, t.source, t.target, t.comments
         FROM trans_unit t, catalogue c
         WHERE c.cat_id =  t.cat_id
           AND c.name = '{$variant}'
         ORDER BY id ASC";
 
-    $db = sqlite_open($this->source);
-    $rs = sqlite_query($statement, $db);
-
-    $result = array();
+        $db = sqlite_open($this->source);
+        $rs = sqlite_query($statement, $db);
 
-    while($row = sqlite_fetch_array($rs, SQLITE_NUM))
-    {
-      $source = $row[1];
-      $result[$source][] = $row[2]; //target
-      $result[$source][] = $row[0]; //id
-      $result[$source][] = $row[3]; //comments
-    }
+        $result = array();
 
-    sqlite_close($db);
-
-    return $result;
-  }
-
-  /**
-   * Gets the last modified unix-time for this particular catalogue+variant.
-   * We need to query the database to get the date_modified.
-   *
-   * @param string $source catalogue+variant
-   * @return int last modified in unix-time format.
-   */
-  protected function getLastModified($source)
-  {
-    $source = sqlite_escape_string($source);
-
-    $db = sqlite_open($this->source);
-
-    $rs = sqlite_query("SELECT date_modified FROM catalogue WHERE name = '{$source}'", $db);
-
-    $result = $rs ? (int) sqlite_fetch_single($rs) : 0;
-
-    sqlite_close($db);
-
-    return $result;
-  }
-
-  /**
-   * Checks if a particular catalogue+variant exists in the database.
-   *
-   * @param string $variant catalogue+variant
-   * @return boolean true if the catalogue+variant is in the database, false otherwise.
-   */
-  public function isValidSource($variant)
-  {
-    $variant = sqlite_escape_string($variant);
-    $db = sqlite_open($this->source);
-    $rs = sqlite_query("SELECT COUNT(*) FROM catalogue WHERE name = '{$variant}'", $db);
-    $result = $rs && (int) sqlite_fetch_single($rs);
-    sqlite_close($db);
-
-    return $result;
-  }
-
-  /**
-   * Retrieves catalogue details, array($cat_id, $variant, $count).
-   *
-   * @param string $catalogue catalogue
-   * @return array catalogue details, array($cat_id, $variant, $count).
-   */
-  protected function getCatalogueDetails($catalogue = 'messages')
-  {
-    if (empty($catalogue))
-    {
-      $catalogue = 'messages';
-    }
+        while ($row = sqlite_fetch_array($rs, SQLITE_NUM)) {
+            $source = $row[1];
+            $result[$source][] = $row[2]; // target
+            $result[$source][] = $row[0]; // id
+            $result[$source][] = $row[3]; // comments
+        }
 
-    $variant = $catalogue.'.'.$this->culture;
+        sqlite_close($db);
 
-    $name = sqlite_escape_string($this->getSource($variant));
+        return $result;
+    }
 
-    $db = sqlite_open($this->source);
+    /**
+     * Checks if a particular catalogue+variant exists in the database.
+     *
+     * @param string $variant catalogue+variant
+     *
+     * @return bool true if the catalogue+variant is in the database, false otherwise
+     */
+    public function isValidSource($variant)
+    {
+        $variant = sqlite_escape_string($variant);
+        $db = sqlite_open($this->source);
+        $rs = sqlite_query("SELECT COUNT(*) FROM catalogue WHERE name = '{$variant}'", $db);
+        $result = $rs && (int) sqlite_fetch_single($rs);
+        sqlite_close($db);
 
-    $rs = sqlite_query("SELECT cat_id FROM catalogue WHERE name = '{$name}'", $db);
+        return $result;
+    }
 
-    if (sqlite_num_rows($rs) != 1)
+    /**
+     * Saves the list of untranslated blocks to the translation source.
+     * If the translation was not found, you should add those
+     * strings to the translation source via the <b>append()</b> method.
+     *
+     * @param string $catalogue the catalogue to add to
+     *
+     * @return bool true if saved successfuly, false otherwise
+     */
+    public function save($catalogue = 'messages')
     {
-      return false;
+        $messages = $this->untranslated;
+
+        if (count($messages) <= 0) {
+            return false;
+        }
+
+        $details = $this->getCatalogueDetails($catalogue);
+
+        if ($details) {
+            list($cat_id, $variant, $count) = $details;
+        } else {
+            return false;
+        }
+
+        if ($cat_id <= 0) {
+            return false;
+        }
+        $inserted = 0;
+
+        $db = sqlite_open($this->source);
+        $time = time();
+
+        foreach ($messages as $message) {
+            $message = sqlite_escape_string($message);
+            if (sqlite_query("INSERT INTO trans_unit (cat_id, id, source, date_added) VALUES ({$cat_id}, {$count}, '{$message}', {$time})", $db)) {
+                ++$count;
+                ++$inserted;
+            }
+        }
+        if ($inserted > 0) {
+            $this->updateCatalogueTime($cat_id, $variant, $db);
+        }
+
+        sqlite_close($db);
+
+        return $inserted > 0;
     }
 
-    $cat_id = (int) (sqlite_fetch_single($rs));
+    /**
+     * Updates the translation.
+     *
+     * @param string $text      the source string
+     * @param string $target    the new translation string
+     * @param string $comments  comments
+     * @param string $catalogue the catalogue of the translation
+     *
+     * @return bool true if translation was updated, false otherwise
+     */
+    public function update($text, $target, $comments, $catalogue = 'messages')
+    {
+        $details = $this->getCatalogueDetails($catalogue);
+        if ($details) {
+            list($cat_id, $variant, $count) = $details;
+        } else {
+            return false;
+        }
 
-    // first get the catalogue ID
-    $rs = sqlite_query("SELECT count(msg_id) FROM trans_unit WHERE cat_id = {$cat_id}", $db);
+        $comments = sqlite_escape_string($comments);
+        $target = sqlite_escape_string($target);
+        $text = sqlite_escape_string($text);
 
-    $count = (int) sqlite_fetch_single($rs);
+        $time = time();
 
-    sqlite_close($db);
+        $db = sqlite_open($this->source);
 
-    return array($cat_id, $variant, $count);
-  }
+        sqlite_query("UPDATE trans_unit SET target = '{$target}', comments = '{$comments}', date_modified = '{$time}' WHERE cat_id = {$cat_id} AND source = '{$text}'", $db);
 
-  /**
-   * Updates the catalogue last modified time.
-   *
-   * @return boolean true if updated, false otherwise.
-   */
-  protected function updateCatalogueTime($cat_id, $variant, $db)
-  {
-    $time = time();
+        if (sqlite_changes($db)) {
+            $this->updateCatalogueTime($cat_id, $variant, $db);
+            $updated = true;
+        } else {
+            $updated = false;
+        }
 
-    $result = sqlite_query("UPDATE catalogue SET date_modified = {$time} WHERE cat_id = {$cat_id}", $db);
+        sqlite_close($db);
 
-    if ($this->cache)
-    {
-      $this->cache->remove($variant.':'.$this->culture);
+        return $updated;
     }
 
-    return $result;
-  }
-
-  /**
-   * Saves the list of untranslated blocks to the translation source.
-   * If the translation was not found, you should add those
-   * strings to the translation source via the <b>append()</b> method.
-   *
-   * @param string $catalogue the catalogue to add to
-   * @return boolean true if saved successfuly, false otherwise.
-   */
-  function save($catalogue = 'messages')
-  {
-    $messages = $this->untranslated;
-
-    if (count($messages) <= 0)
+    /**
+     * Deletes a particular message from the specified catalogue.
+     *
+     * @param string $message   the source message to delete
+     * @param string $catalogue the catalogue to delete from
+     *
+     * @return bool true if deleted, false otherwise
+     */
+    public function delete($message, $catalogue = 'messages')
     {
-      return false;
-    }
+        $details = $this->getCatalogueDetails($catalogue);
+        if ($details) {
+            list($cat_id, $variant, $count) = $details;
+        } else {
+            return false;
+        }
 
-    $details = $this->getCatalogueDetails($catalogue);
+        $db = sqlite_open($this->source);
+        $text = sqlite_escape_string($message);
 
-    if ($details)
-    {
-      list($cat_id, $variant, $count) = $details;
-    }
-    else
-    {
-      return false;
-    }
+        sqlite_query("DELETE FROM trans_unit WHERE cat_id = {$cat_id} AND source = '{$message}'", $db);
 
-    if ($cat_id <= 0)
-    {
-      return false;
-    }
-    $inserted = 0;
+        if (sqlite_changes($db)) {
+            $this->updateCatalogueTime($cat_id, $variant, $db);
+            $deleted = true;
+        } else {
+            $deleted = false;
+        }
 
-    $db = sqlite_open($this->source);
-    $time = time();
+        sqlite_close($db);
 
-    foreach ($messages as $message)
-    {
-      $message = sqlite_escape_string($message);
-      if (sqlite_query("INSERT INTO trans_unit (cat_id, id, source, date_added) VALUES ({$cat_id}, {$count}, '{$message}', $time)", $db))
-      {
-        $count++;
-        $inserted++;
-      }
-    }
-    if ($inserted > 0)
-    {
-      $this->updateCatalogueTime($cat_id, $variant, $db);
+        return $deleted;
     }
 
-    sqlite_close($db);
-
-    return $inserted > 0;
-  }
-
-  /**
-   * Updates the translation.
-   *
-   * @param string $text      the source string.
-   * @param string $target    the new translation string.
-   * @param string $comments  comments
-   * @param string $catalogue the catalogue of the translation.
-   * @return boolean true if translation was updated, false otherwise.
-   */
-  function update($text, $target, $comments, $catalogue = 'messages')
-  {
-    $details = $this->getCatalogueDetails($catalogue);
-    if ($details)
+    /**
+     * Returns a list of catalogue as key and all it variants as value.
+     *
+     * @return array list of catalogues
+     */
+    public function catalogues()
     {
-      list($cat_id, $variant, $count) = $details;
+        $db = sqlite_open($this->source);
+        $statement = 'SELECT name FROM catalogue ORDER BY name';
+        $rs = sqlite_query($statement, $db);
+        $result = array();
+        while ($row = sqlite_fetch_array($rs, SQLITE_NUM)) {
+            $details = explode('.', $row[0]);
+            if (!isset($details[1])) {
+                $details[1] = null;
+            }
+
+            $result[] = $details;
+        }
+        sqlite_close($db);
+
+        return $result;
     }
-    else
+
+    /**
+     * Gets the last modified unix-time for this particular catalogue+variant.
+     * We need to query the database to get the date_modified.
+     *
+     * @param string $source catalogue+variant
+     *
+     * @return int last modified in unix-time format
+     */
+    protected function getLastModified($source)
     {
-      return false;
-    }
+        $source = sqlite_escape_string($source);
 
-    $comments = sqlite_escape_string($comments);
-    $target = sqlite_escape_string($target);
-    $text = sqlite_escape_string($text);
+        $db = sqlite_open($this->source);
 
-    $time = time();
+        $rs = sqlite_query("SELECT date_modified FROM catalogue WHERE name = '{$source}'", $db);
 
-    $db = sqlite_open($this->source);
+        $result = $rs ? (int) sqlite_fetch_single($rs) : 0;
 
-    sqlite_query("UPDATE trans_unit SET target = '{$target}', comments = '{$comments}', date_modified = '{$time}' WHERE cat_id = {$cat_id} AND source = '{$text}'", $db);
+        sqlite_close($db);
 
-    if (sqlite_changes($db))
-    {
-      $this->updateCatalogueTime($cat_id, $variant, $db);
-      $updated = true;
-    }
-    else
-    {
-      $updated = false;
+        return $result;
     }
 
-    sqlite_close($db);
-
-    return $updated;
-  }
-
-  /**
-   * Deletes a particular message from the specified catalogue.
-   *
-   * @param string  $message    the source message to delete.
-   * @param string  $catalogue  the catalogue to delete from.
-   * @return boolean true if deleted, false otherwise.
-   */
-  function delete($message, $catalogue = 'messages')
-  {
-    $details = $this->getCatalogueDetails($catalogue);
-    if ($details)
-    {
-      list($cat_id, $variant, $count) = $details;
-    }
-    else
+    /**
+     * Retrieves catalogue details, array($cat_id, $variant, $count).
+     *
+     * @param string $catalogue catalogue
+     *
+     * @return array catalogue details, array($cat_id, $variant, $count)
+     */
+    protected function getCatalogueDetails($catalogue = 'messages')
     {
-      return false;
-    }
+        if (empty($catalogue)) {
+            $catalogue = 'messages';
+        }
 
-    $db = sqlite_open($this->source);
-    $text = sqlite_escape_string($message);
+        $variant = $catalogue.'.'.$this->culture;
 
-    sqlite_query("DELETE FROM trans_unit WHERE cat_id = {$cat_id} AND source = '{$message}'", $db);
+        $name = sqlite_escape_string($this->getSource($variant));
 
-    if (sqlite_changes($db))
-    {
-      $this->updateCatalogueTime($cat_id, $variant, $db);
-      $deleted = true;
-    }
-    else
-    {
-      $deleted = false;
+        $db = sqlite_open($this->source);
+
+        $rs = sqlite_query("SELECT cat_id FROM catalogue WHERE name = '{$name}'", $db);
+
+        if (1 != sqlite_num_rows($rs)) {
+            return false;
+        }
+
+        $cat_id = (int) sqlite_fetch_single($rs);
+
+        // first get the catalogue ID
+        $rs = sqlite_query("SELECT count(msg_id) FROM trans_unit WHERE cat_id = {$cat_id}", $db);
+
+        $count = (int) sqlite_fetch_single($rs);
+
+        sqlite_close($db);
+
+        return array($cat_id, $variant, $count);
     }
 
-    sqlite_close($db);
-
-    return $deleted;
-  }
-
-  /**
-   * Returns a list of catalogue as key and all it variants as value.
-   *
-   * @return array list of catalogues
-   */
-  function catalogues()
-  {
-    $db = sqlite_open($this->source);
-    $statement = 'SELECT name FROM catalogue ORDER BY name';
-    $rs = sqlite_query($statement, $db);
-    $result = array();
-    while ($row = sqlite_fetch_array($rs, SQLITE_NUM))
+    /**
+     * Updates the catalogue last modified time.
+     *
+     * @param mixed $cat_id
+     * @param mixed $variant
+     * @param mixed $db
+     *
+     * @return bool true if updated, false otherwise
+     */
+    protected function updateCatalogueTime($cat_id, $variant, $db)
     {
-      $details = explode('.', $row[0]);
-      if (!isset($details[1]))
-      {
-        $details[1] = null;
-      }
+        $time = time();
 
-      $result[] = $details;
-    }
-    sqlite_close($db);
+        $result = sqlite_query("UPDATE catalogue SET date_modified = {$time} WHERE cat_id = {$cat_id}", $db);
+
+        if ($this->cache) {
+            $this->cache->remove($variant.':'.$this->culture);
+        }
 
-    return $result;
-  }
+        return $result;
+    }
 }
diff --git a/lib/i18n/sfMessageSource_SQLite3.class.php b/lib/i18n/sfMessageSource_SQLite3.class.php
index 45cd7e7e9..270781321 100644
--- a/lib/i18n/sfMessageSource_SQLite3.class.php
+++ b/lib/i18n/sfMessageSource_SQLite3.class.php
@@ -14,9 +14,8 @@
  *
  * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @author     Jérôme Macias <jmacias@groupe-exp.com>
+ *
  * @version    $Id$
- * @package    symfony
- * @subpackage i18n
  */
 
 /**
@@ -82,337 +81,323 @@
  *  </database>
  *
  * @author Xiang Wei Zhuo <weizhuo[at]gmail[dot]com>
+ *
  * @version v1.0, last update on Fri Dec 24 16:58:58 EST 2004
- * @package    symfony
- * @subpackage i18n
  */
 class sfMessageSource_SQLite3 extends sfMessageSource_Database
 {
-  /**
-   * The SQLite datasource, the filename of the database.
-   * @var string
-   */
-  protected $source;
-
-  /**
-   * Constructor.
-   * Creates a new message source using SQLite.
-   * @see MessageSource::factory();
-   * @param string $source SQLite datasource, in PEAR's DB DSN format.
-   */
-  function __construct($source)
-  {
-    $dsn = $this->parseDSN((string) $source);
-    $this->source = $dsn['database'];
-  }
-
-  /**
-   * Gets an array of messages for a particular catalogue and cultural variant.
-   *
-   * @param string $variant the catalogue name + variant
-   * @return array translation messages.
-   */
-  public function &loadData($variant)
-  {
-    $db = new SQLite3($this->source, SQLITE3_OPEN_READWRITE);
-
-    $variant = $db->escapeString($variant);
-
-    $statement =
-      "SELECT t.id, t.source, t.target, t.comments
+    /**
+     * The SQLite datasource, the filename of the database.
+     *
+     * @var string
+     */
+    protected $source;
+
+    /**
+     * Constructor.
+     * Creates a new message source using SQLite.
+     *
+     * @see MessageSource::factory();
+     *
+     * @param string $source SQLite datasource, in PEAR's DB DSN format
+     */
+    public function __construct($source)
+    {
+        $dsn = $this->parseDSN((string) $source);
+        $this->source = $dsn['database'];
+    }
+
+    /**
+     * Gets an array of messages for a particular catalogue and cultural variant.
+     *
+     * @param string $variant the catalogue name + variant
+     *
+     * @return array translation messages
+     */
+    public function &loadData($variant)
+    {
+        $db = new SQLite3($this->source, SQLITE3_OPEN_READWRITE);
+
+        $variant = $db->escapeString($variant);
+
+        $statement =
+          "SELECT t.id, t.source, t.target, t.comments
         FROM trans_unit t, catalogue c
         WHERE c.cat_id =  t.cat_id
           AND c.name = '{$variant}'
         ORDER BY id ASC";
 
-    $db = new SQLite3($this->source, SQLITE3_OPEN_READWRITE);
-    $rs = $db->query($statement);
+        $db = new SQLite3($this->source, SQLITE3_OPEN_READWRITE);
+        $rs = $db->query($statement);
 
-    $result = array();
+        $result = array();
 
-    while ($row = $rs->fetchArray(SQLITE3_NUM))
-    {
-      $source = $row[1];
-      $result[$source][] = $row[2]; //target
-      $result[$source][] = $row[0]; //id
-      $result[$source][] = $row[3]; //comments
-    }
+        while ($row = $rs->fetchArray(SQLITE3_NUM)) {
+            $source = $row[1];
+            $result[$source][] = $row[2]; // target
+            $result[$source][] = $row[0]; // id
+            $result[$source][] = $row[3]; // comments
+        }
 
-    $db->close();
-
-    return $result;
-  }
-
-  /**
-   * Gets the last modified unix-time for this particular catalogue+variant.
-   * We need to query the database to get the date_modified.
-   *
-   * @param string $source catalogue+variant
-   * @return int last modified in unix-time format.
-   */
-  protected function getLastModified($source)
-  {
-    $db = new SQLite3($this->source, SQLITE3_OPEN_READWRITE);
-
-    $source = $db->escapeString($source);
-    $rs = $db->querySingle("SELECT date_modified FROM catalogue WHERE name = '{$source}'");
-    $result = null !== $rs ? (int) $rs : 0;
-
-    $db->close();
-
-    return $result;
-  }
-
-  /**
-   * Checks if a particular catalogue+variant exists in the database.
-   *
-   * @param string $variant catalogue+variant
-   * @return boolean true if the catalogue+variant is in the database, false otherwise.
-   */
-  public function isValidSource($variant)
-  {
-    $db = new SQLite3($this->source, SQLITE3_OPEN_READWRITE);
-
-    $variant = $db->escapeString($variant);
-    $rs = $db->querySingle("SELECT COUNT(*) FROM catalogue WHERE name = '{$variant}'");
-    $result = null !== $rs && (int) $rs;
-
-    $db->close();
-
-    return $result;
-  }
-
-  /**
-   * Retrieves catalogue details, array($cat_id, $variant, $count).
-   *
-   * @param string $catalogue catalogue
-   * @return array catalogue details, array($cat_id, $variant, $count).
-   */
-  protected function getCatalogueDetails($catalogue = 'messages')
-  {
-    if (empty($catalogue))
-    {
-      $catalogue = 'messages';
+        $db->close();
+
+        return $result;
     }
 
-    $variant = $catalogue.'.'.$this->culture;
+    /**
+     * Checks if a particular catalogue+variant exists in the database.
+     *
+     * @param string $variant catalogue+variant
+     *
+     * @return bool true if the catalogue+variant is in the database, false otherwise
+     */
+    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}'");
+        $result = null !== $rs && (int) $rs;
 
-    $name = $db->escapeString($this->getSource($variant));
+        $db->close();
 
-    $rs = $db->query("SELECT cat_id FROM catalogue WHERE name = '{$name}'");
+        return $result;
+    }
 
-    $i = 0;
-    while ($row = $rs->fetchArray(SQLITE3_NUM))
+    /**
+     * Saves the list of untranslated blocks to the translation source.
+     * If the translation was not found, you should add those
+     * strings to the translation source via the <b>append()</b> method.
+     *
+     * @param string $catalogue the catalogue to add to
+     *
+     * @return bool true if saved successfuly, false otherwise
+     */
+    public function save($catalogue = 'messages')
     {
-      if (0 == $i)
-      {
-        $cat_id = (int) $row[0];
-      }
-
-      if (1 == $i)
-      {
-        return false;
-      }
-
-      ++$i;
+        $messages = $this->untranslated;
+
+        if (count($messages) <= 0) {
+            return false;
+        }
+
+        $details = $this->getCatalogueDetails($catalogue);
+
+        if ($details) {
+            list($cat_id, $variant, $count) = $details;
+        } else {
+            return false;
+        }
+
+        if ($cat_id <= 0) {
+            return false;
+        }
+        $inserted = 0;
+
+        $db = new SQLite3($this->source, SQLITE3_OPEN_READWRITE);
+        $time = time();
+
+        foreach ($messages as $message) {
+            $message = $db->escapeString($message);
+            $db->exec("INSERT INTO trans_unit (cat_id, id, source, date_added) VALUES ({$cat_id}, {$count}, '{$message}', {$time})");
+            if ($db->changes()) {
+                ++$count;
+                ++$inserted;
+            }
+        }
+        if ($inserted > 0) {
+            $this->updateCatalogueTime($cat_id, $variant);
+        }
+
+        $db->close();
+
+        return $inserted > 0;
     }
 
-    // first get the catalogue ID
-    $rs = $db->querySingle("SELECT count(msg_id) FROM trans_unit WHERE cat_id = {$cat_id}");
+    /**
+     * Updates the translation.
+     *
+     * @param string $text      the source string
+     * @param string $target    the new translation string
+     * @param string $comments  comments
+     * @param string $catalogue the catalogue of the translation
+     *
+     * @return bool true if translation was updated, false otherwise
+     */
+    public function update($text, $target, $comments, $catalogue = 'messages')
+    {
+        if ($details = $this->getCatalogueDetails($catalogue)) {
+            list($cat_id, $variant, $count) = $details;
+        } else {
+            return false;
+        }
 
-    $count = (int) $rs;
+        $db = new SQLite3($this->source, SQLITE3_OPEN_READWRITE);
 
-    $db->close();
+        $comments = $db->escapeString($comments);
+        $target = $db->escapeString($target);
+        $text = $db->escapeString($text);
 
-    return array($cat_id, $variant, $count);
-  }
+        $time = time();
 
-  /**
-   * Updates the catalogue last modified time.
-   *
-   * @return boolean true if updated, false otherwise.
-   */
-  protected function updateCatalogueTime($cat_id, $variant)
-  {
-    $time = time();
+        $db->exec("UPDATE trans_unit SET target = '{$target}', comments = '{$comments}', date_modified = '{$time}' WHERE cat_id = {$cat_id} AND source = '{$text}'");
 
-    $db = new SQLite3($this->source, SQLITE3_OPEN_READWRITE);
-    $result = $db->exec("UPDATE catalogue SET date_modified = {$time} WHERE cat_id = {$cat_id}");
-    $res = (boolean) $db->changes();
-    $db->close();
+        $updated = false;
+        if ($db->changes()) {
+            $this->updateCatalogueTime($cat_id, $variant);
+            $updated = true;
+        }
 
-    if ($this->cache)
-    {
-      $this->cache->remove($variant.':'.$this->culture);
+        $db->close();
+
+        return $updated;
     }
 
-    return $res;
-  }
-
-  /**
-   * Saves the list of untranslated blocks to the translation source.
-   * If the translation was not found, you should add those
-   * strings to the translation source via the <b>append()</b> method.
-   *
-   * @param string $catalogue the catalogue to add to
-   * @return boolean true if saved successfuly, false otherwise.
-   */
-  public function save($catalogue = 'messages')
-  {
-    $messages = $this->untranslated;
-
-    if (count($messages) <= 0)
+    /**
+     * Deletes a particular message from the specified catalogue.
+     *
+     * @param string $message   the source message to delete
+     * @param string $catalogue the catalogue to delete from
+     *
+     * @return bool true if deleted, false otherwise
+     */
+    public function delete($message, $catalogue = 'messages')
     {
-      return false;
-    }
+        $details = $this->getCatalogueDetails($catalogue);
+        if ($details) {
+            list($cat_id, $variant, $count) = $details;
+        } else {
+            return false;
+        }
 
-    $details = $this->getCatalogueDetails($catalogue);
+        $db = new SQLite3($this->source, SQLITE3_OPEN_READWRITE);
+        $text = $db->escapeString($message);
 
-    if ($details)
-    {
-      list($cat_id, $variant, $count) = $details;
-    }
-    else
-    {
-      return false;
-    }
+        $db->exec("DELETE FROM trans_unit WHERE cat_id = {$cat_id} AND source = '{$message}'");
 
-    if ($cat_id <= 0)
-    {
-      return false;
-    }
-    $inserted = 0;
+        if ($db->changes()) {
+            $this->updateCatalogueTime($cat_id, $variant);
+            $deleted = true;
+        } else {
+            $deleted = false;
+        }
 
-    $db = new SQLite3($this->source, SQLITE3_OPEN_READWRITE);
-    $time = time();
+        $db->close();
 
-    foreach ($messages as $message)
-    {
-      $message = $db->escapeString($message);
-      $db->exec("INSERT INTO trans_unit (cat_id, id, source, date_added) VALUES ({$cat_id}, {$count}, '{$message}', $time)");
-      if ($db->changes())
-      {
-        ++$count;
-        ++$inserted;
-      }
-    }
-    if ($inserted > 0)
-    {
-      $this->updateCatalogueTime($cat_id, $variant);
+        return $deleted;
     }
 
-    $db->close();
-
-    return $inserted > 0;
-  }
-
-  /**
-   * Updates the translation.
-   *
-   * @param string $text      the source string.
-   * @param string $target    the new translation string.
-   * @param string $comments  comments
-   * @param string $catalogue the catalogue of the translation.
-   * @return boolean true if translation was updated, false otherwise.
-   */
-  function update($text, $target, $comments, $catalogue = 'messages')
-  {
-    if ($details = $this->getCatalogueDetails($catalogue))
+    /**
+     * Returns a list of catalogue as key and all it variants as value.
+     *
+     * @return array list of catalogues
+     */
+    public function catalogues()
     {
-      list($cat_id, $variant, $count) = $details;
+        $db = new SQLite3($this->source, SQLITE3_OPEN_READWRITE);
+        $statement = 'SELECT name FROM catalogue ORDER BY name';
+        $rs = $db->query($statement);
+
+        $result = array();
+        while ($row = $rs->fetchArray(SQLITE3_NUM)) {
+            $details = explode('.', $row[0]);
+            if (!isset($details[1])) {
+                $details[1] = null;
+            }
+
+            $result[] = $details;
+        }
+        $db->close();
+
+        return $result;
     }
-    else
+
+    /**
+     * Gets the last modified unix-time for this particular catalogue+variant.
+     * We need to query the database to get the date_modified.
+     *
+     * @param string $source catalogue+variant
+     *
+     * @return int last modified in unix-time format
+     */
+    protected function getLastModified($source)
     {
-      return false;
+        $db = new SQLite3($this->source, SQLITE3_OPEN_READWRITE);
+
+        $source = $db->escapeString($source);
+        $rs = $db->querySingle("SELECT date_modified FROM catalogue WHERE name = '{$source}'");
+        $result = null !== $rs ? (int) $rs : 0;
+
+        $db->close();
+
+        return $result;
     }
 
-    $db = new SQLite3($this->source, SQLITE3_OPEN_READWRITE);
+    /**
+     * Retrieves catalogue details, array($cat_id, $variant, $count).
+     *
+     * @param string $catalogue catalogue
+     *
+     * @return array catalogue details, array($cat_id, $variant, $count)
+     */
+    protected function getCatalogueDetails($catalogue = 'messages')
+    {
+        if (empty($catalogue)) {
+            $catalogue = 'messages';
+        }
 
-    $comments = $db->escapeString($comments);
-    $target = $db->escapeString($target);
-    $text = $db->escapeString($text);
+        $variant = $catalogue.'.'.$this->culture;
 
-    $time = time();
+        $db = new SQLite3($this->source, SQLITE3_OPEN_READWRITE);
 
-    $db->exec("UPDATE trans_unit SET target = '{$target}', comments = '{$comments}', date_modified = '{$time}' WHERE cat_id = {$cat_id} AND source = '{$text}'");
+        $name = $db->escapeString($this->getSource($variant));
 
-    $updated = false;
-    if ($db->changes())
-    {
-      $this->updateCatalogueTime($cat_id, $variant);
-      $updated = true;
-    }
+        $rs = $db->query("SELECT cat_id FROM catalogue WHERE name = '{$name}'");
 
-    $db->close();
-
-    return $updated;
-  }
-
-  /**
-   * Deletes a particular message from the specified catalogue.
-   *
-   * @param string  $message    the source message to delete.
-   * @param string  $catalogue  the catalogue to delete from.
-   * @return boolean true if deleted, false otherwise.
-   */
-  function delete($message, $catalogue = 'messages')
-  {
-    $details = $this->getCatalogueDetails($catalogue);
-    if ($details)
-    {
-      list($cat_id, $variant, $count) = $details;
-    }
-    else
-    {
-      return false;
-    }
+        $i = 0;
+        while ($row = $rs->fetchArray(SQLITE3_NUM)) {
+            if (0 == $i) {
+                $cat_id = (int) $row[0];
+            }
 
-    $db = new SQLite3($this->source, SQLITE3_OPEN_READWRITE);
-    $text = $db->escapeString($message);
+            if (1 == $i) {
+                return false;
+            }
 
-    $db->exec("DELETE FROM trans_unit WHERE cat_id = {$cat_id} AND source = '{$message}'");
+            ++$i;
+        }
 
-    if ($db->changes())
-    {
-      $this->updateCatalogueTime($cat_id, $variant);
-      $deleted = true;
-    }
-    else
-    {
-      $deleted = false;
-    }
+        // first get the catalogue ID
+        $rs = $db->querySingle("SELECT count(msg_id) FROM trans_unit WHERE cat_id = {$cat_id}");
 
-    $db->close();
+        $count = (int) $rs;
 
-    return $deleted;
-  }
+        $db->close();
 
-  /**
-   * Returns a list of catalogue as key and all it variants as value.
-   *
-   * @return array list of catalogues
-   */
-  function catalogues()
-  {
-    $db = new SQLite3($this->source, SQLITE3_OPEN_READWRITE);
-    $statement = 'SELECT name FROM catalogue ORDER BY name';
-    $rs = $db->query($statement);
+        return array($cat_id, $variant, $count);
+    }
 
-    $result = array();
-    while ($row = $rs->fetchArray(SQLITE3_NUM))
+    /**
+     * Updates the catalogue last modified time.
+     *
+     * @param mixed $cat_id
+     * @param mixed $variant
+     *
+     * @return bool true if updated, false otherwise
+     */
+    protected function updateCatalogueTime($cat_id, $variant)
     {
-      $details = explode('.', $row[0]);
-      if (!isset($details[1]))
-      {
-        $details[1] = null;
-      }
+        $time = time();
 
-      $result[] = $details;
-    }
-    $db->close();
+        $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();
+
+        if ($this->cache) {
+            $this->cache->remove($variant.':'.$this->culture);
+        }
 
-    return $result;
-  }
+        return $res;
+    }
 }
diff --git a/lib/i18n/sfMessageSource_XLIFF.class.php b/lib/i18n/sfMessageSource_XLIFF.class.php
index e6f8fdecc..48e08a2ad 100644
--- a/lib/i18n/sfMessageSource_XLIFF.class.php
+++ b/lib/i18n/sfMessageSource_XLIFF.class.php
@@ -13,9 +13,8 @@
  * {@link http://prado.sourceforge.net/}
  *
  * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
+ *
  * @version    $Id$
- * @package    symfony
- * @subpackage i18n
  */
 
 /**
@@ -30,416 +29,375 @@
  * See the MessageSource::factory() method to instantiate this class.
  *
  * @author Xiang Wei Zhuo <weizhuo[at]gmail[dot]com>
+ *
  * @version v1.0, last update on Fri Dec 24 16:18:44 EST 2004
- * @package    symfony
- * @subpackage i18n
  */
 class sfMessageSource_XLIFF extends sfMessageSource_File
 {
-  /**
-   * Message data filename extension.
-   * @var string
-   */
-  protected $dataExt = '.xml';
-
-  /**
-   * Loads the messages from a XLIFF file.
-   *
-   * @param string $filename  XLIFF file.
-   * @return array|false An array of messages or false if there was a problem loading the file.
-   */
-  public function &loadData($filename)
-  {
-    libxml_use_internal_errors(true);
-    if (!$xml = simplexml_load_file($filename))
+    /**
+     * Message data filename extension.
+     *
+     * @var string
+     */
+    protected $dataExt = '.xml';
+
+    /**
+     * Loads the messages from a XLIFF file.
+     *
+     * @param string $filename XLIFF file
+     *
+     * @return array|false an array of messages or false if there was a problem loading the file
+     */
+    public function &loadData($filename)
     {
-      return false;
-    }
-    libxml_use_internal_errors(false);
-
-    $translationUnit = $xml->xpath('//trans-unit');
+        libxml_use_internal_errors(true);
+        if (!$xml = simplexml_load_file($filename)) {
+            return false;
+        }
+        libxml_use_internal_errors(false);
 
-    $translations = array();
+        $translationUnit = $xml->xpath('//trans-unit');
 
-    foreach ($translationUnit as $unit)
-    {
-      $source = (string) $unit->source;
-      $translations[$source][] = (string) $unit->target;
-      $translations[$source][] = (string) $unit['id'];
-      $translations[$source][] = (string) $unit->note;
-    }
+        $translations = array();
 
-    return $translations;
-  }
-
-  /**
-   * Creates and returns a new DOMDocument instance
-   *
-   * @param  string  $xml  XML string
-   *
-   * @return DOMDocument
-   */
-  protected function createDOMDocument($xml = null)
-  {
-    $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;
-    $dom->preserveWhiteSpace = false;
-
-    if (null !== $xml && is_string($xml))
-    {
-      // Add header for XML with UTF-8
-      if (!preg_match('/<\?xml/', $xml))
-      {
-        $xml = '<?xml version="1.0" encoding="UTF-8"?>'."\n".$xml;
-      }
+        foreach ($translationUnit as $unit) {
+            $source = (string) $unit->source;
+            $translations[$source][] = (string) $unit->target;
+            $translations[$source][] = (string) $unit['id'];
+            $translations[$source][] = (string) $unit->note;
+        }
 
-      $dom->loadXML($xml);
+        return $translations;
     }
 
-    return $dom;
-  }
-
-  /**
-   * Gets the variant for a catalogue depending on the current culture.
-   *
-   * @param string $catalogue catalogue
-   * @return string the variant.
-   * @see save()
-   * @see update()
-   * @see delete()
-   */
-  protected function getVariants($catalogue = 'messages')
-  {
-    if (null === $catalogue)
+    /**
+     * Saves the list of untranslated blocks to the translation source.
+     * If the translation was not found, you should add those
+     * strings to the translation source via the <b>append()</b> method.
+     *
+     * @param string $catalogue the catalogue to add to
+     *
+     * @return bool true if saved successfuly, false otherwise
+     */
+    public function save($catalogue = 'messages')
     {
-      $catalogue = 'messages';
-    }
-
-    foreach ($this->getCatalogueList($catalogue) as $variant)
-    {
-      $file = $this->getSource($variant);
-      if (is_file($file))
-      {
-        return array($variant, $file);
-      }
-    }
+        $messages = $this->untranslated;
+        if (count($messages) <= 0) {
+            return false;
+        }
 
-    return false;
-  }
-
-  /**
-   * Saves the list of untranslated blocks to the translation source.
-   * If the translation was not found, you should add those
-   * strings to the translation source via the <b>append()</b> method.
-   *
-   * @param string $catalogue the catalogue to add to
-   * @return boolean true if saved successfuly, false otherwise.
-   */
-  public function save($catalogue = 'messages')
-  {
-    $messages = $this->untranslated;
-    if (count($messages) <= 0)
-    {
-      return false;
-    }
+        $variants = $this->getVariants($catalogue);
+        if ($variants) {
+            list($variant, $filename) = $variants;
+        } else {
+            list($variant, $filename) = $this->createMessageTemplate($catalogue);
+        }
 
-    $variants = $this->getVariants($catalogue);
-    if ($variants)
-    {
-      list($variant, $filename) = $variants;
-    }
-    else
-    {
-      list($variant, $filename) = $this->createMessageTemplate($catalogue);
-    }
+        if (false == is_writable($filename)) {
+            throw new sfException(sprintf('Unable to save to file %s, file must be writable.', $filename));
+        }
 
-    if (is_writable($filename) == false)
-    {
-      throw new sfException(sprintf("Unable to save to file %s, file must be writable.", $filename));
-    }
+        // create a new dom, import the existing xml
+        $dom = $this->createDOMDocument();
+        @$dom->load($filename);
 
-    // create a new dom, import the existing xml
-    $dom = $this->createDOMDocument();
-    @$dom->load($filename);
+        // find the body element
+        $xpath = new DOMXPath($dom);
+        $body = $xpath->query('//body')->item(0);
 
-    // find the body element
-    $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);
+            $body = $xpath->query('//body')->item(0);
+        }
 
-    if (null === $body)
-    {
-      //create and try again
-      $this->createMessageTemplate($catalogue);
-      $dom->load($filename);
-      $xpath = new DomXPath($dom);
-      $body = $xpath->query('//body')->item(0);
-    }
+        // find the biggest "id" used
+        $lastNodes = $xpath->query('//trans-unit[not(@id <= preceding-sibling::trans-unit/@id) and not(@id <= following-sibling::trans-unit/@id)]');
+        if (null !== $last = $lastNodes->item(0)) {
+            $count = (int) $last->getAttribute('id');
+        } else {
+            $count = 0;
+        }
 
-    // find the biggest "id" used
-    $lastNodes = $xpath->query('//trans-unit[not(@id <= preceding-sibling::trans-unit/@id) and not(@id <= following-sibling::trans-unit/@id)]');
-    if (null !== $last = $lastNodes->item(0))
-    {
-      $count = (int) $last->getAttribute('id');
-    }
-    else
-    {
-      $count = 0;
-    }
+        // for each message add it to the XML file using DOM
+        foreach ($messages as $message) {
+            $unit = $dom->createElement('trans-unit');
+            $unit->setAttribute('id', ++$count);
 
-    // for each message add it to the XML file using DOM
-    foreach ($messages as $message)
-    {
-      $unit = $dom->createElement('trans-unit');
-      $unit->setAttribute('id', ++$count);
+            $source = $dom->createElement('source');
+            $source->appendChild($dom->createTextNode($message));
+            $target = $dom->createElement('target');
+            $target->appendChild($dom->createTextNode(''));
 
-      $source = $dom->createElement('source');
-      $source->appendChild($dom->createTextNode($message));
-      $target = $dom->createElement('target');
-      $target->appendChild($dom->createTextNode(''));
+            $unit->appendChild($source);
+            $unit->appendChild($target);
 
-      $unit->appendChild($source);
-      $unit->appendChild($target);
+            $body->appendChild($unit);
+        }
 
-      $body->appendChild($unit);
-    }
+        $fileNode = $xpath->query('//file')->item(0);
+        $fileNode->setAttribute('date', @date('Y-m-d\TH:i:s\Z'));
 
-    $fileNode = $xpath->query('//file')->item(0);
-    $fileNode->setAttribute('date', @date('Y-m-d\TH:i:s\Z'));
+        $dom = $this->createDOMDocument($dom->saveXML());
 
-    $dom = $this->createDOMDocument($dom->saveXML());
+        // save it and clear the cache for this variant
+        $dom->save($filename);
+        if ($this->cache) {
+            $this->cache->remove($variant.':'.$this->culture);
+        }
 
-    // save it and clear the cache for this variant
-    $dom->save($filename);
-    if ($this->cache)
-    {
-      $this->cache->remove($variant.':'.$this->culture);
+        return true;
     }
 
-    return true;
-  }
-
-  /**
-   * Updates the translation.
-   *
-   * @param string $text      the source string.
-   * @param string $target    the new translation string.
-   * @param string $comments  comments
-   * @param string $catalogue the catalogue to save to.
-   * @return boolean true if translation was updated, false otherwise.
-   */
-  public function update($text, $target, $comments, $catalogue = 'messages')
-  {
-    $variants = $this->getVariants($catalogue);
-    if ($variants)
+    /**
+     * Updates the translation.
+     *
+     * @param string $text      the source string
+     * @param string $target    the new translation string
+     * @param string $comments  comments
+     * @param string $catalogue the catalogue to save to
+     *
+     * @return bool true if translation was updated, false otherwise
+     */
+    public function update($text, $target, $comments, $catalogue = 'messages')
     {
-      list($variant, $filename) = $variants;
-    }
-    else
-    {
-      return false;
-    }
+        $variants = $this->getVariants($catalogue);
+        if ($variants) {
+            list($variant, $filename) = $variants;
+        } else {
+            return false;
+        }
 
-    if (is_writable($filename) == false)
-    {
-      throw new sfException(sprintf("Unable to update file %s, file must be writable.", $filename));
-    }
+        if (false == is_writable($filename)) {
+            throw new sfException(sprintf('Unable to update file %s, file must be writable.', $filename));
+        }
 
-    // create a new dom, import the existing xml
-    $dom = $this->createDOMDocument();
-    $dom->load($filename);
+        // create a new dom, import the existing xml
+        $dom = $this->createDOMDocument();
+        $dom->load($filename);
+
+        // find the body element
+        $xpath = new DOMXPath($dom);
+        $units = $xpath->query('//trans-unit');
+
+        // for each of the existin units
+        foreach ($units as $unit) {
+            $found = false;
+            $targetted = false;
+            $commented = false;
+
+            // in each unit, need to find the source, target and comment nodes
+            // it will assume that the source is before the target.
+            foreach ($unit->childNodes as $node) {
+                // source node
+                if ('source' == $node->nodeName && $node->firstChild->wholeText == $text) {
+                    $found = true;
+                }
+
+                // found source, get the target and notes
+                if ($found) {
+                    // set the new translated string
+                    if ('target' == $node->nodeName) {
+                        $node->nodeValue = $target;
+                        $targetted = true;
+                    }
+
+                    // set the notes
+                    if (!empty($comments) && 'note' == $node->nodeName) {
+                        $node->nodeValue = $comments;
+                        $commented = true;
+                    }
+                }
+            }
 
-    // find the body element
-    $xpath = new DomXPath($dom);
-    $units = $xpath->query('//trans-unit');
+            // append a target
+            if ($found && !$targetted) {
+                $targetNode = $dom->createElement('target');
+                $targetNode->appendChild($dom->createTextNode($target));
+                $unit->appendChild($targetNode);
+            }
 
-    // for each of the existin units
-    foreach ($units as $unit)
-    {
-      $found = false;
-      $targetted = false;
-      $commented = false;
-
-      //in each unit, need to find the source, target and comment nodes
-      //it will assume that the source is before the target.
-      foreach ($unit->childNodes as $node)
-      {
-        // source node
-        if ($node->nodeName == 'source' && $node->firstChild->wholeText == $text)
-        {
-          $found = true;
-        }
+            // append a note
+            if ($found && !$commented && !empty($comments)) {
+                $commentsNode = $dom->createElement('note');
+                $commentsNode->appendChild($dom->createTextNode($comments));
+                $unit->appendChild($commentsNode);
+            }
 
-        // found source, get the target and notes
-        if ($found)
-        {
-          // set the new translated string
-          if ($node->nodeName == 'target')
-          {
-            $node->nodeValue = $target;
-            $targetted = true;
-          }
-
-          // set the notes
-          if (!empty($comments) && $node->nodeName == 'note')
-          {
-            $node->nodeValue = $comments;
-            $commented = true;
-          }
+            // finished searching
+            if ($found) {
+                break;
+            }
         }
-      }
-
-      // append a target
-      if ($found && !$targetted)
-      {
-        $targetNode = $dom->createElement('target');
-        $targetNode->appendChild($dom->createTextNode($target));
-        $unit->appendChild($targetNode);
-      }
-
-      // append a note
-      if ($found && !$commented && !empty($comments))
-      {
-        $commentsNode = $dom->createElement('note');
-        $commentsNode->appendChild($dom->createTextNode($comments));
-        $unit->appendChild($commentsNode);
-      }
-
-      // finished searching
-      if ($found)
-      {
-        break;
-      }
-    }
 
-    $fileNode = $xpath->query('//file')->item(0);
-    $fileNode->setAttribute('date', @date('Y-m-d\TH:i:s\Z'));
+        $fileNode = $xpath->query('//file')->item(0);
+        $fileNode->setAttribute('date', @date('Y-m-d\TH:i:s\Z'));
 
-    if ($dom->save($filename) > 0)
-    {
-      if ($this->cache)
-      {
-        $this->cache->remove($variant.':'.$this->culture);
-      }
+        if ($dom->save($filename) > 0) {
+            if ($this->cache) {
+                $this->cache->remove($variant.':'.$this->culture);
+            }
 
-      return true;
-    }
+            return true;
+        }
 
-    return false;
-  }
-
-  /**
-   * Deletes a particular message from the specified catalogue.
-   *
-   * @param string $message   the source message to delete.
-   * @param string $catalogue the catalogue to delete from.
-   * @return boolean true if deleted, false otherwise.
-   */
-  public function delete($message, $catalogue='messages')
-  {
-    $variants = $this->getVariants($catalogue);
-    if ($variants)
-    {
-      list($variant, $filename) = $variants;
-    }
-    else
-    {
-      return false;
+        return false;
     }
 
-    if (is_writable($filename) == false)
+    /**
+     * Deletes a particular message from the specified catalogue.
+     *
+     * @param string $message   the source message to delete
+     * @param string $catalogue the catalogue to delete from
+     *
+     * @return bool true if deleted, false otherwise
+     */
+    public function delete($message, $catalogue = 'messages')
     {
-      throw new sfException(sprintf("Unable to modify file %s, file must be writable.", $filename));
-    }
+        $variants = $this->getVariants($catalogue);
+        if ($variants) {
+            list($variant, $filename) = $variants;
+        } else {
+            return false;
+        }
 
-    // create a new dom, import the existing xml
-    $dom = $this->createDOMDocument();
-    $dom->load($filename);
+        if (false == is_writable($filename)) {
+            throw new sfException(sprintf('Unable to modify file %s, file must be writable.', $filename));
+        }
 
-    // find the body element
-    $xpath = new DomXPath($dom);
-    $units = $xpath->query('//trans-unit');
+        // create a new dom, import the existing xml
+        $dom = $this->createDOMDocument();
+        $dom->load($filename);
+
+        // find the body element
+        $xpath = new DOMXPath($dom);
+        $units = $xpath->query('//trans-unit');
+
+        // for each of the existin units
+        foreach ($units as $unit) {
+            // in each unit, need to find the source, target and comment nodes
+            // it will assume that the source is before the target.
+            foreach ($unit->childNodes as $node) {
+                // source node
+                if ('source' == $node->nodeName && $node->firstChild->wholeText == $message) {
+                    // we found it, remove and save the xml file.
+                    $unit->parentNode->removeChild($unit);
+
+                    $fileNode = $xpath->query('//file')->item(0);
+                    $fileNode->setAttribute('date', @date('Y-m-d\TH:i:s\Z'));
+
+                    if ($dom->save($filename) > 0) {
+                        if (!empty($this->cache)) {
+                            $this->cache->remove($variant.':'.$this->culture);
+                        }
+
+                        return true;
+                    }
+
+                    return false;
+                }
+            }
+        }
 
-    // for each of the existin units
-    foreach ($units as $unit)
+        return false;
+    }
+
+    /**
+     * Creates and returns a new DOMDocument instance.
+     *
+     * @param string $xml XML string
+     *
+     * @return DOMDocument
+     */
+    protected function createDOMDocument($xml = null)
     {
-      //in each unit, need to find the source, target and comment nodes
-      //it will assume that the source is before the target.
-      foreach ($unit->childNodes as $node)
-      {
-        // source node
-        if ($node->nodeName == 'source' && $node->firstChild->wholeText == $message)
-        {
-          // we found it, remove and save the xml file.
-          $unit->parentNode->removeChild($unit);
-
-          $fileNode = $xpath->query('//file')->item(0);
-          $fileNode->setAttribute('date', @date('Y-m-d\TH:i:s\Z'));
-
-          if ($dom->save($filename) > 0)
-          {
-            if (!empty($this->cache))
-            {
-              $this->cache->remove($variant.':'.$this->culture);
+        $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;
+        $dom->preserveWhiteSpace = false;
+
+        if (null !== $xml && is_string($xml)) {
+            // Add header for XML with UTF-8
+            if (!preg_match('/<\?xml/', $xml)) {
+                $xml = '<?xml version="1.0" encoding="UTF-8"?>'."\n".$xml;
             }
 
-            return true;
-          }
-          else
-          {
-            return false;
-          }
+            $dom->loadXML($xml);
         }
-      }
-    }
-
-    return false;
-  }
 
-  protected function createMessageTemplate($catalogue)
-  {
-    if (null === $catalogue)
-    {
-      $catalogue = 'messages';
+        return $dom;
     }
 
-    $variants = $this->getCatalogueList($catalogue);
-    $variant = array_shift($variants);
-    $file = $this->getSource($variant);
-    $dir = dirname($file);
-    if (!is_dir($dir))
+    /**
+     * Gets the variant for a catalogue depending on the current culture.
+     *
+     * @param string $catalogue catalogue
+     *
+     * @return string the variant
+     *
+     * @see save()
+     * @see update()
+     * @see delete()
+     */
+    protected function getVariants($catalogue = 'messages')
     {
-      @mkdir($dir);
-      @chmod($dir, 0777);
+        if (null === $catalogue) {
+            $catalogue = 'messages';
+        }
+
+        foreach ($this->getCatalogueList($catalogue) as $variant) {
+            $file = $this->getSource($variant);
+            if (is_file($file)) {
+                return array($variant, $file);
+            }
+        }
+
+        return false;
     }
 
-    if (!is_dir($dir))
+    protected function createMessageTemplate($catalogue)
     {
-      throw new sfException(sprintf("Unable to create directory %s.", $dir));
-    }
+        if (null === $catalogue) {
+            $catalogue = 'messages';
+        }
 
-    $dom = $this->createDOMDocument($this->getTemplate($catalogue));
-    file_put_contents($file, $dom->saveXML());
-    chmod($file, 0777);
+        $variants = $this->getCatalogueList($catalogue);
+        $variant = array_shift($variants);
+        $file = $this->getSource($variant);
+        $dir = dirname($file);
+        if (!is_dir($dir)) {
+            @mkdir($dir);
+            @chmod($dir, 0777);
+        }
 
-    return array($variant, $file);
-  }
+        if (!is_dir($dir)) {
+            throw new sfException(sprintf('Unable to create directory %s.', $dir));
+        }
 
-  protected function getTemplate($catalogue)
-  {
-    $date = date('c');
+        $dom = $this->createDOMDocument($this->getTemplate($catalogue));
+        file_put_contents($file, $dom->saveXML());
+        chmod($file, 0777);
 
-    return <<<EOD
+        return array($variant, $file);
+    }
+
+    protected function getTemplate($catalogue)
+    {
+        $date = date('c');
+
+        return <<<EOD
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE xliff PUBLIC "-//XLIFF//DTD XLIFF//EN" "http://www.oasis-open.org/committees/xliff/documents/xliff.dtd" >
 <xliff version="1.0">
-  <file source-language="EN" target-language="{$this->culture}" datatype="plaintext" original="$catalogue" date="$date" product-name="$catalogue">
+  <file source-language="EN" target-language="{$this->culture}" datatype="plaintext" original="{$catalogue}" date="{$date}" product-name="{$catalogue}">
     <header />
     <body>
     </body>
   </file>
 </xliff>
 EOD;
-  }
+    }
 }
diff --git a/lib/i18n/sfMessageSource_gettext.class.php b/lib/i18n/sfMessageSource_gettext.class.php
index 9232e0dff..454ecf5d1 100644
--- a/lib/i18n/sfMessageSource_gettext.class.php
+++ b/lib/i18n/sfMessageSource_gettext.class.php
@@ -13,339 +13,301 @@
  * {@link http://prado.sourceforge.net/}
  *
  * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
+ *
  * @version    $Id$
- * @package    symfony
- * @subpackage i18n
  */
 
 /**
  * sfMessageSource_gettext class.
- * 
+ *
  * Using Gettext MO format as the message source for translation.
  * The gettext classes are based on PEAR's gettext MO and PO classes.
- * 
+ *
  * See the MessageSource::factory() method to instantiate this class.
- * 
+ *
  * @author Xiang Wei Zhuo <weizhuo[at]gmail[dot]com>
+ *
  * @version v1.0, last update on Fri Dec 24 16:18:44 EST 2004
- * @package    symfony
- * @subpackage i18n
  */
 class sfMessageSource_gettext extends sfMessageSource_File
-{ 
-  /**
-   * Message data filename extension.
-   * @var string 
-   */
-  protected $dataExt = '.mo';
-
-  /**
-   * PO data filename extension
-   * @var string 
-   */
-  protected $poExt = '.po';
-
-  /**
-   * Loads the messages from a MO file.
-   *
-   * @param string $filename MO file.
-   * @return array of messages.
-   */
-  public function &loadData($filename)
-  {
-    $mo = TGettext::factory('MO',$filename);
-    $mo->load();
-    $result = $mo->toArray();
-
-    $results = array();
-    $count = 0;
-    foreach ($result['strings'] as $source => $target)
+{
+    /**
+     * Message data filename extension.
+     *
+     * @var string
+     */
+    protected $dataExt = '.mo';
+
+    /**
+     * PO data filename extension.
+     *
+     * @var string
+     */
+    protected $poExt = '.po';
+
+    /**
+     * Loads the messages from a MO file.
+     *
+     * @param string $filename MO file
+     *
+     * @return array of messages
+     */
+    public function &loadData($filename)
     {
-      $results[$source][] = $target;  //target
-      $results[$source][] = $count++; //id
-      $results[$source][] = '';       //comments
-    }
+        $mo = TGettext::factory('MO', $filename);
+        $mo->load();
+        $result = $mo->toArray();
+
+        $results = array();
+        $count = 0;
+        foreach ($result['strings'] as $source => $target) {
+            $results[$source][] = $target;  // target
+            $results[$source][] = $count++; // id
+            $results[$source][] = '';       // comments
+        }
 
-    return $results;
-  }
-
-  /**
-   * Gets the variant for a catalogue depending on the current culture.
-   *
-   * @param string $catalogue catalogue
-   * @return string the variant. 
-   * @see save()
-   * @see update()
-   * @see delete()
-   */
-  protected function getVariants($catalogue = 'messages')
-  {
-    if (empty($catalogue))
-    {
-      $catalogue = 'messages';
+        return $results;
     }
 
-    foreach ($this->getCatalogueList($catalogue) as $variant)
+    /**
+     * Saves the list of untranslated blocks to the translation source.
+     * If the translation was not found, you should add those
+     * strings to the translation source via the <b>append()</b> method.
+     *
+     * @param string $catalogue the catalogue to add to
+     *
+     * @return bool true if saved successfuly, false otherwise
+     */
+    public function save($catalogue = 'messages')
     {
-      $file = $this->getSource($variant);
-      $po = $this->getPOFile($file);
-      if (is_file($file) || is_file($po))
-      {
-        return array($variant, $file, $po);
-      }
-    }
+        $messages = $this->untranslated;
 
-    return false;
-  }
-
-  protected function getPOFile($MOFile)
-  {
-    return substr($MOFile, 0, strlen($MOFile) - strlen($this->dataExt)).$this->poExt;
-  }
-
-  /**
-   * Saves the list of untranslated blocks to the translation source. 
-   * If the translation was not found, you should add those
-   * strings to the translation source via the <b>append()</b> method.
-   *
-   * @param string $catalogue the catalogue to add to
-   * @return boolean true if saved successfuly, false otherwise.   
-   */
-  function save($catalogue = 'messages')
-  {
-    $messages = $this->untranslated;
-
-    if (count($messages) <= 0)
-    {
-      return false;
-    }
+        if (count($messages) <= 0) {
+            return false;
+        }
 
-    $variants = $this->getVariants($catalogue);
+        $variants = $this->getVariants($catalogue);
 
-    if ($variants)
-    {
-      list($variant, $MOFile, $POFile) = $variants;
-    }
-    else
-    {
-      list($variant, $MOFile, $POFile) = $this->createMessageTemplate($catalogue);
-    }
+        if ($variants) {
+            list($variant, $MOFile, $POFile) = $variants;
+        } else {
+            list($variant, $MOFile, $POFile) = $this->createMessageTemplate($catalogue);
+        }
 
-    if (is_writable($MOFile) == false)
-    {
-      throw new sfException(sprintf("Unable to save to file %s, file must be writable.", $MOFile));
-    }
-    if (is_writable($POFile) == false)
-    {
-      throw new sfException(sprintf("Unable to save to file %s, file must be writable.", $POFile));
-    }
+        if (false == is_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));
+        }
 
-    // set the strings as untranslated.
-    $strings = array();
-    foreach ($messages as $message)
-    {
-      $strings[$message] = ''; 
-    }
+        // set the strings as untranslated.
+        $strings = array();
+        foreach ($messages as $message) {
+            $strings[$message] = '';
+        }
 
-    // load the PO
-    $po = TGettext::factory('PO',$POFile);
-    $po->load();
-    $result = $po->toArray();
+        // load the PO
+        $po = TGettext::factory('PO', $POFile);
+        $po->load();
+        $result = $po->toArray();
 
-    $existing = count($result['strings']);
+        $existing = count($result['strings']);
 
-    // add to strings to the existing message list
-    $result['strings'] = array_merge($result['strings'],$strings);
+        // add to strings to the existing message list
+        $result['strings'] = array_merge($result['strings'], $strings);
 
-    $new = count($result['strings']);
+        $new = count($result['strings']);
 
-    if ($new > $existing)
-    {
-      // change the date 2004-12-25 12:26
-      $result['meta']['PO-Revision-Date'] = @date('Y-m-d H:i:s');
-
-      $po->fromArray($result);
-      $mo = $po->toMO();
-      if ($po->save() && $mo->save($MOFile))
-      {
-        if ($this->cache)
-        {
-          $this->cache->remove($variant.':'.$this->culture);
+        if ($new > $existing) {
+            // change the date 2004-12-25 12:26
+            $result['meta']['PO-Revision-Date'] = @date('Y-m-d H:i:s');
+
+            $po->fromArray($result);
+            $mo = $po->toMO();
+            if ($po->save() && $mo->save($MOFile)) {
+                if ($this->cache) {
+                    $this->cache->remove($variant.':'.$this->culture);
+                }
+
+                return true;
+            }
+
+            return false;
         }
 
-        return true;
-      }
-      else
-      {
         return false;
-      }
     }
 
-    return false;
-  }
-
-  /**
-   * Deletes a particular message from the specified catalogue.
-   *
-   * @param string $message   the source message to delete.
-   * @param string $catalogue the catalogue to delete from.
-   * @return boolean true if deleted, false otherwise. 
-   */
-  function delete($message, $catalogue = 'messages')
-  {
-    $variants = $this->getVariants($catalogue);
-    if ($variants)
+    /**
+     * Deletes a particular message from the specified catalogue.
+     *
+     * @param string $message   the source message to delete
+     * @param string $catalogue the catalogue to delete from
+     *
+     * @return bool true if deleted, false otherwise
+     */
+    public function delete($message, $catalogue = 'messages')
     {
-      list($variant, $MOFile, $POFile) = $variants;
-    }
-    else
-    {
-      return false;
-    }
+        $variants = $this->getVariants($catalogue);
+        if ($variants) {
+            list($variant, $MOFile, $POFile) = $variants;
+        } else {
+            return false;
+        }
 
-    if (is_writable($MOFile) == false)
-    {
-      throw new sfException(sprintf("Unable to modify file %s, file must be writable.", $MOFile));
-    }
+        if (false == is_writable($MOFile)) {
+            throw new sfException(sprintf('Unable to modify file %s, file must be writable.', $MOFile));
+        }
 
-    if (is_writable($POFile) == false)
-    {
-      throw new sfException(sprintf("Unable to modify file %s, file must be writable.", $POFile));
-    }
+        if (false == is_writable($POFile)) {
+            throw new sfException(sprintf('Unable to modify file %s, file must be writable.', $POFile));
+        }
 
-    $po = TGettext::factory('PO', $POFile);
-    $po->load();
-    $result = $po->toArray(); 
+        $po = TGettext::factory('PO', $POFile);
+        $po->load();
+        $result = $po->toArray();
 
-    foreach ($result['strings'] as $string => $value)
-    {
-      if ($string == $message)
-      {
-        $result['meta']['PO-Revision-Date'] = @date('Y-m-d H:i:s');
-        unset($result['strings'][$string]);
+        foreach ($result['strings'] as $string => $value) {
+            if ($string == $message) {
+                $result['meta']['PO-Revision-Date'] = @date('Y-m-d H:i:s');
+                unset($result['strings'][$string]);
 
-        $po->fromArray($result);
-        $mo = $po->toMO();
-        if ($po->save() && $mo->save($MOFile))
-        {
-          if ($this->cache)
-          {
-            $this->cache->remove($variant.':'.$this->culture);
-          }
-
-          return true;
-        }
-        else
-        {
-          return false;
+                $po->fromArray($result);
+                $mo = $po->toMO();
+                if ($po->save() && $mo->save($MOFile)) {
+                    if ($this->cache) {
+                        $this->cache->remove($variant.':'.$this->culture);
+                    }
+
+                    return true;
+                }
+
+                return false;
+            }
         }
-      }
-    }
 
-    return false;
-  }
-
-  /**
-   * Updates the translation.
-   *
-   * @param string $text      the source string.
-   * @param string $target    the new translation string.
-   * @param string $comments  comments
-   * @param string $catalogue the catalogue of the translation.
-   * @return boolean true if translation was updated, false otherwise.
-   */
-  function update($text, $target, $comments, $catalogue = 'messages')
-  {
-    $variants = $this->getVariants($catalogue);
-    if ($variants)
-    {
-      list($variant, $MOFile, $POFile) = $variants;
-    }
-    else
-    {
-      return false;
+        return false;
     }
 
-    if (is_writable($MOFile) == false)
+    /**
+     * Updates the translation.
+     *
+     * @param string $text      the source string
+     * @param string $target    the new translation string
+     * @param string $comments  comments
+     * @param string $catalogue the catalogue of the translation
+     *
+     * @return bool true if translation was updated, false otherwise
+     */
+    public function update($text, $target, $comments, $catalogue = 'messages')
     {
-      throw new sfException(sprintf("Unable to update file %s, file must be writable.", $MOFile));
-    }
+        $variants = $this->getVariants($catalogue);
+        if ($variants) {
+            list($variant, $MOFile, $POFile) = $variants;
+        } else {
+            return false;
+        }
 
-    if (is_writable($POFile) == false)
-    {
-      throw new sfException(sprintf("Unable to update file %s, file must be writable.", $POFile));
-    }
+        if (false == is_writable($MOFile)) {
+            throw new sfException(sprintf('Unable to update file %s, file must be writable.', $MOFile));
+        }
 
-    $po = TGettext::factory('PO',$POFile);
-    $po->load();
-    $result = $po->toArray();
+        if (false == is_writable($POFile)) {
+            throw new sfException(sprintf('Unable to update file %s, file must be writable.', $POFile));
+        }
 
-    foreach ($result['strings'] as $string => $value)
-    {
-      if ($string == $text)
-      {
-        $result['strings'][$string] = $target;
-        $result['meta']['PO-Revision-Date'] = @date('Y-m-d H:i:s');
+        $po = TGettext::factory('PO', $POFile);
+        $po->load();
+        $result = $po->toArray();
 
-        $po->fromArray($result);
-        $mo = $po->toMO();
+        foreach ($result['strings'] as $string => $value) {
+            if ($string == $text) {
+                $result['strings'][$string] = $target;
+                $result['meta']['PO-Revision-Date'] = @date('Y-m-d H:i:s');
 
-        if ($po->save() && $mo->save($MOFile))
-        {
-          if ($this->cache)
-          {
-            $this->cache->remove($variant.':'.$this->culture);
-          }
+                $po->fromArray($result);
+                $mo = $po->toMO();
 
-          return true;
-        }
-        else
-        {
-          return false;
+                if ($po->save() && $mo->save($MOFile)) {
+                    if ($this->cache) {
+                        $this->cache->remove($variant.':'.$this->culture);
+                    }
+
+                    return true;
+                }
+
+                return false;
+            }
         }
-      }
-    }
 
-    return false;
-  }
+        return false;
+    }
 
-  protected function createMessageTemplate($catalogue)
-  {
-    if (null === $catalogue)
+    /**
+     * Gets the variant for a catalogue depending on the current culture.
+     *
+     * @param string $catalogue catalogue
+     *
+     * @return string the variant
+     *
+     * @see save()
+     * @see update()
+     * @see delete()
+     */
+    protected function getVariants($catalogue = 'messages')
     {
-      $catalogue = 'messages';
-    }
+        if (empty($catalogue)) {
+            $catalogue = 'messages';
+        }
 
-    $variants = $this->getCatalogueList($catalogue);
-    $variant = array_shift($variants);
-    $mo_file = $this->getSource($variant);
-    $po_file = $this->getPOFile($mo_file);
+        foreach ($this->getCatalogueList($catalogue) as $variant) {
+            $file = $this->getSource($variant);
+            $po = $this->getPOFile($file);
+            if (is_file($file) || is_file($po)) {
+                return array($variant, $file, $po);
+            }
+        }
 
-    $dir = dirname($mo_file);
-    if (!is_dir($dir))
-    {
-      @mkdir($dir);
-      @chmod($dir, 0777);
+        return false;
     }
 
-    if (!is_dir($dir))
+    protected function getPOFile($MOFile)
     {
-      throw new sfException(sprintf("Unable to create directory %s.", $dir));
+        return substr($MOFile, 0, strlen($MOFile) - strlen($this->dataExt)).$this->poExt;
     }
 
-    $po = TGettext::factory('PO', $po_file);
-    $result['meta']['PO-Revision-Date'] = date('Y-m-d H:i:s');
-    $result['strings'] = array();
-
-    $po->fromArray($result);
-    $mo = $po->toMO();
-    if ($po->save() && $mo->save($mo_file))
-    {
-      return array($variant, $mo_file, $po_file);
-    }
-    else
+    protected function createMessageTemplate($catalogue)
     {
-      throw new sfException(sprintf("Unable to create file %s and %s.", $po_file, $mo_file));
+        if (null === $catalogue) {
+            $catalogue = 'messages';
+        }
+
+        $variants = $this->getCatalogueList($catalogue);
+        $variant = array_shift($variants);
+        $mo_file = $this->getSource($variant);
+        $po_file = $this->getPOFile($mo_file);
+
+        $dir = dirname($mo_file);
+        if (!is_dir($dir)) {
+            @mkdir($dir);
+            @chmod($dir, 0777);
+        }
+
+        if (!is_dir($dir)) {
+            throw new sfException(sprintf('Unable to create directory %s.', $dir));
+        }
+
+        $po = TGettext::factory('PO', $po_file);
+        $result['meta']['PO-Revision-Date'] = date('Y-m-d H:i:s');
+        $result['strings'] = array();
+
+        $po->fromArray($result);
+        $mo = $po->toMO();
+        if ($po->save() && $mo->save($mo_file)) {
+            return array($variant, $mo_file, $po_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 bcf948d55..55364dd7c 100644
--- a/lib/i18n/sfNumberFormat.class.php
+++ b/lib/i18n/sfNumberFormat.class.php
@@ -13,9 +13,8 @@
  * {@link http://prado.sourceforge.net/}
  *
  * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
+ *
  * @version    $Id$
- * @package    symfony
- * @subpackage i18n
  */
 
 /**
@@ -57,286 +56,259 @@
  * For each culture, the symbol for each currency may be different.
  *
  * @author Xiang Wei Zhuo <weizhuo[at]gmail[dot]com>
+ *
  * @version v1.0, last update on Fri Dec 10 18:10:20 EST 2004
- * @package    symfony
- * @subpackage i18n
  */
 class sfNumberFormat
 {
-  /**
-   * The DateTimeFormatInfo, containing culture specific patterns and names.
-   * @var DateTimeFormatInfo
-   */
-  protected $formatInfo;
-
-  /**
-   * Creates a new number format instance. The constructor can be instantiated
-   * with a string that represent a culture/locale. Similarly, passing
-   * a sfCultureInfo or sfNumberFormatInfo instance will instantiated a instance
-   * for that particular culture.
-   *
-   * @param mixed $formatInfo either null, a sfCultureInfo, a sfNumberFormatInfo, or string
-   * @return sfNumberFormat
-   */
-  function __construct($formatInfo = null)
-  {
-    if (null === $formatInfo)
-    {
-      $this->formatInfo = sfNumberFormatInfo::getInvariantInfo();
-    }
-    else if ($formatInfo instanceof sfCultureInfo)
-    {
-      $this->formatInfo = $formatInfo->getNumberFormat();
-    }
-    else if ($formatInfo instanceof sfNumberFormatInfo)
+    /**
+     * The DateTimeFormatInfo, containing culture specific patterns and names.
+     *
+     * @var DateTimeFormatInfo
+     */
+    protected $formatInfo;
+
+    /**
+     * Creates a new number format instance. The constructor can be instantiated
+     * with a string that represent a culture/locale. Similarly, passing
+     * a sfCultureInfo or sfNumberFormatInfo instance will instantiated a instance
+     * for that particular culture.
+     *
+     * @param mixed $formatInfo either null, a sfCultureInfo, a sfNumberFormatInfo, or string
+     *
+     * @return sfNumberFormat
+     */
+    public function __construct($formatInfo = null)
     {
-      $this->formatInfo = $formatInfo;
-    }
-    else
-    {
-      $this->formatInfo = sfNumberFormatInfo::getInstance($formatInfo);
-    }
-  }
-
-  /**
-   * Formats the number for a certain pattern. The valid patterns are
-   * 'c', 'd', 'e', 'p' or a custom pattern, such as "#.000" for
-   * 3 decimal places.
-   *
-   * @param mixed   $number   the number to format.
-   * @param string  $pattern  the format pattern, either, 'c', 'd', 'e', 'p'
-   * or a custom pattern. E.g. "#.000" will format the number to
-   * 3 decimal places.
-   * @param string  $currency 3-letter ISO 4217 code. For example, the code
-   * "USD" represents the US Dollar and "EUR" represents the Euro currency.
-   * @param string  $charset  The charset
-   * @return string formatted number string
-   */
-  function format($number, $pattern = 'd', $currency = 'USD', $charset = 'UTF-8')
-  {
-    $this->setPattern($pattern);
-
-    if (strtolower($pattern) == 'p')
-    {
-      $number *= 100;
+        if (null === $formatInfo) {
+            $this->formatInfo = sfNumberFormatInfo::getInvariantInfo();
+        } elseif ($formatInfo instanceof sfCultureInfo) {
+            $this->formatInfo = $formatInfo->getNumberFormat();
+        } elseif ($formatInfo instanceof sfNumberFormatInfo) {
+            $this->formatInfo = $formatInfo;
+        } else {
+            $this->formatInfo = sfNumberFormatInfo::getInstance($formatInfo);
+        }
     }
 
-    // avoid conversion with exponents
-    // see http://trac.symfony-project.org/ticket/5715
-    $precision = ini_set('precision', 14);
-    $string = $this->fixFloat($number);
-    ini_set('precision', $precision);
-
-    $decimal = $this->formatDecimal($string);
-    $integer = $this->formatInteger($this->fixFloat(abs($number)));
+    /**
+     * Formats the number for a certain pattern. The valid patterns are
+     * 'c', 'd', 'e', 'p' or a custom pattern, such as "#.000" for
+     * 3 decimal places.
+     *
+     * @param mixed  $number   the number to format
+     * @param string $pattern  the format pattern, either, 'c', 'd', 'e', 'p'
+     *                         or a custom pattern. E.g. "#.000" will format the number to
+     *                         3 decimal places.
+     * @param string $currency 3-letter ISO 4217 code. For example, the code
+     *                         "USD" represents the US Dollar and "EUR" represents the Euro currency.
+     * @param string $charset  The charset
+     *
+     * @return string formatted number string
+     */
+    public function format($number, $pattern = 'd', $currency = 'USD', $charset = 'UTF-8')
+    {
+        $this->setPattern($pattern);
 
-    $result = (strlen($decimal) > 0) ? $integer.$decimal : $integer;
+        if ('p' == strtolower($pattern)) {
+            $number *= 100;
+        }
 
-    // get the suffix
-    if ($number >= 0)
-    {
-      $suffix = $this->formatInfo->PositivePattern;
-    }
-    else if ($number < 0)
-    {
-      $suffix = $this->formatInfo->NegativePattern;
-    }
+        // avoid conversion with exponents
+        // see http://trac.symfony-project.org/ticket/5715
+        $precision = ini_set('precision', 14);
+        $string = $this->fixFloat($number);
+        ini_set('precision', $precision);
 
-    // append and prepend suffix
-    $result = $suffix[0].$result.$suffix[1];
+        $decimal = $this->formatDecimal($string);
+        $integer = $this->formatInteger($this->fixFloat(abs($number)));
 
-    // replace currency sign
-    $symbol = @$this->formatInfo->getCurrencySymbol($currency);
-    if (null === $symbol)
-    {
-      $symbol = $currency;
-    }
+        $result = (strlen($decimal) > 0) ? $integer.$decimal : $integer;
 
-    $result = str_replace('¤', $symbol, $result);
+        // get the suffix
+        if ($number >= 0) {
+            $suffix = $this->formatInfo->PositivePattern;
+        } elseif ($number < 0) {
+            $suffix = $this->formatInfo->NegativePattern;
+        }
 
-    return sfToolkit::I18N_toEncoding($result, $charset);
-  }
+        // append and prepend suffix
+        $result = $suffix[0].$result.$suffix[1];
 
-  /**
-   * Formats the integer, perform groupings and string padding.
-   *
-   * @param string  $string the decimal number in string form.
-   * @return string  formatted integer string with grouping
-   */
-  protected function formatInteger($string)
-  {
-    $string = (string) $string;
+        // replace currency sign
+        $symbol = @$this->formatInfo->getCurrencySymbol($currency);
+        if (null === $symbol) {
+            $symbol = $currency;
+        }
 
-    $dp = strpos($string, '.');
+        $result = str_replace('¤', $symbol, $result);
 
-    if (is_int($dp))
-    {
-      $string = substr($string, 0, $dp);
+        return sfToolkit::I18N_toEncoding($result, $charset);
     }
 
-    $integer = '';
+    /**
+     * Formats the integer, perform groupings and string padding.
+     *
+     * @param string $string the decimal number in string form
+     *
+     * @return string formatted integer string with grouping
+     */
+    protected function formatInteger($string)
+    {
+        $string = (string) $string;
 
-    $digitSize = $this->formatInfo->getDigitSize();
-    $string = str_pad($string, $digitSize, '0', STR_PAD_LEFT);
+        $dp = strpos($string, '.');
 
-    $len = strlen($string);
+        if (is_int($dp)) {
+            $string = substr($string, 0, $dp);
+        }
 
-    $groupSeparator = $this->formatInfo->GroupSeparator;
-    $groupSize = $this->formatInfo->GroupSizes;
+        $integer = '';
+
+        $digitSize = $this->formatInfo->getDigitSize();
+        $string = str_pad($string, $digitSize, '0', STR_PAD_LEFT);
+
+        $len = strlen($string);
+
+        $groupSeparator = $this->formatInfo->GroupSeparator;
+        $groupSize = $this->formatInfo->GroupSizes;
+
+        $firstGroup = true;
+        $multiGroup = is_int($groupSize[1]);
+        $count = 0;
+
+        if (is_int($groupSize[0])) {
+            // now for the integer groupings
+            for ($i = 0; $i < $len; ++$i) {
+                $char = $string[$len - $i - 1];
+
+                if ($multiGroup && 0 == $count) {
+                    if (0 != $i && 0 == $i % $groupSize[0]) {
+                        $integer = $groupSeparator.$integer;
+                        ++$count;
+                    }
+                } elseif ($multiGroup && $count >= 1) {
+                    if (0 != $i && ($i - $groupSize[0]) % $groupSize[1] == 0) {
+                        $integer = $groupSeparator.$integer;
+                        ++$count;
+                    }
+                } else {
+                    if (0 != $i && 0 == $i % $groupSize[0]) {
+                        $integer = $groupSeparator.$integer;
+                        ++$count;
+                    }
+                }
+
+                $integer = $char.$integer;
+            }
+        } else {
+            $integer = $string;
+        }
 
-    $firstGroup = true;
-    $multiGroup = is_int($groupSize[1]);
-    $count = 0;
+        return $integer;
+    }
 
-    if (is_int($groupSize[0]))
+    /**
+     * Formats the decimal places.
+     *
+     * @param string $string the decimal number in string form
+     *
+     * @return string formatted decimal places
+     */
+    protected function formatDecimal($string)
     {
-      // now for the integer groupings
-      for ($i = 0; $i < $len; $i++)
-      {
-        $char = $string[$len - $i - 1];
-
-        if ($multiGroup && $count == 0)
-        {
-          if ($i != 0 && $i % $groupSize[0] == 0)
-          {
-            $integer = $groupSeparator.$integer;
-            $count++;
-          }
+        $dp = strpos($string, '.');
+        $decimal = '';
+
+        $decimalDigits = $this->formatInfo->DecimalDigits;
+        $decimalSeparator = $this->formatInfo->DecimalSeparator;
+
+        if (is_int($dp)) {
+            if (-1 == $decimalDigits) {
+                $decimal = substr($string, $dp + 1);
+            } elseif (is_int($decimalDigits)) {
+                if (false === $pos = strpos($string, '.')) {
+                    $decimal = str_pad($decimal, $decimalDigits, '0');
+                } else {
+                    $decimal = substr($string, $pos + 1);
+                    if (strlen($decimal) <= $decimalDigits) {
+                        $decimal = str_pad($decimal, $decimalDigits, '0');
+                    } else {
+                        $decimal = substr($decimal, 0, $decimalDigits);
+                    }
+                }
+            } else {
+                return $decimal;
+            }
+
+            return $decimalSeparator.$decimal;
         }
-        else if ($multiGroup && $count >= 1)
-        {
-          if ($i != 0 && ($i - $groupSize[0]) % $groupSize[1] == 0)
-          {
-            $integer = $groupSeparator.$integer;
-            $count++;
-          }
-        }
-        else
-        {
-          if ($i != 0 && $i % $groupSize[0] == 0)
-          {
-            $integer = $groupSeparator.$integer;
-            $count++;
-          }
+        if ($decimalDigits > 0) {
+            return $decimalSeparator.str_pad($decimal, $decimalDigits, '0');
         }
 
-        $integer = $char.$integer;
-      }
+        return $decimal;
     }
-    else
+
+    /**
+     * Sets the pattern to format against. The default patterns
+     * are retrieved from the sfNumberFormatInfo instance.
+     *
+     * @param string $pattern the requested patterns
+     *
+     * @return string a number format pattern
+     */
+    protected function setPattern($pattern)
     {
-      $integer = $string;
-    }
+        switch ($pattern) {
+            case 'c':
+            case 'C':
+                $this->formatInfo->setPattern(sfNumberFormatInfo::CURRENCY);
 
-    return $integer;
-  }
+                break;
 
-  /**
-   * Formats the decimal places.
-   *
-   * @param string $string the decimal number in string form.
-   * @return string formatted decimal places.
-   */
-  protected function formatDecimal($string)
-  {
-    $dp = strpos($string, '.');
-    $decimal = '';
+            case 'd':
+            case 'D':
+                $this->formatInfo->setPattern(sfNumberFormatInfo::DECIMAL);
 
-    $decimalDigits = $this->formatInfo->DecimalDigits;
-    $decimalSeparator = $this->formatInfo->DecimalSeparator;
+                break;
 
-    if (is_int($dp))
-    {
-      if ($decimalDigits == -1)
-      {
-        $decimal = substr($string, $dp + 1);
-      }
-      else if (is_int($decimalDigits))
-      {
-        if (false === $pos = strpos($string, '.'))
-        {
-          $decimal = str_pad($decimal, $decimalDigits, '0');
-        }
-        else
-        {
-          $decimal = substr($string, $pos + 1);
-          if (strlen($decimal) <= $decimalDigits)
-          {
-            $decimal = str_pad($decimal, $decimalDigits, '0');
-          }
-          else
-          {
-            $decimal = substr($decimal, 0, $decimalDigits);
-          }
-        }
-      }
-      else
-      {
-        return $decimal;
-      }
+            case 'e':
+            case 'E':
+                $this->formatInfo->setPattern(sfNumberFormatInfo::SCIENTIFIC);
 
-      return $decimalSeparator.$decimal;
-    }
-    else if ($decimalDigits > 0)
-    {
-      return $decimalSeparator.str_pad($decimal, $decimalDigits, '0');
-    }
+                break;
 
-    return $decimal;
-  }
-
-  /**
-   * Sets the pattern to format against. The default patterns
-   * are retrieved from the sfNumberFormatInfo instance.
-   *
-   * @param string $pattern the requested patterns.
-   * @return string a number format pattern.
-   */
-  protected function setPattern($pattern)
-  {
-    switch ($pattern)
-    {
-      case 'c':
-      case 'C':
-        $this->formatInfo->setPattern(sfNumberFormatInfo::CURRENCY);
-        break;
-      case 'd':
-      case 'D':
-        $this->formatInfo->setPattern(sfNumberFormatInfo::DECIMAL);
-        break;
-      case 'e':
-      case 'E':
-        $this->formatInfo->setPattern(sfNumberFormatInfo::SCIENTIFIC);
-        break;
-      case 'p':
-      case 'P':
-        $this->formatInfo->setPattern(sfNumberFormatInfo::PERCENTAGE);
-        break;
-      default:
-        $this->formatInfo->setPattern($pattern);
-        break;
-    }
-  }
+            case 'p':
+            case 'P':
+                $this->formatInfo->setPattern(sfNumberFormatInfo::PERCENTAGE);
 
-  protected function fixFloat($float)
-  {
-    $string = (string) $float;
+                break;
 
-    if (false === strpos($float, 'E'))
-    {
-      return $string;
+            default:
+                $this->formatInfo->setPattern($pattern);
+
+                break;
+        }
     }
 
-    list($significand, $exp) = explode('E', $string);
-    list(, $decimal) = explode('.', $significand);
-    if ('-' === $exp[0]) {
-        $exp = str_replace('-', '', $exp);
+    protected function fixFloat($float)
+    {
+        $string = (string) $float;
+
+        if (false === strpos($float, 'E')) {
+            return $string;
+        }
+
+        list($significand, $exp) = explode('E', $string);
+        list(, $decimal) = explode('.', $significand);
+        if ('-' === $exp[0]) {
+            $exp = str_replace('-', '', $exp);
 
-        return '0.'.str_repeat('0', $exp).str_replace('.', '', $significand);
-    } else {
+            return '0.'.str_repeat('0', $exp).str_replace('.', '', $significand);
+        }
         $exp = str_replace('+', '', $exp) - strlen($decimal);
 
         return str_replace('.', '', $significand).str_repeat('0', $exp);
     }
-  }
 }
diff --git a/lib/i18n/sfNumberFormatInfo.class.php b/lib/i18n/sfNumberFormatInfo.class.php
index 2bfb7a613..85dd16761 100644
--- a/lib/i18n/sfNumberFormatInfo.class.php
+++ b/lib/i18n/sfNumberFormatInfo.class.php
@@ -13,699 +13,685 @@
  * {@link http://prado.sourceforge.net/}
  *
  * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
+ *
  * @version    $Id$
- * @package    symfony
- * @subpackage i18n
  */
- 
+
 /**
- * sfNumberFormatInfo class
- * 
+ * sfNumberFormatInfo class.
+ *
  * Defines how numeric values are formatted and displayed,
  * depending on the culture. Numeric values are formatted using
- * standard or custom patterns stored in the properties of a 
- * sfNumberFormatInfo. 
+ * standard or custom patterns stored in the properties of a
+ * sfNumberFormatInfo.
  *
- * This class contains information, such as currency, decimal 
+ * This class contains information, such as currency, decimal
  * separators, and other numeric symbols.
  *
- * To create a sfNumberFormatInfo for a specific culture, 
+ * To create a sfNumberFormatInfo for a specific culture,
  * create a sfCultureInfo for that culture and retrieve the
- * sfCultureInfo->NumberFormat property. Or use 
+ * sfCultureInfo->NumberFormat property. Or use
  * sfNumberFormatInfo::getInstance($culture).
- * To create a sfNumberFormatInfo for the invariant culture, use the 
- * InvariantInfo::getInvariantInfo(). 
- *
+ * To create a sfNumberFormatInfo for the invariant culture, use the
+ * InvariantInfo::getInvariantInfo().
  *
  * @author Xiang Wei Zhuo <weizhuo[at]gmail[dot]com>
+ *
  * @version v1.0, last update on Sun Dec 05 14:48:26 EST 2004
- * @package    symfony
- * @subpackage i18n
  */
 class sfNumberFormatInfo
 {
-  /**
-   * ICU number formatting data.
-   * @var array
-   */
-  protected $data = array();
+    public const DECIMAL = 0;
+    public const CURRENCY = 1;
+    public const PERCENTAGE = 2;
+    public const SCIENTIFIC = 3;
+
+    /**
+     * ICU number formatting data.
+     *
+     * @var array
+     */
+    protected $data = array();
+
+    /**
+     * A list of properties that are accessable/writable.
+     *
+     * @var array
+     */
+    protected $properties = array();
+
+    /**
+     * The number pattern.
+     *
+     * @var array
+     */
+    protected $pattern = array();
+
+    /**
+     * Initializes a new writable instance of the sfNumberFormatInfo class
+     * that is dependent on the ICU data for number, decimal, and currency
+     * formatting information. <b>N.B.</b>You should not initialize this
+     * class directly unless you know what you are doing. Please use use
+     * sfNumberFormatInfo::getInstance() to create an instance.
+     *
+     * @param array $data ICU data for date time formatting
+     * @param int   $type The sfNumberFormatInfo type
+     *
+     * @see getInstance()
+     */
+    public function __construct($data = array(), $type = sfNumberFormatInfo::DECIMAL)
+    {
+        $this->properties = get_class_methods($this);
+
+        if (empty($data)) {
+            throw new sfException('Please provide the ICU data to initialize.');
+        }
 
-  /**
-   * A list of properties that are accessable/writable.
-   * @var array
-   */
-  protected $properties = array();
+        $this->data = $data;
+
+        $this->setPattern($type);
+    }
 
-  /**
-   * The number pattern.
-   * @var array
-   */
-  protected $pattern = array();
-
-  const DECIMAL = 0;
-  const CURRENCY = 1;
-  const PERCENTAGE = 2;
-  const SCIENTIFIC = 3;
-
-  /**
-   * Allows functions that begins with 'set' to be called directly
-   * as an attribute/property to retrieve the value.
-   *
-   * @return mixed
-   */
-  function __get($name)
-  {
-    $getProperty = 'get'.$name;
-    if (in_array($getProperty, $this->properties))
-    {
-      return $this->$getProperty();
-    }
-    else
-    {
-      throw new sfException(sprintf('Property %s does not exists.', $name));
-    }
-  }
-
-  /**
-   * Allows functions that begins with 'set' to be called directly
-   * as an attribute/property to set the value.
-   */
-  function __set($name, $value)
-  {
-    $setProperty = 'set'.$name;
-    if (in_array($setProperty, $this->properties))
-    {
-      $this->$setProperty($value);
-    }
-    else
-    {
-      throw new sfException(sprintf('Property %s can not be set.', $name));
-    }
-  }
-
-  /**
-   * Initializes a new writable instance of the sfNumberFormatInfo class 
-   * that is dependent on the ICU data for number, decimal, and currency
-   * formatting information. <b>N.B.</b>You should not initialize this 
-   * class directly unless you know what you are doing. Please use use 
-   * sfNumberFormatInfo::getInstance() to create an instance.
-   *
-   * @param array $data ICU data for date time formatting.
-   * @param int   $type The sfNumberFormatInfo type
-   * @see getInstance()
-   */
-  function __construct($data = array(), $type = sfNumberFormatInfo::DECIMAL)
-  {
-    $this->properties = get_class_methods($this);
-
-    if (empty($data))
-    {
-      throw new sfException('Please provide the ICU data to initialize.');
-    }
-
-    $this->data = $data;
-
-    $this->setPattern($type);
-  }
-
-  /**
-   * Sets the pattern for a specific number pattern. The validate patterns
-   * sfNumberFormatInfo::DECIMAL, sfNumberFormatInfo::CURRENCY,
-   * sfNumberFormatInfo::PERCENTAGE, or sfNumberFormatInfo::SCIENTIFIC
-   *
-   * @param int $type pattern type.
-   */
-  function setPattern($type = sfNumberFormatInfo::DECIMAL)
-  {
-    if (is_int($type))
-    {
-      $this->pattern = $this->parsePattern($this->data['NumberPatterns'][$type]);
-    }
-    else
-    {
-      $this->pattern = $this->parsePattern($type);
-    }
-
-    $this->pattern['negInfty'] = $this->data['NumberElements'][6].$this->data['NumberElements'][9];
-
-    $this->pattern['posInfty'] = $this->data['NumberElements'][11].$this->data['NumberElements'][9];
-  }
-
-  function getPattern()
-  {
-    return $this->pattern;
-  }
-
-  /**
-   * Gets the default sfNumberFormatInfo that is culture-independent (invariant).
-   *
-   * @return sfNumberFormatInfo default sfNumberFormatInfo. 
-   */
-  static public function getInvariantInfo($type = sfNumberFormatInfo::DECIMAL)
-  {
-    static $invariant;
-    if (null === $invariant)
-    {
-      $culture = sfCultureInfo::getInvariantCulture();
-      $invariant = $culture->NumberFormat;
-      $invariant->setPattern($type);
-    }
-
-    return $invariant;
-  }
-
-  /**
-   * 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
-   * @return sfNumberFormatInfo sfNumberFormatInfo for the specified culture.
-   * @see getCurrencyInstance();
-   * @see getPercentageInstance();
-   * @see getScientificInstance();
-   */
-  public static function getInstance($culture = null, $type = sfNumberFormatInfo::DECIMAL)
-  {
-    if ($culture instanceof sfCultureInfo)
-    {
-      $formatInfo = $culture->getNumberFormat();
-      $formatInfo->setPattern($type);
-
-      return $formatInfo;
-    }
-    else if (is_string($culture))
-    {
-      $sfCultureInfo = sfCultureInfo::getInstance($culture);
-      $formatInfo = $sfCultureInfo->getNumberFormat();
-      $formatInfo->setPattern($type);
-
-      return $formatInfo;
-    }
-    else
-    {
-      $sfCultureInfo = sfCultureInfo::getInstance();
-      $formatInfo = $sfCultureInfo->getNumberFormat();
-      $formatInfo->setPattern($type);
-
-      return $formatInfo;
-    }
-  }
-
-  /**
-   * Returns the currency format info associated with the specified culture.
-   *
-   * @param sfCultureInfo $culture the culture that gets the NumberFormat property.
-   * @return sfNumberFormatInfo sfNumberFormatInfo for the specified culture.
-   */
-  public static function getCurrencyInstance($culture = null)
-  {
-    return self::getInstance($culture, self::CURRENCY);
-  }
-
-  /**
-   * Returns the percentage format info associated with the specified culture.
-   *
-   * @param sfCultureInfo $culture the culture that gets the NumberFormat property.
-   * @return sfNumberFormatInfo sfNumberFormatInfo for the specified culture. 
-   */
-  public static function getPercentageInstance($culture = null)
-  {
-    return self::getInstance($culture, self::PERCENTAGE);
-  }
-
-  /**
-   * Returns the scientific format info associated with the specified culture.
-   *
-   * @param sfCultureInfo $culture the culture that gets the NumberFormat property.
-   * @return sfNumberFormatInfo sfNumberFormatInfo for the specified culture. 
-   */
-  public static function getScientificInstance($culture = null)
-  {
-    return self::getInstance($culture, self::SCIENTIFIC);
-  }
-
-  /**
-   * Parses the given pattern and return a list of known properties.
-   *
-   * @param string $pattern a number pattern.
-   * @return array list of pattern properties.
-   */
-  protected function parsePattern($pattern)
-  {
-    $pattern = explode(';', $pattern);
-
-    $negative = null;
-    if (count($pattern) > 1)
-    {
-      $negative = $pattern[1];
-    }
-    $pattern = $pattern[0];
-
-    $comma = ',';
-    $dot = '.';
-    $digit = '0';
-    $hash = '#';
-
-    // find the first group point, and decimal point
-    $groupPos1 = strrpos($pattern, $comma);
-    $decimalPos = strrpos($pattern, $dot);
-
-    $groupPos2 = false;
-    $groupSize1 = false;
-    $groupSize2 = false;
-    $decimalPoints = is_int($decimalPos) ? -1 : false;
-
-    $info['negative'] = $negative;
-    $info['positive'] = $pattern;
-
-    $posfix = $this->getPrePostfix($pattern);
-    $info['posPref'] = $posfix[0];
-    $info['posPost'] = $posfix[1];
-
-    if ($negative)
-    {
-      // find the negative prefix and postfix
-      $prefixPostfix = $this->getPrePostfix($negative);
-      $info['negPref'] = $prefixPostfix[0];
-      $info['negPost'] = $prefixPostfix[1];
-    }
-    else
-    {
-      // use the positive prefix and postfix and add the NegativeSign
-      // http://www.unicode.org/reports/tr35/tr35-15.html#Number_Format_Patterns
-      // If there is no explicit negative subpattern, the negative subpattern is the localized minus sign prefixed to the positive subpattern.
-      $info['negPref'] = $this->getNegativeSign().$info['posPref'];
-      $info['negPost'] = $info['posPost'];
-    }
-
-    if (is_int($groupPos1))
-    {
-      // get the second group
-      $groupPos2 = strrpos(substr($pattern, 0, $groupPos1), $comma);
-
-      // get the number of decimal digits
-      if (is_int($decimalPos))
-      {
-        $groupSize1 = $decimalPos - $groupPos1 - 1;
-      }
-      else
-      {
-        // no decimal point, so traverse from the back
-        // to find the groupsize 1.
-        for ($i = strlen($pattern) - 1; $i >= 0; $i--)
-        {
-          if ($pattern[$i] == $digit || $pattern[$i] == $hash)
-          {
-            $groupSize1 = $i - $groupPos1;
-            break;
-          }
+    /**
+     * Allows functions that begins with 'set' to be called directly
+     * as an attribute/property to retrieve the value.
+     *
+     * @param mixed $name
+     *
+     * @return mixed
+     */
+    public function __get($name)
+    {
+        $getProperty = 'get'.$name;
+        if (in_array($getProperty, $this->properties)) {
+            return $this->{$getProperty}();
         }
-      }
 
-      // get the second group size
-      if (is_int($groupPos2))
-      {
-        $groupSize2 = $groupPos1 - $groupPos2 - 1;
-      }
+        throw new sfException(sprintf('Property %s does not exists.', $name));
     }
 
-    if (is_int($decimalPos))
+    /**
+     * Allows functions that begins with 'set' to be called directly
+     * as an attribute/property to set the value.
+     *
+     * @param mixed $name
+     * @param mixed $value
+     */
+    public function __set($name, $value)
     {
-      for ($i = strlen($pattern) - 1; $i >= 0; $i--)
-      {
-        if ($pattern[$i] == $dot)
-        {
-          break;
+        $setProperty = 'set'.$name;
+        if (in_array($setProperty, $this->properties)) {
+            $this->{$setProperty}($value);
+        } else {
+            throw new sfException(sprintf('Property %s can not be set.', $name));
         }
-        if ($pattern[$i] == $digit)
-        {
-          $decimalPoints = $i - $decimalPos;
-          break;
+    }
+
+    /**
+     * Sets the pattern for a specific number pattern. The validate patterns
+     * sfNumberFormatInfo::DECIMAL, sfNumberFormatInfo::CURRENCY,
+     * sfNumberFormatInfo::PERCENTAGE, or sfNumberFormatInfo::SCIENTIFIC.
+     *
+     * @param int $type pattern type
+     */
+    public function setPattern($type = sfNumberFormatInfo::DECIMAL)
+    {
+        if (is_int($type)) {
+            $this->pattern = $this->parsePattern($this->data['NumberPatterns'][$type]);
+        } else {
+            $this->pattern = $this->parsePattern($type);
         }
-      }
-    }
-
-    $digitPattern = is_int($decimalPos) ? substr($pattern, 0, $decimalPos) : $pattern;
-    $digitPattern  = preg_replace('/[^0]/', '', $digitPattern);
-
-    $info['groupPos1']     = $groupPos1;
-    $info['groupSize1']    = $groupSize1;
-    $info['groupPos2']     = $groupPos2;
-    $info['groupSize2']    = $groupSize2;
-    $info['decimalPos']    = $decimalPos;
-    $info['decimalPoints'] = $decimalPoints;
-    $info['digitSize']     = strlen($digitPattern);
-
-    return $info;
-  }
-
-  /**
-   * Gets the prefix and postfix of a pattern.
-   *
-   * @param string $pattern pattern
-   * @return array of prefix and postfix, array(prefix,postfix). 
-   */
-  protected function getPrePostfix($pattern)
-  {
-    $regexp = '/[#,\.0]+/';
-    $result = preg_split($regexp, $pattern);
-
-    return array($result[0], $result[1]);
-  }
-
-  /**
-   * Indicates the number of decimal places.
-   *
-   * @return int number of decimal places.
-   */
-  function getDecimalDigits()
-  {
-    return $this->pattern['decimalPoints'];
-  }
-
-  /**
-   * Sets the number of decimal places.
-   *
-   * @param int $value number of decimal places.
-   */
-  function setDecimalDigits($value)
-  {
-    return $this->pattern['decimalPoints'] = $value;
-  }
-
-  /**
-   * Indicates the digit size.
-   *
-   * @return int digit size.
-   */
-  function getDigitSize()
-  {
-    return $this->pattern['digitSize'];
-  }
-
-  /**
-   * Sets the digit size.
-   *
-   * @param int $value digit size.
-   */
-  function setDigitSize($value)
-  {
-    $this->pattern['digitSize'] = $value;
-  }
-
-  /**
-   * Gets the string to use as the decimal separator.
-   *
-   * @return string decimal separator.
-   */
-  function getDecimalSeparator()
-  {
-    return $this->data['NumberElements'][0];
-  }
-
-  /**
-   * Sets the string to use as the decimal separator.
-   *
-   * @param string $value the decimal point
-   */
-  function setDecimalSeparator($value)
-  {
-    return $this->data['NumberElements'][0] = $value;
-  }
-
-  /**
-   * Gets the string that separates groups of digits to the left 
-   * of the decimal in currency values.
-   *
-   * @return string currency group separator. 
-   */
-  function getGroupSeparator()
-  {
-    return $this->data['NumberElements'][1];
-  }
-
-  /**
-   * Sets the string to use as the group separator.
-   *
-   * @param string $value the group separator.
-   */
-  function setGroupSeparator($value)
-  {
-    return $this->data['NumberElements'][1] = $value;
-  }
-
-  /**
-   * Gets the number of digits in each group to the left of the decimal
-   * There can be two grouping sizes, this fucntion
-   * returns <b>array(group1, group2)</b>, if there is only 1 grouping size,
-   * group2 will be false.
-   *
-   * @return array grouping size(s). 
-   */
-  function getGroupSizes()
-  {
-    $group1 = $this->pattern['groupSize1'];
-    $group2 = $this->pattern['groupSize2'];
-
-    return array($group1, $group2);
-  }
-
-  /**
-   * Sets the number of digits in each group to the left of the decimal.
-   * There can be two grouping sizes, the value should
-   * be an <b>array(group1, group2)</b>, if there is only 1 grouping size,
-   * group2 should be false.
-   *
-   * @param array $groupSize grouping size(s).
-   */
-  function setGroupSizes($groupSize)
-  {
-    $this->pattern['groupSize1'] = $groupSize[0];
-    $this->pattern['groupSize2'] = $groupSize[1];
-  }
-
-  /**
-   * Gets the format pattern for negative values.
-   * The negative pattern is composed of a prefix, and postfix.
-   * This function returns <b>array(prefix, postfix)</b>.
-   *
-   * @return arary negative pattern. 
-   */
-  function getNegativePattern()
-  {
-    $prefix = $this->pattern['negPref'];
-    $postfix = $this->pattern['negPost'];
-
-    return array($prefix, $postfix);
-  }
-
-  /**
-   * Sets the format pattern for negative values.
-   * The negative pattern is composed of a prefix, and postfix in the form
-   * <b>array(prefix, postfix)</b>.
-   *
-   * @param arary $pattern negative pattern. 
-   */
-  function setNegativePattern($pattern)
-  {
-    $this->pattern['negPref'] = $pattern[0];
-    $this->pattern['negPost'] = $pattern[1];
-  }
-
-  /**
-   * Gets the format pattern for positive values.
-   * The positive pattern is composed of a prefix, and postfix.
-   * This function returns <b>array(prefix, postfix)</b>.
-   *
-   * @return arary positive pattern. 
-   */
-  function getPositivePattern()
-  {
-    $prefix = $this->pattern['posPref'];
-    $postfix = $this->pattern['posPost'];
-
-    return array($prefix, $postfix);
-  }
-
-  /**
-   * Sets the format pattern for positive values.
-   * The positive pattern is composed of a prefix, and postfix in the form
-   * <b>array(prefix, postfix)</b>.
-   *
-   * @param arary $pattern positive pattern. 
-   */
-  function setPositivePattern($pattern)
-  {
-    $this->pattern['posPref'] = $pattern[0];
-    $this->pattern['posPost'] = $pattern[1];
-  }
-
-  /**
-   * Gets the string to use as the currency symbol.
-   *
-   * @return string $currency currency symbol. 
-   */
-  function getCurrencySymbol($currency = 'USD')
-  {
-    if (isset($this->pattern['symbol']))
-    {
-      return $this->pattern['symbol'];
-    }
-    else
-    {
-      return $this->data['Currencies'][$currency][0];
-    }
-  }
-
-  /**
-   * Sets the string to use as the currency symbol.
-   *
-   * @param string $symbol currency symbol.
-   */
-  function setCurrencySymbol($symbol)
-  {
-    $this->pattern['symbol'] = $symbol;
-  }
-
-  /**
-   * Gets the string that represents negative infinity.
-   *
-   * @return string negative infinity.
-   */
-  function getNegativeInfinitySymbol()
-  {
-    return $this->pattern['negInfty'];
-  }
-
-  /**
-   * Sets the string that represents negative infinity.
-   *
-   * @param string $value negative infinity. 
-   */
-  function setNegativeInfinitySymbol($value)
-  {
-    $this->pattern['negInfty'] = $value;
-  }
-
-  /**
-   * Gets the string that represents positive infinity.
-   *
-   * @return string positive infinity. 
-   */
-  function getPositiveInfinitySymbol()
-  {
-    return $this->pattern['posInfty'];
-  }
-
-  /**
-   * Sets the string that represents positive infinity.
-   *
-   * @param string $value positive infinity. 
-   */
-  function setPositiveInfinitySymbol($value)
-  {
-    $this->pattern['posInfty'] = $value;
-  }
-
-  /**
-   * Gets the string that denotes that the associated number is negative.
-   *
-   * @return string negative sign. 
-   */
-  function getNegativeSign()
-  {
-    return $this->data['NumberElements'][6];
-  }
-
-  /**
-   * Sets the string that denotes that the associated number is negative.
-   *
-   * @param string $value negative sign. 
-   */
-  function setNegativeSign($value)
-  {
-    $this->data['NumberElements'][6] = $value;
-  }
-
-  /**
-   * Gets the string that denotes that the associated number is positive.
-   *
-   * @return string positive sign. 
-   */
-  function getPositiveSign()
-  {
-    return $this->data['NumberElements'][11];
-  }
-
-  /**
-   * Sets the string that denotes that the associated number is positive.
-   *
-   * @param string $value positive sign. 
-   */
-  function setPositiveSign($value)
-  {
-    $this->data['NumberElements'][11] = $value;
-  }
-
-  /**
-   * Gets the string that represents the IEEE NaN (not a number) value.
-   *
-   * @return string NaN symbol.
-   */
-  function getNaNSymbol()
-  {
-    return $this->data['NumberElements'][10];
-  }
-
-  /**
-   * Sets the string that represents the IEEE NaN (not a number) value.
-   *
-   * @param string $value NaN symbol.
-   */
-  function setNaNSymbol($value)
-  {
-    $this->data['NumberElements'][10] = $value;
-  }
-
-  /**
-   * Gets the string to use as the percent symbol.
-   *
-   * @return string percent symbol.
-   */
-  function getPercentSymbol()
-  {
-    return $this->data['NumberElements'][3];
-  }
-
-  /**
-   * Sets the string to use as the percent symbol.
-   *
-   * @param string $value percent symbol.
-   */
-  function setPercentSymbol($value)
-  {
-    $this->data['NumberElements'][3] = $value;
-  }
-
-  /**
-   * Gets the string to use as the per mille symbol.
-   *
-   * @return string percent symbol.
-   */
-  function getPerMilleSymbol()
-  {
-    return $this->data['NumberElements'][8];
-  }
-
-  /**
-   * Sets the string to use as the per mille symbol.
-   *
-   * @param string $value percent symbol.
-   */
-  function setPerMilleSymbol($value)
-  {
-    $this->data['NumberElements'][8] = $value;
-  }
+
+        $this->pattern['negInfty'] = $this->data['NumberElements'][6].$this->data['NumberElements'][9];
+
+        $this->pattern['posInfty'] = $this->data['NumberElements'][11].$this->data['NumberElements'][9];
+    }
+
+    public function getPattern()
+    {
+        return $this->pattern;
+    }
+
+    /**
+     * Gets the default sfNumberFormatInfo that is culture-independent (invariant).
+     *
+     * @param mixed $type
+     *
+     * @return sfNumberFormatInfo default sfNumberFormatInfo
+     */
+    public static function getInvariantInfo($type = sfNumberFormatInfo::DECIMAL)
+    {
+        static $invariant;
+        if (null === $invariant) {
+            $culture = sfCultureInfo::getInvariantCulture();
+            $invariant = $culture->NumberFormat;
+            $invariant->setPattern($type);
+        }
+
+        return $invariant;
+    }
+
+    /**
+     * 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
+     *
+     * @return sfNumberFormatInfo sfNumberFormatInfo for the specified culture
+     *
+     * @see getCurrencyInstance();
+     * @see getPercentageInstance();
+     * @see getScientificInstance();
+     */
+    public static function getInstance($culture = null, $type = sfNumberFormatInfo::DECIMAL)
+    {
+        if ($culture instanceof sfCultureInfo) {
+            $formatInfo = $culture->getNumberFormat();
+            $formatInfo->setPattern($type);
+
+            return $formatInfo;
+        }
+        if (is_string($culture)) {
+            $sfCultureInfo = sfCultureInfo::getInstance($culture);
+            $formatInfo = $sfCultureInfo->getNumberFormat();
+            $formatInfo->setPattern($type);
+
+            return $formatInfo;
+        }
+
+        $sfCultureInfo = sfCultureInfo::getInstance();
+        $formatInfo = $sfCultureInfo->getNumberFormat();
+        $formatInfo->setPattern($type);
+
+        return $formatInfo;
+    }
+
+    /**
+     * Returns the currency format info associated with the specified culture.
+     *
+     * @param sfCultureInfo $culture the culture that gets the NumberFormat property
+     *
+     * @return sfNumberFormatInfo sfNumberFormatInfo for the specified culture
+     */
+    public static function getCurrencyInstance($culture = null)
+    {
+        return self::getInstance($culture, self::CURRENCY);
+    }
+
+    /**
+     * Returns the percentage format info associated with the specified culture.
+     *
+     * @param sfCultureInfo $culture the culture that gets the NumberFormat property
+     *
+     * @return sfNumberFormatInfo sfNumberFormatInfo for the specified culture
+     */
+    public static function getPercentageInstance($culture = null)
+    {
+        return self::getInstance($culture, self::PERCENTAGE);
+    }
+
+    /**
+     * Returns the scientific format info associated with the specified culture.
+     *
+     * @param sfCultureInfo $culture the culture that gets the NumberFormat property
+     *
+     * @return sfNumberFormatInfo sfNumberFormatInfo for the specified culture
+     */
+    public static function getScientificInstance($culture = null)
+    {
+        return self::getInstance($culture, self::SCIENTIFIC);
+    }
+
+    /**
+     * Indicates the number of decimal places.
+     *
+     * @return int number of decimal places
+     */
+    public function getDecimalDigits()
+    {
+        return $this->pattern['decimalPoints'];
+    }
+
+    /**
+     * Sets the number of decimal places.
+     *
+     * @param int $value number of decimal places
+     */
+    public function setDecimalDigits($value)
+    {
+        return $this->pattern['decimalPoints'] = $value;
+    }
+
+    /**
+     * Indicates the digit size.
+     *
+     * @return int digit size
+     */
+    public function getDigitSize()
+    {
+        return $this->pattern['digitSize'];
+    }
+
+    /**
+     * Sets the digit size.
+     *
+     * @param int $value digit size
+     */
+    public function setDigitSize($value)
+    {
+        $this->pattern['digitSize'] = $value;
+    }
+
+    /**
+     * Gets the string to use as the decimal separator.
+     *
+     * @return string decimal separator
+     */
+    public function getDecimalSeparator()
+    {
+        return $this->data['NumberElements'][0];
+    }
+
+    /**
+     * Sets the string to use as the decimal separator.
+     *
+     * @param string $value the decimal point
+     */
+    public function setDecimalSeparator($value)
+    {
+        return $this->data['NumberElements'][0] = $value;
+    }
+
+    /**
+     * Gets the string that separates groups of digits to the left
+     * of the decimal in currency values.
+     *
+     * @return string currency group separator
+     */
+    public function getGroupSeparator()
+    {
+        return $this->data['NumberElements'][1];
+    }
+
+    /**
+     * Sets the string to use as the group separator.
+     *
+     * @param string $value the group separator
+     */
+    public function setGroupSeparator($value)
+    {
+        return $this->data['NumberElements'][1] = $value;
+    }
+
+    /**
+     * Gets the number of digits in each group to the left of the decimal
+     * There can be two grouping sizes, this fucntion
+     * returns <b>array(group1, group2)</b>, if there is only 1 grouping size,
+     * group2 will be false.
+     *
+     * @return array grouping size(s)
+     */
+    public function getGroupSizes()
+    {
+        $group1 = $this->pattern['groupSize1'];
+        $group2 = $this->pattern['groupSize2'];
+
+        return array($group1, $group2);
+    }
+
+    /**
+     * Sets the number of digits in each group to the left of the decimal.
+     * There can be two grouping sizes, the value should
+     * be an <b>array(group1, group2)</b>, if there is only 1 grouping size,
+     * group2 should be false.
+     *
+     * @param array $groupSize grouping size(s)
+     */
+    public function setGroupSizes($groupSize)
+    {
+        $this->pattern['groupSize1'] = $groupSize[0];
+        $this->pattern['groupSize2'] = $groupSize[1];
+    }
+
+    /**
+     * Gets the format pattern for negative values.
+     * The negative pattern is composed of a prefix, and postfix.
+     * This function returns <b>array(prefix, postfix)</b>.
+     *
+     * @return arary negative pattern
+     */
+    public function getNegativePattern()
+    {
+        $prefix = $this->pattern['negPref'];
+        $postfix = $this->pattern['negPost'];
+
+        return array($prefix, $postfix);
+    }
+
+    /**
+     * Sets the format pattern for negative values.
+     * The negative pattern is composed of a prefix, and postfix in the form
+     * <b>array(prefix, postfix)</b>.
+     *
+     * @param arary $pattern negative pattern
+     */
+    public function setNegativePattern($pattern)
+    {
+        $this->pattern['negPref'] = $pattern[0];
+        $this->pattern['negPost'] = $pattern[1];
+    }
+
+    /**
+     * Gets the format pattern for positive values.
+     * The positive pattern is composed of a prefix, and postfix.
+     * This function returns <b>array(prefix, postfix)</b>.
+     *
+     * @return arary positive pattern
+     */
+    public function getPositivePattern()
+    {
+        $prefix = $this->pattern['posPref'];
+        $postfix = $this->pattern['posPost'];
+
+        return array($prefix, $postfix);
+    }
+
+    /**
+     * Sets the format pattern for positive values.
+     * The positive pattern is composed of a prefix, and postfix in the form
+     * <b>array(prefix, postfix)</b>.
+     *
+     * @param arary $pattern positive pattern
+     */
+    public function setPositivePattern($pattern)
+    {
+        $this->pattern['posPref'] = $pattern[0];
+        $this->pattern['posPost'] = $pattern[1];
+    }
+
+    /**
+     * Gets the string to use as the currency symbol.
+     *
+     * @param mixed $currency
+     *
+     * @return string $currency currency symbol
+     */
+    public function getCurrencySymbol($currency = 'USD')
+    {
+        if (isset($this->pattern['symbol'])) {
+            return $this->pattern['symbol'];
+        }
+
+        return $this->data['Currencies'][$currency][0];
+    }
+
+    /**
+     * Sets the string to use as the currency symbol.
+     *
+     * @param string $symbol currency symbol
+     */
+    public function setCurrencySymbol($symbol)
+    {
+        $this->pattern['symbol'] = $symbol;
+    }
+
+    /**
+     * Gets the string that represents negative infinity.
+     *
+     * @return string negative infinity
+     */
+    public function getNegativeInfinitySymbol()
+    {
+        return $this->pattern['negInfty'];
+    }
+
+    /**
+     * Sets the string that represents negative infinity.
+     *
+     * @param string $value negative infinity
+     */
+    public function setNegativeInfinitySymbol($value)
+    {
+        $this->pattern['negInfty'] = $value;
+    }
+
+    /**
+     * Gets the string that represents positive infinity.
+     *
+     * @return string positive infinity
+     */
+    public function getPositiveInfinitySymbol()
+    {
+        return $this->pattern['posInfty'];
+    }
+
+    /**
+     * Sets the string that represents positive infinity.
+     *
+     * @param string $value positive infinity
+     */
+    public function setPositiveInfinitySymbol($value)
+    {
+        $this->pattern['posInfty'] = $value;
+    }
+
+    /**
+     * Gets the string that denotes that the associated number is negative.
+     *
+     * @return string negative sign
+     */
+    public function getNegativeSign()
+    {
+        return $this->data['NumberElements'][6];
+    }
+
+    /**
+     * Sets the string that denotes that the associated number is negative.
+     *
+     * @param string $value negative sign
+     */
+    public function setNegativeSign($value)
+    {
+        $this->data['NumberElements'][6] = $value;
+    }
+
+    /**
+     * Gets the string that denotes that the associated number is positive.
+     *
+     * @return string positive sign
+     */
+    public function getPositiveSign()
+    {
+        return $this->data['NumberElements'][11];
+    }
+
+    /**
+     * Sets the string that denotes that the associated number is positive.
+     *
+     * @param string $value positive sign
+     */
+    public function setPositiveSign($value)
+    {
+        $this->data['NumberElements'][11] = $value;
+    }
+
+    /**
+     * Gets the string that represents the IEEE NaN (not a number) value.
+     *
+     * @return string naN symbol
+     */
+    public function getNaNSymbol()
+    {
+        return $this->data['NumberElements'][10];
+    }
+
+    /**
+     * Sets the string that represents the IEEE NaN (not a number) value.
+     *
+     * @param string $value naN symbol
+     */
+    public function setNaNSymbol($value)
+    {
+        $this->data['NumberElements'][10] = $value;
+    }
+
+    /**
+     * Gets the string to use as the percent symbol.
+     *
+     * @return string percent symbol
+     */
+    public function getPercentSymbol()
+    {
+        return $this->data['NumberElements'][3];
+    }
+
+    /**
+     * Sets the string to use as the percent symbol.
+     *
+     * @param string $value percent symbol
+     */
+    public function setPercentSymbol($value)
+    {
+        $this->data['NumberElements'][3] = $value;
+    }
+
+    /**
+     * Gets the string to use as the per mille symbol.
+     *
+     * @return string percent symbol
+     */
+    public function getPerMilleSymbol()
+    {
+        return $this->data['NumberElements'][8];
+    }
+
+    /**
+     * Sets the string to use as the per mille symbol.
+     *
+     * @param string $value percent symbol
+     */
+    public function setPerMilleSymbol($value)
+    {
+        $this->data['NumberElements'][8] = $value;
+    }
+
+    /**
+     * Parses the given pattern and return a list of known properties.
+     *
+     * @param string $pattern a number pattern
+     *
+     * @return array list of pattern properties
+     */
+    protected function parsePattern($pattern)
+    {
+        $pattern = explode(';', $pattern);
+
+        $negative = null;
+        if (count($pattern) > 1) {
+            $negative = $pattern[1];
+        }
+        $pattern = $pattern[0];
+
+        $comma = ',';
+        $dot = '.';
+        $digit = '0';
+        $hash = '#';
+
+        // find the first group point, and decimal point
+        $groupPos1 = strrpos($pattern, $comma);
+        $decimalPos = strrpos($pattern, $dot);
+
+        $groupPos2 = false;
+        $groupSize1 = false;
+        $groupSize2 = false;
+        $decimalPoints = is_int($decimalPos) ? -1 : false;
+
+        $info['negative'] = $negative;
+        $info['positive'] = $pattern;
+
+        $posfix = $this->getPrePostfix($pattern);
+        $info['posPref'] = $posfix[0];
+        $info['posPost'] = $posfix[1];
+
+        if ($negative) {
+            // find the negative prefix and postfix
+            $prefixPostfix = $this->getPrePostfix($negative);
+            $info['negPref'] = $prefixPostfix[0];
+            $info['negPost'] = $prefixPostfix[1];
+        } else {
+            // use the positive prefix and postfix and add the NegativeSign
+            // http://www.unicode.org/reports/tr35/tr35-15.html#Number_Format_Patterns
+            // If there is no explicit negative subpattern, the negative subpattern is the localized minus sign prefixed to the positive subpattern.
+            $info['negPref'] = $this->getNegativeSign().$info['posPref'];
+            $info['negPost'] = $info['posPost'];
+        }
+
+        if (is_int($groupPos1)) {
+            // get the second group
+            $groupPos2 = strrpos(substr($pattern, 0, $groupPos1), $comma);
+
+            // get the number of decimal digits
+            if (is_int($decimalPos)) {
+                $groupSize1 = $decimalPos - $groupPos1 - 1;
+            } else {
+                // no decimal point, so traverse from the back
+                // to find the groupsize 1.
+                for ($i = strlen($pattern) - 1; $i >= 0; --$i) {
+                    if ($pattern[$i] == $digit || $pattern[$i] == $hash) {
+                        $groupSize1 = $i - $groupPos1;
+
+                        break;
+                    }
+                }
+            }
+
+            // get the second group size
+            if (is_int($groupPos2)) {
+                $groupSize2 = $groupPos1 - $groupPos2 - 1;
+            }
+        }
+
+        if (is_int($decimalPos)) {
+            for ($i = strlen($pattern) - 1; $i >= 0; --$i) {
+                if ($pattern[$i] == $dot) {
+                    break;
+                }
+                if ($pattern[$i] == $digit) {
+                    $decimalPoints = $i - $decimalPos;
+
+                    break;
+                }
+            }
+        }
+
+        $digitPattern = is_int($decimalPos) ? substr($pattern, 0, $decimalPos) : $pattern;
+        $digitPattern = preg_replace('/[^0]/', '', $digitPattern);
+
+        $info['groupPos1'] = $groupPos1;
+        $info['groupSize1'] = $groupSize1;
+        $info['groupPos2'] = $groupPos2;
+        $info['groupSize2'] = $groupSize2;
+        $info['decimalPos'] = $decimalPos;
+        $info['decimalPoints'] = $decimalPoints;
+        $info['digitSize'] = strlen($digitPattern);
+
+        return $info;
+    }
+
+    /**
+     * Gets the prefix and postfix of a pattern.
+     *
+     * @param string $pattern pattern
+     *
+     * @return array of prefix and postfix, array(prefix,postfix)
+     */
+    protected function getPrePostfix($pattern)
+    {
+        $regexp = '/[#,\.0]+/';
+        $result = preg_split($regexp, $pattern);
+
+        return array($result[0], $result[1]);
+    }
 }
diff --git a/lib/log/sfAggregateLogger.class.php b/lib/log/sfAggregateLogger.class.php
index ce8199283..5e2799c57 100644
--- a/lib/log/sfAggregateLogger.class.php
+++ b/lib/log/sfAggregateLogger.class.php
@@ -11,107 +11,97 @@
 /**
  * sfAggregateLogger logs messages through several loggers.
  *
- * @package    symfony
- * @subpackage log
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfAggregateLogger extends sfLogger
 {
-  protected
-    $loggers = array();
-
-  /**
-   * Initializes this logger.
-   *
-   * Available options:
-   *
-   * - loggers: Logger objects that extends sfLogger.
-   *
-   * @param  sfEventDispatcher $dispatcher  A sfEventDispatcher instance
-   * @param  array             $options     An array of options.
-   *
-   * @return void
-   */
-  public function initialize(sfEventDispatcher $dispatcher, $options = array())
-  {
-    $this->dispatcher = $dispatcher;
+    protected $loggers = array();
 
-    if (isset($options['loggers']))
+    /**
+     * Initializes this logger.
+     *
+     * Available options:
+     *
+     * - loggers: Logger objects that extends sfLogger.
+     *
+     * @param sfEventDispatcher $dispatcher A sfEventDispatcher instance
+     * @param array             $options    an array of options
+     */
+    public function initialize(sfEventDispatcher $dispatcher, $options = array())
     {
-      if (!is_array($options['loggers']))
-      {
-        $options['loggers'] = array($options['loggers']);
-      }
+        $this->dispatcher = $dispatcher;
 
-      $this->addLoggers($options['loggers']);
-    }
+        if (isset($options['loggers'])) {
+            if (!is_array($options['loggers'])) {
+                $options['loggers'] = array($options['loggers']);
+            }
 
-    parent::initialize($dispatcher, $options);
-  }
+            $this->addLoggers($options['loggers']);
+        }
 
-  /**
-   * Retrieves current loggers.
-   *
-   * @return array List of loggers
-   */
-  public function getLoggers()
-  {
-    return $this->loggers;
-  }
+        parent::initialize($dispatcher, $options);
+    }
 
-  /**
-   * Adds an array of loggers.
-   *
-   * @param object $loggers An array of Logger objects
-   */
-  public function addLoggers($loggers)
-  {
-    foreach ($loggers as $logger)
+    /**
+     * Retrieves current loggers.
+     *
+     * @return array List of loggers
+     */
+    public function getLoggers()
     {
-      $this->addLogger($logger);
+        return $this->loggers;
     }
-  }
-
-  /**
-   * Adds a logger.
-   *
-   * @param sfLoggerInterface $logger The Logger object
-   */
-  public function addLogger(sfLoggerInterface $logger)
-  {
-    $this->loggers[] = $logger;
 
-    $this->dispatcher->disconnect('application.log', array($logger, 'listenToLogEvent'));
-  }
+    /**
+     * Adds an array of loggers.
+     *
+     * @param object $loggers An array of Logger objects
+     */
+    public function addLoggers($loggers)
+    {
+        foreach ($loggers as $logger) {
+            $this->addLogger($logger);
+        }
+    }
 
-  /**
-   * Logs a message.
-   *
-   * @param string $message   Message
-   * @param int    $priority  Message priority
-   */
-  protected function doLog($message, $priority)
-  {
-    foreach ($this->loggers as $logger)
+    /**
+     * Adds a logger.
+     *
+     * @param sfLoggerInterface $logger The Logger object
+     */
+    public function addLogger(sfLoggerInterface $logger)
     {
-      $logger->log($message, $priority);
+        $this->loggers[] = $logger;
+
+        $this->dispatcher->disconnect('application.log', array($logger, 'listenToLogEvent'));
     }
-  }
 
-  /**
-   * Executes the shutdown method.
-   */
-  public function shutdown()
-  {
-    foreach ($this->loggers as $logger)
+    /**
+     * Executes the shutdown method.
+     */
+    public function shutdown()
     {
-      if ($logger instanceof sfLogger)
-      {
-        $logger->shutdown();
-      }
+        foreach ($this->loggers as $logger) {
+            if ($logger instanceof sfLogger) {
+                $logger->shutdown();
+            }
+        }
+
+        $this->loggers = array();
     }
 
-    $this->loggers = array();
-  }
+    /**
+     * Logs a message.
+     *
+     * @param string $message  Message
+     * @param int    $priority Message priority
+     */
+    protected function doLog($message, $priority)
+    {
+        foreach ($this->loggers as $logger) {
+            $logger->log($message, $priority);
+        }
+    }
 }
diff --git a/lib/log/sfConsoleLogger.class.php b/lib/log/sfConsoleLogger.class.php
index dd93cfae3..c7fecd682 100644
--- a/lib/log/sfConsoleLogger.class.php
+++ b/lib/log/sfConsoleLogger.class.php
@@ -11,25 +11,22 @@
 /**
  * sfConsoleLogger logs messages to the console.
  *
- * @package    symfony
- * @subpackage log
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfConsoleLogger extends sfStreamLogger
 {
-  /**
-   * @see sfStreamLogger
-   *
-   * @param  sfEventDispatcher $dispatcher  A sfEventDispatcher instance
-   * @param  array             $options     An array of options.
-   *
-   * @return void
-   */
-  public function initialize(sfEventDispatcher $dispatcher, $options = array())
-  {
-    $options['stream'] = defined('STDOUT') ? STDOUT : fopen('php://stdout', 'w');
+    /**
+     * @see sfStreamLogger
+     *
+     * @param sfEventDispatcher $dispatcher A sfEventDispatcher instance
+     * @param array             $options    an array of options
+     */
+    public function initialize(sfEventDispatcher $dispatcher, $options = array())
+    {
+        $options['stream'] = defined('STDOUT') ? STDOUT : fopen('php://stdout', 'w');
 
-    parent::initialize($dispatcher, $options);
-  }
+        parent::initialize($dispatcher, $options);
+    }
 }
diff --git a/lib/log/sfEventLogger.class.php b/lib/log/sfEventLogger.class.php
index 382f8a2c7..26ddf9f92 100644
--- a/lib/log/sfEventLogger.class.php
+++ b/lib/log/sfEventLogger.class.php
@@ -4,36 +4,33 @@
  * sfEventLogger sends log messages to the event dispatcher to be processed
  * by registered loggers.
  *
- * @package    symfony
- * @subpackage log
  * @author     Jérôme Tamarelle <jtamarelle@groupe-exp.com>
  */
 class sfEventLogger extends sfLogger
 {
-  /**
-   * {@inheritDoc}
-   */
-  public function initialize(sfEventDispatcher $dispatcher, $options = array())
-  {
-    $this->dispatcher = $dispatcher;
-    $this->options = $options;
-
-    if (isset($this->options['level']))
+    /**
+     * {@inheritDoc}
+     */
+    public function initialize(sfEventDispatcher $dispatcher, $options = array())
     {
-      $this->setLogLevel($this->options['level']);
-    }
+        $this->dispatcher = $dispatcher;
+        $this->options = $options;
+
+        if (isset($this->options['level'])) {
+            $this->setLogLevel($this->options['level']);
+        }
 
-    // Use the default "command.log" event if not overriden
-    if (!isset($this->options['event_name'])) {
-      $this->options['event_name'] = 'command.log';
+        // Use the default "command.log" event if not overriden
+        if (!isset($this->options['event_name'])) {
+            $this->options['event_name'] = 'command.log';
+        }
     }
-  }
 
-  /**
-   * {@inheritDoc}
-   */
-  protected function doLog($message, $priority)
-  {
-    $this->dispatcher->notify(new sfEvent($this, $this->options['event_name'], array($message, 'priority' => $priority)));
-  }
+    /**
+     * {@inheritDoc}
+     */
+    protected function doLog($message, $priority)
+    {
+        $this->dispatcher->notify(new sfEvent($this, $this->options['event_name'], array($message, 'priority' => $priority)));
+    }
 }
diff --git a/lib/log/sfFileLogger.class.php b/lib/log/sfFileLogger.class.php
index 35d269a5a..87d98b698 100644
--- a/lib/log/sfFileLogger.class.php
+++ b/lib/log/sfFileLogger.class.php
@@ -11,179 +11,170 @@
 /**
  * sfFileLogger logs messages in a file.
  *
- * @package    symfony
- * @subpackage log
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfFileLogger extends sfLogger
 {
-  protected
-    $type       = 'symfony',
-    $format     = '%time% %type% [%priority%] %message%%EOL%',
-    $timeFormat = '%b %d %H:%M:%S',
-    $fp         = null;
-
-  /**
-   * Initializes this logger.
-   *
-   * Available options:
-   *
-   * - file:        The file path or a php wrapper to log messages
-   *                You can use any support php wrapper. To write logs to the Apache error log, use php://stderr
-   * - format:      The log line format (default to %time% %type% [%priority%] %message%%EOL%)
-   * - time_format: The log time strftime format (default to %b %d %H:%M:%S)
-   * - 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.
-   *
-   * @return void
-   *
-   * @throws sfConfigurationException
-   * @throws sfFileException
-   */
-  public function initialize(sfEventDispatcher $dispatcher, $options = array())
-  {
-    if (!isset($options['file']))
-    {
-      throw new sfConfigurationException('You must provide a "file" parameter for this logger.');
-    }
-
-    if (isset($options['format']))
+    protected $type = 'symfony';
+    protected $format = '%time% %type% [%priority%] %message%%EOL%';
+    protected $timeFormat = '%b %d %H:%M:%S';
+    protected $fp;
+
+    /**
+     * Initializes this logger.
+     *
+     * Available options:
+     *
+     * - file:        The file path or a php wrapper to log messages
+     *                You can use any support php wrapper. To write logs to the Apache error log, use php://stderr
+     * - format:      The log line format (default to %time% %type% [%priority%] %message%%EOL%)
+     * - time_format: The log time strftime format (default to %b %d %H:%M:%S)
+     * - 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
+     *
+     * @throws sfConfigurationException
+     * @throws sfFileException
+     */
+    public function initialize(sfEventDispatcher $dispatcher, $options = array())
     {
-      $this->format = $options['format'];
+        if (!isset($options['file'])) {
+            throw new sfConfigurationException('You must provide a "file" parameter for this logger.');
+        }
+
+        if (isset($options['format'])) {
+            $this->format = $options['format'];
+        }
+
+        if (isset($options['time_format'])) {
+            $this->timeFormat = $options['time_format'];
+        }
+
+        if (isset($options['type'])) {
+            $this->type = $options['type'];
+        }
+
+        $dir = dirname($options['file']);
+        $dirMode = isset($options['dir_mode']) ? $options['dir_mode'] : 0777;
+        if (!is_dir($dir) && !@mkdir($dir, $dirMode, true) && !is_dir($dir)) {
+            throw new \RuntimeException(sprintf('Logger was not able to create a directory "%s"', $dir));
+        }
+
+        $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']));
+        }
+
+        $this->fp = fopen($options['file'], 'a');
+        if (!$fileExists) {
+            chmod($options['file'], isset($options['file_mode']) ? $options['file_mode'] : 0666);
+        }
+
+        parent::initialize($dispatcher, $options);
     }
 
-    if (isset($options['time_format']))
+    /**
+     * Executes the shutdown method.
+     */
+    public function shutdown()
     {
-      $this->timeFormat = $options['time_format'];
+        if (is_resource($this->fp)) {
+            fclose($this->fp);
+        }
     }
 
-    if (isset($options['type']))
+    /**
+     * @param mixed $format
+     *
+     * @return false|string
+     */
+    public static function strftime($format)
     {
-      $this->type = $options['type'];
-    }
+        if (version_compare(PHP_VERSION, '8.1.0') < 0) {
+            return strftime($format);
+        }
 
-    $dir     = dirname($options['file']);
-    $dirMode = isset($options['dir_mode']) ? $options['dir_mode'] : 0777;
-    if (!is_dir($dir) && !@mkdir($dir, $dirMode, true) && !is_dir($dir))
-    {
-      throw new \RuntimeException(sprintf('Logger was not able to create a directory "%s"', $dir));
+        return date(self::_strftimeFormatToDateFormat($format));
     }
 
-    $fileExists = file_exists($options['file']);
-    if (!is_writable($dir) || ($fileExists && !is_writable($options['file'])))
+    /**
+     * Logs a message.
+     *
+     * @param string $message  Message
+     * @param int    $priority Message priority
+     */
+    protected function doLog($message, $priority)
     {
-      throw new sfFileException(sprintf('Unable to open the log file "%s" for writing.', $options['file']));
+        flock($this->fp, LOCK_EX);
+        fwrite($this->fp, strtr($this->format, array(
+            '%type%' => $this->type,
+            '%message%' => $message,
+            '%time%' => self::strftime($this->timeFormat),
+            '%priority%' => $this->getPriority($priority),
+            '%EOL%' => PHP_EOL,
+        )));
+        flock($this->fp, LOCK_UN);
     }
 
-    $this->fp = fopen($options['file'], 'a');
-    if (!$fileExists)
+    /**
+     * Returns the priority string to use in log messages.
+     *
+     * @param string $priority The priority constant
+     *
+     * @return string The priority to use in log messages
+     */
+    protected function getPriority($priority)
     {
-      chmod($options['file'], isset($options['file_mode']) ? $options['file_mode'] : 0666);
+        return sfLogger::getPriorityName($priority);
     }
 
-    parent::initialize($dispatcher, $options);
-  }
-
-  /**
-   * Logs a message.
-   *
-   * @param string $message   Message
-   * @param int $priority  Message priority
-   */
-  protected function doLog($message, $priority)
-  {
-    flock($this->fp, LOCK_EX);
-    fwrite($this->fp, strtr($this->format, array(
-      '%type%'     => $this->type,
-      '%message%'  => $message,
-      '%time%'     => self::strftime($this->timeFormat),
-      '%priority%' => $this->getPriority($priority),
-      '%EOL%'      => PHP_EOL,
-    )));
-    flock($this->fp, LOCK_UN);
-  }
-
-  /**
-   * Returns the priority string to use in log messages.
-   *
-   * @param  string $priority The priority constant
-   *
-   * @return string The priority to use in log messages
-   */
-  protected function getPriority($priority)
-  {
-    return sfLogger::getPriorityName($priority);
-  }
-
-  /**
-   * Executes the shutdown method.
-   */
-  public function shutdown()
-  {
-    if (is_resource($this->fp))
-    {
-      fclose($this->fp);
-    }
-  }
-
-  /**
-   * @param $format
-   * @return false|string
-   */
-  public static function strftime($format)
-  {
-    if (version_compare(PHP_VERSION, '8.1.0') < 0)
+    /**
+     * Try to Convert a strftime to date format.
+     *
+     * Unable to find a perfect implementation, based on those one (Each contains some errors)
+     * https://github.com/Fabrik/fabrik/blob/master/plugins/fabrik_element/date/date.php
+     * https://gist.github.com/mcaskill/02636e5970be1bb22270
+     * https://stackoverflow.com/questions/22665959/using-php-strftime-using-date-format-string
+     *
+     * Limitation:
+     * - Do not apply translation
+     * - Some few strftime format could be broken (low probability to be used on logs)
+     *
+     * Private: because it should not be used outside of this scope
+     *
+     * A better solution is to use : IntlDateFormatter, but it will require to load a new php extension, which could break some setup.
+     *
+     * @param mixed $strftimeFormat
+     *
+     * @return array|string|string[]
+     */
+    private static function _strftimeFormatToDateFormat($strftimeFormat)
     {
-      return strftime($format);
+        // Missing %V %C %g %G
+        $search = array(
+            '%a', '%A', '%d', '%e', '%u',
+            '%w', '%W', '%b', '%h', '%B',
+            '%m', '%y', '%Y', '%D', '%F',
+            '%x', '%n', '%t', '%H', '%k',
+            '%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(
+            'D', 'l', 'd', 'j', 'N',
+            'w', 'W', 'M', 'M', 'F',
+            'm', 'y', 'Y', 'm/d/y', 'Y-m-d',
+            'm/d/y', "\n", "\t", 'H', 'G',
+            '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);
     }
-    return date(self::_strftimeFormatToDateFormat($format));
-  }
-
-  /**
-   * Try to Convert a strftime to date format
-   *
-   * Unable to find a perfect implementation, based on those one (Each contains some errors)
-   * https://github.com/Fabrik/fabrik/blob/master/plugins/fabrik_element/date/date.php
-   * https://gist.github.com/mcaskill/02636e5970be1bb22270
-   * https://stackoverflow.com/questions/22665959/using-php-strftime-using-date-format-string
-   *
-   * Limitation:
-   * - Do not apply translation
-   * - Some few strftime format could be broken (low probability to be used on logs)
-   *
-   * Private: because it should not be used outside of this scope
-   *
-   * A better solution is to use : IntlDateFormatter, but it will require to load a new php extension, which could break some setup.
-   *
-   * @return array|string|string[]
-   */
-  private static function _strftimeFormatToDateFormat($strftimeFormat)
-  {
-    // Missing %V %C %g %G
-    $search = array(
-      '%a', '%A', '%d', '%e', '%u',
-      '%w', '%W', '%b', '%h', '%B',
-      '%m', '%y', '%Y', '%D', '%F',
-      '%x', '%n', '%t', '%H', '%k',
-      '%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(
-      'D', 'l', 'd', 'j', 'N',
-      'w', 'W', 'M', 'M', 'F',
-      'm', 'y', 'Y', 'm/d/y', 'Y-m-d',
-      'm/d/y', "\n", "\t", 'H', 'G',
-      '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 caea21438..72fb1681a 100644
--- a/lib/log/sfLogger.class.php
+++ b/lib/log/sfLogger.class.php
@@ -21,283 +21,276 @@
  * - INFO:    Informational
  * - DEBUG:   Debug-level messages
  *
- * @package    symfony
- * @subpackage log
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfLogger implements sfLoggerInterface
 {
-  const EMERG   = 0; // System is unusable
-  const ALERT   = 1; // Immediate action required
-  const CRIT    = 2; // Critical conditions
-  const ERR     = 3; // Error conditions
-  const WARNING = 4; // Warning conditions
-  const NOTICE  = 5; // Normal but significant
-  const INFO    = 6; // Informational
-  const DEBUG   = 7; // Debug-level messages
-
-  /** @var sfEventDispatcher */
-  protected $dispatcher = null;
-  /** @var array */
-  protected $options = array();
-  /** @var int */
-  protected $level = self::INFO;
-
-  /**
-   * Class constructor.
-   *
-   * @see initialize()
-   *
-   * @param  sfEventDispatcher $dispatcher  A sfEventDispatcher instance
-   * @param  array             $options     An array of options.
-   */
-  public function __construct(sfEventDispatcher $dispatcher, $options = array())
-  {
-    $this->initialize($dispatcher, $options);
-
-    if (!isset($options['auto_shutdown']) || $options['auto_shutdown'])
+    public const EMERG = 0; // System is unusable
+    public const ALERT = 1; // Immediate action required
+    public const CRIT = 2; // Critical conditions
+    public const ERR = 3; // Error conditions
+    public const WARNING = 4; // Warning conditions
+    public const NOTICE = 5; // Normal but significant
+    public const INFO = 6; // Informational
+    public const DEBUG = 7; // Debug-level messages
+
+    /** @var sfEventDispatcher */
+    protected $dispatcher;
+
+    /** @var array */
+    protected $options = array();
+
+    /** @var int */
+    protected $level = self::INFO;
+
+    /**
+     * Class constructor.
+     *
+     * @see initialize()
+     *
+     * @param sfEventDispatcher $dispatcher A sfEventDispatcher instance
+     * @param array             $options    an array of options
+     */
+    public function __construct(sfEventDispatcher $dispatcher, $options = array())
+    {
+        $this->initialize($dispatcher, $options);
+
+        if (!isset($options['auto_shutdown']) || $options['auto_shutdown']) {
+            register_shutdown_function(array($this, 'shutdown'));
+        }
+    }
+
+    /**
+     * Initializes this sfLogger instance.
+     *
+     * Available options:
+     *
+     * - level: The log level.
+     *
+     * @param sfEventDispatcher $dispatcher A sfEventDispatcher instance
+     * @param array             $options    an array of options
+     *
+     * @throws <b>sfInitializationException</b> If an error occurs while initializing this sfLogger
+     */
+    public function initialize(sfEventDispatcher $dispatcher, $options = array())
+    {
+        $this->dispatcher = $dispatcher;
+        $this->options = $options;
+
+        if (isset($this->options['level'])) {
+            $this->setLogLevel($this->options['level']);
+        }
+
+        $dispatcher->connect('application.log', array($this, 'listenToLogEvent'));
+    }
+
+    /**
+     * Returns the options for the logger instance.
+     *
+     * @return array
+     */
+    public function getOptions()
     {
-      register_shutdown_function(array($this, 'shutdown'));
+        return $this->options;
     }
-  }
-
-  /**
-   * Initializes this sfLogger instance.
-   *
-   * Available options:
-   *
-   * - level: The log level.
-   *
-   * @param  sfEventDispatcher $dispatcher  A sfEventDispatcher instance
-   * @param  array             $options     An array of options.
-   *
-   * @return void
-   *
-   * @throws <b>sfInitializationException</b> If an error occurs while initializing this sfLogger.
-   */
-  public function initialize(sfEventDispatcher $dispatcher, $options = array())
-  {
-    $this->dispatcher = $dispatcher;
-    $this->options = $options;
-
-    if (isset($this->options['level']))
+
+    /**
+     * Returns the options for the logger instance.
+     *
+     * @param string $name
+     * @param mixed  $value
+     */
+    public function setOption($name, $value)
     {
-      $this->setLogLevel($this->options['level']);
+        $this->options[$name] = $value;
     }
 
-    $dispatcher->connect('application.log', array($this, 'listenToLogEvent'));
-  }
-
-  /**
-   * Returns the options for the logger instance.
-   *
-   * @return array
-   */
-  public function getOptions()
-  {
-    return $this->options;
-  }
-
-  /**
-   * Returns the options for the logger instance.
-   *
-   * @param string $name
-   * @param mixed $value
-   */
-  public function setOption($name, $value)
-  {
-    $this->options[$name] = $value;
-  }
-
-  /**
-   * Retrieves the log level for the current logger instance.
-   *
-   * @return int Log level
-   */
-  public function getLogLevel()
-  {
-    return $this->level;
-  }
-
-  /**
-   * Sets a log level for the current logger instance.
-   *
-   * @param int $level Log level
-   */
-  public function setLogLevel($level)
-  {
-    if (!is_int($level))
+    /**
+     * Retrieves the log level for the current logger instance.
+     *
+     * @return int Log level
+     */
+    public function getLogLevel()
     {
-      $level = constant('sfLogger::'.strtoupper($level));
+        return $this->level;
     }
 
-    $this->level = $level;
-  }
-
-  /**
-   * Logs a message.
-   *
-   * @param string $message   Message
-   * @param int    $priority  Message priority
-   * @return void|bool
-   */
-  public function log($message, $priority = self::INFO)
-  {
-    if ($this->getLogLevel() < $priority)
+    /**
+     * Sets a log level for the current logger instance.
+     *
+     * @param int $level Log level
+     */
+    public function setLogLevel($level)
     {
-      return false;
+        if (!is_int($level)) {
+            $level = constant('sfLogger::'.strtoupper($level));
+        }
+
+        $this->level = $level;
     }
 
-    $this->doLog($message, $priority);
-  }
-
-  /**
-   * Logs a message.
-   *
-   * @param string $message   Message
-   * @param int    $priority  Message priority
-   */
-  abstract protected function doLog($message, $priority);
-
-  /**
-   * Logs an emerg message.
-   *
-   * @param string $message Message
-   */
-  public function emerg($message)
-  {
-    $this->log($message, self::EMERG);
-  }
-
-  /**
-   * Logs an alert message.
-   *
-   * @param string $message Message
-   */
-  public function alert($message)
-  {
-    $this->log($message, self::ALERT);
-  }
-
-  /**
-   * Logs a critical message.
-   *
-   * @param string $message Message
-   */
-  public function crit($message)
-  {
-    $this->log($message, self::CRIT);
-  }
-
-  /**
-   * Logs an error message.
-   *
-   * @param string $message Message
-   */
-  public function err($message)
-  {
-    $this->log($message, self::ERR);
-  }
-
-  /**
-   * Logs a warning message.
-   *
-   * @param string $message Message
-   */
-  public function warning($message)
-  {
-    $this->log($message, self::WARNING);
-  }
-
-  /**
-   * Logs a notice message.
-   *
-   * @param string $message Message
-   */
-  public function notice($message)
-  {
-    $this->log($message, self::NOTICE);
-  }
-
-  /**
-   * Logs an info message.
-   *
-   * @param string $message Message
-   */
-  public function info($message)
-  {
-    $this->log($message, self::INFO);
-  }
-
-  /**
-   * Logs a debug message.
-   *
-   * @param string $message Message
-   */
-  public function debug($message)
-  {
-    $this->log($message, self::DEBUG);
-  }
-
-  /**
-   * Listens to application.log events.
-   *
-   * @param sfEvent $event An sfEvent instance
-   */
-  public function listenToLogEvent(sfEvent $event)
-  {
-    $priority = isset($event['priority']) ? $event['priority'] : self::INFO;
-
-    $subject  = $event->getSubject();
-    $subject  = is_object($subject) ? get_class($subject) : (is_string($subject) ? $subject : 'main');
-    foreach ($event->getParameters() as $key => $message)
+    /**
+     * Logs a message.
+     *
+     * @param string $message  Message
+     * @param int    $priority Message priority
+     *
+     * @return bool|void
+     */
+    public function log($message, $priority = self::INFO)
     {
-      if ('priority' === $key)
-      {
-        continue;
-      }
+        if ($this->getLogLevel() < $priority) {
+            return false;
+        }
 
-      $this->log(sprintf('{%s} %s', $subject, $message), $priority);
+        $this->doLog($message, $priority);
     }
-  }
-
-  /**
-   * Executes the shutdown procedure.
-   *
-   * Cleans up the current logger instance.
-   */
-  public function shutdown()
-  {
-  }
-
-  /**
-   * Returns the priority name given a priority class constant
-   *
-   * @param  integer $priority A priority class constant
-   *
-   * @return string  The priority name
-   *
-   * @throws sfException if the priority level does not exist
-   */
-  static public function getPriorityName($priority)
-  {
-    static $levels  = array(
-      self::EMERG   => 'emerg',
-      self::ALERT   => 'alert',
-      self::CRIT    => 'crit',
-      self::ERR     => 'err',
-      self::WARNING => 'warning',
-      self::NOTICE  => 'notice',
-      self::INFO    => 'info',
-      self::DEBUG   => 'debug',
-    );
-
-    if (!isset($levels[$priority]))
+
+    /**
+     * Logs an emerg message.
+     *
+     * @param string $message Message
+     */
+    public function emerg($message)
+    {
+        $this->log($message, self::EMERG);
+    }
+
+    /**
+     * Logs an alert message.
+     *
+     * @param string $message Message
+     */
+    public function alert($message)
+    {
+        $this->log($message, self::ALERT);
+    }
+
+    /**
+     * Logs a critical message.
+     *
+     * @param string $message Message
+     */
+    public function crit($message)
+    {
+        $this->log($message, self::CRIT);
+    }
+
+    /**
+     * Logs an error message.
+     *
+     * @param string $message Message
+     */
+    public function err($message)
     {
-      throw new sfException(sprintf('The priority level "%s" does not exist.', $priority));
+        $this->log($message, self::ERR);
+    }
+
+    /**
+     * Logs a warning message.
+     *
+     * @param string $message Message
+     */
+    public function warning($message)
+    {
+        $this->log($message, self::WARNING);
+    }
+
+    /**
+     * Logs a notice message.
+     *
+     * @param string $message Message
+     */
+    public function notice($message)
+    {
+        $this->log($message, self::NOTICE);
+    }
+
+    /**
+     * Logs an info message.
+     *
+     * @param string $message Message
+     */
+    public function info($message)
+    {
+        $this->log($message, self::INFO);
+    }
+
+    /**
+     * Logs a debug message.
+     *
+     * @param string $message Message
+     */
+    public function debug($message)
+    {
+        $this->log($message, self::DEBUG);
+    }
+
+    /**
+     * Listens to application.log events.
+     *
+     * @param sfEvent $event An sfEvent instance
+     */
+    public function listenToLogEvent(sfEvent $event)
+    {
+        $priority = isset($event['priority']) ? $event['priority'] : self::INFO;
+
+        $subject = $event->getSubject();
+        $subject = is_object($subject) ? get_class($subject) : (is_string($subject) ? $subject : 'main');
+        foreach ($event->getParameters() as $key => $message) {
+            if ('priority' === $key) {
+                continue;
+            }
+
+            $this->log(sprintf('{%s} %s', $subject, $message), $priority);
+        }
+    }
+
+    /**
+     * Executes the shutdown procedure.
+     *
+     * Cleans up the current logger instance.
+     */
+    public function shutdown()
+    {
+    }
+
+    /**
+     * Returns the priority name given a priority class constant.
+     *
+     * @param int $priority A priority class constant
+     *
+     * @return string The priority name
+     *
+     * @throws sfException if the priority level does not exist
+     */
+    public static function getPriorityName($priority)
+    {
+        static $levels = array(
+            self::EMERG => 'emerg',
+            self::ALERT => 'alert',
+            self::CRIT => 'crit',
+            self::ERR => 'err',
+            self::WARNING => 'warning',
+            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));
+        }
+
+        return $levels[$priority];
     }
 
-    return $levels[$priority];
-  }
+    /**
+     * Logs a message.
+     *
+     * @param string $message  Message
+     * @param int    $priority Message priority
+     */
+    abstract protected function doLog($message, $priority);
 }
diff --git a/lib/log/sfLoggerInterface.class.php b/lib/log/sfLoggerInterface.class.php
index 467a410fe..b59c3eeac 100644
--- a/lib/log/sfLoggerInterface.class.php
+++ b/lib/log/sfLoggerInterface.class.php
@@ -11,18 +11,17 @@
 /**
  * sfLoggerInterface is the interface all symfony loggers must implement.
  *
- * @package    symfony
- * @subpackage log
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 interface sfLoggerInterface
 {
-  /**
-   * Logs a message.
-   *
-   * @param string $message   Message
-   * @param int    $priority  Message priority
-   */
-  public function log($message, $priority = null);
+    /**
+     * Logs a message.
+     *
+     * @param string $message  Message
+     * @param int    $priority Message priority
+     */
+    public function log($message, $priority = null);
 }
diff --git a/lib/log/sfLoggerWrapper.class.php b/lib/log/sfLoggerWrapper.class.php
index a6230439f..509e85126 100644
--- a/lib/log/sfLoggerWrapper.class.php
+++ b/lib/log/sfLoggerWrapper.class.php
@@ -11,35 +11,33 @@
 /**
  * sfLoggerWrapper wraps a class that implements sfLoggerInterface into a real sfLogger object.
  *
- * @package    symfony
- * @subpackage log
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfLoggerWrapper extends sfLogger
 {
-  /** @var sfLoggerInterface */
-  protected
-    $logger = null;
+    /** @var sfLoggerInterface */
+    protected $logger;
 
-  /**
-   * Creates a new logger wrapper
-   *
-   * @param sfLoggerInterface $logger The wrapped logger
-   */
-  public function __construct(sfLoggerInterface $logger)
-  {
-    $this->logger = $logger;
-  }
+    /**
+     * Creates a new logger wrapper.
+     *
+     * @param sfLoggerInterface $logger The wrapped logger
+     */
+    public function __construct(sfLoggerInterface $logger)
+    {
+        $this->logger = $logger;
+    }
 
-  /**
-   * Logs a message.
-   *
-   * @param string $message   Message
-   * @param int    $priority  Message priority
-   */
-  protected function doLog($message, $priority)
-  {
-    $this->logger->log($message, $priority);
-  }
+    /**
+     * Logs a message.
+     *
+     * @param string $message  Message
+     * @param int    $priority Message priority
+     */
+    protected function doLog($message, $priority)
+    {
+        $this->logger->log($message, $priority);
+    }
 }
diff --git a/lib/log/sfNoLogger.class.php b/lib/log/sfNoLogger.class.php
index 3f512115c..e307cdf9d 100644
--- a/lib/log/sfNoLogger.class.php
+++ b/lib/log/sfNoLogger.class.php
@@ -11,32 +11,29 @@
 /**
  * sfNoLogger is a noop logger.
  *
- * @package    symfony
- * @subpackage log
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfNoLogger extends sfLogger
 {
-  /**
-   * Initializes this logger.
-   *
-   * @param  sfEventDispatcher $dispatcher  A sfEventDispatcher instance
-   * @param  array             $options     An array of options.
-   *
-   * @return void
-   */
-  public function initialize(sfEventDispatcher $dispatcher, $options = array())
-  {
-  }
+    /**
+     * Initializes this logger.
+     *
+     * @param sfEventDispatcher $dispatcher A sfEventDispatcher instance
+     * @param array             $options    an array of options
+     */
+    public function initialize(sfEventDispatcher $dispatcher, $options = array())
+    {
+    }
 
-  /**
-   * Logs a message.
-   *
-   * @param string $message   Message
-   * @param int    $priority  Message priority
-   */
-  protected function doLog($message, $priority)
-  {
-  }
+    /**
+     * Logs a message.
+     *
+     * @param string $message  Message
+     * @param int    $priority Message priority
+     */
+    protected function doLog($message, $priority)
+    {
+    }
 }
diff --git a/lib/log/sfPsrLoggerAdapter.class.php b/lib/log/sfPsrLoggerAdapter.class.php
index d6a513f5f..286965d12 100644
--- a/lib/log/sfPsrLoggerAdapter.class.php
+++ b/lib/log/sfPsrLoggerAdapter.class.php
@@ -12,150 +12,148 @@
  *
  * @see https://github.com/php-fig/log
  *
- * @package    symfony
- * @subpackage service
  * @author     Martin Poirier Theoret <mpoiriert@gmail.com>
  */
 class sfPsrLoggerAdapter extends sfLogger
 {
-  /**
-   * Buffer to keep all the log before the psr logger is registered
-   *
-   * @var array
-   */
-  private $buffer = array();
-
-  /**
-   * The logger that will the log will be forward to
-   *
-   * @var \Psr\Log\LoggerInterface
-   */
-  private $logger;
-
-  /**
-   * The service id that will be use as the psr logger
-   *
-   * @var string
-   */
-  private $loggerServiceId = 'logger.psr';
-
-  /**
-   * Initializes this logger.
-   *
-   * Available options:
-   *
-   * - logger_service_id: The service id to use as the logger. Default: logger.psr
-   * - auto_connect: If we must connect automatically to the context.load_factories to set the logger. Default: true
-   *
-   * @param sfEventDispatcher $dispatcher
-   * @param array $options
-   *
-   * @return void
-   */
-  public function initialize(sfEventDispatcher $dispatcher, $options = array())
-  {
-    if (isset($options['logger_service_id']))
-    {
-      $this->loggerServiceId = $options['logger_service_id'];
-    }
+    /**
+     * Buffer to keep all the log before the psr logger is registered.
+     *
+     * @var array
+     */
+    private $buffer = array();
+
+    /**
+     * The logger that will the log will be forward to.
+     *
+     * @var \Psr\Log\LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * The service id that will be use as the psr logger.
+     *
+     * @var string
+     */
+    private $loggerServiceId = 'logger.psr';
 
-    if (!isset($options['auto_connect']) || $options['auto_connect'])
+    /**
+     * Initializes this logger.
+     *
+     * Available options:
+     *
+     * - logger_service_id: The service id to use as the logger. Default: logger.psr
+     * - auto_connect: If we must connect automatically to the context.load_factories to set the logger. Default: true
+     *
+     * @param array $options
+     */
+    public function initialize(sfEventDispatcher $dispatcher, $options = array())
     {
-      $dispatcher->connect('context.load_factories', array($this, 'listenContextLoadFactoriesEvent'));
+        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'));
+        }
+
+        parent::initialize($dispatcher, $options);
     }
 
-    parent::initialize($dispatcher, $options);
-  }
-
-  /**
-   * Listen the context load factories to get the configure service after the service container is available
-   *
-   * @param sfEvent $event
-   *
-   * @return void
-   */
-  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'));
-  }
-
-  /**
-   * Set the logger
-   *
-   * @param \Psr\Log\LoggerInterface $logger
-   */
-  public function setLogger(\Psr\Log\LoggerInterface $logger)
-  {
-    $this->logger = $logger;
-    $this->flushBuffer();
-  }
-
-  /**
-   * Flush the current buffer to the register logger
-   *
-   * @return void
-   */
-  public function flushBuffer()
-  {
-    if (!$this->logger)
+    /**
+     * Listen the context load factories to get the configure service after the service container is available.
+     */
+    public function listenContextLoadFactoriesEvent(sfEvent $event)
     {
-      $this->buffer = array();
-      return;
+        $context = $event->getSubject();
+        // @var $context sfContext
+        $this->setLogger($context->getService($this->loggerServiceId));
+        $this->dispatcher->disconnect('context.load_factories', array($this, 'listenContextLoadFactoriesEvent'));
     }
 
-    foreach ($this->buffer as $log)
+    /**
+     * Set the logger.
+     *
+     * @param \Psr\Log\LoggerInterface $logger
+     */
+    public function setLogger(Psr\Log\LoggerInterface $logger)
     {
-      $this->log($log['message'], $log['priority']);
+        $this->logger = $logger;
+        $this->flushBuffer();
     }
 
-    $this->buffer = array();
-  }
-
-  /**
-   * Logs a message.
-   *
-   * @param string $message Message
-   * @param int    $priority Message priority
-   *
-   * @return void
-   */
-  public function doLog($message, $priority)
-  {
-    if (!$this->logger)
+    /**
+     * Flush the current buffer to the register logger.
+     */
+    public function flushBuffer()
     {
-      $this->buffer[] = compact('message', 'priority');
-      return;
+        if (!$this->logger) {
+            $this->buffer = array();
+
+            return;
+        }
+
+        foreach ($this->buffer as $log) {
+            $this->log($log['message'], $log['priority']);
+        }
+
+        $this->buffer = array();
     }
 
-    switch ($priority)
+    /**
+     * Logs a message.
+     *
+     * @param string $message  Message
+     * @param int    $priority Message priority
+     */
+    public function doLog($message, $priority)
     {
-      case sfLogger::EMERG:
-        $this->logger->emergency($message);
-        break;
-      case sfLogger::ALERT:
-        $this->logger->alert($message);
-        break;
-      case sfLogger::CRIT:
-        $this->logger->critical($message);
-        break;
-      case sfLogger::ERR:
-        $this->logger->error($message);
-        break;
-      case sfLogger::WARNING:
-        $this->logger->warning($message);
-        break;
-      case sfLogger::NOTICE:
-        $this->logger->notice($message);
-        break;
-      case sfLogger::INFO:
-        $this->logger->info($message);
-        break;
-      case sfLogger::DEBUG:
-        $this->logger->debug($message);
-        break;
+        if (!$this->logger) {
+            $this->buffer[] = compact('message', 'priority');
+
+            return;
+        }
+
+        switch ($priority) {
+            case sfLogger::EMERG:
+                $this->logger->emergency($message);
+
+                break;
+
+            case sfLogger::ALERT:
+                $this->logger->alert($message);
+
+                break;
+
+            case sfLogger::CRIT:
+                $this->logger->critical($message);
+
+                break;
+
+            case sfLogger::ERR:
+                $this->logger->error($message);
+
+                break;
+
+            case sfLogger::WARNING:
+                $this->logger->warning($message);
+
+                break;
+
+            case sfLogger::NOTICE:
+                $this->logger->notice($message);
+
+                break;
+
+            case sfLogger::INFO:
+                $this->logger->info($message);
+
+                break;
+
+            case sfLogger::DEBUG:
+                $this->logger->debug($message);
+
+                break;
+        }
     }
-  }
 }
diff --git a/lib/log/sfStreamLogger.class.php b/lib/log/sfStreamLogger.class.php
index 7320dddb3..570609a8e 100644
--- a/lib/log/sfStreamLogger.class.php
+++ b/lib/log/sfStreamLogger.class.php
@@ -11,69 +11,61 @@
 /**
  * sfStreamLogger logs messages to a PHP stream.
  *
- * @package    symfony
- * @subpackage log
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfStreamLogger extends sfLogger
 {
-  /** @var resource */
-  protected
-    $stream = null;
+    /** @var resource */
+    protected $stream;
 
-  /**
-   * Initializes this logger.
-   *
-   * Available options:
-   *
-   * - stream: A PHP stream
-   *
-   * @param  sfEventDispatcher $dispatcher A sfEventDispatcher instance
-   * @param  array             $options    An array of options.
-   *
-   * @return void
-   *
-   * @throws sfConfigurationException
-   */
-  public function initialize(sfEventDispatcher $dispatcher, $options = array())
-  {
-    if (!isset($options['stream']))
-    {
-      throw new sfConfigurationException('You must provide a "stream" option for this logger.');
-    }
-    else
+    /**
+     * Initializes this logger.
+     *
+     * Available options:
+     *
+     * - stream: A PHP stream
+     *
+     * @param sfEventDispatcher $dispatcher A sfEventDispatcher instance
+     * @param array             $options    an array of options
+     *
+     * @throws sfConfigurationException
+     */
+    public function initialize(sfEventDispatcher $dispatcher, $options = array())
     {
-      if (is_resource($options['stream']) && 'stream' != get_resource_type($options['stream']))
-      {
-        throw new sfConfigurationException('The provided "stream" option is not a stream.');
-      }
-    }
+        if (!isset($options['stream'])) {
+            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.');
+        }
 
-    $this->stream = $options['stream'];
+        $this->stream = $options['stream'];
 
-    parent::initialize($dispatcher, $options);
-  }
+        parent::initialize($dispatcher, $options);
+    }
 
-  /**
-   * Sets the PHP stream to use for this logger.
-   *
-   * @param resource $stream A php stream
-   */
-  public function setStream($stream)
-  {
-    $this->stream = $stream;
-  }
+    /**
+     * Sets the PHP stream to use for this logger.
+     *
+     * @param resource $stream A php stream
+     */
+    public function setStream($stream)
+    {
+        $this->stream = $stream;
+    }
 
-  /**
-   * Logs a message.
-   *
-   * @param string $message   Message
-   * @param int    $priority  Message priority
-   */
-  protected function doLog($message, $priority)
-  {
-    fwrite($this->stream, $message.PHP_EOL);
-    flush();
-  }
+    /**
+     * Logs a message.
+     *
+     * @param string $message  Message
+     * @param int    $priority Message priority
+     */
+    protected function doLog($message, $priority)
+    {
+        fwrite($this->stream, $message.PHP_EOL);
+        flush();
+    }
 }
diff --git a/lib/log/sfVarLogger.class.php b/lib/log/sfVarLogger.class.php
index 9403748d1..ba0c4b34d 100644
--- a/lib/log/sfVarLogger.class.php
+++ b/lib/log/sfVarLogger.class.php
@@ -11,180 +11,165 @@
 /**
  * sfVarLogger logs messages within its instance for later use.
  *
- * @package    symfony
- * @subpackage log
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfVarLogger extends sfLogger
 {
-  protected
-    $logs          = array(),
-    $xdebugLogging = false;
-
-  /**
-   * Initializes this logger.
-   *
-   * Available options:
-   *
-   * - 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.
-   *
-   * @return void
-   */
-  public function initialize(sfEventDispatcher $dispatcher, $options = array())
-  {
-    $this->xdebugLogging = isset($options['xdebug_logging']) ? $options['xdebug_logging'] : false;
-
-    // disable xdebug when an HTTP debug session exists (crashes Apache, see #2438)
-    if (isset($_GET['XDEBUG_SESSION_START']) || isset($_COOKIE['XDEBUG_SESSION']))
+    protected $logs = array();
+    protected $xdebugLogging = false;
+
+    /**
+     * Initializes this logger.
+     *
+     * Available options:
+     *
+     * - 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
+     */
+    public function initialize(sfEventDispatcher $dispatcher, $options = array())
     {
-      $this->xdebugLogging = false;
+        $this->xdebugLogging = isset($options['xdebug_logging']) ? $options['xdebug_logging'] : false;
+
+        // disable xdebug when an HTTP debug session exists (crashes Apache, see #2438)
+        if (isset($_GET['XDEBUG_SESSION_START']) || isset($_COOKIE['XDEBUG_SESSION'])) {
+            $this->xdebugLogging = false;
+        }
+
+        parent::initialize($dispatcher, $options);
     }
 
-    parent::initialize($dispatcher, $options);
-  }
-
-  /**
-   * Gets the logs.
-   *
-   * Each log entry has the following attributes:
-   *
-   *  * priority
-   *  * time
-   *  * message
-   *  * type
-   *  * debugStack
-   *
-   * @return array An array of logs
-   */
-  public function getLogs()
-  {
-    return $this->logs;
-  }
-
-  /**
-   * Returns all the types in the logs.
-   *
-   * @return array An array of types
-   */
-  public function getTypes()
-  {
-    $types = array();
-    foreach ($this->logs as $log)
+    /**
+     * Gets the logs.
+     *
+     * Each log entry has the following attributes:
+     *
+     *  * priority
+     *  * time
+     *  * message
+     *  * type
+     *  * debugStack
+     *
+     * @return array An array of logs
+     */
+    public function getLogs()
     {
-      if (!in_array($log['type'], $types))
-      {
-        $types[] = $log['type'];
-      }
+        return $this->logs;
     }
 
-    sort($types);
+    /**
+     * Returns all the types in the logs.
+     *
+     * @return array An array of types
+     */
+    public function getTypes()
+    {
+        $types = array();
+        foreach ($this->logs as $log) {
+            if (!in_array($log['type'], $types)) {
+                $types[] = $log['type'];
+            }
+        }
 
-    return $types;
-  }
+        sort($types);
 
-  /**
-   * Returns all the priorities in the logs.
-   *
-   * @return array An array of priorities
-   */
-  public function getPriorities()
-  {
-    $priorities = array();
-    foreach ($this->logs as $log)
-    {
-      if (!in_array($log['priority'], $priorities))
-      {
-        $priorities[] = $log['priority'];
-      }
+        return $types;
     }
 
-    sort($priorities);
+    /**
+     * Returns all the priorities in the logs.
+     *
+     * @return array An array of priorities
+     */
+    public function getPriorities()
+    {
+        $priorities = array();
+        foreach ($this->logs as $log) {
+            if (!in_array($log['priority'], $priorities)) {
+                $priorities[] = $log['priority'];
+            }
+        }
 
-    return $priorities;
-  }
+        sort($priorities);
 
-  /**
-   * Returns the highest priority in the logs.
-   *
-   * @return integer The highest priority
-   */
-  public function getHighestPriority()
-  {
-    $priority = 1000;
-    foreach ($this->logs as $log)
-    {
-      if ($log['priority'] < $priority)
-      {
-        $priority = $log['priority'];
-      }
+        return $priorities;
     }
 
-    return $priority;
-  }
-
-  /**
-   * Logs a message.
-   *
-   * @param string $message   Message
-   * @param int    $priority  Message priority
-   */
-  protected function doLog($message, $priority)
-  {
-    // get log type in {}
-    $type = 'sfOther';
-    if (preg_match('/^\s*{([^}]+)}\s*(.+?)$/s', $message, $matches))
+    /**
+     * Returns the highest priority in the logs.
+     *
+     * @return int The highest priority
+     */
+    public function getHighestPriority()
     {
-      $type    = $matches[1];
-      $message = $matches[2];
+        $priority = 1000;
+        foreach ($this->logs as $log) {
+            if ($log['priority'] < $priority) {
+                $priority = $log['priority'];
+            }
+        }
+
+        return $priority;
     }
 
-    $this->logs[] = array(
-      'priority'        => $priority,
-      'priority_name'   => $this->getPriorityName($priority),
-      'time'            => time(),
-      'message'         => $message,
-      'type'            => $type,
-      'debug_backtrace' => $this->getDebugBacktrace(),
-    );
-  }
-
-  /**
-   * Returns the debug stack.
-   *
-   * @return array
-   *
-   * @see debug_backtrace()
-   */
-  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'))
+    /**
+     * Logs a message.
+     *
+     * @param string $message  Message
+     * @param int    $priority Message priority
+     */
+    protected function doLog($message, $priority)
     {
-      return array();
+        // get log type in {}
+        $type = 'sfOther';
+        if (preg_match('/^\s*{([^}]+)}\s*(.+?)$/s', $message, $matches)) {
+            $type = $matches[1];
+            $message = $matches[2];
+        }
+
+        $this->logs[] = array(
+            'priority' => $priority,
+            'priority_name' => $this->getPriorityName($priority),
+            'time' => time(),
+            'message' => $message,
+            'type' => $type,
+            'debug_backtrace' => $this->getDebugBacktrace(),
+        );
     }
 
-    $traces = debug_backtrace();
-
-    // remove sfLogger and sfEventDispatcher from the top of the trace
-    foreach ($traces as $i => $trace)
+    /**
+     * Returns the debug stack.
+     *
+     * @return array
+     *
+     * @see debug_backtrace()
+     */
+    protected function getDebugBacktrace()
     {
-      $class = isset($trace['class']) ? $trace['class'] : substr($file = basename($trace['file']), 0, strpos($file, '.'));
-
-      if (
-        !class_exists($class)
-        ||
-        (!in_array($class, array('sfLogger', 'sfEventDispatcher')) && !is_subclass_of($class, 'sfLogger') && !is_subclass_of($class, 'sfEventDispatcher'))
-      )
-      {
-        $traces = array_slice($traces, $i);
-        break;
-      }
-    }
+        // if we have xdebug and dev has not disabled the feature, add some stack information
+        if (!$this->xdebugLogging || !function_exists('debug_backtrace')) {
+            return array();
+        }
+
+        $traces = debug_backtrace();
+
+        // remove sfLogger and sfEventDispatcher from the top of the trace
+        foreach ($traces as $i => $trace) {
+            $class = isset($trace['class']) ? $trace['class'] : substr($file = basename($trace['file']), 0, strpos($file, '.'));
 
-    return $traces;
-  }
+            if (
+                !class_exists($class)
+                || (!in_array($class, array('sfLogger', 'sfEventDispatcher')) && !is_subclass_of($class, 'sfLogger') && !is_subclass_of($class, 'sfEventDispatcher'))
+            ) {
+                $traces = array_slice($traces, $i);
+
+                break;
+            }
+        }
+
+        return $traces;
+    }
 }
diff --git a/lib/log/sfWebDebugLogger.class.php b/lib/log/sfWebDebugLogger.class.php
index 4e6127a8f..94088f470 100644
--- a/lib/log/sfWebDebugLogger.class.php
+++ b/lib/log/sfWebDebugLogger.class.php
@@ -11,171 +11,163 @@
 /**
  * sfWebDebugLogger logs messages into the web debug toolbar.
  *
- * @package    symfony
- * @subpackage log
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfWebDebugLogger extends sfVarLogger
 {
-  /** @var sfContext */
-  protected $context       = null;
-  /** @var string */
-  protected $webDebugClass = null;
-  /** @var sfWebDebug */
-  protected $webDebug      = null;
-
-  /**
-   * Initializes this logger.
-   *
-   * Available options:
-   *
-   *  * web_debug_class: The web debug class (sfWebDebug by default)
-   *
-   * @param  sfEventDispatcher $dispatcher  A sfEventDispatcher instance
-   * @param  array             $options     An array of options.
-   *
-   * @return void
-   *
-   * @see sfVarLogger
-   */
-  public function initialize(sfEventDispatcher $dispatcher, $options = array())
-  {
-    $this->context = sfContext::getInstance();
-
-    $this->webDebugClass = isset($options['web_debug_class']) ? $options['web_debug_class'] : 'sfWebDebug';
-
-    if (sfConfig::get('sf_web_debug'))
+    /** @var sfContext */
+    protected $context;
+
+    /** @var string */
+    protected $webDebugClass;
+
+    /** @var sfWebDebug */
+    protected $webDebug;
+
+    /**
+     * Initializes this logger.
+     *
+     * Available options:
+     *
+     *  * web_debug_class: The web debug class (sfWebDebug by default)
+     *
+     * @param sfEventDispatcher $dispatcher A sfEventDispatcher instance
+     * @param array             $options    an array of options
+     *
+     * @see sfVarLogger
+     */
+    public function initialize(sfEventDispatcher $dispatcher, $options = array())
     {
-      $dispatcher->connect('context.load_factories', array($this, 'listenForLoadFactories'));
-      $dispatcher->connect('response.filter_content', array($this, 'filterResponseContent'));
-    }
+        $this->context = sfContext::getInstance();
 
-    $this->registerErrorHandler();
-
-    parent::initialize($dispatcher, $options);
-  }
-
-  /**
-   * Registers logger with PHP error handler.
-   */
-  protected function registerErrorHandler()
-  {
-    set_error_handler(array($this,'handlePhpError'));
-  }
-
-  /**
-   * PHP error handler send PHP errors to log.
-   *
-   * PHP user space error handler can not handle E_ERROR, E_PARSE,
-   * E_CORE_ERROR, E_CORE_WARNING, E_COMPILE_ERROR, E_COMPILE_WARNING,
-   * and most of E_STRICT.
-   *
-   * @param string $errno      The level of the error raised, as an integer.
-   * @param string $errstr     The error message, as a string.
-   * @param string $errfile    The filename that the error was raised in, as a string.
-   * @param string $errline    The line number the error was raised at, as an integer.
-   * @param array  $errcontext An array that points to the active symbol table at the point the error occurred.
-   *
-   * @return bool
-   */
-  public function handlePhpError($errno, $errstr, $errfile, $errline, $errcontext = array())
-  {
-    if (($errno & error_reporting()) == 0)
-    {
-      return false;
+        $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'));
+        }
+
+        $this->registerErrorHandler();
+
+        parent::initialize($dispatcher, $options);
     }
 
-    $message = sprintf(' %%s at %s on line %s (%s)', $errfile, $errline, str_replace('%', '%%', $errstr));
-    switch ($errno)
+    /**
+     * PHP error handler send PHP errors to log.
+     *
+     * PHP user space error handler can not handle E_ERROR, E_PARSE,
+     * E_CORE_ERROR, E_CORE_WARNING, E_COMPILE_ERROR, E_COMPILE_WARNING,
+     * and most of E_STRICT.
+     *
+     * @param string $errno      the level of the error raised, as an integer
+     * @param string $errstr     the error message, as a string
+     * @param string $errfile    the filename that the error was raised in, as a string
+     * @param string $errline    the line number the error was raised at, as an integer
+     * @param array  $errcontext an array that points to the active symbol table at the point the error occurred
+     *
+     * @return bool
+     */
+    public function handlePhpError($errno, $errstr, $errfile, $errline, $errcontext = array())
     {
-      case E_STRICT:
-        $this->dispatcher->notify(new sfEvent($this, 'application.log', array('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'))));
-        break;
-      case E_WARNING:
-        $this->dispatcher->notify(new sfEvent($this, 'application.log', array('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'))));
-        break;
+        if (($errno & error_reporting()) == 0) {
+            return false;
+        }
+
+        $message = sprintf(' %%s at %s on line %s (%s)', $errfile, $errline, str_replace('%', '%%', $errstr));
+
+        switch ($errno) {
+            case E_STRICT:
+                $this->dispatcher->notify(new sfEvent($this, 'application.log', array('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'))));
+
+                break;
+
+            case E_WARNING:
+                $this->dispatcher->notify(new sfEvent($this, 'application.log', array('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'))));
+
+                break;
+        }
+
+        return false; // do not prevent default error handling
     }
 
-    return false; // do not prevent default error handling
-  }
-
-  /**
-   * Listens for the context.load_factories event.
-   *
-   * @param sfEvent $event
-   */
-  public function listenForLoadFactories(sfEvent $event)
-  {
-    $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(
-      '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
-   *
-   * @return string  The filtered response content
-   */
-  public function filterResponseContent(sfEvent $event, $content)
-  {
-    if (!sfConfig::get('sf_web_debug'))
+    /**
+     * Listens for the context.load_factories event.
+     */
+    public function listenForLoadFactories(sfEvent $event)
     {
-      return $content;
+        $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(
+            'image_root_path' => $path,
+            'request_parameters' => $event->getSubject()->getRequest()->getParameterHolder()->getAll(),
+        ));
     }
 
-    // log timers information
-    $messages = array();
-    foreach (sfTimerManager::getTimers() as $name => $timer)
+    /**
+     * Listens to the response.filter_content event.
+     *
+     * @param sfEvent $event   The sfEvent instance
+     * @param string  $content The response content
+     *
+     * @return string The filtered response content
+     */
+    public function filterResponseContent(sfEvent $event, $content)
     {
-      $messages[] = sprintf('%s %.2f ms (%d)', $name, $timer->getElapsedTime() * 1000, $timer->getCalls());
+        if (!sfConfig::get('sf_web_debug')) {
+            return $content;
+        }
+
+        // log timers information
+        $messages = array();
+        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));
+
+        // don't add debug toolbar:
+        // * for XHR requests
+        // * if response status code is in the 3xx range
+        // * if not rendering to the client
+        // * if HTTP headers only
+        $response = $event->getSubject();
+
+        /** @var sfWebRequest $request */
+        $request = $this->context->getRequest();
+        if (
+            null === $this->webDebug
+            || !$this->context->has('request')
+            || !$this->context->has('response')
+            || !$this->context->has('controller')
+            || $request->isXmlHttpRequest()
+            || false === strpos($response->getContentType(), 'html')
+            || '3' == substr($response->getStatusCode(), 0, 1)
+            || sfView::RENDER_CLIENT != $this->context->getController()->getRenderMode()
+            || $response->isHeaderOnly()
+        ) {
+            return $content;
+        }
+
+        return $this->webDebug->injectToolbar($content);
     }
-    $this->dispatcher->notify(new sfEvent($this, 'application.log', $messages));
-
-    // don't add debug toolbar:
-    // * for XHR requests
-    // * if response status code is in the 3xx range
-    // * if not rendering to the client
-    // * if HTTP headers only
-    $response = $event->getSubject();
-    /** @var sfWebRequest $request */
-    $request  = $this->context->getRequest();
-    if (
-      null === $this->webDebug
-      ||
-      !$this->context->has('request')
-      ||
-      !$this->context->has('response')
-      ||
-      !$this->context->has('controller')
-      ||
-      $request->isXmlHttpRequest()
-      ||
-      strpos($response->getContentType(), 'html') === false
-      ||
-      '3' == substr($response->getStatusCode(), 0, 1)
-      ||
-      $this->context->getController()->getRenderMode() != sfView::RENDER_CLIENT
-      ||
-      $response->isHeaderOnly()
-    )
+
+    /**
+     * Registers logger with PHP error handler.
+     */
+    protected function registerErrorHandler()
     {
-      return $content;
+        set_error_handler(array($this, 'handlePhpError'));
     }
-
-    return $this->webDebug->injectToolbar($content);
-  }
 }
diff --git a/lib/mailer/sfMailer.class.php b/lib/mailer/sfMailer.class.php
index 86afba3e3..bb55247f4 100755
--- a/lib/mailer/sfMailer.class.php
+++ b/lib/mailer/sfMailer.class.php
@@ -13,315 +13,290 @@
  *
  * This class is instanciated by sfContext on demand.
  *
- * @package    symfony
- * @subpackage mailer
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfMailer extends Swift_Mailer
 {
-  const
-    REALTIME       = 'realtime',
-    SPOOL          = 'spool',
-    SINGLE_ADDRESS = 'single_address',
-    NONE           = 'none';
-
-  protected
-    $spool             = null,
-    $logger            = null,
-    $strategy          = 'realtime',
-    $address           = '',
-    $realtimeTransport = null,
-    $force             = false,
-    $redirectingPlugin = null;
-
-  /**
-   * Constructor.
-   *
-   * Available options:
-   *
-   *  * charset: The default charset to use for messages
-   *  * logging: Whether to enable logging or not
-   *  * delivery_strategy: The delivery strategy to use
-   *  * spool_class: The spool class (for the spool strategy)
-   *  * spool_arguments: The arguments to pass to the spool constructor
-   *  * delivery_address: The email address to use for the single_address strategy
-   *  * transport: The main transport configuration
-   *  *   * class: The main transport class
-   *  *   * param: The main transport parameters
-   *
-   * @param sfEventDispatcher $dispatcher An event dispatcher instance
-   * @param array             $options    An array of options
-   */
-  public function __construct(sfEventDispatcher $dispatcher, $options)
-  {
-    // options
-    $options = array_merge(array(
-      'charset' => 'UTF-8',
-      'logging' => false,
-      'delivery_strategy' => self::REALTIME,
-      'transport' => array(
-        'class' => 'Swift_MailTransport',
-        'param' => array(),
-       ),
-    ), $options);
-
-    $constantName = 'sfMailer::'.strtoupper($options['delivery_strategy']);
-    $this->strategy = defined($constantName) ? constant($constantName) : false;
-    if (!$this->strategy)
+    public const REALTIME = 'realtime';
+    public const SPOOL = 'spool';
+    public const SINGLE_ADDRESS = 'single_address';
+    public const NONE = 'none';
+
+    protected $spool;
+    protected $logger;
+    protected $strategy = 'realtime';
+    protected $address = '';
+    protected $realtimeTransport;
+    protected $force = false;
+    protected $redirectingPlugin;
+
+    /**
+     * Constructor.
+     *
+     * Available options:
+     *
+     *  * charset: The default charset to use for messages
+     *  * logging: Whether to enable logging or not
+     *  * delivery_strategy: The delivery strategy to use
+     *  * spool_class: The spool class (for the spool strategy)
+     *  * spool_arguments: The arguments to pass to the spool constructor
+     *  * delivery_address: The email address to use for the single_address strategy
+     *  * transport: The main transport configuration
+     *  *   * class: The main transport class
+     *  *   * param: The main transport parameters
+     *
+     * @param sfEventDispatcher $dispatcher An event dispatcher instance
+     * @param array             $options    An array of options
+     */
+    public function __construct(sfEventDispatcher $dispatcher, $options)
     {
-      throw new InvalidArgumentException(sprintf('Unknown mail delivery strategy "%s" (should be one of realtime, spool, single_address, or none)', $options['delivery_strategy']));
+        // options
+        $options = array_merge(array(
+            'charset' => 'UTF-8',
+            'logging' => false,
+            'delivery_strategy' => self::REALTIME,
+            'transport' => array(
+                'class' => 'Swift_MailTransport',
+                'param' => array(),
+            ),
+        ), $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']));
+        }
+
+        if (sfMailer::NONE == $this->strategy) {
+            $options['transport']['class'] = 'Swift_NullTransport';
+        }
+
+        // transport
+        $class = $options['transport']['class'];
+        $transport = new $class();
+        if (isset($options['transport']['param'])) {
+            foreach ($options['transport']['param'] as $key => $value) {
+                $method = 'set'.ucfirst($key);
+                if (method_exists($transport, $method)) {
+                    $transport->{$method}($value);
+                } elseif (method_exists($transport, 'getExtensionHandlers')) {
+                    foreach ($transport->getExtensionHandlers() as $handler) {
+                        if (in_array(strtolower($method), array_map('strtolower', (array) $handler->exposeMixinMethods()))) {
+                            $transport->{$method}($value);
+                        }
+                    }
+                }
+            }
+        }
+        $this->realtimeTransport = $transport;
+
+        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');
+            }
+            $arguments = isset($options['spool_arguments']) ? $options['spool_arguments'] : array();
+
+            if ($arguments) {
+                $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) {
+            if (!isset($options['delivery_address'])) {
+                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));
+        }
+
+        parent::__construct($transport);
+
+        // logger
+        if ($options['logging']) {
+            $this->logger = new sfMailerMessageLoggerPlugin($dispatcher);
+
+            $transport->registerPlugin($this->logger);
+        }
+
+        // preferences
+        Swift_Preferences::getInstance()->setCharset($options['charset']);
+
+        $dispatcher->notify(new sfEvent($this, 'mailer.configure'));
     }
 
-    if (sfMailer::NONE == $this->strategy)
+    /**
+     * Gets the realtime transport instance.
+     *
+     * @return Swift_Transport the realtime transport instance
+     */
+    public function getRealtimeTransport()
     {
-      $options['transport']['class'] = 'Swift_NullTransport';
+        return $this->realtimeTransport;
     }
 
-    // transport
-    $class = $options['transport']['class'];
-    $transport = new $class();
-    if (isset($options['transport']['param']))
+    /**
+     * Sets the realtime transport instance.
+     *
+     * @param Swift_Transport $transport the realtime transport instance
+     */
+    public function setRealtimeTransport(Swift_Transport $transport)
     {
-      foreach ($options['transport']['param'] as $key => $value)
-      {
-        $method = 'set'.ucfirst($key);
-        if (method_exists($transport, $method))
-        {
-          $transport->$method($value);
-        }
-        elseif (method_exists($transport, 'getExtensionHandlers'))
-        {
-          foreach ($transport->getExtensionHandlers() as $handler)
-          {
-            if (in_array(strtolower($method), array_map('strtolower', (array) $handler->exposeMixinMethods())))
-            {
-              $transport->$method($value);
-            }
-          }
-        }
-      }
+        $this->realtimeTransport = $transport;
     }
-    $this->realtimeTransport = $transport;
 
-    if (sfMailer::SPOOL == $this->strategy)
+    /**
+     * Gets the logger instance.
+     *
+     * @return sfMailerMessageLoggerPlugin the logger instance
+     */
+    public function getLogger()
     {
-      if (!isset($options['spool_class']))
-      {
-        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();
-
-      if ($arguments)
-      {
-        $r = new ReflectionClass($options['spool_class']);
-        $this->spool = $r->newInstanceArgs($arguments);
-      }
-      else
-      {
-        $this->spool = new $options['spool_class'];
-      }
-
-      $transport = new Swift_SpoolTransport($this->spool);
+        return $this->logger;
     }
-    elseif (sfMailer::SINGLE_ADDRESS == $this->strategy)
+
+    /**
+     * Sets the logger instance.
+     *
+     * @param sfMailerMessageLoggerPlugin $logger the logger instance
+     */
+    public function setLogger($logger)
     {
-      if (!isset($options['delivery_address']))
-      {
-        throw new InvalidArgumentException('For the single_address mail delivery strategy, you must also define a delivery_address option');
-      }
+        $this->logger = $logger;
+    }
 
-      $this->address = $options['delivery_address'];
+    /**
+     * Gets the delivery strategy.
+     *
+     * @return string The delivery strategy
+     */
+    public function getDeliveryStrategy()
+    {
+        return $this->strategy;
+    }
 
-      $transport->registerPlugin($this->redirectingPlugin = new Swift_Plugins_RedirectingPlugin($this->address));
+    /**
+     * Gets the delivery address.
+     *
+     * @return string The delivery address
+     */
+    public function getDeliveryAddress()
+    {
+        return $this->address;
     }
 
-    parent::__construct($transport);
+    /**
+     * Sets the delivery address.
+     *
+     * @param string $address The delivery address
+     */
+    public function setDeliveryAddress($address)
+    {
+        $this->address = $address;
+
+        if (sfMailer::SINGLE_ADDRESS == $this->strategy) {
+            $this->redirectingPlugin->setRecipient($address);
+        }
+    }
 
-    // logger
-    if ($options['logging'])
+    /**
+     * Creates a new message.
+     *
+     * @param array|string $from    The from address
+     * @param array|string $to      The recipient(s)
+     * @param string       $subject The subject
+     * @param string       $body    The body
+     *
+     * @return Swift_Message A Swift_Message instance
+     */
+    public function compose($from = null, $to = null, $subject = null, $body = null)
     {
-      $this->logger = new sfMailerMessageLoggerPlugin($dispatcher);
+        $msg = new Swift_Message();
+
+        return $msg
+            ->setFrom($from)
+            ->setTo($to)
+            ->setSubject($subject)
+            ->setBody($body)
+        ;
+    }
 
-      $transport->registerPlugin($this->logger);
+    /**
+     * Sends a message.
+     *
+     * @param array|string $from    The from address
+     * @param array|string $to      The recipient(s)
+     * @param string       $subject The subject
+     * @param string       $body    The body
+     *
+     * @return int The number of sent emails
+     */
+    public function composeAndSend($from, $to, $subject, $body)
+    {
+        return $this->send($this->compose($from, $to, $subject, $body));
     }
 
-    // preferences
-    Swift_Preferences::getInstance()->setCharset($options['charset']);
-
-    $dispatcher->notify(new sfEvent($this, 'mailer.configure'));
-  }
-
-  /**
-   * Gets the realtime transport instance.
-   *
-   * @return Swift_Transport The realtime transport instance.
-   */
-  public function getRealtimeTransport()
-  {
-    return $this->realtimeTransport;
-  }
-
-  /**
-   * Sets the realtime transport instance.
-   *
-   * @param Swift_Transport $transport The realtime transport instance.
-   */
-  public function setRealtimeTransport(Swift_Transport $transport)
-  {
-    $this->realtimeTransport = $transport;
-  }
-
-  /**
-   * Gets the logger instance.
-   *
-   * @return sfMailerMessageLoggerPlugin The logger instance.
-   */
-  public function getLogger()
-  {
-    return $this->logger;
-  }
-
-  /**
-   * Sets the logger instance.
-   *
-   * @param sfMailerMessageLoggerPlugin $logger The logger instance.
-   */
-  public function setLogger($logger)
-  {
-    $this->logger = $logger;
-  }
-
-  /**
-   * Gets the delivery strategy.
-   *
-   * @return string The delivery strategy
-   */
-  public function getDeliveryStrategy()
-  {
-    return $this->strategy;
-  }
-
-  /**
-   * Gets the delivery address.
-   *
-   * @return string The delivery address
-   */
-  public function getDeliveryAddress()
-  {
-    return $this->address;
-  }
-
-  /**
-   * Sets the delivery address.
-   *
-   * @param string $address The delivery address
-   */
-  public function setDeliveryAddress($address)
-  {
-    $this->address = $address;
-
-    if (sfMailer::SINGLE_ADDRESS == $this->strategy)
+    /**
+     * Forces the next call to send() to use the realtime strategy.
+     *
+     * @return sfMailer The current sfMailer instance
+     */
+    public function sendNextImmediately()
     {
-      $this->redirectingPlugin->setRecipient($address);
+        $this->force = true;
+
+        return $this;
     }
-  }
-
-  /**
-   * Creates a new message.
-   *
-   * @param string|array $from    The from address
-   * @param string|array $to      The recipient(s)
-   * @param string       $subject The subject
-   * @param string       $body    The body
-   *
-   * @return Swift_Message A Swift_Message instance
-   */
-  public function compose($from = null, $to = null, $subject = null, $body = null)
-  {
-    $msg = new Swift_Message();
-
-    return $msg
-      ->setFrom($from)
-      ->setTo($to)
-      ->setSubject($subject)
-      ->setBody($body)
-    ;
-  }
-
-  /**
-   * Sends a message.
-   *
-   * @param string|array $from    The from address
-   * @param string|array $to      The recipient(s)
-   * @param string       $subject The subject
-   * @param string       $body    The body
-   *
-   * @return int The number of sent emails
-   */
-  public function composeAndSend($from, $to, $subject, $body)
-  {
-    return $this->send($this->compose($from, $to, $subject, $body));
-  }
-
-  /**
-   * Forces the next call to send() to use the realtime strategy.
-   *
-   * @return sfMailer The current sfMailer instance
-   */
-  public function sendNextImmediately()
-  {
-    $this->force = true;
-
-    return $this;
-  }
-
-  /**
-   * Sends the given message.
-   *
-   * @param Swift_Mime_Message|Swift_Mime_SimpleMessage $message           The message to send.
-   * @param string[]                                    &$failedRecipients An array of failures by-reference
-   *
-   * @return int|false The number of sent emails
-   */
-  public function send($message, &$failedRecipients = null)
-  {
-    if ($this->force)
+
+    /**
+     * Sends the given message.
+     *
+     * @param Swift_Mime_Message|Swift_Mime_SimpleMessage $message           the message to send
+     * @param string[]                                    &$failedRecipients An array of failures by-reference
+     *
+     * @return false|int The number of sent emails
+     */
+    public function send($message, &$failedRecipients = null)
     {
-      $this->force = false;
+        if ($this->force) {
+            $this->force = false;
 
-      if (!$this->realtimeTransport->isStarted())
-      {
-        $this->realtimeTransport->start();
-      }
+            if (!$this->realtimeTransport->isStarted()) {
+                $this->realtimeTransport->start();
+            }
 
-      return $this->realtimeTransport->send($message, $failedRecipients);
+            return $this->realtimeTransport->send($message, $failedRecipients);
+        }
+
+        return parent::send($message, $failedRecipients);
     }
 
-    return parent::send($message, $failedRecipients);
-  }
-
-  /**
-   * Sends the current messages in the spool.
-   *
-   * The return value is the number of recipients who were accepted for delivery.
-   *
-   * @param string[] &$failedRecipients An array of failures by-reference
-   *
-   * @return int The number of sent emails
-   */
-  public function flushQueue(&$failedRecipients = null)
-  {
-    return $this->getSpool()->flushQueue($this->realtimeTransport, $failedRecipients);
-  }
-
-  public function getSpool()
-  {
-    if (self::SPOOL != $this->strategy)
+    /**
+     * Sends the current messages in the spool.
+     *
+     * The return value is the number of recipients who were accepted for delivery.
+     *
+     * @param string[] &$failedRecipients An array of failures by-reference
+     *
+     * @return int The number of sent emails
+     */
+    public function flushQueue(&$failedRecipients = null)
     {
-      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->getSpool()->flushQueue($this->realtimeTransport, $failedRecipients);
     }
 
-    return $this->spool;
-  }
+    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));
+        }
+
+        return $this->spool;
+    }
 }
diff --git a/lib/mailer/sfMailerMessageLoggerPlugin.class.php b/lib/mailer/sfMailerMessageLoggerPlugin.class.php
index 2234f42d2..0f552beb4 100644
--- a/lib/mailer/sfMailerMessageLoggerPlugin.class.php
+++ b/lib/mailer/sfMailerMessageLoggerPlugin.class.php
@@ -11,75 +11,69 @@
 /**
  * sfMailerMessageLoggerPlugin is a Swift plugin to log all sent messages.
  *
- * @package    symfony
- * @subpackage mailer
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfMailerMessageLoggerPlugin implements Swift_Events_SendListener
 {
-  protected
-    $messages   = array(),
-    $dispatcher = null;
+    protected $messages = array();
+    protected $dispatcher;
 
-  /**
-   * Constructor.
-   *
-   * @param sfEventDispatcher $dispatcher An event dispatcher instance
-   */
-  public function __construct(sfEventDispatcher $dispatcher)
-  {
-    $this->dispatcher = $dispatcher;
-  }
+    /**
+     * Constructor.
+     *
+     * @param sfEventDispatcher $dispatcher An event dispatcher instance
+     */
+    public function __construct(sfEventDispatcher $dispatcher)
+    {
+        $this->dispatcher = $dispatcher;
+    }
 
-  /**
-   * Clears all the messages.
-   */
-  public function clear()
-  {
-    $this->messages = array();
-  }
+    /**
+     * Clears all the messages.
+     */
+    public function clear()
+    {
+        $this->messages = array();
+    }
 
-  /**
-   * Gets all logged messages.
-   *
-   * @return array An array of message instances
-   */
-  public function getMessages()
-  {
-    return $this->messages;
-  }
+    /**
+     * Gets all logged messages.
+     *
+     * @return array An array of message instances
+     */
+    public function getMessages()
+    {
+        return $this->messages;
+    }
 
-  /**
-   * Returns the number of logged messages.
-   *
-   * @return int The number if logged messages
-   */
-  public function countMessages()
-  {
-    return count($this->messages);
-  }
+    /**
+     * Returns the number of logged messages.
+     *
+     * @return int The number if logged messages
+     */
+    public function countMessages()
+    {
+        return count($this->messages);
+    }
 
-  /**
-   * Invoked immediately before the Message is sent.
-   * 
-   * @param Swift_Events_SendEvent $evt
-   */
-  public function beforeSendPerformed(Swift_Events_SendEvent $evt)
-  {
-    $this->messages[] = $message = clone $evt->getMessage();
+    /**
+     * Invoked immediately before the Message is sent.
+     */
+    public function beforeSendPerformed(Swift_Events_SendEvent $evt)
+    {
+        $this->messages[] = $message = clone $evt->getMessage();
 
-    $to = null === $message->getTo() ? '' : implode(', ', array_keys($message->getTo()));
+        $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', array(sprintf('Sending email "%s" to "%s"', $message->getSubject(), $to))));
+    }
 
-  /**
-   * Invoked immediately after the Message is sent.
-   * 
-   * @param Swift_Events_SendEvent $evt
-   */
-  public function sendPerformed(Swift_Events_SendEvent $evt)
-  {
-  }
+    /**
+     * Invoked immediately after the Message is sent.
+     */
+    public function sendPerformed(Swift_Events_SendEvent $evt)
+    {
+    }
 }
diff --git a/lib/mailer/sfNoMailer.class.php b/lib/mailer/sfNoMailer.class.php
index 507b61a33..08165a518 100644
--- a/lib/mailer/sfNoMailer.class.php
+++ b/lib/mailer/sfNoMailer.class.php
@@ -5,69 +5,69 @@
  */
 class sfNoMailer
 {
-  public function __construct(sfEventDispatcher $dispatcher, $options)
-  {
-  }
+    public function __construct(sfEventDispatcher $dispatcher, $options)
+    {
+    }
 
-  public function getRealtimeTransport()
-  {
-    return null;
-  }
+    public function getRealtimeTransport()
+    {
+        return null;
+    }
 
-  public function setRealtimeTransport(Swift_Transport $transport)
-  {
-  }
+    public function setRealtimeTransport(Swift_Transport $transport)
+    {
+    }
 
-  public function getLogger()
-  {
-    return null;
-  }
+    public function getLogger()
+    {
+        return null;
+    }
 
-  public function setLogger($logger)
-  {
-  }
+    public function setLogger($logger)
+    {
+    }
 
-  public function getDeliveryStrategy()
-  {
-    return null;
-  }
+    public function getDeliveryStrategy()
+    {
+        return null;
+    }
 
-  public function getDeliveryAddress()
-  {
-    return null;
-  }
+    public function getDeliveryAddress()
+    {
+        return null;
+    }
 
-  public function setDeliveryAddress($address)
-  {
-  }
+    public function setDeliveryAddress($address)
+    {
+    }
 
-  public function compose($from = null, $to = null, $subject = null, $body = null)
-  {
-    return null;
-  }
+    public function compose($from = null, $to = null, $subject = null, $body = null)
+    {
+        return null;
+    }
 
-  public function composeAndSend($from, $to, $subject, $body)
-  {
-    return null;
-  }
+    public function composeAndSend($from, $to, $subject, $body)
+    {
+        return null;
+    }
 
-  public function sendNextImmediately()
-  {
-    return null;
-  }
+    public function sendNextImmediately()
+    {
+        return null;
+    }
 
-  public function send($message, &$failedRecipients = null)
-  {
-    return null;
-  }
+    public function send($message, &$failedRecipients = null)
+    {
+        return null;
+    }
 
-  public function flushQueue(&$failedRecipients = null)
-  {
-    return null;
-  }
+    public function flushQueue(&$failedRecipients = null)
+    {
+        return null;
+    }
 
-  public function getSpool()
-  {
-    return null;
-  }
+    public function getSpool()
+    {
+        return null;
+    }
 }
diff --git a/lib/plugin/sfPearConfig.class.php b/lib/plugin/sfPearConfig.class.php
index cf0f1336e..20a2edbe9 100644
--- a/lib/plugin/sfPearConfig.class.php
+++ b/lib/plugin/sfPearConfig.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -13,17 +13,16 @@
 /**
  * sfPearConfig.
  *
- * @package    symfony
- * @subpackage plugin
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfPearConfig extends PEAR_Config
 {
-  function &getREST($version, $options = array())
-  {
-    $class = 'sfPearRest'.str_replace('.', '', $version);
+    public function &getREST($version, $options = array())
+    {
+        $class = 'sfPearRest'.str_replace('.', '', $version);
 
-    return new $class($this, $options);
-  }
+        return new $class($this, $options);
+    }
 }
diff --git a/lib/plugin/sfPearDownloader.class.php b/lib/plugin/sfPearDownloader.class.php
index 3a8f72cc4..c820f82e5 100644
--- a/lib/plugin/sfPearDownloader.class.php
+++ b/lib/plugin/sfPearDownloader.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -13,18 +13,25 @@
 /**
  * sfPearDownloader downloads files from the Internet.
  *
- * @package    symfony
- * @subpackage plugin
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfPearDownloader extends PEAR_Downloader
 {
-  /**
-   * @see PEAR_REST::downloadHttp()
-   */
-  public function downloadHttp($url, &$ui, $save_dir = '.', $callback = null, $lastmodified = null, $accept = false, $channel = false)
-  {
-    return parent::downloadHttp($url, $ui, $save_dir, $callback, $lastmodified, $accept, $channel);
-  }
+    /**
+     * @see PEAR_REST::downloadHttp()
+     *
+     * @param mixed      $url
+     * @param mixed      $ui
+     * @param mixed      $save_dir
+     * @param mixed|null $callback
+     * @param mixed|null $lastmodified
+     * @param mixed      $accept
+     * @param mixed      $channel
+     */
+    public function downloadHttp($url, &$ui, $save_dir = '.', $callback = null, $lastmodified = null, $accept = false, $channel = false)
+    {
+        return parent::downloadHttp($url, $ui, $save_dir, $callback, $lastmodified, $accept, $channel);
+    }
 }
diff --git a/lib/plugin/sfPearEnvironment.class.php b/lib/plugin/sfPearEnvironment.class.php
index 83c748f32..071a5f5e8 100644
--- a/lib/plugin/sfPearEnvironment.class.php
+++ b/lib/plugin/sfPearEnvironment.class.php
@@ -13,254 +13,247 @@
 date_default_timezone_set('UTC');
 
 require_once 'PEAR.php';
+
 require_once 'PEAR/Config.php';
+
 require_once 'PEAR/Registry.php';
+
 require_once 'PEAR/Command.php';
+
 require_once 'PEAR/PackageFile/v2/rw.php';
+
 require_once 'PEAR/Dependency2.php';
+
 require_once 'PEAR/Installer.php';
 
 /**
  * sfPearEnvironment represents a PEAR environment.
  *
- * @package    symfony
- * @subpackage plugin
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfPearEnvironment
 {
-  protected
-    $dispatcher = null,
-    $config     = null,
-    $registry   = null,
-    $rest       = null,
-    $frontend   = null,
-    $options    = array();
-
-  /**
-   * Constructs a new sfPluginManager.
-   *
-   * @param sfEventDispatcher $dispatcher   An event dispatcher instance
-   * @param array             $options      An array of options
-   */
-  public function __construct(sfEventDispatcher $dispatcher, $options)
-  {
-    $this->initialize($dispatcher, $options);
-  }
-
-  /**
-   * Initializes this sfPluginManager instance.
-   *
-   * Available options:
-   *
-   * * plugin_dir:            The directory where to put plugins
-   * * cache_dir:             The local PEAR cache directory
-   * * rest_base_class:       The base class for REST calls (default to sfPearRest)
-   *                          (mainly used for testing)
-   * * 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
-   */
-  public function initialize(sfEventDispatcher $dispatcher, $options = array())
-  {
-    $this->dispatcher = $dispatcher;
-
-    // initialize options
-    if (!isset($options['plugin_dir']))
+    protected $dispatcher;
+    protected $config;
+    protected $registry;
+    protected $rest;
+    protected $frontend;
+    protected $options = array();
+
+    /**
+     * Constructs a new sfPluginManager.
+     *
+     * @param sfEventDispatcher $dispatcher An event dispatcher instance
+     * @param array             $options    An array of options
+     */
+    public function __construct(sfEventDispatcher $dispatcher, $options)
     {
-      throw new sfConfigurationException('You must provide a "plugin_dir" option.');
+        $this->initialize($dispatcher, $options);
     }
 
-    if (!isset($options['cache_dir']))
+    /**
+     * Initializes this sfPluginManager instance.
+     *
+     * Available options:
+     *
+     * * plugin_dir:            The directory where to put plugins
+     * * cache_dir:             The local PEAR cache directory
+     * * rest_base_class:       The base class for REST calls (default to sfPearRest)
+     *                          (mainly used for testing)
+     * * 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
+     */
+    public function initialize(sfEventDispatcher $dispatcher, $options = array())
     {
-      throw new sfConfigurationException('You must provide a "cache_dir" option.');
+        $this->dispatcher = $dispatcher;
+
+        // initialize options
+        if (!isset($options['plugin_dir'])) {
+            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.');
+        }
+
+        if (!is_dir($options['cache_dir']) && !@mkdir($options['cache_dir'], 0777, true) && !is_dir($options['cache_dir'])) {
+            throw new \RuntimeException(sprintf('Pear was not able to create a directory "%s"', $options['cache_dir']));
+        }
+
+        if (!isset($options['rest_base_class'])) {
+            $options['rest_base_class'] = 'sfPearRest';
+        }
+
+        if (!isset($options['downloader_base_class'])) {
+            $options['downloader_base_class'] = 'sfPearDownloader';
+        }
+
+        $this->options = $options;
+
+        // initialize some PEAR objects
+        $this->initializeConfiguration($options['plugin_dir'], $options['cache_dir']);
+        $this->initializeRegistry();
+        $this->initializeFrontend();
+
+        // initializes the REST object
+        $this->rest = new sfPearRestPlugin($this->config, array('base_class' => $options['rest_base_class']));
+        $this->rest->setChannel($this->config->get('default_channel'));
     }
 
-    if (!is_dir($options['cache_dir']) && !@mkdir($options['cache_dir'], 0777, true) && !is_dir($options['cache_dir']))
+    /**
+     * Returns a configuration value.
+     *
+     * @param string $name The configuration name
+     *
+     * @return mixed The configuration value
+     */
+    public function getOption($name)
     {
-      throw new \RuntimeException(sprintf('Pear was not able to create a directory "%s"', $options['cache_dir']));
+        return isset($this->options[$name]) ? $this->options[$name] : null;
     }
 
-    if (!isset($options['rest_base_class']))
+    /**
+     * Returns whether configuration name exists.
+     *
+     * @param string $name The configuration name
+     *
+     * @return bool True if configuration name exists
+     */
+    public function hasOption($name)
     {
-      $options['rest_base_class'] = 'sfPearRest';
+        return isset($this->options[$name]);
     }
 
-    if (!isset($options['downloader_base_class']))
+    /**
+     * Sets a configuration value.
+     *
+     * @param string $name  The configuration name
+     * @param mixed  $value The configuration value
+     */
+    public function setOption($name, $value)
     {
-      $options['downloader_base_class'] = 'sfPearDownloader';
+        $this->options[$name] = $value;
     }
 
-    $this->options = $options;
-
-    // initialize some PEAR objects
-    $this->initializeConfiguration($options['plugin_dir'], $options['cache_dir']);
-    $this->initializeRegistry();
-    $this->initializeFrontend();
-
-    // initializes the REST object
-    $this->rest = new sfPearRestPlugin($this->config, array('base_class' => $options['rest_base_class']));
-    $this->rest->setChannel($this->config->get('default_channel'));
-  }
-
-  /**
-   * Returns a configuration value.
-   *
-   * @param  string $name The configuration name
-   *
-   * @return mixed  The configuration value
-   */
-  public function getOption($name)
-  {
-    return isset($this->options[$name]) ? $this->options[$name] : null;
-  }
-
-  /**
-   * Returns whether configuration name exists.
-   *
-   * @param  string $name The configuration name
-   *
-   * @return boolean True if configuration name exists
-   */
-  public function hasOption($name)
-  {
-    return isset($this->options[$name]);
-  }
-
-  /**
-   * Sets a configuration value.
-   *
-   * @param string $name  The configuration name
-   * @param mixed  $value The configuration value
-   */
-  public function setOption($name, $value)
-  {
-    $this->options[$name] = $value;
-  }
-
-  /**
-   * Returns the PEAR Rest instance.
-   *
-   * @return object The PEAR Rest instance
-   */
-  public function getRest()
-  {
-    return $this->rest;
-  }
-
-  /**
-   * Returns the PEAR Config instance.
-   *
-   * @return object The PEAR Config instance
-   */
-  public function getConfig()
-  {
-    return $this->config;
-  }
-
-  /**
-   * Returns the PEAR Frontend instance.
-   *
-   * @return object The PEAR Frontend instance
-   */
-  public function getFrontend()
-  {
-    return $this->frontend;
-  }
-
-  /**
-   * Returns the PEAR Registry instance.
-   *
-   * @return object The PEAR Registry instance
-   */
-  public function getRegistry()
-  {
-    return $this->registry;
-  }
-
-  /**
-   * Registers a PEAR channel.
-   *
-   * @param string  $channel    The channel name
-   * @param Boolean $isDefault  true if this is the default PEAR channel, false otherwise
-   */
-  public function registerChannel($channel, $isDefault = false)
-  {
-    $this->config->set('auto_discover', true);
-
-    if (!$this->registry->channelExists($channel, true))
+    /**
+     * Returns the PEAR Rest instance.
+     *
+     * @return object The PEAR Rest instance
+     */
+    public function getRest()
     {
-      $class = $this->options['downloader_base_class'];
-      $downloader = new $class($this->frontend, array(), $this->config);
-      if (!$downloader->discover($channel))
-      {
-        throw new sfPluginException(sprintf('Unable to register channel "%s"', $channel));
-      }
+        return $this->rest;
     }
 
-    if ($isDefault)
+    /**
+     * Returns the PEAR Config instance.
+     *
+     * @return object The PEAR Config instance
+     */
+    public function getConfig()
     {
-      $this->config->set('default_channel', $channel);
-      $this->rest->setChannel($channel);
+        return $this->config;
     }
-  }
-
-  /**
-   * Initializes the PEAR Frontend instance.
-   */
-  protected function initializeFrontend()
-  {
-    $this->frontend = PEAR_Frontend::singleton('sfPearFrontendPlugin');
-    if (PEAR::isError($this->frontend))
+
+    /**
+     * Returns the PEAR Frontend instance.
+     *
+     * @return object The PEAR Frontend instance
+     */
+    public function getFrontend()
     {
-      throw new sfPluginException(sprintf('Unable to initialize PEAR Frontend object: %s', $this->frontend->getMessage()));
+        return $this->frontend;
     }
 
-    $this->frontend->setEventDispatcher($this->dispatcher);
-  }
+    /**
+     * Returns the PEAR Registry instance.
+     *
+     * @return object The PEAR Registry instance
+     */
+    public function getRegistry()
+    {
+        return $this->registry;
+    }
 
-  /**
-   * Initializes the PEAR Registry instance.
-   */
-  protected function initializeRegistry()
-  {
-    $this->registry = $this->config->getRegistry();
-    if (PEAR::isError($this->registry))
+    /**
+     * Registers a PEAR channel.
+     *
+     * @param string $channel   The channel name
+     * @param bool   $isDefault true if this is the default PEAR channel, false otherwise
+     */
+    public function registerChannel($channel, $isDefault = false)
     {
-      throw new sfPluginException(sprintf('Unable to initialize PEAR registry: %s', $this->registry->getMessage()));
+        $this->config->set('auto_discover', true);
+
+        if (!$this->registry->channelExists($channel, true)) {
+            $class = $this->options['downloader_base_class'];
+            $downloader = new $class($this->frontend, array(), $this->config);
+            if (!$downloader->discover($channel)) {
+                throw new sfPluginException(sprintf('Unable to register channel "%s"', $channel));
+            }
+        }
+
+        if ($isDefault) {
+            $this->config->set('default_channel', $channel);
+            $this->rest->setChannel($channel);
+        }
     }
-  }
-
-  /**
-   * Registers the PEAR Configuration instance.
-   *
-   * @param string $pluginDir   The plugin path
-   * @param string $cacheDir    The cache path
-   */
-  public function initializeConfiguration($pluginDir, $cacheDir)
-  {
-    $this->config = $GLOBALS['_PEAR_Config_instance'] = new sfPearConfig();
-
-    // change the configuration for use
-    $this->config->set('php_dir',  $pluginDir);
-    $this->config->set('data_dir', $pluginDir);
-    $this->config->set('test_dir', $pluginDir);
-    $this->config->set('doc_dir',  $pluginDir);
-    $this->config->set('bin_dir',  $pluginDir);
-
-    if($this->hasOption('preferred_state'))
+
+    /**
+     * Registers the PEAR Configuration instance.
+     *
+     * @param string $pluginDir The plugin path
+     * @param string $cacheDir  The cache path
+     */
+    public function initializeConfiguration($pluginDir, $cacheDir)
     {
-      $this->config->set('preferred_state', $this->getOption('preferred_state'));
+        $this->config = $GLOBALS['_PEAR_Config_instance'] = new sfPearConfig();
+
+        // change the configuration for use
+        $this->config->set('php_dir', $pluginDir);
+        $this->config->set('data_dir', $pluginDir);
+        $this->config->set('test_dir', $pluginDir);
+        $this->config->set('doc_dir', $pluginDir);
+        $this->config->set('bin_dir', $pluginDir);
+
+        if ($this->hasOption('preferred_state')) {
+            $this->config->set('preferred_state', $this->getOption('preferred_state'));
+        }
+
+        // change the PEAR temp dirs
+        $this->config->set('cache_dir', $cacheDir);
+        $this->config->set('download_dir', $cacheDir);
+        $this->config->set('temp_dir', $cacheDir);
+
+        $this->config->set('verbose', 1);
     }
 
-    // change the PEAR temp dirs
-    $this->config->set('cache_dir',    $cacheDir);
-    $this->config->set('download_dir', $cacheDir);
-    $this->config->set('temp_dir',     $cacheDir);
+    /**
+     * Initializes the PEAR Frontend instance.
+     */
+    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->config->set('verbose', 1);
-  }
+        $this->frontend->setEventDispatcher($this->dispatcher);
+    }
+
+    /**
+     * Initializes the PEAR Registry instance.
+     */
+    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()));
+        }
+    }
 }
diff --git a/lib/plugin/sfPearFrontendPlugin.class.php b/lib/plugin/sfPearFrontendPlugin.class.php
index 06e2aaef3..5290fe0fd 100644
--- a/lib/plugin/sfPearFrontendPlugin.class.php
+++ b/lib/plugin/sfPearFrontendPlugin.class.php
@@ -9,55 +9,51 @@
  */
 
 require_once 'PEAR/Frontend.php';
+
 require_once 'PEAR/Frontend/CLI.php';
 
 /**
  * The PEAR Frontend object.
  *
- * @package    symfony
- * @subpackage plugin
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfPearFrontendPlugin extends PEAR_Frontend_CLI
 {
-  protected
-    $dispatcher = null;
-
-  /**
-   * Sets the sfEventDispatcher object for this frontend.
-   *
-   * @param sfEventDispatcher $dispatcher The sfEventDispatcher instance
-   */
-  public function setEventDispatcher(sfEventDispatcher $dispatcher)
-  {
-    $this->dispatcher = $dispatcher;
-  }
-
-  public function _displayLine($text)
-  {
-    $this->_display($text);
-  }
-
-  public function _display($text)
-  {
-    $this->dispatcher->notify(new sfEvent($this, 'application.log', $this->splitLongLine($text)));
-  }
-
-  protected function splitLongLine($text)
-  {
-    $lines = array();
-    foreach (explode("\n", $text) as $longline)
+    protected $dispatcher;
+
+    /**
+     * Sets the sfEventDispatcher object for this frontend.
+     *
+     * @param sfEventDispatcher $dispatcher The sfEventDispatcher instance
+     */
+    public function setEventDispatcher(sfEventDispatcher $dispatcher)
     {
-      foreach (explode("\n", wordwrap($longline, 62)) as $line)
-      {
-        if ($line = trim($line))
-        {
-          $lines[] = $line;
-        }
-      }
+        $this->dispatcher = $dispatcher;
     }
 
-    return $lines;
-  }
+    public function _displayLine($text)
+    {
+        $this->_display($text);
+    }
+
+    public function _display($text)
+    {
+        $this->dispatcher->notify(new sfEvent($this, 'application.log', $this->splitLongLine($text)));
+    }
+
+    protected function splitLongLine($text)
+    {
+        $lines = array();
+        foreach (explode("\n", $text) as $longline) {
+            foreach (explode("\n", wordwrap($longline, 62)) as $line) {
+                if ($line = trim($line)) {
+                    $lines[] = $line;
+                }
+            }
+        }
+
+        return $lines;
+    }
 }
diff --git a/lib/plugin/sfPearRest.class.php b/lib/plugin/sfPearRest.class.php
index 72cb66960..c27bfd34c 100644
--- a/lib/plugin/sfPearRest.class.php
+++ b/lib/plugin/sfPearRest.class.php
@@ -13,18 +13,22 @@
 /**
  * sfPearRest interacts with a PEAR channel.
  *
- * @package    symfony
- * @subpackage plugin
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfPearRest extends PEAR_REST
 {
-  /**
-   * @see PEAR_REST::downloadHttp()
-   */
-  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)));
-  }
+    /**
+     * @see PEAR_REST::downloadHttp()
+     *
+     * @param mixed      $url
+     * @param mixed|null $lastmodified
+     * @param mixed      $accept
+     * @param mixed      $channel
+     */
+    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)));
+    }
 }
diff --git a/lib/plugin/sfPearRest10.class.php b/lib/plugin/sfPearRest10.class.php
index 90f1dcf2f..2fc3f6412 100644
--- a/lib/plugin/sfPearRest10.class.php
+++ b/lib/plugin/sfPearRest10.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -13,20 +13,22 @@
 /**
  * sfPearRest10 interacts with a PEAR channel that supports REST 1.0.
  *
- * @package    symfony
- * @subpackage plugin
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfPearRest10 extends PEAR_REST_10
 {
-  /**
-   * @see PEAR_REST_10
-   */
-  public function __construct($config, $options = array())
-  {
-    $class = isset($options['base_class']) ? $options['base_class'] : 'sfPearRest';
+    /**
+     * @see PEAR_REST_10
+     *
+     * @param mixed $config
+     * @param mixed $options
+     */
+    public function __construct($config, $options = array())
+    {
+        $class = isset($options['base_class']) ? $options['base_class'] : 'sfPearRest';
 
-    $this->_rest = new $class($config, $options);
-  }
+        $this->_rest = new $class($config, $options);
+    }
 }
diff --git a/lib/plugin/sfPearRest11.class.php b/lib/plugin/sfPearRest11.class.php
index b1722e844..cd9538c95 100644
--- a/lib/plugin/sfPearRest11.class.php
+++ b/lib/plugin/sfPearRest11.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -13,20 +13,22 @@
 /**
  * sfPearRest10 interacts with a PEAR channel that supports REST 1.1.
  *
- * @package    symfony
- * @subpackage plugin
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfPearRest11 extends PEAR_REST_11
 {
-  /**
-   * @see PEAR_REST_11
-   */
-  public function __construct($config, $options = array())
-  {
-    $class = isset($options['base_class']) ? $options['base_class'] : 'sfPearRest';
+    /**
+     * @see PEAR_REST_11
+     *
+     * @param mixed $config
+     * @param mixed $options
+     */
+    public function __construct($config, $options = array())
+    {
+        $class = isset($options['base_class']) ? $options['base_class'] : 'sfPearRest';
 
-    $this->_rest = new $class($config, $options);
-  }
+        $this->_rest = new $class($config, $options);
+    }
 }
diff --git a/lib/plugin/sfPearRestPlugin.class.php b/lib/plugin/sfPearRestPlugin.class.php
index 74b9dbabf..f2eddfe19 100644
--- a/lib/plugin/sfPearRestPlugin.class.php
+++ b/lib/plugin/sfPearRestPlugin.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -11,219 +11,201 @@
 /**
  * sfPearRestPlugin interacts with a symfony plugin channel.
  *
- * @package    symfony
- * @subpackage plugin
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfPearRestPlugin extends sfPearRest11
 {
-  protected
-    $config,
-    $rest10,
-    $restBase,
-    $channel;
-
-  /**
-   * Constructs a new sfRestPlugin instance.
-   *
-   * @param PEAR_Config $config   The PEAR Config object
-   * @param array       $options  An array of options
-   */
-  public function __construct(PEAR_Config $config, $options = array())
-  {
-    parent::__construct($config, $options);
-
-    $this->config = $config;
-    $this->rest10 = new sfPearRest10($config, $options);
-  }
-
-  /**
-   * Sets the channel for the REST object.
-   *
-   * @param string $channel The channel name
-   */
-  public function setChannel($channel)
-  {
-    $this->channel = $channel;
-    $this->restBase = $this->getRESTBase($channel);
-  }
-
-  /**
-   * Gets the REST base path.
-   *
-   * @param string $channelName The channel name
-   */
-  protected function getRESTBase($channelName)
-  {
-    $channel = $this->config->getRegistry()->getChannel($channelName);
-    if (PEAR::isError($channel))
+    protected $config;
+    protected $rest10;
+    protected $restBase;
+    protected $channel;
+
+    /**
+     * Constructs a new sfRestPlugin instance.
+     *
+     * @param PEAR_Config $config  The PEAR Config object
+     * @param array       $options An array of options
+     */
+    public function __construct(PEAR_Config $config, $options = array())
     {
-      throw new sfPluginException(sprintf('Unable to initialize channel "%s"', $channel->getMessage()));
-    }
+        parent::__construct($config, $options);
 
-    $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));
+        $this->config = $config;
+        $this->rest10 = new sfPearRest10($config, $options);
     }
 
-    return $channel->getBaseURL('REST1.1', $mirror);
-  }
-
-  /**
-   * Returns the license for a given plugin and version.
-   *
-   * @param string $plugin  The plugin name
-   * @param string $version The version
-   *
-   * @return string The license
-   */
-  public function getPluginLicense($plugin, $version)
-  {
-    $info = $this->packageInfo($this->restBase, $plugin);
-
-    if (PEAR::isError($info))
+    /**
+     * Proxies method to the PEAR REST10 object.
+     *
+     * @param string $method    The method name
+     * @param array  $arguments An array of arguments
+     */
+    public function __call($method, $arguments)
     {
-      throw new sfPluginRestException(sprintf('Unable to get plugin licence information for plugin "%s": %s', $plugin, $info->getMessage())); 
+        if (method_exists($this->rest10, $method)) {
+            return call_user_func_array(array($this->rest10, $method), $arguments);
+        }
     }
 
-    if (null === $info)
+    /**
+     * Sets the channel for the REST object.
+     *
+     * @param string $channel The channel name
+     */
+    public function setChannel($channel)
     {
-      // plugin does not exist
-      return null;
+        $this->channel = $channel;
+        $this->restBase = $this->getRESTBase($channel);
     }
 
-    if (!isset($info['license']) || null === $info['license'])
+    /**
+     * Returns the license for a given plugin and version.
+     *
+     * @param string $plugin  The plugin name
+     * @param string $version The version
+     *
+     * @return string The license
+     */
+    public function getPluginLicense($plugin, $version)
     {
-      throw new Exception('No license found for this plugin!');
-    }
+        $info = $this->packageInfo($this->restBase, $plugin);
 
-    return $info['releases'][$version]['license'];
-  }
-
-  /**
-   * Gets the all available versions for a given plugin.
-   *
-   * @param  string $plugin     The plugin name
-   * @param  string $stability  The stability name
-   *
-   * @return array  An array of versions
-   */
-  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($info)) {
+            throw new sfPluginRestException(sprintf('Unable to get plugin licence information for plugin "%s": %s', $plugin, $info->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));
+        if (null === $info) {
+            // plugin does not exist
+            return null;
+        }
+
+        if (!isset($info['license']) || null === $info['license']) {
+            throw new Exception('No license found for this plugin!');
+        }
+
+        return $info['releases'][$version]['license'];
     }
 
-    if (!isset($allreleases['r'][0]))
+    /**
+     * Gets the all available versions for a given plugin.
+     *
+     * @param string $plugin    The plugin name
+     * @param string $stability The stability name
+     *
+     * @return array An array of versions
+     */
+    public function getPluginVersions($plugin, $stability = null)
     {
-      $allreleases['r'] = array($allreleases['r']);
+        $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 (!isset($allreleases['r']) || (isset($allreleases['r']) && !is_array($allreleases['r']) || !count($allreleases['r']))) {
+            throw new sfPluginRestException(sprintf('No release available for plugin "%s"', $plugin));
+        }
+
+        if (!isset($allreleases['r'][0])) {
+            $allreleases['r'] = array($allreleases['r']);
+        }
+
+        $versions = array();
+        $allowedStates = $this->getAllowedStates($stability);
+        foreach ($allreleases['r'] as $release) {
+            if (!isset($allowedStates[$release['s']])) {
+                continue;
+            }
+
+            $versions[] = $release['v'];
+        }
+
+        if (!count($versions)) {
+            throw new sfPluginException(sprintf('No release available for plugin "%s" in state "%s"', $plugin, $stability));
+        }
+
+        return $versions;
     }
 
-    $versions = array();
-    $allowedStates = $this->getAllowedStates($stability);
-    foreach ($allreleases['r'] as $release)
+    /**
+     * Returns plugin dependencies.
+     *
+     * @param string $plugin  The plugin name
+     * @param string $version The plugin version
+     *
+     * @return array An array of depedencies
+     */
+    public function getPluginDependencies($plugin, $version)
     {
-      if (!isset($allowedStates[$release['s']]))
-      {
-        continue;
-      }
+        $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()));
+        }
 
-      $versions[] = $release['v'];
+        return unserialize($dependencies);
     }
 
-    if (!count($versions))
+    /**
+     * Gets the plugin download URL.
+     *
+     * @param string $plugin    The plugin name
+     * @param string $version   The plugin version
+     * @param string $stability The stability
+     *
+     * @return string The URL for the plugin
+     */
+    public function getPluginDownloadURL($plugin, $version, $stability)
     {
-      throw new sfPluginException(sprintf('No release available for plugin "%s" in state "%s"', $plugin, $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));
+        }
 
-    return $versions;
-  }
-
-  /**
-   * Returns plugin dependencies.
-   *
-   * @param string $plugin  The plugin name
-   * @param string $version The plugin version
-   *
-   * @return array  An array of depedencies
-   */
-  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()));
-    }
+        $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()));
+        }
 
-    return unserialize($dependencies);
-  }
-
-  /**
-   * Gets the plugin download URL.
-   *
-   * @param  string $plugin     The plugin name
-   * @param  string $version    The plugin version
-   * @param  string $stability  The stability
-   *
-   * @return string The URL for the plugin
-   */
-  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));
-    }
+        if (!isset($info['url'])) {
+            throw new sfPluginRestException(sprintf('Plugin "%s" cannot be installed (No URL found)', $plugin));
+        }
 
-    $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()));
+        return $info['url'].(extension_loaded('zlib') ? '.tgz' : '.tar');
     }
 
-    if (!isset($info['url']))
+    /**
+     * Gets the REST base path.
+     *
+     * @param string $channelName The channel name
+     */
+    protected function getRESTBase($channelName)
     {
-      throw new sfPluginRestException(sprintf('Plugin "%s" cannot be installed (No URL found)', $plugin));
+        $channel = $this->config->getRegistry()->getChannel($channelName);
+        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));
+        }
+
+        return $channel->getBaseURL('REST1.1', $mirror);
     }
 
-    return $info['url'].(extension_loaded('zlib') ? '.tgz' : '.tar');
-  }
-
-  /**
-   * Returns an array of set of possible states sorted from most to least stable.
-   *
-   * @param  string $stability Stability name
-   *
-   * @return array  An array of stability names
-   */
-  protected function getAllowedStates($stability = null)
-  {
-    $stability = null === $stability ? $this->config->get('preferred_state', null, $this->channel) : $stability;
-
-    return array_flip($this->betterStates($stability, true));
-  }
-
-  /**
-   * Proxies method to the PEAR REST10 object.
-   *
-   * @param string $method    The method name
-   * @param array  $arguments An array of arguments
-   */
-  public function __call($method, $arguments)
-  {
-    if (method_exists($this->rest10, $method))
+    /**
+     * Returns an array of set of possible states sorted from most to least stable.
+     *
+     * @param string $stability Stability name
+     *
+     * @return array An array of stability names
+     */
+    protected function getAllowedStates($stability = null)
     {
-      return call_user_func_array(array($this->rest10, $method), $arguments);
+        $stability = null === $stability ? $this->config->get('preferred_state', null, $this->channel) : $stability;
+
+        return array_flip($this->betterStates($stability, true));
     }
-  }
 }
diff --git a/lib/plugin/sfPluginDependencyException.class.php b/lib/plugin/sfPluginDependencyException.class.php
index 24a28f4e2..67ede6c99 100644
--- a/lib/plugin/sfPluginDependencyException.class.php
+++ b/lib/plugin/sfPluginDependencyException.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -11,9 +11,8 @@
 /**
  * sfPluginDependencyException.
  *
- * @package    symfony
- * @subpackage plugin
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfPluginDependencyException extends sfPluginException
diff --git a/lib/plugin/sfPluginException.class.php b/lib/plugin/sfPluginException.class.php
index 7807839ad..6b5a7ae97 100644
--- a/lib/plugin/sfPluginException.class.php
+++ b/lib/plugin/sfPluginException.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -11,9 +11,8 @@
 /**
  * sfPluginException.
  *
- * @package    symfony
- * @subpackage plugin
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfPluginException extends sfException
diff --git a/lib/plugin/sfPluginManager.class.php b/lib/plugin/sfPluginManager.class.php
index 7505f7e9f..ed522d1d2 100644
--- a/lib/plugin/sfPluginManager.class.php
+++ b/lib/plugin/sfPluginManager.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -11,489 +11,437 @@
 /**
  * sfPluginManager allows you to manage plugins installation and uninstallation.
  *
- * @package    symfony
- * @subpackage plugin
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfPluginManager
 {
-  protected
-   $dispatcher  = null,
-   $environment = null,
-   $installing  = array();
-
-  /**
-   * Constructs a new sfPluginManager.
-   *
-   * @param sfEventDispatcher $dispatcher   An event dispatcher instance
-   * @param sfPearEnvironment $environment  A sfPearEnvironment instance
-   */
-  public function __construct(sfEventDispatcher $dispatcher, sfPearEnvironment $environment)
-  {
-    $this->initialize($dispatcher, $environment);
-  }
-
-  /**
-   * Initializes this sfPluginManager instance.
-   *
-   * see sfPearEnvironment for available options.
-   *
-   * @param sfEventDispatcher $dispatcher   An event dispatcher instance
-   * @param sfPearEnvironment $environment  A sfPearEnvironment instance
-   */
-  public function initialize(sfEventDispatcher $dispatcher, sfPearEnvironment $environment)
-  {
-    $this->dispatcher  = $dispatcher;
-    $this->environment = $environment;
-
-    // configure this plugin manager
-    $this->configure();
-  }
-
-  /**
-   * Configures this plugin manager.
-   */
-  public function configure()
-  {
-  }
-
-  /**
-   * Returns the sfPearEnvironment instance.
-   *
-   * @return sfPearEnvironment The sfPearEnvironment instance
-   */
-  public function getEnvironment()
-  {
-    return $this->environment;
-  }
-
-  /**
-   * Returns a list of installed plugin.
-   *
-   * @return array An array of installed plugins
-   */
-  public function getInstalledPlugins()
-  {
-    $installed = array();
-    foreach ($this->environment->getRegistry()->packageInfo(null, null, null) as $channel => $packages)
+    protected $dispatcher;
+    protected $environment;
+    protected $installing = array();
+
+    /**
+     * Constructs a new sfPluginManager.
+     *
+     * @param sfEventDispatcher $dispatcher  An event dispatcher instance
+     * @param sfPearEnvironment $environment A sfPearEnvironment instance
+     */
+    public function __construct(sfEventDispatcher $dispatcher, sfPearEnvironment $environment)
     {
-      foreach ($packages as $package)
-      {
-        $installed[] = $this->environment->getRegistry()->getPackage(isset($package['package']) ? $package['package'] : $package['name'], $channel);
-      }
+        $this->initialize($dispatcher, $environment);
     }
 
-    return $installed;
-  }
-
-  /**
-   * Installs a plugin.
-   *
-   * If you don't pass a version, it will install the latest version available
-   * for the current project symfony version.
-   *
-   * Available options:
-   *
-   *  * channel:      The plugin channel name
-   *  * version:      The version to install
-   *  * stability:    The stability preference
-   *  * install_deps: Whether to automatically install dependencies (default to false)
-   *
-   * @param string $plugin  The plugin name
-   * @param array  $options An array of options
-   *
-   * @return Boolean|string true if the plugin is already installed, the name of the installed plugin otherwise
-   */
-  public function installPlugin($plugin, $options = array())
-  {
-    $this->installing = array();
-
-    return $this->doInstallPlugin($plugin, $options);
-  }
-
-  /**
-   * Installs a plugin
-   *
-   * @see installPlugin()
-   */
-  protected function doInstallPlugin($plugin, $options = array())
-  {
-    $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))
+    /**
+     * Initializes this sfPluginManager instance.
+     *
+     * see sfPearEnvironment for available options.
+     *
+     * @param sfEventDispatcher $dispatcher  An event dispatcher instance
+     * @param sfPearEnvironment $environment A sfPearEnvironment instance
+     */
+    public function initialize(sfEventDispatcher $dispatcher, sfPearEnvironment $environment)
     {
-      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.");
-      }
+        $this->dispatcher = $dispatcher;
+        $this->environment = $environment;
 
-      $download  = $plugin;
-      $isPackage = false;
+        // configure this plugin manager
+        $this->configure();
     }
-    else if (false !== strpos($plugin, '/'))
+
+    /**
+     * Configures this plugin manager.
+     */
+    public function configure()
     {
-      list($channel, $plugin) = explode('/', $plugin);
     }
 
-    $this->dispatcher->notify(new sfEvent($this, 'plugin.pre_install', array('channel' => $channel, 'plugin' => $plugin, 'is_package' => $isPackage)));
+    /**
+     * Returns the sfPearEnvironment instance.
+     *
+     * @return sfPearEnvironment The sfPearEnvironment instance
+     */
+    public function getEnvironment()
+    {
+        return $this->environment;
+    }
 
-    if ($isPackage)
+    /**
+     * Returns a list of installed plugin.
+     *
+     * @return array An array of installed plugins
+     */
+    public function getInstalledPlugins()
     {
-      $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));
-      }
-
-      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));
+        $installed = array();
+        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);
+            }
         }
-      }
-
-      if (!preg_match(PEAR_COMMON_PACKAGE_VERSION_PREG, $version))
-      {
-        throw new sfPluginException(sprintf('Plugin version "%s" is not a valid version', $version));
-      }
 
-      $existing = $this->environment->getRegistry()->packageInfo($plugin, 'version', $channel);
-      if (version_compare($existing, $version) === 0)
-      {
-        $this->dispatcher->notify(new sfEvent($this, 'application.log', array('Plugin is already installed')));
+        return $installed;
+    }
 
-        return true;
-      }
+    /**
+     * Installs a plugin.
+     *
+     * If you don't pass a version, it will install the latest version available
+     * for the current project symfony version.
+     *
+     * Available options:
+     *
+     *  * channel:      The plugin channel name
+     *  * version:      The version to install
+     *  * stability:    The stability preference
+     *  * install_deps: Whether to automatically install dependencies (default to false)
+     *
+     * @param string $plugin  The plugin name
+     * @param array  $options An array of options
+     *
+     * @return bool|string true if the plugin is already installed, the name of the installed plugin otherwise
+     */
+    public function installPlugin($plugin, $options = array())
+    {
+        $this->installing = array();
 
-      // skip if the plugin is already installing and we are here through a dependency)
-      if (isset($this->installing[$channel.'/'.$plugin]))
-      {
-        return true;
-      }
-
-      // 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()));
-      }
+        return $this->doInstallPlugin($plugin, $options);
     }
 
-    // download the plugin and install
-    $class = $this->environment->getOption('downloader_base_class');
-    $downloader = new $class($this, array('upgrade' => true), $this->environment->getConfig());
+    /**
+     * Uninstalls a plugin.
+     *
+     * @param string $plugin  The plugin name
+     * @param string $channel The channel name
+     */
+    public function uninstallPlugin($plugin, $channel = null)
+    {
+        if (false !== strpos($plugin, '/')) {
+            list($channel, $plugin) = explode('/', $plugin);
+        }
 
-    $this->installing[$channel.'/'.$plugin] = true;
+        $channel = null === $channel ? $this->environment->getConfig()->get('default_channel') : $channel;
 
-    if ($isPackage)
-    {
-      $this->checkPluginDependencies($plugin, $version, array(
-        'install_deps' => isset($options['install_deps']) ? (bool) $options['install_deps'] : false,
-        'stability'    => $stability,
-      ));
-    }
+        $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))));
 
-    // 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()));
+            return false;
+        }
+
+        $this->dispatcher->notify(new sfEvent($this, 'plugin.pre_uninstall', array('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->setUninstallPackages($packages);
+        $ret = $installer->uninstall($package);
+        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, 'plugin.post_uninstall', array('channel' => $channel, 'plugin' => $plugin)));
+        } else {
+            throw new sfPluginException(sprintf('Uninstallation of "%s" plugin failed', $plugin));
+        }
+
+        return $ret;
     }
-    $errors = $downloader->getErrorMsgs();
-    if (count($errors))
+
+    /**
+     * Checks all plugin dependencies.
+     *
+     * Available options:
+     *
+     *  * stability:    The stability preference
+     *  * install_deps: Whether to automatically install dependencies (default to false)
+     *
+     * @param string $plugin  The plugin name
+     * @param string $version The plugin version
+     * @param array  $options An array of options
+     */
+    public function checkPluginDependencies($plugin, $version, $options = false)
     {
-      $err = array();
-      foreach ($errors as $error)
-      {
-        $err[] = $error;
-      }
-
-      if (!count($downloaded))
-      {
-        throw new sfPluginException(sprintf('Plugin "%s" installation failed: %s', $plugin, implode("\n", $err)));
-      }
-    }
+        $dependencies = $this->environment->getRest()->getPluginDependencies($plugin, $version);
 
-    $pluginPackage = $downloaded[0];
+        if (!isset($dependencies['required']) || !isset($dependencies['required']['package'])) {
+            return;
+        }
 
-    $installer = new PEAR_Installer($this);
-    $installer->setOptions(array('upgrade' => true));
-    $packages = array($pluginPackage);
-    $installer->sortPackagesForInstall($packages);
-    PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-    $err = $installer->setDownloadedPackages($packages);
-    if (PEAR::isError($err))
-    {
-      PEAR::staticPopErrorHandling();
-      throw new sfPluginException($err->getMessage());
+        $deps = $dependencies['required']['package'];
+        if (!isset($deps[0])) {
+            $deps = array($deps);
+        }
+
+        foreach ($deps as $dependency) {
+            if (!$this->checkDependency($dependency)) {
+                $version = (isset($dependency['min']) ? ' >= '.$dependency['min'] : '').(isset($dependency['max']) ? ' <= '.$dependency['max'] : '').(isset($dependency['exclude']) ? ' exclude '.$dependency['exclude'] : '');
+
+                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()));
+                    }
+
+                    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']));
+            }
+        }
     }
 
-    $info = $installer->install($pluginPackage, array('upgrade' => true));
-    PEAR::staticPopErrorHandling();
-    if (PEAR::isError($info))
+    /**
+     * Gets the "best" version available for a given plugin.
+     *
+     * @param string $plugin    The plugin name
+     * @param string $stability The stability name
+     *
+     * @return string The version
+     */
+    public function getPluginVersion($plugin, $stability = null)
     {
-      throw new sfPluginException(sprintf('Installation of "%s" plugin failed: %s', $plugin, $info->getMessage()));
+        $versions = $this->environment->getRest()->getPluginVersions($plugin, $stability);
+        foreach ($versions as $version) {
+            if (!$this->isPluginCompatible($plugin, $version)) {
+                continue;
+            }
+
+            return $version;
+        }
+
+        throw new sfPluginDependencyException(sprintf('No release available for plugin "%s" in state "%s" that satisfies the application requirements.', $plugin, $stability));
     }
 
-    if (is_array($info))
+    /**
+     * Returns true if the plugin is comptatible with your environment.
+     *
+     * @param string $plugin  The plugin name
+     * @param string $version The plugin version
+     *
+     * @return bool true if the plugin is compatible, false otherwise
+     */
+    public function isPluginCompatible($plugin, $version)
     {
-      $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Installation successful for plugin "%s"', $plugin))));
+        $dependencies = $this->environment->getRest()->getPluginDependencies($plugin, $version);
 
-      $this->dispatcher->notify(new sfEvent($this, 'plugin.post_install', array('channel' => $channel, 'plugin' => $pluginPackage->getPackage())));
+        if (!isset($dependencies['required']) || !isset($dependencies['required']['package'])) {
+            return true;
+        }
 
-      unset($this->installing[$channel.'/'.$plugin]);
+        $deps = $dependencies['required']['package'];
+        if (!isset($deps[0])) {
+            $deps = array($deps);
+        }
 
-      return $pluginPackage->getPackage();
+        foreach ($deps as $dependency) {
+            if (!$this->isPluginCompatibleWithDependency($dependency)) {
+                return false;
+            }
+        }
+
+        return true;
     }
-    else
+
+    /**
+     * Returns the license for a given plugin.
+     *
+     * @param string $plugin  The plugin name
+     * @param array  $options An array of options
+     *
+     * @return string The license
+     *
+     * @see installPlugin() for available options
+     */
+    public function getPluginLicense($plugin, $options = array())
     {
-      throw new sfPluginException(sprintf('Installation of "%s" plugin failed', $plugin));
+        $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;
+
+        $rest = $this->environment->getRest();
+        $rest->setChannel(null === $channel ? $this->environment->getConfig()->get('default_channel') : $channel);
+
+        if (null === $version) {
+            try {
+                $version = $this->getPluginVersion($plugin, $stability);
+            } 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));
+            }
+        }
+
+        return $rest->getPluginLicense($plugin, $version);
     }
-  }
-
-  /**
-   * Uninstalls a plugin.
-   *
-   * @param string $plugin  The plugin name
-   * @param string $channel The channel name
-   */
-  public function uninstallPlugin($plugin, $channel = null)
-  {
-    if (false !== strpos($plugin, '/'))
+
+    /**
+     * Installs a plugin.
+     *
+     * @see installPlugin()
+     *
+     * @param mixed $plugin
+     * @param mixed $options
+     */
+    protected function doInstallPlugin($plugin, $options = array())
     {
-      list($channel, $plugin) = explode('/', $plugin);
-    }
+        $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.");
+            }
+
+            $download = $plugin;
+            $isPackage = false;
+        } elseif (false !== strpos($plugin, '/')) {
+            list($channel, $plugin) = explode('/', $plugin);
+        }
 
-    $channel = null === $channel ? $this->environment->getConfig()->get('default_channel') : $channel;
+        $this->dispatcher->notify(new sfEvent($this, 'plugin.pre_install', array('channel' => $channel, 'plugin' => $plugin, 'is_package' => $isPackage)));
 
-    $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))));
+        if ($isPackage) {
+            $this->environment->getRest()->setChannel($channel);
 
-      return false;
-    }
+            if (!preg_match(PEAR_COMMON_PACKAGE_NAME_PREG, $plugin)) {
+                throw new sfPluginException(sprintf('Plugin name "%s" is not a valid package name', $plugin));
+            }
 
-    $this->dispatcher->notify(new sfEvent($this, 'plugin.pre_uninstall', array('channel' => $channel, 'plugin' => $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));
+                }
+            }
 
-    $package = $this->environment->getRegistry()->parsePackageName($plugin, $channel);
+            if (!preg_match(PEAR_COMMON_PACKAGE_VERSION_PREG, $version)) {
+                throw new sfPluginException(sprintf('Plugin version "%s" is not a valid version', $version));
+            }
 
-    $installer = new PEAR_Installer($this);
-    $packages = array($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()));
-    }
+            $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')));
 
-    if ($ret)
-    {
-      $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Uninstallation successful for plugin "%s"', $plugin))));
+                return true;
+            }
 
-      $this->dispatcher->notify(new sfEvent($this, 'plugin.post_uninstall', array('channel' => $channel, 'plugin' => $plugin)));
-    }
-    else
-    {
-      throw new sfPluginException(sprintf('Uninstallation of "%s" plugin failed', $plugin));
-    }
+            // skip if the plugin is already installing and we are here through a dependency)
+            if (isset($this->installing[$channel.'/'.$plugin])) {
+                return true;
+            }
 
-    return $ret;
-  }
-
-  /**
-   * Checks all plugin dependencies.
-   *
-   * Available options:
-   *
-   *  * stability:    The stability preference
-   *  * install_deps: Whether to automatically install dependencies (default to false)
-   *
-   * @param string $plugin  The plugin name
-   * @param string $version The plugin version
-   * @param array  $options An array of options
-   */
-  public function checkPluginDependencies($plugin, $version, $options = false)
-  {
-    $dependencies = $this->environment->getRest()->getPluginDependencies($plugin, $version);
-
-    if (!isset($dependencies['required']) || !isset($dependencies['required']['package']))
-    {
-      return;
-    }
+            // 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()));
+            }
+        }
 
-    $deps = $dependencies['required']['package'];
-    if (!isset($deps[0]))
-    {
-      $deps = array($deps);
-    }
+        // download the plugin and install
+        $class = $this->environment->getOption('downloader_base_class');
+        $downloader = new $class($this, array('upgrade' => true), $this->environment->getConfig());
 
-    foreach ($deps as $dependency)
-    {
-      if (!$this->checkDependency($dependency))
-      {
-        $version = (isset($dependency['min']) ? ' >= '.$dependency['min'] : '').(isset($dependency['max']) ? ' <= '.$dependency['max'] : '').(isset($dependency['exclude']) ? ' exclude '.$dependency['exclude'] : '');
-
-        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()));
-          }
-
-          continue;
+        $this->installing[$channel.'/'.$plugin] = true;
+
+        if ($isPackage) {
+            $this->checkPluginDependencies($plugin, $version, array(
+                'install_deps' => isset($options['install_deps']) ? (bool) $options['install_deps'] : false,
+                'stability' => $stability,
+            ));
         }
 
-        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']));
-      }
-    }
-  }
-
-  /**
-   * Gets the "best" version available for a given plugin.
-   *
-   * @param  string $plugin     The plugin name
-   * @param  string $stability  The stability name
-   *
-   * @return string The version
-   */
-  public function getPluginVersion($plugin, $stability = null)
-  {
-    $versions = $this->environment->getRest()->getPluginVersions($plugin, $stability);
-    foreach ($versions as $version)
-    {
-      if (!$this->isPluginCompatible($plugin, $version))
-      {
-        continue;
-      }
+        // 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()));
+        }
+        $errors = $downloader->getErrorMsgs();
+        if (count($errors)) {
+            $err = array();
+            foreach ($errors as $error) {
+                $err[] = $error;
+            }
+
+            if (!count($downloaded)) {
+                throw new sfPluginException(sprintf('Plugin "%s" installation failed: %s', $plugin, implode("\n", $err)));
+            }
+        }
 
-      return $version;
-    }
+        $pluginPackage = $downloaded[0];
 
-    throw new sfPluginDependencyException(sprintf('No release available for plugin "%s" in state "%s" that satisfies the application requirements.', $plugin, $stability));
-  }
-
-  /**
-   * Returns true if the plugin is comptatible with your environment.
-   *
-   * @param  string $plugin   The plugin name
-   * @param  string $version  The plugin version
-   *
-   * @return Boolean true if the plugin is compatible, false otherwise
-   */
-  public function isPluginCompatible($plugin, $version)
-  {
-    $dependencies = $this->environment->getRest()->getPluginDependencies($plugin, $version);
-
-    if (!isset($dependencies['required']) || !isset($dependencies['required']['package']))
-    {
-      return true;
-    }
+        $installer = new PEAR_Installer($this);
+        $installer->setOptions(array('upgrade' => true));
+        $packages = array($pluginPackage);
+        $installer->sortPackagesForInstall($packages);
+        PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
+        $err = $installer->setDownloadedPackages($packages);
+        if (PEAR::isError($err)) {
+            PEAR::staticPopErrorHandling();
 
-    $deps = $dependencies['required']['package'];
-    if (!isset($deps[0]))
-    {
-      $deps = array($deps);
-    }
+            throw new sfPluginException($err->getMessage());
+        }
 
-    foreach ($deps as $dependency)
-    {
-      if (!$this->isPluginCompatibleWithDependency($dependency))
-      {
-        return false;
-      }
-    }
+        $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()));
+        }
 
-    return true;
-  }
-
-  /**
-   * Returns the license for a given plugin.
-   *
-   * @param string $plugin    The plugin name
-   * @param array  $options   An array of options
-   *
-   * @return string The license
-   *
-   * @see installPlugin() for available options
-   */
-  public function getPluginLicense($plugin, $options = array())
-  {
-    $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;
-
-    $rest = $this->environment->getRest();
-    $rest->setChannel(null === $channel ? $this->environment->getConfig()->get('default_channel') : $channel);
-
-    if (null === $version)
-    {
-      try
-      {
-        $version = $this->getPluginVersion($plugin, $stability);
-      }
-      catch (Exception $e)
-      {
-        // no release available
-        return false;
-      }
+        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, 'plugin.post_install', array('channel' => $channel, 'plugin' => $pluginPackage->getPackage())));
+
+            unset($this->installing[$channel.'/'.$plugin]);
+
+            return $pluginPackage->getPackage();
+        }
+
+        throw new sfPluginException(sprintf('Installation of "%s" plugin failed', $plugin));
     }
-    else
+
+    /**
+     * Returns true if the plugin is comptatible with the dependency.
+     *
+     * @param array $dependency An dependency array
+     *
+     * @return bool true if the plugin is compatible, false otherwise
+     */
+    protected function isPluginCompatibleWithDependency($dependency)
     {
-      if (!$this->isPluginCompatible($plugin, $version))
-      {
-        throw new sfPluginDependencyException(sprintf('Plugin "%s" in version "%s" is not compatible with the current application', $plugin, $version));
-      }
+        return true;
     }
 
-    return $rest->getPluginLicense($plugin, $version);
-  }
-
-  /**
-   * Returns true if the plugin is comptatible with the dependency.
-   *
-   * @param  array   $dependency An dependency array
-   *
-   * @return Boolean true if the plugin is compatible, false otherwise
-   */
-  protected function isPluginCompatibleWithDependency($dependency)
-  {
-    return true;
-  }
-
-  /**
-   * Checks that the dependency is valid.
-   *
-   * @param  array   $dependency A dependency array
-   *
-   * @return Boolean true if the dependency is valid, false otherwise
-   */
-  protected function checkDependency($dependency)
-  {
-    $dependencyChecker = new PEAR_Dependency2($this->environment->getConfig(), array(), array('package' => '', 'channel' => ''));
-
-    PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-    $e = $dependencyChecker->validatePackageDependency($dependency, true, array());
-    PEAR::staticPopErrorHandling();
-    if (PEAR::isError($e))
+    /**
+     * Checks that the dependency is valid.
+     *
+     * @param array $dependency A dependency array
+     *
+     * @return bool true if the dependency is valid, false otherwise
+     */
+    protected function checkDependency($dependency)
     {
-      return false;
-    }
+        $dependencyChecker = new PEAR_Dependency2($this->environment->getConfig(), array(), array('package' => '', 'channel' => ''));
+
+        PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
+        $e = $dependencyChecker->validatePackageDependency($dependency, true, array());
+        PEAR::staticPopErrorHandling();
+        if (PEAR::isError($e)) {
+            return false;
+        }
 
-    return true;
-  }
+        return true;
+    }
 }
diff --git a/lib/plugin/sfPluginRecursiveDependencyException.class.php b/lib/plugin/sfPluginRecursiveDependencyException.class.php
index 2fbc8f998..b4171d0ff 100644
--- a/lib/plugin/sfPluginRecursiveDependencyException.class.php
+++ b/lib/plugin/sfPluginRecursiveDependencyException.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -11,9 +11,8 @@
 /**
  * sfPluginRecursiveDependencyException.
  *
- * @package    symfony
- * @subpackage plugin
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfPluginRecursiveDependencyException extends sfPluginException
diff --git a/lib/plugin/sfPluginRestException.class.php b/lib/plugin/sfPluginRestException.class.php
index 2f28c606d..92d9dcdc7 100644
--- a/lib/plugin/sfPluginRestException.class.php
+++ b/lib/plugin/sfPluginRestException.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -11,9 +11,8 @@
 /**
  * sfPluginRestException.
  *
- * @package    symfony
- * @subpackage plugin
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfPluginRestException extends sfPluginException
diff --git a/lib/plugin/sfSymfonyPluginManager.class.php b/lib/plugin/sfSymfonyPluginManager.class.php
index e68709ca1..2e37ea6d3 100644
--- a/lib/plugin/sfSymfonyPluginManager.class.php
+++ b/lib/plugin/sfSymfonyPluginManager.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -11,216 +11,206 @@
 /**
  * sfSymfonyPluginManager allows you to manage symfony plugins installation and uninstallation.
  *
- * @package    symfony
- * @subpackage plugin
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfSymfonyPluginManager extends sfPluginManager
 {
-  /**
-   * Initializes this sfPluginManager instance.
-   *
-   * Available options:
-   *
-   * * web_dir: The directory where to plugins assets (images, stylesheets, javascripts, ...)
-   *
-   * See sfPluginManager for other options.
-   *
-   * @param sfEventDispatcher $dispatcher   An event dispatcher instance
-   * @param sfPearEnvironment $environment  A sfPearEnvironment instance
-   */
-  public function initialize(sfEventDispatcher $dispatcher, sfPearEnvironment $environment)
-  {
-    parent::initialize($dispatcher, $environment);
-
-    if (!$environment->getOption('web_dir'))
+    /**
+     * Initializes this sfPluginManager instance.
+     *
+     * Available options:
+     *
+     * * web_dir: The directory where to plugins assets (images, stylesheets, javascripts, ...)
+     *
+     * See sfPluginManager for other options.
+     *
+     * @param sfEventDispatcher $dispatcher  An event dispatcher instance
+     * @param sfPearEnvironment $environment A sfPearEnvironment instance
+     */
+    public function initialize(sfEventDispatcher $dispatcher, sfPearEnvironment $environment)
     {
-      throw new sfPluginException('You must provide a "web_dir" option.');
+        parent::initialize($dispatcher, $environment);
+
+        if (!$environment->getOption('web_dir')) {
+            throw new sfPluginException('You must provide a "web_dir" option.');
+        }
     }
-  }
-
-  /**
-   * Configures this plugin manager.
-   */
-  public function configure()
-  {
-    // register symfony channel
-    $this->environment->registerChannel('pear.symfony-project.com', true);
-
-    // register symfony plugins channel
-    $this->environment->registerChannel('plugins.symfony-project.org', true);
-
-    // register symfony for dependencies
-    $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'));
-  }
-
-  /**
-   * Installs web content for a plugin.
-   *
-   * @param string $plugin The plugin name
-   */
-  public function installWebContent($plugin, $sourceDirectory)
-  {
-    $webDir = $sourceDirectory.DIRECTORY_SEPARATOR.$plugin.DIRECTORY_SEPARATOR.'web';
-    if (is_dir($webDir))
+
+    /**
+     * Configures this plugin manager.
+     */
+    public function configure()
     {
-      $this->dispatcher->notify(new sfEvent($this, 'application.log', array('Installing web data for plugin')));
+        // register symfony channel
+        $this->environment->registerChannel('pear.symfony-project.com', true);
 
-      $filesystem = new sfFilesystem();
-      $filesystem->relativeSymlink($webDir, $this->environment->getOption('web_dir').DIRECTORY_SEPARATOR.$plugin, true);
+        // register symfony plugins channel
+        $this->environment->registerChannel('plugins.symfony-project.org', true);
+
+        // register symfony for dependencies
+        $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'));
     }
-  }
-
-  /**
-   * Unnstalls web content for a plugin.
-   *
-   * @param string $plugin The plugin name
-   */
-  public function uninstallWebContent($plugin)
-  {
-    $targetDir = $this->environment->getOption('web_dir').DIRECTORY_SEPARATOR.$plugin;
-    if (is_dir($targetDir))
+
+    /**
+     * Installs web content for a plugin.
+     *
+     * @param string $plugin          The plugin name
+     * @param mixed  $sourceDirectory
+     */
+    public function installWebContent($plugin, $sourceDirectory)
     {
-      $this->dispatcher->notify(new sfEvent($this, 'application.log', array('Uninstalling web data for plugin')));
-
-      $filesystem = new sfFilesystem();
-
-      if (is_link($targetDir))
-      {
-        $filesystem->remove($targetDir);
-      }
-      else
-      {
-        $filesystem->remove(sfFinder::type('any')->in($targetDir));
-        $filesystem->remove($targetDir);
-      }
+        $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')));
+
+            $filesystem = new sfFilesystem();
+            $filesystem->relativeSymlink($webDir, $this->environment->getOption('web_dir').DIRECTORY_SEPARATOR.$plugin, true);
+        }
     }
-  }
-
-  /**
-   * Enables a plugin in the ProjectConfiguration class.
-   *
-   * This is a static method that does not rely on the PEAR environment
-   * as we don't want this method to have PEAR as a dependency.
-   *
-   * @param string $plugin    The name of the plugin
-   * @param string $configDir The config directory
-   */
-  static public function enablePlugin($plugin, $configDir)
-  {
-    if (!$configDir)
+
+    /**
+     * Unnstalls web content for a plugin.
+     *
+     * @param string $plugin The plugin name
+     */
+    public function uninstallWebContent($plugin)
     {
-      throw new sfPluginException('You must provide a "config_dir" option.');
+        $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')));
+
+            $filesystem = new sfFilesystem();
+
+            if (is_link($targetDir)) {
+                $filesystem->remove($targetDir);
+            } else {
+                $filesystem->remove(sfFinder::type('any')->in($targetDir));
+                $filesystem->remove($targetDir);
+            }
+        }
     }
 
-    $manipulator = sfClassManipulator::fromFile($configDir.'/ProjectConfiguration.class.php');
-    $manipulator->wrapMethod('setup', '', sprintf('$this->enablePlugins(\'%s\');', $plugin));
-    $manipulator->save();
-  }
-
-  /**
-   * Disables a plugin in the ProjectConfiguration class.
-   *
-   * This is a static method that does not rely on the PEAR environment
-   * as we don't want this method to have PEAR as a dependency.
-   *
-   * @param string $plugin The name of the plugin
-   * @param string $configDir The config directory
-   */
-  static public function disablePlugin($plugin, $configDir)
-  {
-    if (!$configDir)
+    /**
+     * Enables a plugin in the ProjectConfiguration class.
+     *
+     * This is a static method that does not rely on the PEAR environment
+     * as we don't want this method to have PEAR as a dependency.
+     *
+     * @param string $plugin    The name of the plugin
+     * @param string $configDir The config directory
+     */
+    public static function enablePlugin($plugin, $configDir)
     {
-      throw new sfPluginException('You must provide a "config_dir" option.');
+        if (!$configDir) {
+            throw new sfPluginException('You must provide a "config_dir" option.');
+        }
+
+        $manipulator = sfClassManipulator::fromFile($configDir.'/ProjectConfiguration.class.php');
+        $manipulator->wrapMethod('setup', '', sprintf('$this->enablePlugins(\'%s\');', $plugin));
+        $manipulator->save();
     }
 
-    $file = $configDir.'/ProjectConfiguration.class.php';
-    $source = file_get_contents($file);
-
-    $source = preg_replace(sprintf('# *\$this\->enablePlugins\(array\(([^\)]+), *\'%s\'([^\)]*)\)\)#', $plugin), '$this->enablePlugins(array($1$2))', $source);
-    $source = preg_replace(sprintf('# *\$this\->enablePlugins\(array\(\'%s\', *([^\)]*)\)\)#', $plugin), '$this->enablePlugins(array($1))', $source);
-    $source = preg_replace(sprintf('# *\$this\->enablePlugins\(\'%s\'\); *\n?#', $plugin), '', $source);
-    $source = preg_replace(sprintf('# *\$this\->enablePlugins\(array\(\'%s\'\)\); *\n?#', $plugin), '', $source);
-    $source = preg_replace(sprintf('# *\$this\->enablePlugins\(array\(\)\); *\n?#', $plugin), '', $source);
-
-    file_put_contents($file, $source);
-  }
-
-  /**
-   * Listens to the plugin.post_install event.
-   *
-   * @param sfEvent $event An sfEvent instance
-   */
-  public function listenToPluginPostInstall($event)
-  {
-    $this->installWebContent($event['plugin'], isset($event['plugin_dir']) ? $event['plugin_dir'] : $this->environment->getOption('plugin_dir'));
-
-    $this->enablePlugin($event['plugin'], $this->environment->getOption('config_dir'));
-  }
-
-  /**
-   * Listens to the plugin.post_uninstall event.
-   *
-   * @param sfEvent $event An sfEvent instance
-   */
-  public function listenToPluginPostUninstall($event)
-  {
-    $this->uninstallWebContent($event['plugin']);
-
-    $this->disablePlugin($event['plugin'], $this->environment->getOption('config_dir'));
-  }
-
-  /**
-   * Registers the symfony package for the current version.
-   */
-  protected function registerSymfonyPackage()
-  {
-    $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->setReleaseVersion(preg_replace('/\-\w+$/', '', SYMFONY_VERSION));
-    $symfony->setReleaseStability(false === strpos(SYMFONY_VERSION, 'DEV') ? 'stable' : 'beta');
-    $symfony->setDate(date('Y-m-d'));
-    $symfony->setDescription('symfony');
-    $symfony->setSummary('symfony');
-    $symfony->setLicense('MIT License');
-    $symfony->clearContents();
-    $symfony->resetFilelist();
-    $symfony->addMaintainer('lead', 'fabpot', 'Fabien Potencier', 'fabien.potencier@symfony-project.com');
-    $symfony->setNotes('-');
-    $symfony->setPearinstallerDep('1.4.3');
-    $symfony->setPhpDep('5.2.4');
-
-    $this->environment->getRegistry()->deletePackage('symfony', 'pear.symfony-project.com');
-    if (!$this->environment->getRegistry()->addPackage2($symfony))
+    /**
+     * Disables a plugin in the ProjectConfiguration class.
+     *
+     * This is a static method that does not rely on the PEAR environment
+     * as we don't want this method to have PEAR as a dependency.
+     *
+     * @param string $plugin    The name of the plugin
+     * @param string $configDir The config directory
+     */
+    public static function disablePlugin($plugin, $configDir)
     {
-      throw new sfPluginException('Unable to register the symfony package');
+        if (!$configDir) {
+            throw new sfPluginException('You must provide a "config_dir" option.');
+        }
+
+        $file = $configDir.'/ProjectConfiguration.class.php';
+        $source = file_get_contents($file);
+
+        $source = preg_replace(sprintf('# *\$this\->enablePlugins\(array\(([^\)]+), *\'%s\'([^\)]*)\)\)#', $plugin), '$this->enablePlugins(array($1$2))', $source);
+        $source = preg_replace(sprintf('# *\$this\->enablePlugins\(array\(\'%s\', *([^\)]*)\)\)#', $plugin), '$this->enablePlugins(array($1))', $source);
+        $source = preg_replace(sprintf('# *\$this\->enablePlugins\(\'%s\'\); *\n?#', $plugin), '', $source);
+        $source = preg_replace(sprintf('# *\$this\->enablePlugins\(array\(\'%s\'\)\); *\n?#', $plugin), '', $source);
+        $source = preg_replace(sprintf('# *\$this\->enablePlugins\(array\(\)\); *\n?#', $plugin), '', $source);
+
+        file_put_contents($file, $source);
     }
-  }
-
-  /**
-   * Returns true if the plugin is comptatible with the dependency.
-   *
-   * @param  array   $dependency A dependency array
-   *
-   * @return Boolean true if the plugin is compatible, false otherwise
-   */
-  protected function isPluginCompatibleWithDependency($dependency)
-  {
-    if (isset($dependency['channel']) && 'symfony' == $dependency['name'] && 'pear.symfony-project.com' == $dependency['channel'])
+
+    /**
+     * Listens to the plugin.post_install event.
+     *
+     * @param sfEvent $event An sfEvent instance
+     */
+    public function listenToPluginPostInstall($event)
+    {
+        $this->installWebContent($event['plugin'], isset($event['plugin_dir']) ? $event['plugin_dir'] : $this->environment->getOption('plugin_dir'));
+
+        $this->enablePlugin($event['plugin'], $this->environment->getOption('config_dir'));
+    }
+
+    /**
+     * Listens to the plugin.post_uninstall event.
+     *
+     * @param sfEvent $event An sfEvent instance
+     */
+    public function listenToPluginPostUninstall($event)
+    {
+        $this->uninstallWebContent($event['plugin']);
+
+        $this->disablePlugin($event['plugin'], $this->environment->getOption('config_dir'));
+    }
+
+    /**
+     * Registers the symfony package for the current version.
+     */
+    protected function registerSymfonyPackage()
     {
-      return $this->checkDependency($dependency);
+        $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->setReleaseVersion(preg_replace('/\-\w+$/', '', SYMFONY_VERSION));
+        $symfony->setReleaseStability(false === strpos(SYMFONY_VERSION, 'DEV') ? 'stable' : 'beta');
+        $symfony->setDate(date('Y-m-d'));
+        $symfony->setDescription('symfony');
+        $symfony->setSummary('symfony');
+        $symfony->setLicense('MIT License');
+        $symfony->clearContents();
+        $symfony->resetFilelist();
+        $symfony->addMaintainer('lead', 'fabpot', 'Fabien Potencier', 'fabien.potencier@symfony-project.com');
+        $symfony->setNotes('-');
+        $symfony->setPearinstallerDep('1.4.3');
+        $symfony->setPhpDep('5.2.4');
+
+        $this->environment->getRegistry()->deletePackage('symfony', 'pear.symfony-project.com');
+        if (!$this->environment->getRegistry()->addPackage2($symfony)) {
+            throw new sfPluginException('Unable to register the symfony package');
+        }
     }
 
-    return true;
-  }
+    /**
+     * Returns true if the plugin is comptatible with the dependency.
+     *
+     * @param array $dependency A dependency array
+     *
+     * @return bool true if the plugin is compatible, false otherwise
+     */
+    protected function isPluginCompatibleWithDependency($dependency)
+    {
+        if (isset($dependency['channel']) && 'symfony' == $dependency['name'] && 'pear.symfony-project.com' == $dependency['channel']) {
+            return $this->checkDependency($dependency);
+        }
+
+        return true;
+    }
 }
diff --git a/lib/plugins/sfDoctrinePlugin/config/sfDoctrinePluginConfiguration.class.php b/lib/plugins/sfDoctrinePlugin/config/sfDoctrinePluginConfiguration.class.php
index 57ac53f9d..93fca6719 100755
--- a/lib/plugins/sfDoctrinePlugin/config/sfDoctrinePluginConfiguration.class.php
+++ b/lib/plugins/sfDoctrinePlugin/config/sfDoctrinePluginConfiguration.class.php
@@ -9,97 +9,92 @@
  */
 
 /**
- * sfDoctrinePluginConfiguration Class
+ * sfDoctrinePluginConfiguration Class.
  *
- * @package    symfony
- * @subpackage doctrine
  * @author     Jonathan H. Wage <jonwage@gmail.com>
+ *
  * @version    SVN: $Id$
  */
 class sfDoctrinePluginConfiguration extends sfPluginConfiguration
 {
-  /**
-   * @see sfPluginConfiguration
-   */
-  public function initialize()
-  {
-    sfConfig::set('sf_orm', 'doctrine');
-
-    if (!sfConfig::get('sf_admin_module_web_dir'))
+    /**
+     * @see sfPluginConfiguration
+     */
+    public function initialize()
     {
-      sfConfig::set('sf_admin_module_web_dir', '/sfDoctrinePlugin');
-    }
+        sfConfig::set('sf_orm', 'doctrine');
 
-    if (sfConfig::get('sf_web_debug'))
-    {
-      require_once dirname(__FILE__).'/../lib/debug/sfWebDebugPanelDoctrine.class.php';
+        if (!sfConfig::get('sf_admin_module_web_dir')) {
+            sfConfig::set('sf_admin_module_web_dir', '/sfDoctrinePlugin');
+        }
 
-      $this->dispatcher->connect('debug.web.load_panels', array('sfWebDebugPanelDoctrine', 'listenToAddPanelEvent'));
-    }
+        if (sfConfig::get('sf_web_debug')) {
+            require_once dirname(__FILE__).'/../lib/debug/sfWebDebugPanelDoctrine.class.php';
 
-    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'));
-    }
+            $this->dispatcher->connect('debug.web.load_panels', array('sfWebDebugPanelDoctrine', 'listenToAddPanelEvent'));
+        }
 
-    $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);
+        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'));
+        }
 
-    // apply default attributes
-    $manager->setDefaultAttributes();
+        $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);
 
-    // configure doctrine through the dispatcher
-    $this->dispatcher->notify(new sfEvent($manager, 'doctrine.configure'));
+        // apply default attributes
+        $manager->setDefaultAttributes();
 
-    // make sure the culture is intercepted
-    $this->dispatcher->connect('user.change_culture', array('sfDoctrineRecord', 'listenToChangeCultureEvent'));
-  }
+        // configure doctrine through the dispatcher
+        $this->dispatcher->notify(new sfEvent($manager, 'doctrine.configure'));
 
-  /**
-   * Returns options for the Doctrine schema builder.
-   *
-   * @return array
-   */
-  public function getModelBuilderOptions()
-  {
-    $options = array(
-      'generateBaseClasses'  => true,
-      'generateTableClasses' => true,
-      'packagesPrefix'       => 'Plugin',
-      'suffix'               => '.class.php',
-      'baseClassesDirectory' => 'base',
-      'baseClassName'        => 'sfDoctrineRecord',
-    );
+        // make sure the culture is intercepted
+        $this->dispatcher->connect('user.change_culture', array('sfDoctrineRecord', 'listenToChangeCultureEvent'));
+    }
 
-    // filter options through the dispatcher
-    return $this->dispatcher
-      ->filter(new sfEvent($this, 'doctrine.filter_model_builder_options'), $options)
-      ->getReturnValue();
-  }
+    /**
+     * Returns options for the Doctrine schema builder.
+     *
+     * @return array
+     */
+    public function getModelBuilderOptions()
+    {
+        $options = array(
+            'generateBaseClasses' => true,
+            'generateTableClasses' => true,
+            'packagesPrefix' => 'Plugin',
+            'suffix' => '.class.php',
+            'baseClassesDirectory' => 'base',
+            'baseClassName' => 'sfDoctrineRecord',
+        );
 
-  /**
-   * Returns a configuration array for the Doctrine CLI.
-   *
-   * @return array
-   */
-  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',
-    );
+        // filter options through the dispatcher
+        return $this->dispatcher
+            ->filter(new sfEvent($this, 'doctrine.filter_model_builder_options'), $options)
+            ->getReturnValue()
+        ;
+    }
 
-    // filter config through the dispatcher
-    $config = $this->dispatcher->filter(new sfEvent($this, 'doctrine.filter_cli_config'), $config)->getReturnValue();
+    /**
+     * Returns a configuration array for the Doctrine CLI.
+     *
+     * @return array
+     */
+    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',
+        );
 
-    return $config;
-  }
+        // filter config through the dispatcher
+        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 cdc198e55..0bc9d1400 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/cli/sfDoctrineCli.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/cli/sfDoctrineCli.class.php
@@ -10,62 +10,60 @@
  */
 
 /**
- * sfDoctrineCli
+ * sfDoctrineCli.
  *
- * @package    symfony
- * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
+ *
  * @version    SVN: $Id$
  */
 class sfDoctrineCli extends Doctrine_Cli
 {
-  protected $symfonyDispatcher,
-            $symfonyFormatter;
+    protected $symfonyDispatcher;
+    protected $symfonyFormatter;
 
-  /**
-   * Set the symfony dispatcher of the cli instance
-   *
-   * @param object $dispatcher
-   * @return void
-   */
-  public function setSymfonyDispatcher($dispatcher)
-  {
-    $this->symfonyDispatcher = $dispatcher;
-  }
+    /**
+     * Set the symfony dispatcher of the cli instance.
+     *
+     * @param object $dispatcher
+     */
+    public function setSymfonyDispatcher($dispatcher)
+    {
+        $this->symfonyDispatcher = $dispatcher;
+    }
 
-  /**
-   * Set the symfony formatter to use for the cli
-   *
-   * @param object $formatter
-   * @return void
-   */
-  public function setSymfonyFormatter($formatter)
-  {
-    $this->symfonyFormatter = $formatter;
-  }
+    /**
+     * Set the symfony formatter to use for the cli.
+     *
+     * @param object $formatter
+     */
+    public function setSymfonyFormatter($formatter)
+    {
+        $this->symfonyFormatter = $formatter;
+    }
 
-  /**
-   * Notify the dispatcher of a message. We silent the messages from the Doctrine cli.
-   *
-   * @param string $notification
-   * @param string $style
-   * @return false
-   */
-  public function notify($notification = null, $style = 'HEADER')
-  {
-    $this->symfonyDispatcher->notify(new sfEvent($this, 'command.log', array($this->symfonyFormatter->formatSection('doctrine', $notification))));
-  }
+    /**
+     * Notify the dispatcher of a message. We silent the messages from the Doctrine cli.
+     *
+     * @param string $notification
+     * @param string $style
+     *
+     * @return false
+     */
+    public function notify($notification = null, $style = 'HEADER')
+    {
+        $this->symfonyDispatcher->notify(new sfEvent($this, 'command.log', array($this->symfonyFormatter->formatSection('doctrine', $notification))));
+    }
 
-  /**
-   * Notify symfony of an exception thrown by the Doctrine cli
-   *
-   * @param Doctrine_Exception $exception
-   * @return void
-   * @throws sfException
-   */
-  public function notifyException(Exception $exception)
-  {
-    throw $exception;
-  }
-}
\ No newline at end of file
+    /**
+     * Notify symfony of an exception thrown by the Doctrine cli.
+     *
+     * @param Doctrine_Exception $exception
+     *
+     * @throws sfException
+     */
+    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 5129020ad..95604f3b1 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionListener.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionListener.class.php
@@ -10,29 +10,27 @@
  */
 
 /**
- * Standard connection listener
+ * Standard connection listener.
  *
- * @package    symfony
- * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
+ *
  * @version    SVN: $Id$
  */
 class sfDoctrineConnectionListener extends Doctrine_EventListener
 {
-  protected
-    $connection,
-    $encoding;
+    protected $connection;
+    protected $encoding;
 
-  public function __construct($connection, $encoding)
-  {
-    $this->connection = $connection;
-    $this->encoding = $encoding;
-  }
+    public function __construct($connection, $encoding)
+    {
+        $this->connection = $connection;
+        $this->encoding = $encoding;
+    }
 
-  public function postConnect(Doctrine_Event $event)
-  {
-    $this->connection->setCharset($this->encoding);
-    $this->connection->setDateFormat();
-  }
-}
\ No newline at end of file
+    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 e3824c7c2..1202199bc 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionProfiler.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionProfiler.class.php
@@ -3,209 +3,183 @@
 /**
  * Connection profiler.
  *
- * @package    sfDoctrinePlugin
- * @subpackage database
  * @author     Kris Wallsmith <kris.wallsmith@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfDoctrineConnectionProfiler extends Doctrine_Connection_Profiler
 {
-  protected
-    $dispatcher = null,
-    $options    = array();
-
-  /**
-   * Constructor.
-   *
-   * Available options:
-   *
-   *  * logging:              Whether to notify query logging events (defaults to false)
-   *  * slow_query_threshold: How many seconds a query must take to be considered slow (defaults to 1)
-   *
-   * @param sfEventDispatcher $dispatcher
-   * @param array             $options
-   */
-  public function __construct(sfEventDispatcher $dispatcher, $options = array())
-  {
-    $this->dispatcher = $dispatcher;
-    $this->options = array_merge(array(
-      'logging'              => false,
-      'slow_query_threshold' => 1,
-    ), $options);
-  }
-
-  /**
-   * Returns an option value.
-   *
-   * @param  string $name
-   *
-   * @return mixed
-   */
-  public function getOption($name)
-  {
-    return isset($this->options[$name]) ? $this->options[$name] : null;
-  }
-
-  /**
-   * Sets an option value.
-   *
-   * @param string $name
-   * @param mixed  $value
-   */
-  public function setOption($name, $value)
-  {
-    $this->options[$name] = $value;
-  }
-
-  /**
-   * Logs time and a connection query on behalf of the connection.
-   *
-   * @param Doctrine_Event $event
-   */
-  public function preQuery(Doctrine_Event $event)
-  {
-    if ($this->options['logging'])
+    protected $dispatcher;
+    protected $options = array();
+
+    /**
+     * Constructor.
+     *
+     * Available options:
+     *
+     *  * logging:              Whether to notify query logging events (defaults to false)
+     *  * slow_query_threshold: How many seconds a query must take to be considered slow (defaults to 1)
+     *
+     * @param array $options
+     */
+    public function __construct(sfEventDispatcher $dispatcher, $options = array())
     {
-      $this->dispatcher->notify(new sfEvent($event->getInvoker(), 'application.log', array(sprintf('query : %s - (%s)', $event->getQuery(), join(', ', self::fixParams($event->getParams()))))));
+        $this->dispatcher = $dispatcher;
+        $this->options = array_merge(array(
+            'logging' => false,
+            'slow_query_threshold' => 1,
+        ), $options);
     }
 
-    sfTimerManager::getTimer('Database (Doctrine)');
+    /**
+     * Returns an option value.
+     *
+     * @param string $name
+     *
+     * @return mixed
+     */
+    public function getOption($name)
+    {
+        return isset($this->options[$name]) ? $this->options[$name] : null;
+    }
 
-    $args = func_get_args();
-    $this->__call(__FUNCTION__, $args);
-  }
+    /**
+     * Sets an option value.
+     *
+     * @param string $name
+     * @param mixed  $value
+     */
+    public function setOption($name, $value)
+    {
+        $this->options[$name] = $value;
+    }
 
-  /**
-   * Logs to the timer.
-   *
-   * @param Doctrine_Event $event
-   */
-  public function postQuery(Doctrine_Event $event)
-  {
-    sfTimerManager::getTimer('Database (Doctrine)', false)->addTime();
+    /**
+     * Logs time and a connection query on behalf of the connection.
+     */
+    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()))))));
+        }
 
-    $args = func_get_args();
-    $this->__call(__FUNCTION__, $args);
+        sfTimerManager::getTimer('Database (Doctrine)');
 
-    if ($event->getElapsedSecs() > $this->options['slow_query_threshold'])
-    {
-      $event->slowQuery = true;
+        $args = func_get_args();
+        $this->__call(__FUNCTION__, $args);
     }
-  }
-
-  /**
-   * Logs a connection exec on behalf of the connection.
-   *
-   * @param Doctrine_Event $event
-   */
-  public function preExec(Doctrine_Event $event)
-  {
-    if ($this->options['logging'])
+
+    /**
+     * Logs to the timer.
+     */
+    public function postQuery(Doctrine_Event $event)
     {
-      $this->dispatcher->notify(new sfEvent($event->getInvoker(), 'application.log', array(sprintf('exec : %s - (%s)', $event->getQuery(), join(', ', self::fixParams($event->getParams()))))));
-    }
+        sfTimerManager::getTimer('Database (Doctrine)', false)->addTime();
 
-    sfTimerManager::getTimer('Database (Doctrine)');
+        $args = func_get_args();
+        $this->__call(__FUNCTION__, $args);
 
-    $args = func_get_args();
-    $this->__call(__FUNCTION__, $args);
-  }
+        if ($event->getElapsedSecs() > $this->options['slow_query_threshold']) {
+            $event->slowQuery = true;
+        }
+    }
 
-  /**
-   * Logs to the timer.
-   *
-   * @param Doctrine_Event $event
-   */
-  public function postExec(Doctrine_Event $event)
-  {
-    sfTimerManager::getTimer('Database (Doctrine)', false)->addTime();
+    /**
+     * Logs a connection exec on behalf of the connection.
+     */
+    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()))))));
+        }
 
-    $args = func_get_args();
-    $this->__call(__FUNCTION__, $args);
+        sfTimerManager::getTimer('Database (Doctrine)');
 
-    if ($event->getElapsedSecs() > $this->options['slow_query_threshold'])
-    {
-      $event->slowQuery = true;
+        $args = func_get_args();
+        $this->__call(__FUNCTION__, $args);
     }
-  }
-
-  /**
-   * Logs a statement execute on behalf of the statement.
-   *
-   * @param Doctrine_Event $event
-   */
-  public function preStmtExecute(Doctrine_Event $event)
-  {
-    if ($this->options['logging'])
+
+    /**
+     * Logs to the timer.
+     */
+    public function postExec(Doctrine_Event $event)
     {
-      $this->dispatcher->notify(new sfEvent($event->getInvoker(), 'application.log', array(sprintf('execute : %s - (%s)', $event->getQuery(), join(', ', self::fixParams($event->getParams()))))));
-    }
+        sfTimerManager::getTimer('Database (Doctrine)', false)->addTime();
 
-    sfTimerManager::getTimer('Database (Doctrine)');
+        $args = func_get_args();
+        $this->__call(__FUNCTION__, $args);
 
-    $args = func_get_args();
-    $this->__call(__FUNCTION__, $args);
-  }
+        if ($event->getElapsedSecs() > $this->options['slow_query_threshold']) {
+            $event->slowQuery = true;
+        }
+    }
 
-  /**
-   * Logs to the timer.
-   *
-   * @param Doctrine_Event $event
-   */
-  public function postStmtExecute(Doctrine_Event $event)
-  {
-    sfTimerManager::getTimer('Database (Doctrine)', false)->addTime();
+    /**
+     * Logs a statement execute on behalf of the statement.
+     */
+    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()))))));
+        }
 
-    $args = func_get_args();
-    $this->__call(__FUNCTION__, $args);
+        sfTimerManager::getTimer('Database (Doctrine)');
 
-    if ($event->getElapsedSecs() > $this->options['slow_query_threshold'])
-    {
-      $event->slowQuery = true;
+        $args = func_get_args();
+        $this->__call(__FUNCTION__, $args);
     }
-  }
-
-  /**
-   * Returns events having to do with query execution.
-   *
-   * @return array
-   */
-  public function getQueryExecutionEvents()
-  {
-    $events = array();
-    foreach ($this as $event)
+
+    /**
+     * Logs to the timer.
+     */
+    public function postStmtExecute(Doctrine_Event $event)
     {
-      if (in_array($event->getCode(), array(Doctrine_Event::CONN_QUERY, Doctrine_Event::CONN_EXEC, Doctrine_Event::STMT_EXECUTE)))
-      {
-        $events[] = $event;
-      }
+        sfTimerManager::getTimer('Database (Doctrine)', false)->addTime();
+
+        $args = func_get_args();
+        $this->__call(__FUNCTION__, $args);
+
+        if ($event->getElapsedSecs() > $this->options['slow_query_threshold']) {
+            $event->slowQuery = true;
+        }
     }
 
-    return $events;
-  }
-
-  /**
-   * Fixes query parameters for logging.
-   *
-   * @param  array $params
-   *
-   * @return array
-   */
-  static public function fixParams($params)
-  {
-    if (!is_array($params))
+    /**
+     * Returns events having to do with query execution.
+     *
+     * @return array
+     */
+    public function getQueryExecutionEvents()
     {
-      return array();
+        $events = array();
+        foreach ($this as $event) {
+            if (in_array($event->getCode(), array(Doctrine_Event::CONN_QUERY, Doctrine_Event::CONN_EXEC, Doctrine_Event::STMT_EXECUTE))) {
+                $events[] = $event;
+            }
+        }
+
+        return $events;
     }
 
-    foreach ($params as $key => $param)
+    /**
+     * Fixes query parameters for logging.
+     *
+     * @param array $params
+     *
+     * @return array
+     */
+    public static function fixParams($params)
     {
-      if ($param && strlen($param) >= 255)
-      {
-        $params[$key] = '['.number_format(strlen($param) / 1024, 2).'Kb]';
-      }
-    }
+        if (!is_array($params)) {
+            return array();
+        }
 
-    return $params;
-  }
+        foreach ($params as $key => $param) {
+            if ($param && strlen($param) >= 255) {
+                $params[$key] = '['.number_format(strlen($param) / 1024, 2).'Kb]';
+            }
+        }
+
+        return $params;
+    }
 }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineDatabase.class.php b/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineDatabase.class.php
index 9e3847025..e62d37c4e 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineDatabase.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineDatabase.class.php
@@ -12,144 +12,130 @@
 /**
  * A symfony database driver for Doctrine.
  *
- * @package    symfony
- * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
+ *
  * @version    SVN: $Id$
  */
 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 $_doctrineConnection
-   */
-  protected $_doctrineConnection = null;
-
-  /**
-   * @var sfDoctrineConnectionProfiler
-   **/
-  protected $profiler = null;
-
-  /**
-   * Initialize a sfDoctrineDatabase connection with the given parameters.
-   *
-   * <code>
-   * $parameters = array(
-   *    'name'       => 'doctrine',
-   *    'dsn'        => 'sqlite:////path/to/sqlite/db');
-   *
-   * $p = new sfDoctrineDatabase($parameters);
-   * </code>
-   *
-   * @param array $parameters  Array of parameters used to initialize the database connection
-   * @return void
-   */
-  public function initialize($parameters = array())
-  {
-    parent::initialize($parameters);
-
-    if (null !== $this->_doctrineConnection)
+    /**
+     * Instance of the Doctrine_Connection for this instance of sfDoctrineDatabase.
+     * Connection can be accessed by the getDoctrineConnection() accessor method.
+     *
+     * @var Doctrine_Connection
+     */
+    protected $_doctrineConnection;
+
+    /**
+     * @var sfDoctrineConnectionProfiler
+     */
+    protected $profiler;
+
+    /**
+     * Initialize a sfDoctrineDatabase connection with the given parameters.
+     *
+     * <code>
+     * $parameters = array(
+     *    'name'       => 'doctrine',
+     *    'dsn'        => 'sqlite:////path/to/sqlite/db');
+     *
+     * $p = new sfDoctrineDatabase($parameters);
+     * </code>
+     *
+     * @param array $parameters Array of parameters used to initialize the database connection
+     */
+    public function initialize($parameters = array())
     {
-      return;
+        parent::initialize($parameters);
+
+        if (null !== $this->_doctrineConnection) {
+            return;
+        }
+
+        $dsn = $this->getParameter('dsn');
+        $name = $this->getParameter('name');
+
+        // Make sure we pass non-PEAR style DSNs as an array
+        if (!strpos($dsn, '://')) {
+            $dsn = array($dsn, $this->getParameter('username'), $this->getParameter('password'));
+        }
+
+        // Make the Doctrine connection for $dsn and $name
+        $configuration = sfProjectConfiguration::getActive();
+        $dispatcher = $configuration->getEventDispatcher();
+        $manager = Doctrine_Manager::getInstance();
+
+        $this->_doctrineConnection = $manager->openConnection($dsn, $name);
+
+        $attributes = $this->getParameter('attributes', array());
+        foreach ($attributes as $name => $value) {
+            if (is_string($name)) {
+                $stringName = $name;
+                $name = constant('Doctrine_Core::ATTR_'.strtoupper($name));
+            }
+
+            if (is_string($value)) {
+                $valueConstantName = 'Doctrine_Core::'.strtoupper($stringName).'_'.strtoupper($value);
+                $value = defined($valueConstantName) ? constant($valueConstantName) : $value;
+            }
+
+            $this->_doctrineConnection->setAttribute($name, $value);
+        }
+
+        $encoding = $this->getParameter('encoding', 'UTF8');
+        $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')),
+            ));
+            $this->_doctrineConnection->addListener($this->profiler, 'symfony_profiler');
+        }
+
+        $dispatcher->notify(new sfEvent($manager, 'doctrine.configure_connection', array('connection' => $this->_doctrineConnection, 'database' => $this)));
     }
 
-    $dsn = $this->getParameter('dsn');
-    $name = $this->getParameter('name');
-
-    // Make sure we pass non-PEAR style DSNs as an array
-    if ( !strpos($dsn, '://'))
+    /**
+     * Get the Doctrine_Connection instance.
+     *
+     * @return Doctrine_Connection $conn
+     */
+    public function getDoctrineConnection()
     {
-      $dsn = array($dsn, $this->getParameter('username'), $this->getParameter('password'));
+        return $this->_doctrineConnection;
     }
 
-    // Make the Doctrine connection for $dsn and $name
-    $configuration = sfProjectConfiguration::getActive();
-    $dispatcher = $configuration->getEventDispatcher();
-    $manager = Doctrine_Manager::getInstance();
-
-    $this->_doctrineConnection = $manager->openConnection($dsn, $name);
-
-    $attributes = $this->getParameter('attributes', array());
-    foreach ($attributes as $name => $value)
+    /**
+     * Returns the connection profiler.
+     *
+     * @return sfDoctrineConnectionProfiler|null
+     */
+    public function getProfiler()
     {
-      if (is_string($name))
-      {
-        $stringName = $name;
-        $name = constant('Doctrine_Core::ATTR_'.strtoupper($name));
-      }
-
-      if (is_string($value))
-      {
-        $valueConstantName = 'Doctrine_Core::'.strtoupper($stringName).'_'.strtoupper($value);
-        $value = defined($valueConstantName) ? constant($valueConstantName) : $value;
-      }
-
-      $this->_doctrineConnection->setAttribute($name, $value);
+        return $this->profiler;
     }
 
-    $encoding = $this->getParameter('encoding', 'UTF8');
-    $eventListener = new sfDoctrineConnectionListener($this->_doctrineConnection, $encoding);
-    $this->_doctrineConnection->addListener($eventListener);
-
-    // Load Query Profiler
-    if ($this->getParameter('profiler', sfConfig::get('sf_debug')))
+    /**
+     * Initializes the connection and sets it to object.
+     */
+    public function connect()
     {
-      $this->profiler = new sfDoctrineConnectionProfiler($dispatcher, array(
-        'logging' => $this->getParameter('logging', sfConfig::get('sf_logging_enabled')),
-      ));
-      $this->_doctrineConnection->addListener($this->profiler, 'symfony_profiler');
+        $this->connection = $this->_doctrineConnection->getDbh();
     }
 
-    $dispatcher->notify(new sfEvent($manager, 'doctrine.configure_connection', array('connection' => $this->_doctrineConnection, 'database' => $this)));
-  }
-
-  /**
-   * Get the Doctrine_Connection instance.
-   *
-   * @return Doctrine_Connection $conn
-   */
-  public function getDoctrineConnection()
-  {
-    return $this->_doctrineConnection;
-  }
-
-  /**
-   * Returns the connection profiler.
-   *
-   * @return sfDoctrineConnectionProfiler|null
-   */
-  public function getProfiler()
-  {
-    return $this->profiler;
-  }
-
-  /**
-   * Initializes the connection and sets it to object.
-   *
-   * @return void
-   */
-  public function connect()
-  {
-    $this->connection = $this->_doctrineConnection->getDbh();
-  }
-
-  /**
-   * Execute the shutdown procedure.
-   *
-   * @return void
-   */
-  public function shutdown()
-  {
-    if ($this->connection !== null)
-    {
-      $this->connection = null;
-    }
-    if ($this->_doctrineConnection !== null)
+    /**
+     * Execute the shutdown procedure.
+     */
+    public function shutdown()
     {
-      $this->_doctrineConnection->getManager()->closeConnection($this->_doctrineConnection);
+        if (null !== $this->connection) {
+            $this->connection = null;
+        }
+        if (null !== $this->_doctrineConnection) {
+            $this->_doctrineConnection->getManager()->closeConnection($this->_doctrineConnection);
+        }
     }
-  }
 }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/debug/sfWebDebugPanelDoctrine.class.php b/lib/plugins/sfDoctrinePlugin/lib/debug/sfWebDebugPanelDoctrine.class.php
index 9c4bacf7d..9b1387a04 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/debug/sfWebDebugPanelDoctrine.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/debug/sfWebDebugPanelDoctrine.class.php
@@ -12,152 +12,142 @@
 /**
  * sfWebDebugPanelDoctrine adds a panel to the web debug toolbar with Doctrine information.
  *
- * @package    symfony
- * @subpackage debug
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
+ *
  * @version    SVN: $Id$
  */
 class sfWebDebugPanelDoctrine extends sfWebDebugPanel
 {
-  /**
-   * Get the title/icon for the panel
-   *
-   * @return string $html
-   */
-  public function getTitle()
-  {
-    if ($events = $this->getDoctrineEvents())
+    /**
+     * Get the title/icon for the panel.
+     *
+     * @return string $html
+     */
+    public function getTitle()
+    {
+        if ($events = $this->getDoctrineEvents()) {
+            return '<img src="'.$this->webDebug->getOption('image_root_path').'/database.png" alt="SQL queries" /> '.count($events);
+        }
+    }
+
+    /**
+     * Get the verbal title of the panel.
+     *
+     * @return string $title
+     */
+    public function getPanelTitle()
     {
-      return '<img src="'.$this->webDebug->getOption('image_root_path').'/database.png" alt="SQL queries" /> '.count($events);
+        return 'SQL queries';
     }
-  }
-
-  /**
-   * Get the verbal title of the panel
-   *
-   * @return string $title
-   */
-  public function getPanelTitle()
-  {
-    return 'SQL queries';
-  }
-
-  /**
-   * Get the html content of the panel
-   *
-   * @return string $html
-   */
-  public function getPanelContent()
-  {
-    return '
+
+    /**
+     * Get the html content of the panel.
+     *
+     * @return string $html
+     */
+    public function getPanelContent()
+    {
+        return '
       <div id="sfWebDebugDatabaseLogs">
         <h3>Doctrine Version: '.Doctrine_Core::VERSION.'</h3>
         <ol>'.implode("\n", $this->getSqlLogs()).'</ol>
       </div>
     ';
-  }
-
-  /**
-   * Listens to debug.web.load_panels and adds this panel.
-   */
-  static public function listenToAddPanelEvent(sfEvent $event)
-  {
-    $event->getSubject()->setPanel('db', new self($event->getSubject()));
-  }
-
-  /**
-   * Returns an array of Doctrine query events.
-   *
-   * @return array
-   */
-  protected function getDoctrineEvents()
-  {
-    $databaseManager = sfContext::getInstance()->getDatabaseManager();
-
-    $events = array();
-    if ($databaseManager)
-    {
-      foreach ($databaseManager->getNames() as $name)
-      {
-        $database = $databaseManager->getDatabase($name);
-        if ($database instanceof sfDoctrineDatabase && $profiler = $database->getProfiler())
-        {
-          foreach ($profiler->getQueryExecutionEvents() as $event)
-          {
-            $events[$event->getSequence()] = $event;
-          }
-        }
-      }
     }
 
-    // sequence events
-    ksort($events);
-
-    return $events;
-  }
-
-  /**
-   * Builds the sql logs and returns them as an array.
-   *
-   * @return array
-   */
-  protected function getSqlLogs()
-  {
-    $logs = $this->webDebug->getLogger()->getLogs();
+    /**
+     * Listens to debug.web.load_panels and adds this panel.
+     */
+    public static function listenToAddPanelEvent(sfEvent $event)
+    {
+        $event->getSubject()->setPanel('db', new self($event->getSubject()));
+    }
 
-    $html = array();
-    foreach ($this->getDoctrineEvents() as $i => $event)
+    /**
+     * Returns an array of Doctrine query events.
+     *
+     * @return array
+     */
+    protected function getDoctrineEvents()
     {
-      $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'));
-        $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);
-      }
-
-      // backtrace
-      $backtrace = null;
-      foreach ($logs as $i => $log)
-      {
-        if (!isset($log['debug_backtrace']) || !count($log['debug_backtrace']))
-        {
-          // backtrace disabled
-          break;
+        $databaseManager = sfContext::getInstance()->getDatabaseManager();
+
+        $events = array();
+        if ($databaseManager) {
+            foreach ($databaseManager->getNames() as $name) {
+                $database = $databaseManager->getDatabase($name);
+                if ($database instanceof sfDoctrineDatabase && $profiler = $database->getProfiler()) {
+                    foreach ($profiler->getQueryExecutionEvents() as $event) {
+                        $events[$event->getSequence()] = $event;
+                    }
+                }
+            }
         }
 
-        if (false !== strpos($log['message'], $event->getQuery()))
-        {
-          // assume queries are being requested in order
-          unset($logs[$i]);
-          $backtrace = '&nbsp;'.$this->getToggleableDebugStack($log['debug_backtrace']);
-          break;
-        }
-      }
+        // sequence events
+        ksort($events);
+
+        return $events;
+    }
 
-      $html[] = sprintf('
+    /**
+     * Builds the sql logs and returns them as an array.
+     *
+     * @return array
+     */
+    protected function getSqlLogs()
+    {
+        $logs = $this->webDebug->getLogger()->getLogs();
+
+        $html = array();
+        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')));
+
+            // interpolate parameters
+            foreach ($params as $param) {
+                $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);
+            }
+
+            // backtrace
+            $backtrace = null;
+            foreach ($logs as $i => $log) {
+                if (!isset($log['debug_backtrace']) || !count($log['debug_backtrace'])) {
+                    // backtrace disabled
+                    break;
+                }
+
+                if (false !== strpos($log['message'], $event->getQuery())) {
+                    // assume queries are being requested in order
+                    unset($logs[$i]);
+                    $backtrace = '&nbsp;'.$this->getToggleableDebugStack($log['debug_backtrace']);
+
+                    break;
+                }
+            }
+
+            $html[] = sprintf(
+                '
         <li%s>
           <p class="sfWebDebugDatabaseQuery">%s</p>
           <div class="sfWebDebugDatabaseLogInfo">%ss, "%s" connection%s</div>
         </li>',
-        $event->slowQuery ? ' class="sfWebDebugWarning"' : '',
-        $query,
-        number_format($event->getElapsedSecs(), 2),
-        $conn->getName(),
-        $backtrace
-      );
-    }
+                $event->slowQuery ? ' class="sfWebDebugWarning"' : '',
+                $query,
+                number_format($event->getElapsedSecs(), 2),
+                $conn->getName(),
+                $backtrace
+            );
+        }
 
-    return $html;
-  }
+        return $html;
+    }
 }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/form/sfFormDoctrine.class.php b/lib/plugins/sfDoctrinePlugin/lib/form/sfFormDoctrine.class.php
index 1215dc74d..550ffcd55 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/form/sfFormDoctrine.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/form/sfFormDoctrine.class.php
@@ -14,428 +14,387 @@
  *
  * This class extends BaseForm, a class generated automatically with each new project.
  *
- * @package    symfony
- * @subpackage form
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfFormDoctrine extends sfFormObject
 {
-  /**
-   * Constructor.
-   *
-   * @param mixed  $object     A object used to initialize default values
-   * @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
-   * @see sfForm
-   */
-  public function __construct($object = null, $options = array(), $CSRFSecret = null)
-  {
-    $class = $this->getModelName();
-    if (!$object)
-    {
-      $this->object = new $class();
-    }
-    else
+    /**
+     * Constructor.
+     *
+     * @param mixed  $object     A object used to initialize default values
+     * @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
+     *
+     * @see sfForm
+     */
+    public function __construct($object = null, $options = array(), $CSRFSecret = null)
     {
-      if (!$object instanceof $class)
-      {
-        throw new sfException(sprintf('The "%s" form only accepts a "%s" object.', get_class($this), $class));
-      }
+        $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));
+            }
+
+            $this->object = $object;
+            $this->isNew = !$this->getObject()->exists();
+        }
+
+        parent::__construct(array(), $options, $CSRFSecret);
 
-      $this->object = $object;
-      $this->isNew = !$this->getObject()->exists();
+        $this->updateDefaultsFromObject();
     }
 
-    parent::__construct(array(), $options, $CSRFSecret);
-
-    $this->updateDefaultsFromObject();
-  }
-
-  /**
-   * @return Doctrine_Connection
-   * @see sfFormObject
-   */
-  public function getConnection()
-  {
-    return Doctrine_Manager::getInstance()->getConnectionForComponent($this->getModelName());
-  }
-
-  /**
-   * Embeds i18n objects into the current form.
-   *
-   * @param array  $cultures  An array of cultures
-   * @param string $decorator A HTML decorator for the embedded form
-   *
-   * @throws sfException
-   */
-  public function embedI18n($cultures, $decorator = null)
-  {
-    if (!$this->isI18n())
+    /**
+     * @return Doctrine_Connection
+     *
+     * @see sfFormObject
+     */
+    public function getConnection()
     {
-      throw new sfException(sprintf('The model "%s" is not internationalized.', $this->getModelName()));
+        return Doctrine_Manager::getInstance()->getConnectionForComponent($this->getModelName());
     }
 
-    $class = $this->getI18nFormClass();
-    foreach ($cultures as $culture)
+    /**
+     * Embeds i18n objects into the current form.
+     *
+     * @param array  $cultures  An array of cultures
+     * @param string $decorator A HTML decorator for the embedded form
+     *
+     * @throws sfException
+     */
+    public function embedI18n($cultures, $decorator = null)
     {
-      $i18nObject = $this->getObject()->Translation[$culture];
-      $i18n = new $class($i18nObject);
+        if (!$this->isI18n()) {
+            throw new sfException(sprintf('The model "%s" is not internationalized.', $this->getModelName()));
+        }
 
-      if (false === $i18nObject->exists())
-      {
-        unset($i18n[$this->getI18nModelPrimaryKeyName()], $i18n[$this->getI18nModelI18nField()]);
-      }
+        $class = $this->getI18nFormClass();
+        foreach ($cultures as $culture) {
+            $i18nObject = $this->getObject()->Translation[$culture];
+            $i18n = new $class($i18nObject);
 
-      $this->embedForm($culture, $i18n, $decorator);
-    }
-  }
-
-  /**
-   * Embed a Doctrine_Collection relationship in to a form
-   *
-   *     [php]
-   *     $userForm = new UserForm($user);
-   *     $userForm->embedRelation('Groups AS groups');
-   *
-   * @param string $relationName   The name of the relation and an optional alias
-   * @param string $formClass      The name of the form class to use
-   * @param array  $formArgs       Arguments to pass to the constructor (related object will be shifted onto the front)
-   * @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
-   */
-  public function embedRelation($relationName, $formClass = null, $formArgs = array(), $innerDecorator = null, $decorator = null)
-  {
-    if (false !== $pos = stripos($relationName, ' as '))
-    {
-      $fieldName = substr($relationName, $pos + 4);
-      $relationName = substr($relationName, 0, $pos);
+            if (false === $i18nObject->exists()) {
+                unset($i18n[$this->getI18nModelPrimaryKeyName()], $i18n[$this->getI18nModelI18nField()]);
+            }
+
+            $this->embedForm($culture, $i18n, $decorator);
+        }
     }
-    else
+
+    /**
+     * Embed a Doctrine_Collection relationship in to a form.
+     *
+     *     [php]
+     *     $userForm = new UserForm($user);
+     *     $userForm->embedRelation('Groups AS groups');
+     *
+     * @param string $relationName   The name of the relation and an optional alias
+     * @param string $formClass      The name of the form class to use
+     * @param array  $formArgs       Arguments to pass to the constructor (related object will be shifted onto the front)
+     * @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
+     */
+    public function embedRelation($relationName, $formClass = null, $formArgs = array(), $innerDecorator = null, $decorator = null)
     {
-      $fieldName = $relationName;
-    }
+        if (false !== $pos = stripos($relationName, ' as ')) {
+            $fieldName = substr($relationName, $pos + 4);
+            $relationName = substr($relationName, 0, $pos);
+        } else {
+            $fieldName = $relationName;
+        }
 
-    $relation = $this->getObject()->getTable()->getRelation($relationName);
+        $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);
-    }
-    else
-    {
-      $subForm = new sfForm();
+        if (Doctrine_Relation::ONE == $relation->getType()) {
+            $this->embedForm($fieldName, $r->newInstanceArgs(array_merge(array($this->getObject()->{$relationName}), $formArgs)), $decorator);
+        } else {
+            $subForm = new sfForm();
 
-      foreach ($this->getObject()->$relationName as $index => $childObject)
-      {
-        $form = $r->newInstanceArgs(array_merge(array($childObject), $formArgs));
+            foreach ($this->getObject()->{$relationName} as $index => $childObject) {
+                $form = $r->newInstanceArgs(array_merge(array($childObject), $formArgs));
 
-        $subForm->embedForm($index, $form, $innerDecorator);
-        $subForm->getWidgetSchema()->setLabel($index, (string) $childObject);
-      }
+                $subForm->embedForm($index, $form, $innerDecorator);
+                $subForm->getWidgetSchema()->setLabel($index, (string) $childObject);
+            }
 
-      $this->embedForm($fieldName, $subForm, $decorator);
+            $this->embedForm($fieldName, $subForm, $decorator);
+        }
     }
-  }
-
-  /**
-   * @see sfFormObject
-   */
-  protected function doUpdateObject($values)
-  {
-    $this->getObject()->fromArray($values);
-  }
-
-  /**
-   * Processes cleaned up values with user defined methods.
-   *
-   * To process a value before it is used by the updateObject() method,
-   * you need to define an updateXXXColumn() method where XXX is the PHP name
-   * of the column.
-   *
-   * The method must return the processed value or false to remove the value
-   * from the array of cleaned up values.
-   *
-   * @see sfFormObject
-   *
-   * @param array $values
-   *
-   * @return array
-   */
-  public function processValues($values)
-  {
-    // see if the user has overridden some column setter
-    $valuesToProcess = $values;
-    foreach ($valuesToProcess as $field => $value)
-    {
-      $method = sprintf('update%sColumn', $this->camelize($field));
 
-      if (method_exists($this, $method))
-      {
-        if (false === $ret = $this->$method($value))
-        {
-          unset($values[$field]);
-        }
-        else
-        {
-          $values[$field] = $ret;
-        }
-      }
-      else
-      {
-        // save files
-        if ($this->validatorSchema[$field] instanceof sfValidatorFile)
-        {
-          $values[$field] = $this->processUploadedFile($field, null, $valuesToProcess);
+    /**
+     * Processes cleaned up values with user defined methods.
+     *
+     * To process a value before it is used by the updateObject() method,
+     * you need to define an updateXXXColumn() method where XXX is the PHP name
+     * of the column.
+     *
+     * The method must return the processed value or false to remove the value
+     * from the array of cleaned up values.
+     *
+     * @see sfFormObject
+     *
+     * @param array $values
+     *
+     * @return array
+     */
+    public function processValues($values)
+    {
+        // see if the user has overridden some column setter
+        $valuesToProcess = $values;
+        foreach ($valuesToProcess as $field => $value) {
+            $method = sprintf('update%sColumn', $this->camelize($field));
+
+            if (method_exists($this, $method)) {
+                if (false === $ret = $this->{$method}($value)) {
+                    unset($values[$field]);
+                } else {
+                    $values[$field] = $ret;
+                }
+            } else {
+                // save files
+                if ($this->validatorSchema[$field] instanceof sfValidatorFile) {
+                    $values[$field] = $this->processUploadedFile($field, null, $valuesToProcess);
+                }
+            }
         }
-      }
+
+        return $values;
     }
 
-    return $values;
-  }
-
-  /**
-   * Returns true if the current form has some associated i18n objects.
-   *
-   * @return Boolean true if the current form has some associated i18n objects, false otherwise
-   */
-  public function isI18n()
-  {
-    return $this->getObject()->getTable()->hasTemplate('Doctrine_Template_I18n');
-  }
-
-  /**
-   * Returns the name of the i18n model.
-   *
-   * @return string The name of the i18n model
-   */
-  public function getI18nModelName()
-  {
-    return $this->getObject()->getTable()->getTemplate('Doctrine_Template_I18n')->getI18n()->getOption('className');
-  }
-
-  /**
-   * Returns the name of the i18n form class.
-   *
-   * @return string The name of the i18n form class
-   */
-  public function getI18nFormClass()
-  {
-    return $this->getI18nModelName().'Form';
-  }
-
-  /**
-   * Returns the primary key name of the i18n model.
-   *
-   * @return string The primary key name of the i18n model
-   * @throws sfException
-   */
-  public function getI18nModelPrimaryKeyName()
-  {
-    $primaryKey = $this->getObject()->getTable()->getIdentifier();
-
-    if (is_array($primaryKey))
+    /**
+     * Returns true if the current form has some associated i18n objects.
+     *
+     * @return bool true if the current form has some associated i18n objects, false otherwise
+     */
+    public function isI18n()
     {
-      throw new sfException(sprintf('The model "%s" has composite primary keys and cannot be used with i18n..', $this->getModelName()));
+        return $this->getObject()->getTable()->hasTemplate('Doctrine_Template_I18n');
     }
 
-    return $primaryKey;
-  }
-
-  /**
-   * Returns the i18nField name of the i18n model.
-   *
-   * @return string The i18nField name of the i18n model
-   */
-  public function getI18nModelI18nField()
-  {
-    return $this->getObject()->getTable()->getTemplate('Doctrine_Template_I18n')->getI18n()->getOption('i18nField');
-  }
-
-  /**
-   * Updates the default values of the form with the current values of the current object.
-   */
-  protected function updateDefaultsFromObject()
-  {
-    $defaults = $this->getDefaults();
-
-    // update defaults for the main object
-    if ($this->isNew())
+    /**
+     * Returns the name of the i18n model.
+     *
+     * @return string The name of the i18n model
+     */
+    public function getI18nModelName()
     {
-      $defaults = $defaults + $this->getObject()->toArray(false);
+        return $this->getObject()->getTable()->getTemplate('Doctrine_Template_I18n')->getI18n()->getOption('className');
     }
-    else
+
+    /**
+     * Returns the name of the i18n form class.
+     *
+     * @return string The name of the i18n form class
+     */
+    public function getI18nFormClass()
     {
-      $defaults = $this->getObject()->toArray(false) + $defaults;
+        return $this->getI18nModelName().'Form';
     }
 
-    foreach ($this->embeddedForms as $name => $form)
+    /**
+     * Returns the primary key name of the i18n model.
+     *
+     * @return string The primary key name of the i18n model
+     *
+     * @throws sfException
+     */
+    public function getI18nModelPrimaryKeyName()
     {
-      if ($form instanceof sfFormDoctrine)
-      {
-        $form->updateDefaultsFromObject();
-        $defaults[$name] = $form->getDefaults();
-      }
+        $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()));
+        }
+
+        return $primaryKey;
     }
 
-    $this->setDefaults($defaults);
-  }
-
-  /**
-   * Saves the uploaded file for the given field.
-   *
-   * @param  string $field The field name
-   * @param  string $filename The file name of the file to save
-   * @param  array  $values An array of values
-   *
-   * @return string The filename used to save the file
-   */
-  protected function processUploadedFile($field, $filename = null, $values = null)
-  {
-    if (!$this->validatorSchema[$field] instanceof sfValidatorFile)
+    /**
+     * Returns the i18nField name of the i18n model.
+     *
+     * @return string The i18nField name of the i18n model
+     */
+    public function getI18nModelI18nField()
     {
-      throw new LogicException(sprintf('You cannot save the current file for field "%s" as the field is not a file.', $field));
+        return $this->getObject()->getTable()->getTemplate('Doctrine_Template_I18n')->getI18n()->getOption('i18nField');
     }
 
-    if (null === $values)
+    /**
+     * @see sfFormObject
+     *
+     * @param mixed $values
+     */
+    protected function doUpdateObject($values)
     {
-      $values = $this->values;
+        $this->getObject()->fromArray($values);
     }
 
-    if (isset($values[$field.'_delete']) && $values[$field.'_delete'])
+    /**
+     * Updates the default values of the form with the current values of the current object.
+     */
+    protected function updateDefaultsFromObject()
     {
-      $this->removeFile($field);
+        $defaults = $this->getDefaults();
 
-      return '';
-    }
+        // update defaults for the main object
+        if ($this->isNew()) {
+            $defaults = $defaults + $this->getObject()->toArray(false);
+        } else {
+            $defaults = $this->getObject()->toArray(false) + $defaults;
+        }
 
-    if (!$values[$field])
-    {
-      // this is needed if the form is embedded, in which case
-      // the parent form has already changed the value of the field
-      $oldValues = $this->getObject()->getModified(true, false);
+        foreach ($this->embeddedForms as $name => $form) {
+            if ($form instanceof sfFormDoctrine) {
+                $form->updateDefaultsFromObject();
+                $defaults[$name] = $form->getDefaults();
+            }
+        }
 
-      return isset($oldValues[$field]) ? $oldValues[$field] : $this->object->$field;
+        $this->setDefaults($defaults);
     }
 
-    // we need the base directory
-    if (!$this->validatorSchema[$field]->getOption('path'))
+    /**
+     * Saves the uploaded file for the given field.
+     *
+     * @param string $field    The field name
+     * @param string $filename The file name of the file to save
+     * @param array  $values   An array of values
+     *
+     * @return string The filename used to save the file
+     */
+    protected function processUploadedFile($field, $filename = null, $values = null)
     {
-      return $values[$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));
+        }
 
-    $this->removeFile($field);
+        if (null === $values) {
+            $values = $this->values;
+        }
 
-    return $this->saveFile($field, $filename, $values[$field]);
-  }
+        if (isset($values[$field.'_delete']) && $values[$field.'_delete']) {
+            $this->removeFile($field);
 
-  /**
-   * Removes the current file for the field.
-   *
-   * @param string $field The field name
-   */
-  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));
-    }
+            return '';
+        }
 
-    $directory = $this->validatorSchema[$field]->getOption('path');
-    $filename = $this->getObject()->$field;
+        if (!$values[$field]) {
+            // this is needed if the form is embedded, in which case
+            // the parent form has already changed the value of the field
+            $oldValues = $this->getObject()->getModified(true, false);
 
-    // this is needed if the form is embedded, in which case
-    // the parent form has already changed the value of the field
-    if (!is_string($filename))
-    {
-      $oldValues = $this->getObject()->getModified(true, false);
-      if (isset($oldValues[$field]))
-      {
-        $filename = $oldValues[$field];
-      }
-    }
+            return isset($oldValues[$field]) ? $oldValues[$field] : $this->object->{$field};
+        }
 
-    if ($directory && $filename && is_file($file = $directory.'/'.$filename))
-    {
-      unlink($file);
-    }
-  }
-
-  /**
-   * 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
-   *
-   * @return string The filename used to save the file
-   */
-  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));
+        // we need the base directory
+        if (!$this->validatorSchema[$field]->getOption('path')) {
+            return $values[$field];
+        }
+
+        $this->removeFile($field);
+
+        return $this->saveFile($field, $filename, $values[$field]);
     }
 
-    if (null === $file)
+    /**
+     * Removes the current file for the field.
+     *
+     * @param string $field The field name
+     */
+    protected function removeFile($field)
     {
-      $file = $this->getValue($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));
+        }
 
-    $method = sprintf('generate%sFilename', $this->camelize($field));
+        $directory = $this->validatorSchema[$field]->getOption('path');
+        $filename = $this->getObject()->{$field};
 
-    if (null !== $filename)
-    {
-      return $file->save($filename);
-    }
-    else if (method_exists($this, $method))
-    {
-      return $file->save($this->$method($file));
+        // this is needed if the form is embedded, in which case
+        // the parent form has already changed the value of the field
+        if (!is_string($filename)) {
+            $oldValues = $this->getObject()->getModified(true, false);
+            if (isset($oldValues[$field])) {
+                $filename = $oldValues[$field];
+            }
+        }
+
+        if ($directory && $filename && is_file($file = $directory.'/'.$filename)) {
+            unlink($file);
+        }
     }
-    else if (method_exists($this->getObject(), $method))
+
+    /**
+     * 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
+     *
+     * @return string The filename used to save the file
+     */
+    protected function saveFile($field, $filename = null, sfValidatedFile $file = null)
     {
-      return $file->save($this->getObject()->$method($file));
+        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) {
+            $file = $this->getValue($field);
+        }
+
+        $method = sprintf('generate%sFilename', $this->camelize($field));
+
+        if (null !== $filename) {
+            return $file->save($filename);
+        }
+        if (method_exists($this, $method)) {
+            return $file->save($this->{$method}($file));
+        }
+        if (method_exists($this->getObject(), $method)) {
+            return $file->save($this->getObject()->{$method}($file));
+        }
+
+        return $file->save();
     }
-    else
+
+    /**
+     * Used in generated forms when models use inheritance.
+     */
+    protected function setupInheritance()
     {
-      return $file->save();
     }
-  }
-
-  /**
-   * Used in generated forms when models use inheritance.
-   */
-  protected function setupInheritance()
-  {
-  }
-
-  /**
-   * Returns the name of the related model.
-   *
-   * @param string $alias A relation alias
-   *
-   * @return string
-   *
-   * @throws InvalidArgumentException If no relation with the supplied alias exists on the current model
-   */
-  protected function getRelatedModelName($alias)
-  {
-    $table = Doctrine_Core::getTable($this->getModelName());
-
-    if (!$table->hasRelation($alias))
+
+    /**
+     * Returns the name of the related model.
+     *
+     * @param string $alias A relation alias
+     *
+     * @return string
+     *
+     * @throws InvalidArgumentException If no relation with the supplied alias exists on the current model
+     */
+    protected function getRelatedModelName($alias)
     {
-      throw new InvalidArgumentException(sprintf('The "%s" model has no "%s" relation.', $this->getModelName(), $alias));
-    }
+        $table = Doctrine_Core::getTable($this->getModelName());
+
+        if (!$table->hasRelation($alias)) {
+            throw new InvalidArgumentException(sprintf('The "%s" model has no "%s" relation.', $this->getModelName(), $alias));
+        }
 
-    $relation = $table->getRelation($alias);
+        $relation = $table->getRelation($alias);
 
-    return $relation['class'];
-  }
+        return $relation['class'];
+    }
 }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/form/sfFormFilterDoctrine.class.php b/lib/plugins/sfDoctrinePlugin/lib/form/sfFormFilterDoctrine.class.php
index 814a06625..07234f7a6 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/form/sfFormFilterDoctrine.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/form/sfFormFilterDoctrine.class.php
@@ -17,319 +17,283 @@
  *  * query:        The query object to use
  *  * table_method: A method on the table class that will either filter the passed query object or create a new one
  *
- * @package    symfony
- * @subpackage form
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfFormFilterDoctrine extends sfFormFilter
 {
-  /**
-   * Returns the current model name.
-   *
-   * @return string The model class name
-   */
-  abstract public function getModelName();
-
-  /**
-   * Returns the fields and their filter type.
-   *
-   * @return array An array of fields with their filter type
-   */
-  abstract public function getFields();
-
-  /**
-   * Get the name of the table method used to retrieve the query object for the filter
-   *
-   * @return string
-   */
-  public function getTableMethod()
-  {
-    return $this->getOption('table_method');
-  }
-
-  /**
-   * Set the name of the table method used to retrieve the query object for the filter
-   *
-   * The specified method will be passed the query object before any changes
-   * are made based on incoming parameters.
-   *
-   * @param string $tableMethod
-   */
-  public function setTableMethod($tableMethod)
-  {
-    $this->setOption('table_method', $tableMethod);
-  }
-
-  /**
-   * Sets the query object to use.
-   *
-   * @param Doctrine_Query $query
-   */
-  public function setQuery($query)
-  {
-    $this->setOption('query', $query);
-  }
-
-  /**
-   * Returns a Doctrine Query based on the current values form the form.
-   *
-   * @throws sfValidatorErrorSchema
-   * @return Doctrine_Query A Doctrine Query object
-   */
-  public function getQuery()
-  {
-    if (!$this->isValid())
+    /**
+     * Returns the current model name.
+     *
+     * @return string The model class name
+     */
+    abstract public function getModelName();
+
+    /**
+     * Returns the fields and their filter type.
+     *
+     * @return array An array of fields with their filter type
+     */
+    abstract public function getFields();
+
+    /**
+     * Get the name of the table method used to retrieve the query object for the filter.
+     *
+     * @return string
+     */
+    public function getTableMethod()
     {
-      throw $this->getErrorSchema();
+        return $this->getOption('table_method');
     }
 
-    return $this->buildQuery($this->getValues());
-  }
-
-  /**
-   * Processes cleaned up values with user defined methods.
-   *
-   * To process a value before it is used by the buildQuery() method,
-   * you need to define an convertXXXValue() method where XXX is the PHP name
-   * of the column.
-   *
-   * The method must return the processed value or false to remove the value
-   * from the array of cleaned up values.
-   *
-   * @param  array $values An array of cleaned up values to process
-   *
-   * @return array An array of cleaned up values processed by the user defined methods
-   */
-  public function processValues($values)
-  {
-    // see if the user has overridden some column setter
-    $originalValues = $values;
-    foreach ($originalValues as $field => $value)
+    /**
+     * Set the name of the table method used to retrieve the query object for the filter.
+     *
+     * The specified method will be passed the query object before any changes
+     * are made based on incoming parameters.
+     *
+     * @param string $tableMethod
+     */
+    public function setTableMethod($tableMethod)
     {
-      if (method_exists($this, $method = sprintf('convert%sValue', self::camelize($field))))
-      {
-        if (false === $ret = $this->$method($value))
-        {
-          unset($values[$field]);
-        }
-        else
-        {
-          $values[$field] = $ret;
-        }
-      }
+        $this->setOption('table_method', $tableMethod);
     }
 
-    return $values;
-  }
-
-  /**
-   * Builds a Doctrine Query based on the passed values.
-   *
-   * @param  array $values An array of parameters to build the Query object
-   *
-   * @return Doctrine_Query A Doctrine Query object
-   */
-  public function buildQuery(array $values)
-  {
-    return $this->doBuildQuery($this->processValues($values));
-  }
-
-  /**
-   * Builds a Doctrine query with processed values.
-   *
-   * Overload this method instead of {@link buildQuery()} to avoid running
-   * {@link processValues()} multiple times.
-   *
-   * @throws LogicException
-   *
-   * @param  array $values
-   * @return Doctrine_Query
-   */
-  protected function doBuildQuery(array $values)
-  {
-    $query = isset($this->options['query']) ? clone $this->options['query'] : $this->getTable()->createQuery('r');
-
-    if ($method = $this->getTableMethod())
+    /**
+     * Sets the query object to use.
+     *
+     * @param Doctrine_Query $query
+     */
+    public function setQuery($query)
     {
-      $tmp = $this->getTable()->$method($query);
-
-      // for backward compatibility
-      if ($tmp instanceof Doctrine_Query)
-      {
-        $query = $tmp;
-      }
+        $this->setOption('query', $query);
     }
 
-    $fields = $this->getFields();
-
-    // add those fields that are not represented in getFields() with a null type
-    $names = array_merge($fields, array_diff(array_keys($this->validatorSchema->getFields()), array_keys($fields)));
-    $fields = array_merge($fields, array_combine($names, array_fill(0, count($names), null)));
-
-    foreach ($fields as $field => $type)
+    /**
+     * Returns a Doctrine Query based on the current values form the form.
+     *
+     * @return Doctrine_Query A Doctrine Query object
+     *
+     * @throws sfValidatorErrorSchema
+     */
+    public function getQuery()
     {
-      if (!isset($values[$field]) || null === $values[$field] || '' === $values[$field])
-      {
-        continue;
-      }
-
-      if ($this->getTable()->hasField($field))
-      {
-        $method = sprintf('add%sColumnQuery', self::camelize($this->getFieldName($field)));
-      }
-      else if (!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));
-      }
-
-      if (method_exists($this, $method))
-      {
-        $this->$method($query, $field, $values[$field]);
-      }
-      else if (null !== $type)
-      {
-        if (!method_exists($this, $method = sprintf('add%sQuery', $type)))
-        {
-          throw new LogicException(sprintf('Unable to filter for the "%s" type.', $type));
+        if (!$this->isValid()) {
+            throw $this->getErrorSchema();
         }
 
-        $this->$method($query, $field, $values[$field]);
-      }
+        return $this->buildQuery($this->getValues());
     }
 
-    return $query;
-  }
+    /**
+     * Processes cleaned up values with user defined methods.
+     *
+     * To process a value before it is used by the buildQuery() method,
+     * you need to define an convertXXXValue() method where XXX is the PHP name
+     * of the column.
+     *
+     * The method must return the processed value or false to remove the value
+     * from the array of cleaned up values.
+     *
+     * @param array $values An array of cleaned up values to process
+     *
+     * @return array An array of cleaned up values processed by the user defined methods
+     */
+    public function processValues($values)
+    {
+        // see if the user has overridden some column setter
+        $originalValues = $values;
+        foreach ($originalValues as $field => $value) {
+            if (method_exists($this, $method = sprintf('convert%sValue', self::camelize($field)))) {
+                if (false === $ret = $this->{$method}($value)) {
+                    unset($values[$field]);
+                } else {
+                    $values[$field] = $ret;
+                }
+            }
+        }
 
-  protected function addForeignKeyQuery(Doctrine_Query $query, $field, $value)
-  {
-    $fieldName = $this->getFieldName($field);
+        return $values;
+    }
 
-    if (is_array($value))
+    /**
+     * Builds a Doctrine Query based on the passed values.
+     *
+     * @param array $values An array of parameters to build the Query object
+     *
+     * @return Doctrine_Query A Doctrine Query object
+     */
+    public function buildQuery(array $values)
     {
-      $query->andWhereIn(sprintf('%s.%s', $query->getRootAlias(), $fieldName), $value);
+        return $this->doBuildQuery($this->processValues($values));
     }
-    else
+
+    /**
+     * Builds a Doctrine query with processed values.
+     *
+     * Overload this method instead of {@link buildQuery()} to avoid running
+     * {@link processValues()} multiple times.
+     *
+     * @return Doctrine_Query
+     *
+     * @throws LogicException
+     */
+    protected function doBuildQuery(array $values)
     {
-      $query->addWhere(sprintf('%s.%s = ?', $query->getRootAlias(), $fieldName), $value);
-    }
-  }
+        $query = isset($this->options['query']) ? clone $this->options['query'] : $this->getTable()->createQuery('r');
 
-  protected function addEnumQuery(Doctrine_Query $query, $field, $value)
-  {
-    $fieldName = $this->getFieldName($field);
+        if ($method = $this->getTableMethod()) {
+            $tmp = $this->getTable()->{$method}($query);
 
-    $query->addWhere(sprintf('%s.%s = ?', $query->getRootAlias(), $fieldName), $value);
-  }
+            // for backward compatibility
+            if ($tmp instanceof Doctrine_Query) {
+                $query = $tmp;
+            }
+        }
 
-  protected function addTextQuery(Doctrine_Query $query, $field, $values)
-  {
-    $fieldName = $this->getFieldName($field);
+        $fields = $this->getFields();
 
-    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(''));
+        // add those fields that are not represented in getFields() with a null type
+        $names = array_merge($fields, array_diff(array_keys($this->validatorSchema->getFields()), array_keys($fields)));
+        $fields = array_merge($fields, array_combine($names, array_fill(0, count($names), null)));
+
+        foreach ($fields as $field => $type) {
+            if (!isset($values[$field]) || null === $values[$field] || '' === $values[$field]) {
+                continue;
+            }
+
+            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));
+            }
+
+            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));
+                }
+
+                $this->{$method}($query, $field, $values[$field]);
+            }
+        }
+
+        return $query;
     }
-    else if (is_array($values) && isset($values['text']) && '' != $values['text'])
+
+    protected function addForeignKeyQuery(Doctrine_Query $query, $field, $value)
     {
-      $query->addWhere(sprintf('%s.%s LIKE ?', $query->getRootAlias(), $fieldName), '%'.$values['text'].'%');
-    }
-  }
+        $fieldName = $this->getFieldName($field);
 
-  protected function addNumberQuery(Doctrine_Query $query, $field, $values)
-  {
-    $fieldName = $this->getFieldName($field);
+        if (is_array($value)) {
+            $query->andWhereIn(sprintf('%s.%s', $query->getRootAlias(), $fieldName), $value);
+        } else {
+            $query->addWhere(sprintf('%s.%s = ?', $query->getRootAlias(), $fieldName), $value);
+        }
+    }
 
-    if (is_array($values) && isset($values['is_empty']) && $values['is_empty'])
+    protected function addEnumQuery(Doctrine_Query $query, $field, $value)
     {
-      $query->addWhere(sprintf('(%s.%s IS NULL OR %1$s.%2$s = ?)', $query->getRootAlias(), $fieldName), array(''));
+        $fieldName = $this->getFieldName($field);
+
+        $query->addWhere(sprintf('%s.%s = ?', $query->getRootAlias(), $fieldName), $value);
     }
-    else if (is_array($values) && isset($values['text']) && '' !== $values['text'])
+
+    protected function addTextQuery(Doctrine_Query $query, $field, $values)
     {
-      $query->addWhere(sprintf('%s.%s = ?', $query->getRootAlias(), $fieldName), $values['text']);
+        $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(''));
+        } elseif (is_array($values) && isset($values['text']) && '' != $values['text']) {
+            $query->addWhere(sprintf('%s.%s LIKE ?', $query->getRootAlias(), $fieldName), '%'.$values['text'].'%');
+        }
     }
-  }
 
-  protected function addBooleanQuery(Doctrine_Query $query, $field, $value)
-  {
-    $fieldName = $this->getFieldName($field);
-    $query->addWhere(sprintf('%s.%s = ?', $query->getRootAlias(), $fieldName), $value);
-  }
+    protected function addNumberQuery(Doctrine_Query $query, $field, $values)
+    {
+        $fieldName = $this->getFieldName($field);
 
-  protected function addDateQuery(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(''));
+        } elseif (is_array($values) && isset($values['text']) && '' !== $values['text']) {
+            $query->addWhere(sprintf('%s.%s = ?', $query->getRootAlias(), $fieldName), $values['text']);
+        }
+    }
 
-    if (isset($values['is_empty']) && $values['is_empty'])
+    protected function addBooleanQuery(Doctrine_Query $query, $field, $value)
     {
-      $query->addWhere(sprintf('%s.%s IS NULL', $query->getRootAlias(), $fieldName));
+        $fieldName = $this->getFieldName($field);
+        $query->addWhere(sprintf('%s.%s = ?', $query->getRootAlias(), $fieldName), $value);
     }
-    else
+
+    protected function addDateQuery(Doctrine_Query $query, $field, $values)
     {
-      if (null !== $values['from'] && null !== $values['to'])
-      {
-        $query->andWhere(sprintf('%s.%s >= ?', $query->getRootAlias(), $fieldName), $values['from']);
-        $query->andWhere(sprintf('%s.%s <= ?', $query->getRootAlias(), $fieldName), $values['to']);
-      }
-      else if (null !== $values['from'])
-      {
-        $query->andWhere(sprintf('%s.%s >= ?', $query->getRootAlias(), $fieldName), $values['from']);
-      }
-      else if (null !== $values['to'])
-      {
-        $query->andWhere(sprintf('%s.%s <= ?', $query->getRootAlias(), $fieldName), $values['to']);
-      }
+        $fieldName = $this->getFieldName($field);
+
+        if (isset($values['is_empty']) && $values['is_empty']) {
+            $query->addWhere(sprintf('%s.%s IS NULL', $query->getRootAlias(), $fieldName));
+        } else {
+            if (null !== $values['from'] && null !== $values['to']) {
+                $query->andWhere(sprintf('%s.%s >= ?', $query->getRootAlias(), $fieldName), $values['from']);
+                $query->andWhere(sprintf('%s.%s <= ?', $query->getRootAlias(), $fieldName), $values['to']);
+            } elseif (null !== $values['from']) {
+                $query->andWhere(sprintf('%s.%s >= ?', $query->getRootAlias(), $fieldName), $values['from']);
+            } elseif (null !== $values['to']) {
+                $query->andWhere(sprintf('%s.%s <= ?', $query->getRootAlias(), $fieldName), $values['to']);
+            }
+        }
     }
-  }
-
-  /**
-   * Used in generated forms when models use inheritance.
-   */
-  protected function setupInheritance()
-  {
-  }
-
-  /**
-   * Returns the name of the related model.
-   *
-   * @param string $alias A relation alias
-   *
-   * @return string
-   *
-   * @throws InvalidArgumentException If no relation with the supplied alias exists on the current model
-   */
-  protected function getRelatedModelName($alias)
-  {
-    $table = Doctrine_Core::getTable($this->getModelName());
-
-    if (!$table->hasRelation($alias))
+
+    /**
+     * Used in generated forms when models use inheritance.
+     */
+    protected function setupInheritance()
     {
-      throw new InvalidArgumentException(sprintf('The "%s" model has no "%s" relation.', $this->getModelName(), $alias));
     }
 
-    $relation = $table->getRelation($alias);
+    /**
+     * Returns the name of the related model.
+     *
+     * @param string $alias A relation alias
+     *
+     * @return string
+     *
+     * @throws InvalidArgumentException If no relation with the supplied alias exists on the current model
+     */
+    protected function getRelatedModelName($alias)
+    {
+        $table = Doctrine_Core::getTable($this->getModelName());
 
-    return $relation['class'];
-  }
+        if (!$table->hasRelation($alias)) {
+            throw new InvalidArgumentException(sprintf('The "%s" model has no "%s" relation.', $this->getModelName(), $alias));
+        }
 
-  protected function getColName($field)
-  {
-    return $this->getTable()->getColumnName($field);
-  }
+        $relation = $table->getRelation($alias);
 
-  protected function getFieldName($colName)
-  {
-    return $this->getTable()->getFieldName($colName);
-  }
+        return $relation['class'];
+    }
+
+    protected function getColName($field)
+    {
+        return $this->getTable()->getColumnName($field);
+    }
 
-  protected function camelize($text)
-  {
-    return strtr(ucwords(strtr($text, array('/' => ':: ', '_' => ' ', '-' => ' '))), array(' ' => ''));
-  }
+    protected function getFieldName($colName)
+    {
+        return $this->getTable()->getFieldName($colName);
+    }
 
-  protected function getTable()
-  {
-    return Doctrine_Core::getTable($this->getModelName());
-  }
+    protected function camelize($text)
+    {
+        return strtr(ucwords(strtr($text, array('/' => ':: ', '_' => ' ', '-' => ' '))), array(' ' => ''));
+    }
+
+    protected function getTable()
+    {
+        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 f693ebb55..1b0ca4e04 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineColumn.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineColumn.class.php
@@ -10,366 +10,340 @@
  */
 
 /**
- * Represents a Doctrine column
+ * Represents a Doctrine column.
  *
- * @package    symfony
- * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
+ *
  * @version    SVN: $Id$
  */
 class sfDoctrineColumn implements ArrayAccess
 {
-  /**
-   * Array mapping Doctrine column types to the native symfony type
-   */
-  static $doctrineToSymfony = array(
-    'boolean'   => 'BOOLEAN',
-    'string'    => 'LONGVARCHAR',
-    'integer'   => 'INTEGER',
-    'date'      => 'DATE',
-    'timestamp' => 'TIMESTAMP',
-    'time'      => 'TIME',
-    'enum'      => 'LONGVARCHAR',
-    'float'     => 'FLOAT',
-    'double'    => 'DOUBLE',
-    'clob'      => 'CLOB',
-    'blob'      => 'BLOB',
-    'object'    => 'LONGVARCHAR',
-    'array'     => 'LONGVARCHAR',
-    'decimal'   => 'DECIMAL',
-  );
-
-  /**
-   * Store the name of the related class for this column if it is
-   * a foreign key
-   *
-   * @var string
-   */
-  protected $foreignClassName = null;
-
-  /**
-   * Store the name of the related column for this column if it is
-   * a foreign key
-   *
-   * @var string
-   */
-  protected $foreignFieldName = null;
-
-  /**
-   * Doctrine_Table instance this column belongs to
-   *
-   * @var Doctrine_Table $table
-   */
-  protected $table = null;
-
-  /**
-   * Field name of the column
-   *
-   * @var string
-   */
-  protected $name = null;
-
-  /**
-   * Definition of the column
-   *
-   * @var array $definition
-   */
-  protected $definition = array();
-
-  /**
-   * Constructor
-   *
-   * @param string $name
-   * @param Doctrine_Table $table
-   */
-  public function __construct($name, Doctrine_Table $table)
-  {
-    $this->name = $name;
-    $this->table = $table;
-    $this->definition = $table->getDefinitionOf($name);
-  }
-
-  /**
-   * Get the name of the column
-   *
-   * @return string $name
-   */
-  public function getName()
-  {
-    return $this->table->getColumnName($this->name);
-  }
-
-  /**
-   * Get the alias/field name
-   *
-   * @return string $fieldName
-   */
-  public function getFieldName()
-  {
-    return $this->table->getFieldName($this->getName());
-  }
-
-  /**
-   * Get php name. Exists for backwards compatibility with propel orm
-   *
-   * @return string $fieldName
-   */
-  public function getPhpName()
-  {
-    return $this->getFieldName();
-  }
-
-  /**
-   * Get the Doctrine type of the column
-   *
-   * @return void
-   */
-  public function getDoctrineType()
-  {
-    return isset($this->definition['type']) ? $this->definition['type']:null;
-  }
-
-  /**
-   * Get symfony type of the column
-   *
-   * @return void
-   */
-  public function getType()
-  {
-    $doctrineType = $this->getDoctrineType();
-
-    // we simulate the CHAR/VARCHAR types to generate input_tags
-    if ('string' == $doctrineType && null !== $this->getSize() && $this->getSize() <= 255)
+    /**
+     * Array mapping Doctrine column types to the native symfony type.
+     */
+    public static $doctrineToSymfony = array(
+        'boolean' => 'BOOLEAN',
+        'string' => 'LONGVARCHAR',
+        'integer' => 'INTEGER',
+        'date' => 'DATE',
+        'timestamp' => 'TIMESTAMP',
+        'time' => 'TIME',
+        'enum' => 'LONGVARCHAR',
+        'float' => 'FLOAT',
+        'double' => 'DOUBLE',
+        'clob' => 'CLOB',
+        'blob' => 'BLOB',
+        'object' => 'LONGVARCHAR',
+        'array' => 'LONGVARCHAR',
+        'decimal' => 'DECIMAL',
+    );
+
+    /**
+     * Store the name of the related class for this column if it is
+     * a foreign key.
+     *
+     * @var string
+     */
+    protected $foreignClassName;
+
+    /**
+     * Store the name of the related column for this column if it is
+     * a foreign key.
+     *
+     * @var string
+     */
+    protected $foreignFieldName;
+
+    /**
+     * Doctrine_Table instance this column belongs to.
+     *
+     * @var Doctrine_Table
+     */
+    protected $table;
+
+    /**
+     * Field name of the column.
+     *
+     * @var string
+     */
+    protected $name;
+
+    /**
+     * Definition of the column.
+     *
+     * @var array
+     */
+    protected $definition = array();
+
+    /**
+     * Constructor.
+     *
+     * @param string $name
+     */
+    public function __construct($name, Doctrine_Table $table)
+    {
+        $this->name = $name;
+        $this->table = $table;
+        $this->definition = $table->getDefinitionOf($name);
+    }
+
+    /**
+     * Get the name of the column.
+     *
+     * @return string $name
+     */
+    public function getName()
+    {
+        return $this->table->getColumnName($this->name);
+    }
+
+    /**
+     * Get the alias/field name.
+     *
+     * @return string $fieldName
+     */
+    public function getFieldName()
+    {
+        return $this->table->getFieldName($this->getName());
+    }
+
+    /**
+     * Get php name. Exists for backwards compatibility with propel orm.
+     *
+     * @return string $fieldName
+     */
+    public function getPhpName()
+    {
+        return $this->getFieldName();
+    }
+
+    /**
+     * Get the Doctrine type of the column.
+     */
+    public function getDoctrineType()
+    {
+        return isset($this->definition['type']) ? $this->definition['type'] : null;
+    }
+
+    /**
+     * Get symfony type of the column.
+     */
+    public function getType()
+    {
+        $doctrineType = $this->getDoctrineType();
+
+        // we simulate the CHAR/VARCHAR types to generate input_tags
+        if ('string' == $doctrineType && null !== $this->getSize() && $this->getSize() <= 255) {
+            return 'VARCHAR';
+        }
+
+        return $doctrineType ? self::$doctrineToSymfony[$doctrineType] : 'VARCHAR';
+    }
+
+    /**
+     * Get size/length of the column.
+     */
+    public function getSize()
+    {
+        return $this->definition['length'];
+    }
+
+    public function getLength()
+    {
+        return $this->getSize();
+    }
+
+    /**
+     * Check if the column definition has a certain key.
+     *
+     * @param string $key
+     *
+     * @return bool
+     */
+    public function hasDefinitionKey($key)
     {
-      return 'VARCHAR';
+        return isset($this->definition[$key]) ? true : false;
     }
 
-    return $doctrineType ? self::$doctrineToSymfony[$doctrineType] : 'VARCHAR';
-  }
-
-  /**
-   * Get size/length of the column
-   *
-   * @return void
-   */
-  public function getSize()
-  {
-    return $this->definition['length'];
-  }
-
-  public function getLength()
-  {
-    return $this->getSize();
-  }
-
-  /**
-   * Check if the column definition has a certain key
-   *
-   * @param string $key
-   * @return bool
-   */
-  public function hasDefinitionKey($key)
-  {
-    return isset($this->definition[$key]) ? true:false;
-  }
-
-  /**
-   * Get the value of a column definition key
-   *
-   * @param string $key
-   * @return array $definition
-   */
-  public function getDefinitionKey($key)
-  {
-    if ($this->hasDefinitionKey($key))
+    /**
+     * Get the value of a column definition key.
+     *
+     * @param string $key
+     *
+     * @return array $definition
+     */
+    public function getDefinitionKey($key)
     {
-      return $this->definition[$key];
+        if ($this->hasDefinitionKey($key)) {
+            return $this->definition[$key];
+        }
+
+        return false;
     }
 
-    return false;
-  }
-
-  /**
-   * Returns a value from the current column's relation.
-   *
-   * @param string $key
-   *
-   * @return mixed|null
-   */
-  public function getRelationKey($key)
-  {
-    foreach ($this->table->getRelations() as $relation)
+    /**
+     * Returns a value from the current column's relation.
+     *
+     * @param string $key
+     *
+     * @return mixed|null
+     */
+    public function getRelationKey($key)
     {
-      $local = (array) $relation['local'];
-      $local = array_map('strtolower', $local);
-      if (in_array(strtolower($this->name), $local))
-      {
-        return $relation[$key];
-      }
+        foreach ($this->table->getRelations() as $relation) {
+            $local = (array) $relation['local'];
+            $local = array_map('strtolower', $local);
+            if (in_array(strtolower($this->name), $local)) {
+                return $relation[$key];
+            }
+        }
+
+        return null;
     }
 
-    return null;
-  }
-
-  /**
-   * Returns true of the column is not null and false if it is null
-   *
-   * @return boolean
-   */
-  public function isNotNull()
-  {
-    if (isset($this->definition['notnull']))
+    /**
+     * Returns true of the column is not null and false if it is null.
+     *
+     * @return bool
+     */
+    public function isNotNull()
     {
-      return $this->definition['notnull'];
+        if (isset($this->definition['notnull'])) {
+            return $this->definition['notnull'];
+        }
+
+        if (isset($this->definition['notblank'])) {
+            return $this->definition['notblank'];
+        }
+
+        return false;
     }
 
-    if (isset($this->definition['notblank']))
+    /**
+     * Returns true if the column is a primary key and false if it is not.
+     */
+    public function isPrimaryKey()
     {
-      return $this->definition['notblank'];
+        if (isset($this->definition['primary'])) {
+            return $this->definition['primary'];
+        }
+
+        return false;
     }
 
-    return false;
-  }
-
-  /**
-   * Returns true if the column is a primary key and false if it is not
-   *
-   * @return void
-   */
-  public function isPrimaryKey()
-  {
-    if (isset($this->definition['primary']))
+    /**
+     * Returns true if this column is a foreign key and false if it is not.
+     *
+     * @return bool $isForeignKey
+     */
+    public function isForeignKey()
     {
-      return $this->definition['primary'];
+        if (isset($this->foreignClassName)) {
+            return true;
+        }
+
+        if ($this->isPrimaryKey()) {
+            return false;
+        }
+
+        foreach ($this->table->getRelations() as $relation) {
+            $local = (array) $relation['local'];
+            $local = array_map('strtolower', $local);
+            if (in_array(strtolower($this->name), $local)) {
+                $this->foreignClassName = $relation['class'];
+                if (Doctrine_Relation::ONE === $relation->getType()) {
+                    $this->foreignFieldName = $relation['foreign'];
+                }
+
+                return true;
+            }
+        }
+
+        return false;
     }
 
-    return false;
-  }
-
-  /**
-   * Returns true if this column is a foreign key and false if it is not
-   *
-   * @return boolean $isForeignKey
-   */
-  public function isForeignKey()
-  {
-    if (isset($this->foreignClassName))
+    /**
+     * Get the name of the related class for this column foreign key.
+     *
+     * @return string $foreignClassName
+     */
+    public function getForeignClassName()
     {
-      return true;
+        if ($this->isForeignKey()) {
+            return $this->foreignClassName;
+        }
+
+        return false;
     }
 
-    if ($this->isPrimaryKey())
+    /**
+     * Get the name of the related field for this column foreign key.
+     *
+     * @return string
+     */
+    public function getForeignFieldName()
     {
-      return false;
+        if ($this->isForeignKey()) {
+            return $this->foreignFieldName;
+        }
+
+        return false;
     }
 
-    foreach ($this->table->getRelations() as $relation)
+    /**
+     * If foreign key get the related Doctrine_Table object.
+     *
+     * @return Doctrine_Table $table
+     */
+    public function getForeignTable()
     {
-      $local = (array) $relation['local'];
-      $local = array_map('strtolower', $local);
-      if (in_array(strtolower($this->name), $local))
-      {
-        $this->foreignClassName = $relation['class'];
-        if ($relation->getType() === Doctrine_Relation::ONE)
-        {
-          $this->foreignFieldName = $relation['foreign'];
+        if ($this->isForeignKey()) {
+            return Doctrine_Core::getTable($this->foreignClassName);
         }
 
-        return true;
-      }
+        return false;
+    }
+
+    /**
+     * Set the Doctrine_Table object this column belongs to.
+     */
+    public function setTable(Doctrine_Table $table)
+    {
+        $this->table = $table;
     }
 
-    return false;
-  }
-
-  /**
-   * Get the name of the related class for this column foreign key.
-   *
-   * @return string $foreignClassName
-   */
-  public function getForeignClassName()
-  {
-    if ($this->isForeignKey())
+    /**
+     * Get the Doctrine_Table object this column belongs to.
+     *
+     * @return Doctrine_Table $table
+     */
+    public function getTable()
     {
-      return $this->foreignClassName;
+        return $this->table;
     }
 
-    return false;
-  }
-
-  /**
-   * Get the name of the related field for this column foreign key.
-   *
-   * @return string
-   */
-  public function getForeignFieldName()
-  {
-    if ($this->isForeignKey())
+    #[\ReturnTypeWillChange]
+    public function offsetExists($offset)
     {
-      return $this->foreignFieldName;
+        return isset($this->definition[$offset]);
     }
 
-    return false;
-  }
-
-  /**
-   * If foreign key get the related Doctrine_Table object
-   *
-   * @return Doctrine_Table $table
-   */
-  public function getForeignTable()
-  {
-    if ($this->isForeignKey())
+    #[\ReturnTypeWillChange]
+    public function offsetSet($offset, $value)
     {
-      return Doctrine_Core::getTable($this->foreignClassName);
+        $this->definition[$offset] = $value;
     }
 
-    return false;
-  }
-
-  /**
-   * Set the Doctrine_Table object this column belongs to
-   *
-   * @param Doctrine_Table $table
-   * @return void
-   */
-  public function setTable(Doctrine_Table $table)
-  {
-    $this->table = $table;
-  }
-
-  /**
-   * Get the Doctrine_Table object this column belongs to
-   *
-   * @return Doctrine_Table $table
-   */
-  public function getTable()
-  {
-    return $this->table;
-  }
-
-  #[\ReturnTypeWillChange]
-  public function offsetExists($offset)
-  {
-    return isset($this->definition[$offset]);
-  }
-
-  #[\ReturnTypeWillChange]
-  public function offsetSet($offset, $value)
-  {
-    $this->definition[$offset] = $value;
-  }
-
-  #[\ReturnTypeWillChange]
-  public function offsetGet($offset)
-  {
-    return $this->definition[$offset];
-  }
-
-  #[\ReturnTypeWillChange]
-  public function offsetUnset($offset)
-  {
-    unset($this->definition[$offset]);
-  }
+    #[\ReturnTypeWillChange]
+    public function offsetGet($offset)
+    {
+        return $this->definition[$offset];
+    }
+
+    #[\ReturnTypeWillChange]
+    public function offsetUnset($offset)
+    {
+        unset($this->definition[$offset]);
+    }
 }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormFilterGenerator.class.php b/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormFilterGenerator.class.php
index ec8354651..61d752dc6 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormFilterGenerator.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormFilterGenerator.class.php
@@ -13,359 +13,367 @@
  *
  * This class generates a Doctrine filter forms.
  *
- * @package    symfony
- * @subpackage generator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfDoctrineFormFilterGenerator extends sfDoctrineFormGenerator
 {
-  /**
-   * Initializes the current sfGenerator instance.
-   *
-   * @param sfGeneratorManager $generatorManager A sfGeneratorManager instance
-   */
-  public function initialize(sfGeneratorManager $generatorManager)
-  {
-    parent::initialize($generatorManager);
-
-    $this->setGeneratorClass('sfDoctrineFormFilter');
-  }
-
-  /**
-   * Generates classes and templates in cache.
-   *
-   * @param array $params The parameters
-   *
-   * @return string The data to put in configuration cache
-   */
-  public function generate($params = array())
-  {
-    $this->params = $params;
-
-    if (!isset($this->params['model_dir_name']))
+    /**
+     * Initializes the current sfGenerator instance.
+     *
+     * @param sfGeneratorManager $generatorManager A sfGeneratorManager instance
+     */
+    public function initialize(sfGeneratorManager $generatorManager)
     {
-      $this->params['model_dir_name'] = 'model';
-    }
+        parent::initialize($generatorManager);
 
-    if (!isset($this->params['filter_dir_name']))
-    {
-      $this->params['filter_dir_name'] = 'filter';
+        $this->setGeneratorClass('sfDoctrineFormFilter');
     }
 
-    $models = $this->loadModels();
-
-    // create the project base class for all forms
-    $file = sfConfig::get('sf_lib_dir').'/filter/doctrine/BaseFormFilterDoctrine.class.php';
-    if (!file_exists($file))
+    /**
+     * Generates classes and templates in cache.
+     *
+     * @param array $params The parameters
+     *
+     * @return string The data to put in configuration cache
+     */
+    public function generate($params = array())
     {
-      if (!is_dir($directory = dirname($file)))
-      {
-        mkdir($directory, 0777, true);
-      }
+        $this->params = $params;
 
-      file_put_contents($file, $this->evalTemplate('sfDoctrineFormFilterBaseTemplate.php'));
-    }
+        if (!isset($this->params['model_dir_name'])) {
+            $this->params['model_dir_name'] = 'model';
+        }
 
-    $pluginPaths = $this->generatorManager->getConfiguration()->getAllPluginPaths();
+        if (!isset($this->params['filter_dir_name'])) {
+            $this->params['filter_dir_name'] = 'filter';
+        }
 
-    // create a form class for every Doctrine class
-    foreach ($models as $model)
-    {
-      $this->table = Doctrine_Core::getTable($model);
-      $this->modelName = $model;
-
-      $baseDir = sfConfig::get('sf_lib_dir') . '/filter/doctrine';
-
-      $isPluginModel = $this->isPluginModel($model);
-      if ($isPluginModel)
-      {
-        $pluginName = $this->getPluginNameForModel($model);
-        $baseDir .= '/' . $pluginName;
-      }
-
-      if (!is_dir($baseDir.'/base'))
-      {
-        mkdir($baseDir.'/base', 0777, true);
-      }
-
-      file_put_contents($baseDir.'/base/Base'.$model.'FormFilter.class.php', $this->evalTemplate(null === $this->getParentModel() ? 'sfDoctrineFormFilterGeneratedTemplate.php' : 'sfDoctrineFormFilterGeneratedInheritanceTemplate.php'));
-
-      if ($isPluginModel)
-      {
-        $pluginBaseDir = $pluginPaths[$pluginName].'/lib/filter/doctrine';
-        if (!file_exists($classFile = $pluginBaseDir.'/Plugin'.$model.'FormFilter.class.php'))
-        {
-            if (!is_dir($pluginBaseDir))
-            {
-              mkdir($pluginBaseDir, 0777, true);
+        $models = $this->loadModels();
+
+        // create the project base class for all forms
+        $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);
             }
-            file_put_contents($classFile, $this->evalTemplate('sfDoctrineFormFilterPluginTemplate.php'));
+
+            file_put_contents($file, $this->evalTemplate('sfDoctrineFormFilterBaseTemplate.php'));
         }
-      }
-      if (!file_exists($classFile = $baseDir.'/'.$model.'FormFilter.class.php'))
-      {
-        if ($isPluginModel)
-        {
-           file_put_contents($classFile, $this->evalTemplate('sfDoctrinePluginFormFilterTemplate.php'));
-        } else {
-           file_put_contents($classFile, $this->evalTemplate('sfDoctrineFormFilterTemplate.php'));
+
+        $pluginPaths = $this->generatorManager->getConfiguration()->getAllPluginPaths();
+
+        // create a form class for every Doctrine class
+        foreach ($models as $model) {
+            $this->table = Doctrine_Core::getTable($model);
+            $this->modelName = $model;
+
+            $baseDir = sfConfig::get('sf_lib_dir').'/filter/doctrine';
+
+            $isPluginModel = $this->isPluginModel($model);
+            if ($isPluginModel) {
+                $pluginName = $this->getPluginNameForModel($model);
+                $baseDir .= '/'.$pluginName;
+            }
+
+            if (!is_dir($baseDir.'/base')) {
+                mkdir($baseDir.'/base', 0777, true);
+            }
+
+            file_put_contents($baseDir.'/base/Base'.$model.'FormFilter.class.php', $this->evalTemplate(null === $this->getParentModel() ? 'sfDoctrineFormFilterGeneratedTemplate.php' : 'sfDoctrineFormFilterGeneratedInheritanceTemplate.php'));
+
+            if ($isPluginModel) {
+                $pluginBaseDir = $pluginPaths[$pluginName].'/lib/filter/doctrine';
+                if (!file_exists($classFile = $pluginBaseDir.'/Plugin'.$model.'FormFilter.class.php')) {
+                    if (!is_dir($pluginBaseDir)) {
+                        mkdir($pluginBaseDir, 0777, true);
+                    }
+                    file_put_contents($classFile, $this->evalTemplate('sfDoctrineFormFilterPluginTemplate.php'));
+                }
+            }
+            if (!file_exists($classFile = $baseDir.'/'.$model.'FormFilter.class.php')) {
+                if ($isPluginModel) {
+                    file_put_contents($classFile, $this->evalTemplate('sfDoctrinePluginFormFilterTemplate.php'));
+                } else {
+                    file_put_contents($classFile, $this->evalTemplate('sfDoctrineFormFilterTemplate.php'));
+                }
+            }
         }
-      }
-    }
-  }
-
-  /**
-   * Returns a sfWidgetForm class name for a given column.
-   *
-   * @param  sfDoctrineColumn $column
-   * @return string    The name of a subclass of sfWidgetForm
-   */
-  public function getWidgetClassForColumn($column)
-  {
-    switch ($column->getDoctrineType())
-    {
-      case 'boolean':
-        $name = 'Choice';
-        break;
-      case 'date':
-      case 'datetime':
-      case 'timestamp':
-        $name = 'FilterDate';
-        break;
-      case 'enum':
-        $name = 'Choice';
-        break;
-      default:
-        $name = 'FilterInput';
     }
 
-    if ($column->isForeignKey())
+    /**
+     * Returns a sfWidgetForm class name for a given column.
+     *
+     * @param sfDoctrineColumn $column
+     *
+     * @return string The name of a subclass of sfWidgetForm
+     */
+    public function getWidgetClassForColumn($column)
     {
-      $name = 'DoctrineChoice';
-    }
+        switch ($column->getDoctrineType()) {
+            case 'boolean':
+                $name = 'Choice';
 
-    return sprintf('sfWidgetForm%s', $name);
-  }
-
-  /**
-   * Returns a PHP string representing options to pass to a widget for a given column.
-   *
-   * @param  sfDoctrineColumn $column
-   * @return string    The options to pass to the widget as a PHP string
-   */
-  public function getWidgetOptionsForColumn($column)
-  {
-    $options = array();
-
-    $withEmpty = $column->isNotNull() && !$column->isForeignKey() ? array("'with_empty' => false") : array();
-    switch ($column->getDoctrineType())
-    {
-      case 'boolean':
-        $options[] = "'choices' => array('' => 'yes or no', 1 => 'yes', 0 => 'no')";
-        break;
-      case 'date':
-      case 'datetime':
-      case 'timestamp':
-        $options[] = "'from_date' => new sfWidgetFormDate(), 'to_date' => new sfWidgetFormDate()";
-        $options = array_merge($options, $withEmpty);
-        break;
-      case 'enum':
-        $values = array('' => '');
-        $values = array_merge($values, $column['values']);
-        $values = array_combine($values, $values);
-        $options[] = "'choices' => ".$this->arrayExport($values);
-        break;
-      default:
-        $options = array_merge($options, $withEmpty);
+                break;
+
+            case 'date':
+            case 'datetime':
+            case 'timestamp':
+                $name = 'FilterDate';
+
+                break;
+
+            case 'enum':
+                $name = 'Choice';
+
+                break;
+
+            default:
+                $name = 'FilterInput';
+        }
+
+        if ($column->isForeignKey()) {
+            $name = 'DoctrineChoice';
+        }
+
+        return sprintf('sfWidgetForm%s', $name);
     }
 
-    if ($column->isForeignKey())
+    /**
+     * Returns a PHP string representing options to pass to a widget for a given column.
+     *
+     * @param sfDoctrineColumn $column
+     *
+     * @return string The options to pass to the widget as a PHP string
+     */
+    public function getWidgetOptionsForColumn($column)
     {
-      $options[] = sprintf('\'model\' => $this->getRelatedModelName(\'%s\'), \'add_empty\' => true', $column->getRelationKey('alias'));
+        $options = array();
+
+        $withEmpty = $column->isNotNull() && !$column->isForeignKey() ? array("'with_empty' => false") : array();
+
+        switch ($column->getDoctrineType()) {
+            case 'boolean':
+                $options[] = "'choices' => array('' => 'yes or no', 1 => 'yes', 0 => 'no')";
+
+                break;
+
+            case 'date':
+            case 'datetime':
+            case 'timestamp':
+                $options[] = "'from_date' => new sfWidgetFormDate(), 'to_date' => new sfWidgetFormDate()";
+                $options = array_merge($options, $withEmpty);
+
+                break;
+
+            case 'enum':
+                $values = array('' => '');
+                $values = array_merge($values, $column['values']);
+                $values = array_combine($values, $values);
+                $options[] = "'choices' => ".$this->arrayExport($values);
+
+                break;
+
+            default:
+                $options = array_merge($options, $withEmpty);
+        }
+
+        if ($column->isForeignKey()) {
+            $options[] = sprintf('\'model\' => $this->getRelatedModelName(\'%s\'), \'add_empty\' => true', $column->getRelationKey('alias'));
+        }
+
+        return count($options) ? sprintf('array(%s)', implode(', ', $options)) : '';
     }
 
-    return count($options) ? sprintf('array(%s)', implode(', ', $options)) : '';
-  }
-
-  /**
-   * Returns a sfValidator class name for a given column.
-   *
-   * @param  sfDoctrineColumn $column
-   * @return string    The name of a subclass of sfValidator
-   */
-  public function getValidatorClassForColumn($column)
-  {
-    switch ($column->getDoctrineType())
+    /**
+     * Returns a sfValidator class name for a given column.
+     *
+     * @param sfDoctrineColumn $column
+     *
+     * @return string The name of a subclass of sfValidator
+     */
+    public function getValidatorClassForColumn($column)
     {
-      case 'boolean':
-        $name = 'Choice';
-        break;
-      case 'float':
-      case 'decimal':
-        $name = 'Number';
-        break;
-      case 'integer':
-        $name = 'Integer';
-        break;
-      case 'date':
-      case 'datetime':
-      case 'timestamp':
-        $name = 'DateRange';
-        break;
-      case 'enum':
-        $name = 'Choice';
-        break;
-      default:
-        $name = 'Pass';
+        switch ($column->getDoctrineType()) {
+            case 'boolean':
+                $name = 'Choice';
+
+                break;
+
+            case 'float':
+            case 'decimal':
+                $name = 'Number';
+
+                break;
+
+            case 'integer':
+                $name = 'Integer';
+
+                break;
+
+            case 'date':
+            case 'datetime':
+            case 'timestamp':
+                $name = 'DateRange';
+
+                break;
+
+            case 'enum':
+                $name = 'Choice';
+
+                break;
+
+            default:
+                $name = 'Pass';
+        }
+
+        if ($column->isPrimarykey() || $column->isForeignKey()) {
+            $name = 'DoctrineChoice';
+        }
+
+        return sprintf('sfValidator%s', $name);
     }
 
-    if ($column->isPrimarykey() || $column->isForeignKey())
+    /**
+     * Returns a PHP string representing options to pass to a validator for a given column.
+     *
+     * @param sfDoctrineColumn $column
+     *
+     * @return string The options to pass to the validator as a PHP string
+     */
+    public function getValidatorOptionsForColumn($column)
     {
-      $name = 'DoctrineChoice';
-    }
+        $options = array('\'required\' => false');
+
+        if ($column->isForeignKey()) {
+            $columns = $column->getForeignTable()->getColumns();
+            foreach ($columns as $name => $col) {
+                if (isset($col['primary']) && $col['primary']) {
+                    break;
+                }
+            }
 
-    return sprintf('sfValidator%s', $name);
-  }
+            $options[] = sprintf('\'model\' => $this->getRelatedModelName(\'%s\'), \'column\' => \'%s\'', $column->getRelationKey('alias'), $column->getForeignTable()->getFieldName($name));
+        } elseif ($column->isPrimaryKey()) {
+            $options[] = sprintf('\'model\' => \'%s\', \'column\' => \'%s\'', $this->table->getOption('name'), $column->getFieldName());
+        } else {
+            switch ($column->getDoctrineType()) {
+                case 'boolean':
+                    $options[] = "'choices' => array('', 1, 0)";
 
-  /**
-   * Returns a PHP string representing options to pass to a validator for a given 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');
+                    break;
 
-    if ($column->isForeignKey())
-    {
-      $columns = $column->getForeignTable()->getColumns();
-      foreach ($columns as $name => $col)
-      {
-        if (isset($col['primary']) && $col['primary'])
-        {
-          break;
+                case 'date':
+                    $options[] = "'from_date' => new sfValidatorDate(array('required' => false)), 'to_date' => new sfValidatorDateTime(array('required' => false))";
+
+                    break;
+
+                case 'datetime':
+                case 'timestamp':
+                    $options[] = "'from_date' => new sfValidatorDateTime(array('required' => false, 'datetime_output' => 'Y-m-d 00:00:00')), 'to_date' => new sfValidatorDateTime(array('required' => false, 'datetime_output' => 'Y-m-d 23:59:59'))";
+
+                    break;
+
+                case 'enum':
+                    $values = array_combine($column['values'], $column['values']);
+                    $options[] = "'choices' => ".$this->arrayExport($values);
+
+                    break;
+            }
         }
-      }
 
-      $options[] = sprintf('\'model\' => $this->getRelatedModelName(\'%s\'), \'column\' => \'%s\'', $column->getRelationKey('alias'), $column->getForeignTable()->getFieldName($name));
+        return count($options) ? sprintf('array(%s)', implode(', ', $options)) : '';
     }
-    else if ($column->isPrimaryKey())
+
+    public function getValidatorForColumn($column)
     {
-      $options[] = sprintf('\'model\' => \'%s\', \'column\' => \'%s\'', $this->table->getOption('name'), $column->getFieldName());
+        $format = 'new %s(%s)';
+
+        if (in_array($class = $this->getValidatorClassForColumn($column), array('sfValidatorInteger', 'sfValidatorNumber'))) {
+            $format = 'new sfValidatorSchemaFilter(\'text\', new %s(%s))';
+        }
+
+        return sprintf($format, $class, $this->getValidatorOptionsForColumn($column));
     }
-    else
+
+    public function getType($column)
     {
-      switch ($column->getDoctrineType())
-      {
-        case 'boolean':
-          $options[] = "'choices' => array('', 1, 0)";
-          break;
-        case 'date':
-          $options[] = "'from_date' => new sfValidatorDate(array('required' => false)), 'to_date' => new sfValidatorDateTime(array('required' => false))";
-          break;
-        case 'datetime':
-        case 'timestamp':
-          $options[] = "'from_date' => new sfValidatorDateTime(array('required' => false, 'datetime_output' => 'Y-m-d 00:00:00')), 'to_date' => new sfValidatorDateTime(array('required' => false, 'datetime_output' => 'Y-m-d 23:59:59'))";
-          break;
-        case 'enum':
-          $values = array_combine($column['values'], $column['values']);
-          $options[] = "'choices' => ".$this->arrayExport($values);
-          break;
-      }
-    }
+        if ($column->isForeignKey()) {
+            return 'ForeignKey';
+        }
 
-    return count($options) ? sprintf('array(%s)', implode(', ', $options)) : '';
-  }
+        switch ($column->getDoctrineType()) {
+            case 'enum':
+                return 'Enum';
 
-  public function getValidatorForColumn($column)
-  {
-    $format = 'new %s(%s)';
+            case 'boolean':
+                return 'Boolean';
 
-    if (in_array($class = $this->getValidatorClassForColumn($column), array('sfValidatorInteger', 'sfValidatorNumber')))
-    {
-      $format = 'new sfValidatorSchemaFilter(\'text\', new %s(%s))';
-    }
+            case 'date':
+            case 'datetime':
+            case 'timestamp':
+                return 'Date';
 
-    return sprintf($format, $class, $this->getValidatorOptionsForColumn($column));
-  }
+            case 'integer':
+            case 'decimal':
+            case 'float':
+                return 'Number';
 
-  public function getType($column)
-  {
-    if ($column->isForeignKey())
-    {
-      return 'ForeignKey';
+            default:
+                return 'Text';
+        }
     }
 
-    switch ($column->getDoctrineType())
+    /**
+     * Get the name of the form class to extend based on the inheritance of the model.
+     *
+     * @return string
+     */
+    public function getFormClassToExtend()
     {
-      case 'enum':
-        return 'Enum';
-      case 'boolean':
-        return 'Boolean';
-      case 'date':
-      case 'datetime':
-      case 'timestamp':
-        return 'Date';
-      case 'integer':
-      case 'decimal':
-      case 'float':
-        return 'Number';
-      default:
-        return 'Text';
+        return null === ($model = $this->getParentModel()) ? 'BaseFormFilterDoctrine' : sprintf('%sFormFilter', $model);
     }
-  }
-
-  /**
-   * Array export. Export array to formatted php code
-   *
-   * @param array $values
-   * @return string $php
-   */
-  protected function arrayExport($values)
-  {
-    $php = var_export($values, true);
-    $php = str_replace("\n", '', $php);
-    $php = str_replace('array (  ', 'array(', $php);
-    $php = str_replace(',)', ')', $php);
-    $php = str_replace('  ', ' ', $php);
-    return $php;
-  }
-
-  /**
-   * Filter out models that have disabled generation of form classes
-   *
-   * @return array $models Array of models to generate forms for
-   */
-  protected function filterModels($models)
-  {
-    foreach ($models as $key => $model)
+
+    /**
+     * Array export. Export array to formatted php code.
+     *
+     * @param array $values
+     *
+     * @return string $php
+     */
+    protected function arrayExport($values)
     {
-      $table = Doctrine_Core::getTable($model);
-      $symfonyOptions = (array) $table->getOption('symfony');
-
-      if ($table->isGenerator())
-      {
-        $symfonyOptions = array_merge((array) $table->getParentGenerator()->getOption('table')->getOption('symfony'), $symfonyOptions);
-      }
-
-      if (isset($symfonyOptions['filter']) && !$symfonyOptions['filter'])
-      {
-        unset($models[$key]);
-      }
+        $php = var_export($values, true);
+        $php = str_replace("\n", '', $php);
+        $php = str_replace('array (  ', 'array(', $php);
+        $php = str_replace(',)', ')', $php);
+
+        return str_replace('  ', ' ', $php);
     }
 
-    return $models;
-  }
-
-  /**
-   * Get the name of the form class to extend based on the inheritance of the model
-   *
-   * @return string
-   */
-  public function getFormClassToExtend()
-  {
-    return null === ($model = $this->getParentModel()) ? 'BaseFormFilterDoctrine' : sprintf('%sFormFilter', $model);
-  }
+    /**
+     * Filter out models that have disabled generation of form classes.
+     *
+     * @param mixed $models
+     *
+     * @return array $models Array of models to generate forms for
+     */
+    protected function filterModels($models)
+    {
+        foreach ($models as $key => $model) {
+            $table = Doctrine_Core::getTable($model);
+            $symfonyOptions = (array) $table->getOption('symfony');
+
+            if ($table->isGenerator()) {
+                $symfonyOptions = array_merge((array) $table->getParentGenerator()->getOption('table')->getOption('symfony'), $symfonyOptions);
+            }
+
+            if (isset($symfonyOptions['filter']) && !$symfonyOptions['filter']) {
+                unset($models[$key]);
+            }
+        }
+
+        return $models;
+    }
 }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormGenerator.class.php b/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormGenerator.class.php
index 10690bb95..ac3ad2185 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormGenerator.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormGenerator.class.php
@@ -14,715 +14,679 @@
  *
  * This class generates a Doctrine forms.
  *
- * @package    symfony
- * @subpackage generator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
+ *
  * @version    SVN: $Id$
  */
 class sfDoctrineFormGenerator extends sfGenerator
 {
-  /**
-   * Array of all the loaded models
-   *
-   * @var array
-   */
-  public $models = array();
-
-  /**
-   * Array of all plugin models
-   *
-   * @var array
-   */
-  public $pluginModels = array();
-
-  /**
-   * Initializes the current sfGenerator instance.
-   *
-   * @param sfGeneratorManager A sfGeneratorManager instance
-   */
-  public function initialize(sfGeneratorManager $generatorManager)
-  {
-    parent::initialize($generatorManager);
-
-    $this->getPluginModels();
-    $this->setGeneratorClass('sfDoctrineForm');
-  }
-
-  /**
-   * Generates classes and templates in cache.
-   *
-   * @param array The parameters
-   *
-   * @return string The data to put in configuration cache
-   */
-  public function generate($params = array())
-  {
-    $this->params = $params;
-
-    if (!isset($this->params['model_dir_name']))
+    /**
+     * Array of all the loaded models.
+     *
+     * @var array
+     */
+    public $models = array();
+
+    /**
+     * Array of all plugin models.
+     *
+     * @var array
+     */
+    public $pluginModels = array();
+
+    /**
+     * Initializes the current sfGenerator instance.
+     *
+     * @param sfGeneratorManager A sfGeneratorManager instance
+     */
+    public function initialize(sfGeneratorManager $generatorManager)
     {
-      $this->params['model_dir_name'] = 'model';
-    }
+        parent::initialize($generatorManager);
 
-    if (!isset($this->params['form_dir_name']))
-    {
-      $this->params['form_dir_name'] = 'form';
+        $this->getPluginModels();
+        $this->setGeneratorClass('sfDoctrineForm');
     }
 
-    $models = $this->loadModels();
-
-    // create the project base class for all forms
-    $file = sfConfig::get('sf_lib_dir').'/form/doctrine/BaseFormDoctrine.class.php';
-    if (!file_exists($file))
+    /**
+     * Generates classes and templates in cache.
+     *
+     * @param array The parameters
+     * @param mixed $params
+     *
+     * @return string The data to put in configuration cache
+     */
+    public function generate($params = array())
     {
-      if (!is_dir($directory = dirname($file)))
-      {
-        mkdir($directory, 0777, true);
-      }
+        $this->params = $params;
 
-      file_put_contents($file, $this->evalTemplate('sfDoctrineFormBaseTemplate.php'));
-    }
+        if (!isset($this->params['model_dir_name'])) {
+            $this->params['model_dir_name'] = 'model';
+        }
+
+        if (!isset($this->params['form_dir_name'])) {
+            $this->params['form_dir_name'] = 'form';
+        }
 
-    $pluginPaths = $this->generatorManager->getConfiguration()->getAllPluginPaths();
+        $models = $this->loadModels();
 
-    // create a form class for every Doctrine class
-    foreach ($models as $model)
-    {
-      $this->table = Doctrine_Core::getTable($model);
-      $this->modelName = $model;
-
-      $baseDir = sfConfig::get('sf_lib_dir') . '/form/doctrine';
-
-      $isPluginModel = $this->isPluginModel($model);
-      if ($isPluginModel)
-      {
-        $pluginName = $this->getPluginNameForModel($model);
-        $baseDir .= '/' . $pluginName;
-      }
-
-      if (!is_dir($baseDir.'/base'))
-      {
-        mkdir($baseDir.'/base', 0777, true);
-      }
-
-      file_put_contents($baseDir.'/base/Base'.$model.'Form.class.php', $this->evalTemplate(null === $this->getParentModel() ? 'sfDoctrineFormGeneratedTemplate.php' : 'sfDoctrineFormGeneratedInheritanceTemplate.php'));
-
-      if ($isPluginModel)
-      {
-        $pluginBaseDir = $pluginPaths[$pluginName].'/lib/form/doctrine';
-        if (!file_exists($classFile = $pluginBaseDir.'/Plugin'.$model.'Form.class.php'))
-        {
-            if (!is_dir($pluginBaseDir))
-            {
-              mkdir($pluginBaseDir, 0777, true);
+        // create the project base class for all forms
+        $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);
             }
-            file_put_contents($classFile, $this->evalTemplate('sfDoctrineFormPluginTemplate.php'));
+
+            file_put_contents($file, $this->evalTemplate('sfDoctrineFormBaseTemplate.php'));
         }
-      }
-      if (!file_exists($classFile = $baseDir.'/'.$model.'Form.class.php'))
-      {
-        if ($isPluginModel)
-        {
-           file_put_contents($classFile, $this->evalTemplate('sfDoctrinePluginFormTemplate.php'));
-        } else {
-           file_put_contents($classFile, $this->evalTemplate('sfDoctrineFormTemplate.php'));
+
+        $pluginPaths = $this->generatorManager->getConfiguration()->getAllPluginPaths();
+
+        // create a form class for every Doctrine class
+        foreach ($models as $model) {
+            $this->table = Doctrine_Core::getTable($model);
+            $this->modelName = $model;
+
+            $baseDir = sfConfig::get('sf_lib_dir').'/form/doctrine';
+
+            $isPluginModel = $this->isPluginModel($model);
+            if ($isPluginModel) {
+                $pluginName = $this->getPluginNameForModel($model);
+                $baseDir .= '/'.$pluginName;
+            }
+
+            if (!is_dir($baseDir.'/base')) {
+                mkdir($baseDir.'/base', 0777, true);
+            }
+
+            file_put_contents($baseDir.'/base/Base'.$model.'Form.class.php', $this->evalTemplate(null === $this->getParentModel() ? 'sfDoctrineFormGeneratedTemplate.php' : 'sfDoctrineFormGeneratedInheritanceTemplate.php'));
+
+            if ($isPluginModel) {
+                $pluginBaseDir = $pluginPaths[$pluginName].'/lib/form/doctrine';
+                if (!file_exists($classFile = $pluginBaseDir.'/Plugin'.$model.'Form.class.php')) {
+                    if (!is_dir($pluginBaseDir)) {
+                        mkdir($pluginBaseDir, 0777, true);
+                    }
+                    file_put_contents($classFile, $this->evalTemplate('sfDoctrineFormPluginTemplate.php'));
+                }
+            }
+            if (!file_exists($classFile = $baseDir.'/'.$model.'Form.class.php')) {
+                if ($isPluginModel) {
+                    file_put_contents($classFile, $this->evalTemplate('sfDoctrinePluginFormTemplate.php'));
+                } else {
+                    file_put_contents($classFile, $this->evalTemplate('sfDoctrineFormTemplate.php'));
+                }
+            }
         }
-      }
     }
-  }
-
-  /**
-   * Get all the models which are a part of a plugin and the name of the plugin.
-   * The array format is modelName => pluginName
-   *
-   * @todo This method is ugly and is a very weird way of finding the models which
-   *       belong to plugins. If we could come up with a better way that'd be great
-   * @return array $pluginModels
-   */
-  public function getPluginModels()
-  {
-    if (!$this->pluginModels)
+
+    /**
+     * Get all the models which are a part of a plugin and the name of the plugin.
+     * The array format is modelName => pluginName.
+     *
+     * @todo This method is ugly and is a very weird way of finding the models which
+     *       belong to plugins. If we could come up with a better way that'd be great
+     *
+     * @return array $pluginModels
+     */
+    public function getPluginModels()
     {
-      $plugins     = $this->generatorManager->getConfiguration()->getPlugins();
-      $pluginPaths = $this->generatorManager->getConfiguration()->getAllPluginPaths();
-
-      foreach ($pluginPaths as $pluginName => $path)
-      {
-        if (!in_array($pluginName, $plugins))
-        {
-          continue;
-        }
+        if (!$this->pluginModels) {
+            $plugins = $this->generatorManager->getConfiguration()->getPlugins();
+            $pluginPaths = $this->generatorManager->getConfiguration()->getAllPluginPaths();
 
-        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);
-            if ($reflection->isSubclassOf($parent))
-            {
-              $this->pluginModels[$modelName] = $pluginName;
-
-              if ($reflection->isInstantiable())
-              {
-                $generators = Doctrine_Core::getTable($modelName)->getGenerators();
-                foreach ($generators as $generator)
-                {
-                  $this->pluginModels[$generator->getOption('className')] = $pluginName;
+            foreach ($pluginPaths as $pluginName => $path) {
+                if (!in_array($pluginName, $plugins)) {
+                    continue;
+                }
+
+                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);
+                        if ($reflection->isSubclassOf($parent)) {
+                            $this->pluginModels[$modelName] = $pluginName;
+
+                            if ($reflection->isInstantiable()) {
+                                $generators = Doctrine_Core::getTable($modelName)->getGenerators();
+                                foreach ($generators as $generator) {
+                                    $this->pluginModels[$generator->getOption('className')] = $pluginName;
+                                }
+                            }
+                        }
+                    }
                 }
-              }
             }
-          }
         }
-      }
-    }
 
-    return $this->pluginModels;
-  }
-
-  /**
-   * Check to see if a model is part of a plugin
-   *
-   * @param string $modelName
-   * @return boolean $bool
-   */
-  public function isPluginModel($modelName)
-  {
-    return isset($this->pluginModels[$modelName]) ? true:false;
-  }
-
-  /**
-   * Get the name of the plugin a model belongs to
-   *
-   * @param string $modelName
-   * @return string $pluginName
-   */
-  public function getPluginNameForModel($modelName)
-  {
-    if ($this->isPluginModel($modelName))
-    {
-      return $this->pluginModels[$modelName];
-    } else {
-      return false;
-    }
-  }
-
-  /**
-   * Returns an array of relations that represents a many to many relationship.
-   *
-   * @return array An array of relations
-   */
-  public function getManyToManyRelations()
-  {
-    $relations = array();
-    foreach ($this->table->getRelations() as $relation)
-    {
-      if (
-        Doctrine_Relation::MANY == $relation->getType()
-        &&
-        isset($relation['refTable'])
-        &&
-        (null === $this->getParentModel() || !Doctrine_Core::getTable($this->getParentModel())->hasRelation($relation->getAlias()))
-      )
-      {
-        $relations[] = $relation;
-      }
+        return $this->pluginModels;
     }
 
-    return $relations;
-  }
-
-  /**
-   * Returns PHP names for all foreign keys of the current table.
-   *
-   * This method does not returns foreign keys that are also primary keys.
-   *
-   * @return array An array composed of:
-   *                 * The foreign table PHP name
-   *                 * The foreign key PHP name
-   *                 * A Boolean to indicate whether the column is required or not
-   *                 * A Boolean to indicate whether the column is a many to many relationship or not
-   */
-  public function getForeignKeyNames()
-  {
-    $names = array();
-    foreach ($this->table->getRelations() as $relation)
+    /**
+     * Check to see if a model is part of a plugin.
+     *
+     * @param string $modelName
+     *
+     * @return bool $bool
+     */
+    public function isPluginModel($modelName)
     {
-      if ($relation->getType() === Doctrine_Relation::ONE)
-      {
-        $foreignDef = $relation->getTable()->getDefinitionOf($relation->getForeignFieldName());
-        $names[] = array($relation['table']->getOption('name'), $relation->getForeignFieldName(), $this->isColumnNotNull($relation->getForeignFieldName(), $foreignDef), false);
-      }
+        return isset($this->pluginModels[$modelName]) ? true : false;
     }
 
-    foreach ($this->getManyToManyRelations() as $relation)
+    /**
+     * Get the name of the plugin a model belongs to.
+     *
+     * @param string $modelName
+     *
+     * @return string $pluginName
+     */
+    public function getPluginNameForModel($modelName)
     {
-      $names[] = array($relation['table']->getOption('name'), $relation['alias'], false, true);
-    }
+        if ($this->isPluginModel($modelName)) {
+            return $this->pluginModels[$modelName];
+        }
 
-    return $names;
-  }
-
-  /**
-   * Returns the first primary key column of the current table.
-   *
-   * @param ColumnMap A ColumnMap object
-   */
-  public function getPrimaryKey()
-  {
-    foreach ($this->getColumns() as $column)
-    {
-      if ($column->isPrimaryKey())
-      {
-        return $column;
-      }
-    }
-  }
-
-  /**
-   * Returns a sfWidgetForm class name for a given column.
-   *
-   * @param  sfDoctrineColumn $column
-   * @return string    The name of a subclass of sfWidgetForm
-   */
-  public function getWidgetClassForColumn($column)
-  {
-    switch ($column->getDoctrineType())
-    {
-      case 'string':
-        $widgetSubclass = null === $column->getLength() || $column->getLength() > 255 ? 'Textarea' : 'InputText';
-        break;
-      case 'boolean':
-        $widgetSubclass = 'InputCheckbox';
-        break;
-      case 'blob':
-      case 'clob':
-        $widgetSubclass = 'Textarea';
-        break;
-      case 'date':
-        $widgetSubclass = 'Date';
-        break;
-      case 'time':
-        $widgetSubclass = 'Time';
-        break;
-      case 'timestamp':
-        $widgetSubclass = 'DateTime';
-        break;
-      case 'enum':
-        $widgetSubclass = 'Choice';
-        break;
-      default:
-        $widgetSubclass = 'InputText';
+        return false;
     }
 
-    if ($column->isPrimaryKey())
+    /**
+     * Returns an array of relations that represents a many to many relationship.
+     *
+     * @return array An array of relations
+     */
+    public function getManyToManyRelations()
     {
-      $widgetSubclass = 'InputHidden';
+        $relations = array();
+        foreach ($this->table->getRelations() as $relation) {
+            if (
+                Doctrine_Relation::MANY == $relation->getType()
+                && isset($relation['refTable'])
+                && (null === $this->getParentModel() || !Doctrine_Core::getTable($this->getParentModel())->hasRelation($relation->getAlias()))
+            ) {
+                $relations[] = $relation;
+            }
+        }
+
+        return $relations;
     }
-    else if ($column->isForeignKey())
+
+    /**
+     * Returns PHP names for all foreign keys of the current table.
+     *
+     * This method does not returns foreign keys that are also primary keys.
+     *
+     * @return array An array composed of:
+     *               * The foreign table PHP name
+     *               * The foreign key PHP name
+     *               * A Boolean to indicate whether the column is required or not
+     *               * A Boolean to indicate whether the column is a many to many relationship or not
+     */
+    public function getForeignKeyNames()
     {
-      $widgetSubclass = 'DoctrineChoice';
+        $names = array();
+        foreach ($this->table->getRelations() as $relation) {
+            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);
+            }
+        }
+
+        foreach ($this->getManyToManyRelations() as $relation) {
+            $names[] = array($relation['table']->getOption('name'), $relation['alias'], false, true);
+        }
+
+        return $names;
     }
 
-    return sprintf('sfWidgetForm%s', $widgetSubclass);
-  }
-
-  /**
-   * Returns a PHP string representing options to pass to a widget for a given column.
-   *
-   * @param sfDoctrineColumn $column
-   *
-   * @return string The options to pass to the widget as a PHP string
-   */
-  public function getWidgetOptionsForColumn($column)
-  {
-    $options = array();
-
-    if ($column->isForeignKey())
+    /**
+     * Returns the first primary key column of the current table.
+     *
+     * @param ColumnMap A ColumnMap object
+     */
+    public function getPrimaryKey()
     {
-      $options[] = sprintf('\'model\' => $this->getRelatedModelName(\'%s\'), \'add_empty\' => %s', $column->getRelationKey('alias'), $column->isNotNull() ? 'false' : 'true');
+        foreach ($this->getColumns() as $column) {
+            if ($column->isPrimaryKey()) {
+                return $column;
+            }
+        }
     }
-    else if ('enum' == $column->getDoctrineType() && is_subclass_of($this->getWidgetClassForColumn($column), 'sfWidgetFormChoiceBase'))
+
+    /**
+     * Returns a sfWidgetForm class name for a given column.
+     *
+     * @param sfDoctrineColumn $column
+     *
+     * @return string The name of a subclass of sfWidgetForm
+     */
+    public function getWidgetClassForColumn($column)
     {
-      $options[] = '\'choices\' => '.$this->arrayExport(array_combine($column['values'], $column['values']));
+        switch ($column->getDoctrineType()) {
+            case 'string':
+                $widgetSubclass = null === $column->getLength() || $column->getLength() > 255 ? 'Textarea' : 'InputText';
+
+                break;
+
+            case 'boolean':
+                $widgetSubclass = 'InputCheckbox';
+
+                break;
+
+            case 'blob':
+            case 'clob':
+                $widgetSubclass = 'Textarea';
+
+                break;
+
+            case 'date':
+                $widgetSubclass = 'Date';
+
+                break;
+
+            case 'time':
+                $widgetSubclass = 'Time';
+
+                break;
+
+            case 'timestamp':
+                $widgetSubclass = 'DateTime';
+
+                break;
+
+            case 'enum':
+                $widgetSubclass = 'Choice';
+
+                break;
+
+            default:
+                $widgetSubclass = 'InputText';
+        }
+
+        if ($column->isPrimaryKey()) {
+            $widgetSubclass = 'InputHidden';
+        } elseif ($column->isForeignKey()) {
+            $widgetSubclass = 'DoctrineChoice';
+        }
+
+        return sprintf('sfWidgetForm%s', $widgetSubclass);
     }
 
-    return count($options) ? sprintf('array(%s)', implode(', ', $options)) : '';
-  }
-
-  /**
-   * Returns a sfValidator class name for a given column.
-   *
-   * @param sfDoctrineColumn $column
-   * @return string    The name of a subclass of sfValidator
-   */
-  public function getValidatorClassForColumn($column)
-  {
-    switch ($column->getDoctrineType())
+    /**
+     * Returns a PHP string representing options to pass to a widget for a given column.
+     *
+     * @param sfDoctrineColumn $column
+     *
+     * @return string The options to pass to the widget as a PHP string
+     */
+    public function getWidgetOptionsForColumn($column)
     {
-      case 'boolean':
-        $validatorSubclass = 'Boolean';
-        break;
-      case 'string':
-    		if ($column->getDefinitionKey('email'))
-    		{
-    		  $validatorSubclass = 'Email';
-    		}
-    		else if ($column->getDefinitionKey('regexp'))
-    		{
-    		  $validatorSubclass = 'Regex';
-    		}
-    		else
-    		{
-    		  $validatorSubclass = 'String';
-    		}
-        break;
-      case 'clob':
-      case 'blob':
-        $validatorSubclass = 'String';
-        break;
-      case 'float':
-      case 'decimal':
-        $validatorSubclass = 'Number';
-        break;
-      case 'integer':
-        $validatorSubclass = 'Integer';
-        break;
-      case 'date':
-        $validatorSubclass = 'Date';
-        break;
-      case 'time':
-        $validatorSubclass = 'Time';
-        break;
-      case 'timestamp':
-        $validatorSubclass = 'DateTime';
-        break;
-      case 'enum':
-        $validatorSubclass = 'Choice';
-        break;
-      default:
-        $validatorSubclass = 'Pass';
+        $options = array();
+
+        if ($column->isForeignKey()) {
+            $options[] = sprintf('\'model\' => $this->getRelatedModelName(\'%s\'), \'add_empty\' => %s', $column->getRelationKey('alias'), $column->isNotNull() ? 'false' : 'true');
+        } elseif ('enum' == $column->getDoctrineType() && is_subclass_of($this->getWidgetClassForColumn($column), 'sfWidgetFormChoiceBase')) {
+            $options[] = '\'choices\' => '.$this->arrayExport(array_combine($column['values'], $column['values']));
+        }
+
+        return count($options) ? sprintf('array(%s)', implode(', ', $options)) : '';
     }
 
-    if ($column->isForeignKey())
+    /**
+     * Returns a sfValidator class name for a given column.
+     *
+     * @param sfDoctrineColumn $column
+     *
+     * @return string The name of a subclass of sfValidator
+     */
+    public function getValidatorClassForColumn($column)
     {
-      $validatorSubclass = 'DoctrineChoice';
+        switch ($column->getDoctrineType()) {
+            case 'boolean':
+                $validatorSubclass = 'Boolean';
+
+                break;
+
+            case 'string':
+                if ($column->getDefinitionKey('email')) {
+                    $validatorSubclass = 'Email';
+                } elseif ($column->getDefinitionKey('regexp')) {
+                    $validatorSubclass = 'Regex';
+                } else {
+                    $validatorSubclass = 'String';
+                }
+
+                break;
+
+            case 'clob':
+            case 'blob':
+                $validatorSubclass = 'String';
+
+                break;
+
+            case 'float':
+            case 'decimal':
+                $validatorSubclass = 'Number';
+
+                break;
+
+            case 'integer':
+                $validatorSubclass = 'Integer';
+
+                break;
+
+            case 'date':
+                $validatorSubclass = 'Date';
+
+                break;
+
+            case 'time':
+                $validatorSubclass = 'Time';
+
+                break;
+
+            case 'timestamp':
+                $validatorSubclass = 'DateTime';
+
+                break;
+
+            case 'enum':
+                $validatorSubclass = 'Choice';
+
+                break;
+
+            default:
+                $validatorSubclass = 'Pass';
+        }
+
+        if ($column->isForeignKey()) {
+            $validatorSubclass = 'DoctrineChoice';
+        } elseif ($column->isPrimaryKey()) {
+            $validatorSubclass = 'Choice';
+        }
+
+        return sprintf('sfValidator%s', $validatorSubclass);
     }
-    else if ($column->isPrimaryKey())
+
+    /**
+     * Returns a PHP string representing options to pass to a validator for a given column.
+     *
+     * @param sfDoctrineColumn $column
+     *
+     * @return string The options to pass to the validator as a PHP string
+     */
+    public function getValidatorOptionsForColumn($column)
     {
-      $validatorSubclass = 'Choice';
-    }
+        $options = array();
 
-    return sprintf('sfValidator%s', $validatorSubclass);
-  }
+        if ($column->isForeignKey()) {
+            if ($foreignColumn = $column->getForeignTable()->getColumnName($column->getForeignFieldName())) {
+                $options[] = sprintf('\'model\' => $this->getRelatedModelName(\'%s\'), \'column\' => \'%s\'', $column->getRelationKey('alias'), $foreignColumn);
+            } else {
+                $options[] = sprintf('\'model\' => $this->getRelatedModelName(\'%s\')', $column->getRelationKey('alias'));
+            }
+        } elseif ($column->isPrimaryKey()) {
+            $options[] = sprintf('\'choices\' => array($this->getObject()->get(\'%s\')), \'empty_value\' => $this->getObject()->get(\'%1$s\')', $column->getFieldName());
+        } else {
+            switch ($column->getDoctrineType()) {
+                case 'string':
+                    if ($column['length']) {
+                        $options[] = sprintf('\'max_length\' => %s', $column['length']);
+                    }
+                    if (isset($column['minlength'])) {
+                        $options[] = sprintf('\'min_length\' => %s', $column['minlength']);
+                    }
+                    if (isset($column['regexp'])) {
+                        $options[] = sprintf('\'pattern\' => \'%s\'', $column['regexp']);
+                    }
+
+                    break;
+
+                case 'enum':
+                    $options[] = '\'choices\' => '.$this->arrayExport($column['values']);
+
+                    break;
+            }
+        }
 
-  /**
-   * Returns a PHP string representing options to pass to a validator for a given column.
-   *
-   * @param sfDoctrineColumn $column
-   * @return string    The options to pass to the validator as a PHP string
-   */
-  public function getValidatorOptionsForColumn($column)
-  {
-    $options = array();
+        // If notnull = false, is a primary or the column has a default value then
+        // make the widget not required
+        if (!$column->isNotNull() || $column->isPrimaryKey() || $column->hasDefinitionKey('default')) {
+            $options[] = '\'required\' => false';
+        }
 
-    if ($column->isForeignKey())
-    {
-      if ($foreignColumn = $column->getForeignTable()->getColumnName($column->getForeignFieldName()))
-      {
-        $options[] = sprintf('\'model\' => $this->getRelatedModelName(\'%s\'), \'column\' => \'%s\'', $column->getRelationKey('alias'), $foreignColumn);
-      }
-      else
-      {
-        $options[] = sprintf('\'model\' => $this->getRelatedModelName(\'%s\')', $column->getRelationKey('alias'));
-      }
+        return count($options) ? sprintf('array(%s)', implode(', ', $options)) : '';
     }
-    else if ($column->isPrimaryKey())
+
+    /**
+     * Returns the maximum length for a column name.
+     *
+     * @return int The length of the longer column name
+     */
+    public function getColumnNameMaxLength()
     {
-      $options[] = sprintf('\'choices\' => array($this->getObject()->get(\'%s\')), \'empty_value\' => $this->getObject()->get(\'%1$s\')', $column->getFieldName());
+        $max = 0;
+        foreach ($this->getColumns() as $column) {
+            if (($m = strlen($column->getFieldName())) > $max) {
+                $max = $m;
+            }
+        }
+
+        foreach ($this->getManyToManyRelations() as $relation) {
+            if (($m = strlen($this->underscore($relation['alias']).'_list')) > $max) {
+                $max = $m;
+            }
+        }
+
+        return $max;
     }
-    else
+
+    /**
+     * Returns an array of primary key column names.
+     *
+     * @return array An array of primary key column names
+     */
+    public function getPrimaryKeyColumNames()
     {
-      switch ($column->getDoctrineType())
-      {
-        case 'string':
-          if ($column['length'])
-          {
-            $options[] = sprintf('\'max_length\' => %s', $column['length']);
-          }
-          if (isset($column['minlength']))
-          {
-            $options[] = sprintf('\'min_length\' => %s', $column['minlength']);
-          }
-          if (isset($column['regexp']))
-          {
-            $options[] = sprintf('\'pattern\' => \'%s\'', $column['regexp']);
-          }
-          break;
-        case 'enum':
-          $options[] = '\'choices\' => '.$this->arrayExport($column['values']);
-          break;
-      }
+        return $this->table->getIdentifierColumnNames();
     }
 
-    // If notnull = false, is a primary or the column has a default value then
-    // make the widget not required
-    if (!$column->isNotNull() || $column->isPrimaryKey() || $column->hasDefinitionKey('default'))
+    /**
+     * Returns a PHP string representation for the array of all primary key column names.
+     *
+     * @return string A PHP string representation for the array of all primary key column names
+     *
+     * @see getPrimaryKeyColumNames()
+     */
+    public function getPrimaryKeyColumNamesAsString()
     {
-      $options[] = '\'required\' => false';
+        return sprintf('array(\'%s\')', implode('\', \'', $this->getPrimaryKeyColumNames()));
     }
 
-    return count($options) ? sprintf('array(%s)', implode(', ', $options)) : '';
-  }
-
-  /**
-   * Returns the maximum length for a column name.
-   *
-   * @return integer The length of the longer column name
-   */
-  public function getColumnNameMaxLength()
-  {
-    $max = 0;
-    foreach ($this->getColumns() as $column)
+    /**
+     * Returns true if the current table is internationalized.
+     *
+     * @return bool true if the current table is internationalized, false otherwise
+     */
+    public function isI18n()
     {
-      if (($m = strlen($column->getFieldName())) > $max)
-      {
-        $max = $m;
-      }
+        return $this->table->hasRelation('Translation');
     }
 
-    foreach ($this->getManyToManyRelations() as $relation)
+    /**
+     * Returns the i18n model name for the current table.
+     *
+     * @return string The model class name
+     */
+    public function getI18nModel()
     {
-      if (($m = strlen($this->underscore($relation['alias']).'_list')) > $max)
-      {
-        $max = $m;
-      }
+        return $this->table->getRelation('Translation')->getTable()->create();
     }
 
-    return $max;
-  }
-
-  /**
-   * Returns an array of primary key column names.
-   *
-   * @return array An array of primary key column names
-   */
-  public function getPrimaryKeyColumNames()
-  {
-    return $this->table->getIdentifierColumnNames();
-  }
-
-  /**
-   * Returns a PHP string representation for the array of all primary key column names.
-   *
-   * @return string A PHP string representation for the array of all primary key column names
-   *
-   * @see getPrimaryKeyColumNames()
-   */
-  public function getPrimaryKeyColumNamesAsString()
-  {
-    return sprintf('array(\'%s\')', implode('\', \'', $this->getPrimaryKeyColumNames()));
-  }
-
-  /**
-   * Returns true if the current table is internationalized.
-   *
-   * @return Boolean true if the current table is internationalized, false otherwise
-   */
-  public function isI18n()
-  {
-    return $this->table->hasRelation('Translation');
-  }
-
-  /**
-   * Returns the i18n model name for the current table.
-   *
-   * @return string The model class name
-   */
-  public function getI18nModel()
-  {
-    return $this->table->getRelation('Translation')->getTable()->create();
-  }
-
-  public function underscore($name)
-  {
-    return strtolower(preg_replace(array('/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'), '\\1_\\2', $name));
-  }
-
-  /**
-   * Get array of sfDoctrineColumn objects that exist on the current model but not its parent.
-   *
-   * @return array $columns
-   */
-  public function getColumns()
-  {
-    $parentModel = $this->getParentModel();
-    $parentColumns = $parentModel ? array_keys(Doctrine_Core::getTable($parentModel)->getColumns()) : array();
-
-    $columns = array();
-    foreach (array_diff(array_keys($this->table->getColumns()), $parentColumns) as $name)
+    public function underscore($name)
     {
-      $columns[] = new sfDoctrineColumn($name, $this->table);
+        return strtolower(preg_replace(array('/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'), '\\1_\\2', $name));
     }
 
-    // add relations to columns for inherited classes
-    if ($parentModel)
+    /**
+     * Get array of sfDoctrineColumn objects that exist on the current model but not its parent.
+     *
+     * @return array $columns
+     */
+    public function getColumns()
     {
-      $parentRelationNames = array_keys(Doctrine_Core::getTable($parentModel)->getRelations());
-      $relations = $this->table->getRelations();
-      $relationColumns = array();
-      foreach (array_diff(array_keys($relations), $parentRelationNames) as $relationName)
-      {
-        if (Doctrine_Relation::ONE == $relations[$relationName]->getType())
-        {
-          $columnName = $relations[$relationName]->getLocal();
-          if (!in_array($columnName, $relationColumns))
-          {
-            $relationColumns[] = $columnName;
-            $columns[] = new sfDoctrineColumn($columnName, $this->table);
-          }
+        $parentModel = $this->getParentModel();
+        $parentColumns = $parentModel ? array_keys(Doctrine_Core::getTable($parentModel)->getColumns()) : array();
+
+        $columns = array();
+        foreach (array_diff(array_keys($this->table->getColumns()), $parentColumns) as $name) {
+            $columns[] = new sfDoctrineColumn($name, $this->table);
         }
-      }
-    }
 
-    return $columns;
-  }
+        // add relations to columns for inherited classes
+        if ($parentModel) {
+            $parentRelationNames = array_keys(Doctrine_Core::getTable($parentModel)->getRelations());
+            $relations = $this->table->getRelations();
+            $relationColumns = array();
+            foreach (array_diff(array_keys($relations), $parentRelationNames) as $relationName) {
+                if (Doctrine_Relation::ONE == $relations[$relationName]->getType()) {
+                    $columnName = $relations[$relationName]->getLocal();
+                    if (!in_array($columnName, $relationColumns)) {
+                        $relationColumns[] = $columnName;
+                        $columns[] = new sfDoctrineColumn($columnName, $this->table);
+                    }
+                }
+            }
+        }
 
-  public function getUniqueColumnNames()
-  {
-    $uniqueColumns = array();
+        return $columns;
+    }
 
-    foreach ($this->getColumns() as $column)
+    public function getUniqueColumnNames()
     {
-      if ($column->getDefinitionKey('unique'))
-      {
-        $uniqueColumns[] = array($column->getFieldName());
-      }
+        $uniqueColumns = array();
+
+        foreach ($this->getColumns() as $column) {
+            if ($column->getDefinitionKey('unique')) {
+                $uniqueColumns[] = array($column->getFieldName());
+            }
+        }
+
+        $indexes = $this->table->getOption('indexes');
+        foreach ($indexes as $name => $index) {
+            $index['fields'] = (array) $index['fields'];
+
+            if (isset($index['type']) && 'unique' == $index['type']) {
+                $tmp = $index['fields'];
+                if (is_array(array_shift($tmp))) {
+                    $uniqueColumns[] = array_keys($index['fields']);
+                } else {
+                    $uniqueColumns[] = $index['fields'];
+                }
+            }
+        }
+
+        return $uniqueColumns;
     }
 
-    $indexes = $this->table->getOption('indexes');
-    foreach ($indexes as $name => $index)
+    /**
+     * Returns the name of the model class this model extends.
+     *
+     * @return string|null
+     */
+    public function getParentModel()
     {
-      $index['fields'] = (array) $index['fields'];
-
-      if (isset($index['type']) && $index['type'] == 'unique')
-      {
-        $tmp = $index['fields'];
-        if (is_array(array_shift($tmp)))
-        {
-          $uniqueColumns[] = array_keys($index['fields']);
-        } else {
-          $uniqueColumns[] = $index['fields'];
+        $baseClasses = array(
+            'Doctrine_Record',
+            'sfDoctrineRecord',
+        );
+
+        $builderOptions = sfConfig::get('doctrine_model_builder_options', array());
+        if (isset($builderOptions['baseClassName'])) {
+            $baseClasses[] = $builderOptions['baseClassName'];
+        }
+
+        // find the first non-abstract parent
+        $model = $this->modelName;
+        while ($model = get_parent_class($model)) {
+            if (in_array($model, $baseClasses)) {
+                break;
+            }
+
+            $r = new ReflectionClass($model);
+            if (!$r->isAbstract()) {
+                return $r->getName();
+            }
         }
-      }
     }
 
-    return $uniqueColumns;
-  }
-
-  /**
-   * Loads all Doctrine builders.
-   */
-  protected function loadModels()
-  {
-    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;
-  }
-
-  /**
-   * Filter out models that have disabled generation of form classes
-   *
-   * @return array $models Array of models to generate forms for
-   */
-  protected function filterModels($models)
-  {
-    foreach ($models as $key => $model)
+    /**
+     * Get the name of the form class to extend based on the inheritance of the model.
+     *
+     * @return string
+     */
+    public function getFormClassToExtend()
     {
-      $table = Doctrine_Core::getTable($model);
-      $symfonyOptions = (array) $table->getOption('symfony');
-
-      if ($table->isGenerator())
-      {
-        $symfonyOptions = array_merge((array) $table->getParentGenerator()->getOption('table')->getOption('symfony'), $symfonyOptions);
-      }
-
-      if (isset($symfonyOptions['form']) && !$symfonyOptions['form'])
-      {
-        unset($models[$key]);
-      }
+        return null === ($model = $this->getParentModel()) ? 'BaseFormDoctrine' : sprintf('%sForm', $model);
     }
 
-    return $models;
-  }
-
-  /**
-   * Array export. Export array to formatted php code
-   *
-   * @param array $values
-   * @return string $php
-   */
-  protected function arrayExport($values)
-  {
-    $php = var_export($values, true);
-    $php = str_replace("\n", '', $php);
-    $php = str_replace('array (  ', 'array(', $php);
-    $php = str_replace(',)', ')', $php);
-    $php = str_replace('  ', ' ', $php);
-    return $php;
-  }
-
-  /**
-   * Returns the name of the model class this model extends.
-   *
-   * @return string|null
-   */
-  public function getParentModel()
-  {
-    $baseClasses = array(
-      'Doctrine_Record',
-      'sfDoctrineRecord',
-    );
-
-    $builderOptions = sfConfig::get('doctrine_model_builder_options', array());
-    if (isset($builderOptions['baseClassName']))
+    /**
+     * Loads all Doctrine builders.
+     */
+    protected function loadModels()
     {
-      $baseClasses[] = $builderOptions['baseClassName'];
+        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;
     }
 
-    // find the first non-abstract parent
-    $model = $this->modelName;
-    while ($model = get_parent_class($model))
+    /**
+     * Filter out models that have disabled generation of form classes.
+     *
+     * @param mixed $models
+     *
+     * @return array $models Array of models to generate forms for
+     */
+    protected function filterModels($models)
     {
-      if (in_array($model, $baseClasses))
-      {
-        break;
-      }
-
-      $r = new ReflectionClass($model);
-      if (!$r->isAbstract())
-      {
-        return $r->getName();
-      }
+        foreach ($models as $key => $model) {
+            $table = Doctrine_Core::getTable($model);
+            $symfonyOptions = (array) $table->getOption('symfony');
+
+            if ($table->isGenerator()) {
+                $symfonyOptions = array_merge((array) $table->getParentGenerator()->getOption('table')->getOption('symfony'), $symfonyOptions);
+            }
+
+            if (isset($symfonyOptions['form']) && !$symfonyOptions['form']) {
+                unset($models[$key]);
+            }
+        }
+
+        return $models;
+    }
+
+    /**
+     * Array export. Export array to formatted php code.
+     *
+     * @param array $values
+     *
+     * @return string $php
+     */
+    protected function arrayExport($values)
+    {
+        $php = var_export($values, true);
+        $php = str_replace("\n", '', $php);
+        $php = str_replace('array (  ', 'array(', $php);
+        $php = str_replace(',)', ')', $php);
+
+        return str_replace('  ', ' ', $php);
     }
-  }
-
-  /**
-   * Get the name of the form class to extend based on the inheritance of the model
-   *
-   * @return string
-   */
-  public function getFormClassToExtend()
-  {
-    return null === ($model = $this->getParentModel()) ? 'BaseFormDoctrine' : sprintf('%sForm', $model);
-  }
 }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineGenerator.class.php b/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineGenerator.class.php
index 743f20f03..2883d8d18 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineGenerator.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineGenerator.class.php
@@ -11,272 +11,253 @@
 /**
  * Doctrine generator.
  *
- * @package    symfony
- * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfDoctrineGenerator extends sfModelGenerator
 {
-  protected
-    $table = null;
-
-  /**
-   * Initializes the current sfGenerator instance.
-   *
-   * @param sfGeneratorManager $generatorManager A sfGeneratorManager instance
-   */
-  public function initialize(sfGeneratorManager $generatorManager)
-  {
-    parent::initialize($generatorManager);
-
-    $this->setGeneratorClass('sfDoctrineModule');
-  }
-
-  /** 
-   * Configures this generator.
-   */
-  public function configure()
-  {
-    $this->table = Doctrine_Core::getTable($this->modelClass);
-
-    // load all primary keys
-    $this->loadPrimaryKeys();
-  }
-
-  /**
-   * Returns an array of tables that represents a many to many relationship.
-   *
-   * A table is considered to be a m2m table if it has 2 foreign keys that are also primary keys.
-   *
-   * @return array An array of tables.
-   */
-  public function getManyToManyTables()
-  {
-    $relations = array();
-    foreach ($this->table->getRelations() as $relation)
-    {
-      if ($relation->getType() === Doctrine_Relation::MANY && isset($relation['refTable']))
-      {
-        $relations[] = $relation;
-      }
-    }
-    return $relations;
-  }
-
-  /**
-   * Loads primary keys.
-   *
-   * @throws sfException
-   */
-  protected function loadPrimaryKeys()
-  {
-    $this->primaryKey = array();
-    foreach ($this->getColumns() as $name => $column)
+    protected $table;
+
+    /**
+     * Initializes the current sfGenerator instance.
+     *
+     * @param sfGeneratorManager $generatorManager A sfGeneratorManager instance
+     */
+    public function initialize(sfGeneratorManager $generatorManager)
     {
-      if ($column->isPrimaryKey())
-      {
-        $this->primaryKey[] = $name;
-      }
-    }
+        parent::initialize($generatorManager);
 
-    if (!count($this->primaryKey))
-    {
-      throw new sfException(sprintf('Cannot generate a module for a model without a primary key (%s)', $this->modelClass));
-    }
-  }
-
-  /**
-   * Returns the getter either non-developped: 'getFoo' or developped: '$class->getFoo()'.
-   *
-   * @param string  $column     The column name
-   * @param boolean $developed  true if you want developped method names, false otherwise
-   * @param string  $prefix     The prefix value
-   *
-   * @return string PHP code
-   */
-  public function getColumnGetter($column, $developed = false, $prefix = '')
-  {
-    $getter = 'get'.sfInflector::camelize($column);
-    if ($developed)
-    {
-      $getter = sprintf('$%s%s->%s()', $prefix, $this->getSingularName(), $getter);
+        $this->setGeneratorClass('sfDoctrineModule');
     }
 
-    return $getter;
-  }
-
-  /**
-   * Returns the type of a column.
-   *
-   * @param  object $column A column object
-   *
-   * @return string The column type
-   */
-  public function getType($column)
-  {
-    if ($column->isForeignKey())
+    /**
+     * Configures this generator.
+     */
+    public function configure()
     {
-      return 'ForeignKey';
-    }
+        $this->table = Doctrine_Core::getTable($this->modelClass);
 
-    switch ($column->getDoctrineType())
-    {
-      case 'enum':
-        return 'Enum';
-      case 'boolean':
-        return 'Boolean';
-      case 'date':
-      case 'timestamp':
-        return 'Date';
-      case 'time':
-        return 'Time';
-      default:
-        return 'Text';
+        // load all primary keys
+        $this->loadPrimaryKeys();
     }
-  }
-
-  /**
-   * Returns the default configuration for fields.
-   *
-   * @return array An array of default configuration for all fields
-   */
-  public function getDefaultFieldsConfiguration()
-  {
-    $fields = array();
-
-    $names = array();
-    foreach ($this->getColumns() as $name => $column)
+
+    /**
+     * Returns an array of tables that represents a many to many relationship.
+     *
+     * A table is considered to be a m2m table if it has 2 foreign keys that are also primary keys.
+     *
+     * @return array an array of tables
+     */
+    public function getManyToManyTables()
     {
-      $names[] = $name;
-      $fields[$name] = array_merge(array(
-        'is_link'      => (Boolean) $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());
+        $relations = array();
+        foreach ($this->table->getRelations() as $relation) {
+            if (Doctrine_Relation::MANY === $relation->getType() && isset($relation['refTable'])) {
+                $relations[] = $relation;
+            }
+        }
+
+        return $relations;
     }
 
-    foreach ($this->getManyToManyTables() as $tables)
+    /**
+     * Returns the getter either non-developped: 'getFoo' or developped: '$class->getFoo()'.
+     *
+     * @param string $column    The column name
+     * @param bool   $developed true if you want developped method names, false otherwise
+     * @param string $prefix    The prefix value
+     *
+     * @return string PHP code
+     */
+    public function getColumnGetter($column, $developed = false, $prefix = '')
     {
-      $name = sfInflector::underscore($tables['alias']).'_list';
-      $names[] = $name;
-      $fields[$name] = array_merge(array(
-        'is_link'      => false,
-        'is_real'      => false,
-        'is_partial'   => false,
-        'is_component' => false,
-        'type'         => 'Text',
-      ), isset($this->config['fields'][$name]) ? $this->config['fields'][$name] : array());
+        $getter = 'get'.sfInflector::camelize($column);
+        if ($developed) {
+            $getter = sprintf('$%s%s->%s()', $prefix, $this->getSingularName(), $getter);
+        }
+
+        return $getter;
     }
 
-    if (isset($this->config['fields']))
+    /**
+     * Returns the type of a column.
+     *
+     * @param object $column A column object
+     *
+     * @return string The column type
+     */
+    public function getType($column)
     {
-      foreach ($this->config['fields'] as $name => $params)
-      {
-        if (in_array($name, $names))
-        {
-          continue;
+        if ($column->isForeignKey()) {
+            return 'ForeignKey';
         }
 
-        $fields[$name] = array_merge(array(
-          'is_link'      => false,
-          'is_real'      => false,
-          'is_partial'   => false,
-          'is_component' => false,
-          'type'         => 'Text',
-        ), is_array($params) ? $params : array());
-      }
-    }
+        switch ($column->getDoctrineType()) {
+            case 'enum':
+                return 'Enum';
 
-    unset($this->config['fields']);
+            case 'boolean':
+                return 'Boolean';
 
-    return $fields;
-  }
+            case 'date':
+            case 'timestamp':
+                return 'Date';
 
-  /**
-   * Returns the configuration for fields in a given context.
-   *
-   * @param  string $context The Context
-   *
-   * @return array An array of configuration for all the fields in a given context 
-   */
-  public function getFieldsConfiguration($context)
-  {
-    $fields = array();
+            case 'time':
+                return 'Time';
 
-    $names = array();
-    foreach ($this->getColumns() as $name => $column)
-    {
-      $names[] = $name;
-      $fields[$name] = isset($this->config[$context]['fields'][$name]) ? $this->config[$context]['fields'][$name] : array();
+            default:
+                return 'Text';
+        }
     }
 
-    foreach ($this->getManyToManyTables() as $tables)
+    /**
+     * Returns the default configuration for fields.
+     *
+     * @return array An array of default configuration for all fields
+     */
+    public function getDefaultFieldsConfiguration()
     {
-      $name = sfInflector::underscore($tables['alias']).'_list';
-      $names[] = $name;
-      $fields[$name] = isset($this->config[$context]['fields'][$name]) ? $this->config[$context]['fields'][$name] : array();
+        $fields = array();
+
+        $names = array();
+        foreach ($this->getColumns() as $name => $column) {
+            $names[] = $name;
+            $fields[$name] = array_merge(array(
+                '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());
+        }
+
+        foreach ($this->getManyToManyTables() as $tables) {
+            $name = sfInflector::underscore($tables['alias']).'_list';
+            $names[] = $name;
+            $fields[$name] = array_merge(array(
+                'is_link' => false,
+                'is_real' => false,
+                'is_partial' => false,
+                'is_component' => false,
+                'type' => 'Text',
+            ), isset($this->config['fields'][$name]) ? $this->config['fields'][$name] : array());
+        }
+
+        if (isset($this->config['fields'])) {
+            foreach ($this->config['fields'] as $name => $params) {
+                if (in_array($name, $names)) {
+                    continue;
+                }
+
+                $fields[$name] = array_merge(array(
+                    'is_link' => false,
+                    'is_real' => false,
+                    'is_partial' => false,
+                    'is_component' => false,
+                    'type' => 'Text',
+                ), is_array($params) ? $params : array());
+            }
+        }
+
+        unset($this->config['fields']);
+
+        return $fields;
     }
 
-    if (isset($this->config[$context]['fields']))
+    /**
+     * Returns the configuration for fields in a given context.
+     *
+     * @param string $context The Context
+     *
+     * @return array An array of configuration for all the fields in a given context
+     */
+    public function getFieldsConfiguration($context)
     {
-      foreach ($this->config[$context]['fields'] as $name => $params)
-      {
-        if (in_array($name, $names))
-        {
-          continue;
+        $fields = array();
+
+        $names = array();
+        foreach ($this->getColumns() as $name => $column) {
+            $names[] = $name;
+            $fields[$name] = isset($this->config[$context]['fields'][$name]) ? $this->config[$context]['fields'][$name] : array();
+        }
+
+        foreach ($this->getManyToManyTables() as $tables) {
+            $name = sfInflector::underscore($tables['alias']).'_list';
+            $names[] = $name;
+            $fields[$name] = isset($this->config[$context]['fields'][$name]) ? $this->config[$context]['fields'][$name] : array();
         }
 
-        $fields[$name] = is_array($params) ? $params : array();
-      }
+        if (isset($this->config[$context]['fields'])) {
+            foreach ($this->config[$context]['fields'] as $name => $params) {
+                if (in_array($name, $names)) {
+                    continue;
+                }
+
+                $fields[$name] = is_array($params) ? $params : array();
+            }
+        }
+
+        unset($this->config[$context]['fields']);
+
+        return $fields;
     }
 
-    unset($this->config[$context]['fields']);
-
-    return $fields;
-  }
-
-  /**
-   * Gets all the fields for the current model.
-   *
-   * @param  Boolean $withM2M Whether to include m2m fields or not
-   *
-   * @return array   An array of field names
-   */
-  public function getAllFieldNames($withM2M = true)
-  {
-    $names = array();
-    foreach ($this->getColumns() as $name => $column)
+    /**
+     * Gets all the fields for the current model.
+     *
+     * @param bool $withM2M Whether to include m2m fields or not
+     *
+     * @return array An array of field names
+     */
+    public function getAllFieldNames($withM2M = true)
     {
-      $names[] = $name;
+        $names = array();
+        foreach ($this->getColumns() as $name => $column) {
+            $names[] = $name;
+        }
+
+        if ($withM2M) {
+            foreach ($this->getManyToManyTables() as $tables) {
+                $names[] = sfInflector::underscore($tables['alias']).'_list';
+            }
+        }
+
+        return $names;
     }
 
-    if ($withM2M)
+    /**
+     * Get array of sfDoctrineAdminColumn objects.
+     *
+     * @return array $columns
+     */
+    public function getColumns()
     {
-      foreach ($this->getManyToManyTables() as $tables)
-      {
-        $names[] = sfInflector::underscore($tables['alias']).'_list';
-      }
+        foreach (array_keys($this->table->getColumns()) as $name) {
+            $name = $this->table->getFieldName($name);
+            $columns[$name] = new sfDoctrineColumn($name, $this->table);
+        }
+
+        return $columns;
     }
 
-    return $names;
-  }
-
-  /**
-   * Get array of sfDoctrineAdminColumn objects
-   *
-   * @return array $columns
-   */
-  public function getColumns()
-  {
-    foreach (array_keys($this->table->getColumns()) as $name)
+    /**
+     * Loads primary keys.
+     *
+     * @throws sfException
+     */
+    protected function loadPrimaryKeys()
     {
-      $name = $this->table->getFieldName($name);
-      $columns[$name] = new sfDoctrineColumn($name, $this->table);
-    }
+        $this->primaryKey = array();
+        foreach ($this->getColumns() as $name => $column) {
+            if ($column->isPrimaryKey()) {
+                $this->primaryKey[] = $name;
+            }
+        }
 
-    return $columns;
-  }
-}
\ No newline at end of file
+        if (!count($this->primaryKey)) {
+            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 01a520ec6..060a336f0 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/mailer/Swift_DoctrineSpool.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/mailer/Swift_DoctrineSpool.class.php
@@ -18,117 +18,111 @@
  *   columns:
  *     message: { type: clob, notnull: true }
  *
- * @package    symfony
- * @subpackage mailer
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class Swift_DoctrineSpool extends Swift_ConfigurableSpool
 {
-  protected
-    $model = null,
-    $column = null,
-    $method = null;
-
-  /**
-   * Constructor.
-   *
-   * @param string The Doctrine model to use to store the messages (MailMessage by default)
-   * @param string The column name to use for message storage (message by default)
-   * @param string The method to call to retrieve the query to execute (optional)
-   */
-  public function __construct($model = 'MailMessage', $column = 'message', $method = 'createQuery')
-  {
-    $this->model = $model;
-    $this->column = $column;
-    $this->method = $method;
-  }
-
-  /**
-   * Tests if this Transport mechanism has started.
-   *
-   * @return boolean
-   */
-  public function isStarted()
-  {
-    return true;
-  }
-
-  /**
-   * Starts this Transport mechanism.
-   */
-  public function start()
-  {
-  }
-
-  /**
-   * Stops this Transport mechanism.
-   */
-  public function stop()
-  {
-  }
-
-  /**
-   * Stores a message in the queue.
-   *
-   * @param Swift_Mime_Message $message The message to store
-   */
-  public function queueMessage(Swift_Mime_Message $message)
-  {
-    $object = new $this->model;
-
-    if (!$object instanceof Doctrine_Record)
+    protected $model;
+    protected $column;
+    protected $method;
+
+    /**
+     * Constructor.
+     *
+     * @param string The Doctrine model to use to store the messages (MailMessage by default)
+     * @param string The column name to use for message storage (message by default)
+     * @param string The method to call to retrieve the query to execute (optional)
+     * @param mixed $model
+     * @param mixed $column
+     * @param mixed $method
+     */
+    public function __construct($model = 'MailMessage', $column = 'message', $method = 'createQuery')
     {
-      throw new InvalidArgumentException('The mailer message object must be a Doctrine_Record object.');
+        $this->model = $model;
+        $this->column = $column;
+        $this->method = $method;
     }
 
-    $object->{$this->column} = serialize($message);
-    $object->save();
-    
-    $object->free(true);
-  }
-
-  /**
-   * Sends messages using the given transport instance.
-   *
-   * @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)
-  {
-    $table = Doctrine_Core::getTable($this->model);
-    $objects = $table->{$this->method}()->limit($this->getMessageLimit())->execute();
-
-    if (!$transport->isStarted())
+    /**
+     * Tests if this Transport mechanism has started.
+     *
+     * @return bool
+     */
+    public function isStarted()
     {
-      $transport->start();
+        return true;
     }
 
-    $count = 0;
-    $time = time();
-    foreach ($objects as $object)
+    /**
+     * Starts this Transport mechanism.
+     */
+    public function start()
     {
-      $message = unserialize($object->{$this->column});
-
-      $object->delete();
-
-      try
-      {
-        $count += $transport->send($message, $failedRecipients);
-      }
-      catch (Exception $e)
-      {
-        // TODO: What to do with errors?
-      }
-
-      if ($this->getTimeLimit() && (time() - $time) >= $this->getTimeLimit())
-      {
-        break;
-      }
     }
 
-    return $count;
-  }
+    /**
+     * Stops this Transport mechanism.
+     */
+    public function stop()
+    {
+    }
+
+    /**
+     * Stores a message in the queue.
+     *
+     * @param Swift_Mime_Message $message The message to store
+     */
+    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.');
+        }
+
+        $object->{$this->column} = serialize($message);
+        $object->save();
+
+        $object->free(true);
+    }
+
+    /**
+     * Sends messages using the given transport instance.
+     *
+     * @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)
+    {
+        $table = Doctrine_Core::getTable($this->model);
+        $objects = $table->{$this->method}()->limit($this->getMessageLimit())->execute();
+
+        if (!$transport->isStarted()) {
+            $transport->start();
+        }
+
+        $count = 0;
+        $time = time();
+        foreach ($objects as $object) {
+            $message = unserialize($object->{$this->column});
+
+            $object->delete();
+
+            try {
+                $count += $transport->send($message, $failedRecipients);
+            } catch (Exception $e) {
+                // TODO: What to do with errors?
+            }
+
+            if ($this->getTimeLimit() && (time() - $time) >= $this->getTimeLimit()) {
+                break;
+            }
+        }
+
+        return $count;
+    }
 }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/pager/sfDoctrinePager.class.php b/lib/plugins/sfDoctrinePlugin/lib/pager/sfDoctrinePager.class.php
index b63cd66c0..c603f5475 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/pager/sfDoctrinePager.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/pager/sfDoctrinePager.class.php
@@ -12,213 +12,202 @@
 /**
  * sfDoctrine pager class.
  *
- * @package    sfDoctrinePlugin
- * @subpackage pager
  * @author     Jonathan H. Wage <jonwage@gmail.com>
+ *
  * @version    SVN: $Id$
  */
 class sfDoctrinePager extends sfPager implements Serializable
 {
-  protected
-    $query             = null,
-    $tableMethodName   = null,
-    $tableMethodCalled = false;
-
-  /**
-   * Get the name of the table method used to retrieve the query object for the pager
-   *
-   * @return string $tableMethodName
-   */
-  public function getTableMethod()
-  {
-    return $this->tableMethodName;
-  }
-
-  /**
-   * Set the name of the table method used to retrieve the query object for the pager
-   *
-   * @param string $tableMethodName
-   * @return void
-   */
-  public function setTableMethod($tableMethodName)
-  {
-    $this->tableMethodName = $tableMethodName;
-  }
-
-  /**
-   * Serialize the pager object
-   *
-   * @return string $serialized
-   */
-  public function serialize()
-  {
-    return serialize($this->__serialize());
-  }
-
-  /**
-   * Unserialize a pager object
-   *
-   * @param string $serialized
-   */
-  public function unserialize($serialized)
-  {
-    $array = unserialize($serialized);
-
-    return $this->__unserialize($array);
-  }
-
-  /**
-   * Serializes the current instance for php 7.4+
-   *
-   * @return array
-   */
-  public function __serialize()
-  {
-    $vars = get_object_vars($this);
-    unset($vars['query']);
-    return $vars;
-  }
-
-  /**
-   * Unserializes a sfDoctrinePager instance for php 7.4+
-   *
-   * @param array $data
-   */
-  public function __unserialize($data)
-  {
-
-    foreach ($data as $name => $values)
+    protected $query;
+    protected $tableMethodName;
+    protected $tableMethodCalled = false;
+
+    /**
+     * Serializes the current instance for php 7.4+.
+     *
+     * @return array
+     */
+    public function __serialize()
+    {
+        $vars = get_object_vars($this);
+        unset($vars['query']);
+
+        return $vars;
+    }
+
+    /**
+     * Unserializes a sfDoctrinePager instance for php 7.4+.
+     *
+     * @param array $data
+     */
+    public function __unserialize($data)
+    {
+        foreach ($data as $name => $values) {
+            $this->{$name} = $values;
+        }
+
+        $this->tableMethodCalled = false;
+    }
+
+    /**
+     * Get the name of the table method used to retrieve the query object for the pager.
+     *
+     * @return string $tableMethodName
+     */
+    public function getTableMethod()
+    {
+        return $this->tableMethodName;
+    }
+
+    /**
+     * Set the name of the table method used to retrieve the query object for the pager.
+     *
+     * @param string $tableMethodName
+     */
+    public function setTableMethod($tableMethodName)
+    {
+        $this->tableMethodName = $tableMethodName;
+    }
+
+    /**
+     * Serialize the pager object.
+     *
+     * @return string $serialized
+     */
+    public function serialize()
+    {
+        return serialize($this->__serialize());
+    }
+
+    /**
+     * Unserialize a pager object.
+     *
+     * @param string $serialized
+     */
+    public function unserialize($serialized)
     {
-       $this->$name = $values;
+        $array = unserialize($serialized);
+
+        return $this->__unserialize($array);
     }
 
-    $this->tableMethodCalled = false;
-  }
-
-  /**
-   * Returns a query for counting the total results.
-   *
-   * @return Doctrine_Query
-   */
-  public function getCountQuery()
-  {
-    $query = clone $this->getQuery();
-    $query
-      ->offset(0)
-      ->limit(0)
-    ;
-
-    return $query;
-  }
-
-  /**
-   * @see sfPager
-   */
-  public function init()
-  {
-    $this->resetIterator();
-
-    $countQuery = $this->getCountQuery();
-    $count = $countQuery->count();
-
-    $this->setNbResults($count);
-
-    $query = $this->getQuery();
-    $query
-      ->offset(0)
-      ->limit(0)
-    ;
-
-    if (0 == $this->getPage() || 0 == $this->getMaxPerPage() || 0 == $this->getNbResults())
+    /**
+     * Returns a query for counting the total results.
+     *
+     * @return Doctrine_Query
+     */
+    public function getCountQuery()
     {
-      $this->setLastPage(0);
+        $query = clone $this->getQuery();
+        $query
+            ->offset(0)
+            ->limit(0)
+        ;
+
+        return $query;
     }
-    else
+
+    /**
+     * @see sfPager
+     */
+    public function init()
     {
-      $offset = ($this->getPage() - 1) * $this->getMaxPerPage();
+        $this->resetIterator();
+
+        $countQuery = $this->getCountQuery();
+        $count = $countQuery->count();
+
+        $this->setNbResults($count);
+
+        $query = $this->getQuery();
+        $query
+            ->offset(0)
+            ->limit(0)
+        ;
+
+        if (0 == $this->getPage() || 0 == $this->getMaxPerPage() || 0 == $this->getNbResults()) {
+            $this->setLastPage(0);
+        } else {
+            $offset = ($this->getPage() - 1) * $this->getMaxPerPage();
+
+            $this->setLastPage(ceil($this->getNbResults() / $this->getMaxPerPage()));
+
+            $query
+                ->offset($offset)
+                ->limit($this->getMaxPerPage())
+            ;
+        }
+    }
 
-      $this->setLastPage(ceil($this->getNbResults() / $this->getMaxPerPage()));
+    /**
+     * Get the query for the pager.
+     *
+     * @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->tableMethodCalled = true;
+        } elseif (!$this->query) {
+            $this->query = Doctrine_Core::getTable($this->getClass())->createQuery();
+        }
+
+        return $this->query;
+    }
 
-      $query
-        ->offset($offset)
-        ->limit($this->getMaxPerPage())
-      ;
+    /**
+     * Set query object for the pager.
+     *
+     * @param Doctrine_Query $query
+     */
+    public function setQuery($query)
+    {
+        $this->query = $query;
     }
-  }
-
-  /**
-   * Get the query for the pager.
-   *
-   * @return Doctrine_Query
-   */
-  public function getQuery()
-  {
-    if (!$this->tableMethodCalled && $this->tableMethodName)
+
+    /**
+     * Get all the results for the pager instance.
+     *
+     * @param mixed $hydrationMode A hydration mode identifier
+     *
+     * @return array|Doctrine_Collection
+     */
+    public function getResults($hydrationMode = null)
     {
-      $method = $this->tableMethodName;
-      $this->query = Doctrine_Core::getTable($this->getClass())->$method($this->query);
-      $this->tableMethodCalled = true;
+        return $this->getQuery()->execute(array(), $hydrationMode);
     }
-    else if (!$this->query)
+
+    /**
+     * Retrieve the object for a certain offset.
+     *
+     * @param int $offset
+     *
+     * @return Doctrine_Record
+     */
+    protected function retrieveObject($offset)
     {
-      $this->query = Doctrine_Core::getTable($this->getClass())->createQuery();
+        $queryForRetrieve = clone $this->getQuery();
+        $queryForRetrieve
+            ->offset($offset - 1)
+            ->limit(1)
+        ;
+
+        $results = $queryForRetrieve->execute();
+
+        return $results[0];
     }
 
-    return $this->query;
-  }
-
-  /**
-   * Set query object for the pager
-   *
-   * @param Doctrine_Query $query
-   */
-  public function setQuery($query)
-  {
-    $this->query = $query;
-  }
-
-  /**
-   * Retrieve the object for a certain offset
-   *
-   * @param integer $offset
-   *
-   * @return Doctrine_Record
-   */
-  protected function retrieveObject($offset)
-  {
-    $queryForRetrieve = clone $this->getQuery();
-    $queryForRetrieve
-      ->offset($offset - 1)
-      ->limit(1)
-    ;
-
-    $results = $queryForRetrieve->execute();
-
-    return $results[0];
-  }
-
-  /**
-   * Get all the results for the pager instance
-   *
-   * @param mixed $hydrationMode A hydration mode identifier
-   *
-   * @return Doctrine_Collection|array
-   */
-  public function getResults($hydrationMode = null)
-  {
-    return $this->getQuery()->execute(array(), $hydrationMode);
-  }
-
-  /**
-   * @see sfPager
-   */
-  protected function initializeIterator()
-  {
-    parent::initializeIterator();
-
-    if ($this->results instanceof Doctrine_Collection)
+    /**
+     * @see sfPager
+     */
+    protected function initializeIterator()
     {
-      $this->results = $this->results->getData();
+        parent::initializeIterator();
+
+        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 c281b3358..ee4693fa3 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/record/sfDoctrineRecord.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/record/sfDoctrineRecord.class.php
@@ -11,249 +11,229 @@
 
 /**
  * Base sfDoctrineRecord extends the base Doctrine_Record in Doctrine to provide some
- * symfony specific functionality to Doctrine_Records
+ * symfony specific functionality to Doctrine_Records.
  *
- * @package    symfony
- * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfDoctrineRecord extends Doctrine_Record
 {
-  static protected
-    $_defaultCulture = 'en';
-
-  /**
-   * Initializes internationalization.
-   *
-   * @see Doctrine_Record
-   */
-  public function construct()
-  {
-    if ($this->getTable()->hasRelation('Translation'))
+    protected static $_defaultCulture = 'en';
+
+    /**
+     * Returns a string representation of the record.
+     *
+     * @return string A string representation of the record
+     */
+    public function __toString()
     {
-      // only add filter to each table once
-      if (!$this->getTable()->getOption('has_symfony_i18n_filter'))
-      {
-        $this->getTable()
-          ->unshiftFilter(new sfDoctrineRecordI18nFilter())
-          ->setOption('has_symfony_i18n_filter', true)
-        ;
-      }
+        $guesses = array('name',
+            'title',
+            'description',
+            'subject',
+            'keywords',
+            '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) {
+            }
+        }
+
+        return sprintf('No description for object of class "%s"', $this->getTable()->getComponentName());
     }
-  }
 
-  /**
-   * Listens to the user.change_culture event.
-   *
-   * @param sfEvent An sfEvent instance
-   */
-  static public function listenToChangeCultureEvent(sfEvent $event)
-  {
-    self::$_defaultCulture = $event['culture'];
-  }
+    /**
+     * Provides getter and setter methods.
+     *
+     * @param string $method    The method name
+     * @param array  $arguments The method arguments
+     *
+     * @return mixed The returned value of the called method
+     */
+    public function __call($method, $arguments)
+    {
+        $failed = false;
+
+        try {
+            if (in_array($verb = substr($method, 0, 3), array('set', 'get'))) {
+                $name = substr($method, 3);
+
+                $table = $this->getTable();
+                if ($table->hasRelation($name)) {
+                    $entityName = $name;
+                } elseif ($table->hasField($fieldName = $table->getFieldName($name))) {
+                    $entityNameLower = strtolower($fieldName);
+                    if ($table->hasField($entityNameLower)) {
+                        $entityName = $entityNameLower;
+                    } else {
+                        $entityName = $fieldName;
+                    }
+                } else {
+                    $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 = strtolower($camelCase[0]).substr($camelCase, 1, strlen($camelCase));
+                        if ($table->hasField($camelCase) || $table->hasRelation($camelCase)) {
+                            $entityName = $camelCase;
+                        } else {
+                            $entityName = $underScored;
+                        }
+                    }
+                }
+
+                return call_user_func_array(
+                    array($this, $verb),
+                    array_merge(array($entityName), $arguments)
+                );
+            }
+            $failed = true;
+        } catch (Exception $e) {
+            $failed = true;
+        }
+        if ($failed) {
+            try {
+                return parent::__call($method, $arguments);
+            } catch (Doctrine_Record_UnknownPropertyException $e2) {
+            }
 
-  /**
-   * Sets the default culture
-   *
-   * @param string $culture
-   */
-  static public function setDefaultCulture($culture)
-  {
-    self::$_defaultCulture = $culture;
-  }
+            if (isset($e) && $e) {
+                throw $e;
+            }
+            if (isset($e2) && $e2) {
+                throw $e2;
+            }
+        }
+    }
 
-  /**
-   * Return the default culture
-   *
-   * @return string the default culture
-   */
-  static public function getDefaultCulture()
-  {
-    if (!self::$_defaultCulture)
+    /**
+     * Initializes internationalization.
+     *
+     * @see Doctrine_Record
+     */
+    public function construct()
     {
-      throw new sfException('The default culture has not been set');
+        if ($this->getTable()->hasRelation('Translation')) {
+            // only add filter to each table once
+            if (!$this->getTable()->getOption('has_symfony_i18n_filter')) {
+                $this->getTable()
+                    ->unshiftFilter(new sfDoctrineRecordI18nFilter())
+                    ->setOption('has_symfony_i18n_filter', true)
+                ;
+            }
+        }
     }
 
-    return self::$_defaultCulture;
-  }
-
-  /**
-   * Returns the current record's primary key.
-   *
-   * This a proxy method to {@link Doctrine_Record::identifier()} for
-   * compatibility with a Propel-style API.
-   *
-   * @return mixed The value of the current model's last identifier column
-   */
-  public function getPrimaryKey()
-  {
-    $identifier = (array) $this->identifier();
-    return end($identifier);
-  }
-
-  /**
-   * Function require by symfony >= 1.2 admin generators.
-   *
-   * @return boolean
-   */
-  public function isNew()
-  {
-    return ! $this->exists();
-  }
-
-  /**
-   * Returns a string representation of the record.
-   *
-   * @return string A string representation of the record
-   */
-  public function __toString()
-  {
-    $guesses = array('name',
-                     'title',
-                     'description',
-                     'subject',
-                     'keywords',
-                     'id');
-
-    // we try to guess a column which would give a good description of the object
-    foreach ($guesses as $descriptionColumn)
+    /**
+     * Listens to the user.change_culture event.
+     *
+     * @param sfEvent An sfEvent instance
+     */
+    public static function listenToChangeCultureEvent(sfEvent $event)
     {
-      try
-      {
-        return (string) $this->get($descriptionColumn);
-      } catch (Exception $e) {}
+        self::$_defaultCulture = $event['culture'];
     }
 
-    return sprintf('No description for object of class "%s"', $this->getTable()->getComponentName());
-  }
-
-  /**
-   * Provides getter and setter methods.
-   *
-   * @param  string $method    The method name
-   * @param  array  $arguments The method arguments
-   *
-   * @return mixed The returned value of the called method
-   */
-  public function __call($method, $arguments)
-  {
-    $failed = false;
-    try {
-      if (in_array($verb = substr($method, 0, 3), array('set', 'get')))
-      {
-        $name = substr($method, 3);
+    /**
+     * Sets the default culture.
+     *
+     * @param string $culture
+     */
+    public static function setDefaultCulture($culture)
+    {
+        self::$_defaultCulture = $culture;
+    }
 
-        $table = $this->getTable();
-        if ($table->hasRelation($name))
-        {
-          $entityName = $name;
-        }
-        else if ($table->hasField($fieldName = $table->getFieldName($name)))
-        {
-          $entityNameLower = strtolower($fieldName);
-          if ($table->hasField($entityNameLower))
-          {
-            $entityName = $entityNameLower;
-          } else {
-            $entityName = $fieldName;
-          }
-        }
-        else
-        {
-          $underScored = $table->getFieldName(sfInflector::underscore($name));
-          if ($table->hasField($underScored) || $table->hasRelation($underScored))
-          {
-            $entityName = $underScored;
-          } else if ($table->hasField(strtolower($name)) || $table->hasRelation(strtolower($name))) {
-            $entityName = strtolower($name);
-          } else {
-            $camelCase = $table->getFieldName(sfInflector::camelize($name));
-            $camelCase = strtolower($camelCase[0]).substr($camelCase, 1, strlen($camelCase));
-            if ($table->hasField($camelCase) || $table->hasRelation($camelCase))
-            {
-              $entityName = $camelCase;
-            } else {
-              $entityName = $underScored;
-            }
-          }
+    /**
+     * Return the default culture.
+     *
+     * @return string the default culture
+     */
+    public static function getDefaultCulture()
+    {
+        if (!self::$_defaultCulture) {
+            throw new sfException('The default culture has not been set');
         }
 
-        return call_user_func_array(
-          array($this, $verb),
-          array_merge(array($entityName), $arguments)
-        );
-      } else {
-        $failed = true;
-      }
-    } catch (Exception $e) {
-      $failed = true;
+        return self::$_defaultCulture;
     }
-    if ($failed)
+
+    /**
+     * Returns the current record's primary key.
+     *
+     * This a proxy method to {@link Doctrine_Record::identifier()} for
+     * compatibility with a Propel-style API.
+     *
+     * @return mixed The value of the current model's last identifier column
+     */
+    public function getPrimaryKey()
     {
-      try
-      {
-        return parent::__call($method, $arguments);
-      } catch (Doctrine_Record_UnknownPropertyException $e2) {}
+        $identifier = (array) $this->identifier();
 
-      if (isset($e) && $e)
-      {
-        throw $e;
-      } else if (isset($e2) && $e2) {
-        throw $e2;
-      }
+        return end($identifier);
     }
-  }
 
-  /**
-   * Get the Doctrine date value as a PHP DateTime object, null if the value is not set
-   *
-   * @param string $dateFieldName   The field name to get the DateTime object for
-   *
-   * @return DateTime|null $dateTime     The instance of PHPs DateTime
-   * @throws sfException if the field is not one of date, datetime, or timestamp types
-   */
-  public function getDateTimeObject($dateFieldName)
-  {
-    $type = $this->getTable()->getTypeOf($dateFieldName);
-    if ($type == 'date' || $type == 'timestamp' || $type == 'datetime')
+    /**
+     * Function require by symfony >= 1.2 admin generators.
+     *
+     * @return bool
+     */
+    public function isNew()
     {
-      $datetime = $this->get($dateFieldName);
-      if ($datetime)
-      {
-        return new DateTime($datetime);
-      }
+        return !$this->exists();
     }
-    else
-    {
-      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
-   *
-   * @return sfDoctrineRecord
-   * @throws sfException if the field is not one of date, datetime, or timestamp types
-   */
-  public function setDateTimeObject($dateFieldName, DateTime $dateTimeObject = null)
-  {
-    $type = $this->getTable()->getTypeOf($dateFieldName);
-    if ($type == 'date' || $type == 'timestamp' || $type == 'datetime')
+    /**
+     * Get the Doctrine date value as a PHP DateTime object, null if the value is not set.
+     *
+     * @param string $dateFieldName The field name to get the DateTime object for
+     *
+     * @return DateTime|null $dateTime     The instance of PHPs DateTime
+     *
+     * @throws sfException if the field is not one of date, datetime, or timestamp types
+     */
+    public function getDateTimeObject($dateFieldName)
     {
-      if (null === $dateTimeObject)
-      {
-        return $this->set($dateFieldName, null);
-      }
-      return $this->set($dateFieldName, $dateTimeObject->format('Y-m-d H:i:s'));
+        $type = $this->getTable()->getTypeOf($dateFieldName);
+        if ('date' == $type || 'timestamp' == $type || 'datetime' == $type) {
+            $datetime = $this->get($dateFieldName);
+            if ($datetime) {
+                return new DateTime($datetime);
+            }
+        } else {
+            throw new sfException('Cannot call getDateTimeObject() on a field that is not of type date or timestamp.');
+        }
     }
-    else
+
+    /**
+     * 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
+     *
+     * @return sfDoctrineRecord
+     *
+     * @throws sfException if the field is not one of date, datetime, or timestamp types
+     */
+    public function setDateTimeObject($dateFieldName, DateTime $dateTimeObject = null)
     {
-      throw new sfException('Cannot call setDateTimeObject() on a field that is not of type date or timestamp.');
+        $type = $this->getTable()->getTypeOf($dateFieldName);
+        if ('date' == $type || 'timestamp' == $type || 'datetime' == $type) {
+            if (null === $dateTimeObject) {
+                return $this->set($dateFieldName, null);
+            }
+
+            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.');
     }
-  }
 }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/record/sfDoctrineRecordI18nFilter.class.php b/lib/plugins/sfDoctrinePlugin/lib/record/sfDoctrineRecordI18nFilter.class.php
index 348bc8b48..43e82ce65 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/record/sfDoctrineRecordI18nFilter.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/record/sfDoctrineRecordI18nFilter.class.php
@@ -12,52 +12,48 @@
  * sfDoctrineRecordI18nFilter implements access to the translated properties for
  * the current culture from the internationalized model.
  *
- * @package    symfony
- * @subpackage doctrine
  * @author     Jonathan H. Wage <jonwage@gmail.com>
+ *
  * @version    SVN: $Id$
  */
 class sfDoctrineRecordI18nFilter extends Doctrine_Record_Filter
 {
-  /**
-   * @see Doctrine_Table::unshiftFilter()
-   */
-  public function init()
-  {
-  }
-
-  /**
-   * Calls set on Translation relationship.
-   *
-   * Allows manipulation of I18n properties from the main object.
-   *
-   * @param Doctrine_Record $record
-   * @param string          $name   Name of the property
-   * @param string          $value  Value of the property
-   */
-  public function filterSet(Doctrine_Record $record, $name, $value)
-  {
-    return $record['Translation'][sfDoctrineRecord::getDefaultCulture()][$name] = $value;
-  }
+    /**
+     * @see Doctrine_Table::unshiftFilter()
+     */
+    public function init()
+    {
+    }
 
-  /**
-   * Call get on Translation relationship.
-   *
-   * Allow access to I18n properties from the main object.
-   *
-   * @param Doctrine_Record $record
-   * @param string          $name   Name of the property
-   */
-  public function filterGet(Doctrine_Record $record, $name)
-  {
-    $culture = sfDoctrineRecord::getDefaultCulture();
-    if (isset($record['Translation'][$culture]) && '' != $record['Translation'][$culture][$name])
+    /**
+     * Calls set on Translation relationship.
+     *
+     * Allows manipulation of I18n properties from the main object.
+     *
+     * @param string $name  Name of the property
+     * @param string $value Value of the property
+     */
+    public function filterSet(Doctrine_Record $record, $name, $value)
     {
-      return $record['Translation'][$culture][$name];
+        return $record['Translation'][sfDoctrineRecord::getDefaultCulture()][$name] = $value;
     }
 
-    $defaultCulture = sfConfig::get('sf_default_culture');
+    /**
+     * Call get on Translation relationship.
+     *
+     * Allow access to I18n properties from the main object.
+     *
+     * @param string $name Name of the property
+     */
+    public function filterGet(Doctrine_Record $record, $name)
+    {
+        $culture = sfDoctrineRecord::getDefaultCulture();
+        if (isset($record['Translation'][$culture]) && '' != $record['Translation'][$culture][$name]) {
+            return $record['Translation'][$culture][$name];
+        }
+
+        $defaultCulture = sfConfig::get('sf_default_culture');
 
-    return $record['Translation'][$defaultCulture][$name];
-  }
+        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 7aa937ead..b423ef966 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/routing/sfDoctrineRoute.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/routing/sfDoctrineRoute.class.php
@@ -14,130 +14,110 @@
  *
  * A Doctrine route can represent a single Doctrine object or a list of objects.
  *
- * @package    symfony
- * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
+ *
  * @version    SVN: $Id$
  */
 class sfDoctrineRoute extends sfObjectRoute
 {
-  protected
-    $query = null;
+    protected $query;
 
-  public function setListQuery(Doctrine_Query $query)
-  {
-    if (!$this->isBound())
+    public function setListQuery(Doctrine_Query $query)
     {
-      throw new LogicException('The route is not bound.');
-    }
-
-    $this->query = $query;
-  }
-
-  protected function getObjectForParameters($parameters)
-  {
-    $results = $this->getObjectsForParameters($parameters);
+        if (!$this->isBound()) {
+            throw new LogicException('The route is not bound.');
+        }
 
-    // If query returned Doctrine_Collection with results inside then we
-    // need to return the first Doctrine_Record
-    if ($results instanceof Doctrine_Collection)
-    {
-      if (count($results))
-      {
-        $results = $results->getFirst();
-      } else {
-        $results = null;
-      }
-    }
-    // If an object is returned then lets return it otherwise return null
-    else if(!is_object($results))
-    {
-      $results = null;
+        $this->query = $query;
     }
 
-    return $results;
-  }
+    protected function getObjectForParameters($parameters)
+    {
+        $results = $this->getObjectsForParameters($parameters);
 
-  protected function getObjectsForParameters($parameters)
-  {
-    $tableModel = Doctrine_Core::getTable($this->options['model']);
+        // If query returned Doctrine_Collection with results inside then we
+        // need to return the first Doctrine_Record
+        if ($results instanceof Doctrine_Collection) {
+            if (count($results)) {
+                $results = $results->getFirst();
+            } else {
+                $results = null;
+            }
+        }
+        // If an object is returned then lets return it otherwise return null
+        elseif (!is_object($results)) {
+            $results = null;
+        }
 
-    $variables = array();
-    $values = array();
-    foreach($this->getRealVariables() as $variable)
-    {
-      if($tableModel->hasColumn($tableModel->getColumnName($variable)))
-      {
-        $variables[] = $variable;
-        $values[$variable] = $parameters[$variable];
-      }
+        return $results;
     }
 
-    if (!isset($this->options['method']))
+    protected function getObjectsForParameters($parameters)
     {
-      if (null === $this->query)
-      {
-        $q = $tableModel->createQuery('a');
-        foreach ($values as $variable => $value)
-        {
-          $fieldName = $tableModel->getFieldName($variable);
-          $q->andWhere('a.'. $fieldName . ' = ?', $parameters[$variable]);
+        $tableModel = Doctrine_Core::getTable($this->options['model']);
+
+        $variables = array();
+        $values = array();
+        foreach ($this->getRealVariables() as $variable) {
+            if ($tableModel->hasColumn($tableModel->getColumnName($variable))) {
+                $variables[] = $variable;
+                $values[$variable] = $parameters[$variable];
+            }
         }
-      }
-      else
-      {
-        $q = $this->query;
-      }
-      if (isset($this->options['method_for_query']))
-      {
-        $method = $this->options['method_for_query'];
-        $results = $tableModel->$method($q);
-      }
-      else
-      {
-        $results = $q->execute();
-      }
-    }
-    else
-    {
-      $method = $this->options['method'];
-      $results = $tableModel->$method($this->filterParameters($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)
-    {
-      $obj = $results;
-      $results = new Doctrine_Collection($obj->getTable());
-      $results[] = $obj;
-    }
+        if (!isset($this->options['method'])) {
+            if (null === $this->query) {
+                $q = $tableModel->createQuery('a');
+                foreach ($values as $variable => $value) {
+                    $fieldName = $tableModel->getFieldName($variable);
+                    $q->andWhere('a.'.$fieldName.' = ?', $parameters[$variable]);
+                }
+            } else {
+                $q = $this->query;
+            }
+            if (isset($this->options['method_for_query'])) {
+                $method = $this->options['method_for_query'];
+                $results = $tableModel->{$method}($q);
+            } else {
+                $results = $q->execute();
+            }
+        } else {
+            $method = $this->options['method'];
+            $results = $tableModel->{$method}($this->filterParameters($parameters));
+        }
 
-    return $results;
-  }
+        // 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) {
+            $obj = $results;
+            $results = new Doctrine_Collection($obj->getTable());
+            $results[] = $obj;
+        }
 
-  protected function doConvertObjectToArray($object)
-  {
-    if (isset($this->options['convert']) || method_exists($object, 'toParams'))
-    {
-      return parent::doConvertObjectToArray($object);
+        return $results;
     }
 
-    $parameters = array();
-    foreach ($this->getRealVariables() as $variable)
+    protected function doConvertObjectToArray($object)
     {
-      try {
-        $parameters[$variable] = $object->$variable;
-      } catch (Exception $e) {
-        try {
-          $method = 'get'.sfInflector::camelize($variable);
-          $parameters[$variable] = $object->$method();
-        } catch (Exception $e) {}
-      }
-    }
+        if (isset($this->options['convert']) || method_exists($object, 'toParams')) {
+            return parent::doConvertObjectToArray($object);
+        }
 
-    return $parameters;
-  }
-}
\ No newline at end of file
+        $parameters = array();
+        foreach ($this->getRealVariables() as $variable) {
+            try {
+                $parameters[$variable] = $object->{$variable};
+            } catch (Exception $e) {
+                try {
+                    $method = 'get'.sfInflector::camelize($variable);
+                    $parameters[$variable] = $object->{$method}();
+                } catch (Exception $e) {
+                }
+            }
+        }
+
+        return $parameters;
+    }
+}
diff --git a/lib/plugins/sfDoctrinePlugin/lib/routing/sfDoctrineRouteCollection.class.php b/lib/plugins/sfDoctrinePlugin/lib/routing/sfDoctrineRouteCollection.class.php
index 35f1048f7..887f54fd1 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/routing/sfDoctrineRouteCollection.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/routing/sfDoctrineRouteCollection.class.php
@@ -12,14 +12,12 @@
 /**
  * sfObjectRouteCollection represents a collection of routes bound to Doctrine objects.
  *
- * @package    symfony
- * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
+ *
  * @version    SVN: $Id$
  */
 class sfDoctrineRouteCollection extends sfObjectRouteCollection
 {
-  protected
-    $routeClass = 'sfDoctrineRoute';
-}
\ No newline at end of file
+    protected $routeClass = 'sfDoctrineRoute';
+}
diff --git a/lib/plugins/sfDoctrinePlugin/lib/sfDoctrineException.class.php b/lib/plugins/sfDoctrinePlugin/lib/sfDoctrineException.class.php
index 82042e207..d42b25720 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/sfDoctrineException.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/sfDoctrineException.class.php
@@ -10,14 +10,13 @@
  */
 
 /**
- * sfDoctrine exception class
+ * sfDoctrine exception class.
  *
- * @package    symfony
- * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
+ *
  * @version    SVN: $Id$
  */
 class sfDoctrineException extends sfException
 {
-}
\ No newline at end of file
+}
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBaseTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBaseTask.class.php
index 40fcb082c..3fc6d2b8f 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBaseTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBaseTask.class.php
@@ -12,275 +12,244 @@
 /**
  * Base class for all symfony Doctrine tasks.
  *
- * @package    symfony
- * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfDoctrineBaseTask extends sfBaseTask
 {
-  /**
-   * Returns an array of configuration variables for the Doctrine CLI.
-   *
-   * @return array $config
-   *
-   * @see sfDoctrinePluginConfiguration::getCliConfig()
-   */
-  public function getCliConfig()
-  {
-    return $this->configuration->getPluginConfiguration('sfDoctrinePlugin')->getCliConfig();
-  }
-
-  /**
-   * Calls a Doctrine CLI command.
-   *
-   * @param string $task Name of the Doctrine task to call
-   * @param array  $args Arguments for the task
-   *
-   * @see sfDoctrineCli
-   */
-  public function callDoctrineCli($task, $args = array())
-  {
-    $config = $this->getCliConfig();
-
-    $arguments = array('./symfony', $task);
-
-    foreach ($args as $key => $arg)
+    /**
+     * Returns an array of configuration variables for the Doctrine CLI.
+     *
+     * @return array $config
+     *
+     * @see sfDoctrinePluginConfiguration::getCliConfig()
+     */
+    public function getCliConfig()
     {
-      if (isset($config[$key]))
-      {
-        $config[$key] = $arg;
-      }
-      else
-      {
-        $arguments[] = $arg;
-      }
+        return $this->configuration->getPluginConfiguration('sfDoctrinePlugin')->getCliConfig();
     }
 
-    $cli = new sfDoctrineCli($config);
-    $cli->setSymfonyDispatcher($this->dispatcher);
-    $cli->setSymfonyFormatter($this->formatter);
-    $cli->run($arguments);
-  }
-
-  /**
-   * Returns Doctrine databases from the supplied database manager.
-   *
-   * @param sfDatabaseManager $databaseManager
-   * @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
-   */
-  protected function getDoctrineDatabases(sfDatabaseManager $databaseManager, array $names = null)
-  {
-    $databases = array();
-
-    if (null === $names)
+    /**
+     * Calls a Doctrine CLI command.
+     *
+     * @param string $task Name of the Doctrine task to call
+     * @param array  $args Arguments for the task
+     *
+     * @see sfDoctrineCli
+     */
+    public function callDoctrineCli($task, $args = array())
     {
-      foreach ($databaseManager->getNames() as $name)
-      {
-        $database = $databaseManager->getDatabase($name);
+        $config = $this->getCliConfig();
 
-        if ($database instanceof sfDoctrineDatabase)
-        {
-          $databases[$name] = $database;
-        }
-      }
-    }
-    else
-    {
-      foreach ($names as $name)
-      {
-        $database = $databaseManager->getDatabase($name);
+        $arguments = array('./symfony', $task);
 
-        if (!$database instanceof sfDoctrineDatabase)
-        {
-          throw new InvalidArgumentException(sprintf('The database "%s" is not a Doctrine database.', $name));
+        foreach ($args as $key => $arg) {
+            if (isset($config[$key])) {
+                $config[$key] = $arg;
+            } else {
+                $arguments[] = $arg;
+            }
         }
 
-        $databases[$name] = $database;
-      }
+        $cli = new sfDoctrineCli($config);
+        $cli->setSymfonyDispatcher($this->dispatcher);
+        $cli->setSymfonyFormatter($this->formatter);
+        $cli->run($arguments);
     }
 
-    return $databases;
-  }
-
-  /**
-   * Merges all project and plugin schema files into one.
-   *
-   * Schema files are merged similar to how other configuration files are in
-   * symfony, utilizing a configuration cascade. Files later in the cascade
-   * can change values from earlier in the cascade.
-   *
-   * The order in which schema files are processed is like so:
-   *
-   *  1. Plugin schema files
-   *    * Plugins are processed in the order which they were enabled in ProjectConfiguration
-   *    * Each plugin's schema files are processed in alphabetical order
-   *  2. Project schema files
-   *    * Project schema files are processed in alphabetical order
-   *
-   * A schema file is any file saved in a plugin or project's config/doctrine/
-   * directory that matches the "*.yml" glob.
-   *
-   * @return string Absolute path to the consolidated schema file
-   */
-  protected function prepareSchemaFile($yamlSchemaPath)
-  {
-    $models = array();
-    $finder = sfFinder::type('file')->name('*.yml')->sort_by_name()->follow_link();
-
-    // plugin models
-    foreach ($this->configuration->getPlugins() as $name)
+    /**
+     * Returns Doctrine databases from the supplied database manager.
+     *
+     * @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
+     */
+    protected function getDoctrineDatabases(sfDatabaseManager $databaseManager, array $names = null)
     {
-      $plugin = $this->configuration->getPluginConfiguration($name);
-      foreach ($finder->in($plugin->getRootDir().'/config/doctrine') as $schema)
-      {
-        $pluginModels = (array) sfYaml::load($schema);
-        $globals = $this->filterSchemaGlobals($pluginModels);
-
-        foreach ($pluginModels as $model => $definition)
-        {
-          // canonicalize this definition
-          $definition = $this->canonicalizeModelDefinition($model, $definition);
-
-          // merge in the globals
-          $definition = array_merge($globals, $definition);
-
-          // merge this model into the schema
-          $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()))
-          {
-            $models[$model]['package_custom_path'] = $plugin->getRootDir().'/lib/model/doctrine';
-          }
+        $databases = array();
+
+        if (null === $names) {
+            foreach ($databaseManager->getNames() as $name) {
+                $database = $databaseManager->getDatabase($name);
+
+                if ($database instanceof sfDoctrineDatabase) {
+                    $databases[$name] = $database;
+                }
+            }
+        } else {
+            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));
+                }
+
+                $databases[$name] = $database;
+            }
         }
-      }
+
+        return $databases;
     }
 
-    // project models
-    foreach ($finder->in($yamlSchemaPath) as $schema)
+    /**
+     * Merges all project and plugin schema files into one.
+     *
+     * Schema files are merged similar to how other configuration files are in
+     * symfony, utilizing a configuration cascade. Files later in the cascade
+     * can change values from earlier in the cascade.
+     *
+     * The order in which schema files are processed is like so:
+     *
+     *  1. Plugin schema files
+     *    * Plugins are processed in the order which they were enabled in ProjectConfiguration
+     *    * Each plugin's schema files are processed in alphabetical order
+     *  2. Project schema files
+     *    * Project schema files are processed in alphabetical order
+     *
+     * A schema file is any file saved in a plugin or project's config/doctrine/
+     * directory that matches the "*.yml" glob.
+     *
+     * @param mixed $yamlSchemaPath
+     *
+     * @return string Absolute path to the consolidated schema file
+     */
+    protected function prepareSchemaFile($yamlSchemaPath)
     {
-      $projectModels = (array) sfYaml::load($schema);
-      $globals = $this->filterSchemaGlobals($projectModels);
-
-      foreach ($projectModels as $model => $definition)
-      {
-        // canonicalize this definition
-        $definition = $this->canonicalizeModelDefinition($model, $definition);
+        $models = array();
+        $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);
+                $globals = $this->filterSchemaGlobals($pluginModels);
+
+                foreach ($pluginModels as $model => $definition) {
+                    // canonicalize this definition
+                    $definition = $this->canonicalizeModelDefinition($model, $definition);
+
+                    // merge in the globals
+                    $definition = array_merge($globals, $definition);
+
+                    // merge this model into the schema
+                    $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())) {
+                        $models[$model]['package_custom_path'] = $plugin->getRootDir().'/lib/model/doctrine';
+                    }
+                }
+            }
+        }
 
-        // merge in the globals
-        $definition = array_merge($globals, $definition);
+        // project models
+        foreach ($finder->in($yamlSchemaPath) as $schema) {
+            $projectModels = (array) sfYaml::load($schema);
+            $globals = $this->filterSchemaGlobals($projectModels);
 
-        // merge this model into the schema
-        $models[$model] = isset($models[$model]) ? sfToolkit::arrayDeepMerge($models[$model], $definition) : $definition;
-      }
-    }
+            foreach ($projectModels as $model => $definition) {
+                // canonicalize this definition
+                $definition = $this->canonicalizeModelDefinition($model, $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));
-
-    return $file;
-  }
-
-  /**
-   * Removes and returns globals from the supplied array of models.
-   *
-   * @param array $models An array of model definitions
-   *
-   * @return array An array of globals
-   * 
-   * @see Doctrine_Import_Schema::getGlobalDefinitionKeys()
-   */
-  protected function filterSchemaGlobals(& $models)
-  {
-    $globals = array();
-    $globalKeys = Doctrine_Import_Schema::getGlobalDefinitionKeys();
-
-    foreach ($models as $key => $value)
-    {
-      if (in_array($key, $globalKeys))
-      {
-        $globals[$key] = $value;
-        unset($models[$key]);
-      }
-    }
+                // merge in the globals
+                $definition = array_merge($globals, $definition);
 
-    return $globals;
-  }
-
-  /**
-   * Canonicalizes a model definition in preparation for merging.
-   * 
-   * @param string $model      The model name
-   * @param array  $definition The model definition
-   * 
-   * @return array The canonicalized model definition
-   */
-  protected function canonicalizeModelDefinition($model, $definition)
-  {
-    // expand short "type" syntax
-    if (isset($definition['columns']))
-    {
-      foreach ($definition['columns'] as $key => $value)
-      {
-        if (!is_array($value))
-        {
-          $definition['columns'][$key] = array('type' => $value);
-          $value = $definition['columns'][$key];
+                // merge this model into the schema
+                $models[$model] = isset($models[$model]) ? sfToolkit::arrayDeepMerge($models[$model], $definition) : $definition;
+            }
         }
 
-        // expand short type(length, scale) syntax
-        if (isset($value['type']) && preg_match('/ *(\w+) *\( *(\d+)(?: *, *(\d+))? *\)/', $value['type'], $match))
-        {
-          $definition['columns'][$key]['type'] = $match[1];
-          $definition['columns'][$key]['length'] = $match[2];
+        // 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));
 
-          if (isset($match[3]))
-          {
-            $definition['columns'][$key]['scale'] = $match[3];
-          }
-        }
-      }
+        return $file;
     }
 
-    // expand short "actAs" syntax
-    if (isset($definition['actAs']))
+    /**
+     * Removes and returns globals from the supplied array of models.
+     *
+     * @param array $models An array of model definitions
+     *
+     * @return array An array of globals
+     *
+     * @see Doctrine_Import_Schema::getGlobalDefinitionKeys()
+     */
+    protected function filterSchemaGlobals(&$models)
     {
-      foreach ($definition['actAs'] as $key => $value)
-      {
-        if (is_numeric($key))
-        {
-          $definition['actAs'][$value] = array();
-          unset($definition['actAs'][$key]);
+        $globals = array();
+        $globalKeys = Doctrine_Import_Schema::getGlobalDefinitionKeys();
+
+        foreach ($models as $key => $value) {
+            if (in_array($key, $globalKeys)) {
+                $globals[$key] = $value;
+                unset($models[$key]);
+            }
         }
-      }
+
+        return $globals;
     }
 
-    // expand short "listeners" syntax
-    if (isset($definition['listeners']))
+    /**
+     * Canonicalizes a model definition in preparation for merging.
+     *
+     * @param string $model      The model name
+     * @param array  $definition The model definition
+     *
+     * @return array The canonicalized model definition
+     */
+    protected function canonicalizeModelDefinition($model, $definition)
     {
-      foreach ($definition['listeners'] as $key => $value)
-      {
-        if (is_numeric($key))
-        {
-          $definition['listeners'][$value] = array();
-          unset($definition['listeners'][$key]);
+        // expand short "type" syntax
+        if (isset($definition['columns'])) {
+            foreach ($definition['columns'] as $key => $value) {
+                if (!is_array($value)) {
+                    $definition['columns'][$key] = array('type' => $value);
+                    $value = $definition['columns'][$key];
+                }
+
+                // expand short type(length, scale) syntax
+                if (isset($value['type']) && preg_match('/ *(\w+) *\( *(\d+)(?: *, *(\d+))? *\)/', $value['type'], $match)) {
+                    $definition['columns'][$key]['type'] = $match[1];
+                    $definition['columns'][$key]['length'] = $match[2];
+
+                    if (isset($match[3])) {
+                        $definition['columns'][$key]['scale'] = $match[3];
+                    }
+                }
+            }
         }
-      }
-    }
 
-    return $definition;
-  }
+        // expand short "actAs" syntax
+        if (isset($definition['actAs'])) {
+            foreach ($definition['actAs'] as $key => $value) {
+                if (is_numeric($key)) {
+                    $definition['actAs'][$value] = array();
+                    unset($definition['actAs'][$key]);
+                }
+            }
+        }
+
+        // expand short "listeners" syntax
+        if (isset($definition['listeners'])) {
+            foreach ($definition['listeners'] as $key => $value) {
+                if (is_numeric($key)) {
+                    $definition['listeners'][$value] = array();
+                    unset($definition['listeners'][$key]);
+                }
+            }
+        }
+
+        return $definition;
+    }
 }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildDbTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildDbTask.class.php
index 9559d3dab..950c024dd 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildDbTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildDbTask.class.php
@@ -9,39 +9,38 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/sfDoctrineBaseTask.class.php');
+require_once dirname(__FILE__).'/sfDoctrineBaseTask.class.php';
 
 /**
  * Creates database for current model.
  *
- * @package    symfony
- * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
+ *
  * @version    SVN: $Id$
  */
 class sfDoctrineBuildDbTask extends sfDoctrineBaseTask
 {
-  /**
-   * @see sfTask
-   */
-  protected function configure()
-  {
-    $this->addArguments(array(
-      new sfCommandArgument('database', sfCommandArgument::OPTIONAL | sfCommandArgument::IS_ARRAY, 'A specific database'),
-    ));
+    /**
+     * @see sfTask
+     */
+    protected function configure()
+    {
+        $this->addArguments(array(
+            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(array(
+            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->namespace = 'doctrine';
-    $this->name = 'build-db';
-    $this->briefDescription = 'Creates database for current model';
+        $this->aliases = array('doctrine:create-db');
+        $this->namespace = 'doctrine';
+        $this->name = 'build-db';
+        $this->briefDescription = 'Creates database for current model';
 
-    $this->detailedDescription = <<<EOF
+        $this->detailedDescription = <<<'EOF'
 The [doctrine:build-db|INFO] task creates one or more databases based on
 configuration in [config/databases.yml|COMMENT]:
 
@@ -51,29 +50,29 @@ protected function configure()
 
   [./symfony doctrine:build-db slave1 slave2|INFO]
 EOF;
-  }
+    }
 
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $databaseManager = new sfDatabaseManager($this->configuration);
-    $databases = $this->getDoctrineDatabases($databaseManager, count($arguments['database']) ? $arguments['database'] : null);
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
+    {
+        $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)
-      {
-        $this->logSection('doctrine', $e->getMessage(), null, 'ERROR');
-      }
+        foreach ($databases as $name => $database) {
+            $this->logSection('doctrine', sprintf('Creating "%s" environment "%s" database', $environment, $name));
+
+            try {
+                $database->getDoctrineConnection()->createDatabase();
+            } 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 885e72672..c4241c5a6 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildFiltersTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildFiltersTask.class.php
@@ -8,36 +8,35 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/sfDoctrineBaseTask.class.php');
+require_once dirname(__FILE__).'/sfDoctrineBaseTask.class.php';
 
 /**
  * Create filter form classes for the current model.
  *
- * @package    symfony
- * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfDoctrineBuildFiltersTask extends sfDoctrineBaseTask
 {
-  /**
-   * @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'),
-    ));
+    /**
+     * @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->namespace = 'doctrine';
-    $this->name = 'build-filters';
-    $this->briefDescription = 'Creates filter form classes for the current model';
+        $this->namespace = 'doctrine';
+        $this->name = 'build-filters';
+        $this->briefDescription = 'Creates filter form classes for the current model';
 
-    $this->detailedDescription = <<<EOF
+        $this->detailedDescription = <<<'EOF'
 The [doctrine:build-filters|INFO] task creates form filter classes from the schema:
 
   [./symfony doctrine:build-filters|INFO]
@@ -48,32 +47,35 @@ protected function configure()
 This task never overrides custom classes in [lib/doctrine/filter|COMMENT].
 It only replaces base classes generated in [lib/doctrine/filter/base|COMMENT].
 EOF;
-  }
+    }
 
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $this->logSection('doctrine', 'generating filter form classes');
-    $databaseManager = new sfDatabaseManager($this->configuration);
-    $generatorManager = new sfGeneratorManager($this->configuration);
-    $generatorManager->generate($options['generator-class'], array(
-      'model_dir_name'  => $options['model-dir-name'],
-      'filter_dir_name' => $options['filter-dir-name'],
-    ));
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
+    {
+        $this->logSection('doctrine', 'generating filter form classes');
+        $databaseManager = new sfDatabaseManager($this->configuration);
+        $generatorManager = new sfGeneratorManager($this->configuration);
+        $generatorManager->generate($options['generator-class'], array(
+            '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(
-      'PROJECT_NAME' => isset($properties['symfony']['name']) ? $properties['symfony']['name'] : 'symfony',
-      'AUTHOR_NAME'  => isset($properties['symfony']['author']) ? $properties['symfony']['author'] : 'Your name here'
-    );
+        $constants = array(
+            '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);
+        // customize php and yml files
+        $finder = sfFinder::type('file')->name('*.php');
+        $this->getFilesystem()->replaceTokens($finder->in(sfConfig::get('sf_lib_dir').'/filter/'), '##', '##', $constants);
 
-    $this->reloadAutoload();
-  }
-}
\ No newline at end of file
+        $this->reloadAutoload();
+    }
+}
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildFormsTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildFormsTask.class.php
index a76ca2347..3a572fa0f 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildFormsTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildFormsTask.class.php
@@ -8,36 +8,35 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/sfDoctrineBaseTask.class.php');
+require_once dirname(__FILE__).'/sfDoctrineBaseTask.class.php';
 
 /**
  * Create form classes for the current model.
  *
- * @package    symfony
- * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfDoctrineBuildFormsTask extends sfDoctrineBaseTask
 {
-  /**
-   * @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'),
-    ));
+    /**
+     * @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->namespace = 'doctrine';
-    $this->name = 'build-forms';
-    $this->briefDescription = 'Creates form classes for the current model';
+        $this->namespace = 'doctrine';
+        $this->name = 'build-forms';
+        $this->briefDescription = 'Creates form classes for the current model';
 
-    $this->detailedDescription = <<<EOF
+        $this->detailedDescription = <<<'EOF'
 The [doctrine:build-forms|INFO] task creates form classes from the schema:
 
   [./symfony doctrine:build-forms|INFO]
@@ -48,40 +47,42 @@ protected function configure()
 This task never overrides custom classes in [lib/doctrine/form|COMMENT].
 It only replaces base classes generated in [lib/doctrine/form/base|COMMENT].
 EOF;
-  }
+    }
 
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $this->logSection('doctrine', 'generating form classes');
-    $databaseManager = new sfDatabaseManager($this->configuration);
-    $generatorManager = new sfGeneratorManager($this->configuration);
-    $generatorManager->generate($options['generator-class'], array(
-      'model_dir_name' => $options['model-dir-name'],
-      'form_dir_name'  => $options['form-dir-name'],
-    ));
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
+    {
+        $this->logSection('doctrine', 'generating form classes');
+        $databaseManager = new sfDatabaseManager($this->configuration);
+        $generatorManager = new sfGeneratorManager($this->configuration);
+        $generatorManager->generate($options['generator-class'], array(
+            '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(
-      'PROJECT_NAME' => isset($properties['symfony']['name']) ? $properties['symfony']['name'] : 'symfony',
-      'AUTHOR_NAME'  => isset($properties['symfony']['author']) ? $properties['symfony']['author'] : 'Your name here'
-    );
+        $constants = array(
+            '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);
+        // customize php and yml files
+        $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);
-      $this->getFilesystem()->replaceTokens($file, '##', '##', $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);
+            $this->getFilesystem()->replaceTokens($file, '##', '##', $constants);
+        }
 
-    $this->reloadAutoload();
-  }
-}
\ No newline at end of file
+        $this->reloadAutoload();
+    }
+}
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildModelTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildModelTask.class.php
index 7be173e4d..0f21b9059 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildModelTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildModelTask.class.php
@@ -9,34 +9,33 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/sfDoctrineBaseTask.class.php');
+require_once dirname(__FILE__).'/sfDoctrineBaseTask.class.php';
 
 /**
  * Create classes for the current model.
  *
- * @package    symfony
- * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
+ *
  * @version    SVN: $Id$
  */
 class sfDoctrineBuildModelTask extends sfDoctrineBaseTask
 {
-  /**
-   * @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->namespace = 'doctrine';
-    $this->name = 'build-model';
-    $this->briefDescription = 'Creates classes for the current model';
-
-    $this->detailedDescription = <<<EOF
+    /**
+     * @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->namespace = 'doctrine';
+        $this->name = 'build-model';
+        $this->briefDescription = 'Creates classes for the current model';
+
+        $this->detailedDescription = <<<'EOF'
 The [doctrine:build-model|INFO] task creates model classes from the schema:
 
   [./symfony doctrine:build-model|INFO]
@@ -49,80 +48,79 @@ protected function configure()
 This task never overrides custom classes in [lib/model/doctrine|COMMENT].
 It only replaces files in [lib/model/doctrine/base|COMMENT].
 EOF;
-  }
+    }
 
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $this->logSection('doctrine', 'generating model classes');
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
+    {
+        $this->logSection('doctrine', 'generating model classes');
 
-    $config = $this->getCliConfig();
-    $builderOptions = $this->configuration->getPluginConfiguration('sfDoctrinePlugin')->getModelBuilderOptions();
+        $config = $this->getCliConfig();
+        $builderOptions = $this->configuration->getPluginConfiguration('sfDoctrinePlugin')->getModelBuilderOptions();
 
-    $stubFinder = sfFinder::type('file')->prune('base')->name('*'.$builderOptions['suffix']);
-    $before = $stubFinder->in($config['models_path']);
+        $stubFinder = sfFinder::type('file')->prune('base')->name('*'.$builderOptions['suffix']);
+        $before = $stubFinder->in($config['models_path']);
 
-    $schema = $this->prepareSchemaFile($config['yaml_schema_path']);
+        $schema = $this->prepareSchemaFile($config['yaml_schema_path']);
 
-    $import = new Doctrine_Import_Schema();
-    $import->setOptions($builderOptions);
-    $import->importSchema($schema, 'yml', $config['models_path']);
+        $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)
-    {
-      $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();
-        foreach ($matches as $match)
-        {
-          $properties[$match[2]] = $match[1];
-        }
+        // markup base classes with magic methods
+        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();
+                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), array($model))));
+                $namePad = max(array_map('strlen', array_keys(array_map(array('sfInflector', 'camelize'), $properties))));
+                $setters = array();
+                $getters = array();
 
-        foreach ($properties as $name => $type)
-        {
-          $camelized = sfInflector::camelize($name);
-          $collection = 'Doctrine_Collection' == $type;
+                foreach ($properties as $name => $type) {
+                    $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');
-          $setters[] = sprintf('@method %-'.$typePad.'s %s%-'.($namePad + 2).'s Sets the current record\'s "%s" %s', $model, 'set', $camelized.'()', $name, $collection ? 'collection' : 'value');
+                    $getters[] = sprintf('@method %-'.$typePad.'s %s%-'.($namePad + 2).'s Returns the current record\'s "%s" %s', $type, 'get', $camelized.'()', $name, $collection ? 'collection' : 'value');
+                    $setters[] = sprintf('@method %-'.$typePad.'s %s%-'.($namePad + 2).'s Sets the current record\'s "%s" %s', $model, 'set', $camelized.'()', $name, $collection ? 'collection' : 'value');
+                }
+
+                // use the last match as a search string
+                $code = str_replace($match[0], $match[0].PHP_EOL.' * '.PHP_EOL.' * '.implode(PHP_EOL.' * ', array_merge($getters, $setters)), $code);
+                file_put_contents($file, $code);
+            }
         }
 
-        // use the last match as a search string
-        $code = str_replace($match[0], $match[0].PHP_EOL.' * '.PHP_EOL.' * '.implode(PHP_EOL.' * ', array_merge($getters, $setters)), $code);
-        file_put_contents($file, $code);
-      }
+        $properties = parse_ini_file(sfConfig::get('sf_config_dir').'/properties.ini', true);
+        $tokens = array(
+            '##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');
+        $this->getFilesystem()->replaceTokens($baseFinder->in($baseDirFinder->in($config['models_path'])), '', '', $tokens);
+
+        $this->reloadAutoload();
     }
-
-    $properties = parse_ini_file(sfConfig::get('sf_config_dir').'/properties.ini', true);
-    $tokens = array(
-      '##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');
-    $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 d6b9026d6..122d35e7a 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildSchemaTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildSchemaTask.class.php
@@ -9,50 +9,52 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/sfDoctrineBaseTask.class.php');
+require_once dirname(__FILE__).'/sfDoctrineBaseTask.class.php';
 
 /**
  * Creates a schema.yml from an existing database.
  *
- * @package    symfony
- * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
+ *
  * @version    SVN: $Id$
  */
 class sfDoctrineBuildSchemaTask extends sfDoctrineBaseTask
 {
-  /**
-   * @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->namespace = 'doctrine';
-    $this->name = 'build-schema';
-    $this->briefDescription = 'Creates a schema from an existing database';
-
-    $this->detailedDescription = <<<EOF
+    /**
+     * @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->namespace = 'doctrine';
+        $this->name = 'build-schema';
+        $this->briefDescription = 'Creates a schema from an existing database';
+
+        $this->detailedDescription = <<<'EOF'
 The [doctrine:build-schema|INFO] task introspects a database to create a schema:
 
   [./symfony doctrine:build-schema|INFO]
 
 The task creates a yml file in [config/doctrine|COMMENT]
 EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $this->logSection('doctrine', 'generating yaml schema from database');
-
-    $databaseManager = new sfDatabaseManager($this->configuration);
-    $this->callDoctrineCli('generate-yaml-db');
-  }
-}
\ No newline at end of file
+    }
+
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
+    {
+        $this->logSection('doctrine', 'generating yaml schema from database');
+
+        $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 f3358055f..04281ccf9 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildSqlTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildSqlTask.class.php
@@ -9,34 +9,33 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/sfDoctrineBaseTask.class.php');
+require_once dirname(__FILE__).'/sfDoctrineBaseTask.class.php';
 
 /**
  * Create SQL for the current model.
  *
- * @package    symfony
- * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
+ *
  * @version    SVN: $Id$
  */
 class sfDoctrineBuildSqlTask extends sfDoctrineBaseTask
 {
-  /**
-   * @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'),
-    ));
+    /**
+     * @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->namespace = 'doctrine';
-    $this->name = 'build-sql';
-    $this->briefDescription = 'Creates SQL for the current model';
+        $this->namespace = 'doctrine';
+        $this->name = 'build-sql';
+        $this->briefDescription = 'Creates SQL for the current model';
 
-    $this->detailedDescription = <<<EOF
+        $this->detailedDescription = <<<'EOF'
 The [doctrine:build-sql|INFO] task creates SQL statements for table creation:
 
   [./symfony doctrine:build-sql|INFO]
@@ -45,21 +44,24 @@ protected function configure()
 
   [doctrine.database = mysql|INFO]
 EOF;
-  }
+    }
 
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $this->logSection('doctrine', 'generating sql for models');
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
+    {
+        $this->logSection('doctrine', 'generating sql for models');
 
-    $path = sfConfig::get('sf_data_dir').'/sql';
-    if (!is_dir($path)) {
-      $this->getFilesystem()->mkdirs($path);
-    }
+        $path = sfConfig::get('sf_data_dir').'/sql';
+        if (!is_dir($path)) {
+            $this->getFilesystem()->mkdirs($path);
+        }
 
-    $databaseManager = new sfDatabaseManager($this->configuration);
-    $this->callDoctrineCli('generate-sql');
-  }
-}
\ No newline at end of file
+        $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 4928cd18d..cb7f61e43 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildTask.class.php
@@ -9,60 +9,62 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/sfDoctrineBaseTask.class.php');
+require_once dirname(__FILE__).'/sfDoctrineBaseTask.class.php';
 
 /**
  * Generates code based on your schema.
  *
- * @package    sfDoctrinePlugin
- * @subpackage task
  * @author     Kris Wallsmith <kris.wallsmith@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfDoctrineBuildTask extends sfDoctrineBaseTask
 {
-  const
-    BUILD_MODEL   = 1,
-    BUILD_FORMS   = 2,
-    BUILD_FILTERS = 4,
-    BUILD_SQL     = 8,
-    BUILD_DB      = 16,
-
-    OPTION_MODEL       = 1,
-    OPTION_FORMS       = 3,  // model, forms
-    OPTION_FILTERS     = 5,  // model, filters
-    OPTION_SQL         = 9,  // model, sql
-    OPTION_DB          = 25, // model, sql, db
-    OPTION_ALL_CLASSES = 7,  // model, forms, filters
-    OPTION_ALL         = 31; // model, forms, filters, sql, db
-
-  /**
-   * @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->namespace = 'doctrine';
-    $this->name = 'build';
-
-    $this->briefDescription = 'Generate code based on your schema';
-
-    $this->detailedDescription = <<<EOF
+    public const BUILD_MODEL = 1;
+    public const BUILD_FORMS = 2;
+    public const BUILD_FILTERS = 4;
+    public const BUILD_SQL = 8;
+    public const BUILD_DB = 16;
+    public const OPTION_MODEL = 1;
+    public const OPTION_FORMS = 3;
+    public const // model, forms
+      OPTION_FILTERS = 5;
+    public const // model, filters
+      OPTION_SQL = 9;
+    public const // model, sql
+      OPTION_DB = 25;
+    public const // model, sql, db
+      OPTION_ALL_CLASSES = 7;
+    public const // model, forms, filters
+      OPTION_ALL = 31; // model, forms, filters, sql, db
+
+    /**
+     * @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->namespace = 'doctrine';
+        $this->name = 'build';
+
+        $this->briefDescription = 'Generate code based on your schema';
+
+        $this->detailedDescription = <<<'EOF'
 The [doctrine:build|INFO] task generates code based on your schema:
 
   [./symfony doctrine:build|INFO]
@@ -111,191 +113,168 @@ protected function configure()
 
   [./symfony doctrine:build --all --and-append|INFO]
 EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    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()))));
     }
 
-    if (self::BUILD_DB == (self::BUILD_DB & $mode))
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
     {
-      $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']));
-
-      if ($ret)
-      {
-        return $ret;
-      }
-
-      $task = new sfDoctrineBuildDbTask($this->dispatcher, $this->formatter);
-      $task->setCommandApplication($this->commandApplication);
-      $task->setConfiguration($this->configuration);
-      $ret = $task->run();
-
-      if ($ret)
-      {
-        return $ret;
-      }
-
-      // :insert-sql (or :migrate) will also be run, below
-    }
+        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()))));
+        }
 
-    if (self::BUILD_MODEL == (self::BUILD_MODEL & $mode))
-    {
-      $task = new sfDoctrineBuildModelTask($this->dispatcher, $this->formatter);
-      $task->setCommandApplication($this->commandApplication);
-      $task->setConfiguration($this->configuration);
-      $ret = $task->run();
-
-      if ($ret)
-      {
-        return $ret;
-      }
-    }
+        if (self::BUILD_DB == (self::BUILD_DB & $mode)) {
+            $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']));
 
-    if (self::BUILD_FORMS == (self::BUILD_FORMS & $mode))
-    {
-      $task = new sfDoctrineBuildFormsTask($this->dispatcher, $this->formatter);
-      $task->setCommandApplication($this->commandApplication);
-      $task->setConfiguration($this->configuration);
-      $ret = $task->run();
-
-      if ($ret)
-      {
-        return $ret;
-      }
-    }
+            if ($ret) {
+                return $ret;
+            }
 
-    if (self::BUILD_FILTERS == (self::BUILD_FILTERS & $mode))
-    {
-      $task = new sfDoctrineBuildFiltersTask($this->dispatcher, $this->formatter);
-      $task->setCommandApplication($this->commandApplication);
-      $task->setConfiguration($this->configuration);
-      $ret = $task->run();
-
-      if ($ret)
-      {
-        return $ret;
-      }
-    }
+            $task = new sfDoctrineBuildDbTask($this->dispatcher, $this->formatter);
+            $task->setCommandApplication($this->commandApplication);
+            $task->setConfiguration($this->configuration);
+            $ret = $task->run();
 
-    if (self::BUILD_SQL == (self::BUILD_SQL & $mode))
-    {
-      $task = new sfDoctrineBuildSqlTask($this->dispatcher, $this->formatter);
-      $task->setCommandApplication($this->commandApplication);
-      $task->setConfiguration($this->configuration);
-      $ret = $task->run();
-
-      if ($ret)
-      {
-        return $ret;
-      }
-    }
+            if ($ret) {
+                return $ret;
+            }
 
-    if ($options['and-migrate'])
-    {
-      $task = new sfDoctrineMigrateTask($this->dispatcher, $this->formatter);
-      $task->setCommandApplication($this->commandApplication);
-      $task->setConfiguration($this->configuration);
-      $ret = $task->run();
-
-      if ($ret)
-      {
-        return $ret;
-      }
-    }
-    else if (self::BUILD_DB == (self::BUILD_DB & $mode))
-    {
-      $task = new sfDoctrineInsertSqlTask($this->dispatcher, $this->formatter);
-      $task->setCommandApplication($this->commandApplication);
-      $task->setConfiguration($this->configuration);
-      $ret = $task->run();
-
-      if ($ret)
-      {
-        return $ret;
-      }
-    }
+            // :insert-sql (or :migrate) will also be run, below
+        }
 
-    if (count($options['and-load']) || count($options['and-append']))
-    {
-      $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'],
-        ));
+        if (self::BUILD_MODEL == (self::BUILD_MODEL & $mode)) {
+            $task = new sfDoctrineBuildModelTask($this->dispatcher, $this->formatter);
+            $task->setCommandApplication($this->commandApplication);
+            $task->setConfiguration($this->configuration);
+            $ret = $task->run();
 
-        if ($ret)
-        {
-          return $ret;
+            if ($ret) {
+                return $ret;
+            }
         }
-      }
-
-      if (count($options['and-append']))
-      {
-        $ret = $task->run(array(
-          'dir_or_file' => in_array(array(), $options['and-append'], true) ? null : $options['and-append'],
-        ), array(
-          'append' => true,
-        ));
 
-        if ($ret)
-        {
-          return $ret;
+        if (self::BUILD_FORMS == (self::BUILD_FORMS & $mode)) {
+            $task = new sfDoctrineBuildFormsTask($this->dispatcher, $this->formatter);
+            $task->setCommandApplication($this->commandApplication);
+            $task->setConfiguration($this->configuration);
+            $ret = $task->run();
+
+            if ($ret) {
+                return $ret;
+            }
+        }
+
+        if (self::BUILD_FILTERS == (self::BUILD_FILTERS & $mode)) {
+            $task = new sfDoctrineBuildFiltersTask($this->dispatcher, $this->formatter);
+            $task->setCommandApplication($this->commandApplication);
+            $task->setConfiguration($this->configuration);
+            $ret = $task->run();
+
+            if ($ret) {
+                return $ret;
+            }
+        }
+
+        if (self::BUILD_SQL == (self::BUILD_SQL & $mode)) {
+            $task = new sfDoctrineBuildSqlTask($this->dispatcher, $this->formatter);
+            $task->setCommandApplication($this->commandApplication);
+            $task->setConfiguration($this->configuration);
+            $ret = $task->run();
+
+            if ($ret) {
+                return $ret;
+            }
+        }
+
+        if ($options['and-migrate']) {
+            $task = new sfDoctrineMigrateTask($this->dispatcher, $this->formatter);
+            $task->setCommandApplication($this->commandApplication);
+            $task->setConfiguration($this->configuration);
+            $ret = $task->run();
+
+            if ($ret) {
+                return $ret;
+            }
+        } elseif (self::BUILD_DB == (self::BUILD_DB & $mode)) {
+            $task = new sfDoctrineInsertSqlTask($this->dispatcher, $this->formatter);
+            $task->setCommandApplication($this->commandApplication);
+            $task->setConfiguration($this->configuration);
+            $ret = $task->run();
+
+            if ($ret) {
+                return $ret;
+            }
+        }
+
+        if (count($options['and-load']) || count($options['and-append'])) {
+            $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'],
+                ));
+
+                if ($ret) {
+                    return $ret;
+                }
+            }
+
+            if (count($options['and-append'])) {
+                $ret = $task->run(array(
+                    'dir_or_file' => in_array(array(), $options['and-append'], true) ? null : $options['and-append'],
+                ), array(
+                    'append' => true,
+                ));
+
+                if ($ret) {
+                    return $ret;
+                }
+            }
         }
-      }
     }
-  }
-
-  /**
-   * Calculates a bit mode based on the supplied options.
-   *
-   * @param  array $options
-   *
-   * @return integer
-   */
-  protected function calculateMode($options = array())
-  {
-    $mode = 0;
-    foreach ($this->getBuildOptions() as $name => $value)
+
+    /**
+     * Calculates a bit mode based on the supplied options.
+     *
+     * @param array $options
+     *
+     * @return int
+     */
+    protected function calculateMode($options = array())
     {
-      if (isset($options[$name]) && true === $options[$name])
-      {
-        $mode = $mode | $value;
-      }
+        $mode = 0;
+        foreach ($this->getBuildOptions() as $name => $value) {
+            if (isset($options[$name]) && true === $options[$name]) {
+                $mode = $mode | $value;
+            }
+        }
+
+        return $mode;
     }
 
-    return $mode;
-  }
-
-  /**
-   * Returns an array of valid build options.
-   *
-   * @return array An array of option names and their mode
-   */
-  protected function getBuildOptions()
-  {
-    $options = array();
-    foreach ($this->options as $option)
+    /**
+     * Returns an array of valid build options.
+     *
+     * @return array An array of option names and their mode
+     */
+    protected function getBuildOptions()
     {
-      if (defined($constant = __CLASS__.'::OPTION_'.str_replace('-', '_', strtoupper($option->getName()))))
-      {
-        $options[$option->getName()] = constant($constant);
-      }
-    }
+        $options = array();
+        foreach ($this->options as $option) {
+            if (defined($constant = __CLASS__.'::OPTION_'.str_replace('-', '_', strtoupper($option->getName())))) {
+                $options[$option->getName()] = constant($constant);
+            }
+        }
 
-    return $options;
-  }
+        return $options;
+    }
 }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCleanModelFilesTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCleanModelFilesTask.class.php
index e963f0560..eb69d4c6d 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCleanModelFilesTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCleanModelFilesTask.class.php
@@ -8,112 +8,114 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/sfDoctrineBaseTask.class.php');
+require_once dirname(__FILE__).'/sfDoctrineBaseTask.class.php';
 
 /**
- * Delete all generated model classes for models which no longer exist in your YAML schema
+ * Delete all generated model classes for models which no longer exist in your YAML schema.
  *
- * @package    symfony
- * @subpackage doctrine
  * @author     Jonathan H. Wage <jonwage@gmail.com>
+ *
  * @version    SVN: $Id$
  */
 class sfDoctrineCleanModelFilesTask extends sfDoctrineBaseTask
 {
-  protected function configure()
-  {
-    $this->addOptions(array(
-      new sfCommandOption('no-confirmation', null, sfCommandOption::PARAMETER_NONE, 'Do not ask for confirmation'),
-    ));
-
-    $this->aliases = array('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';
-
-    $this->detailedDescription = <<<EOF
+    protected function configure()
+    {
+        $this->addOptions(array(
+            new sfCommandOption('no-confirmation', null, sfCommandOption::PARAMETER_NONE, 'Do not ask for confirmation'),
+        ));
+
+        $this->aliases = array('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';
+
+        $this->detailedDescription = <<<'EOF'
 The [doctrine:clean-model-files|INFO] task deletes model classes that are not
 represented in project or plugin schema.yml files:
 
   [./symfony doctrine:clean-model-files|INFO]
 EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $config = $this->getCliConfig();
-    $changed = false;
-
-    $deleteModelFiles = new sfDoctrineDeleteModelFilesTask($this->dispatcher, $this->formatter);
-    $deleteModelFiles->setCommandApplication($this->commandApplication);
-    $deleteModelFiles->setConfiguration($this->configuration);
-
-    $yamlSchema = $this->getYamlSchema($config['yaml_schema_path']);
+    }
 
-    // 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)))
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
     {
-      $deleteModelFiles->run($modelsToRemove, array('no-confirmation' => $options['no-confirmation']));
-      $changed = true;
+        $config = $this->getCliConfig();
+        $changed = false;
+
+        $deleteModelFiles = new sfDoctrineDeleteModelFilesTask($this->dispatcher, $this->formatter);
+        $deleteModelFiles->setCommandApplication($this->commandApplication);
+        $deleteModelFiles->setConfiguration($this->configuration);
+
+        $yamlSchema = $this->getYamlSchema($config['yaml_schema_path']);
+
+        // 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']));
+            $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']));
+                $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']));
+                $changed = true;
+            }
+        }
+
+        if ($changed) {
+            $this->reloadAutoload();
+        } else {
+            $this->logSection('doctrine', 'Could not find any files that need to be removed');
+        }
     }
 
-    // remove form classes whose generation is disabled
-    foreach ($yamlSchema as $model => $definition)
+    /**
+     * Returns models defined in YAML.
+     *
+     * @param mixed $yamlSchemaPath
+     *
+     * @return array
+     */
+    protected function getYamlModels($yamlSchemaPath)
     {
-      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']));
-        $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']));
-        $changed = true;
-      }
+        return array_keys($this->getYamlSchema($yamlSchemaPath));
     }
 
-    if ($changed)
+    /**
+     * Returns the schema as defined in YAML.
+     *
+     * @param mixed $yamlSchemaPath
+     *
+     * @return array
+     */
+    protected function getYamlSchema($yamlSchemaPath)
     {
-      $this->reloadAutoload();
+        return (array) sfYaml::load($this->prepareSchemaFile($yamlSchemaPath));
     }
-    else
+
+    /**
+     * Returns models that have class files.
+     *
+     * @param mixed $modelsPath
+     *
+     * @return array
+     */
+    protected function getFileModels($modelsPath)
     {
-      $this->logSection('doctrine', 'Could not find any files that need to be removed');
+        Doctrine_Core::loadModels($modelsPath);
+
+        return Doctrine_Core::getLoadedModels();
     }
-  }
-
-  /**
-   * Returns models defined in YAML.
-   * 
-   * @return array
-   */
-  protected function getYamlModels($yamlSchemaPath)
-  {
-    return array_keys($this->getYamlSchema($yamlSchemaPath));
-  }
-
-  /**
-   * Returns the schema as defined in YAML.
-   * 
-   * @return array
-   */
-  protected function getYamlSchema($yamlSchemaPath)
-  {
-    return (array) sfYaml::load($this->prepareSchemaFile($yamlSchemaPath));
-  }
-
-  /**
-   * Returns models that have class files.
-   * 
-   * @return array
-   */
-  protected function getFileModels($modelsPath)
-  {
-    Doctrine_Core::loadModels($modelsPath);
-    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 11a9224e6..27537733d 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCompileTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCompileTask.class.php
@@ -9,71 +9,72 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/sfDoctrineBaseTask.class.php');
+require_once dirname(__FILE__).'/sfDoctrineBaseTask.class.php';
 
 /**
- * Compile Doctrine
+ * Compile Doctrine.
  *
- * @package    symfony
- * @subpackage doctrine
  * @author     Jerome Tamarelle <jerome@tamarelle.net>
+ *
  * @version    SVN: $Id: sfDoctrineCompileTask.class.php 105 2012-03-22 16:26:34Z jtamarelle $
  */
 class sfDoctrineCompileTask extends sfDoctrineBaseTask
 {
-  /**
-   * @see sfTask
-   */
-  protected function configure()
-  {
-    $this->addArguments(array(
-      new sfCommandArgument('database', sfCommandArgument::OPTIONAL | sfCommandArgument::IS_ARRAY, 'A specific database'),
-    ));
+    /**
+     * @see sfTask
+     */
+    protected function configure()
+    {
+        $this->addArguments(array(
+            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(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->namespace = 'doctrine';
-    $this->name = 'compile';
-    $this->briefDescription = 'Compile doctrine into the cache directory';
+        $this->namespace = 'doctrine';
+        $this->name = 'compile';
+        $this->briefDescription = 'Compile doctrine into the cache directory';
 
-    $this->detailedDescription = <<<EOF
+        $this->detailedDescription = <<<'EOF'
 The [doctrine:compile|INFO] task generated a compiled Doctrine file:
 
   [./symfony doctrine:compile|INFO]
 EOF;
-  }
+    }
 
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $databaseManager = new sfDatabaseManager($this->configuration);
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
+    {
+        $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');
-      $this->logBlock('Run symfony:cache-clear first', 'INFO');
-      return;
-    }
+        if (file_exists($compiledFile)) {
+            $this->logSection('error', $compiledFile.' already exists', null, 'ERROR');
+            $this->logBlock('Run symfony:cache-clear first', 'INFO');
 
-    $drivers = array();
-    foreach ($databaseManager->getNames() as $name)
-    {
-      $drivers[] = strtolower($databaseManager->getDatabase($name)->getDoctrineConnection()->getDriverName());
-    }
-    $drivers = array_unique($drivers);
+            return;
+        }
 
-    $this->logSection('compile', 'Included drivers: '.implode(', ', $drivers));
+        $drivers = array();
+        foreach ($databaseManager->getNames() as $name) {
+            $drivers[] = strtolower($databaseManager->getDatabase($name)->getDoctrineConnection()->getDriverName());
+        }
+        $drivers = array_unique($drivers);
 
-    Doctrine_Core::compile($compiledFile, $drivers);
+        $this->logSection('compile', 'Included drivers: '.implode(', ', $drivers));
 
-    $this->logSection('file+', $compiledFile);
-  }
+        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 26cfa77e2..a32859f57 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineConfigureDatabaseTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineConfigureDatabaseTask.class.php
@@ -11,37 +11,36 @@
 /**
  * Configures the database connection.
  *
- * @package    symfony
- * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfDoctrineConfigureDatabaseTask extends sfBaseTask
 {
-  /**
-   * @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->namespace = 'configure';
-    $this->name = 'database';
-
-    $this->briefDescription = 'Configure database DSN';
-
-    $this->detailedDescription = <<<EOF
+    /**
+     * @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->namespace = 'configure';
+        $this->name = 'database';
+
+        $this->briefDescription = 'Configure database DSN';
+
+        $this->detailedDescription = <<<'EOF'
 The [configure:database|INFO] task configures the database DSN
 for a project:
 
@@ -60,30 +59,30 @@ protected function configure()
 
   [./symfony configure:database --name=main --class=ProjectDatabase mysql:host=localhost;dbname=example root mYsEcret|INFO]
 EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    // update databases.yml
-    if (null !== $options['app'])
-    {
-      $file = sfConfig::get('sf_apps_dir').'/'.$options['app'].'/config/databases.yml';
     }
-    else
+
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
     {
-      $file = sfConfig::get('sf_config_dir').'/databases.yml';
-    }
+        // update databases.yml
+        if (null !== $options['app']) {
+            $file = sfConfig::get('sf_apps_dir').'/'.$options['app'].'/config/databases.yml';
+        } else {
+            $file = sfConfig::get('sf_config_dir').'/databases.yml';
+        }
 
-    $config = file_exists($file) ? sfYaml::load($file) : array();
+        $config = file_exists($file) ? sfYaml::load($file) : array();
 
-    $config[$options['env']][$options['name']] = array(
-      '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'])),
-    );
+        $config[$options['env']][$options['name']] = array(
+            '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'])),
+        );
 
-    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 3fce70c2b..d9b21ee03 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCreateModelTablesTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCreateModelTablesTask.class.php
@@ -8,88 +8,81 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/sfDoctrineBaseTask.class.php');
+require_once dirname(__FILE__).'/sfDoctrineBaseTask.class.php';
 
 /**
- * Create tables for specified list of models
+ * Create tables for specified list of models.
  *
- * @package    symfony
- * @subpackage doctrine
  * @author     Jonathan H. Wage <jonwage@gmail.com>
+ *
  * @version    SVN: $Id$
  */
 class sfDoctrineCreateModelTables extends sfDoctrineBaseTask
 {
-  protected function configure()
-  {
-    $this->addArguments(array(
-      new sfCommandArgument('models', sfCommandArgument::IS_ARRAY, 'The list of models', array()),
-    ));
-
-    $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->namespace = 'doctrine';
-    $this->name = 'create-model-tables';
-    $this->briefDescription = 'Drop and recreate tables for specified models.';
-
-    $this->detailedDescription = <<<EOF
+    protected function configure()
+    {
+        $this->addArguments(array(
+            new sfCommandArgument('models', sfCommandArgument::IS_ARRAY, 'The list of models', array()),
+        ));
+
+        $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->namespace = 'doctrine';
+        $this->name = 'create-model-tables';
+        $this->briefDescription = 'Drop and recreate tables for specified models.';
+
+        $this->detailedDescription = <<<'EOF'
 The [doctrine:create-model-tables|INFO] Drop and recreate tables for specified models:
 
   [./symfony doctrine:create-model-tables User|INFO]
 EOF;
-  }
-
-  protected function execute($arguments = array(), $options = array())
-  {
-    $databaseManager = new sfDatabaseManager($this->configuration);
-
-    if (!$options['skip-build'])
-    {
-      $buildModel = new sfDoctrineBuildModelTask($this->dispatcher, $this->formatter);
-      $buildModel->setCommandApplication($this->commandApplication);
-      $buildModel->setConfiguration($this->configuration);
-      $buildModel->run();
     }
 
-    $connections = array();
-    $models = $arguments['models'];
-    foreach ($models as $key => $model)
+    protected function execute($arguments = array(), $options = array())
     {
-      $model = trim($model);
-      $conn = Doctrine_Core::getTable($model)->getConnection();
-      $connections[$conn->getName()][] = $model;
-    }
+        $databaseManager = new sfDatabaseManager($this->configuration);
 
-    foreach ($connections as $name => $models)
-    {
-      $this->logSection('doctrine', 'dropping model tables for connection "'.$name.'"');
+        if (!$options['skip-build']) {
+            $buildModel = new sfDoctrineBuildModelTask($this->dispatcher, $this->formatter);
+            $buildModel->setCommandApplication($this->commandApplication);
+            $buildModel->setConfiguration($this->configuration);
+            $buildModel->run();
+        }
 
-      $conn = Doctrine_Manager::getInstance()->getConnection($name);
-      $models = $conn->unitOfWork->buildFlushTree($models);
-      $models = array_reverse($models);
+        $connections = array();
+        $models = $arguments['models'];
+        foreach ($models as $key => $model) {
+            $model = trim($model);
+            $conn = Doctrine_Core::getTable($model)->getConnection();
+            $connections[$conn->getName()][] = $model;
+        }
 
-      foreach ($models as $model)
-      {
-        $tableName = Doctrine_Core::getTable($model)->getOption('tableName');
+        foreach ($connections as $name => $models) {
+            $this->logSection('doctrine', 'dropping model tables for connection "'.$name.'"');
 
-        $this->logSection('doctrine', 'dropping table "'.$tableName.'"');
+            $conn = Doctrine_Manager::getInstance()->getConnection($name);
+            $models = $conn->unitOfWork->buildFlushTree($models);
+            $models = array_reverse($models);
 
-        try {
-          $conn->export->dropTable($tableName);
-        }
-        catch (Exception $e)
-        {
-          $this->logSection('doctrine', 'dropping table failed: '.$e->getMessage());
-        }
-      }
+            foreach ($models as $model) {
+                $tableName = Doctrine_Core::getTable($model)->getOption('tableName');
+
+                $this->logSection('doctrine', 'dropping table "'.$tableName.'"');
 
-      $this->logSection('doctrine', 'recreating tables for models');
+                try {
+                    $conn->export->dropTable($tableName);
+                } catch (Exception $e) {
+                    $this->logSection('doctrine', 'dropping table failed: '.$e->getMessage());
+                }
+            }
 
-      Doctrine_Core::createTablesFromArray($models);
+            $this->logSection('doctrine', 'recreating tables for 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 2de4d8006..8593eeddb 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDataDumpTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDataDumpTask.class.php
@@ -9,38 +9,37 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/sfDoctrineBaseTask.class.php');
+require_once dirname(__FILE__).'/sfDoctrineBaseTask.class.php';
 
 /**
  * Dumps data to the fixtures directory.
  *
- * @package    symfony
- * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
+ *
  * @version    SVN: $Id$
  */
 class sfDoctrineDataDumpTask extends sfDoctrineBaseTask
 {
-  /**
-   * @see sfTask
-   */
-  protected function configure()
-  {
-    $this->addArguments(array(
-      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->namespace = 'doctrine';
-    $this->name = 'data-dump';
-    $this->briefDescription = 'Dumps data to the fixtures directory';
-
-    $this->detailedDescription = <<<EOF
+    /**
+     * @see sfTask
+     */
+    protected function configure()
+    {
+        $this->addArguments(array(
+            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->namespace = 'doctrine';
+        $this->name = 'data-dump';
+        $this->briefDescription = 'Dumps data to the fixtures directory';
+
+        $this->detailedDescription = <<<'EOF'
 The [doctrine:data-dump|INFO] task dumps database data:
 
   [./symfony doctrine:data-dump|INFO]
@@ -52,40 +51,40 @@ protected function configure()
 
   [./symfony doctrine:data-load|INFO]
 EOF;
-  }
+    }
 
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $databaseManager = new sfDatabaseManager($this->configuration);
-    $config = $this->getCliConfig();
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
+    {
+        $databaseManager = new sfDatabaseManager($this->configuration);
+        $config = $this->getCliConfig();
 
-    $args = array(
-      'data_fixtures_path' => $config['data_fixtures_path'][0],
-    );
+        $args = array(
+            'data_fixtures_path' => $config['data_fixtures_path'][0],
+        );
 
-    if (!is_dir($args['data_fixtures_path']))
-    {
-      $this->getFilesystem()->mkdirs($args['data_fixtures_path']);
-    }
+        if (!is_dir($args['data_fixtures_path'])) {
+            $this->getFilesystem()->mkdirs($args['data_fixtures_path']);
+        }
 
-    if ($arguments['target'])
-    {
-      $filename = $arguments['target'];
+        if ($arguments['target']) {
+            $filename = $arguments['target'];
 
-      if (!sfToolkit::isPathAbsolute($filename))
-      {
-        $filename = $args['data_fixtures_path'].'/'.$filename;
-      }
+            if (!sfToolkit::isPathAbsolute($filename)) {
+                $filename = $args['data_fixtures_path'].'/'.$filename;
+            }
 
-      $this->getFilesystem()->mkdirs(dirname($filename));
+            $this->getFilesystem()->mkdirs(dirname($filename));
 
-      $args['data_fixtures_path'] = $filename;
-    }
+            $args['data_fixtures_path'] = $filename;
+        }
 
-    $this->logSection('doctrine', sprintf('dumping data to fixtures to "%s"', $args['data_fixtures_path']));
-    $this->callDoctrineCli('dump-data', $args);
-  }
-}
\ No newline at end of file
+        $this->logSection('doctrine', sprintf('dumping data to fixtures to "%s"', $args['data_fixtures_path']));
+        $this->callDoctrineCli('dump-data', $args);
+    }
+}
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDataLoadTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDataLoadTask.class.php
index c3874834b..a4a4e8853 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDataLoadTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDataLoadTask.class.php
@@ -9,40 +9,39 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/sfDoctrineBaseTask.class.php');
+require_once dirname(__FILE__).'/sfDoctrineBaseTask.class.php';
 
 /**
  * Loads YAML fixture data.
  *
- * @package    symfony
- * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
+ *
  * @version    SVN: $Id$
  */
 class sfDoctrineDataLoadTask extends sfDoctrineBaseTask
 {
-  /**
-   * @see sfTask
-   */
-  protected function configure()
-  {
-    $this->addArguments(array(
-      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->namespace = 'doctrine';
-    $this->name = 'data-load';
-    $this->briefDescription = 'Loads YAML fixture data';
-
-    $this->detailedDescription = <<<EOF
+    /**
+     * @see sfTask
+     */
+    protected function configure()
+    {
+        $this->addArguments(array(
+            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->namespace = 'doctrine';
+        $this->name = 'data-load';
+        $this->briefDescription = 'Loads YAML fixture data';
+
+        $this->detailedDescription = <<<'EOF'
 The [doctrine:data-load|INFO] task loads data fixtures into the database:
 
   [./symfony doctrine:data-load|INFO]
@@ -59,33 +58,34 @@ protected function configure()
 
   [./symfony doctrine:data-load --append|INFO]
 EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $databaseManager = new sfDatabaseManager($this->configuration);
+    }
 
-    if (!count($arguments['dir_or_file']))
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
     {
-      // pull default from CLI config array
-      $config = $this->getCliConfig();
-      $arguments['dir_or_file'] = $config['data_fixtures_path'];
-    }
+        $databaseManager = new sfDatabaseManager($this->configuration);
 
-    $doctrineArguments = array(
-      'data_fixtures_path' => $arguments['dir_or_file'],
-      'append'             => $options['append'],
-      'charset'            => $options['charset'],
-    );
+        if (!count($arguments['dir_or_file'])) {
+            // pull default from CLI config array
+            $config = $this->getCliConfig();
+            $arguments['dir_or_file'] = $config['data_fixtures_path'];
+        }
 
-    foreach ($arguments['dir_or_file'] as $target)
-    {
-      $this->logSection('doctrine', sprintf('Loading data fixtures from "%s"', $target));
-    }
+        $doctrineArguments = array(
+            'data_fixtures_path' => $arguments['dir_or_file'],
+            'append' => $options['append'],
+            'charset' => $options['charset'],
+        );
 
-    $this->callDoctrineCli('load-data', $doctrineArguments);
-  }
+        foreach ($arguments['dir_or_file'] as $target) {
+            $this->logSection('doctrine', sprintf('Loading data fixtures from "%s"', $target));
+        }
+
+        $this->callDoctrineCli('load-data', $doctrineArguments);
+    }
 }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDeleteModelFilesTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDeleteModelFilesTask.class.php
index 4d08dcd55..51c84c5d9 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDeleteModelFilesTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDeleteModelFilesTask.class.php
@@ -8,135 +8,126 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/sfDoctrineBaseTask.class.php');
+require_once dirname(__FILE__).'/sfDoctrineBaseTask.class.php';
 
 /**
  * Delete all generated files associated with a Doctrine model. Forms, filters, etc.
  *
- * @package    symfony
- * @subpackage doctrine
  * @author     Jonathan H. Wage <jonwage@gmail.com>
+ *
  * @version    SVN: $Id$
  */
 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->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->namespace = 'doctrine';
-    $this->name = 'delete-model-files';
-    $this->briefDescription = 'Delete all the related auto generated files for a given model name.';
-
-    $this->detailedDescription = <<<EOF
+    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->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->namespace = 'doctrine';
+        $this->name = 'delete-model-files';
+        $this->briefDescription = 'Delete all the related auto generated files for a given model name.';
+
+        $this->detailedDescription = <<<'EOF'
 The [doctrine:delete-model-files|INFO] task deletes all files associated with certain
 models:
 
   [./symfony doctrine:delete-model-files Article Author|INFO]
 EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $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',
-      ),
-      $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'));
-
-    $total = 0;
-
-    foreach ($arguments['name'] as $modelName)
-    {
-      $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)')
-        ), 'QUESTION_LARGE', false))
-        {
-          $this->logSection('doctrine', 'Aborting delete of "'.$modelName.'" files');
-          continue;
-        }
-
-        $this->logSection('doctrine', 'Deleting "'.$modelName.'" files');
-        $this->getFilesystem()->remove($files);
-
-        $total += count($files);
-      }
-      else
-      {
-        $this->logSection('doctrine', 'No files found for the model named "'.$modelName.'"');
-      }
     }
 
-    $this->logSection('doctrine', 'Deleted a total of '.$total.' file(s)');
-  }
-
-  /**
-   * Converts an array of values to a regular expression pattern fragment.
-   *
-   * @param array  $values    An array of values for the pattern
-   * @param string $delimiter The regular expression delimiter
-   *
-   * @return string A regular expression fragment
-   */
-  protected function valuesToRegex($values, $delimiter = '/')
-  {
-    if (false !== $pos = array_search('', $values))
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
     {
-      $required = false;
-      unset($values[$pos]);
-    }
-    else
-    {
-      $required = true;
+        $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',
+            ),
+            $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'));
+
+        $total = 0;
+
+        foreach ($arguments['name'] as $modelName) {
+            $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)')
+                ), 'QUESTION_LARGE', false)) {
+                    $this->logSection('doctrine', 'Aborting delete of "'.$modelName.'" files');
+
+                    continue;
+                }
+
+                $this->logSection('doctrine', 'Deleting "'.$modelName.'" files');
+                $this->getFilesystem()->remove($files);
+
+                $total += count($files);
+            } else {
+                $this->logSection('doctrine', 'No files found for the model named "'.$modelName.'"');
+            }
+        }
+
+        $this->logSection('doctrine', 'Deleted a total of '.$total.' file(s)');
     }
 
-    if (count($values))
+    /**
+     * Converts an array of values to a regular expression pattern fragment.
+     *
+     * @param array  $values    An array of values for the pattern
+     * @param string $delimiter The regular expression delimiter
+     *
+     * @return string A regular expression fragment
+     */
+    protected function valuesToRegex($values, $delimiter = '/')
     {
-      $regex = '(';
-      foreach ($values as $i => $value)
-      {
-        $regex .= preg_quote($value, $delimiter);
-        if (isset($values[$i + 1]))
-        {
-          $regex .= '|';
+        if (false !== $pos = array_search('', $values)) {
+            $required = false;
+            unset($values[$pos]);
+        } else {
+            $required = true;
         }
-      }
-      $regex .= ')';
-
-      if (!$required)
-      {
-        $regex .= '?';
-      }
 
-      return $regex;
+        if (count($values)) {
+            $regex = '(';
+            foreach ($values as $i => $value) {
+                $regex .= preg_quote($value, $delimiter);
+                if (isset($values[$i + 1])) {
+                    $regex .= '|';
+                }
+            }
+            $regex .= ')';
+
+            if (!$required) {
+                $regex .= '?';
+            }
+
+            return $regex;
+        }
     }
-  }
 }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDqlTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDqlTask.class.php
index 4e052d103..57d0ede3d 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDqlTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDqlTask.class.php
@@ -9,41 +9,40 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/sfDoctrineBaseTask.class.php');
+require_once dirname(__FILE__).'/sfDoctrineBaseTask.class.php';
 
 /**
  * Creates database for current model.
  *
- * @package    symfony
- * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
+ *
  * @version    SVN: $Id$
  */
 class sfDoctrineDqlTask extends sfDoctrineBaseTask
 {
-  /**
-   * @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->namespace = 'doctrine';
-    $this->name = 'dql';
-    $this->briefDescription = 'Execute a DQL query and view the results';
-
-    $this->detailedDescription = <<<EOF
+    /**
+     * @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->namespace = 'doctrine';
+        $this->name = 'dql';
+        $this->briefDescription = 'Execute a DQL query and view the results';
+
+        $this->detailedDescription = <<<'EOF'
 The [doctrine:dql|INFO] task executes a DQL query and displays the formatted
 results:
 
@@ -57,121 +56,108 @@ protected function configure()
 
   [./symfony doctrine:dql "FROM User WHERE email LIKE ?" "%symfony-project.com"|INFO]
 EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $databaseManager = new sfDatabaseManager($this->configuration);
-
-    $dql = $arguments['dql_query'];
-
-    $q = Doctrine_Query::create()
-      ->parseDqlQuery($dql);
-
-    $this->logSection('doctrine', 'executing dql query');
-    $this->log(sprintf('DQL: %s', $dql));
-
-    if ($options['show-sql'])
-    {
-      $this->log(sprintf('SQL: %s', $q->getSqlQuery($arguments['parameter'])));
     }
 
-    $count = $q->count($arguments['parameter']);
-
-    if ($count)
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
     {
-      if (!$options['table'])
-      {
-        $results = $q->fetchArray($arguments['parameter']);
-
-        $this->log(array(
-          sprintf('found %s results', number_format($count)),
-          sfYaml::dump($results, 4),
-        ));
-      }
-      else
-      {
-        $results = $q->execute($arguments['parameter'], Doctrine_Core::HYDRATE_SCALAR);
-
-        $headers = array();
-
-        // calculate lengths
-        foreach ($results as $result)
-        {
-          foreach ($result as $field => $value)
-          {
-            if (!isset($headers[$field]))
-            {
-              $headers[$field] = 0;
-            }
-
-            $headers[$field] = max($headers[$field], strlen($this->renderValue($value)));
-          }
-        }
+        $databaseManager = new sfDatabaseManager($this->configuration);
 
-        // print header
-        $hdr = '|';
-        $div = '+';
+        $dql = $arguments['dql_query'];
 
-        foreach ($headers as $field => & $length)
-        {
-          if ($length < strlen($field))
-          {
-            $length = strlen($field);
-          }
+        $q = Doctrine_Query::create()
+            ->parseDqlQuery($dql)
+        ;
 
-          $hdr .= ' '.str_pad($field, $length).' |';
-          $div .= str_repeat('-', $length + 2).'+';
-        }
+        $this->logSection('doctrine', 'executing dql query');
+        $this->log(sprintf('DQL: %s', $dql));
 
-        $this->log(array($div, $hdr, $div));
-
-        // print results
-        foreach ($results as $result)
-        {
-          $line = '|';
-          foreach ($result as $field => $value)
-          {
-            $line .= ' '.str_pad($this->renderValue($value), $headers[$field]).' |';
-          }
-          $this->log($line);
+        if ($options['show-sql']) {
+            $this->log(sprintf('SQL: %s', $q->getSqlQuery($arguments['parameter'])));
         }
 
-        $this->log($div);
-
-        // find profiler
-        if ($profiler = $q->getConnection()->getListener()->get('symfony_profiler'))
-        {
-          $events = $profiler->getQueryExecutionEvents();
-          $event = array_pop($events);
-          $this->log(sprintf('%s results (%s sec)', number_format($count), number_format($event->getElapsedSecs(), 2)));
-        }
-        else
-        {
-          $this->log(sprintf('%s results', number_format($count)));
+        $count = $q->count($arguments['parameter']);
+
+        if ($count) {
+            if (!$options['table']) {
+                $results = $q->fetchArray($arguments['parameter']);
+
+                $this->log(array(
+                    sprintf('found %s results', number_format($count)),
+                    sfYaml::dump($results, 4),
+                ));
+            } else {
+                $results = $q->execute($arguments['parameter'], Doctrine_Core::HYDRATE_SCALAR);
+
+                $headers = array();
+
+                // calculate lengths
+                foreach ($results as $result) {
+                    foreach ($result as $field => $value) {
+                        if (!isset($headers[$field])) {
+                            $headers[$field] = 0;
+                        }
+
+                        $headers[$field] = max($headers[$field], strlen($this->renderValue($value)));
+                    }
+                }
+
+                // print header
+                $hdr = '|';
+                $div = '+';
+
+                foreach ($headers as $field => &$length) {
+                    if ($length < strlen($field)) {
+                        $length = strlen($field);
+                    }
+
+                    $hdr .= ' '.str_pad($field, $length).' |';
+                    $div .= str_repeat('-', $length + 2).'+';
+                }
+
+                $this->log(array($div, $hdr, $div));
+
+                // print results
+                foreach ($results as $result) {
+                    $line = '|';
+                    foreach ($result as $field => $value) {
+                        $line .= ' '.str_pad($this->renderValue($value), $headers[$field]).' |';
+                    }
+                    $this->log($line);
+                }
+
+                $this->log($div);
+
+                // find profiler
+                if ($profiler = $q->getConnection()->getListener()->get('symfony_profiler')) {
+                    $events = $profiler->getQueryExecutionEvents();
+                    $event = array_pop($events);
+                    $this->log(sprintf('%s results (%s sec)', number_format($count), number_format($event->getElapsedSecs(), 2)));
+                } else {
+                    $this->log(sprintf('%s results', number_format($count)));
+                }
+
+                $this->log('');
+            }
+        } else {
+            $this->logSection('doctrine', 'no results found');
         }
-
-        $this->log('');
-      }
     }
-    else
+
+    /**
+     * Renders the supplied value.
+     *
+     * @param string|null $value
+     *
+     * @return string
+     */
+    protected function renderValue($value)
     {
-      $this->logSection('doctrine', 'no results found');
+        return null === $value ? 'NULL' : $value;
     }
-  }
-
-  /**
-   * Renders the supplied value.
-   *
-   * @param string|null $value
-   *
-   * @return string
-   */
-  protected function renderValue($value)
-  {
-    return null === $value ? 'NULL' : $value;
-  }
 }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDropDbTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDropDbTask.class.php
index 5c058f526..970f86d8e 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDropDbTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDropDbTask.class.php
@@ -9,39 +9,38 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/sfDoctrineBaseTask.class.php');
+require_once dirname(__FILE__).'/sfDoctrineBaseTask.class.php';
 
 /**
  * Drops database for current model.
  *
- * @package    symfony
- * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
+ *
  * @version    SVN: $Id$
  */
 class sfDoctrineDropDbTask extends sfDoctrineBaseTask
 {
-  /**
-   * @see sfTask
-   */
-  protected function configure()
-  {
-    $this->addArguments(array(
-      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->namespace = 'doctrine';
-    $this->name = 'drop-db';
-    $this->briefDescription = 'Drops database for current model';
-
-    $this->detailedDescription = <<<EOF
+    /**
+     * @see sfTask
+     */
+    protected function configure()
+    {
+        $this->addArguments(array(
+            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->namespace = 'doctrine';
+        $this->name = 'drop-db';
+        $this->briefDescription = 'Drops database for current model';
+
+        $this->detailedDescription = <<<'EOF'
 The [doctrine:drop-db|INFO] task drops one or more databases based on
 configuration in [config/databases.yml|COMMENT]:
 
@@ -56,44 +55,42 @@ protected function configure()
 
   [./symfony doctrine:drop-db slave1 slave2|INFO]
 EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $databaseManager = new sfDatabaseManager($this->configuration);
-    $databases = $this->getDoctrineDatabases($databaseManager, count($arguments['database']) ? $arguments['database'] : null);
-
-    $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), ''),
-        array_map(function($v) { return ' - '.$v; }, array_keys($databases)),
-        array('', 'Are you sure you want to proceed? (y/N)')
-      ), 'QUESTION_LARGE', false)
-    )
-    {
-      $this->logSection('doctrine', 'task aborted');
-
-      return 1;
     }
 
-    foreach ($databases as $name => $database)
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
     {
-      $this->logSection('doctrine', sprintf('Dropping "%s" database', $name));
-      try
-      {
-        $database->getDoctrineConnection()->dropDatabase();
-      }
-      catch (Exception $e)
-      {
-        $this->logSection('doctrine', $e->getMessage(), null, 'ERROR');
-      }
+        $databaseManager = new sfDatabaseManager($this->configuration);
+        $databases = $this->getDoctrineDatabases($databaseManager, count($arguments['database']) ? $arguments['database'] : null);
+
+        $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), ''),
+                array_map(function ($v) { return ' - '.$v; }, array_keys($databases)),
+                array('', 'Are you sure you want to proceed? (y/N)')
+            ), 'QUESTION_LARGE', false)
+        ) {
+            $this->logSection('doctrine', 'task aborted');
+
+            return 1;
+        }
+
+        foreach ($databases as $name => $database) {
+            $this->logSection('doctrine', sprintf('Dropping "%s" database', $name));
+
+            try {
+                $database->getDoctrineConnection()->dropDatabase();
+            } 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 6a99216a5..77d805245 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateAdminTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateAdminTask.class.php
@@ -8,42 +8,41 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/sfDoctrineBaseTask.class.php');
+require_once dirname(__FILE__).'/sfDoctrineBaseTask.class.php';
 
 /**
  * Generates a Doctrine admin module.
  *
- * @package    symfony
- * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfDoctrineGenerateAdminTask extends sfDoctrineBaseTask
 {
-  /**
-   * @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->namespace = 'doctrine';
-    $this->name = 'generate-admin';
-    $this->briefDescription = 'Generates a Doctrine admin module';
-
-    $this->detailedDescription = <<<EOF
+    /**
+     * @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->namespace = 'doctrine';
+        $this->name = 'generate-admin';
+        $this->briefDescription = 'Generates a Doctrine admin module';
+
+        $this->detailedDescription = <<<'EOF'
 The [doctrine:generate-admin|INFO] task generates a Doctrine admin module:
 
   [./symfony doctrine:generate-admin frontend Article|INFO]
@@ -69,57 +68,54 @@ class: sfDoctrineRouteCollection
       model:                Article
       with_wildcard_routes: true
 EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    // get configuration for the given route
-    if (false !== ($route = $this->getRouteFromName($arguments['route_or_model'])))
-    {
-      $arguments['route'] = $route;
-      $arguments['route_name'] = $arguments['route_or_model'];
-
-      return $this->generateForRoute($arguments, $options);
-    }
-
-    // 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']));
-    }
-
-    $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']));
     }
 
-    // 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));
-
-    if (isset($options['module']))
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
     {
-      $route = $this->getRouteFromName($name);
-      if ($route && !$this->checkRoute($route, $model, $options['module']))
-      {
-        $name .= '_'.$options['module'];
-      }
-    }
-
-    $routing = sfConfig::get('sf_app_config_dir').'/routing.yml';
-    $content = file_get_contents($routing);
-    $routesArray = sfYaml::load($content);
-
-    if (!isset($routesArray[$name]))
-    {
-      $databaseManager = new sfDatabaseManager($this->configuration);
-      $primaryKey = Doctrine_Core::getTable($model)->getIdentifier();
-      $module = $options['module'] ? $options['module'] : $name;
-      $content = sprintf(<<<EOF
+        // get configuration for the given route
+        if (false !== ($route = $this->getRouteFromName($arguments['route_or_model']))) {
+            $arguments['route'] = $route;
+            $arguments['route_name'] = $arguments['route_or_model'];
+
+            return $this->generateForRoute($arguments, $options);
+        }
+
+        // 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']));
+        }
+
+        $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']));
+        }
+
+        // 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));
+
+        if (isset($options['module'])) {
+            $route = $this->getRouteFromName($name);
+            if ($route && !$this->checkRoute($route, $model, $options['module'])) {
+                $name .= '_'.$options['module'];
+            }
+        }
+
+        $routing = sfConfig::get('sf_app_config_dir').'/routing.yml';
+        $content = file_get_contents($routing);
+        $routesArray = sfYaml::load($content);
+
+        if (!isset($routesArray[$name])) {
+            $databaseManager = new sfDatabaseManager($this->configuration);
+            $primaryKey = Doctrine_Core::getTable($model)->getIdentifier();
+            $module = $options['module'] ? $options['module'] : $name;
+            $content = sprintf(<<<'EOF'
 %s:
   class: sfDoctrineRouteCollection
   options:
@@ -131,83 +127,80 @@ class: sfDoctrineRouteCollection
 
 
 EOF
-      , $name, $model, $module, isset($options['plural']) ? $options['plural'] : $module, $primaryKey).$content;
+                , $name, $model, $module, isset($options['plural']) ? $options['plural'] : $module, $primaryKey).$content;
 
-      $this->logSection('file+', $routing);
+            $this->logSection('file+', $routing);
 
-      if (false === file_put_contents($routing, $content))
-      {
-        throw new sfCommandException(sprintf('Unable to write to file, %s.', $routing));
-      }
-    }
-
-    $arguments['route'] = $this->getRouteFromName($name);
-    $arguments['route_name'] = $name;
+            if (false === file_put_contents($routing, $content)) {
+                throw new sfCommandException(sprintf('Unable to write to file, %s.', $routing));
+            }
+        }
 
-    return $this->generateForRoute($arguments, $options);
-  }
+        $arguments['route'] = $this->getRouteFromName($name);
+        $arguments['route_name'] = $name;
 
-  protected function generateForRoute($arguments, $options)
-  {
-    $routeOptions = $arguments['route']->getOptions();
+        return $this->generateForRoute($arguments, $options);
+    }
 
-    if (!$arguments['route'] instanceof sfDoctrineRouteCollection)
+    protected function generateForRoute($arguments, $options)
     {
-      throw new sfCommandException(sprintf('The route "%s" is not a Doctrine collection route.', $arguments['route_name']));
+        $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']));
+        }
+
+        $module = $routeOptions['module'];
+        $model = $routeOptions['model'];
+
+        // execute the doctrine:generate-module task
+        $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(
+            'theme' => $options['theme'],
+            'route-prefix' => $routeOptions['name'],
+            'with-doctrine-route' => true,
+            'generate-in-cache' => true,
+            'non-verbose-templates' => true,
+            'singular' => $options['singular'],
+            'plural' => $options['plural'],
+            'actions-base-class' => $options['actions-base-class'],
+        ));
     }
 
-    $module = $routeOptions['module'];
-    $model = $routeOptions['model'];
-
-    // execute the doctrine:generate-module task
-    $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(
-      'theme'                 => $options['theme'],
-      'route-prefix'          => $routeOptions['name'],
-      'with-doctrine-route'   => true,
-      'generate-in-cache'     => true,
-      'non-verbose-templates' => true,
-      'singular'              => $options['singular'],
-      'plural'                => $options['plural'],
-      'actions-base-class'    => $options['actions-base-class'],
-    ));
-  }
-
-  protected function getRouteFromName($name)
-  {
-    $config = new sfRoutingConfigHandler();
-    $routes = $config->evaluate($this->configuration->getConfigPaths('config/routing.yml'));
-
-    if (isset($routes[$name]))
+    protected function getRouteFromName($name)
     {
-      return $routes[$name];
+        $config = new sfRoutingConfigHandler();
+        $routes = $config->evaluate($this->configuration->getConfigPaths('config/routing.yml'));
+
+        if (isset($routes[$name])) {
+            return $routes[$name];
+        }
+
+        return false;
     }
 
-    return false;
-  }
-
-  /**
-   * Checks whether a route references a model and module.
-   *
-   * @param mixed  $route  A route collection
-   * @param string $model  A model name
-   * @param string $module A module name
-   *
-   * @return boolean
-   */
-  protected function checkRoute($route, $model, $module)
-  {
-    if ($route instanceof sfDoctrineRouteCollection)
+    /**
+     * Checks whether a route references a model and module.
+     *
+     * @param mixed  $route  A route collection
+     * @param string $model  A model name
+     * @param string $module A module name
+     *
+     * @return bool
+     */
+    protected function checkRoute($route, $model, $module)
     {
-      $options = $route->getOptions();
-      return $model == $options['model'] && $module == $options['module'];
-    }
+        if ($route instanceof sfDoctrineRouteCollection) {
+            $options = $route->getOptions();
 
-    return false;
-  }
+            return $model == $options['model'] && $module == $options['module'];
+        }
+
+        return false;
+    }
 }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationTask.class.php
index dfd899303..8cef5a32d 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationTask.class.php
@@ -9,39 +9,38 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/sfDoctrineBaseTask.class.php');
+require_once dirname(__FILE__).'/sfDoctrineBaseTask.class.php';
 
 /**
  * Inserts SQL for current model.
  *
- * @package    symfony
- * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
+ *
  * @version    SVN: $Id$
  */
 class sfDoctrineGenerateMigrationTask extends sfDoctrineBaseTask
 {
-  /**
-   * @see sfTask
-   */
-  protected function configure()
-  {
-    $this->addArguments(array(
-      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->namespace = 'doctrine';
-    $this->name = 'generate-migration';
-    $this->briefDescription = 'Generate migration class';
-
-    $this->detailedDescription = <<<EOF
+    /**
+     * @see sfTask
+     */
+    protected function configure()
+    {
+        $this->addArguments(array(
+            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->namespace = 'doctrine';
+        $this->name = 'generate-migration';
+        $this->briefDescription = 'Generate migration class';
+
+        $this->detailedDescription = <<<'EOF'
 The [doctrine:generate-migration|INFO] task generates migration template
 
   [./symfony doctrine:generate-migration AddUserEmailColumn|INFO]
@@ -51,42 +50,42 @@ protected function configure()
 
   [./symfony doctrine:generate-migration AddUserEmailColumn --editor-cmd=mate|INFO]
 EOF;
-  }
+    }
 
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $databaseManager = new sfDatabaseManager($this->configuration);
-    $config = $this->getCliConfig();
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
+    {
+        $databaseManager = new sfDatabaseManager($this->configuration);
+        $config = $this->getCliConfig();
 
-    $this->logSection('doctrine', sprintf('generating migration class named "%s"', $arguments['name']));
+        $this->logSection('doctrine', sprintf('generating migration class named "%s"', $arguments['name']));
 
-    if (!is_dir($config['migrations_path']))
-    {
-      $this->getFilesystem()->mkdirs($config['migrations_path']);
-    }
+        if (!is_dir($config['migrations_path'])) {
+            $this->getFilesystem()->mkdirs($config['migrations_path']);
+        }
 
-    $this->callDoctrineCli('generate-migration', array('name' => $arguments['name']));
+        $this->callDoctrineCli('generate-migration', array('name' => $arguments['name']));
 
-    $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(
-        "{\n\n" => "{\n",
-        "\n}"   => "\n}\n",
-        '    '  => '  ',
-      ));
-      file_put_contents($file, $contents);
-
-      if (isset($options['editor-cmd']))
-      {
-        $this->getFilesystem()->execute($options['editor-cmd'].' '.escapeshellarg($file));
-      }
+        $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(
+                "{\n\n" => "{\n",
+                "\n}" => "\n}\n",
+                '    ' => '  ',
+            ));
+            file_put_contents($file, $contents);
+
+            if (isset($options['editor-cmd'])) {
+                $this->getFilesystem()->execute($options['editor-cmd'].' '.escapeshellarg($file));
+            }
+        }
     }
-  }
 }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsDbTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsDbTask.class.php
index 3b67ffac8..d07d4e11b 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsDbTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsDbTask.class.php
@@ -9,58 +9,59 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/sfDoctrineBaseTask.class.php');
+require_once dirname(__FILE__).'/sfDoctrineBaseTask.class.php';
 
 /**
- * Generate migrations from database
+ * Generate migrations from database.
  *
- * @package    symfony
- * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
+ *
  * @version    SVN: $Id$
  */
 class sfDoctrineGenerateMigrationsDbTask extends sfDoctrineBaseTask
 {
-  /**
-   * @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'),
-    ));
+    /**
+     * @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->namespace = 'doctrine';
-    $this->name = 'generate-migrations-db';
-    $this->briefDescription = 'Generate migration classes from existing database connections';
+        $this->namespace = 'doctrine';
+        $this->name = 'generate-migrations-db';
+        $this->briefDescription = 'Generate migration classes from existing database connections';
 
-    $this->detailedDescription = <<<EOF
+        $this->detailedDescription = <<<'EOF'
 The [doctrine:generate-migrations-db|INFO] task generates migration classes from
 existing database connections:
 
   [./symfony doctrine:generate-migrations-db|INFO]
 EOF;
-  }
+    }
 
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $databaseManager = new sfDatabaseManager($this->configuration);
-    $config = $this->getCliConfig();
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
+    {
+        $databaseManager = new sfDatabaseManager($this->configuration);
+        $config = $this->getCliConfig();
 
-    $this->logSection('doctrine', 'generating migration classes from database');
+        $this->logSection('doctrine', 'generating migration classes from database');
 
-    if (!is_dir($config['migrations_path']))
-    {
-      $this->getFilesystem()->mkdirs($config['migrations_path']);
-    }
+        if (!is_dir($config['migrations_path'])) {
+            $this->getFilesystem()->mkdirs($config['migrations_path']);
+        }
 
-    $this->callDoctrineCli('generate-migrations-db', array(
-      'yaml_schema_path' => $this->prepareSchemaFile($config['yaml_schema_path']),
-    ));
-  }
-}
\ No newline at end of file
+        $this->callDoctrineCli('generate-migrations-db', array(
+            '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 77ed3bd8a..5c521d7bb 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsDiffTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsDiffTask.class.php
@@ -9,60 +9,61 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/sfDoctrineBaseTask.class.php');
+require_once dirname(__FILE__).'/sfDoctrineBaseTask.class.php';
 
 /**
  * Generate migration classes by producing a diff between your old and new schema.
  *
- * @package    symfony
- * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
+ *
  * @version    SVN: $Id$
  */
 class sfDoctrineGenerateMigrationsDiffTask extends sfDoctrineBaseTask
 {
-  /**
-   * @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'),
-    ));
+    /**
+     * @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->namespace = 'doctrine';
-    $this->name = 'generate-migrations-diff';
-    $this->briefDescription = 'Generate migration classes by producing a diff between your old and new schema.';
+        $this->namespace = 'doctrine';
+        $this->name = 'generate-migrations-diff';
+        $this->briefDescription = 'Generate migration classes by producing a diff between your old and new schema.';
 
-    $this->detailedDescription = <<<EOF
+        $this->detailedDescription = <<<'EOF'
 The [doctrine:generate-migrations-diff|INFO] task generates migration classes by
 producing a diff between your old and new schema.
 
   [./symfony doctrine:generate-migrations-diff|INFO]
 EOF;
-  }
+    }
 
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $databaseManager = new sfDatabaseManager($this->configuration);
-    $config = $this->getCliConfig();
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
+    {
+        $databaseManager = new sfDatabaseManager($this->configuration);
+        $config = $this->getCliConfig();
 
-    $this->logSection('doctrine', 'generating migration diff');
+        $this->logSection('doctrine', 'generating migration diff');
 
-    if (!is_dir($config['migrations_path']))
-    {
-      $this->getFilesystem()->mkdirs($config['migrations_path']);
-    }
+        if (!is_dir($config['migrations_path'])) {
+            $this->getFilesystem()->mkdirs($config['migrations_path']);
+        }
 
-    spl_autoload_register(array('Doctrine_Core', 'modelsAutoload'));
+        spl_autoload_register(array('Doctrine_Core', 'modelsAutoload'));
 
-    $this->callDoctrineCli('generate-migrations-diff', array(
-      'yaml_schema_path' => $this->prepareSchemaFile($config['yaml_schema_path']),
-    ));
-  }
+        $this->callDoctrineCli('generate-migrations-diff', array(
+            '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 b5bf20f6b..970010747 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsModelsTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsModelsTask.class.php
@@ -9,56 +9,57 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/sfDoctrineBaseTask.class.php');
+require_once dirname(__FILE__).'/sfDoctrineBaseTask.class.php';
 
 /**
  * Inserts SQL for current model.
  *
- * @package    symfony
- * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
+ *
  * @version    SVN: $Id$
  */
 class sfDoctrineGenerateMigrationsModelsTask extends sfDoctrineBaseTask
 {
-  /**
-   * @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'),
-    ));
+    /**
+     * @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->namespace = 'doctrine';
-    $this->name = 'generate-migrations-models';
-    $this->briefDescription = 'Generate migration classes from an existing set of models';
+        $this->namespace = 'doctrine';
+        $this->name = 'generate-migrations-models';
+        $this->briefDescription = 'Generate migration classes from an existing set of models';
 
-    $this->detailedDescription = <<<EOF
+        $this->detailedDescription = <<<'EOF'
 The [doctrine:generate-migrations-models|INFO] task generates migration classes
 from an existing set of models:
 
   [./symfony doctrine:generate-migrations-models|INFO]
 EOF;
-  }
+    }
 
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $databaseManager = new sfDatabaseManager($this->configuration);
-    $config = $this->getCliConfig();
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
+    {
+        $databaseManager = new sfDatabaseManager($this->configuration);
+        $config = $this->getCliConfig();
 
-    $this->logSection('doctrine', 'generating migration classes from models');
+        $this->logSection('doctrine', 'generating migration classes from models');
 
-    if (!is_dir($config['migrations_path']))
-    {
-      $this->getFilesystem()->mkdirs($config['migrations_path']);
-    }
+        if (!is_dir($config['migrations_path'])) {
+            $this->getFilesystem()->mkdirs($config['migrations_path']);
+        }
 
-    $this->callDoctrineCli('generate-migrations-models');
-  }
+        $this->callDoctrineCli('generate-migrations-models');
+    }
 }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateModuleForRouteTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateModuleForRouteTask.class.php
index 9228a1d8a..3b931cb46 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateModuleForRouteTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateModuleForRouteTask.class.php
@@ -8,42 +8,41 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/sfDoctrineBaseTask.class.php');
+require_once dirname(__FILE__).'/sfDoctrineBaseTask.class.php';
 
 /**
  * Generates a Doctrine module for a route definition.
  *
- * @package    symfony
- * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfDoctrineGenerateModuleForRouteTask extends sfDoctrineBaseTask
 {
-  /**
-   * @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->namespace = 'doctrine';
-    $this->name = 'generate-module-for-route';
-    $this->briefDescription = 'Generates a Doctrine module for a route definition';
-
-    $this->detailedDescription = <<<EOF
+    /**
+     * @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->namespace = 'doctrine';
+        $this->name = 'generate-module-for-route';
+        $this->briefDescription = 'Generates a Doctrine module for a route definition';
+
+        $this->detailedDescription = <<<'EOF'
 The [doctrine:generate-module-for-route|INFO] task generates a Doctrine module for a route definition:
 
   [./symfony doctrine:generate-module-for-route frontend article|INFO]
@@ -51,48 +50,49 @@ protected function configure()
 The task creates a module in the [%frontend%|COMMENT] application for the
 [%article%|COMMENT] route definition found in [routing.yml|COMMENT].
 EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    // get configuration for the given route
-    $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']));
     }
 
-    $routeOptions = $routes[$arguments['route']]->getOptions();
-
-    if (!$routes[$arguments['route']] instanceof sfDoctrineRouteCollection)
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
     {
-      throw new sfCommandException(sprintf('The route "%s" is not a Doctrine collection route.', $arguments['route']));
+        // get configuration for the given route
+        $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']));
+        }
+
+        $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']));
+        }
+
+        $module = $routeOptions['module'];
+        $model = $routeOptions['model'];
+
+        // execute the doctrine:generate-module task
+        $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(
+            'theme' => $options['theme'],
+            'route-prefix' => $routeOptions['name'],
+            'with-doctrine-route' => true,
+            'with-show' => $routeOptions['with_show'],
+            'non-verbose-templates' => $options['non-verbose-templates'],
+            'singular' => $options['singular'],
+            'plural' => $options['plural'],
+            'actions-base-class' => $options['actions-base-class'],
+        ));
     }
-
-    $module = $routeOptions['module'];
-    $model = $routeOptions['model'];
-
-    // execute the doctrine:generate-module task
-    $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(
-      'theme'                 => $options['theme'],
-      'route-prefix'          => $routeOptions['name'],
-      'with-doctrine-route'   => true,
-      'with-show'             => $routeOptions['with_show'],
-      'non-verbose-templates' => $options['non-verbose-templates'],
-      'singular'              => $options['singular'],
-      'plural'                => $options['plural'],
-      'actions-base-class'    => $options['actions-base-class'],
-    ));
-  }
-}
\ No newline at end of file
+}
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateModuleTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateModuleTask.class.php
index e2880d296..ef7c22ca5 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateModuleTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateModuleTask.class.php
@@ -8,47 +8,46 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/sfDoctrineBaseTask.class.php');
+require_once dirname(__FILE__).'/sfDoctrineBaseTask.class.php';
 
 /**
  * Generates a Doctrine module.
  *
- * @package    symfony
- * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfDoctrineGenerateModuleTask extends sfDoctrineBaseTask
 {
-  /**
-   * @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->namespace = 'doctrine';
-    $this->name = 'generate-module';
-    $this->briefDescription = 'Generates a Doctrine module';
-
-    $this->detailedDescription = <<<EOF
+    /**
+     * @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->namespace = 'doctrine';
+        $this->name = 'generate-module';
+        $this->briefDescription = 'Generates a Doctrine module';
+
+        $this->detailedDescription = <<<'EOF'
 The [doctrine:generate-module|INFO] task generates a Doctrine module:
 
   [./symfony doctrine:generate-module frontend article Article|INFO]
@@ -73,129 +72,123 @@ protected function configure()
 
   [./symfony doctrine:generate-module --actions-base-class="ProjectActions" frontend article Article|INFO]
 EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $databaseManager = new sfDatabaseManager($this->configuration);
-    
-    $properties = parse_ini_file(sfConfig::get('sf_config_dir').'/properties.ini', true);
-
-    $this->constants = array(
-      '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())
-  {
-    // 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(
-      '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'),
-      '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'];
-
-    // copy our generated module
-    $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']));
-
-    // customize php and yml files
-    $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');
-
-    // 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);
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
+    {
+        $databaseManager = new sfDatabaseManager($this->configuration);
 
-    // delete temp files
-    $this->getFilesystem()->remove(sfFinder::type('any')->in($tmpDir));
-  }
+        $properties = parse_ini_file(sfConfig::get('sf_config_dir').'/properties.ini', true);
 
-  protected function executeInit($arguments = array(), $options = array())
-  {
-    $moduleDir = sfConfig::get('sf_app_module_dir').'/'.$arguments['module'];
+        $this->constants = array(
+            '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',
+        );
 
-    // create basic application structure
-    $finder = sfFinder::type('any')->discard('.sf');
-    $dirs = $this->configuration->getGeneratorSkeletonDirs('sfDoctrineModule', $options['theme']);
+        $method = $options['generate-in-cache'] ? 'executeInit' : 'executeGenerate';
 
-    foreach ($dirs as $dir)
-    {
-      if (is_dir($dir))
-      {
-        $this->getFilesystem()->mirror($dir, $moduleDir, $finder);
-        break;
-      }
+        $this->{$method}($arguments, $options);
     }
 
-    // move configuration file
-    if (file_exists($config = $moduleDir.'/lib/configuration.php'))
+    protected function executeGenerate($arguments = array(), $options = array())
     {
-      if (file_exists($target = $moduleDir.'/lib/'.$arguments['module'].'GeneratorConfiguration.class.php'))
-      {
-        $this->getFilesystem()->remove($config);
-      }
-      else
-      {
-        $this->getFilesystem()->rename($config, $target);
-      }
+        // 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(
+            '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'),
+            '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'];
+
+        // copy our generated module
+        $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']));
+
+        // customize php and yml files
+        $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');
+
+        // 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);
+
+        // delete temp files
+        $this->getFilesystem()->remove(sfFinder::type('any')->in($tmpDir));
     }
 
-    // move helper file
-    if (file_exists($config = $moduleDir.'/lib/helper.php'))
+    protected function executeInit($arguments = array(), $options = array())
     {
-      if (file_exists($target = $moduleDir.'/lib/'.$arguments['module'].'GeneratorHelper.class.php'))
-      {
-        $this->getFilesystem()->remove($config);
-      }
-      else
-      {
-        $this->getFilesystem()->rename($config, $target);
-      }
-    }
-
-    // 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');
-
-    // 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);
-
-    // customize php and yml files
-    $finder = sfFinder::type('file')->name('*.php', '*.yml');
-    $this->constants['CONFIG'] = sprintf(<<<EOF
+        $moduleDir = sfConfig::get('sf_app_module_dir').'/'.$arguments['module'];
+
+        // create basic application structure
+        $finder = sfFinder::type('any')->discard('.sf');
+        $dirs = $this->configuration->getGeneratorSkeletonDirs('sfDoctrineModule', $options['theme']);
+
+        foreach ($dirs as $dir) {
+            if (is_dir($dir)) {
+                $this->getFilesystem()->mirror($dir, $moduleDir, $finder);
+
+                break;
+            }
+        }
+
+        // move configuration file
+        if (file_exists($config = $moduleDir.'/lib/configuration.php')) {
+            if (file_exists($target = $moduleDir.'/lib/'.$arguments['module'].'GeneratorConfiguration.class.php')) {
+                $this->getFilesystem()->remove($config);
+            } else {
+                $this->getFilesystem()->rename($config, $target);
+            }
+        }
+
+        // move helper file
+        if (file_exists($config = $moduleDir.'/lib/helper.php')) {
+            if (file_exists($target = $moduleDir.'/lib/'.$arguments['module'].'GeneratorHelper.class.php')) {
+                $this->getFilesystem()->remove($config);
+            } else {
+                $this->getFilesystem()->rename($config, $target);
+            }
+        }
+
+        // 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');
+
+        // 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);
+
+        // customize php and yml files
+        $finder = sfFinder::type('file')->name('*.php', '*.yml');
+        $this->constants['CONFIG'] = sprintf(
+            <<<'EOF'
     model_class:           %s
     theme:                 %s
     non_verbose_templates: %s
@@ -206,17 +199,17 @@ protected function executeInit($arguments = array(), $options = array())
     with_doctrine_route:   %s
     actions_base_class:    %s
 EOF
-    ,
-      $arguments['model'],
-      $options['theme'],
-      $options['non-verbose-templates'] ? 'true' : 'false',
-      $options['with-show'] ? 'true' : 'false',
-      $options['singular'] ? $options['singular'] : '~',
-      $options['plural'] ? $options['plural'] : '~',
-      $options['route-prefix'] ? $options['route-prefix'] : '~',
-      $options['with-doctrine-route'] ? 'true' : 'false',
-      $options['actions-base-class']
-    );
-    $this->getFilesystem()->replaceTokens($finder->in($moduleDir), '##', '##', $this->constants);
-  }
+            ,
+            $arguments['model'],
+            $options['theme'],
+            $options['non-verbose-templates'] ? 'true' : 'false',
+            $options['with-show'] ? 'true' : 'false',
+            $options['singular'] ? $options['singular'] : '~',
+            $options['plural'] ? $options['plural'] : '~',
+            $options['route-prefix'] ? $options['route-prefix'] : '~',
+            $options['with-doctrine-route'] ? 'true' : 'false',
+            $options['actions-base-class']
+        );
+        $this->getFilesystem()->replaceTokens($finder->in($moduleDir), '##', '##', $this->constants);
+    }
 }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineInsertSqlTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineInsertSqlTask.class.php
index 60cbb1674..37cd7efff 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineInsertSqlTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineInsertSqlTask.class.php
@@ -9,34 +9,33 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/sfDoctrineBaseTask.class.php');
+require_once dirname(__FILE__).'/sfDoctrineBaseTask.class.php';
 
 /**
  * Inserts SQL for current model.
  *
- * @package    symfony
- * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
+ *
  * @version    SVN: $Id$
  */
 class sfDoctrineInsertSqlTask extends sfDoctrineBaseTask
 {
-  /**
-   * @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'),
-    ));
+    /**
+     * @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->namespace = 'doctrine';
-    $this->name = 'insert-sql';
-    $this->briefDescription = 'Inserts SQL for current model';
+        $this->namespace = 'doctrine';
+        $this->name = 'insert-sql';
+        $this->briefDescription = 'Inserts SQL for current model';
 
-    $this->detailedDescription = <<<EOF
+        $this->detailedDescription = <<<'EOF'
 The [doctrine:insert-sql|INFO] task creates database tables:
 
   [./symfony doctrine:insert-sql|INFO]
@@ -44,21 +43,24 @@ protected function configure()
 The task connects to the database and creates tables for all the
 [lib/model/doctrine/*.class.php|COMMENT] files.
 EOF;
-  }
+    }
 
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $this->logSection('doctrine', 'creating tables');
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
+    {
+        $this->logSection('doctrine', 'creating tables');
 
-    $databaseManager = new sfDatabaseManager($this->configuration);
-    $config = $this->getCliConfig();
+        $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');
-  }
+        $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 8abbdf0e1..ed4692229 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineMigrateTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineMigrateTask.class.php
@@ -9,41 +9,40 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/sfDoctrineBaseTask.class.php');
+require_once dirname(__FILE__).'/sfDoctrineBaseTask.class.php';
 
 /**
  * Inserts SQL for current model.
  *
- * @package    symfony
- * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
+ *
  * @version    SVN: $Id$
  */
 class sfDoctrineMigrateTask extends sfDoctrineBaseTask
 {
-  /**
-   * @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->namespace = 'doctrine';
-    $this->name = 'migrate';
-    $this->briefDescription = 'Migrates database to current/specified version';
-
-    $this->detailedDescription = <<<EOF
+    /**
+     * @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->namespace = 'doctrine';
+        $this->name = 'migrate';
+        $this->briefDescription = 'Migrates database to current/specified version';
+
+        $this->detailedDescription = <<<'EOF'
 The [doctrine:migrate|INFO] task migrates the database:
 
   [./symfony doctrine:migrate|INFO]
@@ -61,89 +60,73 @@ protected function configure()
 
   [./symfony doctrine:migrate --dry-run|INFO]
 EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $databaseManager = new sfDatabaseManager($this->configuration);
-
-    $config = $this->getCliConfig();
-    $migration = new Doctrine_Migration($config['migrations_path']);
-    $from = $migration->getCurrentVersion();
-
-    if (is_numeric($arguments['version']))
-    {
-      $version = $arguments['version'];
-    }
-    else if ($options['up'])
-    {
-      $version = $from + 1;
-    }
-    else if ($options['down'])
-    {
-      $version = $from - 1;
-    }
-    else
-    {
-      $version = $migration->getLatestVersion();
     }
 
-    if ($from == $version)
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
     {
-      $this->logSection('doctrine', sprintf('Already at migration version %s', $version));
-      return;
-    }
+        $databaseManager = new sfDatabaseManager($this->configuration);
+
+        $config = $this->getCliConfig();
+        $migration = new Doctrine_Migration($config['migrations_path']);
+        $from = $migration->getCurrentVersion();
+
+        if (is_numeric($arguments['version'])) {
+            $version = $arguments['version'];
+        } elseif ($options['up']) {
+            $version = $from + 1;
+        } elseif ($options['down']) {
+            $version = $from - 1;
+        } else {
+            $version = $migration->getLatestVersion();
+        }
 
-    $this->logSection('doctrine', sprintf('Migrating from version %s to %s%s', $from, $version, $options['dry-run'] ? ' (dry run)' : ''));
-    try
-    {
-      $migration_classes = $migration->getMigrationClasses();
-      if($version < $from)
-      {
-        for($i = (int)$from - 1; $i >= (int)$version; $i--)
-        {
-          $this->logSection('doctrine', 'executing migration : '.$i .', class: '.$migration_classes[$i]);
-          $migration->migrate($i, $options['dry-run']);
+        if ($from == $version) {
+            $this->logSection('doctrine', sprintf('Already at migration version %s', $version));
+
+            return;
         }
-      }
-      else
-      {
-        for($i = (int)$from + 1; $i <= (int)$version; $i++)
-        {
-          $this->logSection('doctrine', 'executing migration : '.$i.', class: '.$migration_classes[$i]);
-          $migration->migrate($i, $options['dry-run']);
+
+        $this->logSection('doctrine', sprintf('Migrating from version %s to %s%s', $from, $version, $options['dry-run'] ? ' (dry run)' : ''));
+
+        try {
+            $migration_classes = $migration->getMigrationClasses();
+            if ($version < $from) {
+                for ($i = (int) $from - 1; $i >= (int) $version; --$i) {
+                    $this->logSection('doctrine', 'executing migration : '.$i.', class: '.$migration_classes[$i]);
+                    $migration->migrate($i, $options['dry-run']);
+                }
+            } else {
+                for ($i = (int) $from + 1; $i <= (int) $version; ++$i) {
+                    $this->logSection('doctrine', 'executing migration : '.$i.', class: '.$migration_classes[$i]);
+                    $migration->migrate($i, $options['dry-run']);
+                }
+            }
+        } catch (Exception $e) {
         }
-      }
-    }
-    catch (Exception $e)
-    {
-    }
 
-    // render errors
-    if ($migration->hasErrors())
-    {
-      if ($this->commandApplication && $this->commandApplication->withTrace())
-      {
-        $this->logSection('doctrine', 'The following errors occurred:');
-        foreach ($migration->getErrors() as $error)
-        {
-          $this->commandApplication->renderException($error);
+        // render errors
+        if ($migration->hasErrors()) {
+            if ($this->commandApplication && $this->commandApplication->withTrace()) {
+                $this->logSection('doctrine', 'The following errors occurred:');
+                foreach ($migration->getErrors() as $error) {
+                    $this->commandApplication->renderException($error);
+                }
+            } else {
+                $this->logBlock(array_merge(
+                    array('The following errors occurred:', ''),
+                    array_map(function ($e) { return ' - '.$e->getMessage(); }, $migration->getErrors())
+                ), 'ERROR_LARGE');
+            }
+
+            return 1;
         }
-      }
-      else
-      {
-        $this->logBlock(array_merge(
-          array('The following errors occurred:', ''),
-          array_map(function($e) { return ' - '.$e->getMessage(); }, $migration->getErrors())
-        ), 'ERROR_LARGE');
-      }
-
-      return 1;
-    }
 
-    $this->logSection('doctrine', 'Migration complete');
-  }
+        $this->logSection('doctrine', 'Migration complete');
+    }
 }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/test/sfTesterDoctrine.class.php b/lib/plugins/sfDoctrinePlugin/lib/test/sfTesterDoctrine.class.php
index f8392c7ae..187326f08 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/test/sfTesterDoctrine.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/test/sfTesterDoctrine.class.php
@@ -11,167 +11,139 @@
 /**
  * sfTesterDoctrine implements tests for Doctrine classes.
  *
- * @package    symfony
- * @subpackage test
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfTesterDoctrine extends sfTester
 {
-  /**
-   * Prepares the tester.
-   */
-  public function prepare()
-  {
-  }
-
-  /**
-   * Initializes the tester.
-   */
-  public function initialize()
-  {
-  }
-
-  /**
-   * Tests a model.
-   *
-   * @param string               $model The model class name
-   * @param array|Doctrine_Query $query A Doctrine_Query object or an array of conditions
-   * @param string               $value The value to test
-   *
-   * @return sfTestFunctionalBase|sfTester
-   */
-  public function check($model, $query, $value = true)
-  {
-    if (null === $query)
+    /**
+     * Prepares the tester.
+     */
+    public function prepare()
     {
-      $query = Doctrine_Core::getTable($model)
-        ->createQuery('a');
     }
 
-    if (is_array($query))
+    /**
+     * Initializes the tester.
+     */
+    public function initialize()
     {
-      $conditions = $query;
-      $query = $query = Doctrine_Core::getTable($model)
-        ->createQuery('a');
-      foreach ($conditions as $column => $condition)
-      {
-        $column = Doctrine_Core::getTable($model)->getFieldName($column);
-
-        if (null === $condition)
-        {
-          $query->andWhere('a.'.$column.' IS NULL');
-          continue;
-        }
+    }
 
-        $operator = '=';
-        if (strlen($condition) && '!' == substr($condition, 0, 1))
-        {
-          $operator = false !== strpos($condition, '%') ? 'NOT LIKE' : '!=';
-          $condition = substr($condition, 1);
-        }
-        else if (false !== strpos($condition, '%'))
-        {
-          $operator = 'LIKE';
+    /**
+     * Tests a model.
+     *
+     * @param string               $model The model class name
+     * @param array|Doctrine_Query $query A Doctrine_Query object or an array of conditions
+     * @param string               $value The value to test
+     *
+     * @return sfTester|sfTestFunctionalBase
+     */
+    public function check($model, $query, $value = true)
+    {
+        if (null === $query) {
+            $query = Doctrine_Core::getTable($model)
+                ->createQuery('a')
+            ;
         }
 
-        $query->andWhere('a.' . $column . ' ' . $operator . ' ?', $condition);
-      }
-    }
+        if (is_array($query)) {
+            $conditions = $query;
+            $query = $query = Doctrine_Core::getTable($model)
+                ->createQuery('a')
+            ;
+            foreach ($conditions as $column => $condition) {
+                $column = Doctrine_Core::getTable($model)->getFieldName($column);
+
+                if (null === $condition) {
+                    $query->andWhere('a.'.$column.' IS NULL');
+
+                    continue;
+                }
+
+                $operator = '=';
+                if (strlen($condition) && '!' == substr($condition, 0, 1)) {
+                    $operator = false !== strpos($condition, '%') ? 'NOT LIKE' : '!=';
+                    $condition = substr($condition, 1);
+                } elseif (false !== strpos($condition, '%')) {
+                    $operator = 'LIKE';
+                }
+
+                $query->andWhere('a.'.$column.' '.$operator.' ?', $condition);
+            }
+        }
 
-    $objects = $query->execute();
+        $objects = $query->execute();
 
-    if (false === $value)
-    {
-      $this->tester->is(count($objects), 0, sprintf('no %s object that matches the criteria has been found', $model));
-    }
-    else if (true === $value)
-    {
-      $this->tester->cmp_ok(count($objects), '>', 0, sprintf('%s objects that matches the criteria have been found', $model));
-    }
-    else if (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.');
-    }
+        if (false === $value) {
+            $this->tester->is(count($objects), 0, sprintf('no %s object that matches the criteria has been found', $model));
+        } elseif (true === $value) {
+            $this->tester->cmp_ok(count($objects), '>', 0, sprintf('%s objects that matches the criteria have been found', $model));
+        } 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.');
+        }
 
-    return $this->getObjectToReturn();
-  }
-
-  /**
-   * Outputs some debug information about queries run during the current request.
-   *
-   * @param integer|string $limit Either an integer to return the last many queries, a regular expression or a substring to search for
-   */
-  public function debug($limit = null)
-  {
-    if (!$databaseManager = $this->browser->getContext()->getDatabaseManager())
-    {
-      throw new LogicConnection('The current context does not include a database manager.');
+        return $this->getObjectToReturn();
     }
 
-    $events = array();
-    foreach ($databaseManager->getNames() as $name)
+    /**
+     * Outputs some debug information about queries run during the current request.
+     *
+     * @param int|string $limit Either an integer to return the last many queries, a regular expression or a substring to search for
+     */
+    public function debug($limit = null)
     {
-      $database = $databaseManager->getDatabase($name);
-      if ($database instanceof sfDoctrineDatabase && $profiler = $database->getProfiler())
-      {
-        foreach ($profiler->getQueryExecutionEvents() as $event)
-        {
-          $events[$event->getSequence()] = $event;
+        if (!$databaseManager = $this->browser->getContext()->getDatabaseManager()) {
+            throw new LogicConnection('The current context does not include a database manager.');
         }
-      }
-    }
 
-    // sequence events
-    ksort($events);
+        $events = array();
+        foreach ($databaseManager->getNames() as $name) {
+            $database = $databaseManager->getDatabase($name);
+            if ($database instanceof sfDoctrineDatabase && $profiler = $database->getProfiler()) {
+                foreach ($profiler->getQueryExecutionEvents() as $event) {
+                    $events[$event->getSequence()] = $event;
+                }
+            }
+        }
 
-    if (is_integer($limit))
-    {
-      $events = array_slice($events, $limit * -1);
-    }
-    else if (preg_match('/^(!)?([^a-zA-Z0-9\\\\]).+?\\2[ims]?$/', $limit, $match))
-    {
-      if ($match[1] == '!')
-      {
-        $pattern = substr($limit, 1);
-        $match = false;
-      }
-      else
-      {
-        $pattern = $limit;
-        $match = true;
-      }
-    }
-    else if ($limit)
-    {
-      $substring = $limit;
-    }
+        // sequence events
+        ksort($events);
+
+        if (is_integer($limit)) {
+            $events = array_slice($events, $limit * -1);
+        } elseif (preg_match('/^(!)?([^a-zA-Z0-9\\\\]).+?\\2[ims]?$/', $limit, $match)) {
+            if ('!' == $match[1]) {
+                $pattern = substr($limit, 1);
+                $match = false;
+            } else {
+                $pattern = $limit;
+                $match = true;
+            }
+        } elseif ($limit) {
+            $substring = $limit;
+        }
 
-    echo "\nDumping SQL executed in the current context:\n\n";
+        echo "\nDumping SQL executed in the current context:\n\n";
+
+        foreach ($events as $event) {
+            if (
+                (!isset($pattern) && !isset($substring))
+                || (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();
+
+                echo $event->getQuery()."\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";
+            }
+        }
 
-    foreach ($events as $event)
-    {
-      if (
-        (!isset($pattern) && !isset($substring))
-        ||
-        (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();
-
-        echo $event->getQuery()."\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";
-      }
+        exit(1);
     }
-
-    exit(1);
-  }
 }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/validator/sfValidatorDoctrineChoice.class.php b/lib/plugins/sfDoctrinePlugin/lib/validator/sfValidatorDoctrineChoice.class.php
index cfc11c94c..e4148d260 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/validator/sfValidatorDoctrineChoice.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/validator/sfValidatorDoctrineChoice.class.php
@@ -12,120 +12,109 @@
 /**
  * sfValidatorDoctrineChoice validates that the value is one of the rows of a table.
  *
- * @package    symfony
- * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
+ *
  * @version    SVN: $Id$
  */
 class sfValidatorDoctrineChoice extends sfValidatorBase
 {
-  /**
-   * Configures the current validator.
-   *
-   * Available options:
-   *
-   *  * model:      The model class (required)
-   *  * query:      A query to use when retrieving objects
-   *  * column:     The column name (null by default which means we use the primary key)
-   *                must be in field name format
-   *  * multiple:   true if the select tag must allow multiple selections
-   *  * 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
-   */
-  protected function configure($options = array(), $messages = array())
-  {
-    $this->addRequiredOption('model');
-    $this->addOption('query', null);
-    $this->addOption('column', null);
-    $this->addOption('multiple', false);
-    $this->addOption('min');
-    $this->addOption('max');
-
-    $this->addMessage('min', 'At least %min% values must be selected (%count% values selected).');
-    $this->addMessage('max', 'At most %max% values must be selected (%count% values selected).');
-  }
-
-  /**
-   * @see sfValidatorBase
-   */
-  protected function doClean($value)
-  {
-    if ($query = $this->getOption('query'))
+    /**
+     * Configures the current validator.
+     *
+     * Available options:
+     *
+     *  * model:      The model class (required)
+     *  * query:      A query to use when retrieving objects
+     *  * column:     The column name (null by default which means we use the primary key)
+     *                must be in field name format
+     *  * multiple:   true if the select tag must allow multiple selections
+     *  * 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
+     *
+     * @param mixed $options
+     * @param mixed $messages
+     */
+    protected function configure($options = array(), $messages = array())
     {
-      $query = clone $query;
-    }
-    else
-    {
-      $query = Doctrine_Core::getTable($this->getOption('model'))->createQuery();
+        $this->addRequiredOption('model');
+        $this->addOption('query', null);
+        $this->addOption('column', null);
+        $this->addOption('multiple', false);
+        $this->addOption('min');
+        $this->addOption('max');
+
+        $this->addMessage('min', 'At least %min% values must be selected (%count% values selected).');
+        $this->addMessage('max', 'At most %max% values must be selected (%count% values selected).');
     }
 
-    if ($this->getOption('multiple'))
+    /**
+     * @see sfValidatorBase
+     *
+     * @param mixed $value
+     */
+    protected function doClean($value)
     {
-      if (!is_array($value))
-      {
-        $value = array($value);
-      }
+        if ($query = $this->getOption('query')) {
+            $query = clone $query;
+        } else {
+            $query = Doctrine_Core::getTable($this->getOption('model'))->createQuery();
+        }
 
-      if (isset($value[0]) && '' === $value[0])
-      {
-        unset($value[0]);
-      }
+        if ($this->getOption('multiple')) {
+            if (!is_array($value)) {
+                $value = array($value);
+            }
 
-      $count = count($value);
+            if (isset($value[0]) && '' === $value[0]) {
+                unset($value[0]);
+            }
 
-      if ($this->hasOption('min') && $count < $this->getOption('min'))
-      {
-        throw new sfValidatorError($this, 'min', array('count' => $count, 'min' => $this->getOption('min')));
-      }
+            $count = count($value);
 
-      if ($this->hasOption('max') && $count > $this->getOption('max'))
-      {
-        throw new sfValidatorError($this, 'max', array('count' => $count, 'max' => $this->getOption('max')));
-      }
+            if ($this->hasOption('min') && $count < $this->getOption('min')) {
+                throw new sfValidatorError($this, 'min', array('count' => $count, 'min' => $this->getOption('min')));
+            }
 
-      $query->andWhereIn(sprintf('%s.%s', $query->getRootAlias(), $this->getColumn()), $value);
+            if ($this->hasOption('max') && $count > $this->getOption('max')) {
+                throw new sfValidatorError($this, 'max', array('count' => $count, 'max' => $this->getOption('max')));
+            }
 
-      if ($query->count() != count($value))
-      {
-        throw new sfValidatorError($this, 'invalid', array('value' => $value));
-      }
-    }
-    else
-    {
-      $query->andWhere(sprintf('%s.%s = ?', $query->getRootAlias(), $this->getColumn()), $value);
+            $query->andWhereIn(sprintf('%s.%s', $query->getRootAlias(), $this->getColumn()), $value);
 
-      if (!$query->count())
-      {
-        throw new sfValidatorError($this, 'invalid', array('value' => $value));
-      }
-    }
+            if ($query->count() != count($value)) {
+                throw new sfValidatorError($this, 'invalid', array('value' => $value));
+            }
+        } else {
+            $query->andWhere(sprintf('%s.%s = ?', $query->getRootAlias(), $this->getColumn()), $value);
 
-    return $value;
-  }
+            if (!$query->count()) {
+                throw new sfValidatorError($this, 'invalid', array('value' => $value));
+            }
+        }
 
-  /**
-   * Returns the column to use for comparison.
-   *
-   * The primary key is used by default.
-   *
-   * @return string The column name
-   */
-  protected function getColumn()
-  {
-    $table = Doctrine_Core::getTable($this->getOption('model'));
-    if ($this->getOption('column'))
-    {
-      $columnName = $this->getOption('column');
+        return $value;
     }
-    else
+
+    /**
+     * Returns the column to use for comparison.
+     *
+     * The primary key is used by default.
+     *
+     * @return string The column name
+     */
+    protected function getColumn()
     {
-      $identifier = (array) $table->getIdentifier();
-      $columnName = current($identifier);
-    }
+        $table = Doctrine_Core::getTable($this->getOption('model'));
+        if ($this->getOption('column')) {
+            $columnName = $this->getOption('column');
+        } else {
+            $identifier = (array) $table->getIdentifier();
+            $columnName = current($identifier);
+        }
 
-    return $table->getColumnName($columnName);
-  }
+        return $table->getColumnName($columnName);
+    }
 }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/validator/sfValidatorDoctrineUnique.class.php b/lib/plugins/sfDoctrinePlugin/lib/validator/sfValidatorDoctrineUnique.class.php
index ebd4e774b..f709867b9 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/validator/sfValidatorDoctrineUnique.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/validator/sfValidatorDoctrineUnique.class.php
@@ -16,149 +16,145 @@
  * To avoid this issue, wrap the validation process and the model saving
  * inside a transaction.
  *
- * @package    symfony
- * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
+ *
  * @version    SVN: $Id$
  */
 class sfValidatorDoctrineUnique extends sfValidatorSchema
 {
-  /**
-   * Constructor.
-   *
-   * @param array  An array of options
-   * @param array  An array of error messages
-   *
-   * @see sfValidatorSchema
-   */
-  public function __construct($options = array(), $messages = array())
-  {
-    parent::__construct(null, $options, $messages);
-  }
-
-  /**
-   * Configures the current validator.
-   *
-   * Available options:
-   *
-   *  * model:              The model class (required)
-   *  * column:             The unique column name in Doctrine field name format (required)
-   *                        If the uniquess is for several columns, you can pass an array of field names
-   *  * primary_key:        The primary key column name in Doctrine field name format (optional, will be introspected if not provided)
-   *                        You can also pass an array if the table has several primary keys
-   *  * 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
-   */
-  protected function configure($options = array(), $messages = array())
-  {
-    $this->addRequiredOption('model');
-    $this->addRequiredOption('column');
-    $this->addOption('primary_key', null);
-    $this->addOption('connection', null);
-    $this->addOption('throw_global_error', false);
-
-    $this->setMessage('invalid', 'An object with the same "%column%" already exist.');
-  }
-
-  /**
-   * @see sfValidatorBase
-   */
-  protected function doClean($values)
-  {
-    $originalValues = $values;
-    $table = Doctrine_Core::getTable($this->getOption('model'));
-    if (!is_array($this->getOption('column')))
+    /**
+     * Constructor.
+     *
+     * @param array  An array of options
+     * @param array  An array of error messages
+     * @param mixed $options
+     * @param mixed $messages
+     *
+     * @see sfValidatorSchema
+     */
+    public function __construct($options = array(), $messages = array())
     {
-      $this->setOption('column', array($this->getOption('column')));
+        parent::__construct(null, $options, $messages);
     }
 
-    //if $values isn't an array, make it one
-    if (!is_array($values))
+    /**
+     * Configures the current validator.
+     *
+     * Available options:
+     *
+     *  * model:              The model class (required)
+     *  * column:             The unique column name in Doctrine field name format (required)
+     *                        If the uniquess is for several columns, you can pass an array of field names
+     *  * primary_key:        The primary key column name in Doctrine field name format (optional, will be introspected if not provided)
+     *                        You can also pass an array if the table has several primary keys
+     *  * 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
+     *
+     * @param mixed $options
+     * @param mixed $messages
+     */
+    protected function configure($options = array(), $messages = array())
     {
-      //use first column for key
-      $columns = $this->getOption('column');
-      $values = array($columns[0] => $values);
+        $this->addRequiredOption('model');
+        $this->addRequiredOption('column');
+        $this->addOption('primary_key', null);
+        $this->addOption('connection', null);
+        $this->addOption('throw_global_error', false);
+
+        $this->setMessage('invalid', 'An object with the same "%column%" already exist.');
     }
 
-    $q = Doctrine_Core::getTable($this->getOption('model'))->createQuery('a');
-    foreach ($this->getOption('column') as $column)
+    /**
+     * @see sfValidatorBase
+     *
+     * @param mixed $values
+     */
+    protected function doClean($values)
     {
-      $colName = $table->getColumnName($column);
-      if (!array_key_exists($column, $values))
-      {
-        // one of the column has be removed from the form
-        return $originalValues;
-      }
-
-      $q->addWhere('a.' . $colName . ' = ?', $values[$column]);
-    }
+        $originalValues = $values;
+        $table = Doctrine_Core::getTable($this->getOption('model'));
+        if (!is_array($this->getOption('column'))) {
+            $this->setOption('column', array($this->getOption('column')));
+        }
 
-    $object = $q->fetchOne();
+        // 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);
+        }
 
-    // if no object or if we're updating the object, it's ok
-    if (!$object || $this->isUpdate($object, $values))
-    {
-      return $originalValues;
-    }
+        $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)) {
+                // one of the column has be removed from the form
+                return $originalValues;
+            }
 
-    $error = new sfValidatorError($this, 'invalid', array('column' => implode(', ', $this->getOption('column'))));
+            $q->addWhere('a.'.$colName.' = ?', $values[$column]);
+        }
 
-    if ($this->getOption('throw_global_error'))
-    {
-      throw $error;
-    }
+        $object = $q->fetchOne();
 
-    $columns = $this->getOption('column');
-
-    $errorSchema = new sfValidatorErrorSchema($this);
-    $errorSchema->addError($error, $columns[0]);
-
-    throw $errorSchema;
-  }
-
-  /**
-   * Returns whether the object is being updated.
-   *
-   * @param BaseObject  A Doctrine object
-   * @param array       An array of values
-   *
-   * @param Boolean     true if the object is being updated, false otherwise
-   */
-  protected function isUpdate(Doctrine_Record $object, $values)
-  {
-    // check each primary key column
-    foreach ($this->getPrimaryKeys() as $column)
-    {
-      if (!isset($values[$column]) || $object->$column != $values[$column])
-      {
-        return false;
-      }
+        // if no object or if we're updating the object, it's ok
+        if (!$object || $this->isUpdate($object, $values)) {
+            return $originalValues;
+        }
+
+        $error = new sfValidatorError($this, 'invalid', array('column' => implode(', ', $this->getOption('column'))));
+
+        if ($this->getOption('throw_global_error')) {
+            throw $error;
+        }
+
+        $columns = $this->getOption('column');
+
+        $errorSchema = new sfValidatorErrorSchema($this);
+        $errorSchema->addError($error, $columns[0]);
+
+        throw $errorSchema;
     }
 
-    return true;
-  }
-
-  /**
-   * Returns the primary keys for the model.
-   *
-   * @return array An array of primary keys
-   */
-  protected function getPrimaryKeys()
-  {
-    if (null === $this->getOption('primary_key'))
+    /**
+     * Returns whether the object is being updated.
+     *
+     * @param BaseObject  A Doctrine object
+     * @param array       An array of values
+     * @param bool     true if the object is being updated, false otherwise
+     * @param mixed $values
+     */
+    protected function isUpdate(Doctrine_Record $object, $values)
     {
-      $primaryKeys = Doctrine_Core::getTable($this->getOption('model'))->getIdentifier();
-      $this->setOption('primary_key', $primaryKeys);
+        // check each primary key column
+        foreach ($this->getPrimaryKeys() as $column) {
+            if (!isset($values[$column]) || $object->{$column} != $values[$column]) {
+                return false;
+            }
+        }
+
+        return true;
     }
 
-    if (!is_array($this->getOption('primary_key')))
+    /**
+     * Returns the primary keys for the model.
+     *
+     * @return array An array of primary keys
+     */
+    protected function getPrimaryKeys()
     {
-      $this->setOption('primary_key', array($this->getOption('primary_key')));
-    }
+        if (null === $this->getOption('primary_key')) {
+            $primaryKeys = Doctrine_Core::getTable($this->getOption('model'))->getIdentifier();
+            $this->setOption('primary_key', $primaryKeys);
+        }
 
-    return $this->getOption('primary_key');
-  }
+        if (!is_array($this->getOption('primary_key'))) {
+            $this->setOption('primary_key', array($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 7a43456a7..8157cfa73 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/widget/sfWidgetFormDoctrineArrayChoice.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/widget/sfWidgetFormDoctrineArrayChoice.class.php
@@ -12,74 +12,75 @@
 /**
  * sfWidgetFormDoctrineArrayChoice represents a choice widget for a model and table_method.
  *
- * @package    symfony
- * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
+ *
  * @version    SVN: $Id$
  */
 class sfWidgetFormDoctrineArrayChoice extends sfWidgetFormChoice
 {
-  /**
-   * @see sfWidget
-   */
-  public function __construct($options = array(), $attributes = array())
-  {
-    $options['choices'] = array();
-
-    parent::__construct($options, $attributes);
-  }
-
-  /**
-   * Constructor.
-   *
-   * Available options:
-   *
-   *  * model:                The model class (required)
-   *  * table_method:         A method to return a formatted array of key => value (required)
-   *  * table_method_params:  An array of parameters to pass to the table_method
-   *  * add_empty:            Whether to add a first empty value or not (false by default)
-   *                          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
-   */
-  protected function configure($options = array(), $attributes = array())
-  {
-    $this->addRequiredOption('model');
-    $this->addRequiredOption('table_method');
-    $this->addOption('table_method_params', null);
-    $this->addOption('add_empty', false);
-    $this->addOption('multiple', false);
+    /**
+     * @see sfWidget
+     *
+     * @param mixed $options
+     * @param mixed $attributes
+     */
+    public function __construct($options = array(), $attributes = array())
+    {
+        $options['choices'] = array();
 
-    parent::configure($options, $attributes);
-  }
+        parent::__construct($options, $attributes);
+    }
 
-  /**
-   * Returns the choices builded by the table method of the model.
-   *
-   * @return array An array of choices
-   */
-  public function getChoices()
-  {
-    $choices = array();
-    if (false !== $this->getOption('add_empty'))
+    /**
+     * Returns the choices builded by the table method of the model.
+     *
+     * @return array An array of choices
+     */
+    public function getChoices()
     {
-      $choices[''] = true === $this->getOption('add_empty') ? '' : $this->translate($this->getOption('add_empty'));
-    }
+        $choices = array();
+        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'));
+        $tableMethod = $this->getOption('table_method');
+        $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);
+        if (null !== $params = $this->getOption('table_method_params')) {
+            $choices += call_user_func_array(array($table, $tableMethod), (array) $params);
+        } else {
+            $choices += $table->{$tableMethod}();
+        }
+
+        return $choices;
     }
-    else
+
+    /**
+     * Constructor.
+     *
+     * Available options:
+     *
+     *  * model:                The model class (required)
+     *  * table_method:         A method to return a formatted array of key => value (required)
+     *  * table_method_params:  An array of parameters to pass to the table_method
+     *  * add_empty:            Whether to add a first empty value or not (false by default)
+     *                          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
+     *
+     * @param mixed $options
+     * @param mixed $attributes
+     */
+    protected function configure($options = array(), $attributes = array())
     {
-      $choices += $table->$tableMethod();
-    }
+        $this->addRequiredOption('model');
+        $this->addRequiredOption('table_method');
+        $this->addOption('table_method_params', null);
+        $this->addOption('add_empty', false);
+        $this->addOption('multiple', false);
 
-    return $choices;
-  }
+        parent::configure($options, $attributes);
+    }
 }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/widget/sfWidgetFormDoctrineChoice.class.php b/lib/plugins/sfDoctrinePlugin/lib/widget/sfWidgetFormDoctrineChoice.class.php
index 0523f2298..c95252e45 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/widget/sfWidgetFormDoctrineChoice.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/widget/sfWidgetFormDoctrineChoice.class.php
@@ -12,111 +12,103 @@
 /**
  * sfWidgetFormDoctrineChoice represents a choice widget for a model.
  *
- * @package    symfony
- * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
+ *
  * @version    SVN: $Id$
  */
 class sfWidgetFormDoctrineChoice extends sfWidgetFormChoice
 {
-  /**
-   * @see sfWidget
-   */
-  public function __construct($options = array(), $attributes = array())
-  {
-    $options['choices'] = array();
+    /**
+     * @see sfWidget
+     *
+     * @param mixed $options
+     * @param mixed $attributes
+     */
+    public function __construct($options = array(), $attributes = array())
+    {
+        $options['choices'] = array();
 
-    parent::__construct($options, $attributes);
-  }
+        parent::__construct($options, $attributes);
+    }
 
-  /**
-   * Constructor.
-   *
-   * Available options:
-   *
-   *  * model:        The model class (required)
-   *  * add_empty:    Whether to add a first empty value or not (false by default)
-   *                  If the option is not a Boolean, the value will be used as the text value
-   *  * method:       The method to use to display object values (__toString by default)
-   *  * key_method:   The method to use to display the object keys (getPrimaryKey by default)
-   *  * order_by:     An array composed of two fields:
-   *                    * The column to order by the results (must be in the PhpName format)
-   *                    * asc or desc
-   *  * query:        A query to use when retrieving objects
-   *  * 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
-   */
-  protected function configure($options = array(), $attributes = array())
-  {
-    $this->addRequiredOption('model');
-    $this->addOption('add_empty', false);
-    $this->addOption('method', '__toString');
-    $this->addOption('key_method', 'getPrimaryKey');
-    $this->addOption('order_by', null);
-    $this->addOption('query', null);
-    $this->addOption('multiple', false);
-    $this->addOption('table_method', null);
+    /**
+     * Returns the choices associated to the model.
+     *
+     * @return array An array of choices
+     */
+    public function getChoices()
+    {
+        $choices = array();
+        if (false !== $this->getOption('add_empty')) {
+            $choices[''] = true === $this->getOption('add_empty') ? '' : $this->translate($this->getOption('add_empty'));
+        }
 
-    parent::configure($options, $attributes);
-  }
+        if (null === $this->getOption('table_method')) {
+            $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}();
 
-  /**
-   * Returns the choices associated to the model.
-   *
-   * @return array An array of choices
-   */
-  public function getChoices()
-  {
-    $choices = array();
-    if (false !== $this->getOption('add_empty'))
-    {
-      $choices[''] = true === $this->getOption('add_empty') ? '' : $this->translate($this->getOption('add_empty'));
-    }
+            if ($results instanceof Doctrine_Query) {
+                $objects = $results->execute();
+            } elseif ($results instanceof Doctrine_Collection) {
+                $objects = $results;
+            } elseif ($results instanceof Doctrine_Record) {
+                $objects = new Doctrine_Collection($this->getOption('model'));
+                $objects[] = $results;
+            } else {
+                $objects = array();
+            }
+        }
 
-    if (null === $this->getOption('table_method'))
-    {
-      $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();
+        $method = $this->getOption('method');
+        $keyMethod = $this->getOption('key_method');
 
-      if ($results instanceof Doctrine_Query)
-      {
-        $objects = $results->execute();
-      }
-      else if ($results instanceof Doctrine_Collection)
-      {
-        $objects = $results;
-      }
-      else if ($results instanceof Doctrine_Record)
-      {
-        $objects = new Doctrine_Collection($this->getOption('model'));
-        $objects[] = $results;
-      }
-      else
-      {
-        $objects = array();
-      }
-    }
+        foreach ($objects as $object) {
+            $choices[$object->{$keyMethod}()] = $object->{$method}();
+        }
 
-    $method = $this->getOption('method');
-    $keyMethod = $this->getOption('key_method');
+        return $choices;
+    }
 
-    foreach ($objects as $object)
+    /**
+     * Constructor.
+     *
+     * Available options:
+     *
+     *  * model:        The model class (required)
+     *  * add_empty:    Whether to add a first empty value or not (false by default)
+     *                  If the option is not a Boolean, the value will be used as the text value
+     *  * method:       The method to use to display object values (__toString by default)
+     *  * key_method:   The method to use to display the object keys (getPrimaryKey by default)
+     *  * order_by:     An array composed of two fields:
+     *                    * The column to order by the results (must be in the PhpName format)
+     *                    * asc or desc
+     *  * query:        A query to use when retrieving objects
+     *  * 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
+     *
+     * @param mixed $options
+     * @param mixed $attributes
+     */
+    protected function configure($options = array(), $attributes = array())
     {
-      $choices[$object->$keyMethod()] = $object->$method();
-    }
+        $this->addRequiredOption('model');
+        $this->addOption('add_empty', false);
+        $this->addOption('method', '__toString');
+        $this->addOption('key_method', 'getPrimaryKey');
+        $this->addOption('order_by', null);
+        $this->addOption('query', null);
+        $this->addOption('multiple', false);
+        $this->addOption('table_method', null);
 
-    return $choices;
-  }
-}
\ No newline at end of file
+        parent::configure($options, $attributes);
+    }
+}
diff --git a/lib/plugins/sfDoctrinePlugin/test/bin/coverage.php b/lib/plugins/sfDoctrinePlugin/test/bin/coverage.php
index 8b509905f..f3f3b3321 100644
--- a/lib/plugins/sfDoctrinePlugin/test/bin/coverage.php
+++ b/lib/plugins/sfDoctrinePlugin/test/bin/coverage.php
@@ -10,8 +10,9 @@
 
 define('SYMFONY_LIB_DIR', realpath(dirname(__FILE__).'/../../../..'));
 
-require(SYMFONY_LIB_DIR.'/vendor/lime/lime.php');
-require(SYMFONY_LIB_DIR.'/util/sfFinder.class.php');
+require SYMFONY_LIB_DIR.'/vendor/lime/lime.php';
+
+require SYMFONY_LIB_DIR.'/util/sfFinder.class.php';
 
 $h = new lime_harness();
 $h->base_dir = realpath(dirname(__FILE__).'/..');
@@ -31,4 +32,4 @@
 
 $finder = sfFinder::type('file')->name('*.php')->prune('vendor')->prune('test')->prune('data');
 $c->register($finder->in($c->base_dir));
-$c->run();
\ No newline at end of file
+$c->run();
diff --git a/lib/plugins/sfDoctrinePlugin/test/bin/prove.php b/lib/plugins/sfDoctrinePlugin/test/bin/prove.php
index a50d9528b..1a9f51a3a 100644
--- a/lib/plugins/sfDoctrinePlugin/test/bin/prove.php
+++ b/lib/plugins/sfDoctrinePlugin/test/bin/prove.php
@@ -10,17 +10,18 @@
 
 define('SYMFONY_LIB_DIR', realpath(dirname(__FILE__).'/../../../..'));
 
-require(SYMFONY_LIB_DIR.'/vendor/lime/lime.php');
-require(SYMFONY_LIB_DIR.'/util/sfFinder.class.php');
+require SYMFONY_LIB_DIR.'/vendor/lime/lime.php';
+
+require SYMFONY_LIB_DIR.'/util/sfFinder.class.php';
 
 $h = new lime_harness();
 $h->base_dir = realpath(dirname(__FILE__).'/..');
 
 $h->register(sfFinder::type('file')->prune('fixtures')->name('*Test.php')->in(array(
-  // unit tests
-  $h->base_dir.'/unit',
-  // functional tests
-  $h->base_dir.'/functional'
+    // unit tests
+    $h->base_dir.'/unit',
+    // functional tests
+    $h->base_dir.'/functional',
 )));
 
-exit($h->run() ? 0 : 1);
\ No newline at end of file
+exit($h->run() ? 0 : 1);
diff --git a/lib/plugins/sfDoctrinePlugin/test/bootstrap/functional.php b/lib/plugins/sfDoctrinePlugin/test/bootstrap/functional.php
index 86028cc81..046c1da15 100644
--- a/lib/plugins/sfDoctrinePlugin/test/bootstrap/functional.php
+++ b/lib/plugins/sfDoctrinePlugin/test/bootstrap/functional.php
@@ -8,11 +8,10 @@
  * file that was distributed with this source code.
  */
 
-include(dirname(__FILE__).'/../../../../../test/bootstrap/unit.php');
+include dirname(__FILE__).'/../../../../../test/bootstrap/unit.php';
 
-if (!isset($root_dir))
-{
-  $root_dir = realpath(dirname(__FILE__).sprintf('/../%s/fixtures', isset($type) ? $type : 'functional'));
+if (!isset($root_dir)) {
+    $root_dir = realpath(dirname(__FILE__).sprintf('/../%s/fixtures', isset($type) ? $type : 'functional'));
 }
 
 include $root_dir.'/config/ProjectConfiguration.class.php';
@@ -24,33 +23,28 @@
 register_shutdown_function('sf_functional_test_shutdown');
 
 $configuration->initializeDoctrine();
-if (isset($fixtures))
-{
-  $configuration->loadFixtures($fixtures);
+if (isset($fixtures)) {
+    $configuration->loadFixtures($fixtures);
 }
 
 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');
-  foreach ($databases as $database)
-  {
-    unlink($database);
-  }
+    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);
+    }
 }
 
 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)
-  {
-    echo $e.PHP_EOL;
-  }
+    // try/catch needed due to http://bugs.php.net/bug.php?id=33598
+    try {
+        sf_functional_test_shutdown_cleanup();
+    } catch (Exception $e) {
+        echo $e.PHP_EOL;
+    }
 }
 
-return true;
\ No newline at end of file
+return true;
diff --git a/lib/plugins/sfDoctrinePlugin/test/bootstrap/unit.php b/lib/plugins/sfDoctrinePlugin/test/bootstrap/unit.php
index 32de29825..8514daad2 100644
--- a/lib/plugins/sfDoctrinePlugin/test/bootstrap/unit.php
+++ b/lib/plugins/sfDoctrinePlugin/test/bootstrap/unit.php
@@ -3,16 +3,16 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-include(dirname(__FILE__).'/../../../../../test/bootstrap/unit.php');
+include dirname(__FILE__).'/../../../../../test/bootstrap/unit.php';
 
-include(dirname(__FILE__).'/../../../../autoload/sfSimpleAutoload.class.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->addDirectory(realpath(dirname(__FILE__).'/../../lib'));
 $autoload->register();
 
-$_test_dir = realpath(dirname(__FILE__).'/..');
\ No newline at end of file
+$_test_dir = realpath(dirname(__FILE__).'/..');
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/ActionRedirectTest.php b/lib/plugins/sfDoctrinePlugin/test/functional/ActionRedirectTest.php
index 6ffcefad2..16e76d095 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/ActionRedirectTest.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/ActionRedirectTest.php
@@ -3,24 +3,25 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 $app = 'frontend';
 $fixtures = 'fixtures';
-require_once(dirname(__FILE__).'/../bootstrap/functional.php');
+
+require_once dirname(__FILE__).'/../bootstrap/functional.php';
 
 $browser = new sfTestFunctional(new sfBrowser());
 
 $browser->get('/articles/redirectToShow')
-  ->with('response')->begin()
+    ->with('response')->begin()
     ->isRedirected()
-  ->end()
-  ->followRedirect()
-  ->with('request')->begin()
+    ->end()
+    ->followRedirect()
+    ->with('request')->begin()
     ->isParameter('module', 'articles')
     ->isParameter('action', 'show')
-  ->end()
+    ->end()
 ;
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/AdminGenBrowser.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/AdminGenBrowser.class.php
index cb29fe83e..bf778c6bd 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/AdminGenBrowser.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/AdminGenBrowser.class.php
@@ -1,296 +1,283 @@
 <?php
+
 class AdminGenBrowser extends sfTestBrowser
 {
-  protected $_modules = array('Article'       => 'articles',
-                              'Author'        => 'authors',
-                              'Subscription'  => 'subscriptions',
-                              'User'          => 'users');
-
-  public function __construct()
-  {
-    parent::__construct();
-    $this->setTester('doctrine', 'sfTesterDoctrine');
+    protected $_modules = array('Article' => 'articles',
+        'Author' => 'authors',
+        'Subscription' => 'subscriptions',
+        'User' => 'users');
 
-    $this->_generateAdminGenModules();
-  }
+    public function __construct()
+    {
+        parent::__construct();
+        $this->setTester('doctrine', 'sfTesterDoctrine');
 
-  public function runTests()
-  {
-    $this->info('Run sfDoctrinePlugin Admin Generator Tests');
+        $this->_generateAdminGenModules();
+    }
 
-    $methods = get_class_methods($this);
-    foreach ($methods as $method)
+    public function __destruct()
     {
-      if (substr($method, 0, 5) == '_test')
-      {
-        $this->$method();
-      }
+        $this->_cleanupAdminGenModules();
     }
-  }
 
-  protected function _testValidSort()
-  {
-    $this->info('Test valid sort parameter');
+    public function runTests()
+    {
+        $this->info('Run sfDoctrinePlugin Admin Generator Tests');
 
-    $this->get('/users?sort=username');
+        $methods = get_class_methods($this);
+        foreach ($methods as $method) {
+            if ('_test' == substr($method, 0, 5)) {
+                $this->{$method}();
+            }
+        }
+    }
 
-    $matches = 0;
-    foreach ($this->_getQueryExecutionEvents() as $event)
+    protected function _testValidSort()
     {
-      if (false !== strpos($event->getQuery(), 'ORDER BY u.username asc'))
-      {
-        ++$matches;
-      }
-    }
+        $this->info('Test valid sort parameter');
 
-    $this->test()->is($matches, 1);
-  }
+        $this->get('/users?sort=username');
 
-  protected function _testInvalidSort()
-  {
-    $this->info('Test invalid sort parameter');
+        $matches = 0;
+        foreach ($this->_getQueryExecutionEvents() as $event) {
+            if (false !== strpos($event->getQuery(), 'ORDER BY u.username asc')) {
+                ++$matches;
+            }
+        }
 
-    $this->get('/users?sort=INVALID');
+        $this->test()->is($matches, 1);
+    }
 
-    // there should be no queries that match "INVALID"
-    foreach ($this->_getQueryExecutionEvents() as $event)
+    protected function _testInvalidSort()
     {
-      $this->test()->unlike($event->getQuery(), '/INVALID/');
-    }
-  }
+        $this->info('Test invalid sort parameter');
 
-  protected function _testValidSortType()
-  {
-    $this->info('Test valid sort_type parameter');
+        $this->get('/users?sort=INVALID');
 
-    foreach (array('asc', 'desc', 'ASC', 'DESC') as $sortType)
+        // there should be no queries that match "INVALID"
+        foreach ($this->_getQueryExecutionEvents() as $event) {
+            $this->test()->unlike($event->getQuery(), '/INVALID/');
+        }
+    }
+
+    protected function _testValidSortType()
     {
-      $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))
-        {
-          ++$matches;
+        $this->info('Test valid sort_type parameter');
+
+        foreach (array('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)) {
+                    ++$matches;
+                }
+            }
+
+            $this->test()->is($matches, 1);
         }
-      }
+    }
+
+    protected function _testInvalidSortType()
+    {
+        $this->info('Test invalid sort_type parameter');
+
+        $this->get('/users?sort=username&sort_type=INVALID');
 
-      $this->test()->is($matches, 1);
+        // there should be no queries that match "INVALID"
+        foreach ($this->_getQueryExecutionEvents() as $event) {
+            $this->test()->unlike($event->getQuery(), '/INVALID/');
+        }
     }
-  }
 
-  protected function _testInvalidSortType()
-  {
-    $this->info('Test invalid sort_type parameter');
+    protected function _testSanityCheck()
+    {
+        $this->info('Admin Generator Sanity Checks');
 
-    $this->get('/users?sort=username&sort_type=INVALID');
+        foreach ($this->_modules as $model => $module) {
+            $this->_runAdminGenModuleSanityCheck($model, $module);
+        }
+    }
 
-    // there should be no queries that match "INVALID"
-    foreach ($this->_getQueryExecutionEvents() as $event)
+    protected function _testAdminGenTableMethod()
     {
-      $this->test()->unlike($event->getQuery(), '/INVALID/');
+        $this->
+          get('/my_articles')->
+          with('response')->isStatusCode('200')
+        ;
     }
-  }
 
-  protected function _testSanityCheck()
-  {
-    $this->info('Admin Generator Sanity Checks');
+    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'));
+
+        $this->
+          get('/articles/new')->
+            with('response')->begin()->
+              matches('/En/')->
+              matches('/Fr/')->
+              matches('/Title/')->
+              matches('/Body/')->
+              matches('/Slug/')->
+              matches('/Jonathan H. Wage/')->
+              matches('/Fabien POTENCIER/')->
+            end()->
+            with('request')->begin()->
+              isParameter('module', 'articles')->
+              isParameter('action', 'new')->
+            end()->
+          click('Save', array('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'))->
+            end()
+        ;
+    }
 
-    foreach ($this->_modules as $model => $module)
+    protected function _testEnumDropdown()
     {
-      $this->_runAdminGenModuleSanityCheck($model, $module);
+        $this->info('Test enum column type uses a dropdown as the widget');
+
+        $this->
+          get('/subscriptions/new')->
+            with('response')->begin()->
+              checkElement('select', '/^New\R?Active\R?Pending\R?Expired\R?$/m')->
+            end()
+        ;
     }
-  }
-
-  protected function _testAdminGenTableMethod()
-  {
-    $this->
-      get('/my_articles')->
-      with('response')->isStatusCode('200')
-    ;
-  }
-
-  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'));
-
-    $this->
-      get('/articles/new')->
-        with('response')->begin()->
-          matches('/En/')->
-          matches('/Fr/')->
-          matches('/Title/')->
-          matches('/Body/')->
-          matches('/Slug/')->
-          matches('/Jonathan H. Wage/')->
-          matches('/Fabien POTENCIER/')->
-        end()->
-        with('request')->begin()->
-          isParameter('module', 'articles')->
-          isParameter('action', 'new')->
-        end()->
-      click('Save', array('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'))->
-        end()
-    ;
-  }
-
-  protected function _testEnumDropdown()
-  {
-    $this->info('Test enum column type uses a dropdown as the widget');
-
-    $this->
-      get('/subscriptions/new')->
-        with('response')->begin()->
-          checkElement('select', '/^New\R?Active\R?Pending\R?Expired\R?$/m')->
-        end()
-    ;
-  }
-
-  protected function _testUserEmbedsProfileForm()
-  {
-    $this->info('Test user form embeds the profile form');
-
-    $this->
-      get('/users/new')->
-        with('response')->begin()->
-          matches('/Profile/')->
-          matches('/First name/')->
-          matches('/Last name/')->
-        end()
-    ;
-
-    $this->info('Test the Profile form saves and attached to user properly');
-
-    $userInfo = array(
-      'user' => array(
-        'username'         => 'test',
-        'password'         => 'test',
-        'groups_list'      => array(1, 2),
-        'permissions_list' => array(3, 4),
-        'Profile'  => array(
-          'first_name' => 'Test',
-          'last_name'  => 'Test'
-        )
-      )
-    );
-
-    $this->click('Save', $userInfo);
-
-    $user = Doctrine_Core::getTable('User')->findOneByUsername($userInfo['user']['username']);
-    $userInfo['user']['Profile']['user_id'] = $user->id;
-
-    $this->
-        with('response')->begin()->
-          isRedirected()->
-          followRedirect()->
-        end()->
-        with('doctrine')->begin()->
-          check('User', array('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))->
-        end()
-    ;
-
-    unset($userInfo['user']['Profile']['user_id']);
-    $tester = $this->get('/users/new')->
-      click('Save', $userInfo)->
-      with('form')->begin();
-    $tester->hasErrors();
-    $form = $tester->getForm();
-    $this->test()->is((string) $form->getErrorSchema(), 'username [An object with the same "username" already exist.]', 'Check username gives unique error');
-    $tester->end();
-  }
-
-  protected function _runAdminGenModuleSanityCheck($model, $module)
-  {
-    $this->info('Running admin gen sanity check for module "' . $module . '"');
-    $record = Doctrine_Core::getTable($model)
-      ->createQuery('a')
-      ->fetchOne();
-
-    $this->
-      info('Sanity check on "' . $module . '" module')->
-      getAndCheck($module, 'index', '/' . $module)->
-      get('/' . $module . '/' . $record->getId() . '/edit');
-
-    $this
-      ->click('Save')->
-        with('response')->begin()->
-          isRedirected()->
-          followRedirect()->
-        end()
-    ;
-  }
-
-  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));
-  }
-
-  protected function _generateAdminGenModules()
-  {
-    // $task = new sfDoctrineBuildAllReloadTask($this->getContext()->getEventDispatcher(), new sfFormatter());
-    // $task->run(array(), array('--no-confirmation'));
-
-    // Generate the admin generator modules
-    foreach ($this->_modules as $model => $module)
+
+    protected function _testUserEmbedsProfileForm()
     {
-      $this->_generateAdminGenModule($model, $module);
+        $this->info('Test user form embeds the profile form');
+
+        $this->
+          get('/users/new')->
+            with('response')->begin()->
+              matches('/Profile/')->
+              matches('/First name/')->
+              matches('/Last name/')->
+            end()
+        ;
+
+        $this->info('Test the Profile form saves and attached to user properly');
+
+        $userInfo = array(
+            'user' => array(
+                'username' => 'test',
+                'password' => 'test',
+                'groups_list' => array(1, 2),
+                'permissions_list' => array(3, 4),
+                'Profile' => array(
+                    'first_name' => 'Test',
+                    'last_name' => 'Test',
+                ),
+            ),
+        );
+
+        $this->click('Save', $userInfo);
+
+        $user = Doctrine_Core::getTable('User')->findOneByUsername($userInfo['user']['username']);
+        $userInfo['user']['Profile']['user_id'] = $user->id;
+
+        $this->
+            with('response')->begin()->
+              isRedirected()->
+              followRedirect()->
+            end()->
+            with('doctrine')->begin()->
+              check('User', array('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))->
+            end()
+        ;
+
+        unset($userInfo['user']['Profile']['user_id']);
+        $tester = $this->get('/users/new')->
+          click('Save', $userInfo)->
+          with('form')->begin();
+        $tester->hasErrors();
+        $form = $tester->getForm();
+        $this->test()->is((string) $form->getErrorSchema(), 'username [An object with the same "username" already exist.]', 'Check username gives unique error');
+        $tester->end();
     }
-  }
 
-  protected function _cleanupAdminGenModules()
-  {
-    $fs = new sfFilesystem($this->getContext()->getEventDispatcher(), new sfFormatter());
-    foreach ($this->_modules as $module)
+    protected function _runAdminGenModuleSanityCheck($model, $module)
     {
-      $this->info('Removing admin gen module "' . $module . '"');
-      $fs->execute('rm -rf ' . sfConfig::get('sf_app_module_dir') . '/' . $module);
+        $this->info('Running admin gen sanity check for module "'.$module.'"');
+        $record = Doctrine_Core::getTable($model)
+            ->createQuery('a')
+            ->fetchOne()
+        ;
+
+        $this->
+          info('Sanity check on "'.$module.'" module')->
+          getAndCheck($module, 'index', '/'.$module)->
+          get('/'.$module.'/'.$record->getId().'/edit');
+
+        $this
+            ->click('Save')->
+            with('response')->begin()->
+              isRedirected()->
+              followRedirect()->
+            end()
+        ;
     }
-    $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();
+    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));
+    }
 
-    $databaseManager = $this->browser->getContext()->getDatabaseManager();
-    foreach ($databaseManager->getNames() as $name)
+    protected function _generateAdminGenModules()
     {
-      $database = $databaseManager->getDatabase($name);
-      if ($database instanceof sfDoctrineDatabase && $profiler = $database->getProfiler())
-      {
-        foreach ($profiler->getQueryExecutionEvents() as $event)
-        {
-          $events[$event->getSequence()] = $event;
+        // $task = new sfDoctrineBuildAllReloadTask($this->getContext()->getEventDispatcher(), new sfFormatter());
+        // $task->run(array(), array('--no-confirmation'));
+
+        // Generate the admin generator modules
+        foreach ($this->_modules as $model => $module) {
+            $this->_generateAdminGenModule($model, $module);
         }
-      }
     }
 
-    ksort($events);
+    protected function _cleanupAdminGenModules()
+    {
+        $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_test_dir').'/functional/backend');
+        $fs->execute('rm -rf '.sfConfig::get('sf_data_dir').'/*.sqlite');
+    }
 
-    return array_values($events);
-  }
+    protected function _getQueryExecutionEvents()
+    {
+        $events = array();
+
+        $databaseManager = $this->browser->getContext()->getDatabaseManager();
+        foreach ($databaseManager->getNames() as $name) {
+            $database = $databaseManager->getDatabase($name);
+            if ($database instanceof sfDoctrineDatabase && $profiler = $database->getProfiler()) {
+                foreach ($profiler->getQueryExecutionEvents() as $event) {
+                    $events[$event->getSequence()] = $event;
+                }
+            }
+        }
 
-  public function __destruct()
-  {
-    $this->_cleanupAdminGenModules();
-  }
+        ksort($events);
+
+        return array_values($events);
+    }
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/AdminGenTest.php b/lib/plugins/sfDoctrinePlugin/test/functional/AdminGenTest.php
index 3e9ecb85a..6728f62e0 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/AdminGenTest.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/AdminGenTest.php
@@ -3,15 +3,17 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 $app = 'backend';
 $fixtures = 'fixtures';
-require_once(dirname(__FILE__).'/../bootstrap/functional.php');
-require_once(dirname(__FILE__).'/AdminGenBrowser.class.php');
+
+require_once dirname(__FILE__).'/../bootstrap/functional.php';
+
+require_once dirname(__FILE__).'/AdminGenBrowser.class.php';
 
 $b = new AdminGenBrowser();
-$b->runTests();
\ No newline at end of file
+$b->runTests();
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/EnvironmentSetupTest.php b/lib/plugins/sfDoctrinePlugin/test/functional/EnvironmentSetupTest.php
index a9c35458d..804898925 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/EnvironmentSetupTest.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/EnvironmentSetupTest.php
@@ -3,20 +3,22 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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';
-require_once(dirname(__FILE__).'/../bootstrap/functional.php');
+
+require_once dirname(__FILE__).'/../bootstrap/functional.php';
 
 $t = new lime_test(12);
 
 // Make sure Author records were populated properly
 $q = Doctrine_Query::create()
-  ->from('Author a');
+    ->from('Author a')
+;
 $results = $q->fetchArray();
 
 $t->is(count($results), 2);
@@ -25,8 +27,9 @@
 
 // Make sure data fixtures were loaded
 $q = Doctrine_Query::create()
-  ->from('Article a')
-  ->leftJoin('a.Translation t');
+    ->from('Article a')
+    ->leftJoin('a.Translation t')
+;
 
 $articles = $q->fetchArray();
 $t->is($articles[0]['Translation']['en']['title'], 'English Title');
@@ -38,9 +41,9 @@
 
 // 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);
@@ -53,4 +56,4 @@
 
 $article = new ReflectionClass('Article');
 $parent = new ReflectionClass('myDoctrineRecord');
-$t->is($article->isSubclassOf($parent), true);
\ No newline at end of file
+$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 aaad73dc2..a58b7a128 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/FormGeneratorTest.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/FormGeneratorTest.php
@@ -3,25 +3,25 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 $app = 'backend';
 $fixtures = 'fixtures';
-require_once(dirname(__FILE__).'/../bootstrap/functional.php');
+
+require_once dirname(__FILE__).'/../bootstrap/functional.php';
 
 $t = new lime_test(41);
 
 $t->diag("Test that these models don't generate forms or filters classes");
 $noFormsOrFilters = array('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);
+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->diag('FormGeneratorTest model should generate forms but not filters');
@@ -84,13 +84,11 @@
 $t->is($test->getValidator('author_id')->getOption('model'), 'BlogAuthor');
 
 $t->diag('Check enum primary keys');
-try
-{
-  $test = new ResourceTypeForm();
-  $t->pass('enum primary key widgets work');
-}
-catch (InvalidArgumentException $e)
-{
-  $t->fail('enum primary key widgets work');
-  $t->diag('    '.$e->getMessage());
+
+try {
+    $test = new ResourceTypeForm();
+    $t->pass('enum primary key widgets work');
+} 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 2553a764a..dbd5ef652 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/FormTest.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/FormTest.php
@@ -3,13 +3,14 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 $app = 'frontend';
-require_once(dirname(__FILE__).'/../bootstrap/functional.php');
+
+require_once dirname(__FILE__).'/../bootstrap/functional.php';
 
 $t = new lime_test(17);
 
@@ -24,11 +25,11 @@
 $userForm->embedForm('Profile', $profileForm);
 
 $data = array('username' => 'jwage',
-              'password' => 'changeme',
-              'Profile'  => array(
-                  'first_name' => 'Jonathan',
-                  'last_name'  => 'Wage'
-                ));
+    'password' => 'changeme',
+    'Profile' => array(
+        'first_name' => 'Jonathan',
+        'last_name' => 'Wage',
+    ));
 
 $userForm->bind($data);
 $userForm->save();
@@ -39,14 +40,16 @@
 $t->is($profile->getFirstName(), 'Jonathan');
 
 $userCount = Doctrine_Query::create()
-  ->from('User u')
-  ->count();
+    ->from('User u')
+    ->count()
+;
 
 $t->is($userCount, 1);
 
 $profileCount = Doctrine_Query::create()
-  ->from('Profile p')
-  ->count();
+    ->from('Profile p')
+    ->count()
+;
 
 $t->is($profileCount, 1);
 
@@ -60,15 +63,14 @@
 $t->is($widget->getChoices(), array('jwage' => '4cb9c8a8048fd02294477fcb1a41191a'));
 
 $methods = array(
-  'widgetChoiceTableMethod1',
-  'widgetChoiceTableMethod2',
-  'widgetChoiceTableMethod3'
+    'widgetChoiceTableMethod1',
+    'widgetChoiceTableMethod2',
+    'widgetChoiceTableMethod3',
 );
 
-foreach ($methods as $method)
-{
-  $widget = new sfWidgetFormDoctrineChoice(array('model' => 'User', 'table_method' => $method));
-  $t->is($widget->getChoices(), array(1 => 1));
+foreach ($methods as $method) {
+    $widget = new sfWidgetFormDoctrineChoice(array('model' => 'User', 'table_method' => $method));
+    $t->is($widget->getChoices(), array(1 => 1));
 }
 
 $widget = new sfWidgetFormDoctrineChoice(array('model' => 'User', 'table_method' => 'widgetChoiceTableMethod4'));
@@ -80,35 +82,34 @@
 
 class UserGroupForm extends GroupForm
 {
-  public function configure()
-  {
-    parent::configure();
-    $this->useFields(array('name'));
-  }
+    public function configure()
+    {
+        parent::configure();
+        $this->useFields(array('name'));
+    }
 }
 
 $userForm = new UserForm($user);
 $userForm->embedRelation('Groups', 'UserGroupForm');
 
 $data = array(
-  'username' => 'jonwage',
-  'password' => 'changeme',
-  'Groups'  => array(
-    0 => array(
-      'name' => 'New User Group 1 Name'
+    'username' => 'jonwage',
+    'password' => 'changeme',
+    'Groups' => array(
+        0 => array(
+            'name' => 'New User Group 1 Name',
+        ),
+        1 => array(
+            'name' => 'New User Group 2 Name',
+        ),
     ),
-    1 => array(
-      'name' => 'New User Group 2 Name'
-    )
-  )
 );
 
 $userForm->bind($data);
 $t->is($userForm->isValid(), true);
 
-if ($userForm->isValid())
-{
-  $userForm->save();
+if ($userForm->isValid()) {
+    $userForm->save();
 }
 
 $t->is($user->Groups[0]->name, 'New User Group 1 Name');
@@ -116,4 +117,4 @@ public function configure()
 
 $form = new DefaultValueTestForm();
 $validatorSchema = $form->getValidatorSchema();
-$t->is($validatorSchema['name']->getOption('required'), false);
\ No newline at end of file
+$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 81ef0efd7..a26a3c370 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/I18nTest.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/I18nTest.php
@@ -3,13 +3,14 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 $app = 'frontend';
-require_once(dirname(__FILE__).'/../bootstrap/functional.php');
+
+require_once dirname(__FILE__).'/../bootstrap/functional.php';
 
 $t = new lime_test(13);
 
@@ -33,37 +34,37 @@
 
 class MyArticleForm extends ArticleForm
 {
-  public function configure()
-  {
-    parent::configure();
+    public function configure()
+    {
+        parent::configure();
 
-    $this->embedI18n(array('en', 'fr'));
+        $this->embedI18n(array('en', 'fr'));
 
-    $authorForm = new AuthorForm($this->object->Author);
-    unset($authorForm['id']);
+        $authorForm = new AuthorForm($this->object->Author);
+        unset($authorForm['id']);
 
-    $this->embedForm('Author', $authorForm);
+        $this->embedForm('Author', $authorForm);
 
-    unset($this['author_id']);
-  }
+        unset($this['author_id']);
+    }
 }
 
 $article = new Article();
 $articleForm = new MyArticleForm($article);
 
 $data = array(
-  'is_on_homepage' => 1,
-  'Author' => array(
-    'name' => 'i18n author test',
-    'type' => null),
-  'en' => array(
-    'title' => 'english title',
-    'body'  => 'english body'),
-  'fr' => array(
-    'title' => 'french title',
-    'body'  => 'french body'),
-  'created_at' => time(),
-  'updated_at' => time(),
+    'is_on_homepage' => 1,
+    'Author' => array(
+        'name' => 'i18n author test',
+        'type' => null),
+    'en' => array(
+        'title' => 'english title',
+        'body' => 'english body'),
+    'fr' => array(
+        'title' => 'french title',
+        'body' => 'french body'),
+    'created_at' => time(),
+    'updated_at' => time(),
 );
 
 $articleForm->bind($data);
@@ -72,31 +73,28 @@ public function configure()
 $data = $articleForm->getValues();
 
 $values = array(
-  'is_on_homepage' => true,
-  'Author' => 
-  array(
-    'name' => 'i18n author test',
-    'type' => null
-  ),
-  'en' => 
-  array(
-    'title' => 'english title',
-    'body' => 'english body',
-    'test_column' => '',
-    'slug' => '',
-  ),
-  'fr' => 
-  array(
-    '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'],
+    'is_on_homepage' => true,
+    'Author' => array(
+        'name' => 'i18n author test',
+        'type' => null,
+    ),
+    'en' => array(
+        'title' => 'english title',
+        'body' => 'english body',
+        'test_column' => '',
+        'slug' => '',
+    ),
+    'fr' => array(
+        '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);
@@ -104,40 +102,36 @@ public function configure()
 $articleForm->save();
 
 $expected = array(
-  'id' => $article->id,
-  'author_id' => $article->Author->id,
-  'is_on_homepage' => true,
-  'type' => null,
-  'views' => null,
-  'created_at' => $article->created_at,
-  'updated_at' => $article->updated_at,
-  'Translation' => 
-  array(
-    'en' => 
-    array(
-      'id' => $article->id,
-      'title' => 'english title',
-      'body' => 'english body',
-      'test_column' => '',
-      'lang' => 'en',
-      'slug' => 'english-title',
+    'id' => $article->id,
+    'author_id' => $article->Author->id,
+    'is_on_homepage' => true,
+    'type' => null,
+    'views' => null,
+    'created_at' => $article->created_at,
+    'updated_at' => $article->updated_at,
+    'Translation' => array(
+        'en' => array(
+            'id' => $article->id,
+            'title' => 'english title',
+            'body' => 'english body',
+            'test_column' => '',
+            'lang' => 'en',
+            'slug' => 'english-title',
+        ),
+        'fr' => array(
+            'id' => $article->id,
+            'title' => 'french title',
+            'body' => 'french body',
+            'test_column' => '',
+            'lang' => 'fr',
+            'slug' => 'french-title',
+        ),
     ),
-    'fr' => 
-    array(
-      'id' => $article->id,
-      'title' => 'french title',
-      'body' => 'french body',
-      'test_column' => '',
-      'lang' => 'fr',
-      'slug' => 'french-title',
+    'Author' => array(
+        'id' => $article->Author->id,
+        'name' => 'i18n author test',
+        'type' => null,
     ),
-  ),
-  'Author' => 
-  array(
-    'id' => $article->Author->id,
-    'name' => 'i18n author test',
-    'type' => null
-  ),
 );
 
 $t->is($article->toArray(true), $expected);
@@ -145,71 +139,65 @@ public function configure()
 $articleForm = new MyArticleForm($article);
 
 $expected = array(
-  'id' => $article->id,
-  'author_id' => $article->author_id,
-  'is_on_homepage' => true,
-  'type' => null,
-  'views' => null,
-  'created_at' => $article->created_at,
-  'updated_at' => $article->updated_at,
-  'en' => 
-  array(
-    'id' => $article->id,
-    'title' => 'english title',
-    'body' => 'english body',
-    'test_column' => '',
-    'lang' => 'en',
-    'slug' => 'english-title',
-  ),
-  'fr' => 
-  array(
     'id' => $article->id,
-    'title' => 'french title',
-    'body' => 'french body',
-    'test_column' => '',
-    'lang' => 'fr',
-    'slug' => 'french-title',
-  ),
-  'Author' => 
-  array(
-    'id' => $article->Author->id,
-    'name' => 'i18n author test',
-    'type' => null
-  ),
+    'author_id' => $article->author_id,
+    'is_on_homepage' => true,
+    'type' => null,
+    'views' => null,
+    'created_at' => $article->created_at,
+    'updated_at' => $article->updated_at,
+    'en' => array(
+        'id' => $article->id,
+        'title' => 'english title',
+        'body' => 'english body',
+        'test_column' => '',
+        'lang' => 'en',
+        'slug' => 'english-title',
+    ),
+    'fr' => array(
+        'id' => $article->id,
+        'title' => 'french title',
+        'body' => 'french body',
+        'test_column' => '',
+        'lang' => 'fr',
+        'slug' => 'french-title',
+    ),
+    'Author' => array(
+        'id' => $article->Author->id,
+        'name' => 'i18n author test',
+        'type' => null,
+    ),
 );
 
 $t->is($articleForm->getDefaults(), $expected);
 
 // Bug #7486
 $data = array(
-  'id' => $article->id,
-  'is_on_homepage' => true,
-  'type' => null,
-  'created_at' => $article->created_at,
-  'updated_at' => $article->updated_at,
-  'en' =>
-  array(
-    'id' => $article->id,
-    'title' => 'english title',
-    'body' => 'english body',
-    'test_column' => '',
-    'lang' => 'en',
-    'slug' => 'english-title',
-  ),
-  'fr' =>
-  array(
     'id' => $article->id,
-    'title' => 'french title',
-    'body' => 'french body',
-    'test_column' => '',
-    'lang' => 'fr',
-    'slug' => 'french-title',
-  ),
-  'Author' =>
-  array(
-    'name' => 'i18n author test',
-    'type' => null
-  ),
+    'is_on_homepage' => true,
+    'type' => null,
+    'created_at' => $article->created_at,
+    'updated_at' => $article->updated_at,
+    'en' => array(
+        'id' => $article->id,
+        'title' => 'english title',
+        'body' => 'english body',
+        'test_column' => '',
+        'lang' => 'en',
+        'slug' => 'english-title',
+    ),
+    'fr' => array(
+        'id' => $article->id,
+        'title' => 'french title',
+        'body' => 'french body',
+        'test_column' => '',
+        'lang' => 'fr',
+        'slug' => 'french-title',
+    ),
+    'Author' => array(
+        'name' => 'i18n author test',
+        'type' => null,
+    ),
 );
 
 $articleForm->bind($data);
@@ -219,18 +207,18 @@ public function configure()
 $articleForm = new MyArticleForm($article);
 
 $data = array(
-  'is_on_homepage' => 1,
-  'Author' => array(
-    'name' => 'i18n author test',
-    'type' => null),
-  'en' => array(
-    'title' => 'english title',
-    'body'  => 'english body'),
-  'fr' => array(
-    'title' => 'french title',
-    'body'  => 'french body'),
-  'created_at' => time(),
-  'updated_at' => time(),
+    'is_on_homepage' => 1,
+    'Author' => array(
+        'name' => 'i18n author test',
+        'type' => null),
+    'en' => array(
+        'title' => 'english title',
+        'body' => 'english body'),
+    'fr' => array(
+        'title' => 'french title',
+        'body' => 'french body'),
+    'created_at' => time(),
+    'updated_at' => time(),
 );
 
 $articleForm->bind($data);
@@ -241,4 +229,4 @@ public function configure()
 sfContext::getInstance()->getUser()->setCulture('en');
 $article->title = 'test';
 sfContext::getInstance()->getUser()->setCulture('fr');
-$t->is($article->title, 'test');
\ No newline at end of file
+$t->is($article->title, 'test');
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/PagerTest.php b/lib/plugins/sfDoctrinePlugin/test/functional/PagerTest.php
index e87c738d1..840dcf127 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/PagerTest.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/PagerTest.php
@@ -3,22 +3,22 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 $app = 'frontend';
-require_once(dirname(__FILE__).'/../bootstrap/functional.php');
+
+require_once dirname(__FILE__).'/../bootstrap/functional.php';
 
 $t = new lime_test(23);
 
 $total = 50;
-for ($i = 0; $i < $total; $i++)
-{
-  $author = new Author();
-  $author->name = 'Author #' . $i;
-  $author->save();
+for ($i = 0; $i < $total; ++$i) {
+    $author = new Author();
+    $author->name = 'Author #'.$i;
+    $author->save();
 }
 
 $numPerPage = 25;
@@ -74,7 +74,6 @@
 
 $pager = new sfDoctrinePager('Author', 10);
 $pager->init();
-foreach ($pager as $author)
-{
-  $t->isa_ok($author, 'Author');
+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 667828de4..34be2c712 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/RouteTest.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/RouteTest.php
@@ -3,67 +3,66 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 $app = 'backend';
 $fixtures = 'fixtures';
-require_once(dirname(__FILE__).'/../bootstrap/functional.php');
+
+require_once dirname(__FILE__).'/../bootstrap/functional.php';
 
 $tests = array(
-  '/doctrine/route/test1' => '/Article/',
-  '/doctrine/route/test2' => '/Article/',
-  '/doctrine/route/test3' => '/Doctrine_Collection/',
-  '/doctrine/route/test4' => '/Doctrine_Collection/',
-  '/doctrine/route/test5/1/some_fake_value' => '/Article/',
-  '/doctrine/route/test6/english-title/some_fake_value' => '/Article/',
-  '/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/',
+    '/doctrine/route/test1' => '/Article/',
+    '/doctrine/route/test2' => '/Article/',
+    '/doctrine/route/test3' => '/Doctrine_Collection/',
+    '/doctrine/route/test4' => '/Doctrine_Collection/',
+    '/doctrine/route/test5/1/some_fake_value' => '/Article/',
+    '/doctrine/route/test6/english-title/some_fake_value' => '/Article/',
+    '/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();
-foreach ($tests as $url => $check)
-{
-  $b->
-    get($url)->
-    with('response')->begin()->
-      isStatusCode('200')->
-      matches($check)->
-    end()
-  ;
+foreach ($tests as $url => $check) {
+    $b->
+      get($url)->
+      with('response')->begin()->
+        isStatusCode('200')->
+        matches($check)->
+      end()
+    ;
 }
 
 $article = Doctrine_Core::getTable('Article')->find(1);
 
 $routes = array(
-  'doctrine_route_test5' => array(
-    'url' => '/index.php/doctrine/route/test5/1/test-english-title',
-    'params' => $article
-  ),
-  'doctrine_route_test6' => array(
-    'url' => '/index.php/doctrine/route/test6/english-title/test-english-title',
-    'params' => $article
-  ),
-  'doctrine_route_test7' => array(
-    'url' => '/index.php/doctrine/route/test7/w00t',
-    'params' => array('testing_non_column' => 'w00t')
-  ),
-  'doctrine_route_test8' => array(
-    'url' => '/index.php/doctrine/route/test8/1/english-title/English+Title/test',
-    'params' => array(
-      'id' => $article->id,
-      'slug' => $article->slug,
-      'title' => $article->title,
-      'testing_non_column2' => 'test'
-    )
-  ),
+    'doctrine_route_test5' => array(
+        'url' => '/index.php/doctrine/route/test5/1/test-english-title',
+        'params' => $article,
+    ),
+    'doctrine_route_test6' => array(
+        'url' => '/index.php/doctrine/route/test6/english-title/test-english-title',
+        'params' => $article,
+    ),
+    'doctrine_route_test7' => array(
+        'url' => '/index.php/doctrine/route/test7/w00t',
+        'params' => array('testing_non_column' => 'w00t'),
+    ),
+    'doctrine_route_test8' => array(
+        'url' => '/index.php/doctrine/route/test8/1/english-title/English+Title/test',
+        'params' => array(
+            'id' => $article->id,
+            'slug' => $article->slug,
+            'title' => $article->title,
+            'testing_non_column2' => 'test',
+        ),
+    ),
 );
 
-foreach ($routes as $route => $check)
-{
-  $url = url_for2($route, $check['params']);
-  $b->test()->is($url, $check['url'], 'Check "' . $route . '" generates correct url');
-}
\ No newline at end of file
+foreach ($routes as $route => $check) {
+    $url = url_for2($route, $check['params']);
+    $b->test()->is($url, $check['url'], 'Check "'.$route.'" generates correct url');
+}
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/SchemaMergeTest.php b/lib/plugins/sfDoctrinePlugin/test/functional/SchemaMergeTest.php
index cb2ea47cc..d6ed371f1 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/SchemaMergeTest.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/SchemaMergeTest.php
@@ -3,12 +3,13 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 $app = 'frontend';
+
 require_once dirname(__FILE__).'/../bootstrap/functional.php';
 
 $t = new lime_test(3);
@@ -19,15 +20,15 @@
 $t->diag('columns');
 
 $t->is_deeply($table->getColumnDefinition('name'), array(
-  'type'    => 'string',
-  'length'  => 255,
-  'notnull' => true,
+    'type' => 'string',
+    'length' => 255,
+    'notnull' => true,
 ), 'the short "type" syntax is expanded');
 
 $t->is_deeply($table->getColumnDefinition('weight'), array(
-  'type'   => 'float',
-  'length' => 4,
-  'scale'  => 4,
+    'type' => 'float',
+    'length' => 4,
+    'scale' => 4,
 ), 'the short "type(length, scale)" syntax is expanded');
 
 // actAs
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/Ticket/5269Test.php b/lib/plugins/sfDoctrinePlugin/test/functional/Ticket/5269Test.php
index ccebe8fe6..f0837e4d5 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/Ticket/5269Test.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/Ticket/5269Test.php
@@ -3,23 +3,24 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 $app = 'frontend';
-require_once(dirname(__FILE__).'/../../bootstrap/functional.php');
+
+require_once dirname(__FILE__).'/../../bootstrap/functional.php';
 
 $t = new lime_test(1);
 
 class TestUserForm extends UserForm
 {
-  public function configure()
-  {
-    parent::configure();
-    unset($this['test']);
-  }
+    public function configure()
+    {
+        parent::configure();
+        unset($this['test']);
+    }
 }
 
 $user = new User();
@@ -33,13 +34,12 @@ public function configure()
 $user = Doctrine_Core::getTable('User')->findOneByUsername('nullvaluetest');
 $userForm = new TestUserForm($user);
 $userForm->bind(array('id' => $user->id, 'username' => 'nullvaluetest', 'password' => 'changeme2'));
-if ($userForm->isValid())
-{
-  $userForm->save();
+if ($userForm->isValid()) {
+    $userForm->save();
 }
 
 $user->free();
 unset($user);
 
 $user = Doctrine_Core::getTable('User')->findOneByUsername('nullvaluetest');
-$t->is($user->toArray(), array('id' => 1, 'username' => 'nullvaluetest', 'password' => 'b0660f0b8b989971524762330aea5449', 'test' => 'test'));
\ No newline at end of file
+$t->is($user->toArray(), array('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 837a2b1b2..e7d594adc 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/Ticket/7774Test.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/Ticket/7774Test.php
@@ -3,16 +3,16 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 $app = 'frontend';
-require_once(dirname(__FILE__).'/../../bootstrap/functional.php');
-if (!is_link(sfConfig::get('sf_config_dir').'/doctrine/linked_schema.yml'))
-{
-  return;
+
+require_once dirname(__FILE__).'/../../bootstrap/functional.php';
+if (!is_link(sfConfig::get('sf_config_dir').'/doctrine/linked_schema.yml')) {
+    return;
 }
 
 $t = new lime_test(1);
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/UniqueTest.php b/lib/plugins/sfDoctrinePlugin/test/functional/UniqueTest.php
index 66eac0223..28fb2de1f 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/UniqueTest.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/UniqueTest.php
@@ -3,21 +3,22 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 $app = 'frontend';
-require_once(dirname(__FILE__).'/../bootstrap/functional.php');
+
+require_once dirname(__FILE__).'/../bootstrap/functional.php';
 
 $t = new lime_test(2);
 
 $data = array(
-  'unique_test1' => 'test',
-  'unique_test2' => 'test',
-  'unique_test3' => 'test',
-  'unique_test4' => 'test'
+    'unique_test1' => 'test',
+    'unique_test2' => 'test',
+    'unique_test3' => 'test',
+    'unique_test4' => 'test',
 );
 
 $uniqueTestForm = new UniqueTestForm();
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/UploadTest.php b/lib/plugins/sfDoctrinePlugin/test/functional/UploadTest.php
index 5168ba62c..a23c889eb 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/UploadTest.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/UploadTest.php
@@ -3,48 +3,43 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 $app = 'frontend';
+
 require_once dirname(__FILE__).'/../bootstrap/functional.php';
 
 $browser = new sfTestFunctional(new sfBrowser(), null, array(
-  'doctrine' => 'sfTesterDoctrine',
+    'doctrine' => 'sfTesterDoctrine',
 ));
 
 $browser
-  ->get('/attachment/index')
-
-  ->setField('attachment[file_path]', sfConfig::get('sf_config_dir').'/databases.yml')
-  ->click('submit')
-
-  ->with('response')->begin()
+    ->get('/attachment/index')
+    ->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)
+    ->end()
+    ->with('doctrine')->check('Attachment', array(
+        '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
-  ->get('/attachment/editable?id=1')
-
-  ->setField('attachment[file_path_delete]', 1)
-  ->click('submit')
-
-  ->with('response')->begin()
+    ->get('/attachment/editable?id=1')
+    ->setField('attachment[file_path_delete]', 1)
+    ->click('submit')
+    ->with('response')->begin()
     ->checkElement('h1', 'ok')
-  ->end()
-
-  ->with('doctrine')->check('Attachment', array(
-    'file_path' => AttachmentForm::TEST_GENERATED_FILENAME,
-  ), false)
+    ->end()
+    ->with('doctrine')->check('Attachment', array(
+        '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');
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 29e4cbcb4..36be3be8f 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
@@ -2,7 +2,7 @@
 
 class backendConfiguration extends sfApplicationConfiguration
 {
-  public function configure()
-  {
-  }
+    public function configure()
+    {
+    }
 }
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 92e300891..05d80dadd 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
@@ -3,23 +3,22 @@
 /**
  * doctrine_route_test actions.
  *
- * @package    symfony12
- * @subpackage doctrine_route_test
  * @author     Your name here
+ *
  * @version    SVN: $Id$
  */
 class doctrine_route_testActions extends sfActions
 {
-  public function executeIndex(sfWebRequest $request)
-  {
-    try {
-      $this->object = $this->getRoute()->getObjects();
-    } catch (Exception $e) {
-      try {
-        $this->object = $this->getRoute()->getObject();
-      } catch (Exception $e) {
-        return sfView::NONE;
-      }
+    public function executeIndex(sfWebRequest $request)
+    {
+        try {
+            $this->object = $this->getRoute()->getObjects();
+        } catch (Exception $e) {
+            try {
+                $this->object = $this->getRoute()->getObject();
+            } 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 0ee323309..2db6f320e 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 +1,3 @@
-<?php echo get_class($object) ?>
\ No newline at end of file
+<?php
+
+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 a9dfe46d8..681074466 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,14 +1,14 @@
 <?php
 
 require_once dirname(__FILE__).'/../lib/my_articlesGeneratorConfiguration.class.php';
+
 require_once dirname(__FILE__).'/../lib/my_articlesGeneratorHelper.class.php';
 
 /**
  * my_articles actions.
  *
- * @package    symfony12
- * @subpackage my_articles
  * @author     Your name here
+ *
  * @version    SVN: $Id$
  */
 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 e11f8b00d..d91aad195 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
@@ -3,9 +3,8 @@
 /**
  * my_articles module configuration.
  *
- * @package    symfony12
- * @subpackage my_articles
  * @author     Your name here
+ *
  * @version    SVN: $Id$
  */
 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 5ed57ef5d..5f9b7ccbe 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
@@ -3,9 +3,8 @@
 /**
  * my_articles module helper.
  *
- * @package    symfony12
- * @subpackage my_articles
  * @author     Your name here
+ *
  * @version    SVN: $Id$
  */
 class my_articlesGeneratorHelper extends BaseMy_articlesGeneratorHelper
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/templates/layout.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/templates/layout.php
index 1768630ed..0a836f1fd 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/templates/layout.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/templates/layout.php
@@ -1,15 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
-    <?php include_http_metas() ?>
-    <?php include_metas() ?>
-    <?php include_title() ?>
+    <?php include_http_metas(); ?>
+    <?php include_metas(); ?>
+    <?php include_title(); ?>
     <link rel="shortcut icon" href="/favicon.ico" />
   
-    <?php include_stylesheets() ?>
-    <?php include_javascripts() ?>
+    <?php include_stylesheets(); ?>
+    <?php include_javascripts(); ?>
 </head>
   <body>
-    <?php echo $sf_content ?>
+    <?php echo $sf_content; ?>
   </body>
 </html>
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 12b3e0b67..8e52a8c98 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
@@ -2,7 +2,7 @@
 
 class frontendConfiguration extends sfApplicationConfiguration
 {
-  public function configure()
-  {
-  }
+    public function configure()
+    {
+    }
 }
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 78e008cfa..aea3c9b78 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
@@ -3,87 +3,82 @@
 /**
  * articles actions.
  *
- * @package    symfony12
- * @subpackage articles
  * @author     Your name here
+ *
  * @version    SVN: $Id$
  */
 class articlesActions extends sfActions
 {
-  public function executeIndex()
-  {
-    $this->articleList = $this->getArticleTable()->findAll();
-  }
+    public function executeIndex()
+    {
+        $this->articleList = $this->getArticleTable()->findAll();
+    }
 
-  public function executeRedirectToShow()
-  {
-    $this->redirect('article', Doctrine_Core::getTable('Article')->createQuery()->fetchOne());
-  }
+    public function executeRedirectToShow()
+    {
+        $this->redirect('article', Doctrine_Core::getTable('Article')->createQuery()->fetchOne());
+    }
 
-  public function executeShow()
-  {
-    $this->article = $this->getRoute()->getObject();
-  }
+    public function executeShow()
+    {
+        $this->article = $this->getRoute()->getObject();
+    }
 
-  public function executeCreate()
-  {
-    $this->form = new ArticleForm();
+    public function executeCreate()
+    {
+        $this->form = new ArticleForm();
 
-    $this->setTemplate('edit');
-  }
+        $this->setTemplate('edit');
+    }
 
-  public function executeEdit($request)
-  {
-    $this->form = $this->getArticleForm($request->getParameter('id'));
-  }
+    public function executeEdit($request)
+    {
+        $this->form = $this->getArticleForm($request->getParameter('id'));
+    }
 
-  public function executeUpdate($request)
-  {
-    $this->forward404Unless($request->isMethod(sfRequest::POST));
+    public function executeUpdate($request)
+    {
+        $this->forward404Unless($request->isMethod(sfRequest::POST));
 
-    $this->form = $this->getArticleForm($request->getParameter('id'));
+        $this->form = $this->getArticleForm($request->getParameter('id'));
 
-    $this->form->bind($request->getParameter('article'));
-    if ($this->form->isValid())
+        $this->form->bind($request->getParameter('article'));
+        if ($this->form->isValid()) {
+            $article = $this->form->save();
+
+            $this->redirect('articles/edit?id='.$article->get('id'));
+        }
+
+        $this->setTemplate('edit');
+    }
+
+    public function executeDelete($request)
     {
-      $article = $this->form->save();
+        $this->forward404Unless($article = $this->getArticleById($request->getParameter('id')));
+
+        $article->delete();
 
-      $this->redirect('articles/edit?id='.$article->get('id'));
+        $this->redirect('articles/index');
     }
 
-    $this->setTemplate('edit');
-  }
-
-  public function executeDelete($request)
-  {
-    $this->forward404Unless($article = $this->getArticleById($request->getParameter('id')));
-
-    $article->delete();
-
-    $this->redirect('articles/index');
-  }
-  
-  private function getArticleTable()
-  {
-    return Doctrine_Core::getTable('Article');
-  }
-  
-  private function getArticleById($id)
-  {
-    return $this->getArticleTable()->find($id);
-  }
-  
-  private function getArticleForm($id)
-  {
-    $article = $this->getArticleById($id);
-    
-    if ($article instanceof Article)
+    private function getArticleTable()
     {
-      return new ArticleForm($article);
+        return Doctrine_Core::getTable('Article');
     }
-    else
+
+    private function getArticleById($id)
     {
-      return new ArticleForm();
+        return $this->getArticleTable()->find($id);
+    }
+
+    private function getArticleForm($id)
+    {
+        $article = $this->getArticleById($id);
+
+        if ($article instanceof Article) {
+            return new ArticleForm($article);
+        }
+
+        return new ArticleForm();
     }
-  }
-}
\ No newline at end of file
+}
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 77bce6034..167f2c784 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
@@ -1,56 +1,56 @@
-<?php $article = $form->getObject() ?>
-<h1><?php echo $form->isNew() ? 'New' : 'Edit' ?> Articles</h1>
+<?php $article = $form->getObject(); ?>
+<h1><?php echo $form->isNew() ? 'New' : 'Edit'; ?> Articles</h1>
 
-<form action="<?php echo url_for('articles/update'.(!$form->isNew() ? '?id='.$article->get('id') : '')) ?>" method="post" <?php $form->isMultipart() and print 'enctype="multipart/form-data" ' ?>>
+<form action="<?php echo url_for('articles/update'.(!$form->isNew() ? '?id='.$article->get('id') : '')); ?>" method="post" <?php $form->isMultipart() and print 'enctype="multipart/form-data" '; ?>>
   <table>
     <tfoot>
       <tr>
         <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?')) ?>
-          <?php endif; ?>
+          &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?')); ?>
+          <?php } ?>
           <input type="submit" value="Save" />
         </td>
       </tr>
     </tfoot>
     <tbody>
-      <?php echo $form->renderGlobalErrors() ?>
+      <?php echo $form->renderGlobalErrors(); ?>
       <tr>
         <th><label for="article_author_id">Author id</label></th>
         <td>
-          <?php echo $form['author_id']->renderError() ?>
-          <?php echo $form['author_id'] ?>
+          <?php echo $form['author_id']->renderError(); ?>
+          <?php echo $form['author_id']; ?>
         </td>
       </tr>
       <tr>
         <th><label for="article_created_at">Created at</label></th>
         <td>
-          <?php echo $form['created_at']->renderError() ?>
-          <?php echo $form['created_at'] ?>
+          <?php echo $form['created_at']->renderError(); ?>
+          <?php echo $form['created_at']; ?>
         </td>
       </tr>
       <tr>
         <th><label for="article_updated_at">Updated at</label></th>
         <td>
-          <?php echo $form['updated_at']->renderError() ?>
-          <?php echo $form['updated_at'] ?>
+          <?php echo $form['updated_at']->renderError(); ?>
+          <?php echo $form['updated_at']; ?>
         </td>
       </tr>
       <tr>
         <th><label for="article_en">En</label></th>
         <td>
-          <?php echo $form['en']->renderError() ?>
-          <?php echo $form['en'] ?>
+          <?php echo $form['en']->renderError(); ?>
+          <?php echo $form['en']; ?>
         </td>
       </tr>
       <tr>
         <th><label for="article_fr">Fr</label></th>
         <td>
-          <?php echo $form['fr']->renderError() ?>
-          <?php echo $form['fr'] ?>
+          <?php echo $form['fr']->renderError(); ?>
+          <?php echo $form['fr']; ?>
 
-        <?php echo $form['id'] ?>
+        <?php echo $form['id']; ?>
         </td>
       </tr>
     </tbody>
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/modules/articles/templates/indexSuccess.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/modules/articles/templates/indexSuccess.php
index f849a0f83..e8187ba10 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/modules/articles/templates/indexSuccess.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/modules/articles/templates/indexSuccess.php
@@ -10,15 +10,15 @@
     </tr>
   </thead>
   <tbody>
-    <?php foreach ($articleList as $article): ?>
+    <?php foreach ($articleList as $article) { ?>
     <tr>
-      <td><a href="<?php echo url_for('articles/edit?id='.$article->get('id')) ?>"><?php echo $article->getid() ?></a></td>
-      <td><?php echo $article->getAuthor() ?></td>
-      <td><?php echo $article->getcreated_at() ?></td>
-      <td><?php echo $article->getupdated_at() ?></td>
+      <td><a href="<?php echo url_for('articles/edit?id='.$article->get('id')); ?>"><?php echo $article->getid(); ?></a></td>
+      <td><?php echo $article->getAuthor(); ?></td>
+      <td><?php echo $article->getcreated_at(); ?></td>
+      <td><?php echo $article->getupdated_at(); ?></td>
     </tr>
-    <?php endforeach; ?>
+    <?php } ?>
   </tbody>
 </table>
 
-<a href="<?php echo url_for('articles/create') ?>">Create</a>
+<a href="<?php echo url_for('articles/create'); ?>">Create</a>
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/modules/articles/templates/showSuccess.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/modules/articles/templates/showSuccess.php
index 2617ebe0e..76cb5cd33 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/modules/articles/templates/showSuccess.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/modules/articles/templates/showSuccess.php
@@ -1 +1 @@
-<h1><?php echo $article ?></h1>
+<h1><?php echo $article; ?></h1>
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 83ed83ef1..c2275a960 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
@@ -3,56 +3,51 @@
 /**
  * attachment actions.
  *
- * @package    symfony12
- * @subpackage attachment
  * @author     Your name here
+ *
  * @version    SVN: $Id$
  */
 class attachmentActions extends sfActions
 {
- /**
-  * Executes index action
-  *
-  * @param sfRequest $request A request object
-  */
-  public function executeIndex(sfWebRequest $request)
-  {
-    $this->form = new AttachmentForm();
-    unset($this->form['id']);
-
-    if (
-      $request->isMethod('post')
-      &&
-      $this->form->bindAndSave(
-        $request->getParameter($this->form->getName()),
-        $request->getFiles($this->form->getName())
-      )
-    )
+    /**
+     * Executes index action.
+     *
+     * @param sfRequest $request A request object
+     */
+    public function executeIndex(sfWebRequest $request)
     {
-      return sfView::SUCCESS;
-    }
+        $this->form = new AttachmentForm();
+        unset($this->form['id']);
 
-    return sfView::INPUT;
-  }
+        if (
+            $request->isMethod('post')
+            && $this->form->bindAndSave(
+                $request->getParameter($this->form->getName()),
+                $request->getFiles($this->form->getName())
+            )
+        ) {
+            return sfView::SUCCESS;
+        }
 
-  public function executeEditable(sfWebRequest $request)
-  {
-    $attachment = Doctrine_Core::getTable('Attachment')->find($request['id']);
-    $this->forward404Unless($attachment, 'Attachment not found');
+        return sfView::INPUT;
+    }
 
-    $this->form = new AttachmentForm($attachment);
-    if (
-      $request->isMethod('post')
-      &&
-      $this->form->bindAndSave(
-        $request->getParameter($this->form->getName()),
-        $request->getFiles($this->form->getName())
-      )
-    )
+    public function executeEditable(sfWebRequest $request)
     {
-      return sfView::SUCCESS;
-    }
+        $attachment = Doctrine_Core::getTable('Attachment')->find($request['id']);
+        $this->forward404Unless($attachment, 'Attachment not found');
+
+        $this->form = new AttachmentForm($attachment);
+        if (
+            $request->isMethod('post')
+            && $this->form->bindAndSave(
+                $request->getParameter($this->form->getName()),
+                $request->getFiles($this->form->getName())
+            )
+        ) {
+            return sfView::SUCCESS;
+        }
 
-    return sfView::INPUT;
-  }
+        return sfView::INPUT;
+    }
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/modules/attachment/templates/editableInput.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/modules/attachment/templates/editableInput.php
index 82ba75a4b..21c76a69d 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/modules/attachment/templates/editableInput.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/modules/attachment/templates/editableInput.php
@@ -1,6 +1,6 @@
-<form action="<?php echo url_for('attachment/editable?id='.$form->getObject()->id) ?>" method="post">
+<form action="<?php echo url_for('attachment/editable?id='.$form->getObject()->id); ?>" method="post">
   <table>
-    <?php echo $form ?>
+    <?php echo $form; ?>
   </table>
   <p><button type="submit">submit</button></p>
 </form>
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/modules/attachment/templates/indexInput.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/modules/attachment/templates/indexInput.php
index e88d096ad..23059eeb3 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/modules/attachment/templates/indexInput.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/modules/attachment/templates/indexInput.php
@@ -1,6 +1,6 @@
-<form action="<?php echo url_for('attachment/index') ?>" method="post">
+<form action="<?php echo url_for('attachment/index'); ?>" method="post">
   <table>
-    <?php echo $form ?>
+    <?php echo $form; ?>
   </table>
   <p><button type="submit">submit</button></p>
 </form>
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/templates/layout.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/templates/layout.php
index cb547ebbf..93cf1cb21 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/templates/layout.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/templates/layout.php
@@ -2,20 +2,20 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 
-<?php include_http_metas() ?>
-<?php include_metas() ?>
+<?php include_http_metas(); ?>
+<?php include_metas(); ?>
 
-<?php include_title() ?>
+<?php include_title(); ?>
 
 <link rel="shortcut icon" href="/favicon.ico" />
 
 
-    <?php include_stylesheets() ?>
-    <?php include_javascripts() ?>
+    <?php include_stylesheets(); ?>
+    <?php include_javascripts(); ?>
 </head>
 <body>
 
-<?php echo $sf_content ?>
+<?php echo $sf_content; ?>
 
 </body>
 </html>
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 b07bfb851..659c14f4b 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/config/ProjectConfiguration.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/config/ProjectConfiguration.class.php
@@ -5,63 +5,61 @@
 
 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'));
-  }
+    public function setup()
+    {
+        $this->enableAllPluginsExcept();
 
-  public function initializeDoctrine()
-  {
-    chdir(sfConfig::get('sf_root_dir'));
+        $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'));
+    }
 
-    $task = new sfDoctrineBuildTask($this->dispatcher, new sfFormatter());
-    $task->setConfiguration($this);
-    $task->run(array(), array(
-      'no-confirmation' => true,
-      'db'              => true,
-      'model'           => true,
-      'forms'           => true,
-      'filters'         => true,
-    ));
-  }
+    public function initializeDoctrine()
+    {
+        chdir(sfConfig::get('sf_root_dir'));
 
-  public function loadFixtures($fixtures)
-  {
-    $path = sfConfig::get('sf_data_dir') . '/' . $fixtures;
-    if ( ! file_exists($path)) {
-      throw new sfException('Invalid data fixtures file');
+        $task = new sfDoctrineBuildTask($this->dispatcher, new sfFormatter());
+        $task->setConfiguration($this);
+        $task->run(array(), array(
+            'no-confirmation' => true,
+            'db' => true,
+            'model' => true,
+            'forms' => true,
+            'filters' => true,
+        ));
     }
-    chdir(sfConfig::get('sf_root_dir'));
-    $task = new sfDoctrineDataLoadTask($this->dispatcher, new sfFormatter());
-    $task->setConfiguration($this);
-    $task->run(array($path));
-  }
-
-  public function configureDoctrine(sfEvent $event)
-  {
-    $manager = $event->getSubject();
-    $manager->setAttribute(Doctrine_Core::ATTR_VALIDATE, true);
 
-  }
+    public function loadFixtures($fixtures)
+    {
+        $path = sfConfig::get('sf_data_dir').'/'.$fixtures;
+        if (!file_exists($path)) {
+            throw new sfException('Invalid data fixtures file');
+        }
+        chdir(sfConfig::get('sf_root_dir'));
+        $task = new sfDoctrineDataLoadTask($this->dispatcher, new sfFormatter());
+        $task->setConfiguration($this);
+        $task->run(array($path));
+    }
 
-  public function configureDoctrineModelBuilder(sfEvent $event, $options)
-  {
-    $options['baseClassName'] = 'myDoctrineRecord';
+    public function configureDoctrine(sfEvent $event)
+    {
+        $manager = $event->getSubject();
+        $manager->setAttribute(Doctrine_Core::ATTR_VALIDATE, true);
+    }
 
-    return $options;
-  }
+    public function configureDoctrineModelBuilder(sfEvent $event, $options)
+    {
+        $options['baseClassName'] = 'myDoctrineRecord';
 
-  public function configureDoctrineConnection(sfEvent $event)
-  {
-    $parameters = $event->getParameters();
+        return $options;
+    }
 
-    if ('doctrine2' === $parameters['connection']->getName())
+    public function configureDoctrineConnection(sfEvent $event)
     {
-      $parameters['connection']->setAttribute(Doctrine_Core::ATTR_VALIDATE, false);
+        $parameters = $event->getParameters();
+
+        if ('doctrine2' === $parameters['connection']->getName()) {
+            $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 865614e16..3f970f4d8 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
@@ -3,13 +3,11 @@
 /**
  * Article filter form.
  *
- * @package    filters
- * @subpackage Article *
  * @version    SVN: $Id$
  */
 class ArticleFormFilter extends BaseArticleFormFilter
 {
-  public function configure()
-  {
-  }
-}
\ No newline at end of file
+    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 a02ae0726..bfb0b277c 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
@@ -3,13 +3,11 @@
 /**
  * ArticleTranslation filter form.
  *
- * @package    filters
- * @subpackage ArticleTranslation *
  * @version    SVN: $Id$
  */
 class ArticleTranslationFormFilter extends BaseArticleTranslationFormFilter
 {
-  public function configure()
-  {
-  }
-}
\ No newline at end of file
+    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 5b8256278..b6533b48f 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
@@ -3,14 +3,13 @@
 /**
  * Attachment filter form.
  *
- * @package    symfony12
- * @subpackage filter
  * @author     Your name here
+ *
  * @version    SVN: $Id$
  */
 class AttachmentFormFilter extends BaseAttachmentFormFilter
 {
-  public function configure()
-  {
-  }
+    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 6552bd2d6..be441404f 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
@@ -3,13 +3,11 @@
 /**
  * Author filter form.
  *
- * @package    filters
- * @subpackage Author *
  * @version    SVN: $Id$
  */
 class AuthorFormFilter extends BaseAuthorFormFilter
 {
-  public function configure()
-  {
-  }
-}
\ No newline at end of file
+    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 394c2543b..6ad8fb0f5 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
@@ -3,14 +3,13 @@
 /**
  * AuthorInheritanceConcrete filter form.
  *
- * @package    symfony12
- * @subpackage filter
  * @author     Your name here
+ *
  * @version    SVN: $Id$
  */
 class AuthorInheritanceConcreteFormFilter extends BaseAuthorInheritanceConcreteFormFilter
 {
-  public function configure()
-  {
-  }
+    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 27eaad2cf..5ed4843e0 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
@@ -3,13 +3,11 @@
 /**
  * AuthorInheritance filter form.
  *
- * @package    filters
- * @subpackage AuthorInheritance *
  * @version    SVN: $Id$
  */
 class AuthorInheritanceFormFilter extends BaseAuthorInheritanceFormFilter
 {
-  public function configure()
-  {
-  }
-}
\ No newline at end of file
+    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 91b99e80e..0270ae95e 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
@@ -3,13 +3,11 @@
 /**
  * Project filter form base class.
  *
- * @package    filters
- *
  * @version    SVN: $Id$
  */
 abstract class BaseFormFilterDoctrine extends sfFormFilterDoctrine
 {
-  public function setup()
-  {
-  }
-}
\ No newline at end of file
+    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 8eafdb84a..b78d4ef18 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
@@ -3,18 +3,17 @@
 /**
  * BlogArticle filter form.
  *
- * @package    symfony12
- * @subpackage filter
  * @author     Your name here
+ *
  * @version    SVN: $Id$
  */
 class BlogArticleFormFilter extends BaseBlogArticleFormFilter
 {
-  /**
-   * @see ArticleFormFilter
-   */
-  public function configure()
-  {
-    parent::configure();
-  }
+    /**
+     * @see ArticleFormFilter
+     */
+    public function configure()
+    {
+        parent::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 8004103aa..a630b7444 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
@@ -3,14 +3,13 @@
 /**
  * BlogArticleTranslation filter form.
  *
- * @package    symfony12
- * @subpackage filter
  * @author     Your name here
+ *
  * @version    SVN: $Id$
  */
 class BlogArticleTranslationFormFilter extends BaseBlogArticleTranslationFormFilter
 {
-  public function configure()
-  {
-  }
+    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 85bd68ec5..c25144d39 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
@@ -3,18 +3,17 @@
 /**
  * BlogAuthor filter form.
  *
- * @package    symfony12
- * @subpackage filter
  * @author     Your name here
+ *
  * @version    SVN: $Id$
  */
 class BlogAuthorFormFilter extends BaseBlogAuthorFormFilter
 {
-  /**
-   * @see AuthorFormFilter
-   */
-  public function configure()
-  {
-    parent::configure();
-  }
+    /**
+     * @see AuthorFormFilter
+     */
+    public function configure()
+    {
+        parent::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 acb05d4dc..76bf7c1d5 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
@@ -3,13 +3,11 @@
 /**
  * CamelCase filter form.
  *
- * @package    filters
- * @subpackage CamelCase *
  * @version    SVN: $Id$
  */
 class CamelCaseFormFilter extends BaseCamelCaseFormFilter
 {
-  public function configure()
-  {
-  }
-}
\ No newline at end of file
+    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 4cba6206e..9e9613a2d 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
@@ -3,14 +3,13 @@
 /**
  * DefaultValueTest filter form.
  *
- * @package    symfony12
- * @subpackage filter
  * @author     Your name here
+ *
  * @version    SVN: $Id$
  */
 class DefaultValueTestFormFilter extends BaseDefaultValueTestFormFilter
 {
-  public function configure()
-  {
-  }
+    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 ce99a6636..052581610 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
@@ -3,13 +3,11 @@
 /**
  * FormGeneratorTest2 filter form.
  *
- * @package    filters
- * @subpackage FormGeneratorTest2 *
  * @version    SVN: $Id$
  */
 class FormGeneratorTest2FormFilter extends BaseFormGeneratorTest2FormFilter
 {
-  public function configure()
-  {
-  }
-}
\ No newline at end of file
+    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 ff981c13d..562102d2f 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
@@ -3,13 +3,11 @@
 /**
  * Group filter form.
  *
- * @package    filters
- * @subpackage Group *
  * @version    SVN: $Id$
  */
 class GroupFormFilter extends BaseGroupFormFilter
 {
-  public function configure()
-  {
-  }
-}
\ No newline at end of file
+    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 ec19fd45a..abb691ffc 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
@@ -3,13 +3,11 @@
 /**
  * Permission filter form.
  *
- * @package    filters
- * @subpackage Permission *
  * @version    SVN: $Id$
  */
 class PermissionFormFilter extends BasePermissionFormFilter
 {
-  public function configure()
-  {
-  }
-}
\ No newline at end of file
+    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 997c4f8e5..2af657e14 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
@@ -3,13 +3,11 @@
 /**
  * Profile filter form.
  *
- * @package    filters
- * @subpackage Profile *
  * @version    SVN: $Id$
  */
 class ProfileFormFilter extends BaseProfileFormFilter
 {
-  public function configure()
-  {
-  }
-}
\ No newline at end of file
+    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 4e780c937..f3c530fd3 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
@@ -3,14 +3,13 @@
 /**
  * ResourceType filter form.
  *
- * @package    symfony12
- * @subpackage filter
  * @author     Your name here
+ *
  * @version    SVN: $Id$
  */
 class ResourceTypeFormFilter extends BaseResourceTypeFormFilter
 {
-  public function configure()
-  {
-  }
+    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 89c0f4a38..68ca40683 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
@@ -3,14 +3,13 @@
 /**
  * Setting filter form.
  *
- * @package    symfony12
- * @subpackage filter
  * @author     Your name here
+ *
  * @version    SVN: $Id$
  */
 class SettingFormFilter extends PluginSettingFormFilter
 {
-  public function configure()
-  {
-  }
+    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 0f46e995b..6f5f20cd5 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
@@ -3,13 +3,11 @@
 /**
  * Subscription filter form.
  *
- * @package    filters
- * @subpackage Subscription *
  * @version    SVN: $Id$
  */
 class SubscriptionFormFilter extends BaseSubscriptionFormFilter
 {
-  public function configure()
-  {
-  }
-}
\ No newline at end of file
+    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 c90ac9908..60d896124 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
@@ -3,13 +3,11 @@
 /**
  * UniqueTest filter form.
  *
- * @package    filters
- * @subpackage UniqueTest *
  * @version    SVN: $Id$
  */
 class UniqueTestFormFilter extends BaseUniqueTestFormFilter
 {
-  public function configure()
-  {
-  }
-}
\ No newline at end of file
+    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 d65219ff3..d700bccf3 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
@@ -3,13 +3,11 @@
 /**
  * User filter form.
  *
- * @package    filters
- * @subpackage User *
  * @version    SVN: $Id$
  */
 class UserFormFilter extends BaseUserFormFilter
 {
-  public function configure()
-  {
-  }
-}
\ No newline at end of file
+    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 67942ce19..f7ffaad5e 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
@@ -2,10 +2,9 @@
 
 /**
  * Base project form.
- * 
- * @package    symfony12
- * @subpackage form
+ *
  * @author     Your name here
+ *
  * @version    SVN: $Id$
  */
 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 7dbf91612..9def10c17 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
@@ -3,14 +3,12 @@
 /**
  * Article form.
  *
- * @package    form
- * @subpackage Article
  * @version    SVN: $Id$
  */
 class ArticleForm extends BaseArticleForm
 {
-  public function configure()
-  {
-    $this->embedI18n(array('en', 'fr'));
-  }
-}
\ No newline at end of file
+    public function configure()
+    {
+        $this->embedI18n(array('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 18227272e..eeb3eb6fe 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
@@ -3,13 +3,11 @@
 /**
  * ArticleTranslation form.
  *
- * @package    form
- * @subpackage ArticleTranslation
  * @version    SVN: $Id$
  */
 class ArticleTranslationForm extends BaseArticleTranslationForm
 {
-  public function configure()
-  {
-  }
-}
\ No newline at end of file
+    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 711c5199b..904de2898 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
@@ -3,32 +3,30 @@
 /**
  * Attachment form.
  *
- * @package    symfony12
- * @subpackage form
  * @author     Your name here
+ *
  * @version    SVN: $Id$
  */
 class AttachmentForm extends BaseAttachmentForm
 {
-  const
-    TEST_GENERATED_FILENAME = 'test123';
+    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,
-      'edit_mode' => !$this->isNew(),
-    ));
-    $this->validatorSchema['file_path'] = new sfValidatorFile(array(
-      'path' => sfConfig::get('sf_cache_dir'),
-      'mime_type_guessers' => array(),
-      'required' => false,
-    ));
-    $this->validatorSchema['file_path_delete'] = new sfValidatorBoolean();
-  }
+    public function configure()
+    {
+        $this->widgetSchema['file_path'] = new sfWidgetFormInputFileEditable(array(
+            '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(),
+            'required' => false,
+        ));
+        $this->validatorSchema['file_path_delete'] = new sfValidatorBoolean();
+    }
 
-  protected function generateFilePathFilename()
-  {
-    return self::TEST_GENERATED_FILENAME;
-  }
+    protected function generateFilePathFilename()
+    {
+        return self::TEST_GENERATED_FILENAME;
+    }
 }
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 d56840dfe..96fb68fa3 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
@@ -3,13 +3,11 @@
 /**
  * Author form.
  *
- * @package    form
- * @subpackage Author
  * @version    SVN: $Id$
  */
 class AuthorForm extends BaseAuthorForm
 {
-  public function configure()
-  {
-  }
-}
\ No newline at end of file
+    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 d421feda4..4f6a924a7 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
@@ -3,18 +3,17 @@
 /**
  * AuthorInheritanceConcrete form.
  *
- * @package    symfony12
- * @subpackage form
  * @author     Your name here
+ *
  * @version    SVN: $Id$
  */
 class AuthorInheritanceConcreteForm extends BaseAuthorInheritanceConcreteForm
 {
-  /**
-   * @see AuthorForm
-   */
-  public function configure()
-  {
-    parent::configure();
-  }
+    /**
+     * @see AuthorForm
+     */
+    public function configure()
+    {
+        parent::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 9fffb50aa..cc86e6f5c 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
@@ -3,13 +3,11 @@
 /**
  * AuthorInheritance form.
  *
- * @package    form
- * @subpackage AuthorInheritance
  * @version    SVN: $Id$
  */
 class AuthorInheritanceForm extends BaseAuthorInheritanceForm
 {
-  public function configure()
-  {
-  }
-}
\ No newline at end of file
+    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 2417f3efd..1bf8aa2a2 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
@@ -3,12 +3,11 @@
 /**
  * Project form base class.
  *
- * @package    form
  * @version    SVN: $Id$
  */
 abstract class BaseFormDoctrine extends sfFormDoctrine
 {
-  public function setup()
-  {
-  }
-}
\ No newline at end of file
+    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 46bb99492..5d60b44e8 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
@@ -3,18 +3,17 @@
 /**
  * BlogArticle form.
  *
- * @package    symfony12
- * @subpackage form
  * @author     Your name here
+ *
  * @version    SVN: $Id$
  */
 class BlogArticleForm extends BaseBlogArticleForm
 {
-  /**
-   * @see ArticleForm
-   */
-  public function configure()
-  {
-    parent::configure();
-  }
+    /**
+     * @see ArticleForm
+     */
+    public function configure()
+    {
+        parent::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 88a9a50f4..ca3cb470e 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
@@ -3,14 +3,13 @@
 /**
  * BlogArticleTranslation form.
  *
- * @package    symfony12
- * @subpackage form
  * @author     Your name here
+ *
  * @version    SVN: $Id$
  */
 class BlogArticleTranslationForm extends BaseBlogArticleTranslationForm
 {
-  public function configure()
-  {
-  }
+    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 efe04aa7f..04c807ebf 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
@@ -3,18 +3,17 @@
 /**
  * BlogAuthor form.
  *
- * @package    symfony12
- * @subpackage form
  * @author     Your name here
+ *
  * @version    SVN: $Id$
  */
 class BlogAuthorForm extends BaseBlogAuthorForm
 {
-  /**
-   * @see AuthorForm
-   */
-  public function configure()
-  {
-    parent::configure();
-  }
+    /**
+     * @see AuthorForm
+     */
+    public function configure()
+    {
+        parent::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 342d95844..9a3a7599d 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
@@ -3,13 +3,11 @@
 /**
  * CamelCase form.
  *
- * @package    form
- * @subpackage CamelCase
  * @version    SVN: $Id$
  */
 class CamelCaseForm extends BaseCamelCaseForm
 {
-  public function configure()
-  {
-  }
-}
\ No newline at end of file
+    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 769380405..c74747dec 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
@@ -3,14 +3,13 @@
 /**
  * DefaultValueTest form.
  *
- * @package    symfony12
- * @subpackage form
  * @author     Your name here
+ *
  * @version    SVN: $Id$
  */
 class DefaultValueTestForm extends BaseDefaultValueTestForm
 {
-  public function configure()
-  {
-  }
+    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 d8aca492a..8f5f97c45 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
@@ -3,13 +3,11 @@
 /**
  * FormGeneratorTest form.
  *
- * @package    form
- * @subpackage FormGeneratorTest
  * @version    SVN: $Id$
  */
 class FormGeneratorTestForm extends BaseFormGeneratorTestForm
 {
-  public function configure()
-  {
-  }
-}
\ No newline at end of file
+    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 86debc27d..81ecd8427 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
@@ -3,13 +3,11 @@
 /**
  * Group form.
  *
- * @package    form
- * @subpackage Group
  * @version    SVN: $Id$
  */
 class GroupForm extends BaseGroupForm
 {
-  public function configure()
-  {
-  }
-}
\ No newline at end of file
+    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 875fc00fe..86f4386ba 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
@@ -3,13 +3,11 @@
 /**
  * Permission form.
  *
- * @package    form
- * @subpackage Permission
  * @version    SVN: $Id$
  */
 class PermissionForm extends BasePermissionForm
 {
-  public function configure()
-  {
-  }
-}
\ No newline at end of file
+    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 dc8d9bdfd..21a327ad3 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
@@ -3,13 +3,11 @@
 /**
  * Profile form.
  *
- * @package    form
- * @subpackage Profile
  * @version    SVN: $Id$
  */
 class ProfileForm extends BaseProfileForm
 {
-  public function configure()
-  {
-  }
-}
\ No newline at end of file
+    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 013e9b6a1..44ec435f8 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
@@ -3,14 +3,13 @@
 /**
  * ResourceType form.
  *
- * @package    symfony12
- * @subpackage form
  * @author     Your name here
+ *
  * @version    SVN: $Id$
  */
 class ResourceTypeForm extends BaseResourceTypeForm
 {
-  public function configure()
-  {
-  }
+    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 3b0a25d6a..2d0211442 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
@@ -3,14 +3,13 @@
 /**
  * Setting form.
  *
- * @package    symfony12
- * @subpackage form
  * @author     Your name here
+ *
  * @version    SVN: $Id$
  */
 class SettingForm extends PluginSettingForm
 {
-  public function configure()
-  {
-  }
+    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 ef11865e7..2cae31f70 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
@@ -3,13 +3,11 @@
 /**
  * Subscription form.
  *
- * @package    form
- * @subpackage Subscription
  * @version    SVN: $Id$
  */
 class SubscriptionForm extends BaseSubscriptionForm
 {
-  public function configure()
-  {
-  }
-}
\ No newline at end of file
+    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 6d321ffb7..a9bea3b70 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
@@ -3,13 +3,11 @@
 /**
  * UniqueTest form.
  *
- * @package    form
- * @subpackage UniqueTest
  * @version    SVN: $Id$
  */
 class UniqueTestForm extends BaseUniqueTestForm
 {
-  public function configure()
-  {
-  }
-}
\ No newline at end of file
+    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 b9c3cbf29..fd43fc84c 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
@@ -3,17 +3,15 @@
 /**
  * User form.
  *
- * @package    form
- * @subpackage User
  * @version    SVN: $Id$
  */
 class UserForm extends BaseUserForm
 {
-  public function configure()
-  {
-    $profileForm = new ProfileForm($this->object->getProfile());
-    unset($profileForm['id'], $profileForm['user_id']);
+    public function configure()
+    {
+        $profileForm = new ProfileForm($this->object->getProfile());
+        unset($profileForm['id'], $profileForm['user_id']);
 
-    $this->embedForm('Profile', $profileForm);
-  }
-}
\ No newline at end of file
+        $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 c0470a43e..84c8098c0 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,12 +1,12 @@
 <?php
 
 /**
- * This class has been auto-generated by the Doctrine ORM Framework
+ * This class has been auto-generated by the Doctrine ORM Framework.
  */
 class Article extends BaseArticle
 {
-  public function getTestingNonColumn()
-  {
-    return 'test-' . $this->slug;
-  }
-}
\ No newline at end of file
+    public function getTestingNonColumn()
+    {
+        return 'test-'.$this->slug;
+    }
+}
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 30b0cab96..487cb17f3 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,74 +1,79 @@
 <?php
 /**
- * This class has been auto-generated by the Doctrine ORM Framework
+ * This class has been auto-generated by the Doctrine ORM Framework.
  */
 class ArticleTable extends Doctrine_Table
 {
-  public function retrieveArticle1(Doctrine_Query $query)
-  {
-    return $query->execute();
-  }
+    public function retrieveArticle1(Doctrine_Query $query)
+    {
+        return $query->execute();
+    }
 
-  public function retrieveArticle2(array $parameters)
-  {
-    $query = $this->createQuery('a');
-    return $query->execute();
-  }
+    public function retrieveArticle2(array $parameters)
+    {
+        $query = $this->createQuery('a');
 
-  public function retrieveArticle3(array $parameters)
-  {
-    $query = $this->createQuery('a');
-    return $query->execute();
-  }
+        return $query->execute();
+    }
 
-  public function retrieveArticle4(array $parameters)
-  {
-    $query = $this->createQuery('a');
-    return $query->fetchOne();
-  }
+    public function retrieveArticle3(array $parameters)
+    {
+        $query = $this->createQuery('a');
 
-  public function routeTest9(array $parameters)
-  {
-    return Doctrine_Query::create()
-      ->from('Article a')
-      ->where('a.id = ?', $parameters['id'])
-      ->limit(1)
-      ->execute();
-  }
+        return $query->execute();
+    }
 
-  public function routeTest10(Doctrine_Query $q)
-  {
-    $q->orWhere($q->getRootAlias() . '.is_on_homepage = ?', 0);
-    return $q->fetchOne();
-  }
+    public function retrieveArticle4(array $parameters)
+    {
+        $query = $this->createQuery('a');
 
-  public function testAdminGenTableMethod(Doctrine_Query $q)
-  {
-    return $q;
-  }
+        return $query->fetchOne();
+    }
 
-  public function getNewQuery()
-  {
-    return $this->createQuery()->select('title, body');
-  }
+    public function routeTest9(array $parameters)
+    {
+        return Doctrine_Query::create()
+            ->from('Article a')
+            ->where('a.id = ?', $parameters['id'])
+            ->limit(1)
+            ->execute()
+        ;
+    }
 
-  public function addOnHomepage(Doctrine_Query $q = null)
-  {
-    if (is_null($q))
+    public function routeTest10(Doctrine_Query $q)
     {
-      $q = $this->createQuery('a');
+        $q->orWhere($q->getRootAlias().'.is_on_homepage = ?', 0);
+
+        return $q->fetchOne();
     }
-    $alias = $q->getRootAlias();
-    return $q->addWhere($alias.'.is_on_homepage = 1');
-  }
 
-  public function filterSuppliedQuery($query)
-  {
-    $query->select('title, body');
-  }
+    public function testAdminGenTableMethod(Doctrine_Query $q)
+    {
+        return $q;
+    }
 
-  public function filterSuppliedQueryAndReturn($query)
-  {
-    return $query->select('title, body');
-  }
+    public function getNewQuery()
+    {
+        return $this->createQuery()->select('title, body');
+    }
+
+    public function addOnHomepage(Doctrine_Query $q = null)
+    {
+        if (is_null($q)) {
+            $q = $this->createQuery('a');
+        }
+        $alias = $q->getRootAlias();
+
+        return $q->addWhere($alias.'.is_on_homepage = 1');
+    }
+
+    public function filterSuppliedQuery($query)
+    {
+        $query->select('title, body');
+    }
+
+    public function filterSuppliedQueryAndReturn($query)
+    {
+        return $query->select('title, body');
+    }
 }
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 94e187197..f85160b8d 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,13 +1,12 @@
 <?php
 
 /**
- * Attachment
- * 
+ * Attachment.
+ *
  * This class has been auto-generated by the Doctrine ORM Framework
- * 
- * @package    symfony12
- * @subpackage model
+ *
  * @author     Your name here
+ *
  * @version    SVN: $Id$
  */
 class Attachment extends BaseAttachment
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 8168959dd..b7fc278a8 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,23 +1,21 @@
 <?php
 
 /**
- * This class has been auto-generated by the Doctrine ORM Framework
+ * This class has been auto-generated by the Doctrine ORM Framework.
  */
 class Author extends BaseAuthor
 {
-  public function setName($name)
-  {
-    if ( ! $this->exists())
+    public function setName($name)
     {
-      $author = Doctrine_Core::getTable('Author')->findOneByName(trim($name));
-      if ($author)
-      {
-        $this->assignIdentifier($author->identifier());
-      } else {
-        return $this->_set('name', $name);
-      }
-    } else {
-      return $this->_set('name', $name);
+        if (!$this->exists()) {
+            $author = Doctrine_Core::getTable('Author')->findOneByName(trim($name));
+            if ($author) {
+                $this->assignIdentifier($author->identifier());
+            } else {
+                return $this->_set('name', $name);
+            }
+        } else {
+            return $this->_set('name', $name);
+        }
     }
-  }
-}
\ No newline at end of file
+}
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 f4b193cbd..cd54b43e6 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,16 +1,14 @@
 <?php
 
 /**
- * AuthorInheritance
- * 
+ * AuthorInheritance.
+ *
  * This class has been auto-generated by the Doctrine ORM Framework
- * 
- * @package    ##PACKAGE##
- * @subpackage ##SUBPACKAGE##
+ *
  * @author     ##NAME## <##EMAIL##>
+ *
  * @version    SVN: $Id$
  */
 class AuthorInheritance extends BaseAuthorInheritance
 {
-
-}
\ No newline at end of file
+}
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 262f02ef1..69e5d46f4 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,16 +1,14 @@
 <?php
 
 /**
- * AuthorInheritanceConcrete
- * 
+ * AuthorInheritanceConcrete.
+ *
  * This class has been auto-generated by the Doctrine ORM Framework
- * 
- * @package    ##PACKAGE##
- * @subpackage ##SUBPACKAGE##
+ *
  * @author     ##NAME## <##EMAIL##>
+ *
  * @version    SVN: $Id$
  */
 class AuthorInheritanceConcrete extends BaseAuthorInheritanceConcrete
 {
-
-}
\ No newline at end of file
+}
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 f6e492e10..24d7647d8 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,7 +1,5 @@
 <?php
-/**
- */
+
 class AuthorInheritanceConcreteTable extends AuthorTable
 {
-
-}
\ No newline at end of file
+}
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 c7ec125ef..a13d7d811 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,7 +1,5 @@
 <?php
-/**
- */
+
 class AuthorInheritanceTable extends AuthorTable
 {
-
-}
\ No newline at end of file
+}
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 a1a748dc1..7f9b9a52e 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,35 +1,35 @@
 <?php
 /**
- * This class has been auto-generated by the Doctrine ORM Framework
+ * This class has been auto-generated by the Doctrine ORM Framework.
  */
 class AuthorTable extends Doctrine_Table
 {
-  public function testTableMethod()
-  {
-    return $this->createQuery('a')
-      ->where('a.id > 0');
-  }
-
-  public function testTableMethod2(Doctrine_Query $q)
-  {
-    $q->addWhere('a.id > 0');
-    return $q;
-  }
-
-  public function getChoices($limit = null)
-  {
-    $q = $this->createQuery('a');
-    if (null !== $limit)
+    public function testTableMethod()
     {
-      $q->limit($limit);
+        return $this->createQuery('a')
+            ->where('a.id > 0')
+        ;
     }
-    $choices = array();
 
-    foreach ($q->fetchArray() as $author)
+    public function testTableMethod2(Doctrine_Query $q)
     {
-      $choices[$author['id']] = $author['name'];
+        $q->addWhere('a.id > 0');
+
+        return $q;
     }
 
-    return $choices;
-  }
+    public function getChoices($limit = null)
+    {
+        $q = $this->createQuery('a');
+        if (null !== $limit) {
+            $q->limit($limit);
+        }
+        $choices = array();
+
+        foreach ($q->fetchArray() as $author) {
+            $choices[$author['id']] = $author['name'];
+        }
+
+        return $choices;
+    }
 }
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 3fea774f4..7ca686f8f 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,13 +1,12 @@
 <?php
 
 /**
- * BlogArticle
- * 
+ * BlogArticle.
+ *
  * This class has been auto-generated by the Doctrine ORM Framework
- * 
- * @package    symfony12
- * @subpackage model
+ *
  * @author     Your name here
+ *
  * @version    SVN: $Id$
  */
 class BlogArticle extends BaseBlogArticle
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 09aacebad..b722f1b83 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,13 +1,12 @@
 <?php
 
 /**
- * BlogAuthor
- * 
+ * BlogAuthor.
+ *
  * This class has been auto-generated by the Doctrine ORM Framework
- * 
- * @package    symfony12
- * @subpackage model
+ *
  * @author     Your name here
+ *
  * @version    SVN: $Id$
  */
 class BlogAuthor extends BaseBlogAuthor
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 3d9ad974a..fcb14295a 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,16 +1,14 @@
 <?php
 
 /**
- * CamelCase
- * 
+ * CamelCase.
+ *
  * This class has been auto-generated by the Doctrine ORM Framework
- * 
- * @package    ##PACKAGE##
- * @subpackage ##SUBPACKAGE##
+ *
  * @author     ##NAME## <##EMAIL##>
+ *
  * @version    SVN: $Id$
  */
 class CamelCase extends BaseCamelCase
 {
-
-}
\ No newline at end of file
+}
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 e42564758..1b19bd7a3 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,7 +1,5 @@
 <?php
-/**
- */
+
 class CamelCaseTable extends Doctrine_Table
 {
-
-}
\ No newline at end of file
+}
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 0ffc63b28..5b1334bfe 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,16 +1,18 @@
 <?php
 
 /**
- * DefaultValueTest
- * 
+ * DefaultValueTest.
+ *
  * This class has been auto-generated by the Doctrine ORM Framework
- * 
- * @package    ##PACKAGE##
- * @subpackage ##SUBPACKAGE##
+ *
  * @author     ##NAME## <##EMAIL##>
+ *
  * @version    SVN: $Id$
+ *
+ * @internal
+ *
+ * @coversNothing
  */
 class DefaultValueTest extends BaseDefaultValueTest
 {
-
-}
\ No newline at end of file
+}
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 09e8a223e..5ff964b04 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,7 +1,5 @@
 <?php
-/**
- */
+
 class DefaultValueTestTable extends Doctrine_Table
 {
-
-}
\ No newline at end of file
+}
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 3bad4305b..fbdf65787 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,16 +1,18 @@
 <?php
 
 /**
- * FormGeneratorTest
- * 
+ * FormGeneratorTest.
+ *
  * This class has been auto-generated by the Doctrine ORM Framework
- * 
- * @package    ##PACKAGE##
- * @subpackage ##SUBPACKAGE##
+ *
  * @author     ##NAME## <##EMAIL##>
+ *
  * @version    SVN: $Id$
+ *
+ * @internal
+ *
+ * @coversNothing
  */
 class FormGeneratorTest extends BaseFormGeneratorTest
 {
-
-}
\ No newline at end of file
+}
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 384c1d5e1..a16d4bdfd 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,16 +1,14 @@
 <?php
 
 /**
- * FormGeneratorTest2
- * 
+ * FormGeneratorTest2.
+ *
  * This class has been auto-generated by the Doctrine ORM Framework
- * 
- * @package    ##PACKAGE##
- * @subpackage ##SUBPACKAGE##
+ *
  * @author     ##NAME## <##EMAIL##>
+ *
  * @version    SVN: $Id$
  */
 class FormGeneratorTest2 extends BaseFormGeneratorTest2
 {
-
-}
\ No newline at end of file
+}
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 d014fcb16..9ad271589 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,7 +1,5 @@
 <?php
-/**
- */
+
 class FormGeneratorTest2Table extends Doctrine_Table
 {
-
-}
\ No newline at end of file
+}
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 f815bffd0..d7bb14b74 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,13 +1,12 @@
 <?php
 
 /**
- * FormGeneratorTest3
- * 
+ * FormGeneratorTest3.
+ *
  * This class has been auto-generated by the Doctrine ORM Framework
- * 
- * @package    symfony12
- * @subpackage model
+ *
  * @author     Your name here
+ *
  * @version    SVN: $Id: Builder.php 6716 2009-11-12 19:26:28Z jwage $
  */
 class FormGeneratorTest3 extends BaseFormGeneratorTest3
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 75372ebc0..fcf912825 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,7 +1,5 @@
 <?php
-/**
- */
+
 class FormGeneratorTestTable extends Doctrine_Table
 {
-
-}
\ No newline at end of file
+}
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 6c978826e..75353df89 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,9 +1,8 @@
 <?php
 
 /**
- * This class has been auto-generated by the Doctrine ORM Framework
+ * This class has been auto-generated by the Doctrine ORM Framework.
  */
 class Group extends BaseGroup
 {
-
-}
\ No newline at end of file
+}
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 709ffd71f..2431abf82 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,9 +1,8 @@
 <?php
 
 /**
- * This class has been auto-generated by the Doctrine ORM Framework
+ * This class has been auto-generated by the Doctrine ORM Framework.
  */
 class GroupPermission extends BaseGroupPermission
 {
-
-}
\ No newline at end of file
+}
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 8d1227a49..6560189fd 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,8 +1,7 @@
 <?php
 /**
- * This class has been auto-generated by the Doctrine ORM Framework
+ * This class has been auto-generated by the Doctrine ORM Framework.
  */
 class GroupPermissionTable extends Doctrine_Table
 {
-
-}
\ No newline at end of file
+}
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 f70b82ba5..fb976ba54 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,8 +1,7 @@
 <?php
 /**
- * This class has been auto-generated by the Doctrine ORM Framework
+ * This class has been auto-generated by the Doctrine ORM Framework.
  */
 class GroupTable extends Doctrine_Table
 {
-
-}
\ No newline at end of file
+}
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 457e52031..50c059062 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,13 +1,12 @@
 <?php
 
 /**
- * ModelFromLinkedSchema
- * 
+ * ModelFromLinkedSchema.
+ *
  * This class has been auto-generated by the Doctrine ORM Framework
- * 
- * @package    symfony12
- * @subpackage model
+ *
  * @author     Your name here
+ *
  * @version    SVN: $Id$
  */
 class ModelFromLinkedSchema extends BaseModelFromLinkedSchema
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 02de3103e..30b9f56b0 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,13 +1,12 @@
 <?php
 
 /**
- * ModelWithNumberInColumn
- * 
+ * ModelWithNumberInColumn.
+ *
  * This class has been auto-generated by the Doctrine ORM Framework
- * 
- * @package    symfony12
- * @subpackage model
+ *
  * @author     Your name here
+ *
  * @version    SVN: $Id: Builder.php 6820 2009-11-30 17:27:49Z jwage $
  */
 class ModelWithNumberInColumn extends BaseModelWithNumberInColumn
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 9f05f750f..dcc385d3b 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,9 +1,8 @@
 <?php
 
 /**
- * This class has been auto-generated by the Doctrine ORM Framework
+ * This class has been auto-generated by the Doctrine ORM Framework.
  */
 class Permission extends BasePermission
 {
-
-}
\ No newline at end of file
+}
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 4dcae4230..c4bc9ff97 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,8 +1,7 @@
 <?php
 /**
- * This class has been auto-generated by the Doctrine ORM Framework
+ * This class has been auto-generated by the Doctrine ORM Framework.
  */
 class PermissionTable extends Doctrine_Table
 {
-
-}
\ No newline at end of file
+}
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 59e520b18..332342756 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,9 +1,8 @@
 <?php
 
 /**
- * This class has been auto-generated by the Doctrine ORM Framework
+ * This class has been auto-generated by the Doctrine ORM Framework.
  */
 class Profile extends BaseProfile
 {
-
-}
\ No newline at end of file
+}
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 39427b54b..c2c9474f5 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,8 +1,7 @@
 <?php
 /**
- * This class has been auto-generated by the Doctrine ORM Framework
+ * This class has been auto-generated by the Doctrine ORM Framework.
  */
 class ProfileTable extends Doctrine_Table
 {
-
-}
\ No newline at end of file
+}
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 231764297..68ad86ec5 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,13 +1,12 @@
 <?php
 
 /**
- * ResourceType
- * 
+ * ResourceType.
+ *
  * This class has been auto-generated by the Doctrine ORM Framework
- * 
- * @package    symfony12
- * @subpackage model
+ *
  * @author     Your name here
+ *
  * @version    SVN: $Id$
  */
 class ResourceType extends BaseResourceType
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 bab303f28..b69958cb9 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,13 +1,12 @@
 <?php
 
 /**
- * Setting
- * 
+ * Setting.
+ *
  * This class has been auto-generated by the Doctrine ORM Framework
- * 
- * @package    symfony12
- * @subpackage model
+ *
  * @author     Your name here
+ *
  * @version    SVN: $Id$
  */
 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 bca9fbfe2..ef147fec2 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,11 +1,9 @@
 <?php
 
-
 class SettingTable extends PluginSettingTable
 {
-    
     public static function getInstance()
     {
         return Doctrine_Core::getTable('Setting');
     }
-}
\ No newline at end of file
+}
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 212d26c52..2e9ed9c8d 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,9 +1,8 @@
 <?php
 
 /**
- * This class has been auto-generated by the Doctrine ORM Framework
+ * This class has been auto-generated by the Doctrine ORM Framework.
  */
 class Subscription extends BaseSubscription
 {
-
-}
\ No newline at end of file
+}
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 12530e018..054e0c3c0 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,8 +1,7 @@
 <?php
 /**
- * This class has been auto-generated by the Doctrine ORM Framework
+ * This class has been auto-generated by the Doctrine ORM Framework.
  */
 class SubscriptionTable extends Doctrine_Table
 {
-
-}
\ No newline at end of file
+}
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 8b040367e..667cf2c05 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,9 +1,12 @@
 <?php
 
 /**
- * This class has been auto-generated by the Doctrine ORM Framework
+ * This class has been auto-generated by the Doctrine ORM Framework.
+ *
+ * @internal
+ *
+ * @coversNothing
  */
 class UniqueTest extends BaseUniqueTest
 {
-
-}
\ No newline at end of file
+}
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 a95eae8b8..70a0fd660 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,8 +1,7 @@
 <?php
 /**
- * This class has been auto-generated by the Doctrine ORM Framework
+ * This class has been auto-generated by the Doctrine ORM Framework.
  */
 class UniqueTestTable extends Doctrine_Table
 {
-
-}
\ No newline at end of file
+}
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 852ce6af4..70b2d8889 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,12 +1,12 @@
 <?php
 
 /**
- * This class has been auto-generated by the Doctrine ORM Framework
+ * This class has been auto-generated by the Doctrine ORM Framework.
  */
 class User extends BaseUser
 {
-  public function setPassword($password)
-  {
-    return $this->_set('password', md5($password));
-  }
-}
\ No newline at end of file
+    public function setPassword($password)
+    {
+        return $this->_set('password', md5($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 d42f59454..5253c65af 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,9 +1,8 @@
 <?php
 
 /**
- * This class has been auto-generated by the Doctrine ORM Framework
+ * This class has been auto-generated by the Doctrine ORM Framework.
  */
 class UserGroup extends BaseUserGroup
 {
-
-}
\ No newline at end of file
+}
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 992cfa9c9..c13b5f8c7 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,8 +1,7 @@
 <?php
 /**
- * This class has been auto-generated by the Doctrine ORM Framework
+ * This class has been auto-generated by the Doctrine ORM Framework.
  */
 class UserGroupTable extends Doctrine_Table
 {
-
-}
\ No newline at end of file
+}
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 bf97ee952..3cd3d6990 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,9 +1,8 @@
 <?php
 
 /**
- * This class has been auto-generated by the Doctrine ORM Framework
+ * This class has been auto-generated by the Doctrine ORM Framework.
  */
 class UserPermission extends BaseUserPermission
 {
-
-}
\ No newline at end of file
+}
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 021b10ce0..a184d2fb0 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,8 +1,7 @@
 <?php
 /**
- * This class has been auto-generated by the Doctrine ORM Framework
+ * This class has been auto-generated by the Doctrine ORM Framework.
  */
 class UserPermissionTable extends Doctrine_Table
 {
-
-}
\ No newline at end of file
+}
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 91175d557..4a7c5d4c0 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,30 +1,33 @@
 <?php
 /**
- * This class has been auto-generated by the Doctrine ORM Framework
+ * This class has been auto-generated by the Doctrine ORM Framework.
  */
 class UserTable extends Doctrine_Table
 {
-  public function widgetChoiceTableMethod1()
-  {
-    return $this->createQuery('u');
-  }
+    public function widgetChoiceTableMethod1()
+    {
+        return $this->createQuery('u');
+    }
 
-  public function widgetChoiceTableMethod2()
-  {
-    return $this->widgetChoiceTableMethod1()
-      ->execute();
-  }
+    public function widgetChoiceTableMethod2()
+    {
+        return $this->widgetChoiceTableMethod1()
+            ->execute()
+        ;
+    }
 
-  public function widgetChoiceTableMethod3()
-  {
-    return $this->widgetChoiceTableMethod1()
-      ->fetchOne();
-  }
+    public function widgetChoiceTableMethod3()
+    {
+        return $this->widgetChoiceTableMethod1()
+            ->fetchOne()
+        ;
+    }
 
-  public function widgetChoiceTableMethod4()
-  {
-    return $this->widgetChoiceTableMethod1()
-      ->where('1 = 0')
-      ->execute();
-  }
-}
\ No newline at end of file
+    public function widgetChoiceTableMethod4()
+    {
+        return $this->widgetChoiceTableMethod1()
+            ->where('1 = 0')
+            ->execute()
+        ;
+    }
+}
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 17939c47f..e4c7f680f 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,5 @@
 <?php
+
 abstract class myDoctrineRecord extends sfDoctrineRecord
 {
-  
-}
\ No newline at end of file
+}
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 b613761f5..97c0b3383 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
@@ -3,9 +3,8 @@
 /**
  * PluginSetting form.
  *
- * @package    ##PROJECT_NAME##
- * @subpackage filter
  * @author     ##AUTHOR_NAME##
+ *
  * @version    SVN: $Id$
  */
 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 437dc9ab3..5c2c5e8bc 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
@@ -3,9 +3,8 @@
 /**
  * PluginSetting form.
  *
- * @package    ##PROJECT_NAME##
- * @subpackage form
  * @author     ##AUTHOR_NAME##
+ *
  * @version    SVN: $Id$
  */
 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 1ce1702a7..a61eec69b 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,16 +1,14 @@
 <?php
 
 /**
- * PluginSetting
- * 
+ * PluginSetting.
+ *
  * This class has been auto-generated by the Doctrine ORM Framework
- * 
- * @package    ##PACKAGE##
- * @subpackage ##SUBPACKAGE##
+ *
  * @author     ##NAME## <##EMAIL##>
+ *
  * @version    SVN: $Id$
  */
 abstract class PluginSetting extends BaseSetting
 {
-
-}
\ No newline at end of file
+}
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 773371c78..c8272056c 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,8 +1,8 @@
 <?php
 
 /**
- * PluginSettingTable
- * 
+ * PluginSettingTable.
+ *
  * This class has been auto-generated by the Doctrine ORM Framework
  */
 class PluginSettingTable extends Doctrine_Table
@@ -16,4 +16,4 @@ public static function getInstance()
     {
         return Doctrine_Core::getTable('PluginSetting');
     }
-}
\ No newline at end of file
+}
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/sfDoctrineRecordTest.php b/lib/plugins/sfDoctrinePlugin/test/functional/sfDoctrineRecordTest.php
index 95273cd39..31f52561b 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/sfDoctrineRecordTest.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/sfDoctrineRecordTest.php
@@ -10,7 +10,8 @@
 
 $app = 'frontend';
 $fixtures = 'fixtures/fixtures.yml';
-require_once(dirname(__FILE__).'/../bootstrap/functional.php');
+
+require_once dirname(__FILE__).'/../bootstrap/functional.php';
 
 $t = new lime_test(22);
 
@@ -71,10 +72,10 @@
 $t->is($dateTime, null);
 
 try {
-  $article->getDateTimeObject('author_id');
-  $t->fail();
+    $article->getDateTimeObject('author_id');
+    $t->fail();
 } catch (sfException $e) {
-  $t->pass();
+    $t->pass();
 }
 
 $article->setDateTimeObject('created_at', new DateTime('1985-09-01'));
diff --git a/lib/plugins/sfDoctrinePlugin/test/unit/form/sfFormDoctrineTest.php b/lib/plugins/sfDoctrinePlugin/test/unit/form/sfFormDoctrineTest.php
index f0a2a5810..e27dc6668 100644
--- a/lib/plugins/sfDoctrinePlugin/test/unit/form/sfFormDoctrineTest.php
+++ b/lib/plugins/sfDoctrinePlugin/test/unit/form/sfFormDoctrineTest.php
@@ -1,6 +1,7 @@
 <?php
 
 $app = 'frontend';
+
 include dirname(__FILE__).'/../../bootstrap/functional.php';
 
 $t = new lime_test(13);
@@ -10,12 +11,12 @@
 
 class NumericFieldForm extends ArticleForm
 {
-  public function configure()
-  {
-    $this->widgetSchema[1] = new sfWidgetFormInputText();
-    $this->validatorSchema[1] = new sfValidatorPass();
-    $this->setDefault(1, '==DEFAULT_VALUE==');
-  }
+    public function configure()
+    {
+        $this->widgetSchema[1] = new sfWidgetFormInputText();
+        $this->validatorSchema[1] = new sfValidatorPass();
+        $this->setDefault(1, '==DEFAULT_VALUE==');
+    }
 }
 
 $form = new NumericFieldForm();
@@ -24,10 +25,10 @@ public function configure()
 
 class DefaultValuesForm extends AuthorForm
 {
-  public function configure()
-  {
-    $this->setDefault('name', 'John Doe');
-  }
+    public function configure()
+    {
+        $this->setDefault('name', 'John Doe');
+    }
 }
 
 $author = new Author();
@@ -50,11 +51,11 @@ 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'),
-  ),
+    'Articles' => array(
+        array('title' => 'Article 1'),
+        array('title' => 'Article 2'),
+        array('title' => 'Article 3'),
+    ),
 )));
 
 $form->embedRelation('Articles');
@@ -70,26 +71,26 @@ class myArticleForm extends ArticleForm
 $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'),
-  ),
+    'Articles' => array(
+        array('title' => 'Article 1'),
+        array('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'),
-  ),
+    'Articles' => array(
+        array('title' => 'Article 1'),
+        array('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'),
+    'Author' => array('name' => 'John Doe'),
 )));
 $form->embedRelation('Author');
 $t->is(isset($form['Author']), 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 617460f12..37cee1a2e 100644
--- a/lib/plugins/sfDoctrinePlugin/test/unit/form/sfFormFilterDoctrineTest.php
+++ b/lib/plugins/sfDoctrinePlugin/test/unit/form/sfFormFilterDoctrineTest.php
@@ -1,44 +1,45 @@
 <?php
 
 $app = 'frontend';
+
 include dirname(__FILE__).'/../../bootstrap/functional.php';
 
 $t = new lime_test(16);
 
 class TestFormFilter extends ArticleFormFilter
 {
-  public $processedFields = array();
-
-  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(),
-    ));
-  }
-
-  public function addNameColumnQuery($query, $field, $value)
-  {
-    $this->processedFields[] = $field;
-  }
-
-  public function getFields()
-  {
-    return array_merge(parent::getFields(), array(
-      'body'        => 'Invalid',
-      'nomethod_bc' => 'Text',
-      'author_id'   => 'Number',
-    ));
-  }
+    public $processedFields = array();
+
+    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(),
+        ));
+    }
+
+    public function addNameColumnQuery($query, $field, $value)
+    {
+        $this->processedFields[] = $field;
+    }
+
+    public function getFields()
+    {
+        return array_merge(parent::getFields(), array(
+            'body' => 'Invalid',
+            'nomethod_bc' => 'Text',
+            'author_id' => 'Number',
+        ));
+    }
 }
 
 $t->diag('->getQuery()');
@@ -57,40 +58,34 @@ public function getFields()
 // BC with symfony 1.2
 $filter = new TestFormFilter();
 $filter->bind(array('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)
-{
-  $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');
+
+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) {
+    $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'));
-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)
-{
-  $t->pass('->getQuery() throws an exception if a field is a real column and neither a column nor type method exists');
+
+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) {
+    $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'));
-try
-{
-  $filter->getQuery();
-  $t->pass('->getQuery() does not throw an exception when a value without a query method is passed');
-}
-catch (Exception $e)
-{
-  $t->fail('->getQuery() does not throw an exception when a value without a query method is passed');
+
+try {
+    $filter->getQuery();
+    $t->pass('->getQuery() does not throw an exception when a value without a query method is passed');
+} 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
diff --git a/lib/plugins/sfDoctrinePlugin/test/unit/pager/sfDoctrinePagerTest.php b/lib/plugins/sfDoctrinePlugin/test/unit/pager/sfDoctrinePagerTest.php
index 38d0f5a42..55c91293f 100644
--- a/lib/plugins/sfDoctrinePlugin/test/unit/pager/sfDoctrinePagerTest.php
+++ b/lib/plugins/sfDoctrinePlugin/test/unit/pager/sfDoctrinePagerTest.php
@@ -2,6 +2,7 @@
 
 $app = 'frontend';
 $fixtures = 'fixtures/pager.yml';
+
 include dirname(__FILE__).'/../../bootstrap/functional.php';
 
 $t = new lime_test(6);
@@ -38,13 +39,11 @@
 $pager->init();
 $normal = 0;
 $iterated = 0;
-foreach ($pager->getResults() as $object)
-{
-  $normal++;
+foreach ($pager->getResults() as $object) {
+    ++$normal;
 }
-foreach ($pager as $object)
-{
-  $iterated++;
+foreach ($pager as $object) {
+    ++$iterated;
 }
 $t->is($iterated, $normal, '"Iterator" interface loops over objects in the current pager');
 
diff --git a/lib/plugins/sfDoctrinePlugin/test/unit/record/sfDoctrineRecordTest.php b/lib/plugins/sfDoctrinePlugin/test/unit/record/sfDoctrineRecordTest.php
index 5ff158986..52d19518e 100644
--- a/lib/plugins/sfDoctrinePlugin/test/unit/record/sfDoctrineRecordTest.php
+++ b/lib/plugins/sfDoctrinePlugin/test/unit/record/sfDoctrineRecordTest.php
@@ -1,6 +1,7 @@
 <?php
 
 $app = 'frontend';
+
 include dirname(__FILE__).'/../../bootstrap/functional.php';
 
 $t = new lime_test(9);
@@ -10,7 +11,7 @@
 
 function is_symfony_i18n_filter($filter)
 {
-  return $filter instanceof sfDoctrineRecordI18nFilter;
+    return $filter instanceof sfDoctrineRecordI18nFilter;
 }
 
 $table = Doctrine_Core::getTable('Article');
@@ -53,10 +54,11 @@ function is_symfony_i18n_filter($filter)
 $t->is($after->title, 'test', '->unserialize() maintains field values on I18n records upon reset');
 
 $article = new Article();
+
 try {
-$article->setAuthor(new stdClass());
+    $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');
+    $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();
@@ -67,11 +69,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->getColumn_1();
-  $test->getColumn_2();
-  $test->getColumn__3();
-  $t->pass('Make sure __call() handles fields with *_(n) in the field name');
+    $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) {
-  $t->fail('__call() failed in sfDoctrineRecord');
-}
\ No newline at end of file
+    $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 b5ba789a2..5afb950f2 100644
--- a/lib/plugins/sfDoctrinePlugin/test/unit/sfDoctrineColumnTest.php
+++ b/lib/plugins/sfDoctrinePlugin/test/unit/sfDoctrineColumnTest.php
@@ -8,39 +8,44 @@
  * file that was distributed with this source code.
  */
 
-include(dirname(__FILE__).'/../bootstrap/unit.php');
+include dirname(__FILE__).'/../bootstrap/unit.php';
 
 $t = new lime_test(23);
 
 $conn = Doctrine_Manager::connection(new Doctrine_Adapter_Mock('mysql'));
 
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
 class Test extends sfDoctrineRecord
 {
-  public function setTableDefinition()
-  {
-    $this->hasColumn('name', 'string', 255, array('notblank' => true));
-    $this->hasColumn('test as TEST', 'string', 255);
-    $this->hasColumn('email', 'string', 255, array('email' => true, 'notnull' => true));
-  }
+    public function setUp()
+    {
+        $this->hasMany('TestRelation as TestRelations', array('local' => 'id', 'foreign' => 'test_id'));
+    }
 
-  public function setUp()
-  {
-    $this->hasMany('TestRelation as TestRelations', array('local' => 'id', 'foreign' => 'test_id'));
-  }
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255, array('notblank' => true));
+        $this->hasColumn('test as TEST', 'string', 255);
+        $this->hasColumn('email', 'string', 255, array('email' => true, 'notnull' => true));
+    }
 }
 
 class TestRelation extends sfDoctrineRecord
 {
-  public function setTableDefinition()
-  {
-    $this->hasColumn('name', 'string', 255);
-    $this->hasColumn('test_id', 'integer');
-  }
+    public function setUp()
+    {
+        $this->hasOne('Test', array('local' => 'test_id', 'foreign' => 'id'));
+    }
 
-  public function setUp()
-  {
-    $this->hasOne('Test', array('local' => 'test_id', 'foreign' => 'id'));
-  }
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+        $this->hasColumn('test_id', 'integer');
+    }
 }
 
 $column = new sfDoctrineColumn('name', Doctrine_Core::getTable('Test'));
@@ -80,4 +85,4 @@ public function setUp()
 $t->is($column->getTable()->getOption('name'), 'TestRelation');
 
 // Array access
-$t->is($column['type'], 'integer');
\ No newline at end of file
+$t->is($column['type'], 'integer');
diff --git a/lib/plugins/sfDoctrinePlugin/test/unit/sfDoctrineDatabaseTest.php b/lib/plugins/sfDoctrinePlugin/test/unit/sfDoctrineDatabaseTest.php
index 121ba5f5d..c6e2be61a 100644
--- a/lib/plugins/sfDoctrinePlugin/test/unit/sfDoctrineDatabaseTest.php
+++ b/lib/plugins/sfDoctrinePlugin/test/unit/sfDoctrineDatabaseTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-include(dirname(__FILE__).'/../bootstrap/unit.php');
+include dirname(__FILE__).'/../bootstrap/unit.php';
 
 $t = new lime_test(4);
 
@@ -19,13 +19,13 @@ class ProjectConfiguration extends sfProjectConfiguration
 $configuration = new ProjectConfiguration(dirname(__FILE__).'/../../lib', new sfEventDispatcher());
 
 $parameters = array(
-  'name'        => 'doctrine',
-  'dsn'         => 'sqlite::memory',
-  'attributes'  => array(
-    'use_native_enum'   => true,
-    'validate'          => 'all',
-    'tblname_format'    => 'test_%s',
-  ),
+    'name' => 'doctrine',
+    'dsn' => 'sqlite::memory',
+    'attributes' => array(
+        'use_native_enum' => true,
+        'validate' => 'all',
+        'tblname_format' => 'test_%s',
+    ),
 );
 
 $p = new sfDoctrineDatabase($parameters);
@@ -33,5 +33,3 @@ class ProjectConfiguration extends sfProjectConfiguration
 $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 765719590..4658894e4 100644
--- a/lib/plugins/sfDoctrinePlugin/test/unit/validator/sfValidatorDoctrineChoiceTest.php
+++ b/lib/plugins/sfDoctrinePlugin/test/unit/validator/sfValidatorDoctrineChoiceTest.php
@@ -2,6 +2,7 @@
 
 $app = 'frontend';
 $fixtures = 'fixtures/fixtures.yml';
+
 include dirname(__FILE__).'/../../bootstrap/functional.php';
 
 $t = new lime_test(1);
diff --git a/lib/plugins/sfDoctrinePlugin/test/unit/widget/sfWidgetFormDoctrineArrayChoiceTest.php b/lib/plugins/sfDoctrinePlugin/test/unit/widget/sfWidgetFormDoctrineArrayChoiceTest.php
index bfadec225..c1fbba70d 100644
--- a/lib/plugins/sfDoctrinePlugin/test/unit/widget/sfWidgetFormDoctrineArrayChoiceTest.php
+++ b/lib/plugins/sfDoctrinePlugin/test/unit/widget/sfWidgetFormDoctrineArrayChoiceTest.php
@@ -2,6 +2,7 @@
 
 $app = 'frontend';
 $fixtures = 'fixtures/fixtures.yml';
+
 include dirname(__FILE__).'/../../bootstrap/functional.php';
 
 $t = new lime_test(2);
diff --git a/lib/plugins/sfDoctrinePlugin/test/unit/widget/sfWidgetFormDoctrineChoiceTest.php b/lib/plugins/sfDoctrinePlugin/test/unit/widget/sfWidgetFormDoctrineChoiceTest.php
index c1661a038..c7fd14e2e 100644
--- a/lib/plugins/sfDoctrinePlugin/test/unit/widget/sfWidgetFormDoctrineChoiceTest.php
+++ b/lib/plugins/sfDoctrinePlugin/test/unit/widget/sfWidgetFormDoctrineChoiceTest.php
@@ -2,6 +2,7 @@
 
 $app = 'frontend';
 $fixtures = 'fixtures/fixtures.yml';
+
 include dirname(__FILE__).'/../../bootstrap/functional.php';
 
 $t = new lime_test(4);
diff --git a/lib/request/sfRequest.class.php b/lib/request/sfRequest.class.php
index ac6928e20..4e42fc5d5 100644
--- a/lib/request/sfRequest.class.php
+++ b/lib/request/sfRequest.class.php
@@ -14,340 +14,332 @@
  * as attributes, and parameters. It is also possible to manipulate the
  * request method originally sent by the user.
  *
- * @package    symfony
- * @subpackage request
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfRequest implements ArrayAccess
 {
-  const GET    = 'GET';
-  const POST   = 'POST';
-  const PUT    = 'PUT';
-  const PATCH  = 'PATCH';
-  const DELETE = 'DELETE';
-  const HEAD   = 'HEAD';
-  const OPTIONS = 'OPTIONS';
-
-  /** @var sfEventDispatcher */
-  protected $dispatcher = null;
-  /** @var string|null */
-  protected $content = null;
-  /** @var string */
-  protected $method = null;
-  protected $options = array();
-  /** @var sfParameterHolder */
-  protected $parameterHolder = null;
-  /** @var sfParameterHolder */
-  protected $attributeHolder = null;
-
-  /**
-   * Class constructor.
-   *
-   * @see initialize()
-   *
-   * @param sfEventDispatcher $dispatcher
-   * @param array             $parameters
-   * @param array             $attributes
-   * @param array             $options
-   */
-  public function __construct(sfEventDispatcher $dispatcher, $parameters = array(), $attributes = array(), $options = array())
-  {
-    $this->initialize($dispatcher, $parameters, $attributes, $options);
-  }
-
-  /**
-   * Initializes this sfRequest.
-   *
-   * Available options:
-   *
-   *  * 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
-   *
-   * @return void
-   *
-   * @throws <b>sfInitializationException</b> If an error occurs while initializing this sfRequest
-   */
-  public function initialize(sfEventDispatcher $dispatcher, $parameters = array(), $attributes = array(), $options = array())
-  {
-    $this->dispatcher = $dispatcher;
-
-    $this->options = $options;
-
-    if (!isset($this->options['logging']))
+    public const GET = 'GET';
+    public const POST = 'POST';
+    public const PUT = 'PUT';
+    public const PATCH = 'PATCH';
+    public const DELETE = 'DELETE';
+    public const HEAD = 'HEAD';
+    public const OPTIONS = 'OPTIONS';
+
+    /** @var sfEventDispatcher */
+    protected $dispatcher;
+
+    /** @var string|null */
+    protected $content;
+
+    /** @var string */
+    protected $method;
+    protected $options = array();
+
+    /** @var sfParameterHolder */
+    protected $parameterHolder;
+
+    /** @var sfParameterHolder */
+    protected $attributeHolder;
+
+    /**
+     * Class constructor.
+     *
+     * @see initialize()
+     *
+     * @param array $parameters
+     * @param array $attributes
+     * @param array $options
+     */
+    public function __construct(sfEventDispatcher $dispatcher, $parameters = array(), $attributes = array(), $options = array())
+    {
+        $this->initialize($dispatcher, $parameters, $attributes, $options);
+    }
+
+    /**
+     * Calls methods defined via sfEventDispatcher.
+     *
+     * @param string $method    The method name
+     * @param array  $arguments The method arguments
+     *
+     * @return mixed The returned value of the called method
+     *
+     * @throws <b>sfException</b> if call fails
+     */
+    public function __call($method, $arguments)
+    {
+        $event = $this->dispatcher->notifyUntil(new sfEvent($this, 'request.method_not_found', array('method' => $method, 'arguments' => $arguments)));
+        if (!$event->isProcessed()) {
+            throw new sfException(sprintf('Call to undefined method %s::%s.', get_class($this), $method));
+        }
+
+        return $event->getReturnValue();
+    }
+
+    public function __clone()
+    {
+        $this->parameterHolder = clone $this->parameterHolder;
+        $this->attributeHolder = clone $this->attributeHolder;
+    }
+
+    /**
+     * Initializes this sfRequest.
+     *
+     * Available options:
+     *
+     *  * 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
+     *
+     * @throws <b>sfInitializationException</b> If an error occurs while initializing this sfRequest
+     */
+    public function initialize(sfEventDispatcher $dispatcher, $parameters = array(), $attributes = array(), $options = array())
+    {
+        $this->dispatcher = $dispatcher;
+
+        $this->options = $options;
+
+        if (!isset($this->options['logging'])) {
+            $this->options['logging'] = false;
+        }
+
+        // initialize parameter and attribute holders
+        $this->parameterHolder = new sfParameterHolder();
+        $this->attributeHolder = new sfParameterHolder();
+
+        $this->parameterHolder->add($parameters);
+        $this->attributeHolder->add($attributes);
+    }
+
+    /**
+     * Return an option value or null if option does not exists.
+     *
+     * @param string $name the option name
+     *
+     * @return mixed The option value
+     */
+    public function getOption($name)
     {
-      $this->options['logging'] = false;
+        return isset($this->options[$name]) ? $this->options[$name] : null;
     }
 
-    // initialize parameter and attribute holders
-    $this->parameterHolder = new sfParameterHolder();
-    $this->attributeHolder = new sfParameterHolder();
-
-    $this->parameterHolder->add($parameters);
-    $this->attributeHolder->add($attributes);
-  }
-
-  /**
-   * Return an option value or null if option does not exists
-   *
-   * @param string $name The option name.
-   *
-   * @return mixed The option value
-   */
-  public function getOption($name)
-  {
-    return isset($this->options[$name]) ? $this->options[$name] : null;
-  }
-
-  /**
-   * Returns the options.
-   *
-   * @return array The options.
-   */
-  public function getOptions()
-  {
-    return $this->options;
-  }
-
-  /**
-   * Extracts parameter values from the request.
-   *
-   * @param  array $names  An indexed array of parameter names to extract
-   *
-   * @return array An associative array of parameters and their values. If
-   *               a specified parameter doesn't exist an empty string will
-   *               be returned for its value
-   */
-  public function extractParameters($names)
-  {
-    $array = array();
-
-    $parameters = $this->parameterHolder->getAll();
-    foreach ($parameters as $key => $value)
+    /**
+     * Returns the options.
+     *
+     * @return array the options
+     */
+    public function getOptions()
     {
-      if (in_array($key, $names))
-      {
-        $array[$key] = $value;
-      }
+        return $this->options;
     }
 
-    return $array;
-  }
-
-  /**
-   * Gets the request method.
-   *
-   * @return string The request method
-   */
-  public function getMethod()
-  {
-    return $this->method;
-  }
-
-  /**
-   * Sets the request method.
-   *
-   * @param string $method  The request method
-   *
-   * @throws <b>sfException</b> - 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)))
+    /**
+     * Extracts parameter values from the request.
+     *
+     * @param array $names An indexed array of parameter names to extract
+     *
+     * @return array An associative array of parameters and their values. If
+     *               a specified parameter doesn't exist an empty string will
+     *               be returned for its value
+     */
+    public function extractParameters($names)
     {
-      throw new sfException(sprintf('Invalid request method: %s.', $method));
+        $array = array();
+
+        $parameters = $this->parameterHolder->getAll();
+        foreach ($parameters as $key => $value) {
+            if (in_array($key, $names)) {
+                $array[$key] = $value;
+            }
+        }
+
+        return $array;
     }
 
-    $this->method = strtoupper($method);
-  }
-
-  /**
-   * Returns true if the request parameter exists (implements the ArrayAccess interface).
-   *
-   * @param  string $name The name of the request parameter
-   *
-   * @return bool true if the request parameter exists, false otherwise
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetExists($name)
-  {
-    return $this->hasParameter($name);
-  }
-
-  /**
-   * Returns the request parameter associated with the name (implements the ArrayAccess interface).
-   *
-   * @param  string $name  The offset of the value to get
-   *
-   * @return mixed The request parameter if exists, null otherwise
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetGet($name)
-  {
-    return $this->getParameter($name, false);
-  }
-
-  /**
-   * Sets the request parameter associated with the offset (implements the ArrayAccess interface).
-   *
-   * @param string $offset The parameter name
-   * @param string $value The parameter value
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetSet($offset, $value)
-  {
-    $this->setParameter($offset, $value);
-  }
-
-  /**
-   * Removes a request parameter.
-   *
-   * @param string $offset The parameter name
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetUnset($offset)
-  {
-    $this->getParameterHolder()->remove($offset);
-  }
-
-  /**
-   * Retrieves the parameters for the current request.
-   *
-   * @return sfParameterHolder The parameter holder
-   */
-  public function getParameterHolder()
-  {
-    return $this->parameterHolder;
-  }
-
-  /**
-   * Retrieves the attributes holder.
-   *
-   * @return sfParameterHolder The attribute holder
-   */
-  public function getAttributeHolder()
-  {
-    return $this->attributeHolder;
-  }
-
-  /**
-   * Retrieves an attribute from the current request.
-   *
-   * @param  string $name     Attribute name
-   * @param  string $default  Default attribute value
-   *
-   * @return mixed An attribute value
-   */
-  public function getAttribute($name, $default = null)
-  {
-    return $this->attributeHolder->get($name, $default);
-  }
-
-  /**
-   * Indicates whether or not an attribute exist for the current request.
-   *
-   * @param  string $name  Attribute name
-   *
-   * @return bool true, if the attribute exists otherwise false
-   */
-  public function hasAttribute($name)
-  {
-    return $this->attributeHolder->has($name);
-  }
-
-  /**
-   * Sets an attribute for the request.
-   *
-   * @param string $name   Attribute name
-   * @param string $value  Value for the attribute
-   *
-   */
-  public function setAttribute($name, $value)
-  {
-    $this->attributeHolder->set($name, $value);
-  }
-
-  /**
-   * Retrieves a parameter for the current request.
-   *
-   * @param string $name    Parameter name
-   * @param string $default Parameter default value
-   *
-   * @return mixed
-   */
-  public function getParameter($name, $default = null)
-  {
-    return $this->parameterHolder->get($name, $default);
-  }
-
-  /**
-   * Indicates whether or not a parameter exist for the current request.
-   *
-   * @param  string $name  Parameter name
-   *
-   * @return bool true, if the parameter exists otherwise false
-   */
-  public function hasParameter($name)
-  {
-    return $this->parameterHolder->has($name);
-  }
-
-  /**
-   * Sets a parameter for the current request.
-   *
-   * @param string $name   Parameter name
-   * @param string $value  Parameter value
-   *
-   */
-  public function setParameter($name, $value)
-  {
-    $this->parameterHolder->set($name, $value);
-  }
-
-  /**
-   * Returns the content of the current request.
-   *
-   * @return string|false The content or false if none is available
-   */
-  public function getContent()
-  {
-    if (null === $this->content && '' === trim($this->content = file_get_contents('php://input')))
+    /**
+     * Gets the request method.
+     *
+     * @return string The request method
+     */
+    public function getMethod()
     {
-      $this->content = false;
+        return $this->method;
     }
 
-    return $this->content;
-  }
-
-  /**
-   * Calls methods defined via sfEventDispatcher.
-   *
-   * @param  string $method     The method name
-   * @param  array  $arguments  The method arguments
-   *
-   * @return mixed The returned value of the called method
-   *
-   * @throws <b>sfException</b> if call fails
-   */
-  public function __call($method, $arguments)
-  {
-    $event = $this->dispatcher->notifyUntil(new sfEvent($this, 'request.method_not_found', array('method' => $method, 'arguments' => $arguments)));
-    if (!$event->isProcessed())
+    /**
+     * Sets the request method.
+     *
+     * @param string $method The request method
+     *
+     * @throws <b>sfException</b> - If the specified request method is invalid
+     */
+    public function setMethod($method)
     {
-      throw new sfException(sprintf('Call to undefined method %s::%s.', get_class($this), $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));
+        }
+
+        $this->method = strtoupper($method);
     }
 
-    return $event->getReturnValue();
-  }
+    /**
+     * Returns true if the request parameter exists (implements the ArrayAccess interface).
+     *
+     * @param string $name The name of the request parameter
+     *
+     * @return bool true if the request parameter exists, false otherwise
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetExists($name)
+    {
+        return $this->hasParameter($name);
+    }
 
-  public function __clone()
-  {
-    $this->parameterHolder = clone $this->parameterHolder;
-    $this->attributeHolder = clone $this->attributeHolder;
-  }
+    /**
+     * Returns the request parameter associated with the name (implements the ArrayAccess interface).
+     *
+     * @param string $name The offset of the value to get
+     *
+     * @return mixed The request parameter if exists, null otherwise
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetGet($name)
+    {
+        return $this->getParameter($name, false);
+    }
+
+    /**
+     * Sets the request parameter associated with the offset (implements the ArrayAccess interface).
+     *
+     * @param string $offset The parameter name
+     * @param string $value  The parameter value
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetSet($offset, $value)
+    {
+        $this->setParameter($offset, $value);
+    }
+
+    /**
+     * Removes a request parameter.
+     *
+     * @param string $offset The parameter name
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetUnset($offset)
+    {
+        $this->getParameterHolder()->remove($offset);
+    }
+
+    /**
+     * Retrieves the parameters for the current request.
+     *
+     * @return sfParameterHolder The parameter holder
+     */
+    public function getParameterHolder()
+    {
+        return $this->parameterHolder;
+    }
+
+    /**
+     * Retrieves the attributes holder.
+     *
+     * @return sfParameterHolder The attribute holder
+     */
+    public function getAttributeHolder()
+    {
+        return $this->attributeHolder;
+    }
+
+    /**
+     * Retrieves an attribute from the current request.
+     *
+     * @param string $name    Attribute name
+     * @param string $default Default attribute value
+     *
+     * @return mixed An attribute value
+     */
+    public function getAttribute($name, $default = null)
+    {
+        return $this->attributeHolder->get($name, $default);
+    }
+
+    /**
+     * Indicates whether or not an attribute exist for the current request.
+     *
+     * @param string $name Attribute name
+     *
+     * @return bool true, if the attribute exists otherwise false
+     */
+    public function hasAttribute($name)
+    {
+        return $this->attributeHolder->has($name);
+    }
+
+    /**
+     * Sets an attribute for the request.
+     *
+     * @param string $name  Attribute name
+     * @param string $value Value for the attribute
+     */
+    public function setAttribute($name, $value)
+    {
+        $this->attributeHolder->set($name, $value);
+    }
+
+    /**
+     * Retrieves a parameter for the current request.
+     *
+     * @param string $name    Parameter name
+     * @param string $default Parameter default value
+     *
+     * @return mixed
+     */
+    public function getParameter($name, $default = null)
+    {
+        return $this->parameterHolder->get($name, $default);
+    }
+
+    /**
+     * Indicates whether or not a parameter exist for the current request.
+     *
+     * @param string $name Parameter name
+     *
+     * @return bool true, if the parameter exists otherwise false
+     */
+    public function hasParameter($name)
+    {
+        return $this->parameterHolder->has($name);
+    }
+
+    /**
+     * Sets a parameter for the current request.
+     *
+     * @param string $name  Parameter name
+     * @param string $value Parameter value
+     */
+    public function setParameter($name, $value)
+    {
+        $this->parameterHolder->set($name, $value);
+    }
+
+    /**
+     * Returns the content of the current request.
+     *
+     * @return false|string The content or false if none is available
+     */
+    public function getContent()
+    {
+        if (null === $this->content && '' === trim($this->content = file_get_contents('php://input'))) {
+            $this->content = false;
+        }
+
+        return $this->content;
+    }
 }
diff --git a/lib/request/sfWebRequest.class.php b/lib/request/sfWebRequest.class.php
index 99f8616e3..61c9fefa7 100644
--- a/lib/request/sfWebRequest.class.php
+++ b/lib/request/sfWebRequest.class.php
@@ -14,1075 +14,980 @@
  *
  * This class manages web requests. It parses input from the request and store them as parameters.
  *
- * @package    symfony
- * @subpackage request
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 class sfWebRequest extends sfRequest
 {
-  const
-    PORT_HTTP  = 80,
-    PORT_HTTPS = 443;
-
-  protected
-    $languages              = null,
-    $charsets               = null,
-    $acceptableContentTypes = null,
-    $pathInfoArray          = null,
-    $relativeUrlRoot        = null,
-    $getParameters          = null,
-    $postParameters         = null,
-    $requestParameters      = null,
-    $formats                = array(),
-    $format                 = null,
-    $fixedFileArray         = false;
-
-  /**
-   * Initializes this sfRequest.
-   *
-   * Available options:
-   *
-   *  * formats:           The list of supported format and their associated mime-types
-   *  * path_info_key:     The path info key (default to PATH_INFO)
-   *  * path_info_array:   The path info array (default to SERVER)
-   *  * relative_url_root: The relative URL root
-   *  * 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
-   *
-   * @return void
-   *
-   * @throws <b>sfInitializationException</b> If an error occurs while initializing this sfRequest
-   *
-   * @see sfRequest
-   */
-  public function initialize(sfEventDispatcher $dispatcher, $parameters = array(), $attributes = array(), $options = array())
-  {
-    $options = array_merge(array(
-      '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);
-    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);
+    public const PORT_HTTP = 80;
+    public const PORT_HTTPS = 443;
+
+    protected $languages;
+    protected $charsets;
+    protected $acceptableContentTypes;
+    protected $pathInfoArray;
+    protected $relativeUrlRoot;
+    protected $getParameters;
+    protected $postParameters;
+    protected $requestParameters;
+    protected $formats = array();
+    protected $format;
+    protected $fixedFileArray = false;
+
+    /**
+     * Initializes this sfRequest.
+     *
+     * Available options:
+     *
+     *  * formats:           The list of supported format and their associated mime-types
+     *  * path_info_key:     The path info key (default to PATH_INFO)
+     *  * path_info_array:   The path info array (default to SERVER)
+     *  * relative_url_root: The relative URL root
+     *  * 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
+     *
+     * @throws <b>sfInitializationException</b> If an error occurs while initializing this sfRequest
+     *
+     * @see sfRequest
+     */
+    public function initialize(sfEventDispatcher $dispatcher, $parameters = array(), $attributes = array(), $options = array())
+    {
+        $options = array_merge(array(
+            '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);
+        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);
+        } else {
+            $this->getParameters = $_GET;
+        }
+        $this->parameterHolder->add($this->getParameters);
+
+        $postParameters = $_POST;
+
+        if (isset($_SERVER['REQUEST_METHOD'])) {
+            switch ($_SERVER['REQUEST_METHOD']) {
+                case 'GET':
+                    $this->setMethod(self::GET);
+
+                    break;
+
+                case 'POST':
+                    if (isset($postParameters['sf_method'])) {
+                        $this->setMethod(strtoupper($postParameters['sf_method']));
+                        unset($postParameters['sf_method']);
+                    } elseif (isset($this->getParameters['sf_method'])) {
+                        $this->setMethod(strtoupper($this->getParameters['sf_method']));
+                        unset($this->getParameters['sf_method']);
+                    } else {
+                        $this->setMethod(self::POST);
+                    }
+                    $this->parameterHolder->remove('sf_method');
+
+                    break;
+
+                case 'PUT':
+                    $this->setMethod(self::PUT);
+                    if ('application/x-www-form-urlencoded' === $this->getContentType()) {
+                        parse_str($this->getContent(), $postParameters);
+                    }
+
+                    break;
+
+                case 'PATCH':
+                    $this->setMethod(self::PATCH);
+                    if ('application/x-www-form-urlencoded' === $this->getContentType()) {
+                        parse_str($this->getContent(), $postParameters);
+                    }
+
+                    break;
+
+                case 'DELETE':
+                    $this->setMethod(self::DELETE);
+                    if ('application/x-www-form-urlencoded' === $this->getContentType()) {
+                        parse_str($this->getContent(), $postParameters);
+                    }
+
+                    break;
+
+                case 'HEAD':
+                    $this->setMethod(self::HEAD);
+
+                    break;
+
+                case 'OPTIONS':
+                    $this->setMethod(self::OPTIONS);
+
+                    break;
+
+                default:
+                    $this->setMethod(self::GET);
+            }
+        } else {
+            // set the default method
+            $this->setMethod(self::GET);
+        }
+
+        if (version_compare(PHP_VERSION, '5.4.0-dev', '<') && get_magic_quotes_gpc()) {
+            $this->postParameters = sfToolkit::stripslashesDeep($postParameters);
+        } else {
+            $this->postParameters = $postParameters;
+        }
+
+        $this->parameterHolder->add($this->postParameters);
+
+        if ($formats = $this->getOption('formats')) {
+            foreach ($formats as $format => $mimeTypes) {
+                $this->setFormat($format, $mimeTypes);
+            }
+        }
+
+        // additional parameters
+        $this->requestParameters = $this->parseRequestParameters();
+        $this->parameterHolder->add($this->requestParameters);
+
+        $this->fixParameters();
     }
-    else
+
+    /**
+     * Returns the content type of the current request.
+     *
+     * @param bool $trim If false the full Content-Type header will be returned
+     *
+     * @return string
+     */
+    public function getContentType($trim = true)
     {
-      $this->getParameters = $_GET;
-    }
-    $this->parameterHolder->add($this->getParameters);
+        $contentType = $this->getHttpHeader('Content-Type', null);
 
-    $postParameters = $_POST;
+        if ($trim && false !== $pos = strpos((string) $contentType, ';')) {
+            $contentType = substr($contentType, 0, $pos);
+        }
 
-    if (isset($_SERVER['REQUEST_METHOD']))
-    {
-      switch ($_SERVER['REQUEST_METHOD'])
-      {
-        case 'GET':
-          $this->setMethod(self::GET);
-          break;
-
-        case 'POST':
-          if (isset($postParameters['sf_method']))
-          {
-            $this->setMethod(strtoupper($postParameters['sf_method']));
-            unset($postParameters['sf_method']);
-          }
-          elseif (isset($this->getParameters['sf_method']))
-          {
-            $this->setMethod(strtoupper($this->getParameters['sf_method']));
-            unset($this->getParameters['sf_method']);
-          }
-          else
-          {
-            $this->setMethod(self::POST);
-          }
-          $this->parameterHolder->remove('sf_method');
-          break;
-
-        case 'PUT':
-          $this->setMethod(self::PUT);
-          if ('application/x-www-form-urlencoded' === $this->getContentType())
-          {
-            parse_str($this->getContent(), $postParameters);
-          }
-          break;
-
-        case 'PATCH':
-          $this->setMethod(self::PATCH);
-          if ('application/x-www-form-urlencoded' === $this->getContentType())
-          {
-            parse_str($this->getContent(), $postParameters);
-          }
-          break;
-
-        case 'DELETE':
-          $this->setMethod(self::DELETE);
-          if ('application/x-www-form-urlencoded' === $this->getContentType())
-          {
-            parse_str($this->getContent(), $postParameters);
-          }
-          break;
-
-        case 'HEAD':
-          $this->setMethod(self::HEAD);
-          break;
-
-        case 'OPTIONS':
-          $this->setMethod(self::OPTIONS);
-          break;
-
-        default:
-          $this->setMethod(self::GET);
-      }
+        return $contentType;
     }
-    else
+
+    /**
+     * Retrieves the uniform resource identifier for the current web request.
+     *
+     * @return string Unified resource identifier
+     */
+    public function getUri()
     {
-      // set the default method
-      $this->setMethod(self::GET);
+        $pathArray = $this->getPathInfoArray();
+
+        // for IIS with rewrite module (IIFR, ISAPI Rewrite, ...)
+        if ('HTTP_X_REWRITE_URL' == $this->getOption('path_info_key')) {
+            $uri = isset($pathArray['HTTP_X_REWRITE_URL']) ? $pathArray['HTTP_X_REWRITE_URL'] : '';
+        } else {
+            $uri = isset($pathArray['REQUEST_URI']) ? $pathArray['REQUEST_URI'] : '';
+        }
+
+        return $this->isAbsUri() ? $uri : $this->getUriPrefix().$uri;
     }
 
-    if (version_compare(PHP_VERSION, '5.4.0-dev', '<') && get_magic_quotes_gpc())
+    /**
+     * See if the client is using absolute uri.
+     *
+     * @return bool true, if is absolute uri otherwise false
+     */
+    public function isAbsUri()
     {
-      $this->postParameters = sfToolkit::stripslashesDeep($postParameters);
+        $pathArray = $this->getPathInfoArray();
+
+        return isset($pathArray['REQUEST_URI']) ? 0 === strpos($pathArray['REQUEST_URI'], 'http') : false;
     }
-    else
+
+    /**
+     * Returns Uri prefix, including protocol, hostname and server port.
+     *
+     * @return string Uniform resource identifier prefix
+     */
+    public function getUriPrefix()
     {
-      $this->postParameters = $postParameters;
-    }
+        $pathArray = $this->getPathInfoArray();
+        $secure = $this->isSecure();
 
-    $this->parameterHolder->add($this->postParameters);
+        $protocol = $secure ? 'https' : 'http';
+        $host = $this->getHost();
+        $port = null;
 
-    if ($formats = $this->getOption('formats'))
-    {
-      foreach ($formats as $format => $mimeTypes)
-      {
-        $this->setFormat($format, $mimeTypes);
-      }
+        // extract port from host or environment variable
+        if (false !== strpos($host, ':')) {
+            list($host, $port) = explode(':', $host, 2);
+        } elseif ($protocolPort = $this->getOption($protocol.'_port')) {
+            $port = $protocolPort;
+        } elseif (isset($pathArray['SERVER_PORT'])) {
+            $port = $pathArray['SERVER_PORT'];
+        }
+
+        // cleanup the port based on whether the current request is forwarded from
+        // a secure one and whether the introspected port matches the standard one
+        if ($this->isForwardedSecure()) {
+            $port = self::PORT_HTTPS != $this->getOption('https_port') ? $this->getOption('https_port') : null;
+        } elseif (($secure && self::PORT_HTTPS == $port) || (!$secure && self::PORT_HTTP == $port)) {
+            $port = null;
+        }
+
+        return sprintf('%s://%s%s', $protocol, $host, $port ? ':'.$port : '');
     }
 
-    // additional parameters
-    $this->requestParameters = $this->parseRequestParameters();
-    $this->parameterHolder->add($this->requestParameters);
-
-    $this->fixParameters();
-  }
-
-  /**
-   * Returns the content type of the current request.
-   *
-   * @param  Boolean $trim If false the full Content-Type header will be returned
-   *
-   * @return string
-   */
-  public function getContentType($trim = true)
-  {
-    $contentType = $this->getHttpHeader('Content-Type', null);
-
-    if ($trim && false !== $pos = strpos((string) $contentType, ';'))
+    /**
+     * Retrieves the path info for the current web request.
+     *
+     * @return string Path info
+     */
+    public function getPathInfo()
     {
-      $contentType = substr($contentType, 0, $pos);
-    }
+        $pathInfo = '';
 
-    return $contentType;
-  }
+        $pathArray = $this->getPathInfoArray();
 
-  /**
-   * Retrieves the uniform resource identifier for the current web request.
-   *
-   * @return string Unified resource identifier
-   */
-  public function getUri()
-  {
-    $pathArray = $this->getPathInfoArray();
+        // simulate PATH_INFO if needed
+        $sf_path_info_key = $this->getOption('path_info_key');
+        if (!isset($pathArray[$sf_path_info_key]) || !$pathArray[$sf_path_info_key]) {
+            if (isset($pathArray['REQUEST_URI'])) {
+                $qs = isset($pathArray['QUERY_STRING']) ? $pathArray['QUERY_STRING'] : '';
+                $script_name = $this->getScriptName();
+                $uri_prefix = $this->isAbsUri() ? $this->getUriPrefix() : '';
+                $pathInfo = preg_replace('/^'.preg_quote($uri_prefix, '/').'/', '', $pathArray['REQUEST_URI']);
+                $pathInfo = preg_replace('/^'.preg_quote($script_name, '/').'/', '', $pathInfo);
+                $prefix_name = preg_replace('#/[^/]+$#', '', $script_name);
+                $pathInfo = preg_replace('/^'.preg_quote($prefix_name, '/').'/', '', $pathInfo);
+                $pathInfo = preg_replace('/\??'.preg_quote($qs, '/').'$/', '', $pathInfo);
+            }
+        } else {
+            $pathInfo = $pathArray[$sf_path_info_key];
+            if ($relativeUrlRoot = $this->getRelativeUrlRoot()) {
+                $pathInfo = preg_replace('/^'.str_replace('/', '\\/', $relativeUrlRoot).'\//', '', $pathInfo);
+            }
+        }
 
-    // for IIS with rewrite module (IIFR, ISAPI Rewrite, ...)
-    if ('HTTP_X_REWRITE_URL' == $this->getOption('path_info_key'))
-    {
-      $uri = isset($pathArray['HTTP_X_REWRITE_URL']) ? $pathArray['HTTP_X_REWRITE_URL'] : '';
+        // for IIS
+        if (isset($_SERVER['SERVER_SOFTWARE']) && false !== stripos($_SERVER['SERVER_SOFTWARE'], 'iis') && $pos = stripos($pathInfo, '.php')) {
+            $pathInfo = substr($pathInfo, $pos + 4);
+        }
+
+        if (!$pathInfo) {
+            $pathInfo = '/';
+        }
+
+        return $pathInfo;
     }
-    else
+
+    /**
+     * Returns the relative url root if defined computed with script name if defined.
+     *
+     * @return string The path info prefix
+     */
+    public function getPathInfoPrefix()
     {
-      $uri = isset($pathArray['REQUEST_URI']) ? $pathArray['REQUEST_URI'] : '';
+        $prefix = $this->getRelativeUrlRoot();
+
+        if (!$this->getOption('no_script_name')) {
+            $scriptName = $this->getScriptName();
+            $prefix = null === $prefix ? $scriptName : $prefix.'/'.basename($scriptName);
+        }
+
+        return $prefix;
     }
 
-    return $this->isAbsUri() ? $uri : $this->getUriPrefix().$uri;
-  }
-
-  /**
-   * See if the client is using absolute uri
-   *
-   * @return boolean true, if is absolute uri otherwise false
-   */
-  public function isAbsUri()
-  {
-    $pathArray = $this->getPathInfoArray();
-
-    return isset($pathArray['REQUEST_URI']) ? 0 === strpos($pathArray['REQUEST_URI'], 'http') : false;
-  }
-
-  /**
-   * Returns Uri prefix, including protocol, hostname and server port.
-   *
-   * @return string Uniform resource identifier prefix
-   */
-  public function getUriPrefix()
-  {
-    $pathArray = $this->getPathInfoArray();
-    $secure = $this->isSecure();
-
-    $protocol = $secure ? 'https' : 'http';
-    $host = $this->getHost();
-    $port = null;
-
-    // extract port from host or environment variable
-    if (false !== strpos($host, ':'))
+    /**
+     * Gets GET parameters from request.
+     *
+     * @return array
+     */
+    public function getGetParameters()
     {
-      list($host, $port) = explode(':', $host, 2);
+        return $this->getParameters;
     }
-    else if ($protocolPort = $this->getOption($protocol.'_port'))
+
+    /**
+     * Gets POST parameters from request.
+     *
+     * @return array
+     */
+    public function getPostParameters()
     {
-      $port = $protocolPort;
+        return $this->postParameters;
     }
-    else if (isset($pathArray['SERVER_PORT']))
+
+    /**
+     * Gets REQUEST parameters from request.
+     *
+     * @return array
+     */
+    public function getRequestParameters()
     {
-      $port = $pathArray['SERVER_PORT'];
+        return $this->requestParameters;
     }
 
-    // cleanup the port based on whether the current request is forwarded from
-    // a secure one and whether the introspected port matches the standard one
-    if ($this->isForwardedSecure())
+    /**
+     * Add fixed REQUEST parameters.
+     */
+    public function addRequestParameters(array $parameters)
     {
-      $port = self::PORT_HTTPS != $this->getOption('https_port') ? $this->getOption('https_port') : null;
+        $this->requestParameters = array_merge($this->requestParameters, $parameters);
+        $this->getParameterHolder()->add($parameters);
+
+        $this->fixParameters();
     }
-    elseif (($secure && self::PORT_HTTPS == $port) || (!$secure && self::PORT_HTTP == $port))
+
+    /**
+     * Returns referer.
+     *
+     * @return string
+     */
+    public function getReferer()
     {
-      $port = null;
+        $pathArray = $this->getPathInfoArray();
+
+        return isset($pathArray['HTTP_REFERER']) ? $pathArray['HTTP_REFERER'] : '';
     }
 
-    return sprintf('%s://%s%s', $protocol, $host, $port ? ':'.$port : '');
-  }
+    /**
+     * Returns current host name.
+     *
+     * @return string
+     */
+    public function getHost()
+    {
+        $pathArray = $this->getPathInfoArray();
 
-  /**
-   * Retrieves the path info for the current web request.
-   *
-   * @return string Path info
-   */
-  public function getPathInfo()
-  {
-    $pathInfo = '';
+        if ($this->getOption('trust_proxy') && isset($pathArray['HTTP_X_FORWARDED_HOST'])) {
+            $elements = explode(',', $pathArray['HTTP_X_FORWARDED_HOST']);
 
-    $pathArray = $this->getPathInfoArray();
+            return trim($elements[count($elements) - 1]);
+        }
 
-    // simulate PATH_INFO if needed
-    $sf_path_info_key = $this->getOption('path_info_key');
-    if (!isset($pathArray[$sf_path_info_key]) || !$pathArray[$sf_path_info_key])
-    {
-      if (isset($pathArray['REQUEST_URI']))
-      {
-        $qs = isset($pathArray['QUERY_STRING']) ? $pathArray['QUERY_STRING'] : '';
-        $script_name = $this->getScriptName();
-        $uri_prefix = $this->isAbsUri() ? $this->getUriPrefix() : '';
-        $pathInfo = preg_replace('/^'.preg_quote($uri_prefix, '/').'/','',$pathArray['REQUEST_URI']);
-        $pathInfo = preg_replace('/^'.preg_quote($script_name, '/').'/', '', $pathInfo);
-        $prefix_name = preg_replace('#/[^/]+$#', '', $script_name);
-        $pathInfo = preg_replace('/^'.preg_quote($prefix_name, '/').'/', '', $pathInfo);
-        $pathInfo = preg_replace('/\??'.preg_quote($qs, '/').'$/', '', $pathInfo);
-      }
-    }
-    else
-    {
-      $pathInfo = $pathArray[$sf_path_info_key];
-      if ($relativeUrlRoot = $this->getRelativeUrlRoot())
-      {
-        $pathInfo = preg_replace('/^'.str_replace('/', '\\/', $relativeUrlRoot).'\//', '', $pathInfo);
-      }
+        return isset($pathArray['HTTP_HOST']) ? $pathArray['HTTP_HOST'] : '';
     }
 
-    // for IIS
-    if (isset($_SERVER['SERVER_SOFTWARE']) && false !== stripos($_SERVER['SERVER_SOFTWARE'], 'iis') && $pos = stripos($pathInfo, '.php'))
+    /**
+     * Returns current script name.
+     *
+     * @return string
+     */
+    public function getScriptName()
     {
-      $pathInfo = substr($pathInfo, $pos + 4);
+        $pathArray = $this->getPathInfoArray();
+
+        return isset($pathArray['SCRIPT_NAME']) ? $pathArray['SCRIPT_NAME'] : (isset($pathArray['ORIG_SCRIPT_NAME']) ? $pathArray['ORIG_SCRIPT_NAME'] : '');
     }
 
-    if (!$pathInfo)
+    /**
+     * Checks if the request method is the given one.
+     *
+     * @param string $method The method name
+     *
+     * @return bool true if the current method is the given one, false otherwise
+     */
+    public function isMethod($method)
     {
-      $pathInfo = '/';
+        return strtoupper($method) == $this->getMethod();
     }
 
-    return $pathInfo;
-  }
+    /**
+     * Returns the preferred culture for the current request.
+     *
+     * @param array $cultures An array of ordered cultures available
+     *
+     * @return string The preferred culture
+     */
+    public function getPreferredCulture(array $cultures = null)
+    {
+        $preferredCultures = $this->getLanguages();
 
-  /**
-   * Returns the relative url root if defined computed with script name if defined
-   *
-   * @return string The path info prefix
-   */
-  public function getPathInfoPrefix()
-  {
-    $prefix = $this->getRelativeUrlRoot();
+        if (null === $cultures) {
+            return isset($preferredCultures[0]) ? $preferredCultures[0] : null;
+        }
 
-    if (!$this->getOption('no_script_name'))
-    {
-      $scriptName = $this->getScriptName();
-      $prefix = null === $prefix ? $scriptName : $prefix.'/'.basename($scriptName);
-    }
+        if (!$preferredCultures) {
+            return $cultures[0];
+        }
 
-    return $prefix;
-  }
-
-  /**
-   * Gets GET parameters from request
-   *
-   * @return array
-   */
-  public function getGetParameters()
-  {
-    return $this->getParameters;
-  }
-
-  /**
-   * Gets POST parameters from request
-   *
-   * @return array
-   */
-  public function getPostParameters()
-  {
-    return $this->postParameters;
-  }
-
-  /**
-   * Gets REQUEST parameters from request
-   *
-   * @return array
-   */
-  public function getRequestParameters()
-  {
-    return $this->requestParameters;
-  }
-
-  /**
-   * Add fixed REQUEST parameters
-   *
-   * @param array $parameters
-   */
-  public function addRequestParameters(array $parameters)
-  {
-    $this->requestParameters = array_merge($this->requestParameters, $parameters);
-    $this->getParameterHolder()->add($parameters);
-
-    $this->fixParameters();
-  }
-
-  /**
-   * Returns referer.
-   *
-   * @return string
-   */
-  public function getReferer()
-  {
-    $pathArray = $this->getPathInfoArray();
-
-    return isset($pathArray['HTTP_REFERER']) ? $pathArray['HTTP_REFERER'] : '';
-  }
-
-  /**
-   * Returns current host name.
-   *
-   * @return string
-   */
-  public function getHost()
-  {
-    $pathArray = $this->getPathInfoArray();
-
-    if ($this->getOption('trust_proxy') && isset($pathArray['HTTP_X_FORWARDED_HOST']))
-    {
-      $elements = explode(',', $pathArray['HTTP_X_FORWARDED_HOST']);
+        $preferredCultures = array_values(array_intersect($preferredCultures, $cultures));
 
-      return trim($elements[count($elements) - 1]);
+        return isset($preferredCultures[0]) ? $preferredCultures[0] : $cultures[0];
     }
 
-    return isset($pathArray['HTTP_HOST']) ? $pathArray['HTTP_HOST'] : '';
-  }
-
-  /**
-   * Returns current script name.
-   *
-   * @return string
-   */
-  public function getScriptName()
-  {
-    $pathArray = $this->getPathInfoArray();
-
-    return isset($pathArray['SCRIPT_NAME']) ? $pathArray['SCRIPT_NAME'] : (isset($pathArray['ORIG_SCRIPT_NAME']) ? $pathArray['ORIG_SCRIPT_NAME'] : '');
-  }
-
-  /**
-   * Checks if the request method is the given one.
-   *
-   * @param  string $method  The method name
-   *
-   * @return bool true if the current method is the given one, false otherwise
-   */
-  public function isMethod($method)
-  {
-    return strtoupper($method) == $this->getMethod();
-  }
-
-  /**
-   * Returns the preferred culture for the current request.
-   *
-   * @param  array  $cultures  An array of ordered cultures available
-   *
-   * @return string The preferred culture
-   */
-  public function getPreferredCulture(array $cultures = null)
-  {
-    $preferredCultures = $this->getLanguages();
-
-    if (null === $cultures)
+    /**
+     * Gets a list of languages acceptable by the client browser.
+     *
+     * @return array Languages ordered in the user browser preferences
+     */
+    public function getLanguages()
     {
-      return isset($preferredCultures[0]) ? $preferredCultures[0] : null;
-    }
+        if ($this->languages) {
+            return $this->languages;
+        }
 
-    if (!$preferredCultures)
-    {
-      return $cultures[0];
-    }
+        if (!isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+            return array();
+        }
 
-    $preferredCultures = array_values(array_intersect($preferredCultures, $cultures));
+        $languages = $this->splitHttpAcceptHeader($_SERVER['HTTP_ACCEPT_LANGUAGE']);
+        foreach ($languages as $lang) {
+            if (false !== strpos($lang, '-')) {
+                $codes = explode('-', $lang);
+                if ('i' == $codes[0]) {
+                    // Language not listed in ISO 639 that are not variants
+                    // of any listed language, which can be registerd with the
+                    // i-prefix, such as i-cherokee
+                    if (count($codes) > 1) {
+                        $lang = $codes[1];
+                    }
+                } else {
+                    for ($i = 0, $max = count($codes); $i < $max; ++$i) {
+                        if (0 == $i) {
+                            $lang = strtolower($codes[0]);
+                        } else {
+                            $lang .= '_'.strtoupper($codes[$i]);
+                        }
+                    }
+                }
+            }
 
-    return isset($preferredCultures[0]) ? $preferredCultures[0] : $cultures[0];
-  }
+            $this->languages[] = $lang;
+        }
 
-  /**
-   * Gets a list of languages acceptable by the client browser
-   *
-   * @return array Languages ordered in the user browser preferences
-   */
-  public function getLanguages()
-  {
-    if ($this->languages)
-    {
-      return $this->languages;
+        return $this->languages;
     }
 
-    if (!isset($_SERVER['HTTP_ACCEPT_LANGUAGE']))
+    /**
+     * Gets a list of charsets acceptable by the client browser.
+     *
+     * @return array List of charsets in preferable order
+     */
+    public function getCharsets()
     {
-      return array();
+        if ($this->charsets) {
+            return $this->charsets;
+        }
+
+        if (!isset($_SERVER['HTTP_ACCEPT_CHARSET'])) {
+            return array();
+        }
+
+        $this->charsets = $this->splitHttpAcceptHeader($_SERVER['HTTP_ACCEPT_CHARSET']);
+
+        return $this->charsets;
     }
 
-    $languages = $this->splitHttpAcceptHeader($_SERVER['HTTP_ACCEPT_LANGUAGE']);
-    foreach ($languages as $lang)
+    /**
+     * Gets a list of content types acceptable by the client browser.
+     *
+     * @return array Languages ordered in the user browser preferences
+     */
+    public function getAcceptableContentTypes()
     {
-      if (false !== strpos($lang, '-'))
-      {
-        $codes = explode('-', $lang);
-        if ($codes[0] == 'i')
-        {
-          // Language not listed in ISO 639 that are not variants
-          // of any listed language, which can be registerd with the
-          // i-prefix, such as i-cherokee
-          if (count($codes) > 1)
-          {
-            $lang = $codes[1];
-          }
+        if ($this->acceptableContentTypes) {
+            return $this->acceptableContentTypes;
         }
-        else
-        {
-          for ($i = 0, $max = count($codes); $i < $max; $i++)
-          {
-            if ($i == 0)
-            {
-              $lang = strtolower($codes[0]);
-            }
-            else
-            {
-              $lang .= '_'.strtoupper($codes[$i]);
-            }
-          }
+
+        if (!isset($_SERVER['HTTP_ACCEPT'])) {
+            return array();
         }
-      }
 
-      $this->languages[] = $lang;
+        $this->acceptableContentTypes = $this->splitHttpAcceptHeader($_SERVER['HTTP_ACCEPT']);
+
+        return $this->acceptableContentTypes;
     }
 
-    return $this->languages;
-  }
-
-  /**
-   * Gets a list of charsets acceptable by the client browser.
-   *
-   * @return array List of charsets in preferable order
-   */
-  public function getCharsets()
-  {
-    if ($this->charsets)
+    /**
+     * Returns true if the request is a XMLHttpRequest.
+     *
+     * It works if your JavaScript library set an X-Requested-With HTTP header.
+     * Works with Prototype, Mootools, jQuery, and perhaps others.
+     *
+     * @return bool true if the request is an XMLHttpRequest, false otherwise
+     */
+    public function isXmlHttpRequest()
     {
-      return $this->charsets;
+        return 'XMLHttpRequest' == $this->getHttpHeader('X_REQUESTED_WITH');
     }
 
-    if (!isset($_SERVER['HTTP_ACCEPT_CHARSET']))
+    /**
+     * Gets the value of HTTP header.
+     *
+     * @param string $name   The HTTP header name
+     * @param string $prefix The HTTP header prefix
+     *
+     * @return string The value of HTTP header
+     */
+    public function getHttpHeader($name, $prefix = 'http')
     {
-      return array();
-    }
+        if ($prefix) {
+            $prefix = strtoupper($prefix).'_';
+        }
 
-    $this->charsets = $this->splitHttpAcceptHeader($_SERVER['HTTP_ACCEPT_CHARSET']);
+        $name = $prefix.strtoupper(str_replace('-', '_', $name));
 
-    return $this->charsets;
-  }
+        $pathArray = $this->getPathInfoArray();
 
-  /**
-   * Gets a list of content types acceptable by the client browser
-   *
-   * @return array Languages ordered in the user browser preferences
-   */
-  public function getAcceptableContentTypes()
-  {
-    if ($this->acceptableContentTypes)
-    {
-      return $this->acceptableContentTypes;
+        return isset($pathArray[$name]) ? sfToolkit::stripslashesDeep($pathArray[$name]) : null;
     }
 
-    if (!isset($_SERVER['HTTP_ACCEPT']))
+    /**
+     * Gets the value of a cookie.
+     *
+     * @param string $name         Cookie name
+     * @param string $defaultValue Default value returned when no cookie with given name is found
+     *
+     * @return string The cookie value
+     */
+    public function getCookie($name, $defaultValue = null)
     {
-      return array();
+        $retval = $defaultValue;
+
+        if (isset($_COOKIE[$name])) {
+            if (version_compare(PHP_VERSION, '5.4.0-dev', '<') && get_magic_quotes_gpc()) {
+                $retval = sfToolkit::stripslashesDeep($_COOKIE[$name]);
+            } else {
+                $retval = $_COOKIE[$name];
+            }
+        }
+
+        return $retval;
     }
 
-    $this->acceptableContentTypes = $this->splitHttpAcceptHeader($_SERVER['HTTP_ACCEPT']);
-
-    return $this->acceptableContentTypes;
-  }
-
-  /**
-   * Returns true if the request is a XMLHttpRequest.
-   *
-   * It works if your JavaScript library set an X-Requested-With HTTP header.
-   * Works with Prototype, Mootools, jQuery, and perhaps others.
-   *
-   * @return bool true if the request is an XMLHttpRequest, false otherwise
-   */
-  public function isXmlHttpRequest()
-  {
-    return ($this->getHttpHeader('X_REQUESTED_WITH') == 'XMLHttpRequest');
-  }
-
-  /**
-   * Gets the value of HTTP header
-   *
-   * @param string $name The HTTP header name
-   * @param string $prefix The HTTP header prefix
-   * @return string The value of HTTP header
-   */
-  public function getHttpHeader($name, $prefix = 'http')
-  {
-    if ($prefix)
+    /**
+     * Returns true if the current or forwarded request is secure (HTTPS protocol).
+     *
+     * @return bool
+     */
+    public function isSecure()
     {
-      $prefix = strtoupper($prefix).'_';
+        $pathArray = $this->getPathInfoArray();
+
+        return
+          (isset($pathArray['HTTPS']) && ('on' == strtolower($pathArray['HTTPS']) || 1 == $pathArray['HTTPS']))
+          || ($this->getOption('trust_proxy') && isset($pathArray['HTTP_SSL_HTTPS']) && ('on' == strtolower($pathArray['HTTP_SSL_HTTPS']) || 1 == $pathArray['HTTP_SSL_HTTPS']))
+          || ($this->getOption('trust_proxy') && $this->isForwardedSecure())
+        ;
     }
 
-    $name = $prefix.strtoupper(str_replace('-', '_', $name));
+    /**
+     * Retrieves relative root url.
+     *
+     * @return string URL
+     */
+    public function getRelativeUrlRoot()
+    {
+        if (null === $this->relativeUrlRoot) {
+            if (!($this->relativeUrlRoot = $this->getOption('relative_url_root'))) {
+                $this->relativeUrlRoot = preg_replace('#/[^/]+\.php5?$#', '', $this->getScriptName());
+            }
+        }
 
-    $pathArray = $this->getPathInfoArray();
+        return $this->relativeUrlRoot;
+    }
+
+    /**
+     * Sets the relative root url for the current web request.
+     *
+     * @param string $value Value for the url
+     */
+    public function setRelativeUrlRoot($value)
+    {
+        $this->relativeUrlRoot = $value;
+    }
+
+    /**
+     * Splits an HTTP header for the current web request.
+     *
+     * @param string $header Header to split
+     *
+     * @return array
+     */
+    public function splitHttpAcceptHeader($header)
+    {
+        $values = array();
+        $groups = array();
+        foreach (array_filter(explode(',', $header)) as $value) {
+            // Cut off any q-value that might come after a semi-colon
+            if ($pos = strpos($value, ';')) {
+                $q = trim(substr($value, strpos($value, '=') + 1));
+                $value = substr($value, 0, $pos);
+            } else {
+                $q = 1;
+            }
 
-    return isset($pathArray[$name]) ? sfToolkit::stripslashesDeep($pathArray[$name]) : null;
-  }
+            $groups[$q][] = $value;
+        }
 
-  /**
-   * Gets the value of a cookie.
-   *
-   * @param  string $name          Cookie name
-   * @param  string $defaultValue  Default value returned when no cookie with given name is found
-   *
-   * @return string The cookie value
-   */
-  public function getCookie($name, $defaultValue = null)
-  {
-    $retval = $defaultValue;
+        krsort($groups);
 
-    if (isset($_COOKIE[$name]))
-    {
-      if (version_compare(PHP_VERSION, '5.4.0-dev', '<') && get_magic_quotes_gpc())
-      {
-        $retval = sfToolkit::stripslashesDeep($_COOKIE[$name]);
-      }
-      else
-      {
-        $retval = $_COOKIE[$name];
-      }
-    }
+        foreach ($groups as $q => $items) {
+            if (0 < $q) {
+                foreach ($items as $value) {
+                    $values[] = trim($value);
+                }
+            }
+        }
 
-    return $retval;
-  }
-
-  /**
-   * Returns true if the current or forwarded request is secure (HTTPS protocol).
-   *
-   * @return boolean
-   */
-  public function isSecure()
-  {
-    $pathArray = $this->getPathInfoArray();
-
-    return
-      (isset($pathArray['HTTPS']) && (('on' == strtolower($pathArray['HTTPS']) || 1 == $pathArray['HTTPS'])))
-      ||
-      ($this->getOption('trust_proxy') && isset($pathArray['HTTP_SSL_HTTPS']) && (('on' == strtolower($pathArray['HTTP_SSL_HTTPS']) || 1 == $pathArray['HTTP_SSL_HTTPS'])))
-      ||
-      ($this->getOption('trust_proxy') && $this->isForwardedSecure())
-    ;
-  }
-
-  /**
-   * Returns true if the current request is forwarded from a request that is secure.
-   *
-   * @return boolean
-   */
-  protected function isForwardedSecure()
-  {
-    $pathArray = $this->getPathInfoArray();
-
-    return isset($pathArray['HTTP_X_FORWARDED_PROTO']) && 'https' == strtolower($pathArray['HTTP_X_FORWARDED_PROTO']);
-  }
-
-  /**
-   * Retrieves relative root url.
-   *
-   * @return string URL
-   */
-  public function getRelativeUrlRoot()
-  {
-    if (null === $this->relativeUrlRoot)
-    {
-      if (!($this->relativeUrlRoot = $this->getOption('relative_url_root')))
-      {
-        $this->relativeUrlRoot = preg_replace('#/[^/]+\.php5?$#', '', $this->getScriptName());
-      }
+        return $values;
     }
 
-    return $this->relativeUrlRoot;
-  }
-
-  /**
-   * Sets the relative root url for the current web request.
-   *
-   * @param string $value  Value for the url
-   */
-  public function setRelativeUrlRoot($value)
-  {
-    $this->relativeUrlRoot = $value;
-  }
-
-  /**
-   * Splits an HTTP header for the current web request.
-   *
-   * @param string $header Header to split
-   *
-   * @return array
-   */
-  public function splitHttpAcceptHeader($header)
-  {
-    $values = array();
-    $groups = array();
-    foreach (array_filter(explode(',', $header)) as $value)
+    /**
+     * Returns the array that contains all request information ($_SERVER or $_ENV).
+     *
+     * This information is stored in the path_info_array option.
+     *
+     * @return array Path information
+     */
+    public function getPathInfoArray()
     {
-      // Cut off any q-value that might come after a semi-colon
-      if ($pos = strpos($value, ';'))
-      {
-        $q     = trim(substr($value, strpos($value, '=') + 1));
-        $value = substr($value, 0, $pos);
-      }
-      else
-      {
-        $q = 1;
-      }
-
-      $groups[$q][] = $value;
-    }
+        if (!$this->pathInfoArray) {
+            // parse PATH_INFO
+            switch ($this->getOption('path_info_array')) {
+                case 'SERVER':
+                    $this->pathInfoArray = &$_SERVER;
 
-    krsort($groups);
+                    break;
 
-    foreach ($groups as $q => $items) {
-      if (0 < $q) {
-        foreach ($items as $value) {
-          $values[] = trim($value);
+                case 'ENV':
+                default:
+                    $this->pathInfoArray = &$_ENV;
+            }
         }
-      }
+
+        return $this->pathInfoArray;
     }
 
-    return $values;
-  }
-
-  /**
-   * Returns the array that contains all request information ($_SERVER or $_ENV).
-   *
-   * This information is stored in the path_info_array option.
-   *
-   * @return  array Path information
-   */
-  public function getPathInfoArray()
-  {
-    if (!$this->pathInfoArray)
+    /**
+     * Gets the mime type associated with the format.
+     *
+     * @param string $format The format
+     *
+     * @return string The associated mime type (null if not found)
+     */
+    public function getMimeType($format)
     {
-      // parse PATH_INFO
-      switch ($this->getOption('path_info_array'))
-      {
-        case 'SERVER':
-          $this->pathInfoArray =& $_SERVER;
-          break;
-
-        case 'ENV':
-        default:
-          $this->pathInfoArray =& $_ENV;
-      }
+        return isset($this->formats[$format]) ? $this->formats[$format][0] : null;
     }
 
-    return $this->pathInfoArray;
-  }
-
-  /**
-   * Gets the mime type associated with the format.
-   *
-   * @param  string $format  The format
-   *
-   * @return string The associated mime type (null if not found)
-   */
-  public function getMimeType($format)
-  {
-    return isset($this->formats[$format]) ? $this->formats[$format][0] : null;
-  }
-
-  /**
-   * Gets the format associated with the mime type.
-   *
-   * @param  string $mimeType  The associated mime type
-   *
-   * @return string The format (null if not found)
-   */
-  public function getFormat($mimeType)
-  {
-    foreach ($this->formats as $format => $mimeTypes)
+    /**
+     * Gets the format associated with the mime type.
+     *
+     * @param string $mimeType The associated mime type
+     *
+     * @return string The format (null if not found)
+     */
+    public function getFormat($mimeType)
     {
-      if (in_array($mimeType, $mimeTypes))
-      {
-        return $format;
-      }
+        foreach ($this->formats as $format => $mimeTypes) {
+            if (in_array($mimeType, $mimeTypes)) {
+                return $format;
+            }
+        }
+
+        return null;
     }
 
-    return null;
-  }
-
-  /**
-   * Associates a format with mime types.
-   *
-   * @param string       $format     The format
-   * @param string|array $mimeTypes  The associated mime types (the preferred one must be the first as it will be used as the content type)
-   */
-  public function setFormat($format, $mimeTypes)
-  {
-    $this->formats[$format] = is_array($mimeTypes) ? $mimeTypes : array($mimeTypes);
-  }
-
-  /**
-   * Sets the request format.
-   *
-   * @param string $format  The request format
-   */
-  public function setRequestFormat($format)
-  {
-    $this->format = $format;
-  }
-
-  /**
-   * Gets the request format.
-   *
-   * Here is the process to determine the format:
-   *
-   *  * format defined by the user (with setRequestFormat())
-   *  * sf_format request parameter
-   *  * default format from factories
-   *
-   * @return string The request format
-   */
-  public function getRequestFormat()
-  {
-    if (null === $this->format)
+    /**
+     * Associates a format with mime types.
+     *
+     * @param string       $format    The format
+     * @param array|string $mimeTypes The associated mime types (the preferred one must be the first as it will be used as the content type)
+     */
+    public function setFormat($format, $mimeTypes)
     {
-      $this->setRequestFormat($this->getParameter('sf_format', $this->getOption('default_format')));
+        $this->formats[$format] = is_array($mimeTypes) ? $mimeTypes : array($mimeTypes);
     }
 
-    return $this->format;
-  }
-
-  /**
-   * Retrieves an array of files.
-   *
-   * @param  string $key  A key
-   * @return array  An associative array of files
-   */
-  public function getFiles($key = null)
-  {
-    if (false === $this->fixedFileArray)
+    /**
+     * Sets the request format.
+     *
+     * @param string $format The request format
+     */
+    public function setRequestFormat($format)
     {
-      $this->fixedFileArray = self::convertFileInformation($_FILES);
+        $this->format = $format;
     }
 
-    return null === $key ? $this->fixedFileArray : (isset($this->fixedFileArray[$key]) ? $this->fixedFileArray[$key] : array());
-  }
-
-  /**
-   * Converts uploaded file array to a format following the $_GET and $POST naming convention.
-   *
-   * It's safe to pass an already converted array, in which case this method just returns the original array unmodified.
-   *
-   * @param  array $taintedFiles An array representing uploaded file information
-   *
-   * @return array An array of re-ordered uploaded file information
-   */
-  static public function convertFileInformation(array $taintedFiles)
-  {
-    $files = array();
-    foreach ($taintedFiles as $key => $data)
+    /**
+     * Gets the request format.
+     *
+     * Here is the process to determine the format:
+     *
+     *  * format defined by the user (with setRequestFormat())
+     *  * sf_format request parameter
+     *  * default format from factories
+     *
+     * @return string The request format
+     */
+    public function getRequestFormat()
     {
-      $files[$key] = self::fixPhpFilesArray($data);
+        if (null === $this->format) {
+            $this->setRequestFormat($this->getParameter('sf_format', $this->getOption('default_format')));
+        }
+
+        return $this->format;
     }
 
-    return $files;
-  }
-
-  /**
-   * Fixes PHP files array
-   *
-   * @param array $data The PHP files
-   *
-   * @return array The fixed PHP files array
-   */
-  static protected function fixPhpFilesArray(array $data)
-  {
-    // remove full_path added on php8.1
-    unset($data['full_path']);
-
-    $fileKeys = array('error', 'name', 'size', 'tmp_name', 'type');
-    $keys = array_keys($data);
-    sort($keys);
-
-    if ($fileKeys != $keys || !isset($data['name']) || !is_array($data['name']))
+    /**
+     * Retrieves an array of files.
+     *
+     * @param string $key A key
+     *
+     * @return array An associative array of files
+     */
+    public function getFiles($key = null)
     {
-      return $data;
+        if (false === $this->fixedFileArray) {
+            $this->fixedFileArray = self::convertFileInformation($_FILES);
+        }
+
+        return null === $key ? $this->fixedFileArray : (isset($this->fixedFileArray[$key]) ? $this->fixedFileArray[$key] : array());
     }
 
-    $files = $data;
-    foreach ($fileKeys as $k)
+    /**
+     * Converts uploaded file array to a format following the $_GET and $POST naming convention.
+     *
+     * It's safe to pass an already converted array, in which case this method just returns the original array unmodified.
+     *
+     * @param array $taintedFiles An array representing uploaded file information
+     *
+     * @return array An array of re-ordered uploaded file information
+     */
+    public static function convertFileInformation(array $taintedFiles)
     {
-      unset($files[$k]);
+        $files = array();
+        foreach ($taintedFiles as $key => $data) {
+            $files[$key] = self::fixPhpFilesArray($data);
+        }
+
+        return $files;
     }
-    foreach (array_keys($data['name']) as $key)
+
+    /**
+     * Returns the value of a GET parameter.
+     *
+     * @param string $name    The GET parameter name
+     * @param string $default The default value
+     *
+     * @return string The GET parameter value
+     */
+    public function getGetParameter($name, $default = null)
     {
-      $files[$key] = self::fixPhpFilesArray(array(
-        'error'    => $data['error'][$key],
-        'name'     => $data['name'][$key],
-        'type'     => $data['type'][$key],
-        'tmp_name' => $data['tmp_name'][$key],
-        'size'     => $data['size'][$key],
-      ));
+        if (isset($this->getParameters[$name])) {
+            return $this->getParameters[$name];
+        }
+
+        return sfToolkit::getArrayValueForPath($this->getParameters, $name, $default);
     }
 
-    return $files;
-  }
-
-  /**
-   * Returns the value of a GET parameter.
-   *
-   * @param  string $name     The GET parameter name
-   * @param  string $default  The default value
-   *
-   * @return string The GET parameter value
-   */
-  public function getGetParameter($name, $default = null)
-  {
-    if (isset($this->getParameters[$name]))
+    /**
+     * Returns the value of a POST parameter.
+     *
+     * @param string $name    The POST parameter name
+     * @param string $default The default value
+     *
+     * @return string The POST parameter value
+     */
+    public function getPostParameter($name, $default = null)
     {
-      return $this->getParameters[$name];
+        if (isset($this->postParameters[$name])) {
+            return $this->postParameters[$name];
+        }
+
+        return sfToolkit::getArrayValueForPath($this->postParameters, $name, $default);
     }
-    else
+
+    /**
+     * Returns the value of a parameter passed as a URL segment.
+     *
+     * @param string $name    The parameter name
+     * @param string $default The default value
+     *
+     * @return string The parameter value
+     */
+    public function getUrlParameter($name, $default = null)
     {
-      return sfToolkit::getArrayValueForPath($this->getParameters, $name, $default);
+        if (isset($this->requestParameters[$name])) {
+            return $this->requestParameters[$name];
+        }
+
+        return sfToolkit::getArrayValueForPath($this->requestParameters, $name, $default);
     }
-  }
-
-  /**
-   * Returns the value of a POST parameter.
-   *
-   * @param  string $name     The POST parameter name
-   * @param  string $default  The default value
-   *
-   * @return string The POST parameter value
-   */
-  public function getPostParameter($name, $default = null)
-  {
-    if (isset($this->postParameters[$name]))
+
+    /**
+     * Returns the remote IP address that made the request.
+     *
+     * @return string The remote IP address
+     */
+    public function getRemoteAddress()
     {
-      return $this->postParameters[$name];
+        $pathInfo = $this->getPathInfoArray();
+
+        return $pathInfo['REMOTE_ADDR'];
     }
-    else
+
+    /**
+     * Returns an array containing a list of IPs, the first being the client address
+     * and the others the addresses of each proxy that passed the request. The address
+     * for the last proxy can be retrieved via 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
+     */
+    public function getForwardedFor()
     {
-      return sfToolkit::getArrayValueForPath($this->postParameters, $name, $default);
+        $pathInfo = $this->getPathInfoArray();
+
+        if (empty($pathInfo['HTTP_X_FORWARDED_FOR'])) {
+            return null;
+        }
+
+        return explode(', ', $pathInfo['HTTP_X_FORWARDED_FOR']);
     }
-  }
-
-  /**
-   * Returns the value of a parameter passed as a URL segment.
-   *
-   * @param  string $name     The parameter name
-   * @param  string $default  The default value
-   *
-   * @return string The parameter value
-   */
-  public function getUrlParameter($name, $default = null)
-  {
-    if (isset($this->requestParameters[$name]))
+
+    /**
+     * Returns the client IP address that made the request.
+     *
+     * @param bool $proxy Whether the current request has been made behind a proxy or not
+     *
+     * @return string Client IP(s)
+     */
+    public function getClientIp($proxy = true)
     {
-      return $this->requestParameters[$name];
+        if ($proxy) {
+            $pathInfo = $this->getPathInfoArray();
+
+            if (isset($pathInfo['HTTP_CLIENT_IP']) && ($ip = $pathInfo['HTTP_CLIENT_IP'])) {
+                return $ip;
+            }
+
+            if ($this->getOption('trust_proxy') && ($ip = $this->getForwardedFor())) {
+                return isset($ip[0]) ? trim($ip[0]) : '';
+            }
+        }
+
+        return $this->getRemoteAddress();
     }
-    else
+
+    /**
+     * Check CSRF protection.
+     *
+     * @throws <b>sfValidatorErrorSchema</b> If an error occurs while validating the CRF protection for this sfRequest
+     */
+    public function checkCSRFProtection()
     {
-      return sfToolkit::getArrayValueForPath($this->requestParameters, $name, $default);
+        $form = new BaseForm();
+        $form->bind($form->isCSRFProtected() ? array($form->getCSRFFieldName() => $this->getParameter($form->getCSRFFieldName())) : array());
+
+        if (!$form->isValid()) {
+            throw $form->getErrorSchema();
+        }
     }
-  }
-
-  /**
-   * Returns the remote IP address that made the request.
-   *
-   * @return string The remote IP address
-   */
-  public function getRemoteAddress()
-  {
-    $pathInfo = $this->getPathInfoArray();
-
-    return $pathInfo['REMOTE_ADDR'];
-  }
-
-  /**
-   * Returns an array containing a list of IPs, the first being the client address
-   * and the others the addresses of each proxy that passed the request. The address
-   * for the last proxy can be retrieved via 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.
-   */
-  public function getForwardedFor()
-  {
-    $pathInfo = $this->getPathInfoArray();
-
-    if (empty($pathInfo['HTTP_X_FORWARDED_FOR']))
+
+    /**
+     * Returns the request context used.
+     *
+     * @return array An array of values representing the current request
+     */
+    public function getRequestContext()
     {
-      return null;
+        return array(
+            'path_info' => $this->getPathInfo(),
+            'prefix' => $this->getPathInfoPrefix(),
+            'method' => $this->getMethod(),
+            'format' => $this->getRequestFormat(),
+            'host' => $this->getHost(),
+            'is_secure' => $this->isSecure(),
+            'request_uri' => $this->getUri(),
+        );
     }
 
-    return explode(', ', $pathInfo['HTTP_X_FORWARDED_FOR']);
-  }
-
-  /**
-   * Returns the client IP address that made the request.
-   *
-   * @param  boolean $proxy Whether the current request has been made behind a proxy or not
-   *
-   * @return string Client IP(s)
-   */
-  public function getClientIp($proxy = true)
-  {
-    if ($proxy)
+    /**
+     * Returns true if the current request is forwarded from a request that is secure.
+     *
+     * @return bool
+     */
+    protected function isForwardedSecure()
     {
-      $pathInfo = $this->getPathInfoArray();
-
-      if (isset($pathInfo["HTTP_CLIENT_IP"]) && ($ip = $pathInfo["HTTP_CLIENT_IP"]))
-      {
-        return $ip;
-      }
+        $pathArray = $this->getPathInfoArray();
 
-      if ($this->getOption('trust_proxy') && ($ip = $this->getForwardedFor()))
-      {
-        return isset($ip[0]) ? trim($ip[0]) : '';
-      }
+        return isset($pathArray['HTTP_X_FORWARDED_PROTO']) && 'https' == strtolower($pathArray['HTTP_X_FORWARDED_PROTO']);
     }
 
-    return $this->getRemoteAddress();
-  }
+    /**
+     * Fixes PHP files array.
+     *
+     * @param array $data The PHP files
+     *
+     * @return array The fixed PHP files array
+     */
+    protected static function fixPhpFilesArray(array $data)
+    {
+        // remove full_path added on php8.1
+        unset($data['full_path']);
 
-  /**
-   * Check CSRF protection
-   *
-   * @throws <b>sfValidatorErrorSchema</b> 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());
+        $fileKeys = array('error', 'name', 'size', 'tmp_name', 'type');
+        $keys = array_keys($data);
+        sort($keys);
 
-    if (!$form->isValid())
+        if ($fileKeys != $keys || !isset($data['name']) || !is_array($data['name'])) {
+            return $data;
+        }
+
+        $files = $data;
+        foreach ($fileKeys as $k) {
+            unset($files[$k]);
+        }
+        foreach (array_keys($data['name']) as $key) {
+            $files[$key] = self::fixPhpFilesArray(array(
+                'error' => $data['error'][$key],
+                'name' => $data['name'][$key],
+                'type' => $data['type'][$key],
+                'tmp_name' => $data['tmp_name'][$key],
+                'size' => $data['size'][$key],
+            ));
+        }
+
+        return $files;
+    }
+
+    /**
+     * Parses the request parameters.
+     *
+     * This method notifies the request.filter_parameters event.
+     *
+     * @return array an array of request parameters
+     */
+    protected function parseRequestParameters()
     {
-      throw $form->getErrorSchema();
+        return $this->dispatcher->filter(new sfEvent($this, 'request.filter_parameters', $this->getRequestContext()), array())->getReturnValue();
     }
-  }
-
-  /**
-   * Parses the request parameters.
-   *
-   * This method notifies the request.filter_parameters event.
-   *
-   * @return array An array of request parameters.
-   */
-  protected function parseRequestParameters()
-  {
-    return $this->dispatcher->filter(new sfEvent($this, 'request.filter_parameters', $this->getRequestContext()), array())->getReturnValue();
-  }
-
-  /**
-   * Returns the request context used.
-   *
-   * @return array An array of values representing the current request
-   */
-  public function getRequestContext()
-  {
-    return array(
-      'path_info'   => $this->getPathInfo(),
-      'prefix'      => $this->getPathInfoPrefix(),
-      'method'      => $this->getMethod(),
-      'format'      => $this->getRequestFormat(),
-      'host'        => $this->getHost(),
-      'is_secure'   => $this->isSecure(),
-      'request_uri' => $this->getUri(),
-    );
-  }
-
-  /**
-   * Move symfony parameters to attributes (parameters prefixed with _sf_)
-   */
-  protected function fixParameters()
-  {
-    foreach ($this->parameterHolder->getAll() as $key => $value)
+
+    /**
+     * Move symfony parameters to attributes (parameters prefixed with _sf_).
+     */
+    protected function fixParameters()
     {
-      if (0 === stripos($key, '_sf_'))
-      {
-        $this->parameterHolder->remove($key);
-        $this->setAttribute(substr($key, 1), $value);
-      }
+        foreach ($this->parameterHolder->getAll() as $key => $value) {
+            if (0 === stripos($key, '_sf_')) {
+                $this->parameterHolder->remove($key);
+                $this->setAttribute(substr($key, 1), $value);
+            }
+        }
     }
-  }
 }
diff --git a/lib/response/sfResponse.class.php b/lib/response/sfResponse.class.php
index 1c8e3d48c..3735789b0 100644
--- a/lib/response/sfResponse.class.php
+++ b/lib/response/sfResponse.class.php
@@ -12,183 +12,177 @@
  * sfResponse provides methods for manipulating client response information such
  * as headers, cookies and content.
  *
- * @package    symfony
- * @subpackage response
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfResponse implements Serializable
 {
-  /** @var array */
-  protected $options = array();
-  /** @var sfEventDispatcher */
-  protected $dispatcher = null;
-  /** @var string */
-  protected $content = '';
-
-  /**
-   * Class constructor.
-   *
-   * @see initialize()
-   *
-   * @param sfEventDispatcher $dispatcher
-   * @param array             $options
-   */
-  public function __construct(sfEventDispatcher $dispatcher, $options = array())
-  {
-    $this->initialize($dispatcher, $options);
-  }
-
-  /**
-   * Initializes this sfResponse.
-   *
-   * Available options:
-   *
-   *  * logging: Whether to enable logging or not (false by default)
-   *
-   * @param  sfEventDispatcher  $dispatcher  An sfEventDispatcher instance
-   * @param  array              $options     An array of options
-   *
-   * @return void
-   *
-   * @throws <b>sfInitializationException</b> If an error occurs while initializing this sfResponse
-   */
-  public function initialize(sfEventDispatcher $dispatcher, $options = array())
-  {
-    $this->dispatcher = $dispatcher;
-    $this->options = $options;
-
-    if (!isset($this->options['logging']))
+    /** @var array */
+    protected $options = array();
+
+    /** @var sfEventDispatcher */
+    protected $dispatcher;
+
+    /** @var string */
+    protected $content = '';
+
+    /**
+     * Class constructor.
+     *
+     * @see initialize()
+     *
+     * @param array $options
+     */
+    public function __construct(sfEventDispatcher $dispatcher, $options = array())
+    {
+        $this->initialize($dispatcher, $options);
+    }
+
+    /**
+     * Calls methods defined via sfEventDispatcher.
+     *
+     * @param string $method    The method name
+     * @param array  $arguments The method arguments
+     *
+     * @return mixed The returned value of the called method
+     *
+     * @throws <b>sfException</b> 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)));
+        if (!$event->isProcessed()) {
+            throw new sfException(sprintf('Call to undefined method %s::%s.', get_class($this), $method));
+        }
+
+        return $event->getReturnValue();
+    }
+
+    /**
+     * Serializes the current instance for php 7.4+.
+     *
+     * @return array
+     */
+    public function __serialize()
+    {
+        return array('content' => $this->content);
+    }
+
+    /**
+     * Unserializes a sfResponse instance for php 7.4+.
+     *
+     * @param array $data
+     */
+    public function __unserialize($data)
     {
-      $this->options['logging'] = false;
+        $this->content = $data['content'];
     }
-  }
-
-  /**
-   * Sets the event dispatcher.
-   *
-   * @param sfEventDispatcher $dispatcher  An sfEventDispatcher instance
-   */
-  public function setEventDispatcher(sfEventDispatcher $dispatcher)
-  {
-    $this->dispatcher = $dispatcher;
-  }
-
-  /**
-   * Sets the response content
-   *
-   * @param string $content
-   */
-  public function setContent($content)
-  {
-    $this->content = $content;
-  }
-
-  /**
-   * Gets the current response content
-   *
-   * @return string Content
-   */
-  public function getContent()
-  {
-    return $this->content;
-  }
-
-  /**
-   * Outputs the response content
-   */
-  public function sendContent()
-  {
-    $event = $this->dispatcher->filter(new sfEvent($this, 'response.filter_content'), $this->getContent());
-    $content = $event->getReturnValue();
-
-    if ($this->options['logging'])
+
+    /**
+     * Initializes this sfResponse.
+     *
+     * Available options:
+     *
+     *  * logging: Whether to enable logging or not (false by default)
+     *
+     * @param sfEventDispatcher $dispatcher An sfEventDispatcher instance
+     * @param array             $options    An array of options
+     *
+     * @throws <b>sfInitializationException</b> If an error occurs while initializing this sfResponse
+     */
+    public function initialize(sfEventDispatcher $dispatcher, $options = array())
     {
-      $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Send content (%s o)', strlen($content)))));
+        $this->dispatcher = $dispatcher;
+        $this->options = $options;
+
+        if (!isset($this->options['logging'])) {
+            $this->options['logging'] = false;
+        }
     }
 
-    echo $content;
-  }
-
-  /**
-   * Sends the content.
-   */
-  public function send()
-  {
-    $this->sendContent();
-  }
-
-  /**
-   * Returns the options.
-   *
-   * @return array The options.
-   */
-  public function getOptions()
-  {
-    return $this->options;
-  }
-
-  /**
-   * Calls methods defined via sfEventDispatcher.
-   *
-   * @param string $method     The method name
-   * @param array  $arguments  The method arguments
-   *
-   * @return mixed The returned value of the called method
-   *
-   * @throws <b>sfException</b> 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)));
-    if (!$event->isProcessed())
+    /**
+     * Sets the event dispatcher.
+     *
+     * @param sfEventDispatcher $dispatcher An sfEventDispatcher instance
+     */
+    public function setEventDispatcher(sfEventDispatcher $dispatcher)
     {
-      throw new sfException(sprintf('Call to undefined method %s::%s.', get_class($this), $method));
+        $this->dispatcher = $dispatcher;
     }
 
-    return $event->getReturnValue();
-  }
-
-  /**
-   * Serializes the current instance.
-   *
-   * @return string Objects instance
-   */
-  public function serialize()
-  {
-    return serialize($this->content);
-  }
-
-  /**
-   * Unserializes a sfResponse instance.
-   *
-   * You need to inject a dispatcher after unserializing a sfResponse instance.
-   *
-   * @param string $serialized  A serialized sfResponse instance
-   *
-   */
-  public function unserialize($serialized)
-  {
-    $this->content = unserialize($serialized);
-  }
-
-  /**
-   * Serializes the current instance for php 7.4+
-   *
-   * @return array
-   */
-  public function __serialize()
-  {
-    return array('content' => $this->content);
-  }
-
-  /**
-   * Unserializes a sfResponse instance for php 7.4+
-   *
-   * @param array $data
-  */
-  public function __unserialize($data)
-  {
-    $this->content = $data['content'];
-  }
+    /**
+     * Sets the response content.
+     *
+     * @param string $content
+     */
+    public function setContent($content)
+    {
+        $this->content = $content;
+    }
+
+    /**
+     * Gets the current response content.
+     *
+     * @return string Content
+     */
+    public function getContent()
+    {
+        return $this->content;
+    }
+
+    /**
+     * Outputs the response content.
+     */
+    public function sendContent()
+    {
+        $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)))));
+        }
+
+        echo $content;
+    }
+
+    /**
+     * Sends the content.
+     */
+    public function send()
+    {
+        $this->sendContent();
+    }
+
+    /**
+     * Returns the options.
+     *
+     * @return array the options
+     */
+    public function getOptions()
+    {
+        return $this->options;
+    }
+
+    /**
+     * Serializes the current instance.
+     *
+     * @return string Objects instance
+     */
+    public function serialize()
+    {
+        return serialize($this->content);
+    }
+
+    /**
+     * Unserializes a sfResponse instance.
+     *
+     * You need to inject a dispatcher after unserializing a sfResponse instance.
+     *
+     * @param string $serialized A serialized sfResponse instance
+     */
+    public function unserialize($serialized)
+    {
+        $this->content = unserialize($serialized);
+    }
 }
diff --git a/lib/response/sfWebResponse.class.php b/lib/response/sfWebResponse.class.php
index 3bdc87639..a6126730d 100644
--- a/lib/response/sfWebResponse.class.php
+++ b/lib/response/sfWebResponse.class.php
@@ -13,936 +13,872 @@
  *
  * This class manages web responses. It supports cookies and headers management.
  *
- * @package    symfony
- * @subpackage response
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfWebResponse extends sfResponse
 {
-  const
-    FIRST  = 'first',
-    MIDDLE = '',
-    LAST   = 'last',
-    ALL    = 'ALL',
-    RAW    = 'RAW';
-
-  protected
-    $cookies     = array(),
-    $statusCode  = 200,
-    $statusText  = 'OK',
-    $headerOnly  = false,
-    $headers     = array(),
-    $metas       = array(),
-    $httpMetas   = array(),
-    $positions   = array('first', '', 'last'),
-    $stylesheets = array(),
-    $javascripts = array(),
-    $slots       = array();
-
-  static protected $statusTexts = array(
-    '100' => 'Continue',
-    '101' => 'Switching Protocols',
-    '200' => 'OK',
-    '201' => 'Created',
-    '202' => 'Accepted',
-    '203' => 'Non-Authoritative Information',
-    '204' => 'No Content',
-    '205' => 'Reset Content',
-    '206' => 'Partial Content',
-    '300' => 'Multiple Choices',
-    '301' => 'Moved Permanently',
-    '302' => 'Found',
-    '303' => 'See Other',
-    '304' => 'Not Modified',
-    '305' => 'Use Proxy',
-    '306' => '(Unused)',
-    '307' => 'Temporary Redirect',
-    '400' => 'Bad Request',
-    '401' => 'Unauthorized',
-    '402' => 'Payment Required',
-    '403' => 'Forbidden',
-    '404' => 'Not Found',
-    '405' => 'Method Not Allowed',
-    '406' => 'Not Acceptable',
-    '407' => 'Proxy Authentication Required',
-    '408' => 'Request Timeout',
-    '409' => 'Conflict',
-    '410' => 'Gone',
-    '411' => 'Length Required',
-    '412' => 'Precondition Failed',
-    '413' => 'Request Entity Too Large',
-    '414' => 'Request-URI Too Long',
-    '415' => 'Unsupported Media Type',
-    '416' => 'Requested Range Not Satisfiable',
-    '417' => 'Expectation Failed',
-    '500' => 'Internal Server Error',
-    '501' => 'Not Implemented',
-    '502' => 'Bad Gateway',
-    '503' => 'Service Unavailable',
-    '504' => 'Gateway Timeout',
-    '505' => 'HTTP Version Not Supported',
-  );
-
-  /**
-   * Initializes this sfWebResponse.
-   *
-   * Available options:
-   *
-   *  * charset:           The charset to use (utf-8 by default)
-   *  * content_type:      The content type (text/html by default)
-   *  * 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
-   *
-   * @return void
-   *
-   * @throws <b>sfInitializationException</b> If an error occurs while initializing this sfResponse
-   *
-   * @see sfResponse
-   */
-  public function initialize(sfEventDispatcher $dispatcher, $options = array())
-  {
-    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()));
-
-    if (!isset($this->options['charset']))
-    {
-      $this->options['charset'] = 'utf-8';
-    }
-
-    if (!isset($this->options['send_http_headers']))
-    {
-      $this->options['send_http_headers'] = true;
-    }
-
-    if (!isset($this->options['http_protocol']))
-    {
-      $this->options['http_protocol'] = 'HTTP/1.0';
-    }
-
-    $this->options['content_type'] = $this->fixContentType(isset($this->options['content_type']) ? $this->options['content_type'] : 'text/html');
-  }
-
-  /**
-   * Sets if the response consist of just HTTP headers.
-   *
-   * @param bool $value
-   */
-  public function setHeaderOnly($value = true)
-  {
-    $this->headerOnly = (boolean) $value;
-  }
-
-  /**
-   * Returns if the response must only consist of HTTP headers.
-   *
-   * @return bool returns true if, false otherwise
-   */
-  public function isHeaderOnly()
-  {
-    return $this->headerOnly;
-  }
-
-  /**
-   * Sets a cookie.
-   *
-   * @param  string  $name      HTTP header name
-   * @param  string  $value     Value for the cookie
-   * @param  string  $expire    Cookie expiration period
-   * @param  string  $path      Path
-   * @param  string  $domain    Domain name
-   * @param  bool    $secure    If secure
-   * @param  bool    $httpOnly  If uses only HTTP
-   *
-   * @throws <b>sfException</b> If fails to set the cookie
-   */
-  public function setCookie($name, $value, $expire = null, $path = '/', $domain = '', $secure = false, $httpOnly = false)
-  {
-    if ($expire !== null)
-    {
-      if (is_numeric($expire))
-      {
-        $expire = (int) $expire;
-      }
-      else
-      {
-        $expire = strtotime($expire);
-        if ($expire === false || $expire == -1)
-        {
-          throw new sfException('Your expire parameter is not valid.');
-        }
-      }
-    }
-
-    $this->cookies[$name] = array(
-      'name'     => $name,
-      'value'    => $value,
-      'expire'   => $expire,
-      'path'     => $path,
-      'domain'   => $domain,
-      'secure'   => $secure ? true : false,
-      'httpOnly' => $httpOnly,
+    public const FIRST = 'first';
+    public const MIDDLE = '';
+    public const LAST = 'last';
+    public const ALL = 'ALL';
+    public const RAW = 'RAW';
+
+    protected $cookies = array();
+    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(
+        '100' => 'Continue',
+        '101' => 'Switching Protocols',
+        '200' => 'OK',
+        '201' => 'Created',
+        '202' => 'Accepted',
+        '203' => 'Non-Authoritative Information',
+        '204' => 'No Content',
+        '205' => 'Reset Content',
+        '206' => 'Partial Content',
+        '300' => 'Multiple Choices',
+        '301' => 'Moved Permanently',
+        '302' => 'Found',
+        '303' => 'See Other',
+        '304' => 'Not Modified',
+        '305' => 'Use Proxy',
+        '306' => '(Unused)',
+        '307' => 'Temporary Redirect',
+        '400' => 'Bad Request',
+        '401' => 'Unauthorized',
+        '402' => 'Payment Required',
+        '403' => 'Forbidden',
+        '404' => 'Not Found',
+        '405' => 'Method Not Allowed',
+        '406' => 'Not Acceptable',
+        '407' => 'Proxy Authentication Required',
+        '408' => 'Request Timeout',
+        '409' => 'Conflict',
+        '410' => 'Gone',
+        '411' => 'Length Required',
+        '412' => 'Precondition Failed',
+        '413' => 'Request Entity Too Large',
+        '414' => 'Request-URI Too Long',
+        '415' => 'Unsupported Media Type',
+        '416' => 'Requested Range Not Satisfiable',
+        '417' => 'Expectation Failed',
+        '500' => 'Internal Server Error',
+        '501' => 'Not Implemented',
+        '502' => 'Bad Gateway',
+        '503' => 'Service Unavailable',
+        '504' => 'Gateway Timeout',
+        '505' => 'HTTP Version Not Supported',
     );
-  }
-
-  /**
-   * Sets response status code.
-   *
-   * @param string $code  HTTP status code
-   * @param string $name  HTTP status text
-   *
-   */
-  public function setStatusCode($code, $name = null)
-  {
-    $this->statusCode = $code;
-    $this->statusText = null !== $name ? $name : self::$statusTexts[$code];
-  }
-
-  /**
-   * Retrieves status text for the current web response.
-   *
-   * @return string Status text
-   */
-  public function getStatusText()
-  {
-    return $this->statusText;
-  }
-
-  /**
-   * Retrieves status code for the current web response.
-   *
-   * @return integer Status code
-   */
-  public function getStatusCode()
-  {
-    return $this->statusCode;
-  }
-
-  /**
-   * Sets a HTTP header.
-   *
-   * @param string  $name     HTTP header name
-   * @param string  $value    Value (if null, remove the HTTP header)
-   * @param bool    $replace  Replace for the value
-   *
-   */
-  public function setHttpHeader($name, $value, $replace = true)
-  {
-    $name = $this->normalizeHeaderName($name);
-
-    if (null === $value)
-    {
-      unset($this->headers[$name]);
-
-      return;
-    }
-
-    if ('Content-Type' == $name)
-    {
-      if ($replace || !$this->getHttpHeader('Content-Type', null))
-      {
-        $this->setContentType($value);
-      }
-
-      return;
-    }
-
-    if (!$replace)
-    {
-      $current = isset($this->headers[$name]) ? $this->headers[$name] : '';
-      $value = ($current ? $current.', ' : '').$value;
-    }
-
-    $this->headers[$name] = $value;
-  }
-
-  /**
-   * Gets HTTP header current value.
-   *
-   * @param  string $name     HTTP header name
-   * @param  string $default  Default value returned if named HTTP header is not found
-   *
-   * @return string
-   */
-  public function getHttpHeader($name, $default = null)
-  {
-    $name = $this->normalizeHeaderName($name);
-
-    return isset($this->headers[$name]) ? $this->headers[$name] : $default;
-  }
-
-  /**
-   * Checks if response has given HTTP header.
-   *
-   * @param  string $name  HTTP header name
-   *
-   * @return bool
-   */
-  public function hasHttpHeader($name)
-  {
-    return array_key_exists($this->normalizeHeaderName($name), $this->headers);
-  }
-
-  /**
-   * Sets response content type.
-   *
-   * @param string $value  Content type
-   *
-   */
-  public function setContentType($value)
-  {
-    $this->headers['Content-Type'] = $this->fixContentType($value);
-  }
-
-  /**
-   * Gets the current charset as defined by the content type.
-   *
-   * @return string The current charset
-   */
-  public function getCharset()
-  {
-    return $this->options['charset'];
-  }
-
-  /**
-   * Gets response content type.
-   *
-   * @return string
-   */
-  public function getContentType()
-  {
-    return $this->getHttpHeader('Content-Type', $this->options['content_type']);
-  }
-
-  /**
-   * Sends HTTP headers and cookies. Only the first invocation of this method will send the headers.
-   * Subsequent invocations will silently do nothing. This allows certain actions to send headers early,
-   * while still using the standard controller.
-   */
-  public function sendHttpHeaders()
-  {
-    if (!$this->options['send_http_headers'])
-    {
-      return;
-    }
-
-    // status
-    $status = $this->options['http_protocol'].' '.$this->statusCode.' '.$this->statusText;
-    header($status);
 
-    if (substr(php_sapi_name(), 0, 3) == 'cgi')
+    /**
+     * @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);
+    }
+
+    /**
+     * @see sfResponse
+     *
+     * @param array $data
+     */
+    public function __unserialize($data)
+    {
+        list($this->content, $this->statusCode, $this->statusText, $this->options, $this->headerOnly, $this->headers, $this->metas, $this->httpMetas, $this->stylesheets, $this->javascripts, $this->slots) = $data;
+    }
+
+    /**
+     * Initializes this sfWebResponse.
+     *
+     * Available options:
+     *
+     *  * charset:           The charset to use (utf-8 by default)
+     *  * content_type:      The content type (text/html by default)
+     *  * 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
+     *
+     * @throws <b>sfInitializationException</b> If an error occurs while initializing this sfResponse
+     *
+     * @see sfResponse
+     */
+    public function initialize(sfEventDispatcher $dispatcher, $options = array())
+    {
+        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()));
+
+        if (!isset($this->options['charset'])) {
+            $this->options['charset'] = 'utf-8';
+        }
+
+        if (!isset($this->options['send_http_headers'])) {
+            $this->options['send_http_headers'] = true;
+        }
+
+        if (!isset($this->options['http_protocol'])) {
+            $this->options['http_protocol'] = 'HTTP/1.0';
+        }
+
+        $this->options['content_type'] = $this->fixContentType(isset($this->options['content_type']) ? $this->options['content_type'] : 'text/html');
+    }
+
+    /**
+     * Sets if the response consist of just HTTP headers.
+     *
+     * @param bool $value
+     */
+    public function setHeaderOnly($value = true)
+    {
+        $this->headerOnly = (bool) $value;
+    }
+
+    /**
+     * Returns if the response must only consist of HTTP headers.
+     *
+     * @return bool returns true if, false otherwise
+     */
+    public function isHeaderOnly()
+    {
+        return $this->headerOnly;
+    }
+
+    /**
+     * Sets a cookie.
+     *
+     * @param string $name     HTTP header name
+     * @param string $value    Value for the cookie
+     * @param string $expire   Cookie expiration period
+     * @param string $path     Path
+     * @param string $domain   Domain name
+     * @param bool   $secure   If secure
+     * @param bool   $httpOnly If uses only HTTP
+     *
+     * @throws <b>sfException</b> If fails to set the cookie
+     */
+    public function setCookie($name, $value, $expire = null, $path = '/', $domain = '', $secure = false, $httpOnly = false)
+    {
+        if (null !== $expire) {
+            if (is_numeric($expire)) {
+                $expire = (int) $expire;
+            } else {
+                $expire = strtotime($expire);
+                if (false === $expire || -1 == $expire) {
+                    throw new sfException('Your expire parameter is not valid.');
+                }
+            }
+        }
+
+        $this->cookies[$name] = array(
+            'name' => $name,
+            'value' => $value,
+            'expire' => $expire,
+            'path' => $path,
+            'domain' => $domain,
+            'secure' => $secure ? true : false,
+            'httpOnly' => $httpOnly,
+        );
+    }
+
+    /**
+     * Sets response status code.
+     *
+     * @param string $code HTTP status code
+     * @param string $name HTTP status text
+     */
+    public function setStatusCode($code, $name = null)
+    {
+        $this->statusCode = $code;
+        $this->statusText = null !== $name ? $name : self::$statusTexts[$code];
+    }
+
+    /**
+     * Retrieves status text for the current web response.
+     *
+     * @return string Status text
+     */
+    public function getStatusText()
+    {
+        return $this->statusText;
+    }
+
+    /**
+     * Retrieves status code for the current web response.
+     *
+     * @return int Status code
+     */
+    public function getStatusCode()
+    {
+        return $this->statusCode;
+    }
+
+    /**
+     * Sets a HTTP header.
+     *
+     * @param string $name    HTTP header name
+     * @param string $value   Value (if null, remove the HTTP header)
+     * @param bool   $replace Replace for the value
+     */
+    public function setHttpHeader($name, $value, $replace = true)
+    {
+        $name = $this->normalizeHeaderName($name);
+
+        if (null === $value) {
+            unset($this->headers[$name]);
+
+            return;
+        }
+
+        if ('Content-Type' == $name) {
+            if ($replace || !$this->getHttpHeader('Content-Type', null)) {
+                $this->setContentType($value);
+            }
+
+            return;
+        }
+
+        if (!$replace) {
+            $current = isset($this->headers[$name]) ? $this->headers[$name] : '';
+            $value = ($current ? $current.', ' : '').$value;
+        }
+
+        $this->headers[$name] = $value;
+    }
+
+    /**
+     * Gets HTTP header current value.
+     *
+     * @param string $name    HTTP header name
+     * @param string $default Default value returned if named HTTP header is not found
+     *
+     * @return string
+     */
+    public function getHttpHeader($name, $default = null)
+    {
+        $name = $this->normalizeHeaderName($name);
+
+        return isset($this->headers[$name]) ? $this->headers[$name] : $default;
+    }
+
+    /**
+     * Checks if response has given HTTP header.
+     *
+     * @param string $name HTTP header name
+     *
+     * @return bool
+     */
+    public function hasHttpHeader($name)
+    {
+        return array_key_exists($this->normalizeHeaderName($name), $this->headers);
+    }
+
+    /**
+     * Sets response content type.
+     *
+     * @param string $value Content type
+     */
+    public function setContentType($value)
+    {
+        $this->headers['Content-Type'] = $this->fixContentType($value);
+    }
+
+    /**
+     * Gets the current charset as defined by the content type.
+     *
+     * @return string The current charset
+     */
+    public function getCharset()
+    {
+        return $this->options['charset'];
+    }
+
+    /**
+     * Gets response content type.
+     *
+     * @return string
+     */
+    public function getContentType()
+    {
+        return $this->getHttpHeader('Content-Type', $this->options['content_type']);
+    }
+
+    /**
+     * Sends HTTP headers and cookies. Only the first invocation of this method will send the headers.
+     * Subsequent invocations will silently do nothing. This allows certain actions to send headers early,
+     * while still using the standard controller.
+     */
+    public function sendHttpHeaders()
+    {
+        if (!$this->options['send_http_headers']) {
+            return;
+        }
+
+        // status
+        $status = $this->options['http_protocol'].' '.$this->statusCode.' '.$this->statusText;
+        header($status);
+
+        if ('cgi' == substr(php_sapi_name(), 0, 3)) {
+            // fastcgi servers cannot send this status information because it was sent by them already due to the HTT/1.0 line
+            // so we can safely unset them. see ticket #3191
+            unset($this->headers['Status']);
+        }
+
+        if ($this->options['logging']) {
+            $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Send status "%s"', $status))));
+        }
+
+        // headers
+        if (!$this->getHttpHeader('Content-Type')) {
+            $this->setContentType($this->options['content_type']);
+        }
+        foreach ($this->headers as $name => $value) {
+            header($name.': '.$value);
+
+            if ('' != $value && $this->options['logging']) {
+                $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Send header "%s: %s"', $name, $value))));
+            }
+        }
+
+        // cookies
+        foreach ($this->cookies as $cookie) {
+            $expire = isset($cookie['expire']) ? $cookie['expire'] : 0;
+            setrawcookie($cookie['name'], $cookie['value'], $expire, $cookie['path'], $cookie['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']))));
+            }
+        }
+        // prevent resending the headers
+        $this->options['send_http_headers'] = false;
+    }
+
+    /**
+     * Send content for the current web response.
+     */
+    public function sendContent()
     {
-      // fastcgi servers cannot send this status information because it was sent by them already due to the HTT/1.0 line
-      // so we can safely unset them. see ticket #3191
-      unset($this->headers['Status']);
+        if (!$this->headerOnly) {
+            parent::sendContent();
+        }
     }
 
-    if ($this->options['logging'])
+    /**
+     * Sends the HTTP headers and the content.
+     */
+    public function send()
     {
-      $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Send status "%s"', $status))));
+        $this->sendHttpHeaders();
+        $this->sendContent();
+
+        if (function_exists('fastcgi_finish_request')) {
+            $this->dispatcher->notify(new sfEvent($this, 'response.fastcgi_finish_request'));
+            fastcgi_finish_request();
+        }
     }
 
-    // headers
-    if (!$this->getHttpHeader('Content-Type'))
+    /**
+     * Retrieves a formated date.
+     *
+     * @param string $timestamp Timestamp
+     * @param string $type      Format type
+     *
+     * @return string Formatted date
+     */
+    public static function getDate($timestamp, $type = 'rfc1123')
     {
-      $this->setContentType($this->options['content_type']);
-    }
-    foreach ($this->headers as $name => $value)
-    {
-      header($name.': '.$value);
-
-      if ($value != '' && $this->options['logging'])
-      {
-        $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Send header "%s: %s"', $name, $value))));
-      }
-    }
-
-    // cookies
-    foreach ($this->cookies as $cookie)
-    {
-      $expire = isset($cookie['expire']) ? $cookie['expire'] : 0;
-      setrawcookie($cookie['name'], $cookie['value'], $expire, $cookie['path'], $cookie['domain'], $cookie['secure'], $cookie['httpOnly']);
+        $type = strtolower($type);
+
+        if ('rfc1123' == $type) {
+            return substr(gmdate('r', $timestamp), 0, -5).'GMT';
+        }
+        if ('rfc1036' == $type) {
+            return gmdate('l, d-M-y H:i:s ', $timestamp).'GMT';
+        }
+        if ('asctime' == $type) {
+            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.');
+    }
+
+    /**
+     * Adds vary to a http header.
+     *
+     * @param string $header HTTP header
+     */
+    public function addVaryHttpHeader($header)
+    {
+        $vary = $this->getHttpHeader('Vary');
+        $currentHeaders = array();
+        if ($vary) {
+            $currentHeaders = preg_split('/\s*,\s*/', $vary);
+        }
+        $header = $this->normalizeHeaderName($header);
 
-      if ($this->options['logging'])
-      {
-        $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Send cookie "%s": "%s"', $cookie['name'], $cookie['value']))));
-      }
+        if (!in_array($header, $currentHeaders)) {
+            $currentHeaders[] = $header;
+            $this->setHttpHeader('Vary', implode(', ', $currentHeaders));
+        }
     }
-    // prevent resending the headers
-    $this->options['send_http_headers'] = false;
-  }
-
-  /**
-   * Send content for the current web response.
-   *
-   */
-  public function sendContent()
-  {
-    if (!$this->headerOnly)
-    {
-      parent::sendContent();
+
+    /**
+     * Adds an control cache http header.
+     *
+     * @param string $name  HTTP header
+     * @param string $value Value for the http header
+     */
+    public function addCacheControlHttpHeader($name, $value = null)
+    {
+        $cacheControl = $this->getHttpHeader('Cache-Control');
+        $currentHeaders = array();
+        if ($cacheControl) {
+            foreach (preg_split('/\s*,\s*/', $cacheControl) as $tmp) {
+                $tmp = explode('=', $tmp);
+                $currentHeaders[$tmp[0]] = isset($tmp[1]) ? $tmp[1] : null;
+            }
+        }
+        $currentHeaders[str_replace('_', '-', strtolower($name))] = $value;
+
+        $headers = array();
+        foreach ($currentHeaders as $key => $value) {
+            $headers[] = $key.(null !== $value ? '='.$value : '');
+        }
+
+        $this->setHttpHeader('Cache-Control', implode(', ', $headers));
     }
-  }
 
-  /**
-   * Sends the HTTP headers and the content.
-   */
-  public function send()
-  {
-    $this->sendHttpHeaders();
-    $this->sendContent();
+    /**
+     * Retrieves meta headers for the current web response.
+     *
+     * @return string Meta headers
+     */
+    public function getHttpMetas()
+    {
+        return $this->httpMetas;
+    }
 
-    if (function_exists('fastcgi_finish_request'))
+    /**
+     * Adds a HTTP meta header.
+     *
+     * @param string $key     Key to replace
+     * @param string $value   HTTP meta header value (if null, remove the HTTP meta)
+     * @param bool   $replace Replace or not
+     */
+    public function addHttpMeta($key, $value, $replace = true)
     {
-      $this->dispatcher->notify(new sfEvent($this, 'response.fastcgi_finish_request'));
-      fastcgi_finish_request();
+        $key = $this->normalizeHeaderName($key);
+
+        // set HTTP header
+        $this->setHttpHeader($key, $value, $replace);
+
+        if (null === $value) {
+            unset($this->httpMetas[$key]);
+
+            return;
+        }
+
+        if ('Content-Type' == $key) {
+            $value = $this->getContentType();
+        } elseif (!$replace) {
+            $current = isset($this->httpMetas[$key]) ? $this->httpMetas[$key] : '';
+            $value = ($current ? $current.', ' : '').$value;
+        }
+
+        $this->httpMetas[$key] = $value;
     }
-  }
 
-  /**
-   * Retrieves a normalized Header.
-   *
-   * @param  string $name  Header name
-   *
-   * @return string Normalized header
-   */
-  protected function normalizeHeaderName($name)
-  {
-    return strtr(ucwords(strtr(strtolower($name), array('_' => ' ', '-' => ' '))), array(' ' => '-'));
-  }
+    /**
+     * Retrieves all meta headers.
+     *
+     * @return array List of meta headers
+     */
+    public function getMetas()
+    {
+        return $this->metas;
+    }
+
+    /**
+     * Adds a meta header.
+     *
+     * @param string $key     Name of the header
+     * @param string $value   Meta header value (if null, remove the meta)
+     * @param bool   $replace true if it's replaceable
+     * @param bool   $escape  true for escaping the header
+     */
+    public function addMeta($key, $value, $replace = true, $escape = true)
+    {
+        $key = strtolower($key);
+
+        if (null === $value) {
+            unset($this->metas[$key]);
+
+            return;
+        }
+
+        // FIXME: If you use the i18n layer and escape the data here, it won't work
+        // see include_metas() in AssetHelper
+        if ($escape) {
+            $value = htmlspecialchars($value, ENT_QUOTES, $this->options['charset']);
+        }
 
-  /**
-   * Retrieves a formated date.
-   *
-   * @param  string $timestamp  Timestamp
-   * @param  string $type       Format type
-   *
-   * @return string Formatted date
-   */
-  static public function getDate($timestamp, $type = 'rfc1123')
-  {
-    $type = strtolower($type);
+        $current = isset($this->metas[$key]) ? $this->metas[$key] : null;
+        if ($replace || !$current) {
+            $this->metas[$key] = $value;
+        }
+    }
 
-    if ($type == 'rfc1123')
+    /**
+     * Retrieves title for the current web response.
+     *
+     * @return string Title
+     */
+    public function getTitle()
     {
-      return substr(gmdate('r', $timestamp), 0, -5).'GMT';
+        return isset($this->metas['title']) ? $this->metas['title'] : '';
     }
-    else if ($type == 'rfc1036')
+
+    /**
+     * Preprend title.
+     *
+     * @param string $title     Title name
+     * @param string $separator Separator string (default: " - ")
+     * @param bool   $escape    true, for escaping the title
+     */
+    public function prependTitle($title, $separator = ' - ', $escape = true)
     {
-      return gmdate('l, d-M-y H:i:s ', $timestamp).'GMT';
+        if (!isset($this->metas['title'])) {
+            $this->setTitle($title);
+
+            return;
+        }
+
+        // FIXME: If you use the i18n layer and escape the data here, it won't work
+        // see include_metas() in AssetHelper
+        if ($escape) {
+            $title = htmlspecialchars($title, ENT_QUOTES, $this->options['charset']);
+        }
+
+        $this->metas['title'] = $title.$separator.$this->metas['title'];
     }
-    else if ($type == 'asctime')
+
+    /**
+     * Sets title for the current web response.
+     *
+     * @param string $title  Title name
+     * @param bool   $escape true, for escaping the title
+     */
+    public function setTitle($title, $escape = true)
     {
-      return gmdate('D M j H:i:s', $timestamp);
+        $this->addMeta('title', $title, true, $escape);
     }
-    else
+
+    /**
+     * Returns the available position names for stylesheets and javascripts in order.
+     *
+     * @return array An array of position names
+     */
+    public function getPositions()
     {
-      throw new InvalidArgumentException('The second getDate() method parameter must be one of: rfc1123, rfc1036 or asctime.');
+        return $this->positions;
     }
-  }
 
-  /**
-   * Adds vary to a http header.
-   *
-   * @param string $header  HTTP header
-   */
-  public function addVaryHttpHeader($header)
-  {
-    $vary = $this->getHttpHeader('Vary');
-    $currentHeaders = array();
-    if ($vary)
+    /**
+     * Retrieves stylesheets for the current web response.
+     *
+     * By default, the position is sfWebResponse::ALL,
+     * and the method returns all stylesheets ordered by position.
+     *
+     * @param string $position The position
+     *
+     * @return array An associative array of stylesheet files as keys and options as values
+     */
+    public function getStylesheets($position = self::ALL)
     {
-      $currentHeaders = preg_split('/\s*,\s*/', $vary);
+        if (self::ALL === $position) {
+            $stylesheets = array();
+            foreach ($this->getPositions() as $position) {
+                foreach ($this->stylesheets[$position] as $file => $options) {
+                    $stylesheets[$file] = $options;
+                }
+            }
+
+            return $stylesheets;
+        }
+        if (self::RAW === $position) {
+            return $this->stylesheets;
+        }
+
+        $this->validatePosition($position);
+
+        return $this->stylesheets[$position];
     }
-    $header = $this->normalizeHeaderName($header);
 
-    if (!in_array($header, $currentHeaders))
+    /**
+     * Adds a stylesheet to the current web response.
+     *
+     * @param string $file     The stylesheet file
+     * @param string $position Position
+     * @param array  $options  Stylesheet options
+     */
+    public function addStylesheet($file, $position = '', $options = array())
     {
-      $currentHeaders[] = $header;
-      $this->setHttpHeader('Vary', implode(', ', $currentHeaders));
+        $this->validatePosition($position);
+
+        $this->stylesheets[$position][$file] = $options;
     }
-  }
 
-  /**
-   * Adds an control cache http header.
-   *
-   * @param string $name   HTTP header
-   * @param string $value  Value for the http header
-   */
-  public function addCacheControlHttpHeader($name, $value = null)
-  {
-    $cacheControl = $this->getHttpHeader('Cache-Control');
-    $currentHeaders = array();
-    if ($cacheControl)
+    /**
+     * Removes a stylesheet from the current web response.
+     *
+     * @param string $file The stylesheet file to remove
+     */
+    public function removeStylesheet($file)
     {
-      foreach (preg_split('/\s*,\s*/', $cacheControl) as $tmp)
-      {
-        $tmp = explode('=', $tmp);
-        $currentHeaders[$tmp[0]] = isset($tmp[1]) ? $tmp[1] : null;
-      }
+        foreach ($this->getPositions() as $position) {
+            unset($this->stylesheets[$position][$file]);
+        }
     }
-    $currentHeaders[str_replace('_', '-', strtolower($name))] = $value;
 
-    $headers = array();
-    foreach ($currentHeaders as $key => $value)
+    /**
+     * Clear all previously added stylesheets.
+     */
+    public function clearStylesheets()
     {
-      $headers[] = $key.(null !== $value ? '='.$value : '');
+        foreach (array_keys($this->getStylesheets()) as $file) {
+            $this->removeStylesheet($file);
+        }
     }
 
-    $this->setHttpHeader('Cache-Control', implode(', ', $headers));
-  }
+    /**
+     * Retrieves javascript files from the current web response.
+     *
+     * By default, the position is sfWebResponse::ALL,
+     * and the method returns all javascripts ordered by position.
+     *
+     * @param string $position The position
+     *
+     * @return array An associative array of javascript files as keys and options as values
+     */
+    public function getJavascripts($position = self::ALL)
+    {
+        if (self::ALL === $position) {
+            $javascripts = array();
+            foreach ($this->getPositions() as $position) {
+                foreach ($this->javascripts[$position] as $file => $options) {
+                    $javascripts[$file] = $options;
+                }
+            }
+
+            return $javascripts;
+        }
+        if (self::RAW === $position) {
+            return $this->javascripts;
+        }
+
+        $this->validatePosition($position);
 
-  /**
-   * Retrieves meta headers for the current web response.
-   *
-   * @return string Meta headers
-   */
-  public function getHttpMetas()
-  {
-    return $this->httpMetas;
-  }
+        return $this->javascripts[$position];
+    }
+
+    /**
+     * Adds javascript code to the current web response.
+     *
+     * @param string $file     The JavaScript file
+     * @param string $position Position
+     * @param array  $options  Javascript options
+     */
+    public function addJavascript($file, $position = '', $options = array())
+    {
+        $this->validatePosition($position);
 
-  /**
-   * Adds a HTTP meta header.
-   *
-   * @param string  $key      Key to replace
-   * @param string  $value    HTTP meta header value (if null, remove the HTTP meta)
-   * @param bool    $replace  Replace or not
-   */
-  public function addHttpMeta($key, $value, $replace = true)
-  {
-    $key = $this->normalizeHeaderName($key);
+        $this->javascripts[$position][$file] = $options;
+    }
+
+    /**
+     * Removes a JavaScript file from the current web response.
+     *
+     * @param string $file The Javascript file to remove
+     */
+    public function removeJavascript($file)
+    {
+        foreach ($this->getPositions() as $position) {
+            unset($this->javascripts[$position][$file]);
+        }
+    }
+
+    /**
+     * Clear all previously added javascripts.
+     */
+    public function clearJavascripts()
+    {
+        foreach (array_keys($this->getJavascripts()) as $file) {
+            $this->removeJavascript($file);
+        }
+    }
 
-    // set HTTP header
-    $this->setHttpHeader($key, $value, $replace);
+    /**
+     * Retrieves slots from the current web response.
+     *
+     * @return string Javascript code
+     */
+    public function getSlots()
+    {
+        return $this->slots;
+    }
 
-    if (null === $value)
+    /**
+     * Sets a slot content.
+     *
+     * @param string $name    Slot name
+     * @param string $content Content
+     */
+    public function setSlot($name, $content)
     {
-      unset($this->httpMetas[$key]);
+        $this->slots[$name] = $content;
+    }
 
-      return;
+    /**
+     * Retrieves cookies from the current web response.
+     *
+     * @return array Cookies
+     */
+    public function getCookies()
+    {
+        return $this->cookies;
     }
 
-    if ('Content-Type' == $key)
+    /**
+     * Retrieves HTTP headers from the current web response.
+     *
+     * @return string HTTP headers
+     */
+    public function getHttpHeaders()
     {
-      $value = $this->getContentType();
+        return $this->headers;
     }
-    elseif (!$replace)
+
+    /**
+     * Cleans HTTP headers from the current web response.
+     */
+    public function clearHttpHeaders()
     {
-      $current = isset($this->httpMetas[$key]) ? $this->httpMetas[$key] : '';
-      $value = ($current ? $current.', ' : '').$value;
+        $this->headers = array();
     }
 
-    $this->httpMetas[$key] = $value;
-  }
+    /**
+     * Copies all properties from a given sfWebResponse object to the current one.
+     *
+     * @param sfWebResponse $response An sfWebResponse instance
+     */
+    public function copyProperties(sfWebResponse $response)
+    {
+        $this->options = $response->getOptions();
+        $this->headers = $response->getHttpHeaders();
+        $this->metas = $response->getMetas();
+        $this->httpMetas = $response->getHttpMetas();
+        $this->stylesheets = $response->getStylesheets(self::RAW);
+        $this->javascripts = $response->getJavascripts(self::RAW);
+        $this->slots = $response->getSlots();
+
+        // HTTP protocol must be from the current request
+        // this fix is not nice but that's the only way to fix it and keep BC (see #9254)
+        $this->options['http_protocol'] = isset($_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0';
+    }
 
-  /**
-   * Retrieves all meta headers.
-   *
-   * @return array List of meta headers
-   */
-  public function getMetas()
-  {
-    return $this->metas;
-  }
-
-  /**
-   * Adds a meta header.
-   *
-   * @param string  $key      Name of the header
-   * @param string  $value    Meta header value (if null, remove the meta)
-   * @param bool    $replace  true if it's replaceable
-   * @param bool    $escape   true for escaping the header
-   */
-  public function addMeta($key, $value, $replace = true, $escape = true)
-  {
-    $key = strtolower($key);
-
-    if (null === $value)
-    {
-      unset($this->metas[$key]);
-
-      return;
-    }
-
-    // FIXME: If you use the i18n layer and escape the data here, it won't work
-    // see include_metas() in AssetHelper
-    if ($escape)
+    /**
+     * Merges all properties from a given sfWebResponse object to the current one.
+     *
+     * @param sfWebResponse $response An sfWebResponse instance
+     */
+    public function merge(sfWebResponse $response)
     {
-      $value = htmlspecialchars($value, ENT_QUOTES, $this->options['charset']);
+        foreach ($this->getPositions() as $position) {
+            $this->javascripts[$position] = array_merge($this->getJavascripts($position), $response->getJavascripts($position));
+            $this->stylesheets[$position] = array_merge($this->getStylesheets($position), $response->getStylesheets($position));
+        }
+
+        $this->slots = array_merge($this->getSlots(), $response->getSlots());
     }
 
-    $current = isset($this->metas[$key]) ? $this->metas[$key] : null;
-    if ($replace || !$current)
+    /**
+     * @see sfResponse
+     */
+    public function serialize()
     {
-      $this->metas[$key] = $value;
+        return serialize($this->__serialize());
     }
-  }
 
-  /**
-   * Retrieves title for the current web response.
-   *
-   * @return string Title
-   */
-  public function getTitle()
-  {
-    return isset($this->metas['title']) ? $this->metas['title'] : '';
-  }
-
-  /**
-   * Preprend title
-   *
-   * @param string  $title      Title name
-   * @param string  $separator  Separator string (default: " - ")
-   * @param boolean $escape     true, for escaping the title
-   */
-  public function prependTitle($title, $separator = ' - ', $escape = true)
-  {
-    if (!isset($this->metas['title']))
+    /**
+     * @see sfResponse
+     * {@inheritdoc}
+     */
+    public function unserialize($serialized)
     {
-      $this->setTitle($title);
+        $this->__unserialize(unserialize($serialized));
+    }
 
-      return;
-    }
+    /**
+     * Retrieves a normalized Header.
+     *
+     * @param string $name Header name
+     *
+     * @return string Normalized header
+     */
+    protected function normalizeHeaderName($name)
+    {
+        return strtr(ucwords(strtr(strtolower($name), array('_' => ' ', '-' => ' '))), array(' ' => '-'));
+    }
 
-    // FIXME: If you use the i18n layer and escape the data here, it won't work
-    // see include_metas() in AssetHelper
-    if ($escape)
+    /**
+     * Validate a position name.
+     *
+     * @param string $position
+     *
+     * @throws InvalidArgumentException if the position is not available
+     */
+    protected function validatePosition($position)
     {
-      $title = htmlspecialchars($title, ENT_QUOTES, $this->options['charset']);
+        if (!in_array($position, $this->positions, true)) {
+            throw new InvalidArgumentException(sprintf('The position "%s" does not exist (available positions: %s).', $position, implode(', ', $this->positions)));
+        }
     }
 
-    $this->metas['title'] = $title.$separator.$this->metas['title'];
-  }
+    /**
+     * Fixes the content type by adding the charset for text content types.
+     *
+     * @param string $contentType The content type
+     *
+     * @return string The content type with the charset if needed
+     */
+    protected function fixContentType($contentType)
+    {
+        // add charset if needed (only on text content)
+        if (false === stripos($contentType, 'charset') && (0 === stripos($contentType, 'text/') || strlen($contentType) - 3 === strripos($contentType, 'xml'))) {
+            $contentType .= '; charset='.$this->options['charset'];
+        }
+
+        // change the charset for the response
+        if (preg_match('/charset\s*=\s*(.+)\s*$/', $contentType, $match)) {
+            $this->options['charset'] = $match[1];
+        }
 
-  /**
-   * Sets title for the current web response.
-   *
-   * @param string  $title   Title name
-   * @param bool    $escape  true, for escaping the title
-   */
-  public function setTitle($title, $escape = true)
-  {
-    $this->addMeta('title', $title, true, $escape);
-  }
-
-  /**
-   * Returns the available position names for stylesheets and javascripts in order.
-   *
-   * @return array An array of position names
-   */
-  public function getPositions()
-  {
-    return $this->positions;
-  }
-
-  /**
-   * Retrieves stylesheets for the current web response.
-   *
-   * By default, the position is sfWebResponse::ALL,
-   * and the method returns all stylesheets ordered by position.
-   *
-   * @param  string  $position The position
-   *
-   * @return array   An associative array of stylesheet files as keys and options as values
-   */
-  public function getStylesheets($position = self::ALL)
-  {
-    if (self::ALL === $position)
-    {
-      $stylesheets = array();
-      foreach ($this->getPositions() as $position)
-      {
-        foreach ($this->stylesheets[$position] as $file => $options)
-        {
-          $stylesheets[$file] = $options;
-        }
-      }
-
-      return $stylesheets;
-    }
-    else if (self::RAW === $position)
-    {
-      return $this->stylesheets;
-    }
-
-    $this->validatePosition($position);
-
-    return $this->stylesheets[$position];
-  }
-
-  /**
-   * Adds a stylesheet to the current web response.
-   *
-   * @param string $file      The stylesheet file
-   * @param string $position  Position
-   * @param array  $options   Stylesheet options
-   */
-  public function addStylesheet($file, $position = '', $options = array())
-  {
-    $this->validatePosition($position);
-
-    $this->stylesheets[$position][$file] = $options;
-  }
-
-  /**
-   * Removes a stylesheet from the current web response.
-   *
-   * @param string $file The stylesheet file to remove
-   */
-  public function removeStylesheet($file)
-  {
-    foreach ($this->getPositions() as $position)
-    {
-      unset($this->stylesheets[$position][$file]);
-    }
-  }
-
-  /**
-   * Clear all previously added stylesheets
-   */
-  public function clearStylesheets()
-  {
-    foreach (array_keys($this->getStylesheets()) as $file)
-    {
-      $this->removeStylesheet($file);
-    }
-  }
-
-  /**
-   * Retrieves javascript files from the current web response.
-   *
-   * By default, the position is sfWebResponse::ALL,
-   * and the method returns all javascripts ordered by position.
-   *
-   * @param  string $position  The position
-   *
-   * @return array An associative array of javascript files as keys and options as values
-   */
-  public function getJavascripts($position = self::ALL)
-  {
-    if (self::ALL === $position)
-    {
-      $javascripts = array();
-      foreach ($this->getPositions() as $position)
-      {
-        foreach ($this->javascripts[$position] as $file => $options)
-        {
-          $javascripts[$file] = $options;
-        }
-      }
-
-      return $javascripts;
-    }
-    else if (self::RAW === $position)
-    {
-      return $this->javascripts;
-    }
-
-    $this->validatePosition($position);
-
-    return $this->javascripts[$position];
-  }
-
-  /**
-   * Adds javascript code to the current web response.
-   *
-   * @param string $file      The JavaScript file
-   * @param string $position  Position
-   * @param array  $options   Javascript options
-   */
-  public function addJavascript($file, $position = '', $options = array())
-  {
-    $this->validatePosition($position);
-
-    $this->javascripts[$position][$file] = $options;
-  }
-
-  /**
-   * Removes a JavaScript file from the current web response.
-   *
-   * @param string $file The Javascript file to remove
-   */
-  public function removeJavascript($file)
-  {
-    foreach ($this->getPositions() as $position)
-    {
-      unset($this->javascripts[$position][$file]);
-    }
-  }
-
-  /**
-   * Clear all previously added javascripts
-   */
-  public function clearJavascripts()
-  {
-    foreach (array_keys($this->getJavascripts()) as $file)
-    {
-      $this->removeJavascript($file);
-    }
-  }
-
-  /**
-   * Retrieves slots from the current web response.
-   *
-   * @return string Javascript code
-   */
-  public function getSlots()
-  {
-    return $this->slots;
-  }
-
-  /**
-   * Sets a slot content.
-   *
-   * @param string $name     Slot name
-   * @param string $content  Content
-   */
-  public function setSlot($name, $content)
-  {
-    $this->slots[$name] = $content;
-  }
-
-  /**
-   * Retrieves cookies from the current web response.
-   *
-   * @return array Cookies
-   */
-  public function getCookies()
-  {
-    return $this->cookies;
-  }
-
-  /**
-   * Retrieves HTTP headers from the current web response.
-   *
-   * @return string HTTP headers
-   */
-  public function getHttpHeaders()
-  {
-    return $this->headers;
-  }
-
-  /**
-   * Cleans HTTP headers from the current web response.
-   */
-  public function clearHttpHeaders()
-  {
-    $this->headers = array();
-  }
-
-  /**
-   * Copies all properties from a given sfWebResponse object to the current one.
-   *
-   * @param sfWebResponse $response  An sfWebResponse instance
-   */
-  public function copyProperties(sfWebResponse $response)
-  {
-    $this->options     = $response->getOptions();
-    $this->headers     = $response->getHttpHeaders();
-    $this->metas       = $response->getMetas();
-    $this->httpMetas   = $response->getHttpMetas();
-    $this->stylesheets = $response->getStylesheets(self::RAW);
-    $this->javascripts = $response->getJavascripts(self::RAW);
-    $this->slots       = $response->getSlots();
-
-    // HTTP protocol must be from the current request
-    // this fix is not nice but that's the only way to fix it and keep BC (see #9254)
-    $this->options['http_protocol'] = isset($_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0';
-  }
-
-  /**
-   * Merges all properties from a given sfWebResponse object to the current one.
-   *
-   * @param sfWebResponse $response  An sfWebResponse instance
-   */
-  public function merge(sfWebResponse $response)
-  {
-    foreach ($this->getPositions() as $position)
-    {
-      $this->javascripts[$position] = array_merge($this->getJavascripts($position), $response->getJavascripts($position));
-      $this->stylesheets[$position] = array_merge($this->getStylesheets($position), $response->getStylesheets($position));
-    }
-
-    $this->slots = array_merge($this->getSlots(), $response->getSlots());
-  }
-
-  /**
-   * @see sfResponse
-   */
-  public function serialize()
-  {
-    return serialize($this->__serialize());
-  }
-
-  /**
-   * @see sfResponse
-   * @inheritdoc
-   */
-  public function unserialize($serialized)
-  {
-    $this->__unserialize(unserialize($serialized));
-  }
-
-  /**
-   * @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);
-  }
-
-  /**
-   * @see sfResponse
-   * @param array $data
-   */
-  public function __unserialize($data)
-  {
-    list($this->content, $this->statusCode, $this->statusText, $this->options, $this->headerOnly, $this->headers, $this->metas, $this->httpMetas, $this->stylesheets, $this->javascripts, $this->slots) = $data;
-  }
-
-  /**
-   * Validate a position name.
-   *
-   * @param  string $position
-   *
-   * @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)));
-    }
-  }
-
-  /**
-   * Fixes the content type by adding the charset for text content types.
-   *
-   * @param  string $contentType  The content type
-   *
-   * @return string The content type with the charset if needed
-   */
-  protected function fixContentType($contentType)
-  {
-    // add charset if needed (only on text content)
-    if (false === stripos($contentType, 'charset') && (0 === stripos($contentType, 'text/') || strlen($contentType) - 3 === strripos($contentType, 'xml')))
-    {
-      $contentType .= '; charset='.$this->options['charset'];
-    }
-
-    // change the charset for the response
-    if (preg_match('/charset\s*=\s*(.+)\s*$/', $contentType, $match))
-    {
-      $this->options['charset'] = $match[1];
-    }
-
-    return $contentType;
-  }
+        return $contentType;
+    }
 }
diff --git a/lib/routing/sfObjectRoute.class.php b/lib/routing/sfObjectRoute.class.php
index 91eb1f6ba..215f6353f 100644
--- a/lib/routing/sfObjectRoute.class.php
+++ b/lib/routing/sfObjectRoute.class.php
@@ -13,233 +13,211 @@
  *
  * An object route can represent a single object or a list of objects.
  *
- * @package    symfony
- * @subpackage routing
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfObjectRoute extends sfRequestRoute
 {
-  /** @var bool|object */
-  protected $object = false;
-  /** @var bool|array */
-  protected $objects = false;
-
-  /**
-   * Constructor.
-   *
-   * @param string $pattern       The pattern to match
-   * @param array  $defaults      An array of default parameter values
-   * @param array  $requirements  An array of requirements for parameters (regexes)
-   * @param array  $options       An array of options
-   *
-   * @see sfRoute
-   */
-  public function __construct($pattern, array $defaults = array(), array $requirements = array(), array $options = array())
-  {
-    if (!isset($options['model']))
-    {
-      throw new InvalidArgumentException(sprintf('You must pass a "model" option for a %s object (%s).', get_class($this), $pattern));
-    }
+    /** @var bool|object */
+    protected $object = false;
+
+    /** @var array|bool */
+    protected $objects = false;
+
+    /**
+     * Constructor.
+     *
+     * @param string $pattern      The pattern to match
+     * @param array  $defaults     An array of default parameter values
+     * @param array  $requirements An array of requirements for parameters (regexes)
+     * @param array  $options      An array of options
+     *
+     * @see sfRoute
+     */
+    public function __construct($pattern, array $defaults = array(), array $requirements = array(), array $options = array())
+    {
+        if (!isset($options['model'])) {
+            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));
+        }
+
+        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));
+        }
+
+        parent::__construct($pattern, $defaults, $requirements, $options);
+    }
 
-    if (!isset($options['type']))
+    /**
+     * Returns true if the parameters matches this route, false otherwise.
+     *
+     * @param mixed $params  The parameters
+     * @param array $context The context
+     *
+     * @return bool true if the parameters matches this route, false otherwise
+     */
+    public function matchesParameters($params, $context = array())
     {
-      throw new InvalidArgumentException(sprintf('You must pass a "type" option for a %s object (%s).', get_class($this), $pattern));
+        return parent::matchesParameters('object' == $this->options['type'] ? $this->convertObjectToArray($params) : $params);
     }
 
-    if (!in_array($options['type'], array('object', 'list')))
+    /**
+     * Generates a URL from the given parameters.
+     *
+     * @param mixed $params   The parameter values
+     * @param array $context  The context
+     * @param bool  $absolute Whether to generate an absolute URL
+     *
+     * @return string The generated URL
+     */
+    public function generate($params, $context = array(), $absolute = false)
     {
-      throw new InvalidArgumentException(sprintf('The "type" option can only be "object" or "list", "%s" given (%s).', $options['type'], $pattern));
+        return parent::generate('object' == $this->options['type'] ? $this->convertObjectToArray($params) : $params, $context, $absolute);
     }
 
-    parent::__construct($pattern, $defaults, $requirements, $options);
-  }
-
-  /**
-   * Returns true if the parameters matches this route, false otherwise.
-   *
-   * @param  mixed  $params  The parameters
-   * @param  array  $context The context
-   *
-   * @return Boolean         true if the parameters matches this route, false otherwise.
-   */
-  public function matchesParameters($params, $context = array())
-  {
-    return parent::matchesParameters('object' == $this->options['type'] ? $this->convertObjectToArray($params) : $params);
-  }
-
-  /**
-   * Generates a URL from the given parameters.
-   *
-   * @param  mixed   $params    The parameter values
-   * @param  array   $context   The context
-   * @param  Boolean $absolute  Whether to generate an absolute URL
-   *
-   * @return string The generated URL
-   */
-  public function generate($params, $context = array(), $absolute = false)
-  {
-    return parent::generate('object' == $this->options['type'] ? $this->convertObjectToArray($params) : $params, $context, $absolute);
-  }
-
-  /**
-   * Gets the object related to the current route and parameters.
-   *
-   * This method is only accessible if the route is bound and of type "object".
-   *
-   * @return Object The related object
-   *
-   * @throws sfError404Exception
-   */
-  public function getObject()
-  {
-    if (!$this->isBound())
+    /**
+     * Gets the object related to the current route and parameters.
+     *
+     * This method is only accessible if the route is bound and of type "object".
+     *
+     * @return object The related object
+     *
+     * @throws sfError404Exception
+     */
+    public function getObject()
     {
-      throw new LogicException('The route is not bound.');
-    }
+        if (!$this->isBound()) {
+            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));
-    }
+        if ('object' != $this->options['type']) {
+            throw new LogicException(sprintf('The route "%s" is not of type "object".', $this->pattern));
+        }
 
-    if (false !== $this->object)
-    {
-      return $this->object;
-    }
+        if (false !== $this->object) {
+            return $this->object;
+        }
 
-    // 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))));
-    }
+        // 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))));
+        }
 
-    return $this->object;
-  }
-
-  /**
-   * Gets the list of objects related to the current route and parameters.
-   *
-   * This method is only accessible if the route is bound and of type "list".
-   *
-   * @return array And array of related objects
-   *
-   * @throws sfError404Exception
-   */
-  public function getObjects()
-  {
-    if (!$this->isBound())
-    {
-      throw new LogicException('The route is not bound.');
+        return $this->object;
     }
 
-    if ('list' != $this->options['type'])
+    /**
+     * Gets the list of objects related to the current route and parameters.
+     *
+     * This method is only accessible if the route is bound and of type "list".
+     *
+     * @return array And array of related objects
+     *
+     * @throws sfError404Exception
+     */
+    public function getObjects()
     {
-      throw new LogicException(sprintf('The route "%s" is not of type "list".', $this->pattern));
-    }
+        if (!$this->isBound()) {
+            throw new LogicException('The route is not bound.');
+        }
 
-    if (false !== $this->objects)
-    {
-      return $this->objects;
-    }
+        if ('list' != $this->options['type']) {
+            throw new LogicException(sprintf('The route "%s" is not of type "list".', $this->pattern));
+        }
 
-    $this->objects = $this->getObjectsForParameters($this->parameters);
+        if (false !== $this->objects) {
+            return $this->objects;
+        }
 
-    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))));
-    }
+        $this->objects = $this->getObjectsForParameters($this->parameters);
 
-    return $this->objects;
-  }
+        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))));
+        }
 
-  protected function getObjectForParameters($parameters)
-  {
-    $className = $this->options['model'];
+        return $this->objects;
+    }
 
-    if (!isset($this->options['method']))
+    protected function getObjectForParameters($parameters)
     {
-      throw new InvalidArgumentException(sprintf('You must pass a "method" option for a %s object.', get_class($this)));
-    }
+        $className = $this->options['model'];
 
-    return call_user_func(array($className, $this->options['method']), $this->filterParameters($parameters));
-  }
+        if (!isset($this->options['method'])) {
+            throw new InvalidArgumentException(sprintf('You must pass a "method" option for a %s object.', get_class($this)));
+        }
 
-  protected function getObjectsForParameters($parameters)
-  {
-    $className = $this->options['model'];
+        return call_user_func(array($className, $this->options['method']), $this->filterParameters($parameters));
+    }
 
-    if (!isset($this->options['method']))
+    protected function getObjectsForParameters($parameters)
     {
-      throw new InvalidArgumentException(sprintf('You must pass a "method" option for a %s object.', get_class($this)));
-    }
+        $className = $this->options['model'];
 
-    return call_user_func(array($className, $this->options['method']), $this->filterParameters($parameters));
-  }
+        if (!isset($this->options['method'])) {
+            throw new InvalidArgumentException(sprintf('You must pass a "method" option for a %s object.', get_class($this)));
+        }
 
-  protected function filterParameters($parameters)
-  {
-    if (!is_array($parameters))
-    {
-      return $parameters;
+        return call_user_func(array($className, $this->options['method']), $this->filterParameters($parameters));
     }
 
-    $params = array();
-    foreach (array_keys($this->variables) as $variable)
+    protected function filterParameters($parameters)
     {
-      $params[$variable] = $parameters[$variable];
-    }
+        if (!is_array($parameters)) {
+            return $parameters;
+        }
 
-    return $params;
-  }
+        $params = array();
+        foreach (array_keys($this->variables) as $variable) {
+            $params[$variable] = $parameters[$variable];
+        }
 
-  protected function convertObjectToArray($object)
-  {
-    if (!$this->compiled)
-    {
-      $this->compile();
+        return $params;
     }
 
-    if (is_array($object))
-    {
-      if (!isset($object['sf_subject']))
-      {
-        return $object;
-      }
-
-      $parameters = $object;
-      $object = $parameters['sf_subject'];
-      unset($parameters['sf_subject']);
-    }
-    else
+    protected function convertObjectToArray($object)
     {
-      $parameters = array();
-    }
-
-    return array_merge($parameters, $this->doConvertObjectToArray($object));
-  }
+        if (!$this->compiled) {
+            $this->compile();
+        }
 
-  protected function doConvertObjectToArray($object)
-  {
-    $method = isset($this->options['convert']) ? $this->options['convert'] : 'toParams';
+        if (is_array($object)) {
+            if (!isset($object['sf_subject'])) {
+                return $object;
+            }
 
-    return $object->$method();
-  }
+            $parameters = $object;
+            $object = $parameters['sf_subject'];
+            unset($parameters['sf_subject']);
+        } else {
+            $parameters = array();
+        }
 
-  protected function getRealVariables()
-  {
-    $variables = array();
+        return array_merge($parameters, $this->doConvertObjectToArray($object));
+    }
 
-    foreach (array_keys($this->variables) as $variable)
+    protected function doConvertObjectToArray($object)
     {
-      if (0 === strpos($variable, 'sf_') || in_array($variable, array('module', 'action')))
-      {
-        continue;
-      }
+        $method = isset($this->options['convert']) ? $this->options['convert'] : 'toParams';
 
-      $variables[] = $variable;
+        return $object->{$method}();
     }
 
-    return $variables;
-  }
+    protected function getRealVariables()
+    {
+        $variables = array();
+
+        foreach (array_keys($this->variables) as $variable) {
+            if (0 === strpos($variable, 'sf_') || in_array($variable, array('module', 'action'))) {
+                continue;
+            }
+
+            $variables[] = $variable;
+        }
+
+        return $variables;
+    }
 }
diff --git a/lib/routing/sfObjectRouteCollection.class.php b/lib/routing/sfObjectRouteCollection.class.php
index 3b5d46c8b..2d54744d9 100644
--- a/lib/routing/sfObjectRouteCollection.class.php
+++ b/lib/routing/sfObjectRouteCollection.class.php
@@ -11,216 +11,204 @@
 /**
  * sfObjectRouteCollection represents a collection of routes bound to objects.
  *
- * @package    symfony
- * @subpackage routing
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfObjectRouteCollection extends sfRouteCollection
 {
-  protected
-    $routeClass = 'sfObjectRoute';
-
-  /**
-   * Constructor.
-   *
-   * @param array $options An array of options
-   */
-  public function __construct(array $options)
-  {
-    parent::__construct($options);
-
-    if (!isset($this->options['model']))
+    protected $routeClass = 'sfObjectRoute';
+
+    /**
+     * Constructor.
+     *
+     * @param array $options An array of options
+     */
+    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']));
+        }
+
+        $this->options = array_merge(array(
+            '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(),
+            'with_wildcard_routes' => false,
+            'default_params' => array(),
+        ), $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']);
+
+        if (isset($this->options['route_class'])) {
+            $this->routeClass = $this->options['route_class'];
+        }
+
+        $this->generateRoutes();
+    }
+
+    protected function generateRoutes()
+    {
+        // collection actions
+        if (isset($this->options['collection_actions'])) {
+            foreach ($this->options['collection_actions'] as $action => $methods) {
+                $this->routes[$this->getRoute($action)] = $this->getRouteForCollection($action, $methods);
+            }
+        }
+
+        // "standard" actions
+        $actions = false === $this->options['actions'] ? $this->getDefaultActions() : $this->options['actions'];
+        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));
+            }
+
+            $this->routes[$this->getRoute($action)] = $this->{$method}();
+        }
+
+        // object actions
+        if (isset($this->options['object_actions'])) {
+            foreach ($this->options['object_actions'] as $action => $methods) {
+                $this->routes[$this->getRoute($action)] = $this->getRouteForObject($action, $methods);
+            }
+        }
+
+        if ($this->options['with_wildcard_routes']) {
+            // 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'])
+            );
+
+            // 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'])
+            );
+        }
+    }
+
+    protected function getRouteForCollection($action, $methods)
     {
-      throw new InvalidArgumentException(sprintf('You must pass a "model" option to %s ("%s" route)', get_class($this), $this->options['name']));
+        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'])
+        );
     }
 
-    $this->options = array_merge(array(
-      '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(),
-      'with_wildcard_routes' => false,
-      'default_params'   => array(),
-    ), $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']);
-
-    if (isset($this->options['route_class']))
+    protected function getRouteForObject($action, $methods)
     {
-      $this->routeClass = $this->options['route_class'];
+        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'])
+        );
     }
 
-    $this->generateRoutes();
-  }
+    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'])
+        );
+    }
 
-  protected function generateRoutes()
-  {
-    // collection actions
-    if (isset($this->options['collection_actions']))
+    protected function getRouteForNew()
     {
-      foreach ($this->options['collection_actions'] as $action => $methods)
-      {
-        $this->routes[$this->getRoute($action)] = $this->getRouteForCollection($action, $methods);
-      }
+        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')
+        );
     }
 
-    // "standard" actions
-    $actions = false === $this->options['actions'] ? $this->getDefaultActions() : $this->options['actions'];
-    foreach ($actions as $action)
+    protected function getRouteForCreate()
     {
-      $method = 'getRouteFor'.ucfirst($action);
-      if (!method_exists($this, $method))
-      {
-        throw new InvalidArgumentException(sprintf('Unable to generate a route for the "%s" action.', $action));
-      }
+        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')
+        );
+    }
 
-      $this->routes[$this->getRoute($action)] = $this->$method();
+    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'])
+        );
     }
 
-    // object actions
-    if (isset($this->options['object_actions']))
+    protected function getRouteForEdit()
     {
-      foreach ($this->options['object_actions'] as $action => $methods)
-      {
-        $this->routes[$this->getRoute($action)] = $this->getRouteForObject($action, $methods);
-      }
+        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'])
+        );
     }
 
-    if ($this->options['with_wildcard_routes'])
+    protected function getRouteForUpdate()
     {
-      // 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'])
-      );
-
-      // 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'])
-      );
+        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'])
+        );
     }
-  }
-
-  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'])
-    );
-  }
-
-  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'])
-    );
-  }
-
-  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'])
-    );
-  }
-
-  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')
-    );
-  }
-
-  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')
-    );
-  }
-
-  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'])
-    );
-  }
-
-  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'])
-    );
-  }
-
-  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'])
-    );
-  }
-
-  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'])
-    );
-  }
-
-  protected function getDefaultActions()
-  {
-    $actions = array('list', 'new', 'create', 'edit', 'update', 'delete');
-
-    if ($this->options['with_show'])
+
+    protected function getRouteForDelete()
     {
-      $actions[] = 'show';
+        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'])
+        );
     }
 
-    return $actions;
-  }
+    protected function getDefaultActions()
+    {
+        $actions = array('list', 'new', 'create', 'edit', 'update', 'delete');
+
+        if ($this->options['with_show']) {
+            $actions[] = 'show';
+        }
+
+        return $actions;
+    }
 
-  protected function getRoute($action)
-  {
-    return 'list' == $action ? $this->options['name'] : $this->options['name'].'_'.$action;
-  }
+    protected function getRoute($action)
+    {
+        return 'list' == $action ? $this->options['name'] : $this->options['name'].'_'.$action;
+    }
 
-  protected function getActionMethod($action)
-  {
-    return 'list' == $action ? 'index' : $action;
-  }
+    protected function getActionMethod($action)
+    {
+        return 'list' == $action ? 'index' : $action;
+    }
 }
diff --git a/lib/routing/sfPatternRouting.class.php b/lib/routing/sfPatternRouting.class.php
index 58c69685c..753413c83 100644
--- a/lib/routing/sfPatternRouting.class.php
+++ b/lib/routing/sfPatternRouting.class.php
@@ -13,566 +13,517 @@
  *
  * It parses and generates URLs by delegating the work to an array of sfRoute objects.
  *
- * @package    symfony
- * @subpackage routing
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfPatternRouting extends sfRouting
 {
-  /** @var null|string */
-  protected $currentRouteName = null;
-  protected $currentInternalUri = array();
-  /** @var sfRoute[] */
-  protected $routes = array();
-  protected $cacheData = array();
-  protected $cacheChanged = false;
-
-  /**
-   * Initializes this Routing.
-   *
-   * Available options:
-   *
-   *  * suffix:                           The default suffix
-   *  * variable_prefixes:                An array of characters that starts a variable name (: by default)
-   *  * segment_separators:               An array of allowed characters for segment separators (/ and . by default)
-   *  * variable_regex:                   A regex that match a valid variable name ([\w\d_]+ by default)
-   *  * generate_shortest_url:            Whether to generate the shortest URL possible (true by default)
-   *  * extra_parameters_as_query_string: Whether to generate extra parameters as a query string
-   *  * lookup_cache_dedicated_keys:      Whether to use dedicated keys for parse/generate cache (false by default)
-   *                                      WARNING: When this option is activated, do not use sfFileCache; use a fast access
-   *                                      cache backend (like sfAPCCache).
-   *
-   * @see sfRouting
-   * @inheritdoc
-   */
-  public function initialize(sfEventDispatcher $dispatcher, sfCache $cache = null, $options = array())
-  {
-    $options = array_merge(array(
-      'variable_prefixes'                => array(':'),
-      'segment_separators'               => array('/', '.'),
-      'variable_regex'                   => '[\w\d_]+',
-      'load_configuration'               => false,
-      'suffix'                           => '',
-      'generate_shortest_url'            => true,
-      'extra_parameters_as_query_string' => true,
-      'lookup_cache_dedicated_keys'      => false,
-    ), $options);
-
-    // for BC
-    if ('.' == $options['suffix'])
+    /** @var string|null */
+    protected $currentRouteName;
+    protected $currentInternalUri = array();
+
+    /** @var sfRoute[] */
+    protected $routes = array();
+    protected $cacheData = array();
+    protected $cacheChanged = false;
+
+    /**
+     * Initializes this Routing.
+     *
+     * Available options:
+     *
+     *  * suffix:                           The default suffix
+     *  * variable_prefixes:                An array of characters that starts a variable name (: by default)
+     *  * segment_separators:               An array of allowed characters for segment separators (/ and . by default)
+     *  * variable_regex:                   A regex that match a valid variable name ([\w\d_]+ by default)
+     *  * generate_shortest_url:            Whether to generate the shortest URL possible (true by default)
+     *  * extra_parameters_as_query_string: Whether to generate extra parameters as a query string
+     *  * lookup_cache_dedicated_keys:      Whether to use dedicated keys for parse/generate cache (false by default)
+     *                                      WARNING: When this option is activated, do not use sfFileCache; use a fast access
+     *                                      cache backend (like sfAPCCache).
+     *
+     * @see sfRouting
+     * {@inheritdoc}
+     */
+    public function initialize(sfEventDispatcher $dispatcher, sfCache $cache = null, $options = array())
     {
-      $options['suffix'] = '';
+        $options = array_merge(array(
+            'variable_prefixes' => array(':'),
+            'segment_separators' => array('/', '.'),
+            'variable_regex' => '[\w\d_]+',
+            'load_configuration' => false,
+            'suffix' => '',
+            'generate_shortest_url' => true,
+            'extra_parameters_as_query_string' => true,
+            'lookup_cache_dedicated_keys' => false,
+        ), $options);
+
+        // for BC
+        if ('.' == $options['suffix']) {
+            $options['suffix'] = '';
+        }
+
+        parent::initialize($dispatcher, $cache, $options);
+
+        if (null !== $this->cache && !$options['lookup_cache_dedicated_keys'] && $cacheData = $this->cache->get('symfony.routing.data')) {
+            $this->cacheData = unserialize($cacheData);
+        }
     }
 
-    parent::initialize($dispatcher, $cache, $options);
-
-    if (null !== $this->cache && !$options['lookup_cache_dedicated_keys'] && $cacheData = $this->cache->get('symfony.routing.data'))
+    /**
+     * @see sfRouting
+     * {@inheritdoc}
+     */
+    public function loadConfiguration()
     {
-      $this->cacheData = unserialize($cacheData);
+        if ($this->options['load_configuration'] && $config = $this->getConfigFileName()) {
+            include $config;
+        }
+
+        parent::loadConfiguration();
     }
-  }
-
-  /**
-   * @see sfRouting
-   * @inheritdoc
-   */
-  public function loadConfiguration()
-  {
-    if ($this->options['load_configuration'] && $config = $this->getConfigFileName())
+
+    /**
+     * @see sfRouting
+     * {@inheritdoc}
+     */
+    public function setDefaultParameter($key, $value)
     {
-      include($config);
+        parent::setDefaultParameter($key, $value);
+
+        foreach ($this->routes as $route) {
+            if (is_object($route)) {
+                $route->setDefaultParameters($this->defaultParameters);
+            }
+        }
     }
 
-    parent::loadConfiguration();
-  }
+    /**
+     * @see sfRouting
+     * {@inheritdoc}
+     */
+    public function setDefaultParameters($parameters)
+    {
+        parent::setDefaultParameters($parameters);
 
-  /**
-   * @see sfRouting
-   * @inheritdoc
-   */
-  public function setDefaultParameter($key, $value)
-  {
-    parent::setDefaultParameter($key, $value);
+        foreach ($this->routes as $route) {
+            if (is_object($route)) {
+                $route->setDefaultParameters($this->defaultParameters);
+            }
+        }
+    }
 
-    foreach ($this->routes as $route)
+    /**
+     * @see sfRouting
+     * {@inheritdoc}
+     */
+    public function getCurrentInternalUri($withRouteName = false)
     {
-      if (is_object($route))
-      {
-        $route->setDefaultParameters($this->defaultParameters);
-      }
+        return null === $this->currentRouteName ? null : $this->currentInternalUri[$withRouteName ? 0 : 1];
     }
-  }
-
-  /**
-   * @see sfRouting
-   * @inheritdoc
-   */
-  public function setDefaultParameters($parameters)
-  {
-    parent::setDefaultParameters($parameters);
 
-    foreach ($this->routes as $route)
+    /**
+     * Gets the current route name.
+     *
+     * @return string The route name
+     */
+    public function getCurrentRouteName()
     {
-      if (is_object($route))
-      {
-        $route->setDefaultParameters($this->defaultParameters);
-      }
+        return $this->currentRouteName;
     }
-  }
-
-  protected function getConfigFileName()
-  {
-    return sfContext::getInstance()->getConfigCache()->checkConfig('config/routing.yml', true);
-  }
-
-  /**
-   * @see sfRouting
-   * @inheritdoc
-   */
-  public function getCurrentInternalUri($withRouteName = false)
-  {
-    return null === $this->currentRouteName ? null : $this->currentInternalUri[$withRouteName ? 0 : 1];
-  }
-
-  /**
-   * Gets the current route name.
-   *
-   * @return string The route name
-   */
-  public function getCurrentRouteName()
-  {
-    return $this->currentRouteName;
-  }
-
-  /**
-   * @see sfRouting
-   * @inheritdoc
-   */
-  public function getRoutes()
-  {
-    return $this->routes;
-  }
-
-  /**
-   * @see  sfRouting
-   * @inheritdoc
-   */
-  public function getRoute($name)
-  {
-    if (!array_key_exists($name, $this->routes))
+
+    /**
+     * @see sfRouting
+     * {@inheritdoc}
+     */
+    public function getRoutes()
     {
-      throw new sfException(sprintf('Route "%s" is not defined.', $name));
+        return $this->routes;
     }
 
-    $route = $this->routes[$name];
-
-    if (is_string($route))
+    /**
+     * @see  sfRouting
+     * {@inheritdoc}
+     */
+    public function getRoute($name)
     {
-      $this->routes[$name] = $route = unserialize($route);
-      $route->setDefaultParameters($this->defaultParameters);
-    }
+        if (!array_key_exists($name, $this->routes)) {
+            throw new sfException(sprintf('Route "%s" is not defined.', $name));
+        }
 
-    return $route;
-  }
+        $route = $this->routes[$name];
 
-  /**
-   * @see sfRouting
-   * @inheritdoc
-   */
-  public function setRoutes($routes)
-  {
-    foreach ($routes as $name => $route)
-    {
-      $this->connect($name, $route);
+        if (is_string($route)) {
+            $this->routes[$name] = $route = unserialize($route);
+            $route->setDefaultParameters($this->defaultParameters);
+        }
+
+        return $route;
     }
-  }
-
-  /**
-   * @see sfRouting
-   * @inheritdoc
-   */
-  public function hasRoutes()
-  {
-    return count($this->routes) ? true : false;
-  }
-
-  /**
-   * @see sfRouting
-   * @inheritdoc
-   */
-  public function clearRoutes()
-  {
-    if ($this->options['logging'])
+
+    /**
+     * @see sfRouting
+     * {@inheritdoc}
+     */
+    public function setRoutes($routes)
     {
-      $this->dispatcher->notify(new sfEvent($this, 'application.log', array('Clear all current routes')));
+        foreach ($routes as $name => $route) {
+            $this->connect($name, $route);
+        }
     }
 
-    $this->routes = array();
-  }
-
-  /**
-   * Returns true if the route name given is defined.
-   *
-   * @param  string $name  The route name
-   *
-   * @return boolean
-   */
-  public function hasRouteName($name)
-  {
-    return array_key_exists($name, $this->routes);
-  }
-
-  /**
-   * Adds a new route at the beginning of the current list of routes.
-   *
-   * @see connect
-   *
-   * @param string $name
-   * @param sfRoute $route
-   */
-  public function prependRoute($name, $route)
-  {
-    $routes = $this->routes;
-    $this->routes = array();
-    $this->connect($name, $route);
-    $this->routes = array_merge($this->routes, $routes);
-  }
-
-  /**
-   * Adds a new route.
-   *
-   * Alias for the connect method.
-   *
-   * @see connect
-   *
-   * @param string $name
-   * @param sfRoute $route
-   * @return array
-   */
-  public function appendRoute($name, $route)
-  {
-    return $this->connect($name, $route);
-  }
-
-  /**
-   * Adds a new route before a given one in the current list of routes.
-   *
-   * @see connect
-   *
-   * @param string $pivot
-   * @param string $name
-   * @param sfRoute $route
-   *
-   * @throws sfConfigurationException
-   */
-  public function insertRouteBefore($pivot, $name, $route)
-  {
-    if (!isset($this->routes[$pivot]))
+    /**
+     * @see sfRouting
+     * {@inheritdoc}
+     */
+    public function hasRoutes()
     {
-      throw new sfConfigurationException(sprintf('Unable to insert route "%s" before inexistent route "%s".', $name, $pivot));
+        return count($this->routes) ? true : false;
     }
 
-    $routes = $this->routes;
-    $this->routes = array();
-    $newroutes = array();
-    foreach ($routes as $key => $value)
+    /**
+     * @see sfRouting
+     * {@inheritdoc}
+     */
+    public function clearRoutes()
     {
-      if ($key == $pivot)
-      {
-        $this->connect($name, $route);
-        $newroutes = array_merge($newroutes, $this->routes);
-      }
-      $newroutes[$key] = $value;
+        if ($this->options['logging']) {
+            $this->dispatcher->notify(new sfEvent($this, 'application.log', array('Clear all current routes')));
+        }
+
+        $this->routes = array();
     }
 
-    $this->routes = $newroutes;
-  }
-
-  /**
-   * Adds a new route at the end of the current list of routes.
-   *
-   * A route string is a string with 2 special constructions:
-   * - :string: :string denotes a named parameter (available later as $request->getParameter('string'))
-   * - *: * match an indefinite number of parameters in a route
-   *
-   * Here is a very common rule in a symfony project:
-   *
-   * <code>
-   * $r->connect('default', new sfRoute('/:module/:action/*'));
-   * </code>
-   *
-   * @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);
-    foreach (self::flattenRoutes($routes) as $name => $route)
+    /**
+     * Returns true if the route name given is defined.
+     *
+     * @param string $name The route name
+     *
+     * @return bool
+     */
+    public function hasRouteName($name)
     {
-      $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()))));
-      }
+        return array_key_exists($name, $this->routes);
     }
-  }
-
-  public function configureRoute(sfRoute $route)
-  {
-    $route->setDefaultParameters($this->defaultParameters);
-    $route->setDefaultOptions($this->options);
-  }
-
-  /**
-   * @see sfRouting
-   * @inheritdoc
-   */
-  public function generate($name, $params = array(), $absolute = false)
-  {
-    // fetch from cache
-    if (null !== $this->cache)
+
+    /**
+     * Adds a new route at the beginning of the current list of routes.
+     *
+     * @see connect
+     *
+     * @param string  $name
+     * @param sfRoute $route
+     */
+    public function prependRoute($name, $route)
     {
-      $cacheKey = $this->getGenerateCacheKey($name, (array) $params);
-      if ($this->options['lookup_cache_dedicated_keys'] && $url = $this->cache->get($cacheKey))
-      {
-        return $this->fixGeneratedUrl($url, $absolute);
-      }
-      elseif (isset($this->cacheData[$cacheKey]))
-      {
-        return $this->fixGeneratedUrl($this->cacheData[$cacheKey], $absolute);
-      }
+        $routes = $this->routes;
+        $this->routes = array();
+        $this->connect($name, $route);
+        $this->routes = array_merge($this->routes, $routes);
     }
 
-    if ($name)
+    /**
+     * Adds a new route.
+     *
+     * Alias for the connect method.
+     *
+     * @see connect
+     *
+     * @param string  $name
+     * @param sfRoute $route
+     *
+     * @return array
+     */
+    public function appendRoute($name, $route)
     {
-      $route = $this->getRoute($name);
+        return $this->connect($name, $route);
     }
-    else
+
+    /**
+     * Adds a new route before a given one in the current list of routes.
+     *
+     * @see connect
+     *
+     * @param string  $pivot
+     * @param string  $name
+     * @param sfRoute $route
+     *
+     * @throws sfConfigurationException
+     */
+    public function insertRouteBefore($pivot, $name, $route)
     {
-      // 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))));
-      }
+        if (!isset($this->routes[$pivot])) {
+            throw new sfConfigurationException(sprintf('Unable to insert route "%s" before inexistent route "%s".', $name, $pivot));
+        }
+
+        $routes = $this->routes;
+        $this->routes = array();
+        $newroutes = array();
+        foreach ($routes as $key => $value) {
+            if ($key == $pivot) {
+                $this->connect($name, $route);
+                $newroutes = array_merge($newroutes, $this->routes);
+            }
+            $newroutes[$key] = $value;
+        }
+
+        $this->routes = $newroutes;
     }
 
-    $url = $route->generate($params, $this->options['context'], $absolute);
+    /**
+     * Adds a new route at the end of the current list of routes.
+     *
+     * A route string is a string with 2 special constructions:
+     * - :string: :string denotes a named parameter (available later as $request->getParameter('string'))
+     * - *: * match an indefinite number of parameters in a route
+     *
+     * Here is a very common rule in a symfony project:
+     *
+     * <code>
+     * $r->connect('default', new sfRoute('/:module/:action/*'));
+     * </code>
+     *
+     * @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);
+        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()))));
+            }
+        }
+    }
 
-    // store in cache
-    if (null !== $this->cache)
+    public function configureRoute(sfRoute $route)
     {
-      if ($this->options['lookup_cache_dedicated_keys'])
-      {
-        $this->cache->set($cacheKey, $url);
-      }
-      else
-      {
-        $this->cacheChanged = true;
-        $this->cacheData[$cacheKey] = $url;
-      }
+        $route->setDefaultParameters($this->defaultParameters);
+        $route->setDefaultOptions($this->options);
     }
 
-    return $this->fixGeneratedUrl($url, $absolute);
-  }
-
-  protected function getGenerateCacheKey($name, $params)
-  {
-    return 'generate_'.$name.'_'.md5(serialize(array_merge($this->defaultParameters, $params))).'_'.md5(serialize($this->options['context']));
-  }
-
-  /**
-   * @see sfRouting
-   * @inheritdoc
-   */
-  public function parse($url)
-  {
-    if (false === $info = $this->findRoute($url))
+    /**
+     * @see sfRouting
+     * {@inheritdoc}
+     */
+    public function generate($name, $params = array(), $absolute = false)
     {
-      $this->currentRouteName = null;
-      $this->currentInternalUri = array();
+        // fetch from cache
+        if (null !== $this->cache) {
+            $cacheKey = $this->getGenerateCacheKey($name, (array) $params);
+            if ($this->options['lookup_cache_dedicated_keys'] && $url = $this->cache->get($cacheKey)) {
+                return $this->fixGeneratedUrl($url, $absolute);
+            }
+            if (isset($this->cacheData[$cacheKey])) {
+                return $this->fixGeneratedUrl($this->cacheData[$cacheKey], $absolute);
+            }
+        }
+
+        if ($name) {
+            $route = $this->getRoute($name);
+        } 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))));
+            }
+        }
+
+        $url = $route->generate($params, $this->options['context'], $absolute);
+
+        // store in cache
+        if (null !== $this->cache) {
+            if ($this->options['lookup_cache_dedicated_keys']) {
+                $this->cache->set($cacheKey, $url);
+            } else {
+                $this->cacheChanged = true;
+                $this->cacheData[$cacheKey] = $url;
+            }
+        }
 
-      return false;
+        return $this->fixGeneratedUrl($url, $absolute);
     }
 
-    if ($this->options['logging'])
+    /**
+     * @see sfRouting
+     * {@inheritdoc}
+     */
+    public function parse($url)
     {
-      $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))))));
-    }
+        if (false === $info = $this->findRoute($url)) {
+            $this->currentRouteName = null;
+            $this->currentInternalUri = array();
 
-    // store the current internal URI
-    $this->updateCurrentInternalUri($info['name'], $info['parameters']);
+            return false;
+        }
 
-    $route = $this->getRoute($info['name']);
+        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))))));
+        }
 
-    $route->bind($this->options['context'], $info['parameters']);
-    $info['parameters']['_sf_route'] = $route;
+        // store the current internal URI
+        $this->updateCurrentInternalUri($info['name'], $info['parameters']);
 
-    return $info['parameters'];
-  }
+        $route = $this->getRoute($info['name']);
 
-  protected function updateCurrentInternalUri($name, array $parameters)
-  {
-    // store the route name
-    $this->currentRouteName = $name;
+        $route->bind($this->options['context'], $info['parameters']);
+        $info['parameters']['_sf_route'] = $route;
 
-    $internalUri = array('@'.$this->currentRouteName, $parameters['module'].'/'.$parameters['action']);
-    unset($parameters['module'], $parameters['action']);
+        return $info['parameters'];
+    }
 
-    $params = array();
-    foreach ($parameters as $key => $value)
+    /**
+     * Finds a matching route for given URL.
+     *
+     * Returns false if no route matches.
+     *
+     * Returned array contains:
+     *
+     *  - name:       name or alias of the route that matched
+     *  - pattern:    the compiled pattern of the route that matched
+     *  - parameters: array containing key value pairs of the request parameters including defaults
+     *
+     * @param string $url URL to be parsed
+     *
+     * @return array|false An array with routing information or false if no route matched
+     */
+    public function findRoute($url)
     {
-      $params[] = $key.'='.$value;
+        $url = $this->normalizeUrl($url);
+
+        // fetch from cache
+        if (null !== $this->cache) {
+            $cacheKey = $this->getParseCacheKey($url);
+            if ($this->options['lookup_cache_dedicated_keys'] && $info = $this->cache->get($cacheKey)) {
+                return unserialize($info);
+            }
+            if (isset($this->cacheData[$cacheKey])) {
+                return $this->cacheData[$cacheKey];
+            }
+        }
+
+        $info = $this->getRouteThatMatchesUrl($url);
+
+        // store in cache
+        if (null !== $this->cache) {
+            if ($this->options['lookup_cache_dedicated_keys']) {
+                $this->cache->set($cacheKey, serialize($info));
+            } else {
+                $this->cacheChanged = true;
+                $this->cacheData[$cacheKey] = $info;
+            }
+        }
+
+        return $info;
     }
 
-    // sort to guaranty unicity
-    sort($params);
-
-    $params = $params ? '?'.implode('&', $params) : '';
-
-    $this->currentInternalUri = array($internalUri[0].$params, $internalUri[1].$params);
-  }
-
-  /**
-   * Finds a matching route for given URL.
-   *
-   * Returns false if no route matches.
-   *
-   * Returned array contains:
-   *
-   *  - name:       name or alias of the route that matched
-   *  - pattern:    the compiled pattern of the route that matched
-   *  - parameters: array containing key value pairs of the request parameters including defaults
-   *
-   * @param  string $url     URL to be parsed
-   *
-   * @return array|false  An array with routing information or false if no route matched
-   */
-  public function findRoute($url)
-  {
-    $url = $this->normalizeUrl($url);
-
-    // fetch from cache
-    if (null !== $this->cache)
+    public static function flattenRoutes($routes)
     {
-      $cacheKey = $this->getParseCacheKey($url);
-      if ($this->options['lookup_cache_dedicated_keys'] && $info = $this->cache->get($cacheKey))
-      {
-        return unserialize($info);
-      }
-      elseif (isset($this->cacheData[$cacheKey]))
-      {
-        return $this->cacheData[$cacheKey];
-      }
+        $flattenRoutes = array();
+        foreach ($routes as $name => $route) {
+            if ($route instanceof sfRouteCollection) {
+                $flattenRoutes = array_merge($flattenRoutes, self::flattenRoutes($route));
+            } else {
+                $flattenRoutes[$name] = $route;
+            }
+        }
+
+        return $flattenRoutes;
     }
 
-    $info = $this->getRouteThatMatchesUrl($url);
-
-    // store in cache
-    if (null !== $this->cache)
+    /**
+     * @see sfRouting
+     */
+    public function shutdown()
     {
-      if ($this->options['lookup_cache_dedicated_keys'])
-      {
-        $this->cache->set($cacheKey, serialize($info));
-      }
-      else
-      {
-        $this->cacheChanged = true;
-        $this->cacheData[$cacheKey] = $info;
-      }
+        if (null !== $this->cache && $this->cacheChanged) {
+            $this->cacheChanged = false;
+            $this->cache->set('symfony.routing.data', serialize($this->cacheData));
+        }
     }
 
-    return $info;
-  }
-
-  protected function getParseCacheKey($url)
-  {
-    return 'parse_'.$url.'_'.md5(serialize($this->options['context']));
-  }
-
-  static public function flattenRoutes($routes)
-  {
-    $flattenRoutes = array();
-    foreach ($routes as $name => $route)
+    protected function getConfigFileName()
     {
-      if ($route instanceof sfRouteCollection)
-      {
-        $flattenRoutes = array_merge($flattenRoutes, self::flattenRoutes($route));
-      }
-      else
-      {
-        $flattenRoutes[$name] = $route;
-      }
+        return sfContext::getInstance()->getConfigCache()->checkConfig('config/routing.yml', true);
     }
 
-    return $flattenRoutes;
-  }
+    protected function getGenerateCacheKey($name, $params)
+    {
+        return 'generate_'.$name.'_'.md5(serialize(array_merge($this->defaultParameters, $params))).'_'.md5(serialize($this->options['context']));
+    }
 
-  protected function getRouteThatMatchesUrl($url)
-  {
-    foreach ($this->routes as $name => $route)
+    protected function updateCurrentInternalUri($name, array $parameters)
     {
-      $route = $this->getRoute($name);
+        // store the route name
+        $this->currentRouteName = $name;
 
-      if (false === $parameters = $route->matchesUrl($url, $this->options['context']))
-      {
-        continue;
-      }
+        $internalUri = array('@'.$this->currentRouteName, $parameters['module'].'/'.$parameters['action']);
+        unset($parameters['module'], $parameters['action']);
 
-      return array('name' => $name, 'pattern' => $route->getPattern(), 'parameters' => $parameters);
-    }
+        $params = array();
+        foreach ($parameters as $key => $value) {
+            $params[] = $key.'='.$value;
+        }
 
-    return false;
-  }
+        // sort to guaranty unicity
+        sort($params);
 
-  protected function getRouteThatMatchesParameters($parameters)
-  {
-    foreach ($this->routes as $name => $route)
-    {
-      $route = $this->getRoute($name);
+        $params = $params ? '?'.implode('&', $params) : '';
 
-      if ($route->matchesParameters($parameters, $this->options['context']))
-      {
-        return $route;
-      }
+        $this->currentInternalUri = array($internalUri[0].$params, $internalUri[1].$params);
     }
 
-    return false;
-  }
-
-  protected function normalizeUrl($url)
-  {
-    // an URL should start with a '/', mod_rewrite doesn't respect that, but no-mod_rewrite version does.
-    if ('/' != substr($url, 0, 1))
+    protected function getParseCacheKey($url)
     {
-      $url = '/'.$url;
+        return 'parse_'.$url.'_'.md5(serialize($this->options['context']));
     }
 
-    // we remove the query string
-    if (false !== $pos = strpos($url, '?'))
+    protected function getRouteThatMatchesUrl($url)
     {
-      $url = substr($url, 0, $pos);
+        foreach ($this->routes as $name => $route) {
+            $route = $this->getRoute($name);
+
+            if (false === $parameters = $route->matchesUrl($url, $this->options['context'])) {
+                continue;
+            }
+
+            return array('name' => $name, 'pattern' => $route->getPattern(), 'parameters' => $parameters);
+        }
+
+        return false;
     }
 
-    // remove multiple /
-    $url = preg_replace('#/+#', '/', $url);
+    protected function getRouteThatMatchesParameters($parameters)
+    {
+        foreach ($this->routes as $name => $route) {
+            $route = $this->getRoute($name);
 
-    return $url;
-  }
+            if ($route->matchesParameters($parameters, $this->options['context'])) {
+                return $route;
+            }
+        }
+
+        return false;
+    }
 
-  /**
-   * @see sfRouting
-   */
-  public function shutdown()
-  {
-    if (null !== $this->cache && $this->cacheChanged)
+    protected function normalizeUrl($url)
     {
-      $this->cacheChanged = false;
-      $this->cache->set('symfony.routing.data', serialize($this->cacheData));
+        // an URL should start with a '/', mod_rewrite doesn't respect that, but no-mod_rewrite version does.
+        if ('/' != substr($url, 0, 1)) {
+            $url = '/'.$url;
+        }
+
+        // we remove the query string
+        if (false !== $pos = strpos($url, '?')) {
+            $url = substr($url, 0, $pos);
+        }
+
+        // remove multiple /
+        return preg_replace('#/+#', '/', $url);
     }
-  }
 }
diff --git a/lib/routing/sfRequestRoute.class.php b/lib/routing/sfRequestRoute.class.php
index db3056fa5..3e1c08bbb 100644
--- a/lib/routing/sfRequestRoute.class.php
+++ b/lib/routing/sfRequestRoute.class.php
@@ -13,95 +13,92 @@
  *
  * It implements the sf_method requirement.
  *
- * @package    symfony
- * @subpackage routing
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfRequestRoute extends sfRoute
 {
-  /**
-   * Constructor.
-   *
-   * Applies a default sf_method requirements of GET or HEAD.
-   *
-   * @see sfRoute
-   */
-  public function __construct($pattern, $defaults = array(), $requirements = array(), $options = array())
-  {
-    if (!isset($requirements['sf_method']))
+    /**
+     * Constructor.
+     *
+     * Applies a default sf_method requirements of GET or HEAD.
+     *
+     * @see sfRoute
+     *
+     * @param mixed $pattern
+     * @param mixed $defaults
+     * @param mixed $requirements
+     * @param mixed $options
+     */
+    public function __construct($pattern, $defaults = array(), $requirements = array(), $options = array())
     {
-      $requirements['sf_method'] = array('get', 'head');
+        if (!isset($requirements['sf_method'])) {
+            $requirements['sf_method'] = array('get', 'head');
+        } else {
+            $requirements['sf_method'] = array_map('strtolower', (array) $requirements['sf_method']);
+        }
+
+        parent::__construct($pattern, $defaults, $requirements, $options);
     }
-    else
+
+    /**
+     * Returns true if the URL matches this route, false otherwise.
+     *
+     * @param string $url     The URL
+     * @param array  $context The context
+     *
+     * @return array|bool An array of parameters or false if not matching
+     */
+    public function matchesUrl($url, $context = array())
     {
-      $requirements['sf_method'] = array_map('strtolower', (array) $requirements['sf_method']);
-    }
+        if (false === $parameters = parent::matchesUrl($url, $context)) {
+            return false;
+        }
 
-    parent::__construct($pattern, $defaults, $requirements, $options);
-  }
+        // enforce the sf_method requirement
+        if (in_array(strtolower($context['method']), $this->requirements['sf_method'])) {
+            return $parameters;
+        }
 
-  /**
-   * Returns true if the URL matches this route, false otherwise.
-   *
-   * @param  string  $url     The URL
-   * @param  array   $context The context
-   *
-   * @return array|bool   An array of parameters or false if not matching
-   */
-  public function matchesUrl($url, $context = array())
-  {
-    if (false === $parameters = parent::matchesUrl($url, $context))
-    {
-      return false;
+        return false;
     }
 
-    // enforce the sf_method requirement
-    if (in_array(strtolower($context['method']), $this->requirements['sf_method']))
+    /**
+     * Returns true if the parameters match this route, false otherwise.
+     *
+     * @param mixed $params  The parameters
+     * @param array $context The context
+     *
+     * @return bool true if the parameters match this route, false otherwise
+     */
+    public function matchesParameters($params, $context = array())
     {
-      return $parameters;
-    }
+        if (isset($params['sf_method'])) {
+            // enforce the sf_method requirement
+            if (!in_array(strtolower($params['sf_method']), $this->requirements['sf_method'])) {
+                return false;
+            }
 
-    return false;
-  }
+            unset($params['sf_method']);
+        }
 
-  /**
-   * Returns true if the parameters match this route, false otherwise.
-   *
-   * @param  mixed   $params The parameters
-   * @param  array   $context The context
-   *
-   * @return Boolean true if the parameters match this route, false otherwise.
-   */
-  public function matchesParameters($params, $context = array())
-  {
-    if (isset($params['sf_method']))
-    {
-      // enforce the sf_method requirement
-      if (!in_array(strtolower($params['sf_method']), $this->requirements['sf_method']))
-      {
-        return false;
-      }
-
-      unset($params['sf_method']);
+        return parent::matchesParameters($params, $context);
     }
 
-    return parent::matchesParameters($params, $context);
-  }
-
-  /**
-   * Generates a URL from the given parameters.
-   *
-   * @param  mixed   $params    The parameter values
-   * @param  array   $context   The context
-   * @param  Boolean $absolute  Whether to generate an absolute URL
-   *
-   * @return string The generated URL
-   */
-  public function generate($params, $context = array(), $absolute = false)
-  {
-    unset($params['sf_method']);
+    /**
+     * Generates a URL from the given parameters.
+     *
+     * @param mixed $params   The parameter values
+     * @param array $context  The context
+     * @param bool  $absolute Whether to generate an absolute URL
+     *
+     * @return string The generated URL
+     */
+    public function generate($params, $context = array(), $absolute = false)
+    {
+        unset($params['sf_method']);
 
-    return parent::generate($params, $context, $absolute);
-  }
+        return parent::generate($params, $context, $absolute);
+    }
 }
diff --git a/lib/routing/sfRoute.class.php b/lib/routing/sfRoute.class.php
index f8a6ea7a5..399c9186a 100644
--- a/lib/routing/sfRoute.class.php
+++ b/lib/routing/sfRoute.class.php
@@ -11,873 +11,788 @@
 /**
  * sfRoute represents a route.
  *
- * @package    symfony
- * @subpackage routing
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfRoute implements Serializable
 {
-  protected
-    $isBound           = false,
-    $context           = null,
-    $parameters        = null,
-    $suffix            = null,
-    $defaultParameters = array(),
-    $defaultOptions    = array(),
-    $compiled          = false,
-    $options           = array(),
-    $pattern           = null,
-    $staticPrefix      = null,
-    $regex             = null,
-    $variables         = array(),
-    $defaults          = array(),
-    $requirements      = array(),
-    $tokens            = array(),
-    $customToken       = false,
-    $firstOptional     = null,
-    $segments          = array();
-
-  /**
-   * Constructor.
-   *
-   * Available options:
-   *
-   *  * variable_prefixes:                An array of characters that starts a variable name (: by default)
-   *  * segment_separators:               An array of allowed characters for segment separators (/ and . by default)
-   *  * variable_regex:                   A regex that match a valid variable name ([\w\d_]+ by default)
-   *  * generate_shortest_url:            Whether to generate the shortest URL possible (true by default)
-   *  * extra_parameters_as_query_string: Whether to generate extra parameters as a query string
-   *
-   * @param string $pattern       The pattern to match
-   * @param array  $defaults      An array of default parameter values
-   * @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())
-  {
-    $this->pattern      = trim($pattern);
-    $this->defaults     = $defaults;
-    $this->requirements = $requirements;
-    $this->options      = $options;
-  }
-
-  /**
-   * Binds the current route for a given context and parameters.
-   *
-   * @param array $context    The context
-   * @param array $parameters The parameters
-   */
-  public function bind($context, $parameters)
-  {
-    $this->isBound    = true;
-    $this->context    = $context;
-    $this->parameters = $parameters;
-  }
-
-  /**
-   * Returns true if the route is bound to context and parameters.
-   *
-   * @return Boolean true if theroute is bound to context and parameters, false otherwise
-   */
-  public function isBound()
-  {
-    return $this->isBound;
-  }
-
-  /**
-   * Returns an array of parameters if the URL matches this route, false otherwise.
-   *
-   * @param  string  $url     The URL
-   * @param  array   $context The context
-   *
-   * @return array|bool   An array of parameters or false if not matching
-   */
-  public function matchesUrl($url, $context = array())
-  {
-    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))
-    {
-      return false;
-    }
-    if (!preg_match($this->regex, $url, $matches))
-    {
-      return false;
-    }
-
-    $defaults   = array_merge($this->getDefaultParameters(), $this->defaults);
-    $parameters = array();
-
-    // *
-    if (isset($matches['_star']))
-    {
-      $parameters = $this->parseStarParameter($matches['_star']);
-      unset($matches['_star'], $parameters['module'], $parameters['action']);
-    }
-
-    // defaults
-    $parameters = $this->mergeArrays($defaults, $parameters);
-
-    // variables
-    foreach ($matches as $key => $value)
-    {
-      if (!is_int($key))
-      {
-        $parameters[$key] = urldecode($value);
-      }
-    }
-
-    return $parameters;
-  }
-
-  /**
-   * Returns true if the parameters matches this route, false otherwise.
-   *
-   * @param  mixed  $params  The parameters
-   * @param  array  $context The context
-   *
-   * @return Boolean         true if the parameters matches this route, false otherwise.
-   */
-  public function matchesParameters($params, $context = array())
-  {
-    if (!$this->compiled)
-    {
-      $this->compile();
+    protected $isBound = false;
+    protected $context;
+    protected $parameters;
+    protected $suffix;
+    protected $defaultParameters = array();
+    protected $defaultOptions = array();
+    protected $compiled = false;
+    protected $options = array();
+    protected $pattern;
+    protected $staticPrefix;
+    protected $regex;
+    protected $variables = array();
+    protected $defaults = array();
+    protected $requirements = array();
+    protected $tokens = array();
+    protected $customToken = false;
+    protected $firstOptional;
+    protected $segments = array();
+
+    /**
+     * Constructor.
+     *
+     * Available options:
+     *
+     *  * variable_prefixes:                An array of characters that starts a variable name (: by default)
+     *  * segment_separators:               An array of allowed characters for segment separators (/ and . by default)
+     *  * variable_regex:                   A regex that match a valid variable name ([\w\d_]+ by default)
+     *  * generate_shortest_url:            Whether to generate the shortest URL possible (true by default)
+     *  * extra_parameters_as_query_string: Whether to generate extra parameters as a query string
+     *
+     * @param string $pattern      The pattern to match
+     * @param array  $defaults     An array of default parameter values
+     * @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())
+    {
+        $this->pattern = trim($pattern);
+        $this->defaults = $defaults;
+        $this->requirements = $requirements;
+        $this->options = $options;
+    }
+
+    /**
+     * Serializes the current instance for php 7.4+.
+     *
+     * @return array
+     */
+    public function __serialize()
+    {
+        // always serialize compiled routes
+        $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);
+    }
+
+    /**
+     * Unserializes a sfRoute instance for php 7.4+.
+     *
+     * @param array $data
+     */
+    public function __unserialize($data)
+    {
+        list($this->tokens, $this->defaultOptions, $this->options, $this->pattern, $this->staticPrefix, $this->regex, $this->variables, $this->defaults, $this->requirements, $this->suffix, $this->customToken) = $data;
+
+        $this->compiled = true;
+    }
+
+    /**
+     * Binds the current route for a given context and parameters.
+     *
+     * @param array $context    The context
+     * @param array $parameters The parameters
+     */
+    public function bind($context, $parameters)
+    {
+        $this->isBound = true;
+        $this->context = $context;
+        $this->parameters = $parameters;
+    }
+
+    /**
+     * Returns true if the route is bound to context and parameters.
+     *
+     * @return bool true if theroute is bound to context and parameters, false otherwise
+     */
+    public function isBound()
+    {
+        return $this->isBound;
+    }
+
+    /**
+     * Returns an array of parameters if the URL matches this route, false otherwise.
+     *
+     * @param string $url     The URL
+     * @param array  $context The context
+     *
+     * @return array|bool An array of parameters or false if not matching
+     */
+    public function matchesUrl($url, $context = array())
+    {
+        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)) {
+            return false;
+        }
+        if (!preg_match($this->regex, $url, $matches)) {
+            return false;
+        }
+
+        $defaults = array_merge($this->getDefaultParameters(), $this->defaults);
+        $parameters = array();
+
+        // *
+        if (isset($matches['_star'])) {
+            $parameters = $this->parseStarParameter($matches['_star']);
+            unset($matches['_star'], $parameters['module'], $parameters['action']);
+        }
+
+        // defaults
+        $parameters = $this->mergeArrays($defaults, $parameters);
+
+        // variables
+        foreach ($matches as $key => $value) {
+            if (!is_int($key)) {
+                $parameters[$key] = urldecode($value);
+            }
+        }
+
+        return $parameters;
     }
 
-    if (!is_array($params))
+    /**
+     * Returns true if the parameters matches this route, false otherwise.
+     *
+     * @param mixed $params  The parameters
+     * @param array $context The context
+     *
+     * @return bool true if the parameters matches this route, false otherwise
+     */
+    public function matchesParameters($params, $context = array())
     {
-      return false;
-    }
+        if (!$this->compiled) {
+            $this->compile();
+        }
 
-    $defaults = $this->mergeArrays($this->getDefaultParameters(), $this->defaults);
-    $tparams = $this->mergeArrays($defaults, $params);
+        if (!is_array($params)) {
+            return false;
+        }
 
-    // all $variables must be defined in the $tparams array
-    if (array_diff_key($this->variables, $tparams))
-    {
-      return false;
+        $defaults = $this->mergeArrays($this->getDefaultParameters(), $this->defaults);
+        $tparams = $this->mergeArrays($defaults, $params);
+
+        // all $variables must be defined in the $tparams array
+        if (array_diff_key($this->variables, $tparams)) {
+            return false;
+        }
+
+        // check requirements
+        foreach (array_keys($this->variables) as $variable) {
+            if (!$tparams[$variable]) {
+                continue;
+            }
+
+            if (!preg_match('#'.$this->requirements[$variable].'#', $tparams[$variable])) {
+                return false;
+            }
+        }
+
+        // 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)) {
+                return false;
+            }
+        }
+
+        // check that $params does not override a default value that is not a variable
+        foreach ($defaults as $key => $value) {
+            if (!isset($this->variables[$key]) && $tparams[$key] != $value) {
+                return false;
+            }
+        }
+
+        return true;
     }
 
-    // check requirements
-    foreach (array_keys($this->variables) as $variable)
+    /**
+     * Generates a URL from the given parameters.
+     *
+     * @param mixed $params   The parameter values
+     * @param array $context  The context
+     * @param bool  $absolute Whether to generate an absolute URL
+     *
+     * @return string The generated URL
+     */
+    public function generate($params, $context = array(), $absolute = false)
     {
-      if (!$tparams[$variable])
-      {
-        continue;
-      }
+        if (!$this->compiled) {
+            $this->compile();
+        }
 
-      if (!preg_match('#'.$this->requirements[$variable].'#', $tparams[$variable]))
-      {
-        return false;
-      }
+        $url = $this->pattern;
+
+        $defaults = $this->mergeArrays($this->getDefaultParameters(), $this->defaults);
+        $tparams = $this->mergeArrays($defaults, $params);
+
+        // 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)));
+        }
+
+        if ($this->options['generate_shortest_url'] || $this->customToken) {
+            $url = $this->generateWithTokens($tparams);
+        } else {
+            // replace variables
+            $variables = $this->variables;
+            uasort($variables, array('sfRoute', 'generateCompareVarsByStrlen'));
+            foreach ($variables as $variable => $value) {
+                $url = str_replace($value, urlencode($tparams[$variable]), $url);
+            }
+
+            if (!in_array($this->suffix, $this->options['segment_separators'])) {
+                $url .= $this->suffix;
+            }
+        }
+
+        // replace extra parameters if the route contains *
+        $url = $this->generateStarParameter($url, $defaults, $tparams);
+
+        if ($this->options['extra_parameters_as_query_string'] && !$this->hasStarParameter()) {
+            // add a query string if needed
+            if ($extra = array_diff_key($params, $this->variables, $defaults)) {
+                $url .= '?'.http_build_query($extra);
+            }
+        }
+
+        return $url;
     }
 
-    // all $params must be in $variables or $defaults if there is no * in route
-    if (!$this->options['extra_parameters_as_query_string'])
+    /**
+     * Returns the route parameters.
+     *
+     * @return array The route parameters
+     */
+    public function getParameters()
     {
-      if (false === strpos($this->regex, '<_star>') && array_diff_key($params, $this->variables, $defaults))
-      {
-        return false;
-      }
+        if (!$this->compiled) {
+            $this->compile();
+        }
+
+        return $this->parameters;
     }
 
-    // check that $params does not override a default value that is not a variable
-    foreach ($defaults as $key => $value)
+    /**
+     * Returns the compiled pattern.
+     *
+     * @return string The compiled pattern
+     */
+    public function getPattern()
     {
-      if (!isset($this->variables[$key]) && $tparams[$key] != $value)
-      {
-        return false;
-      }
-    }
-
-    return true;
-  }
-
-  /**
-   * Generates a URL from the given parameters.
-   *
-   * @param  mixed   $params    The parameter values
-   * @param  array   $context   The context
-   * @param  Boolean $absolute  Whether to generate an absolute URL
-   *
-   * @return string The generated URL
-   */
-  public function generate($params, $context = array(), $absolute = false)
-  {
-    if (!$this->compiled)
-    {
-      $this->compile();
-    }
-
-    $url = $this->pattern;
-
-    $defaults = $this->mergeArrays($this->getDefaultParameters(), $this->defaults);
-    $tparams = $this->mergeArrays($defaults, $params);
-
-    // 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)));
-    }
-
-    if ($this->options['generate_shortest_url'] || $this->customToken)
-    {
-      $url = $this->generateWithTokens($tparams);
-    }
-    else
-    {
-      // replace variables
-      $variables = $this->variables;
-      uasort($variables, array('sfRoute', 'generateCompareVarsByStrlen'));
-      foreach ($variables as $variable => $value)
-      {
-        $url = str_replace($value, urlencode($tparams[$variable]), $url);
-      }
-
-      if(!in_array($this->suffix, $this->options['segment_separators']))
-      {
-        $url .= $this->suffix;
-      }
-    }
-
-    // replace extra parameters if the route contains *
-    $url = $this->generateStarParameter($url, $defaults, $tparams);
-
-    if ($this->options['extra_parameters_as_query_string'] && !$this->hasStarParameter())
-    {
-      // add a query string if needed
-      if ($extra = array_diff_key($params, $this->variables, $defaults))
-      {
-        $url .= '?'.http_build_query($extra);
-      }
-    }
-
-    return $url;
-  }
-
-  static private function generateCompareVarsByStrlen($a, $b)
-  {
-    return (strlen($a) < strlen($b)) ? 1 : -1;
-  }
-
-  /**
-   * Generates a URL for the given parameters by using the route tokens.
-   *
-   * @param array $parameters An array of parameters
-   *
-   * @return string
-   */
-  protected function generateWithTokens($parameters)
-  {
-    $url = array();
-    $optional = $this->options['generate_shortest_url'];
-    $first = true;
-    $tokens = array_reverse($this->tokens);
-    foreach ($tokens as $token)
-    {
-      switch ($token[0])
-      {
-        case 'variable':
-          if (!$optional || !isset($this->defaults[$token[3]]) || (isset($parameters[$token[3]]) && $parameters[$token[3]] != $this->defaults[$token[3]]))
-          {
-            $url[] = urlencode($parameters[$token[3]]);
-            $optional = false;
-          }
-          break;
-        case 'text':
-          $url[] = $token[2];
-          $optional = false;
-          break;
-        case 'separator':
-          if (false === $optional || $first)
-          {
-            $url[] = $token[2];
-          }
-          break;
-        default:
-          // handle custom tokens
-          if ($segment = call_user_func_array(array($this, 'generateFor'.ucfirst(array_shift($token))), array_merge(array($optional, $parameters), $token)))
-          {
-            $url[] = $segment;
-            $optional = false;
-          }
-          break;
-      }
+        if (!$this->compiled) {
+            $this->compile();
+        }
 
-      $first = false;
+        return $this->pattern;
     }
 
-    $url = implode('', array_reverse($url));
-    if (!$url)
-    {
-      $url = '/';
-    }
-
-    return $url;
-  }
-
-  /**
-   * Returns the route parameters.
-   *
-   * @return array The route parameters
-   */
-  public function getParameters()
-  {
-    if (!$this->compiled)
-    {
-      $this->compile();
-    }
-
-    return $this->parameters;
-  }
-
-  /**
-   * Returns the compiled pattern.
-   *
-   * @return string The compiled pattern
-   */
-  public function getPattern()
-  {
-    if (!$this->compiled)
-    {
-      $this->compile();
-    }
-
-    return $this->pattern;
-  }
-
-  /**
-   * Returns the compiled regex.
-   *
-   * @return string The compiled regex
-   */
-  public function getRegex()
-  {
-    if (!$this->compiled)
-    {
-      $this->compile();
-    }
-
-    return $this->regex;
-  }
-
-  /**
-   * Returns the compiled tokens.
-   *
-   * @return array The compiled tokens
-   */
-  public function getTokens()
-  {
-    if (!$this->compiled)
+    /**
+     * Returns the compiled regex.
+     *
+     * @return string The compiled regex
+     */
+    public function getRegex()
     {
-      $this->compile();
-    }
+        if (!$this->compiled) {
+            $this->compile();
+        }
 
-    return $this->tokens;
-  }
+        return $this->regex;
+    }
 
-  /**
-   * Returns the compiled options.
-   *
-   * @return array The compiled options
-   */
-  public function getOptions()
-  {
-    if (!$this->compiled)
+    /**
+     * Returns the compiled tokens.
+     *
+     * @return array The compiled tokens
+     */
+    public function getTokens()
     {
-      $this->compile();
-    }
+        if (!$this->compiled) {
+            $this->compile();
+        }
 
-    return $this->options;
-  }
+        return $this->tokens;
+    }
 
-  /**
-   * Returns the compiled variables.
-   *
-   * @return array The compiled variables
-   */
-  public function getVariables()
-  {
-    if (!$this->compiled)
+    /**
+     * Returns the compiled options.
+     *
+     * @return array The compiled options
+     */
+    public function getOptions()
     {
-      $this->compile();
-    }
+        if (!$this->compiled) {
+            $this->compile();
+        }
 
-    return $this->variables;
-  }
+        return $this->options;
+    }
 
-  /**
-   * Returns the compiled defaults.
-   *
-   * @return array The compiled defaults
-   */
-  public function getDefaults()
-  {
-    if (!$this->compiled)
+    /**
+     * Returns the compiled variables.
+     *
+     * @return array The compiled variables
+     */
+    public function getVariables()
     {
-      $this->compile();
-    }
+        if (!$this->compiled) {
+            $this->compile();
+        }
 
-    return $this->defaults;
-  }
+        return $this->variables;
+    }
 
-  /**
-   * Returns the compiled requirements.
-   *
-   * @return array The compiled requirements
-   */
-  public function getRequirements()
-  {
-    if (!$this->compiled)
+    /**
+     * Returns the compiled defaults.
+     *
+     * @return array The compiled defaults
+     */
+    public function getDefaults()
     {
-      $this->compile();
-    }
+        if (!$this->compiled) {
+            $this->compile();
+        }
 
-    return $this->requirements;
-  }
+        return $this->defaults;
+    }
 
-  /**
-   * Compiles the current route instance.
-   */
-  public function compile()
-  {
-    if ($this->compiled)
+    /**
+     * Returns the compiled requirements.
+     *
+     * @return array The compiled requirements
+     */
+    public function getRequirements()
     {
-      return;
+        if (!$this->compiled) {
+            $this->compile();
+        }
+
+        return $this->requirements;
     }
 
-    $this->initializeOptions();
-    $this->fixRequirements();
-    $this->fixDefaults();
-    $this->fixSuffix();
+    /**
+     * Compiles the current route instance.
+     */
+    public function compile()
+    {
+        if ($this->compiled) {
+            return;
+        }
 
-    $this->compiled = true;
-    $this->firstOptional = 0;
-    $this->segments = array();
+        $this->initializeOptions();
+        $this->fixRequirements();
+        $this->fixDefaults();
+        $this->fixSuffix();
 
-    $this->preCompile();
+        $this->compiled = true;
+        $this->firstOptional = 0;
+        $this->segments = array();
 
-    $this->tokenize();
+        $this->preCompile();
 
-    // parse
-    foreach ($this->tokens as $token)
-    {
-      call_user_func_array(array($this, 'compileFor'.ucfirst(array_shift($token))), $token);
-    }
+        $this->tokenize();
+
+        // parse
+        foreach ($this->tokens as $token) {
+            call_user_func_array(array($this, 'compileFor'.ucfirst(array_shift($token))), $token);
+        }
 
-    $this->postCompile();
+        $this->postCompile();
 
-    $separator = '';
-    if (count($this->tokens))
+        $separator = '';
+        if (count($this->tokens)) {
+            $lastToken = $this->tokens[count($this->tokens) - 1];
+            $separator = 'separator' == $lastToken[0] ? $lastToken[2] : '';
+        }
+
+        $this->regex = '#^'.implode('', $this->segments).''.preg_quote($separator, '#').'$#x';
+    }
+
+    public function getDefaultParameters()
     {
-      $lastToken = $this->tokens[count($this->tokens) - 1];
-      $separator = 'separator' == $lastToken[0] ? $lastToken[2] : '';
+        return $this->defaultParameters;
     }
 
-    $this->regex = "#^".implode("", $this->segments)."".preg_quote($separator, '#')."$#x";
-  }
+    public function setDefaultParameters($parameters)
+    {
+        $this->defaultParameters = $parameters;
+    }
 
-  /**
-   * Pre-compiles a route.
-   */
-  protected function preCompile()
-  {
-    // a route must start with a slash
-    if (empty($this->pattern) || '/' != $this->pattern[0])
+    public function getDefaultOptions()
     {
-      $this->pattern = '/'.$this->pattern;
+        return $this->defaultOptions;
     }
-  }
 
-  /**
-   * Post-compiles a route.
-   */
-  protected function postCompile()
-  {
-    // all segments after the last static segment are optional
-    // be careful, the n-1 is optional only if n is empty
-    for ($i = $this->firstOptional, $max = count($this->segments); $i < $max; $i++)
+    public function setDefaultOptions($options)
     {
-      $this->segments[$i] = (0 == $i ? '/?' : '').str_repeat(' ', $i - $this->firstOptional).'(?:'.$this->segments[$i];
-      $this->segments[] = str_repeat(' ', $max - $i - 1).')?';
+        $this->defaultOptions = $options;
     }
 
-    $this->staticPrefix = '';
-    foreach ($this->tokens as $token)
+    public function serialize()
     {
-      switch ($token[0])
-      {
-        case 'separator':
-          break;
-        case 'text':
-          if ($token[2] !== '*')
-          {
-            // non-star text is static
-            $this->staticPrefix .= $token[1].$token[2];
-            break;
-          }
-        default:
-          // everything else indicates variable parts. break switch and for loop
-          break 2;
-      }
+        return serialize($this->__serialize());
     }
-  }
 
-  /**
-   * Tokenizes the route.
-   */
-  protected function tokenize()
-  {
-    $this->tokens = array();
-    $buffer = $this->pattern;
-    $afterASeparator = false;
-    $currentSeparator = '';
+    public function unserialize($serialized)
+    {
+        $array = unserialize($serialized);
+
+        $this->__unserialize($array);
+    }
 
-    // a route is an array of (separator + variable) or (separator + text) segments
-    while (strlen($buffer))
+    /**
+     * Generates a URL for the given parameters by using the route tokens.
+     *
+     * @param array $parameters An array of parameters
+     *
+     * @return string
+     */
+    protected function generateWithTokens($parameters)
     {
-      if (false !== $this->tokenizeBufferBefore($buffer, $this->tokens, $afterASeparator, $currentSeparator))
-      {
-        // a custom token
-        $this->customToken = true;
-      }
-      else if ($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]);
+        $url = array();
+        $optional = $this->options['generate_shortest_url'];
+        $first = true;
+        $tokens = array_reverse($this->tokens);
+        foreach ($tokens as $token) {
+            switch ($token[0]) {
+                case 'variable':
+                    if (!$optional || !isset($this->defaults[$token[3]]) || (isset($parameters[$token[3]]) && $parameters[$token[3]] != $this->defaults[$token[3]])) {
+                        $url[] = urlencode($parameters[$token[3]]);
+                        $optional = false;
+                    }
 
-        $currentSeparator = '';
-        $buffer = substr($buffer, strlen($match[0]));
-        $afterASeparator = false;
-      }
-      else if ($afterASeparator && preg_match('#^('.$this->options['text_regex'].')(?:'.$this->options['segment_separators_regex'].'|$)#', $buffer, $match))
-      {
-        // a text
-        $this->tokens[] = array('text', $currentSeparator, $match[1], null);
+                    break;
 
-        $currentSeparator = '';
-        $buffer = substr($buffer, strlen($match[1]));
-        $afterASeparator = false;
-      }
-      else if (!$afterASeparator && preg_match('#^/|^'.$this->options['segment_separators_regex'].'#', $buffer, $match))
-      {
-        // beginning of URL (^/) or a separator
-        $this->tokens[] = array('separator', $currentSeparator, $match[0], null);
-
-        $currentSeparator = $match[0];
-        $buffer = substr($buffer, strlen($match[0]));
-        $afterASeparator = true;
-      }
-      else if (false !== $this->tokenizeBufferAfter($buffer, $this->tokens, $afterASeparator, $currentSeparator))
-      {
-        // a custom token
-        $this->customToken = true;
-      }
-      else
-      {
-        // parsing problem
-        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);
-    }
-
-  }
-
-  /**
-   * Tokenizes the buffer before default logic is applied.
-   *
-   * This method must return false if the buffer has not been parsed.
-   *
-   * @param string   $buffer           The current route buffer
-   * @param array    $tokens           An array of current tokens
-   * @param Boolean  $afterASeparator  Whether the buffer is just after a separator
-   * @param string   $currentSeparator The last matched separator
-   *
-   * @return Boolean true if a token has been generated, false otherwise
-   */
-  protected function tokenizeBufferBefore(&$buffer, &$tokens, &$afterASeparator, &$currentSeparator)
-  {
-    return false;
-  }
-
-  /**
-   * Tokenizes the buffer after default logic is applied.
-   *
-   * This method must return false if the buffer has not been parsed.
-   *
-   * @param string   $buffer           The current route buffer
-   * @param array    $tokens           An array of current tokens
-   * @param Boolean  $afterASeparator  Whether the buffer is just after a separator
-   * @param string   $currentSeparator The last matched separator
-   *
-   * @return Boolean true if a token has been generated, false otherwise
-   */
-  protected function tokenizeBufferAfter(&$buffer, &$tokens, &$afterASeparator, &$currentSeparator)
-  {
-    return false;
-  }
-
-  protected function compileForText($separator, $text)
-  {
-    if ('*' == $text)
-    {
-      $this->segments[] = '(?:'.preg_quote($separator, '#').'(?P<_star>.*))?';
-    }
-    else
-    {
-      $this->firstOptional = count($this->segments) + 1;
-
-      $this->segments[] = preg_quote($separator, '#').preg_quote($text, '#');
-    }
-  }
-
-  protected function compileForVariable($separator, $name, $variable)
-  {
-    if (!isset($this->requirements[$variable]))
-    {
-      $this->requirements[$variable] = $this->options['variable_content_regex'];
-    }
-
-    $this->segments[] = preg_quote($separator, '#').'(?P<'.$variable.'>'.$this->requirements[$variable].')';
-    $this->variables[$variable] = $name;
-
-    if (!isset($this->defaults[$variable]))
-    {
-      $this->firstOptional = count($this->segments);
-    }
-  }
-
-  protected function compileForSeparator($separator, $regexSeparator)
-  {
-  }
-
-  public function getDefaultParameters()
-  {
-    return $this->defaultParameters;
-  }
+                case 'text':
+                    $url[] = $token[2];
+                    $optional = false;
 
-  public function setDefaultParameters($parameters)
-  {
-    $this->defaultParameters = $parameters;
-  }
+                    break;
 
-  public function getDefaultOptions()
-  {
-    return $this->defaultOptions;
-  }
+                case 'separator':
+                    if (false === $optional || $first) {
+                        $url[] = $token[2];
+                    }
 
-  public function setDefaultOptions($options)
-  {
-    $this->defaultOptions = $options;
-  }
+                    break;
 
-  protected function initializeOptions()
-  {
-    $this->options = array_merge(array(
-      'suffix'                           => '',
-      'variable_prefixes'                => array(':'),
-      'segment_separators'               => array('/', '.'),
-      'variable_regex'                   => '[\w\d_]+',
-      'text_regex'                       => '.+?',
-      'generate_shortest_url'            => true,
-      'extra_parameters_as_query_string' => true,
-    ), $this->getDefaultOptions(), $this->options);
+                default:
+                    // handle custom tokens
+                    if ($segment = call_user_func_array(array($this, 'generateFor'.ucfirst(array_shift($token))), array_merge(array($optional, $parameters), $token))) {
+                        $url[] = $segment;
+                        $optional = false;
+                    }
 
-    $preg_quote_hash = function($a) { return preg_quote($a, '#'); };
+                    break;
+            }
 
-    // compute some regexes
-    $this->options['variable_prefix_regex'] = '(?:'.implode('|', array_map($preg_quote_hash, $this->options['variable_prefixes'])).')';
+            $first = false;
+        }
 
-    if (count($this->options['segment_separators']))
-    {
-      $this->options['segment_separators_regex'] = '(?:'.implode('|', array_map($preg_quote_hash, $this->options['segment_separators'])).')';
+        $url = implode('', array_reverse($url));
+        if (!$url) {
+            $url = '/';
+        }
 
-      // as of PHP 5.3.0, preg_quote automatically quotes dashes "-" (see http://bugs.php.net/bug.php?id=47229)
-      $preg_quote_hash_53 = function($a) { return str_replace('-', '\-', preg_quote($a, '#')); };
-      $this->options['variable_content_regex'] = '[^'.implode('',
-          array_map(version_compare(PHP_VERSION, '5.3.0RC4', '>=') ? $preg_quote_hash : $preg_quote_hash_53, $this->options['segment_separators'])
-        ).']+';
+        return $url;
     }
-    else
+
+    /**
+     * Pre-compiles a route.
+     */
+    protected function preCompile()
     {
-      // use simplified regexes for case where no separators are used
-      $this->options['segment_separators_regex'] = '()';
-      $this->options['variable_content_regex']   = '.+';
+        // a route must start with a slash
+        if (empty($this->pattern) || '/' != $this->pattern[0]) {
+            $this->pattern = '/'.$this->pattern;
+        }
     }
-  }
 
-  protected function parseStarParameter($star)
-  {
-    $parameters = array();
-    $tmp = explode('/', $star);
-    for ($i = 0, $max = count($tmp); $i < $max; $i += 2)
+    /**
+     * Post-compiles a route.
+     */
+    protected function postCompile()
     {
-      //dont allow a param name to be empty - #4173
-      if (!empty($tmp[$i]))
-      {
-        $parameters[$tmp[$i]] = isset($tmp[$i + 1]) ? urldecode($tmp[$i + 1]) : true;
-      }
+        // all segments after the last static segment are optional
+        // be careful, the n-1 is optional only if n is empty
+        for ($i = $this->firstOptional, $max = count($this->segments); $i < $max; ++$i) {
+            $this->segments[$i] = (0 == $i ? '/?' : '').str_repeat(' ', $i - $this->firstOptional).'(?:'.$this->segments[$i];
+            $this->segments[] = str_repeat(' ', $max - $i - 1).')?';
+        }
+
+        $this->staticPrefix = '';
+        foreach ($this->tokens as $token) {
+            switch ($token[0]) {
+                case 'separator':
+                    break;
+
+                case 'text':
+                    if ('*' !== $token[2]) {
+                        // non-star text is static
+                        $this->staticPrefix .= $token[1].$token[2];
+
+                        break;
+                    }
+                    // no break
+                default:
+                    // everything else indicates variable parts. break switch and for loop
+                    break 2;
+            }
+        }
     }
 
-    return $parameters;
-  }
+    /**
+     * Tokenizes the route.
+     */
+    protected function tokenize()
+    {
+        $this->tokens = array();
+        $buffer = $this->pattern;
+        $afterASeparator = false;
+        $currentSeparator = '';
 
-  protected function hasStarParameter()
-  {
-    return false !== strpos($this->regex, '<_star>');
-  }
+        // a route is an array of (separator + variable) or (separator + text) segments
+        while (strlen($buffer)) {
+            if (false !== $this->tokenizeBufferBefore($buffer, $this->tokens, $afterASeparator, $currentSeparator)) {
+                // a custom token
+                $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]);
+
+                $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);
+
+                $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);
+
+                $currentSeparator = $match[0];
+                $buffer = substr($buffer, strlen($match[0]));
+                $afterASeparator = true;
+            } elseif (false !== $this->tokenizeBufferAfter($buffer, $this->tokens, $afterASeparator, $currentSeparator)) {
+                // a custom token
+                $this->customToken = true;
+            } else {
+                // parsing problem
+                throw new InvalidArgumentException(sprintf('Unable to parse "%s" route near "%s".', $this->pattern, $buffer));
+            }
+        }
 
-  protected function generateStarParameter($url, $defaults, $parameters)
-  {
-    if (false === strpos($this->regex, '<_star>'))
-    {
-      return $url;
+        // check for suffix
+        if ($this->suffix) {
+            // treat as a separator
+            $this->tokens[] = array('separator', $currentSeparator, $this->suffix);
+        }
     }
 
-    $tmp = array();
-    foreach (array_diff_key($parameters, $this->variables, $defaults) as $key => $value)
+    /**
+     * Tokenizes the buffer before default logic is applied.
+     *
+     * This method must return false if the buffer has not been parsed.
+     *
+     * @param string $buffer           The current route buffer
+     * @param array  $tokens           An array of current tokens
+     * @param bool   $afterASeparator  Whether the buffer is just after a separator
+     * @param string $currentSeparator The last matched separator
+     *
+     * @return bool true if a token has been generated, false otherwise
+     */
+    protected function tokenizeBufferBefore(&$buffer, &$tokens, &$afterASeparator, &$currentSeparator)
     {
-      if (is_array($value))
-      {
-        foreach ($value as $v)
-        {
-          $tmp[] = $key.'='.urlencode($v);
-        }
-      }
-      else
-      {
-        $tmp[] = urlencode($key).'/'.urlencode($value);
-      }
+        return false;
     }
-    $tmp = implode('/', $tmp);
-    if ($tmp)
+
+    /**
+     * Tokenizes the buffer after default logic is applied.
+     *
+     * This method must return false if the buffer has not been parsed.
+     *
+     * @param string $buffer           The current route buffer
+     * @param array  $tokens           An array of current tokens
+     * @param bool   $afterASeparator  Whether the buffer is just after a separator
+     * @param string $currentSeparator The last matched separator
+     *
+     * @return bool true if a token has been generated, false otherwise
+     */
+    protected function tokenizeBufferAfter(&$buffer, &$tokens, &$afterASeparator, &$currentSeparator)
     {
-      $tmp = '/'.$tmp;
+        return false;
     }
 
-    return preg_replace('#'.$this->options['segment_separators_regex'].'\*('.$this->options['segment_separators_regex'].'|$)#', "$tmp$1", $url);
-  }
-
-  protected function mergeArrays($arr1, $arr2)
-  {
-    foreach ($arr2 as $key => $value)
+    protected function compileForText($separator, $text)
     {
-      $arr1[$key] = $value;
+        if ('*' == $text) {
+            $this->segments[] = '(?:'.preg_quote($separator, '#').'(?P<_star>.*))?';
+        } else {
+            $this->firstOptional = count($this->segments) + 1;
+
+            $this->segments[] = preg_quote($separator, '#').preg_quote($text, '#');
+        }
     }
 
-    return $arr1;
-  }
+    protected function compileForVariable($separator, $name, $variable)
+    {
+        if (!isset($this->requirements[$variable])) {
+            $this->requirements[$variable] = $this->options['variable_content_regex'];
+        }
+
+        $this->segments[] = preg_quote($separator, '#').'(?P<'.$variable.'>'.$this->requirements[$variable].')';
+        $this->variables[$variable] = $name;
 
-  protected function fixDefaults()
-  {
-    foreach ($this->defaults as $key => $value)
+        if (!isset($this->defaults[$variable])) {
+            $this->firstOptional = count($this->segments);
+        }
+    }
+
+    protected function compileForSeparator($separator, $regexSeparator)
     {
-      if (ctype_digit($key))
-      {
-        $this->defaults[$value] = true;
-      }
-      else
-      {
-        $this->defaults[$key] = urldecode((string) $value);
-      }
     }
-  }
 
-  protected function fixRequirements()
-  {
-    foreach ($this->requirements as $key => $regex)
+    protected function initializeOptions()
     {
-      if (!is_string($regex))
-      {
-        continue;
-      }
+        $this->options = array_merge(array(
+            'suffix' => '',
+            'variable_prefixes' => array(':'),
+            'segment_separators' => array('/', '.'),
+            'variable_regex' => '[\w\d_]+',
+            'text_regex' => '.+?',
+            'generate_shortest_url' => true,
+            'extra_parameters_as_query_string' => true,
+        ), $this->getDefaultOptions(), $this->options);
+
+        $preg_quote_hash = function ($a) { return preg_quote($a, '#'); };
 
-      if ('^' == $regex[0])
-      {
-        $regex = substr($regex, 1);
-      }
-      if ('$' == substr($regex, -1))
-      {
-        $regex = substr($regex, 0, -1);
-      }
+        // compute some regexes
+        $this->options['variable_prefix_regex'] = '(?:'.implode('|', array_map($preg_quote_hash, $this->options['variable_prefixes'])).')';
 
-      $this->requirements[$key] = $regex;
+        if (count($this->options['segment_separators'])) {
+            $this->options['segment_separators_regex'] = '(?:'.implode('|', array_map($preg_quote_hash, $this->options['segment_separators'])).')';
+
+            // as of PHP 5.3.0, preg_quote automatically quotes dashes "-" (see http://bugs.php.net/bug.php?id=47229)
+            $preg_quote_hash_53 = function ($a) { return str_replace('-', '\-', preg_quote($a, '#')); };
+            $this->options['variable_content_regex'] = '[^'.implode(
+                '',
+                array_map(version_compare(PHP_VERSION, '5.3.0RC4', '>=') ? $preg_quote_hash : $preg_quote_hash_53, $this->options['segment_separators'])
+            ).']+';
+        } else {
+            // use simplified regexes for case where no separators are used
+            $this->options['segment_separators_regex'] = '()';
+            $this->options['variable_content_regex'] = '.+';
+        }
     }
-  }
 
-  protected function fixSuffix()
-  {
-    $length = strlen($this->pattern);
+    protected function parseStarParameter($star)
+    {
+        $parameters = array();
+        $tmp = explode('/', $star);
+        for ($i = 0, $max = count($tmp); $i < $max; $i += 2) {
+            // dont allow a param name to be empty - #4173
+            if (!empty($tmp[$i])) {
+                $parameters[$tmp[$i]] = isset($tmp[$i + 1]) ? urldecode($tmp[$i + 1]) : true;
+            }
+        }
+
+        return $parameters;
+    }
 
-    if ($length > 0 && '/' == $this->pattern[$length - 1])
+    protected function hasStarParameter()
     {
-      // route ends by / (directory)
-      $this->suffix = '/';
+        return false !== strpos($this->regex, '<_star>');
     }
-    else if ($length > 0 && '.' == $this->pattern[$length - 1])
+
+    protected function generateStarParameter($url, $defaults, $parameters)
     {
-      // route ends by . (no suffix)
-      $this->suffix = '';
-      $this->pattern = substr($this->pattern, 0, $length - 1);
+        if (false === strpos($this->regex, '<_star>')) {
+            return $url;
+        }
+
+        $tmp = array();
+        foreach (array_diff_key($parameters, $this->variables, $defaults) as $key => $value) {
+            if (is_array($value)) {
+                foreach ($value as $v) {
+                    $tmp[] = $key.'='.urlencode($v);
+                }
+            } else {
+                $tmp[] = urlencode($key).'/'.urlencode($value);
+            }
+        }
+        $tmp = implode('/', $tmp);
+        if ($tmp) {
+            $tmp = '/'.$tmp;
+        }
+
+        return preg_replace('#'.$this->options['segment_separators_regex'].'\*('.$this->options['segment_separators_regex'].'|$)#', "{$tmp}$1", $url);
     }
-    else if (preg_match('#\.(?:'.$this->options['variable_prefix_regex'].$this->options['variable_regex'].'|'.$this->options['variable_content_regex'].')$#i', $this->pattern))
+
+    protected function mergeArrays($arr1, $arr2)
     {
-      // specific suffix for this route
-      // a . with a variable after or some chars without any separators
-      $this->suffix = '';
+        foreach ($arr2 as $key => $value) {
+            $arr1[$key] = $value;
+        }
+
+        return $arr1;
     }
-    else
+
+    protected function fixDefaults()
     {
-      $this->suffix = $this->options['suffix'];
+        foreach ($this->defaults as $key => $value) {
+            if (ctype_digit($key)) {
+                $this->defaults[$value] = true;
+            } else {
+                $this->defaults[$key] = urldecode((string) $value);
+            }
+        }
     }
-  }
 
-  public function serialize()
-  {
-    return serialize($this->__serialize());
-  }
+    protected function fixRequirements()
+    {
+        foreach ($this->requirements as $key => $regex) {
+            if (!is_string($regex)) {
+                continue;
+            }
+
+            if ('^' == $regex[0]) {
+                $regex = substr($regex, 1);
+            }
+            if ('$' == substr($regex, -1)) {
+                $regex = substr($regex, 0, -1);
+            }
 
-  public function unserialize($serialized)
-  {
-    $array = unserialize($serialized);
+            $this->requirements[$key] = $regex;
+        }
+    }
 
-    $this->__unserialize($array);
-  }
+    protected function fixSuffix()
+    {
+        $length = strlen($this->pattern);
 
-  /**
-   * Serializes the current instance for php 7.4+
-   *
-   * @return array
-   */
-  public function __serialize()
-  {
-    // always serialize compiled routes
-    $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);
-  }
+        if ($length > 0 && '/' == $this->pattern[$length - 1]) {
+            // route ends by / (directory)
+            $this->suffix = '/';
+        } elseif ($length > 0 && '.' == $this->pattern[$length - 1]) {
+            // route ends by . (no suffix)
+            $this->suffix = '';
+            $this->pattern = substr($this->pattern, 0, $length - 1);
+        } elseif (preg_match('#\.(?:'.$this->options['variable_prefix_regex'].$this->options['variable_regex'].'|'.$this->options['variable_content_regex'].')$#i', $this->pattern)) {
+            // specific suffix for this route
+            // a . with a variable after or some chars without any separators
+            $this->suffix = '';
+        } else {
+            $this->suffix = $this->options['suffix'];
+        }
+    }
 
-  /**
-   * Unserializes a sfRoute instance for php 7.4+
-   *
-   * @param array $data
-   */
-  public function __unserialize($data)
-  {
-    list($this->tokens, $this->defaultOptions, $this->options, $this->pattern, $this->staticPrefix, $this->regex, $this->variables, $this->defaults, $this->requirements, $this->suffix, $this->customToken) = $data;
-
-    $this->compiled = true;
-  }
+    private static function generateCompareVarsByStrlen($a, $b)
+    {
+        return (strlen($a) < strlen($b)) ? 1 : -1;
+    }
 }
diff --git a/lib/routing/sfRouteCollection.class.php b/lib/routing/sfRouteCollection.class.php
index f95d2dbbb..0eb4e28c8 100644
--- a/lib/routing/sfRouteCollection.class.php
+++ b/lib/routing/sfRouteCollection.class.php
@@ -11,105 +11,102 @@
 /**
  * sfRouteCollection represents a collection of routes.
  *
- * @package    symfony
- * @subpackage routing
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfRouteCollection implements Iterator
 {
-  protected
-    $count   = 0,
-    $options = array(),
-    $routes  = array();
+    protected $count = 0;
+    protected $options = array();
+    protected $routes = array();
 
-  /**
-   * Constructor.
-   *
-   * @param array $options An array of options
-   */
-  public function __construct(array $options)
-  {
-    if (!isset($options['name']))
+    /**
+     * Constructor.
+     *
+     * @param array $options An array of options
+     */
+    public function __construct(array $options)
     {
-      throw new InvalidArgumentException('You must pass a "name" option to sfRouteCollection');
-    }
+        if (!isset($options['name'])) {
+            throw new InvalidArgumentException('You must pass a "name" option to sfRouteCollection');
+        }
 
-    $this->options = $options;
-  }
+        $this->options = $options;
+    }
 
-  /**
-   * Returns the routes.
-   *
-   * @return array The routes
-   */
-  public function getRoutes()
-  {
-    return $this->routes;
-  }
+    /**
+     * Returns the routes.
+     *
+     * @return array The routes
+     */
+    public function getRoutes()
+    {
+        return $this->routes;
+    }
 
-  /**
-   * Returns the options.
-   *
-   * @return array The options
-   */
-  public function getOptions()
-  {
-    return $this->options;
-  }
+    /**
+     * Returns the options.
+     *
+     * @return array The options
+     */
+    public function getOptions()
+    {
+        return $this->options;
+    }
 
-  /**
-   * Reset the error array to the beginning (implements the Iterator interface).
-   */
-  #[\ReturnTypeWillChange]
-  public function rewind()
-  {
-    reset($this->routes);
+    /**
+     * Reset the error array to the beginning (implements the Iterator interface).
+     */
+    #[\ReturnTypeWillChange]
+    public function rewind()
+    {
+        reset($this->routes);
 
-    $this->count = count($this->routes);
-  }
+        $this->count = count($this->routes);
+    }
 
-  /**
-   * Get the name of the current route (implements the Iterator interface).
-   *
-   * @return string The key
-   */
-  #[\ReturnTypeWillChange]
-  public function key()
-  {
-    return key($this->routes);
-  }
+    /**
+     * Get the name of the current route (implements the Iterator interface).
+     *
+     * @return string The key
+     */
+    #[\ReturnTypeWillChange]
+    public function key()
+    {
+        return key($this->routes);
+    }
 
-  /**
-   * Returns the current route (implements the Iterator interface).
-   *
-   * @return mixed The escaped value
-   */
-  #[\ReturnTypeWillChange]
-  public function current()
-  {
-    return current($this->routes);
-  }
+    /**
+     * Returns the current route (implements the Iterator interface).
+     *
+     * @return mixed The escaped value
+     */
+    #[\ReturnTypeWillChange]
+    public function current()
+    {
+        return current($this->routes);
+    }
 
-  /**
-   * Moves to the next route (implements the Iterator interface).
-   */
-  #[\ReturnTypeWillChange]
-  public function next()
-  {
-    next($this->routes);
+    /**
+     * Moves to the next route (implements the Iterator interface).
+     */
+    #[\ReturnTypeWillChange]
+    public function next()
+    {
+        next($this->routes);
 
-    --$this->count;
-  }
+        --$this->count;
+    }
 
-  /**
-   * Returns true if the current route is valid (implements the Iterator interface).
-   *
-   * @return boolean The validity of the current route; true if it is valid
-   */
-  #[\ReturnTypeWillChange]
-  public function valid()
-  {
-    return $this->count > 0;
-  }
+    /**
+     * Returns true if the current route is valid (implements the Iterator interface).
+     *
+     * @return bool The validity of the current route; true if it is valid
+     */
+    #[\ReturnTypeWillChange]
+    public function valid()
+    {
+        return $this->count > 0;
+    }
 }
diff --git a/lib/routing/sfRouting.class.php b/lib/routing/sfRouting.class.php
index 49cf7d9e3..d94dfa30b 100644
--- a/lib/routing/sfRouting.class.php
+++ b/lib/routing/sfRouting.class.php
@@ -11,288 +11,275 @@
 /**
  * sfRouting class controls the generation and parsing of URLs.
  *
- * @package    symfony
- * @subpackage routing
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfRouting
 {
-  /** @var sfEventDispatcher */
-  protected $dispatcher = null;
-  /** @var sfCache|null */
-  protected $cache = null;
-  protected $defaultParameters = array();
-  protected $options = array();
-
-  /**
-   * Class constructor.
-   *
-   * @see initialize()
-   *
-   * @param sfEventDispatcher $dispatcher
-   * @param sfCache           $cache
-   * @param array             $options
-   */
-  public function __construct(sfEventDispatcher $dispatcher, sfCache $cache = null, $options = array())
-  {
-    $this->initialize($dispatcher, $cache, $options);
-
-    if (!isset($this->options['auto_shutdown']) || $this->options['auto_shutdown'])
+    /** @var sfEventDispatcher */
+    protected $dispatcher;
+
+    /** @var sfCache|null */
+    protected $cache;
+    protected $defaultParameters = array();
+    protected $options = array();
+
+    /**
+     * Class constructor.
+     *
+     * @see initialize()
+     *
+     * @param sfCache $cache
+     * @param array   $options
+     */
+    public function __construct(sfEventDispatcher $dispatcher, sfCache $cache = null, $options = array())
     {
-      register_shutdown_function(array($this, 'shutdown'));
+        $this->initialize($dispatcher, $cache, $options);
+
+        if (!isset($this->options['auto_shutdown']) || $this->options['auto_shutdown']) {
+            register_shutdown_function(array($this, 'shutdown'));
+        }
     }
-  }
-
-  /**
-   * Returns the routing cache object.
-   *
-   * @return sfCache A sfCache instance or null
-   */
-  public function getCache()
-  {
-    return $this->cache;
-  }
-
-  /**
-   * Initializes this sfRouting instance.
-   *
-   * Available options:
-   *
-   *  * default_module: The default module name
-   *  * default_action: The default action name
-   *  * logging:        Whether to log or not (false by default)
-   *  * 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.
-   */
-  public function initialize(sfEventDispatcher $dispatcher, sfCache $cache = null, $options = array())
-  {
-    $this->dispatcher = $dispatcher;
-
-    $options['debug'] = isset($options['debug']) ? (boolean) $options['debug'] : false;
-
-    // disable caching when in debug mode
-    $this->cache = $options['debug'] ? null : $cache;
-
-    $this->setDefaultParameter('module', isset($options['default_module']) ? $options['default_module'] : 'default');
-    $this->setDefaultParameter('action', isset($options['default_action']) ? $options['default_action'] : 'index');
-
-    if (!isset($options['logging']))
+
+    /**
+     * Returns the routing cache object.
+     *
+     * @return sfCache A sfCache instance or null
+     */
+    public function getCache()
     {
-      $options['logging'] = false;
+        return $this->cache;
     }
 
-    if (!isset($options['context']))
+    /**
+     * Initializes this sfRouting instance.
+     *
+     * Available options:
+     *
+     *  * default_module: The default module name
+     *  * default_action: The default action name
+     *  * logging:        Whether to log or not (false by default)
+     *  * 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
+     */
+    public function initialize(sfEventDispatcher $dispatcher, sfCache $cache = null, $options = array())
     {
-      $options['context'] = array();
+        $this->dispatcher = $dispatcher;
+
+        $options['debug'] = isset($options['debug']) ? (bool) $options['debug'] : false;
+
+        // disable caching when in debug mode
+        $this->cache = $options['debug'] ? null : $cache;
+
+        $this->setDefaultParameter('module', isset($options['default_module']) ? $options['default_module'] : 'default');
+        $this->setDefaultParameter('action', isset($options['default_action']) ? $options['default_action'] : 'index');
+
+        if (!isset($options['logging'])) {
+            $options['logging'] = false;
+        }
+
+        if (!isset($options['context'])) {
+            $options['context'] = array();
+        }
+
+        $this->options = $options;
+
+        $this->dispatcher->connect('user.change_culture', array($this, 'listenToChangeCultureEvent'));
+        $this->dispatcher->connect('request.filter_parameters', array($this, 'filterParametersEvent'));
+
+        $this->loadConfiguration();
+    }
+
+    /**
+     * Returns the options.
+     *
+     * @return array An array of options
+     */
+    public function getOptions()
+    {
+        return $this->options;
     }
 
-    $this->options = $options;
-
-    $this->dispatcher->connect('user.change_culture', array($this, 'listenToChangeCultureEvent'));
-    $this->dispatcher->connect('request.filter_parameters', array($this, 'filterParametersEvent'));
-
-    $this->loadConfiguration();
-  }
-
-  /**
-   * Returns the options.
-   *
-   * @return array An array of options
-   */
-  public function getOptions()
-  {
-    return $this->options;
-  }
-
-  /**
-   * Loads routing configuration.
-   *
-   * This methods notifies a routing.load_configuration event.
-   */
-  public function loadConfiguration()
-  {
-    $this->dispatcher->notify(new sfEvent($this, 'routing.load_configuration'));
-  }
-
-  /**
-   * Gets the internal URI for the current request.
-   *
-   * @param  bool $with_route_name  Whether to give an internal URI with the route name (@route)
-   *                                or with the module/action pair
-   *
-   * @return string The current internal URI
-   */
-  abstract public function getCurrentInternalUri($with_route_name = false);
-
-  /**
-   * Gets the current compiled route array.
-   *
-   * @return array The route array
-   */
-  abstract public function getRoutes();
-
-  /**
-   * Gets route from given name
-   *
-   * @param  string $name The route name
-   *
-   * @return sfRoute
-   */
-  abstract public function getRoute($name);
-
-  /**
-   * Sets the compiled route array.
-   *
-   * @param  array $routes  The route array
-   *
-   * @return array The route array
-   */
-  abstract public function setRoutes($routes);
-
-  /**
-   * Returns true if this instance has some routes.
-   *
-   * @return bool
-   */
-  abstract public function hasRoutes();
-
-  /**
-   * Clears all current routes.
-   */
-  abstract public function clearRoutes();
-
- /**
-  * Generates a valid URLs for parameters.
-  *
-  * @param  string  $name      The route name
-  * @param  array   $params    The parameter values
-  * @param  Boolean $absolute  Whether to generate an absolute URL
-  *
-  * @return string The generated URL
-  */
-  abstract public function generate($name, $params = array(), $absolute = false);
-
- /**
-  * Parses a URL to find a matching route and sets internal state.
-  *
-  * Returns false if no route match the URL.
-  *
-  * @param  string $url  URL to be parsed
-  *
-  * @return array|false  An array of parameters or false if the route does not match
-  */
-  abstract public function parse($url);
-
-  /**
-   * Gets the default parameters for URL generation.
-   *
-   * @return array  An array of default parameters
-   */
-  public function getDefaultParameters()
-  {
-    return $this->defaultParameters;
-  }
-
-  /**
-   * Gets a default parameter.
-   *
-   * @param  string $key    The key
-   *
-   * @return string The value
-   */
-  public function getDefaultParameter($key)
-  {
-    return isset($this->defaultParameters[$key]) ? $this->defaultParameters[$key] : null;
-  }
-
-  /**
-   * Sets a default parameter.
-   *
-   * @param string $key    The key
-   * @param string $value  The value
-   */
-  public function setDefaultParameter($key, $value)
-  {
-    $this->defaultParameters[$key] = $value;
-  }
-
-  /**
-   * Sets the default parameters for URL generation.
-   *
-   * @param array $parameters  An array of default parameters
-   */
-  public function setDefaultParameters($parameters)
-  {
-    $this->defaultParameters = $parameters;
-  }
-
-  /**
-   * Listens to the user.change_culture event.
-   *
-   * @param sfEvent $event An sfEvent instance
-   *
-   */
-  public function listenToChangeCultureEvent(sfEvent $event)
-  {
-    // change the culture in the routing default parameters
-    $this->setDefaultParameter('sf_culture', $event['culture']);
-  }
-
-  /**
-   * Listens to the request.filter_parameters event.
-   *
-   * @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)
-  {
-    $context = $event->getParameters();
-
-    $this->options['context'] = $context;
-
-    if (false === $params = $this->parse($event['path_info']))
+    /**
+     * Loads routing configuration.
+     *
+     * This methods notifies a routing.load_configuration event.
+     */
+    public function loadConfiguration()
     {
-      return $parameters;
+        $this->dispatcher->notify(new sfEvent($this, 'routing.load_configuration'));
     }
 
-    return array_merge($parameters, $params);
-  }
+    /**
+     * Gets the internal URI for the current request.
+     *
+     * @param bool $with_route_name Whether to give an internal URI with the route name (@route)
+     *                              or with the module/action pair
+     *
+     * @return string The current internal URI
+     */
+    abstract public function getCurrentInternalUri($with_route_name = false);
+
+    /**
+     * Gets the current compiled route array.
+     *
+     * @return array The route array
+     */
+    abstract public function getRoutes();
+
+    /**
+     * Gets route from given name.
+     *
+     * @param string $name The route name
+     *
+     * @return sfRoute
+     */
+    abstract public function getRoute($name);
+
+    /**
+     * Sets the compiled route array.
+     *
+     * @param array $routes The route array
+     *
+     * @return array The route array
+     */
+    abstract public function setRoutes($routes);
+
+    /**
+     * Returns true if this instance has some routes.
+     *
+     * @return bool
+     */
+    abstract public function hasRoutes();
+
+    /**
+     * Clears all current routes.
+     */
+    abstract public function clearRoutes();
+
+    /**
+     * Generates a valid URLs for parameters.
+     *
+     * @param string $name     The route name
+     * @param array  $params   The parameter values
+     * @param bool   $absolute Whether to generate an absolute URL
+     *
+     * @return string The generated URL
+     */
+    abstract public function generate($name, $params = array(), $absolute = false);
+
+    /**
+     * Parses a URL to find a matching route and sets internal state.
+     *
+     * Returns false if no route match the URL.
+     *
+     * @param string $url URL to be parsed
+     *
+     * @return array|false An array of parameters or false if the route does not match
+     */
+    abstract public function parse($url);
+
+    /**
+     * Gets the default parameters for URL generation.
+     *
+     * @return array An array of default parameters
+     */
+    public function getDefaultParameters()
+    {
+        return $this->defaultParameters;
+    }
 
-  protected function fixGeneratedUrl($url, $absolute = false)
-  {
-    if (isset($this->options['context']['prefix']))
+    /**
+     * Gets a default parameter.
+     *
+     * @param string $key The key
+     *
+     * @return string The value
+     */
+    public function getDefaultParameter($key)
     {
-      if (0 === strpos($url, 'http'))
-      {
-        $url = preg_replace('#https?\://[^/]+#', '$0'.$this->options['context']['prefix'], $url);
-      }
-      else
-      {
-        $url = $this->options['context']['prefix'].$url;
-      }
+        return isset($this->defaultParameters[$key]) ? $this->defaultParameters[$key] : null;
     }
 
-    if ($absolute && isset($this->options['context']['host']) && 0 !== strpos($url, 'http'))
+    /**
+     * Sets a default parameter.
+     *
+     * @param string $key   The key
+     * @param string $value The value
+     */
+    public function setDefaultParameter($key, $value)
     {
-      $url = 'http'.(isset($this->options['context']['is_secure']) && $this->options['context']['is_secure'] ? 's' : '').'://'.$this->options['context']['host'].$url;
+        $this->defaultParameters[$key] = $value;
     }
 
-    return $url;
-  }
-
-  /**
-   * Execute the shutdown procedure.
-   *
-   * @return void
-   */
-  public function shutdown()
-  {
-  }
+    /**
+     * Sets the default parameters for URL generation.
+     *
+     * @param array $parameters An array of default parameters
+     */
+    public function setDefaultParameters($parameters)
+    {
+        $this->defaultParameters = $parameters;
+    }
+
+    /**
+     * Listens to the user.change_culture event.
+     *
+     * @param sfEvent $event An sfEvent instance
+     */
+    public function listenToChangeCultureEvent(sfEvent $event)
+    {
+        // change the culture in the routing default parameters
+        $this->setDefaultParameter('sf_culture', $event['culture']);
+    }
+
+    /**
+     * Listens to the request.filter_parameters event.
+     *
+     * @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)
+    {
+        $context = $event->getParameters();
+
+        $this->options['context'] = $context;
+
+        if (false === $params = $this->parse($event['path_info'])) {
+            return $parameters;
+        }
+
+        return array_merge($parameters, $params);
+    }
+
+    /**
+     * Execute the shutdown procedure.
+     */
+    public function shutdown()
+    {
+    }
+
+    protected function fixGeneratedUrl($url, $absolute = false)
+    {
+        if (isset($this->options['context']['prefix'])) {
+            if (0 === strpos($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')) {
+            $url = 'http'.(isset($this->options['context']['is_secure']) && $this->options['context']['is_secure'] ? 's' : '').'://'.$this->options['context']['host'].$url;
+        }
+
+        return $url;
+    }
 }
diff --git a/lib/service/sfServiceContainer.class.php b/lib/service/sfServiceContainer.class.php
index 35c5b70f6..4c47a6fe6 100644
--- a/lib/service/sfServiceContainer.class.php
+++ b/lib/service/sfServiceContainer.class.php
@@ -36,188 +36,179 @@
  *   <li>symfony.mysql_session_storage -> getSymfony_MysqlSessionStorageService()</li>
  * </ul>
  *
- * @package    symfony
- * @subpackage service
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfServiceContainer implements sfServiceContainerInterface
 {
-  protected
-    $serviceIds = array(),
-    $parameters = array(),
-    $services   = array(),
-    $count      = 0;
-
-  /**
-   * Constructor.
-   *
-   * @param array $parameters An array of parameters
-   */
-  public function __construct(array $parameters = array())
-  {
-    $this->setParameters($parameters);
-    $this->setService('service_container', $this);
-  }
-
-  /**
-   * Sets the service container parameters.
-   *
-   * @param array $parameters An array of parameters
-   */
-  public function setParameters(array $parameters)
-  {
-    $this->parameters = array();
-    foreach ($parameters as $key => $value)
+    protected $serviceIds = array();
+    protected $parameters = array();
+    protected $services = array();
+    protected $count = 0;
+
+    /**
+     * Constructor.
+     *
+     * @param array $parameters An array of parameters
+     */
+    public function __construct(array $parameters = array())
+    {
+        $this->setParameters($parameters);
+        $this->setService('service_container', $this);
+    }
+
+    /**
+     * Sets the service container parameters.
+     *
+     * @param array $parameters An array of parameters
+     */
+    public function setParameters(array $parameters)
+    {
+        $this->parameters = array();
+        foreach ($parameters as $key => $value) {
+            $this->parameters[strtolower($key)] = $value;
+        }
+    }
+
+    /**
+     * Adds parameters to the service container parameters.
+     *
+     * @param array $parameters An array of parameters
+     */
+    public function addParameters(array $parameters)
+    {
+        $this->setParameters(array_merge($this->parameters, $parameters));
+    }
+
+    /**
+     * Gets the service container parameters.
+     *
+     * @return array An array of parameters
+     */
+    public function getParameters()
+    {
+        return $this->parameters;
+    }
+
+    /**
+     * Gets a service container parameter.
+     *
+     * @param string $name The parameter name
+     *
+     * @return mixed The parameter value
+     *
+     * @throw  InvalidArgumentException if the parameter is not defined
+     */
+    public function getParameter($name)
     {
-      $this->parameters[strtolower($key)] = $value;
+        if ($this->hasParameter($name)) {
+            return $this->parameters[strtolower($name)];
+        }
+
+        if (sfConfig::has($name)) {
+            return sfConfig::get($name);
+        }
+
+        throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
     }
-  }
-
-  /**
-   * Adds parameters to the service container parameters.
-   *
-   * @param array $parameters An array of parameters
-   */
-  public function addParameters(array $parameters)
-  {
-    $this->setParameters(array_merge($this->parameters, $parameters));
-  }
-
-  /**
-   * Gets the service container parameters.
-   *
-   * @return array An array of parameters
-   */
-  public function getParameters()
-  {
-    return $this->parameters;
-  }
-
-  /**
-   * Gets a service container parameter.
-   *
-   * @param  string $name The parameter name
-   *
-   * @return mixed  The parameter value
-   *
-   * @throw  InvalidArgumentException if the parameter is not defined
-   */
-  public function getParameter($name)
-  {
-    if ($this->hasParameter($name))
+
+    /**
+     * Sets a service container parameter.
+     *
+     * @param string $name  The parameter name
+     * @param mixed  $value The parameter value
+     */
+    public function setParameter($name, $value)
     {
-      return $this->parameters[strtolower($name)];
+        $this->parameters[strtolower($name)] = $value;
     }
 
-    if (sfConfig::has($name))
+    /**
+     * Returns true if a parameter name is defined.
+     *
+     * @param string $name The parameter name
+     *
+     * @return bool true if the parameter name is defined, false otherwise
+     */
+    public function hasParameter($name)
     {
-      return sfConfig::get($name);
+        return array_key_exists(strtolower($name), $this->parameters);
     }
 
-    throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
-  }
-
-  /**
-   * Sets a service container parameter.
-   *
-   * @param string $name   The parameter name
-   * @param mixed  $value  The parameter value
-   */
-  public function setParameter($name, $value)
-  {
-    $this->parameters[strtolower($name)] = $value;
-  }
-
-  /**
-   * Returns true if a parameter name is defined.
-   *
-   * @param  string  $name       The parameter name
-   *
-   * @return Boolean true if the parameter name is defined, false otherwise
-   */
-  public function hasParameter($name)
-  {
-    return array_key_exists(strtolower($name), $this->parameters);
-  }
-
-  /**
-   * Sets a service.
-   *
-   * @param string $id      The service identifier
-   * @param object $service The service instance
-   */
-  public function setService($id, $service)
-  {
-    $this->services[$id] = $service;
-  }
-
-  /**
-   * Returns true if the given service is defined.
-   *
-   * @param  string  $id      The service identifier
-   *
-   * @return Boolean true if the service is defined, false otherwise
-   */
-  public function hasService($id)
-  {
-    return isset($this->services[$id]) || method_exists($this, 'get'.self::camelize($id).'Service');
-  }
-
-  /**
-   * Gets a service.
-   *
-   * If a service is both defined through a setService() method and
-   * with a set*Service() method, the former has always precedence.
-   *
-   * @param  string $id The service identifier
-   *
-   * @return object The associated service
-   *
-   * @throw InvalidArgumentException if the service is not defined
-   */
-  public function getService($id)
-  {
-    if (isset($this->services[$id]))
+    /**
+     * Sets a service.
+     *
+     * @param string $id      The service identifier
+     * @param object $service The service instance
+     */
+    public function setService($id, $service)
     {
-      return $this->services[$id];
+        $this->services[$id] = $service;
     }
 
-    if (method_exists($this, $method = 'get'.self::camelize($id).'Service'))
+    /**
+     * Returns true if the given service is defined.
+     *
+     * @param string $id The service identifier
+     *
+     * @return bool true if the service is defined, false otherwise
+     */
+    public function hasService($id)
     {
-      return $this->$method();
+        return isset($this->services[$id]) || method_exists($this, 'get'.self::camelize($id).'Service');
     }
 
-    throw new InvalidArgumentException(sprintf('The service "%s" does not exist.', $id));
-  }
-
-  /**
-   * Gets all service ids.
-   *
-   * @return array An array of all defined service ids
-   */
-  public function getServiceIds()
-  {
-    $ids = array();
-    $r = new ReflectionClass($this);
-    foreach ($r->getMethods() as $method)
+    /**
+     * Gets a service.
+     *
+     * If a service is both defined through a setService() method and
+     * with a set*Service() method, the former has always precedence.
+     *
+     * @param string $id The service identifier
+     *
+     * @return object The associated service
+     *
+     * @throw InvalidArgumentException if the service is not defined
+     */
+    public function getService($id)
     {
-      if (preg_match('/^get(.+)Service$/', $name = $method->getName(), $match))
-      {
-        $ids[] = self::underscore($match[1]);
-      }
+        if (isset($this->services[$id])) {
+            return $this->services[$id];
+        }
+
+        if (method_exists($this, $method = 'get'.self::camelize($id).'Service')) {
+            return $this->{$method}();
+        }
+
+        throw new InvalidArgumentException(sprintf('The service "%s" does not exist.', $id));
     }
 
-    return array_merge($ids, array_keys($this->services));
-  }
+    /**
+     * Gets all service ids.
+     *
+     * @return array An array of all defined service ids
+     */
+    public function getServiceIds()
+    {
+        $ids = array();
+        $r = new ReflectionClass($this);
+        foreach ($r->getMethods() as $method) {
+            if (preg_match('/^get(.+)Service$/', $name = $method->getName(), $match)) {
+                $ids[] = self::underscore($match[1]);
+            }
+        }
+
+        return array_merge($ids, array_keys($this->services));
+    }
 
-  static public function camelize($id)
-  {
-    return strtr(ucwords(strtr($id, array('_' => ' ', '-' => ' ', '.' => '_ '))), array(' ' => ''));
-  }
+    public static function camelize($id)
+    {
+        return strtr(ucwords(strtr($id, array('_' => ' ', '-' => ' ', '.' => '_ '))), array(' ' => ''));
+    }
 
-  static public 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));
-  }
+    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));
+    }
 }
diff --git a/lib/service/sfServiceContainerBuilder.class.php b/lib/service/sfServiceContainerBuilder.class.php
index 29b45e574..6e5e109f3 100644
--- a/lib/service/sfServiceContainerBuilder.class.php
+++ b/lib/service/sfServiceContainerBuilder.class.php
@@ -11,330 +11,298 @@
 /**
  * sfServiceContainerBuilder is a DI container that provides an interface to build the services.
  *
- * @package    symfony
- * @subpackage service
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id: sfServiceContainerBuilder.php 269 2009-03-26 20:39:16Z fabien $
  */
 class sfServiceContainerBuilder extends sfServiceContainer
 {
-  protected
-    $definitions = array(),
-    $aliases     = array(),
-    $loading     = array();
-
-  /**
-   * Sets a service.
-   *
-   * @param string $id      The service identifier
-   * @param object $service The service instance
-   */
-  public function setService($id, $service)
-  {
-    unset($this->aliases[$id]);
-
-    parent::setService($id, $service);
-  }
-
-  /**
-   * Returns true if the given service is defined.
-   *
-   * @param  string  $id      The service identifier
-   *
-   * @return Boolean true if the service is defined, false otherwise
-   */
-  public function hasService($id)
-  {
-    return isset($this->definitions[$id]) || isset($this->aliases[$id]) || parent::hasService($id);
-  }
-
-  /**
-   * Gets a service.
-   *
-   * @param  string $id The service identifier
-   *
-   * @return object The associated service
-   *
-   * @throw InvalidArgumentException if the service is not defined
-   * @throw LogicException if the service has a circular reference to itself
-   */
-  public function getService($id)
-  {
-    try
+    protected $definitions = array();
+    protected $aliases = array();
+    protected $loading = array();
+
+    /**
+     * Sets a service.
+     *
+     * @param string $id      The service identifier
+     * @param object $service The service instance
+     */
+    public function setService($id, $service)
     {
-      return parent::getService($id);
+        unset($this->aliases[$id]);
+
+        parent::setService($id, $service);
     }
-    catch (InvalidArgumentException $e)
+
+    /**
+     * Returns true if the given service is defined.
+     *
+     * @param string $id The service identifier
+     *
+     * @return bool true if the service is defined, false otherwise
+     */
+    public function hasService($id)
     {
-      if (isset($this->loading[$id]))
-      {
-        throw new LogicException(sprintf('The service "%s" has a circular reference to itself.', $id));
-      }
+        return isset($this->definitions[$id]) || isset($this->aliases[$id]) || parent::hasService($id);
+    }
 
-      if (!$this->hasServiceDefinition($id) && isset($this->aliases[$id]))
-      {
-        return $this->getService($this->aliases[$id]);
-      }
+    /**
+     * Gets a service.
+     *
+     * @param string $id The service identifier
+     *
+     * @return object The associated service
+     *
+     * @throw InvalidArgumentException if the service is not defined
+     * @throw LogicException if the service has a circular reference to itself
+     */
+    public function getService($id)
+    {
+        try {
+            return parent::getService($id);
+        } catch (InvalidArgumentException $e) {
+            if (isset($this->loading[$id])) {
+                throw new LogicException(sprintf('The service "%s" has a circular reference to itself.', $id));
+            }
+
+            if (!$this->hasServiceDefinition($id) && isset($this->aliases[$id])) {
+                return $this->getService($this->aliases[$id]);
+            }
 
-      $definition = $this->getServiceDefinition($id);
+            $definition = $this->getServiceDefinition($id);
 
-      $this->loading[$id] = true;
+            $this->loading[$id] = true;
 
-      if ($definition->isShared())
-      {
-        $service = $this->services[$id] = $this->createService($definition);
-      }
-      else
-      {
-        $service = $this->createService($definition);
-      }
+            if ($definition->isShared()) {
+                $service = $this->services[$id] = $this->createService($definition);
+            } else {
+                $service = $this->createService($definition);
+            }
 
-      unset($this->loading[$id]);
+            unset($this->loading[$id]);
 
-      return $service;
+            return $service;
+        }
     }
-  }
-
-  /**
-   * Gets all service ids.
-   *
-   * @return array An array of all defined service ids
-   */
-  public function getServiceIds()
-  {
-    return array_unique(array_merge(array_keys($this->getServiceDefinitions()), array_keys($this->aliases), parent::getServiceIds()));
-  }
-
-  /**
-   * Sets an alias for an existing service.
-   *
-   * @param string $alias The alias to create
-   * @param string $id    The service to alias
-   */
-  public function setAlias($alias, $id)
-  {
-    $this->aliases[$alias] = $id;
-  }
-
-  /**
-   * Gets all defined aliases.
-   *
-   * @return array An array of aliases
-   */
-  public function getAliases()
-  {
-    return $this->aliases;
-  }
-
-  /**
-   * Registers a service definition.
-   *
-   * This methods allows for simple registration of service definition
-   * with a fluid interface.
-   *
-   * @param  string $id    The service identifier
-   * @param  string $class The service class
-   *
-   * @return sfServiceDefinition A sfServiceDefinition instance
-   */
-  public function register($id, $class)
-  {
-    return $this->setServiceDefinition($id, new sfServiceDefinition($class));
-  }
-
-  /**
-   * Adds the service definitions.
-   *
-   * @param array $definitions An array of service definitions
-   */
-  public function addServiceDefinitions(array $definitions)
-  {
-    foreach ($definitions as $id => $definition)
+
+    /**
+     * Gets all service ids.
+     *
+     * @return array An array of all defined service ids
+     */
+    public function getServiceIds()
     {
-      $this->setServiceDefinition($id, $definition);
+        return array_unique(array_merge(array_keys($this->getServiceDefinitions()), array_keys($this->aliases), parent::getServiceIds()));
     }
-  }
-
-  /**
-   * Sets the service definitions.
-   *
-   * @param array $definitions An array of service definitions
-   */
-  public function setServiceDefinitions(array $definitions)
-  {
-    $this->definitions = array();
-    $this->addServiceDefinitions($definitions);
-  }
-
-  /**
-   * Gets all service definitions.
-   *
-   * @return array An array of sfServiceDefinition instances
-   */
-  public function getServiceDefinitions()
-  {
-    return $this->definitions;
-  }
-
-  /**
-   * Sets a service definition.
-   *
-   * @param  string              $id         The service identifier
-   * @param  sfServiceDefinition $definition A sfServiceDefinition instance
-   *
-   * @return sfServiceDefinition
-   */
-  public function setServiceDefinition($id, sfServiceDefinition $definition)
-  {
-    unset($this->aliases[$id]);
-
-    return $this->definitions[$id] = $definition;
-  }
-
-  /**
-   * Returns true if a service definition exists under the given identifier.
-   *
-   * @param  string  $id The service identifier
-   *
-   * @return Boolean true if the service definition exists, false otherwise
-   */
-  public function hasServiceDefinition($id)
-  {
-    return array_key_exists($id, $this->definitions);
-  }
-
-  /**
-   * Gets a service definition.
-   *
-   * @param  string  $id The service identifier
-   *
-   * @return sfServiceDefinition A sfServiceDefinition instance
-   *
-   * @throw InvalidArgumentException if the service definition does not exist
-   */
-  public function getServiceDefinition($id)
-  {
-    if (!$this->hasServiceDefinition($id))
+
+    /**
+     * Sets an alias for an existing service.
+     *
+     * @param string $alias The alias to create
+     * @param string $id    The service to alias
+     */
+    public function setAlias($alias, $id)
     {
-      throw new InvalidArgumentException(sprintf('The service definition "%s" does not exist.', $id));
+        $this->aliases[$alias] = $id;
     }
 
-    return $this->definitions[$id];
-  }
-
-  /**
-   * Creates a service for a service definition.
-   *
-   * @param  sfServiceDefinition $definition A service definition instance
-   *
-   * @return object              The service described by the service definition
-   */
-  protected function createService(sfServiceDefinition $definition)
-  {
-    if (null !== $definition->getFile())
+    /**
+     * Gets all defined aliases.
+     *
+     * @return array An array of aliases
+     */
+    public function getAliases()
     {
-      require_once $this->resolveValue($definition->getFile());
+        return $this->aliases;
     }
 
-    $r = new ReflectionClass($this->resolveValue($definition->getClass()));
+    /**
+     * Registers a service definition.
+     *
+     * This methods allows for simple registration of service definition
+     * with a fluid interface.
+     *
+     * @param string $id    The service identifier
+     * @param string $class The service class
+     *
+     * @return sfServiceDefinition A sfServiceDefinition instance
+     */
+    public function register($id, $class)
+    {
+        return $this->setServiceDefinition($id, new sfServiceDefinition($class));
+    }
 
-    $arguments = $this->resolveServices($this->resolveValue($definition->getArguments()));
+    /**
+     * Adds the service definitions.
+     *
+     * @param array $definitions An array of service definitions
+     */
+    public function addServiceDefinitions(array $definitions)
+    {
+        foreach ($definitions as $id => $definition) {
+            $this->setServiceDefinition($id, $definition);
+        }
+    }
 
-    if (null !== $definition->getConstructor())
+    /**
+     * Sets the service definitions.
+     *
+     * @param array $definitions An array of service definitions
+     */
+    public function setServiceDefinitions(array $definitions)
     {
-      $service = call_user_func_array(array($this->resolveValue($definition->getClass()), $definition->getConstructor()), $arguments);
+        $this->definitions = array();
+        $this->addServiceDefinitions($definitions);
     }
-    else
+
+    /**
+     * Gets all service definitions.
+     *
+     * @return array An array of sfServiceDefinition instances
+     */
+    public function getServiceDefinitions()
     {
-      $service = null === $r->getConstructor() ? $r->newInstance() : $r->newInstanceArgs($arguments);
+        return $this->definitions;
     }
 
-    foreach ($definition->getMethodCalls() as $call)
+    /**
+     * Sets a service definition.
+     *
+     * @param string              $id         The service identifier
+     * @param sfServiceDefinition $definition A sfServiceDefinition instance
+     *
+     * @return sfServiceDefinition
+     */
+    public function setServiceDefinition($id, sfServiceDefinition $definition)
     {
-      call_user_func_array(array($service, $call[0]), $this->resolveServices($this->resolveValue($call[1])));
+        unset($this->aliases[$id]);
+
+        return $this->definitions[$id] = $definition;
     }
 
-    if ($callable = $definition->getConfigurator())
+    /**
+     * Returns true if a service definition exists under the given identifier.
+     *
+     * @param string $id The service identifier
+     *
+     * @return bool true if the service definition exists, false otherwise
+     */
+    public function hasServiceDefinition($id)
     {
-      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)));
-      }
-
-      call_user_func($callable, $service);
+        return array_key_exists($id, $this->definitions);
     }
 
-    return $service;
-  }
-
-  /**
-   * Replaces parameter placeholders (%name%) by their values.
-   *
-   * @param  mixed $value A value
-   *
-   * @return mixed The same value with all placeholders replaced by their values
-   *
-   * @throw RuntimeException if a placeholder references a parameter that does not exist
-   */
-  public function resolveValue($value)
-  {
-    if (is_array($value))
+    /**
+     * Gets a service definition.
+     *
+     * @param string $id The service identifier
+     *
+     * @return sfServiceDefinition A sfServiceDefinition instance
+     *
+     * @throw InvalidArgumentException if the service definition does not exist
+     */
+    public function getServiceDefinition($id)
     {
-      $args = array();
-      foreach ($value as $k => $v)
-      {
-        $args[$this->resolveValue($k)] = $this->resolveValue($v);
-      }
+        if (!$this->hasServiceDefinition($id)) {
+            throw new InvalidArgumentException(sprintf('The service definition "%s" does not exist.', $id));
+        }
 
-      $value = $args;
+        return $this->definitions[$id];
     }
-    else if (is_string($value))
+
+    /**
+     * Replaces parameter placeholders (%name%) by their values.
+     *
+     * @param mixed $value A value
+     *
+     * @return mixed The same value with all placeholders replaced by their values
+     *
+     * @throw RuntimeException if a placeholder references a parameter that does not exist
+     */
+    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));
-      }
+        if (is_array($value)) {
+            $args = array();
+            foreach ($value as $k => $v) {
+                $args[$this->resolveValue($k)] = $this->resolveValue($v);
+            }
+
+            $value = $args;
+        } elseif (is_string($value)) {
+            if (preg_match('/^%([^%]+)%$/', $value, $match)) {
+                $value = $this->getParameter($match[1]);
+            } else {
+                $value = str_replace('%%', '%', preg_replace_callback('/(?<!%)(%)([^%]+)\1/', array($this, 'replaceParameter'), $value));
+            }
+        }
+
+        return $value;
     }
 
-    return $value;
-  }
-
-  /**
-   * Replaces service references by the real service instance.
-   *
-   * @param  mixed $value A value
-   *
-   * @return mixed The same value with all service references replaced by the real service instances
-   */
-  public function resolveServices($value)
-  {
-    if (is_array($value))
+    /**
+     * Replaces service references by the real service instance.
+     *
+     * @param mixed $value A value
+     *
+     * @return mixed The same value with all service references replaced by the real service instances
+     */
+    public function resolveServices($value)
     {
-      $value = array_map(array($this, 'resolveServices'), $value);
+        if (is_array($value)) {
+            $value = array_map(array($this, 'resolveServices'), $value);
+        } elseif (is_object($value) && $value instanceof sfServiceReference) {
+            $value = $this->getService((string) $value);
+        }
+
+        return $value;
     }
-    else if (is_object($value) && $value instanceof sfServiceReference)
+
+    /**
+     * Creates a service for a service definition.
+     *
+     * @param sfServiceDefinition $definition A service definition instance
+     *
+     * @return object The service described by the service definition
+     */
+    protected function createService(sfServiceDefinition $definition)
     {
-      $value = $this->getService((string) $value);
-    }
+        if (null !== $definition->getFile()) {
+            require_once $this->resolveValue($definition->getFile());
+        }
+
+        $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);
+        } else {
+            $service = null === $r->getConstructor() ? $r->newInstance() : $r->newInstanceArgs($arguments);
+        }
 
-    return $value;
-  }
+        foreach ($definition->getMethodCalls() as $call) {
+            call_user_func_array(array($service, $call[0]), $this->resolveServices($this->resolveValue($call[1])));
+        }
 
-  protected function replaceParameter($match)
-  {
-    return $this->getParameter($match[2]);
-  }
+        if ($callable = $definition->getConfigurator()) {
+            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)));
+            }
+
+            call_user_func($callable, $service);
+        }
+
+        return $service;
+    }
+
+    protected function replaceParameter($match)
+    {
+        return $this->getParameter($match[2]);
+    }
 }
diff --git a/lib/service/sfServiceContainerDumper.class.php b/lib/service/sfServiceContainerDumper.class.php
index a5cbca5b7..2fca97b3b 100644
--- a/lib/service/sfServiceContainerDumper.class.php
+++ b/lib/service/sfServiceContainerDumper.class.php
@@ -11,34 +11,33 @@
 /**
  * sfServiceContainerDumper is the abstract class for all built-in dumpers.
  *
- * @package    symfony
- * @subpackage service
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfServiceContainerDumper implements sfServiceContainerDumperInterface
 {
-  protected $container;
+    protected $container;
 
-  /**
-   * Constructor.
-   *
-   * @param sfServiceContainerBuilder $container The service container to dump
-   */
-  public function __construct(sfServiceContainerBuilder $container)
-  {
-    $this->container = $container;
-  }
+    /**
+     * Constructor.
+     *
+     * @param sfServiceContainerBuilder $container The service container to dump
+     */
+    public function __construct(sfServiceContainerBuilder $container)
+    {
+        $this->container = $container;
+    }
 
-  /**
-   * Dumps the service container.
-   *
-   * @param  array  $options An array of options
-   *
-   * @return string The representation of the service container
-   */
-  public function dump(array $options = array())
-  {
-    throw new LogicException('You must extend this abstract class and implement the dump() method.');
-  }
+    /**
+     * Dumps the service container.
+     *
+     * @param array $options An array of options
+     *
+     * @return string The representation of the service container
+     */
+    public function dump(array $options = array())
+    {
+        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 805ec061d..80e1f0a61 100644
--- a/lib/service/sfServiceContainerDumperGraphviz.class.php
+++ b/lib/service/sfServiceContainerDumperGraphviz.class.php
@@ -15,216 +15,194 @@
  *
  *   dot -Tpng container.dot > foo.png
  *
- * @package    symfony
- * @subpackage service
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfServiceContainerDumperGraphviz extends sfServiceContainerDumper
 {
-  protected $nodes, $edges;
-
-  /**
-   * Dumps the service container as a graphviz graph.
-   *
-   * Available options:
-   *
-   *  * graph: The default options for the whole graph
-   *  * node: The default options for nodes
-   *  * edge: The default options for edges
-   *  * node.instance: The default options for services that are defined directly by object instances
-   *  * node.definition: The default options for services that are defined via service definition instances
-   *  * node.missing: The default options for missing services
-   *
-   * @param  array  $options An array of options
-   *
-   * @return string The dot representation of the service container
-   */
-  public function dump(array $options = array())
-  {
-    $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)
+    protected $nodes;
+    protected $edges;
+
+    /**
+     * Dumps the service container as a graphviz graph.
+     *
+     * Available options:
+     *
+     *  * graph: The default options for the whole graph
+     *  * node: The default options for nodes
+     *  * edge: The default options for edges
+     *  * node.instance: The default options for services that are defined directly by object instances
+     *  * node.definition: The default options for services that are defined via service definition instances
+     *  * node.missing: The default options for missing services
+     *
+     * @param array $options An array of options
+     *
+     * @return string The dot representation of the service container
+     */
+    public function dump(array $options = array())
     {
-      if (isset($options[$key]))
-      {
-        $this->options[$key] = array_merge($this->options[$key], $options[$key]);
-      }
-    }
+        $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'),
+        );
 
-    $this->nodes = $this->findNodes();
+        foreach (array('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]);
+            }
+        }
 
-    $this->edges = array();
-    foreach ($this->container->getServiceDefinitions() as $id => $definition)
-    {
-      $this->edges[$id] = $this->findEdges($id, $definition->getArguments(), true, '');
+        $this->nodes = $this->findNodes();
 
-      foreach ($definition->getMethodCalls() as $call)
-      {
-        $this->edges[$id] = array_merge(
-          $this->edges[$id],
-          $this->findEdges($id, $call[1], false, $call[0].'()')
-        );
-      }
-    }
+        $this->edges = array();
+        foreach ($this->container->getServiceDefinitions() as $id => $definition) {
+            $this->edges[$id] = $this->findEdges($id, $definition->getArguments(), true, '');
+
+            foreach ($definition->getMethodCalls() as $call) {
+                $this->edges[$id] = array_merge(
+                    $this->edges[$id],
+                    $this->findEdges($id, $call[1], false, $call[0].'()')
+                );
+            }
+        }
 
-    return $this->startDot().$this->addNodes().$this->addEdges().$this->endDot();
-  }
+        return $this->startDot().$this->addNodes().$this->addEdges().$this->endDot();
+    }
 
-  protected function addNodes()
-  {
-    $code = '';
-    foreach ($this->nodes as $id => $node)
+    protected function addNodes()
     {
-      $aliases = $this->getAliases($id);
+        $code = '';
+        foreach ($this->nodes as $id => $node) {
+            $aliases = $this->getAliases($id);
 
-      $code .= sprintf("  node_%s [label=\"%s\\n%s\\n\", shape=%s%s];\n", $this->dotize($id), $id.($aliases ? ' ('.implode(', ', $aliases).')' : ''), $node['class'], $this->options['node']['shape'], $this->addAttributes($node['attributes']));
-    }
+            $code .= sprintf("  node_%s [label=\"%s\\n%s\\n\", shape=%s%s];\n", $this->dotize($id), $id.($aliases ? ' ('.implode(', ', $aliases).')' : ''), $node['class'], $this->options['node']['shape'], $this->addAttributes($node['attributes']));
+        }
 
-    return $code;
-  }
+        return $code;
+    }
 
-  protected function addEdges()
-  {
-    $code = '';
-    foreach ($this->edges as $id => $edges)
+    protected function addEdges()
     {
-      foreach ($edges as $edge)
-      {
-        $code .= sprintf("  node_%s -> node_%s [label=\"%s\" style=\"%s\"];\n", $this->dotize($id), $this->dotize($edge['to']), $edge['name'], $edge['required'] ? 'filled' : 'dashed');
-      }
-    }
+        $code = '';
+        foreach ($this->edges as $id => $edges) {
+            foreach ($edges as $edge) {
+                $code .= sprintf("  node_%s -> node_%s [label=\"%s\" style=\"%s\"];\n", $this->dotize($id), $this->dotize($edge['to']), $edge['name'], $edge['required'] ? 'filled' : 'dashed');
+            }
+        }
 
-    return $code;
-  }
+        return $code;
+    }
 
-  protected function findEdges($id, $arguments, $required, $name)
-  {
-    $edges = array();
-    foreach ($arguments as $argument)
+    protected function findEdges($id, $arguments, $required, $name)
     {
-      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 (!$this->container->hasService((string) $argument))
-        {
-          $this->nodes[(string) $argument] = array('name' => $name, 'required' => $required, 'class' => '', 'attributes' => $this->options['node.missing']);
+        $edges = array();
+        foreach ($arguments as $argument) {
+            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 (!$this->container->hasService((string) $argument)) {
+                    $this->nodes[(string) $argument] = array('name' => $name, 'required' => $required, 'class' => '', 'attributes' => $this->options['node.missing']);
+                }
+
+                $edges[] = array('name' => $name, 'required' => $required, 'to' => $argument);
+            } elseif (is_array($argument)) {
+                $edges = array_merge($edges, $this->findEdges($id, $argument, $required, $name));
+            }
         }
 
-        $edges[] = array('name' => $name, 'required' => $required, 'to' => $argument);
-      }
-      elseif (is_array($argument))
-      {
-        $edges = array_merge($edges, $this->findEdges($id, $argument, $required, $name));
-      }
+        return $edges;
     }
 
-    return $edges;
-  }
+    protected function findNodes()
+    {
+        $nodes = array();
 
-  protected function findNodes()
-  {
-    $nodes = array();
+        $container = clone $this->container;
 
-    $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')));
 
-    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')));
+            $container->setServiceDefinition($id, new sfServiceDefinition('stdClass'));
+        }
+
+        foreach ($container->getServiceIds() as $id) {
+            if (array_key_exists($id, $container->getAliases())) {
+                continue;
+            }
 
-      $container->setServiceDefinition($id, new sfServiceDefinition('stdClass'));
+            if (!$container->hasServiceDefinition($id)) {
+                $nodes[$id] = array('class' => get_class($container->getService($id)), 'attributes' => $this->options['node.instance']);
+            }
+        }
+
+        return $nodes;
     }
 
-    foreach ($container->getServiceIds() as $id)
+    protected function getValue($value, $default = '')
     {
-      if (array_key_exists($id, $container->getAliases()))
-      {
-        continue;
-      }
-
-      if (!$container->hasServiceDefinition($id))
-      {
-        $nodes[$id] = array('class' => get_class($container->getService($id)), 'attributes' => $this->options['node.instance']);
-      }
+        return $this->container->resolveValue($value);
     }
 
-    return $nodes;
-  }
-
-  protected function getValue($value, $default = '')
-  {
-    return $this->container->resolveValue($value);
-  }
-
-  protected function startDot()
-  {
-    $parameters = var_export($this->container->getParameters(), true);
-
-    return sprintf("digraph sc {\n  %s\n  node [%s];\n  edge [%s];\n\n",
-      $this->addOptions($this->options['graph']),
-      $this->addOptions($this->options['node']),
-      $this->addOptions($this->options['edge'])
-    );
-  }
-
-  protected function endDot()
-  {
-    return "}\n";
-  }
-
-  protected function addAttributes($attributes)
-  {
-    $code = array();
-    foreach ($attributes as $k => $v)
+    protected function startDot()
     {
-      $code[] = sprintf('%s="%s"', $k, $v);
+        $parameters = var_export($this->container->getParameters(), true);
+
+        return sprintf(
+            "digraph sc {\n  %s\n  node [%s];\n  edge [%s];\n\n",
+            $this->addOptions($this->options['graph']),
+            $this->addOptions($this->options['node']),
+            $this->addOptions($this->options['edge'])
+        );
     }
 
-    return $code ? ', '.implode(', ', $code) : '';
-  }
+    protected function endDot()
+    {
+        return "}\n";
+    }
 
-  protected function addOptions($options)
-  {
-    $code = array();
-    foreach ($options as $k => $v)
+    protected function addAttributes($attributes)
     {
-      $code[] = sprintf('%s="%s"', $k, $v);
+        $code = array();
+        foreach ($attributes as $k => $v) {
+            $code[] = sprintf('%s="%s"', $k, $v);
+        }
+
+        return $code ? ', '.implode(', ', $code) : '';
     }
 
-    return implode(' ', $code);
-  }
+    protected function addOptions($options)
+    {
+        $code = array();
+        foreach ($options as $k => $v) {
+            $code[] = sprintf('%s="%s"', $k, $v);
+        }
 
-  protected function dotize($id)
-  {
-    return strtolower(preg_replace('/\W/i', '_', $id));
-  }
+        return implode(' ', $code);
+    }
 
-  protected function getAliases($id)
-  {
-    $aliases = array();
-    foreach ($this->container->getAliases() as $alias => $origin)
+    protected function dotize($id)
     {
-      if ($id == $origin)
-      {
-        $aliases[] = $alias;
-      }
+        return strtolower(preg_replace('/\W/i', '_', $id));
     }
 
-    return $aliases;
-  }
+    protected function getAliases($id)
+    {
+        $aliases = array();
+        foreach ($this->container->getAliases() as $alias => $origin) {
+            if ($id == $origin) {
+                $aliases[] = $alias;
+            }
+        }
+
+        return $aliases;
+    }
 }
diff --git a/lib/service/sfServiceContainerDumperInterface.class.php b/lib/service/sfServiceContainerDumperInterface.class.php
index 6d058f725..6c37579cd 100644
--- a/lib/service/sfServiceContainerDumperInterface.class.php
+++ b/lib/service/sfServiceContainerDumperInterface.class.php
@@ -11,12 +11,11 @@
 /**
  * sfServiceContainerDumperInterface is the interface implemented by service container dumper classes.
  *
- * @package    symfony
- * @subpackage dependency_injection
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 interface sfServiceContainerDumperInterface
 {
-  function dump(array $options = array());
+    public function dump(array $options = array());
 }
diff --git a/lib/service/sfServiceContainerDumperPhp.class.php b/lib/service/sfServiceContainerDumperPhp.class.php
index 88095c7ce..5edc36516 100644
--- a/lib/service/sfServiceContainerDumperPhp.class.php
+++ b/lib/service/sfServiceContainerDumperPhp.class.php
@@ -11,209 +11,198 @@
 /**
  * sfServiceContainerDumperPhp dumps a service container as a PHP class.
  *
- * @package    symfony
- * @subpackage service
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfServiceContainerDumperPhp extends sfServiceContainerDumper
 {
-  /**
-   * Dumps the service container as a PHP class.
-   *
-   * Available options:
-   *
-   *  * class:      The class name
-   *  * base_class: The base class name
-   *
-   * @param  array  $options An array of options
-   *
-   * @return string A PHP class representing of the service container
-   */
-  public function dump(array $options = array())
-  {
-    $options = array_merge(array(
-      'class'      => 'ProjectServiceContainer',
-      'base_class' => 'sfServiceContainer',
-    ), $options);
-
-    return
-      $this->startClass($options['class'], $options['base_class']).
-      $this->addConstructor().
-      $this->addServices().
-      $this->addDefaultParametersMethod().
-      $this->endClass()
-    ;
-  }
+    /**
+     * Dumps the service container as a PHP class.
+     *
+     * Available options:
+     *
+     *  * class:      The class name
+     *  * base_class: The base class name
+     *
+     * @param array $options An array of options
+     *
+     * @return string A PHP class representing of the service container
+     */
+    public function dump(array $options = array())
+    {
+        $options = array_merge(array(
+            'class' => 'ProjectServiceContainer',
+            'base_class' => 'sfServiceContainer',
+        ), $options);
+
+        return
+          $this->startClass($options['class'], $options['base_class']).
+          $this->addConstructor().
+          $this->addServices().
+          $this->addDefaultParametersMethod().
+          $this->endClass()
+        ;
+    }
 
-  /**
-   * @param string $id
-   * @param sfServiceDefinition $definition
-   * @return string
-   */
-  protected function addServiceInclude($id, $definition)
-  {
-    if (null !== $definition->getFile())
+    public function replaceParameter($match)
     {
-      return sprintf("    require_once %s;\n\n", $this->dumpValue($definition->getFile()));
+        return sprintf("'.\$this->getParameter('%s').'", strtolower($match[2]));
     }
-  }
 
-  /**
-   * @param string $id
-   * @param sfServiceDefinition $definition
-   * @return string
-   */
-  protected function addServiceShared($id, $definition)
-  {
-    if ($definition->isShared())
+    /**
+     * @param string              $id
+     * @param sfServiceDefinition $definition
+     *
+     * @return string
+     */
+    protected function addServiceInclude($id, $definition)
+    {
+        if (null !== $definition->getFile()) {
+            return sprintf("    require_once %s;\n\n", $this->dumpValue($definition->getFile()));
+        }
+    }
+
+    /**
+     * @param string              $id
+     * @param sfServiceDefinition $definition
+     *
+     * @return string
+     */
+    protected function addServiceShared($id, $definition)
     {
-      return <<<EOF
-    if (isset(\$this->shared['$id'])) return \$this->shared['$id'];
+        if ($definition->isShared()) {
+            return <<<EOF
+    if (isset(\$this->shared['{$id}'])) return \$this->shared['{$id}'];
 
 
 EOF;
+        }
     }
-  }
 
-  /**
-   * @param string $id
-   * @param sfServiceDefinition $definition
-   * @return string
-   */
-  protected function addServiceReturn($id, $definition)
-  {
-    if ($definition->isShared())
+    /**
+     * @param string              $id
+     * @param sfServiceDefinition $definition
+     *
+     * @return string
+     */
+    protected function addServiceReturn($id, $definition)
     {
-      return <<<EOF
+        if ($definition->isShared()) {
+            return <<<EOF
 
-    return \$this->shared['$id'] = \$instance;
+    return \$this->shared['{$id}'] = \$instance;
   }
 
 EOF;
-    }
-    else
-    {
-      return <<<EOF
+        }
 
-    return \$instance;
+        return <<<'EOF'
+
+    return $instance;
   }
 
 EOF;
     }
-  }
-
-  /**
-   * @param string $id
-   * @param sfServiceDefinition $definition
-   * @return string
-   */
-  protected function addServiceInstance($id, $definition)
-  {
-    $class = $this->dumpValue($definition->getClass());
 
-    $arguments = array();
-    foreach ($definition->getArguments() as $value)
+    /**
+     * @param string              $id
+     * @param sfServiceDefinition $definition
+     *
+     * @return string
+     */
+    protected function addServiceInstance($id, $definition)
     {
-      $arguments[] = $this->dumpValue($value);
-    }
+        $class = $this->dumpValue($definition->getClass());
+
+        $arguments = array();
+        foreach ($definition->getArguments() as $value) {
+            $arguments[] = $this->dumpValue($value);
+        }
+
+        if (null !== $definition->getConstructor()) {
+            return sprintf("    \$instance = call_user_func(array(%s, '%s')%s);\n", $class, $definition->getConstructor(), $arguments ? ', '.implode(', ', $arguments) : '');
+        }
+
+        if ($class != "'".$definition->getClass()."'") {
+            return sprintf("    \$class = %s;\n    \$instance = new \$class(%s);\n", $class, implode(', ', $arguments));
+        }
 
-    if (null !== $definition->getConstructor())
-    {
-      return sprintf("    \$instance = call_user_func(array(%s, '%s')%s);\n", $class, $definition->getConstructor(), $arguments ? ', '.implode(', ', $arguments) : '');
-    }
-    else
-    {
-      if ($class != "'".$definition->getClass()."'")
-      {
-        return sprintf("    \$class = %s;\n    \$instance = new \$class(%s);\n", $class, implode(', ', $arguments));
-      }
-      else
-      {
         return sprintf("    \$instance = new %s(%s);\n", $definition->getClass(), implode(', ', $arguments));
-      }
     }
-  }
 
-  /**
-   * @param string $id
-   * @param sfServiceDefinition $definition
-   * @return string
-   */
-  protected function addServiceMethodCalls($id, $definition)
-  {
-    $calls = '';
-    foreach ($definition->getMethodCalls() as $call)
+    /**
+     * @param string              $id
+     * @param sfServiceDefinition $definition
+     *
+     * @return string
+     */
+    protected function addServiceMethodCalls($id, $definition)
     {
-      $arguments = array();
-      foreach ($call[1] as $value)
-      {
-        $arguments[] = $this->dumpValue($value);
-      }
-
-      $calls .= sprintf("    \$instance->%s(%s);\n", $call[0], implode(', ', $arguments));
-    }
+        $calls = '';
+        foreach ($definition->getMethodCalls() as $call) {
+            $arguments = array();
+            foreach ($call[1] as $value) {
+                $arguments[] = $this->dumpValue($value);
+            }
 
-    return $calls;
-  }
+            $calls .= sprintf("    \$instance->%s(%s);\n", $call[0], implode(', ', $arguments));
+        }
 
-  /**
-   * @param string $id
-   * @param sfServiceDefinition $definition
-   * @return string
-   */
-  protected function addServiceConfigurator($id, $definition)
-  {
-    if (!$callable = $definition->getConfigurator())
-    {
-      return '';
+        return $calls;
     }
 
-    if (is_array($callable))
+    /**
+     * @param string              $id
+     * @param sfServiceDefinition $definition
+     *
+     * @return string
+     */
+    protected function addServiceConfigurator($id, $definition)
     {
-      if (is_object($callable[0]) && $callable[0] instanceof sfServiceReference)
-      {
-        return sprintf("    %s->%s(\$instance);\n", $this->getServiceCall((string) $callable[0]), $callable[1]);
-      }
-      else
-      {
-        return sprintf("    call_user_func(array(%s, '%s'), \$instance);\n", $this->dumpValue($callable[0]), $callable[1]);
-      }
-    }
-    else
-    {
-      return sprintf("    %s(\$instance);\n", $callable);
+        if (!$callable = $definition->getConfigurator()) {
+            return '';
+        }
+
+        if (is_array($callable)) {
+            if (is_object($callable[0]) && $callable[0] instanceof sfServiceReference) {
+                return sprintf("    %s->%s(\$instance);\n", $this->getServiceCall((string) $callable[0]), $callable[1]);
+            }
+
+            return sprintf("    call_user_func(array(%s, '%s'), \$instance);\n", $this->dumpValue($callable[0]), $callable[1]);
+        }
+
+        return sprintf("    %s(\$instance);\n", $callable);
     }
-  }
 
-  protected function addService($id, $definition)
-  {
-    $name = sfServiceContainer::camelize($id);
+    protected function addService($id, $definition)
+    {
+        $name = sfServiceContainer::camelize($id);
 
-    $code = <<<EOF
+        $code = <<<EOF
 
   protected function get{$name}Service()
   {
 
 EOF;
 
-    $code .=
-      $this->addServiceInclude($id, $definition).
-      $this->addServiceShared($id, $definition).
-      $this->addServiceInstance($id, $definition).
-      $this->addServiceMethodCalls($id, $definition).
-      $this->addServiceConfigurator($id, $definition).
-      $this->addServiceReturn($id, $definition)
-    ;
+        $code .=
+          $this->addServiceInclude($id, $definition).
+          $this->addServiceShared($id, $definition).
+          $this->addServiceInstance($id, $definition).
+          $this->addServiceMethodCalls($id, $definition).
+          $this->addServiceConfigurator($id, $definition).
+          $this->addServiceReturn($id, $definition)
+        ;
 
-    return $code;
-  }
+        return $code;
+    }
 
-  protected function addServiceAlias($alias, $id)
-  {
-    $name = sfServiceContainer::camelize($alias);
+    protected function addServiceAlias($alias, $id)
+    {
+        $name = sfServiceContainer::camelize($alias);
 
-    return <<<EOF
+        return <<<EOF
 
   protected function get{$name}Service()
   {
@@ -221,166 +210,135 @@ protected function get{$name}Service()
   }
 
 EOF;
-  }
-
-  protected function addServices()
-  {
-    $code = '';
-    foreach ($this->container->getServiceDefinitions() as $id => $definition)
-    {
-      $code .= $this->addService($id, $definition);
     }
 
-    foreach ($this->container->getAliases() as $alias => $id)
+    protected function addServices()
     {
-      $code .= $this->addServiceAlias($alias, $id);
-    }
+        $code = '';
+        foreach ($this->container->getServiceDefinitions() as $id => $definition) {
+            $code .= $this->addService($id, $definition);
+        }
 
-    return $code;
-  }
+        foreach ($this->container->getAliases() as $alias => $id) {
+            $code .= $this->addServiceAlias($alias, $id);
+        }
 
-  protected function startClass($class, $baseClass)
-  {
-    return <<<EOF
-class $class extends $baseClass
+        return $code;
+    }
+
+    protected function startClass($class, $baseClass)
+    {
+        return <<<EOF
+class {$class} extends {$baseClass}
 {
   protected \$shared = array();
 
 EOF;
-  }
+    }
 
-  protected function addConstructor()
-  {
-    if (!$this->container->getParameters())
+    protected function addConstructor()
     {
-      return '';
-    }
+        if (!$this->container->getParameters()) {
+            return '';
+        }
 
-    return <<<EOF
+        return <<<'EOF'
 
   public function __construct()
   {
-    parent::__construct(\$this->getDefaultParameters());
+    parent::__construct($this->getDefaultParameters());
   }
 
 EOF;
-  }
+    }
 
-  protected function addDefaultParametersMethod()
-  {
-    if (!$this->container->getParameters())
+    protected function addDefaultParametersMethod()
     {
-      return '';
-    }
+        if (!$this->container->getParameters()) {
+            return '';
+        }
 
-    $parameters = $this->exportParameters($this->container->getParameters());
+        $parameters = $this->exportParameters($this->container->getParameters());
 
-    return <<<EOF
+        return <<<EOF
 
   protected function getDefaultParameters()
   {
-    return $parameters;
+    return {$parameters};
   }
 
 EOF;
-  }
+    }
 
-  protected function exportParameters($parameters, $indent = 6)
-  {
-    $php = array();
-    foreach ($parameters as $key => $value)
+    protected function exportParameters($parameters, $indent = 6)
     {
-      if (is_array($value))
-      {
-        $value = $this->exportParameters($value, $indent + 2);
-      }
-      elseif ($value instanceof sfServiceReference)
-      {
-        $value = sprintf("new sfServiceReference('%s')", $value);
-      }
-      elseif ($value instanceof sfServiceParameter)
-      {
-        $value = sprintf("\$this->getParameter('%s')", $value);
-      }
-      else
-      {
-        $value = var_export($value, true);
-      }
-
-      $php[] = sprintf('%s%s => %s,', str_repeat(' ', $indent), var_export($key, true), $value);
+        $php = array();
+        foreach ($parameters as $key => $value) {
+            if (is_array($value)) {
+                $value = $this->exportParameters($value, $indent + 2);
+            } elseif ($value instanceof sfServiceReference) {
+                $value = sprintf("new sfServiceReference('%s')", $value);
+            } elseif ($value instanceof sfServiceParameter) {
+                $value = sprintf("\$this->getParameter('%s')", $value);
+            } else {
+                $value = var_export($value, true);
+            }
+
+            $php[] = sprintf('%s%s => %s,', str_repeat(' ', $indent), var_export($key, true), $value);
+        }
+
+        return sprintf("array(\n%s\n%s)", implode("\n", $php), str_repeat(' ', $indent - 2));
     }
 
-    return sprintf("array(\n%s\n%s)", implode("\n", $php), str_repeat(' ', $indent - 2));
-  }
-
-  protected function endClass()
-  {
-    return <<<EOF
+    protected function endClass()
+    {
+        return <<<'EOF'
 }
 
 EOF;
-  }
-
-  protected function dumpValue($value)
-  {
-    if (is_array($value))
-    {
-      $code = array();
-      foreach ($value as $k => $v)
-      {
-        $code[] = sprintf("%s => %s", $this->dumpValue($k), $this->dumpValue($v));
-      }
-
-      return sprintf("array(%s)", implode(', ', $code));
     }
-    elseif (is_object($value) && $value instanceof sfServiceReference)
-    {
-      return $this->getServiceCall((string) $value);
-    }
-    elseif (is_object($value) && $value instanceof sfServiceParameter)
-    {
-      return sprintf("\$this->getParameter('%s')", strtolower($value));
-    }
-    elseif (is_string($value))
-    {
-      if (preg_match('/^%([^%]+)%$/', $value, $match))
-      {
-        // we do this to deal with non string values (boolean, integer, ...)
-        // the preg_replace_callback converts them to strings
-        return sprintf("\$this->getParameter('%s')", strtolower($match[1]));
-      }
-      else
-      {
-        $code = str_replace('%%', '%', preg_replace_callback('/(?<!%)(%)([^%]+)\1/', array($this, 'replaceParameter'), var_export($value, true)));
-
-        // optimize string
-        $code = preg_replace(array("/^''\./", "/\.''$/", "/\.''\./"), array('', '', '.'), $code);
 
-        return $code;
-      }
-    }
-    elseif (is_object($value) || is_resource($value))
-    {
-      throw new RuntimeException('Unable to dump a service container if a parameter is an object or a resource.');
-    }
-    else
+    protected function dumpValue($value)
     {
-      return var_export($value, true);
+        if (is_array($value)) {
+            $code = array();
+            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) {
+            return $this->getServiceCall((string) $value);
+        }
+        if (is_object($value) && $value instanceof sfServiceParameter) {
+            return sprintf("\$this->getParameter('%s')", strtolower($value));
+        }
+        if (is_string($value)) {
+            if (preg_match('/^%([^%]+)%$/', $value, $match)) {
+                // we do this to deal with non string values (boolean, integer, ...)
+                // the preg_replace_callback converts them to strings
+                return sprintf("\$this->getParameter('%s')", strtolower($match[1]));
+            }
+
+            $code = str_replace('%%', '%', preg_replace_callback('/(?<!%)(%)([^%]+)\1/', array($this, 'replaceParameter'), var_export($value, true)));
+
+            // optimize string
+            return preg_replace(array("/^''\\./", "/\\.''$/", "/\\.''\\./"), array('', '', '.'), $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.');
+        }
+
+        return var_export($value, true);
     }
-  }
 
-  public function replaceParameter($match)
-  {
-    return sprintf("'.\$this->getParameter('%s').'", strtolower($match[2]));
-  }
-
-  protected function getServiceCall($id)
-  {
-    if ('service_container' == $id)
+    protected function getServiceCall($id)
     {
-      return '$this';
-    }
+        if ('service_container' == $id) {
+            return '$this';
+        }
 
-    return sprintf('$this->getService(\'%s\')', $id);
-  }
+        return sprintf('$this->getService(\'%s\')', $id);
+    }
 }
diff --git a/lib/service/sfServiceContainerInterface.class.php b/lib/service/sfServiceContainerInterface.class.php
index cfb24f081..217552234 100644
--- a/lib/service/sfServiceContainerInterface.class.php
+++ b/lib/service/sfServiceContainerInterface.class.php
@@ -11,93 +11,92 @@
 /**
  * sfServiceContainerInterface is the interface implemented by service container classes.
  *
- * @package    symfony
- * @subpackage service
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 interface sfServiceContainerInterface
 {
-  /**
-   * Sets the service container parameters.
-   * All previously defined parameters would be removed.
-   *
-   * @see addParameters()
-   *
-   * @param array $parameters An array of parameters
-   */
-  public function setParameters(array $parameters);
+    /**
+     * Sets the service container parameters.
+     * All previously defined parameters would be removed.
+     *
+     * @see addParameters()
+     *
+     * @param array $parameters An array of parameters
+     */
+    public function setParameters(array $parameters);
 
-  /**
-   * Adds parameters to the service container parameters.
-   *
-   * @param array $parameters An array of parameters
-   */
-  public function addParameters(array $parameters);
+    /**
+     * Adds parameters to the service container parameters.
+     *
+     * @param array $parameters An array of parameters
+     */
+    public function addParameters(array $parameters);
 
-  /**
-   * Gets the service container parameters.
-   *
-   * @return array An array of parameters
-   */
-  public function getParameters();
+    /**
+     * Gets the service container parameters.
+     *
+     * @return array An array of parameters
+     */
+    public function getParameters();
 
-  /**
-   * Gets a service container parameter.
-   *
-   * @param  string $name The parameter name
-   *
-   * @return mixed  The parameter value
-   *
-   * @throw  InvalidArgumentException if the parameter is not defined
-   */
-  public function getParameter($name);
+    /**
+     * Gets a service container parameter.
+     *
+     * @param string $name The parameter name
+     *
+     * @return mixed The parameter value
+     *
+     * @throw  InvalidArgumentException if the parameter is not defined
+     */
+    public function getParameter($name);
 
-  /**
-   * Sets a service container parameter.
-   *
-   * @param string $name  The parameter name
-   * @param mixed  $value The parameter value
-   */
-  public function setParameter($name, $value);
+    /**
+     * Sets a service container parameter.
+     *
+     * @param string $name  The parameter name
+     * @param mixed  $value The parameter value
+     */
+    public function setParameter($name, $value);
 
-  /**
-   * Returns true if a parameter name is defined.
-   *
-   * @param  string  $name       The parameter name
-   *
-   * @return Boolean true if the parameter name is defined, false otherwise
-   */
-  public function hasParameter($name);
+    /**
+     * Returns true if a parameter name is defined.
+     *
+     * @param string $name The parameter name
+     *
+     * @return bool true if the parameter name is defined, false otherwise
+     */
+    public function hasParameter($name);
 
-  /**
-   * Sets a service.
-   *
-   * @param string $id      The service identifier
-   * @param object $service The service instance
-   */
-  public function setService($id, $service);
+    /**
+     * Sets a service.
+     *
+     * @param string $id      The service identifier
+     * @param object $service The service instance
+     */
+    public function setService($id, $service);
 
-  /**
-   * Gets a service.
-   *
-   * If a service is both defined through a setService() method and
-   * with a set*Service() method, the former has always precedence.
-   *
-   * @param  string $id The service identifier
-   *
-   * @return object The associated service
-   *
-   * @throw InvalidArgumentException if the service is not defined
-   */
-  public function getService($id);
+    /**
+     * Gets a service.
+     *
+     * If a service is both defined through a setService() method and
+     * with a set*Service() method, the former has always precedence.
+     *
+     * @param string $id The service identifier
+     *
+     * @return object The associated service
+     *
+     * @throw InvalidArgumentException if the service is not defined
+     */
+    public function getService($id);
 
-  /**
-   * Returns true if the given service is defined.
-   *
-   * @param  string  $id      The service identifier
-   *
-   * @return Boolean true if the service is defined, false otherwise
-   */
-  public function hasService($id);
+    /**
+     * Returns true if the given service is defined.
+     *
+     * @param string $id The service identifier
+     *
+     * @return bool true if the service is defined, false otherwise
+     */
+    public function hasService($id);
 }
diff --git a/lib/service/sfServiceContainerLoader.class.php b/lib/service/sfServiceContainerLoader.class.php
index cc46c4cbb..a27c642c9 100644
--- a/lib/service/sfServiceContainerLoader.class.php
+++ b/lib/service/sfServiceContainerLoader.class.php
@@ -11,102 +11,94 @@
 /**
  * sfServiceContainerLoader is the abstract class used by all built-in loaders.
  *
- * @package    symfony
- * @subpackage service
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id: sfServiceContainerLoader.php 267 2009-03-26 19:56:18Z fabien $
  */
 abstract class sfServiceContainerLoader implements sfServiceContainerLoaderInterface
 {
-  protected $container;
-
-  /**
-   * Constructor.
-   *
-   * @param sfServiceContainerBuilder $container A sfServiceContainerBuilder instance
-   */
-  public function __construct(sfServiceContainerBuilder $container = null)
-  {
-    $this->container = $container;
-  }
-
-  /**
-   * Sets the service container attached to this loader.
-   *
-   * @param sfServiceContainerBuilder $container A sfServiceContainerBuilder instance
-   */
-  public function setServiceContainer(sfServiceContainerBuilder $container)
-  {
-    $this->container = $container;
-  }
+    protected $container;
 
-  /**
-   * Loads a resource.
-   *
-   * A resource can be anything that can be converted to an array of
-   * definitions and parameters by the doLoad() method.
-   *
-   * Service definitions overrides the current defined ones.
-   *
-   * But for parameters, they are overridden by the current ones. It allows
-   * the parameters passed to the container constructor to have precedence
-   * over the loaded ones.
-   *
-   * $container = new sfServiceContainerBuilder(array('foo' => 'bar'));
-   * $loader = new sfServiceContainerLoaderXXX($container);
-   * $loader->load('resource_name');
-   * $container->register('foo', new stdClass());
-   *
-   * In the above example, even if the loaded resource defines a foo
-   * parameter, the value will still be 'bar' as defined in the builder
-   * constructor.
-   *
-   * You can also pass multiple resource paths to the constructor.
-   *
-   * @param mixed $resource The resource path
-   */
-  public function load($resource)
-  {
-    if (!$this->container)
+    /**
+     * Constructor.
+     *
+     * @param sfServiceContainerBuilder $container A sfServiceContainerBuilder instance
+     */
+    public function __construct(sfServiceContainerBuilder $container = null)
     {
-      throw new LogicException('You must attach the loader to a service container.');
+        $this->container = $container;
     }
 
-    $resources = func_get_args();
-    foreach ($resources as $resource)
+    /**
+     * Sets the service container attached to this loader.
+     *
+     * @param sfServiceContainerBuilder $container A sfServiceContainerBuilder instance
+     */
+    public function setServiceContainer(sfServiceContainerBuilder $container)
     {
-      list($definitions, $parameters) = $this->doLoad($resource);
+        $this->container = $container;
+    }
 
-      foreach ($definitions as $id => $definition)
-      {
-        if (is_string($definition))
-        {
-          $this->container->setAlias($id, $definition);
-        }
-        else
-        {
-          $this->container->setServiceDefinition($id, $definition);
+    /**
+     * Loads a resource.
+     *
+     * A resource can be anything that can be converted to an array of
+     * definitions and parameters by the doLoad() method.
+     *
+     * Service definitions overrides the current defined ones.
+     *
+     * But for parameters, they are overridden by the current ones. It allows
+     * the parameters passed to the container constructor to have precedence
+     * over the loaded ones.
+     *
+     * $container = new sfServiceContainerBuilder(array('foo' => 'bar'));
+     * $loader = new sfServiceContainerLoaderXXX($container);
+     * $loader->load('resource_name');
+     * $container->register('foo', new stdClass());
+     *
+     * In the above example, even if the loaded resource defines a foo
+     * parameter, the value will still be 'bar' as defined in the builder
+     * constructor.
+     *
+     * You can also pass multiple resource paths to the constructor.
+     *
+     * @param mixed $resource The resource path
+     */
+    public function load($resource)
+    {
+        if (!$this->container) {
+            throw new LogicException('You must attach the loader to a service container.');
         }
-      }
 
-      $currentParameters = $this->container->getParameters();
-      foreach ($parameters as $key => $value)
-      {
-        $this->container->setParameter($key, $this->container->resolveValue($value));
-      }
-      $this->container->addParameters($currentParameters);
+        $resources = func_get_args();
+        foreach ($resources as $resource) {
+            list($definitions, $parameters) = $this->doLoad($resource);
+
+            foreach ($definitions as $id => $definition) {
+                if (is_string($definition)) {
+                    $this->container->setAlias($id, $definition);
+                } else {
+                    $this->container->setServiceDefinition($id, $definition);
+                }
+            }
+
+            $currentParameters = $this->container->getParameters();
+            foreach ($parameters as $key => $value) {
+                $this->container->setParameter($key, $this->container->resolveValue($value));
+            }
+            $this->container->addParameters($currentParameters);
+        }
     }
-  }
 
-  /**
-   * Loads a resource.
-   *
-   * Concrete classes implements this method to convert
-   * the resource to an array of definitions and parameters.
-   *
-   * @param  mixed $resource The resource path
-   *
-   * @return array An array of definitions and parameters
-   */
-  abstract public function doLoad($resource);
+    /**
+     * Loads a resource.
+     *
+     * Concrete classes implements this method to convert
+     * the resource to an array of definitions and parameters.
+     *
+     * @param mixed $resource The resource path
+     *
+     * @return array An array of definitions and parameters
+     */
+    abstract public function doLoad($resource);
 }
diff --git a/lib/service/sfServiceContainerLoaderArray.class.php b/lib/service/sfServiceContainerLoaderArray.class.php
index b5c214291..ad412cd41 100644
--- a/lib/service/sfServiceContainerLoaderArray.class.php
+++ b/lib/service/sfServiceContainerLoaderArray.class.php
@@ -13,121 +13,98 @@
  *
  * It does not include import functionnality.
  *
- * @package    symfony
- * @subpackage service
  * @author     Jerome Macias <jmacias@groupe-exp.com>
  */
 class sfServiceContainerLoaderArray extends sfServiceContainerLoader
 {
-  public function doLoad($content)
-  {
-    $this->validate($content);
-
-    $parameters = array();
-    $definitions = array();
-
-    // parameters
-    if (isset($content['parameters']))
-    {
-      foreach ($content['parameters'] as $key => $value)
-      {
-        $parameters[strtolower($key)] = $this->resolveServices($value);
-      }
-    }
-
-    // services
-    if (isset($content['services']))
-    {
-      foreach ($content['services'] as $id => $service)
-      {
-        $definitions[$id] = $this->parseDefinition($service);
-      }
-    }
-
-    return array($definitions, $parameters);
-  }
-
-  protected function validate($content)
-  {
-    if (!is_array($content))
-    {
-      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));
-      }
-    }
-
-    return $content;
-  }
-
-  protected function parseDefinition($service)
-  {
-    if (is_string($service) && 0 === strpos($service, '@'))
+    public function doLoad($content)
     {
-      return substr($service, 1);
+        $this->validate($content);
+
+        $parameters = array();
+        $definitions = array();
+
+        // parameters
+        if (isset($content['parameters'])) {
+            foreach ($content['parameters'] as $key => $value) {
+                $parameters[strtolower($key)] = $this->resolveServices($value);
+            }
+        }
+
+        // services
+        if (isset($content['services'])) {
+            foreach ($content['services'] as $id => $service) {
+                $definitions[$id] = $this->parseDefinition($service);
+            }
+        }
+
+        return array($definitions, $parameters);
     }
 
-    $definition = new sfServiceDefinition($service['class']);
-
-    if (isset($service['shared']))
+    protected function validate($content)
     {
-      $definition->setShared($service['shared']);
-    }
+        if (!is_array($content)) {
+            throw new InvalidArgumentException('The service definition is not valid.');
+        }
 
-    if (isset($service['constructor']))
-    {
-      $definition->setConstructor($service['constructor']);
-    }
+        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 (isset($service['file']))
-    {
-      $definition->setFile($service['file']);
+        return $content;
     }
 
-    if (isset($service['arguments']))
+    protected function parseDefinition($service)
     {
-      $definition->setArguments($this->resolveServices($service['arguments']));
+        if (is_string($service) && 0 === strpos($service, '@')) {
+            return substr($service, 1);
+        }
+
+        $definition = new sfServiceDefinition($service['class']);
+
+        if (isset($service['shared'])) {
+            $definition->setShared($service['shared']);
+        }
+
+        if (isset($service['constructor'])) {
+            $definition->setConstructor($service['constructor']);
+        }
+
+        if (isset($service['file'])) {
+            $definition->setFile($service['file']);
+        }
+
+        if (isset($service['arguments'])) {
+            $definition->setArguments($this->resolveServices($service['arguments']));
+        }
+
+        if (isset($service['configurator'])) {
+            if (is_string($service['configurator'])) {
+                $definition->setConfigurator($service['configurator']);
+            } else {
+                $definition->setConfigurator(array($this->resolveServices($service['configurator'][0]), $service['configurator'][1]));
+            }
+        }
+
+        if (isset($service['calls'])) {
+            foreach ($service['calls'] as $call) {
+                $definition->addMethodCall($call[0], $this->resolveServices($call[1]));
+            }
+        }
+
+        return $definition;
     }
 
-    if (isset($service['configurator']))
+    protected function resolveServices($value)
     {
-      if (is_string($service['configurator']))
-      {
-        $definition->setConfigurator($service['configurator']);
-      }
-      else
-      {
-        $definition->setConfigurator(array($this->resolveServices($service['configurator'][0]), $service['configurator'][1]));
-      }
-    }
+        if (is_array($value)) {
+            $value = array_map(array($this, 'resolveServices'), $value);
+        } elseif (is_string($value) && 0 === strpos($value, '@')) {
+            $value = new sfServiceReference(substr($value, 1));
+        }
 
-    if (isset($service['calls']))
-    {
-      foreach ($service['calls'] as $call)
-      {
-        $definition->addMethodCall($call[0], $this->resolveServices($call[1]));
-      }
+        return $value;
     }
-
-    return $definition;
-  }
-
-  protected function resolveServices($value)
-  {
-    if (is_array($value))
-    {
-      $value = array_map(array($this, 'resolveServices'), $value);
-    }
-    else if (is_string($value) && 0 === strpos($value, '@'))
-    {
-      $value = new sfServiceReference(substr($value, 1));
-    }
-
-    return $value;
-  }
 }
diff --git a/lib/service/sfServiceContainerLoaderInterface.class.php b/lib/service/sfServiceContainerLoaderInterface.class.php
index 8e19d63f7..f8f71e580 100644
--- a/lib/service/sfServiceContainerLoaderInterface.class.php
+++ b/lib/service/sfServiceContainerLoaderInterface.class.php
@@ -11,12 +11,11 @@
 /**
  * sfServiceContainerLoaderInterface is the interface implemented by service container loader classes.
  *
- * @package    symfony
- * @subpackage service
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 interface sfServiceContainerLoaderInterface
 {
-  function load($resource);
+    public function load($resource);
 }
diff --git a/lib/service/sfServiceDefinition.class.php b/lib/service/sfServiceDefinition.class.php
index 1090ab924..8cc76edb8 100644
--- a/lib/service/sfServiceDefinition.class.php
+++ b/lib/service/sfServiceDefinition.class.php
@@ -11,232 +11,229 @@
 /**
  * sfServiceDefinition represents a service definition.
  *
- * @package    symfony
- * @subpackage service
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id: sfServiceDefinition.php 269 2009-03-26 20:39:16Z fabien $
  */
 class sfServiceDefinition
 {
-  protected
-    $class        = null,
-    $file         = null,
-    $constructor  = null,
-    $shared       = true,
-    $arguments    = array(),
-    $calls        = array(),
-    $configurator = null;
-
-  /**
-   * Constructor.
-   *
-   * @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())
-  {
-    $this->class     = $class;
-    $this->arguments = $arguments;
-  }
-
-  /**
-   * Sets the constructor method.
-   *
-   * @param  string              $method The method name
-   *
-   * @return sfServiceDefinition The current instance
-   */
-  public function setConstructor($method)
-  {
-    $this->constructor = $method;
-
-    return $this;
-  }
-
-  /**
-   * Gets the constructor method.
-   *
-   * @return sfServiceDefinition The constructor method name
-   */
-  public function getConstructor()
-  {
-    return $this->constructor;
-  }
-
-  /**
-   * Sets the service class.
-   *
-   * @param  string              $class The service class
-   *
-   * @return sfServiceDefinition The current instance
-   */
-  public function setClass($class)
-  {
-    $this->class = $class;
-
-    return $this;
-  }
-
-  /**
-   * Sets the constructor method.
-   *
-   * @return string The service class
-   */
-  public function getClass()
-  {
-    return $this->class;
-  }
-
-  /**
-   * Sets the constructor arguments to pass to the service constructor.
-   *
-   * @param  array               $arguments An array of arguments
-   *
-   * @return sfServiceDefinition The current instance
-   */
-  public function setArguments(array $arguments)
-  {
-    $this->arguments = $arguments;
-
-    return $this;
-  }
-
-  /**
-   * Adds a constructor argument to pass to the service constructor.
-   *
-   * @param  mixed               $argument An argument
-   *
-   * @return sfServiceDefinition The current instance
-   */
-  public function addArgument($argument)
-  {
-    $this->arguments[] = $argument;
-
-    return $this;
-  }
-
-  /**
-   * Gets the constructor arguments to pass to the service constructor.
-   *
-   * @return array The array of arguments
-   */
-  public function getArguments()
-  {
-    return $this->arguments;
-  }
-
-  /**
-   * Sets the methods to call after service initialization.
-   *
-   * @param  array               $calls An array of method calls
-   *
-   * @return sfServiceDefinition The current instance
-   */
-  public function setMethodCalls(array $calls = array())
-  {
-    $this->calls = array();
-    foreach ($calls as $call)
-    {
-      $this->addMethodCall($call[0], $call[1]);
-    }
-
-    return $this;
-  }
-
-  /**
-   * Adds a method to call after service initialization.
-   *
-   * @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
-   */
-  public function addMethodCall($method, array $arguments = array())
-  {
-    $this->calls[] = array($method, $arguments);
-
-    return $this;
-  }
-
-  /**
-   * Gets the methods to call after service initialization.
-   *
-   * @return  array An array of method calls
-   */
-  public function getMethodCalls()
-  {
-    return $this->calls;
-  }
-
-  /**
-   * Sets a file to require before creating the service.
-   *
-   * @param  string              $file A full pathname to include
-   *
-   * @return sfServiceDefinition The current instance
-   */
-  public function setFile($file)
-  {
-    $this->file = $file;
-
-    return $this;
-  }
-
-  /**
-   * Gets the file to require before creating the service.
-   *
-   * @return string The full pathname to include
-   */
-  public function getFile()
-  {
-    return $this->file;
-  }
-
-  /**
-   * Sets if the service must be shared or not.
-   *
-   * @param  Boolean             $shared Whether the service must be shared or not
-   *
-   * @return sfServiceDefinition The current instance
-   */
-  public function setShared($shared)
-  {
-    $this->shared = (Boolean) $shared;
-
-    return $this;
-  }
-
-  /**
-   * Returns true if the service must be shared.
-   *
-   * @return Boolean true if the service is shared, false otherwise
-   */
-  public function isShared()
-  {
-    return $this->shared;
-  }
-
-  /**
-   * Sets a configurator to call after the service is fully initialized.
-   *
-   * @param  mixed               $callable A PHP callable
-   *
-   * @return sfServiceDefinition The current instance
-   */
-  public function setConfigurator($callable)
-  {
-    $this->configurator = $callable;
-
-    return $this;
-  }
-
-  /**
-   * Gets the configurator to call after the service is fully initialized.
-   *
-   * @return mixed The PHP callable to call
-   */
-  public function getConfigurator()
-  {
-    return $this->configurator;
-  }
+    protected $class;
+    protected $file;
+    protected $constructor;
+    protected $shared = true;
+    protected $arguments = array();
+    protected $calls = array();
+    protected $configurator;
+
+    /**
+     * Constructor.
+     *
+     * @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())
+    {
+        $this->class = $class;
+        $this->arguments = $arguments;
+    }
+
+    /**
+     * Sets the constructor method.
+     *
+     * @param string $method The method name
+     *
+     * @return sfServiceDefinition The current instance
+     */
+    public function setConstructor($method)
+    {
+        $this->constructor = $method;
+
+        return $this;
+    }
+
+    /**
+     * Gets the constructor method.
+     *
+     * @return sfServiceDefinition The constructor method name
+     */
+    public function getConstructor()
+    {
+        return $this->constructor;
+    }
+
+    /**
+     * Sets the service class.
+     *
+     * @param string $class The service class
+     *
+     * @return sfServiceDefinition The current instance
+     */
+    public function setClass($class)
+    {
+        $this->class = $class;
+
+        return $this;
+    }
+
+    /**
+     * Sets the constructor method.
+     *
+     * @return string The service class
+     */
+    public function getClass()
+    {
+        return $this->class;
+    }
+
+    /**
+     * Sets the constructor arguments to pass to the service constructor.
+     *
+     * @param array $arguments An array of arguments
+     *
+     * @return sfServiceDefinition The current instance
+     */
+    public function setArguments(array $arguments)
+    {
+        $this->arguments = $arguments;
+
+        return $this;
+    }
+
+    /**
+     * Adds a constructor argument to pass to the service constructor.
+     *
+     * @param mixed $argument An argument
+     *
+     * @return sfServiceDefinition The current instance
+     */
+    public function addArgument($argument)
+    {
+        $this->arguments[] = $argument;
+
+        return $this;
+    }
+
+    /**
+     * Gets the constructor arguments to pass to the service constructor.
+     *
+     * @return array The array of arguments
+     */
+    public function getArguments()
+    {
+        return $this->arguments;
+    }
+
+    /**
+     * Sets the methods to call after service initialization.
+     *
+     * @param array $calls An array of method calls
+     *
+     * @return sfServiceDefinition The current instance
+     */
+    public function setMethodCalls(array $calls = array())
+    {
+        $this->calls = array();
+        foreach ($calls as $call) {
+            $this->addMethodCall($call[0], $call[1]);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Adds a method to call after service initialization.
+     *
+     * @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
+     */
+    public function addMethodCall($method, array $arguments = array())
+    {
+        $this->calls[] = array($method, $arguments);
+
+        return $this;
+    }
+
+    /**
+     * Gets the methods to call after service initialization.
+     *
+     * @return array An array of method calls
+     */
+    public function getMethodCalls()
+    {
+        return $this->calls;
+    }
+
+    /**
+     * Sets a file to require before creating the service.
+     *
+     * @param string $file A full pathname to include
+     *
+     * @return sfServiceDefinition The current instance
+     */
+    public function setFile($file)
+    {
+        $this->file = $file;
+
+        return $this;
+    }
+
+    /**
+     * Gets the file to require before creating the service.
+     *
+     * @return string The full pathname to include
+     */
+    public function getFile()
+    {
+        return $this->file;
+    }
+
+    /**
+     * Sets if the service must be shared or not.
+     *
+     * @param bool $shared Whether the service must be shared or not
+     *
+     * @return sfServiceDefinition The current instance
+     */
+    public function setShared($shared)
+    {
+        $this->shared = (bool) $shared;
+
+        return $this;
+    }
+
+    /**
+     * Returns true if the service must be shared.
+     *
+     * @return bool true if the service is shared, false otherwise
+     */
+    public function isShared()
+    {
+        return $this->shared;
+    }
+
+    /**
+     * Sets a configurator to call after the service is fully initialized.
+     *
+     * @param mixed $callable A PHP callable
+     *
+     * @return sfServiceDefinition The current instance
+     */
+    public function setConfigurator($callable)
+    {
+        $this->configurator = $callable;
+
+        return $this;
+    }
+
+    /**
+     * Gets the configurator to call after the service is fully initialized.
+     *
+     * @return mixed The PHP callable to call
+     */
+    public function getConfigurator()
+    {
+        return $this->configurator;
+    }
 }
diff --git a/lib/service/sfServiceParameter.class.php b/lib/service/sfServiceParameter.class.php
index 31e0520cd..b9ccbdc97 100644
--- a/lib/service/sfServiceParameter.class.php
+++ b/lib/service/sfServiceParameter.class.php
@@ -11,33 +11,31 @@
 /**
  * sfServiceParameter represents a parameter reference.
  *
- * @package    symfony
- * @subpackage service
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id: sfServiceReference.php 267 2009-03-26 19:56:18Z fabien $
  */
 class sfServiceParameter
 {
-  protected
-    $id = null;
+    protected $id;
 
-  /**
-   * Constructor.
-   *
-   * @param string $id The parameter key
-   */
-  public function __construct($id)
-  {
-    $this->id = $id;
-  }
+    /**
+     * Constructor.
+     *
+     * @param string $id The parameter key
+     */
+    public function __construct($id)
+    {
+        $this->id = $id;
+    }
 
-  /**
-   * __toString.
-   *
-   * @return string The parameter key
-   */
-  public function __toString()
-  {
-    return (string) $this->id;
-  }
+    /**
+     * __toString.
+     *
+     * @return string The parameter key
+     */
+    public function __toString()
+    {
+        return (string) $this->id;
+    }
 }
diff --git a/lib/service/sfServiceReference.class.php b/lib/service/sfServiceReference.class.php
index 26824bf3b..e0beeb2ea 100644
--- a/lib/service/sfServiceReference.class.php
+++ b/lib/service/sfServiceReference.class.php
@@ -11,33 +11,31 @@
 /**
  * sfServiceReference represents a service reference.
  *
- * @package    symfony
- * @subpackage service
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id: sfServiceReference.php 267 2009-03-26 19:56:18Z fabien $
  */
 class sfServiceReference
 {
-  protected
-    $id = null;
+    protected $id;
 
-  /**
-   * Constructor.
-   *
-   * @param string $id The service identifier
-   */
-  public function __construct($id)
-  {
-    $this->id = $id;
-  }
+    /**
+     * Constructor.
+     *
+     * @param string $id The service identifier
+     */
+    public function __construct($id)
+    {
+        $this->id = $id;
+    }
 
-  /**
-   * __toString.
-   *
-   * @return string The service identifier
-   */
-  public function __toString()
-  {
-    return (string) $this->id;
-  }
+    /**
+     * __toString.
+     *
+     * @return string The service identifier
+     */
+    public function __toString()
+    {
+        return (string) $this->id;
+    }
 }
diff --git a/lib/storage/sfCacheSessionStorage.class.php b/lib/storage/sfCacheSessionStorage.class.php
index b64fde266..8e944bbc0 100644
--- a/lib/storage/sfCacheSessionStorage.class.php
+++ b/lib/storage/sfCacheSessionStorage.class.php
@@ -6,292 +6,273 @@
  * This class stores the session data in via sfCache instance and with an id issued in a
  * signed cookie. Useful when you don't want to store the session.
  *
- * @package    symfony
- * @subpackage storage
  * @author     Dustin Whittle <dustin.whittle@symfony-project.com>
  */
 class sfCacheSessionStorage extends sfStorage
 {
-  /** @var string */
-  protected $id = null;
-  /** @var sfContext */
-  protected $context = null;
-  /** @var sfEventDispatcher */
-  protected $dispatcher = null;
-  /** @var sfWebRequest */
-  protected $request = null;
-  /** @var sfWebResponse */
-  protected $response = null;
-  /** @var sfCache|null */
-  protected $cache = null;
-  /** @var array */
-  protected $data = array();
-  /** @var bool */
-  protected $dataChanged = false;
-
-  /**
-   * Initialize this Storage.
-   *
-   * @param array $options  An associative array of initialization parameters.
-   *                        session_name [required] name of session to use
-   *                        session_cookie_path [required] cookie path
-   *                        session_cookie_domain [required] cookie domain
-   *                        session_cookie_lifetime [required] liftime of cookie
-   *                        session_cookie_secure [required] send only if secure connection
-   *                        session_cookie_http_only [required] accessible only via http protocol
-   *
-   * @return bool true, when initialization completes successfully.
-   *
-   * @throws <b>sfInitializationException</b> If an error occurs while initializing this Storage.
-   */
-  public function initialize($options = array())
-  {
-    // initialize parent
-
-    // bc with a slightly different name formerly used here, let's be
-    // compatible with the base class name for it from here on out
-    if (isset($options['session_cookie_http_only']))
+    /** @var string */
+    protected $id;
+
+    /** @var sfContext */
+    protected $context;
+
+    /** @var sfEventDispatcher */
+    protected $dispatcher;
+
+    /** @var sfWebRequest */
+    protected $request;
+
+    /** @var sfWebResponse */
+    protected $response;
+
+    /** @var sfCache|null */
+    protected $cache;
+
+    /** @var array */
+    protected $data = array();
+
+    /** @var bool */
+    protected $dataChanged = false;
+
+    /**
+     * Initialize this Storage.
+     *
+     * @param array $options An associative array of initialization parameters.
+     *                       session_name [required] name of session to use
+     *                       session_cookie_path [required] cookie path
+     *                       session_cookie_domain [required] cookie domain
+     *                       session_cookie_lifetime [required] liftime of cookie
+     *                       session_cookie_secure [required] send only if secure connection
+     *                       session_cookie_http_only [required] accessible only via http protocol
+     *
+     * @return bool true, when initialization completes successfully
+     *
+     * @throws <b>sfInitializationException</b> If an error occurs while initializing this Storage
+     */
+    public function initialize($options = array())
     {
-      $options['session_cookie_httponly'] = $options['session_cookie_http_only'];
-    }
+        // initialize parent
 
-    parent::initialize(array_merge(array('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));
+        // bc with a slightly different name formerly used here, let's be
+        // compatible with the base class name for it from here on out
+        if (isset($options['session_cookie_http_only'])) {
+            $options['session_cookie_httponly'] = $options['session_cookie_http_only'];
+        }
 
-    // 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());
-    }
-    else
-    {
-      throw new InvalidArgumentException('sfCacheSessionStorage requires cache option.');
-    }
+        parent::initialize(array_merge(array('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));
+
+        // 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());
+        } else {
+            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();
-    $this->response    = $this->context->getResponse();
+        $this->dispatcher = $this->context->getEventDispatcher();
+        $this->request = $this->context->getRequest();
+        $this->response = $this->context->getResponse();
 
-    $cookie = $this->request->getCookie($this->options['session_name']);
+        $cookie = $this->request->getCookie($this->options['session_name']);
 
-    if(strpos($cookie, ':') !== false)
-    {
-      // split cookie data id:signature(id+secret)
-      list($id, $signature) = explode(':', $cookie, 2);
-
-      if($signature == sha1($id.':'.$this->options['session_cookie_secret']))
-      {
-        // cookie is valid
-        $this->id = $id;
-      }
-      else
-      {
-        // cookie signature broken
-        $this->id = null;
-      }
-    }
-    else
-    {
-      // cookie format wrong
-      $this->id = null;
+        if (false !== strpos($cookie, ':')) {
+            // split cookie data id:signature(id+secret)
+            list($id, $signature) = explode(':', $cookie, 2);
+
+            if ($signature == sha1($id.':'.$this->options['session_cookie_secret'])) {
+                // cookie is valid
+                $this->id = $id;
+            } else {
+                // cookie signature broken
+                $this->id = null;
+            }
+        } else {
+            // cookie format wrong
+            $this->id = null;
+        }
+
+        if (empty($this->id)) {
+            $ip = isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : 'localhost';
+            $ua = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : 'ua';
+
+            // 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')));
+            }
+
+            // only send cookie when id is issued
+            $this->response->setCookie(
+                $this->options['session_name'],
+                $this->id.':'.sha1($this->id.':'.$this->options['session_cookie_secret']),
+                $this->options['session_cookie_lifetime'],
+                $this->options['session_cookie_path'],
+                $this->options['session_cookie_domain'],
+                $this->options['session_cookie_secure'],
+                $this->options['session_cookie_httponly']
+            );
+
+            $this->data = array();
+        } 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();
+            } else {
+                $data = @unserialize($raw);
+                // We test 'b:0' special case, because such a string would result
+                // in $data being === false, while raw is serialized
+                // see http://stackoverflow.com/questions/1369936/check-to-see-if-a-string-is-serialized
+                if ('b:0;' === $raw || false !== $data) {
+                    $this->data = $data;
+                } else {
+                    // Probably an old cached value (BC)
+                    $this->data = $raw;
+                }
+            }
+
+            if (sfConfig::get('sf_logging_enabled')) {
+                $this->dispatcher->notify(new sfEvent($this, 'application.log', array('Restored previous session')));
+            }
+        }
+        session_id($this->id);
+        $this->response->addCacheControlHttpHeader('private');
+
+        return true;
     }
 
-    if(empty($this->id))
+    /**
+     * Write data to this storage.
+     *
+     * The preferred format for a key is directory style so naming conflicts can be avoided.
+     *
+     * @param string $key  a unique key identifying your data
+     * @param mixed  $data data associated with your key
+     */
+    public function write($key, $data)
     {
-       $ip = isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : 'localhost';
-       $ua = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : 'ua';
-
-       // 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')));
-       }
-
-       // only send cookie when id is issued
-       $this->response->setCookie($this->options['session_name'],
-                                  $this->id.':'.sha1($this->id.':'.$this->options['session_cookie_secret']),
-                                  $this->options['session_cookie_lifetime'],
-                                  $this->options['session_cookie_path'],
-                                  $this->options['session_cookie_domain'],
-                                  $this->options['session_cookie_secure'],
-                                  $this->options['session_cookie_httponly']);
-
-       $this->data = array();
+        $this->dataChanged = true;
+
+        $this->data[$key] = &$data;
     }
-    else
+
+    /**
+     * Read data from this storage.
+     *
+     * The preferred format for a key is directory style so naming conflicts can be avoided.
+     *
+     * @param string $key a unique key identifying your data
+     *
+     * @return mixed data associated with the key
+     */
+    public function read($key)
     {
-      // 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();
-      }
-      else
-      {
-        $data = @unserialize($raw);
-        // We test 'b:0' special case, because such a string would result
-        // in $data being === false, while raw is serialized
-        // see http://stackoverflow.com/questions/1369936/check-to-see-if-a-string-is-serialized
-        if ( $raw === 'b:0;' || $data !== false)
-        {
-          $this->data = $data;
-        }
-        else
-        {
-          // Probably an old cached value (BC)
-          $this->data = $raw;
+        $retval = null;
+
+        if (isset($this->data[$key])) {
+            $retval = &$this->data[$key];
         }
-      }
 
-      if(sfConfig::get('sf_logging_enabled'))
-      {
-        $this->dispatcher->notify(new sfEvent($this, 'application.log', array('Restored previous session')));
-      }
-    }
-    session_id($this->id);
-    $this->response->addCacheControlHttpHeader('private');
-
-    return true;
-  }
-
-  /**
-   * Write data to this storage.
-   *
-   * The preferred format for a key is directory style so naming conflicts can be avoided.
-   *
-   * @param string $key  A unique key identifying your data.
-   * @param mixed  $data Data associated with your key.
-   *
-   * @return void
-   */
-  public function write($key, $data)
-  {
-    $this->dataChanged = true;
-
-    $this->data[$key] =& $data;
-  }
-
-  /**
-   * Read data from this storage.
-   *
-   * The preferred format for a key is directory style so naming conflicts can be avoided.
-   *
-   * @param string $key A unique key identifying your data.
-   *
-   * @return mixed Data associated with the key.
-   */
-  public function read($key)
-  {
-    $retval = null;
-
-    if (isset($this->data[$key]))
-    {
-      $retval =& $this->data[$key];
+        return $retval;
     }
 
-    return $retval;
-  }
-
-  /**
-   * Remove data from this storage.
-   *
-   * The preferred format for a key is directory style so naming conflicts can be avoided.
-   *
-   * @param string $key A unique key identifying your data.
-   *
-   * @return mixed Data associated with the key.
-   */
-  public function remove($key)
-  {
-    $retval = null;
-
-    if (isset($this->data[$key]))
+    /**
+     * Remove data from this storage.
+     *
+     * The preferred format for a key is directory style so naming conflicts can be avoided.
+     *
+     * @param string $key a unique key identifying your data
+     *
+     * @return mixed data associated with the key
+     */
+    public function remove($key)
     {
-      $this->dataChanged = true;
+        $retval = null;
+
+        if (isset($this->data[$key])) {
+            $this->dataChanged = true;
 
-      $retval =& $this->data[$key];
-      unset($this->data[$key]);
+            $retval = &$this->data[$key];
+            unset($this->data[$key]);
+        }
+
+        return $retval;
     }
 
-    return $retval;
-  }
-
-  /**
-   * Regenerates id that represents this storage.
-   *
-   * @param boolean $destroy Destroy session when regenerating?
-   *
-   * @return boolean True if session regenerated, false if error
-   *
-   * @throws <b>sfStorageException</b> If an error occurs while regenerating this storage
-   */
-  public function regenerate($destroy = false)
-  {
-    if($destroy)
+    /**
+     * Regenerates id that represents this storage.
+     *
+     * @param bool $destroy Destroy session when regenerating?
+     *
+     * @return bool True if session regenerated, false if error
+     *
+     * @throws <b>sfStorageException</b> If an error occurs while regenerating this storage
+     */
+    public function regenerate($destroy = false)
     {
-      $this->data = array();
-      $this->cache->remove($this->id);
+        if ($destroy) {
+            $this->data = array();
+            $this->cache->remove($this->id);
+        }
+
+        // generate session id
+        $ua = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : 'ua';
+
+        $this->id = md5(mt_rand(0, 999999).$_SERVER['REMOTE_ADDR'].$ua.$this->options['session_cookie_secret']);
+
+        // save data to cache
+        $this->cache->set($this->id, serialize($this->data));
+
+        // update session id in signed cookie
+        $this->response->setCookie(
+            $this->options['session_name'],
+            $this->id.':'.sha1($this->id.':'.$this->options['session_cookie_secret']),
+            $this->options['session_cookie_lifetime'],
+            $this->options['session_cookie_path'],
+            $this->options['session_cookie_domain'],
+            $this->options['session_cookie_secure'],
+            $this->options['session_cookie_httponly']
+        );
+        session_id($this->id);
+
+        return true;
     }
 
-    // generate session id
-    $ua = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : 'ua';
-
-    $this->id = md5(mt_rand(0, 999999).$_SERVER['REMOTE_ADDR'].$ua.$this->options['session_cookie_secret']);
-
-    // save data to cache
-    $this->cache->set($this->id, serialize($this->data));
-
-    // update session id in signed cookie
-    $this->response->setCookie($this->options['session_name'],
-                               $this->id.':'.sha1($this->id.':'.$this->options['session_cookie_secret']),
-                               $this->options['session_cookie_lifetime'],
-                               $this->options['session_cookie_path'],
-                               $this->options['session_cookie_domain'],
-                               $this->options['session_cookie_secure'],
-                               $this->options['session_cookie_httponly']);
-    session_id($this->id);
-    return true;
-  }
-
-  /**
-   * Expires the session storage instance.
-   */
-  public function expire()
-  {
-    // destroy data and regenerate id
-    $this->regenerate(true);
-
-    if(sfConfig::get('sf_logging_enabled'))
+    /**
+     * Expires the session storage instance.
+     */
+    public function expire()
     {
-      $this->dispatcher->notify(new sfEvent($this, 'application.log', array('new session created due to expiraton')));
+        // 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')));
+        }
     }
-  }
-
-  /**
-   * Executes the shutdown procedure.
-   *
-   * @throws <b>sfStorageException</b> If an error occurs while shutting down this storage
-   */
-  public function shutdown()
-  {
-    // only update cache if session has changed
-    if($this->dataChanged === true)
+
+    /**
+     * Executes the shutdown procedure.
+     *
+     * @throws <b>sfStorageException</b> If an error occurs while shutting down this storage
+     */
+    public function shutdown()
     {
-      $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')));
-      }
+        // 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')));
+            }
+        }
     }
-  }
 }
diff --git a/lib/storage/sfDatabaseSessionStorage.class.php b/lib/storage/sfDatabaseSessionStorage.class.php
index 3047a1135..c9ac23065 100644
--- a/lib/storage/sfDatabaseSessionStorage.class.php
+++ b/lib/storage/sfDatabaseSessionStorage.class.php
@@ -12,190 +12,183 @@
 /**
  * Base class for all sfStorage that uses a sfDatabase object as a storage.
  *
- * @package    symfony
- * @subpackage storage
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfDatabaseSessionStorage extends sfSessionStorage
 {
-  /** @var sfDatabase */
-  protected $db = null;
-  /** @var PDO */
-  protected $con = null;
-  
-  /**
-   * Available options:
-   *
-   *   * db_table:    The database table in which session data will be stored
-   *   * database:    The sfDatabase object to use
-   *   * db_id_col:   The database column in which the session id will be stored (sess_id by default)
-   *   * db_data_col: The database column in which the session data will be stored (sess_data by default)
-   *   * db_time_col: The database column in which the session timestamp will be stored (sess_time by default)
-   *
-   * @param  array $options An associative array of options
-   * @return bool|void
-   *
-   * @throws sfInitializationException
-   *
-   * @see sfSessionStorage
-   */
-  public function initialize($options = array())
-  {
-    $options = array_merge(array(
-      'db_id_col'   => 'sess_id',
-      'db_data_col' => 'sess_data',
-      'db_time_col' => 'sess_time',
-    ), $options);
-
-    // disable auto_start
-    $options['auto_start'] = false;
-
-    // initialize the parent
-    parent::initialize($options);
-
-    if (!isset($this->options['db_table']))
+    /** @var sfDatabase */
+    protected $db;
+
+    /** @var PDO */
+    protected $con;
+
+    /**
+     * Available options:.
+     *
+     *   * db_table:    The database table in which session data will be stored
+     *   * database:    The sfDatabase object to use
+     *   * db_id_col:   The database column in which the session id will be stored (sess_id by default)
+     *   * db_data_col: The database column in which the session data will be stored (sess_data by default)
+     *   * db_time_col: The database column in which the session timestamp will be stored (sess_time by default)
+     *
+     * @param array $options An associative array of options
+     *
+     * @return bool|void
+     *
+     * @throws sfInitializationException
+     *
+     * @see sfSessionStorage
+     */
+    public function initialize($options = array())
     {
-      throw new sfInitializationException('You must provide a "db_table" option to sfDatabaseSessionStorage.');
+        $options = array_merge(array(
+            'db_id_col' => 'sess_id',
+            'db_data_col' => 'sess_data',
+            'db_time_col' => 'sess_time',
+        ), $options);
+
+        // disable auto_start
+        $options['auto_start'] = false;
+
+        // initialize the parent
+        parent::initialize($options);
+
+        if (!isset($this->options['db_table'])) {
+            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.');
+        }
+
+        // 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')
+        );
+
+        // start our session
+        session_start();
     }
 
-    if (!isset($this->options['database']))
+    /**
+     * Closes a session.
+     *
+     * @return bool true, if the session was closed, otherwise false
+     */
+    public function sessionClose()
     {
-      throw new sfInitializationException('You must provide a "database" option to sfDatabaseSessionStorage.');
+        // do nothing
+        return true;
     }
 
-    // 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'));
-
-    // start our session
-    session_start();
-  }
-
-  /**
-   * Closes a session.
-   *
-   * @return boolean true, if the session was closed, otherwise false
-   */
-  public function sessionClose()
-  {
-    // do nothing
-    return true;
-  }
-
-  /**
-   * Opens a session.
-   *
-   * @param  string $path  (ignored)
-   * @param  string $name  (ignored)
-   *
-   * @return boolean true, if the session was opened, otherwise an exception is thrown
-   *
-   * @throws <b>DatabaseException</b> 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 */
-    $database = $this->options['database'];
-
-    // get the database and connection
-    $databaseClass = get_class($database);
-    if ($databaseClass == 'sfPropelDatabase')
-    {
-      $this->db = Propel::getConnection($database->getParameter('name'));
-    }
-    elseif($databaseClass == 'sfDoctrineDatabase')
+    /**
+     * Opens a session.
+     *
+     * @param string $path (ignored)
+     * @param string $name (ignored)
+     *
+     * @return bool true, if the session was opened, otherwise an exception is thrown
+     *
+     * @throws <b>DatabaseException</b> If a connection with the database does not exist or cannot be created
+     */
+    public function sessionOpen($path = null, $name = null)
     {
-      $this->db = $database->getConnection();
+        // what database are we using?
+        /** @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'));
+        } elseif ('sfDoctrineDatabase' == $databaseClass) {
+            $this->db = $database->getConnection();
+        } else {
+            $this->db = $database->getResource();
+        }
+
+        $this->con = $database->getConnection();
+
+        if (null === $this->db && null === $this->con) {
+            throw new sfDatabaseException('Database connection does not exist. Unable to open session.');
+        }
+
+        return true;
     }
-    else
-    {
-      $this->db = $database->getResource();
-    }
-
-    $this->con = $database->getConnection();
 
-    if (null === $this->db && null === $this->con)
+    /**
+     * Destroys a session.
+     *
+     * @param string $id A session ID
+     *
+     * @return bool true, if the session was destroyed, otherwise an exception is thrown
+     *
+     * @throws <b>DatabaseException</b> If the session cannot be destroyed
+     */
+    abstract public function sessionDestroy($id);
+
+    /**
+     * Cleans up old sessions.
+     *
+     * @param int $lifetime The lifetime of a session
+     *
+     * @return bool true, if old sessions have been cleaned, otherwise an exception is thrown
+     *
+     * @throws <b>DatabaseException</b> If any old sessions cannot be cleaned
+     */
+    abstract public function sessionGC($lifetime);
+
+    /**
+     * Reads a session.
+     *
+     * @param string $id A session ID
+     *
+     * @return bool true, if the session was read, otherwise an exception is thrown
+     *
+     * @throws <b>DatabaseException</b> If the session cannot be read
+     */
+    abstract public function sessionRead($id);
+
+    /**
+     * Writes session data.
+     *
+     * @param string $id   A session ID
+     * @param string $data A serialized chunk of session data
+     *
+     * @return bool true, if the session was written, otherwise an exception is thrown
+     *
+     * @throws <b>DatabaseException</b> If the session data cannot be written
+     */
+    abstract public function sessionWrite($id, $data);
+
+    /**
+     * Regenerates id that represents this storage.
+     *
+     * @param bool $destroy Destroy session when regenerating?
+     *
+     * @return bool|void True if session regenerated, false if error
+     */
+    public function regenerate($destroy = false)
     {
-      throw new sfDatabaseException('Database connection does not exist. Unable to open session.');
-    }
+        if (self::$sessionIdRegenerated) {
+            return;
+        }
 
-    return true;
-  }
-
-  /**
-   * Destroys a session.
-   *
-   * @param  string $id  A session ID
-   *
-   * @return bool true, if the session was destroyed, otherwise an exception is thrown
-   *
-   * @throws <b>DatabaseException</b> If the session cannot be destroyed
-   */
-  abstract public function sessionDestroy($id);
-
-  /**
-   * Cleans up old sessions.
-   *
-   * @param  int $lifetime  The lifetime of a session
-   *
-   * @return bool true, if old sessions have been cleaned, otherwise an exception is thrown
-   *
-   * @throws <b>DatabaseException</b> If any old sessions cannot be cleaned
-   */
-  abstract public function sessionGC($lifetime);
-
-  /**
-   * Reads a session.
-   *
-   * @param  string $id  A session ID
-   *
-   * @return bool true, if the session was read, otherwise an exception is thrown
-   *
-   * @throws <b>DatabaseException</b> If the session cannot be read
-   */
-  abstract public function sessionRead($id);
-
-  /**
-   * Writes session data.
-   *
-   * @param  string $id    A session ID
-   * @param  string $data  A serialized chunk of session data
-   *
-   * @return bool true, if the session was written, otherwise an exception is thrown
-   *
-   * @throws <b>DatabaseException</b> If the session data cannot be written
-   */
-  abstract public function sessionWrite($id, $data);
-
-  /**
-   * Regenerates id that represents this storage.
-   *
-   * @param  boolean $destroy Destroy session when regenerating?
-   *
-   * @return boolean|void True if session regenerated, false if error
-   *
-   */
-  public function regenerate($destroy = false)
-  {
-    if (self::$sessionIdRegenerated)
-    {
-      return;
-    }
+        $currentId = session_id();
 
-    $currentId = session_id();
+        parent::regenerate($destroy);
 
-    parent::regenerate($destroy);
+        $newId = session_id();
+        $this->sessionRead($newId);
 
-    $newId = session_id();
-    $this->sessionRead($newId);
-
-    return $this->sessionWrite($newId, $this->sessionRead($currentId));
-  }
+        return $this->sessionWrite($newId, $this->sessionRead($currentId));
+    }
 }
diff --git a/lib/storage/sfMySQLSessionStorage.class.php b/lib/storage/sfMySQLSessionStorage.class.php
index f16815611..029a4adcd 100644
--- a/lib/storage/sfMySQLSessionStorage.class.php
+++ b/lib/storage/sfMySQLSessionStorage.class.php
@@ -4,7 +4,7 @@
  * 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>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -14,203 +14,199 @@
  *
  * <b>parameters:</b> see sfDatabaseSessionStorage
  *
- * @package    symfony
- * @subpackage storage
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
  * @author     Julien Garand <julien.garand@gmail.com>
+ *
  * @version    SVN: $Id$
  */
 class sfMySQLSessionStorage extends sfDatabaseSessionStorage
 {
-  /**
-   * Destroys a session.
-   *
-   * @param  string $id  A session ID
-   *
-   * @return bool true, if the session was destroyed, otherwise an exception is thrown
-   *
-   * @throws <b>sfDatabaseException</b> If the session cannot be destroyed.
-   */
-  public function sessionDestroy($id)
-  {
-    // get table/column
-    $db_table  = $this->options['db_table'];
-    $db_id_col = $this->options['db_id_col'];
-
-    // cleanup the session id, just in case
-    $id = $this->db_escape($id);
-
-    // delete the record associated with this id
-    $sql = "DELETE FROM $db_table WHERE $db_id_col = '$id'";
-
-    if ($this->db_query($sql))
+    /**
+     * Destroys a session.
+     *
+     * @param string $id A session ID
+     *
+     * @return bool true, if the session was destroyed, otherwise an exception is thrown
+     *
+     * @throws <b>sfDatabaseException</b> If the session cannot be destroyed
+     */
+    public function sessionDestroy($id)
+    {
+        // get table/column
+        $db_table = $this->options['db_table'];
+        $db_id_col = $this->options['db_id_col'];
+
+        // cleanup the session id, just in case
+        $id = $this->db_escape($id);
+
+        // delete the record associated with this id
+        $sql = "DELETE FROM {$db_table} WHERE {$db_id_col} = '{$id}'";
+
+        if ($this->db_query($sql)) {
+            return true;
+        }
+
+        // failed to destroy session
+        throw new sfDatabaseException(sprintf('%s cannot destroy session id "%s" (%s).', get_class($this), $id, $this->db_error()));
+    }
+
+    /**
+     * Cleans up old sessions.
+     *
+     * @param int $lifetime The lifetime of a session
+     *
+     * @return bool true, if old sessions have been cleaned, otherwise an exception is thrown
+     *
+     * @throws <b>sfDatabaseException</b> If any old sessions cannot be cleaned
+     */
+    public function sessionGC($lifetime)
+    {
+        // get table/column
+        $db_table = $this->options['db_table'];
+        $db_time_col = $this->options['db_time_col'];
+
+    // delete the record older than the authorised session life time
+        $lifetime = $this->db_escape($lifetime); // We never know...
+        $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()));
+        }
+
+        return true;
+    }
+
+    /**
+     * Reads a session.
+     *
+     * @param string $id A session ID
+     *
+     * @return string The session data if the session was read or created, otherwise an exception is thrown
+     *
+     * @throws <b>sfDatabaseException</b> If the session cannot be read
+     */
+    public function sessionRead($id)
     {
-      return true;
+        // get table/column
+        $db_table = $this->options['db_table'];
+        $db_data_col = $this->options['db_data_col'];
+        $db_id_col = $this->options['db_id_col'];
+        $db_time_col = $this->options['db_time_col'];
+
+        // cleanup the session id, just in case
+        $id = $this->db_escape($id);
+
+        // get the record associated with this id
+        $sql = "SELECT {$db_data_col} FROM {$db_table} WHERE {$db_id_col} = '{$id}'";
+
+        $result = $this->db_query($sql);
+
+        if (false != $result && 1 == $this->db_num_rows($result)) {
+            // found the session
+            $data = $this->db_fetch_row($result);
+
+            return $data[0];
+        }
+
+        // session does not exist, create it
+        $sql = "INSERT INTO {$db_table} ({$db_id_col}, {$db_data_col}, {$db_time_col}) VALUES ('{$id}', '', UNIX_TIMESTAMP())";
+        if ($this->db_query($sql)) {
+            return '';
+        }
+
+        // can't create record
+        throw new sfDatabaseException(sprintf('%s cannot create new record for id "%s" (%s).', get_class($this), $id, $this->db_error()));
     }
 
-    // failed to destroy session
-    throw new sfDatabaseException(sprintf('%s cannot destroy session id "%s" (%s).', get_class($this), $id, $this->db_error()));
-  }
-
-  /**
-   * Cleans up old sessions.
-   *
-   * @param  int $lifetime  The lifetime of a session
-   *
-   * @return bool true, if old sessions have been cleaned, otherwise an exception is thrown
-   *
-   * @throws <b>sfDatabaseException</b> If any old sessions cannot be cleaned
-   */
-  public function sessionGC($lifetime)
-  {
-    // get table/column
-    $db_table    = $this->options['db_table'];
-    $db_time_col = $this->options['db_time_col'];
-
-    // delete the record older than the authorised session life time 
-    $lifetime = $this->db_escape($lifetime); // We never know...
-    $sql = "DELETE FROM $db_table WHERE $db_time_col + $lifetime < UNIX_TIMESTAMP()";
-
-    if (!$this->db_query($sql))
+    /**
+     * Writes session data.
+     *
+     * @param string $id   A session ID
+     * @param string $data A serialized chunk of session data
+     *
+     * @return bool true, if the session was written, otherwise an exception is thrown
+     *
+     * @throws <b>sfDatabaseException</b> If the session data cannot be written
+     */
+    public function sessionWrite($id, $data)
     {
-      throw new sfDatabaseException(sprintf('%s cannot delete old sessions (%s).', get_class($this), $this->db_error()));
+        // get table/column
+        $db_table = $this->options['db_table'];
+        $db_data_col = $this->options['db_data_col'];
+        $db_id_col = $this->options['db_id_col'];
+        $db_time_col = $this->options['db_time_col'];
+
+        // cleanup the session id and data, just in case
+        $id = $this->db_escape($id);
+        $data = $this->db_escape($data);
+
+        // update the record associated with this id
+        $sql = "UPDATE {$db_table} SET {$db_data_col}='{$data}', {$db_time_col}=UNIX_TIMESTAMP() WHERE {$db_id_col}='{$id}'";
+
+        if ($this->db_query($sql)) {
+            return true;
+        }
+
+        // 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()));
     }
 
-    return true;
-  }
-
-  /**
-   * Reads a session.
-   *
-   * @param  string $id  A session ID
-   *
-   * @return string      The session data if the session was read or created, otherwise an exception is thrown
-   *
-   * @throws <b>sfDatabaseException</b> If the session cannot be read
-   */
-  public function sessionRead($id)
-  {
-    // get table/column
-    $db_table    = $this->options['db_table'];
-    $db_data_col = $this->options['db_data_col'];
-    $db_id_col   = $this->options['db_id_col'];
-    $db_time_col = $this->options['db_time_col'];
-
-    // cleanup the session id, just in case
-    $id = $this->db_escape($id);
-
-    // get the record associated with this id
-    $sql = "SELECT $db_data_col FROM $db_table WHERE $db_id_col = '$id'";
-
-    $result = $this->db_query($sql);
-
-    if ($result != false && $this->db_num_rows($result) == 1)
+    /**
+     * Executes an SQL Query.
+     *
+     * @param string $query The query to execute
+     *
+     * @return mixed The result of the query
+     */
+    protected function db_query($query)
     {
-      // found the session
-      $data = $this->db_fetch_row($result);
+        return @mysql_query($query, $this->db);
+    }
 
-      return $data[0];
+    /**
+     * Escapes a string before using it in a query statement.
+     *
+     * @param string $string The string to escape
+     *
+     * @return string The escaped string
+     */
+    protected function db_escape($string)
+    {
+        return mysql_real_escape_string($string, $this->db);
     }
-    else
+
+    /**
+     * Counts the rows in a query result.
+     *
+     * @param resource $result Result of a query
+     *
+     * @return int Number of rows
+     */
+    protected function db_num_rows($result)
     {
-      // session does not exist, create it
-      $sql = "INSERT INTO $db_table ($db_id_col, $db_data_col, $db_time_col) VALUES ('$id', '', UNIX_TIMESTAMP())";
-      if ($this->db_query($sql))
-      {
-        return '';
-      }
-
-      // can't create record
-      throw new sfDatabaseException(sprintf('%s cannot create new record for id "%s" (%s).', get_class($this), $id, $this->db_error()));
+        return mysql_num_rows($result);
     }
-  }
-
-  /**
-   * Writes session data.
-   *
-   * @param  string $id    A session ID
-   * @param  string $data  A serialized chunk of session data
-   *
-   * @return bool true, if the session was written, otherwise an exception is thrown
-   *
-   * @throws <b>sfDatabaseException</b> If the session data cannot be written
-   */
-  public function sessionWrite($id, $data)
-  {
-    // get table/column
-    $db_table    = $this->options['db_table'];
-    $db_data_col = $this->options['db_data_col'];
-    $db_id_col   = $this->options['db_id_col'];
-    $db_time_col = $this->options['db_time_col'];
-
-    // cleanup the session id and data, just in case
-    $id   = $this->db_escape($id);
-    $data = $this->db_escape($data);
-
-    // update the record associated with this id
-    $sql = "UPDATE $db_table SET $db_data_col='$data', $db_time_col=UNIX_TIMESTAMP() WHERE $db_id_col='$id'";
-
-    if ($this->db_query($sql))
+
+    /**
+     * Extracts a row from a query result set.
+     *
+     * @param resource $result Result of a query
+     *
+     * @return array Extracted row as an indexed array
+     */
+    protected function db_fetch_row($result)
     {
-      return true;
+        return mysql_fetch_row($result);
     }
 
-    // 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()));
-  }
-
-  /**
-   * Executes an SQL Query
-   *
-   * @param  string $query  The query to execute
-   * @return mixed The result of the query
-   */
-  protected function db_query($query)
-  {
-    return @mysql_query($query, $this->db);
-  }
-
-  /**
-   * Escapes a string before using it in a query statement
-   *
-   * @param  string $string  The string to escape
-   * @return string The escaped string
-   */
-  protected function db_escape($string)
-  {
-    return mysql_real_escape_string($string, $this->db);
-  }
-
-  /**
-   * Counts the rows in a query result
-   *
-   * @param  resource $result  Result of a query
-   * @return int Number of rows
-   */
-  protected function db_num_rows($result)
-  {
-    return mysql_num_rows($result);
-  }
-
-  /**
-   * Extracts a row from a query result set
-   *
-   * @param  resource $result  Result of a query
-   * @return array Extracted row as an indexed array
-   */
-  protected function db_fetch_row($result)
-  {
-    return mysql_fetch_row($result);
-  }
-
-  /**
-   * Returns the text of the error message from previous database operation
-   *
-   * @return string The error text from the last database function
-   */
-  protected function db_error()
-  {
-    return mysql_error($this->db);
-  }
+    /**
+     * Returns the text of the error message from previous database operation.
+     *
+     * @return string The error text from the last database function
+     */
+    protected function db_error()
+    {
+        return mysql_error($this->db);
+    }
 }
diff --git a/lib/storage/sfMySQLiSessionStorage.class.php b/lib/storage/sfMySQLiSessionStorage.class.php
index 4f7965aee..ebe34290c 100644
--- a/lib/storage/sfMySQLiSessionStorage.class.php
+++ b/lib/storage/sfMySQLiSessionStorage.class.php
@@ -4,77 +4,80 @@
  * 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>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 /**
- * Provides support for session storage using a MySQL brand database 
+ * Provides support for session storage using a MySQL brand database
  * using the MySQL improved API.
  *
  * <b>parameters:</b> see sfDatabaseSessionStorage
  *
- * @package    symfony
- * @subpackage storage
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
  * @author     Julien Garand <julien.garand@gmail.com>
+ *
  * @version    SVN: $Id$
  */
 class sfMySQLiSessionStorage extends sfMySQLSessionStorage
 {
-  /**
-   * Execute an SQL Query
-   *
-   * @param  string $query  The query to execute
-   * @return mixed The result of the query
-   */
-  protected function db_query($query)
-  {
-    return mysqli_query($this->db, $query);
-  }
+    /**
+     * Execute an SQL Query.
+     *
+     * @param string $query The query to execute
+     *
+     * @return mixed The result of the query
+     */
+    protected function db_query($query)
+    {
+        return mysqli_query($this->db, $query);
+    }
 
-  /**
-   * Escape a string before using it in a query statement
-   *
-   * @param  string $string  The string to escape
-   * @return string The escaped string
-   */
-  protected function db_escape($string)
-  {
-    return mysqli_real_escape_string($this->db, $string);
-  }
+    /**
+     * Escape a string before using it in a query statement.
+     *
+     * @param string $string The string to escape
+     *
+     * @return string The escaped string
+     */
+    protected function db_escape($string)
+    {
+        return mysqli_real_escape_string($this->db, $string);
+    }
 
-  /**
-   * Count the rows in a query result
-   *
-   * @param  resource $result  Result of a query
-   * @return int Number of rows
-   */
-  protected function db_num_rows($result)
-  {
-    return $result->num_rows;
-  }
+    /**
+     * Count the rows in a query result.
+     *
+     * @param resource $result Result of a query
+     *
+     * @return int Number of rows
+     */
+    protected function db_num_rows($result)
+    {
+        return $result->num_rows;
+    }
 
-  /**
-   * Extract a row from a query result set
-   *
-   * @param  resource $result  Result of a query
-   * @return array Extracted row as an indexed array
-   */
-  protected function db_fetch_row($result)
-  {
-    return $result->fetch_row();
-  }
+    /**
+     * Extract a row from a query result set.
+     *
+     * @param resource $result Result of a query
+     *
+     * @return array Extracted row as an indexed array
+     */
+    protected function db_fetch_row($result)
+    {
+        return $result->fetch_row();
+    }
 
-  /**
-   * Returns the text of the error message from previous database operation
-   *
-   * @return string The error text from the last database function
-   */
-  protected function db_error()
-  {
-    return mysqli_error($this->db);
-  }
+    /**
+     * Returns the text of the error message from previous database operation.
+     *
+     * @return string The error text from the last database function
+     */
+    protected function db_error()
+    {
+        return mysqli_error($this->db);
+    }
 }
diff --git a/lib/storage/sfNoStorage.class.php b/lib/storage/sfNoStorage.class.php
index 529d1990a..81906e3bb 100644
--- a/lib/storage/sfNoStorage.class.php
+++ b/lib/storage/sfNoStorage.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -16,78 +16,76 @@
  *   storage:
  *    class: sfNoStorage
  *
- * @package    symfony
- * @subpackage storage
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfNoStorage extends sfStorage
 {
-  /**
-   * Reads data from this storage.
-   *
-   * The preferred format for a key is directory style so naming conflicts can be avoided.
-   *
-   * @param  string $key  A unique key identifying your data
-   *
-   * @return mixed Data associated with the key
-   *
-   * @throws <b>sfStorageException</b> If an error occurs while reading data from this storage
-   */
-  public function read($key)
-  {
-    return null;
-  }
+    /**
+     * Reads data from this storage.
+     *
+     * The preferred format for a key is directory style so naming conflicts can be avoided.
+     *
+     * @param string $key A unique key identifying your data
+     *
+     * @return mixed Data associated with the key
+     *
+     * @throws <b>sfStorageException</b> If an error occurs while reading data from this storage
+     */
+    public function read($key)
+    {
+        return null;
+    }
 
-  /**
-   * Removes data from this storage.
-   *
-   * The preferred format for a key is directory style so naming conflicts can be avoided.
-   *
-   * @param  string $key  A unique key identifying your data
-   *
-   * @return mixed Data associated with the key
-   *
-   * @throws <b>sfStorageException</b> If an error occurs while removing data from this storage
-   */
-  public function remove($key)
-  {
-    return null;
-  }
+    /**
+     * Removes data from this storage.
+     *
+     * The preferred format for a key is directory style so naming conflicts can be avoided.
+     *
+     * @param string $key A unique key identifying your data
+     *
+     * @return mixed Data associated with the key
+     *
+     * @throws <b>sfStorageException</b> If an error occurs while removing data from this storage
+     */
+    public function remove($key)
+    {
+        return null;
+    }
 
-  /**
-   * Writes data to this storage.
-   *
-   * The preferred format for a key is directory style so naming conflicts can be avoided.
-   *
-   * @param  string $key   A unique key identifying your data
-   * @param  mixed  $data  Data associated with your key
-   *
-   * @throws <b>sfStorageException</b> If an error occurs while writing to this storage
-   */
-  public function write($key, $data)
-  {
-  }
+    /**
+     * Writes data to this storage.
+     *
+     * The preferred format for a key is directory style so naming conflicts can be avoided.
+     *
+     * @param string $key  A unique key identifying your data
+     * @param mixed  $data Data associated with your key
+     *
+     * @throws <b>sfStorageException</b> If an error occurs while writing to this storage
+     */
+    public function write($key, $data)
+    {
+    }
 
-  /**
-   * Regenerates id that represents this storage.
-   *
-   * @param  boolean $destroy Destroy session when regenerating?
-   *
-   * @return boolean True if session regenerated, false if error
-   *
-   */
-  public function regenerate($destroy = false)
-  {
-    return true;
-  }
+    /**
+     * Regenerates id that represents this storage.
+     *
+     * @param bool $destroy Destroy session when regenerating?
+     *
+     * @return bool True if session regenerated, false if error
+     */
+    public function regenerate($destroy = false)
+    {
+        return true;
+    }
 
-  /**
-   * Executes the shutdown procedure.
-   *
-   * @throws <b>sfStorageException</b> If an error occurs while shutting down this storage
-   */
-  public function shutdown()
-  {
-  }
+    /**
+     * Executes the shutdown procedure.
+     *
+     * @throws <b>sfStorageException</b> 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 9f2668e57..dd84e9289 100644
--- a/lib/storage/sfPDOSessionStorage.class.php
+++ b/lib/storage/sfPDOSessionStorage.class.php
@@ -14,161 +14,145 @@
  *
  * <b>parameters:</b> see sfDatabaseSessionStorage
  *
- * @package    symfony
- * @subpackage storage
  * @author     Mathew Toth <developer@poetryleague.com>
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 class sfPDOSessionStorage extends sfDatabaseSessionStorage
 {
-  /**
-   * Destroys a session.
-   *
-   * @param  string $id  A session ID
-   *
-   * @return bool true, if the session was destroyed, otherwise an exception is thrown
-   *
-   * @throws <b>DatabaseException</b> If the session cannot be destroyed
-   */
-  public function sessionDestroy($id)
-  {
-    // get table/column
-    $db_table  = $this->options['db_table'];
-    $db_id_col = $this->options['db_id_col'];
-
-    // delete the record associated with this id
-    $sql = 'DELETE FROM '.$db_table.' WHERE '.$db_id_col.'= ?';
-
-    try
-    {
-      $stmt = $this->db->prepare($sql);
-      $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()));
-    }
-    
-    return true;
-  }
-
-  /**
-   * Cleans up old sessions.
-   *
-   * @param  int $lifetime  The lifetime of a session
-   *
-   * @return bool true, if old sessions have been cleaned, otherwise an exception is thrown
-   *
-   * @throws <b>DatabaseException</b> If any old sessions cannot be cleaned
-   */
-  public function sessionGC($lifetime)
-  {
-    // get table/column
-    $db_table    = $this->options['db_table'];
-    $db_time_col = $this->options['db_time_col'];
-
-    // delete the record associated with this id
-    $sql = 'DELETE FROM '.$db_table.' WHERE '.$db_time_col.' < '.(time() - $lifetime);
-
-    try
-    {
-      $this->db->query($sql);
-    }
-    catch (PDOException $e)
+    /**
+     * Destroys a session.
+     *
+     * @param string $id A session ID
+     *
+     * @return bool true, if the session was destroyed, otherwise an exception is thrown
+     *
+     * @throws <b>DatabaseException</b> If the session cannot be destroyed
+     */
+    public function sessionDestroy($id)
     {
-      throw new sfDatabaseException(sprintf('PDOException was thrown when trying to manipulate session data. Message: %s', $e->getMessage()));
+        // get table/column
+        $db_table = $this->options['db_table'];
+        $db_id_col = $this->options['db_id_col'];
+
+        // delete the record associated with this id
+        $sql = 'DELETE FROM '.$db_table.' WHERE '.$db_id_col.'= ?';
+
+        try {
+            $stmt = $this->db->prepare($sql);
+            $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()));
+        }
+
+        return true;
     }
 
-    return true;
-  }
-
-  /**
-   * Reads a session.
-   *
-   * @param  string $id  A session ID
-   *
-   * @return string      The session data if the session was read or created, otherwise an exception is thrown
-   *
-   * @throws <b>DatabaseException</b> If the session cannot be read
-   */
-  public function sessionRead($id)
-  {
-    // get table/columns
-    $db_table    = $this->options['db_table'];
-    $db_data_col = $this->options['db_data_col'];
-    $db_id_col   = $this->options['db_id_col'];
-    $db_time_col = $this->options['db_time_col'];
-
-    try
+    /**
+     * Cleans up old sessions.
+     *
+     * @param int $lifetime The lifetime of a session
+     *
+     * @return bool true, if old sessions have been cleaned, otherwise an exception is thrown
+     *
+     * @throws <b>DatabaseException</b> If any old sessions cannot be cleaned
+     */
+    public function sessionGC($lifetime)
     {
-      $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->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);
-      if (count($sessionRows) == 1)
-      {
-        return is_resource($sessionRows[0][0]) ? stream_get_contents($sessionRows[0][0]) : $sessionRows[0][0];
-      }
-      else
-      {
-        // session does not exist, create it
-        $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->execute();
-
-        return '';
-      }
-    }
-    catch (PDOException $e)
-    {
-      throw new sfDatabaseException(sprintf('PDOException was thrown when trying to manipulate session data. Message: %s', $e->getMessage()));
+        // get table/column
+        $db_table = $this->options['db_table'];
+        $db_time_col = $this->options['db_time_col'];
+
+        // delete the record associated with this id
+        $sql = 'DELETE FROM '.$db_table.' WHERE '.$db_time_col.' < '.(time() - $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()));
+        }
+
+        return true;
     }
-  }
-
-  /**
-   * Writes session data.
-   *
-   * @param  string $id    A session ID
-   * @param  string $data  A serialized chunk of session data
-   *
-   * @return bool true, if the session was written, otherwise an exception is thrown
-   *
-   * @throws <b>DatabaseException</b> If the session data cannot be written
-   */
-  public function sessionWrite($id, $data)
-  {
-    // get table/column
-    $db_table    = $this->options['db_table'];
-    $db_data_col = $this->options['db_data_col'];
-    $db_id_col   = $this->options['db_id_col'];
-    $db_time_col = $this->options['db_time_col'];
-
-    $sql = 'UPDATE '.$db_table.' SET '.$db_data_col.' = ?, '.$db_time_col.' = '.time().' WHERE '.$db_id_col.'= ?';
-
-    try
+
+    /**
+     * Reads a session.
+     *
+     * @param string $id A session ID
+     *
+     * @return string The session data if the session was read or created, otherwise an exception is thrown
+     *
+     * @throws <b>DatabaseException</b> If the session cannot be read
+     */
+    public function sessionRead($id)
     {
-      $stmt = $this->db->prepare($sql);
-      $stmt->bindParam(1, $data, PDO::PARAM_STR);
-      $stmt->bindParam(2, $id, PDO::PARAM_STR);
-      $stmt->execute();
+        // get table/columns
+        $db_table = $this->options['db_table'];
+        $db_data_col = $this->options['db_data_col'];
+        $db_id_col = $this->options['db_id_col'];
+        $db_time_col = $this->options['db_time_col'];
+
+        try {
+            $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->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);
+            if (1 == count($sessionRows)) {
+                return is_resource($sessionRows[0][0]) ? stream_get_contents($sessionRows[0][0]) : $sessionRows[0][0];
+            }
+
+            // session does not exist, create it
+            $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->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)
+
+    /**
+     * Writes session data.
+     *
+     * @param string $id   A session ID
+     * @param string $data A serialized chunk of session data
+     *
+     * @return bool true, if the session was written, otherwise an exception is thrown
+     *
+     * @throws <b>DatabaseException</b> If the session data cannot be written
+     */
+    public function sessionWrite($id, $data)
     {
-      throw new sfDatabaseException(sprintf('PDOException was thrown when trying to manipulate session data. Message: %s', $e->getMessage()));
+        // get table/column
+        $db_table = $this->options['db_table'];
+        $db_data_col = $this->options['db_data_col'];
+        $db_id_col = $this->options['db_id_col'];
+        $db_time_col = $this->options['db_time_col'];
+
+        $sql = 'UPDATE '.$db_table.' SET '.$db_data_col.' = ?, '.$db_time_col.' = '.time().' WHERE '.$db_id_col.'= ?';
+
+        try {
+            $stmt = $this->db->prepare($sql);
+            $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()));
+        }
+
+        return true;
     }
-
-    return true;
-  }
 }
diff --git a/lib/storage/sfPostgreSQLSessionStorage.class.php b/lib/storage/sfPostgreSQLSessionStorage.class.php
index 828d69483..adc576bb3 100644
--- a/lib/storage/sfPostgreSQLSessionStorage.class.php
+++ b/lib/storage/sfPostgreSQLSessionStorage.class.php
@@ -4,7 +4,7 @@
  * 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>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -14,148 +14,140 @@
  *
  * <b>parameters:</b> see sfDatabaseSessionStorage
  *
- * @package    symfony
- * @subpackage storage
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 class sfPostgreSQLSessionStorage extends sfDatabaseSessionStorage
 {
-  /**
-   * Destroys a session.
-   *
-   * @param  string $id  A session ID
-   *
-   * @return bool true, if the session was destroyed, otherwise an exception is thrown
-   *
-   * @throws <b>sfDatabaseException</b> If the session cannot be destroyed
-   */
-  public function sessionDestroy($id)
-  {
-    // get table/column
-    $db_table  = $this->options['db_table'];
-    $db_id_col = $this->options['db_id_col'];
-
-    // cleanup the session id, just in case
-    $id = addslashes($id);
-
-    // delete the record associated with this id
-    $sql = 'DELETE FROM '.$db_table.' WHERE '.$db_id_col.' = \''.$id.'\'';
-
-    if (@pg_query($this->db, $sql))
+    /**
+     * Destroys a session.
+     *
+     * @param string $id A session ID
+     *
+     * @return bool true, if the session was destroyed, otherwise an exception is thrown
+     *
+     * @throws <b>sfDatabaseException</b> If the session cannot be destroyed
+     */
+    public function sessionDestroy($id)
     {
-      return true;
-    }
+        // get table/column
+        $db_table = $this->options['db_table'];
+        $db_id_col = $this->options['db_id_col'];
 
-    // failed to destroy session
-    throw new sfDatabaseException(sprintf('sfPostgreSQLSessionStorage cannot destroy session id "%s".', $id));
-  }
-
-  /**
-   * Cleans up old sessions.
-   *
-   * @param  int $lifetime  The lifetime of a session
-   *
-   * @return bool true, if old sessions have been cleaned, otherwise an exception is thrown
-   *
-   * @throws <b>sfDatabaseException</b> If any old sessions cannot be cleaned
-   */
-  public function sessionGC($lifetime)
-  {
-    // get table/column
-    $db_table    = $this->options['db_table'];
-    $db_time_col = $this->options['db_time_col'];
-
-    // delete the record associated with this id
-    $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.');
+        // cleanup the session id, just in case
+        $id = addslashes($id);
+
+        // delete the record associated with this id
+        $sql = 'DELETE FROM '.$db_table.' WHERE '.$db_id_col.' = \''.$id.'\'';
+
+        if (@pg_query($this->db, $sql)) {
+            return true;
+        }
+
+        // failed to destroy session
+        throw new sfDatabaseException(sprintf('sfPostgreSQLSessionStorage cannot destroy session id "%s".', $id));
     }
 
-    return true;
-  }
-
-  /**
-   * Reads a session.
-   *
-   * @param  string $id  A session ID
-   *
-   * @return string      The session data if the session was read or created, otherwise an exception is thrown
-   *
-   * @throws <b>sfDatabaseException</b> If the session cannot be read
-   */
-  public function sessionRead($id)
-  {
-    // get table/column
-    $db_table    = $this->options['db_table'];
-    $db_data_col = $this->options['db_data_col'];
-    $db_id_col   = $this->options['db_id_col'];
-    $db_time_col = $this->options['db_time_col'];
-
-    // cleanup the session id, just in case
-    $id = addslashes($id);
-
-    // delete the record associated with this id
-    $sql = 'SELECT '.$db_data_col.' FROM '.$db_table.' WHERE '.$db_id_col.' = \''.$id.'\'';
-
-    $result = @pg_query($this->db, $sql);
-
-    if ($result != false && @pg_num_rows($result) == 1)
+    /**
+     * Cleans up old sessions.
+     *
+     * @param int $lifetime The lifetime of a session
+     *
+     * @return bool true, if old sessions have been cleaned, otherwise an exception is thrown
+     *
+     * @throws <b>sfDatabaseException</b> If any old sessions cannot be cleaned
+     */
+    public function sessionGC($lifetime)
     {
-      // found the session
-      $data = pg_fetch_row($result);
+        // get table/column
+        $db_table = $this->options['db_table'];
+        $db_time_col = $this->options['db_time_col'];
+
+        // delete the record associated with this id
+        $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.');
+        }
 
-      return $data[0];
+        return true;
     }
-    else
+
+    /**
+     * Reads a session.
+     *
+     * @param string $id A session ID
+     *
+     * @return string The session data if the session was read or created, otherwise an exception is thrown
+     *
+     * @throws <b>sfDatabaseException</b> If the session cannot be read
+     */
+    public function sessionRead($id)
     {
-      // session does not exist, create it
-      $sql = 'INSERT INTO '.$db_table.' ('.$db_id_col.', '.$db_data_col.', '.$db_time_col.') VALUES (\''.$id.'\', \'\', '.time().')';
+        // get table/column
+        $db_table = $this->options['db_table'];
+        $db_data_col = $this->options['db_data_col'];
+        $db_id_col = $this->options['db_id_col'];
+        $db_time_col = $this->options['db_time_col'];
+
+        // cleanup the session id, just in case
+        $id = addslashes($id);
 
-      if (@pg_query($this->db, $sql))
-      {
-        return '';
-      }
+        // delete the record associated with this id
+        $sql = 'SELECT '.$db_data_col.' FROM '.$db_table.' WHERE '.$db_id_col.' = \''.$id.'\'';
 
-      // can't create record
-      throw new sfDatabaseException(sprintf('sfPostgreSQLSessionStorage cannot create new record for id "%s".', $id));
+        $result = @pg_query($this->db, $sql);
+
+        if (false != $result && 1 == @pg_num_rows($result)) {
+            // found the session
+            $data = pg_fetch_row($result);
+
+            return $data[0];
+        }
+
+        // session does not exist, create it
+        $sql = 'INSERT INTO '.$db_table.' ('.$db_id_col.', '.$db_data_col.', '.$db_time_col.') VALUES (\''.$id.'\', \'\', '.time().')';
+
+        if (@pg_query($this->db, $sql)) {
+            return '';
+        }
+
+        // can't create record
+        throw new sfDatabaseException(sprintf('sfPostgreSQLSessionStorage cannot create new record for id "%s".', $id));
     }
-  }
-
-  /**
-   * Writes session data.
-   *
-   * @param  string $id    A session ID
-   * @param  string $data  A serialized chunk of session data
-   *
-   * @return bool true, if the session was written, otherwise an exception is thrown
-   *
-   * @throws <b>sfDatabaseException</b> If the session data cannot be written
-   */
-  public function sessionWrite($id, $data)
-  {
-    // get table/column
-    $db_table    = $this->options['db_table'];
-    $db_data_col = $this->options['db_data_col'];
-    $db_id_col   = $this->options['db_id_col'];
-    $db_time_col = $this->options['db_time_col'];
-
-    // cleanup the session id and data, just in case
-    $id   = addslashes($id);
-    $data = addslashes($data);
-
-    // delete the record associated with this id
-    $sql = 'UPDATE '.$db_table.' SET '.$db_data_col.' = \''.$data.'\', '.$db_time_col.' = '.time().' WHERE '.$db_id_col.' = \''.$id.'\'';
-
-    if (@pg_query($this->db, $sql))
+
+    /**
+     * Writes session data.
+     *
+     * @param string $id   A session ID
+     * @param string $data A serialized chunk of session data
+     *
+     * @return bool true, if the session was written, otherwise an exception is thrown
+     *
+     * @throws <b>sfDatabaseException</b> If the session data cannot be written
+     */
+    public function sessionWrite($id, $data)
     {
-      return true;
-    }
+        // get table/column
+        $db_table = $this->options['db_table'];
+        $db_data_col = $this->options['db_data_col'];
+        $db_id_col = $this->options['db_id_col'];
+        $db_time_col = $this->options['db_time_col'];
+
+        // cleanup the session id and data, just in case
+        $id = addslashes($id);
+        $data = addslashes($data);
+
+        // delete the record associated with this id
+        $sql = 'UPDATE '.$db_table.' SET '.$db_data_col.' = \''.$data.'\', '.$db_time_col.' = '.time().' WHERE '.$db_id_col.' = \''.$id.'\'';
 
-    // failed to write session data
-    throw new sfDatabaseException(sprintf('sfPostgreSQLSessionStorage cannot write session data for id "%s".', $id));
-  }
+        if (@pg_query($this->db, $sql)) {
+            return true;
+        }
+
+        // failed to write session data
+        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 f11337d39..ebd669c3e 100644
--- a/lib/storage/sfSessionStorage.class.php
+++ b/lib/storage/sfSessionStorage.class.php
@@ -17,179 +17,165 @@
  * # <b>auto_start</b>   - [Yes]     - Should session_start() automatically be called?
  * # <b>session_name</b> - [symfony] - The name of the session.
  *
- * @package    symfony
- * @subpackage storage
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 class sfSessionStorage extends sfStorage
 {
-  static protected
-    $sessionIdRegenerated = false,
-    $sessionStarted       = false;
-
-  /**
-   * Available options:
-   *
-   *  * session_name:            The cookie name (symfony by default)
-   *  * session_id:              The session id (null by default)
-   *  * auto_start:              Whether to start the session (true by default)
-   *  * session_cookie_lifetime: Cookie lifetime
-   *  * session_cookie_path:     Cookie path
-   *  * session_cookie_domain:   Cookie domain
-   *  * session_cookie_secure:   Cookie secure
-   *  * session_cookie_httponly: Cookie http only (only for PHP >= 5.2)
-   *
-   * The default values for all 'session_cookie_*' options are those returned by the session_get_cookie_params() function
-   *
-   * @param array $options An associative array of options
-   *
-   * @see sfStorage
-   *
-   * @return void
-   */
-  public function initialize($options = null)
-  {
-    $cookieDefaults = session_get_cookie_params();
-
-    $options = array_merge(array(
-      'session_name'            => 'symfony',
-      'session_id'              => null,
-      'auto_start'              => true,
-      'session_cookie_lifetime' => $cookieDefaults['lifetime'],
-      'session_cookie_path'     => $cookieDefaults['path'],
-      'session_cookie_domain'   => $cookieDefaults['domain'],
-      'session_cookie_secure'   => $cookieDefaults['secure'],
-      'session_cookie_httponly' => isset($cookieDefaults['httponly']) ? $cookieDefaults['httponly'] : false,
-      'session_cache_limiter'   => null,
-      'gc_maxlifetime'          => 1800,
-    ), $options);
-
-    // initialize parent
-    parent::initialize($options);
-
-    // set session name
-    $sessionName = $this->options['session_name'];
-
-    session_name($sessionName);
-
-    if (!(boolean) ini_get('session.use_cookies') && $sessionId = $this->options['session_id'])
+    protected static $sessionIdRegenerated = false;
+    protected static $sessionStarted = false;
+
+    /**
+     * Available options:.
+     *
+     *  * session_name:            The cookie name (symfony by default)
+     *  * session_id:              The session id (null by default)
+     *  * auto_start:              Whether to start the session (true by default)
+     *  * session_cookie_lifetime: Cookie lifetime
+     *  * session_cookie_path:     Cookie path
+     *  * session_cookie_domain:   Cookie domain
+     *  * session_cookie_secure:   Cookie secure
+     *  * session_cookie_httponly: Cookie http only (only for PHP >= 5.2)
+     *
+     * The default values for all 'session_cookie_*' options are those returned by the session_get_cookie_params() function
+     *
+     * @param array $options An associative array of options
+     *
+     * @see sfStorage
+     */
+    public function initialize($options = null)
     {
-      session_id($sessionId);
+        $cookieDefaults = session_get_cookie_params();
+
+        $options = array_merge(array(
+            'session_name' => 'symfony',
+            'session_id' => null,
+            'auto_start' => true,
+            'session_cookie_lifetime' => $cookieDefaults['lifetime'],
+            'session_cookie_path' => $cookieDefaults['path'],
+            'session_cookie_domain' => $cookieDefaults['domain'],
+            'session_cookie_secure' => $cookieDefaults['secure'],
+            'session_cookie_httponly' => isset($cookieDefaults['httponly']) ? $cookieDefaults['httponly'] : false,
+            'session_cache_limiter' => null,
+            'gc_maxlifetime' => 1800,
+        ), $options);
+
+        // initialize parent
+        parent::initialize($options);
+
+        // set session name
+        $sessionName = $this->options['session_name'];
+
+        session_name($sessionName);
+
+        if (!(bool) ini_get('session.use_cookies') && $sessionId = $this->options['session_id']) {
+            session_id($sessionId);
+        }
+
+        $lifetime = $this->options['session_cookie_lifetime'];
+        $path = $this->options['session_cookie_path'];
+        $domain = $this->options['session_cookie_domain'];
+        $secure = $this->options['session_cookie_secure'];
+        $httpOnly = $this->options['session_cookie_httponly'];
+        session_set_cookie_params($lifetime, $path, $domain, $secure, $httpOnly);
+
+        if (null !== $this->options['session_cache_limiter']) {
+            session_cache_limiter($this->options['session_cache_limiter']);
+        }
+
+        // force the max lifetime for session garbage collector to be greater than timeout
+        if (ini_get('session.gc_maxlifetime') < $this->options['gc_maxlifetime']) {
+            ini_set('session.gc_maxlifetime', $this->options['gc_maxlifetime']);
+        }
+
+        if ($this->options['auto_start'] && !self::$sessionStarted) {
+            session_start();
+            self::$sessionStarted = true;
+        }
     }
 
-    $lifetime = $this->options['session_cookie_lifetime'];
-    $path     = $this->options['session_cookie_path'];
-    $domain   = $this->options['session_cookie_domain'];
-    $secure   = $this->options['session_cookie_secure'];
-    $httpOnly = $this->options['session_cookie_httponly'];
-    session_set_cookie_params($lifetime, $path, $domain, $secure, $httpOnly);
-
-    if (null !== $this->options['session_cache_limiter'])
+    /**
+     * Reads data from this storage.
+     *
+     * The preferred format for a key is directory style so naming conflicts can be avoided.
+     *
+     * @param string $key A unique key identifying your data
+     *
+     * @return mixed Data associated with the key
+     */
+    public function read($key)
     {
-      session_cache_limiter($this->options['session_cache_limiter']);
-    }
+        $retval = null;
 
-    // force the max lifetime for session garbage collector to be greater than timeout
-    if (ini_get('session.gc_maxlifetime') < $this->options['gc_maxlifetime'])
-    {
-      ini_set('session.gc_maxlifetime', $this->options['gc_maxlifetime']);
+        if (isset($_SESSION[$key])) {
+            $retval = $_SESSION[$key];
+        }
+
+        return $retval;
     }
 
-    if ($this->options['auto_start'] && !self::$sessionStarted)
+    /**
+     * Removes data from this storage.
+     *
+     * The preferred format for a key is directory style so naming conflicts can be avoided.
+     *
+     * @param string $key A unique key identifying your data
+     *
+     * @return mixed Data associated with the key
+     */
+    public function remove($key)
     {
-      session_start();
-      self::$sessionStarted = true;
+        $retval = null;
+
+        if (isset($_SESSION[$key])) {
+            $retval = $_SESSION[$key];
+            unset($_SESSION[$key]);
+        }
+
+        return $retval;
     }
-  }
-
-  /**
-   * Reads data from this storage.
-   *
-   * The preferred format for a key is directory style so naming conflicts can be avoided.
-   *
-   * @param  string $key  A unique key identifying your data
-   *
-   * @return mixed Data associated with the key
-   */
-  public function read($key)
-  {
-    $retval = null;
-
-    if (isset($_SESSION[$key]))
+
+    /**
+     * Writes data to this storage.
+     *
+     * The preferred format for a key is directory style so naming conflicts can be avoided.
+     *
+     * @param string $key  A unique key identifying your data
+     * @param mixed  $data Data associated with your key
+     */
+    public function write($key, $data)
     {
-      $retval = $_SESSION[$key];
+        $_SESSION[$key] = $data;
     }
 
-    return $retval;
-  }
-
-  /**
-   * Removes data from this storage.
-   *
-   * The preferred format for a key is directory style so naming conflicts can be avoided.
-   *
-   * @param  string $key  A unique key identifying your data
-   *
-   * @return mixed Data associated with the key
-   */
-  public function remove($key)
-  {
-    $retval = null;
-
-    if (isset($_SESSION[$key]))
+    /**
+     * Regenerates id that represents this storage.
+     *
+     * @param bool $destroy Destroy session when regenerating?
+     *
+     * @return bool|void
+     */
+    public function regenerate($destroy = false)
     {
-      $retval = $_SESSION[$key];
-      unset($_SESSION[$key]);
+        if (self::$sessionIdRegenerated) {
+            return;
+        }
+
+        // regenerate a new session id once per object
+        session_regenerate_id($destroy);
+
+        self::$sessionIdRegenerated = true;
     }
 
-    return $retval;
-  }
-
-  /**
-   * Writes data to this storage.
-   *
-   * The preferred format for a key is directory style so naming conflicts can be avoided.
-   *
-   * @param string $key   A unique key identifying your data
-   * @param mixed  $data  Data associated with your key
-   *
-   */
-  public function write($key, $data)
-  {
-    $_SESSION[$key] = $data;
-  }
-
-  /**
-   * Regenerates id that represents this storage.
-   *
-   * @param  boolean $destroy Destroy session when regenerating?
-   *
-   * @return bool|void
-   *
-   */
-  public function regenerate($destroy = false)
-  {
-    if (self::$sessionIdRegenerated)
+    /**
+     * Executes the shutdown procedure.
+     */
+    public function shutdown()
     {
-      return;
+        // don't need a shutdown procedure because read/write do it in real-time
+        session_write_close();
+        self::$sessionStarted = false;
     }
-
-    // regenerate a new session id once per object
-    session_regenerate_id($destroy);
-
-    self::$sessionIdRegenerated = true;
-  }
-
-  /**
-   * Executes the shutdown procedure.
-   *
-   */
-  public function shutdown()
-  {
-    // don't need a shutdown procedure because read/write do it in real-time
-    session_write_close();
-    self::$sessionStarted = false;
-  }
 }
diff --git a/lib/storage/sfSessionTestStorage.class.php b/lib/storage/sfSessionTestStorage.class.php
index 5cc6b59d8..5f3979bc2 100644
--- a/lib/storage/sfSessionTestStorage.class.php
+++ b/lib/storage/sfSessionTestStorage.class.php
@@ -11,162 +11,149 @@
 /**
  * sfSessionTestStorage is a fake sfSessionStorage implementation to allow easy testing.
  *
- * @package    symfony
- * @subpackage storage
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfSessionTestStorage extends sfStorage
 {
-  protected
-    $sessionId   = null,
-    $sessionData = array();
-
-  /**
-   * Available options:
-   *
-   *  * session_path: The path to store the session files
-   *  * session_id:   The session identifier
-   *
-   * @param array $options  An associative array of options
-   *
-   * @see sfStorage
-   */
-  public function initialize($options = null)
-  {
-    if (!isset($options['session_path']))
+    protected $sessionId;
+    protected $sessionData = array();
+
+    /**
+     * Available options:.
+     *
+     *  * session_path: The path to store the session files
+     *  * session_id:   The session identifier
+     *
+     * @param array $options An associative array of options
+     *
+     * @see sfStorage
+     */
+    public function initialize($options = null)
     {
-      throw new InvalidArgumentException('The "session_path" option is mandatory for the sfSessionTestStorage class.');
+        if (!isset($options['session_path'])) {
+            throw new InvalidArgumentException('The "session_path" option is mandatory for the sfSessionTestStorage class.');
+        }
+
+        $options = array_merge(array(
+            'session_id' => null,
+        ), $options);
+
+        // initialize parent
+        parent::initialize($options);
+
+        $this->sessionId = null !== $this->options['session_id'] ? $this->options['session_id'] : (array_key_exists('session_id', $_SERVER) ? $_SERVER['session_id'] : 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();
+        } else {
+            $this->sessionId = md5(uniqid(mt_rand(), true));
+            $this->sessionData = array();
+        }
     }
 
-    $options = array_merge(array(
-      'session_id'   => null,
-    ), $options);
+    /**
+     * Gets session id for the current session storage instance.
+     *
+     * @return string Session id
+     */
+    public function getSessionId()
+    {
+        return $this->sessionId;
+    }
+
+    /**
+     * Reads data from this storage.
+     *
+     * The preferred format for a key is directory style so naming conflicts can be avoided.
+     *
+     * @param string $key A unique key identifying your data
+     *
+     * @return mixed Data associated with the key
+     */
+    public function read($key)
+    {
+        $retval = null;
 
-    // initialize parent
-    parent::initialize($options);
+        if (isset($this->sessionData[$key])) {
+            $retval = $this->sessionData[$key];
+        }
 
-    $this->sessionId = null !== $this->options['session_id'] ? $this->options['session_id'] : (array_key_exists('session_id', $_SERVER) ? $_SERVER['session_id'] : null);
+        return $retval;
+    }
 
-    if ($this->sessionId)
+    /**
+     * Removes data from this storage.
+     *
+     * The preferred format for a key is directory style so naming conflicts can be avoided.
+     *
+     * @param string $key A unique key identifying your data
+     *
+     * @return mixed Data associated with the key
+     */
+    public function remove($key)
     {
-      // 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();
+        $retval = null;
+
+        if (isset($this->sessionData[$key])) {
+            $retval = $this->sessionData[$key];
+            unset($this->sessionData[$key]);
+        }
+
+        return $retval;
     }
-    else
+
+    /**
+     * Writes data to this storage.
+     *
+     * The preferred format for a key is directory style so naming conflicts can be avoided
+     *
+     * @param string $key  A unique key identifying your data
+     * @param mixed  $data Data associated with your key
+     */
+    public function write($key, $data)
     {
-      $this->sessionId   = md5(uniqid(mt_rand(), true));
-      $this->sessionData = array();
+        $this->sessionData[$key] = $data;
     }
-  }
-
-  /**
-   * Gets session id for the current session storage instance.
-   *
-   * @return string Session id
-   */
-  public function getSessionId()
-  {
-    return $this->sessionId;
-  }
-
-  /**
-   * Reads data from this storage.
-   *
-   * The preferred format for a key is directory style so naming conflicts can be avoided.
-   *
-   * @param  string $key  A unique key identifying your data
-   *
-   * @return mixed Data associated with the key
-   */
-  public function read($key)
-  {
-    $retval = null;
-
-    if (isset($this->sessionData[$key]))
+
+    /**
+     * Clears all test sessions.
+     */
+    public function clear()
     {
-      $retval = $this->sessionData[$key];
+        sfToolkit::clearDirectory($this->options['session_path']);
     }
 
-    return $retval;
-  }
-
-  /**
-   * Removes data from this storage.
-   *
-   * The preferred format for a key is directory style so naming conflicts can be avoided.
-   *
-   * @param  string $key  A unique key identifying your data
-   *
-   * @return mixed Data associated with the key
-   */
-  public function remove($key)
-  {
-    $retval = null;
-
-    if (isset($this->sessionData[$key]))
+    /**
+     * Regenerates id that represents this storage.
+     *
+     * @param bool $destroy Destroy session when regenerating?
+     *
+     * @return bool True if session regenerated, false if error
+     */
+    public function regenerate($destroy = false)
     {
-      $retval = $this->sessionData[$key];
-      unset($this->sessionData[$key]);
+        return true;
     }
 
-    return $retval;
-  }
-
-  /**
-   * Writes data to this storage.
-   *
-   * The preferred format for a key is directory style so naming conflicts can be avoided
-   *
-   * @param string $key   A unique key identifying your data
-   * @param mixed  $data  Data associated with your key
-   *
-   */
-  public function write($key, $data)
-  {
-    $this->sessionData[$key] = $data;
-  }
-
-  /**
-   * Clears all test sessions.
-   */
-  public function clear()
-  {
-    sfToolkit::clearDirectory($this->options['session_path']);
-  }
-
-  /**
-   * Regenerates id that represents this storage.
-   *
-   * @param  boolean $destroy Destroy session when regenerating?
-   *
-   * @return boolean True if session regenerated, false if error
-   *
-   */
-  public function regenerate($destroy = false)
-  {
-    return true;
-  }
-
-  /**
-   * Executes the shutdown procedure.
-   *
-   */
-  public function shutdown()
-  {
-    if ($this->sessionId)
+    /**
+     * Executes the shutdown procedure.
+     */
+    public function shutdown()
     {
-      $current_umask = umask(0000);
-      $sessionsDir   = $this->options['session_path'];
-      if (!is_dir($sessionsDir) && !@mkdir($sessionsDir, 0777, true) && !is_dir($sessionsDir))
-      {
-        throw new \RuntimeException(sprintf('Logger was not able to create a directory "%s"', $sessionsDir));
-      }
-      umask($current_umask);
-      file_put_contents($sessionsDir.DIRECTORY_SEPARATOR.$this->sessionId.'.session', serialize($this->sessionData));
-      $this->sessionId   = '';
-      $this->sessionData = array();
+        if ($this->sessionId) {
+            $current_umask = umask(0000);
+            $sessionsDir = $this->options['session_path'];
+            if (!is_dir($sessionsDir) && !@mkdir($sessionsDir, 0777, true) && !is_dir($sessionsDir)) {
+                throw new \RuntimeException(sprintf('Logger was not able to create a directory "%s"', $sessionsDir));
+            }
+            umask($current_umask);
+            file_put_contents($sessionsDir.DIRECTORY_SEPARATOR.$this->sessionId.'.session', serialize($this->sessionData));
+            $this->sessionId = '';
+            $this->sessionData = array();
+        }
     }
-  }
 }
diff --git a/lib/storage/sfStorage.class.php b/lib/storage/sfStorage.class.php
index 44b4543cb..552aba56d 100644
--- a/lib/storage/sfStorage.class.php
+++ b/lib/storage/sfStorage.class.php
@@ -12,117 +12,112 @@
 /**
  * sfStorage allows you to customize the way symfony stores its persistent data.
  *
- * @package    symfony
- * @subpackage storage
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfStorage
 {
-  protected
-    $options = array();
-
-  /**
-   * Class constructor.
-   *
-   * @see initialize()
-   *
-   * @param array $options
-   */
-  public function __construct($options = array())
-  {
-    $this->initialize($options);
+    protected $options = array();
 
-    if ($this->options['auto_shutdown'])
+    /**
+     * Class constructor.
+     *
+     * @see initialize()
+     *
+     * @param array $options
+     */
+    public function __construct($options = array())
     {
-      register_shutdown_function(array($this, 'shutdown'));
+        $this->initialize($options);
+
+        if ($this->options['auto_shutdown']) {
+            register_shutdown_function(array($this, 'shutdown'));
+        }
     }
-  }
 
-  /**
-   * Initializes this Storage instance.
-   *
-   * Available options:
-   *
-   *  * auto_shutdown: Whether to automatically save the changes to the session (true by default)
-   *
-   * @param  array $options  An associative array of options
-   *
-   * @return void
-   *
-   * @throws <b>sfInitializationException</b> If an error occurs while initializing this sfStorage
-   */
-  public function initialize($options = array())
-  {
-    $this->options = array_merge(array(
-      'auto_shutdown' => true,
-    ), $options);
-  }
+    /**
+     * Initializes this Storage instance.
+     *
+     * Available options:
+     *
+     *  * auto_shutdown: Whether to automatically save the changes to the session (true by default)
+     *
+     * @param array $options An associative array of options
+     *
+     * @throws <b>sfInitializationException</b> If an error occurs while initializing this sfStorage
+     */
+    public function initialize($options = array())
+    {
+        $this->options = array_merge(array(
+            'auto_shutdown' => true,
+        ), $options);
+    }
 
-  /**
-   * Returns the option array.
-   *
-   * @return array The array of options
-   */
-  public function getOptions()
-  {
-    return $this->options;
-  }
+    /**
+     * Returns the option array.
+     *
+     * @return array The array of options
+     */
+    public function getOptions()
+    {
+        return $this->options;
+    }
 
-  /**
-   * Reads data from this storage.
-   *
-   * The preferred format for a key is directory style so naming conflicts can be avoided.
-   *
-   * @param  string $key  A unique key identifying your data
-   *
-   * @return mixed Data associated with the key
-   *
-   * @throws <b>sfStorageException</b> If an error occurs while reading data from this storage
-   */
-  abstract public function read($key);
+    /**
+     * Reads data from this storage.
+     *
+     * The preferred format for a key is directory style so naming conflicts can be avoided.
+     *
+     * @param string $key A unique key identifying your data
+     *
+     * @return mixed Data associated with the key
+     *
+     * @throws <b>sfStorageException</b> If an error occurs while reading data from this storage
+     */
+    abstract public function read($key);
 
-  /**
-   * Regenerates id that represents this storage.
-   *
-   * @param  boolean $destroy Destroy session when regenerating?
-   *
-   * @return boolean True if session regenerated, false if error
-   *
-   * @throws <b>sfStorageException</b> If an error occurs while regenerating this storage
-   */
-  abstract public function regenerate($destroy = false);
+    /**
+     * Regenerates id that represents this storage.
+     *
+     * @param bool $destroy Destroy session when regenerating?
+     *
+     * @return bool True if session regenerated, false if error
+     *
+     * @throws <b>sfStorageException</b> If an error occurs while regenerating this storage
+     */
+    abstract public function regenerate($destroy = false);
 
-  /**
-   * Removes data from this storage.
-   *
-   * The preferred format for a key is directory style so naming conflicts can be avoided.
-   *
-   * @param  string $key  A unique key identifying your data
-   *
-   * @return mixed Data associated with the key
-   *
-   * @throws <b>sfStorageException</b> If an error occurs while removing data from this storage
-   */
-  abstract public function remove($key);
+    /**
+     * Removes data from this storage.
+     *
+     * The preferred format for a key is directory style so naming conflicts can be avoided.
+     *
+     * @param string $key A unique key identifying your data
+     *
+     * @return mixed Data associated with the key
+     *
+     * @throws <b>sfStorageException</b> If an error occurs while removing data from this storage
+     */
+    abstract public function remove($key);
 
-  /**
-   * Executes the shutdown procedure.
-   *
-   * @throws <b>sfStorageException</b> If an error occurs while shutting down this storage
-   */
-  abstract public function shutdown();
+    /**
+     * Executes the shutdown procedure.
+     *
+     * @throws <b>sfStorageException</b> If an error occurs while shutting down this storage
+     */
+    abstract public function shutdown();
 
-  /**
-   * Writes data to this storage.
-   *
-   * The preferred format for a key is directory style so naming conflicts can be avoided.
-   *
-   * @param  string $key   A unique key identifying your data
-   * @param  mixed  $data  Data associated with your key
-   *
-   * @throws <b>sfStorageException</b> If an error occurs while writing to this storage
-   */
-  abstract public function write($key, $data);
+    /**
+     * Writes data to this storage.
+     *
+     * The preferred format for a key is directory style so naming conflicts can be avoided.
+     *
+     * @param string $key  A unique key identifying your data
+     * @param mixed  $data Data associated with your key
+     *
+     * @throws <b>sfStorageException</b> 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 7623daf1b..53375c4c6 100644
--- a/lib/task/app/sfAppRoutesTask.class.php
+++ b/lib/task/app/sfAppRoutesTask.class.php
@@ -11,156 +11,142 @@
 /**
  * Displays the current routes for an application.
  *
- * @package    symfony
- * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfAppRoutesTask extends sfBaseTask
 {
-  protected
-    $routes = array();
-
-  /**
-   * @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->namespace = 'app';
-    $this->name = 'routes';
-    $this->briefDescription = 'Displays current routes for an application';
-
-    $this->detailedDescription = <<<EOF
+    protected $routes = array();
+
+    /**
+     * @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->namespace = 'app';
+        $this->name = 'routes';
+        $this->briefDescription = 'Displays current routes for an application';
+
+        $this->detailedDescription = <<<'EOF'
 The [app:routes|INFO] displays the current routes for a given application:
 
   [./symfony app:routes frontend|INFO]
 EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $this->routes = $this->getRouting()->getRoutes();
-
-    // display
-    $arguments['name'] ? $this->outputRoute($arguments['application'], $arguments['name']) : $this->outputRoutes($arguments['application']);
-  }
-
-  protected function outputRoutes($application)
-  {
-    $this->logSection('app', sprintf('Current routes for application "%s"', $application));
-
-    $maxName = 4;
-    $maxMethod = 6;
-    foreach ($this->routes as $name => $route)
-    {
-      $requirements = $route->getRequirements();
-      $method = isset($requirements['sf_method']) ? strtoupper(is_array($requirements['sf_method']) ? implode(', ', $requirements['sf_method']) : $requirements['sf_method']) : 'ANY';
-
-      if (strlen($name) > $maxName)
-      {
-        $maxName = strlen($name);
-      }
-
-      if (strlen($method) > $maxMethod)
-      {
-        $maxMethod = strlen($method);
-      }
     }
-    $format  = '%-'.$maxName.'s %-'.$maxMethod.'s %s';
 
-    // displays the generated routes
-    $format1  = '%-'.($maxName + 9).'s %-'.($maxMethod + 9).'s %s';
-    $this->log(sprintf($format1, $this->formatter->format('Name', 'COMMENT'), $this->formatter->format('Method', 'COMMENT'), $this->formatter->format('Pattern', 'COMMENT')));
-    foreach ($this->routes as $name => $route)
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
     {
-      $requirements = $route->getRequirements();
-      $method = isset($requirements['sf_method']) ? strtoupper(is_array($requirements['sf_method']) ? implode(', ', $requirements['sf_method']) : $requirements['sf_method']) : 'ANY';
-      $this->log(sprintf($format, $name, $method, $route->getPattern()));
-    }
-  }
+        $this->routes = $this->getRouting()->getRoutes();
 
-  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));
+        // display
+        $arguments['name'] ? $this->outputRoute($arguments['application'], $arguments['name']) : $this->outputRoutes($arguments['application']);
     }
 
-    $route = $this->routes[$name];
-    $this->log(sprintf('%s         %s', $this->formatter->format('Name', 'COMMENT'), $name));
-    $this->log(sprintf('%s      %s', $this->formatter->format('Pattern', 'COMMENT'), $route->getPattern()));
-    $this->log(sprintf('%s        %s', $this->formatter->format('Class', 'COMMENT'), get_class($route)));
-
-    $defaults = '';
-    $d = $route->getDefaults();
-    ksort($d);
-    foreach ($d as $name => $value)
+    protected function outputRoutes($application)
     {
-      $defaults .= ($defaults ? "\n".str_repeat(' ', 13) : '').$name.': '.$this->formatValue($value);
+        $this->logSection('app', sprintf('Current routes for application "%s"', $application));
+
+        $maxName = 4;
+        $maxMethod = 6;
+        foreach ($this->routes as $name => $route) {
+            $requirements = $route->getRequirements();
+            $method = isset($requirements['sf_method']) ? strtoupper(is_array($requirements['sf_method']) ? implode(', ', $requirements['sf_method']) : $requirements['sf_method']) : 'ANY';
+
+            if (strlen($name) > $maxName) {
+                $maxName = strlen($name);
+            }
+
+            if (strlen($method) > $maxMethod) {
+                $maxMethod = strlen($method);
+            }
+        }
+        $format = '%-'.$maxName.'s %-'.$maxMethod.'s %s';
+
+        // displays the generated routes
+        $format1 = '%-'.($maxName + 9).'s %-'.($maxMethod + 9).'s %s';
+        $this->log(sprintf($format1, $this->formatter->format('Name', 'COMMENT'), $this->formatter->format('Method', 'COMMENT'), $this->formatter->format('Pattern', 'COMMENT')));
+        foreach ($this->routes as $name => $route) {
+            $requirements = $route->getRequirements();
+            $method = isset($requirements['sf_method']) ? strtoupper(is_array($requirements['sf_method']) ? implode(', ', $requirements['sf_method']) : $requirements['sf_method']) : 'ANY';
+            $this->log(sprintf($format, $name, $method, $route->getPattern()));
+        }
     }
-    $this->log(sprintf('%s     %s', $this->formatter->format('Defaults', 'COMMENT'), $defaults));
 
-    $requirements = '';
-    $r = $route->getRequirements();
-    ksort($r);
-    foreach ($r as $name => $value)
+    protected function outputRoute($application, $name)
     {
-      $requirements .= ($requirements ? "\n".str_repeat(' ', 13) : '').$name.': '.$this->formatValue($value);
+        $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));
+        }
+
+        $route = $this->routes[$name];
+        $this->log(sprintf('%s         %s', $this->formatter->format('Name', 'COMMENT'), $name));
+        $this->log(sprintf('%s      %s', $this->formatter->format('Pattern', 'COMMENT'), $route->getPattern()));
+        $this->log(sprintf('%s        %s', $this->formatter->format('Class', 'COMMENT'), get_class($route)));
+
+        $defaults = '';
+        $d = $route->getDefaults();
+        ksort($d);
+        foreach ($d as $name => $value) {
+            $defaults .= ($defaults ? "\n".str_repeat(' ', 13) : '').$name.': '.$this->formatValue($value);
+        }
+        $this->log(sprintf('%s     %s', $this->formatter->format('Defaults', 'COMMENT'), $defaults));
+
+        $requirements = '';
+        $r = $route->getRequirements();
+        ksort($r);
+        foreach ($r as $name => $value) {
+            $requirements .= ($requirements ? "\n".str_repeat(' ', 13) : '').$name.': '.$this->formatValue($value);
+        }
+        $this->log(sprintf('%s %s', $this->formatter->format('Requirements', 'COMMENT'), $requirements));
+
+        $options = '';
+        $o = $route->getOptions();
+        ksort($o);
+        foreach ($o as $name => $value) {
+            $options .= ($options ? "\n".str_repeat(' ', 13) : '').$name.': '.$this->formatValue($value);
+        }
+        $this->log(sprintf('%s      %s', $this->formatter->format('Options', 'COMMENT'), $options));
+        $this->log(sprintf('%s        %s', $this->formatter->format('Regex', 'COMMENT'), preg_replace('/^             /', '', preg_replace('/^/m', '             ', $route->getRegex()))));
+
+        $tokens = '';
+        foreach ($route->getTokens() as $token) {
+            if (!$tokens) {
+                $tokens = $this->displayToken($token);
+            } else {
+                $tokens .= "\n".str_repeat(' ', 13).$this->displayToken($token);
+            }
+        }
+        $this->log(sprintf('%s       %s', $this->formatter->format('Tokens', 'COMMENT'), $tokens));
     }
-    $this->log(sprintf('%s %s', $this->formatter->format('Requirements', 'COMMENT'), $requirements));
 
-    $options = '';
-    $o = $route->getOptions();
-    ksort($o);
-    foreach ($o as $name => $value)
+    protected function displayToken($token)
     {
-      $options .= ($options ? "\n".str_repeat(' ', 13) : '').$name.': '.$this->formatValue($value);
-    }
-    $this->log(sprintf('%s      %s', $this->formatter->format('Options', 'COMMENT'), $options));
-    $this->log(sprintf('%s        %s', $this->formatter->format('Regex', 'COMMENT'), preg_replace('/^             /', '', preg_replace('/^/m', '             ', $route->getRegex()))));
+        $type = array_shift($token);
+        array_shift($token);
 
-    $tokens = '';
-    foreach ($route->getTokens() as $token)
-    {
-      if (!$tokens)
-      {
-        $tokens = $this->displayToken($token);
-      }
-      else
-      {
-        $tokens .= "\n".str_repeat(' ', 13).$this->displayToken($token);
-      }
+        return sprintf('%-10s %s', $type, $this->formatValue($token));
     }
-    $this->log(sprintf('%s       %s', $this->formatter->format('Tokens', 'COMMENT'), $tokens));
-  }
-
-  protected function displayToken($token)
-  {
-    $type = array_shift($token);
-    array_shift($token);
 
-    return sprintf('%-10s %s', $type, $this->formatValue($token));
-  }
-
-  protected function formatValue($value)
-  {
-    if (is_object($value))
-    {
-      return sprintf('object(%s)', get_class($value));
-    }
-    else
+    protected function formatValue($value)
     {
-      return preg_replace("/\n\s*/s", '', var_export($value, true));
+        if (is_object($value)) {
+            return sprintf('object(%s)', get_class($value));
+        }
+
+        return preg_replace("/\n\\s*/s", '', var_export($value, true));
     }
-  }
 }
diff --git a/lib/task/cache/sfCacheClearTask.class.php b/lib/task/cache/sfCacheClearTask.class.php
index 1f2d28cb5..447867d23 100644
--- a/lib/task/cache/sfCacheClearTask.class.php
+++ b/lib/task/cache/sfCacheClearTask.class.php
@@ -11,33 +11,70 @@
 /**
  * Clears the symfony cache.
  *
- * @package    symfony
- * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfCacheClearTask extends sfBaseTask
 {
-  protected
-    $config = null;
-
-  /**
-   * @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->aliases = array('cc');
-    $this->namespace = 'cache';
-    $this->name = 'clear';
-    $this->briefDescription = 'Clears the cache';
-
-    $this->detailedDescription = <<<EOF
+    protected $config;
+
+    public function getFactoriesConfiguration(sfApplicationConfiguration $appConfiguration)
+    {
+        $app = $appConfiguration->getApplication();
+        $env = $appConfiguration->getEnvironment();
+
+        if (!isset($this->config[$app])) {
+            $this->config[$app] = array();
+        }
+
+        if (!isset($this->config[$app][$env])) {
+            $this->config[$app][$env] = sfFactoryConfigHandler::getConfiguration($appConfiguration->getConfigPaths('config/factories.yml'));
+        }
+
+        return $this->config[$app][$env];
+    }
+
+    public function cleanCacheFromFactoryConfig($class, $parameters = array())
+    {
+        if ($class) {
+            // the standard array with ['class'] and ['param'] can be passed as well
+            if (is_array($class)) {
+                if (!isset($class['class'])) {
+                    return;
+                }
+                if (isset($class['param'])) {
+                    $parameters = $class['param'];
+                }
+                $class = $class['class'];
+            }
+
+            try {
+                $cache = new $class($parameters);
+                $cache->clean();
+            } catch (Exception $e) {
+                $this->logSection('error', $e->getMessage(), 255, 'ERROR');
+            }
+        }
+    }
+
+    /**
+     * @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->aliases = array('cc');
+        $this->namespace = 'cache';
+        $this->name = 'clear';
+        $this->briefDescription = 'Clears the cache';
+
+        $this->detailedDescription = <<<'EOF'
 The [cache:clear|INFO] task clears the symfony cache.
 
 By default, it removes the cache for all available types, all applications,
@@ -65,200 +102,143 @@ protected function configure()
 and [template|COMMENT].
 
 EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    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();
-
-    // iterate through applications
-    $apps = null === $options['app'] ? $dirFinder->in(sfConfig::get('sf_apps_dir')) : array($options['app']);
-    foreach ($apps as $app)
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
     {
-      $this->checkAppExists($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']);
-      foreach ($envs as $env)
-      {
-        if (!is_dir(sfConfig::get('sf_cache_dir').'/'.$app.'/'.$env))
-        {
-          continue;
+        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')));
         }
 
-        $this->logSection('cache', sprintf('Clearing cache type "%s" for "%s" app and "%s" env', $options['type'], $app, $env));
+        // finder to find directories (1 level) in a directory
+        $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']);
+        foreach ($apps as $app) {
+            $this->checkAppExists($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']);
+            foreach ($envs as $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);
 
-        $this->lock($app, $env);
+                $event = $appConfiguration->getEventDispatcher()->notifyUntil(new sfEvent($this, 'task.cache.clear', array('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']));
+                    }
+                    $this->{$method}($appConfiguration);
+                }
 
-        $event = $appConfiguration->getEventDispatcher()->notifyUntil(new sfEvent($this, 'task.cache.clear', array('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']));
-          }
-          $this->$method($appConfiguration);
+                $this->unlock($app, $env);
+            }
         }
 
-        $this->unlock($app, $env);
-      }
+        // clear global cache
+        if (null === $options['app'] && 'all' == $options['type']) {
+            $this->getFilesystem()->remove(sfFinder::type('file')->discard('.*')->in(sfConfig::get('sf_cache_dir')));
+        }
     }
 
-    // clear global cache
-    if (null === $options['app'] && 'all' == $options['type'])
+    protected function getClearCacheMethod($type)
     {
-      $this->getFilesystem()->remove(sfFinder::type('file')->discard('.*')->in(sfConfig::get('sf_cache_dir')));
+        return sprintf('clear%sCache', ucfirst($type));
     }
-  }
-
-  protected function getClearCacheMethod($type)
-  {
-    return sprintf('clear%sCache', ucfirst($type));
-  }
-
-  protected function clearAllCache(sfApplicationConfiguration $appConfiguration)
-  {
-    $this->clearI18NCache($appConfiguration);
-    $this->clearRoutingCache($appConfiguration);
-    $this->clearTemplateCache($appConfiguration);
-    $this->clearModuleCache($appConfiguration);
-    $this->clearConfigCache($appConfiguration);
-  }
-
-  protected function clearConfigCache(sfApplicationConfiguration $appConfiguration)
-  {
-    $subDir = sfConfig::get('sf_cache_dir').'/'.$appConfiguration->getApplication().'/'.$appConfiguration->getEnvironment().'/config';
-
-    if (is_dir($subDir))
+
+    protected function clearAllCache(sfApplicationConfiguration $appConfiguration)
     {
-      // remove cache files
-      $this->getFilesystem()->remove(sfFinder::type('file')->discard('.*')->in($subDir));
+        $this->clearI18NCache($appConfiguration);
+        $this->clearRoutingCache($appConfiguration);
+        $this->clearTemplateCache($appConfiguration);
+        $this->clearModuleCache($appConfiguration);
+        $this->clearConfigCache($appConfiguration);
     }
-  }
-
-  protected function clearI18NCache(sfApplicationConfiguration $appConfiguration)
-  {
-    $config = $this->getFactoriesConfiguration($appConfiguration);
 
-    if (isset($config['i18n']['param']['cache']))
+    protected function clearConfigCache(sfApplicationConfiguration $appConfiguration)
     {
-      $this->cleanCacheFromFactoryConfig($config['i18n']['param']['cache']);
-    }
-  }
+        $subDir = sfConfig::get('sf_cache_dir').'/'.$appConfiguration->getApplication().'/'.$appConfiguration->getEnvironment().'/config';
 
-  protected function clearRoutingCache(sfApplicationConfiguration $appConfiguration)
-  {
-    $config = $this->getFactoriesConfiguration($appConfiguration);
+        if (is_dir($subDir)) {
+            // remove cache files
+            $this->getFilesystem()->remove(sfFinder::type('file')->discard('.*')->in($subDir));
+        }
+    }
 
-    if (isset($config['routing']['param']['cache']))
+    protected function clearI18NCache(sfApplicationConfiguration $appConfiguration)
     {
-      $this->cleanCacheFromFactoryConfig($config['routing']['param']['cache']);
-    }
-  }
+        $config = $this->getFactoriesConfiguration($appConfiguration);
 
-  protected function clearTemplateCache(sfApplicationConfiguration $appConfiguration)
-  {
-    $config = $this->getFactoriesConfiguration($appConfiguration);
+        if (isset($config['i18n']['param']['cache'])) {
+            $this->cleanCacheFromFactoryConfig($config['i18n']['param']['cache']);
+        }
+    }
 
-    if (isset($config['view_cache']))
+    protected function clearRoutingCache(sfApplicationConfiguration $appConfiguration)
     {
-      $this->cleanCacheFromFactoryConfig($config['view_cache']);
-    }
-  }
+        $config = $this->getFactoriesConfiguration($appConfiguration);
 
-  protected function clearModuleCache(sfApplicationConfiguration $appConfiguration)
-  {
-    $subDir = sfConfig::get('sf_cache_dir').'/'.$appConfiguration->getApplication().'/'.$appConfiguration->getEnvironment().'/modules';
+        if (isset($config['routing']['param']['cache'])) {
+            $this->cleanCacheFromFactoryConfig($config['routing']['param']['cache']);
+        }
+    }
 
-    if (is_dir($subDir))
+    protected function clearTemplateCache(sfApplicationConfiguration $appConfiguration)
     {
-      // remove cache files
-      $this->getFilesystem()->remove(sfFinder::type('file')->discard('.*')->in($subDir));
-    }
-  }
+        $config = $this->getFactoriesConfiguration($appConfiguration);
 
-  public function getFactoriesConfiguration(sfApplicationConfiguration $appConfiguration)
-  {
-    $app = $appConfiguration->getApplication();
-    $env = $appConfiguration->getEnvironment();
+        if (isset($config['view_cache'])) {
+            $this->cleanCacheFromFactoryConfig($config['view_cache']);
+        }
+    }
 
-    if (!isset($this->config[$app]))
+    protected function clearModuleCache(sfApplicationConfiguration $appConfiguration)
     {
-      $this->config[$app] = array();
+        $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));
+        }
     }
 
-    if (!isset($this->config[$app][$env]))
+    protected function lock($app, $env)
     {
-      $this->config[$app][$env] = sfFactoryConfigHandler::getConfiguration($appConfiguration->getConfigPaths('config/factories.yml'));
+        // create a lock file
+        $this->getFilesystem()->touch($this->getLockFile($app, $env));
+
+        // change mode so the web user can remove it if we die
+        $this->getFilesystem()->chmod($this->getLockFile($app, $env), 0777);
     }
 
-    return $this->config[$app][$env] ;
-  }
+    protected function unlock($app, $env)
+    {
+        // release lock
+        $this->getFilesystem()->remove($this->getLockFile($app, $env));
+    }
 
-  public function cleanCacheFromFactoryConfig($class, $parameters = array())
-  {
-    if ($class)
+    protected function getLockFile($app, $env)
     {
-      // the standard array with ['class'] and ['param'] can be passed as well
-      if (is_array($class))
-      {
-        if (!isset($class['class']))
-        {
-          return;
-        }
-        if (isset($class['param']))
-        {
-          $parameters = $class['param'];
-        }
-        $class = $class['class'];
-      }
-      try
-      {
-        $cache = new $class($parameters);
-        $cache->clean();
-      }
-      catch (Exception $e)
-      {
-        $this->logSection('error', $e->getMessage(), 255, 'ERROR');
-      }
+        return sfConfig::get('sf_data_dir').'/'.$app.'_'.$env.'-cli.lck';
     }
-  }
-
-  protected function lock($app, $env)
-  {
-    // create a lock file
-    $this->getFilesystem()->touch($this->getLockFile($app, $env));
-
-    // change mode so the web user can remove it if we die
-    $this->getFilesystem()->chmod($this->getLockFile($app, $env), 0777);
-  }
-
-  protected function unlock($app, $env)
-  {
-    // release lock
-    $this->getFilesystem()->remove($this->getLockFile($app, $env));
-  }
-
-  protected function getLockFile($app, $env)
-  {
-    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 4eb20d9a1..23e461260 100644
--- a/lib/task/configure/sfConfigureAuthorTask.class.php
+++ b/lib/task/configure/sfConfigureAuthorTask.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -11,28 +11,27 @@
 /**
  * Configures the main author of the project.
  *
- * @package    symfony
- * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfConfigureAuthorTask extends sfBaseTask
 {
-  /**
-   * @see sfTask
-   */
-  protected function configure()
-  {
-    $this->addArguments(array(
-      new sfCommandArgument('author', sfCommandArgument::REQUIRED, 'The project author'),
-    ));
+    /**
+     * @see sfTask
+     */
+    protected function configure()
+    {
+        $this->addArguments(array(
+            new sfCommandArgument('author', sfCommandArgument::REQUIRED, 'The project author'),
+        ));
 
-    $this->namespace = 'configure';
-    $this->name = 'author';
+        $this->namespace = 'configure';
+        $this->name = 'author';
 
-    $this->briefDescription = 'Configure project author';
+        $this->briefDescription = 'Configure project author';
 
-    $this->detailedDescription = <<<EOF
+        $this->detailedDescription = <<<'EOF'
 The [configure:author|INFO] task configures the author for a project:
 
   [./symfony configure:author "Fabien Potencier <fabien.potencier@symfony-project.com>"|INFO]
@@ -41,33 +40,33 @@ protected function configure()
 
 The value is stored in [config/properties.ini].
 EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $file = sfConfig::get('sf_config_dir').'/properties.ini';
-    $content = parse_ini_file($file, true);
+    }
 
-    if (!isset($content['symfony']))
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
     {
-      $content['symfony'] = array();
-    }
+        $file = sfConfig::get('sf_config_dir').'/properties.ini';
+        $content = parse_ini_file($file, true);
 
-    $content['symfony']['author'] = $arguments['author'];
+        if (!isset($content['symfony'])) {
+            $content['symfony'] = array();
+        }
 
-    $ini = '';
-    foreach ($content as $section => $values)
-    {
-      $ini .= sprintf("[%s]\n", $section);
-      foreach ($values as $key => $value)
-      {
-        $ini .= sprintf("  %s=%s\n", $key, $value);
-      }
-    }
+        $content['symfony']['author'] = $arguments['author'];
 
-    file_put_contents($file, $ini);
-  }
+        $ini = '';
+        foreach ($content as $section => $values) {
+            $ini .= sprintf("[%s]\n", $section);
+            foreach ($values as $key => $value) {
+                $ini .= sprintf("  %s=%s\n", $key, $value);
+            }
+        }
+
+        file_put_contents($file, $ini);
+    }
 }
diff --git a/lib/task/generator/sfGenerateAppTask.class.php b/lib/task/generator/sfGenerateAppTask.class.php
index 21f1e3e3e..aeaa610fb 100644
--- a/lib/task/generator/sfGenerateAppTask.class.php
+++ b/lib/task/generator/sfGenerateAppTask.class.php
@@ -8,38 +8,37 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/sfGeneratorBaseTask.class.php');
+require_once __DIR__.'/sfGeneratorBaseTask.class.php';
 
 /**
  * Generates a new application.
  *
- * @package    symfony
- * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfGenerateAppTask extends sfGeneratorBaseTask
 {
-  /**
-   * @see sfTask
-   */
-  protected function configure()
-  {
-    $this->addArguments(array(
-      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->namespace = 'generate';
-    $this->name = 'app';
-
-    $this->briefDescription = 'Generates a new application';
-
-    $this->detailedDescription = <<<EOF
+    /**
+     * @see sfTask
+     */
+    protected function configure()
+    {
+        $this->addArguments(array(
+            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->namespace = 'generate';
+        $this->name = 'app';
+
+        $this->briefDescription = 'Generates a new application';
+
+        $this->detailedDescription = <<<'EOF'
 The [generate:app|INFO] task creates the basic directory structure
 for a new application in the current project:
 
@@ -73,95 +72,91 @@ protected function configure()
 You can customize the default skeleton used by the task by creating a
 [%sf_data_dir%/skeleton/app|COMMENT] directory.
 EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $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));
     }
 
-    $appDir = sfConfig::get('sf_apps_dir').'/'.$app;
-
-    if (is_dir($appDir))
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
     {
-      throw new sfCommandException(sprintf('The application "%s" already exists.', $appDir));
+        $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));
+        }
+
+        $appDir = sfConfig::get('sf_apps_dir').'/'.$app;
+
+        if (is_dir($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';
+        } else {
+            $skeletonDir = __DIR__.'/skeleton/app';
+        }
+
+        // Create basic application structure
+        $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');
+        if (!$firstApp) {
+            $indexName = $app;
+        }
+
+        if (true === $options['csrf-secret']) {
+            $options['csrf-secret'] = sha1(mt_rand(11111111, 99999999).getmypid());
+        }
+
+        // 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(
+            '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',
+        ));
+
+        $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(
+            'APP_NAME' => $app,
+            'ENVIRONMENT' => 'prod',
+            'IS_DEBUG' => 'false',
+            'IP_CHECK' => '',
+        ));
+
+        $this->getFilesystem()->replaceTokens(sfConfig::get('sf_web_dir').'/'.$app.'_dev.php', '##', '##', array(
+            'APP_NAME' => $app,
+            'ENVIRONMENT' => 'dev',
+            'IS_DEBUG' => 'true',
+            'IP_CHECK' => '// this check prevents access to debug front controllers that are deployed by accident to production servers.'.PHP_EOL.
+                             '// feel free to remove this, extend it or make something more sophisticated.'.PHP_EOL.
+                             'if (!in_array(@$_SERVER[\'REMOTE_ADDR\'], array(\'127.0.0.1\', \'::1\')))'.PHP_EOL.
+                             '{'.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));
+
+        $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);
     }
-
-    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');
-    $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');
-    if (!$firstApp)
-    {
-      $indexName = $app;
-    }
-
-    if (true === $options['csrf-secret'])
-    {
-      $options['csrf-secret'] = sha1(mt_rand(11111111, 99999999).getmypid());
-    }
-
-    // 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(
-      'NO_SCRIPT_NAME'    => $firstApp ? 'true' : 'false',
-      'CSRF_SECRET'       => sfYamlInline::dump(sfYamlInline::parseScalar($options['csrf-secret'])),
-      'ESCAPING_STRATEGY' => sfYamlInline::dump((boolean) 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()->replaceTokens(sfConfig::get('sf_web_dir').'/'.$indexName.'.php', '##', '##', array(
-      'APP_NAME'    => $app,
-      'ENVIRONMENT' => 'prod',
-      'IS_DEBUG'    => 'false',
-      'IP_CHECK'    => '',
-    ));
-
-    $this->getFilesystem()->replaceTokens(sfConfig::get('sf_web_dir').'/'.$app.'_dev.php', '##', '##', array(
-      'APP_NAME'    => $app,
-      'ENVIRONMENT' => 'dev',
-      'IS_DEBUG'    => 'true',
-      'IP_CHECK'    => '// this check prevents access to debug front controllers that are deployed by accident to production servers.'.PHP_EOL.
-                       '// feel free to remove this, extend it or make something more sophisticated.'.PHP_EOL.
-                       'if (!in_array(@$_SERVER[\'REMOTE_ADDR\'], array(\'127.0.0.1\', \'::1\')))'.PHP_EOL.
-                       '{'.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));
-
-    $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);
-  }
 }
diff --git a/lib/task/generator/sfGenerateModuleTask.class.php b/lib/task/generator/sfGenerateModuleTask.class.php
index ba0137367..aa47cb0bd 100644
--- a/lib/task/generator/sfGenerateModuleTask.class.php
+++ b/lib/task/generator/sfGenerateModuleTask.class.php
@@ -3,39 +3,38 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/sfGeneratorBaseTask.class.php');
+require_once __DIR__.'/sfGeneratorBaseTask.class.php';
 
 /**
  * Generates a new module.
  *
- * @package    symfony
- * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfGenerateModuleTask extends sfGeneratorBaseTask
 {
-  /**
-   * @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->namespace = 'generate';
-    $this->name = 'module';
-
-    $this->briefDescription = 'Generates a new module';
-
-    $this->detailedDescription = <<<EOF
+    /**
+     * @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->namespace = 'generate';
+        $this->name = 'module';
+
+        $this->briefDescription = 'Generates a new module';
+
+        $this->detailedDescription = <<<'EOF'
 The [generate:module|INFO] task creates the basic directory structure
 for a new module in an existing application:
 
@@ -58,59 +57,57 @@ protected function configure()
 If a module with the same name already exists in the application,
 it throws a [sfCommandException|COMMENT].
 EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $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));
     }
 
-    $moduleDir = sfConfig::get('sf_app_module_dir').'/'.$module;
-
-    if (is_dir($moduleDir))
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
     {
-      throw new sfCommandException(sprintf('The module "%s" already exists in the "%s" application.', $moduleDir, $app));
-    }
+        $app = $arguments['application'];
+        $module = $arguments['module'];
 
-    $properties = parse_ini_file(sfConfig::get('sf_config_dir').'/properties.ini', true);
+        // 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));
+        }
 
-    $constants = array(
-      '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',
-    );
+        $moduleDir = sfConfig::get('sf_app_module_dir').'/'.$module;
 
-    if (is_readable(sfConfig::get('sf_data_dir').'/skeleton/module'))
-    {
-      $skeletonDir = sfConfig::get('sf_data_dir').'/skeleton/module';
-    }
-    else
-    {
-      $skeletonDir = __DIR__.'/skeleton/module';
-    }
+        if (is_dir($moduleDir)) {
+            throw new sfCommandException(sprintf('The module "%s" already exists in the "%s" application.', $moduleDir, $app));
+        }
 
-    // create basic application structure
-    $finder = sfFinder::type('any')->discard('.sf');
-    $this->getFilesystem()->mirror($skeletonDir.'/module', $moduleDir, $finder);
+        $properties = parse_ini_file(sfConfig::get('sf_config_dir').'/properties.ini', true);
 
-    // create basic test
-    $this->getFilesystem()->copy($skeletonDir.'/test/actionsTest.php', sfConfig::get('sf_test_dir').'/functional/'.$app.'/'.$module.'ActionsTest.php');
+        $constants = array(
+            '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',
+        );
 
-    // customize test file
-    $this->getFilesystem()->replaceTokens(sfConfig::get('sf_test_dir').'/functional/'.$app.DIRECTORY_SEPARATOR.$module.'ActionsTest.php', '##', '##', $constants);
+        if (is_readable(sfConfig::get('sf_data_dir').'/skeleton/module')) {
+            $skeletonDir = sfConfig::get('sf_data_dir').'/skeleton/module';
+        } else {
+            $skeletonDir = __DIR__.'/skeleton/module';
+        }
 
-    // customize php and yml files
-    $finder = sfFinder::type('file')->name('*.php', '*.yml');
-    $this->getFilesystem()->replaceTokens($finder->in($moduleDir), '##', '##', $constants);
-  }
+        // create basic application structure
+        $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');
+
+        // customize test file
+        $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');
+        $this->getFilesystem()->replaceTokens($finder->in($moduleDir), '##', '##', $constants);
+    }
 }
diff --git a/lib/task/generator/sfGenerateProjectTask.class.php b/lib/task/generator/sfGenerateProjectTask.class.php
index 1cfcb4343..281123a84 100755
--- a/lib/task/generator/sfGenerateProjectTask.class.php
+++ b/lib/task/generator/sfGenerateProjectTask.class.php
@@ -8,49 +8,50 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/sfGeneratorBaseTask.class.php');
+require_once __DIR__.'/sfGeneratorBaseTask.class.php';
 
 /**
  * Generates a new project.
  *
- * @package    symfony
- * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfGenerateProjectTask extends sfGeneratorBaseTask
 {
-  /**
-   * @see sfTask
-   */
-  protected function doRun(sfCommandManager $commandManager, $options)
-  {
-    $this->process($commandManager, $options);
-
-    return $this->execute($commandManager->getArgumentValues(), $commandManager->getOptionValues());
-  }
-
-  /**
-   * @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->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->namespace = 'generate';
-    $this->name = 'project';
-
-    $this->briefDescription = 'Generates a new project';
-
-    $this->detailedDescription = <<<EOF
+    /**
+     * @see sfTask
+     *
+     * @param mixed $options
+     */
+    protected function doRun(sfCommandManager $commandManager, $options)
+    {
+        $this->process($commandManager, $options);
+
+        return $this->execute($commandManager->getArgumentValues(), $commandManager->getOptionValues());
+    }
+
+    /**
+     * @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->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->namespace = 'generate';
+        $this->name = 'project';
+
+        $this->briefDescription = 'Generates a new project';
+
+        $this->detailedDescription = <<<'EOF'
 The [generate:project|INFO] task creates the basic directory structure
 for a new project in the current directory:
 
@@ -75,92 +76,89 @@ protected function configure()
 
   [./symfony generate:project blog "Jack Doe"|INFO]
 EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    if (file_exists('symfony'))
-    {
-      throw new sfCommandException(sprintf('A symfony project already exists in this directory (%s).', getcwd()));
     }
 
-    if (!in_array(strtolower($options['orm']), array('doctrine', 'none')))
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
     {
-      throw new InvalidArgumentException(sprintf('Invalid ORM name "%s".', $options['orm']));
-    }
+        if (file_exists('symfony')) {
+            throw new sfCommandException(sprintf('A symfony project already exists in this directory (%s).', getcwd()));
+        }
 
-    if ($options['installer'] && $this->commandApplication && !file_exists($options['installer']))
-    {
-      throw new InvalidArgumentException(sprintf('The installer "%s" does not exist.', $options['installer']));
-    }
+        if (!in_array(strtolower($options['orm']), array('doctrine', 'none'))) {
+            throw new InvalidArgumentException(sprintf('Invalid ORM name "%s".', $options['orm']));
+        }
 
-    // clean orm option
-    $options['orm'] = ucfirst(strtolower($options['orm']));
+        if ($options['installer'] && $this->commandApplication && !file_exists($options['installer'])) {
+            throw new InvalidArgumentException(sprintf('The installer "%s" does not exist.', $options['installer']));
+        }
 
-    $this->arguments = $arguments;
-    $this->options = $options;
+        // clean orm option
+        $options['orm'] = ucfirst(strtolower($options['orm']));
 
-    // create basic project structure
-    $this->installDir(__DIR__.'/skeleton/project');
+        $this->arguments = $arguments;
+        $this->options = $options;
 
-    // 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);
+        // create basic project structure
+        $this->installDir(__DIR__.'/skeleton/project');
 
-    $this->replaceTokens(array(sfConfig::get('sf_config_dir')), array('SYMFONY_CORE_AUTOLOAD' => str_replace('\\', '/', $symfonyCoreAutoload)));
+        // 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);
 
-    $this->tokens = array(
-      'ORM'          => $this->options['orm'],
-      'PROJECT_NAME' => $this->arguments['name'],
-      'AUTHOR_NAME'  => $this->arguments['author'],
-      'PROJECT_DIR'  => sfConfig::get('sf_root_dir'),
-    );
+        $this->replaceTokens(array(sfConfig::get('sf_config_dir')), array('SYMFONY_CORE_AUTOLOAD' => str_replace('\\', '/', $symfonyCoreAutoload)));
 
-    $this->replaceTokens();
+        $this->tokens = array(
+            'ORM' => $this->options['orm'],
+            'PROJECT_NAME' => $this->arguments['name'],
+            'AUTHOR_NAME' => $this->arguments['author'],
+            'PROJECT_DIR' => sfConfig::get('sf_root_dir'),
+        );
 
-    // execute the choosen ORM installer script
-    if ('Doctrine' === $options['orm'])
-    {
-      include __DIR__.'/../../plugins/sf'.$options['orm'].'Plugin/config/installer.php';
-    }
+        $this->replaceTokens();
 
-    // execute a custom installer
-    if ($options['installer'] && $this->commandApplication)
-    {
-      if ($this->canRunInstaller($options['installer']))
-      {
-        $this->reloadTasks();
-        include $options['installer'];
-      }
-    }
+        // execute the choosen ORM installer script
+        if ('Doctrine' === $options['orm']) {
+            include __DIR__.'/../../plugins/sf'.$options['orm'].'Plugin/config/installer.php';
+        }
+
+        // execute a custom installer
+        if ($options['installer'] && $this->commandApplication) {
+            if ($this->canRunInstaller($options['installer'])) {
+                $this->reloadTasks();
 
-    // fix permission for common directories
-    $fixPerms = new sfProjectPermissionsTask($this->dispatcher, $this->formatter);
-    $fixPerms->setCommandApplication($this->commandApplication);
-    $fixPerms->setConfiguration($this->configuration);
-    $fixPerms->run();
+                include $options['installer'];
+            }
+        }
 
-    $this->replaceTokens();
-  }
+        // fix permission for common directories
+        $fixPerms = new sfProjectPermissionsTask($this->dispatcher, $this->formatter);
+        $fixPerms->setCommandApplication($this->commandApplication);
+        $fixPerms->setConfiguration($this->configuration);
+        $fixPerms->run();
+
+        $this->replaceTokens();
+    }
 
-  protected function canRunInstaller($installer)
-  {
-    if (preg_match('#^(https?|ftps?)://#', $installer))
+    protected function canRunInstaller($installer)
     {
-      if (ini_get('allow_url_fopen') === false)
-      {
-        $this->logSection('generate', sprintf('Cannot run remote installer "%s" because "allow_url_fopen" is off', $installer));
-      }
-      if (ini_get('allow_url_include') === false)
-      {
-        $this->logSection('generate', sprintf('Cannot run remote installer "%s" because "allow_url_include" is off', $installer));
-      }
-      return ini_get('allow_url_fopen') && ini_get('allow_url_include');
+        if (preg_match('#^(https?|ftps?)://#', $installer)) {
+            if (false === ini_get('allow_url_fopen')) {
+                $this->logSection('generate', sprintf('Cannot run remote installer "%s" because "allow_url_fopen" is off', $installer));
+            }
+            if (false === ini_get('allow_url_include')) {
+                $this->logSection('generate', sprintf('Cannot run remote installer "%s" because "allow_url_include" is off', $installer));
+            }
+
+            return ini_get('allow_url_fopen') && ini_get('allow_url_include');
+        }
+
+        return true;
     }
-    return true;
-  }
 }
diff --git a/lib/task/generator/sfGenerateTaskTask.class.php b/lib/task/generator/sfGenerateTaskTask.class.php
index 17539a0f6..f6d17ed8b 100644
--- a/lib/task/generator/sfGenerateTaskTask.class.php
+++ b/lib/task/generator/sfGenerateTaskTask.class.php
@@ -3,40 +3,38 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 /**
- * Creates a task skeleton
+ * Creates a task skeleton.
  *
- * @package    symfony
- * @subpackage task
  * @author     Francois Zaninotto <francois.zaninotto@symfony-project.com>
  */
 class sfGenerateTaskTask extends sfBaseTask
 {
-  /**
-   * @see sfTask
-   */
-  protected function configure()
-  {
-    $this->addArguments(array(
-      new sfCommandArgument('task_name', sfCommandArgument::REQUIRED, 'The task name (can contain namespace)'),
-    ));
+    /**
+     * @see sfTask
+     */
+    protected function configure()
+    {
+        $this->addArguments(array(
+            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(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->namespace = 'generate';
-    $this->name = 'task';
-    $this->briefDescription = 'Creates a skeleton class for a new task';
+        $this->namespace = 'generate';
+        $this->name = 'task';
+        $this->briefDescription = 'Creates a skeleton class for a new task';
 
-    $this->detailedDescription = <<<EOF
+        $this->detailedDescription = <<<'EOF'
 The [generate:task|INFO] creates a new sfTask class based on the name passed as
 argument:
 
@@ -65,42 +63,43 @@ protected function configure()
 
   [./symfony generate:task namespace:name --brief-description="Does interesting things"|INFO]
 EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $taskName = $arguments['task_name'];
-    $taskNameComponents = explode(':', $taskName);
-    $namespace = isset($taskNameComponents[1]) ? $taskNameComponents[0] : '';
-    $name = isset($taskNameComponents[1]) ? $taskNameComponents[1] : $taskNameComponents[0];
-    $taskClassName = str_replace('-', '', ($namespace ? $namespace.ucfirst($name) : $name)).'Task';
-
-    // 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));
     }
 
-    $briefDescription = $options['brief-description'];
-    $detailedDescription = <<<HED
-The [$taskName|INFO] task does things.
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
+    {
+        $taskName = $arguments['task_name'];
+        $taskNameComponents = explode(':', $taskName);
+        $namespace = isset($taskNameComponents[1]) ? $taskNameComponents[0] : '';
+        $name = isset($taskNameComponents[1]) ? $taskNameComponents[1] : $taskNameComponents[0];
+        $taskClassName = str_replace('-', '', $namespace ? $namespace.ucfirst($name) : $name).'Task';
+
+        // 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));
+        }
+
+        $briefDescription = $options['brief-description'];
+        $detailedDescription = <<<HED
+The [{$taskName}|INFO] task does things.
 Call it with:
 
-  [php symfony $taskName|INFO]
+  [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
+        if ($useDatabase) {
+            $content = <<<HED
 <?php
 
-class $taskClassName extends sfBaseTask
+class {$taskClassName} extends sfBaseTask
 {
   protected function configure()
   {
@@ -112,15 +111,15 @@ protected function configure()
     \$this->addOptions(array(
       new sfCommandOption('application', null, sfCommandOption::PARAMETER_REQUIRED, 'The application name'),
       new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
-      new sfCommandOption('connection', null, sfCommandOption::PARAMETER_REQUIRED, 'The connection name', '$defaultConnection'),
+      new sfCommandOption('connection', null, sfCommandOption::PARAMETER_REQUIRED, 'The connection name', '{$defaultConnection}'),
       // add your own options here
     ));
 
-    \$this->namespace        = '$namespace';
-    \$this->name             = '$name';
-    \$this->briefDescription = '$briefDescription';
+    \$this->namespace        = '{$namespace}';
+    \$this->name             = '{$name}';
+    \$this->briefDescription = '{$briefDescription}';
     \$this->detailedDescription = <<<EOF
-$detailedDescription
+{$detailedDescription}
 EOF;
   }
 
@@ -135,13 +134,11 @@ protected function execute(\$arguments = array(), \$options = array())
 }
 
 HED;
-    }
-    else
-    {
-      $content = <<<HED
+        } else {
+            $content = <<<HED
 <?php
 
-class $taskClassName extends sfBaseTask
+class {$taskClassName} extends sfBaseTask
 {
   protected function configure()
   {
@@ -155,11 +152,11 @@ protected function configure()
     //   new sfCommandOption('my_option', null, sfCommandOption::PARAMETER_REQUIRED, 'My option'),
     // ));
 
-    \$this->namespace        = '$namespace';
-    \$this->name             = '$name';
-    \$this->briefDescription = '$briefDescription';
+    \$this->namespace        = '{$namespace}';
+    \$this->name             = '{$name}';
+    \$this->briefDescription = '{$briefDescription}';
     \$this->detailedDescription = <<<EOF
-$detailedDescription
+{$detailedDescription}
 EOF;
   }
 
@@ -170,21 +167,19 @@ protected function execute(\$arguments = array(), \$options = array())
 }
 
 HED;
-    }
+        }
 
-    // check that the task directory exists and that the task file doesn't exist
-    if (!is_readable(sfConfig::get('sf_root_dir').'/'.$options['dir']))
-    {
-      $this->getFilesystem()->mkdirs($options['dir']);
-    }
+        // check that the task directory exists and that the task file doesn't exist
+        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';
-    if (is_readable($taskFile))
-    {
-      throw new sfCommandException(sprintf('A "%s" task already exists in "%s".', $taskName, $taskFile));
-    }
+        $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));
+        }
 
-    $this->logSection('task', sprintf('Creating "%s" task file', $taskFile));
-    file_put_contents($taskFile, $content);
-  }
+        $this->logSection('task', sprintf('Creating "%s" task file', $taskFile));
+        file_put_contents($taskFile, $content);
+    }
 }
diff --git a/lib/task/generator/sfGeneratorBaseTask.class.php b/lib/task/generator/sfGeneratorBaseTask.class.php
index 163a39dcd..6324a094b 100644
--- a/lib/task/generator/sfGeneratorBaseTask.class.php
+++ b/lib/task/generator/sfGeneratorBaseTask.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -11,9 +11,8 @@
 /**
  * Base class for all symfony generator tasks.
  *
- * @package    symfony
- * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfGeneratorBaseTask extends sfBaseTask
diff --git a/lib/task/help/sfHelpTask.class.php b/lib/task/help/sfHelpTask.class.php
index b386bd3f7..abdf8a9f3 100644
--- a/lib/task/help/sfHelpTask.class.php
+++ b/lib/task/help/sfHelpTask.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -11,29 +11,28 @@
 /**
  * Displays help for a task.
  *
- * @package    symfony
- * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfHelpTask extends sfCommandApplicationTask
 {
-  /**
-   * @see sfTask
-   */
-  protected function configure()
-  {
-    $this->addArguments(array(
-      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->briefDescription = 'Displays help for a task';
-
-    $this->detailedDescription = <<<EOF
+    /**
+     * @see sfTask
+     */
+    protected function configure()
+    {
+        $this->addArguments(array(
+            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->briefDescription = 'Displays help for a task';
+
+        $this->detailedDescription = <<<'EOF'
 The [help|INFO] task displays help for a given task:
 
   [./symfony help test:all|INFO]
@@ -42,92 +41,83 @@ protected function configure()
 
   [./symfony help test:all --xml|INFO]
 EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    if (!isset($this->commandApplication))
-    {
-      throw new sfCommandException('You can only launch this task from the command line.');
-    }
-
-    $task = $this->commandApplication->getTask($arguments['task_name']);
-
-    if ($options['xml'])
-    {
-      $this->outputAsXml($task);
-    }
-    else
-    {
-      $this->outputAsText($task);
     }
-  }
 
-  protected function outputAsText(sfTask $task)
-  {
-    $messages = array();
-
-    $messages[] = $this->formatter->format('Usage:', 'COMMENT');
-    $messages[] = $this->formatter->format(sprintf(' '.$task->getSynopsis(), null === $this->commandApplication ? '' : $this->commandApplication->getName()))."\n";
-
-    // find the largest option or argument name
-    $max = 0;
-    foreach ($task->getOptions() as $option)
-    {
-      $max = strlen($option->getName()) + 2 > $max ? strlen($option->getName()) + 2 : $max;
-    }
-    foreach ($task->getArguments() as $argument)
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
     {
-      $max = strlen($argument->getName()) > $max ? strlen($argument->getName()) : $max;
-    }
-    $max += strlen($this->formatter->format(' ', 'INFO'));
+        if (!isset($this->commandApplication)) {
+            throw new sfCommandException('You can only launch this task from the command line.');
+        }
 
-    if ($task->getAliases())
-    {
-      $messages[] = $this->formatter->format('Aliases:', 'COMMENT').' '.$this->formatter->format(implode(', ', $task->getAliases()), 'INFO')."\n";
-    }
+        $task = $this->commandApplication->getTask($arguments['task_name']);
 
-    if ($task->getArguments())
-    {
-      $messages[] = $this->formatter->format('Arguments:', 'COMMENT');
-      foreach ($task->getArguments() as $argument)
-      {
-        $default = null !== $argument->getDefault() && (!is_array($argument->getDefault()) || count($argument->getDefault())) ? $this->formatter->format(sprintf(' (default: %s)', is_array($argument->getDefault()) ? str_replace("\n", '', print_r($argument->getDefault(), true)): $argument->getDefault()), 'COMMENT') : '';
-        $messages[] = sprintf(" %-{$max}s %s%s", $this->formatter->format($argument->getName(), 'INFO'), $argument->getHelp(), $default);
-      }
-
-      $messages[] = '';
+        if ($options['xml']) {
+            $this->outputAsXml($task);
+        } else {
+            $this->outputAsText($task);
+        }
     }
 
-    if ($task->getOptions())
+    protected function outputAsText(sfTask $task)
     {
-      $messages[] = $this->formatter->format('Options:', 'COMMENT');
-
-      foreach ($task->getOptions() as $option)
-      {
-        $default = $option->acceptParameter() && null !== $option->getDefault() && (!is_array($option->getDefault()) || count($option->getDefault())) ? $this->formatter->format(sprintf(' (default: %s)', is_array($option->getDefault()) ? str_replace("\n", '', print_r($option->getDefault(), true)): $option->getDefault()), 'COMMENT') : '';
-        $multiple = $option->isArray() ? $this->formatter->format(' (multiple values allowed)', 'COMMENT') : '';
-        $messages[] = sprintf(' %-'.$max.'s %s%s%s%s', $this->formatter->format('--'.$option->getName(), 'INFO'), $option->getShortcut() ? sprintf('(-%s) ', $option->getShortcut()) : '', $option->getHelp(), $default, $multiple);
-      }
-
-      $messages[] = '';
+        $messages = array();
+
+        $messages[] = $this->formatter->format('Usage:', 'COMMENT');
+        $messages[] = $this->formatter->format(sprintf(' '.$task->getSynopsis(), null === $this->commandApplication ? '' : $this->commandApplication->getName()))."\n";
+
+        // find the largest option or argument name
+        $max = 0;
+        foreach ($task->getOptions() as $option) {
+            $max = strlen($option->getName()) + 2 > $max ? strlen($option->getName()) + 2 : $max;
+        }
+        foreach ($task->getArguments() as $argument) {
+            $max = strlen($argument->getName()) > $max ? strlen($argument->getName()) : $max;
+        }
+        $max += strlen($this->formatter->format(' ', 'INFO'));
+
+        if ($task->getAliases()) {
+            $messages[] = $this->formatter->format('Aliases:', 'COMMENT').' '.$this->formatter->format(implode(', ', $task->getAliases()), 'INFO')."\n";
+        }
+
+        if ($task->getArguments()) {
+            $messages[] = $this->formatter->format('Arguments:', 'COMMENT');
+            foreach ($task->getArguments() as $argument) {
+                $default = null !== $argument->getDefault() && (!is_array($argument->getDefault()) || count($argument->getDefault())) ? $this->formatter->format(sprintf(' (default: %s)', is_array($argument->getDefault()) ? str_replace("\n", '', print_r($argument->getDefault(), true)) : $argument->getDefault()), 'COMMENT') : '';
+                $messages[] = sprintf(" %-{$max}s %s%s", $this->formatter->format($argument->getName(), 'INFO'), $argument->getHelp(), $default);
+            }
+
+            $messages[] = '';
+        }
+
+        if ($task->getOptions()) {
+            $messages[] = $this->formatter->format('Options:', 'COMMENT');
+
+            foreach ($task->getOptions() as $option) {
+                $default = $option->acceptParameter() && null !== $option->getDefault() && (!is_array($option->getDefault()) || count($option->getDefault())) ? $this->formatter->format(sprintf(' (default: %s)', is_array($option->getDefault()) ? str_replace("\n", '', print_r($option->getDefault(), true)) : $option->getDefault()), 'COMMENT') : '';
+                $multiple = $option->isArray() ? $this->formatter->format(' (multiple values allowed)', 'COMMENT') : '';
+                $messages[] = sprintf(' %-'.$max.'s %s%s%s%s', $this->formatter->format('--'.$option->getName(), 'INFO'), $option->getShortcut() ? sprintf('(-%s) ', $option->getShortcut()) : '', $option->getHelp(), $default, $multiple);
+            }
+
+            $messages[] = '';
+        }
+
+        if ($detailedDescription = $task->getDetailedDescription()) {
+            $messages[] = $this->formatter->format('Description:', 'COMMENT');
+
+            $messages[] = ' '.implode("\n ", explode("\n", $detailedDescription))."\n";
+        }
+
+        $this->log($messages);
     }
 
-    if ($detailedDescription = $task->getDetailedDescription())
+    protected function outputAsXml(sfTask $task)
     {
-      $messages[] = $this->formatter->format('Description:', 'COMMENT');
-
-      $messages[] = ' '.implode("\n ", explode("\n", $detailedDescription))."\n";
+        echo $task->asXml();
     }
-
-    $this->log($messages);
-  }
-
-  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 38354c33f..0d08f34cf 100644
--- a/lib/task/help/sfListTask.class.php
+++ b/lib/task/help/sfListTask.class.php
@@ -11,29 +11,28 @@
 /**
  * Lists tasks.
  *
- * @package    symfony
- * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfListTask extends sfCommandApplicationTask
 {
-  /**
-   * @see sfTask
-   */
-  protected function configure()
-  {
-    $this->addArguments(array(
-      new sfCommandArgument('namespace', sfCommandArgument::OPTIONAL, 'The namespace name'),
-    ));
-
-    $this->addOptions(array(
-      new sfCommandOption('xml', null, sfCommandOption::PARAMETER_NONE, 'To output help as XML'),
-    ));
-
-    $this->briefDescription = 'Lists tasks';
-
-    $this->detailedDescription = <<<EOF
+    /**
+     * @see sfTask
+     */
+    protected function configure()
+    {
+        $this->addArguments(array(
+            new sfCommandArgument('namespace', sfCommandArgument::OPTIONAL, 'The namespace name'),
+        ));
+
+        $this->addOptions(array(
+            new sfCommandOption('xml', null, sfCommandOption::PARAMETER_NONE, 'To output help as XML'),
+        ));
+
+        $this->briefDescription = 'Lists tasks';
+
+        $this->detailedDescription = <<<'EOF'
 The [list|INFO] task lists all tasks:
 
   [./symfony list|INFO]
@@ -46,132 +45,116 @@ protected function configure()
 
   [./symfony list --xml|INFO]
 EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $tasks = array();
-    foreach ($this->commandApplication->getTasks() as $name => $task)
-    {
-      if ($arguments['namespace'] && $arguments['namespace'] != $task->getNamespace())
-      {
-        continue;
-      }
-
-      if ($name != $task->getFullName())
-      {
-        // it is an alias
-        continue;
-      }
-
-      if (!$task->getNamespace())
-      {
-        $name = '_default:'.$name;
-      }
-
-      $tasks[$name] = $task;
-    }
-
-    if ($options['xml'])
-    {
-      $this->outputAsXml($arguments['namespace'], $tasks);
-    }
-    else
-    {
-      $this->outputAsText($arguments['namespace'], $tasks);
-    }
-  }
-
-  protected function outputAsText($namespace, $tasks)
-  {
-    $this->commandApplication->help();
-    $this->log('');
-
-    $width = 0;
-    foreach ($tasks as $name => $task)
-    {
-      $width = strlen($task->getName()) > $width ? strlen($task->getName()) : $width;
     }
-    $width += strlen($this->formatter->format('  ', 'INFO'));
 
-    $messages = array();
-    if ($namespace)
-    {
-      $messages[] = $this->formatter->format(sprintf("Available tasks for the \"%s\" namespace:", $namespace), 'COMMENT');
-    }
-    else
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
     {
-      $messages[] = $this->formatter->format('Available tasks:', 'COMMENT');
-    }
-
-    // display tasks
-    ksort($tasks);
-    $currentNamespace = '';
-    foreach ($tasks as $name => $task)
-    {
-      if (!$namespace && $currentNamespace != $task->getNamespace())
-      {
-        $currentNamespace = $task->getNamespace();
-        $messages[] = $this->formatter->format($task->getNamespace(), 'COMMENT');
-      }
-
-      $aliases = $task->getAliases() ? $this->formatter->format(' ('.implode(', ', $task->getAliases()).')', 'COMMENT') : '';
-
-      $messages[] = sprintf("  %-{$width}s %s%s", $this->formatter->format(':'.$task->getName(), 'INFO'), $task->getBriefDescription(), $aliases);
+        $tasks = array();
+        foreach ($this->commandApplication->getTasks() as $name => $task) {
+            if ($arguments['namespace'] && $arguments['namespace'] != $task->getNamespace()) {
+                continue;
+            }
+
+            if ($name != $task->getFullName()) {
+                // it is an alias
+                continue;
+            }
+
+            if (!$task->getNamespace()) {
+                $name = '_default:'.$name;
+            }
+
+            $tasks[$name] = $task;
+        }
+
+        if ($options['xml']) {
+            $this->outputAsXml($arguments['namespace'], $tasks);
+        } else {
+            $this->outputAsText($arguments['namespace'], $tasks);
+        }
     }
 
-    $this->log($messages);
-  }
-
-  protected function outputAsXml($namespace, $tasks)
-  {
-    $dom = new DOMDocument('1.0', 'UTF-8');
-    $dom->formatOutput = true;
-    $dom->appendChild($symfonyXML = $dom->createElement('symfony'));
-
-    $symfonyXML->appendChild($tasksXML = $dom->createElement('tasks'));
-
-    if ($namespace)
+    protected function outputAsText($namespace, $tasks)
     {
-      $tasksXML->setAttribute('namespace', $namespace);
-    }
-    else
-    {
-      $symfonyXML->appendChild($namespacesXML = $dom->createElement('namespaces'));
+        $this->commandApplication->help();
+        $this->log('');
+
+        $width = 0;
+        foreach ($tasks as $name => $task) {
+            $width = strlen($task->getName()) > $width ? strlen($task->getName()) : $width;
+        }
+        $width += strlen($this->formatter->format('  ', 'INFO'));
+
+        $messages = array();
+        if ($namespace) {
+            $messages[] = $this->formatter->format(sprintf('Available tasks for the "%s" namespace:', $namespace), 'COMMENT');
+        } else {
+            $messages[] = $this->formatter->format('Available tasks:', 'COMMENT');
+        }
+
+        // display tasks
+        ksort($tasks);
+        $currentNamespace = '';
+        foreach ($tasks as $name => $task) {
+            if (!$namespace && $currentNamespace != $task->getNamespace()) {
+                $currentNamespace = $task->getNamespace();
+                $messages[] = $this->formatter->format($task->getNamespace(), 'COMMENT');
+            }
+
+            $aliases = $task->getAliases() ? $this->formatter->format(' ('.implode(', ', $task->getAliases()).')', 'COMMENT') : '';
+
+            $messages[] = sprintf("  %-{$width}s %s%s", $this->formatter->format(':'.$task->getName(), 'INFO'), $task->getBriefDescription(), $aliases);
+        }
+
+        $this->log($messages);
     }
 
-    // display tasks
-    ksort($tasks);
-    $currentNamespace = 'foobar';
-    $namespaceArrayXML = array();
-    foreach ($tasks as $name => $task)
+    protected function outputAsXml($namespace, $tasks)
     {
-      if (!$namespace && $currentNamespace != $task->getNamespace())
-      {
-        $currentNamespace = $task->getNamespace();
-        $namespacesXML->appendChild($namespaceArrayXML[$task->getNamespace()] = $dom->createElement('namespace'));
-
-        $namespaceArrayXML[$task->getNamespace()]->setAttribute('id', $task->getNamespace() ?: '_global');
-      }
-
-      if (!$namespace)
-      {
-        $namespaceArrayXML[$task->getNamespace()]->appendChild($taskXML = $dom->createElement('task'));
-        $taskXML->appendChild($dom->createTextNode($task->getName()));
-      }
-
-      $taskXML = new DOMDocument('1.0', 'UTF-8');
-      $taskXML->formatOutput = true;
-      $taskXML->loadXML($task->asXml());
-      $node = $taskXML->getElementsByTagName('task')->item(0);
-      $node = $dom->importNode($node, true);
-
-      $tasksXML->appendChild($node);
+        $dom = new DOMDocument('1.0', 'UTF-8');
+        $dom->formatOutput = true;
+        $dom->appendChild($symfonyXML = $dom->createElement('symfony'));
+
+        $symfonyXML->appendChild($tasksXML = $dom->createElement('tasks'));
+
+        if ($namespace) {
+            $tasksXML->setAttribute('namespace', $namespace);
+        } else {
+            $symfonyXML->appendChild($namespacesXML = $dom->createElement('namespaces'));
+        }
+
+        // display tasks
+        ksort($tasks);
+        $currentNamespace = 'foobar';
+        $namespaceArrayXML = array();
+        foreach ($tasks as $name => $task) {
+            if (!$namespace && $currentNamespace != $task->getNamespace()) {
+                $currentNamespace = $task->getNamespace();
+                $namespacesXML->appendChild($namespaceArrayXML[$task->getNamespace()] = $dom->createElement('namespace'));
+
+                $namespaceArrayXML[$task->getNamespace()]->setAttribute('id', $task->getNamespace() ?: '_global');
+            }
+
+            if (!$namespace) {
+                $namespaceArrayXML[$task->getNamespace()]->appendChild($taskXML = $dom->createElement('task'));
+                $taskXML->appendChild($dom->createTextNode($task->getName()));
+            }
+
+            $taskXML = new DOMDocument('1.0', 'UTF-8');
+            $taskXML->formatOutput = true;
+            $taskXML->loadXML($task->asXml());
+            $node = $taskXML->getElementsByTagName('task')->item(0);
+            $node = $dom->importNode($node, true);
+
+            $tasksXML->appendChild($node);
+        }
+
+        echo $dom->saveXML();
     }
-
-    echo $dom->saveXML();
-  }
 }
diff --git a/lib/task/i18n/sfI18nExtractTask.class.php b/lib/task/i18n/sfI18nExtractTask.class.php
index 95f6fa8f6..a45952586 100644
--- a/lib/task/i18n/sfI18nExtractTask.class.php
+++ b/lib/task/i18n/sfI18nExtractTask.class.php
@@ -17,36 +17,85 @@
 /**
  * Extracts i18n strings from php files.
  *
- * @package    symfony
- * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfI18nExtractTask extends sfBaseTask
 {
-  /**
-   * @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->namespace = 'i18n';
-    $this->name = 'extract';
-    $this->briefDescription = 'Extracts i18n strings from php files';
-
-    $this->detailedDescription = <<<EOF
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    public function execute($arguments = array(), $options = array())
+    {
+        $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'));
+
+        $class = $config['i18n']['class'];
+        $params = $config['i18n']['param'];
+        unset($params['cache']);
+
+        $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())));
+        $this->logSection('i18n', sprintf('found "%d" old i18n strings', count($extract->getOldMessages())));
+
+        if ($options['display-new']) {
+            $this->logSection('i18n', sprintf('display "%d" new i18n strings', count($extract->getOldMessages())));
+            foreach ($extract->getNewMessages() as $message) {
+                $this->log('               '.$message."\n");
+            }
+        }
+
+        if ($options['auto-save']) {
+            $this->logSection('i18n', 'saving new i18n strings');
+
+            $extract->saveNewMessages();
+        }
+
+        if ($options['display-old']) {
+            $this->logSection('i18n', sprintf('display "%d" old i18n strings', count($extract->getOldMessages())));
+            foreach ($extract->getOldMessages() as $message) {
+                $this->log('               '.$message."\n");
+            }
+        }
+
+        if ($options['auto-delete']) {
+            $this->logSection('i18n', 'deleting old i18n strings');
+
+            $extract->deleteOldMessages();
+        }
+    }
+
+    /**
+     * @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->namespace = 'i18n';
+        $this->name = 'extract';
+        $this->briefDescription = 'Extracts i18n strings from php files';
+
+        $this->detailedDescription = <<<'EOF'
 The [i18n:extract|INFO] task extracts i18n strings from your project files
 for the given application and target culture:
 
@@ -79,58 +128,5 @@ protected function configure()
 
   [./symfony i18n:extract --auto-delete frontend fr|INFO]
 EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  public function execute($arguments = array(), $options = array())
-  {
-    $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'));
-
-    $class = $config['i18n']['class'];
-    $params = $config['i18n']['param'];
-    unset($params['cache']);
-
-    $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())));
-    $this->logSection('i18n', sprintf('found "%d" old i18n strings', count($extract->getOldMessages())));
-
-    if ($options['display-new'])
-    {
-      $this->logSection('i18n', sprintf('display "%d" new i18n strings', count($extract->getOldMessages())));
-      foreach ($extract->getNewMessages() as $message)
-      {
-        $this->log('               '.$message."\n");
-      }
-    }
-
-    if ($options['auto-save'])
-    {
-      $this->logSection('i18n', 'saving new i18n strings');
-
-      $extract->saveNewMessages();
-    }
-
-    if ($options['display-old'])
-    {
-      $this->logSection('i18n', sprintf('display "%d" old i18n strings', count($extract->getOldMessages())));
-      foreach ($extract->getOldMessages() as $message)
-      {
-        $this->log('               '.$message."\n");
-      }
-    }
-
-    if ($options['auto-delete'])
-    {
-      $this->logSection('i18n', 'deleting old i18n strings');
-
-      $extract->deleteOldMessages();
     }
-  }
 }
diff --git a/lib/task/i18n/sfI18nFindTask.class.php b/lib/task/i18n/sfI18nFindTask.class.php
index f193f00cb..bcea6f1a4 100644
--- a/lib/task/i18n/sfI18nFindTask.class.php
+++ b/lib/task/i18n/sfI18nFindTask.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -11,132 +11,116 @@
 /**
  * Finds non "i18n ready" strings in an application.
  *
- * @package    symfony
- * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfI18nFindTask extends sfBaseTask
 {
-  /**
-   * @see sfTask
-   */
-  protected function configure()
-  {
-    $this->addArguments(array(
-      new sfCommandArgument('application', sfCommandArgument::REQUIRED, 'The application name'),
-    ));
-
-    $this->addOptions(array(
-      new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
-    ));
-
-    $this->namespace = 'i18n';
-    $this->name = 'find';
-    $this->briefDescription = 'Finds non "i18n ready" strings in an application';
-
-    $this->detailedDescription = <<<EOF
-The [i18n:find|INFO] task finds non internationalized strings embedded in templates:
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    public function execute($arguments = array(), $options = array())
+    {
+        $this->logSection('i18n', sprintf('find non "i18n ready" strings in the "%s" application', $arguments['application']));
 
-  [./symfony i18n:find frontend|INFO]
+        // Look in templates
+        $dirs = array();
+        $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_dir').'/templates';
+
+        $strings = array();
+        foreach ($dirs as $dir) {
+            $templates = sfFinder::type('file')->name('*.php')->in($dir);
+            foreach ($templates as $template) {
+                if (!isset($strings[$template])) {
+                    $strings[$template] = array();
+                }
 
-This task is able to find non internationalized strings in pure HTML and in PHP code:
+                $dom = new DOMDocument('1.0', sfConfig::get('sf_charset', 'UTF-8'));
+                $content = file_get_contents($template);
+
+                // remove doctype
+                $content = preg_replace('/<!DOCTYPE.*?>/', '', $content);
+
+                @$dom->loadXML('<doc>'.$content.'</doc>');
+
+                $nodes = array($dom);
+                while ($nodes) {
+                    $node = array_shift($nodes);
+
+                    if (XML_TEXT_NODE === $node->nodeType) {
+                        if (!$node->isWhitespaceInElementContent()) {
+                            $strings[$template][] = $node->nodeValue;
+                        }
+                    } elseif ($node->childNodes) {
+                        for ($i = 0, $max = $node->childNodes->length; $i < $max; ++$i) {
+                            $nodes[] = $node->childNodes->item($i);
+                        }
+                    } elseif ('DOMProcessingInstruction' == get_class($node) && 'php' == $node->target) {
+                        // processing instruction node
+                        $tokens = token_get_all('<?php '.$node->nodeValue);
+                        foreach ($tokens as $token) {
+                            if (is_array($token)) {
+                                list($id, $text) = $token;
+
+                                if (T_CONSTANT_ENCAPSED_STRING === $id) {
+                                    $strings[$template][] = substr($text, 1, -1);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
 
-  <p>Non i18n text</p>
-  <p><?php echo 'Test' ?></p>
+        foreach ($strings as $template => $messages) {
+            if (!$messages) {
+                continue;
+            }
 
-As the task returns all strings embedded in PHP, you can have some false positive (especially
-if you use the string syntax for helper arguments).
-EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  public function execute($arguments = array(), $options = array())
-  {
-    $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'));
-    foreach ($moduleNames as $moduleName)
-    {
-      $dirs[] = sfConfig::get('sf_app_module_dir').'/'.$moduleName.'/templates';
+            $this->logSection('i18n', sprintf('strings in "%s"', str_replace(sfConfig::get('sf_root_dir'), '', $template)), 1000);
+            foreach ($messages as $message) {
+                $this->log("  {$message}\n");
+            }
+        }
     }
-    $dirs[] = sfConfig::get('sf_app_dir').'/templates';
 
-    $strings = array();
-    foreach ($dirs as $dir)
+    /**
+     * @see sfTask
+     */
+    protected function configure()
     {
-      $templates = sfFinder::type('file')->name('*.php')->in($dir);
-      foreach ($templates as $template)
-      {
-        if (!isset($strings[$template]))
-        {
-          $strings[$template] = array();
-        }
+        $this->addArguments(array(
+            new sfCommandArgument('application', sfCommandArgument::REQUIRED, 'The application name'),
+        ));
 
-        $dom = new DomDocument('1.0', sfConfig::get('sf_charset', 'UTF-8'));
-        $content = file_get_contents($template);
+        $this->addOptions(array(
+            new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
+        ));
 
-        // remove doctype
-        $content = preg_replace('/<!DOCTYPE.*?>/', '', $content);
+        $this->namespace = 'i18n';
+        $this->name = 'find';
+        $this->briefDescription = 'Finds non "i18n ready" strings in an application';
 
-        @$dom->loadXML('<doc>'.$content.'</doc>');
+        $this->detailedDescription = <<<'EOF'
+The [i18n:find|INFO] task finds non internationalized strings embedded in templates:
 
-        $nodes = array($dom);
-        while ($nodes)
-        {
-          $node = array_shift($nodes);
+  [./symfony i18n:find frontend|INFO]
 
-          if (XML_TEXT_NODE === $node->nodeType)
-          {
-            if (!$node->isWhitespaceInElementContent())
-            {
-              $strings[$template][] = $node->nodeValue;
-            }
-          }
-          else if ($node->childNodes)
-          {
-            for ($i = 0, $max = $node->childNodes->length; $i < $max; $i++)
-            {
-              $nodes[] = $node->childNodes->item($i);
-            }
-          }
-          else if ('DOMProcessingInstruction' == get_class($node) && 'php' == $node->target)
-          {
-            // processing instruction node
-            $tokens = token_get_all('<?php '.$node->nodeValue);
-            foreach ($tokens as $token)
-            {
-              if (is_array($token))
-              {
-                list($id, $text) = $token;
-
-                if (T_CONSTANT_ENCAPSED_STRING === $id)
-                {
-                  $strings[$template][] = substr($text, 1, -1);
-                }
-              }
-            }
-          }
-        }
-      }
-    }
+This task is able to find non internationalized strings in pure HTML and in PHP code:
 
-    foreach ($strings as $template => $messages)
-    {
-      if (!$messages)
-      {
-        continue;
-      }
-
-      $this->logSection('i18n', sprintf('strings in "%s"', str_replace(sfConfig::get('sf_root_dir'), '', $template)), 1000);
-      foreach ($messages as $message)
-      {
-        $this->log("  $message\n");
-      }
+  <p>Non i18n text</p>
+  <p><?php echo 'Test' ?></p>
+
+As the task returns all strings embedded in PHP, you can have some false positive (especially
+if you use the string syntax for helper arguments).
+EOF;
     }
-  }
 }
diff --git a/lib/task/log/sfLogClearTask.class.php b/lib/task/log/sfLogClearTask.class.php
index 01e9d3de4..5aa7f9c52 100644
--- a/lib/task/log/sfLogClearTask.class.php
+++ b/lib/task/log/sfLogClearTask.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -11,35 +11,37 @@
 /**
  * Clears log files.
  *
- * @package    symfony
- * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfLogClearTask extends sfBaseTask
 {
-  /**
-   * @see sfTask
-   */
-  protected function configure()
-  {
-    $this->namespace = 'log';
-    $this->name = 'clear';
-    $this->briefDescription = 'Clears log files';
+    /**
+     * @see sfTask
+     */
+    protected function configure()
+    {
+        $this->namespace = 'log';
+        $this->name = 'clear';
+        $this->briefDescription = 'Clears log files';
 
-    $this->detailedDescription = <<<EOF
+        $this->detailedDescription = <<<'EOF'
 The [log:clear|INFO] task clears all symfony log files:
 
   [./symfony log:clear|INFO]
 EOF;
-  }
+    }
 
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $logs = sfFinder::type('file')->in(sfConfig::get('sf_log_dir'));
-    $this->getFilesystem()->remove($logs);
-  }
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
+    {
+        $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 80ff429f9..1f2623bb4 100644
--- a/lib/task/log/sfLogRotateTask.class.php
+++ b/lib/task/log/sfLogRotateTask.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -11,150 +11,142 @@
 /**
  * Rotates an application log files.
  *
- * @package    symfony
- * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfLogRotateTask extends sfBaseTask
 {
-  /** the default period to rotate logs in days */
-  const DEF_PERIOD = 7;
-
-  /** the default number of log historys to store, one history is created for every period */
-  const DEF_HISTORY = 10;
-
-  /**
-   * @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->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->namespace = 'log';
-    $this->name = 'rotate';
-    $this->briefDescription = 'Rotates an application\'s log files';
-
-    $this->detailedDescription = <<<EOF
-The [log:rotate|INFO] task rotates application log files for a given
-environment:
+    /** the default period to rotate logs in days */
+    public const DEF_PERIOD = 7;
+
+    /** the default number of log historys to store, one history is created for every period */
+    public const DEF_HISTORY = 10;
+
+    /**
+     * Rotates log file.
+     *
+     * @param string $app      Application name
+     * @param string $env      Enviroment name
+     * @param string $period   Period
+     * @param string $history  History
+     * @param bool   $override Override
+     *
+     * @author Joe Simms
+     */
+    public function rotate($app, $env, $period = null, $history = null, $override = false)
+    {
+        $logfile = $app.'_'.$env;
+        $logdir = sfConfig::get('sf_log_dir');
 
-  [./symfony log:rotate frontend dev|INFO]
+        // set history and period values if not passed to default values
+        $period = isset($period) ? $period : self::DEF_PERIOD;
+        $history = isset($history) ? $history : self::DEF_HISTORY;
 
-You can specify a [period|COMMENT] or a [history|COMMENT] option:
+        // get todays date
+        $today = date('Ymd');
 
-  [./symfony log:rotate frontend dev --history=10 --period=7|INFO]
-EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $this->rotate($arguments['application'], $arguments['env'], $options['period'], $options['history'], true);
-  }
-
-  /**
-   * Rotates log file.
-   *
-   * @param  string $app       Application name
-   * @param  string $env       Enviroment name
-   * @param  string $period    Period 
-   * @param  string $history   History
-   * @param  bool   $override  Override
-   *
-   * @author Joe Simms
-   **/
-  public function rotate($app, $env, $period = null, $history = null, $override = false)
-  {
-    $logfile = $app.'_'.$env;
-    $logdir = sfConfig::get('sf_log_dir');
-
-    // set history and period values if not passed to default values
-    $period = isset($period) ? $period : self::DEF_PERIOD;
-    $history = isset($history) ? $history : self::DEF_HISTORY;
-
-    // get todays date
-    $today = date('Ymd');
-
-    // check history folder exists
-    if (!is_dir($logdir.'/history'))
-    {
-      $this->getFilesystem()->mkdirs($logdir.'/history');
-    }
+        // check history folder exists
+        if (!is_dir($logdir.'/history')) {
+            $this->getFilesystem()->mkdirs($logdir.'/history');
+        }
 
-    // determine date of last rotation
-    $logs = sfFinder::type('file')->maxdepth(1)->name($logfile.'_*.log')->sort_by_name()->in($logdir.'/history');
-    $recentlog = is_array($logs) ? array_pop($logs) : null;
+        // determine date of last rotation
+        $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) {
+            // calculate date to rotate logs on
+            $lastRotatedOn = filemtime($recentlog);
+            $rotateOn = date('Ymd', strtotime('+ '.$period.' days', $lastRotatedOn));
+        } else {
+            // no rotation has occured yet
+            $rotateOn = null;
+        }
 
-    if ($recentlog)
-    {
-      // calculate date to rotate logs on
-      $lastRotatedOn = filemtime($recentlog);
-      $rotateOn = date('Ymd', strtotime('+ '.$period.' days', $lastRotatedOn));
+        $srcLog = $logdir.'/'.$logfile.'.log';
+        $destLog = $logdir.'/history/'.$logfile.'_'.$today.'.log';
+
+        // 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';
+            $this->getFilesystem()->touch($lockFile);
+
+            // change mode so the web user can remove it if we die
+            $this->getFilesystem()->chmod($lockFile, 0777);
+
+            // if log file exists rotate it
+            if (file_exists($srcLog)) {
+                // check if the log file has already been rotated today
+                if (file_exists($destLog)) {
+                    // append log to existing rotated log
+                    $handle = fopen($destLog, 'a');
+                    $append = file_get_contents($srcLog);
+
+                    $this->logSection('file+', $destLog);
+                    fwrite($handle, $append);
+                } else {
+                    // copy log
+                    $this->getFilesystem()->copy($srcLog, $destLog);
+                }
+
+                // remove the log file
+                $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');
+
+                // if the number of logs in history exceeds history then remove the oldest log
+                if (count($newLogs) > $history) {
+                    $this->getFilesystem()->remove($newLogs[0]);
+                }
+            }
+
+            // release lock
+            $this->getFilesystem()->remove($lockFile);
+        }
     }
-    else
+
+    /**
+     * @see sfTask
+     */
+    protected function configure()
     {
-      // no rotation has occured yet
-      $rotateOn = null;
-    }
+        $this->addArguments(array(
+            new sfCommandArgument('application', sfCommandArgument::REQUIRED, 'The application name'),
+            new sfCommandArgument('env', sfCommandArgument::REQUIRED, 'The environment name'),
+        ));
 
-    $srcLog = $logdir.'/'.$logfile.'.log';
-    $destLog = $logdir.'/history/'.$logfile.'_'.$today.'.log';
+        $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),
+        ));
 
-    // 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';
-      $this->getFilesystem()->touch($lockFile);
-
-      // change mode so the web user can remove it if we die
-      $this->getFilesystem()->chmod($lockFile, 0777);
-
-      // if log file exists rotate it
-      if (file_exists($srcLog))
-      {
-        // check if the log file has already been rotated today
-        if (file_exists($destLog))
-        {
-          // append log to existing rotated log
-          $handle = fopen($destLog, 'a');
-          $append = file_get_contents($srcLog);
-
-          $this->logSection('file+', $destLog);
-          fwrite($handle, $append);
-        }
-        else
-        {
-          // copy log
-          $this->getFilesystem()->copy($srcLog, $destLog);
-        }
+        $this->namespace = 'log';
+        $this->name = 'rotate';
+        $this->briefDescription = 'Rotates an application\'s log files';
 
-        // remove the log file
-        $this->getFilesystem()->remove($srcLog);
+        $this->detailedDescription = <<<'EOF'
+The [log:rotate|INFO] task rotates application log files for a given
+environment:
 
-        // 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');
+  [./symfony log:rotate frontend dev|INFO]
 
-        // if the number of logs in history exceeds history then remove the oldest log
-        if (count($newLogs) > $history)
-        {
-          $this->getFilesystem()->remove($newLogs[0]);
-        }
-      }
+You can specify a [period|COMMENT] or a [history|COMMENT] option:
 
-      // release lock
-      $this->getFilesystem()->remove($lockFile);
+  [./symfony log:rotate frontend dev --history=10 --period=7|INFO]
+EOF;
+    }
+
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
+    {
+        $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 cf330fe87..a1fd40672 100644
--- a/lib/task/plugin/sfPluginAddChannelTask.class.php
+++ b/lib/task/plugin/sfPluginAddChannelTask.class.php
@@ -3,51 +3,53 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/sfPluginBaseTask.class.php');
+require_once __DIR__.'/sfPluginBaseTask.class.php';
 
 /**
  * Installs a plugin.
  *
- * @package    symfony
- * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfPluginAddChannelTask extends sfPluginBaseTask
 {
-  /**
-   * @see sfTask
-   */
-  protected function configure()
-  {
-    $this->addArguments(array(
-      new sfCommandArgument('name', sfCommandArgument::REQUIRED, 'The channel name'),
-    ));
+    /**
+     * @see sfTask
+     */
+    protected function configure()
+    {
+        $this->addArguments(array(
+            new sfCommandArgument('name', sfCommandArgument::REQUIRED, 'The channel name'),
+        ));
 
-    $this->namespace = 'plugin';
-    $this->name = 'add-channel';
+        $this->namespace = 'plugin';
+        $this->name = 'add-channel';
 
-    $this->briefDescription = 'Add a new PEAR channel';
+        $this->briefDescription = 'Add a new PEAR channel';
 
-    $this->detailedDescription = <<<EOF
+        $this->detailedDescription = <<<'EOF'
 The [plugin:add-channel|INFO] task adds a new PEAR channel:
 
   [./symfony plugin:add-channel symfony.plugins.pear.example.com|INFO]
 EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $this->logSection('plugin', sprintf('add channel "%s"', $arguments['name']));
-
-    $this->getPluginManager()->getEnvironment()->registerChannel($arguments['name']);
-  }
+    }
+
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
+    {
+        $this->logSection('plugin', sprintf('add channel "%s"', $arguments['name']));
+
+        $this->getPluginManager()->getEnvironment()->registerChannel($arguments['name']);
+    }
 }
diff --git a/lib/task/plugin/sfPluginBaseTask.class.php b/lib/task/plugin/sfPluginBaseTask.class.php
index cb550e651..b7c657c90 100644
--- a/lib/task/plugin/sfPluginBaseTask.class.php
+++ b/lib/task/plugin/sfPluginBaseTask.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -11,9 +11,8 @@
 /**
  * Base class for all symfony plugin tasks.
  *
- * @package    symfony
- * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfPluginBaseTask extends sfBaseTask
diff --git a/lib/task/plugin/sfPluginInstallTask.class.php b/lib/task/plugin/sfPluginInstallTask.class.php
index a6b1fe1f6..0689f7689 100644
--- a/lib/task/plugin/sfPluginInstallTask.class.php
+++ b/lib/task/plugin/sfPluginInstallTask.class.php
@@ -3,46 +3,45 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/sfPluginBaseTask.class.php');
+require_once __DIR__.'/sfPluginBaseTask.class.php';
 
 /**
  * Installs a plugin.
  *
- * @package    symfony
- * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfPluginInstallTask extends sfPluginBaseTask
 {
-  /**
-   * @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->namespace = 'plugin';
-    $this->name = 'install';
-
-    $this->briefDescription = 'Installs a plugin';
-
-    $this->detailedDescription = <<<EOF
+    /**
+     * @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->namespace = 'plugin';
+        $this->name = 'install';
+
+        $this->briefDescription = 'Installs a plugin';
+
+        $this->detailedDescription = <<<'EOF'
 The [plugin:install|INFO] task installs a plugin:
 
   [./symfony plugin:install sfGuardPlugin|INFO]
@@ -85,40 +84,37 @@ protected function configure()
 the task creates a [%name%|COMMENT] symbolic link for those assets under [web/|COMMENT].
 On Windows, the task copy all the files to the [web/%name%|COMMENT] directory.
 EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $this->logSection('plugin', sprintf('installing plugin "%s"', $arguments['name']));
-
-    $options['version'] = $options['release'];
-    unset($options['release']);
+    }
 
-    // license compatible?
-    if (!$options['force-license'])
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
     {
-      try
-      {
-        $license = $this->getPluginManager()->getPluginLicense($arguments['name'], $options);
-      }
-      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));
+        $this->logSection('plugin', sprintf('installing plugin "%s"', $arguments['name']));
+
+        $options['version'] = $options['release'];
+        unset($options['release']);
+
+        // license compatible?
+        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()));
+            }
+
+            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));
+                }
+            }
         }
-      }
-    }
 
-    $this->getPluginManager()->installPlugin($arguments['name'], $options);
-  }
+        $this->getPluginManager()->installPlugin($arguments['name'], $options);
+    }
 }
diff --git a/lib/task/plugin/sfPluginListTask.class.php b/lib/task/plugin/sfPluginListTask.class.php
index 97a21efc4..fbb779ad3 100644
--- a/lib/task/plugin/sfPluginListTask.class.php
+++ b/lib/task/plugin/sfPluginListTask.class.php
@@ -8,48 +8,49 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/sfPluginBaseTask.class.php');
+require_once __DIR__.'/sfPluginBaseTask.class.php';
 
 /**
  * Lists installed plugins.
  *
- * @package    symfony
- * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfPluginListTask extends sfPluginBaseTask
 {
-  /**
-   * @see sfTask
-   */
-  protected function configure()
-  {
-    $this->namespace = 'plugin';
-    $this->name = 'list';
+    /**
+     * @see sfTask
+     */
+    protected function configure()
+    {
+        $this->namespace = 'plugin';
+        $this->name = 'list';
 
-    $this->briefDescription = 'Lists installed plugins';
+        $this->briefDescription = 'Lists installed plugins';
 
-    $this->detailedDescription = <<<EOF
+        $this->detailedDescription = <<<'EOF'
 The [plugin:list|INFO] task lists all installed plugins:
 
   [./symfony plugin:list|INFO]
 
 It also gives the channel and version for each plugin.
 EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $this->log($this->formatter->format('Installed plugins:', 'COMMENT'));
+    }
 
-    foreach ($this->getPluginManager()->getInstalledPlugins() as $package)
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
     {
-      $alias = $this->getPluginManager()->getEnvironment()->getRegistry()->getChannel($package->getChannel())->getAlias();
-      $this->log(sprintf(' %-40s %10s-%-6s %s', $this->formatter->format($package->getPackage(), 'INFO'), $package->getVersion(), $package->getState() ?: null, $this->formatter->format(sprintf('# %s (%s)', $package->getChannel(), $alias), 'COMMENT')));
+        $this->log($this->formatter->format('Installed plugins:', 'COMMENT'));
+
+        foreach ($this->getPluginManager()->getInstalledPlugins() as $package) {
+            $alias = $this->getPluginManager()->getEnvironment()->getRegistry()->getChannel($package->getChannel())->getAlias();
+            $this->log(sprintf(' %-40s %10s-%-6s %s', $this->formatter->format($package->getPackage(), 'INFO'), $package->getVersion(), $package->getState() ?: null, $this->formatter->format(sprintf('# %s (%s)', $package->getChannel(), $alias), 'COMMENT')));
+        }
     }
-  }
 }
diff --git a/lib/task/plugin/sfPluginPublishAssetsTask.class.php b/lib/task/plugin/sfPluginPublishAssetsTask.class.php
index 390f632d1..3ca4831e7 100644
--- a/lib/task/plugin/sfPluginPublishAssetsTask.class.php
+++ b/lib/task/plugin/sfPluginPublishAssetsTask.class.php
@@ -8,41 +8,40 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/sfPluginBaseTask.class.php');
+require_once __DIR__.'/sfPluginBaseTask.class.php';
 
 /**
- * Publishes Web Assets for Core and third party plugins
+ * Publishes Web Assets for Core and third party plugins.
  *
- * @package    symfony
- * @subpackage task
  * @author     Fabian Lange <fabian.lange@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfPluginPublishAssetsTask extends sfPluginBaseTask
 {
-  /**
-   * @see sfTask
-   */
-  protected function configure()
-  {
-    $this->addArguments(array(
-      new sfCommandArgument('plugins', sfCommandArgument::OPTIONAL | sfCommandArgument::IS_ARRAY, 'Publish this plugin\'s assets'),
-    ));
+    /**
+     * @see sfTask
+     */
+    protected function configure()
+    {
+        $this->addArguments(array(
+            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(array(
+            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(array(
+            new sfCommandOption('relative', '', sfCommandOption::PARAMETER_NONE, 'If set symlinks will be relative'),
+        ));
 
-    $this->namespace = 'plugin';
-    $this->name = 'publish-assets';
+        $this->namespace = 'plugin';
+        $this->name = 'publish-assets';
 
-    $this->briefDescription = 'Publishes web assets for all plugins';
+        $this->briefDescription = 'Publishes web assets for all plugins';
 
-    $this->detailedDescription = <<<EOF
+        $this->detailedDescription = <<<'EOF'
 The [plugin:publish-assets|INFO] task will publish web assets from all plugins.
 
   [./symfony plugin:publish-assets|INFO]
@@ -54,56 +53,54 @@ protected function configure()
 
   [./symfony plugin:publish-assets sfDoctrinePlugin|INFO]
 EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $enabledPlugins = $this->configuration->getPlugins();
-
-    if ($diff = array_diff($arguments['plugins'], $enabledPlugins))
-    {
-      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');
-      $arguments['plugins'] = array_unique(array_merge($arguments['plugins'], array_intersect($enabledPlugins, $corePlugins)));
-    }
-    else if (!count($arguments['plugins']))
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
     {
-      $arguments['plugins'] = $enabledPlugins;
-    }
+        $enabledPlugins = $this->configuration->getPlugins();
 
-    foreach ($arguments['plugins'] as $plugin)
-    {
-      $pluginConfiguration = $this->configuration->getPluginConfiguration($plugin);
+        if ($diff = array_diff($arguments['plugins'], $enabledPlugins)) {
+            throw new InvalidArgumentException('Plugin(s) not found: '.implode(', ', $diff));
+        }
 
-      $this->logSection('plugin', 'Configuring plugin - '.$plugin);
-      $this->installPluginAssets($plugin, $pluginConfiguration->getRootDir(), $options['relative']);
+        if ($options['core-only']) {
+            $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;
+        }
+
+        foreach ($arguments['plugins'] as $plugin) {
+            $pluginConfiguration = $this->configuration->getPluginConfiguration($plugin);
+
+            $this->logSection('plugin', 'Configuring plugin - '.$plugin);
+            $this->installPluginAssets($plugin, $pluginConfiguration->getRootDir(), $options['relative']);
+        }
     }
-  }
-
-  /**
-   * Installs web content for a plugin.
-   *
-   * @param string $plugin The plugin name
-   * @param string $dir    The plugin directory
-   */
-  protected function installPluginAssets($plugin, $dir, $relative)
-  {
-    $webDir = $dir.DIRECTORY_SEPARATOR.'web';
-
-    if (is_dir($webDir))
+
+    /**
+     * Installs web content for a plugin.
+     *
+     * @param string $plugin   The plugin name
+     * @param string $dir      The plugin directory
+     * @param mixed  $relative
+     */
+    protected function installPluginAssets($plugin, $dir, $relative)
     {
-    	if($relative) {
-	      $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);
-    	}
+        $webDir = $dir.DIRECTORY_SEPARATOR.'web';
+
+        if (is_dir($webDir)) {
+            if ($relative) {
+                $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);
+            }
+        }
     }
-  }
 }
diff --git a/lib/task/plugin/sfPluginUninstallTask.class.php b/lib/task/plugin/sfPluginUninstallTask.class.php
index 6e5d1febb..620b7a317 100644
--- a/lib/task/plugin/sfPluginUninstallTask.class.php
+++ b/lib/task/plugin/sfPluginUninstallTask.class.php
@@ -3,43 +3,42 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/sfPluginBaseTask.class.php');
+require_once __DIR__.'/sfPluginBaseTask.class.php';
 
 /**
  * Uninstall a plugin.
  *
- * @package    symfony
- * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfPluginUninstallTask extends sfPluginBaseTask
 {
-  /**
-   * @see sfTask
-   */
-  protected function configure()
-  {
-    $this->addArguments(array(
-      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->namespace = 'plugin';
-    $this->name = 'uninstall';
-
-    $this->briefDescription = 'Uninstalls a plugin';
-
-    $this->detailedDescription = <<<EOF
+    /**
+     * @see sfTask
+     */
+    protected function configure()
+    {
+        $this->addArguments(array(
+            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->namespace = 'plugin';
+        $this->name = 'uninstall';
+
+        $this->briefDescription = 'Uninstalls a plugin';
+
+        $this->detailedDescription = <<<'EOF'
 The [plugin:uninstall|INFO] task uninstalls a plugin:
 
   [./symfony plugin:uninstall sfGuardPlugin|INFO]
@@ -63,15 +62,18 @@ protected function configure()
 the task also removes the [web/%name%|COMMENT] symbolic link (on *nix)
 or directory (on Windows).
 EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $this->logSection('plugin', sprintf('uninstalling plugin "%s"', $arguments['name']));
-
-    $this->getPluginManager()->uninstallPlugin($arguments['name'], $options['channel']);
-  }
+    }
+
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
+    {
+        $this->logSection('plugin', sprintf('uninstalling plugin "%s"', $arguments['name']));
+
+        $this->getPluginManager()->uninstallPlugin($arguments['name'], $options['channel']);
+    }
 }
diff --git a/lib/task/plugin/sfPluginUpgradeTask.class.php b/lib/task/plugin/sfPluginUpgradeTask.class.php
index a68269274..753ea2b67 100644
--- a/lib/task/plugin/sfPluginUpgradeTask.class.php
+++ b/lib/task/plugin/sfPluginUpgradeTask.class.php
@@ -3,44 +3,43 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/sfPluginBaseTask.class.php');
+require_once __DIR__.'/sfPluginBaseTask.class.php';
 
 /**
  * Upgrades a plugin.
  *
- * @package    symfony
- * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfPluginUpgradeTask extends sfPluginBaseTask
 {
-  /**
-   * @see sfTask
-   */
-  protected function configure()
-  {
-    $this->addArguments(array(
-      new sfCommandArgument('name', sfCommandArgument::REQUIRED, 'The plugin name'),
-    ));
+    /**
+     * @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),
-    ));
+        $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->namespace = 'plugin';
-    $this->name = 'upgrade';
+        $this->namespace = 'plugin';
+        $this->name = 'upgrade';
 
-    $this->briefDescription = 'Upgrades a plugin';
+        $this->briefDescription = 'Upgrades a plugin';
 
-    $this->detailedDescription = <<<EOF
+        $this->detailedDescription = <<<'EOF'
 The [plugin:upgrade|INFO] task tries to upgrade a plugin:
 
   [./symfony plugin:upgrade sfGuardPlugin|INFO]
@@ -52,15 +51,18 @@ protected function configure()
 
 See [plugin:install|INFO] for more information about the format of the plugin name and options.
 EOF;
-  }
+    }
 
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $this->logSection('plugin', sprintf('upgrading plugin "%s"', $arguments['name']));
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
+    {
+        $this->logSection('plugin', sprintf('upgrading plugin "%s"', $arguments['name']));
 
-    $this->getPluginManager()->installPlugin($arguments['name'], $options);
-  }
+        $this->getPluginManager()->installPlugin($arguments['name'], $options);
+    }
 }
diff --git a/lib/task/project/sfProjectClearControllersTask.class.php b/lib/task/project/sfProjectClearControllersTask.class.php
index 287df08bc..bbbd43480 100644
--- a/lib/task/project/sfProjectClearControllersTask.class.php
+++ b/lib/task/project/sfProjectClearControllersTask.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -11,23 +11,22 @@
 /**
  * Clears all non production environment controllers.
  *
- * @package    symfony
- * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfProjectClearControllersTask extends sfBaseTask
 {
-  /**
-   * @see sfTask
-   */
-  protected function configure()
-  {
-    $this->namespace = 'project';
-    $this->name = 'clear-controllers';
-    $this->briefDescription = 'Clears all non production environment controllers';
+    /**
+     * @see sfTask
+     */
+    protected function configure()
+    {
+        $this->namespace = 'project';
+        $this->name = 'clear-controllers';
+        $this->briefDescription = 'Clears all non production environment controllers';
 
-    $this->detailedDescription = <<<EOF
+        $this->detailedDescription = <<<'EOF'
 The [project:clear-controllers|INFO] task clears all non production environment
 controllers:
 
@@ -53,26 +52,26 @@ protected function configure()
 Those two controllers are safe because debug mode and the web debug
 toolbar are disabled.
 EOF;
-  }
+    }
 
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $finder = sfFinder::type('file')->maxdepth(1)->name('*.php');
-    foreach ($finder->in(sfConfig::get('sf_web_dir')) as $controller)
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
     {
-      $content = file_get_contents($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))
-      {
-        // Remove file if it has found an application and the environment is not production
-        if ($match[2] != 'prod')
-        {
-          $this->getFilesystem()->remove($controller);
+            if (preg_match('/ProjectConfiguration::getApplicationConfiguration\(\'(.*?)\', \'(.*?)\'/', $content, $match)) {
+                // Remove file if it has found an application and the environment is not production
+                if ('prod' != $match[2]) {
+                    $this->getFilesystem()->remove($controller);
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/lib/task/project/sfProjectDeployTask.class.php b/lib/task/project/sfProjectDeployTask.class.php
index 842a84293..a4d91b7fd 100644
--- a/lib/task/project/sfProjectDeployTask.class.php
+++ b/lib/task/project/sfProjectDeployTask.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -11,37 +11,57 @@
 /**
  * Deploys a project to another server.
  *
- * @package    symfony
- * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfProjectDeployTask extends sfBaseTask
 {
-  protected
-    $outputBuffer = '',
-    $errorBuffer = '';
-
-  /**
-   * @see sfTask
-   */
-  protected function configure()
-  {
-    $this->addArguments(array(
-      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->namespace = 'project';
-    $this->name = 'deploy';
-    $this->briefDescription = 'Deploys a project to another server';
-
-    $this->detailedDescription = <<<EOF
+    protected $outputBuffer = '';
+    protected $errorBuffer = '';
+
+    public function logOutput($output)
+    {
+        if (false !== $pos = strpos($output, "\n")) {
+            $this->outputBuffer .= substr($output, 0, $pos);
+            $this->log($this->outputBuffer);
+            $this->outputBuffer = substr($output, $pos + 1);
+        } else {
+            $this->outputBuffer .= $output;
+        }
+    }
+
+    public function logErrors($output)
+    {
+        if (false !== $pos = strpos($output, "\n")) {
+            $this->errorBuffer .= substr($output, 0, $pos);
+            $this->log($this->formatter->format($this->errorBuffer, 'ERROR'));
+            $this->errorBuffer = substr($output, $pos + 1);
+        } else {
+            $this->errorBuffer .= $output;
+        }
+    }
+
+    /**
+     * @see sfTask
+     */
+    protected function configure()
+    {
+        $this->addArguments(array(
+            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->namespace = 'project';
+        $this->name = 'deploy';
+        $this->briefDescription = 'Deploys a project to another server';
+
+        $this->detailedDescription = <<<'EOF'
 The [project:deploy|INFO] task deploys a project on a server:
 
   [./symfony project:deploy production|INFO]
@@ -84,128 +104,89 @@ protected function configure()
 
   [./symfony project:deploy --go --rsync-options=-avz|INFO]
 EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $env = $arguments['server'];
+    }
 
-    $ini = sfConfig::get('sf_config_dir').'/properties.ini';
-    if (!file_exists($ini))
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
     {
-      throw new sfCommandException('You must create a config/properties.ini file');
-    }
+        $env = $arguments['server'];
 
-    $properties = parse_ini_file($ini, true);
+        $ini = sfConfig::get('sf_config_dir').'/properties.ini';
+        if (!file_exists($ini)) {
+            throw new sfCommandException('You must create a config/properties.ini file');
+        }
 
-    if (!isset($properties[$env]))
-    {
-      throw new sfCommandException(sprintf('You must define the configuration for server "%s" in config/properties.ini', $env));
-    }
+        $properties = parse_ini_file($ini, true);
 
-    $properties = $properties[$env];
+        if (!isset($properties[$env])) {
+            throw new sfCommandException(sprintf('You must define the configuration for server "%s" in config/properties.ini', $env));
+        }
 
-    if (!isset($properties['host']))
-    {
-      throw new sfCommandException('You must define a "host" entry.');
-    }
+        $properties = $properties[$env];
 
-    if (!isset($properties['dir']))
-    {
-      throw new sfCommandException('You must define a "dir" entry.');
-    }
+        if (!isset($properties['host'])) {
+            throw new sfCommandException('You must define a "host" entry.');
+        }
 
-    $host = $properties['host'];
-    $dir  = $properties['dir'];
-    $user = isset($properties['user']) ? $properties['user'].'@' : '';
+        if (!isset($properties['dir'])) {
+            throw new sfCommandException('You must define a "dir" entry.');
+        }
 
-    if (substr($dir, -1) != '/')
-    {
-      $dir .= '/';
-    }
+        $host = $properties['host'];
+        $dir = $properties['dir'];
+        $user = isset($properties['user']) ? $properties['user'].'@' : '';
 
-    $ssh = 'ssh';
+        if ('/' != substr($dir, -1)) {
+            $dir .= '/';
+        }
 
-    if (isset($properties['port']))
-    {
-      $port = $properties['port'];
-      $ssh = '"ssh -p'.$port.'"';
-    }
+        $ssh = 'ssh';
 
-    if (isset($properties['parameters']))
-    {
-      $parameters = $properties['parameters'];
-    }
-    else
-    {
-      $parameters = $options['rsync-options'];
-      if (file_exists($options['rsync-dir'].'/rsync_include.txt'))
-      {
-        $parameters .= sprintf(' --include-from=%s/rsync_include.txt', $options['rsync-dir']);
-      }
-
-      if (file_exists($options['rsync-dir'].'/rsync_exclude.txt'))
-      {
-        $parameters .= sprintf(' --exclude-from=%s/rsync_exclude.txt', $options['rsync-dir']);
-      }
-
-      if (file_exists($options['rsync-dir'].'/rsync.txt'))
-      {
-        $parameters .= sprintf(' --files-from=%s/rsync.txt', $options['rsync-dir']);
-      }
-    }
+        if (isset($properties['port'])) {
+            $port = $properties['port'];
+            $ssh = '"ssh -p'.$port.'"';
+        }
 
-    $dryRun = $options['go'] ? '' : '--dry-run';
-    $command = "rsync $dryRun $parameters -e $ssh ./ $user$host:$dir";
+        if (isset($properties['parameters'])) {
+            $parameters = $properties['parameters'];
+        } else {
+            $parameters = $options['rsync-options'];
+            if (file_exists($options['rsync-dir'].'/rsync_include.txt')) {
+                $parameters .= sprintf(' --include-from=%s/rsync_include.txt', $options['rsync-dir']);
+            }
 
-    $this->getFilesystem()->execute($command, $options['trace'] ? array($this, 'logOutput') : null, array($this, 'logErrors'));
+            if (file_exists($options['rsync-dir'].'/rsync_exclude.txt')) {
+                $parameters .= sprintf(' --exclude-from=%s/rsync_exclude.txt', $options['rsync-dir']);
+            }
 
-    $this->clearBuffers();
-  }
+            if (file_exists($options['rsync-dir'].'/rsync.txt')) {
+                $parameters .= sprintf(' --files-from=%s/rsync.txt', $options['rsync-dir']);
+            }
+        }
 
-  public function logOutput($output)
-  {
-    if (false !== $pos = strpos($output, "\n"))
-    {
-      $this->outputBuffer .= substr($output, 0, $pos);
-      $this->log($this->outputBuffer);
-      $this->outputBuffer = substr($output, $pos + 1);
-    }
-    else
-    {
-      $this->outputBuffer .= $output;
-    }
-  }
+        $dryRun = $options['go'] ? '' : '--dry-run';
+        $command = "rsync {$dryRun} {$parameters} -e {$ssh} ./ {$user}{$host}:{$dir}";
 
-  public function logErrors($output)
-  {
-    if (false !== $pos = strpos($output, "\n"))
-    {
-      $this->errorBuffer .= substr($output, 0, $pos);
-      $this->log($this->formatter->format($this->errorBuffer, 'ERROR'));
-      $this->errorBuffer = substr($output, $pos + 1);
-    }
-    else
-    {
-      $this->errorBuffer .= $output;
-    }
-  }
+        $this->getFilesystem()->execute($command, $options['trace'] ? array($this, 'logOutput') : null, array($this, 'logErrors'));
 
-  protected function clearBuffers()
-  {
-    if ($this->outputBuffer)
-    {
-      $this->log($this->outputBuffer);
-      $this->outputBuffer = '';
+        $this->clearBuffers();
     }
 
-    if ($this->errorBuffer)
+    protected function clearBuffers()
     {
-      $this->log($this->formatter->format($this->errorBuffer, 'ERROR'));
-      $this->errorBuffer = '';
+        if ($this->outputBuffer) {
+            $this->log($this->outputBuffer);
+            $this->outputBuffer = '';
+        }
+
+        if ($this->errorBuffer) {
+            $this->log($this->formatter->format($this->errorBuffer, 'ERROR'));
+            $this->errorBuffer = '';
+        }
     }
-  }
 }
diff --git a/lib/task/project/sfProjectDisableTask.class.php b/lib/task/project/sfProjectDisableTask.class.php
index e41179ec5..b891c0dae 100644
--- a/lib/task/project/sfProjectDisableTask.class.php
+++ b/lib/task/project/sfProjectDisableTask.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -11,28 +11,27 @@
 /**
  * Disables an application in a given environment.
  *
- * @package    symfony
- * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfProjectDisableTask extends sfBaseTask
 {
-  /**
-   * @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'),
-    ));
+    /**
+     * @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->namespace = 'project';
-    $this->name = 'disable';
-    $this->briefDescription = 'Disables an application in a given environment';
+        $this->namespace = 'project';
+        $this->name = 'disable';
+        $this->briefDescription = 'Disables an application in a given environment';
 
-    $this->detailedDescription = <<<EOF
+        $this->detailedDescription = <<<'EOF'
 The [project:disable|INFO] task disables an environment:
 
   [./symfony project:disable prod|INFO]
@@ -42,38 +41,34 @@ protected function configure()
 
   [./symfony project:disable prod frontend backend|INFO]
 EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    if (1 == count($arguments['app']) && !file_exists(sfConfig::get('sf_apps_dir').'/'.$arguments['app'][0]))
-    {
-      // support previous task signature
-      $applications = array($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'));
-      $env = $arguments['env'];
     }
 
-    foreach ($applications as $app)
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
     {
-      $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
-      {
-        $this->getFilesystem()->touch($lockFile);
+        if (1 == count($arguments['app']) && !file_exists(sfConfig::get('sf_apps_dir').'/'.$arguments['app'][0])) {
+            // support previous task signature
+            $applications = array($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'));
+            $env = $arguments['env'];
+        }
+
+        foreach ($applications as $app) {
+            $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 {
+                $this->getFilesystem()->touch($lockFile);
 
-        $this->logSection('enable', sprintf('%s [%s] has been DISABLED', $app, $env));
-      }
+                $this->logSection('enable', sprintf('%s [%s] has been DISABLED', $app, $env));
+            }
+        }
     }
-  }
 }
diff --git a/lib/task/project/sfProjectEnableTask.class.php b/lib/task/project/sfProjectEnableTask.class.php
index bb61ef109..c106124da 100644
--- a/lib/task/project/sfProjectEnableTask.class.php
+++ b/lib/task/project/sfProjectEnableTask.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -11,28 +11,27 @@
 /**
  * Enables an application in a given environment.
  *
- * @package    symfony
- * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfProjectEnableTask extends sfBaseTask
 {
-  /**
-   * @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'),
-    ));
+    /**
+     * @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->namespace = 'project';
-    $this->name = 'enable';
-    $this->briefDescription = 'Enables an application in a given environment';
+        $this->namespace = 'project';
+        $this->name = 'enable';
+        $this->briefDescription = 'Enables an application in a given environment';
 
-    $this->detailedDescription = <<<EOF
+        $this->detailedDescription = <<<'EOF'
 The [project:enable|INFO] task enables a specific environment:
 
   [./symfony project:enable frontend prod|INFO]
@@ -42,43 +41,39 @@ protected function configure()
 
   [./symfony project:enable prod frontend backend|INFO]
 EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    if (1 == count($arguments['app']) && !file_exists(sfConfig::get('sf_apps_dir').'/'.$arguments['app'][0]))
-    {
-      // support previous task signature
-      $applications = array($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'));
-      $env = $arguments['env'];
     }
 
-    foreach ($applications as $app)
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
     {
-      $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);
+        if (1 == count($arguments['app']) && !file_exists(sfConfig::get('sf_apps_dir').'/'.$arguments['app'][0])) {
+            // support previous task signature
+            $applications = array($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'));
+            $env = $arguments['env'];
+        }
+
+        foreach ($applications as $app) {
+            $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->setCommandApplication($this->commandApplication);
-        $clearCache->setConfiguration($this->configuration);
-        $clearCache->run(array(), array('--app='.$app, '--env='.$env));
+                $clearCache = new sfCacheClearTask($this->dispatcher, $this->formatter);
+                $clearCache->setCommandApplication($this->commandApplication);
+                $clearCache->setConfiguration($this->configuration);
+                $clearCache->run(array(), array('--app='.$app, '--env='.$env));
 
-        $this->logSection('enable', sprintf('%s [%s] has been ENABLED', $app, $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 5726e78bd..2aae397f2 100644
--- a/lib/task/project/sfProjectOptimizeTask.class.php
+++ b/lib/task/project/sfProjectOptimizeTask.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -11,28 +11,27 @@
 /**
  * Optimizes a project for better performance.
  *
- * @package    symfony
- * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfProjectOptimizeTask extends sfBaseTask
 {
-  /**
-   * @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->namespace = 'project';
-    $this->name = 'optimize';
-    $this->briefDescription = 'Optimizes a project for better performance';
-
-    $this->detailedDescription = <<<EOF
+    /**
+     * @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->namespace = 'project';
+        $this->name = 'optimize';
+        $this->briefDescription = 'Optimizes a project for better performance';
+
+        $this->detailedDescription = <<<'EOF'
 The [project:optimize|INFO] optimizes a project for better performance:
 
   [./symfony project:optimize frontend prod|INFO]
@@ -40,166 +39,150 @@ protected function configure()
 This task should only be used on a production server. Don't forget to re-run
 the task each time the project changes.
 EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $data = array();
-    $modules = $this->findModules();
-    $target = sfConfig::get('sf_cache_dir').'/'.$arguments['application'].'/'.$arguments['env'].'/config/configuration.php';
-
-    $current_umask = umask();
-    umask(0000);
-
-    // remove existing optimization file
-    if (file_exists($target))
-    {
-      $this->getFilesystem()->remove($target);
     }
 
-    // recreate configuration without the cache
-    $this->setConfiguration($this->createConfiguration($arguments['application'], $arguments['env']));
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
+    {
+        $data = array();
+        $modules = $this->findModules();
+        $target = sfConfig::get('sf_cache_dir').'/'.$arguments['application'].'/'.$arguments['env'].'/config/configuration.php';
 
-    // initialize the context
-    sfContext::createInstance($this->configuration);
+        $current_umask = umask();
+        umask(0000);
 
-    // force cache generation for generated modules
-    foreach ($modules as $module)
-    {
-      $this->logSection('module', $module);
-
-      try
-      {
-        $this->configuration->getConfigCache()->checkConfig('modules/'.$module.'/config/generator.yml',  true);
-      }
-      catch (Exception $e)
-      {
-        $this->dispatcher->notifyUntil(new sfEvent($e, 'application.throw_exception'));
-
-        $this->logSection($module, $e->getMessage(), null, 'ERROR');
-      }
-    }
+        // remove existing optimization file
+        if (file_exists($target)) {
+            $this->getFilesystem()->remove($target);
+        }
 
-    $templates = $this->findTemplates($modules);
+        // recreate configuration without the cache
+        $this->setConfiguration($this->createConfiguration($arguments['application'], $arguments['env']));
 
-    $data['getTemplateDir'] = $this->optimizeGetTemplateDir($modules, $templates);
-    $data['getControllerDirs'] = $this->optimizeGetControllerDirs($modules);
-    $data['getPluginPaths'] = $this->configuration->getPluginPaths();
-    $data['loadHelpers'] = $this->optimizeLoadHelpers($modules);
+        // initialize the context
+        sfContext::createInstance($this->configuration);
 
-    if (!file_exists($directory = dirname($target)))
-    {
-      $this->getFilesystem()->mkdirs($directory);
-    }
+        // force cache generation for generated modules
+        foreach ($modules as $module) {
+            $this->logSection('module', $module);
 
-    $this->logSection('file+', $target);
-    file_put_contents($target, '<?php return '.var_export($data, true).';');
+            try {
+                $this->configuration->getConfigCache()->checkConfig('modules/'.$module.'/config/generator.yml', true);
+            } catch (Exception $e) {
+                $this->dispatcher->notifyUntil(new sfEvent($e, 'application.throw_exception'));
 
-    umask($current_umask);
-  }
+                $this->logSection($module, $e->getMessage(), null, 'ERROR');
+            }
+        }
 
-  protected function optimizeGetControllerDirs($modules)
-  {
-    $data = array();
-    foreach ($modules as $module)
-    {
-      $data[$module] = $this->configuration->getControllerDirs($module);
-    }
+        $templates = $this->findTemplates($modules);
 
-    return $data;
-  }
+        $data['getTemplateDir'] = $this->optimizeGetTemplateDir($modules, $templates);
+        $data['getControllerDirs'] = $this->optimizeGetControllerDirs($modules);
+        $data['getPluginPaths'] = $this->configuration->getPluginPaths();
+        $data['loadHelpers'] = $this->optimizeLoadHelpers($modules);
 
-  protected function optimizeGetTemplateDir($modules, $templates)
-  {
-    $data = array();
-    foreach ($modules as $module)
-    {
-      $data[$module] = array();
-      foreach ($templates[$module] as $template)
-      {
-        if (null !== $dir = $this->configuration->getTemplateDir($module, $template))
-        {
-          $data[$module][$template] = $dir;
+        if (!file_exists($directory = dirname($target))) {
+            $this->getFilesystem()->mkdirs($directory);
         }
-      }
-    }
-
-    return $data;
-  }
 
-  protected function optimizeLoadHelpers($modules)
-  {
-    $data = array();
+        $this->logSection('file+', $target);
+        file_put_contents($target, '<?php return '.var_export($data, true).';');
 
-    $finder = sfFinder::type('file')->name('*Helper.php');
+        umask($current_umask);
+    }
 
-    // module helpers
-    foreach ($modules as $module)
+    protected function optimizeGetControllerDirs($modules)
     {
-      $helpers = array();
-
-      $dirs = $this->configuration->getHelperDirs($module);
-      foreach ($finder->in($dirs[0]) as $file)
-      {
-        $helpers[basename($file, 'Helper.php')] = $file;
-      }
-
-      if (count($helpers))
-      {
-        $data[$module] = $helpers;
-      }
+        $data = array();
+        foreach ($modules as $module) {
+            $data[$module] = $this->configuration->getControllerDirs($module);
+        }
+
+        return $data;
     }
 
-    // all other helpers
-    foreach ($this->configuration->getHelperDirs() as $dir)
+    protected function optimizeGetTemplateDir($modules, $templates)
     {
-      foreach ($finder->in($dir) as $file)
-      {
-        $helper = basename($file, 'Helper.php');
-        if (!isset($data[''][$helper]))
-        {
-          $data[''][$helper] = $file;
+        $data = array();
+        foreach ($modules as $module) {
+            $data[$module] = array();
+            foreach ($templates[$module] as $template) {
+                if (null !== $dir = $this->configuration->getTemplateDir($module, $template)) {
+                    $data[$module][$template] = $dir;
+                }
+            }
         }
-      }
+
+        return $data;
     }
 
-    return $data;
-  }
+    protected function optimizeLoadHelpers($modules)
+    {
+        $data = array();
 
-  protected function findTemplates($modules)
-  {
-    $files = array();
+        $finder = sfFinder::type('file')->name('*Helper.php');
 
-    foreach ($modules as $module)
-    {
-      $files[$module] = sfFinder::type('file')->follow_link()->relative()->in($this->configuration->getTemplateDirs($module));
-    }
+        // module helpers
+        foreach ($modules as $module) {
+            $helpers = array();
+
+            $dirs = $this->configuration->getHelperDirs($module);
+            foreach ($finder->in($dirs[0]) as $file) {
+                $helpers[basename($file, 'Helper.php')] = $file;
+            }
+
+            if (count($helpers)) {
+                $data[$module] = $helpers;
+            }
+        }
 
-    return $files;
-  }
+        // all other helpers
+        foreach ($this->configuration->getHelperDirs() as $dir) {
+            foreach ($finder->in($dir) as $file) {
+                $helper = basename($file, 'Helper.php');
+                if (!isset($data[''][$helper])) {
+                    $data[''][$helper] = $file;
+                }
+            }
+        }
 
-  protected function findModules()
-  {
-    // application
-    $dirs = array(sfConfig::get('sf_app_module_dir'));
+        return $data;
+    }
 
-    // plugins
-    $pluginSubPaths = $this->configuration->getPluginSubPaths(DIRECTORY_SEPARATOR.'modules');
-    $modules = array();
-    foreach (sfFinder::type('dir')->maxdepth(0)->follow_link()->relative()->in($pluginSubPaths) as $module)
+    protected function findTemplates($modules)
     {
-        if (in_array($module, sfConfig::get('sf_enabled_modules')))
-        {
-          $modules[] = $module;
+        $files = array();
+
+        foreach ($modules as $module) {
+            $files[$module] = sfFinder::type('file')->follow_link()->relative()->in($this->configuration->getTemplateDirs($module));
         }
+
+        return $files;
     }
 
-    // core modules
-    $dirs[] = sfConfig::get('sf_symfony_lib_dir').'/controller';
+    protected function findModules()
+    {
+        // application
+        $dirs = array(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[] = $module;
+            }
+        }
 
-    return array_unique(array_merge(sfFinder::type('dir')->maxdepth(0)->follow_link()->relative()->in($dirs), $modules));
-  }
+        // core modules
+        $dirs[] = sfConfig::get('sf_symfony_lib_dir').'/controller';
+
+        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 c5b5d9b0c..c0c13d43c 100644
--- a/lib/task/project/sfProjectPermissionsTask.class.php
+++ b/lib/task/project/sfProjectPermissionsTask.class.php
@@ -11,109 +11,109 @@
 /**
  * Fixes symfony directory permissions.
  *
- * @package    symfony
- * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfProjectPermissionsTask extends sfBaseTask
 {
-  protected
-    $current = null,
-    $failed  = array();
+    protected $current;
+    protected $failed = array();
 
-  /**
-   * @see sfTask
-   */
-  protected function configure()
-  {
-    $this->namespace = 'project';
-    $this->name = 'permissions';
-    $this->briefDescription = 'Fixes symfony directory permissions';
+    /**
+     * Captures those chmod commands that fail.
+     *
+     * @see http://www.php.net/set_error_handler
+     *
+     * @param mixed      $no
+     * @param mixed      $string
+     * @param mixed      $file
+     * @param mixed      $line
+     * @param mixed|null $context
+     */
+    public function handleError($no, $string, $file, $line, $context = null)
+    {
+        $this->failed[] = $this->current;
+    }
 
-    $this->detailedDescription = <<<EOF
+    /**
+     * @see sfTask
+     */
+    protected function configure()
+    {
+        $this->namespace = 'project';
+        $this->name = 'permissions';
+        $this->briefDescription = 'Fixes symfony directory permissions';
+
+        $this->detailedDescription = <<<'EOF'
 The [project:permissions|INFO] task fixes directory permissions:
 
   [./symfony project:permissions|INFO]
 EOF;
-  }
+    }
 
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    if (file_exists(sfConfig::get('sf_upload_dir')))
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
     {
-      $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 = array(
+            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);
-      $this->chmod($fileFinder->in($dir), 0666);
-    }
+        foreach ($dirs as $dir) {
+            $this->chmod($dirFinder->in($dir), 0777);
+            $this->chmod($fileFinder->in($dir), 0666);
+        }
 
-    // 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)
-      ), 'ERROR_LARGE');
+        // 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)
+            ), 'ERROR_LARGE');
+        }
     }
-  }
 
-  /**
-   * Chmod and capture any failures.
-   *
-   * @param string  $file
-   * @param integer $mode
-   * @param integer $umask
-   *
-   * @see sfFilesystem
-   */
-  protected function chmod($file, $mode, $umask = 0000)
-  {
-    if (is_array($file))
+    /**
+     * Chmod and capture any failures.
+     *
+     * @param string $file
+     * @param int    $mode
+     * @param int    $umask
+     *
+     * @see sfFilesystem
+     */
+    protected function chmod($file, $mode, $umask = 0000)
     {
-      foreach ($file as $f)
-      {
-        $this->chmod($f, $mode, $umask);
-      }
-    }
-    else
-    {
-      set_error_handler(array($this, 'handleError'));
+        if (is_array($file)) {
+            foreach ($file as $f) {
+                $this->chmod($f, $mode, $umask);
+            }
+        } else {
+            set_error_handler(array($this, 'handleError'));
 
-      $this->current = $file;
-      @$this->getFilesystem()->chmod($file, $mode, $umask);
-      $this->current = null;
+            $this->current = $file;
+            @$this->getFilesystem()->chmod($file, $mode, $umask);
+            $this->current = null;
 
-      restore_error_handler();
+            restore_error_handler();
+        }
     }
-  }
-
-  /**
-   * Captures those chmod commands that fail.
-   *
-   * @see http://www.php.net/set_error_handler
-   */
-  public function handleError($no, $string, $file, $line, $context = null)
-  {
-    $this->failed[] = $this->current;
-  }
 }
diff --git a/lib/task/project/sfProjectSendEmailsTask.class.php b/lib/task/project/sfProjectSendEmailsTask.class.php
index 83cb92dd2..d6280c464 100644
--- a/lib/task/project/sfProjectSendEmailsTask.class.php
+++ b/lib/task/project/sfProjectSendEmailsTask.class.php
@@ -11,31 +11,30 @@
 /**
  * Send emails stored in a queue.
  *
- * @package    symfony
- * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfProjectSendEmailsTask extends sfBaseTask
 {
-  /**
-   * @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),
-    ));
+    /**
+     * @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->namespace = 'project';
-    $this->name = 'send-emails';
+        $this->namespace = 'project';
+        $this->name = 'send-emails';
 
-    $this->briefDescription = 'Sends emails stored in a queue';
+        $this->briefDescription = 'Sends emails stored in a queue';
 
-    $this->detailedDescription = <<<EOF
+        $this->detailedDescription = <<<'EOF'
 The [project:send-emails|INFO] sends emails stored in a queue:
 
   [php symfony project:send-emails|INFO]
@@ -48,18 +47,18 @@ protected function configure()
 
   [php symfony project:send-emails --time-limit=10|INFO]
 EOF;
-  }
+    }
 
-  protected function execute($arguments = array(), $options = array())
-  {
-    $databaseManager = new sfDatabaseManager($this->configuration);
+    protected function execute($arguments = array(), $options = array())
+    {
+        $databaseManager = new sfDatabaseManager($this->configuration);
 
-    $spool = $this->getMailer()->getSpool();
-    $spool->setMessageLimit($options['message-limit']);
-    $spool->setTimeLimit($options['time-limit']);
+        $spool = $this->getMailer()->getSpool();
+        $spool->setMessageLimit($options['message-limit']);
+        $spool->setTimeLimit($options['time-limit']);
 
-    $sent = $this->getMailer()->flushQueue();
+        $sent = $this->getMailer()->flushQueue();
 
-    $this->logSection('project', sprintf('sent %s emails', $sent));
-  }
+        $this->logSection('project', sprintf('sent %s emails', $sent));
+    }
 }
diff --git a/lib/task/project/sfProjectValidateTask.class.php b/lib/task/project/sfProjectValidateTask.class.php
index 1fd690e7c..65881ec1f 100644
--- a/lib/task/project/sfProjectValidateTask.class.php
+++ b/lib/task/project/sfProjectValidateTask.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -11,23 +11,22 @@
 /**
  * Finds deprecated usage in a project.
  *
- * @package    symfony
- * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfValidateTask extends sfBaseTask
 {
-  /**
-   * @see sfTask
-   */
-  protected function configure()
-  {
-    $this->namespace = 'project';
-    $this->name = 'validate';
-    $this->briefDescription = 'Finds deprecated usage in a project';
-
-    $this->detailedDescription = <<<EOF
+    /**
+     * @see sfTask
+     */
+    protected function configure()
+    {
+        $this->namespace = 'project';
+        $this->name = 'validate';
+        $this->briefDescription = 'Finds deprecated usage in a project';
+
+        $this->detailedDescription = <<<'EOF'
 The [project:validate|INFO] task detects deprecated usage in your project.
 
   [./symfony project:validate|INFO]
@@ -35,68 +34,65 @@ protected function configure()
 The task lists all the files you need to change before switching to
 symfony 1.4.
 EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    foreach ($this->getUpgradeClasses() as $i => $class)
+    }
+
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
     {
-      $v = new $class($this->dispatcher, $this->formatter);
+        foreach ($this->getUpgradeClasses() as $i => $class) {
+            $v = new $class($this->dispatcher, $this->formatter);
 
-      $this->logBlock(($i + 1).'. '.$v->getHeader(), 'QUESTION_LARGE');
+            $this->logBlock(($i + 1).'. '.$v->getHeader(), 'QUESTION_LARGE');
 
-      $v->setCommandApplication($this->commandApplication);
-      $v->setConfiguration($this->configuration);
-      $files = $v->validate();
+            $v->setCommandApplication($this->commandApplication);
+            $v->setConfiguration($this->configuration);
+            $files = $v->validate();
 
-      if (!$files)
-      {
-        $this->log('  '.$this->formatter->format(' OK ', 'INFO'));
+            if (!$files) {
+                $this->log('  '.$this->formatter->format(' OK ', 'INFO'));
 
-        continue;
-      }
+                continue;
+            }
 
-      $this->log('  '.$this->formatter->format(' '.count($files).' file(s) need to be changed. ', 'ERROR'));
+            $this->log('  '.$this->formatter->format(' '.count($files).' file(s) need to be changed. ', 'ERROR'));
 
-      foreach ($files as $file => $value)
-      {
-        $this->log('  '.$this->formatter->format($this->formatFile($file), 'INFO'));
+            foreach ($files as $file => $value) {
+                $this->log('  '.$this->formatter->format($this->formatFile($file), 'INFO'));
 
-        if (true !== $value)
-        {
-          $this->log('    '.$value);
+                if (true !== $value) {
+                    $this->log('    '.$value);
+                }
+            }
+
+            $this->log($v->getExplanation());
         }
-      }
+    }
 
-      $this->log($v->getExplanation());
+    protected function formatFile($file)
+    {
+        return str_replace(realpath(sfConfig::get('sf_root_dir')), 'ROOT', realpath($file));
     }
-  }
 
-  protected function formatFile($file)
-  {
-    return str_replace(realpath(sfConfig::get('sf_root_dir')), 'ROOT', realpath($file));
-  }
+    protected function getUpgradeClasses()
+    {
+        $baseDir = __DIR__.'/validation/';
+        $classes = array();
 
-  protected function getUpgradeClasses()
-  {
-    $baseDir = __DIR__.'/validation/';
-    $classes = array();
+        foreach (glob($baseDir.'*.class.php') as $file) {
+            $class = str_replace(array($baseDir, '.class.php'), '', $file);
 
-    foreach (glob($baseDir.'*.class.php') as $file)
-    {
-      $class = str_replace(array($baseDir, '.class.php'), '', $file);
+            if ('sfValidation' != $class) {
+                $classes[] = $class;
 
-      if ('sfValidation' != $class)
-      {
-        $classes[] = $class;
+                require_once $baseDir.$class.'.class.php';
+            }
+        }
 
-        require_once $baseDir.$class.'.class.php';
-      }
+        return $classes;
     }
-  
-    return $classes;
-  }
 }
diff --git a/lib/task/project/validation/sfDeprecatedClassesValidation.class.php b/lib/task/project/validation/sfDeprecatedClassesValidation.class.php
index 4da3c729f..b4df0ff8d 100644
--- a/lib/task/project/validation/sfDeprecatedClassesValidation.class.php
+++ b/lib/task/project/validation/sfDeprecatedClassesValidation.class.php
@@ -11,83 +11,78 @@
 /**
  * Finds deprecated classes usage.
  *
- * @package    symfony
- * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfDeprecatedClassesValidation extends sfValidation
 {
-  public function getHeader()
-  {
-    return 'Checking usage of deprecated classes';
-  }
+    public function getHeader()
+    {
+        return 'Checking usage of deprecated classes';
+    }
 
-  public function getExplanation()
-  {
-    return array(
-          '',
-          '  The files above use deprecated classes',
-          '  that have been removed in symfony 1.4.',
-          '',
-          '  You can find a list of all deprecated classes under the',
-          '  "Classes" section of the DEPRECATED tutorial:',
-          '',
-          '  http://www.symfony-project.org/tutorial/1_4/en/deprecated',
-          '',
-    );
-  }
+    public function getExplanation()
+    {
+        return array(
+            '',
+            '  The files above use deprecated classes',
+            '  that have been removed in symfony 1.4.',
+            '',
+            '  You can find a list of all deprecated classes under the',
+            '  "Classes" section of the DEPRECATED tutorial:',
+            '',
+            '  http://www.symfony-project.org/tutorial/1_4/en/deprecated',
+            '',
+        );
+    }
 
-  public function validate()
-  {
-    $classes = array(
-      'sfDoctrineLogger', 'sfNoRouting', 'sfPathInfoRouting', 'sfRichTextEditor',
-      'sfRichTextEditorFCK', 'sfRichTextEditorTinyMCE', 'sfCrudGenerator', 'sfAdminGenerator',
-      'sfPropelCrudGenerator', 'sfPropelAdminGenerator', 'sfPropelUniqueValidator', 'sfDoctrineUniqueValidator',
-      'sfLoader', 'sfConsoleRequest', 'sfConsoleResponse', 'sfConsoleController',
-      'sfDoctrineDataRetriever', 'sfPropelDataRetriever',
-      'sfWidgetFormI18nSelectLanguage', 'sfWidgetFormI18nSelectCurrency', 'sfWidgetFormI18nSelectCountry',
-      'sfWidgetFormChoiceMany', 'sfWidgetFormPropelChoiceMany', 'sfWidgetFormDoctrineChoiceMany',
-      'sfValidatorChoiceMany', 'sfValidatorPropelChoiceMany', 'sfValidatorPropelDoctrineMany',
-      'SfExtensionObjectBuilder', 'SfExtensionPeerBuilder', 'SfMultiExtendObjectBuilder',
-      'SfNestedSetBuilder', 'SfNestedSetPeerBuilder', 'SfObjectBuilder', 'SfPeerBuilder',
-      'sfWidgetFormPropelSelect', 'sfWidgetFormPropelSelectMany',
-      'sfWidgetFormDoctrineSelect', 'sfWidgetFormDoctrineSelectMany',
+    public function validate()
+    {
+        $classes = array(
+            'sfDoctrineLogger', 'sfNoRouting', 'sfPathInfoRouting', 'sfRichTextEditor',
+            'sfRichTextEditorFCK', 'sfRichTextEditorTinyMCE', 'sfCrudGenerator', 'sfAdminGenerator',
+            'sfPropelCrudGenerator', 'sfPropelAdminGenerator', 'sfPropelUniqueValidator', 'sfDoctrineUniqueValidator',
+            'sfLoader', 'sfConsoleRequest', 'sfConsoleResponse', 'sfConsoleController',
+            'sfDoctrineDataRetriever', 'sfPropelDataRetriever',
+            'sfWidgetFormI18nSelectLanguage', 'sfWidgetFormI18nSelectCurrency', 'sfWidgetFormI18nSelectCountry',
+            'sfWidgetFormChoiceMany', 'sfWidgetFormPropelChoiceMany', 'sfWidgetFormDoctrineChoiceMany',
+            'sfValidatorChoiceMany', 'sfValidatorPropelChoiceMany', 'sfValidatorPropelDoctrineMany',
+            'SfExtensionObjectBuilder', 'SfExtensionPeerBuilder', 'SfMultiExtendObjectBuilder',
+            'SfNestedSetBuilder', 'SfNestedSetPeerBuilder', 'SfObjectBuilder', 'SfPeerBuilder',
+            'sfWidgetFormPropelSelect', 'sfWidgetFormPropelSelectMany',
+            'sfWidgetFormDoctrineSelect', 'sfWidgetFormDoctrineSelectMany',
 
-      // classes from sfCompat10Plugin
-      'sfEzComponentsBridge', 'sfZendFrameworkBridge', 'sfProcessCache', 'sfValidatorConfigHandler',
-      'sfActionException', 'sfValidatorException', 'sfFillInFormFilter', 'sfValidationExecutionFilter',
-      'sfRequestCompat10', 'sfFillInForm', 'sfCallbackValidator', 'sfCompareValidator', 'sfDateValidator',
-      'sfEmailValidator', 'sfFileValidator', 'sfNumberValidator', 'sfRegexValidator', 'sfStringValidator',
-      'sfUrlValidator', 'sfValidator', 'sfValidatorManager', 'sfMailView', 'sfMail',
-    );
+            // classes from sfCompat10Plugin
+            'sfEzComponentsBridge', 'sfZendFrameworkBridge', 'sfProcessCache', 'sfValidatorConfigHandler',
+            'sfActionException', 'sfValidatorException', 'sfFillInFormFilter', 'sfValidationExecutionFilter',
+            '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'),
-    ));
-    foreach ($files as $file)
-    {
-      $content = sfToolkit::stripComments(file_get_contents($file));
+        $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'),
+        ));
+        foreach ($files as $file) {
+            $content = sfToolkit::stripComments(file_get_contents($file));
 
-      $matches = array();
-      foreach ($classes as $class)
-      {
-        if (preg_match('#\b'.preg_quote($class, '#').'\b#', $content))
-        {
-          $matches[] = $class;
+            $matches = array();
+            foreach ($classes as $class) {
+                if (preg_match('#\b'.preg_quote($class, '#').'\b#', $content)) {
+                    $matches[] = $class;
+                }
+            }
+
+            if ($matches) {
+                $found[$file] = implode(', ', $matches);
+            }
         }
-      }
 
-      if ($matches)
-      {
-        $found[$file] = implode(', ', $matches);
-      }
+        return $found;
     }
-
-    return $found;
-  }
 }
diff --git a/lib/task/project/validation/sfDeprecatedConfigurationFilesValidation.class.php b/lib/task/project/validation/sfDeprecatedConfigurationFilesValidation.class.php
index c11c707c0..f7b41f376 100644
--- a/lib/task/project/validation/sfDeprecatedConfigurationFilesValidation.class.php
+++ b/lib/task/project/validation/sfDeprecatedConfigurationFilesValidation.class.php
@@ -11,64 +11,59 @@
 /**
  * Finds deprecated configuration files usage.
  *
- * @package    symfony
- * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfDeprecatedConfigurationFilesValidation extends sfValidation
 {
-  public function getHeader()
-  {
-    return 'Checking usage of deprecated configuration files';
-  }
-
-  public function getExplanation()
-  {
-    return array(
-          '',
-          '  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();
-    foreach ($files as $file)
+    public function getHeader()
     {
-      $found[$file] = true;
+        return 'Checking usage of deprecated configuration files';
     }
 
-    // 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')
-    ));
-    foreach ($files as $file)
+    public function getExplanation()
     {
-      $found[$file] = true;
+        return array(
+            '',
+            '  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)',
+            '',
+        );
     }
 
-    // old generator.yml
-    $files = sfFinder::type('file')->name('generator.yml')->in(array(
-      sfConfig::get('sf_apps_dir'),
-      sfConfig::get('sf_plugins_dir'),
-    ));
-    foreach ($files as $file)
+    public function validate()
     {
-      $content = file_get_contents($file);
+        // mailer.yml
+        $files = sfFinder::type('file')->name('mailer.yml')->in($this->getProjectConfigDirectories());
+        $found = array();
+        foreach ($files as $file) {
+            $found[$file] = true;
+        }
 
-      if (false !== strpos($content, 'sfPropelAdminGenerator'))
-      {
-        $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')
+        ));
+        foreach ($files as $file) {
+            $found[$file] = true;
+        }
 
-    return $found;
-  }
+        // old generator.yml
+        $files = sfFinder::type('file')->name('generator.yml')->in(array(
+            sfConfig::get('sf_apps_dir'),
+            sfConfig::get('sf_plugins_dir'),
+        ));
+        foreach ($files as $file) {
+            $content = file_get_contents($file);
+
+            if (false !== strpos($content, 'sfPropelAdminGenerator')) {
+                $found[$file] = true;
+            }
+        }
+
+        return $found;
+    }
 }
diff --git a/lib/task/project/validation/sfDeprecatedHelpersValidation.class.php b/lib/task/project/validation/sfDeprecatedHelpersValidation.class.php
index f7b458d27..4be0e711a 100644
--- a/lib/task/project/validation/sfDeprecatedHelpersValidation.class.php
+++ b/lib/task/project/validation/sfDeprecatedHelpersValidation.class.php
@@ -11,78 +11,73 @@
 /**
  * Finds deprecated helpers usage.
  *
- * @package    symfony
- * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfDeprecatedHelpersValidation extends sfValidation
 {
-  public function getHeader()
-  {
-    return 'Checking usage of deprecated helpers';
-  }
-
-  public function getExplanation()
-  {
-    return array(
-          '',
-          '  The files above use deprecated helpers',
-          '  that have been removed in symfony 1.4.',
-          '',
-          '  You can find a list of all deprecated helpers under the',
-          '  "Helpers" section of the DEPRECATED tutorial:',
-          '',
-          '  http://www.symfony-project.org/tutorial/1_4/en/deprecated',
-          '',
-    );
-  }
+    public function getHeader()
+    {
+        return 'Checking usage of deprecated helpers';
+    }
 
-  public function validate()
-  {
-    $helpers = array(
-      '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',
-      'select_language_tag', 'select_currency_tag', 'input_tag', 'input_hidden_tag', 'input_file_tag',
-      'input_password_tag', 'textarea_tag', 'checkbox_tag', 'radiobutton_tag', 'input_date_range_tag',
-      'input_date_tag', 'submit_tag', 'reset_tag', 'submit_image_tag', 'label_for',
-      'object_admin_input_file_tag', 'object_admin_double_list', 'object_admin_select_list',
-      'object_admin_check_list', 'object_input_date_tag', 'object_textarea_tag', 'objects_for_select',
-      'object_select_tag', 'object_select_country_tag', 'object_select_language_tag', 'object_input_hidden_tag',
-      'object_input_tag', 'object_checkbox_tag', 'form_has_error', 'form_error', 'get_callbacks',
-      'get_ajax_options', 'button_to_remote', 'link_to_remote', 'periodically_call_remote', 'form_remote_tag',
-      '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',
-    );
+    public function getExplanation()
+    {
+        return array(
+            '',
+            '  The files above use deprecated helpers',
+            '  that have been removed in symfony 1.4.',
+            '',
+            '  You can find a list of all deprecated helpers under the',
+            '  "Helpers" section of the DEPRECATED tutorial:',
+            '',
+            '  http://www.symfony-project.org/tutorial/1_4/en/deprecated',
+            '',
+        );
+    }
 
-    $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'),
-    ));
-    foreach ($files as $file)
+    public function validate()
     {
-      $content = sfToolkit::stripComments(file_get_contents($file));
+        $helpers = array(
+            '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',
+            'select_language_tag', 'select_currency_tag', 'input_tag', 'input_hidden_tag', 'input_file_tag',
+            'input_password_tag', 'textarea_tag', 'checkbox_tag', 'radiobutton_tag', 'input_date_range_tag',
+            'input_date_tag', 'submit_tag', 'reset_tag', 'submit_image_tag', 'label_for',
+            'object_admin_input_file_tag', 'object_admin_double_list', 'object_admin_select_list',
+            'object_admin_check_list', 'object_input_date_tag', 'object_textarea_tag', 'objects_for_select',
+            'object_select_tag', 'object_select_country_tag', 'object_select_language_tag', 'object_input_hidden_tag',
+            'object_input_tag', 'object_checkbox_tag', 'form_has_error', 'form_error', 'get_callbacks',
+            'get_ajax_options', 'button_to_remote', 'link_to_remote', 'periodically_call_remote', 'form_remote_tag',
+            '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'),
+        ));
+        foreach ($files as $file) {
+            $content = sfToolkit::stripComments(file_get_contents($file));
 
-      $matches = array();
-      foreach ($helpers as $helper)
-      {
-        if (preg_match('#\b'.preg_quote($helper, '#').'\b#', $content))
-        {
-          $matches[] = $helper;
+            $matches = array();
+            foreach ($helpers as $helper) {
+                if (preg_match('#\b'.preg_quote($helper, '#').'\b#', $content)) {
+                    $matches[] = $helper;
+                }
+            }
+
+            if ($matches) {
+                $found[$file] = implode(', ', $matches);
+            }
         }
-      }
 
-      if ($matches)
-      {
-        $found[$file] = implode(', ', $matches);
-      }
+        return $found;
     }
-
-    return $found;
-  }
 }
diff --git a/lib/task/project/validation/sfDeprecatedMethodsValidation.class.php b/lib/task/project/validation/sfDeprecatedMethodsValidation.class.php
index fccd77e6f..2d12c03ad 100644
--- a/lib/task/project/validation/sfDeprecatedMethodsValidation.class.php
+++ b/lib/task/project/validation/sfDeprecatedMethodsValidation.class.php
@@ -11,91 +11,82 @@
 /**
  * Finds deprecated methods usage.
  *
- * @package    symfony
- * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfDeprecatedMethodsValidation extends sfValidation
 {
-  public function getHeader()
-  {
-    return 'Checking usage of deprecated methods';
-  }
-
-  public function getExplanation()
-  {
-    return array(
-          '',
-          '  The files above use deprecated functions and/or methods',
-          '  that have been removed in symfony 1.4.',
-          '',
-          '  You can find a list of all deprecated methods under the',
-          '  "Methods and Functions" section of the DEPRECATED tutorial:',
-          '',
-          '  http://www.symfony-project.org/tutorial/1_4/en/deprecated',
-          '',
-    );
-  }
-
-  public function validate()
-  {
-    $found = array_merge(
-      $this->doValidate(array(
-        'sfToolkit::getTmpDir',
-        'sfToolkit::removeArrayValueForPath',
-        'sfToolkit::hasArrayValueForPath',
-        'sfToolkit::getArrayValueForPathByRef',
-        'sfValidatorBase::setInvalidMessage',
-        'sfValidatorBase::setRequiredMessage',
-        'debug_message',
-        'sfContext::retrieveObjects',
-        '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(
-        'contains', 'responseContains', 'isRequestParameter', 'isResponseHeader',
-        'isUserCulture', 'isRequestFormat', 'checkResponseElement',
-      ), sfConfig::get('sf_test_dir')),
+    public function getHeader()
+    {
+        return 'Checking usage of deprecated methods';
+    }
 
-      $this->doValidate(array(
-        'getDefaultView', 'handleError', 'validate', 'debugMessage', 'getController()->sendEmail'
-      ), $this->getProjectActionDirectories())
-    );
+    public function getExplanation()
+    {
+        return array(
+            '',
+            '  The files above use deprecated functions and/or methods',
+            '  that have been removed in symfony 1.4.',
+            '',
+            '  You can find a list of all deprecated methods under the',
+            '  "Methods and Functions" section of the DEPRECATED tutorial:',
+            '',
+            '  http://www.symfony-project.org/tutorial/1_4/en/deprecated',
+            '',
+        );
+    }
 
-    return $found;
-  }
+    public function validate()
+    {
+        return array_merge(
+            $this->doValidate(array(
+                'sfToolkit::getTmpDir',
+                'sfToolkit::removeArrayValueForPath',
+                'sfToolkit::hasArrayValueForPath',
+                'sfToolkit::getArrayValueForPathByRef',
+                'sfValidatorBase::setInvalidMessage',
+                'sfValidatorBase::setRequiredMessage',
+                'debug_message',
+                'sfContext::retrieveObjects',
+                '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(
+                'contains', 'responseContains', 'isRequestParameter', 'isResponseHeader',
+                'isUserCulture', 'isRequestFormat', 'checkResponseElement',
+            ), sfConfig::get('sf_test_dir')),
+            $this->doValidate(array(
+                'getDefaultView', 'handleError', 'validate', 'debugMessage', 'getController()->sendEmail',
+            ), $this->getProjectActionDirectories())
+        );
+    }
 
-  public function doValidate($methods, $dir)
-  {
-    $found = array();
-    $files = sfFinder::type('file')->name('*.php')->prune('vendor')->in($dir);
-    foreach ($files as $file)
+    public function doValidate($methods, $dir)
     {
-      $content = sfToolkit::stripComments(file_get_contents($file));
+        $found = array();
+        $files = sfFinder::type('file')->name('*.php')->prune('vendor')->in($dir);
+        foreach ($files as $file) {
+            $content = sfToolkit::stripComments(file_get_contents($file));
+
+            $matches = array();
+            foreach ($methods as $method) {
+                if (preg_match('#\b'.preg_quote($method, '#').'\b#', $content)) {
+                    $matches[] = $method;
+                }
+            }
 
-      $matches = array();
-      foreach ($methods as $method)
-      {
-        if (preg_match('#\b'.preg_quote($method, '#').'\b#', $content))
-        {
-          $matches[] = $method;
+            if ($matches) {
+                $found[$file] = implode(', ', $matches);
+            }
         }
-      }
 
-      if ($matches)
-      {
-        $found[$file] = implode(', ', $matches);
-      }
+        return $found;
     }
-
-    return $found;
-  }
 }
diff --git a/lib/task/project/validation/sfDeprecatedPluginsValidation.class.php b/lib/task/project/validation/sfDeprecatedPluginsValidation.class.php
index 18f799fea..7c1a5d77e 100644
--- a/lib/task/project/validation/sfDeprecatedPluginsValidation.class.php
+++ b/lib/task/project/validation/sfDeprecatedPluginsValidation.class.php
@@ -11,54 +11,49 @@
 /**
  * Finds deprecated plugins usage.
  *
- * @package    symfony
- * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfDeprecatedPluginsValidation extends sfValidation
 {
-  public function getHeader()
-  {
-    return 'Checking usage of deprecated plugins';
-  }
+    public function getHeader()
+    {
+        return 'Checking usage of deprecated plugins';
+    }
 
-  public function getExplanation()
-  {
-    return array(
-          '',
-          '  The files above use deprecated plugins',
-          '  that have been removed in symfony 1.4.',
-          '',
-          'You can probably remove those references safely.',
-          '',
-    );
-  }
+    public function getExplanation()
+    {
+        return array(
+            '',
+            '  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());
-    foreach ($files as $file)
+    public function validate()
     {
-      $content = sfToolkit::stripComments(file_get_contents($file));
+        $found = array();
+        $files = sfFinder::type('file')->name('*Configuration.class.php')->in($this->getProjectConfigDirectories());
+        foreach ($files as $file) {
+            $content = sfToolkit::stripComments(file_get_contents($file));
 
-      $matches = array();
-      if (false !== strpos($content, 'sfCompat10Plugin'))
-      {
-        $matches[] = 'sfCompat10Plugin';
-      }
-      if (false !== strpos($content, 'sfProtoculousPlugin'))
-      {
-        $matches[] = 'sfProtoculousPlugin';
-      }
+            $matches = array();
+            if (false !== strpos($content, 'sfCompat10Plugin')) {
+                $matches[] = 'sfCompat10Plugin';
+            }
+            if (false !== strpos($content, 'sfProtoculousPlugin')) {
+                $matches[] = 'sfProtoculousPlugin';
+            }
 
-      if ($matches)
-      {
-        $found[$file] = implode(', ', $matches);
-      }
-    }
+            if ($matches) {
+                $found[$file] = implode(', ', $matches);
+            }
+        }
 
-    return $found;
-  }
+        return $found;
+    }
 }
diff --git a/lib/task/project/validation/sfDeprecatedSettingsValidation.class.php b/lib/task/project/validation/sfDeprecatedSettingsValidation.class.php
index 9bab76074..e0971109a 100644
--- a/lib/task/project/validation/sfDeprecatedSettingsValidation.class.php
+++ b/lib/task/project/validation/sfDeprecatedSettingsValidation.class.php
@@ -11,68 +11,63 @@
 /**
  * Finds deprecated settings usage.
  *
- * @package    symfony
- * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfDeprecatedSettingsValidation extends sfValidation
 {
-  public function getHeader()
-  {
-    return 'Checking usage of deprecated settings';
-  }
-
-  public function getExplanation()
-  {
-    return array(
-          '',
-          '  The files above use deprecated settings',
-          '  that have been removed in symfony 1.4.',
-          '',
-          '  You can find a list of all deprecated settings under the',
-          '  "Settings" section of the DEPRECATED tutorial:',
-          '',
-          '  http://www.symfony-project.org/tutorial/1_4/en/deprecated',
-          '',
-    );
-  }
+    public function getHeader()
+    {
+        return 'Checking usage of deprecated settings';
+    }
 
-  public function validate()
-  {
-    $settings = array(
-      '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',
-    );
+    public function getExplanation()
+    {
+        return array(
+            '',
+            '  The files above use deprecated settings',
+            '  that have been removed in symfony 1.4.',
+            '',
+            '  You can find a list of all deprecated settings under the',
+            '  "Settings" section of the DEPRECATED tutorial:',
+            '',
+            '  http://www.symfony-project.org/tutorial/1_4/en/deprecated',
+            '',
+        );
+    }
 
-    $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'),
-    ));
-    foreach ($files as $file)
+    public function validate()
     {
-      $content = sfToolkit::stripComments(file_get_contents($file));
+        $settings = array(
+            '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'),
+        ));
+        foreach ($files as $file) {
+            $content = sfToolkit::stripComments(file_get_contents($file));
 
-      $matches = array();
-      foreach ($settings as $setting)
-      {
-        if (false !== stripos($content, $setting))
-        {
-          $matches[] = $setting;
+            $matches = array();
+            foreach ($settings as $setting) {
+                if (false !== stripos($content, $setting)) {
+                    $matches[] = $setting;
+                }
+            }
+
+            if ($matches) {
+                $found[$file] = implode(', ', $matches);
+            }
         }
-      }
 
-      if ($matches)
-      {
-        $found[$file] = implode(', ', $matches);
-      }
+        return $found;
     }
-
-    return $found;
-  }
 }
diff --git a/lib/task/project/validation/sfParameterHolderValidation.class.php b/lib/task/project/validation/sfParameterHolderValidation.class.php
index 4018e3a04..cd62c9340 100644
--- a/lib/task/project/validation/sfParameterHolderValidation.class.php
+++ b/lib/task/project/validation/sfParameterHolderValidation.class.php
@@ -11,55 +11,52 @@
 /**
  * Finds usage of array notation with a parameter holder.
  *
- * @package    symfony
- * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfParameterHolderValidation extends sfValidation
 {
-  public function getHeader()
-  {
-    return 'Checking usage of array notation with a parameter holder';
-  }
+    public function getHeader()
+    {
+        return 'Checking usage of array notation with a parameter holder';
+    }
 
-  public function getExplanation()
-  {
-    return array(
-          '',
-          '  The files above use the array notation with a parameter holder,',
-          '  which is not supported anymore in symfony 1.4.',
-          '  For instance, you need to change this construct:',
-          '',
-          '    $foo = $request->getParameter(\'foo[bar]\')',
-          '',
-          '  to this one:',
-          '',
-          '    $params = $request->getParameter(\'foo\')',
-          '    $foo = $params[\'bar\'])',
-          '',
-    );
-  }
+    public function getExplanation()
+    {
+        return array(
+            '',
+            '  The files above use the array notation with a parameter holder,',
+            '  which is not supported anymore in symfony 1.4.',
+            '  For instance, you need to change this construct:',
+            '',
+            '    $foo = $request->getParameter(\'foo[bar]\')',
+            '',
+            '  to this one:',
+            '',
+            '    $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'),
-    ));
-    foreach ($files as $file)
+    public function validate()
     {
-      $content = sfToolkit::stripComments(file_get_contents($file));
+        $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'),
+        ));
+        foreach ($files as $file) {
+            $content = sfToolkit::stripComments(file_get_contents($file));
 
-      if (preg_match('#\b(get|has|remove)(Request)*Parameter\(\s*[\'"][^\),]*?\[[^\),]#', $content))
-      {
-        $found[$file] = true;
-      }
-    }
+            if (preg_match('#\b(get|has|remove)(Request)*Parameter\(\s*[\'"][^\),]*?\[[^\),]#', $content)) {
+                $found[$file] = true;
+            }
+        }
 
-    return $found;
-  }
+        return $found;
+    }
 }
diff --git a/lib/task/project/validation/sfValidation.class.php b/lib/task/project/validation/sfValidation.class.php
index 06d9aabbf..9fd1e93ad 100644
--- a/lib/task/project/validation/sfValidation.class.php
+++ b/lib/task/project/validation/sfValidation.class.php
@@ -11,106 +11,104 @@
 /**
  * Abstract class for validation classes.
  *
- * @package    symfony
- * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfValidation extends sfBaseTask
 {
-  protected
-    $task = null;
+    protected $task;
 
-  /**
-   * Validates the current project.
-   */
-  abstract public function validate();
+    /**
+     * Validates the current project.
+     */
+    abstract public function validate();
 
-  abstract public function getHeader();
+    abstract public function getHeader();
 
-  public function execute($arguments = array(), $options = array())
-  {
-    throw new sfException('You can\'t execute this task.');
-  }
+    public function execute($arguments = array(), $options = array())
+    {
+        throw new sfException('You can\'t execute this task.');
+    }
 
-  /**
-   * Returns a finder that exclude upgrade scripts from being upgraded!
-   *
-   * @param  string $type String directory or file or any (for both file and directory)
-   *
-   * @return sfFinder A sfFinder instance
-   */
-  protected function getFinder($type)
-  {
-    return sfFinder::type($type)->prune('symfony')->discard('symfony');
-  }
+    /**
+     * Returns a finder that exclude upgrade scripts from being upgraded!
+     *
+     * @param string $type String directory or file or any (for both file and directory)
+     *
+     * @return sfFinder A sfFinder instance
+     */
+    protected function getFinder($type)
+    {
+        return sfFinder::type($type)->prune('symfony')->discard('symfony');
+    }
 
-  /**
-   * Returns all project directories where you can put PHP classes.
-   */
-  protected function getProjectClassDirectories()
-  {
-    return array_merge(
-      $this->getProjectLibDirectories(),
-      $this->getProjectActionDirectories()
-    );
-  }
+    /**
+     * Returns all project directories where you can put PHP classes.
+     */
+    protected function getProjectClassDirectories()
+    {
+        return array_merge(
+            $this->getProjectLibDirectories(),
+            $this->getProjectActionDirectories()
+        );
+    }
 
-  /**
-   * Returns all project directories where you can put templates.
-   */
-  protected function getProjectTemplateDirectories()
-  {
-    return array_merge(
-      glob(sfConfig::get('sf_apps_dir').'/*/modules/*/templates'),
-      glob(sfConfig::get('sf_apps_dir').'/*/templates')
-    );
-  }
+    /**
+     * Returns all project directories where you can put templates.
+     */
+    protected function getProjectTemplateDirectories()
+    {
+        return array_merge(
+            glob(sfConfig::get('sf_apps_dir').'/*/modules/*/templates'),
+            glob(sfConfig::get('sf_apps_dir').'/*/templates')
+        );
+    }
 
-  /**
-   * Returns all project directories where you can put actions and components.
-   */
-  protected function getProjectActionDirectories()
-  {
-    return glob(sfConfig::get('sf_apps_dir').'/*/modules/*/actions');
-  }
+    /**
+     * Returns all project directories where you can put actions and components.
+     */
+    protected function getProjectActionDirectories()
+    {
+        return glob(sfConfig::get('sf_apps_dir').'/*/modules/*/actions');
+    }
 
-  /**
-   * Returns all project lib directories.
-   * 
-   * @param string $subdirectory A subdirectory within lib (i.e. "/form")
-   */
-  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,
-      )
-    );
-  }
+    /**
+     * Returns all project lib directories.
+     *
+     * @param string $subdirectory A subdirectory within lib (i.e. "/form")
+     */
+    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,
+            )
+        );
+    }
 
-  /**
-   * Returns all project config directories.
-   */
-  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'))
-    );
-  }
+    /**
+     * Returns all project config directories.
+     */
+    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'))
+        );
+    }
 
-  /**
-   * Returns all application names.
-   *
-   * @return array An array of application names
-   */
-  protected function getApplications()
-  {
-    return sfFinder::type('dir')->maxdepth(0)->relative()->in(sfConfig::get('sf_apps_dir'));
-  }
+    /**
+     * Returns all application names.
+     *
+     * @return array An array of application names
+     */
+    protected function getApplications()
+    {
+        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 247576054..f83f4dd45 100644
--- a/lib/task/sfBaseTask.class.php
+++ b/lib/task/sfBaseTask.class.php
@@ -11,547 +11,498 @@
 /**
  * Base class for all symfony tasks.
  *
- * @package    symfony
- * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfBaseTask extends sfCommandApplicationTask
 {
-  protected
-    $configuration   = null,
-    $pluginManager   = null,
-    $statusStartTime = null,
-    $filesystem      = null,
-    $tokens          = array();
-
-  /**
-   * @see sfTask
-   * @inheritdoc
-   */
-  protected function doRun(sfCommandManager $commandManager, $options)
-  {
-    $event = $this->dispatcher->filter(new sfEvent($this, 'command.filter_options', array('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()));
-    $this->dispatcher->notifyUntil($event);
-    if ($event->isProcessed())
-    {
-      return $event->getReturnValue();
-    }
-
-    $this->checkProjectExists();
-
-    $requiresApplication = $commandManager->getArgumentSet()->hasArgument('application') || $commandManager->getOptionSet()->hasOption('application');
-    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';
-
-      if (true === $application)
-      {
-        $application = $this->getFirstApplication();
-
-        if ($commandManager->getOptionSet()->hasOption('application'))
-        {
-          $commandManager->setOption($commandManager->getOptionSet()->getOption('application'), $application);
+    protected $configuration;
+    protected $pluginManager;
+    protected $statusStartTime;
+    protected $filesystem;
+    protected $tokens = array();
+
+    /**
+     * Sets the current task's configuration.
+     *
+     * @param sfProjectConfiguration $configuration
+     */
+    public function setConfiguration(sfProjectConfiguration $configuration = null)
+    {
+        $this->configuration = $configuration;
+    }
+
+    /**
+     * Returns the filesystem instance.
+     *
+     * @return sfFilesystem A sfFilesystem instance
+     */
+    public function getFilesystem()
+    {
+        if (!isset($this->filesystem)) {
+            if ($this->isVerbose()) {
+                $this->filesystem = new sfFilesystem($this->dispatcher, $this->formatter);
+            } else {
+                $this->filesystem = new sfFilesystem();
+            }
         }
-      }
 
-      $this->configuration = $this->createConfiguration($application, $env);
+        return $this->filesystem;
     }
 
-    if (!$this->withTrace())
+    /**
+     * Checks if the current directory is a symfony project directory.
+     *
+     * @return true if the current directory is a symfony project directory, false otherwise
+     *
+     * @throws sfException
+     */
+    public function checkProjectExists()
     {
-      sfConfig::set('sf_logging_enabled', false);
+        if (!file_exists('symfony')) {
+            throw new sfException('You must be in a symfony project directory.');
+        }
     }
 
-    $ret = $this->execute($commandManager->getArgumentValues(), $commandManager->getOptionValues());
-
-    $this->dispatcher->notify(new sfEvent($this, 'command.post_command'));
-
-    return $ret;
-  }
-
-  /**
-   * Sets the current task's configuration.
-   *
-   * @param sfProjectConfiguration $configuration
-   */
-  public function setConfiguration(sfProjectConfiguration $configuration = null)
-  {
-    $this->configuration = $configuration;
-  }
-
-  /**
-   * Returns the filesystem instance.
-   *
-   * @return sfFilesystem A sfFilesystem instance
-   */
-  public function getFilesystem()
-  {
-    if (!isset($this->filesystem))
+    /**
+     * Checks if an application exists.
+     *
+     * @param string $app The application name
+     *
+     * @return bool true if the application exists, false otherwise
+     *
+     * @throws sfException
+     */
+    public function checkAppExists($app)
     {
-      if ($this->isVerbose())
-      {
-        $this->filesystem = new sfFilesystem($this->dispatcher, $this->formatter);
-      }
-      else
-      {
-        $this->filesystem = new sfFilesystem();
-      }
+        if (!is_dir(sfConfig::get('sf_apps_dir').'/'.$app)) {
+            throw new sfException(sprintf('Application "%s" does not exist', $app));
+        }
     }
 
-    return $this->filesystem;
-  }
-
-  /**
-   * Checks if the current directory is a symfony project directory.
-   *
-   * @return true if the current directory is a symfony project directory, false otherwise
-   *
-   * @throws sfException
-   */
-  public function checkProjectExists()
-  {
-    if (!file_exists('symfony'))
-    {
-      throw new sfException('You must be in a symfony project directory.');
-    }
-  }
-
-  /**
-   * Checks if an application exists.
-   *
-   * @param  string $app The application name
-   *
-   * @return bool true if the application exists, false otherwise
-   *
-   * @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));
+    /**
+     * Checks if a module exists.
+     *
+     * @param string $app    The application name
+     * @param string $module The module name
+     *
+     * @return bool true if the module exists, false otherwise
+     *
+     * @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));
+        }
     }
-  }
-
-  /**
-   * Checks if a module exists.
-   *
-   * @param  string $app    The application name
-   * @param  string $module The module name
-   *
-   * @return bool true if the module exists, false otherwise
-   *
-   * @throws sfException
-   */
-  public function checkModuleExists($app, $module)
-  {
-    if (!is_dir(sfConfig::get('sf_apps_dir').'/'.$app.'/modules/'.$module))
+
+    /**
+     * @see sfTask
+     * {@inheritdoc}
+     */
+    protected function doRun(sfCommandManager $commandManager, $options)
     {
-      throw new sfException(sprintf('Module "%s/%s" does not exist.', $app, $module));
+        $event = $this->dispatcher->filter(new sfEvent($this, 'command.filter_options', array('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()));
+        $this->dispatcher->notifyUntil($event);
+        if ($event->isProcessed()) {
+            return $event->getReturnValue();
+        }
+
+        $this->checkProjectExists();
+
+        $requiresApplication = $commandManager->getArgumentSet()->hasArgument('application') || $commandManager->getOptionSet()->hasOption('application');
+        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';
+
+            if (true === $application) {
+                $application = $this->getFirstApplication();
+
+                if ($commandManager->getOptionSet()->hasOption('application')) {
+                    $commandManager->setOption($commandManager->getOptionSet()->getOption('application'), $application);
+                }
+            }
+
+            $this->configuration = $this->createConfiguration($application, $env);
+        }
+
+        if (!$this->withTrace()) {
+            sfConfig::set('sf_logging_enabled', false);
+        }
+
+        $ret = $this->execute($commandManager->getArgumentValues(), $commandManager->getOptionValues());
+
+        $this->dispatcher->notify(new sfEvent($this, 'command.post_command'));
+
+        return $ret;
     }
-  }
-
-  /**
-   * Checks if trace mode is enabled
-   *
-   * @return boolean
-   */
-  protected function withTrace()
-  {
-    if (null !== $this->commandApplication && !$this->commandApplication->withTrace())
+
+    /**
+     * Checks if trace mode is enabled.
+     *
+     * @return bool
+     */
+    protected function withTrace()
     {
-      return false;
+        if (null !== $this->commandApplication && !$this->commandApplication->withTrace()) {
+            return false;
+        }
+
+        return true;
     }
 
-    return true;
-  }
-
-  /**
-   * Checks if verbose mode is enabled
-   *
-   * @return boolean
-   */
-  protected function isVerbose()
-  {
-    if (null !== $this->commandApplication && !$this->commandApplication->isVerbose())
+    /**
+     * Checks if verbose mode is enabled.
+     *
+     * @return bool
+     */
+    protected function isVerbose()
     {
-      return false;
+        if (null !== $this->commandApplication && !$this->commandApplication->isVerbose()) {
+            return false;
+        }
+
+        return true;
     }
 
-    return true;
-  }
-
-  /**
-   * Checks if debug mode is enabled
-   *
-   * @return boolean
-   */
-  protected function isDebug()
-  {
-    if (null !== $this->commandApplication && !$this->commandApplication->isDebug())
+    /**
+     * Checks if debug mode is enabled.
+     *
+     * @return bool
+     */
+    protected function isDebug()
     {
-      return false;
+        if (null !== $this->commandApplication && !$this->commandApplication->isDebug()) {
+            return false;
+        }
+
+        return true;
     }
 
-    return true;
-  }
-
-  /**
-   * Creates a configuration object.
-   *
-   * @param string  $application The application name
-   * @param string  $env         The environment name
-   *
-   * @return sfProjectConfiguration A sfProjectConfiguration instance
-   */
-  protected function createConfiguration($application, $env)
-  {
-    if (null !== $application)
+    /**
+     * Creates a configuration object.
+     *
+     * @param string $application The application name
+     * @param string $env         The environment name
+     *
+     * @return sfProjectConfiguration A sfProjectConfiguration instance
+     */
+    protected function createConfiguration($application, $env)
     {
-      $this->checkAppExists($application);
+        if (null !== $application) {
+            $this->checkAppExists($application);
+
+            require_once sfConfig::get('sf_config_dir').'/ProjectConfiguration.class.php';
+
+            $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);
+            } else {
+                $configuration = new sfProjectConfiguration(getcwd(), $this->dispatcher);
+            }
 
-      require_once sfConfig::get('sf_config_dir').'/ProjectConfiguration.class.php';
+            if (null !== $env) {
+                sfConfig::set('sf_environment', $env);
+            }
 
-      $configuration = ProjectConfiguration::getApplicationConfiguration($application, $env, $this->isDebug(), null, $this->dispatcher);
+            $this->initializeAutoload($configuration);
+        }
+
+        return $configuration;
     }
-    else
+
+    /**
+     * Returns the first application in apps.
+     *
+     * @return string The Application name
+     */
+    protected function getFirstApplication()
     {
-      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);
-      }
-
-      if (null !== $env)
-      {
-        sfConfig::set('sf_environment', $env);
-      }
-
-      $this->initializeAutoload($configuration);
+        if (count($dirs = sfFinder::type('dir')->maxdepth(0)->follow_link()->relative()->in(sfConfig::get('sf_apps_dir')))) {
+            return $dirs[0];
+        }
+
+        return null;
     }
 
-    return $configuration;
-  }
-
-  /**
-   * Returns the first application in apps.
-   *
-   * @return string The Application name
-   */
-  protected function getFirstApplication()
-  {
-    if (count($dirs = sfFinder::type('dir')->maxdepth(0)->follow_link()->relative()->in(sfConfig::get('sf_apps_dir'))))
+    /**
+     * Reloads all autoloaders.
+     *
+     * This method should be called whenever a task generates new classes that
+     * are to be loaded by the symfony autoloader. It clears the autoloader
+     * cache for all applications and environments and the current execution.
+     *
+     * @see initializeAutoload()
+     */
+    protected function reloadAutoload()
     {
-      return $dirs[0];
+        $this->initializeAutoload($this->configuration, true);
     }
 
-    return null;
-  }
-
-  /**
-   * Reloads all autoloaders.
-   *
-   * This method should be called whenever a task generates new classes that
-   * are to be loaded by the symfony autoloader. It clears the autoloader
-   * cache for all applications and environments and the current execution.
-   *
-   * @see initializeAutoload()
-   */
-  protected function reloadAutoload()
-  {
-    $this->initializeAutoload($this->configuration, true);
-  }
-
-  /**
-   * Initializes autoloaders.
-   *
-   * @param sfProjectConfiguration $configuration The current project or application configuration
-   * @param boolean                $reload        If true, all autoloaders will be reloaded
-   */
-  protected function initializeAutoload(sfProjectConfiguration $configuration, $reload = false)
-  {
-    // sfAutoload
-    if ($reload)
+    /**
+     * Initializes autoloaders.
+     *
+     * @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)
     {
-      $this->logSection('autoload', 'Resetting application autoloaders');
+        // 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)
-    {
-      // plugins
-      if ($reload)
-      {
-        foreach ($configuration->getPlugins() as $name)
-        {
-          $configuration->getPluginConfiguration($name)->initializeAutoload();
+        // sfSimpleAutoload
+        if (!$configuration instanceof sfApplicationConfiguration) {
+            // plugins
+            if ($reload) {
+                foreach ($configuration->getPlugins() as $name) {
+                    $configuration->getPluginConfiguration($name)->initializeAutoload();
+                }
+            }
+
+            // 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->register();
+
+            if ($reload) {
+                $this->logSection('autoload', 'Resetting CLI autoloader');
+                $autoload->reload();
+            }
         }
-      }
-
-      // 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->register();
-
-      if ($reload)
-      {
-        $this->logSection('autoload', 'Resetting CLI autoloader');
-        $autoload->reload();
-      }
     }
-  }
-
-  /**
-   * 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
-   */
-  protected function installDir($dir, $finder = null)
-  {
-    if (null === $finder)
+
+    /**
+     * 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
+     */
+    protected function installDir($dir, $finder = null)
     {
-      $finder = sfFinder::type('any')->discard('.sf');
+        if (null === $finder) {
+            $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);
-  }
-
-  /**
-   * Replaces tokens in files contained in a given directory.
-   *
-   * If you don't pass a directory, it will replace in the config/ and lib/ directory.
-   *
-   * You can define global tokens by defining the $this->tokens property.
-   *
-   * @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())
-  {
-    if (!$dirs)
+    /**
+     * Replaces tokens in files contained in a given directory.
+     *
+     * If you don't pass a directory, it will replace in the config/ and lib/ directory.
+     *
+     * You can define global tokens by defining the $this->tokens property.
+     *
+     * @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())
     {
-      $dirs = array(sfConfig::get('sf_config_dir'), sfConfig::get('sf_lib_dir'));
-    }
+        if (!$dirs) {
+            $dirs = array(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 : array(), $tokens);
 
-    $this->getFilesystem()->replaceTokens(sfFinder::type('file')->prune('vendor')->in($dirs), '##', '##', $tokens);
-  }
+        $this->getFilesystem()->replaceTokens(sfFinder::type('file')->prune('vendor')->in($dirs), '##', '##', $tokens);
+    }
 
-  /**
-   * Reloads tasks.
-   *
-   * Useful when you install plugins with tasks and if you want to use them with the runTask() method.
-   */
-  protected function reloadTasks()
-  {
-    if (null === $this->commandApplication)
+    /**
+     * Reloads tasks.
+     *
+     * Useful when you install plugins with tasks and if you want to use them with the runTask() method.
+     */
+    protected function reloadTasks()
     {
-      return;
-    }
+        if (null === $this->commandApplication) {
+            return;
+        }
 
-    $this->configuration = $this->createConfiguration(null, null);
+        $this->configuration = $this->createConfiguration(null, null);
 
-    $this->commandApplication->clearTasks();
-    $this->commandApplication->loadTasks($this->configuration);
+        $this->commandApplication->clearTasks();
+        $this->commandApplication->loadTasks($this->configuration);
 
-    $disabledPluginsRegex = sprintf('#^(%s)#', implode('|', array_diff($this->configuration->getAllPluginPaths(), $this->configuration->getPluginPaths())));
-    $tasks = array();
-    foreach (get_declared_classes() as $class)
-    {
-      $r = new Reflectionclass($class);
-      if ($r->isSubclassOf('sfTask') && !$r->isAbstract() && !preg_match($disabledPluginsRegex, $r->getFileName()))
-      {
-        $tasks[] = new $class($this->dispatcher, $this->formatter);
-      }
+        $disabledPluginsRegex = sprintf('#^(%s)#', implode('|', array_diff($this->configuration->getAllPluginPaths(), $this->configuration->getPluginPaths())));
+        $tasks = array();
+        foreach (get_declared_classes() as $class) {
+            $r = new ReflectionClass($class);
+            if ($r->isSubclassOf('sfTask') && !$r->isAbstract() && !preg_match($disabledPluginsRegex, $r->getFileName())) {
+                $tasks[] = new $class($this->dispatcher, $this->formatter);
+            }
+        }
+
+        $this->commandApplication->registerTasks($tasks);
     }
 
-    $this->commandApplication->registerTasks($tasks);
-  }
-
-  /**
-   * Enables a plugin in the ProjectConfiguration class.
-   *
-   * @param string $plugin The name of the plugin
-   */
-  protected function enablePlugin($plugin)
-  {
-    sfSymfonyPluginManager::enablePlugin($plugin, sfConfig::get('sf_config_dir'));
-  }
-
-  /**
-   * Disables a plugin in the ProjectConfiguration class.
-   *
-   * @param string $plugin The name of the plugin
-   */
-  protected function disablePlugin($plugin)
-  {
-    sfSymfonyPluginManager::disablePlugin($plugin, sfConfig::get('sf_config_dir'));
-  }
-
-  /**
-   * Returns a plugin manager instance.
-   *
-   * @return sfSymfonyPluginManager A sfSymfonyPluginManager instance
-   */
-  protected function getPluginManager()
-  {
-    if (null === $this->pluginManager)
+    /**
+     * Enables a plugin in the ProjectConfiguration class.
+     *
+     * @param string $plugin The name of the plugin
+     */
+    protected function enablePlugin($plugin)
     {
-      $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);
+        sfSymfonyPluginManager::enablePlugin($plugin, sfConfig::get('sf_config_dir'));
     }
 
-    return $this->pluginManager;
-  }
-
-  /**
-   * @see sfCommandApplicationTask
-   */
-  protected function createTask($name)
-  {
-    $task = parent::createTask($name);
-
-    if ($task instanceof sfBaseTask)
+    /**
+     * Disables a plugin in the ProjectConfiguration class.
+     *
+     * @param string $plugin The name of the plugin
+     */
+    protected function disablePlugin($plugin)
     {
-      $task->setConfiguration($this->configuration);
+        sfSymfonyPluginManager::disablePlugin($plugin, sfConfig::get('sf_config_dir'));
     }
 
-    return $task;
-  }
-
-  /**
-   * Show status of task
-   *
-   * @param integer $done
-   * @param integer $total
-   * @param integer $size
-   * @return void
-   */
-  protected function showStatus($done, $total, $size = 30)
-  {
-    // if we go over our bound, just ignore it
-    if ($done > $total)
+    /**
+     * Returns a plugin manager instance.
+     *
+     * @return sfSymfonyPluginManager A sfSymfonyPluginManager instance
+     */
+    protected function getPluginManager()
     {
-      $this->statusStartTime = null;
-      return;
+        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);
+        }
+
+        return $this->pluginManager;
     }
 
-    if (null === $this->statusStartTime)
+    /**
+     * @see sfCommandApplicationTask
+     *
+     * @param mixed $name
+     */
+    protected function createTask($name)
     {
-      $this->statusStartTime = time();
-    }
+        $task = parent::createTask($name);
 
-    $now = time();
-    $perc = (double)($done / $total);
-    $bar = floor($perc * $size);
+        if ($task instanceof sfBaseTask) {
+            $task->setConfiguration($this->configuration);
+        }
 
-    $statusBar = "\r[";
-    $statusBar .= str_repeat('=', $bar);
-    if ($bar < $size)
-    {
-      $statusBar .= '>';
-      $statusBar .= str_repeat(' ', $size - $bar);
+        return $task;
     }
-    else
+
+    /**
+     * Show status of task.
+     *
+     * @param int $done
+     * @param int $total
+     * @param int $size
+     */
+    protected function showStatus($done, $total, $size = 30)
     {
-      $statusBar .= "=";
-    }
+        // if we go over our bound, just ignore it
+        if ($done > $total) {
+            $this->statusStartTime = null;
+
+            return;
+        }
 
-    $disp = number_format($perc * 100, 0);
+        if (null === $this->statusStartTime) {
+            $this->statusStartTime = time();
+        }
 
-    $statusBar .= "] $disp% ($done/$total)";
+        $now = time();
+        $perc = (float) ($done / $total);
+        $bar = floor($perc * $size);
+
+        $statusBar = "\r[";
+        $statusBar .= str_repeat('=', $bar);
+        if ($bar < $size) {
+            $statusBar .= '>';
+            $statusBar .= str_repeat(' ', $size - $bar);
+        } else {
+            $statusBar .= '=';
+        }
 
-    $rate = $done ? ($now - $this->statusStartTime) / $done : 0;
-    $left = $total - $done;
-    $eta = round($rate * $left, 2);
+        $disp = number_format($perc * 100, 0);
 
-    $elapsed = $now - $this->statusStartTime;
+        $statusBar .= "] {$disp}% ({$done}/{$total})";
 
-    $eta = $this->convertTime($eta);
-    $elapsed = $this->convertTime($elapsed);
+        $rate = $done ? ($now - $this->statusStartTime) / $done : 0;
+        $left = $total - $done;
+        $eta = round($rate * $left, 2);
 
-    $memory = memory_get_usage(true);
-    if ($memory>1024*1024*1024*10)
-    {
-      $memory = sprintf('%.2fGB', $memory/1024/1024/1024);
-    }
-    elseif ($memory>1024*1024*10)
-    {
-      $memory = sprintf('%.2fMB', $memory/1024/1024);
-    }
-    elseif ($memory>1024*10)
-    {
-      $memory = sprintf('%.2fkB', $memory/1024);
-    }
-    else
-    {
-      $memory = sprintf('%.2fB', $memory);
-    }
+        $elapsed = $now - $this->statusStartTime;
 
-    $statusBar .= ' [ remaining: '.$eta.' | elapsed: '.$elapsed.' ] (memory: '.$memory.')     ';
+        $eta = $this->convertTime($eta);
+        $elapsed = $this->convertTime($elapsed);
 
-    echo $statusBar;
+        $memory = memory_get_usage(true);
+        if ($memory > 1024 * 1024 * 1024 * 10) {
+            $memory = sprintf('%.2fGB', $memory / 1024 / 1024 / 1024);
+        } elseif ($memory > 1024 * 1024 * 10) {
+            $memory = sprintf('%.2fMB', $memory / 1024 / 1024);
+        } elseif ($memory > 1024 * 10) {
+            $memory = sprintf('%.2fkB', $memory / 1024);
+        } else {
+            $memory = sprintf('%.2fB', $memory);
+        }
 
-    // when done, send a newline
-    if ($done == $total)
-    {
-      $this->statusStartTime = null;
-      echo "\n";
-    }
-  }
-
-  /**
-   * Convert time into humain format
-   *
-   * @param integer $time
-   * @return string
-   */
-  private function convertTime($time)
-  {
-    $string = '';
-
-    if ($time > 3600)
-    {
-      $h = (int) abs($time / 3600);
-      $time -= ($h * 3600);
-      $string .= $h. ' h ';
+        $statusBar .= ' [ remaining: '.$eta.' | elapsed: '.$elapsed.' ] (memory: '.$memory.')     ';
+
+        echo $statusBar;
+
+        // when done, send a newline
+        if ($done == $total) {
+            $this->statusStartTime = null;
+            echo "\n";
+        }
     }
 
-    if ($time > 60)
+    /**
+     * Convert time into humain format.
+     *
+     * @param int $time
+     *
+     * @return string
+     */
+    private function convertTime($time)
     {
-      $m = (int) abs($time / 60);
-      $time -= ($m * 60);
-      $string .= $m. ' min ';
-    }
+        $string = '';
 
-    $string .= (int) $time.' sec';
+        if ($time > 3600) {
+            $h = (int) abs($time / 3600);
+            $time -= ($h * 3600);
+            $string .= $h.' h ';
+        }
+
+        if ($time > 60) {
+            $m = (int) abs($time / 60);
+            $time -= ($m * 60);
+            $string .= $m.' min ';
+        }
 
-    return $string;
-  }
+        $string .= (int) $time.' sec';
+
+        return $string;
+    }
 }
diff --git a/lib/task/sfCommandApplicationTask.class.php b/lib/task/sfCommandApplicationTask.class.php
index 2f08df3cd..33f89d6d3 100644
--- a/lib/task/sfCommandApplicationTask.class.php
+++ b/lib/task/sfCommandApplicationTask.class.php
@@ -11,231 +11,224 @@
 /**
  * Base class for tasks that depends on a sfCommandApplication object.
  *
- * @package    symfony
- * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  *
  * @property sfApplicationConfiguration $configuration
  */
 abstract class sfCommandApplicationTask extends sfTask
 {
-  /** @var sfSymfonyCommandApplication */
-  protected $commandApplication;
-
-  /** @var sfMailer */
-  private $mailer;
-  /** @var sfRouting */
-  private $routing;
-  /** @var sfServiceContainer */
-  private $serviceContainer;
-  private $factoryConfiguration;
-
-  /**
-   * Sets the command application instance for this task.
-   *
-   * @param sfCommandApplication $commandApplication A sfCommandApplication instance
-   */
-  public function setCommandApplication(sfCommandApplication $commandApplication = null)
-  {
-    $this->commandApplication = $commandApplication;
-  }
-
-  /**
-   * @see sfTask
-   * @inheritdoc
-   */
-  public function log($messages)
-  {
-    if (null === $this->commandApplication || $this->commandApplication->isVerbose())
+    /** @var sfSymfonyCommandApplication */
+    protected $commandApplication;
+
+    /** @var sfMailer */
+    private $mailer;
+
+    /** @var sfRouting */
+    private $routing;
+
+    /** @var sfServiceContainer */
+    private $serviceContainer;
+    private $factoryConfiguration;
+
+    /**
+     * Sets the command application instance for this task.
+     *
+     * @param sfCommandApplication $commandApplication A sfCommandApplication instance
+     */
+    public function setCommandApplication(sfCommandApplication $commandApplication = null)
+    {
+        $this->commandApplication = $commandApplication;
+    }
+
+    /**
+     * @see sfTask
+     * {@inheritdoc}
+     */
+    public function log($messages)
     {
-      parent::log($messages);
+        if (null === $this->commandApplication || $this->commandApplication->isVerbose()) {
+            parent::log($messages);
+        }
     }
-  }
-
-  /**
-   * @see sfTask
-   * @inheritdoc
-   */
-  public function logSection($section, $message, $size = null, $style = 'INFO')
-  {
-    if (null === $this->commandApplication || $this->commandApplication->isVerbose())
+
+    /**
+     * @see sfTask
+     * {@inheritdoc}
+     */
+    public function logSection($section, $message, $size = null, $style = 'INFO')
     {
-      parent::logSection($section, $message, $size, $style);
+        if (null === $this->commandApplication || $this->commandApplication->isVerbose()) {
+            parent::logSection($section, $message, $size, $style);
+        }
     }
-  }
-
-  /**
-   * Creates a new task object.
-   *
-   * @param  string $name The name of the task
-   *
-   * @return sfTask
-   *
-   * @throws LogicException If the current task has no command application
-   */
-  protected function createTask($name)
-  {
-    if (null === $this->commandApplication)
+
+    /**
+     * Retrieves a service from the service container.
+     *
+     * @param string $id The service identifier
+     *
+     * @return object The service instance
+     */
+    public function getService($id)
     {
-      throw new LogicException('Unable to create a task as no command application is associated with this task yet.');
+        return $this->getServiceContainer()->getService($id);
     }
 
-    $task = $this->commandApplication->getTaskToExecute($name);
+    /**
+     * Creates a new task object.
+     *
+     * @param string $name The name of the task
+     *
+     * @return sfTask
+     *
+     * @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.');
+        }
+
+        $task = $this->commandApplication->getTaskToExecute($name);
+
+        if ($task instanceof sfCommandApplicationTask) {
+            $task->setCommandApplication($this->commandApplication);
+        }
+
+        return $task;
+    }
 
-    if ($task instanceof sfCommandApplicationTask)
+    /**
+     * Executes another task in the context of the current one.
+     *
+     * @param string $name      The name of the task to execute
+     * @param array  $arguments An array of arguments to pass to the task
+     * @param array  $options   An array of options to pass to the task
+     *
+     * @return bool The returned value of the task run() method
+     *
+     * @see createTask()
+     */
+    protected function runTask($name, $arguments = array(), $options = array())
     {
-      $task->setCommandApplication($this->commandApplication);
+        return $this->createTask($name)->run($arguments, $options);
     }
 
-    return $task;
-  }
-
-  /**
-   * Executes another task in the context of the current one.
-   *
-   * @param  string  $name      The name of the task to execute
-   * @param  array   $arguments An array of arguments to pass to the task
-   * @param  array   $options   An array of options to pass to the task
-   *
-   * @return Boolean The returned value of the task run() method
-   *
-   * @see createTask()
-   */
-  protected function runTask($name, $arguments = array(), $options = array())
-  {
-    return $this->createTask($name)->run($arguments, $options);
-  }
-
-  /**
-   * Returns a mailer instance.
-   *
-   * Notice that your task should accept an application option.
-   * The mailer configuration is read from the current configuration
-   * instance, which is automatically created according to the current
-   * --application option.
-   *
-   * @return sfMailer A sfMailer instance
-   */
-  protected function getMailer()
-  {
-    if (null === $this->mailer)
+    /**
+     * Returns a mailer instance.
+     *
+     * Notice that your task should accept an application option.
+     * The mailer configuration is read from the current configuration
+     * instance, which is automatically created according to the current
+     * --application option.
+     *
+     * @return sfMailer A sfMailer instance
+     */
+    protected function getMailer()
     {
-      $this->mailer = $this->initializeMailer();
+        if (null === $this->mailer) {
+            $this->mailer = $this->initializeMailer();
+        }
+
+        return $this->mailer;
     }
 
-    return $this->mailer;
-  }
-
-  /**
-   * Initialize mailer
-   *
-   * @return sfMailer A sfMailer instance
-   */
-  protected function initializeMailer()
-  {
-    if (!class_exists('Swift'))
+    /**
+     * Initialize mailer.
+     *
+     * @return sfMailer A sfMailer instance
+     */
+    protected function initializeMailer()
     {
-      $swift_dir = sfConfig::get('sf_symfony_lib_dir').'/vendor/swiftmailer/lib';
-      require_once $swift_dir.'/swift_required.php';
+        if (!class_exists('Swift')) {
+            $swift_dir = sfConfig::get('sf_symfony_lib_dir').'/vendor/swiftmailer/lib';
+
+            require_once $swift_dir.'/swift_required.php';
+        }
+
+        $config = $this->getFactoryConfiguration();
+
+        return new $config['mailer']['class']($this->dispatcher, $config['mailer']['param']);
     }
 
-    $config = $this->getFactoryConfiguration();
-
-    return new $config['mailer']['class']($this->dispatcher, $config['mailer']['param']);
-  }
-
-  /**
-   * Returns a routing instance.
-   *
-   * Notice that your task should accept an application option.
-   * The routing configuration is read from the current configuration
-   * instance, which is automatically created according to the current
-   * --application option.
-   *
-   * @return sfRouting A sfRouting instance
-   */
-  protected function getRouting()
-  {
-    if (null === $this->routing)
+    /**
+     * Returns a routing instance.
+     *
+     * Notice that your task should accept an application option.
+     * The routing configuration is read from the current configuration
+     * instance, which is automatically created according to the current
+     * --application option.
+     *
+     * @return sfRouting A sfRouting instance
+     */
+    protected function getRouting()
     {
-      $this->routing = $this->initializeRouting();
+        if (null === $this->routing) {
+            $this->routing = $this->initializeRouting();
+        }
+
+        return $this->routing;
     }
 
-    return $this->routing;
-  }
-
-  /**
-   * Initialize routing
-   *
-   * @return sfRouting A sfRouting instance
-   */
-  protected function initializeRouting()
-  {
-    $config = $this->getFactoryConfiguration();
-    $params = array_merge($config['routing']['param'], array('load_configuration' => false, 'logging' => false));
-
-    $handler = new sfRoutingConfigHandler();
-    $routes = $handler->evaluate($this->configuration->getConfigPaths('config/routing.yml'));
-
-    /** @var sfRouting $routing */
-    $routing = new $config['routing']['class']($this->dispatcher, null, $params);
-    $routing->setRoutes($routes);
-
-    $this->dispatcher->notify(new sfEvent($routing, 'routing.load_configuration'));
-
-    return $routing;
-  }
-
-  /**
-   * Returns the service container instance.
-   *
-   * Notice that your task should accept an application option.
-   * The routing configuration is read from the current configuration
-   * instance, which is automatically created according to the current
-   * --application option.
-   *
-   * @return sfServiceContainer An application service container
-   */
-  protected function getServiceContainer()
-  {
-    if (null === $this->serviceContainer)
+    /**
+     * Initialize routing.
+     *
+     * @return sfRouting A sfRouting instance
+     */
+    protected function initializeRouting()
     {
-      $class = require $this->configuration->getConfigCache()->checkConfig('config/services.yml', true);
+        $config = $this->getFactoryConfiguration();
+        $params = array_merge($config['routing']['param'], array('load_configuration' => false, 'logging' => false));
+
+        $handler = new sfRoutingConfigHandler();
+        $routes = $handler->evaluate($this->configuration->getConfigPaths('config/routing.yml'));
 
-      $this->serviceContainer = new $class();
-      $this->serviceContainer->setService('sf_event_dispatcher', $this->dispatcher);
-      $this->serviceContainer->setService('sf_formatter', $this->formatter);
-      $this->serviceContainer->setService('sf_routing', $this->getRouting());
+        /** @var sfRouting $routing */
+        $routing = new $config['routing']['class']($this->dispatcher, null, $params);
+        $routing->setRoutes($routes);
+
+        $this->dispatcher->notify(new sfEvent($routing, 'routing.load_configuration'));
+
+        return $routing;
     }
 
-    return $this->serviceContainer;
-  }
-
-  /**
-   * Retrieves a service from the service container.
-   *
-   * @param  string $id The service identifier
-   *
-   * @return object The service instance
-   */
-  public function getService($id)
-  {
-    return $this->getServiceContainer()->getService($id);
-  }
-
-  /**
-   * Gets the factory configuration
-   *
-   * @return array
-   */
-  protected function getFactoryConfiguration()
-  {
-    if (null === $this->factoryConfiguration)
+    /**
+     * Returns the service container instance.
+     *
+     * Notice that your task should accept an application option.
+     * The routing configuration is read from the current configuration
+     * instance, which is automatically created according to the current
+     * --application option.
+     *
+     * @return sfServiceContainer An application service container
+     */
+    protected function getServiceContainer()
     {
-      $this->factoryConfiguration = sfFactoryConfigHandler::getConfiguration($this->configuration->getConfigPaths('config/factories.yml'));
+        if (null === $this->serviceContainer) {
+            $class = require $this->configuration->getConfigCache()->checkConfig('config/services.yml', true);
+
+            $this->serviceContainer = new $class();
+            $this->serviceContainer->setService('sf_event_dispatcher', $this->dispatcher);
+            $this->serviceContainer->setService('sf_formatter', $this->formatter);
+            $this->serviceContainer->setService('sf_routing', $this->getRouting());
+        }
+
+        return $this->serviceContainer;
     }
 
-    return $this->factoryConfiguration;
-  }
+    /**
+     * Gets the factory configuration.
+     *
+     * @return array
+     */
+    protected function getFactoryConfiguration()
+    {
+        if (null === $this->factoryConfiguration) {
+            $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 7162cbe25..75288b352 100644
--- a/lib/task/sfFilesystem.class.php
+++ b/lib/task/sfFilesystem.class.php
@@ -11,489 +11,431 @@
 /**
  * sfFilesystem provides basic utility to manipulate the file system.
  *
- * @package    symfony
- * @subpackage util
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfFilesystem
 {
-  protected
-    $dispatcher = null,
-    $formatter  = null;
-
-  /**
-   * Constructor.
-   *
-   * @param sfEventDispatcher $dispatcher  An sfEventDispatcher instance
-   * @param sfFormatter       $formatter   An sfFormatter instance
-   */
-  public function __construct(sfEventDispatcher $dispatcher = null, sfFormatter $formatter = null)
-  {
-    $this->dispatcher = $dispatcher;
-    $this->formatter = $formatter;
-  }
-
-  /**
-   * Copies a file.
-   *
-   * This method only copies the file if the origin file is newer than the target file.
-   *
-   * By default, if the target already exists, it is not overriden.
-   *
-   * To override existing files, pass the "override" option.
-   *
-   * @param string $originFile  The original filename
-   * @param string $targetFile  The target filename
-   * @param array  $options     An array of options
-   *
-   * @return bool
-   */
-  public function copy($originFile, $targetFile, $options = array())
-  {
-    if (!array_key_exists('override', $options))
+    protected $dispatcher;
+    protected $formatter;
+
+    /**
+     * Constructor.
+     *
+     * @param sfEventDispatcher $dispatcher An sfEventDispatcher instance
+     * @param sfFormatter       $formatter  An sfFormatter instance
+     */
+    public function __construct(sfEventDispatcher $dispatcher = null, sfFormatter $formatter = null)
     {
-      $options['override'] = false;
+        $this->dispatcher = $dispatcher;
+        $this->formatter = $formatter;
     }
 
-    // we create target_dir if needed
-    if (!is_dir(dirname($targetFile)))
+    /**
+     * Copies a file.
+     *
+     * This method only copies the file if the origin file is newer than the target file.
+     *
+     * By default, if the target already exists, it is not overriden.
+     *
+     * To override existing files, pass the "override" option.
+     *
+     * @param string $originFile The original filename
+     * @param string $targetFile The target filename
+     * @param array  $options    An array of options
+     *
+     * @return bool
+     */
+    public function copy($originFile, $targetFile, $options = array())
     {
-      $this->mkdirs(dirname($targetFile));
+        if (!array_key_exists('override', $options)) {
+            $options['override'] = false;
+        }
+
+        // we create target_dir if needed
+        if (!is_dir(dirname($targetFile))) {
+            $this->mkdirs(dirname($targetFile));
+        }
+
+        $mostRecent = false;
+        if (file_exists($targetFile)) {
+            $statTarget = stat($targetFile);
+            $stat_origin = stat($originFile);
+            $mostRecent = ($stat_origin['mtime'] > $statTarget['mtime']);
+        }
+
+        if ($options['override'] || !file_exists($targetFile) || $mostRecent) {
+            $this->logSection('file+', $targetFile);
+
+            return copy($originFile, $targetFile);
+        }
+
+        return true;
     }
 
-    $mostRecent = false;
-    if (file_exists($targetFile))
+    /**
+     * Creates a directory recursively.
+     *
+     * @param string $path The directory path
+     * @param int    $mode The directory mode
+     *
+     * @return bool true if the directory has been created, false otherwise
+     */
+    public function mkdirs($path, $mode = 0777)
     {
-      $statTarget = stat($targetFile);
-      $stat_origin = stat($originFile);
-      $mostRecent = ($stat_origin['mtime'] > $statTarget['mtime']);
+        if (is_dir($path)) {
+            return true;
+        }
+
+        $this->logSection('dir+', $path);
+
+        return @mkdir($path, $mode, true);
     }
 
-    if ($options['override'] || !file_exists($targetFile) || $mostRecent)
+    /**
+     * Creates empty files.
+     *
+     * @param mixed $files The filename, or an array of filenames
+     */
+    public function touch($files)
     {
-      $this->logSection('file+', $targetFile);
+        if (!is_array($files)) {
+            $files = array($files);
+        }
+
+        foreach ($files as $file) {
+            $this->logSection('file+', $file);
 
-      return copy($originFile, $targetFile);
+            touch($file);
+        }
     }
 
-    return true;
-  }
-
-  /**
-   * Creates a directory recursively.
-   *
-   * @param  string $path  The directory path
-   * @param  int    $mode  The directory mode
-   *
-   * @return bool true if the directory has been created, false otherwise
-   */
-  public function mkdirs($path, $mode = 0777)
-  {
-    if (is_dir($path))
+    /**
+     * Removes files or directories.
+     *
+     * @param mixed $files A filename or an array of files to remove
+     */
+    public function remove($files)
     {
-      return true;
-    }
+        if (!is_array($files)) {
+            $files = array($files);
+        }
 
-    $this->logSection('dir+', $path);
+        $files = array_reverse($files);
+        foreach ($files as $file) {
+            if (is_dir($file) && !is_link($file)) {
+                $this->logSection('dir-', $file);
 
-    return @mkdir($path, $mode, true);
-  }
+                rmdir($file);
+            } else {
+                $this->logSection(is_link($file) ? 'link-' : 'file-', $file);
 
-  /**
-   * Creates empty files.
-   *
-   * @param mixed $files  The filename, or an array of filenames
-   */
-  public function touch($files)
-  {
-    if (!is_array($files))
-    {
-      $files = array($files);
+                unlink($file);
+            }
+        }
     }
 
-    foreach ($files as $file)
+    /**
+     * Change mode for an array of files or directories.
+     *
+     * @param array $files An array of files or directories
+     * @param int   $mode  The new mode
+     * @param int   $umask The mode mask (octal)
+     */
+    public function chmod($files, $mode, $umask = 0000)
     {
-      $this->logSection('file+', $file);
+        $currentUmask = umask();
+        umask($umask);
 
-      touch($file);
-    }
-  }
-
-  /**
-   * Removes files or directories.
-   *
-   * @param mixed $files  A filename or an array of files to remove
-   */
-  public function remove($files)
-  {
-    if (!is_array($files))
-    {
-      $files = array($files);
-    }
+        if (!is_array($files)) {
+            $files = array($files);
+        }
 
-    $files = array_reverse($files);
-    foreach ($files as $file)
-    {
-      if (is_dir($file) && !is_link($file))
-      {
-        $this->logSection('dir-', $file);
-
-        rmdir($file);
-      }
-      else
-      {
-        $this->logSection(is_link($file) ? 'link-' : 'file-', $file);
-
-        unlink($file);
-      }
-    }
-  }
-
-  /**
-   * Change mode for an array of files or directories.
-   *
-   * @param array   $files  An array of files or directories
-   * @param integer $mode   The new mode
-   * @param integer $umask  The mode mask (octal)
-   */
-  public function chmod($files, $mode, $umask = 0000)
-  {
-    $currentUmask = umask();
-    umask($umask);
-
-    if (!is_array($files))
-    {
-      $files = array($files);
-    }
+        foreach ($files as $file) {
+            $this->logSection(sprintf('chmod %o', $mode), $file);
+            chmod($file, $mode);
+        }
 
-    foreach ($files as $file)
-    {
-      $this->logSection(sprintf('chmod %o', $mode), $file);
-      chmod($file, $mode);
+        umask($currentUmask);
     }
 
-    umask($currentUmask);
-  }
-
-  /**
-   * Renames a file.
-   *
-   * @param string $origin  The origin filename
-   * @param string $target  The new filename
-   *
-   * @return bool
-   *
-   * @throws sfException
-   */
-  public function rename($origin, $target)
-  {
-    // we check that target does not exist
-    if (is_readable($target))
+    /**
+     * Renames a file.
+     *
+     * @param string $origin The origin filename
+     * @param string $target The new filename
+     *
+     * @return bool
+     *
+     * @throws sfException
+     */
+    public function rename($origin, $target)
     {
-      throw new sfException(sprintf('Cannot rename because the target "%s" already exist.', $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));
+        }
 
-    $this->logSection('rename', $origin.' > '.$target);
-
-    return rename($origin, $target);
-  }
-
-  /**
-   * Creates a symbolic link or copy a directory.
-   *
-   * @param string $originDir      The origin directory path
-   * @param string $targetDir      The symbolic link name
-   * @param bool   $copyOnWindows  Whether to copy files if on windows
-   */
-  public function symlink($originDir, $targetDir, $copyOnWindows = false)
-  {
-    if ('\\' == DIRECTORY_SEPARATOR && $copyOnWindows)
-    {
-      $finder = sfFinder::type('any');
-      $this->mirror($originDir, $targetDir, $finder);
-      return;
-    }
+        $this->logSection('rename', $origin.' > '.$target);
 
-    $ok = false;
-    if (is_link($targetDir))
-    {
-      if (readlink($targetDir) != $originDir)
-      {
-        unlink($targetDir);
-      }
-      else
-      {
-        $ok = true;
-      }
+        return rename($origin, $target);
     }
 
-    if (!$ok)
+    /**
+     * Creates a symbolic link or copy a directory.
+     *
+     * @param string $originDir     The origin directory path
+     * @param string $targetDir     The symbolic link name
+     * @param bool   $copyOnWindows Whether to copy files if on windows
+     */
+    public function symlink($originDir, $targetDir, $copyOnWindows = false)
     {
-      $this->logSection('link+', $targetDir);
-      symlink($originDir, $targetDir);
+        if ('\\' == DIRECTORY_SEPARATOR && $copyOnWindows) {
+            $finder = sfFinder::type('any');
+            $this->mirror($originDir, $targetDir, $finder);
+
+            return;
+        }
+
+        $ok = false;
+        if (is_link($targetDir)) {
+            if (readlink($targetDir) != $originDir) {
+                unlink($targetDir);
+            } else {
+                $ok = true;
+            }
+        }
+
+        if (!$ok) {
+            $this->logSection('link+', $targetDir);
+            symlink($originDir, $targetDir);
+        }
     }
-  }
-
-  /**
-   * Creates a symbolic link using a relative path if possible.
-   *
-   * @param string $originDir      The origin directory path
-   * @param string $targetDir      The symbolic link name
-   * @param bool   $copyOnWindows  Whether to copy files if on windows
-   */
-  public function relativeSymlink($originDir, $targetDir, $copyOnWindows = false)
-  {
-    if ('\\' != DIRECTORY_SEPARATOR || !$copyOnWindows)
+
+    /**
+     * Creates a symbolic link using a relative path if possible.
+     *
+     * @param string $originDir     The origin directory path
+     * @param string $targetDir     The symbolic link name
+     * @param bool   $copyOnWindows Whether to copy files if on windows
+     */
+    public function relativeSymlink($originDir, $targetDir, $copyOnWindows = false)
     {
-      $originDir = $this->calculateRelativeDir($targetDir, $originDir);
+        if ('\\' != DIRECTORY_SEPARATOR || !$copyOnWindows) {
+            $originDir = $this->calculateRelativeDir($targetDir, $originDir);
+        }
+
+        $this->symlink($originDir, $targetDir, $copyOnWindows);
     }
 
-    $this->symlink($originDir, $targetDir, $copyOnWindows);
-  }
-
-  /**
-   * 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())
-   *
-   * @throws sfException
-   */
-  public function mirror($originDir, $targetDir, $finder, $options = array())
-  {
-    foreach ($finder->relative()->in($originDir) as $file)
+    /**
+     * 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())
+     *
+     * @throws sfException
+     */
+    public function mirror($originDir, $targetDir, $finder, $options = array())
     {
-      if (is_dir($originDir.DIRECTORY_SEPARATOR.$file))
-      {
-        $this->mkdirs($targetDir.DIRECTORY_SEPARATOR.$file);
-      }
-      else if (is_file($originDir.DIRECTORY_SEPARATOR.$file))
-      {
-        $this->copy($originDir.DIRECTORY_SEPARATOR.$file, $targetDir.DIRECTORY_SEPARATOR.$file, $options);
-      }
-      else if (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));
-      }
+        foreach ($finder->relative()->in($originDir) as $file) {
+            if (is_dir($originDir.DIRECTORY_SEPARATOR.$file)) {
+                $this->mkdirs($targetDir.DIRECTORY_SEPARATOR.$file);
+            } elseif (is_file($originDir.DIRECTORY_SEPARATOR.$file)) {
+                $this->copy($originDir.DIRECTORY_SEPARATOR.$file, $targetDir.DIRECTORY_SEPARATOR.$file, $options);
+            } 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));
+            }
+        }
     }
-  }
-
-  /**
-   * Executes a shell command.
-   *
-   * @param string $cmd            The command to execute on the shell
-   * @param array  $stdoutCallback A callback for stdout output
-   * @param array  $stderrCallback A callback for stderr output
-   *
-   * @return array An array composed of the content output and the error output
-   */
-  public function execute($cmd, $stdoutCallback = null, $stderrCallback = null)
-  {
-    $this->logSection('exec ', $cmd);
-
-    $descriptorspec = array(
-      1 => array('pipe', 'w'), // stdout
-      2 => array('pipe', 'w'), // stderr
-    );
-
-    $process = proc_open($cmd, $descriptorspec, $pipes);
-    if (!is_resource($process))
+
+    /**
+     * Executes a shell command.
+     *
+     * @param string $cmd            The command to execute on the shell
+     * @param array  $stdoutCallback A callback for stdout output
+     * @param array  $stderrCallback A callback for stderr output
+     *
+     * @return array An array composed of the content output and the error output
+     */
+    public function execute($cmd, $stdoutCallback = null, $stderrCallback = null)
     {
-      throw new RuntimeException('Unable to execute the command.');
-    }
+        $this->logSection('exec ', $cmd);
 
-    stream_set_blocking($pipes[1], false);
-    stream_set_blocking($pipes[2], false);
+        $descriptorspec = array(
+            1 => array('pipe', 'w'), // stdout
+            2 => array('pipe', 'w'), // stderr
+        );
 
-    $output = '';
-    $err = '';
-    while (!feof($pipes[1]) || !feof($pipes[2]))
-    {
-      foreach ($pipes as $key => $pipe)
-      {
-        if (!$line = fread($pipe, 128))
-        {
-          continue;
+        $process = proc_open($cmd, $descriptorspec, $pipes);
+        if (!is_resource($process)) {
+            throw new RuntimeException('Unable to execute the command.');
         }
 
-        if (1 == $key)
-        {
-          // stdout
-          $output .= $line;
-          if ($stdoutCallback)
-          {
-            call_user_func($stdoutCallback, $line);
-          }
-        }
-        else
-        {
-          // stderr
-          $err .= $line;
-          if ($stderrCallback)
-          {
-            call_user_func($stderrCallback, $line);
-          }
+        stream_set_blocking($pipes[1], false);
+        stream_set_blocking($pipes[2], false);
+
+        $output = '';
+        $err = '';
+        while (!feof($pipes[1]) || !feof($pipes[2])) {
+            foreach ($pipes as $key => $pipe) {
+                if (!$line = fread($pipe, 128)) {
+                    continue;
+                }
+
+                if (1 == $key) {
+                    // stdout
+                    $output .= $line;
+                    if ($stdoutCallback) {
+                        call_user_func($stdoutCallback, $line);
+                    }
+                } else {
+                    // stderr
+                    $err .= $line;
+                    if ($stderrCallback) {
+                        call_user_func($stderrCallback, $line);
+                    }
+                }
+            }
+
+            usleep(100000);
         }
-      }
 
-      usleep(100000);
-    }
+        fclose($pipes[1]);
+        fclose($pipes[2]);
 
-    fclose($pipes[1]);
-    fclose($pipes[2]);
+        if (($return = proc_close($process)) > 0) {
+            throw new RuntimeException('Problem executing command.', $return);
+        }
 
-    if (($return = proc_close($process)) > 0)
-    {
-      throw new RuntimeException('Problem executing command.', $return);
+        return array($output, $err);
     }
 
-    return array($output, $err);
-  }
-
-  /**
-   * Replaces tokens in an array of files.
-   *
-   * @param array  $files       An array of filenames
-   * @param string $beginToken  The begin token delimiter
-   * @param string $endToken    The end token delimiter
-   * @param array  $tokens      An array of token/value pairs
-   */
-  public function replaceTokens($files, $beginToken, $endToken, $tokens)
-  {
-    if (!is_array($files))
+    /**
+     * Replaces tokens in an array of files.
+     *
+     * @param array  $files      An array of filenames
+     * @param string $beginToken The begin token delimiter
+     * @param string $endToken   The end token delimiter
+     * @param array  $tokens     An array of token/value pairs
+     */
+    public function replaceTokens($files, $beginToken, $endToken, $tokens)
     {
-      $files = array($files);
-    }
+        if (!is_array($files)) {
+            $files = array($files);
+        }
 
-    foreach ($files as $file)
-    {
-      $content = file_get_contents($file);
-      foreach ($tokens as $key => $value)
-      {
-        $content = str_replace($beginToken.$key.$endToken, $value, $content, $count);
-      }
+        foreach ($files as $file) {
+            $content = file_get_contents($file);
+            foreach ($tokens as $key => $value) {
+                $content = str_replace($beginToken.$key.$endToken, $value, $content, $count);
+            }
 
-      $this->logSection('tokens', $file);
+            $this->logSection('tokens', $file);
 
-      file_put_contents($file, $content);
-    }
-  }
-
-  /**
-   * Logs a message in a section.
-   *
-   * @param string $section  The section name
-   * @param string $message  The message
-   * @param int    $size     The maximum size of a line
-   */
-  protected function logSection($section, $message, $size = null)
-  {
-    if (!$this->dispatcher)
-    {
-      return;
+            file_put_contents($file, $content);
+        }
     }
 
-    $message = $this->formatter ? $this->formatter->formatSection($section, $message, $size) : $section.' '.$message."\n";
-
-    $this->dispatcher->notify(new sfEvent($this, 'command.log', array($message)));
-  }
-
-  /**
-   * Calculates the relative path from one to another directory.
-   *
-   * If the paths share no common path the absolute target dir is returned.
-   *
-   * @param string $from The directory from which to calculate the relative path
-   * @param string $to   The target directory
-   *
-   * @return string
-   */
-  protected function calculateRelativeDir($from, $to)
-  {
-    $from = $this->canonicalizePath($from);
-    $to = $this->canonicalizePath($to);
-
-    $commonLength = 0;
-    $minPathLength = min(strlen($from), strlen($to));
-
-    // count how many chars the strings have in common
-    for ($i = 0; $i < $minPathLength; $i++)
+    /**
+     * Logs a message in a section.
+     *
+     * @param string $section The section name
+     * @param string $message The message
+     * @param int    $size    The maximum size of a line
+     */
+    protected function logSection($section, $message, $size = null)
     {
-      if ($from[$i] != $to[$i])
-      {
-        break;
-      }
-
-      if (DIRECTORY_SEPARATOR == $from[$i])
-      {
-        $commonLength = $i + 1;
-      }
-    }
+        if (!$this->dispatcher) {
+            return;
+        }
 
-    if ($commonLength)
-    {
-      if (extension_loaded('mbstring'))
-      {
-        $levelUp = mb_substr_count(mb_strcut($from, $commonLength), DIRECTORY_SEPARATOR);
-      }
-      else
-      {
-        $levelUp = substr_count($from, DIRECTORY_SEPARATOR, $commonLength);
-      }
-
-      // up that many level
-      $relativeDir = str_repeat('..'.DIRECTORY_SEPARATOR, $levelUp);
-
-      // down the remaining $to path
-      $relativeDir .= substr($to, $commonLength);
-
-      return $relativeDir;
+        $message = $this->formatter ? $this->formatter->formatSection($section, $message, $size) : $section.' '.$message."\n";
+
+        $this->dispatcher->notify(new sfEvent($this, 'command.log', array($message)));
     }
 
-    return $to;
-  }
-
-  /**
-   * @param string $path A filesystem path
-   *
-   * @return string
-   */
-  protected function canonicalizePath($path)
-  {
-    if (empty($path))
+    /**
+     * Calculates the relative path from one to another directory.
+     *
+     * If the paths share no common path the absolute target dir is returned.
+     *
+     * @param string $from The directory from which to calculate the relative path
+     * @param string $to   The target directory
+     *
+     * @return string
+     */
+    protected function calculateRelativeDir($from, $to)
     {
-      return '';
+        $from = $this->canonicalizePath($from);
+        $to = $this->canonicalizePath($to);
+
+        $commonLength = 0;
+        $minPathLength = min(strlen($from), strlen($to));
+
+        // count how many chars the strings have in common
+        for ($i = 0; $i < $minPathLength; ++$i) {
+            if ($from[$i] != $to[$i]) {
+                break;
+            }
+
+            if (DIRECTORY_SEPARATOR == $from[$i]) {
+                $commonLength = $i + 1;
+            }
+        }
+
+        if ($commonLength) {
+            if (extension_loaded('mbstring')) {
+                $levelUp = mb_substr_count(mb_strcut($from, $commonLength), DIRECTORY_SEPARATOR);
+            } else {
+                $levelUp = substr_count($from, DIRECTORY_SEPARATOR, $commonLength);
+            }
+
+            // up that many level
+            $relativeDir = str_repeat('..'.DIRECTORY_SEPARATOR, $levelUp);
+
+            // down the remaining $to path
+            $relativeDir .= substr($to, $commonLength);
+
+            return $relativeDir;
+        }
+
+        return $to;
     }
 
-    $out = array();
-    foreach (explode(DIRECTORY_SEPARATOR, $path) as $i => $fold)
+    /**
+     * @param string $path A filesystem path
+     *
+     * @return string
+     */
+    protected function canonicalizePath($path)
     {
-      if ('' == $fold || '.' == $fold)
-      {
-        continue;
-      }
-
-      if ('..' == $fold && $i > 0 && '..' != end($out))
-      {
-        array_pop($out);
-      }
-      else
-      {
-        $out[] = $fold;
-      }
-    }
+        if (empty($path)) {
+            return '';
+        }
+
+        $out = array();
+        foreach (explode(DIRECTORY_SEPARATOR, $path) as $i => $fold) {
+            if ('' == $fold || '.' == $fold) {
+                continue;
+            }
+
+            if ('..' == $fold && $i > 0 && '..' != end($out)) {
+                array_pop($out);
+            } else {
+                $out[] = $fold;
+            }
+        }
 
-    $result  = DIRECTORY_SEPARATOR == $path[0] ? DIRECTORY_SEPARATOR : '';
-    $result .= implode(DIRECTORY_SEPARATOR, $out);
-    $result .= DIRECTORY_SEPARATOR == $path[strlen($path) - 1] ? DIRECTORY_SEPARATOR : '';
+        $result = DIRECTORY_SEPARATOR == $path[0] ? DIRECTORY_SEPARATOR : '';
+        $result .= implode(DIRECTORY_SEPARATOR, $out);
+        $result .= DIRECTORY_SEPARATOR == $path[strlen($path) - 1] ? DIRECTORY_SEPARATOR : '';
 
-    return $result;
-  }
+        return $result;
+    }
 }
diff --git a/lib/task/sfTask.class.php b/lib/task/sfTask.class.php
index 0a4e69072..355ffa6ca 100644
--- a/lib/task/sfTask.class.php
+++ b/lib/task/sfTask.class.php
@@ -11,671 +11,624 @@
 /**
  * Abstract class for all tasks.
  *
- * @package    symfony
- * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfTask
 {
-  protected $namespace = '';
-  protected $name = null;
-  protected $aliases = array();
-  protected $briefDescription = '';
-  protected $detailedDescription = '';
-  protected $arguments = array();
-  protected $options = array();
-  /** @var sfEventDispatcher */
-  protected $dispatcher = null;
-  /** @var sfFormatter */
-  protected $formatter = null;
-
-  /**
-   * Constructor.
-   *
-   * @param sfEventDispatcher $dispatcher  An sfEventDispatcher instance
-   * @param sfFormatter       $formatter   An sfFormatter instance
-   */
-  public function __construct(sfEventDispatcher $dispatcher, sfFormatter $formatter)
-  {
-    $this->initialize($dispatcher, $formatter);
-
-    $this->configure();
-  }
-
-  /**
-   * Initializes the sfTask instance.
-   *
-   * @param sfEventDispatcher $dispatcher  A sfEventDispatcher instance
-   * @param sfFormatter       $formatter   A sfFormatter instance
-   */
-  public function initialize(sfEventDispatcher $dispatcher, sfFormatter $formatter)
-  {
-    $this->dispatcher = $dispatcher;
-    $this->formatter  = $formatter;
-  }
-
-  /**
-   * Configures the current task.
-   */
-  protected function configure()
-  {
-  }
-
-  /**
-   * Returns the formatter instance.
-   *
-   * @return sfFormatter The formatter instance
-   */
-  public function getFormatter()
-  {
-    return $this->formatter;
-  }
-
-  /**
-   * Sets the formatter instance.
-   *
-   * @param sfFormatter $formatter The formatter instance
-   */
-  public function setFormatter(sfFormatter $formatter)
-  {
-    $this->formatter = $formatter;
-  }
-
-  /**
-   * Runs the task from the CLI.
-   *
-   * @param sfCommandManager $commandManager  An sfCommandManager instance
-   * @param mixed            $options         The command line options
-   *
-   * @return integer 0 if everything went fine, or an error code
-   */
-  public function runFromCLI(sfCommandManager $commandManager, $options = null)
-  {
-    $commandManager->getArgumentSet()->addArguments($this->getArguments());
-    $commandManager->getOptionSet()->addOptions($this->getOptions());
-
-    return $this->doRun($commandManager, $options);
-  }
-
-  /**
-   * Runs the task.
-   *
-   * @param array|string $arguments  An array of arguments or a string representing the CLI arguments and options
-   * @param array        $options    An array of options
-   *
-   * @return integer 0 if everything went fine, or an error code
-   */
-  public function run($arguments = array(), $options = array())
-  {
-    $commandManager = new sfCommandManager(new sfCommandArgumentSet($this->getArguments()), new sfCommandOptionSet($this->getOptions()));
-
-    if (is_array($arguments) && is_string(key($arguments)))
+    protected $namespace = '';
+    protected $name;
+    protected $aliases = array();
+    protected $briefDescription = '';
+    protected $detailedDescription = '';
+    protected $arguments = array();
+    protected $options = array();
+
+    /** @var sfEventDispatcher */
+    protected $dispatcher;
+
+    /** @var sfFormatter */
+    protected $formatter;
+
+    /**
+     * Constructor.
+     *
+     * @param sfEventDispatcher $dispatcher An sfEventDispatcher instance
+     * @param sfFormatter       $formatter  An sfFormatter instance
+     */
+    public function __construct(sfEventDispatcher $dispatcher, sfFormatter $formatter)
     {
-      // index arguments by name for ordering and reference
-      $indexArguments = array();
-      foreach ($this->arguments as $argument)
-      {
-        $indexArguments[$argument->getName()] = $argument;
-      }
-
-      foreach ($arguments as $name => $value)
-      {
-        if (false !== $pos = array_search($name, array_keys($indexArguments)))
-        {
-          if ($indexArguments[$name]->isArray())
-          {
-            $value = implode(' ', (array) $value);
-            $arguments[$pos] = isset($arguments[$pos]) ? $arguments[$pos].' '.$value : $value;
-          }
-          else
-          {
-            $arguments[$pos] = $value;
-          }
-
-          unset($arguments[$name]);
-        }
-      }
+        $this->initialize($dispatcher, $formatter);
 
-      ksort($arguments);
+        $this->configure();
     }
 
-    // index options by name for reference
-    $indexedOptions = array();
-    foreach ($this->options as $option)
+    /**
+     * Initializes the sfTask instance.
+     *
+     * @param sfEventDispatcher $dispatcher A sfEventDispatcher instance
+     * @param sfFormatter       $formatter  A sfFormatter instance
+     */
+    public function initialize(sfEventDispatcher $dispatcher, sfFormatter $formatter)
     {
-      $indexedOptions[$option->getName()] = $option;
+        $this->dispatcher = $dispatcher;
+        $this->formatter = $formatter;
     }
 
-    foreach ($options as $name => $value)
+    /**
+     * Returns the formatter instance.
+     *
+     * @return sfFormatter The formatter instance
+     */
+    public function getFormatter()
     {
-      if (is_string($name))
-      {
-        if (false === $value || null === $value || (isset($indexedOptions[$name]) && $indexedOptions[$name]->isArray() && !$value))
-        {
-          unset($options[$name]);
-          continue;
-        }
+        return $this->formatter;
+    }
 
-        // convert associative array
-        $value = true === $value ? $name : sprintf('%s=%s', $name, isset($indexedOptions[$name]) && $indexedOptions[$name]->isArray() ? implode(' --'.$name.'=', (array) $value) : $value);
-      }
+    /**
+     * Sets the formatter instance.
+     *
+     * @param sfFormatter $formatter The formatter instance
+     */
+    public function setFormatter(sfFormatter $formatter)
+    {
+        $this->formatter = $formatter;
+    }
 
-      // add -- before each option if needed
-      if (0 !== strpos($value, '--'))
-      {
-        $value = '--'.$value;
-      }
+    /**
+     * Runs the task from the CLI.
+     *
+     * @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)
+    {
+        $commandManager->getArgumentSet()->addArguments($this->getArguments());
+        $commandManager->getOptionSet()->addOptions($this->getOptions());
 
-      $options[] = $value;
-      unset($options[$name]);
+        return $this->doRun($commandManager, $options);
     }
 
-    return $this->doRun($commandManager, is_string($arguments) ? $arguments : implode(' ', array_merge($arguments, $options)));
-  }
-
-  /**
-   * Returns the argument objects.
-   *
-   * @return sfCommandArgument[] An array of sfCommandArgument objects.
-   */
-  public function getArguments()
-  {
-    return $this->arguments;
-  }
-
-  /**
-   * Adds an array of argument objects.
-   *
-   * @param sfCommandArgument[] $arguments  An array of arguments
-   */
-  public function addArguments($arguments)
-  {
-    $this->arguments = array_merge($this->arguments, $arguments);
-  }
-
-  /**
-   * Add an argument.
-   *
-   * This method always use the sfCommandArgument class to create an option.
-   *
-   * @see sfCommandArgument::__construct()
-   * @param string $name
-   * @param int    $mode
-   * @param string $help
-   * @param mixed  $default
-   */
-  public function addArgument($name, $mode = null, $help = '', $default = null)
-  {
-    $this->arguments[] = new sfCommandArgument($name, $mode, $help, $default);
-  }
-
-  /**
-   * Returns the options objects.
-   *
-   * @return sfCommandOption[] An array of sfCommandOption objects.
-   */
-  public function getOptions()
-  {
-    return $this->options;
-  }
-
-  /**
-   * Adds an array of option objects.
-   *
-   * @param array $options    An array of options
-   */
-  public function addOptions($options)
-  {
-    $this->options = array_merge($this->options, $options);
-  }
-
-  /**
-   * Add an option.
-   *
-   * This method always use the sfCommandOption class to create an option.
-   *
-   * @see sfCommandOption::__construct()
-   *
-   * @param string $name
-   * @param string $shortcut
-   * @param int    $mode
-   * @param string $help
-   * @param mixed  $default
-   */
-  public function addOption($name, $shortcut = null, $mode = null, $help = '', $default = null)
-  {
-    $this->options[] = new sfCommandOption($name, $shortcut, $mode, $help, $default);
-  }
-
-  /**
-   * Returns the task namespace.
-   *
-   * @return string The task namespace
-   */
-  public function getNamespace()
-  {
-    return $this->namespace;
-  }
-
-  /**
-   * Returns the task name
-   *
-   * @return string The task name
-   */
-  public function getName()
-  {
-    if ($this->name)
+    /**
+     * Runs the task.
+     *
+     * @param array|string $arguments An array of arguments or a string representing the CLI arguments and options
+     * @param array        $options   An array of options
+     *
+     * @return int 0 if everything went fine, or an error code
+     */
+    public function run($arguments = array(), $options = array())
     {
-      return $this->name;
-    }
+        $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();
+            foreach ($this->arguments as $argument) {
+                $indexArguments[$argument->getName()] = $argument;
+            }
+
+            foreach ($arguments as $name => $value) {
+                if (false !== $pos = array_search($name, array_keys($indexArguments))) {
+                    if ($indexArguments[$name]->isArray()) {
+                        $value = implode(' ', (array) $value);
+                        $arguments[$pos] = isset($arguments[$pos]) ? $arguments[$pos].' '.$value : $value;
+                    } else {
+                        $arguments[$pos] = $value;
+                    }
+
+                    unset($arguments[$name]);
+                }
+            }
+
+            ksort($arguments);
+        }
 
-    $name = get_class($this);
+        // index options by name for reference
+        $indexedOptions = array();
+        foreach ($this->options as $option) {
+            $indexedOptions[$option->getName()] = $option;
+        }
 
-    if ('sf' == substr($name, 0, 2))
-    {
-      $name = substr($name, 2);
+        foreach ($options as $name => $value) {
+            if (is_string($name)) {
+                if (false === $value || null === $value || (isset($indexedOptions[$name]) && $indexedOptions[$name]->isArray() && !$value)) {
+                    unset($options[$name]);
+
+                    continue;
+                }
+
+                // convert associative array
+                $value = true === $value ? $name : sprintf('%s=%s', $name, isset($indexedOptions[$name]) && $indexedOptions[$name]->isArray() ? implode(' --'.$name.'=', (array) $value) : $value);
+            }
+
+            // add -- before each option if needed
+            if (0 !== strpos($value, '--')) {
+                $value = '--'.$value;
+            }
+
+            $options[] = $value;
+            unset($options[$name]);
+        }
+
+        return $this->doRun($commandManager, is_string($arguments) ? $arguments : implode(' ', array_merge($arguments, $options)));
     }
 
-    if ('Task' == substr($name, -4))
+    /**
+     * Returns the argument objects.
+     *
+     * @return sfCommandArgument[] an array of sfCommandArgument objects
+     */
+    public function getArguments()
     {
-      $name = substr($name, 0, -4);
+        return $this->arguments;
     }
 
-    return str_replace('_', '-', sfInflector::underscore($name));
-  }
-
-  /**
-   * Returns the fully qualified task name.
-   *
-   * @return string The fully qualified task name
-   */
-  final function getFullName()
-  {
-    return $this->getNamespace() ? $this->getNamespace().':'.$this->getName() : $this->getName();
-  }
-
-  /**
-   * Returns the brief description for the task.
-   *
-   * @return string The brief description for the task
-   */
-  public function getBriefDescription()
-  {
-    return $this->briefDescription;
-  }
-
-  /**
-   * Returns the detailed description for the task.
-   *
-   * It also formats special string like [...|COMMENT]
-   * depending on the current formatter.
-   *
-   * @return string The detailed description for the task
-   */
-  public function getDetailedDescription()
-  {
-    $formatter = $this->getFormatter();
-    return preg_replace_callback('/\[(.+?)\|(\w+)\]/s', function ($match) use ($formatter) {
-      return $formatter->format($match['1'], $match['2']);
-    }, $this->detailedDescription);
-  }
-
-  /**
-   * Returns the aliases for the task.
-   *
-   * @return array An array of aliases for the task
-   */
-  public function getAliases()
-  {
-    return $this->aliases;
-  }
-
-  /**
-   * Returns the synopsis for the task.
-   *
-   * @return string The synopsis
-   */
-  public function getSynopsis()
-  {
-    $options = array();
-    foreach ($this->getOptions() as $option)
+    /**
+     * Adds an array of argument objects.
+     *
+     * @param sfCommandArgument[] $arguments An array of arguments
+     */
+    public function addArguments($arguments)
     {
-      $shortcut = $option->getShortcut() ? sprintf('-%s|', $option->getShortcut()) : '';
-      $options[] = sprintf('['.($option->isParameterRequired() ? '%s--%s="..."' : ($option->isParameterOptional() ? '%s--%s[="..."]' : '%s--%s')).']', $shortcut, $option->getName());
+        $this->arguments = array_merge($this->arguments, $arguments);
     }
 
-    $arguments = array();
-    foreach ($this->getArguments() as $argument)
+    /**
+     * Add an argument.
+     *
+     * This method always use the sfCommandArgument class to create an option.
+     *
+     * @see sfCommandArgument::__construct()
+     *
+     * @param string $name
+     * @param int    $mode
+     * @param string $help
+     * @param mixed  $default
+     */
+    public function addArgument($name, $mode = null, $help = '', $default = null)
     {
-      $arguments[] = sprintf($argument->isRequired() ? '%s' : '[%s]', $argument->getName().($argument->isArray() ? '1' : ''));
-
-      if ($argument->isArray())
-      {
-        $arguments[] = sprintf('... [%sN]', $argument->getName());
-      }
+        $this->arguments[] = new sfCommandArgument($name, $mode, $help, $default);
     }
 
-    return sprintf('%%s %s %s %s', $this->getFullName(), implode(' ', $options), implode(' ', $arguments));
-  }
-
-  protected function process(sfCommandManager $commandManager, $options)
-  {
-    $commandManager->process($options);
-    if (!$commandManager->isValid())
+    /**
+     * Returns the options objects.
+     *
+     * @return sfCommandOption[] an array of sfCommandOption objects
+     */
+    public function getOptions()
     {
-      throw new sfCommandArgumentsException(sprintf("The execution of task \"%s\" failed.\n- %s", $this->getFullName(), implode("\n- ", $commandManager->getErrors())));
+        return $this->options;
     }
-  }
 
-  protected function doRun(sfCommandManager $commandManager, $options)
-  {
-    $event = $this->dispatcher->filter(new sfEvent($this, 'command.filter_options', array('command_manager' => $commandManager)), $options);
-    $options = $event->getReturnValue();
+    /**
+     * Adds an array of option objects.
+     *
+     * @param array $options An array of options
+     */
+    public function addOptions($options)
+    {
+        $this->options = array_merge($this->options, $options);
+    }
 
-    $this->process($commandManager, $options);
+    /**
+     * Add an option.
+     *
+     * This method always use the sfCommandOption class to create an option.
+     *
+     * @see sfCommandOption::__construct()
+     *
+     * @param string $name
+     * @param string $shortcut
+     * @param int    $mode
+     * @param string $help
+     * @param mixed  $default
+     */
+    public function addOption($name, $shortcut = null, $mode = null, $help = '', $default = null)
+    {
+        $this->options[] = new sfCommandOption($name, $shortcut, $mode, $help, $default);
+    }
 
-    $event = new sfEvent($this, 'command.pre_command', array('arguments' => $commandManager->getArgumentValues(), 'options' => $commandManager->getOptionValues()));
-    $this->dispatcher->notifyUntil($event);
-    if ($event->isProcessed())
+    /**
+     * Returns the task namespace.
+     *
+     * @return string The task namespace
+     */
+    public function getNamespace()
     {
-      return $event->getReturnValue();
+        return $this->namespace;
     }
 
-    $ret = $this->execute($commandManager->getArgumentValues(), $commandManager->getOptionValues());
+    /**
+     * Returns the task name.
+     *
+     * @return string The task name
+     */
+    public function getName()
+    {
+        if ($this->name) {
+            return $this->name;
+        }
 
-    $this->dispatcher->notify(new sfEvent($this, 'command.post_command'));
+        $name = get_class($this);
 
-    return $ret;
-  }
+        if ('sf' == substr($name, 0, 2)) {
+            $name = substr($name, 2);
+        }
 
-  /**
-   * Logs a message.
-   *
-   * @param mixed $messages  The message as an array of lines of a single string
-   */
-  public function log($messages)
-  {
-    if (!is_array($messages))
-    {
-      $messages = array($messages);
+        if ('Task' == substr($name, -4)) {
+            $name = substr($name, 0, -4);
+        }
+
+        return str_replace('_', '-', sfInflector::underscore($name));
     }
 
-    $this->dispatcher->notify(new sfEvent($this, 'command.log', $messages));
-  }
-
-  /**
-   * Logs a message in a section.
-   *
-   * @param string  $section  The section name
-   * @param string  $message  The message
-   * @param int     $size     The maximum size of a line
-   * @param string  $style    The color scheme to apply to the section string (INFO, ERROR, or COMMAND)
-   */
-  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))));
-  }
-
-  /**
-   * Logs a message as a block of text.
-   *
-   * @param string|array $messages The message to display in the block
-   * @param string       $style    The style to use
-   */
-  public function logBlock($messages, $style)
-  {
-    if (!is_array($messages))
+    /**
+     * Returns the fully qualified task name.
+     *
+     * @return string The fully qualified task name
+     */
+    final public function getFullName()
     {
-      $messages = array($messages);
+        return $this->getNamespace() ? $this->getNamespace().':'.$this->getName() : $this->getName();
     }
 
-    $style = str_replace('_LARGE', '', $style, $count);
-    $large = (Boolean) $count;
-
-    $len = 0;
-    $lines = array();
-    foreach ($messages as $message)
+    /**
+     * Returns the brief description for the task.
+     *
+     * @return string The brief description for the task
+     */
+    public function getBriefDescription()
     {
-      $lines[] = sprintf($large ? '  %s  ' : ' %s ', $message);
-      $len = max($this->strlen($message) + ($large ? 4 : 2), $len);
+        return $this->briefDescription;
     }
 
-    $messages = $large ? array(str_repeat(' ', $len)) : array();
-    foreach ($lines as $line)
+    /**
+     * Returns the detailed description for the task.
+     *
+     * It also formats special string like [...|COMMENT]
+     * depending on the current formatter.
+     *
+     * @return string The detailed description for the task
+     */
+    public function getDetailedDescription()
     {
-      $messages[] = $line.str_repeat(' ', $len - $this->strlen($line));
+        $formatter = $this->getFormatter();
+
+        return preg_replace_callback('/\[(.+?)\|(\w+)\]/s', function ($match) use ($formatter) {
+            return $formatter->format($match['1'], $match['2']);
+        }, $this->detailedDescription);
     }
-    if ($large)
+
+    /**
+     * Returns the aliases for the task.
+     *
+     * @return array An array of aliases for the task
+     */
+    public function getAliases()
     {
-      $messages[] = str_repeat(' ', $len);
+        return $this->aliases;
     }
 
-    foreach ($messages as $message)
+    /**
+     * Returns the synopsis for the task.
+     *
+     * @return string The synopsis
+     */
+    public function getSynopsis()
     {
-      $this->log($this->formatter->format($message, $style));
+        $options = array();
+        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();
+        foreach ($this->getArguments() as $argument) {
+            $arguments[] = sprintf($argument->isRequired() ? '%s' : '[%s]', $argument->getName().($argument->isArray() ? '1' : ''));
+
+            if ($argument->isArray()) {
+                $arguments[] = sprintf('... [%sN]', $argument->getName());
+            }
+        }
+
+        return sprintf('%%s %s %s %s', $this->getFullName(), implode(' ', $options), implode(' ', $arguments));
     }
-  }
-
-  /**
-   * Asks a question to the user.
-   *
-   * @param string|array $question The question to ask
-   * @param string       $style    The style to use (QUESTION by default)
-   * @param string       $default  The default answer if none is given by the user
-   *
-   * @return string      The user answer
-   */
-  public function ask($question, $style = 'QUESTION', $default = null)
-  {
-    if (false === $style)
+
+    /**
+     * Logs a message.
+     *
+     * @param mixed $messages The message as an array of lines of a single string
+     */
+    public function log($messages)
     {
-      $this->log($question);
+        if (!is_array($messages)) {
+            $messages = array($messages);
+        }
+
+        $this->dispatcher->notify(new sfEvent($this, 'command.log', $messages));
     }
-    else
+
+    /**
+     * Logs a message in a section.
+     *
+     * @param string $section The section name
+     * @param string $message The message
+     * @param int    $size    The maximum size of a line
+     * @param string $style   The color scheme to apply to the section string (INFO, ERROR, or COMMAND)
+     */
+    public function logSection($section, $message, $size = null, $style = 'INFO')
     {
-      $this->logBlock($question, null === $style ? 'QUESTION' : $style);
+        $this->dispatcher->notify(new sfEvent($this, 'command.log', array($this->formatter->formatSection($section, $message, $size, $style))));
     }
 
-    $ret = trim(fgets(STDIN));
-
-    return $ret ?: $default;
-  }
-
-  /**
-   * Asks a confirmation to the user.
-   *
-   * The question will be asked until the user answer by nothing, yes, or no.
-   *
-   * @param string|array $question The question to ask
-   * @param string       $style    The style to use (QUESTION by default)
-   * @param Boolean      $default  The default answer if the user enters nothing
-   *
-   * @return Boolean     true if the user has confirmed, false otherwise
-   */
-  public function askConfirmation($question, $style = 'QUESTION', $default = true)
-  {
-    $answer = 'z';
-    while ($answer && !in_array(strtolower($answer[0]), array('y', 'n')))
+    /**
+     * Logs a message as a block of text.
+     *
+     * @param array|string $messages The message to display in the block
+     * @param string       $style    The style to use
+     */
+    public function logBlock($messages, $style)
     {
-      $answer = $this->ask($question, $style);
+        if (!is_array($messages)) {
+            $messages = array($messages);
+        }
+
+        $style = str_replace('_LARGE', '', $style, $count);
+        $large = (bool) $count;
+
+        $len = 0;
+        $lines = array();
+        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();
+        foreach ($lines as $line) {
+            $messages[] = $line.str_repeat(' ', $len - $this->strlen($line));
+        }
+        if ($large) {
+            $messages[] = str_repeat(' ', $len);
+        }
+
+        foreach ($messages as $message) {
+            $this->log($this->formatter->format($message, $style));
+        }
     }
 
-    if (false === $default)
+    /**
+     * Asks a question to the user.
+     *
+     * @param array|string $question The question to ask
+     * @param string       $style    The style to use (QUESTION by default)
+     * @param string       $default  The default answer if none is given by the user
+     *
+     * @return string The user answer
+     */
+    public function ask($question, $style = 'QUESTION', $default = null)
     {
-      return $answer && 'y' == strtolower($answer[0]);
+        if (false === $style) {
+            $this->log($question);
+        } else {
+            $this->logBlock($question, null === $style ? 'QUESTION' : $style);
+        }
+
+        $ret = trim(fgets(STDIN));
+
+        return $ret ?: $default;
     }
-    else
+
+    /**
+     * Asks a confirmation to the user.
+     *
+     * The question will be asked until the user answer by nothing, yes, or no.
+     *
+     * @param array|string $question The question to ask
+     * @param string       $style    The style to use (QUESTION by default)
+     * @param bool         $default  The default answer if the user enters nothing
+     *
+     * @return bool true if the user has confirmed, false otherwise
+     */
+    public function askConfirmation($question, $style = 'QUESTION', $default = true)
     {
-      return !$answer || 'y' == strtolower($answer[0]);
+        $answer = 'z';
+        while ($answer && !in_array(strtolower($answer[0]), array('y', 'n'))) {
+            $answer = $this->ask($question, $style);
+        }
+
+        if (false === $default) {
+            return $answer && 'y' == strtolower($answer[0]);
+        }
+
+        return !$answer || 'y' == strtolower($answer[0]);
     }
-  }
-
-  /**
-   * Asks for a value and validates the response.
-   *
-   * Available options:
-   *
-   *  * value:    A value to try against the validator before asking the user
-   *  * attempts: Max number of times to ask before giving up (false by default, which means infinite)
-   *  * style:    Style for question output (QUESTION by default)
-   *
-   * @param   string|array    $question
-   * @param   sfValidatorBase $validator
-   * @param   array           $options
-   *
-   * @return mixed
-   *
-   * @throws sfValidatorError
-   */
-  public function askAndValidate($question, sfValidatorBase $validator, array $options = array())
-  {
-    if (!is_array($question))
+
+    /**
+     * Asks for a value and validates the response.
+     *
+     * Available options:
+     *
+     *  * value:    A value to try against the validator before asking the user
+     *  * attempts: Max number of times to ask before giving up (false by default, which means infinite)
+     *  * style:    Style for question output (QUESTION by default)
+     *
+     * @param array|string $question
+     *
+     * @return mixed
+     *
+     * @throws sfValidatorError
+     */
+    public function askAndValidate($question, sfValidatorBase $validator, array $options = array())
     {
-      $question = array($question);
-    }
+        if (!is_array($question)) {
+            $question = array($question);
+        }
 
-    $options = array_merge(array(
-      'value'    => null,
-      'attempts' => false,
-      'style'    => 'QUESTION',
-    ), $options);
+        $options = array_merge(array(
+            'value' => null,
+            'attempts' => false,
+            'style' => 'QUESTION',
+        ), $options);
+
+        // does the provided value passes the validator?
+        if ($options['value']) {
+            try {
+                return $validator->clean($options['value']);
+            } catch (sfValidatorError $error) {
+            }
+        }
 
-    // does the provided value passes the validator?
-    if ($options['value'])
-    {
-      try
-      {
-        return $validator->clean($options['value']);
-      }
-      catch (sfValidatorError $error)
-      {
-      }
+        // no, ask the user for a valid user
+        /** @var sfValidatorError|null $error */
+        $error = null;
+        while (false === $options['attempts'] || $options['attempts']--) {
+            if (null !== $error) {
+                $this->logBlock($error->getMessage(), 'ERROR');
+            }
+
+            $value = $this->ask($question, $options['style'], null);
+
+            try {
+                return $validator->clean($value);
+            } catch (sfValidatorError $error) {
+            }
+        }
+
+        throw $error;
     }
 
-    // no, ask the user for a valid user
-    /** @var sfValidatorError|null $error */
-    $error = null;
-    while (false === $options['attempts'] || $options['attempts']--)
+    /**
+     * Returns an XML representation of a task.
+     *
+     * @return string An XML string representing the task
+     */
+    public function asXml()
     {
-      if (null !== $error)
-      {
-        $this->logBlock($error->getMessage(), 'ERROR');
-      }
-
-      $value = $this->ask($question, $options['style'], null);
-
-      try
-      {
-        return $validator->clean($value);
-      }
-      catch (sfValidatorError $error)
-      {
-      }
+        $dom = new DOMDocument('1.0', 'UTF-8');
+        $dom->formatOutput = true;
+        $dom->appendChild($taskXML = $dom->createElement('task'));
+        $taskXML->setAttribute('id', $this->getFullName());
+        $taskXML->setAttribute('namespace', $this->getNamespace() ?: '_global');
+        $taskXML->setAttribute('name', $this->getName());
+
+        $taskXML->appendChild($usageXML = $dom->createElement('usage'));
+        $usageXML->appendChild($dom->createTextNode(sprintf($this->getSynopsis(), '')));
+
+        $taskXML->appendChild($descriptionXML = $dom->createElement('description'));
+        $descriptionXML->appendChild($dom->createTextNode(implode("\n ", explode("\n", $this->getBriefDescription()))));
+
+        $taskXML->appendChild($helpXML = $dom->createElement('help'));
+        $help = $this->detailedDescription;
+        $help = str_replace(array('|COMMENT', '|INFO'), array('|strong', '|em'), $help);
+        $help = preg_replace('/\[(.+?)\|(\w+)\]/s', '<$2>$1</$2>', $help);
+        $helpXML->appendChild($dom->createTextNode(implode("\n ", explode("\n", $help))));
+
+        $taskXML->appendChild($aliasesXML = $dom->createElement('aliases'));
+        foreach ($this->getAliases() as $alias) {
+            $aliasesXML->appendChild($aliasXML = $dom->createElement('alias'));
+            $aliasXML->appendChild($dom->createTextNode($alias));
+        }
+
+        $taskXML->appendChild($argumentsXML = $dom->createElement('arguments'));
+        foreach ($this->getArguments() as $argument) {
+            $argumentsXML->appendChild($argumentXML = $dom->createElement('argument'));
+            $argumentXML->setAttribute('name', $argument->getName());
+            $argumentXML->setAttribute('is_required', $argument->isRequired() ? 1 : 0);
+            $argumentXML->setAttribute('is_array', $argument->isArray() ? 1 : 0);
+            $argumentXML->appendChild($helpXML = $dom->createElement('description'));
+            $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());
+            foreach ($defaults as $default) {
+                $defaultsXML->appendChild($defaultXML = $dom->createElement('default'));
+                $defaultXML->appendChild($dom->createTextNode($default));
+            }
+        }
+
+        $taskXML->appendChild($optionsXML = $dom->createElement('options'));
+        foreach ($this->getOptions() as $option) {
+            $optionsXML->appendChild($optionXML = $dom->createElement('option'));
+            $optionXML->setAttribute('name', '--'.$option->getName());
+            $optionXML->setAttribute('shortcut', $option->getShortcut() ? '-'.$option->getShortcut() : '');
+            $optionXML->setAttribute('accept_parameter', $option->acceptParameter() ? 1 : 0);
+            $optionXML->setAttribute('is_parameter_required', $option->isParameterRequired() ? 1 : 0);
+            $optionXML->setAttribute('is_multiple', $option->isArray() ? 1 : 0);
+            $optionXML->appendChild($helpXML = $dom->createElement('description'));
+            $helpXML->appendChild($dom->createTextNode($option->getHelp()));
+
+            if ($option->acceptParameter()) {
+                $optionXML->appendChild($defaultsXML = $dom->createElement('defaults'));
+                $defaults = is_array($option->getDefault()) ? $option->getDefault() : ($option->getDefault() ? array($option->getDefault()) : array());
+                foreach ($defaults as $default) {
+                    $defaultsXML->appendChild($defaultXML = $dom->createElement('default'));
+                    $defaultXML->appendChild($dom->createTextNode($default));
+                }
+            }
+        }
+
+        return $dom->saveXML();
     }
 
-    throw $error;
-  }
-
-  /**
-   * Returns an XML representation of a task.
-   *
-   * @return string An XML string representing the task
-   */
-  public function asXml()
-  {
-    $dom = new DOMDocument('1.0', 'UTF-8');
-    $dom->formatOutput = true;
-    $dom->appendChild($taskXML = $dom->createElement('task'));
-    $taskXML->setAttribute('id', $this->getFullName());
-    $taskXML->setAttribute('namespace', $this->getNamespace() ?: '_global');
-    $taskXML->setAttribute('name', $this->getName());
-
-    $taskXML->appendChild($usageXML = $dom->createElement('usage'));
-    $usageXML->appendChild($dom->createTextNode(sprintf($this->getSynopsis(), '')));
-
-    $taskXML->appendChild($descriptionXML = $dom->createElement('description'));
-    $descriptionXML->appendChild($dom->createTextNode(implode("\n ", explode("\n", $this->getBriefDescription()))));
-
-    $taskXML->appendChild($helpXML = $dom->createElement('help'));
-    $help = $this->detailedDescription;
-    $help = str_replace(array('|COMMENT', '|INFO'), array('|strong', '|em'), $help);
-    $help = preg_replace('/\[(.+?)\|(\w+)\]/s', '<$2>$1</$2>', $help);
-    $helpXML->appendChild($dom->createTextNode(implode("\n ", explode("\n", $help))));
-
-    $taskXML->appendChild($aliasesXML = $dom->createElement('aliases'));
-    foreach ($this->getAliases() as $alias)
+    /**
+     * Configures the current task.
+     */
+    protected function configure()
     {
-      $aliasesXML->appendChild($aliasXML = $dom->createElement('alias'));
-      $aliasXML->appendChild($dom->createTextNode($alias));
     }
 
-    $taskXML->appendChild($argumentsXML = $dom->createElement('arguments'));
-    foreach ($this->getArguments() as $argument)
+    protected function process(sfCommandManager $commandManager, $options)
     {
-      $argumentsXML->appendChild($argumentXML = $dom->createElement('argument'));
-      $argumentXML->setAttribute('name', $argument->getName());
-      $argumentXML->setAttribute('is_required', $argument->isRequired() ? 1 : 0);
-      $argumentXML->setAttribute('is_array', $argument->isArray() ? 1 : 0);
-      $argumentXML->appendChild($helpXML = $dom->createElement('description'));
-      $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());
-      foreach ($defaults as $default)
-      {
-        $defaultsXML->appendChild($defaultXML = $dom->createElement('default'));
-        $defaultXML->appendChild($dom->createTextNode($default));
-      }
+        $commandManager->process($options);
+        if (!$commandManager->isValid()) {
+            throw new sfCommandArgumentsException(sprintf("The execution of task \"%s\" failed.\n- %s", $this->getFullName(), implode("\n- ", $commandManager->getErrors())));
+        }
     }
 
-    $taskXML->appendChild($optionsXML = $dom->createElement('options'));
-    foreach ($this->getOptions() as $option)
+    protected function doRun(sfCommandManager $commandManager, $options)
     {
-      $optionsXML->appendChild($optionXML = $dom->createElement('option'));
-      $optionXML->setAttribute('name', '--'.$option->getName());
-      $optionXML->setAttribute('shortcut', $option->getShortcut() ? '-'.$option->getShortcut() : '');
-      $optionXML->setAttribute('accept_parameter', $option->acceptParameter() ? 1 : 0);
-      $optionXML->setAttribute('is_parameter_required', $option->isParameterRequired() ? 1 : 0);
-      $optionXML->setAttribute('is_multiple', $option->isArray() ? 1 : 0);
-      $optionXML->appendChild($helpXML = $dom->createElement('description'));
-      $helpXML->appendChild($dom->createTextNode($option->getHelp()));
-
-      if ($option->acceptParameter())
-      {
-        $optionXML->appendChild($defaultsXML = $dom->createElement('defaults'));
-        $defaults = is_array($option->getDefault()) ? $option->getDefault() : ($option->getDefault() ? array($option->getDefault()) : array());
-        foreach ($defaults as $default)
-        {
-          $defaultsXML->appendChild($defaultXML = $dom->createElement('default'));
-          $defaultXML->appendChild($dom->createTextNode($default));
+        $event = $this->dispatcher->filter(new sfEvent($this, 'command.filter_options', array('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()));
+        $this->dispatcher->notifyUntil($event);
+        if ($event->isProcessed()) {
+            return $event->getReturnValue();
         }
-      }
+
+        $ret = $this->execute($commandManager->getArgumentValues(), $commandManager->getOptionValues());
+
+        $this->dispatcher->notify(new sfEvent($this, 'command.post_command'));
+
+        return $ret;
     }
 
-    return $dom->saveXML();
-  }
-
-  /**
-   * Executes the current task.
-   *
-   * @param array    $arguments  An array of arguments
-   * @param array    $options    An array of options
-   *
-   * @return integer 0 if everything went fine, or an error code
-   */
-   abstract protected function execute($arguments = array(), $options = array());
-
-   protected function strlen($string)
-   {
-     if (!function_exists('mb_strlen')) {
-         return strlen($string);
-     }
-
-     if (false === $encoding = mb_detect_encoding($string)) {
-         return strlen($string);
-     }
-
-     return mb_strlen($string, $encoding);
-   }
+     /**
+      * Executes the current task.
+      *
+      * @param array    $arguments  An array of arguments
+      * @param array    $options    An array of options
+      *
+      * @return int 0 if everything went fine, or an error code
+      */
+     abstract protected function execute($arguments = array(), $options = array());
+
+    protected function strlen($string)
+    {
+        if (!function_exists('mb_strlen')) {
+            return strlen($string);
+        }
+
+        if (false === $encoding = mb_detect_encoding($string)) {
+            return strlen($string);
+        }
+
+        return mb_strlen($string, $encoding);
+    }
 }
diff --git a/lib/task/symfony/lime_symfony.php b/lib/task/symfony/lime_symfony.php
index 9506e4a5e..7605c4cd9 100644
--- a/lib/task/symfony/lime_symfony.php
+++ b/lib/task/symfony/lime_symfony.php
@@ -10,14 +10,14 @@
 
 class lime_symfony extends lime_harness
 {
-  protected function get_relative_file($file)
-  {
-    $file = str_replace(DIRECTORY_SEPARATOR, '/', str_replace(array(
-      realpath($this->base_dir).DIRECTORY_SEPARATOR,
-      realpath($this->base_dir.'/../lib/plugins').DIRECTORY_SEPARATOR,
-      $this->extension,
-    ), '', $file));
+    protected function get_relative_file($file)
+    {
+        $file = str_replace(DIRECTORY_SEPARATOR, '/', str_replace(array(
+            realpath($this->base_dir).DIRECTORY_SEPARATOR,
+            realpath($this->base_dir.'/../lib/plugins').DIRECTORY_SEPARATOR,
+            $this->extension,
+        ), '', $file));
 
-    return preg_replace('#^(.*?)Plugin/test/(unit|functional)/#', '[$1] $2/', $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 db04e26ec..fc6864e97 100644
--- a/lib/task/symfony/sfSymfonyTestTask.class.php
+++ b/lib/task/symfony/sfSymfonyTestTask.class.php
@@ -11,116 +11,107 @@
 /**
  * Launches the symfony test suite.
  *
- * @package    symfony
- * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfSymfonyTestTask extends 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->namespace = 'symfony';
-    $this->name = 'test';
-    $this->briefDescription = 'Launches the symfony test suite';
-
-    $this->detailedDescription = <<<EOF
+    /**
+     * @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->namespace = 'symfony';
+        $this->name = 'test';
+        $this->briefDescription = 'Launches the symfony test suite';
+
+        $this->detailedDescription = <<<EOF
 The [{$this->getFullName()}|INFO] task launches the symfony test suite:
 
   [./symfony {$this->getFullName()}|INFO]
 EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    require_once(__DIR__.'/../../vendor/lime/lime.php');
-    require_once(__DIR__.'/lime_symfony.php');
-
-    // cleanup
-    require_once(__DIR__.'/../../util/sfToolkit.class.php');
-    if ($files = glob(sys_get_temp_dir().DIRECTORY_SEPARATOR.'/sf_autoload_unit_*'))
-    {
-      foreach ($files as $file)
-      {
-        unlink($file);
-      }
-    }
-
-    // update sfCoreAutoload
-    if ($options['update-autoloader'])
-    {
-      require_once(__DIR__.'/../../autoload/sfCoreAutoload.class.php');
-      sfCoreAutoload::make();
     }
 
-    $status = false;
-    $statusFile = sys_get_temp_dir().DIRECTORY_SEPARATOR.sprintf('/.test_symfony_%s_status', md5(__DIR__));
-    if ($options['only-failed'])
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
     {
-      if (file_exists($statusFile))
-      {
-        $status = unserialize(file_get_contents($statusFile));
-      }
+        require_once __DIR__.'/../../vendor/lime/lime.php';
+
+        require_once __DIR__.'/lime_symfony.php';
+
+        // cleanup
+        require_once __DIR__.'/../../util/sfToolkit.class.php';
+        if ($files = glob(sys_get_temp_dir().DIRECTORY_SEPARATOR.'/sf_autoload_unit_*')) {
+            foreach ($files as $file) {
+                unlink($file);
+            }
+        }
+
+        // update sfCoreAutoload
+        if ($options['update-autoloader']) {
+            require_once __DIR__.'/../../autoload/sfCoreAutoload.class.php';
+            sfCoreAutoload::make();
+        }
+
+        $status = false;
+        $statusFile = sys_get_temp_dir().DIRECTORY_SEPARATOR.sprintf('/.test_symfony_%s_status', md5(__DIR__));
+        if ($options['only-failed']) {
+            if (file_exists($statusFile)) {
+                $status = unserialize(file_get_contents($statusFile));
+            }
+        }
+
+        $h = new lime_symfony(array('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'));
+            foreach ($finder->in(glob($h->base_dir.'/../lib/plugins/*/test/functional/fixtures/lib')) as $dir) {
+                sfToolkit::clearDirectory($dir);
+            }
+        }
+
+        if ($status) {
+            foreach ($status as $file) {
+                $h->register($file);
+            }
+        } else {
+            $h->register(sfFinder::type('file')->prune('fixtures')->name('*Test.php')->in(array_merge(
+                // unit tests
+                array($h->base_dir.'/unit'),
+                glob($h->base_dir.'/../lib/plugins/*/test/unit'),
+
+                // functional tests
+                array($h->base_dir.'/functional'),
+                glob($h->base_dir.'/../lib/plugins/*/test/functional'),
+
+                // other tests
+                array($h->base_dir.'/other')
+            )));
+        }
+
+        $ret = $h->run() ? 0 : 1;
+
+        file_put_contents($statusFile, serialize($h->get_failed_files()));
+
+        if ($options['xml']) {
+            file_put_contents($options['xml'], $h->to_xml());
+        }
+
+        return $ret;
     }
-
-    $h = new lime_symfony(array('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'));
-      foreach ($finder->in(glob($h->base_dir.'/../lib/plugins/*/test/functional/fixtures/lib')) as $dir)
-      {
-        sfToolkit::clearDirectory($dir);
-      }
-    }
-
-    if ($status)
-    {
-      foreach ($status as $file)
-      {
-        $h->register($file);
-      }
-    }
-    else
-    {
-      $h->register(sfFinder::type('file')->prune('fixtures')->name('*Test.php')->in(array_merge(
-        // unit tests
-        array($h->base_dir.'/unit'),
-        glob($h->base_dir.'/../lib/plugins/*/test/unit'),
-
-        // functional tests
-        array($h->base_dir.'/functional'),
-        glob($h->base_dir.'/../lib/plugins/*/test/functional'),
-
-        // other tests
-        array($h->base_dir.'/other')
-      )));
-    }
-
-    $ret = $h->run() ? 0 : 1;
-
-    file_put_contents($statusFile, serialize($h->get_failed_files()));
-
-    if ($options['xml'])
-    {
-      file_put_contents($options['xml'], $h->to_xml());
-    }
-
-    return $ret;
-  }
 }
diff --git a/lib/task/test/sfLimeHarness.class.php b/lib/task/test/sfLimeHarness.class.php
index d6e76b2a7..226b818fa 100644
--- a/lib/task/test/sfLimeHarness.class.php
+++ b/lib/task/test/sfLimeHarness.class.php
@@ -4,33 +4,29 @@
 
 class sfLimeHarness extends lime_harness
 {
-  protected
-    $plugins = array();
+    protected $plugins = array();
 
-  public function addPlugins($plugins)
-  {
-    foreach ($plugins as $plugin)
+    public function addPlugins($plugins)
     {
-      $pluginDir = $plugin->getRootDir().DIRECTORY_SEPARATOR.'test'.DIRECTORY_SEPARATOR;
+        foreach ($plugins as $plugin) {
+            $pluginDir = $plugin->getRootDir().DIRECTORY_SEPARATOR.'test'.DIRECTORY_SEPARATOR;
 
-      $this->plugins[$pluginDir] = '['.preg_replace('/Plugin$/i', '', $plugin->getName()).'] ';
+            $this->plugins[$pluginDir] = '['.preg_replace('/Plugin$/i', '', $plugin->getName()).'] ';
 
-      if (true === $this->full_output)
-      {
-        $this->plugins[$pluginDir] .= $pluginDir;
-      }
+            if (true === $this->full_output) {
+                $this->plugins[$pluginDir] .= $pluginDir;
+            }
+        }
     }
-  }
 
-  protected function get_relative_file($file)
-  {
-    $file = strtr($file, $this->plugins);
-
-    if (true === $this->full_output)
+    protected function get_relative_file($file)
     {
-      return $file;
-    }
+        $file = strtr($file, $this->plugins);
 
-    return str_replace(DIRECTORY_SEPARATOR, '/', str_replace(array(realpath($this->base_dir).DIRECTORY_SEPARATOR, $this->extension), '', $file));
-  }
+        if (true === $this->full_output) {
+            return $file;
+        }
+
+        return str_replace(DIRECTORY_SEPARATOR, '/', str_replace(array(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 ba8974734..bc80f13c0 100644
--- a/lib/task/test/sfTestAllTask.class.php
+++ b/lib/task/test/sfTestAllTask.class.php
@@ -11,29 +11,28 @@
 /**
  * Launches all tests.
  *
- * @package    symfony
- * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfTestAllTask extends sfTestBaseTask
 {
-  /**
-   * @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->namespace = 'test';
-    $this->name = 'all';
-    $this->briefDescription = 'Launches all tests';
-
-    $this->detailedDescription = <<<EOF
+    /**
+     * @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->namespace = 'test';
+        $this->name = 'all';
+        $this->briefDescription = 'Launches all tests';
+
+        $this->detailedDescription = <<<'EOF'
 The [test:all|INFO] task launches all unit and functional tests:
 
   [./symfony test:all|INFO]
@@ -69,56 +68,52 @@ protected function configure()
 
   [./symfony test:all --full-output|INFO]
 EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    require_once __DIR__.'/sfLimeHarness.class.php';
-
-    $h = new sfLimeHarness(array(
-      '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');
-
-    $status = false;
-    $statusFile = sfConfig::get('sf_cache_dir').'/.test_all_status';
-    if ($options['only-failed'])
-    {
-      if (file_exists($statusFile))
-      {
-        $status = unserialize(file_get_contents($statusFile));
-      }
     }
 
-    if ($status)
-    {
-      foreach ($status as $file)
-      {
-        $h->register($file);
-      }
-    }
-    else
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
     {
-      // filter and register all tests
-      $finder = sfFinder::type('file')->follow_link()->name('*Test.php');
-      $h->register($this->filterTestFiles($finder->in($h->base_dir), $arguments, $options));
+        require_once __DIR__.'/sfLimeHarness.class.php';
+
+        $h = new sfLimeHarness(array(
+            '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');
+
+        $status = false;
+        $statusFile = sfConfig::get('sf_cache_dir').'/.test_all_status';
+        if ($options['only-failed']) {
+            if (file_exists($statusFile)) {
+                $status = unserialize(file_get_contents($statusFile));
+            }
+        }
+
+        if ($status) {
+            foreach ($status as $file) {
+                $h->register($file);
+            }
+        } else {
+            // filter and register all tests
+            $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;
+
+        file_put_contents($statusFile, serialize($h->get_failed_files()));
+
+        if ($options['xml']) {
+            file_put_contents($options['xml'], $h->to_xml());
+        }
+
+        return $ret;
     }
-
-    $ret = $h->run() ? 0 : 1;
-
-    file_put_contents($statusFile, serialize($h->get_failed_files()));
-
-    if ($options['xml'])
-    {
-      file_put_contents($options['xml'], $h->to_xml());
-    }
-
-    return $ret;
-  }
 }
diff --git a/lib/task/test/sfTestBaseTask.class.php b/lib/task/test/sfTestBaseTask.class.php
index 99170672c..43a4cecc8 100644
--- a/lib/task/test/sfTestBaseTask.class.php
+++ b/lib/task/test/sfTestBaseTask.class.php
@@ -11,52 +11,48 @@
 /**
  * Base test task.
  *
- * @package    symfony
- * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfTestBaseTask extends sfBaseTask
 {
-  /**
-   * Filters tests through the "task.test.filter_test_files" event.
-   *
-   * @param  array $tests     An array of absolute test file paths
-   * @param  array $arguments Current task arguments
-   * @param  array $options   Current task options
-   *
-   * @return array The filtered array of test files
-   */
-  protected function filterTestFiles($tests, $arguments, $options)
-  {
-    $event = new sfEvent($this, 'task.test.filter_test_files', array('arguments' => $arguments, 'options' => $options));
+    /**
+     * Filters tests through the "task.test.filter_test_files" event.
+     *
+     * @param array $tests     An array of absolute test file paths
+     * @param array $arguments Current task arguments
+     * @param array $options   Current task options
+     *
+     * @return array The filtered array of test files
+     */
+    protected function filterTestFiles($tests, $arguments, $options)
+    {
+        $event = new sfEvent($this, 'task.test.filter_test_files', array('arguments' => $arguments, 'options' => $options));
 
-    $this->dispatcher->filter($event, $tests);
+        $this->dispatcher->filter($event, $tests);
 
-    return $event->getReturnValue();
-  }
+        return $event->getReturnValue();
+    }
 
-  /**
-   * Checks if a plugin exists.
-   *
-   * The plugin directory must exist and have at least one file or folder
-   * inside for that plugin to exist.
-   *
-   * @param   string  $plugin
-   *
-   * @return  boolean True if the plugin exist, false otherwise
-   */
-  protected function checkPluginExists($plugin)
-  {
-    try
+    /**
+     * Checks if a plugin exists.
+     *
+     * The plugin directory must exist and have at least one file or folder
+     * inside for that plugin to exist.
+     *
+     * @param string $plugin
+     *
+     * @return bool True if the plugin exist, false otherwise
+     */
+    protected function checkPluginExists($plugin)
     {
-      sfApplicationConfiguration::getActive()->getPluginConfiguration($plugin);
+        try {
+            sfApplicationConfiguration::getActive()->getPluginConfiguration($plugin);
 
-      return true;
-    }
-    catch (Exception $e)
-    {
-      return false;
+            return true;
+        } catch (Exception $e) {
+            return false;
+        }
     }
-  }
 }
diff --git a/lib/task/test/sfTestCoverageTask.class.php b/lib/task/test/sfTestCoverageTask.class.php
index 28d2a313b..e885d097d 100644
--- a/lib/task/test/sfTestCoverageTask.class.php
+++ b/lib/task/test/sfTestCoverageTask.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -11,32 +11,31 @@
 /**
  * Outputs test code coverage.
  *
- * @package    symfony
- * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfTestCoverageTask extends sfBaseTask
 {
-  /**
-   * @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->addOptions(array(
-      new sfCommandOption('detailed', null, sfCommandOption::PARAMETER_NONE, 'Output detailed information'),
-    ));
-
-    $this->namespace = 'test';
-    $this->name = 'coverage';
-    $this->briefDescription = 'Outputs test code coverage';
-
-    $this->detailedDescription = <<<EOF
+    /**
+     * @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->addOptions(array(
+            new sfCommandOption('detailed', null, sfCommandOption::PARAMETER_NONE, 'Output detailed information'),
+        ));
+
+        $this->namespace = 'test';
+        $this->name = 'coverage';
+        $this->briefDescription = 'Outputs test code coverage';
+
+        $this->detailedDescription = <<<'EOF'
 The [test:coverage|INFO] task outputs the code coverage
 given a test file or test directory
 and a lib file or lib directory for which you want code
@@ -48,62 +47,60 @@ protected function configure()
 
   [./symfony test:coverage --detailed test/unit/model lib/model|INFO]
 EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    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']);
-
-    $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']);
-    $coverage->output($coveredFiles);
-  }
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
+    {
+        require_once sfConfig::get('sf_symfony_lib_dir').'/vendor/lime/lime.php';
 
-  protected function getTestHarness($harnessOptions = array())
-  {
-    require_once __DIR__.'/sfLimeHarness.class.php';
+        $coverage = $this->getCoverage($this->getTestHarness(array('force_colors' => isset($options['color']) && $options['color'])), $options['detailed']);
 
-    $harness = new sfLimeHarness($harnessOptions);
-    $harness->addPlugins(array_map(array($this->configuration, 'getPluginConfiguration'), $this->configuration->getPlugins()));
-    $harness->base_dir = sfConfig::get('sf_root_dir');
+        $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);
+        }
 
-    return $harness;
-  }
+        $coveredFiles = $this->getFiles(sfConfig::get('sf_root_dir').'/'.$arguments['lib_name']);
+        $coverage->output($coveredFiles);
+    }
 
-  protected function getCoverage(lime_harness $harness, $detailed = false)
-  {
-    $coverage = new lime_coverage($harness);
-    $coverage->verbose = $detailed;
-    $coverage->base_dir = sfConfig::get('sf_root_dir');
+    protected function getTestHarness($harnessOptions = array())
+    {
+        require_once __DIR__.'/sfLimeHarness.class.php';
 
-    return $coverage;
-  }
+        $harness = new sfLimeHarness($harnessOptions);
+        $harness->addPlugins(array_map(array($this->configuration, 'getPluginConfiguration'), $this->configuration->getPlugins()));
+        $harness->base_dir = sfConfig::get('sf_root_dir');
 
-  protected function getFiles($directory)
-  {
-    if (is_dir($directory))
-    {
-      return sfFinder::type('file')->name('*.php')->in($directory);
+        return $harness;
     }
-    else if (file_exists($directory))
+
+    protected function getCoverage(lime_harness $harness, $detailed = false)
     {
-      return array($directory);
+        $coverage = new lime_coverage($harness);
+        $coverage->verbose = $detailed;
+        $coverage->base_dir = sfConfig::get('sf_root_dir');
+
+        return $coverage;
     }
-    else
+
+    protected function getFiles($directory)
     {
-      throw new sfCommandException(sprintf('File or directory "%s" does not exist.', $directory));
+        if (is_dir($directory)) {
+            return sfFinder::type('file')->name('*.php')->in($directory);
+        }
+        if (file_exists($directory)) {
+            return array($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 1f0b12b03..f8493d025 100644
--- a/lib/task/test/sfTestFunctionalTask.class.php
+++ b/lib/task/test/sfTestFunctionalTask.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -11,32 +11,31 @@
 /**
  * Launches functional tests.
  *
- * @package    symfony
- * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfTestFunctionalTask extends sfTestBaseTask
 {
-  /**
-   * @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->addOptions(array(
-      new sfCommandOption('xml', null, sfCommandOption::PARAMETER_REQUIRED, 'The file name for the JUnit compatible XML log file'),
-    ));
-
-    $this->namespace = 'test';
-    $this->name = 'functional';
-    $this->briefDescription = 'Launches functional tests';
-
-    $this->detailedDescription = <<<EOF
+    /**
+     * @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->addOptions(array(
+            new sfCommandOption('xml', null, sfCommandOption::PARAMETER_REQUIRED, 'The file name for the JUnit compatible XML log file'),
+        ));
+
+        $this->namespace = 'test';
+        $this->name = 'functional';
+        $this->briefDescription = 'Launches functional tests';
+
+        $this->detailedDescription = <<<'EOF'
 The [test:functional|INFO] task launches functional tests for a
 given application:
 
@@ -63,60 +62,54 @@ protected function configure()
 
   [./symfony test:functional --xml=log.xml|INFO]
 EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $app = $arguments['application'];
+    }
 
-    if (count($arguments['controller']))
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
     {
-      $files = array();
-
-      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)));
-      }
-
-      if($allFiles = $this->filterTestFiles($files, $arguments, $options))
-      {
-        foreach ($allFiles as $file)
-        {
-          include($file);
+        $app = $arguments['application'];
+
+        if (count($arguments['controller'])) {
+            $files = array();
+
+            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)));
+            }
+
+            if ($allFiles = $this->filterTestFiles($files, $arguments, $options)) {
+                foreach ($allFiles as $file) {
+                    include $file;
+                }
+            } else {
+                $this->logSection('functional', 'no controller found', null, 'ERROR');
+            }
+        } else {
+            require_once __DIR__.'/sfLimeHarness.class.php';
+
+            $h = new sfLimeHarness(array(
+                '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;
+
+            // filter and register functional tests
+            $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;
+
+            if ($options['xml']) {
+                file_put_contents($options['xml'], $h->to_xml());
+            }
+
+            return $ret;
         }
-      }
-      else
-      {
-        $this->logSection('functional', 'no controller found', null, 'ERROR');
-      }
-    }
-    else
-    {
-      require_once __DIR__.'/sfLimeHarness.class.php';
-
-      $h = new sfLimeHarness(array(
-        '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;
-
-      // filter and register functional tests
-      $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;
-
-      if ($options['xml'])
-      {
-        file_put_contents($options['xml'], $h->to_xml());
-      }
-
-      return $ret;
     }
-  }
 }
diff --git a/lib/task/test/sfTestPluginTask.class.php b/lib/task/test/sfTestPluginTask.class.php
index 6cdc6cf84..ce04c2925 100644
--- a/lib/task/test/sfTestPluginTask.class.php
+++ b/lib/task/test/sfTestPluginTask.class.php
@@ -11,32 +11,31 @@
 /**
  * Launches a plugin test suite.
  *
- * @package     symfony
- * @subpackage  task
  * @author      Kris Wallsmith <kris.wallsmith@symfony-project.com>
+ *
  * @version     SVN: $Id$
  */
 class sfTestPluginTask extends sfTestBaseTask
 {
-  /**
-   * @see sfTask
-   */
-  protected function configure()
-  {
-    $this->addArguments(array(
-      new sfCommandArgument('plugin', sfCommandArgument::REQUIRED, 'The plugin name'),
-    ));
+    /**
+     * @see sfTask
+     */
+    protected function configure()
+    {
+        $this->addArguments(array(
+            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(array(
+            new sfCommandOption('only', null, sfCommandOption::PARAMETER_REQUIRED, 'Only run "unit" or "functional" tests'),
+        ));
 
-    $this->namespace = 'test';
-    $this->name = 'plugin';
+        $this->namespace = 'test';
+        $this->name = 'plugin';
 
-    $this->briefDescription = 'Launches a plugin test suite';
+        $this->briefDescription = 'Launches a plugin test suite';
 
-    $this->detailedDescription = <<<EOF
+        $this->detailedDescription = <<<'EOF'
 The [test:plugin|INFO] task launches a plugin's test suite:
 
   [./symfony test:plugin sfExamplePlugin|INFO]
@@ -45,31 +44,32 @@ protected function configure()
 
   [./symfony test:plugin sfExamplePlugin --only=unit|INFO]
 EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    if (false === $this->checkPluginExists($arguments['plugin']))
-    {
-      throw new sfCommandException(sprintf('The plugin "%s" does not exists', $arguments['plugin']));
     }
 
-    if ($options['only'] && !in_array($options['only'], array('unit', 'functional')))
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
     {
-      throw new sfCommandException(sprintf('The --only option must be either "unit" or "functional" ("%s" given)', $options['only']));
-    }
+        if (false === $this->checkPluginExists($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']));
+        }
 
-    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');
-    $h->register($finder->in($h->base_dir));
+        $finder = sfFinder::type('file')->follow_link()->name('*Test.php');
+        $h->register($finder->in($h->base_dir));
 
-    $h->run();
-  }
+        $h->run();
+    }
 }
diff --git a/lib/task/test/sfTestUnitTask.class.php b/lib/task/test/sfTestUnitTask.class.php
index 811d71a01..1c7cd7d2c 100644
--- a/lib/task/test/sfTestUnitTask.class.php
+++ b/lib/task/test/sfTestUnitTask.class.php
@@ -11,31 +11,30 @@
 /**
  * Launches unit tests.
  *
- * @package    symfony
- * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfTestUnitTask extends sfTestBaseTask
 {
-  /**
-   * @see sfTask
-   */
-  protected function configure()
-  {
-    $this->addArguments(array(
-      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->namespace = 'test';
-    $this->name = 'unit';
-    $this->briefDescription = 'Launches unit tests';
-
-    $this->detailedDescription = <<<EOF
+    /**
+     * @see sfTask
+     */
+    protected function configure()
+    {
+        $this->addArguments(array(
+            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->namespace = 'test';
+        $this->name = 'unit';
+        $this->briefDescription = 'Launches unit tests';
+
+        $this->detailedDescription = <<<'EOF'
 The [test:unit|INFO] task launches unit tests:
 
   [./symfony test:unit|INFO]
@@ -60,59 +59,53 @@ protected function configure()
 
   [./symfony test:unit --xml=log.xml|INFO]
 EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    if (count($arguments['name']))
-    {
-      $files = array();
-
-      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)));
-      }
-
-      if($allFiles = $this->filterTestFiles($files, $arguments, $options))
-      {
-        foreach ($allFiles as $file)
-        {
-          include($file);
-        }
-      }
-      else
-      {
-        $this->logSection('test', 'no tests found', null, 'ERROR');
-      }
     }
-    else
-    {
-      require_once __DIR__.'/sfLimeHarness.class.php';
-
-      $h = new sfLimeHarness(array(
-        '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';
-
-      // filter and register unit tests
-      $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;
 
-      if ($options['xml'])
-      {
-        file_put_contents($options['xml'], $h->to_xml());
-      }
-
-      return $ret;
+    /**
+     * @see sfTask
+     *
+     * @param mixed $arguments
+     * @param mixed $options
+     */
+    protected function execute($arguments = array(), $options = array())
+    {
+        if (count($arguments['name'])) {
+            $files = array();
+
+            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)));
+            }
+
+            if ($allFiles = $this->filterTestFiles($files, $arguments, $options)) {
+                foreach ($allFiles as $file) {
+                    include $file;
+                }
+            } else {
+                $this->logSection('test', 'no tests found', null, 'ERROR');
+            }
+        } else {
+            require_once __DIR__.'/sfLimeHarness.class.php';
+
+            $h = new sfLimeHarness(array(
+                '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';
+
+            // filter and register unit tests
+            $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;
+
+            if ($options['xml']) {
+                file_put_contents($options['xml'], $h->to_xml());
+            }
+
+            return $ret;
+        }
     }
-  }
 }
diff --git a/lib/test/sfTestBrowser.class.php b/lib/test/sfTestBrowser.class.php
index a63fb430f..4ef73b4b0 100644
--- a/lib/test/sfTestBrowser.class.php
+++ b/lib/test/sfTestBrowser.class.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once(__DIR__.'/../vendor/lime/lime.php');
+require_once __DIR__.'/../vendor/lime/lime.php';
 
 /*
  * This file is part of the symfony package.
@@ -16,41 +16,34 @@
  * sfTestFunctional is backward compatible class for symfony 1.0, and 1.1.
  * For new code, you can use the sfTestFunctional class directly.
  *
- * @package    symfony
- * @subpackage test
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfTestBrowser extends sfTestFunctional
 {
-  /**
-   * Initializes the browser tester instance.
-   *
-   * @param string $hostname  Hostname to browse
-   * @param string $remote    Remote address to spook
-   * @param array  $options   Options for sfBrowser
-   */
-  public function __construct($hostname = null, $remote = null, $options = array())
-  {
-    if (is_object($hostname))
-    {
-      // new signature
-      parent::__construct($hostname, $remote);
-    }
-    else
+    /**
+     * Initializes the browser tester instance.
+     *
+     * @param string $hostname Hostname to browse
+     * @param string $remote   Remote address to spook
+     * @param array  $options  Options for sfBrowser
+     */
+    public function __construct($hostname = null, $remote = null, $options = array())
     {
-      $browser = new sfBrowser($hostname, $remote, $options);
+        if (is_object($hostname)) {
+            // new signature
+            parent::__construct($hostname, $remote);
+        } else {
+            $browser = new sfBrowser($hostname, $remote, $options);
 
-      if (null === self::$test)
-      {
-        $lime = new lime_test(null, isset($options['output']) ? $options['output'] : null);
-      }
-      else
-      {
-        $lime = null;
-      }
+            if (null === self::$test) {
+                $lime = new lime_test(null, isset($options['output']) ? $options['output'] : null);
+            } else {
+                $lime = null;
+            }
 
-      parent::__construct($browser, $lime);
+            parent::__construct($browser, $lime);
+        }
     }
-  }
 }
diff --git a/lib/test/sfTestFunctional.class.php b/lib/test/sfTestFunctional.class.php
index 9699e7d7f..3be0a9f10 100644
--- a/lib/test/sfTestFunctional.class.php
+++ b/lib/test/sfTestFunctional.class.php
@@ -11,57 +11,60 @@
 /**
  * sfTestFunctional tests an application by using a browser simulator.
  *
- * @package    symfony
- * @subpackage test
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfTestFunctional extends sfTestFunctionalBase
 {
-  /**
-   * Initializes the browser tester 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())
-  {
-    $testers = array_merge(array(
-      'view_cache' => 'sfTesterViewCache',
-      'form'       => 'sfTesterForm',
-    ), $testers);
-
-    parent::__construct($browser, $lime, $testers);
-  }
+    /**
+     * Initializes the browser tester instance.
+     *
+     * @param sfBrowserBase $browser A sfBrowserBase instance
+     * @param lime_test     $lime    A lime instance
+     * @param mixed         $testers
+     */
+    public function __construct(sfBrowserBase $browser, lime_test $lime = null, $testers = array())
+    {
+        $testers = array_merge(array(
+            'view_cache' => 'sfTesterViewCache',
+            'form' => 'sfTesterForm',
+        ), $testers);
 
-  /**
-   * Checks that the request is forwarded to a given module/action.
-   *
-   * @param  string $moduleName  The module name
-   * @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
-   */
-  public function isForwardedTo($moduleName, $actionName, $position = 'last')
-  {
-    $actionStack = $this->browser->getContext()->getActionStack();
+        parent::__construct($browser, $lime, $testers);
+    }
 
-    switch ($position)
+    /**
+     * Checks that the request is forwarded to a given module/action.
+     *
+     * @param string $moduleName The module name
+     * @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
+     */
+    public function isForwardedTo($moduleName, $actionName, $position = 'last')
     {
-      case 'first':
-        $entry = $actionStack->getFirstEntry();
-        break;
-      case 'last':
-        $entry = $actionStack->getLastEntry();
-        break;
-      default:
-        $entry = $actionStack->getEntry($position);
-    }
+        $actionStack = $this->browser->getContext()->getActionStack();
+
+        switch ($position) {
+            case 'first':
+                $entry = $actionStack->getFirstEntry();
 
-    $this->test()->is($entry->getModuleName(), $moduleName, sprintf('request is forwarded to the "%s" module (%s)', $moduleName, $position));
-    $this->test()->is($entry->getActionName(), $actionName, sprintf('request is forwarded to the "%s" action (%s)', $actionName, $position));
+                break;
 
-    return $this;
-  }
+            case 'last':
+                $entry = $actionStack->getLastEntry();
+
+                break;
+
+            default:
+                $entry = $actionStack->getEntry($position);
+        }
+
+        $this->test()->is($entry->getModuleName(), $moduleName, sprintf('request is forwarded to the "%s" module (%s)', $moduleName, $position));
+        $this->test()->is($entry->getActionName(), $actionName, sprintf('request is forwarded to the "%s" action (%s)', $actionName, $position));
+
+        return $this;
+    }
 }
diff --git a/lib/test/sfTestFunctionalBase.class.php b/lib/test/sfTestFunctionalBase.class.php
index fc83df3b5..e846e7eba 100644
--- a/lib/test/sfTestFunctionalBase.class.php
+++ b/lib/test/sfTestFunctionalBase.class.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once(__DIR__.'/../vendor/lime/lime.php');
+require_once __DIR__.'/../vendor/lime/lime.php';
 
 /*
  * This file is part of the symfony package.
@@ -13,501 +13,475 @@
 /**
  * sfTestFunctional tests an application by using a browser simulator.
  *
- * @package    symfony
- * @subpackage test
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfTestFunctionalBase
 {
-  protected
-    $testers       = array(),
-    $blockTester   = null,
-    $currentTester = null,
-    $browser       = null;
-
-  protected static
-    $test = null;
-
-  /**
-   * Initializes the browser tester 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())
-  {
-    $this->browser = $browser;
-
-    if (null === self::$test)
+    protected $testers = array();
+    protected $blockTester;
+    protected $currentTester;
+    protected $browser;
+
+    protected static $test;
+
+    /**
+     * Initializes the browser tester instance.
+     *
+     * @param sfBrowserBase $browser A sfBrowserBase instance
+     * @param lime_test     $lime    A lime instance
+     * @param mixed         $testers
+     */
+    public function __construct(sfBrowserBase $browser, lime_test $lime = null, $testers = array())
     {
-      self::$test = null !== $lime ? $lime : new lime_test();
+        $this->browser = $browser;
+
+        if (null === self::$test) {
+            self::$test = null !== $lime ? $lime : new lime_test();
+        }
+
+        $this->setTesters(array_merge(array(
+            'request' => 'sfTesterRequest',
+            'response' => 'sfTesterResponse',
+            'user' => 'sfTesterUser',
+            'mailer' => 'sfTesterMailer',
+        ), $testers));
+
+        // register our shutdown function
+        register_shutdown_function(array($this, 'shutdown'));
+
+        // register our error/exception handlers
+        set_error_handler(array($this, 'handlePhpError'));
+        set_exception_handler(array($this, 'handleException'));
     }
 
-    $this->setTesters(array_merge(array(
-      'request'  => 'sfTesterRequest',
-      'response' => 'sfTesterResponse',
-      'user'     => 'sfTesterUser',
-      'mailer'   => 'sfTesterMailer',
-    ), $testers));
-
-    // register our shutdown function
-    register_shutdown_function(array($this, 'shutdown'));
-
-    // register our error/exception handlers
-    set_error_handler(array($this, 'handlePhpError'));
-    set_exception_handler(array($this, 'handleException'));
-  }
-
-  /**
-   * Returns the tester associated with the given name.
-   *
-   * @param string   $name The tester name
-   *
-   * @param sfTester A sfTester instance
-   */
-  public function with($name)
-  {
-    if (!isset($this->testers[$name]))
+    public function __call($method, $arguments)
     {
-      throw new InvalidArgumentException(sprintf('The "%s" tester does not exist.', $name));
+        $retval = call_user_func_array(array($this->browser, $method), $arguments);
+
+        // fix the fluent interface
+        return $retval === $this->browser ? $this : $retval;
     }
 
-    if ($this->blockTester)
+    /**
+     * Returns the tester associated with the given name.
+     *
+     * @param string $name The tester name
+     * @param sfTester A sfTester instance
+     */
+    public function with($name)
     {
-      throw new LogicException(sprintf('You cannot nest tester blocks.'));
+        if (!isset($this->testers[$name])) {
+            throw new InvalidArgumentException(sprintf('The "%s" tester does not exist.', $name));
+        }
+
+        if ($this->blockTester) {
+            throw new LogicException(sprintf('You cannot nest tester blocks.'));
+        }
+
+        $this->currentTester = $this->testers[$name];
+        $this->currentTester->initialize();
+
+        return $this->currentTester;
     }
 
-    $this->currentTester = $this->testers[$name];
-    $this->currentTester->initialize();
+    /**
+     * Begins a block of test for the current tester.
+     *
+     * @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.'));
+        }
 
-    return $this->currentTester;
-  }
+        return $this->blockTester = $this->currentTester;
+    }
 
-  /**
-   * Begins a block of test for the current tester.
-   *
-   * @return sfTester The current sfTester instance
-   */
-  public function begin()
-  {
-    if (!$this->currentTester)
+    /**
+     * End a block of test for the current tester.
+     *
+     * @return sfTestFunctionalBase
+     */
+    public function end()
     {
-      throw new LogicException(sprintf('You must call with() before beginning a tester block.'));
+        if (null === $this->blockTester) {
+            throw new LogicException(sprintf('There is no current tester block to end.'));
+        }
+
+        $this->blockTester = null;
+
+        return $this;
     }
 
-    return $this->blockTester = $this->currentTester;
-  }
-
-  /**
-   * End a block of test for the current tester.
-   *
-   * @return sfTestFunctionalBase
-   */
-  public function end()
-  {
-    if (null === $this->blockTester)
+    /**
+     * Sets the testers.
+     *
+     * @param array $testers An array of named testers
+     */
+    public function setTesters($testers)
     {
-      throw new LogicException(sprintf('There is no current tester block to end.'));
+        foreach ($testers as $name => $tester) {
+            $this->setTester($name, $tester);
+        }
     }
 
-    $this->blockTester = null;
+    /**
+     * Sets a tester.
+     *
+     * @param string          $name   The tester name
+     * @param sfTester|string $tester A sfTester instance or a tester class name
+     */
+    public function setTester($name, $tester)
+    {
+        if (is_string($tester)) {
+            $tester = new $tester($this, self::$test);
+        }
 
-    return $this;
-  }
+        if (!$tester instanceof sfTester) {
+            throw new InvalidArgumentException(sprintf('The tester "%s" is not of class sfTester.', $name));
+        }
+
+        $this->testers[$name] = $tester;
+    }
 
-  /**
-   * Sets the testers.
-   *
-   * @param array $testers An array of named testers
-   */
-  public function setTesters($testers)
-  {
-    foreach ($testers as $name => $tester)
+    /**
+     * Shutdown function.
+     */
+    public function shutdown()
     {
-      $this->setTester($name, $tester);
+        $this->checkCurrentExceptionIsEmpty();
     }
-  }
-
-  /**
-   * Sets a tester.
-   *
-   * @param string          $name   The tester name
-   * @param sfTester|string $tester A sfTester instance or a tester class name
-   */
-  public function setTester($name, $tester)
-  {
-    if (is_string($tester))
+
+    /**
+     * Retrieves the lime_test instance.
+     *
+     * @return lime_test The lime_test instance
+     */
+    public function test()
     {
-      $tester = new $tester($this, self::$test);
+        return self::$test;
     }
 
-    if (!$tester instanceof sfTester)
+    /**
+     * Gets a uri.
+     *
+     * @param string $uri         The URI to fetch
+     * @param array  $parameters  The Request parameters
+     * @param bool   $changeStack Change the browser history stack?
+     *
+     * @return sfTestFunctionalBase
+     */
+    public function get($uri, $parameters = array(), $changeStack = true)
     {
-      throw new InvalidArgumentException(sprintf('The tester "%s" is not of class sfTester.', $name));
+        return $this->call($uri, 'get', $parameters, $changeStack);
     }
 
-    $this->testers[$name] = $tester;
-  }
-
-  /**
-   * Shutdown function.
-   *
-   * @return void
-   */
-  public function shutdown()
-  {
-    $this->checkCurrentExceptionIsEmpty();
-  }
-
-  /**
-   * Retrieves the lime_test instance.
-   *
-   * @return lime_test The lime_test instance
-   */
-  public function test()
-  {
-    return self::$test;
-  }
-
-  /**
-   * Gets a uri.
-   *
-   * @param string $uri         The URI to fetch
-   * @param array  $parameters  The Request parameters
-   * @param bool   $changeStack  Change the browser history stack?
-   *
-   * @return sfTestFunctionalBase
-   */
-  public function get($uri, $parameters = array(), $changeStack = true)
-  {
-    return $this->call($uri, 'get', $parameters, $changeStack);
-  }
-
-  /**
-   * Retrieves and checks an action.
-   *
-   * @param  string $module  Module name
-   * @param  string $action  Action name
-   * @param  string $url     Url
-   * @param  string $code    The expected return status code
-   *
-   * @return sfTestFunctionalBase The current sfTestFunctionalBase instance
-   */
-  public function getAndCheck($module, $action, $url = null, $code = 200)
-  {
-    return $this->
-      get(null !== $url ? $url : sprintf('/%s/%s', $module, $action))->
-      with('request')->begin()->
-        isParameter('module', $module)->
-        isParameter('action', $action)->
-      end()->
-      with('response')->isStatusCode($code)
-    ;
-  }
-
-  /**
-   * Posts a uri.
-   *
-   * @param string $uri         The URI to fetch
-   * @param array  $parameters  The Request parameters
-   * @param bool   $changeStack  Change the browser history stack?
-   *
-   * @return sfTestFunctionalBase
-   */
-  public function post($uri, $parameters = array(), $changeStack = true)
-  {
-    return $this->call($uri, 'post', $parameters, $changeStack);
-  }
-
-  /**
-   * Calls a request.
-   *
-   * @param  string $uri          URI to be invoked
-   * @param  string $method       HTTP method used
-   * @param  array  $parameters   Additional parameters
-   * @param  bool   $changeStack  If set to false ActionStack is not changed
-   *
-   * @return sfTestFunctionalBase The current sfTestFunctionalBase instance
-   */
-  public function call($uri, $method = 'get', $parameters = array(), $changeStack = true)
-  {
-    $this->checkCurrentExceptionIsEmpty();
-
-    $uri = $this->browser->fixUri($uri);
-
-    $this->test()->comment(sprintf('%s %s', strtolower($method), $uri));
-
-    foreach ($this->testers as $tester)
+    /**
+     * Retrieves and checks an action.
+     *
+     * @param string $module Module name
+     * @param string $action Action name
+     * @param string $url    Url
+     * @param string $code   The expected return status code
+     *
+     * @return sfTestFunctionalBase The current sfTestFunctionalBase instance
+     */
+    public function getAndCheck($module, $action, $url = null, $code = 200)
     {
-      $tester->prepare();
+        return $this->
+          get(null !== $url ? $url : sprintf('/%s/%s', $module, $action))->
+          with('request')->begin()->
+            isParameter('module', $module)->
+            isParameter('action', $action)->
+          end()->
+          with('response')->isStatusCode($code)
+        ;
     }
 
-    $this->browser->call($uri, $method, $parameters, $changeStack);
-
-    return $this;
-  }
-
-  /**
-   * Simulates deselecting a checkbox or radiobutton.
-   *
-   * @param string  $name       The checkbox or radiobutton id, name or text
-   *
-   * @return sfTestFunctionalBase
-   */
-  public function deselect($name)
-  {
-    $this->browser->doSelect($name, false);
-
-    return $this;
-  }
-
-  /**
-   * Simulates selecting a checkbox or radiobutton.
-   *
-   * @param string  $name       The checkbox or radiobutton id, name or text
-   *
-   * @return sfTestFunctionalBase
-   */
-  public function select($name)
-  {
-    $this->browser->doSelect($name, true);
-
-    return $this;
-  }
-
-  /**
-   * Simulates a click on a link or button.
-   *
-   * @param string  $name       The link or button text
-   * @param array   $arguments  The arguments to pass to the link
-   * @param array   $options    An array of options
-   *
-   * @return sfTestFunctionalBase
-   */
-  public function click($name, $arguments = array(), $options = array())
-  {
-    if ($name instanceof DOMElement)
+    /**
+     * Posts a uri.
+     *
+     * @param string $uri         The URI to fetch
+     * @param array  $parameters  The Request parameters
+     * @param bool   $changeStack Change the browser history stack?
+     *
+     * @return sfTestFunctionalBase
+     */
+    public function post($uri, $parameters = array(), $changeStack = true)
     {
-      list($uri, $method, $parameters) = $this->doClickElement($name, $arguments, $options);
+        return $this->call($uri, 'post', $parameters, $changeStack);
     }
-    else
+
+    /**
+     * Calls a request.
+     *
+     * @param string $uri         URI to be invoked
+     * @param string $method      HTTP method used
+     * @param array  $parameters  Additional parameters
+     * @param bool   $changeStack If set to false ActionStack is not changed
+     *
+     * @return sfTestFunctionalBase The current sfTestFunctionalBase instance
+     */
+    public function call($uri, $method = 'get', $parameters = array(), $changeStack = true)
     {
-      try
-      {
-        list($uri, $method, $parameters) = $this->doClick($name, $arguments, $options);
-      }
-      catch (InvalidArgumentException $e)
-      {
-        list($uri, $method, $parameters) = $this->doClickCssSelector($name, $arguments, $options);
-      }
+        $this->checkCurrentExceptionIsEmpty();
+
+        $uri = $this->browser->fixUri($uri);
+
+        $this->test()->comment(sprintf('%s %s', strtolower($method), $uri));
+
+        foreach ($this->testers as $tester) {
+            $tester->prepare();
+        }
+
+        $this->browser->call($uri, $method, $parameters, $changeStack);
+
+        return $this;
     }
 
-    return $this->call($uri, $method, $parameters);
-  }
-
-  /**
-   * Simulates the browser back button.
-   *
-   * @return sfTestFunctionalBase The current sfTestFunctionalBase instance
-   */
-  public function back()
-  {
-    $this->test()->comment('back');
-
-    $this->browser->back();
-
-    return $this;
-  }
-
-  /**
-   * Simulates the browser forward button.
-   *
-   * @return sfTestFunctionalBase The current sfTestFunctionalBase instance
-   */
-  public function forward()
-  {
-    $this->test()->comment('forward');
-
-    $this->browser->forward();
-
-    return $this;
-  }
-
-  /**
-   * Outputs an information message.
-   *
-   * @param string $message A message
-   *
-   * @return sfTestFunctionalBase The current sfTestFunctionalBase instance
-   */
-  public function info($message)
-  {
-    $this->test()->info($message);
-
-    return $this;
-  }
-
-  /**
-   * Checks that the current response contains a given text.
-   *
-   * @param  string $uri   Uniform resource identifier
-   * @param  string $text  Text in the response
-   *
-   * @return sfTestFunctionalBase The current sfTestFunctionalBase instance
-   */
-  public function check($uri, $text = null)
-  {
-    $this->get($uri)->with('response')->isStatusCode();
-
-    if ($text !== null)
+    /**
+     * Simulates deselecting a checkbox or radiobutton.
+     *
+     * @param string $name The checkbox or radiobutton id, name or text
+     *
+     * @return sfTestFunctionalBase
+     */
+    public function deselect($name)
     {
-      $this->with('response')->contains($text);
+        $this->browser->doSelect($name, false);
+
+        return $this;
     }
 
-    return $this;
-  }
-
-  /**
-   * Tests if an exception is thrown by the latest request.
-   *
-   * @param  string $class    Class name
-   * @param  string $message  Message name
-   *
-   * @return sfTestFunctionalBase The current sfTestFunctionalBase instance
-   */
-  public function throwsException($class = null, $message = null)
-  {
-    $e = $this->browser->getCurrentException();
-
-    if (null === $e)
+    /**
+     * Simulates selecting a checkbox or radiobutton.
+     *
+     * @param string $name The checkbox or radiobutton id, name or text
+     *
+     * @return sfTestFunctionalBase
+     */
+    public function select($name)
     {
-      $this->test()->fail('response returns an exception');
+        $this->browser->doSelect($name, true);
+
+        return $this;
     }
-    else
+
+    /**
+     * Simulates a click on a link or button.
+     *
+     * @param string $name      The link or button text
+     * @param array  $arguments The arguments to pass to the link
+     * @param array  $options   An array of options
+     *
+     * @return sfTestFunctionalBase
+     */
+    public function click($name, $arguments = array(), $options = array())
     {
-      if (null !== $class)
-      {
-        $this->test()->ok($e instanceof $class, sprintf('response returns an exception of class "%s"', $class));
-      }
-
-      if (null !== $message && preg_match('/^(!)?([^a-zA-Z0-9\\\\]).+?\\2[ims]?$/', $message, $match))
-      {
-        if ($match[1] == '!')
-        {
-          $this->test()->unlike($e->getMessage(), substr($message, 1), sprintf('response exception message does not match regex "%s"', $message));
+        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) {
+                list($uri, $method, $parameters) = $this->doClickCssSelector($name, $arguments, $options);
+            }
         }
-        else
-        {
-          $this->test()->like($e->getMessage(), $message, sprintf('response exception message matches regex "%s"', $message));
-        }
-      }
-      else if (null !== $message)
-      {
-        $this->test()->is($e->getMessage(), $message, sprintf('response exception message is "%s"', $message));
-      }
+
+        return $this->call($uri, $method, $parameters);
     }
 
-    $this->resetCurrentException();
+    /**
+     * Simulates the browser back button.
+     *
+     * @return sfTestFunctionalBase The current sfTestFunctionalBase instance
+     */
+    public function back()
+    {
+        $this->test()->comment('back');
+
+        $this->browser->back();
+
+        return $this;
+    }
+
+    /**
+     * Simulates the browser forward button.
+     *
+     * @return sfTestFunctionalBase The current sfTestFunctionalBase instance
+     */
+    public function forward()
+    {
+        $this->test()->comment('forward');
+
+        $this->browser->forward();
+
+        return $this;
+    }
 
-    return $this;
-  }
+    /**
+     * Outputs an information message.
+     *
+     * @param string $message A message
+     *
+     * @return sfTestFunctionalBase The current sfTestFunctionalBase instance
+     */
+    public function info($message)
+    {
+        $this->test()->info($message);
+
+        return $this;
+    }
 
-  /**
-   * Triggers a test failure if an uncaught exception is present.
-   *
-   * @return  bool
-   */
-  public function checkCurrentExceptionIsEmpty()
-  {
-    if (false === ($empty = $this->browser->checkCurrentExceptionIsEmpty()))
+    /**
+     * Checks that the current response contains a given text.
+     *
+     * @param string $uri  Uniform resource identifier
+     * @param string $text Text in the response
+     *
+     * @return sfTestFunctionalBase The current sfTestFunctionalBase instance
+     */
+    public function check($uri, $text = null)
     {
-      $this->test()->fail(sprintf('last request threw an uncaught exception "%s: %s"', get_class($this->browser->getCurrentException()), $this->browser->getCurrentException()->getMessage()));
+        $this->get($uri)->with('response')->isStatusCode();
+
+        if (null !== $text) {
+            $this->with('response')->contains($text);
+        }
+
+        return $this;
     }
 
-    return $empty;
-  }
-
-  public function __call($method, $arguments)
-  {
-    $retval = call_user_func_array(array($this->browser, $method), $arguments);
-
-    // fix the fluent interface
-    return $retval === $this->browser ? $this : $retval;
-  }
-
-  /**
-   * Error handler for the current test browser instance.
-   *
-   * @param mixed  $errno    Error number
-   * @param string $errstr   Error message
-   * @param string $errfile  Error file
-   * @param mixed  $errline  Error line
-   */
-  static public function handlePhpError($errno, $errstr, $errfile, $errline)
-  {
-    if (($errno & error_reporting()) == 0)
+    /**
+     * Tests if an exception is thrown by the latest request.
+     *
+     * @param string $class   Class name
+     * @param string $message Message name
+     *
+     * @return sfTestFunctionalBase The current sfTestFunctionalBase instance
+     */
+    public function throwsException($class = null, $message = null)
     {
-      return false;
+        $e = $this->browser->getCurrentException();
+
+        if (null === $e) {
+            $this->test()->fail('response returns an exception');
+        } else {
+            if (null !== $class) {
+                $this->test()->ok($e instanceof $class, sprintf('response returns an exception of class "%s"', $class));
+            }
+
+            if (null !== $message && preg_match('/^(!)?([^a-zA-Z0-9\\\\]).+?\\2[ims]?$/', $message, $match)) {
+                if ('!' == $match[1]) {
+                    $this->test()->unlike($e->getMessage(), substr($message, 1), sprintf('response exception message does not match regex "%s"', $message));
+                } else {
+                    $this->test()->like($e->getMessage(), $message, sprintf('response exception message matches regex "%s"', $message));
+                }
+            } elseif (null !== $message) {
+                $this->test()->is($e->getMessage(), $message, sprintf('response exception message is "%s"', $message));
+            }
+        }
+
+        $this->resetCurrentException();
+
+        return $this;
     }
 
-    $msg = sprintf('PHP sent a "%%s" error at %s line %s (%s)', $errfile, $errline, $errstr);
-    switch ($errno)
+    /**
+     * Triggers a test failure if an uncaught exception is present.
+     *
+     * @return bool
+     */
+    public function checkCurrentExceptionIsEmpty()
     {
-      case E_WARNING:
-        $msg = sprintf($msg, 'warning');
-        throw new RuntimeException($msg);
-        break;
-      case E_NOTICE:
-        $msg = sprintf($msg, 'notice');
-        throw new RuntimeException($msg);
-        break;
-      case E_STRICT:
-        $msg = sprintf($msg, 'strict');
-        throw new RuntimeException($msg);
-        break;
-      case E_RECOVERABLE_ERROR:
-        $msg = sprintf($msg, 'catchable');
-        throw new RuntimeException($msg);
-        break;
+        if (false === ($empty = $this->browser->checkCurrentExceptionIsEmpty())) {
+            $this->test()->fail(sprintf('last request threw an uncaught exception "%s: %s"', get_class($this->browser->getCurrentException()), $this->browser->getCurrentException()->getMessage()));
+        }
+
+        return $empty;
     }
 
-    return false;
-  }
-
-  /**
-   * Exception handler for the current test browser instance.
-   *
-   * @param Throwable|Exception $exception The exception
-   */
-  function handleException($exception)
-  {
-    $this->test()->error(sprintf('%s: %s', get_class($exception), $exception->getMessage()));
-
-    $traceData = $exception->getTrace();
-    array_unshift($traceData, array(
-      'function' => '',
-      'file'     => $exception->getFile() != null ? $exception->getFile() : 'n/a',
-      'line'     => $exception->getLine() != null ? $exception->getLine() : 'n/a',
-      'args'     => array(),
-    ));
-
-    $traces = array();
-    $lineFormat = '  at %s%s%s() in %s line %s';
-    for ($i = 0, $count = count($traceData); $i < $count; $i++)
+    /**
+     * Error handler for the current test browser instance.
+     *
+     * @param mixed  $errno   Error number
+     * @param string $errstr  Error message
+     * @param string $errfile Error file
+     * @param mixed  $errline Error line
+     */
+    public static function handlePhpError($errno, $errstr, $errfile, $errline)
     {
-      $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();
-      $this->test()->error(sprintf($lineFormat,
-        (isset($traceData[$i]['class']) ? $traceData[$i]['class'] : ''),
-        (isset($traceData[$i]['type']) ? $traceData[$i]['type'] : ''),
-        $traceData[$i]['function'],
-        $file,
-        $line
-      ));
+        if (($errno & error_reporting()) == 0) {
+            return false;
+        }
+
+        $msg = sprintf('PHP sent a "%%s" error at %s line %s (%s)', $errfile, $errline, $errstr);
+
+        switch ($errno) {
+            case E_WARNING:
+                $msg = sprintf($msg, 'warning');
+
+                throw new RuntimeException($msg);
+                break;
+
+            case E_NOTICE:
+                $msg = sprintf($msg, 'notice');
+
+                throw new RuntimeException($msg);
+                break;
+
+            case E_STRICT:
+                $msg = sprintf($msg, 'strict');
+
+                throw new RuntimeException($msg);
+                break;
+
+            case E_RECOVERABLE_ERROR:
+                $msg = sprintf($msg, 'catchable');
+
+                throw new RuntimeException($msg);
+                break;
+        }
+
+        return false;
     }
 
-    $this->test()->fail('An uncaught exception has been thrown.');
-  }
+    /**
+     * Exception handler for the current test browser instance.
+     *
+     * @param Exception|Throwable $exception The exception
+     */
+    public function handleException($exception)
+    {
+        $this->test()->error(sprintf('%s: %s', get_class($exception), $exception->getMessage()));
+
+        $traceData = $exception->getTrace();
+        array_unshift($traceData, array(
+            'function' => '',
+            'file' => null != $exception->getFile() ? $exception->getFile() : 'n/a',
+            'line' => null != $exception->getLine() ? $exception->getLine() : 'n/a',
+            'args' => array(),
+        ));
+
+        $traces = array();
+        $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();
+            $this->test()->error(sprintf(
+                $lineFormat,
+                isset($traceData[$i]['class']) ? $traceData[$i]['class'] : '',
+                isset($traceData[$i]['type']) ? $traceData[$i]['type'] : '',
+                $traceData[$i]['function'],
+                $file,
+                $line
+            ));
+        }
+
+        $this->test()->fail('An uncaught exception has been thrown.');
+    }
 }
diff --git a/lib/test/sfTester.class.php b/lib/test/sfTester.class.php
index a915eb77c..1be904270 100644
--- a/lib/test/sfTester.class.php
+++ b/lib/test/sfTester.class.php
@@ -11,78 +11,76 @@
 /**
  * sfTester is the base class for all tester classes.
  *
- * @package    symfony
- * @subpackage test
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfTester
 {
-  protected
-    $inABlock = false,
-    $browser  = null,
-    $tester   = null;
+    protected $inABlock = false;
+    protected $browser;
+    protected $tester;
 
-  /**
-   * Constructor.
-   *
-   * @param sfTestFunctionalBase $browser A browser
-   * @param lime_test            $tester  A tester object
-   */
-  public function __construct(sfTestFunctionalBase $browser, $tester)
-  {
-    $this->browser = $browser;
-    $this->tester  = $tester;
-  }
+    /**
+     * Constructor.
+     *
+     * @param sfTestFunctionalBase $browser A browser
+     * @param lime_test            $tester  A tester object
+     */
+    public function __construct(sfTestFunctionalBase $browser, $tester)
+    {
+        $this->browser = $browser;
+        $this->tester = $tester;
+    }
 
-  /**
-   * Prepares the tester.
-   */
-  abstract public function prepare();
+    public function __call($method, $arguments)
+    {
+        call_user_func_array(array($this->browser, $method), $arguments);
 
-  /**
-   * Initializes the tester.
-   */
-  abstract public function initialize();
+        return $this->getObjectToReturn();
+    }
 
-  /**
-   * Begins a block.
-   *
-   * @return sfTester This sfTester instance
-   */
-  public function begin()
-  {
-    $this->inABlock = true;
+    /**
+     * Prepares the tester.
+     */
+    abstract public function prepare();
 
-    return $this->browser->begin();
-  }
+    /**
+     * Initializes the tester.
+     */
+    abstract public function initialize();
 
-  /**
-   * Ends a block.
-   *
-   * @param sfTestFunctionalBase
-   */
-  public function end()
-  {
-    $this->inABlock = false;
+    /**
+     * Begins a block.
+     *
+     * @return sfTester This sfTester instance
+     */
+    public function begin()
+    {
+        $this->inABlock = true;
 
-    return $this->browser->end();
-  }
+        return $this->browser->begin();
+    }
 
-  /**
-   * Returns the object that each test method must return.
-   *
-   * @return sfTestFunctionalBase|sfTester
-   */
-  public function getObjectToReturn()
-  {
-    return $this->inABlock ? $this : $this->browser;
-  }
+    /**
+     * Ends a block.
+     *
+     * @param sfTestFunctionalBase
+     */
+    public function end()
+    {
+        $this->inABlock = false;
 
-  public function __call($method, $arguments)
-  {
-    call_user_func_array(array($this->browser, $method), $arguments);
+        return $this->browser->end();
+    }
 
-    return $this->getObjectToReturn();
-  }
+    /**
+     * Returns the object that each test method must return.
+     *
+     * @return sfTester|sfTestFunctionalBase
+     */
+    public function getObjectToReturn()
+    {
+        return $this->inABlock ? $this : $this->browser;
+    }
 }
diff --git a/lib/test/sfTesterForm.class.php b/lib/test/sfTesterForm.class.php
index e1e29371c..af02b0b5d 100644
--- a/lib/test/sfTesterForm.class.php
+++ b/lib/test/sfTesterForm.class.php
@@ -11,260 +11,218 @@
 /**
  * sfTesterForm implements tests for forms submitted by the user.
  *
- * @package    symfony
- * @subpackage test
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfTesterForm extends sfTester
 {
-  protected
-    $form = null;
-
-  /**
-   * Constructor.
-   *
-   * @param sfTestFunctionalBase $browser A browser
-   * @param lime_test            $tester  A tester object
-   */
-  public function __construct(sfTestFunctionalBase $browser, $tester)
-  {
-    parent::__construct($browser, $tester);
-
-    $this->browser->addListener('template.filter_parameters', array($this, 'filterTemplateParameters'));
-  }
+    protected $form;
 
-  /**
-   * Prepares the tester.
-   */
-  public function prepare()
-  {
-    $this->form = null;
-  }
-
-  /**
-   * Initiliazes the tester.
-   */
-  public function initialize()
-  {
-    if (null === $this->form)
+    /**
+     * Constructor.
+     *
+     * @param sfTestFunctionalBase $browser A browser
+     * @param lime_test            $tester  A tester object
+     */
+    public function __construct(sfTestFunctionalBase $browser, $tester)
     {
-      $action = $this->browser->getContext()->getActionStack()->getLastEntry()->getActionInstance();
+        parent::__construct($browser, $tester);
 
-      foreach ($action->getVarHolder()->getAll() as $name => $value)
-      {
-        if ($value instanceof sfForm && $value->isBound())
-        {
-          $this->form = $value;
-          break;
-        }
-      }
+        $this->browser->addListener('template.filter_parameters', array($this, 'filterTemplateParameters'));
     }
-  }
-
-  /**
-   * Returns the current form.
-   *
-   * @return sfForm The current sfForm form instance
-   */
-  public function getForm()
-  {
-    return $this->form;
-  }
 
-  /**
-   * Tests if the submitted form has some error.
-   *
-   * @param  Boolean|integer $value Whether to check if the form has error or not, or the number of errors
-   *
-   * @return sfTestFunctionalBase|sfTester
-   */
-  public function hasErrors($value = true)
-  {
-    if (null === $this->form)
+    /**
+     * Prepares the tester.
+     */
+    public function prepare()
     {
-      throw new LogicException('no form has been submitted.');
+        $this->form = null;
     }
 
-    if (is_int($value))
+    /**
+     * Initiliazes the tester.
+     */
+    public function initialize()
     {
-      $this->tester->is(count($this->form->getErrorSchema()), $value, sprintf('the submitted form has "%s" errors.', $value));
+        if (null === $this->form) {
+            $action = $this->browser->getContext()->getActionStack()->getLastEntry()->getActionInstance();
+
+            foreach ($action->getVarHolder()->getAll() as $name => $value) {
+                if ($value instanceof sfForm && $value->isBound()) {
+                    $this->form = $value;
+
+                    break;
+                }
+            }
+        }
     }
-    else
+
+    /**
+     * Returns the current form.
+     *
+     * @return sfForm The current sfForm form instance
+     */
+    public function getForm()
     {
-      $this->tester->is($this->form->hasErrors(), $value, sprintf('the submitted form %s.', ($value) ? 'has some errors' : 'is valid'));
+        return $this->form;
     }
 
-    if ((false === $value || is_int($value) && $value != count($this->form->getErrorSchema()))
-      && $this->form->hasErrors())
+    /**
+     * Tests if the submitted form has some error.
+     *
+     * @param bool|int $value Whether to check if the form has error or not, or the number of errors
+     *
+     * @return sfTester|sfTestFunctionalBase
+     */
+    public function hasErrors($value = true)
     {
-      $this->tester->diag(sprintf('%s Errors:', get_class($this->form)));
-      foreach ($this->form->getErrorSchema()->getErrors() as $key => $error)
-      {
-        $this->tester->diag(sprintf('  - %s: %s', $key, $error));
-      }
-    }
+        if (null === $this->form) {
+            throw new LogicException('no form has been submitted.');
+        }
 
-    return $this->getObjectToReturn();
-  }
+        if (is_int($value)) {
+            $this->tester->is(count($this->form->getErrorSchema()), $value, sprintf('the submitted form has "%s" errors.', $value));
+        } else {
+            $this->tester->is($this->form->hasErrors(), $value, sprintf('the submitted form %s.', ($value) ? 'has some errors' : 'is valid'));
+        }
 
-  /**
-   * Tests if the submitted form has a specific error.
-   *
-   * @param mixed $value The error message or the number of errors for the field (optional)
-   *
-   * @return sfTestFunctionalBase|sfTester
-   */
-  public function hasGlobalError($value = true)
-  {
-    return $this->isError(null, $value);
-  }
+        if ((false === $value || is_int($value) && $value != count($this->form->getErrorSchema()))
+          && $this->form->hasErrors()) {
+            $this->tester->diag(sprintf('%s Errors:', get_class($this->form)));
+            foreach ($this->form->getErrorSchema()->getErrors() as $key => $error) {
+                $this->tester->diag(sprintf('  - %s: %s', $key, $error));
+            }
+        }
 
-  /**
-   * Tests if the submitted form has a specific error.
-   *
-   * @param string $field The field name to check for an error (null for global errors)
-   * @param mixed  $value The error message or the number of errors for the field (optional)
-   *
-   * @return sfTestFunctionalBase|sfTester
-   */
-  public function isError($field, $value = true)
-  {
-    if (null === $this->form)
-    {
-      throw new LogicException('no form has been submitted.');
+        return $this->getObjectToReturn();
     }
 
-    if (null === $field)
-    {
-      $error = new sfValidatorErrorSchema(new sfValidatorPass());
-      foreach ($this->form->getGlobalErrors() as $globalError)
-      {
-        $error->addError($globalError);
-      }
-    }
-    else
+    /**
+     * Tests if the submitted form has a specific error.
+     *
+     * @param mixed $value The error message or the number of errors for the field (optional)
+     *
+     * @return sfTester|sfTestFunctionalBase
+     */
+    public function hasGlobalError($value = true)
     {
-      $error = $this->getFormField($field)->getError();
+        return $this->isError(null, $value);
     }
 
-    if (false === $value)
-    {
-      $this->tester->ok(!$error || 0 == count($error), sprintf('the submitted form has no "%s" error.', $field));
-    }
-    else if (true === $value)
-    {
-      $this->tester->ok($error && count($error) > 0, sprintf('the submitted form has a "%s" error.', $field));
-    }
-    else if (is_int($value))
+    /**
+     * Tests if the submitted form has a specific error.
+     *
+     * @param string $field The field name to check for an error (null for global errors)
+     * @param mixed  $value The error message or the number of errors for the field (optional)
+     *
+     * @return sfTester|sfTestFunctionalBase
+     */
+    public function isError($field, $value = true)
     {
-      $this->tester->ok($error && count($error) == $value, sprintf('the submitted form has %s "%s" error(s).', $value, $field));
-    }
-    else if (preg_match('/^(!)?([^a-zA-Z0-9\\\\]).+?\\2[ims]?$/', $value, $match))
-    {
-      if (!$error)
-      {
-        $this->tester->fail(sprintf('the submitted form has a "%s" error.', $field));
-      }
-      else
-      {
-        if ($match[1] == '!')
-        {
-          $this->tester->unlike($error->getCode(), substr($value, 1), sprintf('the submitted form has a "%s" error that does not match "%s".', $field, $value));
+        if (null === $this->form) {
+            throw new LogicException('no form has been submitted.');
         }
-        else
-        {
-          $this->tester->like($error->getCode(), $value, sprintf('the submitted form has a "%s" error that matches "%s".', $field, $value));
+
+        if (null === $field) {
+            $error = new sfValidatorErrorSchema(new sfValidatorPass());
+            foreach ($this->form->getGlobalErrors() as $globalError) {
+                $error->addError($globalError);
+            }
+        } else {
+            $error = $this->getFormField($field)->getError();
         }
-      }
-    }
-    else
-    {
-      if (!$error)
-      {
-        $this->tester->fail(sprintf('the submitted form has a "%s" error (%s).', $field, $value));
-      }
-      else
-      {
-        $this->tester->is($error->getCode(), $value, sprintf('the submitted form has a "%s" error (%s).', $field, $value));
-      }
-    }
 
-    return $this->getObjectToReturn();
-  }
+        if (false === $value) {
+            $this->tester->ok(!$error || 0 == count($error), sprintf('the submitted form has no "%s" error.', $field));
+        } elseif (true === $value) {
+            $this->tester->ok($error && count($error) > 0, sprintf('the submitted form has a "%s" error.', $field));
+        } elseif (is_int($value)) {
+            $this->tester->ok($error && count($error) == $value, sprintf('the submitted form has %s "%s" error(s).', $value, $field));
+        } elseif (preg_match('/^(!)?([^a-zA-Z0-9\\\\]).+?\\2[ims]?$/', $value, $match)) {
+            if (!$error) {
+                $this->tester->fail(sprintf('the submitted form has a "%s" error.', $field));
+            } else {
+                if ('!' == $match[1]) {
+                    $this->tester->unlike($error->getCode(), substr($value, 1), sprintf('the submitted form has a "%s" error that does not match "%s".', $field, $value));
+                } else {
+                    $this->tester->like($error->getCode(), $value, sprintf('the submitted form has a "%s" error that matches "%s".', $field, $value));
+                }
+            }
+        } else {
+            if (!$error) {
+                $this->tester->fail(sprintf('the submitted form has a "%s" error (%s).', $field, $value));
+            } else {
+                $this->tester->is($error->getCode(), $value, sprintf('the submitted form has a "%s" error (%s).', $field, $value));
+            }
+        }
 
-  /**
-   * Outputs some debug information about the current submitted form.
-   */
-  public function debug()
-  {
-    if (null === $this->form)
-    {
-      throw new LogicException('no form has been submitted.');
+        return $this->getObjectToReturn();
     }
 
-    print $this->tester->error('Form debug');
+    /**
+     * Outputs some debug information about the current submitted form.
+     */
+    public function debug()
+    {
+        if (null === $this->form) {
+            throw new LogicException('no form has been submitted.');
+        }
 
-    print sprintf("Submitted values: %s\n", str_replace("\n", '', var_export($this->form->getTaintedValues(), true)));
-    print sprintf("Errors: %s\n", $this->form->getErrorSchema());
+        echo $this->tester->error('Form debug');
 
-    exit(1);
-  }
+        echo sprintf("Submitted values: %s\n", str_replace("\n", '', var_export($this->form->getTaintedValues(), true)));
+        echo sprintf("Errors: %s\n", $this->form->getErrorSchema());
 
-  /**
-   * 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
-   *
-   * @return array The array of parameters passed to the template
-   */
-  public function filterTemplateParameters(sfEvent $event, $parameters)
-  {
-    if (!isset($parameters['sf_type']))
-    {
-      return $parameters;
+        exit(1);
     }
 
-    if ('action' == $parameters['sf_type'])
+    /**
+     * 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
+     *
+     * @return array The array of parameters passed to the template
+     */
+    public function filterTemplateParameters(sfEvent $event, $parameters)
     {
-      foreach ($parameters as $key => $value)
-      {
-        if ($value instanceof sfForm && $value->isBound())
-        {
-          $this->form = $value;
-          break;
+        if (!isset($parameters['sf_type'])) {
+            return $parameters;
         }
-      }
-    }
 
-    return $parameters;
-  }
+        if ('action' == $parameters['sf_type']) {
+            foreach ($parameters as $key => $value) {
+                if ($value instanceof sfForm && $value->isBound()) {
+                    $this->form = $value;
 
-  /**
-   * @param string $path
-   * @return sfFormField
-   */
+                    break;
+                }
+            }
+        }
 
-  public function getFormField($path)
-  {
-    if (false !== $pos = strpos($path, '['))
-    {
-      $field = $this->form[substr($path, 0, $pos)];
-    }
-    else
-    {
-      return $this->form[$path];
+        return $parameters;
     }
 
-    if (preg_match_all('/\[(?P<part>[^]]+)\]/', $path, $matches))
+    /**
+     * @param string $path
+     *
+     * @return sfFormField
+     */
+    public function getFormField($path)
     {
-      foreach($matches['part'] as $part)
-      {
-        $field = $field[$part];
-      }
-    }
+        if (false !== $pos = strpos($path, '[')) {
+            $field = $this->form[substr($path, 0, $pos)];
+        } else {
+            return $this->form[$path];
+        }
 
-    return $field;
-  }
+        if (preg_match_all('/\[(?P<part>[^]]+)\]/', $path, $matches)) {
+            foreach ($matches['part'] as $part) {
+                $field = $field[$part];
+            }
+        }
+
+        return $field;
+    }
 }
diff --git a/lib/test/sfTesterMailer.class.php b/lib/test/sfTesterMailer.class.php
index c00e47fd3..acdd755ff 100644
--- a/lib/test/sfTesterMailer.class.php
+++ b/lib/test/sfTesterMailer.class.php
@@ -11,265 +11,224 @@
 /**
  * sfTesterMailer implements tests for the symfony mailer object.
  *
- * @package    symfony
- * @subpackage test
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfTesterMailer extends sfTester
 {
-  protected
-    $logger  = null,
-    $message = null;
-
-  /**
-   * Prepares the tester.
-   */
-  public function prepare()
-  {
-  }
-
-  /**
-   * Initializes the tester.
-   */
-  public function initialize()
-  {
-    $this->logger = $this->browser->getContext()->getMailer()->getLogger();
+    protected $logger;
+    protected $message;
 
-    if ($this->logger->countMessages())
+    /**
+     * Prepares the tester.
+     */
+    public function prepare()
     {
-      $messages = $this->logger->getMessages();
-
-      $this->message = $messages[0];
     }
-  }
 
-  /**
-   * Tests if message was send and optional how many.
-   *
-   * @param int $nb number of messages
-   *
-   * @return sfTestFunctionalBase|sfTester
-   */
-  public function hasSent($nb = null)
-  {
-    if (null === $nb)
-    {
-      $this->tester->ok($this->logger->countMessages() > 0, 'mailer sent some email(s).');
-    }
-    else
+    /**
+     * Initializes the tester.
+     */
+    public function initialize()
     {
-      $this->tester->is($this->logger->countMessages(), $nb, sprintf('mailer sent %s email(s).', $nb));
-    }
+        $this->logger = $this->browser->getContext()->getMailer()->getLogger();
 
-    return $this->getObjectToReturn();
-  }
+        if ($this->logger->countMessages()) {
+            $messages = $this->logger->getMessages();
 
-  /**
-   * Outputs some debug information about mails sent during the current request.
-   */
-  public function debug()
-  {
-    foreach ($this->logger->getMessages() as $message)
-    {
-      echo $message->toString()."\n\n";
+            $this->message = $messages[0];
+        }
     }
 
-    exit(1);
-  }
-
-  /**
-   * Changes the context to use the email corresponding to the given criteria.
-   *
-   * @param string|array $to       the email or array(email => alias)
-   * @param int          $position address position
-   *
-   * @return sfTestFunctionalBase|sfTester
-   */
-  public function withMessage($to, $position = 1)
-  {
-    $messageEmail = $to;
-    if(is_array($to))
+    /**
+     * Tests if message was send and optional how many.
+     *
+     * @param int $nb number of messages
+     *
+     * @return sfTester|sfTestFunctionalBase
+     */
+    public function hasSent($nb = null)
     {
-      $alias        = current($to);
-      $to           = key($to);
-      $messageEmail = sprintf('%s <%s>', $alias, $to);
+        if (null === $nb) {
+            $this->tester->ok($this->logger->countMessages() > 0, 'mailer sent some email(s).');
+        } else {
+            $this->tester->is($this->logger->countMessages(), $nb, sprintf('mailer sent %s email(s).', $nb));
+        }
+
+        return $this->getObjectToReturn();
     }
 
-    $matches = 0;
-    foreach ($this->logger->getMessages() as $message)
+    /**
+     * Outputs some debug information about mails sent during the current request.
+     */
+    public function debug()
     {
-      $email = $message->getTo();
-      if ($to == key($email))
-      {
-        $matches++;
+        foreach ($this->logger->getMessages() as $message) {
+            echo $message->toString()."\n\n";
+        }
 
-        if ($matches == $position)
-        {
-          $this->message = $message;
+        exit(1);
+    }
 
-          if(isset($alias) AND $alias != current($email))
-          {
-            break;
-          }
+    /**
+     * Changes the context to use the email corresponding to the given criteria.
+     *
+     * @param array|string $to       the email or array(email => alias)
+     * @param int          $position address position
+     *
+     * @return sfTester|sfTestFunctionalBase
+     */
+    public function withMessage($to, $position = 1)
+    {
+        $messageEmail = $to;
+        if (is_array($to)) {
+            $alias = current($to);
+            $to = key($to);
+            $messageEmail = sprintf('%s <%s>', $alias, $to);
+        }
 
-          $this->tester->pass(sprintf('switch context to the message number "%s" sent to "%s"', $position, $messageEmail));
+        $matches = 0;
+        foreach ($this->logger->getMessages() as $message) {
+            $email = $message->getTo();
+            if ($to == key($email)) {
+                ++$matches;
 
-          return $this;
-        }
-      }
-    }
+                if ($matches == $position) {
+                    $this->message = $message;
 
-    $this->tester->fail(sprintf('unable to find a message sent to "%s"', $messageEmail));
+                    if (isset($alias) and $alias != current($email)) {
+                        break;
+                    }
 
-    return $this;
-  }
+                    $this->tester->pass(sprintf('switch context to the message number "%s" sent to "%s"', $position, $messageEmail));
 
-  /**
-   * Tests for a mail message body.
-   *
-   * @param string $value regular expression or value
-   *
-   * @return sfTestFunctionalBase|sfTester
-   */
-  public function checkBody($value)
-  {
-    if (!$this->message)
-    {
-      $this->tester->fail('unable to test as no email were sent');
-    }
+                    return $this;
+                }
+            }
+        }
 
-    $body = $this->message->getBody();
-    $ok = false;
-    $regex = false;
-    $mustMatch = true;
-    if (preg_match('/^(!)?([^a-zA-Z0-9\\\\]).+?\\2[ims]?$/', $value, $match))
-    {
-      $regex = $value;
-      if ($match[1] == '!')
-      {
-        $mustMatch = false;
-        $regex = substr($value, 1);
-      }
+        $this->tester->fail(sprintf('unable to find a message sent to "%s"', $messageEmail));
+
+        return $this;
     }
 
-    if (false !== $regex)
+    /**
+     * Tests for a mail message body.
+     *
+     * @param string $value regular expression or value
+     *
+     * @return sfTester|sfTestFunctionalBase
+     */
+    public function checkBody($value)
     {
-      if ($mustMatch)
-      {
-        if (preg_match($regex, $body))
-        {
-          $ok = true;
-          $this->tester->pass(sprintf('email body matches "%s"', $value));
+        if (!$this->message) {
+            $this->tester->fail('unable to test as no email were sent');
         }
-      }
-      else
-      {
-        if (preg_match($regex, $body))
-        {
-          $ok = true;
-          $this->tester->fail(sprintf('email body does not match "%s"', $value));
+
+        $body = $this->message->getBody();
+        $ok = false;
+        $regex = false;
+        $mustMatch = true;
+        if (preg_match('/^(!)?([^a-zA-Z0-9\\\\]).+?\\2[ims]?$/', $value, $match)) {
+            $regex = $value;
+            if ('!' == $match[1]) {
+                $mustMatch = false;
+                $regex = substr($value, 1);
+            }
         }
-      }
-    }
-    else if ($body == $value)
-    {
-      $ok = true;
-      $this->tester->pass(sprintf('email body is "%s"', $value));
-    }
 
-    if (!$ok)
-    {
-      if (!$mustMatch)
-      {
-        $this->tester->pass(sprintf('email body matches "%s"', $value));
-      }
-      else
-      {
-        $this->tester->fail(sprintf('email body matches "%s"', $value));
-      }
-    }
+        if (false !== $regex) {
+            if ($mustMatch) {
+                if (preg_match($regex, $body)) {
+                    $ok = true;
+                    $this->tester->pass(sprintf('email body matches "%s"', $value));
+                }
+            } else {
+                if (preg_match($regex, $body)) {
+                    $ok = true;
+                    $this->tester->fail(sprintf('email body does not match "%s"', $value));
+                }
+            }
+        } elseif ($body == $value) {
+            $ok = true;
+            $this->tester->pass(sprintf('email body is "%s"', $value));
+        }
 
-    return $this->getObjectToReturn();
-  }
+        if (!$ok) {
+            if (!$mustMatch) {
+                $this->tester->pass(sprintf('email body matches "%s"', $value));
+            } else {
+                $this->tester->fail(sprintf('email body matches "%s"', $value));
+            }
+        }
 
-  /**
-   * Tests for a mail message header.
-   *
-   * @param string $key   entry to test
-   * @param string $value regular expression or value
-   *
-   * @return sfTestFunctionalBase|sfTester
-   */
-  public function checkHeader($key, $value)
-  {
-    if (!$this->message)
-    {
-      $this->tester->fail('unable to test as no email were sent');
+        return $this->getObjectToReturn();
     }
 
-    $headers = array();
-    foreach ($this->message->getHeaders()->getAll($key) as $header)
+    /**
+     * Tests for a mail message header.
+     *
+     * @param string $key   entry to test
+     * @param string $value regular expression or value
+     *
+     * @return sfTester|sfTestFunctionalBase
+     */
+    public function checkHeader($key, $value)
     {
-      $headers[] = $header->getFieldBody();
-    }
-    $current = implode(', ', $headers);
-    $ok = false;
-    $regex = false;
-    $mustMatch = true;
-    if (preg_match('/^(!)?([^a-zA-Z0-9\\\\]).+?\\2[ims]?$/', $value, $match))
-    {
-      $regex = $value;
-      if ($match[1] == '!')
-      {
-        $mustMatch = false;
-        $regex = substr($value, 1);
-      }
-    }
+        if (!$this->message) {
+            $this->tester->fail('unable to test as no email were sent');
+        }
 
-    foreach ($headers as $header)
-    {
-      if (false !== $regex)
-      {
-        if ($mustMatch)
-        {
-          if (preg_match($regex, $header))
-          {
-            $ok = true;
-            $this->tester->pass(sprintf('email header "%s" matches "%s" (%s)', $key, $value, $current));
-            break;
-          }
+        $headers = array();
+        foreach ($this->message->getHeaders()->getAll($key) as $header) {
+            $headers[] = $header->getFieldBody();
         }
-        else
-        {
-          if (preg_match($regex, $header))
-          {
-            $ok = true;
-            $this->tester->fail(sprintf('email header "%s" does not match "%s" (%s)', $key, $value, $current));
-            break;
-          }
+        $current = implode(', ', $headers);
+        $ok = false;
+        $regex = false;
+        $mustMatch = true;
+        if (preg_match('/^(!)?([^a-zA-Z0-9\\\\]).+?\\2[ims]?$/', $value, $match)) {
+            $regex = $value;
+            if ('!' == $match[1]) {
+                $mustMatch = false;
+                $regex = substr($value, 1);
+            }
         }
-      }
-      else if ($header == $value)
-      {
-        $ok = true;
-        $this->tester->pass(sprintf('email header "%s" is "%s" (%s)', $key, $value, $current));
-        break;
-      }
-    }
 
-    if (!$ok)
-    {
-      if (!$mustMatch)
-      {
-        $this->tester->pass(sprintf('email header "%s" matches "%s" (%s)', $key, $value, $current));
-      }
-      else
-      {
-        $this->tester->fail(sprintf('email header "%s" matches "%s" (%s)', $key, $value, $current));
-      }
-    }
+        foreach ($headers as $header) {
+            if (false !== $regex) {
+                if ($mustMatch) {
+                    if (preg_match($regex, $header)) {
+                        $ok = true;
+                        $this->tester->pass(sprintf('email header "%s" matches "%s" (%s)', $key, $value, $current));
+
+                        break;
+                    }
+                } else {
+                    if (preg_match($regex, $header)) {
+                        $ok = true;
+                        $this->tester->fail(sprintf('email header "%s" does not match "%s" (%s)', $key, $value, $current));
+
+                        break;
+                    }
+                }
+            } elseif ($header == $value) {
+                $ok = true;
+                $this->tester->pass(sprintf('email header "%s" is "%s" (%s)', $key, $value, $current));
+
+                break;
+            }
+        }
 
-    return $this->getObjectToReturn();
-  }
+        if (!$ok) {
+            if (!$mustMatch) {
+                $this->tester->pass(sprintf('email header "%s" matches "%s" (%s)', $key, $value, $current));
+            } else {
+                $this->tester->fail(sprintf('email header "%s" matches "%s" (%s)', $key, $value, $current));
+            }
+        }
+
+        return $this->getObjectToReturn();
+    }
 }
diff --git a/lib/test/sfTesterRequest.class.php b/lib/test/sfTesterRequest.class.php
index ac52fe094..bd66957f8 100644
--- a/lib/test/sfTesterRequest.class.php
+++ b/lib/test/sfTesterRequest.class.php
@@ -11,142 +11,127 @@
 /**
  * sfTesterRequest implements tests for the symfony request object.
  *
- * @package    symfony
- * @subpackage test
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfTesterRequest extends sfTester
 {
-  protected $request;
-
-  /**
-   * Prepares the tester.
-   */
-  public function prepare()
-  {
-  }
-
-  /**
-   * Initializes the tester.
-   */
-  public function initialize()
-  {
-    $this->request = $this->browser->getRequest();
-  }
-
-  /**
-   * Tests whether or not a given key and value exists in the request.
-   *
-   * @param string $key
-   * @param string $value
-   *
-   * @return sfTestFunctionalBase|sfTester
-   */
-  public function isParameter($key, $value)
-  {
-    $this->tester->is($this->request->getParameter($key), $value, sprintf('request parameter "%s" is "%s"', $key, $value));
-
-    return $this->getObjectToReturn();
-  }
-
-  /**
-   * Tests for the request is in the given format.
-   *
-   * @param  string $format  The request format
-   *
-   * @return sfTestFunctionalBase|sfTester
-   */
-  public function isFormat($format)
-  {
-    $this->tester->is($this->request->getRequestFormat(), $format, sprintf('request format is "%s"', $format));
-
-    return $this->getObjectToReturn();
-  }
-
-  /**
-   * Tests if the current HTTP method matches the given one
-   *
-   * @param  string  $method  The HTTP method name
-   *
-   * @return sfTestFunctionalBase|sfTester
-   */
-  public function isMethod($method)
-  {
-    $this->tester->ok($this->request->isMethod($method), sprintf('request method is "%s"', strtoupper($method)));
-
-    return $this->getObjectToReturn();
-  }
-
-  /**
-   * Checks if a cookie exists.
-   *
-   * @param string  $name   The cookie name
-   * @param Boolean $exists Whether the cookie must exist or not
-   *
-   * @return sfTestFunctionalBase|sfTester
-   */
-  public function hasCookie($name, $exists = true)
-  {
-    if (!array_key_exists($name, $_COOKIE))
+    protected $request;
+
+    /**
+     * Prepares the tester.
+     */
+    public function prepare()
     {
-      if ($exists)
-      {
-        $this->tester->fail(sprintf('cookie "%s" exists.', $name));
-      }
-      else
-      {
-        $this->tester->pass(sprintf('cookie "%s" does not exist.', $name));
-      }
-
-      return $this->getObjectToReturn();
     }
 
-    if ($exists)
+    /**
+     * Initializes the tester.
+     */
+    public function initialize()
     {
-      $this->tester->pass(sprintf('cookie "%s" exists.', $name));
+        $this->request = $this->browser->getRequest();
     }
-    else
+
+    /**
+     * Tests whether or not a given key and value exists in the request.
+     *
+     * @param string $key
+     * @param string $value
+     *
+     * @return sfTester|sfTestFunctionalBase
+     */
+    public function isParameter($key, $value)
     {
-      $this->tester->fail(sprintf('cookie "%s" does not exist.', $name));
+        $this->tester->is($this->request->getParameter($key), $value, sprintf('request parameter "%s" is "%s"', $key, $value));
+
+        return $this->getObjectToReturn();
     }
 
-    return $this->getObjectToReturn();
-  }
-
-  /**
-   * Checks the value of a cookie.
-   *
-   * @param string $name   The cookie name
-   * @param mixed  $value  The expected value
-   *
-   * @return sfTestFunctionalBase|sfTester
-   */
-  public function isCookie($name, $value)
-  {
-    if (!array_key_exists($name, $_COOKIE))
+    /**
+     * Tests for the request is in the given format.
+     *
+     * @param string $format The request format
+     *
+     * @return sfTester|sfTestFunctionalBase
+     */
+    public function isFormat($format)
     {
-      $this->tester->fail(sprintf('cookie "%s" does not exist.', $name));
+        $this->tester->is($this->request->getRequestFormat(), $format, sprintf('request format is "%s"', $format));
 
-      return $this->getObjectToReturn();
+        return $this->getObjectToReturn();
     }
 
-    if (preg_match('/^(!)?([^a-zA-Z0-9\\\\]).+?\\2[ims]?$/', $value, $match))
+    /**
+     * Tests if the current HTTP method matches the given one.
+     *
+     * @param string $method The HTTP method name
+     *
+     * @return sfTester|sfTestFunctionalBase
+     */
+    public function isMethod($method)
     {
-      if ($match[1] == '!')
-      {
-        $this->tester->unlike($_COOKIE[$name], substr($value, 1), sprintf('cookie "%s" content does not match regex "%s"', $name, $value));
-      }
-      else
-      {
-        $this->tester->like($_COOKIE[$name], $value, sprintf('cookie "%s" content matches regex "%s"', $name, $value));
-      }
+        $this->tester->ok($this->request->isMethod($method), sprintf('request method is "%s"', strtoupper($method)));
+
+        return $this->getObjectToReturn();
     }
-    else
+
+    /**
+     * Checks if a cookie exists.
+     *
+     * @param string $name   The cookie name
+     * @param bool   $exists Whether the cookie must exist or not
+     *
+     * @return sfTester|sfTestFunctionalBase
+     */
+    public function hasCookie($name, $exists = true)
     {
-      $this->tester->is($_COOKIE[$name], $value, sprintf('cookie "%s" content is ok', $name));
+        if (!array_key_exists($name, $_COOKIE)) {
+            if ($exists) {
+                $this->tester->fail(sprintf('cookie "%s" exists.', $name));
+            } else {
+                $this->tester->pass(sprintf('cookie "%s" does not exist.', $name));
+            }
+
+            return $this->getObjectToReturn();
+        }
+
+        if ($exists) {
+            $this->tester->pass(sprintf('cookie "%s" exists.', $name));
+        } else {
+            $this->tester->fail(sprintf('cookie "%s" does not exist.', $name));
+        }
+
+        return $this->getObjectToReturn();
     }
 
-    return $this->getObjectToReturn();
-  }
+    /**
+     * Checks the value of a cookie.
+     *
+     * @param string $name  The cookie name
+     * @param mixed  $value The expected value
+     *
+     * @return sfTester|sfTestFunctionalBase
+     */
+    public function isCookie($name, $value)
+    {
+        if (!array_key_exists($name, $_COOKIE)) {
+            $this->tester->fail(sprintf('cookie "%s" does not exist.', $name));
+
+            return $this->getObjectToReturn();
+        }
+
+        if (preg_match('/^(!)?([^a-zA-Z0-9\\\\]).+?\\2[ims]?$/', $value, $match)) {
+            if ('!' == $match[1]) {
+                $this->tester->unlike($_COOKIE[$name], substr($value, 1), sprintf('cookie "%s" content does not match regex "%s"', $name, $value));
+            } else {
+                $this->tester->like($_COOKIE[$name], $value, sprintf('cookie "%s" content matches regex "%s"', $name, $value));
+            }
+        } else {
+            $this->tester->is($_COOKIE[$name], $value, sprintf('cookie "%s" content is ok', $name));
+        }
+
+        return $this->getObjectToReturn();
+    }
 }
diff --git a/lib/test/sfTesterResponse.class.php b/lib/test/sfTesterResponse.class.php
index 7409dfc2d..4b2080c56 100644
--- a/lib/test/sfTesterResponse.class.php
+++ b/lib/test/sfTesterResponse.class.php
@@ -11,482 +11,411 @@
 /**
  * sfTesterResponse implements tests for the symfony response object.
  *
- * @package    symfony
- * @subpackage test
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfTesterResponse extends sfTester
 {
-  protected
-    $response       = null,
-    $dom            = null,
-    $domCssSelector = null;
-
-  /**
-   * Prepares the tester.
-   */
-  public function prepare()
-  {
-  }
-
-  /**
-   * Initializes the tester.
-   */
-  public function initialize()
-  {
-    $this->response = $this->browser->getResponse();
-
-    $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->validateOnParse = true;
-      if ('x' == $matches[1])
-      {
-        @$this->dom->loadXML($this->response->getContent());
-      }
-      else
-      {
-        if ($content = $this->response->getContent())
-        {
-          @$this->dom->loadHTML($content);
-        }
-      }
-      $this->domCssSelector = new sfDomCssSelector($this->dom);
-    }
-  }
-
-  /**
-   * Tests that the response matches a given CSS selector.
-   *
-   * @param  string $selector  The response selector or a sfDomCssSelector object
-   * @param  mixed  $value     Flag for the selector
-   * @param  array  $options   Options for the current test
-   *
-   * @return sfTestFunctionalBase|sfTester
-   */
-  public function checkElement($selector, $value = true, $options = array())
-  {
-    if (null === $this->dom)
-    {
-      throw new LogicException('The DOM is not accessible because the browser response content type is not HTML.');
-    }
-
-    if (is_object($selector))
+    protected $response;
+    protected $dom;
+    protected $domCssSelector;
+
+    /**
+     * Prepares the tester.
+     */
+    public function prepare()
     {
-      $values = $selector->getValues();
-    }
-    else
-    {
-      $values = $this->domCssSelector->matchAll($selector)->getValues();
     }
 
-    if (false === $value)
+    /**
+     * Initializes the tester.
+     */
+    public function initialize()
     {
-      $this->tester->is(count($values), 0, sprintf('response selector "%s" does not exist', $selector));
-    }
-    else if (true === $value)
-    {
-      $this->tester->cmp_ok(count($values), '>', 0, sprintf('response selector "%s" exists', $selector));
-    }
-    else if (is_int($value))
-    {
-      $this->tester->is(count($values), $value, sprintf('response selector "%s" matches "%s" times', $selector, $value));
-    }
-    else if (preg_match('/^(!)?([^a-zA-Z0-9\\\\]).+?\\2[ims]?$/', $value, $match))
-    {
-      $position = isset($options['position']) ? $options['position'] : 0;
-      if ($match[1] == '!')
-      {
-        $this->tester->unlike(@$values[$position], substr($value, 1), sprintf('response selector "%s" does not match regex "%s"', $selector, substr($value, 1)));
-      }
-      else
-      {
-        $this->tester->like(@$values[$position], $value, sprintf('response selector "%s" matches regex "%s"', $selector, $value));
-      }
-    }
-    else
-    {
-      $position = isset($options['position']) ? $options['position'] : 0;
-      $this->tester->is(@$values[$position], $value, sprintf('response selector "%s" matches "%s"', $selector, $value));
+        $this->response = $this->browser->getResponse();
+
+        $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->validateOnParse = true;
+            if ('x' == $matches[1]) {
+                @$this->dom->loadXML($this->response->getContent());
+            } else {
+                if ($content = $this->response->getContent()) {
+                    @$this->dom->loadHTML($content);
+                }
+            }
+            $this->domCssSelector = new sfDomCssSelector($this->dom);
+        }
     }
 
-    if (isset($options['count']))
+    /**
+     * Tests that the response matches a given CSS selector.
+     *
+     * @param string $selector The response selector or a sfDomCssSelector object
+     * @param mixed  $value    Flag for the selector
+     * @param array  $options  Options for the current test
+     *
+     * @return sfTester|sfTestFunctionalBase
+     */
+    public function checkElement($selector, $value = true, $options = array())
     {
-      $this->tester->is(count($values), $options['count'], sprintf('response selector "%s" matches "%s" times', $selector, $options['count']));
-    }
+        if (null === $this->dom) {
+            throw new LogicException('The DOM is not accessible because the browser response content type is not HTML.');
+        }
 
-    return $this->getObjectToReturn();
-  }
-
-  /**
-   * Checks that a form is rendered correctly.
-   *
-   * @param  sfForm|string $form     A form object or the name of a form class
-   * @param  string        $selector CSS selector for the root form element for this form
-   *
-   * @return sfTestFunctionalBase|sfTester
-   */
-  public function checkForm($form, $selector = 'form')
-  {
-    if (!$form instanceof sfForm)
-    {
-      $form = new $form();
-    }
+        if (is_object($selector)) {
+            $values = $selector->getValues();
+        } else {
+            $values = $this->domCssSelector->matchAll($selector)->getValues();
+        }
 
-    $rendered = array();
-    foreach ($this->domCssSelector->matchAll(sprintf('%1$s input, %1$s textarea, %1$s select', $selector))->getNodes() as $element)
-    {
-      $rendered[] = $element->getAttribute('name');
-    }
+        if (false === $value) {
+            $this->tester->is(count($values), 0, sprintf('response selector "%s" does not exist', $selector));
+        } elseif (true === $value) {
+            $this->tester->cmp_ok(count($values), '>', 0, sprintf('response selector "%s" exists', $selector));
+        } elseif (is_int($value)) {
+            $this->tester->is(count($values), $value, sprintf('response selector "%s" matches "%s" times', $selector, $value));
+        } elseif (preg_match('/^(!)?([^a-zA-Z0-9\\\\]).+?\\2[ims]?$/', $value, $match)) {
+            $position = isset($options['position']) ? $options['position'] : 0;
+            if ('!' == $match[1]) {
+                $this->tester->unlike(@$values[$position], substr($value, 1), sprintf('response selector "%s" does not match regex "%s"', $selector, substr($value, 1)));
+            } else {
+                $this->tester->like(@$values[$position], $value, sprintf('response selector "%s" matches regex "%s"', $selector, $value));
+            }
+        } else {
+            $position = isset($options['position']) ? $options['position'] : 0;
+            $this->tester->is(@$values[$position], $value, sprintf('response selector "%s" matches "%s"', $selector, $value));
+        }
 
-    foreach ($form as $field => $widget)
-    {
-      $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 (false !== $pos = array_search($element->getAttribute('name'), $rendered))
-          {
-            unset($rendered[$pos]);
-          }
-
-          $this->tester->ok(false !== $pos, sprintf('response includes "%s" form "%s" field - "%s %s[name=%s]"', get_class($form), $field, $selector, $element->tagName, $element->getAttribute('name')));
+        if (isset($options['count'])) {
+            $this->tester->is(count($values), $options['count'], sprintf('response selector "%s" matches "%s" times', $selector, $options['count']));
         }
-      }
+
+        return $this->getObjectToReturn();
     }
 
-    return $this->getObjectToReturn();
-  }
-
-  /**
-   * Validates the response.
-   *
-   * @param mixed $checkDTD Either true to validate against the response DTD or
-   *                        provide the path to a *.xsd, *.rng or *.rnc schema
-   *
-   * @return sfTestFunctionalBase|sfTester
-   *
-   * @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()))
+    /**
+     * Checks that a form is rendered correctly.
+     *
+     * @param sfForm|string $form     A form object or the name of a form class
+     * @param string        $selector CSS selector for the root form element for this form
+     *
+     * @return sfTester|sfTestFunctionalBase
+     */
+    public function checkForm($form, $selector = 'form')
     {
-      $revert = libxml_use_internal_errors(true);
-
-      $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';
-        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
-          // file://c:\symfony\cache\xml.dtd or file://c:/symfony/cache/xml.dtd
-          // The first one simply doesnt work, the second one is treated as remote call.
-          // However the following works. Unfortunatly this means we can only access the current disk
-          // file:///symfony/cache/xml.dtd
-          // Note that all work for file_get_contents so the bug is most likely in DOMDocument.
-          $local = 'file://'.substr(str_replace(DIRECTORY_SEPARATOR, '/', $cache), 2);
+        if (!$form instanceof sfForm) {
+            $form = new $form();
         }
-        else
-        {
-          $local = 'file://'.$cache;
+
+        $rendered = array();
+        foreach ($this->domCssSelector->matchAll(sprintf('%1$s input, %1$s textarea, %1$s select', $selector))->getNodes() as $element) {
+            $rendered[] = $element->getAttribute('name');
         }
 
-        if (!file_exists($cache.'/TR/xhtml11/DTD/xhtml11.dtd'))
-        {
-          $filesystem = new sfFilesystem();
+        foreach ($form as $field => $widget) {
+            $dom = new DOMDocument('1.0', sfConfig::get('sf_charset'));
+            $dom->loadHTML((string) $widget);
 
-          $finder = sfFinder::type('any')->discard('.sf');
-          $filesystem->mirror(__DIR__.'/w3', $cache, $finder);
+            foreach ($dom->getElementsByTagName('*') as $element) {
+                if (in_array($element->tagName, array('input', 'select', 'textarea'))) {
+                    if (false !== $pos = array_search($element->getAttribute('name'), $rendered)) {
+                        unset($rendered[$pos]);
+                    }
 
-          $finder = sfFinder::type('file');
-          $filesystem->replaceTokens($finder->in($cache), '##', '##', array('LOCAL_W3' => $local));
+                    $this->tester->ok(false !== $pos, sprintf('response includes "%s" form "%s" field - "%s %s[name=%s]"', get_class($form), $field, $selector, $element->tagName, $element->getAttribute('name')));
+                }
+            }
         }
 
-        $content = preg_replace('#(<!DOCTYPE[^>]+")http://www.w3.org(.*")#i', '\\1'.$local.'\\2', $content);
-        $dom->validateOnParse = $checkDTD;
-      }
-
-      $dom->loadXML($content);
-
-      switch (pathinfo($checkDTD, PATHINFO_EXTENSION))
-      {
-        case 'xsd':
-          $dom->schemaValidate($checkDTD);
-          $message = sprintf('response validates per XSD schema "%s"', basename($checkDTD));
-          break;
-        case 'rng':
-        case 'rnc':
-          $dom->relaxNGValidate($checkDTD);
-          $message = sprintf('response validates per relaxNG schema "%s"', basename($checkDTD));
-          break;
-        default:
-          $message = $dom->validateOnParse ? sprintf('response validates as "%s"', $dom->doctype->name) : 'response is well-formed "xml"';
-      }
-
-      if (count($errors = libxml_get_errors()))
-      {
-        $lines = explode(PHP_EOL, $this->response->getContent());
-
-        $this->tester->fail($message);
-        foreach ($errors as $error)
-        {
-          $this->tester->diag('    '.trim($error->message));
-          if (preg_match('/line (\d+)/', $error->message, $match) && $error->line != $match[1])
-          {
-            $this->tester->diag('      '.str_pad($match[1].':', 6).trim($lines[$match[1] - 1]));
-          }
-          $this->tester->diag('      '.str_pad($error->line.':', 6).trim($lines[$error->line - 1]));
-        }
-      }
-      else
-      {
-        $this->tester->pass($message);
-      }
-
-      libxml_use_internal_errors($revert);
-    }
-    else
-    {
-      throw new LogicException(sprintf('Unable to validate responses of content type "%s"', $this->response->getContentType()));
+        return $this->getObjectToReturn();
     }
 
-    return $this->getObjectToReturn();
-  }
-
-  /**
-   * Tests for a response header.
-   *
-   * @param  string $key
-   * @param  string $value
-   *
-   * @return sfTestFunctionalBase|sfTester
-   */
-  public function isHeader($key, $value)
-  {
-    $headers = explode(', ', $this->response->getHttpHeader($key));
-    $ok = false;
-    $regex = false;
-    $mustMatch = true;
-    if (preg_match('/^(!)?([^a-zA-Z0-9\\\\]).+?\\2[ims]?$/', $value, $match))
+    /**
+     * Validates the response.
+     *
+     * @param mixed $checkDTD Either true to validate against the response DTD or
+     *                        provide the path to a *.xsd, *.rng or *.rnc schema
+     *
+     * @return sfTester|sfTestFunctionalBase
+     *
+     * @throws LogicException If the response is neither XML nor (X)HTML
+     */
+    public function isValid($checkDTD = false)
     {
-      $regex = $value;
-      if ($match[1] == '!')
-      {
-        $mustMatch = false;
-        $regex = substr($value, 1);
-      }
+        if (preg_match('/(x|ht)ml/i', $this->response->getContentType())) {
+            $revert = libxml_use_internal_errors(true);
+
+            $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';
+                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
+                    // file://c:\symfony\cache\xml.dtd or file://c:/symfony/cache/xml.dtd
+                    // The first one simply doesnt work, the second one is treated as remote call.
+                    // However the following works. Unfortunatly this means we can only access the current disk
+                    // file:///symfony/cache/xml.dtd
+                    // Note that all work for file_get_contents so the bug is most likely in DOMDocument.
+                    $local = 'file://'.substr(str_replace(DIRECTORY_SEPARATOR, '/', $cache), 2);
+                } else {
+                    $local = 'file://'.$cache;
+                }
+
+                if (!file_exists($cache.'/TR/xhtml11/DTD/xhtml11.dtd')) {
+                    $filesystem = new sfFilesystem();
+
+                    $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));
+                }
+
+                $content = preg_replace('#(<!DOCTYPE[^>]+")http://www.w3.org(.*")#i', '\\1'.$local.'\\2', $content);
+                $dom->validateOnParse = $checkDTD;
+            }
+
+            $dom->loadXML($content);
+
+            switch (pathinfo($checkDTD, PATHINFO_EXTENSION)) {
+                case 'xsd':
+                    $dom->schemaValidate($checkDTD);
+                    $message = sprintf('response validates per XSD schema "%s"', basename($checkDTD));
+
+                    break;
+
+                case 'rng':
+                case 'rnc':
+                    $dom->relaxNGValidate($checkDTD);
+                    $message = sprintf('response validates per relaxNG schema "%s"', basename($checkDTD));
+
+                    break;
+
+                default:
+                    $message = $dom->validateOnParse ? sprintf('response validates as "%s"', $dom->doctype->name) : 'response is well-formed "xml"';
+            }
+
+            if (count($errors = libxml_get_errors())) {
+                $lines = explode(PHP_EOL, $this->response->getContent());
+
+                $this->tester->fail($message);
+                foreach ($errors as $error) {
+                    $this->tester->diag('    '.trim($error->message));
+                    if (preg_match('/line (\d+)/', $error->message, $match) && $error->line != $match[1]) {
+                        $this->tester->diag('      '.str_pad($match[1].':', 6).trim($lines[$match[1] - 1]));
+                    }
+                    $this->tester->diag('      '.str_pad($error->line.':', 6).trim($lines[$error->line - 1]));
+                }
+            } else {
+                $this->tester->pass($message);
+            }
+
+            libxml_use_internal_errors($revert);
+        } else {
+            throw new LogicException(sprintf('Unable to validate responses of content type "%s"', $this->response->getContentType()));
+        }
+
+        return $this->getObjectToReturn();
     }
 
-    foreach ($headers as $header)
+    /**
+     * Tests for a response header.
+     *
+     * @param string $key
+     * @param string $value
+     *
+     * @return sfTester|sfTestFunctionalBase
+     */
+    public function isHeader($key, $value)
     {
-      if (false !== $regex)
-      {
-        if ($mustMatch)
-        {
-          if (preg_match($regex, $header))
-          {
-            $ok = true;
-            $this->tester->pass(sprintf('response header "%s" matches "%s" (%s)', $key, $value, $this->response->getHttpHeader($key)));
-            break;
-          }
+        $headers = explode(', ', $this->response->getHttpHeader($key));
+        $ok = false;
+        $regex = false;
+        $mustMatch = true;
+        if (preg_match('/^(!)?([^a-zA-Z0-9\\\\]).+?\\2[ims]?$/', $value, $match)) {
+            $regex = $value;
+            if ('!' == $match[1]) {
+                $mustMatch = false;
+                $regex = substr($value, 1);
+            }
         }
-        else
-        {
-          if (preg_match($regex, $header))
-          {
-            $ok = true;
-            $this->tester->fail(sprintf('response header "%s" does not match "%s" (%s)', $key, $value, $this->response->getHttpHeader($key)));
-            break;
-          }
+
+        foreach ($headers as $header) {
+            if (false !== $regex) {
+                if ($mustMatch) {
+                    if (preg_match($regex, $header)) {
+                        $ok = true;
+                        $this->tester->pass(sprintf('response header "%s" matches "%s" (%s)', $key, $value, $this->response->getHttpHeader($key)));
+
+                        break;
+                    }
+                } else {
+                    if (preg_match($regex, $header)) {
+                        $ok = true;
+                        $this->tester->fail(sprintf('response header "%s" does not match "%s" (%s)', $key, $value, $this->response->getHttpHeader($key)));
+
+                        break;
+                    }
+                }
+            } elseif ($header == $value) {
+                $ok = true;
+                $this->tester->pass(sprintf('response header "%s" is "%s" (%s)', $key, $value, $this->response->getHttpHeader($key)));
+
+                break;
+            }
         }
-      }
-      else if ($header == $value)
-      {
-        $ok = true;
-        $this->tester->pass(sprintf('response header "%s" is "%s" (%s)', $key, $value, $this->response->getHttpHeader($key)));
-        break;
-      }
+
+        if (!$ok) {
+            if (!$mustMatch) {
+                $this->tester->pass(sprintf('response header "%s" matches "%s" (%s)', $key, $value, $this->response->getHttpHeader($key)));
+            } else {
+                $this->tester->fail(sprintf('response header "%s" matches "%s" (%s)', $key, $value, $this->response->getHttpHeader($key)));
+            }
+        }
+
+        return $this->getObjectToReturn();
     }
 
-    if (!$ok)
+    /**
+     * Tests if a cookie was set.
+     *
+     * @param string $name
+     * @param string $value
+     * @param array  $attributes Other cookie attributes to check (expires, path, domain, etc)
+     *
+     * @return sfTester|sfTestFunctionalBase
+     */
+    public function setsCookie($name, $value = null, $attributes = array())
     {
-      if (!$mustMatch)
-      {
-        $this->tester->pass(sprintf('response header "%s" matches "%s" (%s)', $key, $value, $this->response->getHttpHeader($key)));
-      }
-      else
-      {
-        $this->tester->fail(sprintf('response header "%s" matches "%s" (%s)', $key, $value, $this->response->getHttpHeader($key)));
-      }
+        foreach ($this->response->getCookies() as $cookie) {
+            if ($name == $cookie['name']) {
+                if (null === $value) {
+                    $this->tester->pass(sprintf('response sets cookie "%s"', $name));
+                } else {
+                    $this->tester->ok($value == $cookie['value'], sprintf('response sets cookie "%s" to "%s"', $name, $value));
+                }
+
+                foreach ($attributes as $attributeName => $attributeValue) {
+                    if (!array_key_exists($attributeName, $cookie)) {
+                        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));
+                }
+
+                return $this->getObjectToReturn();
+            }
+        }
+
+        $this->tester->fail(sprintf('response sets cookie "%s"', $name));
+
+        return $this->getObjectToReturn();
     }
 
-    return $this->getObjectToReturn();
-  }
-
-  /**
-   * Tests if a cookie was set.
-   *
-   * @param  string $name
-   * @param  string $value
-   * @param  array  $attributes Other cookie attributes to check (expires, path, domain, etc)
-   *
-   * @return sfTestFunctionalBase|sfTester
-   */
-  public function setsCookie($name, $value = null, $attributes = array())
-  {
-    foreach ($this->response->getCookies() as $cookie)
+    /**
+     * Tests the response content against a regex.
+     *
+     * @param string Regex
+     * @param mixed $regex
+     *
+     * @return sfTester|sfTestFunctionalBase
+     */
+    public function matches($regex)
     {
-      if ($name == $cookie['name'])
-      {
-        if (null === $value)
-        {
-          $this->tester->pass(sprintf('response sets cookie "%s"', $name));
+        if (!preg_match('/^(!)?([^a-zA-Z0-9\\\\]).+?\\2[ims]?$/', $regex, $match)) {
+            throw new InvalidArgumentException(sprintf('"%s" is not a valid regular expression.', $regex));
         }
-        else
-        {
-          $this->tester->ok($value == $cookie['value'], sprintf('response sets cookie "%s" to "%s"', $name, $value));
-        }
-
-        foreach ($attributes as $attributeName => $attributeValue)
-        {
-          if (!array_key_exists($attributeName, $cookie))
-          {
-            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));
+        if ('!' == $match[1]) {
+            $this->tester->unlike($this->response->getContent(), substr($regex, 1), sprintf('response content does not match regex "%s"', substr($regex, 1)));
+        } else {
+            $this->tester->like($this->response->getContent(), $regex, sprintf('response content matches regex "%s"', $regex));
         }
 
         return $this->getObjectToReturn();
-      }
     }
 
-    $this->tester->fail(sprintf('response sets cookie "%s"', $name));
-
-    return $this->getObjectToReturn();
-  }
-
-  /**
-   * Tests the response content against a regex.
-   *
-   * @param string Regex
-   *
-   * @return sfTestFunctionalBase|sfTester
-   */
-  public function matches($regex)
-  {
-    if (!preg_match('/^(!)?([^a-zA-Z0-9\\\\]).+?\\2[ims]?$/', $regex, $match))
+    /**
+     * Tests the status code.
+     *
+     * @param string $statusCode Status code to check, default 200
+     *
+     * @return sfTester|sfTestFunctionalBase
+     */
+    public function isStatusCode($statusCode = 200)
     {
-      throw new InvalidArgumentException(sprintf('"%s" is not a valid regular expression.', $regex));
-    }
+        $this->tester->is($this->response->getStatusCode(), $statusCode, sprintf('status code is "%s"', $statusCode));
 
-    if ($match[1] == '!')
-    {
-      $this->tester->unlike($this->response->getContent(), substr($regex, 1), sprintf('response content does not match regex "%s"', substr($regex, 1)));
-    }
-    else
-    {
-      $this->tester->like($this->response->getContent(), $regex, sprintf('response content matches regex "%s"', $regex));
+        return $this->getObjectToReturn();
     }
 
-    return $this->getObjectToReturn();
-  }
-
-  /**
-   * Tests the status code.
-   *
-   * @param string $statusCode Status code to check, default 200
-   *
-   * @return sfTestFunctionalBase|sfTester
-   */
-  public function isStatusCode($statusCode = 200)
-  {
-    $this->tester->is($this->response->getStatusCode(), $statusCode, sprintf('status code is "%s"', $statusCode));
-
-    return $this->getObjectToReturn();
-  }
-
-  /**
-   * Tests if the current request has been redirected.
-   *
-   * @param  bool $boolean  Flag for redirection mode
-   *
-   * @return sfTestFunctionalBase|sfTester
-   */
-  public function isRedirected($boolean = true)
-  {
-    if ($location = $this->response->getHttpHeader('location'))
-    {
-      $boolean ? $this->tester->pass(sprintf('page redirected to "%s"', $location)) : $this->tester->fail(sprintf('page redirected to "%s"', $location));
-    }
-    else
+    /**
+     * Tests if the current request has been redirected.
+     *
+     * @param bool $boolean Flag for redirection mode
+     *
+     * @return sfTester|sfTestFunctionalBase
+     */
+    public function isRedirected($boolean = true)
     {
-      $boolean ? $this->tester->fail('page redirected') : $this->tester->pass('page not redirected');
+        if ($location = $this->response->getHttpHeader('location')) {
+            $boolean ? $this->tester->pass(sprintf('page redirected to "%s"', $location)) : $this->tester->fail(sprintf('page redirected to "%s"', $location));
+        } else {
+            $boolean ? $this->tester->fail('page redirected') : $this->tester->pass('page not redirected');
+        }
+
+        return $this->getObjectToReturn();
     }
 
-    return $this->getObjectToReturn();
-  }
+    /**
+     * Outputs some debug information about the current response.
+     *
+     * @param string $realOutput Whether to display the actual content of the response when an error occurred
+     *                           or the exception message and the stack trace to ease debugging
+     */
+    public function debug($realOutput = false)
+    {
+        echo $this->tester->error('Response debug');
 
-  /**
-   * Outputs some debug information about the current response.
-   *
-   * @param string $realOutput Whether to display the actual content of the response when an error occurred
-   *                           or the exception message and the stack trace to ease debugging
-   */
-  public function debug($realOutput = false)
-  {
-    print $this->tester->error('Response debug');
+        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.');
+            $this->tester->comment('The real response content has been replaced with the exception message to ease debugging.');
+        }
 
-    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.');
-      $this->tester->comment('The real response content has been replaced with the exception message to ease debugging.');
-    }
+        printf("HTTP/1.X %s\n", $this->response->getStatusCode());
 
-    printf("HTTP/1.X %s\n", $this->response->getStatusCode());
+        foreach ($this->response->getHttpHeaders() as $name => $value) {
+            printf("%s: %s\n", $name, $value);
+        }
 
-    foreach ($this->response->getHttpHeaders() as $name => $value)
-    {
-      printf("%s: %s\n", $name, $value);
-    }
+        foreach ($this->response->getCookies() as $cookie) {
+            vprintf("Set-Cookie: %s=%s; %spath=%s%s%s%s\n", array(
+                $cookie['name'],
+                $cookie['value'],
+                null === $cookie['expire'] ? '' : sprintf('expires=%s; ', date('D d-M-Y H:i:s T', $cookie['expire'])),
+                $cookie['path'],
+                $cookie['domain'] ? sprintf('; domain=%s', $cookie['domain']) : '',
+                $cookie['secure'] ? '; secure' : '',
+                $cookie['httpOnly'] ? '; HttpOnly' : '',
+            ));
+        }
 
-    foreach ($this->response->getCookies() as $cookie)
-    {
-      vprintf("Set-Cookie: %s=%s; %spath=%s%s%s%s\n", array(
-        $cookie['name'],
-        $cookie['value'],
-        null === $cookie['expire'] ? '' : sprintf('expires=%s; ', date('D d-M-Y H:i:s T', $cookie['expire'])),
-        $cookie['path'],
-        $cookie['domain'] ? sprintf('; domain=%s', $cookie['domain']) : '',
-        $cookie['secure'] ? '; secure' : '',
-        $cookie['httpOnly'] ? '; HttpOnly' : '',
-      ));
-    }
+        echo "\n";
+        if (!$realOutput && null !== $exception = sfException::getLastException()) {
+            echo $exception;
+        } else {
+            echo $this->response->getContent();
+        }
+        echo "\n";
 
-    echo "\n";
-    if (!$realOutput && null !== $exception = sfException::getLastException())
-    {
-      echo $exception;
-    }
-    else
-    {
-      echo $this->response->getContent();
+        exit(1);
     }
-    echo "\n";
-
-    exit(1);
-  }
 }
diff --git a/lib/test/sfTesterUser.class.php b/lib/test/sfTesterUser.class.php
index 4a6ebc103..b40ad3bc7 100644
--- a/lib/test/sfTesterUser.class.php
+++ b/lib/test/sfTesterUser.class.php
@@ -11,102 +11,101 @@
 /**
  * sfTesterUser implements tests for the symfony user object.
  *
- * @package    symfony
- * @subpackage test
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfTesterUser extends sfTester
 {
-  protected $user;
+    protected $user;
 
-  /**
-   * Prepares the tester.
-   */
-  public function prepare()
-  {
-  }
+    /**
+     * Prepares the tester.
+     */
+    public function prepare()
+    {
+    }
 
-  /**
-   * Initializes the tester.
-   */
-  public function initialize()
-  {
-    $this->user = $this->browser->getUser();
-  }
+    /**
+     * Initializes the tester.
+     */
+    public function initialize()
+    {
+        $this->user = $this->browser->getUser();
+    }
 
-  /**
-   * Tests a user attribute value.
-   *
-   * @param string $key
-   * @param string $value
-   * @param string $ns
-   *
-   * @return sfTestFunctionalBase|sfTester
-   */
-  public function isAttribute($key, $value, $ns = null)
-  {
-    $this->tester->is($this->user->getAttribute($key, null, $ns), $value, sprintf('user attribute "%s" is "%s"', $key, $value));
+    /**
+     * Tests a user attribute value.
+     *
+     * @param string $key
+     * @param string $value
+     * @param string $ns
+     *
+     * @return sfTester|sfTestFunctionalBase
+     */
+    public function isAttribute($key, $value, $ns = null)
+    {
+        $this->tester->is($this->user->getAttribute($key, null, $ns), $value, sprintf('user attribute "%s" is "%s"', $key, $value));
 
-    return $this->getObjectToReturn();
-  }
+        return $this->getObjectToReturn();
+    }
 
-  /**
-   * Tests a user flash value.
-   *
-   * @param string $key
-   * @param string $value
-   *
-   * @return sfTestFunctionalBase|sfTester
-   */
-  public function isFlash($key, $value)
-  {
-    $this->tester->is($this->user->getFlash($key), $value, sprintf('user flash "%s" is "%s"', $key, $value));
+    /**
+     * Tests a user flash value.
+     *
+     * @param string $key
+     * @param string $value
+     *
+     * @return sfTester|sfTestFunctionalBase
+     */
+    public function isFlash($key, $value)
+    {
+        $this->tester->is($this->user->getFlash($key), $value, sprintf('user flash "%s" is "%s"', $key, $value));
 
-    return $this->getObjectToReturn();
-  }
+        return $this->getObjectToReturn();
+    }
 
-  /**
-   * Tests the user culture.
-   *
-   * @param  string $culture  The user culture
-   *
-   * @return sfTestFunctionalBase|sfTester
-   */
-  public function isCulture($culture)
-  {
-    $this->tester->is($this->user->getCulture(), $culture, sprintf('user culture is "%s"', $culture));
+    /**
+     * Tests the user culture.
+     *
+     * @param string $culture The user culture
+     *
+     * @return sfTester|sfTestFunctionalBase
+     */
+    public function isCulture($culture)
+    {
+        $this->tester->is($this->user->getCulture(), $culture, sprintf('user culture is "%s"', $culture));
 
-    return $this->getObjectToReturn();
-  }
+        return $this->getObjectToReturn();
+    }
 
-  /**
-   * Tests if the user is authenticated.
-   *
-   * @param  Boolean $boolean Whether to check if the user is authenticated or not
-   *
-   * @return sfTestFunctionalBase|sfTester
-   */
-  public function isAuthenticated($boolean = true)
-  {
-    $this->tester->is($this->user->isAuthenticated(), $boolean, sprintf('user is %sauthenticated', $boolean ? '' : 'not '));
+    /**
+     * Tests if the user is authenticated.
+     *
+     * @param bool $boolean Whether to check if the user is authenticated or not
+     *
+     * @return sfTester|sfTestFunctionalBase
+     */
+    public function isAuthenticated($boolean = true)
+    {
+        $this->tester->is($this->user->isAuthenticated(), $boolean, sprintf('user is %sauthenticated', $boolean ? '' : 'not '));
 
-    return $this->getObjectToReturn();
-  }
+        return $this->getObjectToReturn();
+    }
 
-  /**
-   * Tests if the user has some credentials.
-   *
-   * @param  mixed $credentials
-   * @param  bool  $boolean      Whether to check if the user have some credentials or not
-   * @param  bool  $useAnd       specify the mode, either AND or OR
-   *
-   * @return sfTestFunctionalBase|sfTester
-   */
-  public function hasCredential($credentials, $boolean = true, $useAnd = true)
-  {
-    $this->tester->is($this->user->hasCredential($credentials, $useAnd), $boolean, sprintf('user has %sthe right credentials', $boolean ? '' : 'not '));
+    /**
+     * Tests if the user has some credentials.
+     *
+     * @param mixed $credentials
+     * @param bool  $boolean     Whether to check if the user have some credentials or not
+     * @param bool  $useAnd      specify the mode, either AND or OR
+     *
+     * @return sfTester|sfTestFunctionalBase
+     */
+    public function hasCredential($credentials, $boolean = true, $useAnd = true)
+    {
+        $this->tester->is($this->user->hasCredential($credentials, $useAnd), $boolean, sprintf('user has %sthe right credentials', $boolean ? '' : 'not '));
 
-    return $this->getObjectToReturn();
-  }
+        return $this->getObjectToReturn();
+    }
 }
diff --git a/lib/test/sfTesterViewCache.class.php b/lib/test/sfTesterViewCache.class.php
index a846b31a3..c4ae4991d 100644
--- a/lib/test/sfTesterViewCache.class.php
+++ b/lib/test/sfTesterViewCache.class.php
@@ -11,120 +11,103 @@
 /**
  * sfTesterViewCache implements tests for the symfony view cache manager.
  *
- * @package    symfony
- * @subpackage test
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfTesterViewCache extends sfTester
 {
-  protected
-    $viewCacheManager = null,
-    $response         = null,
-    $routing          = null;
-
-  /**
-   * Prepares the tester.
-   */
-  public function prepare()
-  {
-  }
-
-  /**
-   * Initializes the tester.
-   */
-  public function initialize()
-  {
-    $this->viewCacheManager = $this->browser->getContext()->getViewCacheManager();
-    $this->routing = $this->browser->getContext()->getRouting();
-    $this->response = $this->browser->getResponse();
-  }
-
-  /**
-   * Tests if the given uri is cached.
-   *
-   * @param  boolean $boolean      Flag for checking the cache
-   * @param  boolean $with_layout  If have or not layout
-   *
-   * @return sfTestFunctionalBase|sfTester
-   */
-  public function isCached($boolean, $with_layout = false)
-  {
-    return $this->isUriCached($this->viewCacheManager->getCurrentCacheKey(), $boolean, $with_layout);
-  }
-
-  /**
-   * Tests if the given uri is cached.
-   *
-   * @param  string  $uri          Uniform resource identifier
-   * @param  boolean $boolean      Flag for checking the cache
-   * @param  boolean $with_layout  If have or not layout
-   *
-   * @return sfTestFunctionalBase|sfTester
-   */
-  public function isUriCached($uri, $boolean, $with_layout = false)
-  {
-    $cacheManager = $this->viewCacheManager;
+    protected $viewCacheManager;
+    protected $response;
+    protected $routing;
 
-    // check that cache is enabled
-    if (!$cacheManager)
+    /**
+     * Prepares the tester.
+     */
+    public function prepare()
     {
-      $this->tester->ok(!$boolean, 'cache is disabled');
-
-      return $this->getObjectToReturn();
     }
 
-    if ($uri == $this->viewCacheManager->getCurrentCacheKey())
-    {
-      $main = true;
-      $type = $with_layout ? 'page' : 'action';
-    }
-    else
+    /**
+     * Initializes the tester.
+     */
+    public function initialize()
     {
-      $main = false;
-      $type = $uri;
+        $this->viewCacheManager = $this->browser->getContext()->getViewCacheManager();
+        $this->routing = $this->browser->getContext()->getRouting();
+        $this->response = $this->browser->getResponse();
     }
 
-    // check layout configuration
-    if ($cacheManager->withLayout($uri) && !$with_layout)
+    /**
+     * Tests if the given uri is cached.
+     *
+     * @param bool $boolean     Flag for checking the cache
+     * @param bool $with_layout If have or not layout
+     *
+     * @return sfTester|sfTestFunctionalBase
+     */
+    public function isCached($boolean, $with_layout = false)
     {
-      $this->tester->fail('cache without layout');
-      $this->tester->skip('cache is not configured properly', 2);
+        return $this->isUriCached($this->viewCacheManager->getCurrentCacheKey(), $boolean, $with_layout);
     }
-    else if (!$cacheManager->withLayout($uri) && $with_layout)
-    {
-      $this->tester->fail('cache with layout');
-      $this->tester->skip('cache is not configured properly', 2);
-    }
-    else
+
+    /**
+     * Tests if the given uri is cached.
+     *
+     * @param string $uri         Uniform resource identifier
+     * @param bool   $boolean     Flag for checking the cache
+     * @param bool   $with_layout If have or not layout
+     *
+     * @return sfTester|sfTestFunctionalBase
+     */
+    public function isUriCached($uri, $boolean, $with_layout = false)
     {
-      $this->tester->pass('cache is configured properly');
+        $cacheManager = $this->viewCacheManager;
 
-      // check page is cached
-      $ret = $this->tester->is($cacheManager->has($uri), $boolean, sprintf('"%s" %s in cache', $type, $boolean ? 'is' : 'is not'));
+        // check that cache is enabled
+        if (!$cacheManager) {
+            $this->tester->ok(!$boolean, 'cache is disabled');
 
-      // check that the content is ok in cache
-      if ($boolean)
-      {
-        if (!$ret)
-        {
-          $this->tester->fail('content in cache is ok');
+            return $this->getObjectToReturn();
         }
-        else if ($with_layout)
-        {
-          $response = unserialize($cacheManager->get($uri));
-          $content = $response->getContent();
-          $this->tester->ok($content == $this->response->getContent(), 'content in cache is ok');
+
+        if ($uri == $this->viewCacheManager->getCurrentCacheKey()) {
+            $main = true;
+            $type = $with_layout ? 'page' : 'action';
+        } else {
+            $main = false;
+            $type = $uri;
         }
-        else
-        {
-          $ret = unserialize($cacheManager->get($uri));
-          $content = $ret['content'];
-          $this->tester->ok(false !== strpos($this->response->getContent(), $content), 'content in cache is ok');
+
+        // check layout configuration
+        if ($cacheManager->withLayout($uri) && !$with_layout) {
+            $this->tester->fail('cache without layout');
+            $this->tester->skip('cache is not configured properly', 2);
+        } elseif (!$cacheManager->withLayout($uri) && $with_layout) {
+            $this->tester->fail('cache with layout');
+            $this->tester->skip('cache is not configured properly', 2);
+        } else {
+            $this->tester->pass('cache is configured properly');
+
+            // check page is cached
+            $ret = $this->tester->is($cacheManager->has($uri), $boolean, sprintf('"%s" %s in cache', $type, $boolean ? 'is' : 'is not'));
+
+            // check that the content is ok in cache
+            if ($boolean) {
+                if (!$ret) {
+                    $this->tester->fail('content in cache is ok');
+                } elseif ($with_layout) {
+                    $response = unserialize($cacheManager->get($uri));
+                    $content = $response->getContent();
+                    $this->tester->ok($content == $this->response->getContent(), 'content in cache is ok');
+                } else {
+                    $ret = unserialize($cacheManager->get($uri));
+                    $content = $ret['content'];
+                    $this->tester->ok(false !== strpos($this->response->getContent(), $content), 'content in cache is ok');
+                }
+            }
         }
-      }
-    }
 
-    return $this->getObjectToReturn();
-  }
+        return $this->getObjectToReturn();
+    }
 }
diff --git a/lib/user/sfBasicSecurityUser.class.php b/lib/user/sfBasicSecurityUser.class.php
index 02086fffb..32b61f499 100644
--- a/lib/user/sfBasicSecurityUser.class.php
+++ b/lib/user/sfBasicSecurityUser.class.php
@@ -12,283 +12,259 @@
 /**
  * sfBasicSecurityUser will handle any type of data as a credential.
  *
- * @package    symfony
- * @subpackage user
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 class sfBasicSecurityUser extends sfUser implements sfSecurityUser
 {
-  const LAST_REQUEST_NAMESPACE = 'symfony/user/sfUser/lastRequest';
-  const AUTH_NAMESPACE = 'symfony/user/sfUser/authenticated';
-  const CREDENTIAL_NAMESPACE = 'symfony/user/sfUser/credentials';
-
-  protected $lastRequest = null;
-
-  protected $credentials = null;
-  protected $authenticated = null;
-
-  protected $timedout = false;
-
-  /**
-   * Clears all credentials.
-   *
-   */
-  public function clearCredentials()
-  {
-    $this->credentials = array();
-  }
-
-  /**
-   * Returns the current user's credentials.
-   *
-   * @return array
-   */
-  public function getCredentials()
-  {
-    return $this->credentials;
-  }
-
-  /**
-   * Removes a credential.
-   *
-   * @param  mixed $credential credential
-   */
-  public function removeCredential($credential)
-  {
-    if ($this->hasCredential($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))));
-          }
+    public const LAST_REQUEST_NAMESPACE = 'symfony/user/sfUser/lastRequest';
+    public const AUTH_NAMESPACE = 'symfony/user/sfUser/authenticated';
+    public const CREDENTIAL_NAMESPACE = 'symfony/user/sfUser/credentials';
 
-          unset($this->credentials[$key]);
+    protected $lastRequest;
 
-          $this->storage->regenerate(true);
+    protected $credentials;
+    protected $authenticated;
 
-          return;
-        }
-      }
-    }
-  }
-
-  /**
-   * Adds a credential.
-   *
-   * @param mixed $credential
-   */
-  public function addCredential($credential)
-  {
-    $this->addCredentials(func_get_args());
-  }
-
-  /**
-   * Adds several credential at once.
-   *
-   * @param  mixed array or list of credentials
-   */
-  public function addCredentials()
-  {
-    if (func_num_args() == 0) return;
-
-    // Add all credentials
-    $credentials = (is_array(func_get_arg(0))) ? func_get_arg(0) : func_get_args();
-
-    if ($this->options['logging'])
+    protected $timedout = false;
+
+    /**
+     * Clears all credentials.
+     */
+    public function clearCredentials()
     {
-      $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Add credential(s) "%s"', implode(', ', $credentials)))));
+        $this->credentials = array();
     }
 
-    $added = false;
-    foreach ($credentials as $aCredential)
+    /**
+     * Returns the current user's credentials.
+     *
+     * @return array
+     */
+    public function getCredentials()
     {
-      if (!in_array($aCredential, $this->credentials))
-      {
-        $added = true;
-        $this->credentials[] = $aCredential;
-      }
+        return $this->credentials;
     }
 
-    if ($added)
+    /**
+     * Removes a credential.
+     *
+     * @param mixed $credential credential
+     */
+    public function removeCredential($credential)
     {
-      $this->storage->regenerate(true);
+        if ($this->hasCredential($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))));
+                    }
+
+                    unset($this->credentials[$key]);
+
+                    $this->storage->regenerate(true);
+
+                    return;
+                }
+            }
+        }
     }
-  }
-
-  /**
-   * Returns true if user has credential.
-   *
-   * @param  mixed $credentials
-   * @param  bool  $useAnd       specify the mode, either AND or OR
-   * @return bool
-   *
-   * @author Olivier Verdier <Olivier.Verdier@free.fr>
-   */
-  public function hasCredential($credentials, $useAnd = true)
-  {
-    if (null === $this->credentials)
+
+    /**
+     * Adds a credential.
+     *
+     * @param mixed $credential
+     */
+    public function addCredential($credential)
     {
-      return false;
+        $this->addCredentials(func_get_args());
     }
 
-    if (!is_array($credentials))
+    /**
+     * Adds several credential at once.
+     *
+     * @param  mixed array or list of credentials
+     */
+    public function addCredentials()
     {
-      return in_array($credentials, $this->credentials);
-    }
+        if (0 == func_num_args()) {
+            return;
+        }
 
-    // now we assume that $credentials is an array
-    $test = false;
+        // Add all credentials
+        $credentials = (is_array(func_get_arg(0))) ? func_get_arg(0) : func_get_args();
 
-    foreach ($credentials as $credential)
-    {
-      // recursively check the credential with a switched AND/OR mode
-      $test = $this->hasCredential($credential, $useAnd ? false : true);
-
-      if ($useAnd)
-      {
-        $test = $test ? false : true;
-      }
-
-      if ($test) // either passed one in OR mode or failed one in AND mode
-      {
-        break; // the matter is settled
-      }
+        if ($this->options['logging']) {
+            $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Add credential(s) "%s"', implode(', ', $credentials)))));
+        }
+
+        $added = false;
+        foreach ($credentials as $aCredential) {
+            if (!in_array($aCredential, $this->credentials)) {
+                $added = true;
+                $this->credentials[] = $aCredential;
+            }
+        }
+
+        if ($added) {
+            $this->storage->regenerate(true);
+        }
     }
 
-    if ($useAnd) // in AND mode we succeed if $test is false
+    /**
+     * Returns true if user has credential.
+     *
+     * @param mixed $credentials
+     * @param bool  $useAnd      specify the mode, either AND or OR
+     *
+     * @return bool
+     *
+     * @author Olivier Verdier <Olivier.Verdier@free.fr>
+     */
+    public function hasCredential($credentials, $useAnd = true)
     {
-      $test = $test ? false : true;
+        if (null === $this->credentials) {
+            return false;
+        }
+
+        if (!is_array($credentials)) {
+            return in_array($credentials, $this->credentials);
+        }
+
+        // now we assume that $credentials is an array
+        $test = false;
+
+        foreach ($credentials as $credential) {
+            // recursively check the credential with a switched AND/OR mode
+            $test = $this->hasCredential($credential, $useAnd ? false : true);
+
+            if ($useAnd) {
+                $test = $test ? false : true;
+            }
+
+            if ($test) { // either passed one in OR mode or failed one in AND mode
+                break; // the matter is settled
+            }
+        }
+
+        if ($useAnd) { // in AND mode we succeed if $test is false
+            $test = $test ? false : true;
+        }
+
+        return $test;
     }
 
-    return $test;
-  }
-
-  /**
-   * Returns true if user is authenticated.
-   *
-   * @return boolean
-   */
-  public function isAuthenticated()
-  {
-    return $this->authenticated;
-  }
-
-  /**
-   * Sets authentication for user.
-   *
-   * @param  bool $authenticated
-   */
-  public function setAuthenticated($authenticated)
-  {
-    if ($this->options['logging'])
+    /**
+     * Returns true if user is authenticated.
+     *
+     * @return bool
+     */
+    public function isAuthenticated()
     {
-      $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('User is %sauthenticated', $authenticated === true ? '' : 'not '))));
+        return $this->authenticated;
     }
 
-    if ((bool) $authenticated !== $this->authenticated)
+    /**
+     * Sets authentication for user.
+     *
+     * @param bool $authenticated
+     */
+    public function setAuthenticated($authenticated)
     {
-      if ($authenticated === true)
-      {
-        $this->authenticated = true;
-      }
-      else
-      {
-        $this->authenticated = false;
-        $this->clearCredentials();
-      }
-
-      $this->dispatcher->notify(new sfEvent($this, 'user.change_authentication', array('authenticated' => $this->authenticated)));
-
-      $this->storage->regenerate(true);
+        if ($this->options['logging']) {
+            $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('User is %sauthenticated', true === $authenticated ? '' : 'not '))));
+        }
+
+        if ((bool) $authenticated !== $this->authenticated) {
+            if (true === $authenticated) {
+                $this->authenticated = true;
+            } else {
+                $this->authenticated = false;
+                $this->clearCredentials();
+            }
+
+            $this->dispatcher->notify(new sfEvent($this, 'user.change_authentication', array('authenticated' => $this->authenticated)));
+
+            $this->storage->regenerate(true);
+        }
     }
-  }
-
-  public function setTimedOut()
-  {
-    $this->timedout = true;
-  }
-
-  public function isTimedOut()
-  {
-    return $this->timedout;
-  }
-
-  /**
-   * Returns the timestamp of the last user request.
-   *
-   * @return  int
-   */
-  public function getLastRequestTime()
-  {
-    return $this->lastRequest;
-  }
-
-  /**
-   * Available options:
-   *
-   *  * 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.
-   *
-   * @see sfUser
-   */
-  public function initialize(sfEventDispatcher $dispatcher, sfStorage $storage, $options = array())
-  {
-    // initialize parent
-    parent::initialize($dispatcher, $storage, $options);
-
-    if (!array_key_exists('timeout', $this->options))
+
+    public function setTimedOut()
     {
-      $this->options['timeout'] = 1800;
+        $this->timedout = true;
     }
 
-    // read data from storage
-    $this->authenticated = $storage->read(self::AUTH_NAMESPACE);
-    $this->credentials   = $storage->read(self::CREDENTIAL_NAMESPACE);
-    $this->lastRequest   = $storage->read(self::LAST_REQUEST_NAMESPACE);
+    public function isTimedOut()
+    {
+        return $this->timedout;
+    }
 
-    if (null === $this->authenticated)
+    /**
+     * Returns the timestamp of the last user request.
+     *
+     * @return int
+     */
+    public function getLastRequestTime()
     {
-      $this->authenticated = false;
-      $this->credentials   = array();
+        return $this->lastRequest;
     }
-    else
+
+    /**
+     * Available options:.
+     *
+     *  * 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
+     *
+     * @see sfUser
+     */
+    public function initialize(sfEventDispatcher $dispatcher, sfStorage $storage, $options = array())
     {
-      // 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')));
+        // initialize parent
+        parent::initialize($dispatcher, $storage, $options);
+
+        if (!array_key_exists('timeout', $this->options)) {
+            $this->options['timeout'] = 1800;
         }
 
-        $this->setTimedOut();
-        $this->setAuthenticated(false);
-      }
-    }
+        // read data from storage
+        $this->authenticated = $storage->read(self::AUTH_NAMESPACE);
+        $this->credentials = $storage->read(self::CREDENTIAL_NAMESPACE);
+        $this->lastRequest = $storage->read(self::LAST_REQUEST_NAMESPACE);
+
+        if (null === $this->authenticated) {
+            $this->authenticated = false;
+            $this->credentials = array();
+        } 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->setTimedOut();
+                $this->setAuthenticated(false);
+            }
+        }
 
-    $this->lastRequest = time();
-  }
+        $this->lastRequest = time();
+    }
 
-  public function shutdown()
-  {
-    // write the last request time to the storage
-    $this->storage->write(self::LAST_REQUEST_NAMESPACE, $this->lastRequest);
+    public function shutdown()
+    {
+        // write the last request time to the storage
+        $this->storage->write(self::LAST_REQUEST_NAMESPACE, $this->lastRequest);
 
-    $this->storage->write(self::AUTH_NAMESPACE,         $this->authenticated);
-    $this->storage->write(self::CREDENTIAL_NAMESPACE,   $this->credentials);
+        $this->storage->write(self::AUTH_NAMESPACE, $this->authenticated);
+        $this->storage->write(self::CREDENTIAL_NAMESPACE, $this->credentials);
 
-    // call the parent shutdown method
-    parent::shutdown();
-  }
+        // call the parent shutdown method
+        parent::shutdown();
+    }
 }
diff --git a/lib/user/sfSecurityUser.class.php b/lib/user/sfSecurityUser.class.php
index 87b290968..b3a3d63bf 100644
--- a/lib/user/sfSecurityUser.class.php
+++ b/lib/user/sfSecurityUser.class.php
@@ -4,7 +4,7 @@
  * 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>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -12,53 +12,52 @@
 /**
  * sfSecurityUser interface provides advanced security manipulation methods.
  *
- * @package    symfony
- * @subpackage user
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 interface sfSecurityUser
 {
-  /**
-   * Add a credential to this user.
-   *
-   * @param mixed $credential Credential data.
-   */
-  public function addCredential($credential);
+    /**
+     * Add a credential to this user.
+     *
+     * @param mixed $credential credential data
+     */
+    public function addCredential($credential);
 
-  /**
-   * Clear all credentials associated with this user.
-   */
-  public function clearCredentials();
+    /**
+     * Clear all credentials associated with this user.
+     */
+    public function clearCredentials();
 
-  /**
-   * Indicates whether or not this user has a credential.
-   *
-   * @param mixed $credential  Credential data.
-   *
-   * @return bool true, if this user has the credential, otherwise false.
-   */
-  public function hasCredential($credential);
+    /**
+     * Indicates whether or not this user has a credential.
+     *
+     * @param mixed $credential credential data
+     *
+     * @return bool true, if this user has the credential, otherwise false
+     */
+    public function hasCredential($credential);
 
-  /**
-   * Indicates whether or not this user is authenticated.
-   *
-   * @return bool true, if this user is authenticated, otherwise false.
-   */
-  public function isAuthenticated();
+    /**
+     * Indicates whether or not this user is authenticated.
+     *
+     * @return bool true, if this user is authenticated, otherwise false
+     */
+    public function isAuthenticated();
 
-  /**
-   * Remove a credential from this user.
-   *
-   * @param mixed $credential  Credential data.
-   */
-  public function removeCredential($credential);
+    /**
+     * Remove a credential from this user.
+     *
+     * @param mixed $credential credential data
+     */
+    public function removeCredential($credential);
 
-  /**
-   * Set the authenticated status of this user.
-   *
-   * @param bool $authenticated  A flag indicating the authenticated status of this user.
-   */
-  public function setAuthenticated($authenticated);
+    /**
+     * Set the authenticated status of this user.
+     *
+     * @param bool $authenticated a flag indicating the authenticated status of this user
+     */
+    public function setAuthenticated($authenticated);
 }
diff --git a/lib/user/sfUser.class.php b/lib/user/sfUser.class.php
index 47d122a20..45e6881dd 100644
--- a/lib/user/sfUser.class.php
+++ b/lib/user/sfUser.class.php
@@ -10,336 +10,315 @@
  */
 
 /**
- *
  * sfUser wraps a client session and provides accessor methods for user
  * attributes. It also makes storing and retrieving multiple page form data
  * rather easy by allowing user attributes to be stored in namespaces, which
  * help organize data.
  *
- * @package    symfony
- * @subpackage user
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 class sfUser implements ArrayAccess
 {
-  /**
-   * The namespace under which attributes will be stored.
-   */
-  const ATTRIBUTE_NAMESPACE = 'symfony/user/sfUser/attributes';
-
-  const CULTURE_NAMESPACE = 'symfony/user/sfUser/culture';
-
-  protected $options = array();
-  /** @var sfNamespacedParameterHolder */
-  protected $attributeHolder = null;
-  protected $culture = null;
-  /** @var sfStorage */
-  protected $storage = null;
-  /** @var sfEventDispatcher */
-  protected $dispatcher = null;
-
-  /**
-   * Class constructor.
-   *
-   * @see initialize()
-   *
-   * @param sfEventDispatcher $dispatcher
-   * @param sfStorage         $storage
-   * @param array             $options
-   */
-  public function __construct(sfEventDispatcher $dispatcher, sfStorage $storage, $options = array())
-  {
-    $this->initialize($dispatcher, $storage, $options);
-
-    if ($this->options['auto_shutdown'])
+    /**
+     * The namespace under which attributes will be stored.
+     */
+    public const ATTRIBUTE_NAMESPACE = 'symfony/user/sfUser/attributes';
+
+    public const CULTURE_NAMESPACE = 'symfony/user/sfUser/culture';
+
+    protected $options = array();
+
+    /** @var sfNamespacedParameterHolder */
+    protected $attributeHolder;
+    protected $culture;
+
+    /** @var sfStorage */
+    protected $storage;
+
+    /** @var sfEventDispatcher */
+    protected $dispatcher;
+
+    /**
+     * Class constructor.
+     *
+     * @see initialize()
+     *
+     * @param array $options
+     */
+    public function __construct(sfEventDispatcher $dispatcher, sfStorage $storage, $options = array())
+    {
+        $this->initialize($dispatcher, $storage, $options);
+
+        if ($this->options['auto_shutdown']) {
+            register_shutdown_function(array($this, 'shutdown'));
+        }
+    }
+
+    /**
+     * Calls methods defined via sfEventDispatcher.
+     *
+     * @param string $method    The method name
+     * @param array  $arguments The method arguments
+     *
+     * @return mixed The returned value of the called method
+     *
+     * @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)));
+        if (!$event->isProcessed()) {
+            throw new sfException(sprintf('Call to undefined method %s::%s.', get_class($this), $method));
+        }
+
+        return $event->getReturnValue();
+    }
+
+    /**
+     * Initializes this sfUser.
+     *
+     * Available options:
+     *
+     *  * auto_shutdown:   Whether to automatically save the changes to the session (true by default)
+     *  * culture:         The user culture
+     *  * default_culture: The default user culture (en by default)
+     *  * 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
+     */
+    public function initialize(sfEventDispatcher $dispatcher, sfStorage $storage, $options = array())
     {
-      register_shutdown_function(array($this, 'shutdown'));
+        $this->dispatcher = $dispatcher;
+        $this->storage = $storage;
+
+        $this->options = array_merge(array(
+            'auto_shutdown' => true,
+            'culture' => null,
+            'default_culture' => 'en',
+            'use_flash' => false,
+            'logging' => false,
+        ), $options);
+
+        $this->attributeHolder = new sfNamespacedParameterHolder(self::ATTRIBUTE_NAMESPACE);
+
+        // read attributes from storage
+        $attributes = $storage->read(self::ATTRIBUTE_NAMESPACE);
+        if (is_array($attributes)) {
+            foreach ($attributes as $namespace => $values) {
+                $this->attributeHolder->add($values, $namespace);
+            }
+        }
+
+        // set the user culture to sf_culture parameter if present in the request
+        // otherwise
+        //  - use the culture defined in the user session
+        //  - use the default culture set in settings.yml
+        $currentCulture = $storage->read(self::CULTURE_NAMESPACE);
+        $this->setCulture(null !== $this->options['culture'] ? $this->options['culture'] : (null !== $currentCulture ? $currentCulture : $this->options['default_culture']));
+
+        // 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)))));
+            }
+
+            foreach ($names as $name) {
+                $this->attributeHolder->set($name, true, 'symfony/user/sfUser/flash/remove');
+            }
+        }
     }
-  }
-
-  /**
-   * Initializes this sfUser.
-   *
-   * Available options:
-   *
-   *  * auto_shutdown:   Whether to automatically save the changes to the session (true by default)
-   *  * culture:         The user culture
-   *  * default_culture: The default user culture (en by default)
-   *  * 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.
-   *
-   * @return void
-   */
-  public function initialize(sfEventDispatcher $dispatcher, sfStorage $storage, $options = array())
-  {
-    $this->dispatcher = $dispatcher;
-    $this->storage    = $storage;
-
-    $this->options = array_merge(array(
-      'auto_shutdown'   => true,
-      'culture'         => null,
-      'default_culture' => 'en',
-      'use_flash'       => false,
-      'logging'         => false,
-    ), $options);
-
-    $this->attributeHolder = new sfNamespacedParameterHolder(self::ATTRIBUTE_NAMESPACE);
-
-    // read attributes from storage
-    $attributes = $storage->read(self::ATTRIBUTE_NAMESPACE);
-    if (is_array($attributes))
+
+    /**
+     * Returns the initialization options.
+     *
+     * @return array The options used to initialize sfUser
+     */
+    public function getOptions()
+    {
+        return $this->options;
+    }
+
+    /**
+     * Sets the user culture.
+     *
+     * @param string $culture
+     */
+    public function setCulture($culture)
     {
-      foreach ($attributes as $namespace => $values)
-      {
-        $this->attributeHolder->add($values, $namespace);
-      }
+        if ($this->culture != $culture) {
+            $this->culture = $culture;
+
+            $this->dispatcher->notify(new sfEvent($this, 'user.change_culture', array('culture' => $culture)));
+        }
     }
 
-    // set the user culture to sf_culture parameter if present in the request
-    // otherwise
-    //  - use the culture defined in the user session
-    //  - use the default culture set in settings.yml
-    $currentCulture = $storage->read(self::CULTURE_NAMESPACE);
-    $this->setCulture(null !== $this->options['culture'] ? $this->options['culture'] : (null !== $currentCulture ? $currentCulture : $this->options['default_culture']));
+    /**
+     * Sets a flash variable that will be passed to the very next action.
+     *
+     * @param string $name    The name of the flash variable
+     * @param string $value   The value of the flash variable
+     * @param bool   $persist true if the flash have to persist for the following request (true by default)
+     */
+    public function setFlash($name, $value, $persist = true)
+    {
+        if (!$this->options['use_flash']) {
+            return;
+        }
+
+        $this->setAttribute($name, $value, 'symfony/user/sfUser/flash');
+
+        if ($persist) {
+            // clear removal flag
+            $this->attributeHolder->remove($name, null, 'symfony/user/sfUser/flash/remove');
+        } else {
+            $this->setAttribute($name, true, 'symfony/user/sfUser/flash/remove');
+        }
+    }
 
-    // flag current flash to be removed at shutdown
-    if ($this->options['use_flash'] && $names = $this->attributeHolder->getNames('symfony/user/sfUser/flash'))
+    /**
+     * Gets a flash variable.
+     *
+     * @param string $name    The name of the flash variable
+     * @param string $default the default value returned when named variable does not exist
+     *
+     * @return mixed The value of the flash variable
+     */
+    public function getFlash($name, $default = null)
     {
-      if ($this->options['logging'])
-      {
-        $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Flag old flash messages ("%s")', implode('", "', $names)))));
-      }
-
-      foreach ($names as $name)
-      {
-        $this->attributeHolder->set($name, true, 'symfony/user/sfUser/flash/remove');
-      }
+        if (!$this->options['use_flash']) {
+            return $default;
+        }
+
+        return $this->getAttribute($name, $default, 'symfony/user/sfUser/flash');
     }
-  }
-
-  /**
-   * Returns the initialization options
-   *
-   * @return array The options used to initialize sfUser
-   */
-  public function getOptions()
-  {
-    return $this->options;
-  }
-
-  /**
-   * Sets the user culture.
-   *
-   * @param string $culture
-   */
-  public function setCulture($culture)
-  {
-    if ($this->culture != $culture)
+
+    /**
+     * Returns true if a flash variable of the specified name exists.
+     *
+     * @param string $name The name of the flash variable
+     *
+     * @return bool true if the variable exists, false otherwise
+     */
+    public function hasFlash($name)
     {
-      $this->culture = $culture;
+        if (!$this->options['use_flash']) {
+            return false;
+        }
 
-      $this->dispatcher->notify(new sfEvent($this, 'user.change_culture', array('culture' => $culture)));
+        return $this->hasAttribute($name, 'symfony/user/sfUser/flash');
     }
-  }
-
-  /**
-   * Sets a flash variable that will be passed to the very next action.
-   *
-   * @param  string $name     The name of the flash variable
-   * @param  string $value    The value of the flash variable
-   * @param  bool   $persist  true if the flash have to persist for the following request (true by default)
-   */
-  public function setFlash($name, $value, $persist = true)
-  {
-    if (!$this->options['use_flash'])
+
+    /**
+     * Gets culture.
+     *
+     * @return string
+     */
+    public function getCulture()
     {
-      return;
+        return $this->culture;
     }
 
-    $this->setAttribute($name, $value, 'symfony/user/sfUser/flash');
+    /**
+     * Returns true if the user attribute exists (implements the ArrayAccess interface).
+     *
+     * @param string $name The name of the user attribute
+     *
+     * @return bool true if the user attribute exists, false otherwise
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetExists($name)
+    {
+        return $this->hasAttribute($name);
+    }
 
-    if ($persist)
+    /**
+     * Returns the user attribute associated with the name (implements the ArrayAccess interface).
+     *
+     * @param string $name The offset of the value to get
+     *
+     * @return mixed The user attribute if exists, null otherwise
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetGet($name)
     {
-      // clear removal flag
-      $this->attributeHolder->remove($name, null, 'symfony/user/sfUser/flash/remove');
+        return $this->getAttribute($name, false);
     }
-    else
+
+    /**
+     * Sets the user attribute associated with the offset (implements the ArrayAccess interface).
+     *
+     * @param string $offset The parameter name
+     * @param string $value  The parameter value
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetSet($offset, $value)
     {
-      $this->setAttribute($name, true, 'symfony/user/sfUser/flash/remove');
+        $this->setAttribute($offset, $value);
     }
-  }
-
-  /**
-   * Gets a flash variable.
-   *
-   * @param  string $name     The name of the flash variable
-   * @param  string $default  The default value returned when named variable does not exist.
-   *
-   * @return mixed The value of the flash variable
-   */
-  public function getFlash($name, $default = null)
-  {
-    if (!$this->options['use_flash'])
+
+    /**
+     * Unsets the user attribute associated with the offset (implements the ArrayAccess interface).
+     *
+     * @param string $offset The parameter name
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetUnset($offset)
     {
-      return $default;
+        $this->getAttributeHolder()->remove($offset);
     }
 
-    return $this->getAttribute($name, $default, 'symfony/user/sfUser/flash');
-  }
-
-  /**
-   * Returns true if a flash variable of the specified name exists.
-   *
-   * @param  string $name  The name of the flash variable
-   *
-   * @return bool true if the variable exists, false otherwise
-   */
-  public function hasFlash($name)
-  {
-    if (!$this->options['use_flash'])
+    public function getAttributeHolder()
     {
-      return false;
+        return $this->attributeHolder;
     }
 
-    return $this->hasAttribute($name, 'symfony/user/sfUser/flash');
-  }
-
-  /**
-   * Gets culture.
-   *
-   * @return string
-   */
-  public function getCulture()
-  {
-    return $this->culture;
-  }
-
-  /**
-   * Returns true if the user attribute exists (implements the ArrayAccess interface).
-   *
-   * @param  string $name The name of the user attribute
-   *
-   * @return Boolean true if the user attribute exists, false otherwise
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetExists($name)
-  {
-    return $this->hasAttribute($name);
-  }
-
-  /**
-   * Returns the user attribute associated with the name (implements the ArrayAccess interface).
-   *
-   * @param  string $name  The offset of the value to get
-   *
-   * @return mixed The user attribute if exists, null otherwise
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetGet($name)
-  {
-    return $this->getAttribute($name, false);
-  }
-
-  /**
-   * Sets the user attribute associated with the offset (implements the ArrayAccess interface).
-   *
-   * @param string $offset The parameter name
-   * @param string $value The parameter value
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetSet($offset, $value)
-  {
-    $this->setAttribute($offset, $value);
-  }
-
-  /**
-   * Unsets the user attribute associated with the offset (implements the ArrayAccess interface).
-   *
-   * @param string $offset The parameter name
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetUnset($offset)
-  {
-    $this->getAttributeHolder()->remove($offset);
-  }
-
-  public function getAttributeHolder()
-  {
-    return $this->attributeHolder;
-  }
-
-  public function getAttribute($name, $default = null, $ns = null)
-  {
-    return $this->attributeHolder->get($name, $default, $ns);
-  }
-
-  public function hasAttribute($name, $ns = null)
-  {
-    return $this->attributeHolder->has($name, $ns);
-  }
-
-  public function setAttribute($name, $value, $ns = null)
-  {
-    return $this->attributeHolder->set($name, $value, $ns);
-  }
-
-  /**
-   * Executes the shutdown procedure.
-   */
-  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'))
+    public function getAttribute($name, $default = null, $ns = null)
     {
-      if ($this->options['logging'])
-      {
-        $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Remove old flash messages ("%s")', implode('", "', $names)))));
-      }
-
-      foreach ($names as $name)
-      {
-        $this->attributeHolder->remove($name, null, 'symfony/user/sfUser/flash');
-        $this->attributeHolder->remove($name, null, 'symfony/user/sfUser/flash/remove');
-      }
+        return $this->attributeHolder->get($name, $default, $ns);
     }
 
-    $attributes = array();
-    foreach ($this->attributeHolder->getNamespaces() as $namespace)
+    public function hasAttribute($name, $ns = null)
     {
-      $attributes[$namespace] = $this->attributeHolder->getAll($namespace);
+        return $this->attributeHolder->has($name, $ns);
     }
 
-    // write attributes to the storage
-    $this->storage->write(self::ATTRIBUTE_NAMESPACE, $attributes);
-
-    // write culture to the storage
-    $this->storage->write(self::CULTURE_NAMESPACE, $this->culture);
-  }
-
-  /**
-   * Calls methods defined via sfEventDispatcher.
-   *
-   * @param string $method     The method name
-   * @param array  $arguments  The method arguments
-   *
-   * @return mixed The returned value of the called method
-   *
-   * @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)));
-    if (!$event->isProcessed())
+    public function setAttribute($name, $value, $ns = null)
     {
-      throw new sfException(sprintf('Call to undefined method %s::%s.', get_class($this), $method));
+        return $this->attributeHolder->set($name, $value, $ns);
     }
 
-    return $event->getReturnValue();
-  }
+    /**
+     * Executes the shutdown procedure.
+     */
+    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)))));
+            }
+
+            foreach ($names as $name) {
+                $this->attributeHolder->remove($name, null, 'symfony/user/sfUser/flash');
+                $this->attributeHolder->remove($name, null, 'symfony/user/sfUser/flash/remove');
+            }
+        }
+
+        $attributes = array();
+        foreach ($this->attributeHolder->getNamespaces() as $namespace) {
+            $attributes[$namespace] = $this->attributeHolder->getAll($namespace);
+        }
+
+        // write attributes to the storage
+        $this->storage->write(self::ATTRIBUTE_NAMESPACE, $attributes);
+
+        // write culture to the storage
+        $this->storage->write(self::CULTURE_NAMESPACE, $this->culture);
+    }
 }
diff --git a/lib/util/sfBrowser.class.php b/lib/util/sfBrowser.class.php
index ec13e4460..47ef10627 100644
--- a/lib/util/sfBrowser.class.php
+++ b/lib/util/sfBrowser.class.php
@@ -11,161 +11,149 @@
 /**
  * sfBrowser simulates a browser which can surf a symfony application.
  *
- * @package    symfony
- * @subpackage util
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfBrowser extends sfBrowserBase
 {
-  protected
-    $listeners        = array(),
-    $context          = null,
-    $currentException = null,
-    $rawConfiguration = array();
-
-  /**
-   * Calls a request to a uri.
-   */
-  protected function doCall()
-  {
-    // Before getContext, it can trigger some
-    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));
-
-    $this->resetCurrentException();
-
-    // dispatch our request
-    ob_start();
-    $this->context->getController()->dispatch();
-    $retval = ob_get_clean();
-
-    // append retval to the response content
-    $this->context->getResponse()->setContent($retval);
-
-    // manually shutdown user to save current session data
-    if ($this->context->getUser())
+    protected $listeners = array();
+    protected $context;
+    protected $currentException;
+    protected $rawConfiguration = array();
+
+    /**
+     * Returns the current application context.
+     *
+     * @param bool $forceReload true to force context reload, false otherwise
+     *
+     * @return sfContext
+     */
+    public function getContext($forceReload = false)
+    {
+        if (null === $this->context || $forceReload) {
+            $isContextEmpty = null === $this->context;
+            $context = $isContextEmpty ? sfContext::getInstance() : $this->context;
+
+            // create configuration
+            $currentConfiguration = $context->getConfiguration();
+            $configuration = ProjectConfiguration::getApplicationConfiguration($currentConfiguration->getApplication(), $currentConfiguration->getEnvironment(), $currentConfiguration->isDebug());
+
+            // connect listeners
+            $configuration->getEventDispatcher()->connect('application.throw_exception', array($this, 'listenToException'));
+            foreach ($this->listeners as $name => $listener) {
+                $configuration->getEventDispatcher()->connect($name, $listener);
+            }
+
+            // create context
+            $this->context = sfContext::createInstance($configuration);
+            unset($currentConfiguration);
+
+            if (!$isContextEmpty) {
+                sfConfig::clear();
+                sfConfig::add($this->rawConfiguration);
+            } else {
+                $this->rawConfiguration = sfConfig::getAll();
+            }
+        }
+
+        return $this->context;
+    }
+
+    public function addListener($name, $listener)
+    {
+        $this->listeners[$name] = $listener;
+    }
+
+    /**
+     * Gets response.
+     *
+     * @return sfWebResponse
+     */
+    public function getResponse()
+    {
+        return $this->context->getResponse();
+    }
+
+    /**
+     * Gets request.
+     *
+     * @return sfWebRequest
+     */
+    public function getRequest()
+    {
+        return $this->context->getRequest();
+    }
+
+    /**
+     * Gets user.
+     *
+     * @return sfUser
+     */
+    public function getUser()
+    {
+        return $this->context->getUser();
+    }
+
+    /**
+     * Shutdown function to clean up and remove sessions.
+     */
+    public function shutdown()
     {
-      $this->context->getUser()->shutdown();
-      $this->context->getStorage()->shutdown();
+        parent::shutdown();
+
+        // we remove all session data
+        sfToolkit::clearDirectory(sfConfig::get('sf_test_cache_dir').'/sessions');
     }
-  }
-
-  /**
-   * Returns the current application context.
-   *
-   * @param  bool $forceReload  true to force context reload, false otherwise
-   *
-   * @return sfContext
-   */
-  public function getContext($forceReload = false)
-  {
-    if (null === $this->context || $forceReload)
+
+    /**
+     * Listener for exceptions.
+     *
+     * @param sfEvent $event The event to handle
+     */
+    public function listenToException(sfEvent $event)
     {
-      $isContextEmpty = null === $this->context;
-      $context = $isContextEmpty ? sfContext::getInstance() : $this->context;
-
-      // create configuration
-      $currentConfiguration = $context->getConfiguration();
-      $configuration = ProjectConfiguration::getApplicationConfiguration($currentConfiguration->getApplication(), $currentConfiguration->getEnvironment(), $currentConfiguration->isDebug());
-
-      // connect listeners
-      $configuration->getEventDispatcher()->connect('application.throw_exception', array($this, 'listenToException'));
-      foreach ($this->listeners as $name => $listener)
-      {
-        $configuration->getEventDispatcher()->connect($name, $listener);
-      }
-
-      // create context
-      $this->context = sfContext::createInstance($configuration);
-      unset($currentConfiguration);
-
-      if (!$isContextEmpty)
-      {
-        sfConfig::clear();
-        sfConfig::add($this->rawConfiguration);
-      }
-      else
-      {
-        $this->rawConfiguration = sfConfig::getAll();
-      }
+        $this->setCurrentException($event->getSubject());
     }
 
-    return $this->context;
-  }
-
-  public function addListener($name, $listener)
-  {
-    $this->listeners[$name] = $listener;
-  }
-
-  /**
-   * Gets response.
-   *
-   * @return sfWebResponse
-   */
-  public function getResponse()
-  {
-    return $this->context->getResponse();
-  }
-
-  /**
-   * Gets request.
-   *
-   * @return sfWebRequest
-   */
-  public function getRequest()
-  {
-    return $this->context->getRequest();
-  }
-
-  /**
-   * Gets user.
-   *
-   * @return sfUser
-   */
-  public function getUser()
-  {
-    return $this->context->getUser();
-  }
-
-  /**
-   * Shutdown function to clean up and remove sessions
-   *
-   * @return void
-   */
-  public function shutdown()
-  {
-    parent::shutdown();
-
-    // we remove all session data
-    sfToolkit::clearDirectory(sfConfig::get('sf_test_cache_dir').'/sessions');
-  }
-
-  /**
-   * Listener for exceptions
-   *
-   * @param  sfEvent $event  The event to handle
-   *
-   * @return void
-   */
-  public function listenToException(sfEvent $event)
-  {
-    $this->setCurrentException($event->getSubject());
-  }
+    /**
+     * Calls a request to a uri.
+     */
+    protected function doCall()
+    {
+        // Before getContext, it can trigger some
+        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));
+
+        $this->resetCurrentException();
+
+        // dispatch our request
+        ob_start();
+        $this->context->getController()->dispatch();
+        $retval = ob_get_clean();
+
+        // append retval to the response content
+        $this->context->getResponse()->setContent($retval);
+
+        // manually shutdown user to save current session data
+        if ($this->context->getUser()) {
+            $this->context->getUser()->shutdown();
+            $this->context->getStorage()->shutdown();
+        }
+    }
 }
 
 class sfFakeRenderingFilter extends sfFilter
 {
-  public function execute($filterChain)
-  {
-    $filterChain->execute();
+    public function execute($filterChain)
+    {
+        $filterChain->execute();
 
-    $this->context->getResponse()->sendContent();
-  }
+        $this->context->getResponse()->sendContent();
+    }
 }
diff --git a/lib/util/sfBrowserBase.class.php b/lib/util/sfBrowserBase.class.php
index 4267bb0a9..4c9929a2f 100755
--- a/lib/util/sfBrowserBase.class.php
+++ b/lib/util/sfBrowserBase.class.php
@@ -13,1016 +13,906 @@
  *
  * It implements features that is independent from the symfony controllers.
  *
- * @package    symfony
- * @subpackage util
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfBrowserBase
 {
-  protected
-    $hostname           = null,
-    $remote             = null,
-    $dom                = null,
-    $stack              = array(),
-    $stackPosition      = -1,
-    $cookieJar          = array(),
-    $fields             = array(),
-    $files              = array(),
-    $vars               = array(),
-    $defaultServerArray = array(),
-    $headers            = array(),
-    $currentException   = null,
-    $domCssSelector     = null;
-
-  /**
-   * Class constructor.
-   *
-   * @param string $hostname  Hostname to browse
-   * @param string $remote    Remote address to spook
-   * @param array  $options   Options for sfBrowser
-   *
-   * @return void
-   */
-  public function __construct($hostname = null, $remote = null, $options = array())
-  {
-    $this->initialize($hostname, $remote, $options);
-  }
-
-  /**
-   * Initializes sfBrowser - sets up environment
-   *
-   * @param string $hostname  Hostname to browse
-   * @param string $remote    Remote address to spook
-   * @param array  $options   Options for sfBrowser
-   *
-   * @return void
-   */
-  public function initialize($hostname = null, $remote = null, $options = array())
-  {
-    unset($_SERVER['argv'], $_SERVER['argc']);
-
-    // setup our fake environment
-    $this->hostname = null === $hostname ? 'localhost' : $hostname;
-    $this->remote   = null === $remote ? '127.0.0.1' : $remote;
-
-    // we set a session id (fake cookie / persistence)
-    $this->newSession();
-
-    // store default global $_SERVER array
-    $this->defaultServerArray = $_SERVER;
-
-    // register our shutdown function
-    register_shutdown_function(array($this, 'shutdown'));
-  }
-
-  /**
-   * Sets variable name
-   *
-   * @param string $name   The variable name
-   * @param mixed  $value  The value
-   *
-   * @return sfBrowserBase
-   */
-  public function setVar($name, $value)
-  {
-    $this->vars[$name] = $value;
-
-    return $this;
-  }
-
-  /**
-   * Sets a HTTP header for the very next request.
-   *
-   * @param string $header  The header name
-   * @param string $value   The header value
-   */
-  public function setHttpHeader($header, $value)
-  {
-    $this->headers[$header] = $value;
-
-    return $this;
-  }
-
-  /**
-   * Sets a cookie.
-   *
-   * @param  string  $name     The cookie name
-   * @param  string  $value    Value for the cookie
-   * @param  string  $expire   Cookie expiration period
-   * @param  string  $path     Path
-   * @param  string  $domain   Domain name
-   * @param  bool    $secure   If secure
-   * @param  bool    $httpOnly If uses only HTTP
-   *
-   * @return sfBrowserBase     This sfBrowserBase instance
-   */
-  public function setCookie($name, $value, $expire = null, $path = '/', $domain = '', $secure = false, $httpOnly = false)
-  {
-    $this->cookieJar[$name] = array(
-      'name'     => $name,
-      'value'    => $value,
-      'expire'   => $expire,
-      'path'     => $path,
-      'domain'   => $domain,
-      'secure'   => (Boolean) $secure,
-      'httpOnly' => $httpOnly,
-    );
-
-    return $this;
-  }
-
-  /**
-   * Removes a cookie by name.
-   *
-   * @param string $name   The cookie name
-   *
-   * @return sfBrowserBase This sfBrowserBase instance
-   */
-  public function removeCookie($name)
-  {
-    unset($this->cookieJar[$name]);
-
-    return $this;
-  }
-
-  /**
-   * Clears all cookies.
-   *
-   * @return sfBrowserBase This sfBrowserBase instance
-   */
-  public function clearCookies()
-  {
-    $this->cookieJar = array();
-
-    return $this;
-  }
-
-  /**
-   * Sets username and password for simulating http authentication.
-   *
-   * @param string $username  The username
-   * @param string $password  The password
-   *
-   * @return sfBrowserBase
-   */
-  public function setAuth($username, $password)
-  {
-    $this->vars['PHP_AUTH_USER'] = $username;
-    $this->vars['PHP_AUTH_PW']   = $password;
-
-    return $this;
-  }
-
-  /**
-   * Gets a uri.
-   *
-   * @param string $uri         The URI to fetch
-   * @param array  $parameters  The Request parameters
-   * @param bool   $changeStack  Change the browser history stack?
-   *
-   * @return sfBrowserBase
-   */
-  public function get($uri, $parameters = array(), $changeStack = true)
-  {
-    return $this->call($uri, 'get', $parameters, $changeStack);
-  }
-
-  /**
-   * Posts a uri.
-   *
-   * @param string $uri         The URI to fetch
-   * @param array  $parameters  The Request parameters
-   * @param bool   $changeStack  Change the browser history stack?
-   *
-   * @return sfBrowserBase
-   */
-  public function post($uri, $parameters = array(), $changeStack = true)
-  {
-    return $this->call($uri, 'post', $parameters, $changeStack);
-  }
-
-  /**
-   * Calls a request to a uri.
-   *
-   * @param string $uri          The URI to fetch
-   * @param string $method       The request method
-   * @param array  $parameters   The Request parameters
-   * @param bool   $changeStack  Change the browser history stack?
-   *
-   * @return sfBrowserBase
-   */
-  public function call($uri, $method = 'get', $parameters = array(), $changeStack = true)
-  {
-    // check that the previous call() hasn't returned an uncatched exception
-    $this->checkCurrentExceptionIsEmpty();
-
-    $uri = $this->fixUri($uri);
-
-    // add uri to the stack
-    if ($changeStack)
+    protected $hostname;
+    protected $remote;
+    protected $dom;
+    protected $stack = array();
+    protected $stackPosition = -1;
+    protected $cookieJar = array();
+    protected $fields = array();
+    protected $files = array();
+    protected $vars = array();
+    protected $defaultServerArray = array();
+    protected $headers = array();
+    protected $currentException;
+    protected $domCssSelector;
+
+    /**
+     * Class constructor.
+     *
+     * @param string $hostname Hostname to browse
+     * @param string $remote   Remote address to spook
+     * @param array  $options  Options for sfBrowser
+     */
+    public function __construct($hostname = null, $remote = null, $options = array())
+    {
+        $this->initialize($hostname, $remote, $options);
+    }
+
+    /**
+     * Initializes sfBrowser - sets up environment.
+     *
+     * @param string $hostname Hostname to browse
+     * @param string $remote   Remote address to spook
+     * @param array  $options  Options for sfBrowser
+     */
+    public function initialize($hostname = null, $remote = null, $options = array())
+    {
+        unset($_SERVER['argv'], $_SERVER['argc']);
+
+        // setup our fake environment
+        $this->hostname = null === $hostname ? 'localhost' : $hostname;
+        $this->remote = null === $remote ? '127.0.0.1' : $remote;
+
+        // we set a session id (fake cookie / persistence)
+        $this->newSession();
+
+        // store default global $_SERVER array
+        $this->defaultServerArray = $_SERVER;
+
+        // register our shutdown function
+        register_shutdown_function(array($this, 'shutdown'));
+    }
+
+    /**
+     * Sets variable name.
+     *
+     * @param string $name  The variable name
+     * @param mixed  $value The value
+     *
+     * @return sfBrowserBase
+     */
+    public function setVar($name, $value)
+    {
+        $this->vars[$name] = $value;
+
+        return $this;
+    }
+
+    /**
+     * Sets a HTTP header for the very next request.
+     *
+     * @param string $header The header name
+     * @param string $value  The header value
+     */
+    public function setHttpHeader($header, $value)
+    {
+        $this->headers[$header] = $value;
+
+        return $this;
+    }
+
+    /**
+     * Sets a cookie.
+     *
+     * @param string $name     The cookie name
+     * @param string $value    Value for the cookie
+     * @param string $expire   Cookie expiration period
+     * @param string $path     Path
+     * @param string $domain   Domain name
+     * @param bool   $secure   If secure
+     * @param bool   $httpOnly If uses only HTTP
+     *
+     * @return sfBrowserBase This sfBrowserBase instance
+     */
+    public function setCookie($name, $value, $expire = null, $path = '/', $domain = '', $secure = false, $httpOnly = false)
+    {
+        $this->cookieJar[$name] = array(
+            'name' => $name,
+            'value' => $value,
+            'expire' => $expire,
+            'path' => $path,
+            'domain' => $domain,
+            'secure' => (bool) $secure,
+            'httpOnly' => $httpOnly,
+        );
+
+        return $this;
+    }
+
+    /**
+     * Removes a cookie by name.
+     *
+     * @param string $name The cookie name
+     *
+     * @return sfBrowserBase This sfBrowserBase instance
+     */
+    public function removeCookie($name)
     {
-      $this->stack = array_slice($this->stack, 0, $this->stackPosition + 1);
-      $this->stack[] = array(
-        'uri'        => $uri,
-        'method'     => $method,
-        'parameters' => $parameters,
-      );
-      $this->stackPosition = count($this->stack) - 1;
-    }
+        unset($this->cookieJar[$name]);
 
-    list($path, $queryString) = false !== ($pos = strpos($uri, '?')) ? array(substr($uri, 0, $pos), substr($uri, $pos + 1)) : array($uri, '');
-    $queryString = html_entity_decode($queryString);
-
-    // remove anchor
-    $path = preg_replace('/#.*/', '', $path);
-
-    // removes all fields from previous request
-    $this->fields = array();
-
-    // prepare the request object
-    $_SERVER = $this->defaultServerArray;
-    $_SERVER['HTTP_HOST']       = $this->hostname;
-    $_SERVER['SERVER_NAME']     = $_SERVER['HTTP_HOST'];
-    $_SERVER['SERVER_PORT']     = 80;
-    $_SERVER['HTTP_USER_AGENT'] = 'PHP5/CLI';
-    $_SERVER['REMOTE_ADDR']     = $this->remote;
-    $_SERVER['REQUEST_METHOD']  = strtoupper($method);
-    $_SERVER['PATH_INFO']       = $path;
-    $_SERVER['REQUEST_URI']     = '/index.php'.$uri;
-    $_SERVER['SCRIPT_NAME']     = '/index.php';
-    $_SERVER['SCRIPT_FILENAME'] = '/index.php';
-    $_SERVER['QUERY_STRING']    = $queryString;
-
-    if ($this->stackPosition >= 1)
-    {
-      $_SERVER['HTTP_REFERER'] = sprintf('http%s://%s%s', isset($this->defaultServerArray['HTTPS']) ? 's' : '', $this->hostname, $this->stack[$this->stackPosition - 1]['uri']);
-    }
+        return $this;
+    }
+
+    /**
+     * Clears all cookies.
+     *
+     * @return sfBrowserBase This sfBrowserBase instance
+     */
+    public function clearCookies()
+    {
+        $this->cookieJar = array();
+
+        return $this;
+    }
+
+    /**
+     * Sets username and password for simulating http authentication.
+     *
+     * @param string $username The username
+     * @param string $password The password
+     *
+     * @return sfBrowserBase
+     */
+    public function setAuth($username, $password)
+    {
+        $this->vars['PHP_AUTH_USER'] = $username;
+        $this->vars['PHP_AUTH_PW'] = $password;
+
+        return $this;
+    }
+
+    /**
+     * Gets a uri.
+     *
+     * @param string $uri         The URI to fetch
+     * @param array  $parameters  The Request parameters
+     * @param bool   $changeStack Change the browser history stack?
+     *
+     * @return sfBrowserBase
+     */
+    public function get($uri, $parameters = array(), $changeStack = true)
+    {
+        return $this->call($uri, 'get', $parameters, $changeStack);
+    }
+
+    /**
+     * Posts a uri.
+     *
+     * @param string $uri         The URI to fetch
+     * @param array  $parameters  The Request parameters
+     * @param bool   $changeStack Change the browser history stack?
+     *
+     * @return sfBrowserBase
+     */
+    public function post($uri, $parameters = array(), $changeStack = true)
+    {
+        return $this->call($uri, 'post', $parameters, $changeStack);
+    }
+
+    /**
+     * Calls a request to a uri.
+     *
+     * @param string $uri         The URI to fetch
+     * @param string $method      The request method
+     * @param array  $parameters  The Request parameters
+     * @param bool   $changeStack Change the browser history stack?
+     *
+     * @return sfBrowserBase
+     */
+    public function call($uri, $method = 'get', $parameters = array(), $changeStack = true)
+    {
+        // check that the previous call() hasn't returned an uncatched exception
+        $this->checkCurrentExceptionIsEmpty();
+
+        $uri = $this->fixUri($uri);
+
+        // add uri to the stack
+        if ($changeStack) {
+            $this->stack = array_slice($this->stack, 0, $this->stackPosition + 1);
+            $this->stack[] = array(
+                'uri' => $uri,
+                'method' => $method,
+                'parameters' => $parameters,
+            );
+            $this->stackPosition = count($this->stack) - 1;
+        }
 
-    foreach ($this->vars as $key => $value)
-    {
-      $_SERVER[strtoupper($key)] = $value;
-    }
+        list($path, $queryString) = false !== ($pos = strpos($uri, '?')) ? array(substr($uri, 0, $pos), substr($uri, $pos + 1)) : array($uri, '');
+        $queryString = html_entity_decode($queryString);
+
+        // remove anchor
+        $path = preg_replace('/#.*/', '', $path);
+
+        // removes all fields from previous request
+        $this->fields = array();
+
+        // prepare the request object
+        $_SERVER = $this->defaultServerArray;
+        $_SERVER['HTTP_HOST'] = $this->hostname;
+        $_SERVER['SERVER_NAME'] = $_SERVER['HTTP_HOST'];
+        $_SERVER['SERVER_PORT'] = 80;
+        $_SERVER['HTTP_USER_AGENT'] = 'PHP5/CLI';
+        $_SERVER['REMOTE_ADDR'] = $this->remote;
+        $_SERVER['REQUEST_METHOD'] = strtoupper($method);
+        $_SERVER['PATH_INFO'] = $path;
+        $_SERVER['REQUEST_URI'] = '/index.php'.$uri;
+        $_SERVER['SCRIPT_NAME'] = '/index.php';
+        $_SERVER['SCRIPT_FILENAME'] = '/index.php';
+        $_SERVER['QUERY_STRING'] = $queryString;
+
+        if ($this->stackPosition >= 1) {
+            $_SERVER['HTTP_REFERER'] = sprintf('http%s://%s%s', isset($this->defaultServerArray['HTTPS']) ? 's' : '', $this->hostname, $this->stack[$this->stackPosition - 1]['uri']);
+        }
 
-    foreach ($this->headers as $header => $value)
-    {
-      $_SERVER['HTTP_'.strtoupper(str_replace('-', '_', $header))] = $value;
-    }
-    $this->headers = array();
+        foreach ($this->vars as $key => $value) {
+            $_SERVER[strtoupper($key)] = $value;
+        }
 
-    // request parameters
-    $_GET = $_POST = array();
-    if (in_array(strtoupper($method), array('POST', 'DELETE', 'PUT', 'PATCH')))
-    {
-      if (isset($parameters['_with_csrf']) && $parameters['_with_csrf'])
-      {
-        unset($parameters['_with_csrf']);
-        $form = new BaseForm();
-        $parameters[$form->getCSRFFieldName()] = $form->getCSRFToken();
-      }
-
-      $_POST = $parameters;
-    }
-    if (strtoupper($method) == 'GET')
-    {
-      $_GET = $parameters;
-    }
+        foreach ($this->headers as $header => $value) {
+            $_SERVER['HTTP_'.strtoupper(str_replace('-', '_', $header))] = $value;
+        }
+        $this->headers = array();
+
+        // request parameters
+        $_GET = $_POST = array();
+        if (in_array(strtoupper($method), array('POST', 'DELETE', 'PUT', 'PATCH'))) {
+            if (isset($parameters['_with_csrf']) && $parameters['_with_csrf']) {
+                unset($parameters['_with_csrf']);
+                $form = new BaseForm();
+                $parameters[$form->getCSRFFieldName()] = $form->getCSRFToken();
+            }
 
-    // handle input type="file" fields
-    $_FILES = array();
-    if (count($this->files))
-    {
-      $_FILES = $this->files;
-    }
-    $this->files = array();
+            $_POST = $parameters;
+        }
+        if ('GET' == strtoupper($method)) {
+            $_GET = $parameters;
+        }
 
-    parse_str($queryString, $qs);
-    if (is_array($qs))
-    {
-      $_GET = array_merge($qs, $_GET);
-    }
+        // handle input type="file" fields
+        $_FILES = array();
+        if (count($this->files)) {
+            $_FILES = $this->files;
+        }
+        $this->files = array();
 
-    // expire cookies
-    $cookies = $this->cookieJar;
-    foreach ($cookies as $name => $cookie)
-    {
-      if ($cookie['expire'] && $cookie['expire'] < time())
-      {
-        unset($this->cookieJar[$name]);
-      }
-    }
+        parse_str($queryString, $qs);
+        if (is_array($qs)) {
+            $_GET = array_merge($qs, $_GET);
+        }
 
-    // restore cookies
-    $_COOKIE = array();
-    foreach ($this->cookieJar as $name => $cookie)
-    {
-      $_COOKIE[$name] = $cookie['value'];
-    }
+        // expire cookies
+        $cookies = $this->cookieJar;
+        foreach ($cookies as $name => $cookie) {
+            if ($cookie['expire'] && $cookie['expire'] < time()) {
+                unset($this->cookieJar[$name]);
+            }
+        }
 
-    $this->doCall();
+        // restore cookies
+        $_COOKIE = array();
+        foreach ($this->cookieJar as $name => $cookie) {
+            $_COOKIE[$name] = $cookie['value'];
+        }
 
-    $response = $this->getResponse();
+        $this->doCall();
 
-    // save cookies
-    foreach ($response->getCookies() as $name => $cookie)
-    {
-      // FIXME: deal with path, secure, ...
-      $this->cookieJar[$name] = $cookie;
-    }
+        $response = $this->getResponse();
 
-    // support for the ETag header
-    if ($etag = $response->getHttpHeader('Etag'))
-    {
-      $this->vars['HTTP_IF_NONE_MATCH'] = $etag;
-    }
-    else
-    {
-      unset($this->vars['HTTP_IF_NONE_MATCH']);
-    }
+        // save cookies
+        foreach ($response->getCookies() as $name => $cookie) {
+            // FIXME: deal with path, secure, ...
+            $this->cookieJar[$name] = $cookie;
+        }
 
-    // support for the last modified header
-    if ($lastModified = $response->getHttpHeader('Last-Modified'))
-    {
-      $this->vars['HTTP_IF_MODIFIED_SINCE'] = $lastModified;
-    }
-    else
-    {
-      unset($this->vars['HTTP_IF_MODIFIED_SINCE']);
-    }
+        // support for the ETag header
+        if ($etag = $response->getHttpHeader('Etag')) {
+            $this->vars['HTTP_IF_NONE_MATCH'] = $etag;
+        } else {
+            unset($this->vars['HTTP_IF_NONE_MATCH']);
+        }
 
-    // for HTML/XML content, create a DOM and sfDomCssSelector objects for the response content
-    $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->validateOnParse = true;
-      if ('x' == $matches[1])
-      {
-        @$this->dom->loadXML($response->getContent());
-      }
-      else
-      {
-        if ($content = $response->getContent())
-        {
-          @$this->dom->loadHTML($content);
+        // support for the last modified header
+        if ($lastModified = $response->getHttpHeader('Last-Modified')) {
+            $this->vars['HTTP_IF_MODIFIED_SINCE'] = $lastModified;
+        } else {
+            unset($this->vars['HTTP_IF_MODIFIED_SINCE']);
         }
-      }
-      $this->domCssSelector = new sfDomCssSelector($this->dom);
-    }
 
-    return $this;
-  }
-
-  /**
-   * Calls a request to a uri.
-   */
-  abstract protected function doCall();
-
-  /**
-   * Go back in the browser history stack.
-   *
-   * @return sfBrowserBase
-   */
-  public function back()
-  {
-    if ($this->stackPosition < 1)
-    {
-      throw new LogicException('You are already on the first page.');
-    }
+        // for HTML/XML content, create a DOM and sfDomCssSelector objects for the response content
+        $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->validateOnParse = true;
+            if ('x' == $matches[1]) {
+                @$this->dom->loadXML($response->getContent());
+            } else {
+                if ($content = $response->getContent()) {
+                    @$this->dom->loadHTML($content);
+                }
+            }
+            $this->domCssSelector = new sfDomCssSelector($this->dom);
+        }
 
-    --$this->stackPosition;
-    return $this->call($this->stack[$this->stackPosition]['uri'], $this->stack[$this->stackPosition]['method'], $this->stack[$this->stackPosition]['parameters'], false);
-  }
-
-  /**
-   * Go forward in the browser history stack.
-   *
-   * @return sfBrowserBase
-   */
-  public function forward()
-  {
-    if ($this->stackPosition > count($this->stack) - 2)
-    {
-      throw new LogicException('You are already on the last page.');
+        return $this;
     }
 
-    ++$this->stackPosition;
-    return $this->call($this->stack[$this->stackPosition]['uri'], $this->stack[$this->stackPosition]['method'], $this->stack[$this->stackPosition]['parameters'], false);
-  }
-
-  /**
-   * Reload the current browser.
-   *
-   * @return sfBrowserBase
-   */
-  public function reload()
-  {
-    if (-1 == $this->stackPosition)
+    /**
+     * Go back in the browser history stack.
+     *
+     * @return sfBrowserBase
+     */
+    public function back()
     {
-      throw new LogicException('No page to reload.');
-    }
+        if ($this->stackPosition < 1) {
+            throw new LogicException('You are already on the first page.');
+        }
 
-    return $this->call($this->stack[$this->stackPosition]['uri'], $this->stack[$this->stackPosition]['method'], $this->stack[$this->stackPosition]['parameters'], false);
-  }
-
-  /**
-   * Get response DOM CSS selector.
-   *
-   * @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.');
-    }
+        --$this->stackPosition;
 
-    return $this->domCssSelector;
-  }
-
-  /**
-   * Get the response DOM XPath selector.
-   *
-   * @return DOMXPath
-   *
-   * @uses getResponseDom()
-   */
-  public function getResponseDomXpath()
-  {
-    return new DOMXPath($this->getResponseDom());
-  }
-
-  /**
-   * Get response DOM.
-   *
-   * @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.');
+        return $this->call($this->stack[$this->stackPosition]['uri'], $this->stack[$this->stackPosition]['method'], $this->stack[$this->stackPosition]['parameters'], false);
     }
 
-    return $this->dom;
-  }
-
-  /**
-   * Gets response.
-   *
-   * @return sfWebResponse
-   */
-  abstract public function getResponse();
-
-  /**
-   * Gets request.
-   *
-   * @return sfWebRequest
-   */
-  abstract public function getRequest();
-
-  /**
-   * Gets user.
-   *
-   * @return sfUser
-   */
-  abstract public function getUser();
-
-  /**
-   * Gets the current exception.
-   *
-   * @return Exception
-   */
-  public function getCurrentException()
-  {
-    return $this->currentException;
-  }
-
-  /**
-   * Sets the current exception.
-   *
-   * @param Exception $exception An Exception instance
-   */
-  public function setCurrentException(Exception $exception)
-  {
-    $this->currentException = $exception;
-  }
-
-  /**
-   * Resets the current exception.
-   */
-  public function resetCurrentException()
-  {
-    $this->currentException = null;
-    sfException::clearLastException();
-  }
-
-  /**
-   * Test for an uncaught exception.
-   *
-   * @return  boolean
-   */
-  public function checkCurrentExceptionIsEmpty()
-  {
-    return null === $this->getCurrentException() || $this->getCurrentException() instanceof sfError404Exception;
-  }
-
-  /**
-   * Follow redirects?
-   *
-   * @throws sfException If request was not a redirect
-   *
-   * @return sfBrowserBase
-   */
-  public function followRedirect()
-  {
-    if (null === $this->getResponse()->getHttpHeader('Location'))
+    /**
+     * Go forward in the browser history stack.
+     *
+     * @return sfBrowserBase
+     */
+    public function forward()
     {
-      throw new LogicException('The request was not redirected.');
+        if ($this->stackPosition > count($this->stack) - 2) {
+            throw new LogicException('You are already on the last page.');
+        }
+
+        ++$this->stackPosition;
+
+        return $this->call($this->stack[$this->stackPosition]['uri'], $this->stack[$this->stackPosition]['method'], $this->stack[$this->stackPosition]['parameters'], false);
     }
 
-    return $this->get($this->getResponse()->getHttpHeader('Location'));
-  }
-
-  /**
-   * Sets a form field in the browser.
-   *
-   * @param string $name   The field name
-   * @param string $value  The field value
-   *
-   * @return sfBrowserBase
-   */
-  public function setField($name, $value)
-  {
-    // as we don't know yet the form, just store name/value pairs
-    $this->parseArgumentAsArray($name, $value, $this->fields);
-
-    return $this;
-  }
-
-  /**
-   * Simulates deselecting a checkbox or radiobutton.
-   *
-   * @param string  $name       The checkbox or radiobutton id, name or text
-   *
-   * @return sfBrowserBase
-   *
-   * @see    doSelect()
-   */
-  public function deselect($name)
-  {
-    $this->doSelect($name, false);
-
-    return $this;
-  }
-
-  /**
-   * Simulates selecting a checkbox or radiobutton.
-   *
-   * @param string  $name       The checkbox or radiobutton id, name or text
-   *
-   * @return sfBrowserBase
-   *
-   * @see    doSelect()
-   */
-  public function select($name)
-  {
-    $this->doSelect($name, true);
-
-    return $this;
-  }
-
-  /**
-   * Simulates selecting a checkbox or radiobutton.
-   *
-   * This method is called internally by the select() and deselect() methods.
-   *
-   * @param string  $name       The checkbox or radiobutton id, name or text
-   * @param boolean $selected   If true the item will be selected
-   *
-   */
-  public function doSelect($name, $selected)
-  {
-    $xpath = $this->getResponseDomXpath();
-
-    if ($element = $xpath->query(sprintf('//input[(@type="radio" or @type="checkbox") and (.="%s" or @id="%s" or @name="%s")]', $name, $name, $name))->item(0))
+    /**
+     * Reload the current browser.
+     *
+     * @return sfBrowserBase
+     */
+    public function reload()
     {
-      if ($selected)
-      {
-        if ($element->getAttribute('type') == 'radio')
-        {
-          //we need to deselect all other radio buttons with the same name
-          foreach ($xpath->query(sprintf('//input[@type="radio" and @name="%s"]', $element->getAttribute('name'))) as $radio)
-          {
-            $radio->removeAttribute('checked');
-          }
-        }
-        $element->setAttribute('checked', 'checked');
-      }
-      else
-      {
-        if ($element->getAttribute('type') == 'radio')
-        {
-          throw new InvalidArgumentException('Radiobutton cannot be deselected - Select another radiobutton to deselect the current.');
+        if (-1 == $this->stackPosition) {
+            throw new LogicException('No page to reload.');
         }
-        $element->removeAttribute('checked');
-      }
-    }
-    else
-    {
-      throw new InvalidArgumentException(sprintf('Cannot find the "%s" checkbox or radiobutton.', $name));
+
+        return $this->call($this->stack[$this->stackPosition]['uri'], $this->stack[$this->stackPosition]['method'], $this->stack[$this->stackPosition]['parameters'], false);
     }
-  }
-
-  /**
-   * Simulates a click on a link or button.
-   *
-   * Available options:
-   *
-   *  * position: The position of the linked to link if several ones have the same name
-   *              (the first one is 1, not 0)
-   *  * method:   The method to used instead of the form ones
-   *              (useful when you need to click on a link that is converted to a form with JavaScript code)
-   *
-   * @param  string|DOMElement $name      The link, button text, CSS selector or DOMElement
-   * @param  array             $arguments The arguments to pass to the link
-   * @param  array             $options   An array of options
-   *
-   * @return sfBrowserBase
-   *
-   * @uses   doClickElement() doClick() doClickCssSelector()
-   */
-  public function click($name, $arguments = array(), $options = array())
-  {
-    if ($name instanceof DOMElement)
+
+    /**
+     * Get response DOM CSS selector.
+     *
+     * @return sfDomCssSelector
+     */
+    public function getResponseDomCssSelector()
     {
-      list($uri, $method, $parameters) = $this->doClickElement($name, $arguments, $options);
+        if (null === $this->domCssSelector) {
+            throw new LogicException('The DOM is not accessible because the browser response content type is not HTML.');
+        }
+
+        return $this->domCssSelector;
     }
-    else
+
+    /**
+     * Get the response DOM XPath selector.
+     *
+     * @return DOMXPath
+     *
+     * @uses getResponseDom()
+     */
+    public function getResponseDomXpath()
     {
-      try
-      {
-        list($uri, $method, $parameters) = $this->doClick($name, $arguments, $options);
-      }
-      catch (InvalidArgumentException $e)
-      {
-        list($uri, $method, $parameters) = $this->doClickCssSelector($name, $arguments, $options);
-      }
+        return new DOMXPath($this->getResponseDom());
     }
 
-    return $this->call($uri, $method, $parameters);
-  }
-
-  /**
-   * Simulates a click on a link or button.
-   *
-   * This method is called internally by the {@link click()} method.
-   *
-   * @param  string $name      The link or button text
-   * @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 {@link call()} call
-   *
-   * @uses   getResponseDomXpath() doClickElement()
-   * @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())
-  {
-    if (false !== strpos($name, '[') || false !== strpos($name, ']'))
+    /**
+     * Get response DOM.
+     *
+     * @return sfDomCssSelector
+     */
+    public function getResponseDom()
     {
-      throw new InvalidArgumentException(sprintf('The name "%s" is not valid', $name));
+        if (null === $this->dom) {
+            throw new LogicException('The DOM is not accessible because the browser response content type is not HTML.');
+        }
+
+        return $this->dom;
     }
 
-    $query  = sprintf('//a[.="%s"]', $name);
-    $query .= sprintf('|//a/img[@alt="%s"]/ancestor::a', $name);
-    $query .= sprintf('|//input[((@type="submit" or @type="button") and @value="%s") or (@type="image" and @alt="%s")]', $name, $name);
-    $query .= sprintf('|//button[.="%s" or @id="%s" or @name="%s"]', $name, $name, $name);
+    /**
+     * Gets response.
+     *
+     * @return sfWebResponse
+     */
+    abstract public function getResponse();
+
+    /**
+     * Gets request.
+     *
+     * @return sfWebRequest
+     */
+    abstract public function getRequest();
+
+    /**
+     * Gets user.
+     *
+     * @return sfUser
+     */
+    abstract public function getUser();
 
-    if (!$list = @$this->getResponseDomXpath()->query($query))
+    /**
+     * Gets the current exception.
+     *
+     * @return Exception
+     */
+    public function getCurrentException()
     {
-      throw new InvalidArgumentException(sprintf('The name "%s" is not valid', $name));
+        return $this->currentException;
     }
 
-    $position = isset($options['position']) ? $options['position'] - 1 : 0;
-
-    if (!$item = $list->item($position))
+    /**
+     * Sets the current exception.
+     *
+     * @param Exception $exception An Exception instance
+     */
+    public function setCurrentException(Exception $exception)
     {
-      throw new InvalidArgumentException(sprintf('Cannot find the "%s" link or button (position %d).', $name, $position + 1));
+        $this->currentException = $exception;
     }
 
-    return $this->doClickElement($item, $arguments, $options);
-  }
-
-  /**
-   * Simulates a click on an element indicated by CSS selector.
-   *
-   * This method is called internally by the {@link click()} method.
-   *
-   * @param  string $selector  The CSS selector
-   * @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 {@link call()} call
-   *
-   * @uses   getResponseDomCssSelector() doClickElement()
-   * @throws InvalidArgumentException If a matching element cannot be found
-   */
-  public function doClickCssSelector($selector, $arguments = array(), $options = array())
-  {
-    $elements = $this->getResponseDomCssSelector()->matchAll($selector)->getNodes();
-    $position = isset($options['position']) ? $options['position'] - 1 : 0;
-
-    if (isset($elements[$position]))
+    /**
+     * Resets the current exception.
+     */
+    public function resetCurrentException()
     {
-      return $this->doClickElement($elements[$position], $arguments, $options);
+        $this->currentException = null;
+        sfException::clearLastException();
     }
-    else
+
+    /**
+     * Test for an uncaught exception.
+     *
+     * @return bool
+     */
+    public function checkCurrentExceptionIsEmpty()
     {
-      throw new InvalidArgumentException(sprintf('Could not find the element "%s" (position %d) in the current DOM.', $selector, $position + 1));
+        return null === $this->getCurrentException() || $this->getCurrentException() instanceof sfError404Exception;
     }
-  }
-
-  /**
-   * Simulates a click on the supplied DOM element.
-   *
-   * 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
-   *
-   * @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())
-  {
-    $method = strtolower(isset($options['method']) ? $options['method'] : 'get');
-
-    if ('a' == $item->nodeName)
+
+    /**
+     * Follow redirects?
+     *
+     * @return sfBrowserBase
+     *
+     * @throws sfException If request was not a redirect
+     */
+    public function followRedirect()
     {
-      if (in_array($method, array('post', 'put', 'delete')))
-      {
-        if (isset($options['_with_csrf']) && $options['_with_csrf'])
-        {
-          $arguments['_with_csrf'] = true;
+        if (null === $this->getResponse()->getHttpHeader('Location')) {
+            throw new LogicException('The request was not redirected.');
         }
 
-        return array($item->getAttribute('href'), $method, $arguments);
-      }
-      else
-      {
-        return array($item->getAttribute('href'), 'get', $arguments);
-      }
-    }
-    else if ('button' == $item->nodeName || ('input' == $item->nodeName && in_array($item->getAttribute('type'), array('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);
-      }
-
-      // use the ancestor form element
-      do
-      {
-        if (null === $item = $item->parentNode)
-        {
-          throw new Exception('The clicked form element does not have a form ancestor.');
+        return $this->get($this->getResponse()->getHttpHeader('Location'));
+    }
+
+    /**
+     * Sets a form field in the browser.
+     *
+     * @param string $name  The field name
+     * @param string $value The field value
+     *
+     * @return sfBrowserBase
+     */
+    public function setField($name, $value)
+    {
+        // as we don't know yet the form, just store name/value pairs
+        $this->parseArgumentAsArray($name, $value, $this->fields);
+
+        return $this;
+    }
+
+    /**
+     * Simulates deselecting a checkbox or radiobutton.
+     *
+     * @param string $name The checkbox or radiobutton id, name or text
+     *
+     * @return sfBrowserBase
+     *
+     * @see    doSelect()
+     */
+    public function deselect($name)
+    {
+        $this->doSelect($name, false);
+
+        return $this;
+    }
+
+    /**
+     * Simulates selecting a checkbox or radiobutton.
+     *
+     * @param string $name The checkbox or radiobutton id, name or text
+     *
+     * @return sfBrowserBase
+     *
+     * @see    doSelect()
+     */
+    public function select($name)
+    {
+        $this->doSelect($name, true);
+
+        return $this;
+    }
+
+    /**
+     * Simulates selecting a checkbox or radiobutton.
+     *
+     * This method is called internally by the select() and deselect() methods.
+     *
+     * @param string $name     The checkbox or radiobutton id, name or text
+     * @param bool   $selected If true the item will be selected
+     */
+    public function doSelect($name, $selected)
+    {
+        $xpath = $this->getResponseDomXpath();
+
+        if ($element = $xpath->query(sprintf('//input[(@type="radio" or @type="checkbox") and (.="%s" or @id="%s" or @name="%s")]', $name, $name, $name))->item(0)) {
+            if ($selected) {
+                if ('radio' == $element->getAttribute('type')) {
+                    // we need to deselect all other radio buttons with the same name
+                    foreach ($xpath->query(sprintf('//input[@type="radio" and @name="%s"]', $element->getAttribute('name'))) as $radio) {
+                        $radio->removeAttribute('checked');
+                    }
+                }
+                $element->setAttribute('checked', 'checked');
+            } else {
+                if ('radio' == $element->getAttribute('type')) {
+                    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));
         }
-      }
-      while ('form' != $item->nodeName);
     }
 
-    // form attributes
-    $url = $item->getAttribute('action');
-    if (!$url || '#' == $url)
-    {
-      $url = $this->stack[$this->stackPosition]['uri'];
-    }
-    $method = strtolower(isset($options['method']) ? $options['method'] : ($item->getAttribute('method') ?: 'get'));
+    /**
+     * Simulates a click on a link or button.
+     *
+     * Available options:
+     *
+     *  * position: The position of the linked to link if several ones have the same name
+     *              (the first one is 1, not 0)
+     *  * method:   The method to used instead of the form ones
+     *              (useful when you need to click on a link that is converted to a form with JavaScript code)
+     *
+     * @param DOMElement|string $name      The link, button text, CSS selector or DOMElement
+     * @param array             $arguments The arguments to pass to the link
+     * @param array             $options   An array of options
+     *
+     * @return sfBrowserBase
+     *
+     * @uses   doClickElement() doClick() doClickCssSelector()
+     */
+    public function click($name, $arguments = array(), $options = array())
+    {
+        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) {
+                list($uri, $method, $parameters) = $this->doClickCssSelector($name, $arguments, $options);
+            }
+        }
 
-    // merge form default values and arguments
-    $defaults = array();
-    $arguments = sfToolkit::arrayDeepMerge($this->fields, $arguments);
+        return $this->call($uri, $method, $parameters);
+    }
+
+    /**
+     * Simulates a click on a link or button.
+     *
+     * This method is called internally by the {@link click()} method.
+     *
+     * @param string $name      The link or button text
+     * @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 {@link call()} call
+     *
+     * @uses   getResponseDomXpath() doClickElement()
+     *
+     * @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())
+    {
+        if (false !== strpos($name, '[') || false !== strpos($name, ']')) {
+            throw new InvalidArgumentException(sprintf('The name "%s" is not valid', $name));
+        }
 
-    $xpath = $this->getResponseDomXpath();
-    foreach ($xpath->query('descendant::input | descendant::textarea | descendant::select', $item) as $element)
-    {
-      if ($element->hasAttribute('disabled'))
-      {
-        continue;
-      }
-
-      $elementName = $element->getAttribute('name');
-      $nodeName    = $element->nodeName;
-      $value       = null;
-
-      if ($nodeName == 'input' && ($element->getAttribute('type') == 'checkbox' || $element->getAttribute('type') == 'radio'))
-      {
-        if ($element->getAttribute('checked'))
-        {
-          $value = $element->hasAttribute('value') ? $element->getAttribute('value') : '1';
+        $query = sprintf('//a[.="%s"]', $name);
+        $query .= sprintf('|//a/img[@alt="%s"]/ancestor::a', $name);
+        $query .= sprintf('|//input[((@type="submit" or @type="button") and @value="%s") or (@type="image" and @alt="%s")]', $name, $name);
+        $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));
         }
-      }
-      else if ($nodeName == 'input' && $element->getAttribute('type') == 'file')
-      {
-        $filename = array_key_exists($elementName, $arguments) ? $arguments[$elementName] : sfToolkit::getArrayValueForPath($arguments, $elementName, '');
-
-        if (is_readable($filename))
-        {
-          $fileError = UPLOAD_ERR_OK;
-          $fileSize = filesize($filename);
+
+        $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));
         }
-        else
-        {
-          $fileError = UPLOAD_ERR_NO_FILE;
-          $fileSize = 0;
+
+        return $this->doClickElement($item, $arguments, $options);
+    }
+
+    /**
+     * Simulates a click on an element indicated by CSS selector.
+     *
+     * This method is called internally by the {@link click()} method.
+     *
+     * @param string $selector  The CSS selector
+     * @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 {@link call()} call
+     *
+     * @uses   getResponseDomCssSelector() doClickElement()
+     *
+     * @throws InvalidArgumentException If a matching element cannot be found
+     */
+    public function doClickCssSelector($selector, $arguments = array(), $options = array())
+    {
+        $elements = $this->getResponseDomCssSelector()->matchAll($selector)->getNodes();
+        $position = isset($options['position']) ? $options['position'] - 1 : 0;
+
+        if (isset($elements[$position])) {
+            return $this->doClickElement($elements[$position], $arguments, $options);
         }
 
-        unset($arguments[$elementName]);
-
-        $this->parseArgumentAsArray($elementName, array('name' => basename($filename), 'type' => '', 'tmp_name' => $filename, 'error' => $fileError, 'size' => $fileSize), $this->files);
-      }
-      else if ('input' == $nodeName && !in_array($element->getAttribute('type'), array('submit', 'button', 'image')))
-      {
-        $value = $element->getAttribute('value');
-      }
-      else if ($nodeName == 'textarea')
-      {
-        $value = '';
-        foreach ($element->childNodes as $el)
-        {
-          $value .= $this->getResponseDom()->saveXML($el);
+        throw new InvalidArgumentException(sprintf('Could not find the element "%s" (position %d) in the current DOM.', $selector, $position + 1));
+    }
+
+    /**
+     * Simulates a click on the supplied DOM element.
+     *
+     * 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
+     *
+     * @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())
+    {
+        $method = strtolower(isset($options['method']) ? $options['method'] : 'get');
+
+        if ('a' == $item->nodeName) {
+            if (in_array($method, array('post', 'put', 'delete'))) {
+                if (isset($options['_with_csrf']) && $options['_with_csrf']) {
+                    $arguments['_with_csrf'] = true;
+                }
+
+                return array($item->getAttribute('href'), $method, $arguments);
+            }
+
+            return array($item->getAttribute('href'), 'get', $arguments);
         }
-      }
-      else if ($nodeName == 'select')
-      {
-        if ($multiple = $element->hasAttribute('multiple'))
-        {
-          $elementName = str_replace('[]', '', $elementName);
-          $value = array();
+        if ('button' == $item->nodeName || ('input' == $item->nodeName && in_array($item->getAttribute('type'), array('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);
+            }
+
+            // use the ancestor form element
+            do {
+                if (null === $item = $item->parentNode) {
+                    throw new Exception('The clicked form element does not have a form ancestor.');
+                }
+            } while ('form' != $item->nodeName);
         }
-        else
-        {
-          $value = null;
+
+        // form attributes
+        $url = $item->getAttribute('action');
+        if (!$url || '#' == $url) {
+            $url = $this->stack[$this->stackPosition]['uri'];
         }
+        $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);
 
-        $found = false;
-        foreach ($xpath->query('descendant::option', $element) as $option)
-        {
-          if ($option->getAttribute('selected'))
-          {
-            $found = true;
-            if ($multiple)
-            {
-              $value[] = $option->getAttribute('value');
+        $xpath = $this->getResponseDomXpath();
+        foreach ($xpath->query('descendant::input | descendant::textarea | descendant::select', $item) as $element) {
+            if ($element->hasAttribute('disabled')) {
+                continue;
             }
-            else
-            {
-              $value = $option->getAttribute('value');
+
+            $elementName = $element->getAttribute('name');
+            $nodeName = $element->nodeName;
+            $value = null;
+
+            if ('input' == $nodeName && ('checkbox' == $element->getAttribute('type') || 'radio' == $element->getAttribute('type'))) {
+                if ($element->getAttribute('checked')) {
+                    $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, '');
+
+                if (is_readable($filename)) {
+                    $fileError = UPLOAD_ERR_OK;
+                    $fileSize = filesize($filename);
+                } else {
+                    $fileError = UPLOAD_ERR_NO_FILE;
+                    $fileSize = 0;
+                }
+
+                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'))) {
+                $value = $element->getAttribute('value');
+            } elseif ('textarea' == $nodeName) {
+                $value = '';
+                foreach ($element->childNodes as $el) {
+                    $value .= $this->getResponseDom()->saveXML($el);
+                }
+            } elseif ('select' == $nodeName) {
+                if ($multiple = $element->hasAttribute('multiple')) {
+                    $elementName = str_replace('[]', '', $elementName);
+                    $value = array();
+                } else {
+                    $value = null;
+                }
+
+                $found = false;
+                foreach ($xpath->query('descendant::option', $element) as $option) {
+                    if ($option->getAttribute('selected')) {
+                        $found = true;
+                        if ($multiple) {
+                            $value[] = $option->getAttribute('value');
+                        } else {
+                            $value = $option->getAttribute('value');
+                        }
+                    }
+                }
+
+                // 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) {
+                    $value = $option->getAttribute('value');
+                }
+            }
+
+            if (null !== $value) {
+                $this->parseArgumentAsArray($elementName, $value, $defaults);
             }
-          }
         }
 
-        // 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)
-        {
-          $value = $option->getAttribute('value');
+        // create request parameters
+        $arguments = sfToolkit::arrayDeepMerge($defaults, $arguments);
+        if (in_array($method, array('post', 'put', 'delete'))) {
+            return array($url, $method, $arguments);
         }
-      }
 
-      if (null !== $value)
-      {
-        $this->parseArgumentAsArray($elementName, $value, $defaults);
-      }
-    }
+        $queryString = is_array($arguments) ? http_build_query($arguments, '', '&') : '';
+        $sep = false === strpos($url, '?') ? '?' : '&';
 
-    // create request parameters
-    $arguments = sfToolkit::arrayDeepMerge($defaults, $arguments);
-    if (in_array($method, array('post', 'put', 'delete')))
-    {
-      return array($url, $method, $arguments);
+        return array($url.($queryString ? $sep.$queryString : ''), 'get', array());
     }
-    else
+
+    /**
+     * Reset browser to original state.
+     *
+     * @return sfBrowserBase
+     */
+    public function restart()
     {
-      $queryString = is_array($arguments) ? http_build_query($arguments, '', '&') : '';
-      $sep = false === strpos($url, '?') ? '?' : '&';
+        $this->newSession();
+        $this->cookieJar = array();
+        $this->stack = array();
+        $this->fields = array();
+        $this->vars = array();
+        $this->dom = null;
+        $this->stackPosition = -1;
 
-      return array($url.($queryString ? $sep.$queryString : ''), 'get', array());
+        return $this;
     }
-  }
-
-  /**
-   * Parses arguments as array
-   *
-   * @param string $name   The argument name
-   * @param string $value  The argument value
-   * @param array  $vars
-   */
-  protected function parseArgumentAsArray($name, $value, &$vars)
-  {
-    if (false !== $pos = strpos($name, '['))
+
+    /**
+     * Shutdown function to clean up and remove sessions.
+     */
+    public function shutdown()
     {
-      $var = &$vars;
-      $tmps = array_filter(preg_split('/(\[ | \[\] | \])/x', $name), function($s) { return $s !== ''; });
-      foreach ($tmps as $tmp)
-      {
-        $var = &$var[$tmp];
-      }
-      if ($var && '[]' === substr($name, -2))
-      {
-        if (!is_array($var))
-        {
-          $var = array($var);
-        }
-        $var[] = $value;
-      }
-      else
-      {
-        $var = $value;
-      }
+        $this->checkCurrentExceptionIsEmpty();
     }
-    else
+
+    /**
+     * Fixes uri removing # declarations and front controller.
+     *
+     * @param string $uri The URI to fix
+     *
+     * @return string The fixed uri
+     */
+    public function fixUri($uri)
     {
-      $vars[$name] = $value;
+        // remove absolute information if needed (to be able to do follow redirects, click on links, ...)
+        if (0 === strpos($uri, 'http')) {
+            // detect secure request
+            if (0 === strpos($uri, 'https')) {
+                $this->defaultServerArray['HTTPS'] = 'on';
+            } else {
+                unset($this->defaultServerArray['HTTPS']);
+            }
+
+            $uri = preg_replace('#^https?\://[^/]+/#', '/', $uri);
+        }
+        $uri = str_replace('/index.php', '', $uri);
+
+        // # as a uri
+        if ($uri && '#' == $uri[0]) {
+            $uri = $this->stack[$this->stackPosition]['uri'].$uri;
+        }
+
+        return $uri;
     }
-  }
-
-  /**
-   * Reset browser to original state
-   *
-   * @return sfBrowserBase
-   */
-  public function restart()
-  {
-    $this->newSession();
-    $this->cookieJar     = array();
-    $this->stack         = array();
-    $this->fields        = array();
-    $this->vars          = array();
-    $this->dom           = null;
-    $this->stackPosition = -1;
-
-    return $this;
-  }
-
-  /**
-   * Shutdown function to clean up and remove sessions
-   *
-   * @return void
-   */
-  public function shutdown()
-  {
-    $this->checkCurrentExceptionIsEmpty();
-  }
-
-  /**
-   * Fixes uri removing # declarations and front controller.
-   *
-   * @param  string $uri  The URI to fix
-   * @return string The fixed uri
-   */
-  public function fixUri($uri)
-  {
-    // remove absolute information if needed (to be able to do follow redirects, click on links, ...)
-    if (0 === strpos($uri, 'http'))
+
+    /**
+     * Calls a request to a uri.
+     */
+    abstract protected function doCall();
+
+    /**
+     * Parses arguments as array.
+     *
+     * @param string $name  The argument name
+     * @param string $value The argument value
+     * @param array  $vars
+     */
+    protected function parseArgumentAsArray($name, $value, &$vars)
     {
-      // detect secure request
-      if (0 === strpos($uri, 'https'))
-      {
-        $this->defaultServerArray['HTTPS'] = 'on';
-      }
-      else
-      {
-        unset($this->defaultServerArray['HTTPS']);
-      }
-
-      $uri = preg_replace('#^https?\://[^/]+/#', '/', $uri);
+        if (false !== $pos = strpos($name, '[')) {
+            $var = &$vars;
+            $tmps = array_filter(preg_split('/(\[ | \[\] | \])/x', $name), function ($s) { return '' !== $s; });
+            foreach ($tmps as $tmp) {
+                $var = &$var[$tmp];
+            }
+            if ($var && '[]' === substr($name, -2)) {
+                if (!is_array($var)) {
+                    $var = array($var);
+                }
+                $var[] = $value;
+            } else {
+                $var = $value;
+            }
+        } else {
+            $vars[$name] = $value;
+        }
     }
-    $uri = str_replace('/index.php', '', $uri);
 
-    // # as a uri
-    if ($uri && '#' == $uri[0])
+    /**
+     * Creates a new session in the browser.
+     */
+    protected function newSession()
     {
-      $uri = $this->stack[$this->stackPosition]['uri'].$uri;
+        $this->defaultServerArray['session_id'] = $_SERVER['session_id'] = md5(uniqid(mt_rand(), true));
     }
-
-    return $uri;
-  }
-
-  /**
-   * Creates a new session in the browser.
-   *
-   * @return void
-   */
-  protected function newSession()
-  {
-    $this->defaultServerArray['session_id'] = $_SERVER['session_id'] = md5(uniqid(mt_rand(), true));
-  }
 }
diff --git a/lib/util/sfCallable.class.php b/lib/util/sfCallable.class.php
index f540858d7..1251393e3 100644
--- a/lib/util/sfCallable.class.php
+++ b/lib/util/sfCallable.class.php
@@ -11,54 +11,51 @@
 /**
  * sfCallable represents a PHP callable.
  *
- * @package    symfony
- * @subpackage util
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfCallable
 {
-  protected
-    $callable = null;
-
-  /**
-   * Constructor.
-   *
-   * @param mixed $callable  A valid PHP callable (must be valid when calling the call() method)
-   */
-  public function __construct($callable)
-  {
-    $this->callable = $callable;
-  }
+    protected $callable;
 
-  /**
-   * Returns the current callable.
-   *
-   * @return mixed The current callable
-   */
-  public function getCallable()
-  {
-    return $this->callable;
-  }
+    /**
+     * Constructor.
+     *
+     * @param mixed $callable A valid PHP callable (must be valid when calling the call() method)
+     */
+    public function __construct($callable)
+    {
+        $this->callable = $callable;
+    }
 
-  /**
-   * Calls the current callable with the given arguments.
-   *
-   * The callable is called with the arguments given to this method.
-   *
-   * This method throws an exception if the callable is not valid.
-   * This check is not done during the object construction to allow
-   * you to load the callable as late as possible.
-   */
-  public function call()
-  {
-    if (!is_callable($this->callable))
+    /**
+     * Returns the current callable.
+     *
+     * @return mixed The current callable
+     */
+    public function getCallable()
     {
-      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))));
+        return $this->callable;
     }
 
-    $arguments = func_get_args();
+    /**
+     * Calls the current callable with the given arguments.
+     *
+     * The callable is called with the arguments given to this method.
+     *
+     * This method throws an exception if the callable is not valid.
+     * This check is not done during the object construction to allow
+     * you to load the callable as late as possible.
+     */
+    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))));
+        }
+
+        $arguments = func_get_args();
 
-    return call_user_func_array($this->callable, $arguments);
-  }
+        return call_user_func_array($this->callable, $arguments);
+    }
 }
diff --git a/lib/util/sfClassManipulator.class.php b/lib/util/sfClassManipulator.class.php
index 9f3ade68f..cd0e09c6a 100644
--- a/lib/util/sfClassManipulator.class.php
+++ b/lib/util/sfClassManipulator.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -11,304 +11,260 @@
 /**
  * sfClassManipulator manipulates class code.
  *
- * @package    symfony
- * @subpackage util
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfClassManipulator
 {
-  static protected $signatureTokens = array(
-    T_FINAL,
-    T_ABSTRACT,
-    T_STATIC,
-    T_PUBLIC,
-    T_PROTECTED,
-    T_PRIVATE,
-    T_FUNCTION,
-  );
-
-  protected $code = '', $file = false;
-
-  /**
-   * Constructor.
-   *
-   * @param string $code The code to manipulate
-   */
-  public function __construct($code)
-  {
-    $this->code = $code;
-  }
-
-  /**
-   * Creates a manipulator object from a file.
-   *
-   * @param string $file A file name
-   *
-   * @return sfClassManipulator A sfClassManipulator instance
-   */
-  static public function fromFile($file)
-  {
-    $manipulator = new self(file_get_contents($file));
-    $manipulator->setFile($file);
-
-    return $manipulator;
-  }
-
-  /**
-   * Saves the code back to the associated file.
-   *
-   * This only works if you have bound the instance with a file with the setFile() method.
-   *
-   * @throw LogicException if no file is associated with the instance
-   */
-  public function save()
-  {
-    if (!$this->file)
+    protected static $signatureTokens = array(
+        T_FINAL,
+        T_ABSTRACT,
+        T_STATIC,
+        T_PUBLIC,
+        T_PROTECTED,
+        T_PRIVATE,
+        T_FUNCTION,
+    );
+
+    protected $code = '';
+    protected $file = false;
+
+    /**
+     * Constructor.
+     *
+     * @param string $code The code to manipulate
+     */
+    public function __construct($code)
     {
-      throw new LogicException('Unable to save the code as no file has been provided.');
+        $this->code = $code;
     }
 
-    file_put_contents($this->file, $this->code);
-  }
-
-  /**
-   * Gets the modified code.
-   *
-   * @return string The modified code
-   */
-  public function getCode()
-  {
-    return $this->code;
-  }
-
-  /**
-   * Gets the associated file.
-   *
-   * @return string The associated file
-   */
-  public function getFile()
-  {
-    return $this->file;
-  }
-
-  /**
-   * Sets the file associated with this instance.
-   *
-   * @param string A file name
-   */
-  public function setFile($file)
-  {
-    $this->file = $file;
-  }
-
-  /**
-   * Wraps an existing method with some code.
-   *
-   * @param string $method     The method name to change
-   * @param string $topCode    The code to add at the top of the method
-   * @param string $bottomCode The code to add at the bottom of the method
-   */
-  public function wrapMethod($method, $topCode = '', $bottomCode = '')
-  {
-    $code = '';
-    $insideSetup = -1;
-    $parens = 0;
-    foreach (token_get_all($this->code) as $token)
+    /**
+     * Creates a manipulator object from a file.
+     *
+     * @param string $file A file name
+     *
+     * @return sfClassManipulator A sfClassManipulator instance
+     */
+    public static function fromFile($file)
     {
-      if (isset($token[1]))
-      {
-        if (-1 == $insideSetup && T_FUNCTION == $token[0])
-        {
-          $insideSetup = 0;
-        }
-        elseif (0 == $insideSetup && T_STRING == $token[0])
-        {
-          $insideSetup = $method == $token[1] ? 1 : -1;
-        }
+        $manipulator = new self(file_get_contents($file));
+        $manipulator->setFile($file);
 
-        $code .= $token[1];
-      }
-      else
-      {
-        if (1 == $insideSetup && '{' == $token)
-        {
-          if (!$parens)
-          {
-            $code .= $topCode ? $token.PHP_EOL.'    '.$topCode : $token;
-          }
-          else
-          {
-            $code .= $token;
-          }
-
-          ++$parens;
-        }
-        elseif (1 == $insideSetup && '}' == $token)
-        {
-          --$parens;
-
-          if (!$parens)
-          {
-            $insideSetup = -1;
-
-            $code .= $bottomCode ? '  '.$bottomCode.PHP_EOL.'  '.$token : $token;
-          }
-          else
-          {
-            $code .= $token;
-          }
-        }
-        else
-        {
-          $code .= $token;
+        return $manipulator;
+    }
+
+    /**
+     * Saves the code back to the associated file.
+     *
+     * This only works if you have bound the instance with a file with the setFile() method.
+     *
+     * @throw LogicException if no file is associated with the instance
+     */
+    public function save()
+    {
+        if (!$this->file) {
+            throw new LogicException('Unable to save the code as no file has been provided.');
         }
-      }
+
+        file_put_contents($this->file, $this->code);
     }
 
-    return $this->code = $code;
-  }
-
-  /**
-   * Filters each line of the given method through a callable.
-   * 
-   * @param string $method   The method name
-   * @param mixed  $callable A PHP callable that accepts and returns one line of PHP code
-   */
-  public function filterMethod($method, $callable)
-  {
-    $line = '';
-    $code = '';
-    $insideSetup = -1;
-    $parens = 0;
-    $break = false;
-
-    $tokens = token_get_all($this->code);
-    for ($i = 0; $i < count($tokens); $i++)
+    /**
+     * Gets the modified code.
+     *
+     * @return string The modified code
+     */
+    public function getCode()
     {
-      $token = $tokens[$i];
+        return $this->code;
+    }
 
-      if (is_array($token))
-      {
-        $line .= $token[1];
+    /**
+     * Gets the associated file.
+     *
+     * @return string The associated file
+     */
+    public function getFile()
+    {
+        return $this->file;
+    }
 
-        if (-1 == $insideSetup && T_FUNCTION == $token[0])
-        {
-          $insideSetup = 0;
-        }
-        elseif (0 == $insideSetup && T_STRING == $token[0])
-        {
-          $insideSetup = $method == $token[1] ? 1 : -1;
-        }
-      }
-      else
-      {
-        if (1 == $insideSetup && '{' == $token)
-        {
-          ++$parens;
-        }
-        elseif (1 == $insideSetup && '}' == $token)
-        {
-          --$parens;
-
-          if (!$parens)
-          {
-            $break = true;
-          }
-        }
+    /**
+     * Sets the file associated with this instance.
+     *
+     * @param string A file name
+     * @param mixed $file
+     */
+    public function setFile($file)
+    {
+        $this->file = $file;
+    }
 
-        $line .= $token;
-      }
-
-      $lines = preg_split('/(\r?\n)/', $line, null, PREG_SPLIT_DELIM_CAPTURE);
-      if (count($lines) > 1 || $break)
-      {
-        $line = $break ? '' : array_pop($lines);
-        foreach (array_chunk($lines, 2) as $chunk)
-        {
-          list($l, $eol) = array_pad($chunk, 2, '');
-
-          if (1 == $insideSetup)
-          {
-            list($before, $setup) = $this->splitSetup($l);
-            $code .= $before;
-            $code .= call_user_func($callable, $setup.$eol);
-          }
-          else
-          {
-            $code .= $l.$eol;
-          }
+    /**
+     * Wraps an existing method with some code.
+     *
+     * @param string $method     The method name to change
+     * @param string $topCode    The code to add at the top of the method
+     * @param string $bottomCode The code to add at the bottom of the method
+     */
+    public function wrapMethod($method, $topCode = '', $bottomCode = '')
+    {
+        $code = '';
+        $insideSetup = -1;
+        $parens = 0;
+        foreach (token_get_all($this->code) as $token) {
+            if (isset($token[1])) {
+                if (-1 == $insideSetup && T_FUNCTION == $token[0]) {
+                    $insideSetup = 0;
+                } elseif (0 == $insideSetup && T_STRING == $token[0]) {
+                    $insideSetup = $method == $token[1] ? 1 : -1;
+                }
+
+                $code .= $token[1];
+            } else {
+                if (1 == $insideSetup && '{' == $token) {
+                    if (!$parens) {
+                        $code .= $topCode ? $token.PHP_EOL.'    '.$topCode : $token;
+                    } else {
+                        $code .= $token;
+                    }
+
+                    ++$parens;
+                } elseif (1 == $insideSetup && '}' == $token) {
+                    --$parens;
+
+                    if (!$parens) {
+                        $insideSetup = -1;
+
+                        $code .= $bottomCode ? '  '.$bottomCode.PHP_EOL.'  '.$token : $token;
+                    } else {
+                        $code .= $token;
+                    }
+                } else {
+                    $code .= $token;
+                }
+            }
         }
-      }
 
-      if ($break)
-      {
-        $insideSetup = -1;
-        $break = false;
-      }
+        return $this->code = $code;
     }
 
-    if ($line)
+    /**
+     * Filters each line of the given method through a callable.
+     *
+     * @param string $method   The method name
+     * @param mixed  $callable A PHP callable that accepts and returns one line of PHP code
+     */
+    public function filterMethod($method, $callable)
     {
-      $code .= $line;
-    }
+        $line = '';
+        $code = '';
+        $insideSetup = -1;
+        $parens = 0;
+        $break = false;
+
+        $tokens = token_get_all($this->code);
+        for ($i = 0; $i < count($tokens); ++$i) {
+            $token = $tokens[$i];
+
+            if (is_array($token)) {
+                $line .= $token[1];
+
+                if (-1 == $insideSetup && T_FUNCTION == $token[0]) {
+                    $insideSetup = 0;
+                } elseif (0 == $insideSetup && T_STRING == $token[0]) {
+                    $insideSetup = $method == $token[1] ? 1 : -1;
+                }
+            } else {
+                if (1 == $insideSetup && '{' == $token) {
+                    ++$parens;
+                } elseif (1 == $insideSetup && '}' == $token) {
+                    --$parens;
+
+                    if (!$parens) {
+                        $break = true;
+                    }
+                }
+
+                $line .= $token;
+            }
+
+            $lines = preg_split('/(\r?\n)/', $line, null, PREG_SPLIT_DELIM_CAPTURE);
+            if (count($lines) > 1 || $break) {
+                $line = $break ? '' : array_pop($lines);
+                foreach (array_chunk($lines, 2) as $chunk) {
+                    list($l, $eol) = array_pad($chunk, 2, '');
+
+                    if (1 == $insideSetup) {
+                        list($before, $setup) = $this->splitSetup($l);
+                        $code .= $before;
+                        $code .= call_user_func($callable, $setup.$eol);
+                    } else {
+                        $code .= $l.$eol;
+                    }
+                }
+            }
+
+            if ($break) {
+                $insideSetup = -1;
+                $break = false;
+            }
+        }
 
-    return $this->code = $code;
-  }
+        if ($line) {
+            $code .= $line;
+        }
 
-  protected function splitSetup($line)
-  {
-    $before = '';
-    $setup = '';
+        return $this->code = $code;
+    }
 
-    if ($line)
+    protected function splitSetup($line)
     {
-      if (false === stripos($line, '<?php'))
-      {
-        // add a function so we can accurately slice
-        $tokens = token_get_all('<?php function'.$line);
-        $tokens = array_slice($tokens, 2);
-      }
-      else
-      {
-        $tokens = token_get_all($line);
-      }
-
-      // we're in reverse
-      $inSignature = false;
-      while ($token = array_pop($tokens))
-      {
-        $value = $this->getTokenValue($token);
-        if (is_array($token) && in_array($token[0], self::$signatureTokens))
-        {
-          $inSignature = true;
-        }
-        elseif ($inSignature && !preg_match('/\s+/', $value))
-        {
-          // clean up
-          preg_match('/^\s*/', $setup, $match);
-          $before = implode('', array_map(array($this, 'getTokenValue'), $tokens)).$value.$match[0];
-          $setup = substr($setup, strlen($match[0]));
-
-          return array($before, $setup);
+        $before = '';
+        $setup = '';
+
+        if ($line) {
+            if (false === stripos($line, '<?php')) {
+                // add a function so we can accurately slice
+                $tokens = token_get_all('<?php function'.$line);
+                $tokens = array_slice($tokens, 2);
+            } else {
+                $tokens = token_get_all($line);
+            }
+
+            // we're in reverse
+            $inSignature = false;
+            while ($token = array_pop($tokens)) {
+                $value = $this->getTokenValue($token);
+                if (is_array($token) && in_array($token[0], self::$signatureTokens)) {
+                    $inSignature = true;
+                } elseif ($inSignature && !preg_match('/\s+/', $value)) {
+                    // clean up
+                    preg_match('/^\s*/', $setup, $match);
+                    $before = implode('', array_map(array($this, 'getTokenValue'), $tokens)).$value.$match[0];
+                    $setup = substr($setup, strlen($match[0]));
+
+                    return array($before, $setup);
+                }
+
+                $setup = $value.$setup;
+            }
         }
 
-        $setup = $value.$setup;
-      }
+        return array($before, $setup);
     }
 
-    return array($before, $setup);
-  }
-
-  /**
-   * Returns a token's string value.
-   *
-   * @param array|string $token
-   *
-   * @return string
-   */
-  protected function getTokenValue($token)
-  {
-    return is_array($token) ? $token[1] : $token;
-  }
+    /**
+     * Returns a token's string value.
+     *
+     * @param array|string $token
+     *
+     * @return string
+     */
+    protected function getTokenValue($token)
+    {
+        return is_array($token) ? $token[1] : $token;
+    }
 }
diff --git a/lib/util/sfContext.class.php b/lib/util/sfContext.class.php
index b0128afc7..5000c0e50 100644
--- a/lib/util/sfContext.class.php
+++ b/lib/util/sfContext.class.php
@@ -14,675 +14,635 @@
  * the module and action names and the module directory. References to the
  * main symfony instances are also provided.
  *
- * @package    symfony
- * @subpackage util
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 class sfContext implements ArrayAccess
 {
-  /** @var sfEventDispatcher */
-  protected $dispatcher = null;
-  /** @var sfApplicationConfiguration */
-  protected $configuration = null;
-  protected $mailerConfiguration = array();
-  protected $serviceContainerConfiguration = array();
-  protected $factories = array();
-  protected $hasShutdownUserAndStorage = false;
+    /** @var sfEventDispatcher */
+    protected $dispatcher;
+
+    /** @var sfApplicationConfiguration */
+    protected $configuration;
+    protected $mailerConfiguration = array();
+    protected $serviceContainerConfiguration = array();
+    protected $factories = array();
+    protected $hasShutdownUserAndStorage = false;
+
+    protected static $instances = array();
+    protected static $current = 'default';
+
+    /**
+     * Calls methods defined via sfEventDispatcher.
+     *
+     * If a method cannot be found via sfEventDispatcher, the method name will
+     * be parsed to magically handle getMyFactory() and setMyFactory() methods.
+     *
+     * @param string $method    The method name
+     * @param array  $arguments The method arguments
+     *
+     * @return mixed The returned value of the called method
+     *
+     * @throws <b>sfException</b> if call fails
+     */
+    public function __call($method, $arguments)
+    {
+        $event = $this->dispatcher->notifyUntil(new sfEvent($this, 'context.method_not_found', array('method' => $method, 'arguments' => $arguments)));
+        if (!$event->isProcessed()) {
+            $verb = substr($method, 0, 3); // get | set
+            $factory = strtolower(substr($method, 3)); // factory name
+
+            if ('get' == $verb && $this->has($factory)) {
+                return $this->factories[$factory];
+            }
+            if ('set' == $verb && isset($arguments[0])) {
+                return $this->set($factory, $arguments[0]);
+            }
+
+            throw new sfException(sprintf('Call to undefined method %s::%s.', get_class($this), $method));
+        }
+
+        return $event->getReturnValue();
+    }
+
+    /**
+     * 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)
+     *
+     * @return sfContext An sfContext instance
+     *
+     * @throws sfFactoryException
+     */
+    public static function createInstance(sfApplicationConfiguration $configuration, $name = null, $class = __CLASS__)
+    {
+        if (null === $name) {
+            $name = $configuration->getApplication();
+        }
+
+        self::$current = $name;
+
+        self::$instances[$name] = new $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);
+
+        return self::$instances[$name];
+    }
+
+    /**
+     * Initializes the current sfContext instance.
+     *
+     * @param sfApplicationConfiguration $configuration An sfApplicationConfiguration instance
+     */
+    public function initialize(sfApplicationConfiguration $configuration)
+    {
+        $this->configuration = $configuration;
+        $this->dispatcher = $configuration->getEventDispatcher();
+
+        try {
+            $this->loadFactories();
+        } catch (sfException $e) {
+            $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'));
+
+        // register our shutdown function
+        register_shutdown_function(array($this, 'shutdown'));
+    }
+
+    /**
+     * Retrieves the singleton instance of this class.
+     *
+     * @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
+     *
+     * @throws sfException
+     */
+    public static function getInstance($name = null, $class = __CLASS__)
+    {
+        if (null === $name) {
+            $name = self::$current;
+        }
+
+        if (!isset(self::$instances[$name])) {
+            throw new sfException(sprintf('The "%s" context does not exist.', $name));
+        }
+
+        return self::$instances[$name];
+    }
+
+    /**
+     * Checks to see if there has been a context created.
+     *
+     * @param string $name The name of the sfContext to check for
+     *
+     * @return bool true is instanced, otherwise false
+     */
+    public static function hasInstance($name = null)
+    {
+        if (null === $name) {
+            $name = self::$current;
+        }
+
+        return isset(self::$instances[$name]);
+    }
+
+    /**
+     * Loads the symfony factories.
+     */
+    public function loadFactories()
+    {
+        if (sfConfig::get('sf_use_database')) {
+            // setup our database connections
+            $this->factories['databaseManager'] = new sfDatabaseManager($this->configuration, array('auto_shutdown' => false));
+        }
+
+        // create a new action stack
+        $this->factories['actionStack'] = new sfActionStack();
+
+        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'));
+
+        if (sfConfig::get('sf_debug') && sfConfig::get('sf_logging_enabled')) {
+            // @var $timer sfTimer
+            $timer->addTime();
+        }
+    }
+
+    /**
+     * Dispatches the current request.
+     */
+    public function dispatch()
+    {
+        $this->getController()->dispatch();
+    }
+
+    /**
+     * Sets the current context to something else.
+     *
+     * @param string $name The name of the context to switch to
+     */
+    public static function switchTo($name)
+    {
+        if (!isset(self::$instances[$name])) {
+            $currentConfiguration = sfContext::getInstance()->getConfiguration();
+            sfContext::createInstance(ProjectConfiguration::getApplicationConfiguration($name, $currentConfiguration->getEnvironment(), $currentConfiguration->isDebug()));
+        }
+
+        self::$current = $name;
+
+        sfContext::getInstance()->getConfiguration()->activate();
+    }
+
+    /**
+     * Returns the configuration instance.
+     *
+     * @return sfApplicationConfiguration The current application configuration instance
+     */
+    public function getConfiguration()
+    {
+        return $this->configuration;
+    }
+
+    /**
+     * Retrieves the current event dispatcher.
+     *
+     * @return sfEventDispatcher An sfEventDispatcher instance
+     */
+    public function getEventDispatcher()
+    {
+        return $this->dispatcher;
+    }
+
+    /**
+     * Retrieve the action name for this context.
+     *
+     * @return string the currently executing action name, if one is set,
+     *                otherwise null
+     */
+    public function getActionName()
+    {
+        // get the last action stack entry
+        if ($this->factories['actionStack'] && $lastEntry = $this->factories['actionStack']->getLastEntry()) {
+            // @var $lastEntry sfActionStackEntry
+            return $lastEntry->getActionName();
+        }
+    }
+
+    /**
+     * Retrieve the ActionStack.
+     *
+     * @return sfActionStack the sfActionStack instance
+     */
+    public function getActionStack()
+    {
+        return $this->factories['actionStack'];
+    }
+
+    /**
+     * Retrieve the controller.
+     *
+     * @return sfFrontWebController the current sfController implementation instance
+     */
+    public function getController()
+    {
+        return isset($this->factories['controller']) ? $this->factories['controller'] : null;
+    }
+
+    /**
+     * Retrieves the mailer.
+     *
+     * @return sfMailer the current sfMailer implementation instance
+     */
+    public function getMailer()
+    {
+        if (!isset($this->factories['mailer'])) {
+            $this->factories['mailer'] = new $this->mailerConfiguration['class']($this->dispatcher, $this->mailerConfiguration);
+        }
+
+        return $this->factories['mailer'];
+    }
+
+    /**
+     * Set mailer configuration.
+     *
+     * @param array $configuration
+     */
+    public function setMailerConfiguration($configuration)
+    {
+        $this->mailerConfiguration = $configuration;
+    }
+
+    /**
+     * Retrieve the logger.
+     *
+     * @return sfLogger the current sfLogger implementation instance
+     */
+    public function getLogger()
+    {
+        if (!isset($this->factories['logger'])) {
+            $this->factories['logger'] = new sfNoLogger($this->dispatcher);
+        }
+
+        return $this->factories['logger'];
+    }
 
-  protected static
-    $instances = array(),
-    $current   = 'default';
+    /**
+     * Retrieve a database connection from the database manager.
+     *
+     * This is a shortcut to manually getting a connection from an existing
+     * database implementation instance.
+     *
+     * If the [sf_use_database] setting is off, this will return null.
+     *
+     * @param string $name a database name
+     *
+     * @return mixed a database instance
+     *
+     * @throws sfDatabaseException if the requested database name does not exist
+     */
+    public function getDatabaseConnection($name = 'default')
+    {
+        if (null !== $this->factories['databaseManager']) {
+            return $this->factories['databaseManager']->getDatabase($name)->getConnection();
+        }
+
+        return null;
+    }
 
-  /**
-   * 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)
-   *
-   * @return sfContext An sfContext instance
-   *
-   * @throws sfFactoryException
-   */
-  static public function createInstance(sfApplicationConfiguration $configuration, $name = null, $class = __CLASS__)
-  {
-    if (null === $name)
+    /**
+     * Retrieve the database manager.
+     *
+     * @return sfDatabaseManager the current sfDatabaseManager instance
+     */
+    public function getDatabaseManager()
     {
-      $name = $configuration->getApplication();
+        return isset($this->factories['databaseManager']) ? $this->factories['databaseManager'] : null;
     }
 
-    self::$current = $name;
+    /**
+     * Retrieve the module directory for this context.
+     *
+     * @return string an absolute filesystem path to the directory of the
+     *                currently executing module, if one is set, otherwise null
+     */
+    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();
+        }
+    }
 
-    self::$instances[$name] = new $class();
+    /**
+     * Retrieve the module name for this context.
+     *
+     * @return string the currently executing module name, if one is set,
+     *                otherwise null
+     */
+    public function getModuleName()
+    {
+        // get the last action stack entry
+        if (isset($this->factories['actionStack']) && $lastEntry = $this->factories['actionStack']->getLastEntry()) {
+            // @var $lastEntry sfActionStackEntry
+            return $lastEntry->getModuleName();
+        }
+    }
 
-    if (!self::$instances[$name] instanceof sfContext)
+    /**
+     * Retrieve the request.
+     *
+     * @return sfRequest the current sfRequest implementation instance
+     */
+    public function getRequest()
     {
-      throw new sfFactoryException(sprintf('Class "%s" is not of the type sfContext.', $class));
+        return isset($this->factories['request']) ? $this->factories['request'] : null;
     }
 
-    self::$instances[$name]->initialize($configuration);
+    /**
+     * Retrieve the response.
+     *
+     * @return sfResponse the current sfResponse implementation instance
+     */
+    public function getResponse()
+    {
+        return isset($this->factories['response']) ? $this->factories['response'] : null;
+    }
+
+    /**
+     * Set the response object.
+     *
+     * @param sfResponse $response an sfResponse instance
+     */
+    public function setResponse($response)
+    {
+        $this->factories['response'] = $response;
+    }
 
-    return self::$instances[$name];
-  }
+    /**
+     * Retrieve the storage.
+     *
+     * @return sfStorage the current sfStorage implementation instance
+     */
+    public function getStorage()
+    {
+        return isset($this->factories['storage']) ? $this->factories['storage'] : null;
+    }
 
-  /**
-   * Initializes the current sfContext instance.
-   *
-   * @param sfApplicationConfiguration $configuration  An sfApplicationConfiguration instance
-   */
-  public function initialize(sfApplicationConfiguration $configuration)
-  {
-    $this->configuration = $configuration;
-    $this->dispatcher    = $configuration->getEventDispatcher();
+    /**
+     * Retrieve the view cache manager.
+     *
+     * @return sfViewCacheManager the current sfViewCacheManager implementation instance
+     */
+    public function getViewCacheManager()
+    {
+        return isset($this->factories['viewCacheManager']) ? $this->factories['viewCacheManager'] : null;
+    }
 
-    try
+    /**
+     * Retrieve the i18n instance.
+     *
+     * @return sfI18N the current sfI18N implementation instance
+     *
+     * @throws sfConfigurationException
+     */
+    public function getI18N()
     {
-      $this->loadFactories();
+        if (!sfConfig::get('sf_i18n')) {
+            throw new sfConfigurationException('You must enable i18n support in your settings.yml configuration file.');
+        }
+
+        return $this->factories['i18n'];
     }
-    catch (sfException $e)
+
+    /**
+     * Retrieve the routing instance.
+     *
+     * @return sfRouting the current sfRouting implementation instance
+     */
+    public function getRouting()
     {
-      $e->printStackTrace();
+        return isset($this->factories['routing']) ? $this->factories['routing'] : null;
     }
-    catch (Exception $e)
+
+    /**
+     * Retrieve the user.
+     *
+     * @return sfUser the current sfUser implementation instance
+     */
+    public function getUser()
     {
-      sfException::createFromException($e)->printStackTrace();
+        return isset($this->factories['user']) ? $this->factories['user'] : null;
     }
 
-    $this->dispatcher->connect('template.filter_parameters', array($this, 'filterTemplateParameters'));
-    $this->dispatcher->connect('response.fastcgi_finish_request', array($this, 'shutdownUserAndStorage'));
+    /**
+     * Retrieves the service container.
+     *
+     * @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_user', $this->getUser());
+            $this->factories['serviceContainer']->setService('sf_routing', $this->getRouting());
+        }
+
+        return $this->factories['serviceContainer'];
+    }
 
-    // register our shutdown function
-    register_shutdown_function(array($this, 'shutdown'));
-  }
+    /**
+     * Set service ontainer configuration.
+     */
+    public function setServiceContainerConfiguration(array $config)
+    {
+        $this->serviceContainerConfiguration = $config;
+    }
 
-  /**
-   * Retrieves the singleton instance of this class.
-   *
-   * @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.
-   *
-   * @throws sfException
-   */
-  static public function getInstance($name = null, $class = __CLASS__)
-  {
-    if (null === $name)
+    /**
+     * Retrieves a service from the service container.
+     *
+     * @param string $id The service identifier
+     *
+     * @return object The service instance
+     */
+    public function getService($id)
     {
-      $name = self::$current;
+        return $this->getServiceContainer()->getService($id);
     }
 
-    if (!isset(self::$instances[$name]))
+    /**
+     * Returns the configuration cache.
+     *
+     * @return sfConfigCache A sfConfigCache instance
+     */
+    public function getConfigCache()
     {
-      throw new sfException(sprintf('The "%s" context does not exist.', $name));
+        return $this->configuration->getConfigCache();
     }
 
-    return self::$instances[$name];
-  }
+    /**
+     * Returns true if the context object exists (implements the ArrayAccess interface).
+     *
+     * @param string $name The name of the context object
+     *
+     * @return bool true if the context object exists, false otherwise
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetExists($name)
+    {
+        return $this->has($name);
+    }
 
-  /**
-   * Checks to see if there has been a context created
-   *
-   * @param  string $name  The name of the sfContext to check for
-   *
-   * @return bool true is instanced, otherwise false
-   */
+    /**
+     * Returns the context object associated with the name (implements the ArrayAccess interface).
+     *
+     * @param string $name The offset of the value to get
+     *
+     * @return mixed The context object if exists, null otherwise
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetGet($name)
+    {
+        return $this->get($name);
+    }
 
-  public static function hasInstance($name = null)
-  {
-    if (null === $name)
+    /**
+     * Sets the context object associated with the offset (implements the ArrayAccess interface).
+     *
+     * @param string $offset Service name
+     * @param mixed  $value  Service
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetSet($offset, $value)
     {
-      $name = self::$current;
+        $this->set($offset, $value);
     }
 
-    return isset(self::$instances[$name]);
-  }
+    /**
+     * Unsets the context object associated with the offset (implements the ArrayAccess interface).
+     *
+     * @param string $offset The parameter name
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetUnset($offset)
+    {
+        unset($this->factories[$offset]);
+    }
 
-  /**
-   * Loads the symfony factories.
-   */
-  public function loadFactories()
-  {
-    if (sfConfig::get('sf_use_database'))
+    /**
+     * Gets an object from the current context.
+     *
+     * @param string $name The name of the object to retrieve
+     *
+     * @return object The object associated with the given name
+     */
+    public function get($name)
     {
-      // setup our database connections
-      $this->factories['databaseManager'] = new sfDatabaseManager($this->configuration, array('auto_shutdown' => false));
+        if (!$this->has($name)) {
+            throw new sfException(sprintf('The "%s" object does not exist in the current context.', $name));
+        }
+
+        return $this->factories[$name];
     }
 
-    // create a new action stack
-    $this->factories['actionStack'] = new sfActionStack();
+    /**
+     * Puts an object in the current context.
+     *
+     * @param string $name   The name of the object to store
+     * @param mixed  $object The object to store
+     */
+    public function set($name, $object)
+    {
+        $this->factories[$name] = $object;
+    }
 
-    if (sfConfig::get('sf_debug') && sfConfig::get('sf_logging_enabled'))
+    /**
+     * Returns true if an object is currently stored in the current context with the given name, false otherwise.
+     *
+     * @param string $name The object name
+     *
+     * @return bool true if the object is not null, false otherwise
+     */
+    public function has($name)
     {
-      $timer = sfTimerManager::getTimer('Factories');
+        return isset($this->factories[$name]);
     }
 
-    // include the factories configuration
-    require($this->configuration->getConfigCache()->checkConfig('config/factories.yml'));
+    /**
+     * Listens to the template.filter_parameters event.
+     *
+     * @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)
+    {
+        $parameters['sf_context'] = $this;
+        $parameters['sf_request'] = $this->factories['request'];
+        $parameters['sf_params'] = $this->factories['request']->getParameterHolder();
+        $parameters['sf_response'] = $this->factories['response'];
+        $parameters['sf_user'] = $this->factories['user'];
 
-    $this->dispatcher->notify(new sfEvent($this, 'context.load_factories'));
+        return $parameters;
+    }
 
-    if (sfConfig::get('sf_debug') && sfConfig::get('sf_logging_enabled'))
+    /**
+     * Shuts the user/storage down.
+     *
+     * @internal Should be called only via invoking "response.fastcgi_finish_request" or context shutting down.
+     */
+    public function shutdownUserAndStorage()
     {
-      /** @var $timer sfTimer */
-      $timer->addTime();
+        if (!$this->hasShutdownUserAndStorage && $this->has('user')) {
+            $this->getUser()->shutdown();
+            $this->getStorage()->shutdown();
+
+            $this->hasShutdownUserAndStorage = true;
+        }
     }
-  }
 
-  /**
-   * Dispatches the current request.
-   */
-  public function dispatch()
-  {
-    $this->getController()->dispatch();
-  }
+    /**
+     * Execute the shutdown procedure.
+     */
+    public function shutdown()
+    {
+        $this->shutdownUserAndStorage();
+
+        if ($this->has('routing')) {
+            $this->getRouting()->shutdown();
+        }
+
+        if (sfConfig::get('sf_use_database')) {
+            $this->getDatabaseManager()->shutdown();
+        }
 
-  /**
-   * Sets the current context to something else
-   *
-   * @param string $name  The name of the context to switch to
-   *
-   */
-  public static function switchTo($name)
-  {
-    if (!isset(self::$instances[$name]))
-    {
-      $currentConfiguration = sfContext::getInstance()->getConfiguration();
-      sfContext::createInstance(ProjectConfiguration::getApplicationConfiguration($name, $currentConfiguration->getEnvironment(), $currentConfiguration->isDebug()));
-    }
-
-    self::$current = $name;
-
-    sfContext::getInstance()->getConfiguration()->activate();
-  }
-
-  /**
-   * Returns the configuration instance.
-   *
-   * @return sfApplicationConfiguration  The current application configuration instance
-   */
-  public function getConfiguration()
-  {
-    return $this->configuration;
-  }
-
-  /**
-   * Retrieves the current event dispatcher.
-   *
-   * @return sfEventDispatcher An sfEventDispatcher instance
-   */
-  public function getEventDispatcher()
-  {
-    return $this->dispatcher;
-  }
-
-  /**
-   * Retrieve the action name for this context.
-   *
-   * @return string The currently executing action name, if one is set,
-   *                otherwise null.
-   */
-  public function getActionName()
-  {
-    // get the last action stack entry
-    if ($this->factories['actionStack'] && $lastEntry = $this->factories['actionStack']->getLastEntry())
-    {
-      /** @var $lastEntry sfActionStackEntry */
-      return $lastEntry->getActionName();
-    }
-  }
-
-
-  /**
-   * Retrieve the ActionStack.
-   *
-   * @return sfActionStack the sfActionStack instance
-   */
-  public function getActionStack()
-  {
-    return $this->factories['actionStack'];
-  }
-
-  /**
-   * Retrieve the controller.
-   *
-   * @return sfFrontWebController The current sfController implementation instance.
-   */
-  public function getController()
-  {
-    return isset($this->factories['controller']) ? $this->factories['controller'] : null;
-  }
-
-  /**
-   * Retrieves the mailer.
-   *
-   * @return sfMailer The current sfMailer implementation instance.
-   */
-  public function getMailer()
-  {
-    if (!isset($this->factories['mailer']))
-    {
-     $this->factories['mailer'] = new $this->mailerConfiguration['class']($this->dispatcher, $this->mailerConfiguration);
-    }
-
-    return $this->factories['mailer'];
-  }
-
-  /**
-   * Set mailer configuration.
-   *
-   * @param array $configuration
-   */
-  public function setMailerConfiguration($configuration)
-  {
-    $this->mailerConfiguration = $configuration;
-  }
-
-  /**
-   * Retrieve the logger.
-   *
-   * @return sfLogger The current sfLogger implementation instance.
-   */
-  public function getLogger()
-  {
-    if (!isset($this->factories['logger']))
-    {
-      $this->factories['logger'] = new sfNoLogger($this->dispatcher);
-    }
-
-    return $this->factories['logger'];
-  }
-
-  /**
-   * Retrieve a database connection from the database manager.
-   *
-   * This is a shortcut to manually getting a connection from an existing
-   * database implementation instance.
-   *
-   * If the [sf_use_database] setting is off, this will return null.
-   *
-   * @param  string  $name  A database name.
-   *
-   * @return mixed A database instance.
-   *
-   * @throws sfDatabaseException if the requested database name does not exist.
-   */
-  public function getDatabaseConnection($name = 'default')
-  {
-    if (null !== $this->factories['databaseManager'])
-    {
-      return $this->factories['databaseManager']->getDatabase($name)->getConnection();
-    }
-
-    return null;
-  }
-
-  /**
-   * Retrieve the database manager.
-   *
-   * @return sfDatabaseManager The current sfDatabaseManager instance.
-   */
-  public function getDatabaseManager()
-  {
-    return isset($this->factories['databaseManager']) ? $this->factories['databaseManager'] : null;
-  }
-
-  /**
-   * Retrieve the module directory for this context.
-   *
-   * @return string An absolute filesystem path to the directory of the
-   *                currently executing module, if one is set, otherwise null.
-   */
-  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();
-    }
-  }
-
-  /**
-   * Retrieve the module name for this context.
-   *
-   * @return string The currently executing module name, if one is set,
-   *                otherwise null.
-   */
-  public function getModuleName()
-  {
-    // get the last action stack entry
-    if (isset($this->factories['actionStack']) && $lastEntry = $this->factories['actionStack']->getLastEntry())
-    {
-      /** @var $lastEntry sfActionStackEntry */
-      return $lastEntry->getModuleName();
-    }
-  }
-
-  /**
-   * Retrieve the request.
-   *
-   * @return sfRequest The current sfRequest implementation instance.
-   */
-  public function getRequest()
-  {
-    return isset($this->factories['request']) ? $this->factories['request'] : null;
-  }
-
-  /**
-   * Retrieve the response.
-   *
-   * @return sfResponse The current sfResponse implementation instance.
-   */
-  public function getResponse()
-  {
-    return isset($this->factories['response']) ? $this->factories['response'] : null;
-  }
-
-  /**
-   * Set the response object.
-   *
-   * @param sfResponse $response  An sfResponse instance.
-   *
-   * @return void
-   */
-  public function setResponse($response)
-  {
-    $this->factories['response'] = $response;
-  }
-
-  /**
-   * Retrieve the storage.
-   *
-   * @return sfStorage The current sfStorage implementation instance.
-   */
-  public function getStorage()
-  {
-    return isset($this->factories['storage']) ? $this->factories['storage'] : null;
-  }
-
-  /**
-   * Retrieve the view cache manager
-   *
-   * @return sfViewCacheManager The current sfViewCacheManager implementation instance.
-   */
-  public function getViewCacheManager()
-  {
-    return isset($this->factories['viewCacheManager']) ? $this->factories['viewCacheManager'] : null;
-  }
-
-  /**
-   * Retrieve the i18n instance
-   *
-   * @return sfI18N The current sfI18N implementation instance.
-   *
-   * @throws sfConfigurationException
-   */
-  public function getI18N()
-  {
-    if (!sfConfig::get('sf_i18n'))
-    {
-      throw new sfConfigurationException('You must enable i18n support in your settings.yml configuration file.');
-    }
-
-    return $this->factories['i18n'];
-  }
-
-  /**
-   * Retrieve the routing instance.
-   *
-   * @return sfRouting The current sfRouting implementation instance.
-   */
-  public function getRouting()
-  {
-    return isset($this->factories['routing']) ? $this->factories['routing'] : null;
-  }
-
-  /**
-   * Retrieve the user.
-   *
-   * @return sfUser The current sfUser implementation instance.
-   */
-  public function getUser()
-  {
-    return isset($this->factories['user']) ? $this->factories['user'] : null;
-  }
-
-  /**
-   * Retrieves the service container.
-   *
-   * @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_user', $this->getUser());
-      $this->factories['serviceContainer']->setService('sf_routing', $this->getRouting());
-    }
-
-    return $this->factories['serviceContainer'];
-  }
-
-  /**
-   * Set service ontainer configuration
-   *
-   * @param array $config
-   */
-  public function setServiceContainerConfiguration(array $config)
-  {
-    $this->serviceContainerConfiguration = $config;
-  }
-
-  /**
-   * Retrieves a service from the service container.
-   *
-   * @param  string $id The service identifier
-   *
-   * @return object The service instance
-   */
-  public function getService($id)
-  {
-    return $this->getServiceContainer()->getService($id);
-  }
-
-  /**
-   * Returns the configuration cache.
-   *
-   * @return sfConfigCache A sfConfigCache instance
-   */
-  public function getConfigCache()
-  {
-    return $this->configuration->getConfigCache();
-  }
-
-  /**
-   * Returns true if the context object exists (implements the ArrayAccess interface).
-   *
-   * @param  string $name The name of the context object
-   *
-   * @return Boolean true if the context object exists, false otherwise
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetExists($name)
-  {
-    return $this->has($name);
-  }
-
-  /**
-   * Returns the context object associated with the name (implements the ArrayAccess interface).
-   *
-   * @param  string $name  The offset of the value to get
-   *
-   * @return mixed The context object if exists, null otherwise
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetGet($name)
-  {
-    return $this->get($name);
-  }
-
-  /**
-   * Sets the context object associated with the offset (implements the ArrayAccess interface).
-   *
-   * @param string $offset Service name
-   * @param mixed  $value Service
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetSet($offset, $value)
-  {
-    $this->set($offset, $value);
-  }
-
-  /**
-   * Unsets the context object associated with the offset (implements the ArrayAccess interface).
-   *
-   * @param string $offset The parameter name
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetUnset($offset)
-  {
-    unset($this->factories[$offset]);
-  }
-
-  /**
-   * Gets an object from the current context.
-   *
-   * @param  string $name  The name of the object to retrieve
-   *
-   * @return object The object associated with the given name
-   */
-  public function get($name)
-  {
-    if (!$this->has($name))
-    {
-      throw new sfException(sprintf('The "%s" object does not exist in the current context.', $name));
-    }
-
-    return $this->factories[$name];
-  }
-
-  /**
-   * Puts an object in the current context.
-   *
-   * @param string $name    The name of the object to store
-   * @param mixed $object   The object to store
-   */
-  public function set($name, $object)
-  {
-    $this->factories[$name] = $object;
-  }
-
-  /**
-   * Returns true if an object is currently stored in the current context with the given name, false otherwise.
-   *
-   * @param  string $name  The object name
-   *
-   * @return bool true if the object is not null, false otherwise
-   */
-  public function has($name)
-  {
-    return isset($this->factories[$name]);
-  }
-
-  /**
-   * Listens to the template.filter_parameters event.
-   *
-   * @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)
-  {
-    $parameters['sf_context']  = $this;
-    $parameters['sf_request']  = $this->factories['request'];
-    $parameters['sf_params']   = $this->factories['request']->getParameterHolder();
-    $parameters['sf_response'] = $this->factories['response'];
-    $parameters['sf_user']     = $this->factories['user'];
-
-    return $parameters;
-  }
-
-  /**
-   * Shuts the user/storage down.
-   *
-   * @internal Should be called only via invoking "response.fastcgi_finish_request" or context shutting down.
-   */
-  public function shutdownUserAndStorage()
-  {
-    if (!$this->hasShutdownUserAndStorage && $this->has('user'))
-    {
-      $this->getUser()->shutdown();
-      $this->getStorage()->shutdown();
-
-      $this->hasShutdownUserAndStorage = true;
-    }
-  }
-
-  /**
-   * Calls methods defined via sfEventDispatcher.
-   *
-   * If a method cannot be found via sfEventDispatcher, the method name will
-   * be parsed to magically handle getMyFactory() and setMyFactory() methods.
-   *
-   * @param  string $method     The method name
-   * @param  array  $arguments  The method arguments
-   *
-   * @return mixed The returned value of the called method
-   *
-   * @throws <b>sfException</b> if call fails
-   */
-  public function __call($method, $arguments)
-  {
-    $event = $this->dispatcher->notifyUntil(new sfEvent($this, 'context.method_not_found', array('method' => $method, 'arguments' => $arguments)));
-    if (!$event->isProcessed())
-    {
-      $verb = substr($method, 0, 3); // get | set
-      $factory = strtolower(substr($method, 3)); // factory name
-
-      if ('get' == $verb && $this->has($factory))
-      {
-        return $this->factories[$factory];
-      }
-      else if ('set' == $verb && isset($arguments[0]))
-      {
-        return $this->set($factory, $arguments[0]);
-      }
-
-      throw new sfException(sprintf('Call to undefined method %s::%s.', get_class($this), $method));
-    }
-
-    return $event->getReturnValue();
-  }
-
-  /**
-   * Execute the shutdown procedure.
-   *
-   * @return void
-   */
-  public function shutdown()
-  {
-    $this->shutdownUserAndStorage();
-
-    if ($this->has('routing'))
-    {
-    	$this->getRouting()->shutdown();
-    }
-
-    if (sfConfig::get('sf_use_database'))
-    {
-      $this->getDatabaseManager()->shutdown();
-    }
-
-    if (sfConfig::get('sf_logging_enabled'))
-    {
-      $this->getLogger()->shutdown();
-    }
-  }
+        if (sfConfig::get('sf_logging_enabled')) {
+            $this->getLogger()->shutdown();
+        }
+    }
 }
diff --git a/lib/util/sfDomCssSelector.class.php b/lib/util/sfDomCssSelector.class.php
index a207f4e75..2d523ef1a 100644
--- a/lib/util/sfDomCssSelector.class.php
+++ b/lib/util/sfDomCssSelector.class.php
@@ -16,153 +16,207 @@
  *
  * Some methods based on the jquery library
  *
- * @package    symfony
- * @subpackage util
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfDomCssSelector implements Countable, Iterator
 {
-  public $nodes = array();
+    public $nodes = array();
 
-  private $count;
+    private $count;
 
-  public function __construct($nodes)
-  {
-    if (!is_array($nodes))
+    public function __construct($nodes)
     {
-      $nodes = array($nodes);
+        if (!is_array($nodes)) {
+            $nodes = array($nodes);
+        }
+
+        $this->nodes = $nodes;
     }
 
-    $this->nodes = $nodes;
-  }
+    public function getNodes()
+    {
+        return $this->nodes;
+    }
 
-  public function getNodes()
-  {
-    return $this->nodes;
-  }
+    public function getNode()
+    {
+        return $this->nodes ? $this->nodes[0] : null;
+    }
 
-  public function getNode()
-  {
-    return $this->nodes ? $this->nodes[0] : null;
-  }
+    public function getValue()
+    {
+        return $this->nodes[0]->nodeValue;
+    }
 
-  public function getValue()
-  {
-    return $this->nodes[0]->nodeValue;
-  }
+    public function getValues()
+    {
+        $values = array();
+        foreach ($this->nodes as $node) {
+            $values[] = $node->nodeValue;
+        }
 
-  public function getValues()
-  {
-    $values = array();
-    foreach ($this->nodes as $node)
+        return $values;
+    }
+
+    public function matchSingle($selector)
     {
-      $values[] = $node->nodeValue;
+        $nodes = $this->getElements($selector);
+
+        return $nodes ? new sfDomCssSelector($nodes[0]) : new sfDomCssSelector(array());
     }
 
-    return $values;
-  }
+    public function matchAll($selector)
+    {
+        $nodes = $this->getElements($selector);
 
-  public function matchSingle($selector)
-  {
-    $nodes = $this->getElements($selector);
+        return $nodes ? new sfDomCssSelector($nodes) : new sfDomCssSelector(array());
+    }
 
-    return $nodes ? new sfDomCssSelector($nodes[0]) : new sfDomCssSelector(array());
-  }
+    /**
+     * Reset the array to the beginning (as required for the Iterator interface).
+     */
+    #[\ReturnTypeWillChange]
+    public function rewind()
+    {
+        reset($this->nodes);
 
-  public function matchAll($selector)
-  {
-    $nodes = $this->getElements($selector);
+        $this->count = count($this->nodes);
+    }
 
-    return $nodes ? new sfDomCssSelector($nodes) : new sfDomCssSelector(array());
-  }
+    /**
+     * Get the key associated with the current value (as required by the Iterator interface).
+     *
+     * @return string The key
+     */
+    #[\ReturnTypeWillChange]
+    public function key()
+    {
+        return key($this->nodes);
+    }
 
-  protected function getElements($selector)
-  {
-    $nodes = array();
-    foreach ($this->nodes as $node)
+    /**
+     * Escapes and return the current value (as required by the Iterator interface).
+     *
+     * @return mixed The escaped value
+     */
+    #[\ReturnTypeWillChange]
+    public function current()
     {
-      $result_nodes = $this->getElementsForNode($selector, $node);
-      if ($result_nodes)
-      {
-        $nodes = array_merge($nodes, $result_nodes);
-      }
+        return current($this->nodes);
     }
 
-    foreach ($nodes as $node)
+    /**
+     * Moves to the next element (as required by the Iterator interface).
+     */
+    #[\ReturnTypeWillChange]
+    public function next()
     {
-      $node->removeAttribute('sf_matched');
+        next($this->nodes);
+
+        --$this->count;
     }
 
-    return $nodes;
-  }
+    /**
+     * Returns true if the current element is valid (as required by the Iterator interface).
+     *
+     * The current element will not be valid if {@link next()} has fallen off the
+     * end of the array or if there are no elements in the array and {@link * rewind()} was called.
+     *
+     * @return bool The validity of the current element; true if it is valid
+     */
+    #[\ReturnTypeWillChange]
+    public function valid()
+    {
+        return $this->count > 0;
+    }
 
-  protected function getElementsForNode($selector, $root_node)
-  {
-    $all_nodes = array();
-    foreach ($this->tokenize_selectors($selector) as $selector)
+    /**
+     * Returns the number of matching nodes (implements Countable).
+     *
+     * @param int The number of matching nodes
+     */
+    #[\ReturnTypeWillChange]
+    public function count()
     {
-      $nodes = array($root_node);
-      foreach ($this->tokenize($selector) as $token)
-      {
-        $combinator = $token['combinator'];
-        $selector = $token['selector'];
-
-        $token = trim($token['name']);
-
-        $pos = strpos($token, '#');
-        if (false !== $pos && preg_match('/^[A-Za-z0-9]*$/', substr($token, 0, $pos)))
-        {
-          // Token is an ID selector
-          $tagName = substr($token, 0, $pos);
-          $id = substr($token, $pos + 1);
-          $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();
-          }
-
-          // Set nodes to contain just this element
-          $nodes = array($element);
-          $nodes = $this->matchMultipleCustomSelectors($nodes, $selector);
-
-          continue; // Skip to next token
-        }
+        return count($this->nodes);
+    }
 
-        $pos = strpos($token, '.');
-        if (false !== $pos && preg_match('/^[A-Za-z0-9\*]*$/', substr($token, 0, $pos)))
-        {
-          // Token contains a class selector
-          $tagName = substr($token, 0, $pos);
-          if (!$tagName)
-          {
-            $tagName = '*';
-          }
-          $className = substr($token, $pos + 1);
-
-          // Get elements matching tag, filter them for class selector
-          $founds = $this->getElementsByTagName($nodes, $tagName, $combinator);
-          $nodes = array();
-          foreach ($founds as $found)
-          {
-            if (preg_match('/(^|\s+)'.$className.'($|\s+)/', $found->getAttribute('class')))
-            {
-              $nodes[] = $found;
+    protected function getElements($selector)
+    {
+        $nodes = array();
+        foreach ($this->nodes as $node) {
+            $result_nodes = $this->getElementsForNode($selector, $node);
+            if ($result_nodes) {
+                $nodes = array_merge($nodes, $result_nodes);
             }
-          }
-
-          $nodes = $this->matchMultipleCustomSelectors($nodes, $selector);
+        }
 
-          continue; // Skip to next token
+        foreach ($nodes as $node) {
+            $node->removeAttribute('sf_matched');
         }
 
-        // Code to deal with attribute selectors
-        if (preg_match('/^(\w+|\*)(\[.+\])$/', $token, $matches))
-        {
-          $tagName = $matches[1] ?: '*';
-          preg_match_all('/
+        return $nodes;
+    }
+
+    protected function getElementsForNode($selector, $root_node)
+    {
+        $all_nodes = array();
+        foreach ($this->tokenize_selectors($selector) as $selector) {
+            $nodes = array($root_node);
+            foreach ($this->tokenize($selector) as $token) {
+                $combinator = $token['combinator'];
+                $selector = $token['selector'];
+
+                $token = trim($token['name']);
+
+                $pos = strpos($token, '#');
+                if (false !== $pos && preg_match('/^[A-Za-z0-9]*$/', substr($token, 0, $pos))) {
+                    // Token is an ID selector
+                    $tagName = substr($token, 0, $pos);
+                    $id = substr($token, $pos + 1);
+                    $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();
+                    }
+
+                    // Set nodes to contain just this element
+                    $nodes = array($element);
+                    $nodes = $this->matchMultipleCustomSelectors($nodes, $selector);
+
+                    continue; // Skip to next token
+                }
+
+                $pos = strpos($token, '.');
+                if (false !== $pos && preg_match('/^[A-Za-z0-9\*]*$/', substr($token, 0, $pos))) {
+                    // Token contains a class selector
+                    $tagName = substr($token, 0, $pos);
+                    if (!$tagName) {
+                        $tagName = '*';
+                    }
+                    $className = substr($token, $pos + 1);
+
+                    // Get elements matching tag, filter them for class selector
+                    $founds = $this->getElementsByTagName($nodes, $tagName, $combinator);
+                    $nodes = array();
+                    foreach ($founds as $found) {
+                        if (preg_match('/(^|\s+)'.$className.'($|\s+)/', $found->getAttribute('class'))) {
+                            $nodes[] = $found;
+                        }
+                    }
+
+                    $nodes = $this->matchMultipleCustomSelectors($nodes, $selector);
+
+                    continue; // Skip to next token
+                }
+
+                // Code to deal with attribute selectors
+                if (preg_match('/^(\w+|\*)(\[.+\])$/', $token, $matches)) {
+                    $tagName = $matches[1] ?: '*';
+                    preg_match_all('/
             \[
               ([\w\-]+)             # attribute
               ([=~\|\^\$\*]?)       # modifier (optional)
@@ -175,336 +229,325 @@ protected function getElementsForNode($selector, $root_node)
             \]
           /x', $matches[2], $matches, PREG_SET_ORDER);
 
-          // Grab all of the tagName elements within current node
-          $founds = $this->getElementsByTagName($nodes, $tagName, $combinator);
-          $nodes = array();
-          foreach ($founds as $found)
-          {
-            $ok = false;
-            foreach ($matches as $match)
-            {
-              $attrName = $match[1];
-              $attrOperator = $match[2];
-              $attrValue = $match[4] === '' ? (isset($match[5]) ? $match[5] : '') : $match[4];
-
-              switch ($attrOperator)
-              {
-                case '=': // Equality
-                  $ok = $found->getAttribute($attrName) == $attrValue;
-                  break;
-                case '~': // Match one of space seperated words
-                  $ok = preg_match('/\b'.preg_quote($attrValue, '/').'\b/', $found->getAttribute($attrName));
-                  break;
-                case '|': // Match start with value followed by optional hyphen
-                  $ok = preg_match('/^'.preg_quote($attrValue, '/').'-?/', $found->getAttribute($attrName));
-                  break;
-                case '^': // Match starts with value
-                  $ok = 0 === strpos($found->getAttribute($attrName), $attrValue);
-                  break;
-                case '$': // Match ends with value
-                  $ok = $attrValue == substr($found->getAttribute($attrName), -strlen($attrValue));
-                  break;
-                case '*': // Match ends with value
-                  $ok = false !== strpos($found->getAttribute($attrName), $attrValue);
-                  break;
-                default :
-                  // Just test for existence of attribute
-                  $ok = $found->hasAttribute($attrName);
-              }
-
-              if (false == $ok)
-              {
-                break;
-              }
-            }
+                    // Grab all of the tagName elements within current node
+                    $founds = $this->getElementsByTagName($nodes, $tagName, $combinator);
+                    $nodes = array();
+                    foreach ($founds as $found) {
+                        $ok = false;
+                        foreach ($matches as $match) {
+                            $attrName = $match[1];
+                            $attrOperator = $match[2];
+                            $attrValue = '' === $match[4] ? (isset($match[5]) ? $match[5] : '') : $match[4];
 
-            if ($ok)
-            {
-              $nodes[] = $found;
-            }
-          }
+                            switch ($attrOperator) {
+                                case '=': // Equality
+                                    $ok = $found->getAttribute($attrName) == $attrValue;
 
-          continue; // Skip to next token
-        }
+                                    break;
 
-        // If we get here, token is JUST an element (not a class or ID selector)
-        $nodes = $this->getElementsByTagName($nodes, $token, $combinator);
+                                case '~': // Match one of space seperated words
+                                    $ok = preg_match('/\b'.preg_quote($attrValue, '/').'\b/', $found->getAttribute($attrName));
 
-        $nodes = $this->matchMultipleCustomSelectors($nodes, $selector);
-      }
+                                    break;
 
-      foreach ($nodes as $node)
-      {
-        if (!$node->getAttribute('sf_matched'))
-        {
-          $node->setAttribute('sf_matched', true);
-          $all_nodes[] = $node;
-        }
-      }
-    }
+                                case '|': // Match start with value followed by optional hyphen
+                                    $ok = preg_match('/^'.preg_quote($attrValue, '/').'-?/', $found->getAttribute($attrName));
 
-    return $all_nodes;
-  }
+                                    break;
 
-  protected function getElementsByTagName($nodes, $tagName, $combinator = ' ')
-  {
-    $founds = array();
-    foreach ($nodes as $node)
-    {
-      switch ($combinator)
-      {
-        case ' ':
-          // Descendant selector
-          foreach ($node->getElementsByTagName($tagName) as $element)
-          {
-            $founds[] = $element;
-          }
-          break;
-        case '>':
-          // Child selector
-          foreach ($node->childNodes as $element)
-          {
-            if ($tagName == $element->nodeName)
-            {
-              $founds[] = $element;
+                                case '^': // Match starts with value
+                                    $ok = 0 === strpos($found->getAttribute($attrName), $attrValue);
+
+                                    break;
+
+                                case '$': // Match ends with value
+                                    $ok = $attrValue == substr($found->getAttribute($attrName), -strlen($attrValue));
+
+                                    break;
+
+                                case '*': // Match ends with value
+                                    $ok = false !== strpos($found->getAttribute($attrName), $attrValue);
+
+                                    break;
+
+                                default:
+                                    // Just test for existence of attribute
+                                    $ok = $found->hasAttribute($attrName);
+                            }
+
+                            if (false == $ok) {
+                                break;
+                            }
+                        }
+
+                        if ($ok) {
+                            $nodes[] = $found;
+                        }
+                    }
+
+                    continue; // Skip to next token
+                }
+
+                // If we get here, token is JUST an element (not a class or ID selector)
+                $nodes = $this->getElementsByTagName($nodes, $token, $combinator);
+
+                $nodes = $this->matchMultipleCustomSelectors($nodes, $selector);
             }
-          }
-          break;
-        case '+':
-          // Adjacent selector
-          $element = $node->nextSibling;
-          if ($element && '#text' == $element->nodeName)
-          {
-            $element = $element->nextSibling;
-          }
-
-          if ($element && $tagName == $element->nodeName)
-          {
-            $founds[] = $element;
-          }
-          break;
-        default:
-          throw new Exception(sprintf('Unrecognized combinator "%s".', $combinator));
-      }
-    }
 
-    return $founds;
-  }
+            foreach ($nodes as $node) {
+                if (!$node->getAttribute('sf_matched')) {
+                    $node->setAttribute('sf_matched', true);
+                    $all_nodes[] = $node;
+                }
+            }
+        }
 
-  protected function tokenize_selectors($selector)
-  {
-    // split tokens by , except in an attribute selector
-    $tokens = array();
-    $quoted = false;
-    $token = '';
-    for ($i = 0, $max = strlen($selector); $i < $max; $i++)
-    {
-      if (',' == $selector[$i] && !$quoted)
-      {
-        $tokens[] = trim($token);
-        $token = '';
-      }
-      else if ('"' == $selector[$i])
-      {
-        $token .= $selector[$i];
-        $quoted = $quoted ? false : true;
-      }
-      else
-      {
-        $token .= $selector[$i];
-      }
-    }
-    if ($token)
-    {
-      $tokens[] = trim($token);
+        return $all_nodes;
     }
 
-    return $tokens;
-  }
-
-  protected function tokenize($selector)
-  {
-    // split tokens by space except if space is in an attribute selector
-    $tokens = array();
-    $combinators = array(' ', '>', '+');
-    $quoted = false;
-    $token = array('combinator' => ' ', 'name' => '');
-    for ($i = 0, $max = strlen($selector); $i < $max; $i++)
+    protected function getElementsByTagName($nodes, $tagName, $combinator = ' ')
     {
-      if (in_array($selector[$i], $combinators) && !$quoted)
-      {
-        // remove all whitespaces around the combinator
-        $combinator = $selector[$i];
-        while (in_array($selector[$i + 1], $combinators))
-        {
-          if (' ' != $selector[++$i])
-          {
-            $combinator = $selector[$i];
-          }
+        $founds = array();
+        foreach ($nodes as $node) {
+            switch ($combinator) {
+                case ' ':
+                    // Descendant selector
+                    foreach ($node->getElementsByTagName($tagName) as $element) {
+                        $founds[] = $element;
+                    }
+
+                    break;
+
+                case '>':
+                    // Child selector
+                    foreach ($node->childNodes as $element) {
+                        if ($tagName == $element->nodeName) {
+                            $founds[] = $element;
+                        }
+                    }
+
+                    break;
+
+                case '+':
+                    // Adjacent selector
+                    $element = $node->nextSibling;
+                    if ($element && '#text' == $element->nodeName) {
+                        $element = $element->nextSibling;
+                    }
+
+                    if ($element && $tagName == $element->nodeName) {
+                        $founds[] = $element;
+                    }
+
+                    break;
+
+                default:
+                    throw new Exception(sprintf('Unrecognized combinator "%s".', $combinator));
+            }
         }
 
-        $tokens[] = $token;
-        $token = array('combinator' => $combinator, 'name' => '');
-      }
-      else if ('"' == $selector[$i])
-      {
-        $token['name'] .= $selector[$i];
-        $quoted = $quoted ? false : true;
-      }
-      else
-      {
-        $token['name'] .= $selector[$i];
-      }
+        return $founds;
     }
-    if ($token['name'])
+
+    protected function tokenize_selectors($selector)
     {
-      $tokens[] = $token;
+        // split tokens by , except in an attribute selector
+        $tokens = array();
+        $quoted = false;
+        $token = '';
+        for ($i = 0, $max = strlen($selector); $i < $max; ++$i) {
+            if (',' == $selector[$i] && !$quoted) {
+                $tokens[] = trim($token);
+                $token = '';
+            } elseif ('"' == $selector[$i]) {
+                $token .= $selector[$i];
+                $quoted = $quoted ? false : true;
+            } else {
+                $token .= $selector[$i];
+            }
+        }
+        if ($token) {
+            $tokens[] = trim($token);
+        }
+
+        return $tokens;
     }
 
-    foreach ($tokens as &$token)
+    protected function tokenize($selector)
     {
-      list($token['name'], $token['selector']) = $this->tokenize_selector_name($token['name']);
+        // split tokens by space except if space is in an attribute selector
+        $tokens = array();
+        $combinators = array(' ', '>', '+');
+        $quoted = false;
+        $token = array('combinator' => ' ', 'name' => '');
+        for ($i = 0, $max = strlen($selector); $i < $max; ++$i) {
+            if (in_array($selector[$i], $combinators) && !$quoted) {
+                // remove all whitespaces around the combinator
+                $combinator = $selector[$i];
+                while (in_array($selector[$i + 1], $combinators)) {
+                    if (' ' != $selector[++$i]) {
+                        $combinator = $selector[$i];
+                    }
+                }
+
+                $tokens[] = $token;
+                $token = array('combinator' => $combinator, 'name' => '');
+            } elseif ('"' == $selector[$i]) {
+                $token['name'] .= $selector[$i];
+                $quoted = $quoted ? false : true;
+            } else {
+                $token['name'] .= $selector[$i];
+            }
+        }
+        if ($token['name']) {
+            $tokens[] = $token;
+        }
+
+        foreach ($tokens as &$token) {
+            list($token['name'], $token['selector']) = $this->tokenize_selector_name($token['name']);
+        }
+
+        return $tokens;
     }
 
-    return $tokens;
-  }
-
-  protected function tokenize_selector_name($token_name)
-  {
-    // split custom selector
-    $quoted = false;
-    $name = '';
-    $selector = '';
-    $in_selector = false;
-    for ($i = 0, $max = strlen($token_name); $i < $max; $i++)
+    protected function tokenize_selector_name($token_name)
     {
-      if ('"' == $token_name[$i])
-      {
-        $quoted = $quoted ? false : true;
-      }
-
-      if (!$quoted && ':' == $token_name[$i])
-      {
-        $in_selector = true;
-      }
-
-      if ($in_selector)
-      {
-        $selector .= $token_name[$i];
-      }
-      else
-      {
-        $name .= $token_name[$i];
-      }
-    }
+        // split custom selector
+        $quoted = false;
+        $name = '';
+        $selector = '';
+        $in_selector = false;
+        for ($i = 0, $max = strlen($token_name); $i < $max; ++$i) {
+            if ('"' == $token_name[$i]) {
+                $quoted = $quoted ? false : true;
+            }
 
-    return array($name, $selector);
-  }
+            if (!$quoted && ':' == $token_name[$i]) {
+                $in_selector = true;
+            }
 
-  protected function matchMultipleCustomSelectors($nodes, $selector)
-  {
-    if (!$selector)
-    {
-      return $nodes;
-    }
+            if ($in_selector) {
+                $selector .= $token_name[$i];
+            } else {
+                $name .= $token_name[$i];
+            }
+        }
 
-    foreach ($this->split_custom_selector($selector) as $selector) {
-      $nodes = $this->matchCustomSelector($nodes, $selector);
+        return array($name, $selector);
     }
-    return $nodes;
-  }
 
-  protected function matchCustomSelector($nodes, $selector)
-  {
-    if (!$selector)
+    protected function matchMultipleCustomSelectors($nodes, $selector)
     {
-      return $nodes;
+        if (!$selector) {
+            return $nodes;
+        }
+
+        foreach ($this->split_custom_selector($selector) as $selector) {
+            $nodes = $this->matchCustomSelector($nodes, $selector);
+        }
+
+        return $nodes;
     }
 
-    $selector = $this->tokenize_custom_selector($selector);
-    $matchingNodes = array();
-    for ($i = 0, $max = count($nodes); $i < $max; $i++)
+    protected function matchCustomSelector($nodes, $selector)
     {
-      switch ($selector['selector'])
-      {
-        case 'contains':
-          if (false !== strpos($nodes[$i]->textContent, $selector['parameter']))
-          {
-            $matchingNodes[] = $nodes[$i];
-          }
-          break;
-        case 'nth-child':
-          if ($nodes[$i] === $this->nth($nodes[$i]->parentNode->firstChild, (integer) $selector['parameter']))
-          {
-            $matchingNodes[] = $nodes[$i];
-          }
-          break;
-        case 'first-child':
-          if ($nodes[$i] === $this->nth($nodes[$i]->parentNode->firstChild))
-          {
-            $matchingNodes[] = $nodes[$i];
-          }
-          break;
-        case 'last-child':
-          if ($nodes[$i] === $this->nth($nodes[$i]->parentNode->lastChild, 1, 'previousSibling'))
-          {
-            $matchingNodes[] = $nodes[$i];
-          }
-          break;
-        case 'lt':
-          if ($i < (integer) $selector['parameter'])
-          {
-            $matchingNodes[] = $nodes[$i];
-          }
-          break;
-        case 'gt':
-          if ($i > (integer) $selector['parameter'])
-          {
-            $matchingNodes[] = $nodes[$i];
-          }
-          break;
-        case 'odd':
-          if ($i % 2)
-          {
-            $matchingNodes[] = $nodes[$i];
-          }
-          break;
-        case 'even':
-          if (0 == $i % 2)
-          {
-            $matchingNodes[] = $nodes[$i];
-          }
-          break;
-        case 'nth':
-        case 'eq':
-          if ($i == (integer) $selector['parameter'])
-          {
-            $matchingNodes[] = $nodes[$i];
-          }
-          break;
-        case 'first':
-          if ($i == 0)
-          {
-            $matchingNodes[] = $nodes[$i];
-          }
-          break;
-        case 'last':
-          if ($i == $max - 1)
-          {
-            $matchingNodes[] = $nodes[$i];
-          }
-          break;
-        default:
-          throw new Exception(sprintf('Unrecognized selector "%s".', $selector['selector']));
-      }
-    }
+        if (!$selector) {
+            return $nodes;
+        }
+
+        $selector = $this->tokenize_custom_selector($selector);
+        $matchingNodes = array();
+        for ($i = 0, $max = count($nodes); $i < $max; ++$i) {
+            switch ($selector['selector']) {
+                case 'contains':
+                    if (false !== strpos($nodes[$i]->textContent, $selector['parameter'])) {
+                        $matchingNodes[] = $nodes[$i];
+                    }
+
+                    break;
+
+                case 'nth-child':
+                    if ($nodes[$i] === $this->nth($nodes[$i]->parentNode->firstChild, (int) $selector['parameter'])) {
+                        $matchingNodes[] = $nodes[$i];
+                    }
+
+                    break;
+
+                case 'first-child':
+                    if ($nodes[$i] === $this->nth($nodes[$i]->parentNode->firstChild)) {
+                        $matchingNodes[] = $nodes[$i];
+                    }
+
+                    break;
+
+                case 'last-child':
+                    if ($nodes[$i] === $this->nth($nodes[$i]->parentNode->lastChild, 1, 'previousSibling')) {
+                        $matchingNodes[] = $nodes[$i];
+                    }
+
+                    break;
+
+                case 'lt':
+                    if ($i < (int) $selector['parameter']) {
+                        $matchingNodes[] = $nodes[$i];
+                    }
 
-    return $matchingNodes;
-  }
+                    break;
 
-  protected function split_custom_selector($selectors)
-  {
-    if (!preg_match_all('/
+                case 'gt':
+                    if ($i > (int) $selector['parameter']) {
+                        $matchingNodes[] = $nodes[$i];
+                    }
+
+                    break;
+
+                case 'odd':
+                    if ($i % 2) {
+                        $matchingNodes[] = $nodes[$i];
+                    }
+
+                    break;
+
+                case 'even':
+                    if (0 == $i % 2) {
+                        $matchingNodes[] = $nodes[$i];
+                    }
+
+                    break;
+
+                case 'nth':
+                case 'eq':
+                    if ($i == (int) $selector['parameter']) {
+                        $matchingNodes[] = $nodes[$i];
+                    }
+
+                    break;
+
+                case 'first':
+                    if (0 == $i) {
+                        $matchingNodes[] = $nodes[$i];
+                    }
+
+                    break;
+
+                case 'last':
+                    if ($i == $max - 1) {
+                        $matchingNodes[] = $nodes[$i];
+                    }
+
+                    break;
+
+                default:
+                    throw new Exception(sprintf('Unrecognized selector "%s".', $selector['selector']));
+            }
+        }
+
+        return $matchingNodes;
+    }
+
+    protected function split_custom_selector($selectors)
+    {
+        if (!preg_match_all('/
       :
       (?:[a-zA-Z0-9\-]+)
       (?:
@@ -516,16 +559,16 @@ protected function split_custom_selector($selectors)
           )
         \)
       )?
-    /x', $selectors, $matches, PREG_PATTERN_ORDER))
-    {
-      throw new Exception(sprintf('Unable to split custom selector "%s".', $selectors));
+    /x', $selectors, $matches, PREG_PATTERN_ORDER)) {
+            throw new Exception(sprintf('Unable to split custom selector "%s".', $selectors));
+        }
+
+        return $matches[0];
     }
-    return $matches[0];
-  }
 
-  protected function tokenize_custom_selector($selector)
-  {
-    if (!preg_match('/
+    protected function tokenize_custom_selector($selector)
+    {
+        if (!preg_match('/
       ([a-zA-Z0-9\-]+)
       (?:
         \(
@@ -536,97 +579,24 @@ protected function tokenize_custom_selector($selector)
           )
         \)
       )?
-    /x', substr($selector, 1), $matches))
-    {
-      throw new Exception(sprintf('Unable to parse custom selector "%s".', $selector));
+    /x', substr($selector, 1), $matches)) {
+            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 array('selector' => $matches[1], 'parameter' => isset($matches[3]) ? ($matches[3] ?: $matches[4]) : '');
-  }
 
-  protected function nth($cur, $result = 1, $dir = 'nextSibling')
-  {
-    $num = 0;
-    for (; $cur; $cur = $cur->$dir)
+    protected function nth($cur, $result = 1, $dir = 'nextSibling')
     {
-      if (1 == $cur->nodeType)
-      {
-        ++$num;
-      }
-
-      if ($num == $result)
-      {
-        return $cur;
-      }
+        $num = 0;
+        for (; $cur; $cur = $cur->{$dir}) {
+            if (1 == $cur->nodeType) {
+                ++$num;
+            }
+
+            if ($num == $result) {
+                return $cur;
+            }
+        }
     }
-  }
-
-  /**
-   * Reset the array to the beginning (as required for the Iterator interface).
-   */
-  #[\ReturnTypeWillChange]
-  public function rewind()
-  {
-    reset($this->nodes);
-
-    $this->count = count($this->nodes);
-  }
-
-  /**
-   * Get the key associated with the current value (as required by the Iterator interface).
-   *
-   * @return string The key
-   */
-  #[\ReturnTypeWillChange]
-  public function key()
-  {
-    return key($this->nodes);
-  }
-
-  /**
-   * Escapes and return the current value (as required by the Iterator interface).
-   *
-   * @return mixed The escaped value
-   */
-  #[\ReturnTypeWillChange]
-  public function current()
-  {
-    return current($this->nodes);
-  }
-
-  /**
-   * Moves to the next element (as required by the Iterator interface).
-   */
-  #[\ReturnTypeWillChange]
-  public function next()
-  {
-    next($this->nodes);
-
-    $this->count --;
-  }
-
-  /**
-   * Returns true if the current element is valid (as required by the Iterator interface).
-   *
-   * The current element will not be valid if {@link next()} has fallen off the
-   * end of the array or if there are no elements in the array and {@link
-   * rewind()} was called.
-   *
-   * @return bool The validity of the current element; true if it is valid
-   */
-  #[\ReturnTypeWillChange]
-  public function valid()
-  {
-    return $this->count > 0;
-  }
-
-  /**
-   * Returns the number of matching nodes (implements Countable).
-   *
-   * @param integer The number of matching nodes
-   */
-  #[\ReturnTypeWillChange]
-  public function count()
-  {
-    return count($this->nodes);
-  }
 }
diff --git a/lib/util/sfFinder.class.php b/lib/util/sfFinder.class.php
index be56137a3..48b7d52cd 100644
--- a/lib/util/sfFinder.class.php
+++ b/lib/util/sfFinder.class.php
@@ -8,9 +8,7 @@
  * file that was distributed with this source code.
  */
 
-
 /**
- *
  * Allow to build rules to find files and directories.
  *
  * All rules may be invoked several times, except for ->in() method.
@@ -23,575 +21,559 @@
  *
  * Interface loosely based on perl File::Find::Rule module.
  *
- * @package    symfony
- * @subpackage util
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfFinder
 {
-  protected $type                   = 'file';
-  protected $names                  = array();
-  protected $prunes                 = array();
-  protected $discards               = array();
-  protected $execs                  = array();
-  protected $mindepth               = 0;
-  protected $sizes                  = array();
-  protected $maxdepth               = 1000000;
-  protected $relative               = false;
-  protected $follow_link            = false;
-  protected $sort                   = false;
-  protected $ignore_version_control = true;
-
-  /**
-   * Sets maximum directory depth.
-   *
-   * Finder will descend at most $level levels of directories below the starting point.
-   *
-   * @param  int $level
-   * @return sfFinder current sfFinder object
-   */
-  public function maxdepth($level)
-  {
-    $this->maxdepth = $level;
-
-    return $this;
-  }
-
-  /**
-   * Sets minimum directory depth.
-   *
-   * Finder will start applying tests at level $level.
-   *
-   * @param  int $level
-   * @return sfFinder current sfFinder object
-   */
-  public function mindepth($level)
-  {
-    $this->mindepth = $level;
-
-    return $this;
-  }
-
-  public function get_type()
-  {
-    return $this->type;
-  }
-
-  /**
-   * Sets the type of elements to returns.
-   *
-   * @param  string $name  directory or file or any (for both file and directory)
-   * @return sfFinder new sfFinder object
-   */
-  public static function type($name)
-  {
-    $finder = new self();
-    return $finder->setType($name);
-  }
-  /**
-   * Sets the type of elements to returns.
-   *
-   * @param  string $name  directory or file or any (for both file and directory)
-   * @return sfFinder Current object
-   */
-  public function setType($name)
-  {
-    $name = strtolower($name);
-
-    if (substr($name, 0, 3) === 'dir')
+    protected $type = 'file';
+    protected $names = array();
+    protected $prunes = array();
+    protected $discards = array();
+    protected $execs = array();
+    protected $mindepth = 0;
+    protected $sizes = array();
+    protected $maxdepth = 1000000;
+    protected $relative = false;
+    protected $follow_link = false;
+    protected $sort = false;
+    protected $ignore_version_control = true;
+
+    /**
+     * Sets maximum directory depth.
+     *
+     * Finder will descend at most $level levels of directories below the starting point.
+     *
+     * @param int $level
+     *
+     * @return sfFinder current sfFinder object
+     */
+    public function maxdepth($level)
     {
-      $this->type = 'directory';
+        $this->maxdepth = $level;
 
-      return $this;
+        return $this;
     }
-    if ($name === 'any')
+
+    /**
+     * Sets minimum directory depth.
+     *
+     * Finder will start applying tests at level $level.
+     *
+     * @param int $level
+     *
+     * @return sfFinder current sfFinder object
+     */
+    public function mindepth($level)
     {
-      $this->type = 'any';
+        $this->mindepth = $level;
 
-      return $this;
+        return $this;
     }
 
-      $this->type = 'file';
-
-    return $this;
-  }
-
-  /*
-   * glob, patterns (must be //) or strings
-   */
-  protected function to_regex($str)
-  {
-    if (preg_match('/^(!)?([^a-zA-Z0-9\\\\]).+?\\2[ims]?$/', $str))
+    public function get_type()
     {
-      return $str;
+        return $this->type;
     }
 
-    return sfGlobToRegex::glob_to_regex($str);
-  }
-
-  protected function args_to_array($arg_list, $not = false)
-  {
-    $list = array();
-    $nbArgList = count($arg_list);
-    for ($i = 0; $i < $nbArgList; $i++)
+    /**
+     * Sets the type of elements to returns.
+     *
+     * @param string $name directory or file or any (for both file and directory)
+     *
+     * @return sfFinder new sfFinder object
+     */
+    public static function type($name)
     {
-      if (is_array($arg_list[$i]))
-      {
-        foreach ($arg_list[$i] as $arg)
-        {
-          $list[] = array($not, $this->to_regex($arg));
-        }
-      }
-      else
-      {
-        $list[] = array($not, $this->to_regex($arg_list[$i]));
-      }
+        $finder = new self();
+
+        return $finder->setType($name);
     }
 
-    return $list;
-  }
-
-  /**
-   * Adds rules that files must match.
-   *
-   * You can use patterns (delimited with / sign), globs or simple strings.
-   *
-   * $finder->name('*.php')
-   * $finder->name('/\.php$/') // same as above
-   * $finder->name('test.php')
-   *
-   * @param  list   a list of patterns, globs or strings
-   * @return sfFinder Current object
-   */
-  public function name()
-  {
-    $args = func_get_args();
-    $this->names = array_merge($this->names, $this->args_to_array($args));
-
-    return $this;
-  }
-
-  /**
-   * Adds rules that files must not match.
-   *
-   * @see    ->name()
-   * @param  list   a list of patterns, globs or strings
-   * @return sfFinder Current object
-   */
-  public function not_name()
-  {
-    $args = func_get_args();
-    $this->names = array_merge($this->names, $this->args_to_array($args, true));
-
-    return $this;
-  }
-
-  /**
-   * Adds tests for file sizes.
-   *
-   * $finder->size('> 10K');
-   * $finder->size('<= 1Ki');
-   * $finder->size(4);
-   *
-   * @param  list   a list of comparison strings
-   * @return sfFinder Current object
-   */
-  public function size()
-  {
-    $args = func_get_args();
-    $numargs = count($args);
-    for ($i = 0; $i < $numargs; $i++)
+    /**
+     * Sets the type of elements to returns.
+     *
+     * @param string $name directory or file or any (for both file and directory)
+     *
+     * @return sfFinder Current object
+     */
+    public function setType($name)
     {
-      $this->sizes[] = new sfNumberCompare($args[$i]);
+        $name = strtolower($name);
+
+        if ('dir' === substr($name, 0, 3)) {
+            $this->type = 'directory';
+
+            return $this;
+        }
+        if ('any' === $name) {
+            $this->type = 'any';
+
+            return $this;
+        }
+
+        $this->type = 'file';
+
+        return $this;
     }
 
-    return $this;
-  }
-
-  /**
-   * Traverses no further.
-   *
-   * @param  list   a list of patterns, globs to match
-   * @return sfFinder Current object
-   */
-  public function prune()
-  {
-    $args = func_get_args();
-    $this->prunes = array_merge($this->prunes, $this->args_to_array($args));
-
-    return $this;
-  }
-
-  /**
-   * Discards elements that matches.
-   *
-   * @param  list   a list of patterns, globs to match
-   * @return sfFinder Current object
-   */
-  public function discard()
-  {
-    $args = func_get_args();
-    $this->discards = array_merge($this->discards, $this->args_to_array($args));
-
-    return $this;
-  }
-
-  /**
-   * Ignores version control directories.
-   *
-   * Currently supports Subversion, CVS, DARCS, Gnu Arch, Monotone, Bazaar-NG, GIT, Mercurial
-   *
-   * @param  bool   $ignore  falase when version control directories shall be included (default is true)
-   *
-   * @return sfFinder Current object
-   */
-  public function ignore_version_control($ignore = true)
-  {
-    $this->ignore_version_control = $ignore;
-
-    return $this;
-  }
-
-  /**
-   * Returns files and directories ordered by name
-   *
-   * @return sfFinder Current object
-   */
-  public function sort_by_name()
-  {
-    $this->sort = 'name';
-
-    return $this;
-  }
-
-  /**
-   * Returns files and directories ordered by type (directories before files), then by name
-   *
-   * @return sfFinder Current object
-   */
-  public function sort_by_type()
-  {
-    $this->sort = 'type';
-
-    return $this;
-  }
-
-  /**
-   * Executes function or method for each element.
-   *
-   * Element match if functino or method returns true.
-   *
-   * $finder->exec('myfunction');
-   * $finder->exec(array($object, 'mymethod'));
-   *
-   * @param  mixed  function or method to call
-   * @return sfFinder Current object
-   */
-  public function exec()
-  {
-    $args = func_get_args();
-    $numargs = count($args);
-    for ($i = 0; $i < $numargs; $i++)
+    /**
+     * Adds rules that files must match.
+     *
+     * You can use patterns (delimited with / sign), globs or simple strings.
+     *
+     * $finder->name('*.php')
+     * $finder->name('/\.php$/') // same as above
+     * $finder->name('test.php')
+     *
+     * @param  list   a list of patterns, globs or strings
+     *
+     * @return sfFinder Current object
+     */
+    public function name()
     {
-      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]));
-      }
-      if (!is_array($args[$i]) && !function_exists($args[$i]))
-      {
-        throw new sfException(sprintf('function "%s" does not exist.', $args[$i]));
-      }
-
-      $this->execs[] = $args[$i];
+        $args = func_get_args();
+        $this->names = array_merge($this->names, $this->args_to_array($args));
+
+        return $this;
     }
 
-    return $this;
-  }
-
-  /**
-   * Returns relative paths for all files and directories.
-   *
-   * @return sfFinder Current object
-   */
-  public function relative()
-  {
-    $this->relative = true;
-
-    return $this;
-  }
-
-  /**
-   * Symlink following.
-   *
-   * @return sfFinder Current object
-   */
-  public function follow_link()
-  {
-    $this->follow_link = true;
-
-    return $this;
-  }
-
-  /**
-   * Searches files and directories which match defined rules.
-   *
-   * @return array list of files and directories
-   */
-  public function in()
-  {
-    $files    = array();
-    $here_dir = getcwd();
-
-    $finder = clone $this;
-
-    if ($this->ignore_version_control)
+    /**
+     * Adds rules that files must not match.
+     *
+     * @see    ->name()
+     *
+     * @param  list   a list of patterns, globs or strings
+     *
+     * @return sfFinder Current object
+     */
+    public function not_name()
     {
-      $ignores = array('.svn', '_svn', 'CVS', '_darcs', '.arch-params', '.monotone', '.bzr', '.git', '.hg');
+        $args = func_get_args();
+        $this->names = array_merge($this->names, $this->args_to_array($args, true));
 
-      $finder->discard($ignores)->prune($ignores);
+        return $this;
     }
 
-    // first argument is an array?
-    $numargs  = func_num_args();
-    $arg_list = func_get_args();
-    if ($numargs === 1 && is_array($arg_list[0]))
+    /**
+     * Adds tests for file sizes.
+     *
+     * $finder->size('> 10K');
+     * $finder->size('<= 1Ki');
+     * $finder->size(4);
+     *
+     * @param  list   a list of comparison strings
+     *
+     * @return sfFinder Current object
+     */
+    public function size()
     {
-      $arg_list = $arg_list[0];
-      $numargs  = count($arg_list);
+        $args = func_get_args();
+        $numargs = count($args);
+        for ($i = 0; $i < $numargs; ++$i) {
+            $this->sizes[] = new sfNumberCompare($args[$i]);
+        }
+
+        return $this;
     }
 
-    for ($i = 0; $i < $numargs; $i++)
+    /**
+     * Traverses no further.
+     *
+     * @param  list   a list of patterns, globs to match
+     *
+     * @return sfFinder Current object
+     */
+    public function prune()
     {
-      $dir = realpath($arg_list[$i]);
-
-      if (!is_dir($dir))
-      {
-        continue;
-      }
+        $args = func_get_args();
+        $this->prunes = array_merge($this->prunes, $this->args_to_array($args));
 
-      $dir = str_replace('\\', '/', $dir);
+        return $this;
+    }
 
-      // absolute path?
-      if (!self::isPathAbsolute($dir))
-      {
-        $dir = $here_dir.'/'.$dir;
-      }
+    /**
+     * Discards elements that matches.
+     *
+     * @param  list   a list of patterns, globs to match
+     *
+     * @return sfFinder Current object
+     */
+    public function discard()
+    {
+        $args = func_get_args();
+        $this->discards = array_merge($this->discards, $this->args_to_array($args));
 
-      $new_files = str_replace('\\', '/', $finder->search_in($dir));
+        return $this;
+    }
 
-      if ($this->relative)
-      {
-        $new_files = preg_replace('#^'.preg_quote(rtrim($dir, '/'), '#').'/#', '', $new_files);
-      }
+    /**
+     * Ignores version control directories.
+     *
+     * Currently supports Subversion, CVS, DARCS, Gnu Arch, Monotone, Bazaar-NG, GIT, Mercurial
+     *
+     * @param bool $ignore falase when version control directories shall be included (default is true)
+     *
+     * @return sfFinder Current object
+     */
+    public function ignore_version_control($ignore = true)
+    {
+        $this->ignore_version_control = $ignore;
 
-      $files = array_merge($files, $new_files);
+        return $this;
     }
 
-    if ($this->sort === 'name')
+    /**
+     * Returns files and directories ordered by name.
+     *
+     * @return sfFinder Current object
+     */
+    public function sort_by_name()
     {
-      sort($files);
+        $this->sort = 'name';
+
+        return $this;
     }
 
-    return array_unique($files);
-  }
+    /**
+     * Returns files and directories ordered by type (directories before files), then by name.
+     *
+     * @return sfFinder Current object
+     */
+    public function sort_by_type()
+    {
+        $this->sort = 'type';
+
+        return $this;
+    }
 
-  protected function search_in($dir, $depth = 0)
-  {
-    if ($depth > $this->maxdepth)
+    /**
+     * Executes function or method for each element.
+     *
+     * Element match if functino or method returns true.
+     *
+     * $finder->exec('myfunction');
+     * $finder->exec(array($object, 'mymethod'));
+     *
+     * @param  mixed  function or method to call
+     *
+     * @return sfFinder Current object
+     */
+    public function exec()
     {
-      return array();
+        $args = func_get_args();
+        $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]));
+            }
+            if (!is_array($args[$i]) && !function_exists($args[$i])) {
+                throw new sfException(sprintf('function "%s" does not exist.', $args[$i]));
+            }
+
+            $this->execs[] = $args[$i];
+        }
+
+        return $this;
     }
 
-    $dir = realpath($dir);
+    /**
+     * Returns relative paths for all files and directories.
+     *
+     * @return sfFinder Current object
+     */
+    public function relative()
+    {
+        $this->relative = true;
 
-    if ((!$this->follow_link) && is_link($dir))
+        return $this;
+    }
+
+    /**
+     * Symlink following.
+     *
+     * @return sfFinder Current object
+     */
+    public function follow_link()
     {
-      return array();
+        $this->follow_link = true;
+
+        return $this;
     }
 
-    $files = array();
-    $temp_files = array();
-    $temp_folders = array();
-    if (is_dir($dir) && is_readable($dir))
+    /**
+     * Searches files and directories which match defined rules.
+     *
+     * @return array list of files and directories
+     */
+    public function in()
     {
-      $current_dir = opendir($dir);
-      while (false !== $entryname = readdir($current_dir))
-      {
-        if ($entryname == '.' || $entryname == '..') continue;
-
-        $current_entry = $dir.DIRECTORY_SEPARATOR.$entryname;
-        if ((!$this->follow_link) && is_link($current_entry))
-        {
-          continue;
-        }
-
-        if (is_dir($current_entry))
-        {
-          if ($this->sort === 'type')
-          {
-            $temp_folders[$entryname] = $current_entry;
-          }
-          else
-          {
-            if (($this->type === 'directory' || $this->type === 'any') && ($depth >= $this->mindepth) && !$this->is_discarded($dir, $entryname) && $this->match_names($dir, $entryname) && $this->exec_ok($dir, $entryname))
-            {
-              $files[] = $current_entry;
-            }
+        $files = array();
+        $here_dir = getcwd();
 
-            if (!$this->is_pruned($dir, $entryname))
-            {
-              $files = array_merge($files, $this->search_in($current_entry, $depth + 1));
-            }
-          }
-        }
-        else
-        {
-          if (($this->type !== 'directory' || $this->type === 'any') && ($depth >= $this->mindepth) && !$this->is_discarded($dir, $entryname) && $this->match_names($dir, $entryname) && $this->size_ok($dir, $entryname) && $this->exec_ok($dir, $entryname))
-          {
-            if ($this->sort === 'type')
-            {
-              $temp_files[] = $current_entry;
+        $finder = clone $this;
+
+        if ($this->ignore_version_control) {
+            $ignores = array('.svn', '_svn', 'CVS', '_darcs', '.arch-params', '.monotone', '.bzr', '.git', '.hg');
+
+            $finder->discard($ignores)->prune($ignores);
+        }
+
+        // first argument is an array?
+        $numargs = func_num_args();
+        $arg_list = func_get_args();
+        if (1 === $numargs && is_array($arg_list[0])) {
+            $arg_list = $arg_list[0];
+            $numargs = count($arg_list);
+        }
+
+        for ($i = 0; $i < $numargs; ++$i) {
+            $dir = realpath($arg_list[$i]);
+
+            if (!is_dir($dir)) {
+                continue;
             }
-            else
-            {
-              $files[] = $current_entry;
+
+            $dir = str_replace('\\', '/', $dir);
+
+            // absolute path?
+            if (!self::isPathAbsolute($dir)) {
+                $dir = $here_dir.'/'.$dir;
             }
-          }
-        }
-      }
 
-      if ($this->sort === 'type')
-      {
-        ksort($temp_folders);
-        foreach($temp_folders as $entryname => $current_entry)
-        {
-          if (($this->type === 'directory' || $this->type === 'any') && ($depth >= $this->mindepth) && !$this->is_discarded($dir, $entryname) && $this->match_names($dir, $entryname) && $this->exec_ok($dir, $entryname))
-          {
-            $files[] = $current_entry;
-          }
+            $new_files = str_replace('\\', '/', $finder->search_in($dir));
 
-          if (!$this->is_pruned($dir, $entryname))
-          {
-            $files = array_merge($files, $this->search_in($current_entry, $depth + 1));
-          }
+            if ($this->relative) {
+                $new_files = preg_replace('#^'.preg_quote(rtrim($dir, '/'), '#').'/#', '', $new_files);
+            }
+
+            $files = array_merge($files, $new_files);
         }
 
-        sort($temp_files);
-        $files = array_merge($files, $temp_files);
-      }
+        if ('name' === $this->sort) {
+            sort($files);
+        }
 
-      closedir($current_dir);
+        return array_unique($files);
     }
 
-    return $files;
-  }
-
-  protected function match_names($dir, $entry)
-  {
-    if (!count($this->names)) return true;
+    public static function isPathAbsolute($path)
+    {
+        if ('/' === $path[0] || '\\' === $path[0]
+            || (
+                strlen($path) > 3 && ctype_alpha($path[0])
+             && ':' === $path[1]
+             && ('\\' === $path[2] || '/' === $path[2])
+            )
+        ) {
+            return true;
+        }
 
-    // Flags indicating that there was attempts to match
-    // at least one "not_name" or "name" rule respectively
-    // to following variables:
-    $one_not_name_rule = false;
-    $one_name_rule = false;
+        return false;
+    }
 
-    foreach ($this->names as $args)
+    // glob, patterns (must be //) or strings
+    protected function to_regex($str)
     {
-      list($not, $regex) = $args;
-      $not ? $one_not_name_rule = true : $one_name_rule = true;
-      if (preg_match($regex, $entry))
-      {
-        // We must match ONLY ONE "not_name" or "name" rule:
-        // if "not_name" rule matched then we return "false"
-        // if "name" rule matched then we return "true"
-        return $not ? false : true;
-      }
+        if (preg_match('/^(!)?([^a-zA-Z0-9\\\\]).+?\\2[ims]?$/', $str)) {
+            return $str;
+        }
+
+        return sfGlobToRegex::glob_to_regex($str);
     }
 
-    if ($one_not_name_rule && $one_name_rule)
+    protected function args_to_array($arg_list, $not = false)
     {
-      return false;
+        $list = array();
+        $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));
+                }
+            } else {
+                $list[] = array($not, $this->to_regex($arg_list[$i]));
+            }
+        }
+
+        return $list;
     }
-    else if ($one_not_name_rule)
+
+    protected function search_in($dir, $depth = 0)
     {
-      return true;
+        if ($depth > $this->maxdepth) {
+            return array();
+        }
+
+        $dir = realpath($dir);
+
+        if ((!$this->follow_link) && is_link($dir)) {
+            return array();
+        }
+
+        $files = array();
+        $temp_files = array();
+        $temp_folders = array();
+        if (is_dir($dir) && is_readable($dir)) {
+            $current_dir = opendir($dir);
+            while (false !== $entryname = readdir($current_dir)) {
+                if ('.' == $entryname || '..' == $entryname) {
+                    continue;
+                }
+
+                $current_entry = $dir.DIRECTORY_SEPARATOR.$entryname;
+                if ((!$this->follow_link) && is_link($current_entry)) {
+                    continue;
+                }
+
+                if (is_dir($current_entry)) {
+                    if ('type' === $this->sort) {
+                        $temp_folders[$entryname] = $current_entry;
+                    } else {
+                        if (('directory' === $this->type || 'any' === $this->type) && ($depth >= $this->mindepth) && !$this->is_discarded($dir, $entryname) && $this->match_names($dir, $entryname) && $this->exec_ok($dir, $entryname)) {
+                            $files[] = $current_entry;
+                        }
+
+                        if (!$this->is_pruned($dir, $entryname)) {
+                            $files = array_merge($files, $this->search_in($current_entry, $depth + 1));
+                        }
+                    }
+                } else {
+                    if (('directory' !== $this->type || 'any' === $this->type) && ($depth >= $this->mindepth) && !$this->is_discarded($dir, $entryname) && $this->match_names($dir, $entryname) && $this->size_ok($dir, $entryname) && $this->exec_ok($dir, $entryname)) {
+                        if ('type' === $this->sort) {
+                            $temp_files[] = $current_entry;
+                        } else {
+                            $files[] = $current_entry;
+                        }
+                    }
+                }
+            }
+
+            if ('type' === $this->sort) {
+                ksort($temp_folders);
+                foreach ($temp_folders as $entryname => $current_entry) {
+                    if (('directory' === $this->type || 'any' === $this->type) && ($depth >= $this->mindepth) && !$this->is_discarded($dir, $entryname) && $this->match_names($dir, $entryname) && $this->exec_ok($dir, $entryname)) {
+                        $files[] = $current_entry;
+                    }
+
+                    if (!$this->is_pruned($dir, $entryname)) {
+                        $files = array_merge($files, $this->search_in($current_entry, $depth + 1));
+                    }
+                }
+
+                sort($temp_files);
+                $files = array_merge($files, $temp_files);
+            }
+
+            closedir($current_dir);
+        }
+
+        return $files;
     }
-    else if ($one_name_rule)
+
+    protected function match_names($dir, $entry)
     {
-      return false;
-    }
-    return true;
-  }
+        if (!count($this->names)) {
+            return true;
+        }
 
-  protected function size_ok($dir, $entry)
-  {
-    if (0 === count($this->sizes)) return true;
+        // Flags indicating that there was attempts to match
+        // at least one "not_name" or "name" rule respectively
+        // to following variables:
+        $one_not_name_rule = false;
+        $one_name_rule = false;
+
+        foreach ($this->names as $args) {
+            list($not, $regex) = $args;
+            $not ? $one_not_name_rule = true : $one_name_rule = true;
+            if (preg_match($regex, $entry)) {
+                // We must match ONLY ONE "not_name" or "name" rule:
+                // if "not_name" rule matched then we return "false"
+                // if "name" rule matched then we return "true"
+                return $not ? false : true;
+            }
+        }
 
-    if (!is_file($dir.DIRECTORY_SEPARATOR.$entry)) return true;
+        if ($one_not_name_rule && $one_name_rule) {
+            return false;
+        }
+        if ($one_not_name_rule) {
+            return true;
+        }
+        if ($one_name_rule) {
+            return false;
+        }
 
-    $filesize = filesize($dir.DIRECTORY_SEPARATOR.$entry);
-    foreach ($this->sizes as $number_compare)
-    {
-      if (!$number_compare->test($filesize)) return false;
+        return true;
     }
 
-    return true;
-  }
+    protected function size_ok($dir, $entry)
+    {
+        if (0 === count($this->sizes)) {
+            return true;
+        }
 
-  protected function is_pruned($dir, $entry)
-  {
-    if (0 === count($this->prunes)) return false;
+        if (!is_file($dir.DIRECTORY_SEPARATOR.$entry)) {
+            return true;
+        }
 
-    foreach ($this->prunes as $args)
-    {
-      $regex = $args[1];
-      if (preg_match($regex, $entry)) return true;
+        $filesize = filesize($dir.DIRECTORY_SEPARATOR.$entry);
+        foreach ($this->sizes as $number_compare) {
+            if (!$number_compare->test($filesize)) {
+                return false;
+            }
+        }
+
+        return true;
     }
 
-    return false;
-  }
+    protected function is_pruned($dir, $entry)
+    {
+        if (0 === count($this->prunes)) {
+            return false;
+        }
 
-  protected function is_discarded($dir, $entry)
-  {
-    if (0 === count($this->discards)) return false;
+        foreach ($this->prunes as $args) {
+            $regex = $args[1];
+            if (preg_match($regex, $entry)) {
+                return true;
+            }
+        }
 
-    foreach ($this->discards as $args)
-    {
-      $regex = $args[1];
-      if (preg_match($regex, $entry)) return true;
+        return false;
     }
 
-    return false;
-  }
+    protected function is_discarded($dir, $entry)
+    {
+        if (0 === count($this->discards)) {
+            return false;
+        }
 
-  protected function exec_ok($dir, $entry)
-  {
-    if (0 === count($this->execs)) return true;
+        foreach ($this->discards as $args) {
+            $regex = $args[1];
+            if (preg_match($regex, $entry)) {
+                return true;
+            }
+        }
 
-    foreach ($this->execs as $exec)
-    {
-      if (!call_user_func_array($exec, array($dir, $entry))) return false;
+        return false;
     }
 
-    return true;
-  }
-
-  public static function isPathAbsolute($path)
-  {
-    if ($path[0] === '/' || $path[0] === '\\' ||
-        (strlen($path) > 3 && ctype_alpha($path[0]) &&
-         $path[1] === ':' &&
-         ($path[2] === '\\' || $path[2] === '/')
-        )
-       )
+    protected function exec_ok($dir, $entry)
     {
-      return true;
-    }
+        if (0 === count($this->execs)) {
+            return true;
+        }
+
+        foreach ($this->execs as $exec) {
+            if (!call_user_func_array($exec, array($dir, $entry))) {
+                return false;
+            }
+        }
 
-    return false;
-  }
+        return true;
+    }
 }
 
 /**
@@ -611,109 +593,91 @@ public static function isPathAbsolute($path)
  *
  * based on perl Text::Glob module.
  *
- * @package    symfony
- * @subpackage util
  * @author     Fabien Potencier <fabien.potencier@gmail.com> php port
  * @author     Richard Clamp <richardc@unixbeard.net> perl version
  * @copyright  2004-2005 Fabien Potencier <fabien.potencier@gmail.com>
  * @copyright  2002 Richard Clamp <richardc@unixbeard.net>
+ *
  * @version    SVN: $Id$
  */
 class sfGlobToRegex
 {
-  protected static $strict_leading_dot = true;
-  protected static $strict_wildcard_slash = true;
-
-  public static function setStrictLeadingDot($boolean)
-  {
-    self::$strict_leading_dot = $boolean;
-  }
-
-  public static function setStrictWildcardSlash($boolean)
-  {
-    self::$strict_wildcard_slash = $boolean;
-  }
-
-  /**
-   * Returns a compiled regex which is the equiavlent of the globbing pattern.
-   *
-   * @param  string $glob  pattern
-   * @return string regex
-   */
-  public static function glob_to_regex($glob)
-  {
-    $first_byte = true;
-    $escaping = false;
-    $in_curlies = 0;
-    $regex = '';
-    $sizeGlob = strlen($glob);
-    for ($i = 0; $i < $sizeGlob; $i++)
+    protected static $strict_leading_dot = true;
+    protected static $strict_wildcard_slash = true;
+
+    public static function setStrictLeadingDot($boolean)
     {
-      $car = $glob[$i];
-      if ($first_byte)
-      {
-        if (self::$strict_leading_dot && $car !== '.')
-        {
-          $regex .= '(?=[^\.])';
-        }
+        self::$strict_leading_dot = $boolean;
+    }
 
-        $first_byte = false;
-      }
+    public static function setStrictWildcardSlash($boolean)
+    {
+        self::$strict_wildcard_slash = $boolean;
+    }
 
-      if ($car === '/')
-      {
+    /**
+     * Returns a compiled regex which is the equiavlent of the globbing pattern.
+     *
+     * @param string $glob pattern
+     *
+     * @return string regex
+     */
+    public static function glob_to_regex($glob)
+    {
         $first_byte = true;
-      }
-
-      if ($car === '.' || $car === '(' || $car === ')' || $car === '|' || $car === '+' || $car === '^' || $car === '$')
-      {
-        $regex .= "\\$car";
-      }
-      elseif ($car === '*')
-      {
-        $regex .= ($escaping ? '\\*' : (self::$strict_wildcard_slash ? '[^/]*' : '.*'));
-      }
-      elseif ($car === '?')
-      {
-        $regex .= ($escaping ? '\\?' : (self::$strict_wildcard_slash ? '[^/]' : '.'));
-      }
-      elseif ($car === '{')
-      {
-        $regex .= ($escaping ? '\\{' : '(');
-        if (!$escaping) ++$in_curlies;
-      }
-      elseif ($car === '}' && $in_curlies)
-      {
-        $regex .= ($escaping ? '}' : ')');
-        if (!$escaping) --$in_curlies;
-      }
-      elseif ($car === ',' && $in_curlies)
-      {
-        $regex .= ($escaping ? ',' : '|');
-      }
-      elseif ($car === '\\')
-      {
-        if ($escaping)
-        {
-          $regex .= '\\\\';
-          $escaping = false;
-        }
-        else
-        {
-          $escaping = true;
-        }
-
-        continue;
-      }
-      else
-      {
-        $regex .= $car;
-      }
-      $escaping = false;
-    }
+        $escaping = false;
+        $in_curlies = 0;
+        $regex = '';
+        $sizeGlob = strlen($glob);
+        for ($i = 0; $i < $sizeGlob; ++$i) {
+            $car = $glob[$i];
+            if ($first_byte) {
+                if (self::$strict_leading_dot && '.' !== $car) {
+                    $regex .= '(?=[^\.])';
+                }
+
+                $first_byte = false;
+            }
+
+            if ('/' === $car) {
+                $first_byte = true;
+            }
+
+            if ('.' === $car || '(' === $car || ')' === $car || '|' === $car || '+' === $car || '^' === $car || '$' === $car) {
+                $regex .= "\\{$car}";
+            } elseif ('*' === $car) {
+                $regex .= ($escaping ? '\\*' : (self::$strict_wildcard_slash ? '[^/]*' : '.*'));
+            } elseif ('?' === $car) {
+                $regex .= ($escaping ? '\\?' : (self::$strict_wildcard_slash ? '[^/]' : '.'));
+            } elseif ('{' === $car) {
+                $regex .= ($escaping ? '\\{' : '(');
+                if (!$escaping) {
+                    ++$in_curlies;
+                }
+            } elseif ('}' === $car && $in_curlies) {
+                $regex .= ($escaping ? '}' : ')');
+                if (!$escaping) {
+                    --$in_curlies;
+                }
+            } elseif (',' === $car && $in_curlies) {
+                $regex .= ($escaping ? ',' : '|');
+            } elseif ('\\' === $car) {
+                if ($escaping) {
+                    $regex .= '\\\\';
+                    $escaping = false;
+                } else {
+                    $escaping = true;
+                }
+
+                continue;
+            } else {
+                $regex .= $car;
+            }
+            $escaping = false;
+        }
 
-    return '#^'.$regex.'$#';
-  }
+        return '#^'.$regex.'$#';
+    }
 }
 
 /**
@@ -721,10 +685,10 @@ public static function glob_to_regex($glob)
  *
  * sfNumberCompare compiles a simple comparison to an anonymous
  * subroutine, which you can call with a value to be tested again.
-
+ *
  * Now this would be very pointless, if sfNumberCompare didn't understand
  * magnitudes.
-
+ *
  * The target value may use magnitudes of kilobytes (k, ki),
  * megabytes (m, mi), or gigabytes (g, gi).  Those suffixed
  * with an i use the appropriate 2**n version in accordance with the
@@ -732,62 +696,68 @@ public static function glob_to_regex($glob)
  *
  * based on perl Number::Compare module.
  *
- * @package    symfony
- * @subpackage util
  * @author     Fabien Potencier <fabien.potencier@gmail.com> php port
  * @author     Richard Clamp <richardc@unixbeard.net> perl version
  * @copyright  2004-2005 Fabien Potencier <fabien.potencier@gmail.com>
  * @copyright  2002 Richard Clamp <richardc@unixbeard.net>
+ *
  * @see        http://physics.nist.gov/cuu/Units/binary.html
+ *
  * @version    SVN: $Id$
  */
 class sfNumberCompare
 {
-  protected $test = '';
+    protected $test = '';
 
-  public function __construct($test)
-  {
-    $this->test = $test;
-  }
-
-  public function test($number)
-  {
-    if (!preg_match('{^([<>]=?)?(.*?)([kmg]i?)?$}i', $this->test, $matches))
+    public function __construct($test)
     {
-      throw new sfException(sprintf('don\'t understand "%s" as a test.', $this->test));
+        $this->test = $test;
     }
 
-    $target = array_key_exists(2, $matches) ? $matches[2] : '';
-    $magnitude = array_key_exists(3, $matches) ? $matches[3] : '';
-    if (strtolower($magnitude) === 'k')  $target *=           1000;
-    if (strtolower($magnitude) === 'ki') $target *=           1024;
-    if (strtolower($magnitude) === 'm')  $target *=        1000000;
-    if (strtolower($magnitude) === 'mi') $target *=      1024*1024;
-    if (strtolower($magnitude) === 'g')  $target *=     1000000000;
-    if (strtolower($magnitude) === 'gi') $target *= 1024*1024*1024;
-
-    $comparison = array_key_exists(1, $matches) ? $matches[1] : '==';
-    if ($comparison === '==' || $comparison == '')
-    {
-      return ($number == $target);
-    }
-    if ($comparison === '>')
-    {
-      return ($number > $target);
-    }
-    if ($comparison === '>=')
-    {
-      return ($number >= $target);
-    }
-    if ($comparison === '<')
-    {
-      return ($number < $target);
-    }
-    if ($comparison === '<=')
+    public function test($number)
     {
-      return ($number <= $target);
-    }
+        if (!preg_match('{^([<>]=?)?(.*?)([kmg]i?)?$}i', $this->test, $matches)) {
+            throw new sfException(sprintf('don\'t understand "%s" as a test.', $this->test));
+        }
 
-    return false;
-  }
+        $target = array_key_exists(2, $matches) ? $matches[2] : '';
+        $magnitude = array_key_exists(3, $matches) ? $matches[3] : '';
+        if ('k' === strtolower($magnitude)) {
+            $target *= 1000;
+        }
+        if ('ki' === strtolower($magnitude)) {
+            $target *= 1024;
+        }
+        if ('m' === strtolower($magnitude)) {
+            $target *= 1000000;
+        }
+        if ('mi' === strtolower($magnitude)) {
+            $target *= 1024 * 1024;
+        }
+        if ('g' === strtolower($magnitude)) {
+            $target *= 1000000000;
+        }
+        if ('gi' === strtolower($magnitude)) {
+            $target *= 1024 * 1024 * 1024;
+        }
+
+        $comparison = array_key_exists(1, $matches) ? $matches[1] : '==';
+        if ('==' === $comparison || '' == $comparison) {
+            return $number == $target;
+        }
+        if ('>' === $comparison) {
+            return $number > $target;
+        }
+        if ('>=' === $comparison) {
+            return $number >= $target;
+        }
+        if ('<' === $comparison) {
+            return $number < $target;
+        }
+        if ('<=' === $comparison) {
+            return $number <= $target;
+        }
+
+        return false;
+    }
 }
diff --git a/lib/util/sfInflector.class.php b/lib/util/sfInflector.class.php
index f1676eb06..f79a3c11b 100644
--- a/lib/util/sfInflector.class.php
+++ b/lib/util/sfInflector.class.php
@@ -9,110 +9,106 @@
  */
 
 /**
- *
- * @package    symfony
- * @subpackage util
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfInflector
 {
-  /**
-   * Returns a camelized string from a lower case and underscored string by replaceing slash with
-   * double-colon and upper-casing each letter preceded by an underscore.
-   *
-   * @param  string $lower_case_and_underscored_word  String to camelize.
-   *
-   * @return string Camelized string.
-   */
-  public static function camelize($lower_case_and_underscored_word)
-  {
-
-    return strtr(ucwords(strtr((string) $lower_case_and_underscored_word, array('/' => ':: ', '_' => ' ', '-' => ' '))), array(' ' => ''));
-  }
-
-  /**
-   * Returns an underscore-syntaxed version or the CamelCased string.
-   *
-   * @param  string $camel_cased_word  String to underscore.
-   *
-   * @return string Underscored string.
-   */
-  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'));
+    /**
+     * Returns a camelized string from a lower case and underscored string by replaceing slash with
+     * double-colon and upper-casing each letter preceded by an underscore.
+     *
+     * @param string $lower_case_and_underscored_word string to camelize
+     *
+     * @return string camelized string
+     */
+    public static function camelize($lower_case_and_underscored_word)
+    {
+        return strtr(ucwords(strtr((string) $lower_case_and_underscored_word, array('/' => ':: ', '_' => ' ', '-' => ' '))), array(' ' => ''));
+    }
 
-    return strtolower($tmp);
-  }
+    /**
+     * Returns an underscore-syntaxed version or the CamelCased string.
+     *
+     * @param string $camel_cased_word string to underscore
+     *
+     * @return string underscored string
+     */
+    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'));
 
-  /**
-   * Returns classname::module with classname:: stripped off.
-   *
-   * @param  string $class_name_in_module  Classname and module pair.
-   *
-   * @return string Module name.
-   */
-  public static function demodulize($class_name_in_module)
-  {
-    return preg_replace('/^.*::/', '', $class_name_in_module);
-  }
+        return strtolower($tmp);
+    }
 
-  /**
-   * Returns classname in underscored form, with "_id" tacked on at the end.
-   * This is for use in dealing with foreign keys in the database.
-   *
-   * @param string $class_name                Class name.
-   * @param bool   $separate_with_underscore  Separate with underscore.
-   *
-   * @return string Foreign key
-   */
-  public static function foreign_key($class_name, $separate_with_underscore = true)
-  {
-    return sfInflector::underscore(sfInflector::demodulize($class_name)).($separate_with_underscore ? "_id" : "id");
-  }
+    /**
+     * Returns classname::module with classname:: stripped off.
+     *
+     * @param string $class_name_in_module classname and module pair
+     *
+     * @return string module name
+     */
+    public static function demodulize($class_name_in_module)
+    {
+        return preg_replace('/^.*::/', '', $class_name_in_module);
+    }
 
-  /**
-   * Returns corresponding table name for given classname.
-   *
-   * @param  string $class_name  Name of class to get database table name for.
-   *
-   * @return string Name of the databse table for given class.
-   */
-  public static function tableize($class_name)
-  {
-    return sfInflector::underscore($class_name);
-  }
+    /**
+     * Returns classname in underscored form, with "_id" tacked on at the end.
+     * This is for use in dealing with foreign keys in the database.
+     *
+     * @param string $class_name               class name
+     * @param bool   $separate_with_underscore separate with underscore
+     *
+     * @return string Foreign key
+     */
+    public static function foreign_key($class_name, $separate_with_underscore = true)
+    {
+        return sfInflector::underscore(sfInflector::demodulize($class_name)).($separate_with_underscore ? '_id' : 'id');
+    }
 
-  /**
-   * Returns model class name for given database table.
-   *
-   * @param  string $table_name  Table name.
-   *
-   * @return string Classified table name.
-   */
-  public static function classify($table_name)
-  {
-    return sfInflector::camelize($table_name);
-  }
+    /**
+     * Returns corresponding table name for given classname.
+     *
+     * @param string $class_name name of class to get database table name for
+     *
+     * @return string name of the databse table for given class
+     */
+    public static function tableize($class_name)
+    {
+        return sfInflector::underscore($class_name);
+    }
 
-  /**
-   * Returns a human-readable string from a lower case and underscored word by replacing underscores
-   * with a space, and by upper-casing the initial characters.
-   *
-   * @param  string $lower_case_and_underscored_word String to make more readable.
-   *
-   * @return string Human-readable string.
-   */
-  public static function humanize($lower_case_and_underscored_word)
-  {
-    if (substr($lower_case_and_underscored_word, -3) === '_id')
+    /**
+     * Returns model class name for given database table.
+     *
+     * @param string $table_name table name
+     *
+     * @return string classified table name
+     */
+    public static function classify($table_name)
     {
-      $lower_case_and_underscored_word = substr($lower_case_and_underscored_word, 0, -3);
+        return sfInflector::camelize($table_name);
     }
 
-    return ucfirst(str_replace('_', ' ', $lower_case_and_underscored_word));
-  }
+    /**
+     * Returns a human-readable string from a lower case and underscored word by replacing underscores
+     * with a space, and by upper-casing the initial characters.
+     *
+     * @param string $lower_case_and_underscored_word string to make more readable
+     *
+     * @return string human-readable string
+     */
+    public static function humanize($lower_case_and_underscored_word)
+    {
+        if ('_id' === substr($lower_case_and_underscored_word, -3)) {
+            $lower_case_and_underscored_word = substr($lower_case_and_underscored_word, 0, -3);
+        }
+
+        return ucfirst(str_replace('_', ' ', $lower_case_and_underscored_word));
+    }
 }
diff --git a/lib/util/sfNamespacedParameterHolder.class.php b/lib/util/sfNamespacedParameterHolder.class.php
index 03008a030..f792bb2eb 100644
--- a/lib/util/sfNamespacedParameterHolder.class.php
+++ b/lib/util/sfNamespacedParameterHolder.class.php
@@ -16,392 +16,367 @@
  * Parameters, in this case, are used to extend classes with additional data
  * that requires no additional logic to manage.
  *
- * @package    symfony
- * @subpackage util
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 class sfNamespacedParameterHolder extends sfParameterHolder
 {
-  protected $default_namespace = null;
-  protected $parameters = array();
-
-  /**
-   * The constructor for sfNamespacedParameterHolder.
-   *
-   * The default namespace may be overridden at initialization as follows:
-   * <code>
-   * <?php
-   * $mySpecialPH = new sfNamespacedParameterHolder('symfony/special');
-   * ?>
-   * </code>
-   *
-   * @param string $namespace
-   */
-  public function __construct($namespace = 'symfony/default')
-  {
-    $this->default_namespace = $namespace;
-  }
-
-  /**
-   * Sets the default namespace value.
-   *
-   * @param string $namespace  Default namespace
-   * @param bool   $move       Move all values of the old default namespace to the new one or not
-   */
-  public function setDefaultNamespace($namespace, $move = true)
-  {
-    if ($move)
+    protected $default_namespace;
+    protected $parameters = array();
+
+    /**
+     * The constructor for sfNamespacedParameterHolder.
+     *
+     * The default namespace may be overridden at initialization as follows:
+     * <code>
+     * <?php
+     * $mySpecialPH = new sfNamespacedParameterHolder('symfony/special');
+     * ?>
+     * </code>
+     *
+     * @param string $namespace
+     */
+    public function __construct($namespace = 'symfony/default')
     {
-      if (null !== $values = $this->removeNamespace())
-      {
-          $this->addByRef($values, $namespace);
-      }
+        $this->default_namespace = $namespace;
     }
 
-    $this->default_namespace = $namespace;
-  }
-
-  /**
-   * Get the default namespace value.
-   *
-   * The $default_namespace is defined as 'symfony/default'.
-   *
-   * @return string The default namespace
-   */
-  public function getDefaultNamespace()
-  {
-    return $this->default_namespace;
-  }
-
-  /**
-   * Clear all parameters associated with this request.
-   */
-  public function clear()
-  {
-    $this->parameters = null;
-    $this->parameters = array();
-  }
-
-  /**
-   * Retrieve a parameter with an optionally specified namespace.
-   *
-   * An isolated namespace may be identified by providing a value for the third
-   * argument.  If not specified, the default namespace 'symfony/default' is
-   * used.
-   *
-   * @param string $name     A parameter name
-   * @param mixed  $default  A default parameter value
-   * @param string $ns       A parameter namespace
-   *
-   * @return mixed A parameter value, if the parameter exists, otherwise null
-   */
-  public function & get($name, $default = null, $ns = null)
-  {
-    if (!$ns)
+    /**
+     * Serializes the current instance for PHP 7.4+.
+     *
+     * @return array
+     */
+    public function __serialize()
     {
-      $ns = $this->default_namespace;
+        return array($this->default_namespace, $this->parameters);
     }
 
-    if (isset($this->parameters[$ns][$name]))
+    /**
+     * Unserializes a sfParameterHolder instance for PHP 7.4+.
+     *
+     * @param array $data
+     */
+    public function __unserialize($data)
     {
-      $value = & $this->parameters[$ns][$name];
+        $this->default_namespace = $data[0];
+        $this->parameters = $data[1];
     }
-    else
+
+    /**
+     * Sets the default namespace value.
+     *
+     * @param string $namespace Default namespace
+     * @param bool   $move      Move all values of the old default namespace to the new one or not
+     */
+    public function setDefaultNamespace($namespace, $move = true)
     {
-      $value = $default;
+        if ($move) {
+            if (null !== $values = $this->removeNamespace()) {
+                $this->addByRef($values, $namespace);
+            }
+        }
+
+        $this->default_namespace = $namespace;
     }
 
-    return $value;
-  }
-
-  /**
-   * Retrieve an array of parameter names from an optionally specified namespace.
-   *
-   * @param  string $ns  A parameter namespace.
-   *
-   * @return array An indexed array of parameter names, if the namespace exists, otherwise null
-   */
-  public function getNames($ns = null)
-  {
-    if (!$ns)
+    /**
+     * Get the default namespace value.
+     *
+     * The $default_namespace is defined as 'symfony/default'.
+     *
+     * @return string The default namespace
+     */
+    public function getDefaultNamespace()
     {
-      $ns = $this->default_namespace;
+        return $this->default_namespace;
     }
 
-    if (isset($this->parameters[$ns]))
+    /**
+     * Clear all parameters associated with this request.
+     */
+    public function clear()
     {
-      return array_keys($this->parameters[$ns]);
+        $this->parameters = null;
+        $this->parameters = array();
     }
 
-    return array();
-  }
-
-  /**
-   * Retrieve an array of parameter namespaces.
-   *
-   * @return array An indexed array of parameter namespaces
-   */
-  public function getNamespaces()
-  {
-    return array_keys($this->parameters);
-  }
-
-  /**
-   * Retrieve an array of parameters, within a namespace.
-   *
-   * This method is limited to a namespace.  Without any argument,
-   * it returns the parameters of the default namespace.  If a
-   * namespace is passed as an argument, only the parameters of the
-   * specified namespace are returned.
-   *
-   * @param  string $ns  A parameter namespace
-   *
-   * @return array An associative array of parameters
-   */
-  public function & getAll($ns = null)
-  {
-    if (!$ns)
+    /**
+     * Retrieve a parameter with an optionally specified namespace.
+     *
+     * An isolated namespace may be identified by providing a value for the third
+     * argument.  If not specified, the default namespace 'symfony/default' is
+     * used.
+     *
+     * @param string $name    A parameter name
+     * @param mixed  $default A default parameter value
+     * @param string $ns      A parameter namespace
+     *
+     * @return mixed A parameter value, if the parameter exists, otherwise null
+     */
+    public function &get($name, $default = null, $ns = null)
     {
-      $ns = $this->default_namespace;
-    }
+        if (!$ns) {
+            $ns = $this->default_namespace;
+        }
 
-    $parameters = array();
+        if (isset($this->parameters[$ns][$name])) {
+            $value = &$this->parameters[$ns][$name];
+        } else {
+            $value = $default;
+        }
 
-    if (isset($this->parameters[$ns]))
-    {
-      $parameters = $this->parameters[$ns];
+        return $value;
     }
 
-    return $parameters;
-  }
-
-  /**
-   * Indicates whether or not a parameter exists.
-   *
-   * @param  string $name  A parameter name
-   * @param  string $ns    A parameter namespace
-   *
-   * @return bool true, if the parameter exists, otherwise false
-   */
-  public function has($name, $ns = null)
-  {
-    if (!$ns)
+    /**
+     * Retrieve an array of parameter names from an optionally specified namespace.
+     *
+     * @param string $ns a parameter namespace
+     *
+     * @return array An indexed array of parameter names, if the namespace exists, otherwise null
+     */
+    public function getNames($ns = null)
     {
-      $ns = $this->default_namespace;
-    }
+        if (!$ns) {
+            $ns = $this->default_namespace;
+        }
 
-    return isset($this->parameters[$ns][$name]);
-  }
-
-  /**
-   * Indicates whether or not A parameter namespace exists.
-   *
-   * @param  string $ns  A parameter namespace
-   *
-   * @return bool true, if the namespace exists, otherwise false
-   */
-  public function hasNamespace($ns)
-  {
-    return isset($this->parameters[$ns]);
-  }
-
-  /**
-   * Remove a parameter.
-   *
-   * @param  string $name     A parameter name
-   * @param  mixed  $default  A default parameter value
-   * @param  string $ns       A parameter namespace
-   *
-   * @return string A parameter value, if the parameter was removed, otherwise null
-   */
-  public function remove($name, $default = null, $ns = null)
-  {
-    if (!$ns)
-    {
-      $ns = $this->default_namespace;
-    }
+        if (isset($this->parameters[$ns])) {
+            return array_keys($this->parameters[$ns]);
+        }
 
-    $retval = $default;
+        return array();
+    }
 
-    if (isset($this->parameters[$ns]) && array_key_exists($name, $this->parameters[$ns]))
+    /**
+     * Retrieve an array of parameter namespaces.
+     *
+     * @return array An indexed array of parameter namespaces
+     */
+    public function getNamespaces()
     {
-      $retval = $this->parameters[$ns][$name];
-      unset($this->parameters[$ns][$name]);
+        return array_keys($this->parameters);
     }
 
-    return $retval;
-  }
-
-  /**
-   * Remove A parameter namespace and all of its associated parameters.
-   *
-   * @param string $ns A parameter namespace.
-   *
-   * @return mixed|null
-   */
-  public function & removeNamespace($ns = null)
-  {
-    if (!$ns)
+    /**
+     * Retrieve an array of parameters, within a namespace.
+     *
+     * This method is limited to a namespace.  Without any argument,
+     * it returns the parameters of the default namespace.  If a
+     * namespace is passed as an argument, only the parameters of the
+     * specified namespace are returned.
+     *
+     * @param string $ns A parameter namespace
+     *
+     * @return array An associative array of parameters
+     */
+    public function &getAll($ns = null)
     {
-      $ns = $this->default_namespace;
-    }
+        if (!$ns) {
+            $ns = $this->default_namespace;
+        }
 
-    $retval = null;
+        $parameters = array();
 
-    if (isset($this->parameters[$ns]))
-    {
-      $retval =& $this->parameters[$ns];
-      unset($this->parameters[$ns]);
+        if (isset($this->parameters[$ns])) {
+            $parameters = $this->parameters[$ns];
+        }
+
+        return $parameters;
     }
 
-    return $retval;
-  }
-
-  /**
-   * Set a parameter.
-   *
-   * If a parameter with the name already exists the value will be overridden.
-   *
-   * @param string $name   A parameter name
-   * @param mixed  $value  A parameter value
-   * @param string $ns     A parameter namespace
-   */
-  public function set($name, $value, $ns = null)
-  {
-    if (!$ns)
+    /**
+     * Indicates whether or not a parameter exists.
+     *
+     * @param string $name A parameter name
+     * @param string $ns   A parameter namespace
+     *
+     * @return bool true, if the parameter exists, otherwise false
+     */
+    public function has($name, $ns = null)
     {
-      $ns = $this->default_namespace;
+        if (!$ns) {
+            $ns = $this->default_namespace;
+        }
+
+        return isset($this->parameters[$ns][$name]);
     }
 
-    if (!isset($this->parameters[$ns]))
+    /**
+     * Indicates whether or not A parameter namespace exists.
+     *
+     * @param string $ns A parameter namespace
+     *
+     * @return bool true, if the namespace exists, otherwise false
+     */
+    public function hasNamespace($ns)
     {
-      $this->parameters[$ns] = array();
+        return isset($this->parameters[$ns]);
     }
 
-    $this->parameters[$ns][$name] = $value;
-  }
-
-  /**
-   * Set a parameter by reference.
-   *
-   * If a parameter with the name already exists the value will be overridden.
-   *
-   * @param string $name   A parameter name
-   * @param mixed  $value  A reference to a parameter value
-   * @param string $ns     A parameter namespace
-   */
-  public function setByRef($name, & $value, $ns = null)
-  {
-    if (!$ns)
+    /**
+     * Remove a parameter.
+     *
+     * @param string $name    A parameter name
+     * @param mixed  $default A default parameter value
+     * @param string $ns      A parameter namespace
+     *
+     * @return string A parameter value, if the parameter was removed, otherwise null
+     */
+    public function remove($name, $default = null, $ns = null)
     {
-      $ns = $this->default_namespace;
+        if (!$ns) {
+            $ns = $this->default_namespace;
+        }
+
+        $retval = $default;
+
+        if (isset($this->parameters[$ns]) && array_key_exists($name, $this->parameters[$ns])) {
+            $retval = $this->parameters[$ns][$name];
+            unset($this->parameters[$ns][$name]);
+        }
+
+        return $retval;
     }
 
-    if (!isset($this->parameters[$ns]))
+    /**
+     * Remove A parameter namespace and all of its associated parameters.
+     *
+     * @param string $ns a parameter namespace
+     *
+     * @return mixed|null
+     */
+    public function &removeNamespace($ns = null)
     {
-      $this->parameters[$ns] = array();
+        if (!$ns) {
+            $ns = $this->default_namespace;
+        }
+
+        $retval = null;
+
+        if (isset($this->parameters[$ns])) {
+            $retval = &$this->parameters[$ns];
+            unset($this->parameters[$ns]);
+        }
+
+        return $retval;
     }
 
-    $this->parameters[$ns][$name] =& $value;
-  }
-
-  /**
-   * Set an array of parameters.
-   *
-   * If an existing parameter name matches any of the keys in the supplied
-   * array, the associated value will be overridden.
-   *
-   * @param array  $parameters  An associative array of parameters and their associated values
-   * @param string $ns          A parameter namespace
-   */
-  public function add($parameters, $ns = null)
-  {
-    if ($parameters === null) return;
-
-    if (!$ns)
+    /**
+     * Set a parameter.
+     *
+     * If a parameter with the name already exists the value will be overridden.
+     *
+     * @param string $name  A parameter name
+     * @param mixed  $value A parameter value
+     * @param string $ns    A parameter namespace
+     */
+    public function set($name, $value, $ns = null)
     {
-      $ns = $this->default_namespace;
+        if (!$ns) {
+            $ns = $this->default_namespace;
+        }
+
+        if (!isset($this->parameters[$ns])) {
+            $this->parameters[$ns] = array();
+        }
+
+        $this->parameters[$ns][$name] = $value;
     }
 
-    if (!isset($this->parameters[$ns]))
+    /**
+     * Set a parameter by reference.
+     *
+     * If a parameter with the name already exists the value will be overridden.
+     *
+     * @param string $name  A parameter name
+     * @param mixed  $value A reference to a parameter value
+     * @param string $ns    A parameter namespace
+     */
+    public function setByRef($name, &$value, $ns = null)
     {
-      $this->parameters[$ns] = array();
+        if (!$ns) {
+            $ns = $this->default_namespace;
+        }
+
+        if (!isset($this->parameters[$ns])) {
+            $this->parameters[$ns] = array();
+        }
+
+        $this->parameters[$ns][$name] = &$value;
     }
 
-    foreach ($parameters as $key => $value)
+    /**
+     * Set an array of parameters.
+     *
+     * If an existing parameter name matches any of the keys in the supplied
+     * array, the associated value will be overridden.
+     *
+     * @param array  $parameters An associative array of parameters and their associated values
+     * @param string $ns         A parameter namespace
+     */
+    public function add($parameters, $ns = null)
     {
-      $this->parameters[$ns][$key] = $value;
+        if (null === $parameters) {
+            return;
+        }
+
+        if (!$ns) {
+            $ns = $this->default_namespace;
+        }
+
+        if (!isset($this->parameters[$ns])) {
+            $this->parameters[$ns] = array();
+        }
+
+        foreach ($parameters as $key => $value) {
+            $this->parameters[$ns][$key] = $value;
+        }
     }
-  }
-
-  /**
-   * Set an array of parameters by reference.
-   *
-   * If an existing parameter name matches any of the keys in the supplied
-   * array, the associated value will be overridden.
-   *
-   * @param array  $parameters  An associative array of parameters and references to their associated values
-   * @param string $ns          A parameter namespace
-   */
-  public function addByRef(& $parameters, $ns = null)
-  {
-    if (!$ns)
+
+    /**
+     * Set an array of parameters by reference.
+     *
+     * If an existing parameter name matches any of the keys in the supplied
+     * array, the associated value will be overridden.
+     *
+     * @param array  $parameters An associative array of parameters and references to their associated values
+     * @param string $ns         A parameter namespace
+     */
+    public function addByRef(&$parameters, $ns = null)
     {
-      $ns = $this->default_namespace;
+        if (!$ns) {
+            $ns = $this->default_namespace;
+        }
+
+        if (!isset($this->parameters[$ns])) {
+            $this->parameters[$ns] = array();
+        }
+
+        foreach ($parameters as $key => &$value) {
+            $this->parameters[$ns][$key] = &$value;
+        }
     }
 
-    if (!isset($this->parameters[$ns]))
+    /**
+     * Serializes the current instance.
+     *
+     * @return string Objects instance
+     */
+    public function serialize()
     {
-      $this->parameters[$ns] = array();
+        return serialize($this->__serialize());
     }
 
-    foreach ($parameters as $key => &$value)
+    /**
+     * Unserializes a sfNamespacedParameterHolder instance.
+     *
+     * @param string $serialized A serialized sfNamespacedParameterHolder instance
+     */
+    public function unserialize($serialized)
     {
-      $this->parameters[$ns][$key] =& $value;
+        $this->__unserialize(unserialize($serialized));
     }
-  }
-
-  /**
-   * Serializes the current instance.
-   *
-   * @return string Objects instance
-   */
-  public function serialize()
-  {
-    return serialize($this->__serialize());
-  }
-
-  /**
-   * Unserializes a sfNamespacedParameterHolder instance.
-   *
-   * @param string $serialized  A serialized sfNamespacedParameterHolder instance
-   */
-  public function unserialize($serialized)
-  {
-    $this->__unserialize(unserialize($serialized));
-  }
-
-
-  /**
-   * Serializes the current instance for PHP 7.4+
-   *
-   * @return array
-   */
-  public function __serialize()
-  {
-    return array($this->default_namespace, $this->parameters);
-  }
-
-  /**
-   * Unserializes a sfParameterHolder instance for PHP 7.4+
-   *
-   * @param array $data
-   */
-  public function __unserialize($data)
-  {
-      $this->default_namespace = $data[0];
-      $this->parameters = $data[1];
-  }
 }
diff --git a/lib/util/sfParameterHolder.class.php b/lib/util/sfParameterHolder.class.php
index b4d57b6d5..0e643a5a2 100644
--- a/lib/util/sfParameterHolder.class.php
+++ b/lib/util/sfParameterHolder.class.php
@@ -15,206 +15,198 @@
  * Parameters, in this case, are used to extend classes with additional data
  * that requires no additional logic to manage.
  *
- * @package    symfony
- * @subpackage util
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 class sfParameterHolder implements Serializable
 {
-  protected $parameters = array();
-
-  /**
-   * The constructor for sfParameterHolder.
-   */
-  public function __construct()
-  {
-  }
-
-  /**
-   * Clears all parameters associated with this request.
-   */
-  public function clear()
-  {
-    $this->parameters = array();
-  }
-
-  /**
-   * Retrieves a parameter.
-   *
-   * @param  string $name     A parameter name
-   * @param  mixed  $default  A default parameter value
-   *
-   * @return mixed A parameter value, if the parameter exists, otherwise null
-   */
-  public function & get($name, $default = null)
-  {
-    if (array_key_exists($name, $this->parameters))
+    protected $parameters = array();
+
+    /**
+     * The constructor for sfParameterHolder.
+     */
+    public function __construct()
+    {
+    }
+
+    /**
+     * Serializes the current instance for PHP 7.4+.
+     *
+     * @return array
+     */
+    public function __serialize()
+    {
+        return $this->parameters;
+    }
+
+    /**
+     * Unserializes a sfParameterHolder instance for PHP 7.4+.
+     *
+     * @param array $data
+     */
+    public function __unserialize($data)
+    {
+        $this->parameters = $data;
+    }
+
+    /**
+     * Clears all parameters associated with this request.
+     */
+    public function clear()
     {
-      $value = & $this->parameters[$name];
+        $this->parameters = array();
     }
-    else
+
+    /**
+     * Retrieves a parameter.
+     *
+     * @param string $name    A parameter name
+     * @param mixed  $default A default parameter value
+     *
+     * @return mixed A parameter value, if the parameter exists, otherwise null
+     */
+    public function &get($name, $default = null)
     {
-      $value = $default;
+        if (array_key_exists($name, $this->parameters)) {
+            $value = &$this->parameters[$name];
+        } else {
+            $value = $default;
+        }
+
+        return $value;
     }
 
-    return $value;
-  }
-
-  /**
-   * Retrieves an array of parameter names.
-   *
-   * @return array An indexed array of parameter names
-   */
-  public function getNames()
-  {
-    return array_keys($this->parameters);
-  }
-
-  /**
-   * Retrieves an array of parameters.
-   *
-   * @return array An associative array of parameters
-   */
-  public function & getAll()
-  {
-    return $this->parameters;
-  }
-
-  /**
-   * Indicates whether or not a parameter exists.
-   *
-   * @param  string $name  A parameter name
-   *
-   * @return bool true, if the parameter exists, otherwise false
-   */
-  public function has($name)
-  {
-    return array_key_exists($name, $this->parameters);
-  }
-
-  /**
-   * Remove a parameter.
-   *
-   * @param  string $name     A parameter name
-   * @param  mixed  $default  A default parameter value
-   *
-   * @return string A parameter value, if the parameter was removed, otherwise null
-   */
-  public function remove($name, $default = null)
-  {
-    $retval = $default;
-
-    if (array_key_exists($name, $this->parameters))
+    /**
+     * Retrieves an array of parameter names.
+     *
+     * @return array An indexed array of parameter names
+     */
+    public function getNames()
     {
-      $retval = $this->parameters[$name];
-      unset($this->parameters[$name]);
+        return array_keys($this->parameters);
     }
 
-    return $retval;
-  }
-
-  /**
-   * Sets a parameter.
-   *
-   * If a parameter with the name already exists the value will be overridden.
-   *
-   * @param string $name   A parameter name
-   * @param mixed  $value  A parameter value
-   */
-  public function set($name, $value)
-  {
-    $this->parameters[$name] = $value;
-  }
-
-  /**
-   * Sets a parameter by reference.
-   *
-   * If a parameter with the name already exists the value will be overridden.
-   *
-   * @param string $name   A parameter name
-   * @param mixed  $value  A reference to a parameter value
-   */
-  public function setByRef($name, & $value)
-  {
-    $this->parameters[$name] =& $value;
-  }
-
-  /**
-   * Sets an array of parameters.
-   *
-   * If an existing parameter name matches any of the keys in the supplied
-   * array, the associated value will be overridden.
-   *
-   * @param array $parameters  An associative array of parameters and their associated values
-   */
-  public function add($parameters)
-  {
-    if (null === $parameters)
+    /**
+     * Retrieves an array of parameters.
+     *
+     * @return array An associative array of parameters
+     */
+    public function &getAll()
     {
-      return;
+        return $this->parameters;
     }
 
-    foreach ($parameters as $key => $value)
+    /**
+     * Indicates whether or not a parameter exists.
+     *
+     * @param string $name A parameter name
+     *
+     * @return bool true, if the parameter exists, otherwise false
+     */
+    public function has($name)
     {
-      $this->parameters[$key] = $value;
+        return array_key_exists($name, $this->parameters);
+    }
+
+    /**
+     * Remove a parameter.
+     *
+     * @param string $name    A parameter name
+     * @param mixed  $default A default parameter value
+     *
+     * @return string A parameter value, if the parameter was removed, otherwise null
+     */
+    public function remove($name, $default = null)
+    {
+        $retval = $default;
+
+        if (array_key_exists($name, $this->parameters)) {
+            $retval = $this->parameters[$name];
+            unset($this->parameters[$name]);
+        }
+
+        return $retval;
     }
-  }
-
-  /**
-   * Sets an array of parameters by reference.
-   *
-   * If an existing parameter name matches any of the keys in the supplied
-   * array, the associated value will be overridden.
-   *
-   * @param array $parameters  An associative array of parameters and references to their associated values
-   */
-  public function addByRef(& $parameters)
-  {
-    foreach ($parameters as $key => &$value)
+
+    /**
+     * Sets a parameter.
+     *
+     * If a parameter with the name already exists the value will be overridden.
+     *
+     * @param string $name  A parameter name
+     * @param mixed  $value A parameter value
+     */
+    public function set($name, $value)
+    {
+        $this->parameters[$name] = $value;
+    }
+
+    /**
+     * Sets a parameter by reference.
+     *
+     * If a parameter with the name already exists the value will be overridden.
+     *
+     * @param string $name  A parameter name
+     * @param mixed  $value A reference to a parameter value
+     */
+    public function setByRef($name, &$value)
+    {
+        $this->parameters[$name] = &$value;
+    }
+
+    /**
+     * Sets an array of parameters.
+     *
+     * If an existing parameter name matches any of the keys in the supplied
+     * array, the associated value will be overridden.
+     *
+     * @param array $parameters An associative array of parameters and their associated values
+     */
+    public function add($parameters)
+    {
+        if (null === $parameters) {
+            return;
+        }
+
+        foreach ($parameters as $key => $value) {
+            $this->parameters[$key] = $value;
+        }
+    }
+
+    /**
+     * Sets an array of parameters by reference.
+     *
+     * If an existing parameter name matches any of the keys in the supplied
+     * array, the associated value will be overridden.
+     *
+     * @param array $parameters An associative array of parameters and references to their associated values
+     */
+    public function addByRef(&$parameters)
+    {
+        foreach ($parameters as $key => &$value) {
+            $this->parameters[$key] = &$value;
+        }
+    }
+
+    /**
+     * Serializes the current instance.
+     *
+     * @return string Objects instance
+     */
+    public function serialize()
+    {
+        return serialize($this->__serialize());
+    }
+
+    /**
+     * Unserializes a sfParameterHolder instance.
+     *
+     * @param string $serialized A serialized sfParameterHolder instance
+     */
+    public function unserialize($serialized)
     {
-      $this->parameters[$key] =& $value;
+        $this->__unserialize(unserialize($serialized));
     }
-  }
-
-  /**
-   * Serializes the current instance.
-   *
-   * @return string Objects instance
-   */
-  public function serialize()
-  {
-    return serialize($this->__serialize());
-  }
-
-  /**
-   * Unserializes a sfParameterHolder instance.
-   *
-   * @param string $serialized  A serialized sfParameterHolder instance
-   */
-  public function unserialize($serialized)
-  {
-    $this->__unserialize(unserialize($serialized));
-  }
-
-  /**
-   * Serializes the current instance for PHP 7.4+
-   *
-   * @return Array
-   */
-  public function __serialize()
-  {
-      return $this->parameters;
-  }
-
-  /**
-   * Unserializes a sfParameterHolder instance for PHP 7.4+
-   *
-   * @param array $data
-   */
-  public function __unserialize($data)
-  {
-    $this->parameters = $data;
-  }
 }
diff --git a/lib/util/sfToolkit.class.php b/lib/util/sfToolkit.class.php
index 811df0edb..a9d7c0e17 100644
--- a/lib/util/sfToolkit.class.php
+++ b/lib/util/sfToolkit.class.php
@@ -12,268 +12,240 @@
 /**
  * sfToolkit provides basic utility methods.
  *
- * @package    symfony
- * @subpackage util
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 class sfToolkit
 {
-  /**
-   * Extract the class or interface name from filename.
-   *
-   * @param  string $filename  A filename.
-   *
-   * @return string A class or interface name, if one can be extracted, otherwise null.
-   */
-  public static function extractClassName($filename)
-  {
-    $retval = null;
-
-    if (self::isPathAbsolute($filename))
+    /**
+     * Extract the class or interface name from filename.
+     *
+     * @param string $filename a filename
+     *
+     * @return string a class or interface name, if one can be extracted, otherwise null
+     */
+    public static function extractClassName($filename)
     {
-      $filename = basename($filename);
-    }
+        $retval = null;
+
+        if (self::isPathAbsolute($filename)) {
+            $filename = basename($filename);
+        }
 
-    $pattern = '/(.*?)\.(class|interface)\.php/i';
+        $pattern = '/(.*?)\.(class|interface)\.php/i';
 
-    if (preg_match($pattern, $filename, $match))
-    {
-      $retval = $match[1];
+        if (preg_match($pattern, $filename, $match)) {
+            $retval = $match[1];
+        }
+
+        return $retval;
     }
 
-    return $retval;
-  }
-
-  /**
-   * Clear all files in a given directory.
-   *
-   * @param string $directory  An absolute filesystem path to a directory.
-   */
-  public static function clearDirectory($directory)
-  {
-    if (!is_dir($directory))
+    /**
+     * Clear all files in a given directory.
+     *
+     * @param string $directory an absolute filesystem path to a directory
+     */
+    public static function clearDirectory($directory)
     {
-      return;
-    }
+        if (!is_dir($directory)) {
+            return;
+        }
 
-    // open a file point to the cache dir
-    $fp = opendir($directory);
+        // open a file point to the cache dir
+        $fp = opendir($directory);
+
+        // ignore names
+        $ignore = array('.', '..', 'CVS', '.svn');
+
+        while (($file = readdir($fp)) !== false) {
+            if (!in_array($file, $ignore)) {
+                if (is_link($directory.'/'.$file)) {
+                    // delete symlink
+                    unlink($directory.'/'.$file);
+                } elseif (is_dir($directory.'/'.$file)) {
+                    // recurse through directory
+                    self::clearDirectory($directory.'/'.$file);
+
+                    // delete the directory
+                    rmdir($directory.'/'.$file);
+                } else {
+                    // delete the file
+                    unlink($directory.'/'.$file);
+                }
+            }
+        }
 
-    // ignore names
-    $ignore = array('.', '..', 'CVS', '.svn');
+        // close file pointer
+        closedir($fp);
+    }
 
-    while (($file = readdir($fp)) !== false)
+    /**
+     * Clear all files and directories corresponding to a glob pattern.
+     *
+     * @param string $pattern an absolute filesystem pattern
+     */
+    public static function clearGlob($pattern)
     {
-      if (!in_array($file, $ignore))
-      {
-        if (is_link($directory.'/'.$file))
-        {
-          // delete symlink
-          unlink($directory.'/'.$file);
+        if (false === $files = glob($pattern)) {
+            return;
         }
-        else if (is_dir($directory.'/'.$file))
-        {
-          // recurse through directory
-          self::clearDirectory($directory.'/'.$file);
 
-          // delete the directory
-          rmdir($directory.'/'.$file);
-        }
-        else
-        {
-          // delete the file
-          unlink($directory.'/'.$file);
+        // order is important when removing directories
+        sort($files);
+
+        foreach ($files as $file) {
+            if (is_dir($file)) {
+                // delete directory
+                self::clearDirectory($file);
+            } else {
+                // delete file
+                unlink($file);
+            }
         }
-      }
     }
 
-    // close file pointer
-    closedir($fp);
-  }
-
-  /**
-   * Clear all files and directories corresponding to a glob pattern.
-   *
-   * @param string $pattern  An absolute filesystem pattern.
-   */
-  public static function clearGlob($pattern)
-  {
-    if (false === $files = glob($pattern))
+    /**
+     * Determine if a filesystem path is absolute.
+     *
+     * @param string $path a filesystem path
+     *
+     * @return bool true, if the path is absolute, otherwise false
+     */
+    public static function isPathAbsolute($path)
     {
-      return;
-    }
-
-    // order is important when removing directories
-    sort($files);
+        if ('/' == $path[0] || '\\' == $path[0]
+            || (
+                strlen($path) > 3 && ctype_alpha($path[0])
+             && ':' == $path[1]
+             && ('\\' == $path[2] || '/' == $path[2])
+            )
+        ) {
+            return true;
+        }
 
-    foreach ($files as $file)
-    {
-      if (is_dir($file))
-      {
-        // delete directory
-        self::clearDirectory($file);
-      }
-      else
-      {
-        // delete file
-        unlink($file);
-      }
+        return false;
     }
-  }
-
-  /**
-   * Determine if a filesystem path is absolute.
-   *
-   * @param  string $path  A filesystem path.
-   *
-   * @return bool true, if the path is absolute, otherwise false.
-   */
-  public static function isPathAbsolute($path)
-  {
-    if ($path[0] == '/' || $path[0] == '\\' ||
-        (strlen($path) > 3 && ctype_alpha($path[0]) &&
-         $path[1] == ':' &&
-         ($path[2] == '\\' || $path[2] == '/')
-        )
-       )
+
+    /**
+     * Strips comments from php source code.
+     *
+     * @param string $source PHP source code
+     *
+     * @return string comment free source code
+     */
+    public static function stripComments($source)
     {
-      return true;
+        if (!function_exists('token_get_all')) {
+            return $source;
+        }
+
+        $ignore = array(T_COMMENT => true, T_DOC_COMMENT => true);
+        $output = '';
+
+        foreach (token_get_all($source) as $token) {
+            // array
+            if (isset($token[1])) {
+                // no action on comments
+                if (!isset($ignore[$token[0]])) {
+                    // anything else -> output "as is"
+                    $output .= $token[1];
+                }
+            } else {
+                // simple 1-character token
+                $output .= $token;
+            }
+        }
+
+        return $output;
     }
 
-    return false;
-  }
-
-  /**
-   * Strips comments from php source code
-   *
-   * @param  string $source  PHP source code.
-   *
-   * @return string Comment free source code.
-   */
-  public static function stripComments($source)
-  {
-    if (!function_exists('token_get_all'))
+    /**
+     * Strip slashes recursively from array.
+     *
+     * @param array $value the value to strip
+     *
+     * @return array clean value with slashes stripped
+     */
+    public static function stripslashesDeep($value)
     {
-      return $source;
+        return is_array($value) ? array_map(array('sfToolkit', 'stripslashesDeep'), $value) : stripslashes($value);
     }
 
-    $ignore = array(T_COMMENT => true, T_DOC_COMMENT => true);
-    $output = '';
-
-    foreach (token_get_all($source) as $token)
+    // code from php at moechofe dot com (array_merge comment on php.net)
+    /*
+     * array arrayDeepMerge ( array array1 [, array array2 [, array ...]] )
+     *
+     * Like array_merge
+     *
+     *  arrayDeepMerge() merges the elements of one or more arrays together so
+     * that the values of one are appended to the end of the previous one. It
+     * returns the resulting array.
+     *  If the input arrays have the same string keys, then the later value for
+     * that key will overwrite the previous one. If, however, the arrays contain
+     * numeric keys, the later value will not overwrite the original value, but
+     * will be appended.
+     *  If only one array is given and the array is numerically indexed, the keys
+     * get reindexed in a continuous way.
+     *
+     * Different from array_merge
+     *  If string keys have arrays for values, these arrays will merge recursively.
+     */
+    public static function arrayDeepMerge()
     {
-      // array
-      if (isset($token[1]))
-      {
-        // no action on comments
-        if (!isset($ignore[$token[0]]))
-        {
-          // anything else -> output "as is"
-          $output .= $token[1];
+        switch (func_num_args()) {
+            case 0:
+                return false;
+
+            case 1:
+                return func_get_arg(0);
+
+            case 2:
+                $args = func_get_args();
+                $args[2] = array();
+                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]);
+                        $isKey1 = array_key_exists($key, $args[1]);
+                        if ($isKey0 && $isKey1 && is_array($args[0][$key]) && is_array($args[1][$key])) {
+                            $args[2][$key] = self::arrayDeepMerge($args[0][$key], $args[1][$key]);
+                        } elseif ($isKey0 && $isKey1) {
+                            $args[2][$key] = $args[1][$key];
+                        } elseif (!$isKey1) {
+                            $args[2][$key] = $args[0][$key];
+                        } elseif (!$isKey0) {
+                            $args[2][$key] = $args[1][$key];
+                        }
+                    }
+
+                    return $args[2];
+                }
+
+                return $args[1];
+
+            default:
+                $args = func_get_args();
+                $args[1] = sfToolkit::arrayDeepMerge($args[0], $args[1]);
+                array_shift($args);
+
+                return call_user_func_array(array('sfToolkit', 'arrayDeepMerge'), $args);
+
+                break;
         }
-      }
-      else
-      {
-        // simple 1-character token
-        $output .= $token;
-      }
     }
 
-    return $output;
-  }
-
-  /**
-   * Strip slashes recursively from array
-   *
-   * @param  array $value  the value to strip
-   *
-   * @return array clean value with slashes stripped
-   */
-  public static function stripslashesDeep($value)
-  {
-    return is_array($value) ? array_map(array('sfToolkit', 'stripslashesDeep'), $value) : stripslashes($value);
-  }
-
-  // code from php at moechofe dot com (array_merge comment on php.net)
-  /*
-   * array arrayDeepMerge ( array array1 [, array array2 [, array ...]] )
-   *
-   * Like array_merge
-   *
-   *  arrayDeepMerge() merges the elements of one or more arrays together so
-   * that the values of one are appended to the end of the previous one. It
-   * returns the resulting array.
-   *  If the input arrays have the same string keys, then the later value for
-   * that key will overwrite the previous one. If, however, the arrays contain
-   * numeric keys, the later value will not overwrite the original value, but
-   * will be appended.
-   *  If only one array is given and the array is numerically indexed, the keys
-   * get reindexed in a continuous way.
-   *
-   * Different from array_merge
-   *  If string keys have arrays for values, these arrays will merge recursively.
-   */
-  public static function arrayDeepMerge()
-  {
-    switch (func_num_args())
+    /**
+     * Converts string to array.
+     *
+     * @param string $string the value to convert to array
+     *
+     * @return array
+     */
+    public static function stringToArray($string)
     {
-      case 0:
-        return false;
-      case 1:
-        return func_get_arg(0);
-      case 2:
-        $args = func_get_args();
-        $args[2] = array();
-        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]);
-            $isKey1 = array_key_exists($key, $args[1]);
-            if ($isKey0 && $isKey1 && is_array($args[0][$key]) && is_array($args[1][$key]))
-            {
-              $args[2][$key] = self::arrayDeepMerge($args[0][$key], $args[1][$key]);
-            }
-            else if ($isKey0 && $isKey1)
-            {
-              $args[2][$key] = $args[1][$key];
-            }
-            else if (!$isKey1)
-            {
-              $args[2][$key] = $args[0][$key];
-            }
-            else if (!$isKey0)
-            {
-              $args[2][$key] = $args[1][$key];
-            }
-          }
-          return $args[2];
-        }
-        else
-        {
-          return $args[1];
-        }
-      default :
-        $args = func_get_args();
-        $args[1] = sfToolkit::arrayDeepMerge($args[0], $args[1]);
-        array_shift($args);
-        return call_user_func_array(array('sfToolkit', 'arrayDeepMerge'), $args);
-        break;
-    }
-  }
-
-  /**
-   * Converts string to array
-   *
-   * @param  string $string  the value to convert to array
-   *
-   * @return array
-   */
-  public static function stringToArray($string)
-  {
-    preg_match_all('/
+        preg_match_all('/
       \s*((?:\w+-)*\w+)     # key                               \\1
       \s*=\s*               # =
       (\'|")?               # values may be included in \' or " \\2
@@ -284,335 +256,296 @@ public static function stringToArray($string)
       )
     /x', $string, $matches, PREG_SET_ORDER);
 
-    $attributes = array();
-    foreach ($matches as $val)
-    {
-      $attributes[$val[1]] = self::literalize($val[3]);
-    }
+        $attributes = array();
+        foreach ($matches as $val) {
+            $attributes[$val[1]] = self::literalize($val[3]);
+        }
 
-    return $attributes;
-  }
-
-  /**
-   * Finds the type of the passed value, returns the value as the new type.
-   *
-   * @param  string $value
-   * @param  bool   $quoted  Quote?
-   *
-   * @return mixed
-   */
-  public static function literalize($value, $quoted = false)
-  {
-    // lowercase our value for comparison
-    $value  = trim($value);
-    $lvalue = strtolower($value);
-
-    if (in_array($lvalue, array('null', '~', '')))
-    {
-      $value = null;
+        return $attributes;
     }
-    else if (in_array($lvalue, array('true', 'on', '+', 'yes')))
-    {
-      $value = true;
-    }
-    else if (in_array($lvalue, array('false', 'off', '-', 'no')))
-    {
-      $value = false;
-    }
-    else if (ctype_digit($value))
+
+    /**
+     * Finds the type of the passed value, returns the value as the new type.
+     *
+     * @param string $value
+     * @param bool   $quoted Quote?
+     *
+     * @return mixed
+     */
+    public static function literalize($value, $quoted = false)
     {
-      $value = (int) $value;
+        // lowercase our value for comparison
+        $value = trim($value);
+        $lvalue = strtolower($value);
+
+        if (in_array($lvalue, array('null', '~', ''))) {
+            $value = null;
+        } elseif (in_array($lvalue, array('true', 'on', '+', 'yes'))) {
+            $value = true;
+        } elseif (in_array($lvalue, array('false', 'off', '-', 'no'))) {
+            $value = false;
+        } elseif (ctype_digit($value)) {
+            $value = (int) $value;
+        } elseif (is_numeric($value)) {
+            $value = (float) $value;
+        } else {
+            $value = self::replaceConstants($value);
+            if ($quoted) {
+                $value = '\''.str_replace('\'', '\\\'', $value).'\'';
+            }
+        }
+
+        return $value;
     }
-    else if (is_numeric($value))
+
+    /**
+     * Replaces constant identifiers in a scalar value.
+     *
+     * @param string $value the value to perform the replacement on
+     *
+     * @return string the value with substitutions made
+     */
+    public static function replaceConstants($value)
     {
-      $value = (float) $value;
+        if (!is_string($value)) {
+            return $value;
+        }
+
+        return preg_replace_callback('/%(.+?)%/', function ($v) {
+            return sfConfig::has(strtolower($v[1])) ? sfConfig::get(strtolower($v[1])) : '%'.$v[1].'%';
+        }, $value);
     }
-    else
+
+    /**
+     * Returns subject replaced with regular expression matchs.
+     *
+     * @param mixed $search       subject to search
+     * @param array $replacePairs array of search => replace pairs
+     */
+    public static function pregtr($search, $replacePairs)
     {
-      $value = self::replaceConstants($value);
-      if ($quoted)
-      {
-        $value = '\''.str_replace('\'', '\\\'', $value).'\'';
-      }
+        return preg_replace(array_keys($replacePairs), array_values($replacePairs), (string) $search);
     }
 
-    return $value;
-  }
-
-  /**
-   * Replaces constant identifiers in a scalar value.
-   *
-   * @param  string $value  the value to perform the replacement on
-   *
-   * @return string the value with substitutions made
-   */
-  public static function replaceConstants($value)
-  {
-    if (!is_string($value))
+    /**
+     * Checks if array values are empty.
+     *
+     * @param array $array the array to check
+     *
+     * @return bool true if empty, otherwise false
+     */
+    public static function isArrayValuesEmpty($array)
     {
-      return $value;
+        static $isEmpty = true;
+        foreach ($array as $value) {
+            $isEmpty = is_array($value) ? self::isArrayValuesEmpty($value) : '' === (string) $value;
+            if (!$isEmpty) {
+                break;
+            }
+        }
+
+        return $isEmpty;
     }
 
-    return preg_replace_callback('/%(.+?)%/', function ($v) {
-      return sfConfig::has(strtolower($v[1])) ? sfConfig::get(strtolower($v[1])) : '%'.$v[1].'%';
-    }, $value);
-  }
-
-  /**
-   * Returns subject replaced with regular expression matchs
-   *
-   * @param mixed $search        subject to search
-   * @param array $replacePairs  array of search => replace pairs
-   */
-  public static function pregtr($search, $replacePairs)
-  {
-    return preg_replace(array_keys($replacePairs), array_values($replacePairs), (string) $search);
-  }
-
-  /**
-   * Checks if array values are empty
-   *
-   * @param  array $array  the array to check
-   * @return boolean true if empty, otherwise false
-   */
-  public static function isArrayValuesEmpty($array)
-  {
-    static $isEmpty = true;
-    foreach ($array as $value)
+    /**
+     * Checks if a string is an utf8.
+     *
+     * Yi Stone Li<yili@yahoo-inc.com>
+     * Copyright (c) 2007 Yahoo! Inc. All rights reserved.
+     * Licensed under the BSD open source license
+     *
+     * @param string
+     * @param mixed $string
+     *
+     * @return bool true if $string is valid UTF-8 and false otherwise
+     */
+    public static function isUTF8($string)
     {
-      $isEmpty = is_array($value) ? self::isArrayValuesEmpty($value) : '' === (string)$value;
-      if (!$isEmpty)
-      {
-        break;
-      }
+        for ($idx = 0, $strlen = strlen($string); $idx < $strlen; ++$idx) {
+            $byte = ord($string[$idx]);
+
+            if ($byte & 0x80) {
+                if (($byte & 0xE0) == 0xC0) {
+                    // 2 byte char
+                    $bytes_remaining = 1;
+                } elseif (($byte & 0xF0) == 0xE0) {
+                    // 3 byte char
+                    $bytes_remaining = 2;
+                } elseif (($byte & 0xF8) == 0xF0) {
+                    // 4 byte char
+                    $bytes_remaining = 3;
+                } else {
+                    return false;
+                }
+
+                if ($idx + $bytes_remaining >= $strlen) {
+                    return false;
+                }
+
+                while ($bytes_remaining--) {
+                    if ((ord($string[++$idx]) & 0xC0) != 0x80) {
+                        return false;
+                    }
+                }
+            }
+        }
+
+        return true;
     }
 
-    return $isEmpty;
-  }
-
-  /**
-   * Checks if a string is an utf8.
-   *
-   * Yi Stone Li<yili@yahoo-inc.com>
-   * Copyright (c) 2007 Yahoo! Inc. All rights reserved.
-   * Licensed under the BSD open source license
-   *
-   * @param string
-   *
-   * @return bool true if $string is valid UTF-8 and false otherwise.
-   */
-  public static function isUTF8($string)
-  {
-    for ($idx = 0, $strlen = strlen($string); $idx < $strlen; $idx++)
+    /**
+     * Returns an array value for a path.
+     *
+     * @param array  $values  The values to search
+     * @param string $name    The token name
+     * @param array  $default Default if not found
+     *
+     * @return array
+     */
+    public static function getArrayValueForPath($values, $name, $default = null)
     {
-      $byte = ord($string[$idx]);
-
-      if ($byte & 0x80)
-      {
-        if (($byte & 0xE0) == 0xC0)
-        {
-          // 2 byte char
-          $bytes_remaining = 1;
-        }
-        else if (($byte & 0xF0) == 0xE0)
-        {
-          // 3 byte char
-          $bytes_remaining = 2;
-        }
-        else if (($byte & 0xF8) == 0xF0)
-        {
-          // 4 byte char
-          $bytes_remaining = 3;
-        }
-        else
-        {
-          return false;
+        if (false === $offset = strpos($name, '[')) {
+            return isset($values[$name]) ? $values[$name] : $default;
         }
 
-        if ($idx + $bytes_remaining >= $strlen)
-        {
-          return false;
+        if (!isset($values[substr($name, 0, $offset)])) {
+            return $default;
         }
 
-        while ($bytes_remaining--)
-        {
-          if ((ord($string[++$idx]) & 0xC0) != 0x80)
-          {
-            return false;
-          }
+        $array = $values[substr($name, 0, $offset)];
+
+        while (false !== $pos = strpos($name, '[', $offset)) {
+            $end = strpos($name, ']', $pos);
+            if ($end == $pos + 1) {
+                // reached a []
+                if (!is_array($array)) {
+                    return $default;
+                }
+
+                break;
+            }
+            if (!isset($array[substr($name, $pos + 1, $end - $pos - 1)])) {
+                return $default;
+            }
+            if (is_array($array)) {
+                $array = $array[substr($name, $pos + 1, $end - $pos - 1)];
+                $offset = $end;
+            } else {
+                return $default;
+            }
         }
-      }
-    }
 
-    return true;
-  }
-
-  /**
-   * Returns an array value for a path.
-   *
-   * @param array  $values   The values to search
-   * @param string $name     The token name
-   * @param array  $default  Default if not found
-   *
-   * @return array
-   */
-  public static function getArrayValueForPath($values, $name, $default = null)
-  {
-    if (false === $offset = strpos($name, '['))
-    {
-      return isset($values[$name]) ? $values[$name] : $default;
+        return $array;
     }
 
-    if (!isset($values[substr($name, 0, $offset)]))
+    /**
+     * Get path to php cli.
+     *
+     * @return string
+     *
+     * @throws sfException If no php cli found
+     */
+    public static function getPhpCli()
     {
-      return $default;
-    }
+        $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) {
+            foreach ($suffixes as $suffix) {
+                foreach (explode(PATH_SEPARATOR, $path) as $dir) {
+                    if (is_file($file = $dir.DIRECTORY_SEPARATOR.$phpCli.$suffix) && is_executable($file)) {
+                        return $file;
+                    }
+                }
+            }
+        }
 
-    $array = $values[substr($name, 0, $offset)];
+        throw new sfException('Unable to find PHP executable.');
+    }
 
-    while (false !== $pos = strpos($name, '[', $offset))
+    /**
+     * Converts strings to UTF-8 via iconv. NB, the result may not by UTF-8 if the conversion failed.
+     *
+     * This file comes from Prado (BSD License)
+     *
+     * @param string $string string to convert to UTF-8
+     * @param string $from   current encoding
+     *
+     * @return string UTF-8 encoded string, original string if iconv failed
+     */
+    public static function I18N_toUTF8($string, $from)
     {
-      $end = strpos($name, ']', $pos);
-      if ($end == $pos + 1)
-      {
-        // reached a []
-        if (!is_array($array))
-        {
-          return $default;
+        $from = strtoupper($from);
+        if ('UTF-8' != $from) {
+            $s = iconv($from, 'UTF-8', $string);  // to UTF-8
+
+            return false !== $s ? $s : $string; // it could return false
         }
-        break;
-      }
-      else if (!isset($array[substr($name, $pos + 1, $end - $pos - 1)]))
-      {
-        return $default;
-      }
-      else if (is_array($array))
-      {
-        $array = $array[substr($name, $pos + 1, $end - $pos - 1)];
-        $offset = $end;
-      }
-      else
-      {
-        return $default;
-      }
+
+        return $string;
     }
 
-    return $array;
-  }
-
-  /**
-   * Get path to php cli.
-   *
-   * @throws sfException If no php cli found
-   * @return string
-   */
-  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)
+    /**
+     * Converts UTF-8 strings to a different encoding. NB. The result may not have been encoded if iconv fails.
+     *
+     * This file comes from Prado (BSD License)
+     *
+     * @param string $string the UTF-8 string for conversion
+     * @param string $to     new encoding
+     *
+     * @return string encoded string
+     */
+    public static function I18N_toEncoding($string, $to)
     {
-      foreach ($suffixes as $suffix)
-      {
-        foreach (explode(PATH_SEPARATOR, $path) as $dir)
-        {
-          if (is_file($file = $dir.DIRECTORY_SEPARATOR.$phpCli.$suffix) && is_executable($file))
-          {
-            return $file;
-          }
+        $to = strtoupper($to);
+        if ('UTF-8' != $to) {
+            $s = iconv('UTF-8', $to, $string);
+
+            return false !== $s ? $s : $string;
         }
-      }
+
+        return $string;
     }
 
-    throw new sfException('Unable to find PHP executable.');
-  }
-
-  /**
-   * Converts strings to UTF-8 via iconv. NB, the result may not by UTF-8 if the conversion failed.
-   *
-   * This file comes from Prado (BSD License)
-   *
-   * @param  string $string string to convert to UTF-8
-   * @param  string $from   current encoding
-   *
-   * @return string UTF-8 encoded string, original string if iconv failed.
-   */
-  static public function I18N_toUTF8($string, $from)
-  {
-    $from = strtoupper($from);
-    if ($from != 'UTF-8')
+    /**
+     * Adds a path to the PHP include_path setting.
+     *
+     * @param mixed  $path     Single string path or an array of paths
+     * @param string $position Either 'front' or 'back'
+     *
+     * @return string The old include path
+     */
+    public static function addIncludePath($path, $position = 'front')
     {
-      $s = iconv($from,'UTF-8',$string);  // to UTF-8
+        if (is_array($path)) {
+            foreach ('front' == $position ? array_reverse($path) : $path as $p) {
+                self::addIncludePath($p, $position);
+            }
 
-      return $s !== false ? $s : $string; // it could return false
-    }
+            return;
+        }
 
-    return $string;
-  }
-
-  /**
-   * Converts UTF-8 strings to a different encoding. NB. The result may not have been encoded if iconv fails.
-   *
-   * This file comes from Prado (BSD License)
-   *
-   * @param  string $string  the UTF-8 string for conversion
-   * @param  string $to      new encoding
-   *
-   * @return string encoded string.
-   */
-  static public function I18N_toEncoding($string, $to)
-  {
-    $to = strtoupper($to);
-    if ($to != 'UTF-8')
-    {
-      $s = iconv('UTF-8', $to, $string);
+        $paths = explode(PATH_SEPARATOR, get_include_path());
 
-      return $s !== false ? $s : $string;
-    }
+        // remove what's already in the include_path
+        if (false !== $key = array_search(realpath($path), array_map('realpath', $paths))) {
+            unset($paths[$key]);
+        }
 
-    return $string;
-  }
-
-  /**
-   * Adds a path to the PHP include_path setting.
-   *
-   * @param   mixed  $path     Single string path or an array of paths
-   * @param   string $position Either 'front' or 'back'
-   *
-   * @return  string The old include path
-   */
-  static public function addIncludePath($path, $position = 'front')
-  {
-    if (is_array($path))
-    {
-      foreach ('front' == $position ? array_reverse($path) : $path as $p)
-      {
-        self::addIncludePath($p, $position);
-      }
+        switch ($position) {
+            case 'front':
+                array_unshift($paths, $path);
 
-      return;
-    }
+                break;
 
-    $paths = explode(PATH_SEPARATOR, get_include_path());
+            case 'back':
+                $paths[] = $path;
 
-    // remove what's already in the include_path
-    if (false !== $key = array_search(realpath($path), array_map('realpath', $paths)))
-    {
-      unset($paths[$key]);
-    }
+                break;
 
-    switch ($position)
-    {
-      case 'front':
-        array_unshift($paths, $path);
-        break;
-      case 'back':
-        $paths[] = $path;
-        break;
-      default:
-        throw new InvalidArgumentException(sprintf('Unrecognized position: "%s"', $position));
-    }
+            default:
+                throw new InvalidArgumentException(sprintf('Unrecognized position: "%s"', $position));
+        }
 
-    return set_include_path(implode(PATH_SEPARATOR, $paths));
-  }
+        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 3bf1a3f4f..925588ef6 100644
--- a/lib/validator/i18n/sfValidatorI18nChoiceCountry.class.php
+++ b/lib/validator/i18n/sfValidatorI18nChoiceCountry.class.php
@@ -11,45 +11,42 @@
 /**
  * sfValidatorI18nChoiceCountry validates than the value is a valid country.
  *
- * @package    symfony
- * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfValidatorI18nChoiceCountry extends sfValidatorChoice
 {
-  /**
-   * Configures the current validator.
-   *
-   * Available options:
-   *
-   *  * countries: An array of country codes to use (ISO 3166)
-   *
-   * @param array $options   An array of options
-   * @param array $messages  An array of error messages
-   *
-   * @see sfValidatorChoice
-   */
-  protected function configure($options = array(), $messages = array())
-  {
-    parent::configure($options, $messages);
+    /**
+     * Configures the current validator.
+     *
+     * Available options:
+     *
+     *  * countries: An array of country codes to use (ISO 3166)
+     *
+     * @param array $options  An array of options
+     * @param array $messages An array of error messages
+     *
+     * @see sfValidatorChoice
+     */
+    protected function configure($options = array(), $messages = array())
+    {
+        parent::configure($options, $messages);
 
-    $this->addOption('countries');
+        $this->addOption('countries');
 
-    // populate choices with all countries
-    $countries = array_keys(sfCultureInfo::getInstance()->getCountries());
+        // populate choices with all countries
+        $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)));
-      }
+        // 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)));
+            }
 
-      $countries = $options['countries'];
-    }
+            $countries = $options['countries'];
+        }
 
-    $this->setOption('choices', $countries);
-  }
+        $this->setOption('choices', $countries);
+    }
 }
diff --git a/lib/validator/i18n/sfValidatorI18nChoiceLanguage.class.php b/lib/validator/i18n/sfValidatorI18nChoiceLanguage.class.php
index f89431e47..7ecc6cd4e 100644
--- a/lib/validator/i18n/sfValidatorI18nChoiceLanguage.class.php
+++ b/lib/validator/i18n/sfValidatorI18nChoiceLanguage.class.php
@@ -11,45 +11,42 @@
 /**
  * sfValidatorI18nChoiceLanguage validates than the value is a valid language.
  *
- * @package    symfony
- * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfValidatorI18nChoiceLanguage extends sfValidatorChoice
 {
-  /**
-   * Configures the current validator.
-   *
-   * Available options:
-   *
-   *  * languages: An array of language codes to use
-   *
-   * @param array $options   An array of options
-   * @param array $messages  An array of error messages
-   *
-   * @see sfValidatorChoice
-   */
-  protected function configure($options = array(), $messages = array())
-  {
-    parent::configure($options, $messages);
+    /**
+     * Configures the current validator.
+     *
+     * Available options:
+     *
+     *  * languages: An array of language codes to use
+     *
+     * @param array $options  An array of options
+     * @param array $messages An array of error messages
+     *
+     * @see sfValidatorChoice
+     */
+    protected function configure($options = array(), $messages = array())
+    {
+        parent::configure($options, $messages);
 
-    $this->addOption('languages');
+        $this->addOption('languages');
 
-    // populate choices with all languages
-    $languages = array_keys(sfCultureInfo::getInstance()->getLanguages());
+        // populate choices with all languages
+        $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)));
-      }
+        // 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)));
+            }
 
-      $languages = $options['languages'];
-    }
+            $languages = $options['languages'];
+        }
 
-    $this->setOption('choices', $languages);
-  }
+        $this->setOption('choices', $languages);
+    }
 }
diff --git a/lib/validator/i18n/sfValidatorI18nChoiceTimezone.class.php b/lib/validator/i18n/sfValidatorI18nChoiceTimezone.class.php
index 5e1bad4e4..a0a8b56a8 100644
--- a/lib/validator/i18n/sfValidatorI18nChoiceTimezone.class.php
+++ b/lib/validator/i18n/sfValidatorI18nChoiceTimezone.class.php
@@ -11,27 +11,26 @@
 /**
  * sfValidatorI18nChoiceLanguage validates than the value is a valid timezone.
  *
- * @package    symfony
- * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfValidatorI18nChoiceTimezone extends sfValidatorChoice
 {
-  /**
-   * Configures the current validator.
-   *
-   * Available options:
-   *
-   * @param array $options   An array of options
-   * @param array $messages  An array of error messages
-   *
-   * @see sfValidatorChoice
-   */
-  protected function configure($options = array(), $messages = array())
-  {
-    parent::configure($options, $messages);
+    /**
+     * Configures the current validator.
+     *
+     * Available options:
+     *
+     * @param array $options  An array of options
+     * @param array $messages An array of error messages
+     *
+     * @see sfValidatorChoice
+     */
+    protected function configure($options = array(), $messages = array())
+    {
+        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 a6959f016..703d00efd 100644
--- a/lib/validator/sfValidatedFile.class.php
+++ b/lib/validator/sfValidatedFile.class.php
@@ -11,660 +11,652 @@
 /**
  * sfValidatedFile represents a validated uploaded file.
  *
- * @package    symfony
- * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfValidatedFile
 {
-  protected
-    $originalName = '',
-    $tempName     = '',
-    $savedName    = null,
-    $type         = '',
-    $size         = 0,
-    $path         = null;
-
-  /**
-   * Constructor.
-   *
-   * @param string $originalName  The original file name
-   * @param string $type          The file content type
-   * @param string $tempName      The absolute temporary path to the file
-   * @param int    $size          The file size (in bytes)
-   * @param string $path          The path to save the file (optional).
-   */
-  public function __construct($originalName, $type, $tempName, $size, $path = null)
-  {
-    $this->originalName = $originalName;
-    $this->tempName = $tempName;
-    $this->type = $type;
-    $this->size = $size;
-    $this->path = $path;
-  }
+    protected $originalName = '';
+    protected $tempName = '';
+    protected $savedName;
+    protected $type = '';
+    protected $size = 0;
+    protected $path;
 
-  /**
-   * Returns the name of the saved file.
-   */
-  public function __toString()
-  {
-    return null === $this->savedName ? '' : $this->savedName;
-  }
+    /**
+     * Constructor.
+     *
+     * @param string $originalName The original file name
+     * @param string $type         The file content type
+     * @param string $tempName     The absolute temporary path to the file
+     * @param int    $size         The file size (in bytes)
+     * @param string $path         the path to save the file (optional)
+     */
+    public function __construct($originalName, $type, $tempName, $size, $path = null)
+    {
+        $this->originalName = $originalName;
+        $this->tempName = $tempName;
+        $this->type = $type;
+        $this->size = $size;
+        $this->path = $path;
+    }
 
-  /**
-   * Saves the uploaded file.
-   *
-   * This method can throw exceptions if there is a problem when saving the file.
-   *
-   * If you don't pass a file name, it will be generated by the generateFilename method.
-   * This will only work if you have passed a path when initializing this instance.
-   *
-   * @param  string $file      The file path to save the file
-   * @param  int    $fileMode  The octal mode to use for the new file
-   * @param  bool   $create    Indicates that we should make the directory before moving the file
-   * @param  int    $dirMode   The octal mode to use when creating the directory
-   *
-   * @return string The filename without the $this->path prefix
-   *
-   * @throws Exception
-   */
-  public function save($file = null, $fileMode = 0666, $create = true, $dirMode = 0777)
-  {
-    if (null === $file)
+    /**
+     * Returns the name of the saved file.
+     */
+    public function __toString()
     {
-      $file = $this->generateFilename();
+        return null === $this->savedName ? '' : $this->savedName;
     }
 
-    if ($file[0] != '/' && $file[0] != '\\' && !(strlen($file) > 3 && ctype_alpha($file[0]) && $file[1] == ':' && ($file[2] == '\\' || $file[2] == '/')))
+    /**
+     * Saves the uploaded file.
+     *
+     * This method can throw exceptions if there is a problem when saving the file.
+     *
+     * If you don't pass a file name, it will be generated by the generateFilename method.
+     * This will only work if you have passed a path when initializing this instance.
+     *
+     * @param string $file     The file path to save the file
+     * @param int    $fileMode The octal mode to use for the new file
+     * @param bool   $create   Indicates that we should make the directory before moving the file
+     * @param int    $dirMode  The octal mode to use when creating the directory
+     *
+     * @return string The filename without the $this->path prefix
+     *
+     * @throws Exception
+     */
+    public function save($file = null, $fileMode = 0666, $create = true, $dirMode = 0777)
     {
-      if (null === $this->path)
-      {
-        throw new RuntimeException('You must give a "path" when you give a relative file name.');
-      }
+        if (null === $file) {
+            $file = $this->generateFilename();
+        }
 
-      $file = $this->path.DIRECTORY_SEPARATOR.$file;
-    }
+        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.');
+            }
 
-    // get our directory path from the destination filename
-    $directory = dirname($file);
+            $file = $this->path.DIRECTORY_SEPARATOR.$file;
+        }
 
-    if (!is_readable($directory))
-    {
-      if ($create && !@mkdir($directory, $dirMode, true) && !is_dir($directory))
-      {
-        // failed to create the directory
-        throw new \Exception(sprintf('Failed to create file upload directory "%s".', $directory));
-      }
+        // get our directory path from the destination filename
+        $directory = dirname($file);
 
-      // chmod the directory since it doesn't seem to work on recursive paths
-      chmod($directory, $dirMode);
-    }
+        if (!is_readable($directory)) {
+            if ($create && !@mkdir($directory, $dirMode, true) && !is_dir($directory)) {
+                // failed to create the directory
+                throw new \Exception(sprintf('Failed to create file upload directory "%s".', $directory));
+            }
 
-    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));
-    }
+            // chmod the directory since it doesn't seem to work on recursive paths
+            chmod($directory, $dirMode);
+        }
 
-    if (!is_writable($directory))
-    {
-      // the directory isn't writable
-      throw new Exception(sprintf('File upload path "%s" is not writable.', $directory));
-    }
+        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));
+        }
 
-    // copy the temp file to the destination file
-    copy($this->getTempName(), $file);
+        if (!is_writable($directory)) {
+            // the directory isn't writable
+            throw new Exception(sprintf('File upload path "%s" is not writable.', $directory));
+        }
 
-    // chmod our file
-    chmod($file, $fileMode);
+        // copy the temp file to the destination file
+        copy($this->getTempName(), $file);
 
-    $this->savedName = $file;
+        // chmod our file
+        chmod($file, $fileMode);
 
-    return null === $this->path ? $file : str_replace($this->path.DIRECTORY_SEPARATOR, '', $file);
-  }
+        $this->savedName = $file;
 
-  /**
-   * Generates a random filename for the current file.
-   *
-   * @return string A random name to represent the current file
-   */
-  public function generateFilename()
-  {
-    return sha1($this->getOriginalName().mt_rand(11111, 99999)).$this->getExtension($this->getOriginalExtension());
-  }
+        return null === $this->path ? $file : str_replace($this->path.DIRECTORY_SEPARATOR, '', $file);
+    }
 
-  /**
-   * Returns the path to use when saving a file with a relative filename.
-   *
-   * @return string The path to use when saving a file with a relative filename
-   */
-  public function getPath()
-  {
-    return $this->path;
-  }
+    /**
+     * Generates a random filename for the current file.
+     *
+     * @return string A random name to represent the current file
+     */
+    public function generateFilename()
+    {
+        return sha1($this->getOriginalName().mt_rand(11111, 99999)).$this->getExtension($this->getOriginalExtension());
+    }
 
-  /**
-   * Returns the file extension, based on the content type of the file.
-   *
-   * @param  string $default  The default extension to return if none was given
-   *
-   * @return string The extension (with the dot)
-   */
-  public function getExtension($default = '')
-  {
-    return $this->getExtensionFromType($this->type, $default);
-  }
+    /**
+     * Returns the path to use when saving a file with a relative filename.
+     *
+     * @return string The path to use when saving a file with a relative filename
+     */
+    public function getPath()
+    {
+        return $this->path;
+    }
 
-  /**
-   * Returns the original uploaded file name extension.
-   *
-   * @param  string $default  The default extension to return if none was given
-   *
-   * @return string The extension of the uploaded name (with the dot)
-   */
-  public function getOriginalExtension($default = '')
-  {
-    return (false === $pos = strrpos($this->getOriginalName(), '.')) ? $default : substr($this->getOriginalName(), $pos);
-  }
+    /**
+     * Returns the file extension, based on the content type of the file.
+     *
+     * @param string $default The default extension to return if none was given
+     *
+     * @return string The extension (with the dot)
+     */
+    public function getExtension($default = '')
+    {
+        return $this->getExtensionFromType($this->type, $default);
+    }
 
-  /**
-   * Returns true if the file has already been saved.
-   *
-   * @return Boolean true if the file has already been saved, false otherwise
-   */
-  public function isSaved()
-  {
-    return null !== $this->savedName;
-  }
+    /**
+     * Returns the original uploaded file name extension.
+     *
+     * @param string $default The default extension to return if none was given
+     *
+     * @return string The extension of the uploaded name (with the dot)
+     */
+    public function getOriginalExtension($default = '')
+    {
+        return (false === $pos = strrpos($this->getOriginalName(), '.')) ? $default : substr($this->getOriginalName(), $pos);
+    }
 
-  /**
-   * Returns the path where the file has been saved
-   *
-   * @return string The path where the file has been saved
-   */
-  public function getSavedName()
-  {
-    return $this->savedName;
-  }
+    /**
+     * Returns true if the file has already been saved.
+     *
+     * @return bool true if the file has already been saved, false otherwise
+     */
+    public function isSaved()
+    {
+        return null !== $this->savedName;
+    }
 
-  /**
-   * Returns the original file name.
-   *
-   * @return string The file name
-   */
-  public function getOriginalName()
-  {
-    return $this->originalName;
-  }
+    /**
+     * Returns the path where the file has been saved.
+     *
+     * @return string The path where the file has been saved
+     */
+    public function getSavedName()
+    {
+        return $this->savedName;
+    }
 
-  /**
-   * Returns the absolute temporary path to the uploaded file.
-   *
-   * @return string The temporary path
-   */
-  public function getTempName()
-  {
-    return $this->tempName;
-  }
+    /**
+     * Returns the original file name.
+     *
+     * @return string The file name
+     */
+    public function getOriginalName()
+    {
+        return $this->originalName;
+    }
+
+    /**
+     * Returns the absolute temporary path to the uploaded file.
+     *
+     * @return string The temporary path
+     */
+    public function getTempName()
+    {
+        return $this->tempName;
+    }
 
-  /**
-   * Returns the file content type.
-   *
-   * @return string The content type
-   */
-  public function getType()
-  {
-    return $this->type;
-  }
+    /**
+     * Returns the file content type.
+     *
+     * @return string The content type
+     */
+    public function getType()
+    {
+        return $this->type;
+    }
 
-  /**
-   * Reset type
-   *
-   * @param string $type
-   * @return sfValidatedFile
-   */
-  public function resetType($type)
-  {
-    $this->type = $type;
+    /**
+     * Reset type.
+     *
+     * @param string $type
+     *
+     * @return sfValidatedFile
+     */
+    public function resetType($type)
+    {
+        $this->type = $type;
 
-    return $this;
-  }
+        return $this;
+    }
 
-  /**
-   * Returns the size of the uploaded file.
-   *
-   * @return int The file size
-   */
-  public function getSize()
-  {
-    return $this->size;
-  }
+    /**
+     * Returns the size of the uploaded file.
+     *
+     * @return int The file size
+     */
+    public function getSize()
+    {
+        return $this->size;
+    }
 
-  /**
-   * Returns the extension associated with the given content type.
-   *
-   * @param  string $type     The content type
-   * @param  string $default  The default extension to use
-   *
-   * @return string The extension (with the dot)
-   */
-  protected function getExtensionFromType($type, $default = '')
-  {
-    static $extensions = array(
-      'application/andrew-inset' => 'ez',
-      'application/appledouble' => 'base64',
-      'application/applefile' => 'base64',
-      'application/commonground' => 'dp',
-      'application/cprplayer' => 'pqi',
-      'application/dsptype' => 'tsp',
-      'application/excel' => 'xls',
-      'application/font-tdpfr' => 'pfr',
-      'application/futuresplash' => 'spl',
-      'application/hstu' => 'stk',
-      'application/hyperstudio' => 'stk',
-      'application/javascript' => 'js',
-      'application/mac-binhex40' => 'hqx',
-      'application/mac-compactpro' => 'cpt',
-      'application/mbed' => 'mbd',
-      'application/mirage' => 'mfp',
-      'application/msword' => 'doc',
-      'application/ocsp-request' => 'orq',
-      'application/ocsp-response' => 'ors',
-      'application/octet-stream' => 'bin',
-      'application/oda' => 'oda',
-      'application/ogg' => 'ogg',
-      'application/pdf' => 'pdf',
-      'application/x-pdf' => 'pdf',
-      'application/pgp-encrypted' => '7bit',
-      'application/pgp-keys' => '7bit',
-      'application/pgp-signature' => 'sig',
-      'application/pkcs10' => 'p10',
-      'application/pkcs7-mime' => 'p7m',
-      'application/pkcs7-signature' => 'p7s',
-      'application/pkix-cert' => 'cer',
-      'application/pkix-crl' => 'crl',
-      'application/pkix-pkipath' => 'pkipath',
-      'application/pkixcmp' => 'pki',
-      'application/postscript' => 'ps',
-      'application/presentations' => 'shw',
-      'application/prs.cww' => 'cw',
-      'application/prs.nprend' => 'rnd',
-      'application/quest' => 'qrt',
-      'application/rtf' => 'rtf',
-      'application/sgml-open-catalog' => 'soc',
-      'application/sieve' => 'siv',
-      'application/smil' => 'smi',
-      'application/toolbook' => 'tbk',
-      'application/vnd.3gpp.pic-bw-large' => 'plb',
-      'application/vnd.3gpp.pic-bw-small' => 'psb',
-      'application/vnd.3gpp.pic-bw-var' => 'pvb',
-      'application/vnd.3gpp.sms' => 'sms',
-      'application/vnd.acucorp' => 'atc',
-      'application/vnd.adobe.xfdf' => 'xfdf',
-      'application/vnd.amiga.amu' => 'ami',
-      'application/vnd.blueice.multipass' => 'mpm',
-      'application/vnd.cinderella' => 'cdy',
-      'application/vnd.cosmocaller' => 'cmc',
-      'application/vnd.criticaltools.wbs+xml' => 'wbs',
-      'application/vnd.curl' => 'curl',
-      'application/vnd.data-vision.rdz' => 'rdz',
-      'application/vnd.dreamfactory' => 'dfac',
-      'application/vnd.fsc.weblauch' => 'fsc',
-      'application/vnd.genomatix.tuxedo' => 'txd',
-      'application/vnd.hbci' => 'hbci',
-      'application/vnd.hhe.lesson-player' => 'les',
-      'application/vnd.hp-hpgl' => 'plt',
-      'application/vnd.ibm.electronic-media' => 'emm',
-      'application/vnd.ibm.rights-management' => 'irm',
-      'application/vnd.ibm.secure-container' => 'sc',
-      'application/vnd.ipunplugged.rcprofile' => 'rcprofile',
-      'application/vnd.irepository.package+xml' => 'irp',
-      'application/vnd.jisp' => 'jisp',
-      'application/vnd.kde.karbon' => 'karbon',
-      'application/vnd.kde.kchart' => 'chrt',
-      'application/vnd.kde.kformula' => 'kfo',
-      'application/vnd.kde.kivio' => 'flw',
-      'application/vnd.kde.kontour' => 'kon',
-      'application/vnd.kde.kpresenter' => 'kpr',
-      'application/vnd.kde.kspread' => 'ksp',
-      'application/vnd.kde.kword' => 'kwd',
-      'application/vnd.kenameapp' => 'htke',
-      'application/vnd.kidspiration' => 'kia',
-      'application/vnd.kinar' => 'kne',
-      'application/vnd.llamagraphics.life-balance.desktop' => 'lbd',
-      'application/vnd.llamagraphics.life-balance.exchange+xml' => 'lbe',
-      'application/vnd.lotus-1-2-3' => 'wks',
-      'application/vnd.mcd' => 'mcd',
-      'application/vnd.mfmp' => 'mfm',
-      'application/vnd.micrografx.flo' => 'flo',
-      'application/vnd.micrografx.igx' => 'igx',
-      'application/vnd.mif' => 'mif',
-      'application/vnd.mophun.application' => 'mpn',
-      'application/vnd.mophun.certificate' => 'mpc',
-      'application/vnd.mozilla.xul+xml' => 'xul',
-      'application/vnd.ms-artgalry' => 'cil',
-      'application/vnd.ms-asf' => 'asf',
-      'application/vnd.ms-excel' => 'xls',
-      'application/vnd.ms-excel.sheet.macroenabled.12' => 'xlsm',
-      'application/vnd.ms-lrm' => 'lrm',
-      'application/vnd.ms-powerpoint' => 'ppt',
-      'application/vnd.ms-project' => 'mpp',
-      'application/vnd.ms-tnef' => 'base64',
-      'application/vnd.ms-works' => 'base64',
-      'application/vnd.ms-wpl' => 'wpl',
-      'application/vnd.mseq' => 'mseq',
-      'application/vnd.nervana' => 'ent',
-      'application/vnd.nokia.radio-preset' => 'rpst',
-      'application/vnd.nokia.radio-presets' => 'rpss',
-      'application/vnd.oasis.opendocument.text' => 'odt',
-      'application/vnd.oasis.opendocument.text-template' => 'ott',
-      'application/vnd.oasis.opendocument.text-web' => 'oth',
-      'application/vnd.oasis.opendocument.text-master' => 'odm',
-      'application/vnd.oasis.opendocument.graphics' => 'odg',
-      'application/vnd.oasis.opendocument.graphics-template' => 'otg',
-      'application/vnd.oasis.opendocument.presentation' => 'odp',
-      'application/vnd.oasis.opendocument.presentation-template' => 'otp',
-      'application/vnd.oasis.opendocument.spreadsheet' => 'ods',
-      'application/vnd.oasis.opendocument.spreadsheet-template' => 'ots',
-      'application/vnd.oasis.opendocument.chart' => 'odc',
-      'application/vnd.oasis.opendocument.formula' => 'odf',
-      'application/vnd.oasis.opendocument.database' => 'odb',
-      'application/vnd.oasis.opendocument.image' => 'odi',
-      'application/vnd.openxmlformats-officedocument.wordprocessingml.document' => 'docx',
-      'application/vnd.openxmlformats-officedocument.wordprocessingml.template' => 'dotx',
-      'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' => 'xlsx',
-      'application/vnd.openxmlformats-officedocument.presentationml.presentation' => 'pptx',
-      'application/vnd.palm' => 'prc',
-      'application/vnd.picsel' => 'efif',
-      'application/vnd.pvi.ptid1' => 'pti',
-      'application/vnd.quark.quarkxpress' => 'qxd',
-      'application/vnd.sealed.doc' => 'sdoc',
-      'application/vnd.sealed.eml' => 'seml',
-      'application/vnd.sealed.mht' => 'smht',
-      'application/vnd.sealed.ppt' => 'sppt',
-      'application/vnd.sealed.xls' => 'sxls',
-      'application/vnd.sealedmedia.softseal.html' => 'stml',
-      'application/vnd.sealedmedia.softseal.pdf' => 'spdf',
-      'application/vnd.seemail' => 'see',
-      'application/vnd.smaf' => 'mmf',
-      'application/vnd.sun.xml.calc' => 'sxc',
-      'application/vnd.sun.xml.calc.template' => 'stc',
-      'application/vnd.sun.xml.draw' => 'sxd',
-      'application/vnd.sun.xml.draw.template' => 'std',
-      'application/vnd.sun.xml.impress' => 'sxi',
-      'application/vnd.sun.xml.impress.template' => 'sti',
-      'application/vnd.sun.xml.math' => 'sxm',
-      'application/vnd.sun.xml.writer' => 'sxw',
-      'application/vnd.sun.xml.writer.global' => 'sxg',
-      'application/vnd.sun.xml.writer.template' => 'stw',
-      'application/vnd.sus-calendar' => 'sus',
-      'application/vnd.vidsoft.vidconference' => 'vsc',
-      'application/vnd.visio' => 'vsd',
-      'application/vnd.visionary' => 'vis',
-      'application/vnd.wap.sic' => 'sic',
-      'application/vnd.wap.slc' => 'slc',
-      'application/vnd.wap.wbxml' => 'wbxml',
-      'application/vnd.wap.wmlc' => 'wmlc',
-      'application/vnd.wap.wmlscriptc' => 'wmlsc',
-      'application/vnd.webturbo' => 'wtb',
-      'application/vnd.wordperfect' => 'wpd',
-      'application/vnd.wqd' => 'wqd',
-      'application/vnd.wv.csp+wbxml' => 'wv',
-      'application/vnd.wv.csp+xml' => '8bit',
-      'application/vnd.wv.ssp+xml' => '8bit',
-      'application/vnd.yamaha.hv-dic' => 'hvd',
-      'application/vnd.yamaha.hv-script' => 'hvs',
-      'application/vnd.yamaha.hv-voice' => 'hvp',
-      'application/vnd.yamaha.smaf-audio' => 'saf',
-      'application/vnd.yamaha.smaf-phrase' => 'spf',
-      'application/vocaltec-media-desc' => 'vmd',
-      'application/vocaltec-media-file' => 'vmf',
-      'application/vocaltec-talker' => 'vtk',
-      'application/watcherinfo+xml' => 'wif',
-      'application/wordperfect5.1' => 'wp5',
-      'application/x-123' => 'wk',
-      'application/x-7th_level_event' => '7ls',
-      'application/x-authorware-bin' => 'aab',
-      'application/x-authorware-map' => 'aam',
-      'application/x-authorware-seg' => 'aas',
-      'application/x-bcpio' => 'bcpio',
-      'application/x-bleeper' => 'bleep',
-      'application/x-bzip2' => 'bz2',
-      'application/x-cdlink' => 'vcd',
-      'application/x-chat' => 'chat',
-      'application/x-chess-pgn' => 'pgn',
-      'application/x-compress' => 'z',
-      'application/x-cpio' => 'cpio',
-      'application/x-cprplayer' => 'pqf',
-      'application/x-csh' => 'csh',
-      'application/x-cu-seeme' => 'csm',
-      'application/x-cult3d-object' => 'co',
-      'application/x-debian-package' => 'deb',
-      'application/x-director' => 'dcr',
-      'application/x-dvi' => 'dvi',
-      'application/x-envoy' => 'evy',
-      'application/x-futuresplash' => 'spl',
-      'application/x-gtar' => 'gtar',
-      'application/x-gzip' => 'gz',
-      'application/x-hdf' => 'hdf',
-      'application/x-hep' => 'hep',
-      'application/x-html+ruby' => 'rhtml',
-      'application/x-httpd-miva' => 'mv',
-      'application/x-httpd-php' => 'phtml',
-      'application/x-ica' => 'ica',
-      'application/x-imagemap' => 'imagemap',
-      'application/x-ipix' => 'ipx',
-      'application/x-ipscript' => 'ips',
-      'application/x-java-archive' => 'jar',
-      'application/x-java-jnlp-file' => 'jnlp',
-      'application/x-java-serialized-object' => 'ser',
-      'application/x-java-vm' => 'class',
-      'application/x-javascript' => 'js',
-      'application/x-koan' => 'skp',
-      'application/x-latex' => 'latex',
-      'application/x-mac-compactpro' => 'cpt',
-      'application/x-maker' => 'frm',
-      'application/x-mathcad' => 'mcd',
-      'application/x-midi' => 'mid',
-      'application/x-mif' => 'mif',
-      'application/x-msaccess' => 'mda',
-      'application/x-msdos-program' => 'com',
-      'application/x-msdownload' => 'base64',
-      'application/x-msexcel' => 'xls',
-      'application/x-msword' => 'doc',
-      'application/x-netcdf' => 'nc',
-      'application/x-ns-proxy-autoconfig' => 'pac',
-      'application/x-pagemaker' => 'pm5',
-      'application/x-perl' => 'pl',
-      'application/x-pn-realmedia' => 'rp',
-      'application/x-python' => 'py',
-      'application/x-quicktimeplayer' => 'qtl',
-      'application/x-rar-compressed' => 'rar',
-      'application/x-ruby' => 'rb',
-      'application/x-sh' => 'sh',
-      'application/x-shar' => 'shar',
-      'application/x-shockwave-flash' => 'swf',
-      'application/x-sprite' => 'spr',
-      'application/x-spss' => 'sav',
-      'application/x-spt' => 'spt',
-      'application/x-stuffit' => 'sit',
-      'application/x-sv4cpio' => 'sv4cpio',
-      'application/x-sv4crc' => 'sv4crc',
-      'application/x-tar' => 'tar',
-      'application/x-tcl' => 'tcl',
-      'application/x-tex' => 'tex',
-      'application/x-texinfo' => 'texinfo',
-      'application/x-troff' => 't',
-      'application/x-troff-man' => 'man',
-      'application/x-troff-me' => 'me',
-      'application/x-troff-ms' => 'ms',
-      'application/x-twinvq' => 'vqf',
-      'application/x-twinvq-plugin' => 'vqe',
-      'application/x-ustar' => 'ustar',
-      'application/x-vmsbackup' => 'bck',
-      'application/x-wais-source' => 'src',
-      'application/x-wingz' => 'wz',
-      'application/x-word' => 'base64',
-      'application/x-wordperfect6.1' => 'wp6',
-      'application/x-x509-ca-cert' => 'crt',
-      'application/x-zip-compressed' => 'zip',
-      'application/xhtml+xml' => 'xhtml',
-      'application/zip' => 'zip',
-      'audio/3gpp' => '3gpp',
-      'audio/amr' => 'amr',
-      'audio/amr-wb' => 'awb',
-      'audio/basic' => 'au',
-      'audio/evrc' => 'evc',
-      'audio/l16' => 'l16',
-      'audio/midi' => 'mid',
-      'audio/mpeg' => 'mp3',
-      'audio/prs.sid' => 'sid',
-      'audio/qcelp' => 'qcp',
-      'audio/smv' => 'smv',
-      'audio/vnd.audiokoz' => 'koz',
-      'audio/vnd.digital-winds' => 'eol',
-      'audio/vnd.everad.plj' => 'plj',
-      'audio/vnd.lucent.voice' => 'lvp',
-      'audio/vnd.nokia.mobile-xmf' => 'mxmf',
-      'audio/vnd.nortel.vbk' => 'vbk',
-      'audio/vnd.nuera.ecelp4800' => 'ecelp4800',
-      'audio/vnd.nuera.ecelp7470' => 'ecelp7470',
-      'audio/vnd.nuera.ecelp9600' => 'ecelp9600',
-      'audio/vnd.sealedmedia.softseal.mpeg' => 'smp3',
-      'audio/voxware' => 'vox',
-      'audio/x-aiff' => 'aif',
-      'audio/x-mid' => 'mid',
-      'audio/x-midi' => 'mid',
-      'audio/x-mpeg' => 'mp2',
-      'audio/x-mpegurl' => 'mpu',
-      'audio/x-pn-realaudio' => 'rm',
-      'audio/x-pn-realaudio-plugin' => 'rpm',
-      'audio/x-realaudio' => 'ra',
-      'audio/x-wav' => 'wav',
-      'chemical/x-csml' => 'csm',
-      'chemical/x-embl-dl-nucleotide' => 'emb',
-      'chemical/x-gaussian-cube' => 'cube',
-      'chemical/x-gaussian-input' => 'gau',
-      'chemical/x-jcamp-dx' => 'jdx',
-      'chemical/x-mdl-molfile' => 'mol',
-      'chemical/x-mdl-rxnfile' => 'rxn',
-      'chemical/x-mdl-tgf' => 'tgf',
-      'chemical/x-mopac-input' => 'mop',
-      'chemical/x-pdb' => 'pdb',
-      'chemical/x-rasmol' => 'scr',
-      'chemical/x-xyz' => 'xyz',
-      'drawing/dwf' => 'dwf',
-      'drawing/x-dwf' => 'dwf',
-      'i-world/i-vrml' => 'ivr',
-      'image/bmp' => 'bmp',
-      'image/cewavelet' => 'wif',
-      'image/cis-cod' => 'cod',
-      'image/fif' => 'fif',
-      'image/gif' => 'gif',
-      'image/ief' => 'ief',
-      'image/jp2' => 'jp2',
-      'image/jpeg' => 'jpg',
-      'image/jpm' => 'jpm',
-      'image/jpx' => 'jpf',
-      'image/pict' => 'pic',
-      'image/pjpeg' => 'jpg',
-      'image/png' => 'png',
-      'image/targa' => 'tga',
-      'image/tiff' => 'tif',
-      'image/vn-svf' => 'svf',
-      'image/vnd.dgn' => 'dgn',
-      'image/vnd.djvu' => 'djvu',
-      'image/vnd.dwg' => 'dwg',
-      'image/vnd.glocalgraphics.pgb' => 'pgb',
-      'image/vnd.microsoft.icon' => 'ico',
-      'image/vnd.ms-modi' => 'mdi',
-      'image/vnd.sealed.png' => 'spng',
-      'image/vnd.sealedmedia.softseal.gif' => 'sgif',
-      'image/vnd.sealedmedia.softseal.jpg' => 'sjpg',
-      'image/vnd.wap.wbmp' => 'wbmp',
-      'image/x-bmp' => 'bmp',
-      'image/x-cmu-raster' => 'ras',
-      'image/x-freehand' => 'fh4',
-      'image/x-ms-bmp' => 'bmp',
-      'image/x-png' => 'png',
-      'image/x-portable-anymap' => 'pnm',
-      'image/x-portable-bitmap' => 'pbm',
-      'image/x-portable-graymap' => 'pgm',
-      'image/x-portable-pixmap' => 'ppm',
-      'image/x-rgb' => 'rgb',
-      'image/x-xbitmap' => 'xbm',
-      'image/x-xpixmap' => 'xpm',
-      'image/x-xwindowdump' => 'xwd',
-      'message/external-body' => '8bit',
-      'message/news' => '8bit',
-      'message/partial' => '8bit',
-      'message/rfc822' => '8bit',
-      'model/iges' => 'igs',
-      'model/mesh' => 'msh',
-      'model/vnd.parasolid.transmit.binary' => 'x_b',
-      'model/vnd.parasolid.transmit.text' => 'x_t',
-      'model/vrml' => 'wrl',
-      'multipart/alternative' => '8bit',
-      'multipart/appledouble' => '8bit',
-      'multipart/digest' => '8bit',
-      'multipart/mixed' => '8bit',
-      'multipart/parallel' => '8bit',
-      'text/comma-separated-values' => 'csv',
-      'text/css' => 'css',
-      'text/html' => 'html',
-      'text/plain' => 'txt',
-      'text/prs.fallenstein.rst' => 'rst',
-      'text/richtext' => 'rtx',
-      'text/rtf' => 'rtf',
-      'text/sgml' => 'sgml',
-      'text/tab-separated-values' => 'tsv',
-      'text/vnd.net2phone.commcenter.command' => 'ccc',
-      'text/vnd.sun.j2me.app-descriptor' => 'jad',
-      'text/vnd.wap.si' => 'si',
-      'text/vnd.wap.sl' => 'sl',
-      'text/vnd.wap.wml' => 'wml',
-      'text/vnd.wap.wmlscript' => 'wmls',
-      'text/x-hdml' => 'hdml',
-      'text/x-setext' => 'etx',
-      'text/x-sgml' => 'sgml',
-      'text/x-speech' => 'talk',
-      'text/x-vcalendar' => 'vcs',
-      'text/x-vcard' => 'vcf',
-      'text/xml' => 'xml',
-      'ulead/vrml' => 'uvr',
-      'video/3gpp' => '3gp',
-      'video/dl' => 'dl',
-      'video/gl' => 'gl',
-      'video/mj2' => 'mj2',
-      'video/mpeg' => 'mpeg',
-      'video/quicktime' => 'mov',
-      'video/vdo' => 'vdo',
-      'video/vivo' => 'viv',
-      'video/vnd.fvt' => 'fvt',
-      'video/vnd.mpegurl' => 'mxu',
-      'video/vnd.nokia.interleaved-multimedia' => 'nim',
-      'video/vnd.objectvideo' => 'mp4',
-      'video/vnd.sealed.mpeg1' => 's11',
-      'video/vnd.sealed.mpeg4' => 'smpg',
-      'video/vnd.sealed.swf' => 'sswf',
-      'video/vnd.sealedmedia.softseal.mov' => 'smov',
-      'video/vnd.vivo' => 'vivo',
-      'video/x-fli' => 'fli',
-      'video/x-ms-asf' => 'asf',
-      'video/x-ms-wmv' => 'wmv',
-      'video/x-msvideo' => 'avi',
-      'video/x-sgi-movie' => 'movie',
-      'x-chemical/x-pdb' => 'pdb',
-      'x-chemical/x-xyz' => 'xyz',
-      'x-conference/x-cooltalk' => 'ice',
-      'x-drawing/dwf' => 'dwf',
-      'x-world/x-d96' => 'd',
-      'x-world/x-svr' => 'svr',
-      'x-world/x-vream' => 'vrw',
-      'x-world/x-vrml' => 'wrl',
-    );
+    /**
+     * Returns the extension associated with the given content type.
+     *
+     * @param string $type    The content type
+     * @param string $default The default extension to use
+     *
+     * @return string The extension (with the dot)
+     */
+    protected function getExtensionFromType($type, $default = '')
+    {
+        static $extensions = array(
+            'application/andrew-inset' => 'ez',
+            'application/appledouble' => 'base64',
+            'application/applefile' => 'base64',
+            'application/commonground' => 'dp',
+            'application/cprplayer' => 'pqi',
+            'application/dsptype' => 'tsp',
+            'application/excel' => 'xls',
+            'application/font-tdpfr' => 'pfr',
+            'application/futuresplash' => 'spl',
+            'application/hstu' => 'stk',
+            'application/hyperstudio' => 'stk',
+            'application/javascript' => 'js',
+            'application/mac-binhex40' => 'hqx',
+            'application/mac-compactpro' => 'cpt',
+            'application/mbed' => 'mbd',
+            'application/mirage' => 'mfp',
+            'application/msword' => 'doc',
+            'application/ocsp-request' => 'orq',
+            'application/ocsp-response' => 'ors',
+            'application/octet-stream' => 'bin',
+            'application/oda' => 'oda',
+            'application/ogg' => 'ogg',
+            'application/pdf' => 'pdf',
+            'application/x-pdf' => 'pdf',
+            'application/pgp-encrypted' => '7bit',
+            'application/pgp-keys' => '7bit',
+            'application/pgp-signature' => 'sig',
+            'application/pkcs10' => 'p10',
+            'application/pkcs7-mime' => 'p7m',
+            'application/pkcs7-signature' => 'p7s',
+            'application/pkix-cert' => 'cer',
+            'application/pkix-crl' => 'crl',
+            'application/pkix-pkipath' => 'pkipath',
+            'application/pkixcmp' => 'pki',
+            'application/postscript' => 'ps',
+            'application/presentations' => 'shw',
+            'application/prs.cww' => 'cw',
+            'application/prs.nprend' => 'rnd',
+            'application/quest' => 'qrt',
+            'application/rtf' => 'rtf',
+            'application/sgml-open-catalog' => 'soc',
+            'application/sieve' => 'siv',
+            'application/smil' => 'smi',
+            'application/toolbook' => 'tbk',
+            'application/vnd.3gpp.pic-bw-large' => 'plb',
+            'application/vnd.3gpp.pic-bw-small' => 'psb',
+            'application/vnd.3gpp.pic-bw-var' => 'pvb',
+            'application/vnd.3gpp.sms' => 'sms',
+            'application/vnd.acucorp' => 'atc',
+            'application/vnd.adobe.xfdf' => 'xfdf',
+            'application/vnd.amiga.amu' => 'ami',
+            'application/vnd.blueice.multipass' => 'mpm',
+            'application/vnd.cinderella' => 'cdy',
+            'application/vnd.cosmocaller' => 'cmc',
+            'application/vnd.criticaltools.wbs+xml' => 'wbs',
+            'application/vnd.curl' => 'curl',
+            'application/vnd.data-vision.rdz' => 'rdz',
+            'application/vnd.dreamfactory' => 'dfac',
+            'application/vnd.fsc.weblauch' => 'fsc',
+            'application/vnd.genomatix.tuxedo' => 'txd',
+            'application/vnd.hbci' => 'hbci',
+            'application/vnd.hhe.lesson-player' => 'les',
+            'application/vnd.hp-hpgl' => 'plt',
+            'application/vnd.ibm.electronic-media' => 'emm',
+            'application/vnd.ibm.rights-management' => 'irm',
+            'application/vnd.ibm.secure-container' => 'sc',
+            'application/vnd.ipunplugged.rcprofile' => 'rcprofile',
+            'application/vnd.irepository.package+xml' => 'irp',
+            'application/vnd.jisp' => 'jisp',
+            'application/vnd.kde.karbon' => 'karbon',
+            'application/vnd.kde.kchart' => 'chrt',
+            'application/vnd.kde.kformula' => 'kfo',
+            'application/vnd.kde.kivio' => 'flw',
+            'application/vnd.kde.kontour' => 'kon',
+            'application/vnd.kde.kpresenter' => 'kpr',
+            'application/vnd.kde.kspread' => 'ksp',
+            'application/vnd.kde.kword' => 'kwd',
+            'application/vnd.kenameapp' => 'htke',
+            'application/vnd.kidspiration' => 'kia',
+            'application/vnd.kinar' => 'kne',
+            'application/vnd.llamagraphics.life-balance.desktop' => 'lbd',
+            'application/vnd.llamagraphics.life-balance.exchange+xml' => 'lbe',
+            'application/vnd.lotus-1-2-3' => 'wks',
+            'application/vnd.mcd' => 'mcd',
+            'application/vnd.mfmp' => 'mfm',
+            'application/vnd.micrografx.flo' => 'flo',
+            'application/vnd.micrografx.igx' => 'igx',
+            'application/vnd.mif' => 'mif',
+            'application/vnd.mophun.application' => 'mpn',
+            'application/vnd.mophun.certificate' => 'mpc',
+            'application/vnd.mozilla.xul+xml' => 'xul',
+            'application/vnd.ms-artgalry' => 'cil',
+            'application/vnd.ms-asf' => 'asf',
+            'application/vnd.ms-excel' => 'xls',
+            'application/vnd.ms-excel.sheet.macroenabled.12' => 'xlsm',
+            'application/vnd.ms-lrm' => 'lrm',
+            'application/vnd.ms-powerpoint' => 'ppt',
+            'application/vnd.ms-project' => 'mpp',
+            'application/vnd.ms-tnef' => 'base64',
+            'application/vnd.ms-works' => 'base64',
+            'application/vnd.ms-wpl' => 'wpl',
+            'application/vnd.mseq' => 'mseq',
+            'application/vnd.nervana' => 'ent',
+            'application/vnd.nokia.radio-preset' => 'rpst',
+            'application/vnd.nokia.radio-presets' => 'rpss',
+            'application/vnd.oasis.opendocument.text' => 'odt',
+            'application/vnd.oasis.opendocument.text-template' => 'ott',
+            'application/vnd.oasis.opendocument.text-web' => 'oth',
+            'application/vnd.oasis.opendocument.text-master' => 'odm',
+            'application/vnd.oasis.opendocument.graphics' => 'odg',
+            'application/vnd.oasis.opendocument.graphics-template' => 'otg',
+            'application/vnd.oasis.opendocument.presentation' => 'odp',
+            'application/vnd.oasis.opendocument.presentation-template' => 'otp',
+            'application/vnd.oasis.opendocument.spreadsheet' => 'ods',
+            'application/vnd.oasis.opendocument.spreadsheet-template' => 'ots',
+            'application/vnd.oasis.opendocument.chart' => 'odc',
+            'application/vnd.oasis.opendocument.formula' => 'odf',
+            'application/vnd.oasis.opendocument.database' => 'odb',
+            'application/vnd.oasis.opendocument.image' => 'odi',
+            'application/vnd.openxmlformats-officedocument.wordprocessingml.document' => 'docx',
+            'application/vnd.openxmlformats-officedocument.wordprocessingml.template' => 'dotx',
+            'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' => 'xlsx',
+            'application/vnd.openxmlformats-officedocument.presentationml.presentation' => 'pptx',
+            'application/vnd.palm' => 'prc',
+            'application/vnd.picsel' => 'efif',
+            'application/vnd.pvi.ptid1' => 'pti',
+            'application/vnd.quark.quarkxpress' => 'qxd',
+            'application/vnd.sealed.doc' => 'sdoc',
+            'application/vnd.sealed.eml' => 'seml',
+            'application/vnd.sealed.mht' => 'smht',
+            'application/vnd.sealed.ppt' => 'sppt',
+            'application/vnd.sealed.xls' => 'sxls',
+            'application/vnd.sealedmedia.softseal.html' => 'stml',
+            'application/vnd.sealedmedia.softseal.pdf' => 'spdf',
+            'application/vnd.seemail' => 'see',
+            'application/vnd.smaf' => 'mmf',
+            'application/vnd.sun.xml.calc' => 'sxc',
+            'application/vnd.sun.xml.calc.template' => 'stc',
+            'application/vnd.sun.xml.draw' => 'sxd',
+            'application/vnd.sun.xml.draw.template' => 'std',
+            'application/vnd.sun.xml.impress' => 'sxi',
+            'application/vnd.sun.xml.impress.template' => 'sti',
+            'application/vnd.sun.xml.math' => 'sxm',
+            'application/vnd.sun.xml.writer' => 'sxw',
+            'application/vnd.sun.xml.writer.global' => 'sxg',
+            'application/vnd.sun.xml.writer.template' => 'stw',
+            'application/vnd.sus-calendar' => 'sus',
+            'application/vnd.vidsoft.vidconference' => 'vsc',
+            'application/vnd.visio' => 'vsd',
+            'application/vnd.visionary' => 'vis',
+            'application/vnd.wap.sic' => 'sic',
+            'application/vnd.wap.slc' => 'slc',
+            'application/vnd.wap.wbxml' => 'wbxml',
+            'application/vnd.wap.wmlc' => 'wmlc',
+            'application/vnd.wap.wmlscriptc' => 'wmlsc',
+            'application/vnd.webturbo' => 'wtb',
+            'application/vnd.wordperfect' => 'wpd',
+            'application/vnd.wqd' => 'wqd',
+            'application/vnd.wv.csp+wbxml' => 'wv',
+            'application/vnd.wv.csp+xml' => '8bit',
+            'application/vnd.wv.ssp+xml' => '8bit',
+            'application/vnd.yamaha.hv-dic' => 'hvd',
+            'application/vnd.yamaha.hv-script' => 'hvs',
+            'application/vnd.yamaha.hv-voice' => 'hvp',
+            'application/vnd.yamaha.smaf-audio' => 'saf',
+            'application/vnd.yamaha.smaf-phrase' => 'spf',
+            'application/vocaltec-media-desc' => 'vmd',
+            'application/vocaltec-media-file' => 'vmf',
+            'application/vocaltec-talker' => 'vtk',
+            'application/watcherinfo+xml' => 'wif',
+            'application/wordperfect5.1' => 'wp5',
+            'application/x-123' => 'wk',
+            'application/x-7th_level_event' => '7ls',
+            'application/x-authorware-bin' => 'aab',
+            'application/x-authorware-map' => 'aam',
+            'application/x-authorware-seg' => 'aas',
+            'application/x-bcpio' => 'bcpio',
+            'application/x-bleeper' => 'bleep',
+            'application/x-bzip2' => 'bz2',
+            'application/x-cdlink' => 'vcd',
+            'application/x-chat' => 'chat',
+            'application/x-chess-pgn' => 'pgn',
+            'application/x-compress' => 'z',
+            'application/x-cpio' => 'cpio',
+            'application/x-cprplayer' => 'pqf',
+            'application/x-csh' => 'csh',
+            'application/x-cu-seeme' => 'csm',
+            'application/x-cult3d-object' => 'co',
+            'application/x-debian-package' => 'deb',
+            'application/x-director' => 'dcr',
+            'application/x-dvi' => 'dvi',
+            'application/x-envoy' => 'evy',
+            'application/x-futuresplash' => 'spl',
+            'application/x-gtar' => 'gtar',
+            'application/x-gzip' => 'gz',
+            'application/x-hdf' => 'hdf',
+            'application/x-hep' => 'hep',
+            'application/x-html+ruby' => 'rhtml',
+            'application/x-httpd-miva' => 'mv',
+            'application/x-httpd-php' => 'phtml',
+            'application/x-ica' => 'ica',
+            'application/x-imagemap' => 'imagemap',
+            'application/x-ipix' => 'ipx',
+            'application/x-ipscript' => 'ips',
+            'application/x-java-archive' => 'jar',
+            'application/x-java-jnlp-file' => 'jnlp',
+            'application/x-java-serialized-object' => 'ser',
+            'application/x-java-vm' => 'class',
+            'application/x-javascript' => 'js',
+            'application/x-koan' => 'skp',
+            'application/x-latex' => 'latex',
+            'application/x-mac-compactpro' => 'cpt',
+            'application/x-maker' => 'frm',
+            'application/x-mathcad' => 'mcd',
+            'application/x-midi' => 'mid',
+            'application/x-mif' => 'mif',
+            'application/x-msaccess' => 'mda',
+            'application/x-msdos-program' => 'com',
+            'application/x-msdownload' => 'base64',
+            'application/x-msexcel' => 'xls',
+            'application/x-msword' => 'doc',
+            'application/x-netcdf' => 'nc',
+            'application/x-ns-proxy-autoconfig' => 'pac',
+            'application/x-pagemaker' => 'pm5',
+            'application/x-perl' => 'pl',
+            'application/x-pn-realmedia' => 'rp',
+            'application/x-python' => 'py',
+            'application/x-quicktimeplayer' => 'qtl',
+            'application/x-rar-compressed' => 'rar',
+            'application/x-ruby' => 'rb',
+            'application/x-sh' => 'sh',
+            'application/x-shar' => 'shar',
+            'application/x-shockwave-flash' => 'swf',
+            'application/x-sprite' => 'spr',
+            'application/x-spss' => 'sav',
+            'application/x-spt' => 'spt',
+            'application/x-stuffit' => 'sit',
+            'application/x-sv4cpio' => 'sv4cpio',
+            'application/x-sv4crc' => 'sv4crc',
+            'application/x-tar' => 'tar',
+            'application/x-tcl' => 'tcl',
+            'application/x-tex' => 'tex',
+            'application/x-texinfo' => 'texinfo',
+            'application/x-troff' => 't',
+            'application/x-troff-man' => 'man',
+            'application/x-troff-me' => 'me',
+            'application/x-troff-ms' => 'ms',
+            'application/x-twinvq' => 'vqf',
+            'application/x-twinvq-plugin' => 'vqe',
+            'application/x-ustar' => 'ustar',
+            'application/x-vmsbackup' => 'bck',
+            'application/x-wais-source' => 'src',
+            'application/x-wingz' => 'wz',
+            'application/x-word' => 'base64',
+            'application/x-wordperfect6.1' => 'wp6',
+            'application/x-x509-ca-cert' => 'crt',
+            'application/x-zip-compressed' => 'zip',
+            'application/xhtml+xml' => 'xhtml',
+            'application/zip' => 'zip',
+            'audio/3gpp' => '3gpp',
+            'audio/amr' => 'amr',
+            'audio/amr-wb' => 'awb',
+            'audio/basic' => 'au',
+            'audio/evrc' => 'evc',
+            'audio/l16' => 'l16',
+            'audio/midi' => 'mid',
+            'audio/mpeg' => 'mp3',
+            'audio/prs.sid' => 'sid',
+            'audio/qcelp' => 'qcp',
+            'audio/smv' => 'smv',
+            'audio/vnd.audiokoz' => 'koz',
+            'audio/vnd.digital-winds' => 'eol',
+            'audio/vnd.everad.plj' => 'plj',
+            'audio/vnd.lucent.voice' => 'lvp',
+            'audio/vnd.nokia.mobile-xmf' => 'mxmf',
+            'audio/vnd.nortel.vbk' => 'vbk',
+            'audio/vnd.nuera.ecelp4800' => 'ecelp4800',
+            'audio/vnd.nuera.ecelp7470' => 'ecelp7470',
+            'audio/vnd.nuera.ecelp9600' => 'ecelp9600',
+            'audio/vnd.sealedmedia.softseal.mpeg' => 'smp3',
+            'audio/voxware' => 'vox',
+            'audio/x-aiff' => 'aif',
+            'audio/x-mid' => 'mid',
+            'audio/x-midi' => 'mid',
+            'audio/x-mpeg' => 'mp2',
+            'audio/x-mpegurl' => 'mpu',
+            'audio/x-pn-realaudio' => 'rm',
+            'audio/x-pn-realaudio-plugin' => 'rpm',
+            'audio/x-realaudio' => 'ra',
+            'audio/x-wav' => 'wav',
+            'chemical/x-csml' => 'csm',
+            'chemical/x-embl-dl-nucleotide' => 'emb',
+            'chemical/x-gaussian-cube' => 'cube',
+            'chemical/x-gaussian-input' => 'gau',
+            'chemical/x-jcamp-dx' => 'jdx',
+            'chemical/x-mdl-molfile' => 'mol',
+            'chemical/x-mdl-rxnfile' => 'rxn',
+            'chemical/x-mdl-tgf' => 'tgf',
+            'chemical/x-mopac-input' => 'mop',
+            'chemical/x-pdb' => 'pdb',
+            'chemical/x-rasmol' => 'scr',
+            'chemical/x-xyz' => 'xyz',
+            'drawing/dwf' => 'dwf',
+            'drawing/x-dwf' => 'dwf',
+            'i-world/i-vrml' => 'ivr',
+            'image/bmp' => 'bmp',
+            'image/cewavelet' => 'wif',
+            'image/cis-cod' => 'cod',
+            'image/fif' => 'fif',
+            'image/gif' => 'gif',
+            'image/ief' => 'ief',
+            'image/jp2' => 'jp2',
+            'image/jpeg' => 'jpg',
+            'image/jpm' => 'jpm',
+            'image/jpx' => 'jpf',
+            'image/pict' => 'pic',
+            'image/pjpeg' => 'jpg',
+            'image/png' => 'png',
+            'image/targa' => 'tga',
+            'image/tiff' => 'tif',
+            'image/vn-svf' => 'svf',
+            'image/vnd.dgn' => 'dgn',
+            'image/vnd.djvu' => 'djvu',
+            'image/vnd.dwg' => 'dwg',
+            'image/vnd.glocalgraphics.pgb' => 'pgb',
+            'image/vnd.microsoft.icon' => 'ico',
+            'image/vnd.ms-modi' => 'mdi',
+            'image/vnd.sealed.png' => 'spng',
+            'image/vnd.sealedmedia.softseal.gif' => 'sgif',
+            'image/vnd.sealedmedia.softseal.jpg' => 'sjpg',
+            'image/vnd.wap.wbmp' => 'wbmp',
+            'image/x-bmp' => 'bmp',
+            'image/x-cmu-raster' => 'ras',
+            'image/x-freehand' => 'fh4',
+            'image/x-ms-bmp' => 'bmp',
+            'image/x-png' => 'png',
+            'image/x-portable-anymap' => 'pnm',
+            'image/x-portable-bitmap' => 'pbm',
+            'image/x-portable-graymap' => 'pgm',
+            'image/x-portable-pixmap' => 'ppm',
+            'image/x-rgb' => 'rgb',
+            'image/x-xbitmap' => 'xbm',
+            'image/x-xpixmap' => 'xpm',
+            'image/x-xwindowdump' => 'xwd',
+            'message/external-body' => '8bit',
+            'message/news' => '8bit',
+            'message/partial' => '8bit',
+            'message/rfc822' => '8bit',
+            'model/iges' => 'igs',
+            'model/mesh' => 'msh',
+            'model/vnd.parasolid.transmit.binary' => 'x_b',
+            'model/vnd.parasolid.transmit.text' => 'x_t',
+            'model/vrml' => 'wrl',
+            'multipart/alternative' => '8bit',
+            'multipart/appledouble' => '8bit',
+            'multipart/digest' => '8bit',
+            'multipart/mixed' => '8bit',
+            'multipart/parallel' => '8bit',
+            'text/comma-separated-values' => 'csv',
+            'text/css' => 'css',
+            'text/html' => 'html',
+            'text/plain' => 'txt',
+            'text/prs.fallenstein.rst' => 'rst',
+            'text/richtext' => 'rtx',
+            'text/rtf' => 'rtf',
+            'text/sgml' => 'sgml',
+            'text/tab-separated-values' => 'tsv',
+            'text/vnd.net2phone.commcenter.command' => 'ccc',
+            'text/vnd.sun.j2me.app-descriptor' => 'jad',
+            'text/vnd.wap.si' => 'si',
+            'text/vnd.wap.sl' => 'sl',
+            'text/vnd.wap.wml' => 'wml',
+            'text/vnd.wap.wmlscript' => 'wmls',
+            'text/x-hdml' => 'hdml',
+            'text/x-setext' => 'etx',
+            'text/x-sgml' => 'sgml',
+            'text/x-speech' => 'talk',
+            'text/x-vcalendar' => 'vcs',
+            'text/x-vcard' => 'vcf',
+            'text/xml' => 'xml',
+            'ulead/vrml' => 'uvr',
+            'video/3gpp' => '3gp',
+            'video/dl' => 'dl',
+            'video/gl' => 'gl',
+            'video/mj2' => 'mj2',
+            'video/mpeg' => 'mpeg',
+            'video/quicktime' => 'mov',
+            'video/vdo' => 'vdo',
+            'video/vivo' => 'viv',
+            'video/vnd.fvt' => 'fvt',
+            'video/vnd.mpegurl' => 'mxu',
+            'video/vnd.nokia.interleaved-multimedia' => 'nim',
+            'video/vnd.objectvideo' => 'mp4',
+            'video/vnd.sealed.mpeg1' => 's11',
+            'video/vnd.sealed.mpeg4' => 'smpg',
+            'video/vnd.sealed.swf' => 'sswf',
+            'video/vnd.sealedmedia.softseal.mov' => 'smov',
+            'video/vnd.vivo' => 'vivo',
+            'video/x-fli' => 'fli',
+            'video/x-ms-asf' => 'asf',
+            'video/x-ms-wmv' => 'wmv',
+            'video/x-msvideo' => 'avi',
+            'video/x-sgi-movie' => 'movie',
+            'x-chemical/x-pdb' => 'pdb',
+            'x-chemical/x-xyz' => 'xyz',
+            'x-conference/x-cooltalk' => 'ice',
+            'x-drawing/dwf' => 'dwf',
+            'x-world/x-d96' => 'd',
+            'x-world/x-svr' => 'svr',
+            'x-world/x-vream' => 'vrw',
+            'x-world/x-vrml' => 'wrl',
+        );
 
-    return !$type ? $default : (isset($extensions[$type]) ? '.'.$extensions[$type] : $default);
-  }
+        return !$type ? $default : (isset($extensions[$type]) ? '.'.$extensions[$type] : $default);
+    }
 }
diff --git a/lib/validator/sfValidatorAnd.class.php b/lib/validator/sfValidatorAnd.class.php
index 1b9f6f33d..142f50b8d 100644
--- a/lib/validator/sfValidatorAnd.class.php
+++ b/lib/validator/sfValidatorAnd.class.php
@@ -11,158 +11,144 @@
 /**
  * sfValidatorAnd validates an input value if all validators passes.
  *
- * @package    symfony
- * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfValidatorAnd extends sfValidatorBase
 {
-  protected
-    $validators = array();
-
-  /**
-   * Constructor.
-   *
-   * The first argument can be:
-   *
-   *  * null
-   *  * a sfValidatorBase instance
-   *  * an array of sfValidatorBase instances
-   *
-   * @param mixed $validators Initial validators
-   * @param array $options    An array of options
-   * @param array $messages   An array of error messages
-   *
-   * @see sfValidatorBase
-   */
-  public function __construct($validators = null, $options = array(), $messages = array())
-  {
-    if ($validators instanceof sfValidatorBase)
+    protected $validators = array();
+
+    /**
+     * Constructor.
+     *
+     * The first argument can be:
+     *
+     *  * null
+     *  * a sfValidatorBase instance
+     *  * an array of sfValidatorBase instances
+     *
+     * @param mixed $validators Initial validators
+     * @param array $options    An array of options
+     * @param array $messages   An array of error messages
+     *
+     * @see sfValidatorBase
+     */
+    public function __construct($validators = null, $options = array(), $messages = array())
     {
-      $this->addValidator($validators);
+        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.');
+        }
+
+        parent::__construct($options, $messages);
     }
-    else if (is_array($validators))
+
+    /**
+     * Adds a validator.
+     *
+     * @param sfValidatorBase $validator A sfValidatorBase instance
+     */
+    public function addValidator(sfValidatorBase $validator)
     {
-      foreach ($validators as $validator)
-      {
-        $this->addValidator($validator);
-      }
+        $this->validators[] = $validator;
     }
-    else if (null !== $validators)
+
+    /**
+     * Returns an array of the validators.
+     *
+     * @return array An array of sfValidatorBase instances
+     */
+    public function getValidators()
     {
-      throw new InvalidArgumentException('sfValidatorAnd constructor takes a sfValidatorBase object, or a sfValidatorBase array.');
+        return $this->validators;
     }
 
-    parent::__construct($options, $messages);
-  }
-
-  /**
-   * Configures the current validator.
-   *
-   * Available options:
-   *
-   *  * halt_on_error: Whether to halt on the first error or not (false by default)
-   *
-   * @param array $options   An array of options
-   * @param array $messages  An array of error messages
-   *
-   * @see sfValidatorBase
-   */
-  protected function configure($options = array(), $messages = array())
-  {
-    $this->addOption('halt_on_error', false);
-
-    $this->setMessage('invalid', null);
-  }
-
-  /**
-   * Adds a validator.
-   *
-   * @param sfValidatorBase $validator  A sfValidatorBase instance
-   */
-  public function addValidator(sfValidatorBase $validator)
-  {
-    $this->validators[] = $validator;
-  }
-
-  /**
-   * Returns an array of the validators.
-   *
-   * @return array An array of sfValidatorBase instances
-   */
-  public function getValidators()
-  {
-    return $this->validators;
-  }
-
-  /**
-   * @see sfValidatorBase
-   */
-  protected function doClean($value)
-  {
-    $clean = $value;
-    $errors = new sfValidatorErrorSchema($this);
-    foreach ($this->validators as $validator)
+    /**
+     * @see sfValidatorBase
+     *
+     * @param mixed $indent
+     */
+    public function asString($indent = 0)
     {
-      try
-      {
-        $clean = $validator->clean($clean);
-      }
-      catch (sfValidatorError $e)
-      {
-        $errors->addError($e);
-
-        if ($this->getOption('halt_on_error'))
-        {
-          break;
+        $validators = '';
+        for ($i = 0, $max = count($this->validators); $i < $max; ++$i) {
+            $validators .= "\n".$this->validators[$i]->asString($indent + 2)."\n";
+
+            if ($i < $max - 1) {
+                $validators .= str_repeat(' ', $indent + 2).'and';
+            }
+
+            if ($i == $max - 2) {
+                $options = $this->getOptionsWithoutDefaults();
+                $messages = $this->getMessagesWithoutDefaults();
+
+                if ($options || $messages) {
+                    $validators .= sprintf(
+                        '(%s%s)',
+                        $options ? sfYamlInline::dump($options) : ($messages ? '{}' : ''),
+                        $messages ? ', '.sfYamlInline::dump($messages) : ''
+                    );
+                }
+            }
         }
-      }
+
+        return sprintf('%s(%s%s)', str_repeat(' ', $indent), $validators, str_repeat(' ', $indent));
     }
 
-    if ($errors->count())
+    /**
+     * Configures the current validator.
+     *
+     * Available options:
+     *
+     *  * halt_on_error: Whether to halt on the first error or not (false by default)
+     *
+     * @param array $options  An array of options
+     * @param array $messages An array of error messages
+     *
+     * @see sfValidatorBase
+     */
+    protected function configure($options = array(), $messages = array())
     {
-      if ($this->getMessage('invalid'))
-      {
-        throw new sfValidatorError($this, 'invalid', array('value' => $value));
-      }
+        $this->addOption('halt_on_error', false);
 
-      throw $errors;
+        $this->setMessage('invalid', null);
     }
 
-    return $clean;
-  }
-
-  /**
-   * @see sfValidatorBase
-   */
-  public function asString($indent = 0)
-  {
-    $validators = '';
-    for ($i = 0, $max = count($this->validators); $i < $max; $i++)
+    /**
+     * @see sfValidatorBase
+     *
+     * @param mixed $value
+     */
+    protected function doClean($value)
     {
-      $validators .= "\n".$this->validators[$i]->asString($indent + 2)."\n";
-
-      if ($i < $max - 1)
-      {
-        $validators .= str_repeat(' ', $indent + 2).'and';
-      }
-
-      if ($i == $max - 2)
-      {
-        $options = $this->getOptionsWithoutDefaults();
-        $messages = $this->getMessagesWithoutDefaults();
-
-        if ($options || $messages)
-        {
-          $validators .= sprintf('(%s%s)',
-            $options ? sfYamlInline::dump($options) : ($messages ? '{}' : ''),
-            $messages ? ', '.sfYamlInline::dump($messages) : ''
-          );
+        $clean = $value;
+        $errors = new sfValidatorErrorSchema($this);
+        foreach ($this->validators as $validator) {
+            try {
+                $clean = $validator->clean($clean);
+            } catch (sfValidatorError $e) {
+                $errors->addError($e);
+
+                if ($this->getOption('halt_on_error')) {
+                    break;
+                }
+            }
         }
-      }
-    }
 
-    return sprintf("%s(%s%s)", str_repeat(' ', $indent), $validators, str_repeat(' ', $indent));
-  }
+        if ($errors->count()) {
+            if ($this->getMessage('invalid')) {
+                throw new sfValidatorError($this, 'invalid', array('value' => $value));
+            }
+
+            throw $errors;
+        }
+
+        return $clean;
+    }
 }
diff --git a/lib/validator/sfValidatorBase.class.php b/lib/validator/sfValidatorBase.class.php
index 831db16f9..ec150533d 100644
--- a/lib/validator/sfValidatorBase.class.php
+++ b/lib/validator/sfValidatorBase.class.php
@@ -13,486 +13,472 @@
  *
  * It also implements the required option for all validators.
  *
- * @package    symfony
- * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfValidatorBase
 {
-  protected static
-    $charset = 'UTF-8',
-    $globalDefaultMessages = array('invalid' => 'Invalid.', 'required' => 'Required.');
-
-  protected
-    $requiredOptions = array(),
-    $defaultMessages = array(),
-    $defaultOptions  = array(),
-    $messages        = array(),
-    $options         = array();
-
-  /**
-   * Constructor.
-   *
-   * Available options:
-   *
-   *  * required:    true if the value is required, false otherwise (default to true)
-   *  * trim:        true if the value must be trimmed, false otherwise (default to false)
-   *  * empty_value: empty value when value is not required
-   *
-   * Available error codes:
-   *
-   *  * required
-   *  * invalid
-   *
-   * @param array $options   An array of options
-   * @param array $messages  An array of error messages
-   */
-  public function __construct($options = array(), $messages = array())
-  {
-    $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->configure($options, $messages);
-
-    $this->setDefaultOptions($this->getOptions());
-    $this->setDefaultMessages($this->getMessages());
-
-    $currentOptionKeys = array_keys($this->options);
-    $optionKeys = array_keys($options);
-
-    // check option names
-    if ($diff = array_diff($optionKeys, array_merge($currentOptionKeys, $this->requiredOptions)))
+    protected static $charset = 'UTF-8';
+    protected static $globalDefaultMessages = array('invalid' => 'Invalid.', 'required' => 'Required.');
+
+    protected $requiredOptions = array();
+    protected $defaultMessages = array();
+    protected $defaultOptions = array();
+    protected $messages = array();
+    protected $options = array();
+
+    /**
+     * Constructor.
+     *
+     * Available options:
+     *
+     *  * required:    true if the value is required, false otherwise (default to true)
+     *  * trim:        true if the value must be trimmed, false otherwise (default to false)
+     *  * empty_value: empty value when value is not required
+     *
+     * Available error codes:
+     *
+     *  * required
+     *  * invalid
+     *
+     * @param array $options  An array of options
+     * @param array $messages An array of error messages
+     */
+    public function __construct($options = array(), $messages = array())
     {
-      throw new InvalidArgumentException(sprintf('%s does not support the following options: \'%s\'.', get_class($this), implode('\', \'', $diff)));
+        $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->configure($options, $messages);
+
+        $this->setDefaultOptions($this->getOptions());
+        $this->setDefaultMessages($this->getMessages());
+
+        $currentOptionKeys = array_keys($this->options);
+        $optionKeys = array_keys($options);
+
+        // 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)));
+        }
+
+        // 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)));
+        }
+
+        // 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)));
+        }
+
+        $this->options = array_merge($this->options, $options);
+        $this->messages = array_merge($this->messages, $messages);
     }
 
-    // check error code names
-    if ($diff = array_diff(array_keys($messages), array_keys($this->messages)))
+    /**
+     * Returns an error message given an error code.
+     *
+     * @param string $name The error code
+     *
+     * @return string The error message, or the empty string if the error code does not exist
+     */
+    public function getMessage($name)
     {
-      throw new InvalidArgumentException(sprintf('%s does not support the following error codes: \'%s\'.', get_class($this), implode('\', \'', $diff)));
+        return isset($this->messages[$name]) ? $this->messages[$name] : '';
     }
 
-    // check required options
-    if ($diff = array_diff($this->requiredOptions, array_merge($currentOptionKeys, $optionKeys)))
+    /**
+     * Adds a new error code with a default error message.
+     *
+     * @param string $name  The error code
+     * @param string $value The error message
+     *
+     * @return sfValidatorBase The current validator instance
+     */
+    public function addMessage($name, $value)
     {
-      throw new RuntimeException(sprintf('%s requires the following options: \'%s\'.', get_class($this), implode('\', \'', $diff)));
+        $this->messages[$name] = isset(self::$globalDefaultMessages[$name]) ? self::$globalDefaultMessages[$name] : $value;
+
+        return $this;
     }
 
-    $this->options  = array_merge($this->options, $options);
-    $this->messages = array_merge($this->messages, $messages);
-  }
-
-  /**
-   * Configures the current validator.
-   *
-   * This method allows each validator to add options and error messages
-   * during validator creation.
-   *
-   * If some options and messages are given in the sfValidatorBase constructor
-   * they will take precedence over the options and messages you configure
-   * in this method.
-   *
-   * @param array $options   An array of options
-   * @param array $messages  An array of error messages
-   *
-   * @see __construct()
-   */
-  protected function configure($options = array(), $messages = array())
-  {
-  }
-
-  /**
-   * Returns an error message given an error code.
-   *
-   * @param  string $name  The error code
-   *
-   * @return string The error message, or the empty string if the error code does not exist
-   */
-  public function getMessage($name)
-  {
-    return isset($this->messages[$name]) ? $this->messages[$name] : '';
-  }
-
-  /**
-   * Adds a new error code with a default error message.
-   *
-   * @param string $name   The error code
-   * @param string $value  The error message
-   *
-   * @return sfValidatorBase The current validator instance
-   */
-  public function addMessage($name, $value)
-  {
-    $this->messages[$name] = isset(self::$globalDefaultMessages[$name]) ? self::$globalDefaultMessages[$name] : $value;
-
-    return $this;
-  }
-
-  /**
-   * Changes an error message given the error code.
-   *
-   * @param string $name   The error code
-   * @param string $value  The error message
-   *
-   * @return sfValidatorBase The current validator instance
-   */
-  public function setMessage($name, $value)
-  {
-    if (!array_key_exists($name, $this->messages))
+    /**
+     * Changes an error message given the error code.
+     *
+     * @param string $name  The error code
+     * @param string $value The error message
+     *
+     * @return sfValidatorBase The current validator instance
+     */
+    public function setMessage($name, $value)
     {
-      throw new InvalidArgumentException(sprintf('%s does not support the following error code: \'%s\'.', get_class($this), $name));
+        if (!array_key_exists($name, $this->messages)) {
+            throw new InvalidArgumentException(sprintf('%s does not support the following error code: \'%s\'.', get_class($this), $name));
+        }
+
+        $this->messages[$name] = $value;
+
+        return $this;
     }
 
-    $this->messages[$name] = $value;
-
-    return $this;
-  }
-
-  /**
-   * Returns an array of current error messages.
-   *
-   * @return array An array of messages
-   */
-  public function getMessages()
-  {
-    return $this->messages;
-  }
-
-  /**
-   * Changes all error messages.
-   *
-   * @param array $values  An array of error messages
-   *
-   * @return sfValidatorBase The current validator instance
-   */
-  public function setMessages($values)
-  {
-    $this->messages = array_merge(array('required' => self::$globalDefaultMessages['required'], 'invalid' => self::$globalDefaultMessages['invalid']), $values);
-
-    return $this;
-  }
-
-  /**
-   * Gets an option value.
-   *
-   * @param  string $name  The option name
-   *
-   * @return mixed  The option value
-   */
-  public function getOption($name)
-  {
-    return isset($this->options[$name]) ? $this->options[$name] : null;
-  }
-
-  /**
-   * Adds a new option value with a default value.
-   *
-   * @param string $name   The option name
-   * @param mixed  $value  The default value
-   *
-   * @return sfValidatorBase The current validator instance
-   */
-  public function addOption($name, $value = null)
-  {
-    $this->options[$name] = $value;
-
-    return $this;
-  }
-
-  /**
-   * Changes an option value.
-   *
-   * @param string $name   The option name
-   * @param mixed  $value  The value
-   *
-   * @return sfValidatorBase The current validator instance
-   */
-  public function setOption($name, $value)
-  {
-    if (!in_array($name, array_merge(array_keys($this->options), $this->requiredOptions)))
+    /**
+     * Returns an array of current error messages.
+     *
+     * @return array An array of messages
+     */
+    public function getMessages()
     {
-      throw new InvalidArgumentException(sprintf('%s does not support the following option: \'%s\'.', get_class($this), $name));
+        return $this->messages;
     }
 
-    $this->options[$name] = $value;
-
-    return $this;
-  }
-
-  /**
-   * Returns true if the option exists.
-   *
-   * @param  string $name  The option name
-   *
-   * @return bool true if the option exists, false otherwise
-   */
-  public function hasOption($name)
-  {
-    return isset($this->options[$name]);
-  }
-
-  /**
-   * Returns all options.
-   *
-   * @return array An array of options
-   */
-  public function getOptions()
-  {
-    return $this->options;
-  }
-
-  /**
-   * Changes all options.
-   *
-   * @param array $values  An array of options
-   *
-   * @return sfValidatorBase The current validator instance
-   */
-  public function setOptions($values)
-  {
-    $this->options = array_merge(array('required' => true, 'trim' => false, 'empty_value' => null), $values);
-
-    return $this;
-  }
-
-  /**
-   * Adds a required option.
-   *
-   * @param string $name  The option name
-   *
-   * @return sfValidatorBase The current validator instance
-   */
-  public function addRequiredOption($name)
-  {
-    $this->requiredOptions[] = $name;
-
-    return $this;
-  }
-
-  /**
-   * Returns all required option names.
-   *
-   * @return array An array of required option names
-   */
-  public function getRequiredOptions()
-  {
-    return $this->requiredOptions;
-  }
-
-  /**
-   * Sets the default message for a given name.
-   *
-   * @param string $name    The name of the message
-   * @param string $message The default message string
-   */
-  static public function setDefaultMessage($name, $message)
-  {
-    self::$globalDefaultMessages[$name] = $message;
-  }
-
-  /**
-   * Cleans the input value.
-   *
-   * This method is also responsible for trimming the input value
-   * and checking the required option.
-   *
-   * @param  mixed $value  The input value
-   *
-   * @return mixed The cleaned value
-   *
-   * @throws sfValidatorError
-   */
-  public function clean($value)
-  {
-    $clean = $value;
-
-    if ($this->options['trim'] && is_string($clean))
+    /**
+     * Changes all error messages.
+     *
+     * @param array $values An array of error messages
+     *
+     * @return sfValidatorBase The current validator instance
+     */
+    public function setMessages($values)
     {
-      $clean = trim($clean);
+        $this->messages = array_merge(array('required' => self::$globalDefaultMessages['required'], 'invalid' => self::$globalDefaultMessages['invalid']), $values);
+
+        return $this;
     }
 
-    // empty value?
-    if ($this->isEmpty($clean))
+    /**
+     * Gets an option value.
+     *
+     * @param string $name The option name
+     *
+     * @return mixed The option value
+     */
+    public function getOption($name)
     {
-      // required?
-      if ($this->options['required'])
-      {
-        throw new sfValidatorError($this, 'required');
-      }
+        return isset($this->options[$name]) ? $this->options[$name] : null;
+    }
 
-      return $this->getEmptyValue();
+    /**
+     * Adds a new option value with a default value.
+     *
+     * @param string $name  The option name
+     * @param mixed  $value The default value
+     *
+     * @return sfValidatorBase The current validator instance
+     */
+    public function addOption($name, $value = null)
+    {
+        $this->options[$name] = $value;
+
+        return $this;
     }
 
-    return $this->doClean($clean);
-  }
-
-  /**
-   * Cleans the input value.
-   *
-   * Every subclass must implements this method.
-   *
-   * @param  mixed $value  The input value
-   *
-   * @return mixed The cleaned value
-   *
-   * @throws sfValidatorError
-   */
-  abstract protected function doClean($value);
-
-  /**
-   * Sets the charset to use when validating strings.
-   *
-   * @param string $charset  The charset
-   */
-  static public function setCharset($charset)
-  {
-    self::$charset = $charset;
-  }
-
-  /**
-   * Returns the charset to use when validating strings.
-   *
-   * @return string The charset (default to UTF-8)
-   */
-  static public function getCharset()
-  {
-    return self::$charset;
-  }
-
-  /**
-   * Returns true if the value is empty.
-   *
-   * @param  mixed $value  The input value
-   *
-   * @return bool true if the value is empty, false otherwise
-   */
-  protected function isEmpty($value)
-  {
-    return in_array($value, array(null, '', array()), true);
-  }
-
-  /**
-   * Returns an empty value for this validator.
-   *
-   * @return mixed The empty value for this validator
-   */
-  protected function getEmptyValue()
-  {
-    return $this->getOption('empty_value');
-  }
-
-  /**
-   * Returns an array of all error codes for this validator.
-   *
-   * @return array An array of possible error codes
-   *
-   * @see getDefaultMessages()
-   */
-  final public function getErrorCodes()
-  {
-    return array_keys($this->getDefaultMessages());
-  }
-
-  /**
-   * Returns default messages for all possible error codes.
-   *
-   * @return array An array of default error codes and messages
-   */
-  public function getDefaultMessages()
-  {
-    return $this->defaultMessages;
-  }
-
-  /**
-   * Sets default messages for all possible error codes.
-   *
-   * @param array $messages  An array of default error codes and messages
-   */
-  protected function setDefaultMessages($messages)
-  {
-    $this->defaultMessages = $messages;
-  }
-
-  /**
-   * Returns default option values.
-   *
-   * @return array An array of default option values
-   */
-  public function getDefaultOptions()
-  {
-    return $this->defaultOptions;
-  }
-
-  /**
-   * Sets default option values.
-   *
-   * @param array $options  An array of default option values
-   */
-  protected function setDefaultOptions($options)
-  {
-    $this->defaultOptions = $options;
-  }
-
-  /**
-   * Returns a string representation of this validator.
-   *
-   * @param  int $indent  Indentation (number of spaces before each line)
-   *
-   * @return string The string representation of the validator
-   */
-  public function asString($indent = 0)
-  {
-    $options = $this->getOptionsWithoutDefaults();
-    $messages = $this->getMessagesWithoutDefaults();
-
-    return sprintf('%s%s(%s%s)',
-      str_repeat(' ', $indent),
-      str_replace('sfValidator', '', get_class($this)),
-      $options ? sfYamlInline::dump($options) : ($messages ? '{}' : ''),
-      $messages ? ', '.sfYamlInline::dump($messages) : ''
-    );
-  }
-
-  /**
-   * Returns all error messages with non default values.
-   *
-   * @return string A string representation of the error messages
-   */
-  protected function getMessagesWithoutDefaults()
-  {
-    $messages = $this->messages;
-
-    // remove default option values
-    foreach ($this->getDefaultMessages() as $key => $value)
+    /**
+     * Changes an option value.
+     *
+     * @param string $name  The option name
+     * @param mixed  $value The value
+     *
+     * @return sfValidatorBase The current validator instance
+     */
+    public function setOption($name, $value)
     {
-      if (array_key_exists($key, $messages) && $messages[$key] === $value)
-      {
-        unset($messages[$key]);
-      }
+        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));
+        }
+
+        $this->options[$name] = $value;
+
+        return $this;
     }
 
-    return $messages;
-  }
+    /**
+     * Returns true if the option exists.
+     *
+     * @param string $name The option name
+     *
+     * @return bool true if the option exists, false otherwise
+     */
+    public function hasOption($name)
+    {
+        return isset($this->options[$name]);
+    }
 
-  /**
-   * Returns all options with non default values.
-   *
-   * @return string  A string representation of the options
-   */
-  protected function getOptionsWithoutDefaults()
-  {
-    $options = $this->options;
+    /**
+     * Returns all options.
+     *
+     * @return array An array of options
+     */
+    public function getOptions()
+    {
+        return $this->options;
+    }
 
-    // remove default option values
-    foreach ($this->getDefaultOptions() as $key => $value)
+    /**
+     * Changes all options.
+     *
+     * @param array $values An array of options
+     *
+     * @return sfValidatorBase The current validator instance
+     */
+    public function setOptions($values)
     {
-      if (array_key_exists($key, $options) && $options[$key] === $value)
-      {
-        unset($options[$key]);
-      }
+        $this->options = array_merge(array('required' => true, 'trim' => false, 'empty_value' => null), $values);
+
+        return $this;
+    }
+
+    /**
+     * Adds a required option.
+     *
+     * @param string $name The option name
+     *
+     * @return sfValidatorBase The current validator instance
+     */
+    public function addRequiredOption($name)
+    {
+        $this->requiredOptions[] = $name;
+
+        return $this;
+    }
+
+    /**
+     * Returns all required option names.
+     *
+     * @return array An array of required option names
+     */
+    public function getRequiredOptions()
+    {
+        return $this->requiredOptions;
+    }
+
+    /**
+     * Sets the default message for a given name.
+     *
+     * @param string $name    The name of the message
+     * @param string $message The default message string
+     */
+    public static function setDefaultMessage($name, $message)
+    {
+        self::$globalDefaultMessages[$name] = $message;
+    }
+
+    /**
+     * Cleans the input value.
+     *
+     * This method is also responsible for trimming the input value
+     * and checking the required option.
+     *
+     * @param mixed $value The input value
+     *
+     * @return mixed The cleaned value
+     *
+     * @throws sfValidatorError
+     */
+    public function clean($value)
+    {
+        $clean = $value;
+
+        if ($this->options['trim'] && is_string($clean)) {
+            $clean = trim($clean);
+        }
+
+        // empty value?
+        if ($this->isEmpty($clean)) {
+            // required?
+            if ($this->options['required']) {
+                throw new sfValidatorError($this, 'required');
+            }
+
+            return $this->getEmptyValue();
+        }
+
+        return $this->doClean($clean);
     }
 
-    return $options;
-  }
+    /**
+     * Sets the charset to use when validating strings.
+     *
+     * @param string $charset The charset
+     */
+    public static function setCharset($charset)
+    {
+        self::$charset = $charset;
+    }
+
+    /**
+     * Returns the charset to use when validating strings.
+     *
+     * @return string The charset (default to UTF-8)
+     */
+    public static function getCharset()
+    {
+        return self::$charset;
+    }
+
+    /**
+     * Returns an array of all error codes for this validator.
+     *
+     * @return array An array of possible error codes
+     *
+     * @see getDefaultMessages()
+     */
+    final public function getErrorCodes()
+    {
+        return array_keys($this->getDefaultMessages());
+    }
+
+    /**
+     * Returns default messages for all possible error codes.
+     *
+     * @return array An array of default error codes and messages
+     */
+    public function getDefaultMessages()
+    {
+        return $this->defaultMessages;
+    }
+
+    /**
+     * Returns default option values.
+     *
+     * @return array An array of default option values
+     */
+    public function getDefaultOptions()
+    {
+        return $this->defaultOptions;
+    }
+
+    /**
+     * Returns a string representation of this validator.
+     *
+     * @param int $indent Indentation (number of spaces before each line)
+     *
+     * @return string The string representation of the validator
+     */
+    public function asString($indent = 0)
+    {
+        $options = $this->getOptionsWithoutDefaults();
+        $messages = $this->getMessagesWithoutDefaults();
+
+        return sprintf(
+            '%s%s(%s%s)',
+            str_repeat(' ', $indent),
+            str_replace('sfValidator', '', get_class($this)),
+            $options ? sfYamlInline::dump($options) : ($messages ? '{}' : ''),
+            $messages ? ', '.sfYamlInline::dump($messages) : ''
+        );
+    }
+
+    /**
+     * Configures the current validator.
+     *
+     * This method allows each validator to add options and error messages
+     * during validator creation.
+     *
+     * If some options and messages are given in the sfValidatorBase constructor
+     * they will take precedence over the options and messages you configure
+     * in this method.
+     *
+     * @param array $options  An array of options
+     * @param array $messages An array of error messages
+     *
+     * @see __construct()
+     */
+    protected function configure($options = array(), $messages = array())
+    {
+    }
+
+    /**
+     * Cleans the input value.
+     *
+     * Every subclass must implements this method.
+     *
+     * @param mixed $value The input value
+     *
+     * @return mixed The cleaned value
+     *
+     * @throws sfValidatorError
+     */
+    abstract protected function doClean($value);
+
+    /**
+     * Returns true if the value is empty.
+     *
+     * @param mixed $value The input value
+     *
+     * @return bool true if the value is empty, false otherwise
+     */
+    protected function isEmpty($value)
+    {
+        return in_array($value, array(null, '', array()), true);
+    }
+
+    /**
+     * Returns an empty value for this validator.
+     *
+     * @return mixed The empty value for this validator
+     */
+    protected function getEmptyValue()
+    {
+        return $this->getOption('empty_value');
+    }
+
+    /**
+     * Sets default messages for all possible error codes.
+     *
+     * @param array $messages An array of default error codes and messages
+     */
+    protected function setDefaultMessages($messages)
+    {
+        $this->defaultMessages = $messages;
+    }
+
+    /**
+     * Sets default option values.
+     *
+     * @param array $options An array of default option values
+     */
+    protected function setDefaultOptions($options)
+    {
+        $this->defaultOptions = $options;
+    }
+
+    /**
+     * Returns all error messages with non default values.
+     *
+     * @return string A string representation of the error messages
+     */
+    protected function getMessagesWithoutDefaults()
+    {
+        $messages = $this->messages;
+
+        // remove default option values
+        foreach ($this->getDefaultMessages() as $key => $value) {
+            if (array_key_exists($key, $messages) && $messages[$key] === $value) {
+                unset($messages[$key]);
+            }
+        }
+
+        return $messages;
+    }
+
+    /**
+     * Returns all options with non default values.
+     *
+     * @return string A string representation of the options
+     */
+    protected function getOptionsWithoutDefaults()
+    {
+        $options = $this->options;
+
+        // remove default option values
+        foreach ($this->getDefaultOptions() as $key => $value) {
+            if (array_key_exists($key, $options) && $options[$key] === $value) {
+                unset($options[$key]);
+            }
+        }
+
+        return $options;
+    }
 }
diff --git a/lib/validator/sfValidatorBoolean.class.php b/lib/validator/sfValidatorBoolean.class.php
index b7d92b667..98abfc434 100755
--- a/lib/validator/sfValidatorBoolean.class.php
+++ b/lib/validator/sfValidatorBoolean.class.php
@@ -11,51 +11,50 @@
 /**
  * sfValidatorBoolean validates a boolean. It also converts the input value to a valid boolean.
  *
- * @package    symfony
- * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfValidatorBoolean extends sfValidatorBase
 {
-  /**
-   * Configures the current validator.
-   *
-   * Available options:
-   *
-   *  * true_values:  The list of true values
-   *  * false_values: The list of false values
-   *
-   * @param array $options    An array of options
-   * @param array $messages   An array of error messages
-   *
-   * @see sfValidatorBase
-   */
-  protected function configure($options = array(), $messages = array())
-  {
-    $this->addOption('true_values', array('true', 't', 'yes', 'y', 'on', '1'));
-    $this->addOption('false_values', array('false', 'f', 'no', 'n', 'off', '0'));
-
-    $this->setOption('required', false);
-    $this->setOption('empty_value', false);
-  }
-
-  /**
-   * @see sfValidatorBase
-   */
-  protected function doClean($value)
-  {
-    $checkValue = $value === 0 ? '0' : $value;
-    if (in_array($checkValue, $this->getOption('true_values')))
+    /**
+     * Configures the current validator.
+     *
+     * Available options:
+     *
+     *  * true_values:  The list of true values
+     *  * false_values: The list of false values
+     *
+     * @param array $options  An array of options
+     * @param array $messages An array of error messages
+     *
+     * @see sfValidatorBase
+     */
+    protected function configure($options = array(), $messages = array())
     {
-      return true;
+        $this->addOption('true_values', array('true', 't', 'yes', 'y', 'on', '1'));
+        $this->addOption('false_values', array('false', 'f', 'no', 'n', 'off', '0'));
+
+        $this->setOption('required', false);
+        $this->setOption('empty_value', false);
     }
 
-    if (in_array($checkValue, $this->getOption('false_values')))
+    /**
+     * @see sfValidatorBase
+     *
+     * @param mixed $value
+     */
+    protected function doClean($value)
     {
-      return false;
-    }
+        $checkValue = 0 === $value ? '0' : $value;
+        if (in_array($checkValue, $this->getOption('true_values'))) {
+            return true;
+        }
+
+        if (in_array($checkValue, $this->getOption('false_values'))) {
+            return false;
+        }
 
-    throw new sfValidatorError($this, 'invalid', array('value' => $value));
-  }
+        throw new sfValidatorError($this, 'invalid', array('value' => $value));
+    }
 }
diff --git a/lib/validator/sfValidatorCSRFToken.class.php b/lib/validator/sfValidatorCSRFToken.class.php
index 51d893e70..4e1c09d18 100644
--- a/lib/validator/sfValidatorCSRFToken.class.php
+++ b/lib/validator/sfValidatorCSRFToken.class.php
@@ -11,35 +11,38 @@
 /**
  * sfValidatorCSRFToken checks that the token is valid.
  *
- * @package    symfony
- * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfValidatorCSRFToken extends sfValidatorBase
 {
-  /**
-   * @see sfValidatorBase
-   */
-  protected function configure($options = array(), $messages = array())
-  {
-    $this->addRequiredOption('token');
+    /**
+     * @see sfValidatorBase
+     *
+     * @param mixed $options
+     * @param mixed $messages
+     */
+    protected function configure($options = array(), $messages = array())
+    {
+        $this->addRequiredOption('token');
 
-    $this->setOption('required', true);
+        $this->setOption('required', true);
 
-    $this->addMessage('csrf_attack', 'CSRF attack detected.');
-  }
+        $this->addMessage('csrf_attack', 'CSRF attack detected.');
+    }
 
-  /**
-   * @see sfValidatorBase
-   */
-  protected function doClean($value)
-  {
-    if ($value != $this->getOption('token'))
+    /**
+     * @see sfValidatorBase
+     *
+     * @param mixed $value
+     */
+    protected function doClean($value)
     {
-      throw new sfValidatorError($this, 'csrf_attack');
-    }
+        if ($value != $this->getOption('token')) {
+            throw new sfValidatorError($this, 'csrf_attack');
+        }
 
-    return $value;
-  }
+        return $value;
+    }
 }
diff --git a/lib/validator/sfValidatorCallback.class.php b/lib/validator/sfValidatorCallback.class.php
index ec631d9ef..94a2562ce 100644
--- a/lib/validator/sfValidatorCallback.class.php
+++ b/lib/validator/sfValidatorCallback.class.php
@@ -11,39 +11,40 @@
 /**
  * sfValidatorCallback validates an input value if the given callback does not throw a sfValidatorError.
  *
- * @package    symfony
- * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfValidatorCallback extends sfValidatorBase
 {
-  /**
-   * Configures the current validator.
-   *
-   * Available options:
-   *
-   *  * callback:  A valid PHP callback (required)
-   *  * arguments: An array of arguments to pass to the callback
-   *
-   * @param array $options    An array of options
-   * @param array $messages   An array of error messages
-   *
-   * @see sfValidatorBase
-   */
-  protected function configure($options = array(), $messages = array())
-  {
-    $this->addRequiredOption('callback');
-    $this->addOption('arguments', array());
+    /**
+     * Configures the current validator.
+     *
+     * Available options:
+     *
+     *  * callback:  A valid PHP callback (required)
+     *  * arguments: An array of arguments to pass to the callback
+     *
+     * @param array $options  An array of options
+     * @param array $messages An array of error messages
+     *
+     * @see sfValidatorBase
+     */
+    protected function configure($options = array(), $messages = array())
+    {
+        $this->addRequiredOption('callback');
+        $this->addOption('arguments', array());
 
-    $this->setOption('required', false);
-  }
+        $this->setOption('required', false);
+    }
 
-  /**
-   * @see sfValidatorBase
-   */
-  protected function doClean($value)
-  {
-    return call_user_func($this->getOption('callback'), $this, $value, $this->getOption('arguments'));
-  }
+    /**
+     * @see sfValidatorBase
+     *
+     * @param mixed $value
+     */
+    protected function doClean($value)
+    {
+        return call_user_func($this->getOption('callback'), $this, $value, $this->getOption('arguments'));
+    }
 }
diff --git a/lib/validator/sfValidatorChoice.class.php b/lib/validator/sfValidatorChoice.class.php
index 6280c258f..d092816af 100644
--- a/lib/validator/sfValidatorChoice.class.php
+++ b/lib/validator/sfValidatorChoice.class.php
@@ -11,165 +11,151 @@
 /**
  * sfValidatorChoice validates than the value is one of the expected values.
  *
- * @package    symfony
- * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfValidatorChoice extends sfValidatorBase
 {
-  /**
-   * Configures the current validator.
-   *
-   * Available options:
-   *
-   *  * choices:  An array of expected values (required)
-   *  * multiple: true if the select tag must allow multiple selections
-   *  * 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)
-   *
-   * @param array $options    An array of options
-   * @param array $messages   An array of error messages
-   *
-   * @see sfValidatorBase
-   */
-  protected function configure($options = array(), $messages = array())
-  {
-    $this->addRequiredOption('choices');
-    $this->addOption('multiple', false);
-    $this->addOption('min');
-    $this->addOption('max');
-
-    $this->addMessage('min', 'At least %min% values must be selected (%count% values selected).');
-    $this->addMessage('max', 'At most %max% values must be selected (%count% values selected).');
-  }
-
-  /**
-   * @see sfValidatorBase
-   */
-  protected function doClean($value)
-  {
-    $choices = $this->getChoices();
-
-    if ($this->getOption('multiple'))
-    {
-      $value = $this->cleanMultiple($value, $choices);
-    }
-    else
+    /**
+     * Get choices.
+     *
+     * @return array
+     */
+    public function getChoices()
     {
-      if (!self::inChoices($value, $choices))
-      {
-        throw new sfValidatorError($this, 'invalid', array('value' => $value));
-      }
+        $choices = $this->getOption('choices');
+        if ($choices instanceof sfCallable) {
+            $choices = $choices->call();
+        }
+
+        return $choices;
     }
 
-    return $value;
-  }
-
-  /**
-   * Get choices
-   *
-   * @return array
-   */
-  public function getChoices()
-  {
-    $choices = $this->getOption('choices');
-    if ($choices instanceof sfCallable)
+    /**
+     * Configures the current validator.
+     *
+     * Available options:
+     *
+     *  * choices:  An array of expected values (required)
+     *  * multiple: true if the select tag must allow multiple selections
+     *  * 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)
+     *
+     * @param array $options  An array of options
+     * @param array $messages An array of error messages
+     *
+     * @see sfValidatorBase
+     */
+    protected function configure($options = array(), $messages = array())
     {
-      $choices = $choices->call();
+        $this->addRequiredOption('choices');
+        $this->addOption('multiple', false);
+        $this->addOption('min');
+        $this->addOption('max');
+
+        $this->addMessage('min', 'At least %min% values must be selected (%count% values selected).');
+        $this->addMessage('max', 'At most %max% values must be selected (%count% values selected).');
     }
 
-    return $choices;
-  }
-
-  /**
-   * Cleans a value when multiple is true.
-   *
-   * @param  mixed $value The submitted value
-   *
-   * @return array The cleaned value
-   */
-  protected function cleanMultiple($value, $choices)
-  {
-    if (!is_array($value))
+    /**
+     * @see sfValidatorBase
+     *
+     * @param mixed $value
+     */
+    protected function doClean($value)
     {
-      $value = array($value);
+        $choices = $this->getChoices();
+
+        if ($this->getOption('multiple')) {
+            $value = $this->cleanMultiple($value, $choices);
+        } else {
+            if (!self::inChoices($value, $choices)) {
+                throw new sfValidatorError($this, 'invalid', array('value' => $value));
+            }
+        }
+
+        return $value;
     }
 
-    foreach ($value as $v)
+    /**
+     * Cleans a value when multiple is true.
+     *
+     * @param mixed $value   The submitted value
+     * @param mixed $choices
+     *
+     * @return array The cleaned value
+     */
+    protected function cleanMultiple($value, $choices)
     {
-      if (!self::inChoices($v, $choices))
-      {
-        throw new sfValidatorError($this, 'invalid', array('value' => $v));
-      }
-    }
+        if (!is_array($value)) {
+            $value = array($value);
+        }
 
-    $count = count($value);
+        foreach ($value as $v) {
+            if (!self::inChoices($v, $choices)) {
+                throw new sfValidatorError($this, 'invalid', array('value' => $v));
+            }
+        }
 
-    if ($this->hasOption('min') && $count < $this->getOption('min'))
-    {
-      throw new sfValidatorError($this, 'min', array('count' => $count, 'min' => $this->getOption('min')));
-    }
+        $count = count($value);
 
-    if ($this->hasOption('max') && $count > $this->getOption('max'))
-    {
-      throw new sfValidatorError($this, 'max', array('count' => $count, 'max' => $this->getOption('max')));
-    }
+        if ($this->hasOption('min') && $count < $this->getOption('min')) {
+            throw new sfValidatorError($this, 'min', array('count' => $count, 'min' => $this->getOption('min')));
+        }
 
-    return $value;
-  }
-
-  /**
-   * Returns true if the value is empty.
-   *
-   * @param  mixed $value  The input value
-   *
-   * @return bool true if the value is empty, false otherwise
-   */
-  protected function isEmpty($value)
-  {
-    if (parent::isEmpty($value))
-    {
-      return true;
+        if ($this->hasOption('max') && $count > $this->getOption('max')) {
+            throw new sfValidatorError($this, 'max', array('count' => $count, 'max' => $this->getOption('max')));
+        }
+
+        return $value;
     }
 
-    if (is_array($value))
+    /**
+     * Returns true if the value is empty.
+     *
+     * @param mixed $value The input value
+     *
+     * @return bool true if the value is empty, false otherwise
+     */
+    protected function isEmpty($value)
     {
-      $isEmpty = true;
-      foreach ($value as $v)
-      {
-        if (!parent::isEmpty($v))
-        {
-          $isEmpty = false;
-
-          break;
+        if (parent::isEmpty($value)) {
+            return true;
         }
-      }
 
-      return $isEmpty;
+        if (is_array($value)) {
+            $isEmpty = true;
+            foreach ($value as $v) {
+                if (!parent::isEmpty($v)) {
+                    $isEmpty = false;
+
+                    break;
+                }
+            }
+
+            return $isEmpty;
+        }
+
+        return false;
     }
 
-    return false;
-  }
-
-  /**
-   * Checks if a value is part of given choices (see bug #4212)
-   *
-   * @param  mixed $value   The value to check
-   * @param  array $choices The array of available choices
-   *
-   * @return Boolean
-   */
-  static protected function inChoices($value, array $choices = array())
-  {
-    foreach ($choices as $choice)
+    /**
+     * Checks if a value is part of given choices (see bug #4212).
+     *
+     * @param mixed $value   The value to check
+     * @param array $choices The array of available choices
+     *
+     * @return bool
+     */
+    protected static function inChoices($value, array $choices = array())
     {
-      if ((string) $choice == (string) $value)
-      {
-        return true;
-      }
-    }
+        foreach ($choices as $choice) {
+            if ((string) $choice == (string) $value) {
+                return true;
+            }
+        }
 
-    return false;
-  }
+        return false;
+    }
 }
diff --git a/lib/validator/sfValidatorDate.class.php b/lib/validator/sfValidatorDate.class.php
index 1b03cb6f8..a8d5f2902 100644
--- a/lib/validator/sfValidatorDate.class.php
+++ b/lib/validator/sfValidatorDate.class.php
@@ -11,251 +11,226 @@
 /**
  * sfValidatorDate validates a date. It also converts the input value to a valid date.
  *
- * @package    symfony
- * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfValidatorDate extends sfValidatorBase
 {
-  /**
-   * Configures the current validator.
-   *
-   * Available options:
-   *
-   *  * date_format:             A regular expression that dates must match
-   *                             Note that the regular expression must use named subpatterns like (?P<year>)
-   *                             Working example: ~(?P<day>\d{2})/(?P<month>\d{2})/(?P<year>\d{4})~
-   *  * with_time:               true if the validator must return a time, false otherwise
-   *  * date_output:             The format to use when returning a date (default to Y-m-d)
-   *  * datetime_output:         The format to use when returning a date with time (default to Y-m-d H:i:s)
-   *  * date_format_error:       The date format to use when displaying an error for a bad_format error (use date_format if not provided)
-   *  * max:                     The maximum date allowed (as a timestamp or accecpted date() format)
-   *  * min:                     The minimum date allowed (as a timestamp or accecpted date() format)
-   *  * date_format_range_error: The date format to use when displaying an error for min/max (default to d/m/Y H:i:s)
-   *
-   * Available error codes:
-   *
-   *  * bad_format
-   *  * min
-   *  * max
-   *
-   * @param array $options    An array of options
-   * @param array $messages   An array of error messages
-   *
-   * @see sfValidatorBase
-   */
-  protected function configure($options = array(), $messages = array())
-  {
-    $this->addMessage('bad_format', '"%value%" does not match the date format (%date_format%).');
-    $this->addMessage('max', 'The date must be before %max%.');
-    $this->addMessage('min', 'The date must be after %min%.');
-
-    $this->addOption('date_format', null);
-    $this->addOption('with_time', false);
-    $this->addOption('date_output', 'Y-m-d');
-    $this->addOption('datetime_output', 'Y-m-d H:i:s');
-    $this->addOption('date_format_error');
-    $this->addOption('min', null);
-    $this->addOption('max', null);
-    $this->addOption('date_format_range_error', 'd/m/Y H:i:s');
-  }
-
-  /**
-   * @see sfValidatorBase
-   */
-  protected function doClean($value)
-  {
-    // check date format
-    if (is_string($value) && $regex = $this->getOption('date_format'))
+    /**
+     * Configures the current validator.
+     *
+     * Available options:
+     *
+     *  * date_format:             A regular expression that dates must match
+     *                             Note that the regular expression must use named subpatterns like (?P<year>)
+     *                             Working example: ~(?P<day>\d{2})/(?P<month>\d{2})/(?P<year>\d{4})~
+     *  * with_time:               true if the validator must return a time, false otherwise
+     *  * date_output:             The format to use when returning a date (default to Y-m-d)
+     *  * datetime_output:         The format to use when returning a date with time (default to Y-m-d H:i:s)
+     *  * date_format_error:       The date format to use when displaying an error for a bad_format error (use date_format if not provided)
+     *  * max:                     The maximum date allowed (as a timestamp or accecpted date() format)
+     *  * min:                     The minimum date allowed (as a timestamp or accecpted date() format)
+     *  * date_format_range_error: The date format to use when displaying an error for min/max (default to d/m/Y H:i:s)
+     *
+     * Available error codes:
+     *
+     *  * bad_format
+     *  * min
+     *  * max
+     *
+     * @param array $options  An array of options
+     * @param array $messages An array of error messages
+     *
+     * @see sfValidatorBase
+     */
+    protected function configure($options = array(), $messages = array())
     {
-      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')));
-      }
-
-      $value = $match;
+        $this->addMessage('bad_format', '"%value%" does not match the date format (%date_format%).');
+        $this->addMessage('max', 'The date must be before %max%.');
+        $this->addMessage('min', 'The date must be after %min%.');
+
+        $this->addOption('date_format', null);
+        $this->addOption('with_time', false);
+        $this->addOption('date_output', 'Y-m-d');
+        $this->addOption('datetime_output', 'Y-m-d H:i:s');
+        $this->addOption('date_format_error');
+        $this->addOption('min', null);
+        $this->addOption('max', null);
+        $this->addOption('date_format_range_error', 'd/m/Y H:i:s');
     }
 
-    // convert array to date string
-    if (is_array($value))
-    {
-      $value = $this->convertDateArrayToString($value);
-    }
-
-    // convert timestamp to date number format
-    if (is_numeric($value))
-    {
-      $cleanTime = (integer) $value;
-      $clean     = date('YmdHis', $cleanTime);
-    }
-    // convert string to date number format
-    else
+    /**
+     * @see sfValidatorBase
+     *
+     * @param mixed $value
+     */
+    protected function doClean($value)
     {
-      try
-      {
-        $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));
-      }
+        // 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')));
+            }
+
+            $value = $match;
+        }
+
+        // convert array to date string
+        if (is_array($value)) {
+            $value = $this->convertDateArrayToString($value);
+        }
+
+        // convert timestamp to date number format
+        if (is_numeric($value)) {
+            $cleanTime = (int) $value;
+            $clean = date('YmdHis', $cleanTime);
+        }
+        // convert string to date number format
+        else {
+            try {
+                $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));
+            }
+        }
+
+        // check max
+        if ($max = $this->getOption('max')) {
+            // convert timestamp to date number format
+            if (is_numeric($max)) {
+                $maxError = date($this->getOption('date_format_range_error'), $max);
+                $max = date('YmdHis', $max);
+            }
+            // convert string to date number
+            else {
+                $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));
+            }
+        }
+
+        // check min
+        if ($min = $this->getOption('min')) {
+            // convert timestamp to date number
+            if (is_numeric($min)) {
+                $minError = date($this->getOption('date_format_range_error'), $min);
+                $min = date('YmdHis', $min);
+            }
+            // convert string to date number
+            else {
+                $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));
+            }
+        }
+
+        if ($clean === $this->getEmptyValue()) {
+            return $cleanTime;
+        }
+
+        $format = $this->getOption('with_time') ? $this->getOption('datetime_output') : $this->getOption('date_output');
+
+        return isset($date) ? $date->format($format) : date($format, $cleanTime);
     }
 
-    // check max
-    if ($max = $this->getOption('max'))
+    /**
+     * Converts an array representing a date to a timestamp.
+     *
+     * The array can contains the following keys: year, month, day, hour, minute, second
+     *
+     * @param array $value An array of date elements
+     *
+     * @return int A timestamp
+     */
+    protected function convertDateArrayToString($value)
     {
-      // convert timestamp to date number format
-      if (is_numeric($max))
-      {
-        $maxError = date($this->getOption('date_format_range_error'), $max);
-        $max      = date('YmdHis', $max);
-      }
-      // convert string to date number
-      else
-      {
-        $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));
-      }
+        // all elements must be empty or a number
+        foreach (array('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));
+            }
+        }
+
+        // if one date value is empty, all others must be empty too
+        $empties =
+          (!isset($value['year']) || !$value['year'] ? 1 : 0) +
+          (!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));
+        }
+        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));
+        }
+
+        if ($this->getOption('with_time')) {
+            // if second is set, minute and hour must be set
+            // if minute is set, hour must be set
+            if (
+                $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));
+            }
+
+            $clean = sprintf(
+                '%04d-%02d-%02d %02d:%02d:%02d',
+                (int) $value['year'],
+                (int) $value['month'],
+                (int) $value['day'],
+                isset($value['hour']) ? (int) $value['hour'] : 0,
+                isset($value['minute']) ? (int) $value['minute'] : 0,
+                isset($value['second']) ? (int) $value['second'] : 0
+            );
+        } else {
+            $clean = sprintf(
+                '%04d-%02d-%02d %02d:%02d:%02d',
+                (int) $value['year'],
+                (int) $value['month'],
+                (int) $value['day'],
+                0,
+                0,
+                0
+            );
+        }
+
+        return $clean;
     }
 
-    // check min
-    if ($min = $this->getOption('min'))
+    protected function isValueSet($values, $key)
     {
-      // convert timestamp to date number
-      if (is_numeric($min))
-      {
-        $minError = date($this->getOption('date_format_range_error'), $min);
-        $min      = date('YmdHis', $min);
-      }
-      // convert string to date number
-      else
-      {
-        $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));
-      }
+        return isset($values[$key]) && !in_array($values[$key], array(null, ''), true);
     }
 
-    if ($clean === $this->getEmptyValue())
+    /**
+     * @see sfValidatorBase
+     *
+     * @param mixed $value
+     */
+    protected function isEmpty($value)
     {
-      return $cleanTime;
-    }
+        if (is_array($value)) {
+            $filtered = array_filter($value);
 
-    $format = $this->getOption('with_time') ? $this->getOption('datetime_output') : $this->getOption('date_output');
+            return empty($filtered);
+        }
 
-    return isset($date) ? $date->format($format) : date($format, $cleanTime);
-  }
-
-  /**
-   * Converts an array representing a date to a timestamp.
-   *
-   * The array can contains the following keys: year, month, day, hour, minute, second
-   *
-   * @param  array $value  An array of date elements
-   *
-   * @return int A timestamp
-   */
-  protected function convertDateArrayToString($value)
-  {
-    // all elements must be empty or a number
-    foreach (array('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));
-      }
+        return parent::isEmpty($value);
     }
-
-    // if one date value is empty, all others must be empty too
-    $empties =
-      (!isset($value['year']) || !$value['year'] ? 1 : 0) +
-      (!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));
-    }
-    else 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));
-    }
-
-    if ($this->getOption('with_time'))
-    {
-      // if second is set, minute and hour must be set
-      // if minute is set, hour must be set
-      if (
-        $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));
-      }
-
-      $clean = sprintf(
-        "%04d-%02d-%02d %02d:%02d:%02d",
-        (int) $value['year'],
-        (int) $value['month'],
-        (int) $value['day'],
-        isset($value['hour']) ? (int) $value['hour'] : 0,
-        isset($value['minute']) ? (int) $value['minute'] : 0,
-        isset($value['second']) ? (int) $value['second'] : 0
-      );
-    }
-    else
-    {
-      $clean = sprintf(
-        "%04d-%02d-%02d %02d:%02d:%02d",
-        (int) $value['year'],
-        (int) $value['month'],
-        (int) $value['day'],
-        0,
-        0,
-        0
-      );
-    }
-
-    return $clean;
-  }
-
-  protected function isValueSet($values, $key)
-  {
-    return isset($values[$key]) && !in_array($values[$key], array(null, ''), true);
-  }
-
-  /**
-   * @see sfValidatorBase
-   */
-  protected function isEmpty($value)
-  {
-    if (is_array($value))
-    {
-      $filtered = array_filter($value);
-
-      return empty($filtered);
-    }
-
-    return parent::isEmpty($value);
-  }
 }
diff --git a/lib/validator/sfValidatorDateRange.class.php b/lib/validator/sfValidatorDateRange.class.php
index 3758c0127..b16c6ab49 100644
--- a/lib/validator/sfValidatorDateRange.class.php
+++ b/lib/validator/sfValidatorDateRange.class.php
@@ -11,55 +11,55 @@
 /**
  * sfValidatorDateRange validates a range of date. It also converts the input values to valid dates.
  *
- * @package    symfony
- * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfValidatorDateRange extends sfValidatorBase
 {
-  /**
-   * Configures the current validator.
-   *
-   * Available options:
-   *
-   *  * from_date:   The from date validator (required)
-   *  * to_date:     The to date validator (required)
-   *  * from_field:  The name of the "from" date field (optional, default: from)
-   *  * to_field:    The name of the "to" date field (optional, default: to)
-   *
-   * @param array $options    An array of options
-   * @param array $messages   An array of error messages
-   *
-   * @see sfValidatorBase
-   */
-  protected function configure($options = array(), $messages = array())
-  {
-    $this->setMessage('invalid', 'The begin date must be before the end date.');
+    /**
+     * Configures the current validator.
+     *
+     * Available options:
+     *
+     *  * from_date:   The from date validator (required)
+     *  * to_date:     The to date validator (required)
+     *  * from_field:  The name of the "from" date field (optional, default: from)
+     *  * to_field:    The name of the "to" date field (optional, default: to)
+     *
+     * @param array $options  An array of options
+     * @param array $messages An array of error messages
+     *
+     * @see sfValidatorBase
+     */
+    protected function configure($options = array(), $messages = array())
+    {
+        $this->setMessage('invalid', 'The begin date must be before the end date.');
 
-    $this->addRequiredOption('from_date');
-    $this->addRequiredOption('to_date');
-    $this->addOption('from_field', 'from');
-    $this->addOption('to_field', 'to');
-  }
+        $this->addRequiredOption('from_date');
+        $this->addRequiredOption('to_date');
+        $this->addOption('from_field', 'from');
+        $this->addOption('to_field', 'to');
+    }
 
-  /**
-   * @see sfValidatorBase
-   */
-  protected function doClean($value)
-  {
-    $fromField = $this->getOption('from_field');
-    $toField   = $this->getOption('to_field');
+    /**
+     * @see sfValidatorBase
+     *
+     * @param mixed $value
+     */
+    protected function doClean($value)
+    {
+        $fromField = $this->getOption('from_field');
+        $toField = $this->getOption('to_field');
 
-    $value[$fromField] = $this->getOption('from_date')->clean(isset($value[$fromField]) ? $value[$fromField] : null);
-    $value[$toField]   = $this->getOption('to_date')->clean(isset($value[$toField]) ? $value[$toField] : null);
+        $value[$fromField] = $this->getOption('from_date')->clean(isset($value[$fromField]) ? $value[$fromField] : null);
+        $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->clean($value);
-    }
+        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->clean($value);
+        }
 
-    return $value;
-  }
+        return $value;
+    }
 }
diff --git a/lib/validator/sfValidatorDateTime.class.php b/lib/validator/sfValidatorDateTime.class.php
index 7d62ace48..493e4412e 100644
--- a/lib/validator/sfValidatorDateTime.class.php
+++ b/lib/validator/sfValidatorDateTime.class.php
@@ -11,20 +11,22 @@
 /**
  * sfValidatorDateTime validates a date and a time. It also converts the input value to a valid date.
  *
- * @package    symfony
- * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfValidatorDateTime extends sfValidatorDate
 {
-  /**
-   * @see sfValidatorDate
-   */
-  protected function configure($options = array(), $messages = array())
-  {
-    parent::configure($options, $messages);
+    /**
+     * @see sfValidatorDate
+     *
+     * @param mixed $options
+     * @param mixed $messages
+     */
+    protected function configure($options = array(), $messages = array())
+    {
+        parent::configure($options, $messages);
 
-    $this->setOption('with_time', true);
-  }
+        $this->setOption('with_time', true);
+    }
 }
diff --git a/lib/validator/sfValidatorDecorator.class.php b/lib/validator/sfValidatorDecorator.class.php
index d4ada141a..5136db45f 100644
--- a/lib/validator/sfValidatorDecorator.class.php
+++ b/lib/validator/sfValidatorDecorator.class.php
@@ -15,157 +15,177 @@
  *
  * The options and messages are proxied from the decorated validator.
  *
- * @package    symfony
- * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfValidatorDecorator extends sfValidatorBase
 {
-  protected
-    $validator = null;
+    protected $validator;
+
+    /**
+     * @see sfValidatorBase
+     *
+     * @param mixed $options
+     * @param mixed $messages
+     */
+    public function __construct($options = array(), $messages = array())
+    {
+        $this->validator = $this->getValidator();
+
+        if (!$this->validator instanceof sfValidatorBase) {
+            throw new RuntimeException('The getValidator() method must return a sfValidatorBase instance.');
+        }
+
+        foreach ($options as $key => $value) {
+            $this->validator->setOption($key, $value);
+        }
+
+        foreach ($messages as $key => $value) {
+            $this->validator->setMessage($key, $value);
+        }
+    }
+
+    /**
+     * @see sfValidatorBase
+     *
+     * @param mixed $value
+     */
+    public function clean($value)
+    {
+        return $this->doClean($value);
+    }
+
+    /**
+     * @see sfValidatorBase
+     *
+     * @param mixed $name
+     */
+    public function getMessage($name)
+    {
+        return $this->validator->getMessage($name);
+    }
+
+    /**
+     * @see sfValidatorBase
+     *
+     * @param mixed $name
+     * @param mixed $value
+     */
+    public function setMessage($name, $value)
+    {
+        $this->validator->setMessage($name, $value);
+    }
+
+    /**
+     * @see sfValidatorBase
+     */
+    public function getMessages()
+    {
+        return $this->validator->getMessages();
+    }
+
+    /**
+     * @see sfValidatorBase
+     *
+     * @param mixed $values
+     */
+    public function setMessages($values)
+    {
+        return $this->validator->setMessages($values);
+    }
+
+    /**
+     * @see sfValidatorBase
+     *
+     * @param mixed $name
+     */
+    public function getOption($name)
+    {
+        return $this->validator->getOption($name);
+    }
 
-  /**
-   * @see sfValidatorBase
-   */
-  public function __construct($options = array(), $messages = array())
-  {
-    $this->validator = $this->getValidator();
+    /**
+     * @see sfValidatorBase
+     *
+     * @param mixed $name
+     * @param mixed $value
+     */
+    public function setOption($name, $value)
+    {
+        $this->validator->setOption($name, $value);
+    }
+
+    /**
+     * @see sfValidatorBase
+     *
+     * @param mixed $name
+     */
+    public function hasOption($name)
+    {
+        return $this->validator->hasOption($name);
+    }
+
+    /**
+     * @see sfValidatorBase
+     */
+    public function getOptions()
+    {
+        return $this->validator->getOptions();
+    }
+
+    /**
+     * @see sfValidatorBase
+     *
+     * @param mixed $values
+     */
+    public function setOptions($values)
+    {
+        $this->validator->setOptions($values);
+    }
+
+    /**
+     * @see sfValidatorBase
+     *
+     * @param mixed $indent
+     */
+    public function asString($indent = 0)
+    {
+        return $this->validator->asString($indent);
+    }
 
-    if (!$this->validator instanceof sfValidatorBase)
+    /**
+     * @see sfValidatorBase
+     */
+    public function getDefaultOptions()
     {
-      throw new RuntimeException('The getValidator() method must return a sfValidatorBase instance.');
+        return $this->validator->getDefaultOptions();
     }
 
-    foreach ($options as $key => $value)
+    /**
+     * @see sfValidatorBase
+     */
+    public function getDefaultMessages()
     {
-      $this->validator->setOption($key, $value);
+        return $this->validator->getDefaultMessages();
     }
 
-    foreach ($messages as $key => $value)
+    /**
+     * Returns the decorated validator.
+     *
+     * Every subclass must implement this method.
+     *
+     * @return sfValidatorBase A sfValidatorBase instance
+     */
+    abstract protected function getValidator();
+
+    /**
+     * @see sfValidatorBase
+     *
+     * @param mixed $value
+     */
+    protected function doClean($value)
     {
-      $this->validator->setMessage($key, $value);
+        return $this->validator->clean($value);
     }
-  }
-
-  /**
-   * Returns the decorated validator.
-   *
-   * Every subclass must implement this method.
-   *
-   * @return sfValidatorBase A sfValidatorBase instance
-   */
-  abstract protected function getValidator();
-
-  /**
-   * @see sfValidatorBase
-   */
-  public function clean($value)
-  {
-    return $this->doClean($value);
-  }
-
-  /**
-   * @see sfValidatorBase
-   */
-  protected function doClean($value)
-  {
-    return $this->validator->clean($value);
-  }
-
-  /**
-   * @see sfValidatorBase
-   */
-  public function getMessage($name)
-  {
-    return $this->validator->getMessage($name);
-  }
-
-  /**
-   * @see sfValidatorBase
-   */
-  public function setMessage($name, $value)
-  {
-    $this->validator->setMessage($name, $value);
-  }
-
-  /**
-   * @see sfValidatorBase
-   */
-  public function getMessages()
-  {
-    return $this->validator->getMessages();
-  }
-
-  /**
-   * @see sfValidatorBase
-   */
-  public function setMessages($values)
-  {
-    return $this->validator->setMessages($values);
-  }
-
-  /**
-   * @see sfValidatorBase
-   */
-  public function getOption($name)
-  {
-    return $this->validator->getOption($name);
-  }
-
-  /**
-   * @see sfValidatorBase
-   */
-  public function setOption($name, $value)
-  {
-    $this->validator->setOption($name, $value);
-  }
-
-  /**
-   * @see sfValidatorBase
-   */
-  public function hasOption($name)
-  {
-    return $this->validator->hasOption($name);
-  }
-
-  /**
-   * @see sfValidatorBase
-   */
-  public function getOptions()
-  {
-    return $this->validator->getOptions();
-  }
-
-  /**
-   * @see sfValidatorBase
-   */
-  public function setOptions($values)
-  {
-    $this->validator->setOptions($values);
-  }
-
-  /**
-   * @see sfValidatorBase
-   */
-  public function asString($indent = 0)
-  {
-    return $this->validator->asString($indent);
-  }
-
-  /**
-   * @see sfValidatorBase
-   */
-  public function getDefaultOptions()
-  {
-    return $this->validator->getDefaultOptions();
-  }
-
-  /**
-   * @see sfValidatorBase
-   */
-  public function getDefaultMessages()
-  {
-    return $this->validator->getDefaultMessages();
-  }
 }
diff --git a/lib/validator/sfValidatorEmail.class.php b/lib/validator/sfValidatorEmail.class.php
index 6de05b581..a383edb20 100644
--- a/lib/validator/sfValidatorEmail.class.php
+++ b/lib/validator/sfValidatorEmail.class.php
@@ -11,22 +11,24 @@
 /**
  * sfValidatorEmail validates emails.
  *
- * @package    symfony
- * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfValidatorEmail extends sfValidatorRegex
 {
-  const REGEX_EMAIL = '/^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i';
+    public const REGEX_EMAIL = '/^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i';
 
-  /**
-   * @see sfValidatorRegex
-   */
-  protected function configure($options = array(), $messages = array())
-  {
-    parent::configure($options, $messages);
+    /**
+     * @see sfValidatorRegex
+     *
+     * @param mixed $options
+     * @param mixed $messages
+     */
+    protected function configure($options = array(), $messages = array())
+    {
+        parent::configure($options, $messages);
 
-    $this->setOption('pattern', self::REGEX_EMAIL);
-  }
+        $this->setOption('pattern', self::REGEX_EMAIL);
+    }
 }
diff --git a/lib/validator/sfValidatorEqual.class.php b/lib/validator/sfValidatorEqual.class.php
index ea82435ae..c6ad69272 100644
--- a/lib/validator/sfValidatorEqual.class.php
+++ b/lib/validator/sfValidatorEqual.class.php
@@ -11,55 +11,52 @@
 /**
  * sfValidatorEqual validates a value compared to another value.
  *
- * @package    symfony
- * @subpackage validator
  * @author     Yvann Boucher <yboucher@groupe-exp.com>
+ *
  * @version    SVN: $Id$
  */
 class sfValidatorEqual extends sfValidatorBase
 {
-  /**
-   * Configures the current validator.
-   *
-   * Available options:
-   *
-   *  * strict: If it's equal strictly or not
-   *  * value: The value to compare
-   *
-   * Available error codes:
-   *
-   *  * not_equal
-   *  * not_strictly_equal
-   *
-   * @param array $options   An array of options
-   * @param array $messages  An array of error messages
-   *
-   * @see sfValidatorBase
-   */
-  protected function configure($options = array(), $messages = array())
-  {
-    $this->addRequiredOption('value');
-    $this->addOption('strict', false);
-
-    $this->addMessage('not_equal', '%value% is not equal to %compared_value%');
-    $this->addMessage('not_strictly_equal', '%value% is not strictly equal to %compared_value%');
-  }
+    /**
+     * Configures the current validator.
+     *
+     * Available options:
+     *
+     *  * strict: If it's equal strictly or not
+     *  * value: The value to compare
+     *
+     * Available error codes:
+     *
+     *  * not_equal
+     *  * not_strictly_equal
+     *
+     * @param array $options  An array of options
+     * @param array $messages An array of error messages
+     *
+     * @see sfValidatorBase
+     */
+    protected function configure($options = array(), $messages = array())
+    {
+        $this->addRequiredOption('value');
+        $this->addOption('strict', false);
 
-  /**
-   * @see sfValidatorBase
-   */
-  protected function doClean($value)
-  {
-    $isStrict = $this->getOption('strict');
+        $this->addMessage('not_equal', '%value% is not equal to %compared_value%');
+        $this->addMessage('not_strictly_equal', '%value% is not strictly equal to %compared_value%');
+    }
 
-    if (($isStrict && $value !== $this->getOption('value')) || (!$isStrict && $value != $this->getOption('value')))
+    /**
+     * @see sfValidatorBase
+     *
+     * @param mixed $value
+     */
+    protected function doClean($value)
     {
-      throw new sfValidatorError($this, $isStrict ? 'not_strictly_equal' : 'not_equal', array(
-        'value'          => $value,
-        'compared_value' => $this->getOption('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')));
+        }
 
-    return $value;
-  }
+        return $value;
+    }
 }
diff --git a/lib/validator/sfValidatorError.class.php b/lib/validator/sfValidatorError.class.php
index fc4fc6c33..71d338f6c 100644
--- a/lib/validator/sfValidatorError.class.php
+++ b/lib/validator/sfValidatorError.class.php
@@ -11,169 +11,161 @@
 /**
  * sfValidatorError represents a validation error.
  *
- * @package    symfony
- * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfValidatorError extends Exception implements Serializable
 {
-  protected
-    $validator = null,
-    $arguments = array();
-
-  /**
-   * 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
-   */
-  public function __construct(sfValidatorBase $validator, $code, $arguments = array())
-  {
-    $this->validator = $validator;
-    $this->arguments = $arguments;
-
-    // override default exception message and code
-    $this->code = $code;
-
-    if (!$messageFormat = $this->getMessageFormat())
+    protected $validator;
+    protected $arguments = array();
+
+    /**
+     * 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
+     */
+    public function __construct(sfValidatorBase $validator, $code, $arguments = array())
+    {
+        $this->validator = $validator;
+        $this->arguments = $arguments;
+
+        // override default exception message and code
+        $this->code = $code;
+
+        if (!$messageFormat = $this->getMessageFormat()) {
+            $messageFormat = $code;
+        }
+        $this->message = strtr($messageFormat, $this->getArguments());
+    }
+
+    /**
+     * Returns the string representation of the error.
+     *
+     * @return string The error message
+     */
+    public function __toString()
+    {
+        return $this->getMessage();
+    }
+
+    /**
+     * Serializes the current instance for php 7.4+.
+     *
+     * @return array
+     */
+    public function __serialize()
+    {
+        return array($this->validator, $this->arguments, $this->code, $this->message);
+    }
+
+    /**
+     * Unserializes a sfValidatorError instance for php 7.4+.
+     *
+     * @param string $serialized A serialized sfValidatorError instance
+     * @param mixed  $data
+     */
+    public function __unserialize($data)
     {
-      $messageFormat = $code;
+        list($this->validator, $this->arguments, $this->code, $this->message) = $data;
     }
-    $this->message = strtr($messageFormat, $this->getArguments());
-  }
-
-  /**
-   * Returns the string representation of the error.
-   *
-   * @return string The error message
-   */
-  public function __toString()
-  {
-    return $this->getMessage();
-  }
-
-  /**
-   * Returns the input value that triggered this error.
-   *
-   * @return mixed The input value
-   */
-  public function getValue()
-  {
-    return isset($this->arguments['value']) ? $this->arguments['value'] : null;
-  }
-
-  /**
-   * Returns the validator that triggered this error.
-   *
-   * @return sfValidatorBase A sfValidatorBase instance
-   */
-  public function getValidator()
-  {
-    return $this->validator;
-  }
-
-  /**
-   * Returns the arguments needed to format the message.
-   *
-   * @param bool $raw  false to use it as arguments for the message format, true otherwise (default to false)
-   *
-   * @see getMessageFormat()
-   */
-  public function getArguments($raw = false)
-  {
-    if ($raw)
+
+    /**
+     * Returns the input value that triggered this error.
+     *
+     * @return mixed The input value
+     */
+    public function getValue()
+    {
+        return isset($this->arguments['value']) ? $this->arguments['value'] : null;
+    }
+
+    /**
+     * Returns the validator that triggered this error.
+     *
+     * @return sfValidatorBase A sfValidatorBase instance
+     */
+    public function getValidator()
+    {
+        return $this->validator;
+    }
+
+    /**
+     * Returns the arguments needed to format the message.
+     *
+     * @param bool $raw false to use it as arguments for the message format, true otherwise (default to false)
+     *
+     * @see getMessageFormat()
+     */
+    public function getArguments($raw = false)
     {
-      return $this->arguments;
+        if ($raw) {
+            return $this->arguments;
+        }
+
+        $arguments = array();
+        foreach ($this->arguments as $key => $value) {
+            if (is_array($value)) {
+                continue;
+            }
+
+            $arguments["%{$key}%"] = htmlspecialchars($value, ENT_QUOTES, sfValidatorBase::getCharset());
+        }
+
+        return $arguments;
     }
 
-    $arguments = array();
-    foreach ($this->arguments as $key => $value)
+    /**
+     * Returns the message format for this error.
+     *
+     * This is the string you need to use if you need to internationalize
+     * error messages:
+     *
+     * $i18n->__($error->getMessageFormat(), $error->getArguments());
+     *
+     * If no message format has been set in the validator, the exception standard
+     * message is returned.
+     *
+     * @return string The message format
+     */
+    public function getMessageFormat()
     {
-      if (is_array($value))
-      {
-        continue;
-      }
+        $messageFormat = $this->validator->getMessage($this->code);
+        if (!$messageFormat) {
+            $messageFormat = $this->getMessage();
+        }
 
-      $arguments["%$key%"] = htmlspecialchars($value, ENT_QUOTES, sfValidatorBase::getCharset());
+        return $messageFormat;
     }
 
-    return $arguments;
-  }
-
-  /**
-   * Returns the message format for this error.
-   *
-   * This is the string you need to use if you need to internationalize
-   * error messages:
-   *
-   * $i18n->__($error->getMessageFormat(), $error->getArguments());
-   *
-   * If no message format has been set in the validator, the exception standard
-   * message is returned.
-   *
-   * @return string The message format
-   */
-  public function getMessageFormat()
-  {
-    $messageFormat = $this->validator->getMessage($this->code);
-    if (!$messageFormat)
+    /**
+     * Serializes the current instance.
+     *
+     * We must implement the Serializable interface to overcome a problem with PDO
+     * used as a session handler.
+     *
+     * The default serialization process serializes the exception trace, and because
+     * the trace can contain a PDO instance which is not serializable, serializing won't
+     * work when using PDO.
+     *
+     * @return string The instance as a serialized string
+     */
+    public function serialize()
     {
-      $messageFormat = $this->getMessage();
+        return serialize($this->__serialize());
     }
 
-    return $messageFormat;
-  }
-
-  /**
-   * Serializes the current instance.
-   *
-   * We must implement the Serializable interface to overcome a problem with PDO
-   * used as a session handler.
-   *
-   * The default serialization process serializes the exception trace, and because
-   * the trace can contain a PDO instance which is not serializable, serializing won't
-   * work when using PDO.
-   *
-   * @return string The instance as a serialized string
-   */
-  public function serialize()
-  {
-    return serialize($this->__serialize());
-  }
-
-  /**
-   * Unserializes a sfValidatorError instance.
-   *
-   * @param string $serialized  A serialized sfValidatorError instance
-   *
-   */
-  public function unserialize($serialized)
-  {
-    $array = unserialize($serialized);
-
-    $this->__unserialize($array);
-  }
-
-  /**
-   * Serializes the current instance for php 7.4+
-   *
-   * @return array
-   */
-  public function __serialize()
-  {
-    return array($this->validator, $this->arguments, $this->code, $this->message);
-  }
-
-  /**
-   * Unserializes a sfValidatorError instance for php 7.4+
-   *
-   * @param string $serialized  A serialized sfValidatorError instance
-   */
-  public function __unserialize($data)
-  {
-    list($this->validator, $this->arguments, $this->code, $this->message) = $data;
-  }
+    /**
+     * Unserializes a sfValidatorError instance.
+     *
+     * @param string $serialized A serialized sfValidatorError instance
+     */
+    public function unserialize($serialized)
+    {
+        $array = unserialize($serialized);
 
+        $this->__unserialize($array);
+    }
 }
diff --git a/lib/validator/sfValidatorErrorSchema.class.php b/lib/validator/sfValidatorErrorSchema.class.php
index f0175d226..f56d9447f 100644
--- a/lib/validator/sfValidatorErrorSchema.class.php
+++ b/lib/validator/sfValidatorErrorSchema.class.php
@@ -11,322 +11,309 @@
 /**
  * sfValidatorErrorSchema represents a validation schema error.
  *
- * @package    symfony
- * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfValidatorErrorSchema extends sfValidatorError implements ArrayAccess, Iterator, Countable
 {
-  protected
-    $errors       = array(),
-    $globalErrors = array(),
-    $namedErrors  = array(),
-    $count        = 0;
-
-  /**
-   * Constructor.
-   *
-   * @param sfValidatorBase $validator  An sfValidatorBase instance
-   * @param array           $errors     An array of errors, depreciated
-   */
-  public function __construct(sfValidatorBase $validator, $errors = array())
-  {
-    $this->validator = $validator;
-    $this->arguments = array();
-
-    // override default exception message and code
-    $this->code    = '';
-    $this->message = '';
-
-    foreach ($errors as $name => $error)
+    protected $errors = array();
+    protected $globalErrors = array();
+    protected $namedErrors = array();
+    protected $count = 0;
+
+    /**
+     * Constructor.
+     *
+     * @param sfValidatorBase $validator An sfValidatorBase instance
+     * @param array           $errors    An array of errors, depreciated
+     */
+    public function __construct(sfValidatorBase $validator, $errors = array())
+    {
+        $this->validator = $validator;
+        $this->arguments = array();
+
+        // override default exception message and code
+        $this->code = '';
+        $this->message = '';
+
+        foreach ($errors as $name => $error) {
+            $this->addError($error, is_numeric($name) ? null : $name);
+        }
+    }
+
+    /**
+     * Adds an error.
+     *
+     * This method merges sfValidatorErrorSchema errors with the current instance.
+     *
+     * @param sfValidatorError $error An sfValidatorError instance
+     * @param string           $name  The error name
+     *
+     * @return sfValidatorErrorSchema The current error schema instance
+     */
+    public function addError(sfValidatorError $error, $name = null)
+    {
+        if (null === $name) {
+            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) {
+                $current = $this->namedErrors[$name];
+                $this->namedErrors[$name] = new sfValidatorErrorSchema($current->getValidator());
+                $this->namedErrors[$name]->addError($current);
+            }
+
+            $method = $error instanceof sfValidatorErrorSchema ? 'addErrors' : 'addError';
+            $this->namedErrors[$name]->{$method}($error);
+
+            $this->errors[$name] = $this->namedErrors[$name];
+        } else {
+            $this->namedErrors[$name] = $error;
+            $this->errors[$name] = $error;
+        }
+
+        $this->updateCode();
+        $this->updateMessage();
+
+        return $this;
+    }
+
+    /**
+     * Adds a collection of errors.
+     *
+     * @param sfValidatorErrorSchema $errorsAn sfValidatorErrorSchema instance
+     *
+     * @return sfValidatorErrorSchema The current error schema instance
+     */
+    public function addErrors(sfValidatorErrorSchema $errors)
+    {
+        foreach ($errors->getGlobalErrors() as $error) {
+            $this->addError($error);
+        }
+
+        foreach ($errors->getNamedErrors() as $name => $error) {
+            $this->addError($error, $name);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Gets an array of all errors.
+     *
+     * @return array An array of sfValidatorError instances
+     */
+    public function getErrors()
+    {
+        return $this->errors;
+    }
+
+    /**
+     * Gets an array of all named errors.
+     *
+     * @return sfValidatorError[] An array of sfValidatorError instances
+     */
+    public function getNamedErrors()
+    {
+        return $this->namedErrors;
+    }
+
+    /**
+     * Gets an array of all global errors.
+     *
+     * @return array An array of sfValidatorError instances
+     */
+    public function getGlobalErrors()
+    {
+        return $this->globalErrors;
+    }
+
+    /**
+     * @see sfValidatorError
+     */
+    public function getValue()
+    {
+        return null;
+    }
+
+    /**
+     * @see sfValidatorError
+     *
+     * @param mixed $raw
+     */
+    public function getArguments($raw = false)
+    {
+        return array();
+    }
+
+    /**
+     * @see sfValidatorError
+     */
+    public function getMessageFormat()
     {
-      $this->addError($error, is_numeric($name) ? null : $name);
+        return '';
     }
-  }
-
-  /**
-   * Adds an error.
-   *
-   * This method merges sfValidatorErrorSchema errors with the current instance.
-   *
-   * @param sfValidatorError $error  An sfValidatorError instance
-   * @param string           $name   The error name
-   *
-   * @return sfValidatorErrorSchema The current error schema instance
-   */
-  public function addError(sfValidatorError $error, $name = null)
-  {
-    if (null === $name)
+
+    /**
+     * Returns the number of errors (implements the Countable interface).
+     *
+     * @return int The number of array
+     */
+    #[\ReturnTypeWillChange]
+    public function count()
     {
-      if ($error instanceof sfValidatorErrorSchema)
-      {
-        $this->addErrors($error);
-      }
-      else
-      {
-        $this->globalErrors[] = $error;
-        $this->errors[] = $error;
-      }
+        return count($this->errors);
     }
-    else if (isset($this->namedErrors[$name]))
+
+    /**
+     * Reset the error array to the beginning (implements the Iterator interface).
+     */
+    #[\ReturnTypeWillChange]
+    public function rewind()
     {
-      if (!$this->namedErrors[$name] instanceof sfValidatorErrorSchema)
-      {
-        $current = $this->namedErrors[$name];
-        $this->namedErrors[$name] = new sfValidatorErrorSchema($current->getValidator());
-        $this->namedErrors[$name]->addError($current);
-      }
+        reset($this->errors);
+
+        $this->count = count($this->errors);
+    }
 
-      $method = $error instanceof sfValidatorErrorSchema ? 'addErrors' : 'addError';
-      $this->namedErrors[$name]->$method($error);
+    /**
+     * Get the key associated with the current error (implements the Iterator interface).
+     *
+     * @return string The key
+     */
+    #[\ReturnTypeWillChange]
+    public function key()
+    {
+        return key($this->errors);
+    }
 
-      $this->errors[$name] = $this->namedErrors[$name];
+    /**
+     * Returns the current error (implements the Iterator interface).
+     *
+     * @return mixed The escaped value
+     */
+    #[\ReturnTypeWillChange]
+    public function current()
+    {
+        return current($this->errors);
     }
-    else
+
+    /**
+     * Moves to the next error (implements the Iterator interface).
+     */
+    #[\ReturnTypeWillChange]
+    public function next()
+    {
+        next($this->errors);
+
+        --$this->count;
+    }
+
+    /**
+     * Returns true if the current error is valid (implements the Iterator interface).
+     *
+     * @return bool The validity of the current element; true if it is valid
+     */
+    #[\ReturnTypeWillChange]
+    public function valid()
+    {
+        return $this->count > 0;
+    }
+
+    /**
+     * Returns true if the error exists (implements the ArrayAccess interface).
+     *
+     * @param string $name The name of the error
+     *
+     * @return bool true if the error exists, false otherwise
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetExists($name)
     {
-      $this->namedErrors[$name] = $error;
-      $this->errors[$name] = $error;
+        return isset($this->errors[$name]);
     }
 
-    $this->updateCode();
-    $this->updateMessage();
-
-    return $this;
-  }
-
-  /**
-   * Adds a collection of errors.
-   *
-   * @param sfValidatorErrorSchema $errorsAn sfValidatorErrorSchema instance
-   *
-   * @return sfValidatorErrorSchema The current error schema instance
-   */
-  public function addErrors(sfValidatorErrorSchema $errors)
-  {
-    foreach ($errors->getGlobalErrors() as $error)
+    /**
+     * Returns the error associated with the name (implements the ArrayAccess interface).
+     *
+     * @param string $name The offset of the value to get
+     *
+     * @return sfValidatorError A sfValidatorError instance
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetGet($name)
     {
-      $this->addError($error);
+        return isset($this->errors[$name]) ? $this->errors[$name] : null;
     }
 
-    foreach ($errors->getNamedErrors() as $name => $error)
+    /**
+     * Throws an exception saying that values cannot be set (implements the ArrayAccess interface).
+     *
+     * @param string $offset (ignored)
+     * @param string $value  (ignored)
+     *
+     * @throws LogicException
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetSet($offset, $value)
     {
-      $this->addError($error, $name);
+        throw new LogicException('Unable update an error.');
     }
 
-    return $this;
-  }
-
-  /**
-   * Gets an array of all errors
-   *
-   * @return array An array of sfValidatorError instances
-   */
-  public function getErrors()
-  {
-    return $this->errors;
-  }
-
-  /**
-   * Gets an array of all named errors
-   *
-   * @return sfValidatorError[] An array of sfValidatorError instances
-   */
-  public function getNamedErrors()
-  {
-    return $this->namedErrors;
-  }
-
-  /**
-   * Gets an array of all global errors
-   *
-   * @return array An array of sfValidatorError instances
-   */
-  public function getGlobalErrors()
-  {
-    return $this->globalErrors;
-  }
-
-  /**
-   * @see sfValidatorError
-   */
-  public function getValue()
-  {
-    return null;
-  }
-
-  /**
-   * @see sfValidatorError
-   */
-  public function getArguments($raw = false)
-  {
-    return array();
-  }
-
-  /**
-   * @see sfValidatorError
-   */
-  public function getMessageFormat()
-  {
-    return '';
-  }
-
-  /**
-   * Returns the number of errors (implements the Countable interface).
-   *
-   * @return int The number of array
-   */
-  #[\ReturnTypeWillChange]
-  public function count()
-  {
-    return count($this->errors);
-  }
-
-  /**
-   * Reset the error array to the beginning (implements the Iterator interface).
-   */
-  #[\ReturnTypeWillChange]
-  public function rewind()
-  {
-    reset($this->errors);
-
-    $this->count = count($this->errors);
-  }
-
-  /**
-   * Get the key associated with the current error (implements the Iterator interface).
-   *
-   * @return string The key
-   */
-  #[\ReturnTypeWillChange]
-  public function key()
-  {
-    return key($this->errors);
-  }
-
-  /**
-   * Returns the current error (implements the Iterator interface).
-   *
-   * @return mixed The escaped value
-   */
-  #[\ReturnTypeWillChange]
-  public function current()
-  {
-    return current($this->errors);
-  }
-
-  /**
-   * Moves to the next error (implements the Iterator interface).
-   */
-  #[\ReturnTypeWillChange]
-  public function next()
-  {
-    next($this->errors);
-
-    --$this->count;
-  }
-
-  /**
-   * Returns true if the current error is valid (implements the Iterator interface).
-   *
-   * @return boolean The validity of the current element; true if it is valid
-   */
-  #[\ReturnTypeWillChange]
-  public function valid()
-  {
-    return $this->count > 0;
-  }
-
-  /**
-   * Returns true if the error exists (implements the ArrayAccess interface).
-   *
-   * @param  string $name  The name of the error
-   *
-   * @return bool true if the error exists, false otherwise
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetExists($name)
-  {
-    return isset($this->errors[$name]);
-  }
-
-  /**
-   * Returns the error associated with the name (implements the ArrayAccess interface).
-   *
-   * @param  string $name  The offset of the value to get
-   *
-   * @return sfValidatorError A sfValidatorError instance
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetGet($name)
-  {
-    return isset($this->errors[$name]) ? $this->errors[$name] : null;
-  }
-
-  /**
-   * Throws an exception saying that values cannot be set (implements the ArrayAccess interface).
-   *
-   * @param string $offset  (ignored)
-   * @param string $value   (ignored)
-   *
-   * @throws LogicException
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetSet($offset, $value)
-  {
-    throw new LogicException('Unable update an error.');
-  }
-
-  /**
-   * Impossible to call because this is an exception!
-   *
-   * @param string $offset  (ignored)
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetUnset($offset)
-  {
-  }
-
-  /**
-   * Updates the exception error code according to the current errors.
-   */
-  protected function updateCode()
-  {
-    $this->code = implode(' ', array_merge(
-      array_map(function($e) { /** @var $e sfValidatorError */ return $e->getCode(); }, $this->globalErrors),
-      array_map(function($n, $e) { /** @var $e sfValidatorError */ return $n.' ['.$e->getCode().']'; }, array_keys($this->namedErrors), array_values($this->namedErrors))
-    ));
-  }
-
-  /**
-   * Updates the exception error message according to the current errors.
-   */
-  protected function updateMessage()
-  {
-    $this->message = implode(' ', array_merge(
-      array_map(function($e) { /** @var $e sfValidatorError */ return $e->getMessage(); }, $this->globalErrors),
-      array_map(function($n, $e) { /** @var $e sfValidatorError */ return $n.' ['.$e->getMessage().']'; }, array_keys($this->namedErrors), array_values($this->namedErrors))
-    ));
-  }
-
-  /**
-   * Serializes the current instance.
-   *
-   * @return string The instance as a serialized string
-   */
-  public function serialize()
-  {
-    return serialize(array($this->validator, $this->arguments, $this->code, $this->message, $this->errors, $this->globalErrors, $this->namedErrors));
-  }
-
-  /**
-   * Unserializes a sfValidatorError instance.
-   *
-   * @param string $serialized  A serialized sfValidatorError instance
-   *
-   */
-  public function unserialize($serialized)
-  {
-    list($this->validator, $this->arguments, $this->code, $this->message, $this->errors, $this->globalErrors, $this->namedErrors) = unserialize($serialized);
-  }
+    /**
+     * Impossible to call because this is an exception!
+     *
+     * @param string $offset (ignored)
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetUnset($offset)
+    {
+    }
+
+    /**
+     * Serializes the current instance.
+     *
+     * @return string The instance as a serialized string
+     */
+    public function serialize()
+    {
+        return serialize(array($this->validator, $this->arguments, $this->code, $this->message, $this->errors, $this->globalErrors, $this->namedErrors));
+    }
+
+    /**
+     * Unserializes a sfValidatorError instance.
+     *
+     * @param string $serialized A serialized sfValidatorError instance
+     */
+    public function unserialize($serialized)
+    {
+        list($this->validator, $this->arguments, $this->code, $this->message, $this->errors, $this->globalErrors, $this->namedErrors) = unserialize($serialized);
+    }
+
+    /**
+     * Updates the exception error code according to the current errors.
+     */
+    protected function updateCode()
+    {
+        $this->code = implode(' ', array_merge(
+            array_map(function ($e) { /* @var $e sfValidatorError */ return $e->getCode(); }, $this->globalErrors),
+            array_map(function ($n, $e) { /* @var $e sfValidatorError */ return $n.' ['.$e->getCode().']'; }, array_keys($this->namedErrors), array_values($this->namedErrors))
+        ));
+    }
+
+    /**
+     * Updates the exception error message according to the current errors.
+     */
+    protected function updateMessage()
+    {
+        $this->message = implode(' ', array_merge(
+            array_map(function ($e) { /* @var $e sfValidatorError */ return $e->getMessage(); }, $this->globalErrors),
+            array_map(function ($n, $e) { /* @var $e sfValidatorError */ return $n.' ['.$e->getMessage().']'; }, array_keys($this->namedErrors), array_values($this->namedErrors))
+        ));
+    }
 }
diff --git a/lib/validator/sfValidatorFile.class.php b/lib/validator/sfValidatorFile.class.php
index 294dea8c0..e46cb07b2 100644
--- a/lib/validator/sfValidatorFile.class.php
+++ b/lib/validator/sfValidatorFile.class.php
@@ -11,328 +11,303 @@
 /**
  * sfValidatorFile validates an uploaded file.
  *
- * @package    symfony
- * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfValidatorFile extends sfValidatorBase
 {
-  /**
-   * Configures the current validator.
-   *
-   * Available options:
-   *
-   *  * max_size:             The maximum file size in bytes (cannot exceed upload_max_filesize in php.ini)
-   *  * mime_types:           Allowed mime types array or category (available categories: web_images)
-   *  * mime_type_guessers:   An array of mime type guesser PHP callables (must return the mime type or null)
-   *  * mime_categories:      An array of mime type categories (web_images is defined by default)
-   *  * path:                 The path where to save the file - as used by the sfValidatedFile class (optional)
-   *  * validated_file_class: Name of the class that manages the cleaned uploaded file (optional)
-   *
-   * There are 3 built-in mime type guessers:
-   *
-   *  * guessFromFileinfo:        Uses the finfo_open() function (from the Fileinfo PECL extension)
-   *  * guessFromMimeContentType: Uses the mime_content_type() function (deprecated)
-   *  * guessFromFileBinary:      Uses the file binary (only works on *nix system)
-   *
-   * Available error codes:
-   *
-   *  * max_size
-   *  * mime_types
-   *  * partial
-   *  * no_tmp_dir
-   *  * cant_write
-   *  * extension
-   *
-   * @param array $options   An array of options
-   * @param array $messages  An array of error messages
-   *
-   * @see sfValidatorBase
-   */
-  protected function configure($options = array(), $messages = array())
-  {
-    if (!ini_get('file_uploads'))
+    /**
+     * Configures the current validator.
+     *
+     * Available options:
+     *
+     *  * max_size:             The maximum file size in bytes (cannot exceed upload_max_filesize in php.ini)
+     *  * mime_types:           Allowed mime types array or category (available categories: web_images)
+     *  * mime_type_guessers:   An array of mime type guesser PHP callables (must return the mime type or null)
+     *  * mime_categories:      An array of mime type categories (web_images is defined by default)
+     *  * path:                 The path where to save the file - as used by the sfValidatedFile class (optional)
+     *  * validated_file_class: Name of the class that manages the cleaned uploaded file (optional)
+     *
+     * There are 3 built-in mime type guessers:
+     *
+     *  * guessFromFileinfo:        Uses the finfo_open() function (from the Fileinfo PECL extension)
+     *  * guessFromMimeContentType: Uses the mime_content_type() function (deprecated)
+     *  * guessFromFileBinary:      Uses the file binary (only works on *nix system)
+     *
+     * Available error codes:
+     *
+     *  * max_size
+     *  * mime_types
+     *  * partial
+     *  * no_tmp_dir
+     *  * cant_write
+     *  * extension
+     *
+     * @param array $options  An array of options
+     * @param array $messages An array of error messages
+     *
+     * @see sfValidatorBase
+     */
+    protected function configure($options = array(), $messages = array())
     {
-      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')));
-    }
+        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')));
+        }
 
-    $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(
-        'image/jpeg',
-        'image/pjpeg',
-        'image/png',
-        'image/x-png',
-        'image/gif',
-    )));
-    $this->addOption('validated_file_class', 'sfValidatedFile');
-    $this->addOption('path', null);
-
-    $this->addMessage('max_size', 'File is too large (maximum is %max_size% kilobytes).');
-    $this->addMessage('mime_types', 'Invalid mime type (%mime_type%).');
-    $this->addMessage('partial', 'The uploaded file was only partially uploaded.');
-    $this->addMessage('no_tmp_dir', 'Missing a temporary folder.');
-    $this->addMessage('cant_write', 'Failed to write file to disk.');
-    $this->addMessage('extension', 'File upload stopped by extension.');
-  }
-
-  /**
-   * This validator always returns a sfValidatedFile object.
-   *
-   * The input value must be an array with the following keys:
-   *
-   *  * tmp_name: The absolute temporary path to the file
-   *  * name:     The original file name (optional)
-   *  * type:     The file content type (optional)
-   *  * error:    The error code (optional)
-   *  * size:     The file size in bytes (optional)
-   *
-   * @see sfValidatorBase
-   */
-  protected function doClean($value)
-  {
-    if (!is_array($value) || !isset($value['tmp_name']))
-    {
-      throw new sfValidatorError($this, 'invalid', array('value' => (string) $value));
+        $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(
+                'image/jpeg',
+                'image/pjpeg',
+                'image/png',
+                'image/x-png',
+                'image/gif',
+            )));
+        $this->addOption('validated_file_class', 'sfValidatedFile');
+        $this->addOption('path', null);
+
+        $this->addMessage('max_size', 'File is too large (maximum is %max_size% kilobytes).');
+        $this->addMessage('mime_types', 'Invalid mime type (%mime_type%).');
+        $this->addMessage('partial', 'The uploaded file was only partially uploaded.');
+        $this->addMessage('no_tmp_dir', 'Missing a temporary folder.');
+        $this->addMessage('cant_write', 'Failed to write file to disk.');
+        $this->addMessage('extension', 'File upload stopped by extension.');
     }
 
-    if (!isset($value['name']))
+    /**
+     * This validator always returns a sfValidatedFile object.
+     *
+     * The input value must be an array with the following keys:
+     *
+     *  * tmp_name: The absolute temporary path to the file
+     *  * name:     The original file name (optional)
+     *  * type:     The file content type (optional)
+     *  * error:    The error code (optional)
+     *  * size:     The file size in bytes (optional)
+     *
+     * @see sfValidatorBase
+     *
+     * @param mixed $value
+     */
+    protected function doClean($value)
     {
-      $value['name'] = '';
-    }
+        if (!is_array($value) || !isset($value['tmp_name'])) {
+            throw new sfValidatorError($this, 'invalid', array('value' => (string) $value));
+        }
 
-    if (!isset($value['error']))
-    {
-      $value['error'] = UPLOAD_ERR_OK;
-    }
+        if (!isset($value['name'])) {
+            $value['name'] = '';
+        }
 
-    if (!isset($value['size']))
-    {
-      $value['size'] = filesize($value['tmp_name']);
-    }
+        if (!isset($value['error'])) {
+            $value['error'] = UPLOAD_ERR_OK;
+        }
 
-    if (!isset($value['type']))
-    {
-      $value['type'] = 'application/octet-stream';
-    }
+        if (!isset($value['size'])) {
+            $value['size'] = filesize($value['tmp_name']);
+        }
 
-    switch ($value['error'])
-    {
-      case UPLOAD_ERR_INI_SIZE:
-        $max = $this->getMaxFilesize();
-        if ($this->getOption('max_size'))
-        {
-          $max = min($max, $this->getOption('max_size'));
+        if (!isset($value['type'])) {
+            $value['type'] = 'application/octet-stream';
         }
-        throw new sfValidatorError($this, 'max_size', array(
-          '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']
-        ));
-      case UPLOAD_ERR_PARTIAL:
-        throw new sfValidatorError($this, 'partial');
-      case UPLOAD_ERR_NO_TMP_DIR:
-        throw new sfValidatorError($this, 'no_tmp_dir');
-      case UPLOAD_ERR_CANT_WRITE:
-        throw new sfValidatorError($this, 'cant_write');
-      case UPLOAD_ERR_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']
-      ));
-    }
+        switch ($value['error']) {
+            case UPLOAD_ERR_INI_SIZE:
+                $max = $this->getMaxFilesize();
+                if ($this->getOption('max_size')) {
+                    $max = min($max, $this->getOption('max_size'));
+                }
+
+                throw new sfValidatorError($this, 'max_size', array('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']));
+            case UPLOAD_ERR_PARTIAL:
+                throw new sfValidatorError($this, 'partial');
+            case UPLOAD_ERR_NO_TMP_DIR:
+                throw new sfValidatorError($this, 'no_tmp_dir');
+            case UPLOAD_ERR_CANT_WRITE:
+                throw new sfValidatorError($this, 'cant_write');
+            case UPLOAD_ERR_EXTENSION:
+                throw new sfValidatorError($this, 'extension');
+        }
 
-    $mimeType = $this->getMimeType((string) $value['tmp_name'], (string) $value['type']);
+        // 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']));
+        }
 
-    // check mime type
-    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));
-      }
-    }
+        $mimeType = $this->getMimeType((string) $value['tmp_name'], (string) $value['type']);
 
-    $class = $this->getOption('validated_file_class');
-
-    return new $class($value['name'], $mimeType, $value['tmp_name'], $value['size'], $this->getOption('path'));
-  }
-
-  /**
-   * Returns the mime type of a file.
-   *
-   * This methods call each mime_type_guessers option callables to
-   * guess the mime type.
-   *
-   * This method always returns a lower-cased string as mime types are case-insensitive
-   * as per the RFC 2616 (http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.7).
-   *
-   * @param  string $file      The absolute path of a file
-   * @param  string $fallback  The default mime type to return if not guessable
-   *
-   * @return string The mime type of the file (fallback is returned if not guessable)
-   */
-  protected function getMimeType($file, $fallback)
-  {
-    foreach ($this->getOption('mime_type_guessers') as $method)
-    {
-      $type = call_user_func($method, $file);
+        // check mime type
+        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));
+            }
+        }
 
-      if (null !== $type && $type !== false)
-      {
-        return strtolower($type);
-      }
-    }
+        $class = $this->getOption('validated_file_class');
 
-    return strtolower($fallback);
-  }
-
-  /**
-   * Guess the file mime type with PECL Fileinfo extension
-   *
-   * @param  string $file  The absolute path of a file
-   *
-   * @return string The mime type of the file (null if not guessable)
-   */
-  protected function guessFromFileinfo($file)
-  {
-    if (!function_exists('finfo_open') || !is_readable($file))
-    {
-      return null;
+        return new $class($value['name'], $mimeType, $value['tmp_name'], $value['size'], $this->getOption('path'));
     }
 
-    if (!$finfo = new finfo(FILEINFO_MIME))
+    /**
+     * Returns the mime type of a file.
+     *
+     * This methods call each mime_type_guessers option callables to
+     * guess the mime type.
+     *
+     * This method always returns a lower-cased string as mime types are case-insensitive
+     * as per the RFC 2616 (http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.7).
+     *
+     * @param string $file     The absolute path of a file
+     * @param string $fallback The default mime type to return if not guessable
+     *
+     * @return string The mime type of the file (fallback is returned if not guessable)
+     */
+    protected function getMimeType($file, $fallback)
     {
-      return null;
-    }
+        foreach ($this->getOption('mime_type_guessers') as $method) {
+            $type = call_user_func($method, $file);
 
-    $type = $finfo->file($file);
+            if (null !== $type && false !== $type) {
+                return strtolower($type);
+            }
+        }
 
-    // remove charset (added as of PHP 5.3)
-    if (false !== $pos = strpos($type, ';'))
-    {
-      $type = substr($type, 0, $pos);
+        return strtolower($fallback);
     }
 
-    return $type;
-  }
-
-  /**
-   * Guess the file mime type with mime_content_type function (deprecated)
-   *
-   * @param  string $file  The absolute path of a file
-   *
-   * @return string The mime type of the file (null if not guessable)
-   */
-  protected function guessFromMimeContentType($file)
-  {
-    if (!function_exists('mime_content_type') || !is_readable($file))
+    /**
+     * Guess the file mime type with PECL Fileinfo extension.
+     *
+     * @param string $file The absolute path of a file
+     *
+     * @return string The mime type of the file (null if not guessable)
+     */
+    protected function guessFromFileinfo($file)
     {
-      return null;
+        if (!function_exists('finfo_open') || !is_readable($file)) {
+            return null;
+        }
+
+        if (!$finfo = new finfo(FILEINFO_MIME)) {
+            return null;
+        }
+
+        $type = $finfo->file($file);
+
+        // remove charset (added as of PHP 5.3)
+        if (false !== $pos = strpos($type, ';')) {
+            $type = substr($type, 0, $pos);
+        }
+
+        return $type;
     }
 
-    return mime_content_type($file);
-  }
-
-  /**
-   * Guess the file mime type with the file binary (only available on *nix)
-   *
-   * @param  string $file  The absolute path of a file
-   *
-   * @return string The mime type of the file (null if not guessable)
-   */
-  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;
-    passthru(sprintf($cmd, escapeshellarg($file)), $return);
-    if ($return > 0)
+    /**
+     * Guess the file mime type with mime_content_type function (deprecated).
+     *
+     * @param string $file The absolute path of a file
+     *
+     * @return string The mime type of the file (null if not guessable)
+     */
+    protected function guessFromMimeContentType($file)
     {
-      ob_end_clean();
+        if (!function_exists('mime_content_type') || !is_readable($file)) {
+            return null;
+        }
 
-      return null;
+        return mime_content_type($file);
     }
-    $type = trim(ob_get_clean());
 
-    if (!preg_match('#^([a-z0-9\-]+/[a-z0-9\-.]+)#i', $type, $match))
+    /**
+     * Guess the file mime type with the file binary (only available on *nix).
+     *
+     * @param string $file The absolute path of a file
+     *
+     * @return string The mime type of the file (null if not guessable)
+     */
+    protected function guessFromFileBinary($file)
     {
-      // it's not a type, but an error message
-      return null;
-    }
+        ob_start();
+        // need to use --mime instead of -i. see #6641
+        $cmd = 'file -b --mime -- %s 2>/dev/null';
+        $file = (0 === strpos($file, '-') ? './' : '').$file;
+        passthru(sprintf($cmd, escapeshellarg($file)), $return);
+        if ($return > 0) {
+            ob_end_clean();
+
+            return null;
+        }
+        $type = trim(ob_get_clean());
 
-    return $match[1];
-  }
+        if (!preg_match('#^([a-z0-9\-]+/[a-z0-9\-.]+)#i', $type, $match)) {
+            // it's not a type, but an error message
+            return null;
+        }
 
-  protected function getMimeTypesFromCategory($category)
-  {
-    $categories = $this->getOption('mime_categories');
+        return $match[1];
+    }
 
-    if (!isset($categories[$category]))
+    protected function getMimeTypesFromCategory($category)
     {
-      throw new InvalidArgumentException(sprintf('Invalid mime type category "%s".', $category));
+        $categories = $this->getOption('mime_categories');
+
+        if (!isset($categories[$category])) {
+            throw new InvalidArgumentException(sprintf('Invalid mime type category "%s".', $category));
+        }
+
+        return $categories[$category];
     }
 
-    return $categories[$category];
-  }
-
-  /**
-   * @see sfValidatorBase
-   */
-  protected function isEmpty($value)
-  {
-    // empty if the value is not an array
-    // or if the value comes from PHP with an error of UPLOAD_ERR_NO_FILE
-    return
-      (!is_array($value))
-        ||
-      (is_array($value) && isset($value['error']) && UPLOAD_ERR_NO_FILE === $value['error']);
-  }
-
-  /**
-   * Returns the maximum size of an uploaded file as configured in php.ini
-   *
-   * @return type The maximum size of an uploaded file in bytes
-   */
-  protected function getMaxFilesize()
-  {
-    $max = trim(ini_get('upload_max_filesize'));
-
-    if ('' === $max)
+    /**
+     * @see sfValidatorBase
+     *
+     * @param mixed $value
+     */
+    protected function isEmpty($value)
     {
-      return PHP_INT_MAX;
+        // empty if the value is not an array
+        // or if the value comes from PHP with an error of UPLOAD_ERR_NO_FILE
+        return
+          (!is_array($value))
+          || (is_array($value) && isset($value['error']) && UPLOAD_ERR_NO_FILE === $value['error']);
     }
 
-    $value = (int) $max;
-    switch (strtolower(substr($max, -1)))
+    /**
+     * Returns the maximum size of an uploaded file as configured in php.ini.
+     *
+     * @return type The maximum size of an uploaded file in bytes
+     */
+    protected function getMaxFilesize()
     {
-      case 'g':
-        $value *= 1024;
-      case 'm':
-        $value *= 1024;
-      case 'k':
-        $value *= 1024;
-    }
+        $max = trim(ini_get('upload_max_filesize'));
+
+        if ('' === $max) {
+            return PHP_INT_MAX;
+        }
 
-    return (integer) $value;
-  }
+        $value = (int) $max;
+
+        switch (strtolower(substr($max, -1))) {
+            case 'g':
+                $value *= 1024;
+                // no break
+            case 'm':
+                $value *= 1024;
+                // no break
+            case 'k':
+                $value *= 1024;
+        }
+
+        return (int) $value;
+    }
 }
diff --git a/lib/validator/sfValidatorFileMulti.class.php b/lib/validator/sfValidatorFileMulti.class.php
index 2f551ea5c..a21c1a9ca 100644
--- a/lib/validator/sfValidatorFileMulti.class.php
+++ b/lib/validator/sfValidatorFileMulti.class.php
@@ -2,19 +2,19 @@
 
 class sfValidatorFileMulti extends sfValidatorFile
 {
+    /**
+     * @see sfValidatorBase
+     *
+     * @param mixed $value
+     */
+    protected function doClean($value)
+    {
+        $clean = array();
 
-  /**
-   * @see sfValidatorBase
-   */
-  protected function doClean($value)
-  {
-    $clean = array();
+        foreach ($value as $file) {
+            $clean[] = parent::doClean($file);
+        }
 
-    foreach ($value as $file)
-    {
-      $clean[] = parent::doClean($file);
+        return $clean;
     }
-
-    return $clean;
-  }
 }
diff --git a/lib/validator/sfValidatorFromDescription.class.php b/lib/validator/sfValidatorFromDescription.class.php
index 16bd206fd..49abf6f3b 100644
--- a/lib/validator/sfValidatorFromDescription.class.php
+++ b/lib/validator/sfValidatorFromDescription.class.php
@@ -11,377 +11,353 @@
 /**
  * sfValidatorFromDescription converts a string to a validator.
  *
- * @package    symfony
- * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfValidatorFromDescription extends sfValidatorDecorator
 {
-  protected
-    $tokens = array(),
-    $string = '';
-
-  /**
-   * @see sfValidatorBase
-   */
-  public function __construct($string, $options = array(), $messages = array())
-  {
-    $this->string = $string;
-    $this->tokens = $this->tokenize($string);
-
-    parent::__construct($options, $messages);
-  }
-
-  /**
-   * Returns a PHP representation for the validator.
-   *
-   * This PHP representation can be evaled to return the object validator.
-   *
-   * This is mainly useful to cache the result of the validator string parsing.
-   *
-   * @return string The PHP representation for the validator
-   */
-  public function asPhp()
-  {
-    return $this->reduceTokens($this->tokens, 'asPhp');
-  }
-
-  /**
-   * @see sfValidatorDecorator
-   */
-  public function getValidator()
-  {
-    if (null === $this->validator)
+    protected $tokens = array();
+    protected $string = '';
+
+    /**
+     * @see sfValidatorBase
+     *
+     * @param mixed $string
+     * @param mixed $options
+     * @param mixed $messages
+     */
+    public function __construct($string, $options = array(), $messages = array())
     {
-      $this->validator = $this->reduceTokens($this->tokens, 'getValidator');
+        $this->string = $string;
+        $this->tokens = $this->tokenize($string);
+
+        parent::__construct($options, $messages);
     }
 
-    return $this->validator;
-  }
-
-  /**
-   * Tokenizes a validator string to a list of tokens in RPN.
-   *
-   * @param  string $string  A validator string
-   *
-   * @return array  An array of tokens
-   */
-  protected function tokenize($string)
-  {
-    $tokens = array();
-    $len = strlen($string);
-    $i = 0;
-    while ($i < $len)
+    /**
+     * Returns a PHP representation for the validator.
+     *
+     * This PHP representation can be evaled to return the object validator.
+     *
+     * This is mainly useful to cache the result of the validator string parsing.
+     *
+     * @return string The PHP representation for the validator
+     */
+    public function asPhp()
     {
-      if (preg_match('/^([a-z0-9_\-]+)\s*(<=|>=|<|>|==|!=)/i', substr($string, $i), $match))
-      {
-        // schema compare validator
-        $i += strlen($match[0]);
+        return $this->reduceTokens($this->tokens, 'asPhp');
+    }
 
-        $leftField = $match[1];
-        $operator = $match[2];
+    /**
+     * @see sfValidatorDecorator
+     */
+    public function getValidator()
+    {
+        if (null === $this->validator) {
+            $this->validator = $this->reduceTokens($this->tokens, 'getValidator');
+        }
 
-        // arguments (optional)
-        $arguments = $this->parseArguments($string, $i);
+        return $this->validator;
+    }
 
-        // rightField
-        if (!preg_match('/\s*([a-z0-9_\-]+)/', substr($string, $i), $match))
-        {
-          throw new DomainException('Parsing problem.');
+    /**
+     * Tokenizes a validator string to a list of tokens in RPN.
+     *
+     * @param string $string A validator string
+     *
+     * @return array An array of tokens
+     */
+    protected function tokenize($string)
+    {
+        $tokens = array();
+        $len = strlen($string);
+        $i = 0;
+        while ($i < $len) {
+            if (preg_match('/^([a-z0-9_\-]+)\s*(<=|>=|<|>|==|!=)/i', substr($string, $i), $match)) {
+                // schema compare validator
+                $i += strlen($match[0]);
+
+                $leftField = $match[1];
+                $operator = $match[2];
+
+                // arguments (optional)
+                $arguments = $this->parseArguments($string, $i);
+
+                // rightField
+                if (!preg_match('/\s*([a-z0-9_\-]+)/', substr($string, $i), $match)) {
+                    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()));
+            } elseif (preg_match('/^(and|or)/i', substr($string, $i), $match)) {
+                // all, any validador
+                $i += strlen($match[0]);
+
+                // arguments (optional)
+                $arguments = $this->parseArguments($string, $i);
+
+                $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()));
+                if ($match[1]) {
+                    $token = new sfValidatorFDTokenFilter($match[1], $token);
+                }
+
+                $tokens[] = $token;
+            } elseif ('(' == $string[$i]) {
+                $tokens[] = new sfValidatorFDTokenLeftBracket();
+                ++$i;
+            } elseif (')' == $string[$i]) {
+                $tokens[] = new sfValidatorFDTokenRightBracket();
+                ++$i;
+            } elseif (in_array($string[$i], array(' ', "\t", "\r", "\n"))) {
+                ++$i;
+            } else {
+                throw new DomainException(sprintf('Unable to parse string (%s).', $string));
+            }
         }
 
-        $i += strlen($match[0]);
-        $rightField = $match[1];
-
-        $tokens[] = new sfValidatorFDToken('sfValidatorSchemaCompare', array($leftField, $operator, $rightField, $arguments[0], isset($arguments[1]) ? $arguments[1] : array()));
-      }
-      else if (preg_match('/^(and|or)/i', substr($string, $i), $match))
-      {
-        // all, any validador
-        $i += strlen($match[0]);
-
-        // arguments (optional)
-        $arguments = $this->parseArguments($string, $i);
-
-        $tokens[] = new sfValidatorFDTokenOperator(strtolower($match[1]), $arguments);
-      }
-      else if (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()));
-        if ($match[1])
-        {
-          $token = new sfValidatorFDTokenFilter($match[1], $token);
+        return $this->convertInfixToRpn($tokens);
+    }
+
+    /**
+     * Parses validator arguments.
+     *
+     * @param string $string The string to parse
+     * @param int    $i      The indice to start the parsing
+     *
+     * @return array An array of parameters
+     */
+    protected function parseArguments($string, &$i)
+    {
+        $len = strlen($string);
+
+        if ($i + 1 > $len || '(' != $string[$i]) {
+            return array(array(), array());
         }
 
-        $tokens[] = $token;
-      }
-      else if ('(' == $string[$i])
-      {
-        $tokens[] = new sfValidatorFDTokenLeftBracket();
-        ++$i;
-      }
-      else if (')' == $string[$i])
-      {
-        $tokens[] = new sfValidatorFDTokenRightBracket();
         ++$i;
-      }
-      else if (in_array($string[$i], array(' ', "\t", "\r", "\n")))
-      {
+
+        $args = '';
+        $opened = 0;
+        while ($i < $len) {
+            if ('(' == $string[$i]) {
+                ++$opened;
+            } elseif (')' == $string[$i]) {
+                if (!$opened) {
+                    break;
+                }
+
+                --$opened;
+            }
+
+            $args .= $string[$i++];
+        }
+
         ++$i;
-      }
-      else
-      {
-        throw new DomainException(sprintf('Unable to parse string (%s).', $string));
-      }
+
+        return sfYamlInline::load('['.(!$args ? '{}' : $args).']');
     }
 
-    return $this->convertInfixToRpn($tokens);
-  }
-
-  /**
-   * Parses validator arguments.
-   *
-   * @param  string  $string  The string to parse
-   * @param  integer $i       The indice to start the parsing
-   *
-   * @return array   An array of parameters
-   */
-  protected function parseArguments($string, &$i)
-  {
-    $len = strlen($string);
-
-    if ($i + 1 > $len || '(' != $string[$i])
+    /**
+     * Converts a token array from an infix notation to a RPN.
+     *
+     * @param array $tokens An array of tokens in infix notation
+     *
+     * @return array An array of token in RPN
+     */
+    protected function convertInfixToRpn($tokens)
     {
-      return array(array(), array());
-    }
+        $outputStack = array();
+        $operatorStack = array();
+        $precedences = array('and' => 2, 'or' => 1, '(' => 0);
 
-    ++$i;
+        // based on the shunting yard algorithm
+        foreach ($tokens as $token) {
+            switch (get_class($token)) {
+                case 'sfValidatorFDToken':
+                    $outputStack[] = $token;
 
-    $args = '';
-    $opened = 0;
-    while ($i < $len)
-    {
-      if ('(' == $string[$i])
-      {
-        ++$opened;
-      }
-      else if (')' == $string[$i])
-      {
-        if (!$opened)
-        {
-          break;
+                    break;
+
+                case 'sfValidatorFDTokenLeftBracket':
+                    $operatorStack[] = $token;
+
+                    break;
+
+                case 'sfValidatorFDTokenRightBracket':
+                    while (!$operatorStack[count($operatorStack) - 1] instanceof sfValidatorFDTokenLeftBracket) {
+                        $outputStack[] = array_pop($operatorStack);
+                    }
+                    array_pop($operatorStack);
+
+                    break;
+
+                case 'sfValidatorFDTokenOperator':
+                    while (count($operatorStack) && $precedences[$token->__toString()] <= $precedences[$operatorStack[count($operatorStack) - 1]->__toString()]) {
+                        $outputStack[] = array_pop($operatorStack);
+                    }
+                    $operatorStack[] = $token;
+
+                    break;
+
+                default:
+                    $outputStack[] = $token;
+            }
         }
 
-        --$opened;
-      }
+        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));
+            }
 
-      $args .= $string[$i++];
-    }
+            $outputStack[] = $token;
+        }
 
-    ++$i;
-
-    return sfYamlInline::load('['.(!$args ? '{}' : $args).']');
-  }
-
-  /**
-   * Converts a token array from an infix notation to a RPN.
-   *
-   * @param  array $tokens  An array of tokens in infix notation
-   *
-   * @return array An array of token in RPN
-   */
-  protected function convertInfixToRpn($tokens)
-  {
-    $outputStack = array();
-    $operatorStack = array();
-    $precedences = array('and' => 2, 'or' => 1, '(' => 0);
-
-    // based on the shunting yard algorithm
-    foreach ($tokens as $token)
-    {
-      switch (get_class($token))
-      {
-        case 'sfValidatorFDToken':
-          $outputStack[] = $token;
-          break;
-        case 'sfValidatorFDTokenLeftBracket':
-          $operatorStack[] = $token;
-          break;
-        case 'sfValidatorFDTokenRightBracket':
-          while (!$operatorStack[count($operatorStack) - 1] instanceof sfValidatorFDTokenLeftBracket)
-          {
-            $outputStack[] = array_pop($operatorStack);
-          }
-          array_pop($operatorStack);
-          break;
-        case 'sfValidatorFDTokenOperator':
-          while (count($operatorStack) && $precedences[$token->__toString()] <= $precedences[$operatorStack[count($operatorStack) - 1]->__toString()])
-          {
-            $outputStack[] = array_pop($operatorStack);
-          }
-          $operatorStack[] = $token;
-          break;
-        default:
-          $outputStack[] = $token;
-      }
+        return $outputStack;
     }
 
-    while (count($operatorStack))
+    /**
+     * Reduces tokens to a single token and convert it with the given method.
+     *
+     * @param array  $tokens An array of tokens
+     * @param string $method The method name to execute on each token
+     *
+     * @return mixed A single validator representation
+     */
+    protected function reduceTokens($tokens, $method)
     {
-      $token = array_pop($operatorStack);
-      if ($token instanceof sfValidatorFDTokenLeftBracket || $token instanceof sfValidatorFDTokenRightBracket)
-      {
-        throw new DomainException(sprintf('Uneven parenthesis in string (%s).', $this->string));
-      }
+        if (1 == count($tokens)) {
+            return $tokens[0]->{$method}();
+        }
+
+        // reduce to a single validator
+        while (count($tokens) > 1) {
+            $i = 0;
+            while (isset($tokens[$i]) && !$tokens[$i] instanceof sfValidatorFDTokenOperator) {
+                ++$i;
+            }
+
+            $tokens[$i] = $tokens[$i]->{$method}($tokens[$i - 2], $tokens[$i - 1]);
+            unset($tokens[$i - 1], $tokens[$i - 2]);
 
-      $outputStack[] = $token;
+            $tokens = array_values($tokens);
+        }
+
+        return $tokens[0];
     }
+}
 
-    return $outputStack;
-  }
-
-  /**
-   * Reduces tokens to a single token and convert it with the given method.
-   *
-   * @param  array  $tokens  An array of tokens
-   * @param  string $method  The method name to execute on each token
-   *
-   * @return mixed  A single validator representation
-   */
-  protected function reduceTokens($tokens, $method)
-  {
-    if (1 == count($tokens))
+class sfValidatorFDToken
+{
+    protected $class;
+    protected $arguments;
+
+    public function __construct($class, $arguments = array())
     {
-      return $tokens[0]->$method();
+        $this->class = $class;
+        $this->arguments = $arguments;
     }
 
-    // reduce to a single validator
-    while (count($tokens) > 1)
+    public function asPhp()
     {
-      $i = 0;
-      while (isset($tokens[$i]) && !$tokens[$i] instanceof sfValidatorFDTokenOperator)
-      {
-        $i++;
-      }
-
-      $tokens[$i] = $tokens[$i]->$method($tokens[$i - 2], $tokens[$i - 1]);
-      unset($tokens[$i - 1], $tokens[$i - 2]);
-
-      $tokens = array_values($tokens);
+        return sprintf('new %s(%s)', $this->class, implode(', ', array_map(function ($a) { return var_export($a, true); }, $this->arguments)));
     }
 
-    return $tokens[0];
-  }
-}
+    public function getValidator()
+    {
+        $reflection = new ReflectionClass($this->class);
 
-class sfValidatorFDToken
-{
-  protected
-    $class,
-    $arguments;
-
-  public function __construct($class, $arguments = array())
-  {
-    $this->class = $class;
-    $this->arguments = $arguments;
-  }
-
-  public function asPhp()
-  {
-    return sprintf('new %s(%s)', $this->class, implode(', ', array_map(function($a) { return var_export($a, true); }, $this->arguments)));
-  }
-
-  public function getValidator()
-  {
-    $reflection = new ReflectionClass($this->class);
-
-    return $reflection->newInstanceArgs($this->arguments);
-  }
+        return $reflection->newInstanceArgs($this->arguments);
+    }
 }
 
 class sfValidatorFDTokenFilter
 {
-  protected
-    $field,
-    $token;
-
-  public function __construct($field, sfValidatorFDToken $token)
-  {
-    $this->field = $field;
-    $this->token = $token;
-  }
-
-  public function asPhp()
-  {
-    return sprintf('new sfValidatorSchemaFilter(\'%s\', %s)', $this->field, $this->token->asPhp());
-  }
-
-  public function getValidator()
-  {
-    return new sfValidatorSchemaFilter($this->field, $this->token->getValidator());
-  }
+    protected $field;
+    protected $token;
+
+    public function __construct($field, sfValidatorFDToken $token)
+    {
+        $this->field = $field;
+        $this->token = $token;
+    }
+
+    public function asPhp()
+    {
+        return sprintf('new sfValidatorSchemaFilter(\'%s\', %s)', $this->field, $this->token->asPhp());
+    }
+
+    public function getValidator()
+    {
+        return new sfValidatorSchemaFilter($this->field, $this->token->getValidator());
+    }
 }
 
 class sfValidatorFDTokenOperator
 {
-  protected
-    $class,
-    $operator,
-    $token;
-
-  public function __construct($operator, $arguments = array())
-  {
-    $this->operator = $operator;
-    $this->arguments = $arguments;
-    $this->class = 'or' == $operator ? 'sfValidatorOr' : 'sfValidatorAnd';
-  }
-
-  public function __toString()
-  {
-    return $this->operator;
-  }
-
-  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,
-      implode(', ', array_map(function($a) { return var_export($a, true); }, $this->arguments))
-    );
-  }
-
-  public function getValidator($tokenLeft, $tokenRight)
-  {
-    $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,
-    );
-
-    return $reflection->newInstanceArgs(array_merge(array($validators), $this->arguments));
-  }
+    protected $class;
+    protected $operator;
+    protected $token;
+
+    public function __construct($operator, $arguments = array())
+    {
+        $this->operator = $operator;
+        $this->arguments = $arguments;
+        $this->class = 'or' == $operator ? 'sfValidatorOr' : 'sfValidatorAnd';
+    }
+
+    public function __toString()
+    {
+        return $this->operator;
+    }
+
+    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,
+            implode(', ', array_map(function ($a) { return var_export($a, true); }, $this->arguments))
+        );
+    }
+
+    public function getValidator($tokenLeft, $tokenRight)
+    {
+        $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,
+        );
+
+        return $reflection->newInstanceArgs(array_merge(array($validators), $this->arguments));
+    }
 }
 
 class sfValidatorFDTokenLeftBracket
 {
-  public function __toString()
-  {
-    return '(';
-  }
+    public function __toString()
+    {
+        return '(';
+    }
 }
 
 class sfValidatorFDTokenRightBracket
 {
-  public function __toString()
-  {
-    return ')';
-  }
+    public function __toString()
+    {
+        return ')';
+    }
 }
diff --git a/lib/validator/sfValidatorInteger.class.php b/lib/validator/sfValidatorInteger.class.php
index 047a49d91..594e9f7af 100644
--- a/lib/validator/sfValidatorInteger.class.php
+++ b/lib/validator/sfValidatorInteger.class.php
@@ -11,64 +11,62 @@
 /**
  * sfValidatorInteger validates an integer. It also converts the input value to an integer.
  *
- * @package    symfony
- * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfValidatorInteger extends sfValidatorBase
 {
-  /**
-   * Configures the current validator.
-   *
-   * Available options:
-   *
-   *  * max: The maximum value allowed
-   *  * min: The minimum value allowed
-   *
-   * Available error codes:
-   *
-   *  * max
-   *  * min
-   *
-   * @param array $options   An array of options
-   * @param array $messages  An array of error messages
-   *
-   * @see sfValidatorBase
-   */
-  protected function configure($options = array(), $messages = array())
-  {
-    $this->addMessage('max', '"%value%" must be at most %max%.');
-    $this->addMessage('min', '"%value%" must be at least %min%.');
-
-    $this->addOption('min');
-    $this->addOption('max');
-
-    $this->setMessage('invalid', '"%value%" is not an integer.');
-  }
+    /**
+     * Configures the current validator.
+     *
+     * Available options:
+     *
+     *  * max: The maximum value allowed
+     *  * min: The minimum value allowed
+     *
+     * Available error codes:
+     *
+     *  * max
+     *  * min
+     *
+     * @param array $options  An array of options
+     * @param array $messages An array of error messages
+     *
+     * @see sfValidatorBase
+     */
+    protected function configure($options = array(), $messages = array())
+    {
+        $this->addMessage('max', '"%value%" must be at most %max%.');
+        $this->addMessage('min', '"%value%" must be at least %min%.');
 
-  /**
-   * @see sfValidatorBase
-   */
-  protected function doClean($value)
-  {
-    $clean = (int) $value;
+        $this->addOption('min');
+        $this->addOption('max');
 
-    if ((string) $clean != $value)
-    {
-      throw new sfValidatorError($this, 'invalid', array('value' => $value));
+        $this->setMessage('invalid', '"%value%" is not an integer.');
     }
 
-    if ($this->hasOption('max') && $clean > $this->getOption('max'))
+    /**
+     * @see sfValidatorBase
+     *
+     * @param mixed $value
+     */
+    protected function doClean($value)
     {
-      throw new sfValidatorError($this, 'max', array('value' => $value, 'max' => $this->getOption('max')));
-    }
+        $clean = (int) $value;
 
-    if ($this->hasOption('min') && $clean < $this->getOption('min'))
-    {
-      throw new sfValidatorError($this, 'min', array('value' => $value, 'min' => $this->getOption('min')));
-    }
+        if ((string) $clean != $value) {
+            throw new sfValidatorError($this, 'invalid', array('value' => $value));
+        }
+
+        if ($this->hasOption('max') && $clean > $this->getOption('max')) {
+            throw new sfValidatorError($this, 'max', array('value' => $value, 'max' => $this->getOption('max')));
+        }
 
-    return $clean;
-  }
+        if ($this->hasOption('min') && $clean < $this->getOption('min')) {
+            throw new sfValidatorError($this, 'min', array('value' => $value, 'min' => $this->getOption('min')));
+        }
+
+        return $clean;
+    }
 }
diff --git a/lib/validator/sfValidatorIp.class.php b/lib/validator/sfValidatorIp.class.php
index dd44f238c..9bf2cdb24 100644
--- a/lib/validator/sfValidatorIp.class.php
+++ b/lib/validator/sfValidatorIp.class.php
@@ -11,101 +11,110 @@
 /**
  * sfValidatorIp validate an IP address.
  *
- * @package    symfony
- * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfValidatorIp extends sfValidatorString
 {
-  const IP_V4 = '4';
-  const IP_V6 = '6';
-  const IP_ALL = 'all';
+    public const IP_V4 = '4';
+    public const IP_V6 = '6';
+    public const IP_ALL = 'all';
+
+    // adds FILTER_FLAG_NO_PRIV_RANGE flag (skip private ranges)
+    public const IP_V4_NO_PRIV = '4_no_priv';
+    public const IP_V6_NO_PRIV = '6_no_priv';
+    public const IP_ALL_NO_PRIV = 'all_no_priv';
+
+    // adds FILTER_FLAG_NO_RES_RANGE flag (skip reserved ranges)
+    public const IP_V4_NO_RES = '4_no_res';
+    public const IP_V6_NO_RES = '6_no_res';
+    public const IP_ALL_NO_RES = 'all_no_res';
+
+    // adds FILTER_FLAG_NO_PRIV_RANGE and FILTER_FLAG_NO_RES_RANGE flags (skip both)
+    public const IP_V4_ONLY_PUBLIC = '4_public';
+    public const IP_V6_ONLY_PUBLIC = '6_public';
+    public const IP_ALL_ONLY_PUBLIC = 'all_public';
+
+    public function configure($options = array(), $messages = array())
+    {
+        $this->addOption('version', self::IP_ALL);
 
-  // adds FILTER_FLAG_NO_PRIV_RANGE flag (skip private ranges)
-  const IP_V4_NO_PRIV = '4_no_priv';
-  const IP_V6_NO_PRIV = '6_no_priv';
-  const IP_ALL_NO_PRIV = 'all_no_priv';
+        parent::configure($options, $messages);
 
-  // adds FILTER_FLAG_NO_RES_RANGE flag (skip reserved ranges)
-  const IP_V4_NO_RES = '4_no_res';
-  const IP_V6_NO_RES = '6_no_res';
-  const IP_ALL_NO_RES = 'all_no_res';
+        $this->setMessage('invalid', 'Ip address is invalid');
+    }
 
-  // adds FILTER_FLAG_NO_PRIV_RANGE and FILTER_FLAG_NO_RES_RANGE flags (skip both)
-  const IP_V4_ONLY_PUBLIC = '4_public';
-  const IP_V6_ONLY_PUBLIC = '6_public';
-  const IP_ALL_ONLY_PUBLIC = 'all_public';
+    protected function doClean($value)
+    {
+        $value = parent::doClean($value);
 
-  public function configure($options = array(), $messages = array())
-  {
-    $this->addOption('version', self::IP_ALL);
+        switch ($this->getOption('version')) {
+            case self::IP_V4:
+                $flag = FILTER_FLAG_IPV4;
 
-    parent::configure($options, $messages);
+                break;
 
-    $this->setMessage('invalid', 'Ip address is invalid');
-  }
+            case self::IP_V6:
+                $flag = FILTER_FLAG_IPV6;
 
-  protected function doClean($value)
-  {
-    $value = parent::doClean($value);
+                break;
 
-    switch ($this->getOption('version'))
-    {
-      case self::IP_V4:
-        $flag = FILTER_FLAG_IPV4;
-        break;
+            case self::IP_V4_NO_PRIV:
+                $flag = FILTER_FLAG_IPV4 | FILTER_FLAG_NO_PRIV_RANGE;
 
-      case self::IP_V6:
-        $flag = FILTER_FLAG_IPV6;
-        break;
+                break;
 
-      case self::IP_V4_NO_PRIV:
-        $flag = FILTER_FLAG_IPV4 | FILTER_FLAG_NO_PRIV_RANGE;
-        break;
+            case self::IP_V6_NO_PRIV:
+                $flag = FILTER_FLAG_IPV6 | FILTER_FLAG_NO_PRIV_RANGE;
 
-      case self::IP_V6_NO_PRIV:
-        $flag = FILTER_FLAG_IPV6 | FILTER_FLAG_NO_PRIV_RANGE;
-        break;
+                break;
 
-      case self::IP_ALL_NO_PRIV:
-        $flag = FILTER_FLAG_NO_PRIV_RANGE;
-        break;
+            case self::IP_ALL_NO_PRIV:
+                $flag = FILTER_FLAG_NO_PRIV_RANGE;
 
-      case self::IP_V4_NO_RES:
-        $flag = FILTER_FLAG_IPV4 | FILTER_FLAG_NO_RES_RANGE;
-        break;
+                break;
 
-      case self::IP_V6_NO_RES:
-        $flag = FILTER_FLAG_IPV6 | FILTER_FLAG_NO_RES_RANGE;
-        break;
+            case self::IP_V4_NO_RES:
+                $flag = FILTER_FLAG_IPV4 | FILTER_FLAG_NO_RES_RANGE;
 
-      case self::IP_ALL_NO_RES:
-        $flag = FILTER_FLAG_NO_RES_RANGE;
-        break;
+                break;
 
-      case self::IP_V4_ONLY_PUBLIC:
-        $flag = FILTER_FLAG_IPV4 | FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE;
-        break;
+            case self::IP_V6_NO_RES:
+                $flag = FILTER_FLAG_IPV6 | FILTER_FLAG_NO_RES_RANGE;
 
-      case self::IP_V6_ONLY_PUBLIC:
-        $flag = FILTER_FLAG_IPV6 | FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE;
-        break;
+                break;
 
-      case self::IP_ALL_ONLY_PUBLIC:
-        $flag = FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE;
-        break;
+            case self::IP_ALL_NO_RES:
+                $flag = FILTER_FLAG_NO_RES_RANGE;
 
-      default:
-        $flag = null;
-        break;
-    }
+                break;
 
-    if (!filter_var($value, FILTER_VALIDATE_IP, $flag))
-    {
-      throw new sfValidatorError($this, 'invalid', array('value' => $value));
-    }
+            case self::IP_V4_ONLY_PUBLIC:
+                $flag = FILTER_FLAG_IPV4 | FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE;
+
+                break;
 
-    return $value;
-  }
+            case self::IP_V6_ONLY_PUBLIC:
+                $flag = FILTER_FLAG_IPV6 | FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE;
+
+                break;
+
+            case self::IP_ALL_ONLY_PUBLIC:
+                $flag = FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE;
+
+                break;
+
+            default:
+                $flag = null;
+
+                break;
+        }
+
+        if (!filter_var($value, FILTER_VALIDATE_IP, $flag)) {
+            throw new sfValidatorError($this, 'invalid', array('value' => $value));
+        }
+
+        return $value;
+    }
 }
diff --git a/lib/validator/sfValidatorNumber.class.php b/lib/validator/sfValidatorNumber.class.php
index 24150b088..0cd54cc2b 100644
--- a/lib/validator/sfValidatorNumber.class.php
+++ b/lib/validator/sfValidatorNumber.class.php
@@ -11,64 +11,62 @@
 /**
  * sfValidatorNumber validates a number (integer or float). It also converts the input value to a float.
  *
- * @package    symfony
- * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfValidatorNumber extends sfValidatorBase
 {
-  /**
-   * Configures the current validator.
-   *
-   * Available options:
-   *
-   *  * max: The maximum value allowed
-   *  * min: The minimum value allowed
-   *
-   * Available error codes:
-   *
-   *  * max
-   *  * min
-   *
-   * @param array $options   An array of options
-   * @param array $messages  An array of error messages
-   *
-   * @see sfValidatorBase
-   */
-  protected function configure($options = array(), $messages = array())
-  {
-    $this->addMessage('max', '"%value%" must be at most %max%.');
-    $this->addMessage('min', '"%value%" must be at least %min%.');
+    /**
+     * Configures the current validator.
+     *
+     * Available options:
+     *
+     *  * max: The maximum value allowed
+     *  * min: The minimum value allowed
+     *
+     * Available error codes:
+     *
+     *  * max
+     *  * min
+     *
+     * @param array $options  An array of options
+     * @param array $messages An array of error messages
+     *
+     * @see sfValidatorBase
+     */
+    protected function configure($options = array(), $messages = array())
+    {
+        $this->addMessage('max', '"%value%" must be at most %max%.');
+        $this->addMessage('min', '"%value%" must be at least %min%.');
 
-    $this->addOption('min');
-    $this->addOption('max');
+        $this->addOption('min');
+        $this->addOption('max');
 
-    $this->setMessage('invalid', '"%value%" is not a number.');
-  }
+        $this->setMessage('invalid', '"%value%" is not a number.');
+    }
 
-  /**
-   * @see sfValidatorBase
-   */
-  protected function doClean($value)
-  {
-    if (!is_numeric($value))
+    /**
+     * @see sfValidatorBase
+     *
+     * @param mixed $value
+     */
+    protected function doClean($value)
     {
-      throw new sfValidatorError($this, 'invalid', array('value' => $value));
-    }
+        if (!is_numeric($value)) {
+            throw new sfValidatorError($this, 'invalid', array('value' => $value));
+        }
 
-    $clean = (float) $value;
+        $clean = (float) $value;
 
-    if ($this->hasOption('max') && $clean > $this->getOption('max'))
-    {
-      throw new sfValidatorError($this, 'max', array('value' => $value, 'max' => $this->getOption('max')));
-    }
+        if ($this->hasOption('max') && $clean > $this->getOption('max')) {
+            throw new sfValidatorError($this, 'max', array('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')));
-    }
+        if ($this->hasOption('min') && $clean < $this->getOption('min')) {
+            throw new sfValidatorError($this, 'min', array('value' => $value, 'min' => $this->getOption('min')));
+        }
 
-    return $clean;
-  }
+        return $clean;
+    }
 }
diff --git a/lib/validator/sfValidatorOr.class.php b/lib/validator/sfValidatorOr.class.php
index f88e0ce2d..354da8997 100644
--- a/lib/validator/sfValidatorOr.class.php
+++ b/lib/validator/sfValidatorOr.class.php
@@ -11,136 +11,127 @@
 /**
  * sfValidatorOr validates an input value if at least one validator passes.
  *
- * @package    symfony
- * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfValidatorOr extends sfValidatorBase
 {
-  protected
-    $validators = array();
+    protected $validators = array();
 
-  /**
-   * Constructor.
-   *
-   * The first argument can be:
-   *
-   *  * null
-   *  * a sfValidatorBase instance
-   *  * an array of sfValidatorBase instances
-   *
-   * @param mixed $validators  Initial validators
-   * @param array $options     An array of options
-   * @param array $messages    An array of error messages
-   *
-   * @see sfValidatorBase
-   */
-  public function __construct($validators = null, $options = array(), $messages = array())
-  {
-    if ($validators instanceof sfValidatorBase)
+    /**
+     * Constructor.
+     *
+     * The first argument can be:
+     *
+     *  * null
+     *  * a sfValidatorBase instance
+     *  * an array of sfValidatorBase instances
+     *
+     * @param mixed $validators Initial validators
+     * @param array $options    An array of options
+     * @param array $messages   An array of error messages
+     *
+     * @see sfValidatorBase
+     */
+    public function __construct($validators = null, $options = array(), $messages = array())
     {
-      $this->addValidator($validators);
+        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.');
+        }
+
+        parent::__construct($options, $messages);
     }
-    else if (is_array($validators))
+
+    /**
+     * Adds a validator.
+     *
+     * @param sfValidatorBase $validator An sfValidatorBase instance
+     */
+    public function addValidator(sfValidatorBase $validator)
     {
-      foreach ($validators as $validator)
-      {
-        $this->addValidator($validator);
-      }
+        $this->validators[] = $validator;
     }
-    else if (null !== $validators)
+
+    /**
+     * Returns an array of the validators.
+     *
+     * @return array An array of sfValidatorBase instances
+     */
+    public function getValidators()
     {
-      throw new InvalidArgumentException('sfValidatorOr constructor takes a sfValidatorBase object, or a sfValidatorBase array.');
+        return $this->validators;
     }
 
-    parent::__construct($options, $messages);
-  }
+    /**
+     * @see sfValidatorBase
+     *
+     * @param mixed $indent
+     */
+    public function asString($indent = 0)
+    {
+        $validators = '';
+        for ($i = 0, $max = count($this->validators); $i < $max; ++$i) {
+            $validators .= "\n".$this->validators[$i]->asString($indent + 2)."\n";
 
-  /**
-   * @see sfValidatorBase
-   */
-  protected function configure($options = array(), $messages = array())
-  {
-    $this->setMessage('invalid', null);
-  }
+            if ($i < $max - 1) {
+                $validators .= str_repeat(' ', $indent + 2).'or';
+            }
 
-  /**
-   * Adds a validator.
-   *
-   * @param sfValidatorBase $validator  An sfValidatorBase instance
-   */
-  public function addValidator(sfValidatorBase $validator)
-  {
-    $this->validators[] = $validator;
-  }
+            if ($i == $max - 2) {
+                $options = $this->getOptionsWithoutDefaults();
+                $messages = $this->getMessagesWithoutDefaults();
 
-  /**
-   * Returns an array of the validators.
-   *
-   * @return array An array of sfValidatorBase instances
-   */
-  public function getValidators()
-  {
-    return $this->validators;
-  }
+                if ($options || $messages) {
+                    $validators .= sprintf(
+                        '(%s%s)',
+                        $options ? sfYamlInline::dump($options) : ($messages ? '{}' : ''),
+                        $messages ? ', '.sfYamlInline::dump($messages) : ''
+                    );
+                }
+            }
+        }
 
-  /**
-   * @see sfValidatorBase
-   */
-  protected function doClean($value)
-  {
-    $errors = new sfValidatorErrorSchema($this);
-    foreach ($this->validators as $validator)
-    {
-      try
-      {
-        return $validator->clean($value);
-      }
-      catch (sfValidatorError $e)
-      {
-        $errors->addError($e);
-      }
+        return sprintf('%s(%s%s)', str_repeat(' ', $indent), $validators, str_repeat(' ', $indent));
     }
 
-    if ($this->getMessage('invalid'))
+    /**
+     * @see sfValidatorBase
+     *
+     * @param mixed $options
+     * @param mixed $messages
+     */
+    protected function configure($options = array(), $messages = array())
     {
-      throw new sfValidatorError($this, 'invalid', array('value' => $value));
+        $this->setMessage('invalid', null);
     }
 
-    throw $errors;
-  }
-
-  /**
-   * @see sfValidatorBase
-   */
-  public function asString($indent = 0)
-  {
-    $validators = '';
-    for ($i = 0, $max = count($this->validators); $i < $max; $i++)
+    /**
+     * @see sfValidatorBase
+     *
+     * @param mixed $value
+     */
+    protected function doClean($value)
     {
-      $validators .= "\n".$this->validators[$i]->asString($indent + 2)."\n";
-
-      if ($i < $max - 1)
-      {
-        $validators .= str_repeat(' ', $indent + 2).'or';
-      }
-
-      if ($i == $max - 2)
-      {
-        $options = $this->getOptionsWithoutDefaults();
-        $messages = $this->getMessagesWithoutDefaults();
+        $errors = new sfValidatorErrorSchema($this);
+        foreach ($this->validators as $validator) {
+            try {
+                return $validator->clean($value);
+            } catch (sfValidatorError $e) {
+                $errors->addError($e);
+            }
+        }
 
-        if ($options || $messages)
-        {
-          $validators .= sprintf('(%s%s)',
-            $options ? sfYamlInline::dump($options) : ($messages ? '{}' : ''),
-            $messages ? ', '.sfYamlInline::dump($messages) : ''
-          );
+        if ($this->getMessage('invalid')) {
+            throw new sfValidatorError($this, 'invalid', array('value' => $value));
         }
-      }
-    }
 
-    return sprintf("%s(%s%s)", str_repeat(' ', $indent), $validators, str_repeat(' ', $indent));
-  }
+        throw $errors;
+    }
 }
diff --git a/lib/validator/sfValidatorPass.class.php b/lib/validator/sfValidatorPass.class.php
index e3b1a14e7..def7dd3eb 100644
--- a/lib/validator/sfValidatorPass.class.php
+++ b/lib/validator/sfValidatorPass.class.php
@@ -9,28 +9,31 @@
  */
 
 /**
- * sfValidatorPass is an identity validator. It simply returns the value unmodified. 
+ * sfValidatorPass is an identity validator. It simply returns the value unmodified.
  *
- * @package    symfony
- * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfValidatorPass extends sfValidatorBase
 {
-  /**
-   * @see sfValidatorBase
-   */
-  public function clean($value)
-  {
-    return $this->doClean($value);
-  }
+    /**
+     * @see sfValidatorBase
+     *
+     * @param mixed $value
+     */
+    public function clean($value)
+    {
+        return $this->doClean($value);
+    }
 
-  /**
-   * @see sfValidatorBase
-   */
-  protected function doClean($value)
-  {
-    return $value;
-  }
+    /**
+     * @see sfValidatorBase
+     *
+     * @param mixed $value
+     */
+    protected function doClean($value)
+    {
+        return $value;
+    }
 }
diff --git a/lib/validator/sfValidatorRegex.class.php b/lib/validator/sfValidatorRegex.class.php
index f8308ba64..c72127827 100644
--- a/lib/validator/sfValidatorRegex.class.php
+++ b/lib/validator/sfValidatorRegex.class.php
@@ -11,64 +11,63 @@
 /**
  * sfValidatorRegex validates a value with a regular expression.
  *
- * @package    symfony
- * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfValidatorRegex extends sfValidatorString
 {
-  /**
-   * Configures the current validator.
-   *
-   * Available options:
-   *
-   *  * pattern:    A regex pattern compatible with PCRE or {@link sfCallable} that returns one (required)
-   *  * must_match: Whether the regex must match or not (true by default)
-   *
-   * @param array $options   An array of options
-   * @param array $messages  An array of error messages
-   *
-   * @see sfValidatorString
-   */
-  protected function configure($options = array(), $messages = array())
-  {
-    parent::configure($options, $messages);
+    /**
+     * Returns the current validator's regular expression.
+     *
+     * @return string
+     */
+    public function getPattern()
+    {
+        $pattern = $this->getOption('pattern');
 
-    $this->addRequiredOption('pattern');
-    $this->addOption('must_match', true);
-  }
+        return $pattern instanceof sfCallable ? $pattern->call() : $pattern;
+    }
 
-  /**
-   * @see sfValidatorString
-   */
-  protected function doClean($value)
-  {
-    $clean = parent::doClean($value);
+    /**
+     * Configures the current validator.
+     *
+     * Available options:
+     *
+     *  * pattern:    A regex pattern compatible with PCRE or {@link sfCallable} that returns one (required)
+     *  * must_match: Whether the regex must match or not (true by default)
+     *
+     * @param array $options  An array of options
+     * @param array $messages An array of error messages
+     *
+     * @see sfValidatorString
+     */
+    protected function configure($options = array(), $messages = array())
+    {
+        parent::configure($options, $messages);
 
-    $pattern = $this->getPattern();
+        $this->addRequiredOption('pattern');
+        $this->addOption('must_match', true);
+    }
 
-    if (
-      ($this->getOption('must_match') && !preg_match($pattern, $clean))
-      ||
-      (!$this->getOption('must_match') && preg_match($pattern, $clean))
-    )
+    /**
+     * @see sfValidatorString
+     *
+     * @param mixed $value
+     */
+    protected function doClean($value)
     {
-      throw new sfValidatorError($this, 'invalid', array('value' => $value));
-    }
+        $clean = parent::doClean($value);
 
-    return $clean;
-  }
+        $pattern = $this->getPattern();
 
-  /**
-   * Returns the current validator's regular expression.
-   *
-   * @return string
-   */
-  public function getPattern()
-  {
-    $pattern = $this->getOption('pattern');
+        if (
+            ($this->getOption('must_match') && !preg_match($pattern, $clean))
+            || (!$this->getOption('must_match') && preg_match($pattern, $clean))
+        ) {
+            throw new sfValidatorError($this, 'invalid', array('value' => $value));
+        }
 
-    return $pattern instanceof sfCallable ? $pattern->call() : $pattern;
-  }
+        return $clean;
+    }
 }
diff --git a/lib/validator/sfValidatorSchema.class.php b/lib/validator/sfValidatorSchema.class.php
index 34c97180e..21a77afde 100644
--- a/lib/validator/sfValidatorSchema.class.php
+++ b/lib/validator/sfValidatorSchema.class.php
@@ -13,402 +13,368 @@
  *
  * A field is a named validator.
  *
- * @package    symfony
- * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfValidatorSchema extends sfValidatorBase implements ArrayAccess
 {
-  protected
-    $fields        = array(),
-    $preValidator  = null,
-    $postValidator = null;
-
-  /**
-   * Constructor.
-   *
-   * The first argument can be:
-   *
-   *  * null
-   *  * an array of named sfValidatorBase instances
-   *
-   * @param mixed $fields    Initial fields
-   * @param array $options   An array of options
-   * @param array $messages  An array of error messages
-   *
-   * @see sfValidatorBase
-   */
-  public function __construct($fields = null, $options = array(), $messages = array())
-  {
-    if (is_array($fields))
-    {
-      foreach ($fields as $name => $validator)
-      {
-        $this[$name] = $validator;
-      }
-    }
-    else if (null !== $fields)
+    protected $fields = array();
+    protected $preValidator;
+    protected $postValidator;
+
+    /**
+     * Constructor.
+     *
+     * The first argument can be:
+     *
+     *  * null
+     *  * an array of named sfValidatorBase instances
+     *
+     * @param mixed $fields   Initial fields
+     * @param array $options  An array of options
+     * @param array $messages An array of error messages
+     *
+     * @see sfValidatorBase
+     */
+    public function __construct($fields = null, $options = array(), $messages = array())
     {
-      throw new InvalidArgumentException('sfValidatorSchema constructor takes an array of sfValidatorBase objects.');
-    }
+        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.');
+        }
 
-    parent::__construct($options, $messages);
-  }
-
-  /**
-   * Configures the validator.
-   *
-   * Available options:
-   *
-   *  * allow_extra_fields:  if false, the validator adds an error if extra fields are given in the input array of values (default to false)
-   *  * filter_extra_fields: if true, the validator filters extra fields from the returned array of cleaned values (default to true)
-   *
-   * Available error codes:
-   *
-   *  * extra_fields
-   *
-   * @param array $options   An array of options
-   * @param array $messages  An array of error messages
-   *
-   * @see sfValidatorBase
-   */
-  protected function configure($options = array(), $messages = array())
-  {
-    $this->addOption('allow_extra_fields', false);
-    $this->addOption('filter_extra_fields', true);
-
-    $this->addMessage('extra_fields', 'Unexpected extra form field named "%field%".');
-    $this->addMessage('post_max_size', 'The form submission cannot be processed. It probably means that you have uploaded a file that is too big.');
-  }
-
-  /**
-   * @see sfValidatorBase
-   */
-  public function clean($values)
-  {
-    return $this->doClean($values);
-  }
-
-  /**
-   * @see sfValidatorBase
-   */
-  protected function doClean($values)
-  {
-    if (null === $values)
-    {
-      $values = array();
+        parent::__construct($options, $messages);
     }
 
-    if (!is_array($values))
+    public function __clone()
     {
-      throw new InvalidArgumentException('You must pass an array parameter to the clean() method');
-    }
-
-    $clean  = array();
-    $unused = array_keys($this->fields);
-    $errorSchema = new sfValidatorErrorSchema($this);
+        foreach ($this->fields as $name => $field) {
+            $this->fields[$name] = clone $field;
+        }
 
-    // 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')) && ini_get('post_max_size') != 0)
-    {
-      $errorSchema->addError(new sfValidatorError($this, 'post_max_size'));
+        if (null !== $this->preValidator) {
+            $this->preValidator = clone $this->preValidator;
+        }
 
-      throw $errorSchema;
+        if (null !== $this->postValidator) {
+            $this->postValidator = clone $this->postValidator;
+        }
     }
 
-    // pre validator
-    try
-    {
-      $values = $this->preClean($values);
-    }
-    catch (sfValidatorErrorSchema $e)
-    {
-      $errorSchema->addErrors($e);
-    }
-    catch (sfValidatorError $e)
+    /**
+     * @see sfValidatorBase
+     *
+     * @param mixed $values
+     */
+    public function clean($values)
     {
-      $errorSchema->addError($e);
+        return $this->doClean($values);
     }
 
-    // validate given values
-    foreach ($values as $name => $value)
+    /**
+     * Cleans the input values.
+     *
+     * This method is the first validator executed by doClean().
+     *
+     * It executes the validator returned by getPreValidator()
+     * on the global array of values.
+     *
+     * @param array $values The input values
+     *
+     * @return array The cleaned values
+     *
+     * @throws sfValidatorError
+     */
+    public function preClean($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)));
-        }
-        else if (!$this->options['filter_extra_fields'])
-        {
-          $clean[$name] = $value;
+        if (null === $validator = $this->getPreValidator()) {
+            return $values;
         }
 
-        continue;
-      }
+        return $validator->clean($values);
+    }
 
-      unset($unused[array_search($name, $unused, true)]);
+    /**
+     * Cleans the input values.
+     *
+     * This method is the last validator executed by doClean().
+     *
+     * It executes the validator returned by getPostValidator()
+     * on the global array of cleaned values.
+     *
+     * @param array $values The input values
+     *
+     * @throws sfValidatorError
+     */
+    public function postClean($values)
+    {
+        if (null === $validator = $this->getPostValidator()) {
+            return $values;
+        }
 
-      // validate value
-      try
-      {
-        $clean[$name] = $this->fields[$name]->clean($value);
-      }
-      catch (sfValidatorError $e)
-      {
-        $clean[$name] = null;
+        return $validator->clean($values);
+    }
 
-        $errorSchema->addError($e, (string) $name);
-      }
-      catch (Exception $e)
-      {
-        $class = get_class($e);
+    /**
+     * Sets the pre validator.
+     *
+     * @param sfValidatorBase $validator An sfValidatorBase instance
+     *
+     * @return sfValidatorBase The current validator instance
+     */
+    public function setPreValidator(sfValidatorBase $validator)
+    {
+        $this->preValidator = clone $validator;
 
-        throw new $class($e->getMessage().' of "'.$name.'" field');
-      }
+        return $this;
     }
 
-    // are non given values required?
-    foreach ($unused as $name)
+    /**
+     * Returns the pre validator.
+     *
+     * @return sfValidatorBase A sfValidatorBase instance
+     */
+    public function getPreValidator()
     {
-      // validate value
-      try
-      {
-        $clean[$name] = $this->fields[$name]->clean(null);
-      }
-      catch (sfValidatorError $e)
-      {
-        $clean[$name] = null;
-
-        $errorSchema->addError($e, (string) $name);
-      }
+        return $this->preValidator;
     }
 
-    // post validator
-    try
+    /**
+     * Sets the post validator.
+     *
+     * @param sfValidatorBase $validator An sfValidatorBase instance
+     *
+     * @return sfValidatorBase The current validator instance
+     */
+    public function setPostValidator(sfValidatorBase $validator)
     {
-      $clean = $this->postClean($clean);
+        $this->postValidator = clone $validator;
+
+        return $this;
     }
-    catch (sfValidatorErrorSchema $e)
+
+    /**
+     * Returns the post validator.
+     *
+     * @return sfValidatorBase An sfValidatorBase instance
+     */
+    public function getPostValidator()
     {
-      $errorSchema->addErrors($e);
+        return $this->postValidator;
     }
-    catch (sfValidatorError $e)
+
+    /**
+     * Returns true if the schema has a field with the given name (implements the ArrayAccess interface).
+     *
+     * @param string $name The field name
+     *
+     * @return bool true if the schema has a field with the given name, false otherwise
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetExists($name)
     {
-      $errorSchema->addError($e);
+        return isset($this->fields[$name]);
     }
 
-    if (count($errorSchema))
+    /**
+     * Gets the field associated with the given name (implements the ArrayAccess interface).
+     *
+     * @param string $name The field name
+     *
+     * @return sfValidatorBase The sfValidatorBase instance associated with the given name, null if it does not exist
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetGet($name)
     {
-      throw $errorSchema;
+        return isset($this->fields[$name]) ? $this->fields[$name] : null;
     }
 
-    return $clean;
-  }
-
-  /**
-   * Cleans the input values.
-   *
-   * This method is the first validator executed by doClean().
-   *
-   * It executes the validator returned by getPreValidator()
-   * on the global array of values.
-   *
-   * @param  array $values  The input values
-   *
-   * @return array The cleaned values
-   *
-   * @throws sfValidatorError
-   */
-  public function preClean($values)
-  {
-    if (null === $validator = $this->getPreValidator())
+    /**
+     * Sets a field (implements the ArrayAccess interface).
+     *
+     * @param string          $name      The field name
+     * @param sfValidatorBase $validator An sfValidatorBase instance
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetSet($name, $validator)
     {
-      return $values;
+        if (!$validator instanceof sfValidatorBase) {
+            throw new InvalidArgumentException('A validator must be an instance of sfValidatorBase.');
+        }
+
+        $this->fields[$name] = clone $validator;
     }
 
-    return $validator->clean($values);
-  }
-
-  /**
-   * Cleans the input values.
-   *
-   * This method is the last validator executed by doClean().
-   *
-   * It executes the validator returned by getPostValidator()
-   * on the global array of cleaned values.
-   *
-   * @param  array $values  The input values
-   *
-   * @throws sfValidatorError
-   */
-  public function postClean($values)
-  {
-    if (null === $validator = $this->getPostValidator())
+    /**
+     * Removes a field by name (implements the ArrayAccess interface).
+     *
+     * @param string $name
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetUnset($name)
     {
-      return $values;
+        unset($this->fields[$name]);
     }
 
-    return $validator->clean($values);
-  }
-
-  /**
-   * Sets the pre validator.
-   *
-   * @param sfValidatorBase $validator  An sfValidatorBase instance
-   *
-   * @return sfValidatorBase The current validator instance
-   */
-  public function setPreValidator(sfValidatorBase $validator)
-  {
-    $this->preValidator = clone $validator;
-
-    return $this;
-  }
-
-  /**
-   * Returns the pre validator.
-   *
-   * @return sfValidatorBase A sfValidatorBase instance
-   */
-  public function getPreValidator()
-  {
-    return $this->preValidator;
-  }
-
-  /**
-   * Sets the post validator.
-   *
-   * @param sfValidatorBase $validator  An sfValidatorBase instance
-   *
-   * @return sfValidatorBase The current validator instance
-   */
-  public function setPostValidator(sfValidatorBase $validator)
-  {
-    $this->postValidator = clone $validator;
-
-    return $this;
-  }
-
-  /**
-   * Returns the post validator.
-   *
-   * @return sfValidatorBase An sfValidatorBase instance
-   */
-  public function getPostValidator()
-  {
-    return $this->postValidator;
-  }
-
-  /**
-   * Returns true if the schema has a field with the given name (implements the ArrayAccess interface).
-   *
-   * @param  string  $name  The field name
-   *
-   * @return bool true if the schema has a field with the given name, false otherwise
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetExists($name)
-  {
-    return isset($this->fields[$name]);
-  }
-
-  /**
-   * Gets the field associated with the given name (implements the ArrayAccess interface).
-   *
-   * @param  string $name  The field name
-   *
-   * @return sfValidatorBase The sfValidatorBase instance associated with the given name, null if it does not exist
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetGet($name)
-  {
-    return isset($this->fields[$name]) ? $this->fields[$name] : null;
-  }
-
-  /**
-   * Sets a field (implements the ArrayAccess interface).
-   *
-   * @param string          $name       The field name
-   * @param sfValidatorBase $validator  An sfValidatorBase instance
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetSet($name, $validator)
-  {
-    if (!$validator instanceof sfValidatorBase)
+    /**
+     * Returns an array of fields.
+     *
+     * @return sfValidatorBase[] An array of sfValidatorBase instances
+     */
+    public function getFields()
     {
-      throw new InvalidArgumentException('A validator must be an instance of sfValidatorBase.');
+        return $this->fields;
     }
 
-    $this->fields[$name] = clone $validator;
-  }
-
-  /**
-   * Removes a field by name (implements the ArrayAccess interface).
-   *
-   * @param string $name
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetUnset($name)
-  {
-    unset($this->fields[$name]);
-  }
-
-  /**
-   * Returns an array of fields.
-   *
-   * @return sfValidatorBase[] An array of sfValidatorBase instances
-   */
-  public function getFields()
-  {
-    return $this->fields;
-  }
-
-  /**
-   * @see sfValidatorBase
-   */
-  public function asString($indent = 0)
-  {
-    throw new Exception('Unable to convert a sfValidatorSchema to string.');
-  }
-
-  public function __clone()
-  {
-    foreach ($this->fields as $name => $field)
+    /**
+     * @see sfValidatorBase
+     *
+     * @param mixed $indent
+     */
+    public function asString($indent = 0)
     {
-      $this->fields[$name] = clone $field;
+        throw new Exception('Unable to convert a sfValidatorSchema to string.');
     }
 
-    if (null !== $this->preValidator)
+    /**
+     * Configures the validator.
+     *
+     * Available options:
+     *
+     *  * allow_extra_fields:  if false, the validator adds an error if extra fields are given in the input array of values (default to false)
+     *  * filter_extra_fields: if true, the validator filters extra fields from the returned array of cleaned values (default to true)
+     *
+     * Available error codes:
+     *
+     *  * extra_fields
+     *
+     * @param array $options  An array of options
+     * @param array $messages An array of error messages
+     *
+     * @see sfValidatorBase
+     */
+    protected function configure($options = array(), $messages = array())
     {
-      $this->preValidator = clone $this->preValidator;
+        $this->addOption('allow_extra_fields', false);
+        $this->addOption('filter_extra_fields', true);
+
+        $this->addMessage('extra_fields', 'Unexpected extra form field named "%field%".');
+        $this->addMessage('post_max_size', 'The form submission cannot be processed. It probably means that you have uploaded a file that is too big.');
     }
 
-    if (null !== $this->postValidator)
+    /**
+     * @see sfValidatorBase
+     *
+     * @param mixed $values
+     */
+    protected function doClean($values)
     {
-      $this->postValidator = clone $this->postValidator;
-    }
-  }
-
-  protected function getBytes($value)
-  {
-    $value    = trim($value);
-    $number   = (float) $value;
-    $modifier = strtolower($value[strlen($value) - 1]);
-
-    $exp_by_modifier = array(
-      'k' => 1,
-      'm' => 2,
-      'g' => 3,
-    );
-
-    if (array_key_exists($modifier, $exp_by_modifier)) {
-      $exp    = $exp_by_modifier[$modifier];
-      $number = $number * pow(1024, $exp);
+        if (null === $values) {
+            $values = array();
+        }
+
+        if (!is_array($values)) {
+            throw new InvalidArgumentException('You must pass an array parameter to the clean() method');
+        }
+
+        $clean = array();
+        $unused = array_keys($this->fields);
+        $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'));
+
+            throw $errorSchema;
+        }
+
+        // pre validator
+        try {
+            $values = $this->preClean($values);
+        } catch (sfValidatorErrorSchema $e) {
+            $errorSchema->addErrors($e);
+        } catch (sfValidatorError $e) {
+            $errorSchema->addError($e);
+        }
+
+        // validate given values
+        foreach ($values as $name => $value) {
+            // 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)));
+                } elseif (!$this->options['filter_extra_fields']) {
+                    $clean[$name] = $value;
+                }
+
+                continue;
+            }
+
+            unset($unused[array_search($name, $unused, true)]);
+
+            // validate value
+            try {
+                $clean[$name] = $this->fields[$name]->clean($value);
+            } catch (sfValidatorError $e) {
+                $clean[$name] = null;
+
+                $errorSchema->addError($e, (string) $name);
+            } catch (Exception $e) {
+                $class = get_class($e);
+
+                throw new $class($e->getMessage().' of "'.$name.'" field');
+            }
+        }
+
+        // are non given values required?
+        foreach ($unused as $name) {
+            // validate value
+            try {
+                $clean[$name] = $this->fields[$name]->clean(null);
+            } catch (sfValidatorError $e) {
+                $clean[$name] = null;
+
+                $errorSchema->addError($e, (string) $name);
+            }
+        }
+
+        // post validator
+        try {
+            $clean = $this->postClean($clean);
+        } catch (sfValidatorErrorSchema $e) {
+            $errorSchema->addErrors($e);
+        } catch (sfValidatorError $e) {
+            $errorSchema->addError($e);
+        }
+
+        if (count($errorSchema)) {
+            throw $errorSchema;
+        }
+
+        return $clean;
     }
 
-    return $number;
-  }
+    protected function getBytes($value)
+    {
+        $value = trim($value);
+        $number = (float) $value;
+        $modifier = strtolower($value[strlen($value) - 1]);
+
+        $exp_by_modifier = array(
+            'k' => 1,
+            'm' => 2,
+            'g' => 3,
+        );
+
+        if (array_key_exists($modifier, $exp_by_modifier)) {
+            $exp = $exp_by_modifier[$modifier];
+            $number = $number * pow(1024, $exp);
+        }
+
+        return $number;
+    }
 }
diff --git a/lib/validator/sfValidatorSchemaCompare.class.php b/lib/validator/sfValidatorSchemaCompare.class.php
index a41d651cd..93bddc007 100644
--- a/lib/validator/sfValidatorSchemaCompare.class.php
+++ b/lib/validator/sfValidatorSchemaCompare.class.php
@@ -11,152 +11,167 @@
 /**
  * sfValidatorSchemaCompare compares several values from an array.
  *
- * @package    symfony
- * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfValidatorSchemaCompare extends sfValidatorSchema
 {
-  const EQUAL              = '==';
-  const NOT_EQUAL          = '!=';
-  const IDENTICAL          = '===';
-  const NOT_IDENTICAL      = '!==';
-  const LESS_THAN          = '<';
-  const LESS_THAN_EQUAL    = '<=';
-  const GREATER_THAN       = '>';
-  const GREATER_THAN_EQUAL = '>=';
-
-  /**
-   * Constructor.
-   *
-   * Available options:
-   *
-   *  * left_field:         The left field name
-   *  * operator:           The comparison operator
-   *                          * self::EQUAL
-   *                          * self::NOT_EQUAL
-   *                          * self::IDENTICAL
-   *                          * self::NOT_IDENTICAL
-   *                          * self::LESS_THAN
-   *                          * self::LESS_THAN_EQUAL
-   *                          * self::GREATER_THAN
-   *                          * self::GREATER_THAN_EQUAL
-   *  * right_field:        The right field name
-   *  * throw_global_error: Whether to throw a global error (false by default) or an error tied to the left field
-   *
-   * @param string $leftField   The left field name
-   * @param string $operator    The operator to apply
-   * @param string $rightField  The right field name
-   * @param array  $options     An array of options
-   * @param array  $messages    An array of error messages
-   *
-   * @see sfValidatorBase
-   */
-  public function __construct($leftField, $operator, $rightField, $options = array(), $messages = array())
-  {
-    $this->addOption('left_field', $leftField);
-    $this->addOption('operator', $operator);
-    $this->addOption('right_field', $rightField);
-
-    $this->addOption('throw_global_error', false);
-
-    parent::__construct(null, $options, $messages);
-  }
-
-  /**
-   * @see sfValidatorBase
-   */
-  protected function doClean($values)
-  {
-    if (null === $values)
+    public const EQUAL = '==';
+    public const NOT_EQUAL = '!=';
+    public const IDENTICAL = '===';
+    public const NOT_IDENTICAL = '!==';
+    public const LESS_THAN = '<';
+    public const LESS_THAN_EQUAL = '<=';
+    public const GREATER_THAN = '>';
+    public const GREATER_THAN_EQUAL = '>=';
+
+    /**
+     * Constructor.
+     *
+     * Available options:
+     *
+     *  * left_field:         The left field name
+     *  * operator:           The comparison operator
+     *                          * self::EQUAL
+     *                          * self::NOT_EQUAL
+     *                          * self::IDENTICAL
+     *                          * self::NOT_IDENTICAL
+     *                          * self::LESS_THAN
+     *                          * self::LESS_THAN_EQUAL
+     *                          * self::GREATER_THAN
+     *                          * self::GREATER_THAN_EQUAL
+     *  * right_field:        The right field name
+     *  * throw_global_error: Whether to throw a global error (false by default) or an error tied to the left field
+     *
+     * @param string $leftField  The left field name
+     * @param string $operator   The operator to apply
+     * @param string $rightField The right field name
+     * @param array  $options    An array of options
+     * @param array  $messages   An array of error messages
+     *
+     * @see sfValidatorBase
+     */
+    public function __construct($leftField, $operator, $rightField, $options = array(), $messages = array())
     {
-      $values = array();
-    }
+        $this->addOption('left_field', $leftField);
+        $this->addOption('operator', $operator);
+        $this->addOption('right_field', $rightField);
 
-    if (!is_array($values))
-    {
-      throw new InvalidArgumentException('You must pass an array parameter to the clean() method');
-    }
+        $this->addOption('throw_global_error', false);
 
-    $leftValue  = isset($values[$this->getOption('left_field')]) ? $values[$this->getOption('left_field')] : null;
-    $rightValue = isset($values[$this->getOption('right_field')]) ? $values[$this->getOption('right_field')] : null;
+        parent::__construct(null, $options, $messages);
+    }
 
-    switch ($this->getOption('operator'))
+    /**
+     * @see sfValidatorBase
+     *
+     * @param mixed $indent
+     */
+    public function asString($indent = 0)
     {
-      case self::GREATER_THAN:
-        $valid = $leftValue > $rightValue;
-        break;
-      case self::GREATER_THAN_EQUAL:
-        $valid = $leftValue >= $rightValue;
-        break;
-      case self::LESS_THAN:
-        $valid = $leftValue < $rightValue;
-        break;
-      case self::LESS_THAN_EQUAL:
-        $valid = $leftValue <= $rightValue;
-        break;
-      case self::NOT_EQUAL:
-        $valid = $leftValue != $rightValue;
-        break;
-      case self::EQUAL:
-        $valid = $leftValue == $rightValue;
-        break;
-      case self::NOT_IDENTICAL:
-        $valid = $leftValue !== $rightValue;
-        break;
-      case self::IDENTICAL:
-        $valid = $leftValue === $rightValue;
-        break;
-      default:
-        throw new InvalidArgumentException(sprintf('The operator "%s" does not exist.', $this->getOption('operator')));
+        $options = $this->getOptionsWithoutDefaults();
+        $messages = $this->getMessagesWithoutDefaults();
+        unset($options['left_field'], $options['operator'], $options['right_field']);
+
+        $arguments = '';
+        if ($options || $messages) {
+            $arguments = sprintf(
+                '(%s%s)',
+                $options ? sfYamlInline::dump($options) : ($messages ? '{}' : ''),
+                $messages ? ', '.sfYamlInline::dump($messages) : ''
+            );
+        }
+
+        return sprintf(
+            '%s%s %s%s %s',
+            str_repeat(' ', $indent),
+            $this->getOption('left_field'),
+            $this->getOption('operator'),
+            $arguments,
+            $this->getOption('right_field')
+        );
     }
 
-    if (!$valid)
+    /**
+     * @see sfValidatorBase
+     *
+     * @param mixed $values
+     */
+    protected function doClean($values)
     {
-      $error = new sfValidatorError($this, 'invalid', array(
-        'left_field'  => $leftValue,
-        'right_field' => $rightValue,
-        'operator'    => $this->getOption('operator'),
-      ));
-      if ($this->getOption('throw_global_error'))
-      {
-        throw $error;
-      }
-
-      $errorSchema = new sfValidatorErrorSchema($this);
-      $errorSchema->addError($error, $this->getOption('left_field'));
-
-      throw $errorSchema;
-    }
+        if (null === $values) {
+            $values = array();
+        }
 
-    return $values;
-  }
+        if (!is_array($values)) {
+            throw new InvalidArgumentException('You must pass an array parameter to the clean() method');
+        }
 
-  /**
-   * @see sfValidatorBase
-   */
-  public function asString($indent = 0)
-  {
-    $options = $this->getOptionsWithoutDefaults();
-    $messages = $this->getMessagesWithoutDefaults();
-    unset($options['left_field'], $options['operator'], $options['right_field']);
+        $leftValue = isset($values[$this->getOption('left_field')]) ? $values[$this->getOption('left_field')] : null;
+        $rightValue = isset($values[$this->getOption('right_field')]) ? $values[$this->getOption('right_field')] : null;
 
-    $arguments = '';
-    if ($options || $messages)
-    {
-      $arguments = sprintf('(%s%s)',
-        $options ? sfYamlInline::dump($options) : ($messages ? '{}' : ''),
-        $messages ? ', '.sfYamlInline::dump($messages) : ''
-      );
-    }
+        switch ($this->getOption('operator')) {
+            case self::GREATER_THAN:
+                $valid = $leftValue > $rightValue;
+
+                break;
+
+            case self::GREATER_THAN_EQUAL:
+                $valid = $leftValue >= $rightValue;
+
+                break;
+
+            case self::LESS_THAN:
+                $valid = $leftValue < $rightValue;
+
+                break;
+
+            case self::LESS_THAN_EQUAL:
+                $valid = $leftValue <= $rightValue;
 
-    return sprintf('%s%s %s%s %s',
-      str_repeat(' ', $indent),
-      $this->getOption('left_field'),
-      $this->getOption('operator'),
-      $arguments,
-      $this->getOption('right_field')
-    );
-  }
+                break;
+
+            case self::NOT_EQUAL:
+                $valid = $leftValue != $rightValue;
+
+                break;
+
+            case self::EQUAL:
+                $valid = $leftValue == $rightValue;
+
+                break;
+
+            case self::NOT_IDENTICAL:
+                $valid = $leftValue !== $rightValue;
+
+                break;
+
+            case self::IDENTICAL:
+                $valid = $leftValue === $rightValue;
+
+                break;
+
+            default:
+                throw new InvalidArgumentException(sprintf('The operator "%s" does not exist.', $this->getOption('operator')));
+        }
+
+        if (!$valid) {
+            $error = new sfValidatorError($this, 'invalid', array(
+                'left_field' => $leftValue,
+                'right_field' => $rightValue,
+                'operator' => $this->getOption('operator'),
+            ));
+            if ($this->getOption('throw_global_error')) {
+                throw $error;
+            }
+
+            $errorSchema = new sfValidatorErrorSchema($this);
+            $errorSchema->addError($error, $this->getOption('left_field'));
+
+            throw $errorSchema;
+        }
+
+        return $values;
+    }
 }
diff --git a/lib/validator/sfValidatorSchemaFilter.class.php b/lib/validator/sfValidatorSchemaFilter.class.php
index 14de5b7cb..5ca9920ec 100644
--- a/lib/validator/sfValidatorSchemaFilter.class.php
+++ b/lib/validator/sfValidatorSchemaFilter.class.php
@@ -11,71 +11,66 @@
 /**
  * sfValidatorSchemaFilter executes non schema validator on a schema input value.
  *
- * @package    symfony
- * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 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
-   *
-   * @see sfValidatorBase
-   */
-  public function __construct($field, sfValidatorBase $validator, $options = array(), $messages = array())
-  {
-    $this->addOption('field', $field);
-    $this->addOption('validator', $validator);
+    /**
+     * 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
+     *
+     * @see sfValidatorBase
+     */
+    public function __construct($field, sfValidatorBase $validator, $options = array(), $messages = array())
+    {
+        $this->addOption('field', $field);
+        $this->addOption('validator', $validator);
 
-    parent::__construct(null, $options, $messages);
-  }
+        parent::__construct(null, $options, $messages);
+    }
 
-  /**
-   * @see sfValidatorBase
-   */
-  protected function doClean($values)
-  {
-    if (null === $values)
+    /**
+     * @see sfValidatorBase
+     *
+     * @param mixed $indent
+     */
+    public function asString($indent = 0)
     {
-      $values = array();
+        return sprintf('%s%s:%s', str_repeat(' ', $indent), $this->getOption('field'), $this->getOption('validator')->asString(0));
     }
 
-    if (!is_array($values))
+    /**
+     * @see sfValidatorBase
+     *
+     * @param mixed $values
+     */
+    protected function doClean($values)
     {
-      throw new InvalidArgumentException(sprintf(
-        'You must pass an array parameter to the clean() method for filter field "%s"',
-        $this->getOption('field')
-      ));
-    }
+        if (null === $values) {
+            $values = array();
+        }
 
-    $value = isset($values[$this->getOption('field')]) ? $values[$this->getOption('field')] : null;
+        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')));
+        }
 
-    try
-    {
-      $values[$this->getOption('field')] = $this->getOption('validator')->clean($value);
-    }
-    catch (sfValidatorError $error)
-    {
-      $errorSchema = new sfValidatorErrorSchema($this);
-      $errorSchema->addError($error, $this->getOption('field'));
+        $value = isset($values[$this->getOption('field')]) ? $values[$this->getOption('field')] : null;
 
-      throw $errorSchema;
-    }
+        try {
+            $values[$this->getOption('field')] = $this->getOption('validator')->clean($value);
+        } catch (sfValidatorError $error) {
+            $errorSchema = new sfValidatorErrorSchema($this);
+            $errorSchema->addError($error, $this->getOption('field'));
 
-    return $values;
-  }
+            throw $errorSchema;
+        }
 
-  /**
-   * @see sfValidatorBase
-   */
-  public function asString($indent = 0)
-  {
-    return sprintf('%s%s:%s', str_repeat(' ', $indent), $this->getOption('field'), $this->getOption('validator')->asString(0));
-  }
+        return $values;
+    }
 }
diff --git a/lib/validator/sfValidatorString.class.php b/lib/validator/sfValidatorString.class.php
index faefca7c5..23786f779 100644
--- a/lib/validator/sfValidatorString.class.php
+++ b/lib/validator/sfValidatorString.class.php
@@ -11,61 +11,60 @@
 /**
  * sfValidatorString validates a string. It also converts the input value to a string.
  *
- * @package    symfony
- * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfValidatorString extends sfValidatorBase
 {
-  /**
-   * Configures the current validator.
-   *
-   * Available options:
-   *
-   *  * max_length: The maximum length of the string
-   *  * min_length: The minimum length of the string
-   *
-   * Available error codes:
-   *
-   *  * max_length
-   *  * min_length
-   *
-   * @param array $options   An array of options
-   * @param array $messages  An array of error messages
-   *
-   * @see sfValidatorBase
-   */
-  protected function configure($options = array(), $messages = array())
-  {
-    $this->addMessage('max_length', '"%value%" is too long (%max_length% characters max).');
-    $this->addMessage('min_length', '"%value%" is too short (%min_length% characters min).');
+    /**
+     * Configures the current validator.
+     *
+     * Available options:
+     *
+     *  * max_length: The maximum length of the string
+     *  * min_length: The minimum length of the string
+     *
+     * Available error codes:
+     *
+     *  * max_length
+     *  * min_length
+     *
+     * @param array $options  An array of options
+     * @param array $messages An array of error messages
+     *
+     * @see sfValidatorBase
+     */
+    protected function configure($options = array(), $messages = array())
+    {
+        $this->addMessage('max_length', '"%value%" is too long (%max_length% characters max).');
+        $this->addMessage('min_length', '"%value%" is too short (%min_length% characters min).');
 
-    $this->addOption('max_length');
-    $this->addOption('min_length');
+        $this->addOption('max_length');
+        $this->addOption('min_length');
 
-    $this->setOption('empty_value', '');
-  }
+        $this->setOption('empty_value', '');
+    }
 
-  /**
-   * @see sfValidatorBase
-   */
-  protected function doClean($value)
-  {
-    $clean = (string) $value;
+    /**
+     * @see sfValidatorBase
+     *
+     * @param mixed $value
+     */
+    protected function doClean($value)
+    {
+        $clean = (string) $value;
 
-    $length = function_exists('mb_strlen') ? mb_strlen($clean, $this->getCharset()) : strlen($clean);
+        $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')));
-    }
+        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')));
+        }
 
-    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')));
-    }
+        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')));
+        }
 
-    return $clean;
-  }
+        return $clean;
+    }
 }
diff --git a/lib/validator/sfValidatorTime.class.php b/lib/validator/sfValidatorTime.class.php
index bc18924fc..a8ec40d07 100644
--- a/lib/validator/sfValidatorTime.class.php
+++ b/lib/validator/sfValidatorTime.class.php
@@ -11,141 +11,131 @@
 /**
  * sfValidatorTime validates a time. It also converts the input value to a valid time.
  *
- * @package    symfony
- * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Fabian Lange <fabian.lange@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfValidatorTime extends sfValidatorBase
 {
-  /**
-   * Configures the current validator.
-   *
-   * Available options:
-   *
-   *  * time_format:       A regular expression that dates must match
-   *  * time_output:       The format to use when returning a date with time (default to H:i:s)
-   *  * time_format_error: The date format to use when displaying an error for a bad_format error
-   *
-   * Available error codes:
-   *
-   *  * bad_format
-   *
-   * @param array $options    An array of options
-   * @param array $messages   An array of error messages
-   *
-   * @see sfValidatorBase
-   */
-  protected function configure($options = array(), $messages = array())
-  {
-    $this->addMessage('bad_format', '"%value%" does not match the time format (%time_format%).');
-
-    $this->addOption('time_format', null);
-    $this->addOption('time_output', 'H:i:s');
-    $this->addOption('time_format_error');
-  }
-
-  /**
-   * @see sfValidatorBase
-   */
-  protected function doClean($value)
-  {
-    if (is_array($value))
-    {
-      $clean = $this->convertTimeArrayToTimestamp($value);
-    }
-    else if ($regex = $this->getOption('time_format'))
+    /**
+     * Configures the current validator.
+     *
+     * Available options:
+     *
+     *  * time_format:       A regular expression that dates must match
+     *  * time_output:       The format to use when returning a date with time (default to H:i:s)
+     *  * time_format_error: The date format to use when displaying an error for a bad_format error
+     *
+     * Available error codes:
+     *
+     *  * bad_format
+     *
+     * @param array $options  An array of options
+     * @param array $messages An array of error messages
+     *
+     * @see sfValidatorBase
+     */
+    protected function configure($options = array(), $messages = array())
     {
-      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')));
-      }
+        $this->addMessage('bad_format', '"%value%" does not match the time format (%time_format%).');
 
-      $clean = $this->convertTimeArrayToTimestamp($match);
+        $this->addOption('time_format', null);
+        $this->addOption('time_output', 'H:i:s');
+        $this->addOption('time_format_error');
     }
-    else if (!ctype_digit($value))
-    {
-      $clean = strtotime($value);
-      if (false === $clean)
-      {
-        throw new sfValidatorError($this, 'invalid', array('value' => $value));
-      }
-    }
-    else
+
+    /**
+     * @see sfValidatorBase
+     *
+     * @param mixed $value
+     */
+    protected function doClean($value)
     {
-      $clean = (integer) $value;
-    }
+        if (is_array($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')));
+            }
 
-    return $clean === $this->getEmptyValue() ? $clean : date($this->getOption('time_output'), $clean);
-  }
+            $clean = $this->convertTimeArrayToTimestamp($match);
+        } elseif (!ctype_digit($value)) {
+            $clean = strtotime($value);
+            if (false === $clean) {
+                throw new sfValidatorError($this, 'invalid', array('value' => $value));
+            }
+        } else {
+            $clean = (int) $value;
+        }
 
-  /**
-   * Converts an array representing a time to a timestamp.
-   *
-   * The array can contains the following keys: hour, minute, second
-   *
-   * @param  array $value  An array of date elements
-   *
-   * @return int A timestamp
-   */
-  protected function convertTimeArrayToTimestamp($value)
-  {
-    // all elements must be empty or a number
-    foreach (array('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));
-      }
+        return $clean === $this->getEmptyValue() ? $clean : date($this->getOption('time_output'), $clean);
     }
 
-    // if second is set, minute and hour must be set
-    // if minute is set, hour must be set
-    if (
-      $this->isValueSet($value, 'second') && (!$this->isValueSet($value, 'minute') || !$this->isValueSet($value, 'hour'))
-      ||
-      $this->isValueSet($value, 'minute') && !$this->isValueSet($value, 'hour')
-    )
+    /**
+     * Converts an array representing a time to a timestamp.
+     *
+     * The array can contains the following keys: hour, minute, second
+     *
+     * @param array $value An array of date elements
+     *
+     * @return int A timestamp
+     */
+    protected function convertTimeArrayToTimestamp($value)
     {
-      throw new sfValidatorError($this, 'invalid', array('value' => $value));
-    }
+        // all elements must be empty or a number
+        foreach (array('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));
+            }
+        }
 
-    $clean = mktime(
-      isset($value['hour']) ? (int) $value['hour'] : 0,
-      isset($value['minute']) ? (int) $value['minute'] : 0,
-      isset($value['second']) ? (int) $value['second'] : 0
-    );
+        // if second is set, minute and hour must be set
+        // if minute is set, hour must be set
+        if (
+            $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));
+        }
 
-    if (false === $clean)
-    {
-      throw new sfValidatorError($this, 'invalid', array('value' => var_export($value, true)));
-    }
+        $clean = mktime(
+            isset($value['hour']) ? (int) $value['hour'] : 0,
+            isset($value['minute']) ? (int) $value['minute'] : 0,
+            isset($value['second']) ? (int) $value['second'] : 0
+        );
 
-    return $clean;
-  }
+        if (false === $clean) {
+            throw new sfValidatorError($this, 'invalid', array('value' => var_export($value, true)));
+        }
 
-  protected function isValueSet($values, $key)
-  {
-    return isset($values[$key]) && !in_array($values[$key], array(null, ''), true);
-  }
+        return $clean;
+    }
 
-  /**
-   * @see sfValidatorBase
-   */
-  protected function isEmpty($value)
-  {
-    if (is_array($value))
+    protected function isValueSet($values, $key)
     {
-      // array is not empty when a value is found
-      foreach($value as $key => $val)
-      {
-        // int and string '0' are 'empty' values that are explicitly accepted
-        if ($val === 0 || $val === '0' || !empty($val)) return false;
-      }
-      return true;
+        return isset($values[$key]) && !in_array($values[$key], array(null, ''), true);
     }
 
-    return parent::isEmpty($value);
-  }
+    /**
+     * @see sfValidatorBase
+     *
+     * @param mixed $value
+     */
+    protected function isEmpty($value)
+    {
+        if (is_array($value)) {
+            // array is not empty when a value is found
+            foreach ($value as $key => $val) {
+                // int and string '0' are 'empty' values that are explicitly accepted
+                if (0 === $val || '0' === $val || !empty($val)) {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        return parent::isEmpty($value);
+    }
 }
diff --git a/lib/validator/sfValidatorUrl.class.php b/lib/validator/sfValidatorUrl.class.php
index b39f23632..d63cf3a88 100644
--- a/lib/validator/sfValidatorUrl.class.php
+++ b/lib/validator/sfValidatorUrl.class.php
@@ -11,14 +11,13 @@
 /**
  * sfValidatorUrl validates Urls.
  *
- * @package    symfony
- * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfValidatorUrl extends sfValidatorRegex
 {
-  const REGEX_URL_FORMAT = '~^
+    public const REGEX_URL_FORMAT = '~^
       (%s)://                                 # protocol
       (
         ([a-z0-9-]+\.)+[a-z]{2,6}             # a domain name
@@ -29,31 +28,31 @@ class sfValidatorUrl extends sfValidatorRegex
       (/?|/\S+)                               # a /, nothing or a / with something
     $~ix';
 
-  /**
-   * Available options:
-   *
-   *  * protocols: An array of acceptable URL protocols (http, https, ftp and ftps by default)
-   *
-   * @param array $options   An array of options
-   * @param array $messages  An array of error messages
-   *
-   * @see sfValidatorRegex
-   */
-  protected function configure($options = array(), $messages = array())
-  {
-    parent::configure($options, $messages);
+    /**
+     * Generates the current validator's regular expression.
+     *
+     * @return string
+     */
+    public function generateRegex()
+    {
+        return sprintf(self::REGEX_URL_FORMAT, implode('|', $this->getOption('protocols')));
+    }
 
-    $this->addOption('protocols', array('http', 'https', 'ftp', 'ftps'));
-    $this->setOption('pattern', new sfCallable(array($this, 'generateRegex')));
-  }
+    /**
+     * Available options:.
+     *
+     *  * protocols: An array of acceptable URL protocols (http, https, ftp and ftps by default)
+     *
+     * @param array $options  An array of options
+     * @param array $messages An array of error messages
+     *
+     * @see sfValidatorRegex
+     */
+    protected function configure($options = array(), $messages = array())
+    {
+        parent::configure($options, $messages);
 
-  /**
-   * Generates the current validator's regular expression.
-   *
-   * @return string
-   */
-  public function generateRegex()
-  {
-    return sprintf(self::REGEX_URL_FORMAT, implode('|', $this->getOption('protocols')));
-  }
+        $this->addOption('protocols', array('http', 'https', 'ftp', 'ftps'));
+        $this->setOption('pattern', new sfCallable(array($this, 'generateRegex')));
+    }
 }
diff --git a/lib/view/sfPHPView.class.php b/lib/view/sfPHPView.class.php
index f6feca06c..6ccd701cd 100644
--- a/lib/view/sfPHPView.class.php
+++ b/lib/view/sfPHPView.class.php
@@ -12,190 +12,172 @@
 /**
  * A view that uses PHP as the templating engine.
  *
- * @package    symfony
- * @subpackage view
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 class sfPHPView extends sfView
 {
-  /**
-   * Executes any presentation logic for this view.
-   */
-  public function execute()
-  {
-  }
-
-  /**
-   * Loads core and standard helpers to be use in the template.
-   */
-  protected function loadCoreAndStandardHelpers()
-  {
-    static $coreHelpersLoaded = 0;
-
-    if ($coreHelpersLoaded)
+    /**
+     * Executes any presentation logic for this view.
+     */
+    public function execute()
     {
-      return;
     }
 
-    $coreHelpersLoaded = 1;
+    /**
+     * Retrieves the template engine associated with this view.
+     *
+     * Note: This will return null because PHP itself has no engine reference.
+     */
+    public function getEngine()
+    {
+        return null;
+    }
 
-    $helpers = array_unique(array_merge(array('Helper', 'Url', 'Asset', 'Tag', 'Escaping'), sfConfig::get('sf_standard_helpers')));
+    /**
+     * Configures template.
+     */
+    public function configure()
+    {
+        // store our current view
+        $this->context->set('view_instance', $this);
 
-    $this->context->getConfiguration()->loadHelpers($helpers);
-  }
+        // require our configuration
+        require $this->context->getConfigCache()->checkConfig('modules/'.$this->moduleName.'/config/view.yml');
 
-  /**
-   * Renders the presentation.
-   *
-   * @param  string $_sfFile  Filename
-   *
-   * @return string File content
-   */
-  protected function renderFile($_sfFile)
-  {
-    if (sfConfig::get('sf_logging_enabled'))
-    {
-      $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Render "%s"', $_sfFile))));
+        // set template directory
+        if (!$this->directory) {
+            $this->setDirectory($this->context->getConfiguration()->getTemplateDir($this->moduleName, $this->getTemplate()));
+        }
     }
 
-    $this->loadCoreAndStandardHelpers();
+    /**
+     * Renders the presentation.
+     *
+     * @return string A string representing the rendered presentation
+     */
+    public function render()
+    {
+        $content = null;
+        if (sfConfig::get('sf_cache')) {
+            $viewCache = $this->context->getViewCacheManager();
+            $uri = $viewCache->getCurrentCacheKey();
+
+            if (null !== $uri) {
+                list($content, $decoratorTemplate) = $viewCache->getActionCache($uri);
+                if (null !== $content) {
+                    $this->setDecoratorTemplate($decoratorTemplate);
+                }
+            }
+        }
 
-    // EXTR_REFS can't be used (see #3595 and #3151)
-    $vars = $this->attributeHolder->toArray();
-    extract($vars);
+        // render template if no cache
+        if (null === $content) {
+            // execute pre-render check
+            $this->preRenderCheck();
 
-    // render
-    ob_start();
-    ob_implicit_flush(0);
+            $this->attributeHolder->set('sf_type', 'action');
 
-    try
-    {
-      require($_sfFile);
-    }
-    catch (Exception $e)
-    {
-      // need to end output buffering before throwing the exception #7596
-      ob_end_clean();
-      throw $e;
-    }
+            // render template file
+            $content = $this->renderFile($this->getDirectory().'/'.$this->getTemplate());
 
-    return ob_get_clean();
-  }
-
-  /**
-   * Retrieves the template engine associated with this view.
-   *
-   * Note: This will return null because PHP itself has no engine reference.
-   *
-   * @return null
-   */
-  public function getEngine()
-  {
-    return null;
-  }
-
-  /**
-   * Configures template.
-   *
-   * @return void
-   */
-  public function configure()
-  {
-    // store our current view
-    $this->context->set('view_instance', $this);
-
-    // require our configuration
-    require($this->context->getConfigCache()->checkConfig('modules/'.$this->moduleName.'/config/view.yml'));
-
-    // set template directory
-    if (!$this->directory)
-    {
-      $this->setDirectory($this->context->getConfiguration()->getTemplateDir($this->moduleName, $this->getTemplate()));
+            if (sfConfig::get('sf_cache') && null !== $uri) {
+                $content = $viewCache->setActionCache($uri, $content, $this->isDecorator() ? $this->getDecoratorDirectory().'/'.$this->getDecoratorTemplate() : false);
+            }
+        }
+
+        // now render decorator template, if one exists
+        if ($this->isDecorator()) {
+            $content = $this->decorate($content);
+        }
+
+        return $content;
     }
-  }
-
-  /**
-   * Loop through all template slots and fill them in with the results of presentation data.
-   *
-   * @param  string $content  A chunk of decorator content
-   *
-   * @return string A decorated template
-   */
-  protected function decorate($content)
-  {
-    if (sfConfig::get('sf_logging_enabled'))
+
+    /**
+     * Loads core and standard helpers to be use in the template.
+     */
+    protected function loadCoreAndStandardHelpers()
     {
-      $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Decorate content with "%s/%s"', $this->getDecoratorDirectory(), $this->getDecoratorTemplate()))));
-    }
+        static $coreHelpersLoaded = 0;
 
-    // set the decorator content as an attribute
-    $attributeHolder = $this->attributeHolder;
+        if ($coreHelpersLoaded) {
+            return;
+        }
 
-    $this->attributeHolder = $this->initializeAttributeHolder(array('sf_content' => new sfOutputEscaperSafe($content)));
-    $this->attributeHolder->set('sf_type', 'layout');
+        $coreHelpersLoaded = 1;
 
-    // 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));
+        $helpers = array_unique(array_merge(array('Helper', 'Url', 'Asset', 'Tag', 'Escaping'), sfConfig::get('sf_standard_helpers')));
+
+        $this->context->getConfiguration()->loadHelpers($helpers);
     }
 
-    // render the decorator template and return the result
-    $ret = $this->renderFile($this->getDecoratorDirectory().'/'.$this->getDecoratorTemplate());
+    /**
+     * Renders the presentation.
+     *
+     * @param string $_sfFile Filename
+     *
+     * @return string File content
+     */
+    protected function renderFile($_sfFile)
+    {
+        if (sfConfig::get('sf_logging_enabled')) {
+            $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Render "%s"', $_sfFile))));
+        }
 
-    $this->attributeHolder = $attributeHolder;
+        $this->loadCoreAndStandardHelpers();
 
-    return $ret;
-  }
+        // EXTR_REFS can't be used (see #3595 and #3151)
+        $vars = $this->attributeHolder->toArray();
+        extract($vars);
 
-  /**
-   * Renders the presentation.
-   *
-   * @return string A string representing the rendered presentation
-   */
-  public function render()
-  {
-    $content = null;
-    if (sfConfig::get('sf_cache'))
-    {
-      $viewCache = $this->context->getViewCacheManager();
-      $uri = $viewCache->getCurrentCacheKey();
-
-      if (null !== $uri)
-      {
-        list($content, $decoratorTemplate) = $viewCache->getActionCache($uri);
-        if (null !== $content)
-        {
-          $this->setDecoratorTemplate($decoratorTemplate);
+        // render
+        ob_start();
+        ob_implicit_flush(0);
+
+        try {
+            require $_sfFile;
+        } catch (Exception $e) {
+            // need to end output buffering before throwing the exception #7596
+            ob_end_clean();
+
+            throw $e;
         }
-      }
+
+        return ob_get_clean();
     }
 
-    // render template if no cache
-    if (null === $content)
+    /**
+     * Loop through all template slots and fill them in with the results of presentation data.
+     *
+     * @param string $content A chunk of decorator content
+     *
+     * @return string A decorated template
+     */
+    protected function decorate($content)
     {
-      // execute pre-render check
-      $this->preRenderCheck();
+        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()))));
+        }
 
-      $this->attributeHolder->set('sf_type', 'action');
+        // set the decorator content as an attribute
+        $attributeHolder = $this->attributeHolder;
 
-      // render template file
-      $content = $this->renderFile($this->getDirectory().'/'.$this->getTemplate());
+        $this->attributeHolder = $this->initializeAttributeHolder(array('sf_content' => new sfOutputEscaperSafe($content)));
+        $this->attributeHolder->set('sf_type', 'layout');
 
-      if (sfConfig::get('sf_cache') && null !== $uri)
-      {
-        $content = $viewCache->setActionCache($uri, $content, $this->isDecorator() ? $this->getDecoratorDirectory().'/'.$this->getDecoratorTemplate() : false);
-      }
-    }
+        // 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));
+        }
 
-    // now render decorator template, if one exists
-    if ($this->isDecorator())
-    {
-      $content = $this->decorate($content);
-    }
+        // render the decorator template and return the result
+        $ret = $this->renderFile($this->getDecoratorDirectory().'/'.$this->getDecoratorTemplate());
 
-    return $content;
-  }
+        $this->attributeHolder = $attributeHolder;
+
+        return $ret;
+    }
 }
diff --git a/lib/view/sfPartialView.class.php b/lib/view/sfPartialView.class.php
index d8a122eff..7c7711552 100644
--- a/lib/view/sfPartialView.class.php
+++ b/lib/view/sfPartialView.class.php
@@ -11,155 +11,137 @@
 /**
  * A View to render partials.
  *
- * @package    symfony
- * @subpackage view
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfPartialView extends sfPHPView
 {
-  protected
-    $viewCache   = null,
-    $checkCache  = false,
-    $cacheKey    = null,
-    $partialVars = array();
-
-  /**
-   * Constructor.
-   * 
-   * @see sfView
-   */
-  public function initialize($context, $moduleName, $actionName, $viewName)
-  {
-    $ret = parent::initialize($context, $moduleName, $actionName, $viewName);
-
-    $this->viewCache = $this->context->getViewCacheManager();
-
-    if (sfConfig::get('sf_cache'))
+    protected $viewCache;
+    protected $checkCache = false;
+    protected $cacheKey;
+    protected $partialVars = array();
+
+    /**
+     * Constructor.
+     *
+     * @see sfView
+     *
+     * @param mixed $context
+     * @param mixed $moduleName
+     * @param mixed $actionName
+     * @param mixed $viewName
+     */
+    public function initialize($context, $moduleName, $actionName, $viewName)
     {
-      $this->checkCache = $this->viewCache->isActionCacheable($moduleName, $actionName);
-    }
+        $ret = parent::initialize($context, $moduleName, $actionName, $viewName);
 
-    return $ret;
-  }
-
-  /**
-   * Executes any presentation logic for this view.
-   */
-  public function execute()
-  {
-  }
-
-  /**
-   * @param array $partialVars
-   */
-  public function setPartialVars(array $partialVars)
-  {
-    $this->partialVars = $partialVars;
-    $this->getAttributeHolder()->add($partialVars);
-  }
-
-  /**
-   * Configures template for this view.
-   */
-  public function configure()
-  {
-    $this->setDecorator(false);
-    $this->setTemplate($this->actionName.$this->getExtension());
-    if ('global' == $this->moduleName)
-    {
-      $this->setDirectory($this->context->getConfiguration()->getDecoratorDir($this->getTemplate()));
-    }
-    else
-    {
-      $this->setDirectory($this->context->getConfiguration()->getTemplateDir($this->moduleName, $this->getTemplate()));
-    }
-  }
-
-  /**
-   * Renders the presentation.
-   *
-   * @return string Current template content
-   */
-  public function render()
-  {
-    if (sfConfig::get('sf_debug') && sfConfig::get('sf_logging_enabled'))
-    {
-      $timer = sfTimerManager::getTimer(sprintf('Partial "%s/%s"', $this->moduleName, $this->actionName));
-    }
+        $this->viewCache = $this->context->getViewCacheManager();
 
-    if ($retval = $this->getCache())
-    {
-      return $retval;
-    }
+        if (sfConfig::get('sf_cache')) {
+            $this->checkCache = $this->viewCache->isActionCacheable($moduleName, $actionName);
+        }
 
-    if ($this->checkCache)
-    {
-      $mainResponse = $this->context->getResponse();
-
-      $responseClass = get_class($mainResponse);
-      $response = new $responseClass($this->context->getEventDispatcher(), $mainResponse->getOptions());
-
-      // the inner response has access to different properties, depending on whether it is marked as contextual in cache.yml
-      if ($this->viewCache->isContextual($this->viewCache->getPartialUri($this->moduleName, $this->actionName, $this->cacheKey)))
-      {
-        $response->copyProperties($mainResponse);
-      }
-      else
-      {
-        $response->setContentType($mainResponse->getContentType());
-      }
-
-      $this->context->setResponse($response);
+        return $ret;
     }
 
-    try
-    {
-      // execute pre-render check
-      $this->preRenderCheck();
-
-      $this->getAttributeHolder()->set('sf_type', 'partial');
-
-      // render template
-      $retval = $this->renderFile($this->getDirectory().'/'.$this->getTemplate());
-    }
-    catch (Exception $e)
+    /**
+     * Executes any presentation logic for this view.
+     */
+    public function execute()
     {
-      if ($this->checkCache)
-      {
-        $this->context->setResponse($mainResponse);
-        $mainResponse->merge($response);
-      }
-
-      throw $e;
     }
 
-    if ($this->checkCache)
+    public function setPartialVars(array $partialVars)
     {
-      $retval = $this->viewCache->setPartialCache($this->moduleName, $this->actionName, $this->cacheKey, $retval);
-      $this->context->setResponse($mainResponse);
-      $mainResponse->merge($response);
+        $this->partialVars = $partialVars;
+        $this->getAttributeHolder()->add($partialVars);
     }
 
-    if (sfConfig::get('sf_debug') && sfConfig::get('sf_logging_enabled'))
+    /**
+     * Configures template for this view.
+     */
+    public function configure()
     {
-      $timer->addTime();
+        $this->setDecorator(false);
+        $this->setTemplate($this->actionName.$this->getExtension());
+        if ('global' == $this->moduleName) {
+            $this->setDirectory($this->context->getConfiguration()->getDecoratorDir($this->getTemplate()));
+        } else {
+            $this->setDirectory($this->context->getConfiguration()->getTemplateDir($this->moduleName, $this->getTemplate()));
+        }
     }
 
-    return $retval;
-  }
-
-  public function getCache()
-  {
-    if (!$this->checkCache)
+    /**
+     * Renders the presentation.
+     *
+     * @return string Current template content
+     */
+    public function render()
     {
-      return null;
+        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()) {
+            return $retval;
+        }
+
+        if ($this->checkCache) {
+            $mainResponse = $this->context->getResponse();
+
+            $responseClass = get_class($mainResponse);
+            $response = new $responseClass($this->context->getEventDispatcher(), $mainResponse->getOptions());
+
+            // the inner response has access to different properties, depending on whether it is marked as contextual in cache.yml
+            if ($this->viewCache->isContextual($this->viewCache->getPartialUri($this->moduleName, $this->actionName, $this->cacheKey))) {
+                $response->copyProperties($mainResponse);
+            } else {
+                $response->setContentType($mainResponse->getContentType());
+            }
+
+            $this->context->setResponse($response);
+        }
+
+        try {
+            // execute pre-render check
+            $this->preRenderCheck();
+
+            $this->getAttributeHolder()->set('sf_type', 'partial');
+
+            // render template
+            $retval = $this->renderFile($this->getDirectory().'/'.$this->getTemplate());
+        } catch (Exception $e) {
+            if ($this->checkCache) {
+                $this->context->setResponse($mainResponse);
+                $mainResponse->merge($response);
+            }
+
+            throw $e;
+        }
+
+        if ($this->checkCache) {
+            $retval = $this->viewCache->setPartialCache($this->moduleName, $this->actionName, $this->cacheKey, $retval);
+            $this->context->setResponse($mainResponse);
+            $mainResponse->merge($response);
+        }
+
+        if (sfConfig::get('sf_debug') && sfConfig::get('sf_logging_enabled')) {
+            $timer->addTime();
+        }
+
+        return $retval;
     }
 
-    $this->cacheKey = $this->viewCache->checkCacheKey($this->partialVars);
-    if ($retval = $this->viewCache->getPartialCache($this->moduleName, $this->actionName, $this->cacheKey))
+    public function getCache()
     {
-      return $retval;
+        if (!$this->checkCache) {
+            return null;
+        }
+
+        $this->cacheKey = $this->viewCache->checkCacheKey($this->partialVars);
+        if ($retval = $this->viewCache->getPartialCache($this->moduleName, $this->actionName, $this->cacheKey)) {
+            return $retval;
+        }
     }
-  }
 }
diff --git a/lib/view/sfView.class.php b/lib/view/sfView.class.php
index 87107d59c..35bc3a3bc 100644
--- a/lib/view/sfView.class.php
+++ b/lib/view/sfView.class.php
@@ -14,559 +14,539 @@
  * customized by supplying attributes, which a template can manipulate and
  * display.
  *
- * @package    symfony
- * @subpackage view
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfView
 {
-  /**
-   * Show an alert view.
-   */
-  const ALERT = 'Alert';
-
-  /**
-   * Show an error view.
-   */
-  const ERROR = 'Error';
-
-  /**
-   * Show a form input view.
-   */
-  const INPUT = 'Input';
-
-  /**
-   * Skip view execution.
-   */
-  const NONE = 'None';
-
-  /**
-   * Show a success view.
-   */
-  const SUCCESS = 'Success';
-
-  /**
-   * Do not render the presentation.
-   */
-  const RENDER_NONE = 1;
-
-  /**
-   * Render the presentation to the client.
-   */
-  const RENDER_CLIENT = 2;
-
-  /**
-   * Render the presentation to a variable.
-   */
-  const RENDER_VAR = 4;
-
-  /**
-   * Skip view rendering but output http headers
-   */
-  const HEADER_ONLY = 8;
-
-  protected
-    $context            = null,
-    $dispatcher         = null,
-    $decorator          = false,
-    $decoratorDirectory = null,
-    $decoratorTemplate  = null,
-    $directory          = null,
-    $componentSlots     = array(),
-    $template           = null,
-    $attributeHolder    = null,
-    $parameterHolder    = null,
-    $moduleName         = '',
-    $actionName         = '',
-    $viewName           = '',
-    $extension          = '.php';
-
-  /**
-   * Class constructor.
-   *
-   * @see initialize()
-   */
-  public function __construct($context, $moduleName, $actionName, $viewName)
-  {
-    $this->initialize($context, $moduleName, $actionName, $viewName);
-  }
-
-  /**
-   * 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
-   *
-   * @return bool  true, if initialization completes successfully, otherwise false
-   */
-  public function initialize($context, $moduleName, $actionName, $viewName)
-  {
-    $this->moduleName = $moduleName;
-    $this->actionName = $actionName;
-    $this->viewName   = $viewName;
-
-    $this->context    = $context;
-    $this->dispatcher = $context->getEventDispatcher();
-
-    sfOutputEscaper::markClassesAsSafe(array('sfForm', 'sfFormField', 'sfFormFieldSchema', 'sfModelGeneratorHelper'));
-
-    $this->attributeHolder = $this->initializeAttributeHolder();
-
-    $this->parameterHolder = new sfParameterHolder();
-    $this->parameterHolder->add(sfConfig::get('mod_'.strtolower($moduleName).'_view_param', array()));
-
-    $request = $context->getRequest();
-
-    $format = $request->getRequestFormat();
-    if (null !== $format)
+    /**
+     * Show an alert view.
+     */
+    public const ALERT = 'Alert';
+
+    /**
+     * Show an error view.
+     */
+    public const ERROR = 'Error';
+
+    /**
+     * Show a form input view.
+     */
+    public const INPUT = 'Input';
+
+    /**
+     * Skip view execution.
+     */
+    public const NONE = 'None';
+
+    /**
+     * Show a success view.
+     */
+    public const SUCCESS = 'Success';
+
+    /**
+     * Do not render the presentation.
+     */
+    public const RENDER_NONE = 1;
+
+    /**
+     * Render the presentation to the client.
+     */
+    public const RENDER_CLIENT = 2;
+
+    /**
+     * Render the presentation to a variable.
+     */
+    public const RENDER_VAR = 4;
+
+    /**
+     * Skip view rendering but output http headers.
+     */
+    public const HEADER_ONLY = 8;
+
+    protected $context;
+    protected $dispatcher;
+    protected $decorator = false;
+    protected $decoratorDirectory;
+    protected $decoratorTemplate;
+    protected $directory;
+    protected $componentSlots = array();
+    protected $template;
+    protected $attributeHolder;
+    protected $parameterHolder;
+    protected $moduleName = '';
+    protected $actionName = '';
+    protected $viewName = '';
+    protected $extension = '.php';
+
+    /**
+     * Class constructor.
+     *
+     * @see initialize()
+     *
+     * @param mixed $context
+     * @param mixed $moduleName
+     * @param mixed $actionName
+     * @param mixed $viewName
+     */
+    public function __construct($context, $moduleName, $actionName, $viewName)
+    {
+        $this->initialize($context, $moduleName, $actionName, $viewName);
+    }
+
+    /**
+     * Calls methods defined via sfEventDispatcher.
+     *
+     * @param string $method    The method name
+     * @param array  $arguments The method arguments
+     *
+     * @return mixed The returned value of the called method
+     *
+     * @throws sfException< If the calls fails
+     */
+    public function __call($method, $arguments)
+    {
+        $event = $this->dispatcher->notifyUntil(new sfEvent($this, 'view.method_not_found', array('method' => $method, 'arguments' => $arguments)));
+        if (!$event->isProcessed()) {
+            throw new sfException(sprintf('Call to undefined method %s::%s.', get_class($this), $method));
+        }
+
+        return $event->getReturnValue();
+    }
+
+    /**
+     * 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
+     *
+     * @return bool true, if initialization completes successfully, otherwise false
+     */
+    public function initialize($context, $moduleName, $actionName, $viewName)
+    {
+        $this->moduleName = $moduleName;
+        $this->actionName = $actionName;
+        $this->viewName = $viewName;
+
+        $this->context = $context;
+        $this->dispatcher = $context->getEventDispatcher();
+
+        sfOutputEscaper::markClassesAsSafe(array('sfForm', 'sfFormField', 'sfFormFieldSchema', 'sfModelGeneratorHelper'));
+
+        $this->attributeHolder = $this->initializeAttributeHolder();
+
+        $this->parameterHolder = new sfParameterHolder();
+        $this->parameterHolder->add(sfConfig::get('mod_'.strtolower($moduleName).'_view_param', array()));
+
+        $request = $context->getRequest();
+
+        $format = $request->getRequestFormat();
+        if (null !== $format) {
+            if ('html' != $format) {
+                $this->setExtension('.'.$format.$this->getExtension());
+            }
+
+            if ($mimeType = $request->getMimeType($format)) {
+                $this->context->getResponse()->setContentType($mimeType);
+
+                if ('html' != $format) {
+                    $this->setDecorator(false);
+                }
+            }
+        }
+        $this->dispatcher->notify(new sfEvent($this, 'view.configure_format', array('format' => $format, 'response' => $context->getResponse(), 'request' => $context->getRequest())));
+
+        // include view configuration
+        $this->configure();
+
+        return true;
+    }
+
+    /**
+     * Executes any presentation logic and set template attributes.
+     */
+    abstract public function execute();
+
+    /**
+     * Configures template.
+     */
+    abstract public function configure();
+
+    /**
+     * Retrieves this views decorator template directory.
+     *
+     * @return string An absolute filesystem path to this views decorator template directory
+     */
+    public function getDecoratorDirectory()
+    {
+        return $this->decoratorDirectory;
+    }
+
+    /**
+     * Retrieves this views decorator template.
+     *
+     * @return string A template filename, if a template has been set, otherwise null
+     */
+    public function getDecoratorTemplate()
+    {
+        return $this->decoratorTemplate;
+    }
+
+    /**
+     * Retrieves this view template directory.
+     *
+     * @return string An absolute filesystem path to this views template directory
+     */
+    public function getDirectory()
+    {
+        return $this->directory;
+    }
+
+    /**
+     * Retrieves the template engine associated with this view.
+     *
+     * Note: This will return null for PHPView instances.
+     *
+     * @return mixed A template engine instance
+     */
+    abstract public function getEngine();
+
+    /**
+     * Retrieves this views template.
+     *
+     * @return string A template filename, if a template has been set, otherwise null
+     */
+    public function getTemplate()
+    {
+        return $this->template;
+    }
+
+    /**
+     * Retrieves attributes for the current view.
+     *
+     * @return sfParameterHolder The attribute parameter holder
+     */
+    public function getAttributeHolder()
+    {
+        return $this->attributeHolder;
+    }
+
+    /**
+     * Retrieves an attribute for the current view.
+     *
+     * @param string $name    Name of the attribute
+     * @param string $default Value of the attribute
+     *
+     * @return mixed Attribute
+     */
+    public function getAttribute($name, $default = null)
+    {
+        return $this->attributeHolder->get($name, $default);
+    }
+
+    /**
+     * Returns true if the view have attributes.
+     *
+     * @param string $name Name of the attribute
+     *
+     * @return mixed Attribute of the view
+     */
+    public function hasAttribute($name)
+    {
+        return $this->attributeHolder->has($name);
+    }
+
+    /**
+     * Sets an attribute of the view.
+     *
+     * @param string $name  Attribute name
+     * @param string $value Value for the attribute
+     */
+    public function setAttribute($name, $value)
     {
-      if ('html' != $format)
-      {
-        $this->setExtension('.'.$format.$this->getExtension());
-      }
-
-      if ($mimeType = $request->getMimeType($format))
-      {
-        $this->context->getResponse()->setContentType($mimeType);
-
-        if ('html' != $format)
-        {
-          $this->setDecorator(false);
+        $this->attributeHolder->set($name, $value);
+    }
+
+    /**
+     * Retrieves the parameters for the current view.
+     *
+     * @return sfParameterHolder The parameter holder
+     */
+    public function getParameterHolder()
+    {
+        return $this->parameterHolder;
+    }
+
+    /**
+     * Retrieves a parameter from the current view.
+     *
+     * @param string $name    Parameter name
+     * @param string $default Default parameter value
+     *
+     * @return mixed A parameter value
+     */
+    public function getParameter($name, $default = null)
+    {
+        return $this->parameterHolder->get($name, $default);
+    }
+
+    /**
+     * Indicates whether or not a parameter exist for the current view.
+     *
+     * @param string $name Name of the parameter
+     *
+     * @return bool true, if the parameter exists otherwise false
+     */
+    public function hasParameter($name)
+    {
+        return $this->parameterHolder->has($name);
+    }
+
+    /**
+     * Sets a parameter for the view.
+     *
+     * @param string $name  Name of the parameter
+     * @param string $value The parameter value
+     */
+    public function setParameter($name, $value)
+    {
+        $this->parameterHolder->set($name, $value);
+    }
+
+    /**
+     * Indicates that this view is a decorating view.
+     *
+     * @return bool true, if this view is a decorating view, otherwise false
+     */
+    public function isDecorator()
+    {
+        return $this->decorator;
+    }
+
+    /**
+     * Sets the decorating mode for the current view.
+     *
+     * @param bool $boolean Set the decorating mode for the view
+     */
+    public function setDecorator($boolean)
+    {
+        $this->decorator = (bool) $boolean;
+
+        if (false === $boolean) {
+            $this->decoratorTemplate = false;
         }
-      }
     }
-    $this->dispatcher->notify(new sfEvent($this, 'view.configure_format', array('format' => $format, 'response' => $context->getResponse(), 'request' => $context->getRequest())));
-
-    // include view configuration
-    $this->configure();
-
-    return true;
-  }
-
-  protected function initializeAttributeHolder($attributes = array())
-  {
-    $attributeHolder = new sfViewParameterHolder($this->dispatcher, $attributes, array(
-      'escaping_method'   => sfConfig::get('sf_escaping_method'),
-      'escaping_strategy' => sfConfig::get('sf_escaping_strategy'),
-    ));
-
-    return $attributeHolder;
-  }
-
-  /**
-   * Executes any presentation logic and set template attributes.
-   */
-  abstract function execute();
-
-  /**
-   * Configures template.
-   */
-  abstract function configure();
-
-  /**
-   * Retrieves this views decorator template directory.
-   *
-   * @return string An absolute filesystem path to this views decorator template directory
-   */
-  public function getDecoratorDirectory()
-  {
-    return $this->decoratorDirectory;
-  }
-
-  /**
-   * Retrieves this views decorator template.
-   *
-   * @return string A template filename, if a template has been set, otherwise null
-   */
-  public function getDecoratorTemplate()
-  {
-    return $this->decoratorTemplate;
-  }
-
-  /**
-   * Retrieves this view template directory.
-   *
-   * @return string An absolute filesystem path to this views template directory
-   */
-  public function getDirectory()
-  {
-    return $this->directory;
-  }
-
-  /**
-   * Retrieves the template engine associated with this view.
-   *
-   * Note: This will return null for PHPView instances.
-   *
-   * @return mixed A template engine instance
-   */
-  abstract function getEngine();
-
-  /**
-   * Retrieves this views template.
-   *
-   * @return string A template filename, if a template has been set, otherwise null
-   */
-  public function getTemplate()
-  {
-    return $this->template;
-  }
-
-  /**
-   * Retrieves attributes for the current view.
-   *
-   * @return sfParameterHolder The attribute parameter holder
-   */
-  public function getAttributeHolder()
-  {
-    return $this->attributeHolder;
-  }
-
-  /**
-   * Retrieves an attribute for the current view.
-   *
-   * @param  string $name     Name of the attribute
-   * @param  string $default  Value of the attribute
-   *
-   * @return mixed Attribute
-   */
-  public function getAttribute($name, $default = null)
-  {
-    return $this->attributeHolder->get($name, $default);
-  }
-
-  /**
-   * Returns true if the view have attributes.
-   *
-   * @param  string $name  Name of the attribute
-   *
-   * @return mixed Attribute of the view
-   */
-  public function hasAttribute($name)
-  {
-    return $this->attributeHolder->has($name);
-  }
-
-  /**
-   * Sets an attribute of the view.
-   *
-   * @param string $name   Attribute name
-   * @param string $value  Value for the attribute
-   */
-  public function setAttribute($name, $value)
-  {
-    $this->attributeHolder->set($name, $value);
-  }
-
-  /**
-   * Retrieves the parameters for the current view.
-   *
-   * @return sfParameterHolder The parameter holder
-   */
-  public function getParameterHolder()
-  {
-    return $this->parameterHolder;
-  }
-
-  /**
-   * Retrieves a parameter from the current view.
-   *
-   * @param  string $name     Parameter name
-   * @param  string $default  Default parameter value
-   *
-   * @return mixed A parameter value
-   */
-  public function getParameter($name, $default = null)
-  {
-    return $this->parameterHolder->get($name, $default);
-  }
-
-  /**
-   * Indicates whether or not a parameter exist for the current view.
-   *
-   * @param  string $name  Name of the parameter
-   *
-   * @return bool true, if the parameter exists otherwise false
-   */
-  public function hasParameter($name)
-  {
-    return $this->parameterHolder->has($name);
-  }
-
-  /**
-   * Sets a parameter for the view.
-   *
-   * @param string $name   Name of the parameter
-   * @param string $value  The parameter value
-   */
-  public function setParameter($name, $value)
-  {
-    $this->parameterHolder->set($name, $value);
-  }
-
-  /**
-   * Indicates that this view is a decorating view.
-   *
-   * @return bool true, if this view is a decorating view, otherwise false
-   */
-  public function isDecorator()
-  {
-    return $this->decorator;
-  }
-
-  /**
-   * Sets the decorating mode for the current view.
-   *
-   * @param bool $boolean  Set the decorating mode for the view
-   */
-  public function setDecorator($boolean)
-  {
-    $this->decorator = (boolean) $boolean;
-
-    if (false === $boolean)
+
+    /**
+     * Renders the presentation.
+     *
+     * @return string A string representing the rendered presentation
+     */
+    abstract public function render();
+
+    /**
+     * Sets the decorator template directory for this view.
+     *
+     * @param string $directory An absolute filesystem path to a template directory
+     */
+    public function setDecoratorDirectory($directory)
     {
-      $this->decoratorTemplate = false;
+        $this->decoratorDirectory = $directory;
     }
-  }
-
-  /**
-   * 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
-   */
-  protected function preRenderCheck()
-  {
-    if (null === $this->template)
+
+    /**
+     * Sets the decorator template for this view.
+     *
+     * If the template path is relative, it will be based on the currently
+     * executing module's template sub-directory.
+     *
+     * @param string $template An absolute or relative filesystem path to a template
+     */
+    public function setDecoratorTemplate($template)
     {
-      // a template has not been set
-      throw new sfRenderException('A template has not been set.');
+        if (false === $template) {
+            $this->setDecorator(false);
+
+            return;
+        }
+        if (null === $template) {
+            return;
+        }
+
+        if (!strpos($template, '.')) {
+            $template .= $this->getExtension();
+        }
+
+        if (sfToolkit::isPathAbsolute($template)) {
+            $this->decoratorDirectory = dirname($template);
+            $this->decoratorTemplate = basename($template);
+        } else {
+            $this->decoratorDirectory = $this->context->getConfiguration()->getDecoratorDir($template);
+            $this->decoratorTemplate = $template;
+        }
+
+        // set decorator status
+        $this->decorator = true;
     }
 
-    if (!is_readable($this->directory.'/'.$this->template))
+    /**
+     * Sets the template directory for this view.
+     *
+     * @param string $directory An absolute filesystem path to a template directory
+     */
+    public function setDirectory($directory)
     {
-      // 404?
-      if ('404' == $this->context->getResponse()->getStatusCode())
-      {
-        // use default exception templates
-        $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));
-      }
+        $this->directory = $directory;
     }
-  }
-
-  /**
-   * Renders the presentation.
-   *
-   * @return string A string representing the rendered presentation
-   */
-  abstract function render();
-
-  /**
-   * Sets the decorator template directory for this view.
-   *
-   * @param string $directory  An absolute filesystem path to a template directory
-   */
-  public function setDecoratorDirectory($directory)
-  {
-    $this->decoratorDirectory = $directory;
-  }
-
-  /**
-   * Sets the decorator template for this view.
-   *
-   * If the template path is relative, it will be based on the currently
-   * executing module's template sub-directory.
-   *
-   * @param string $template  An absolute or relative filesystem path to a template
-   */
-  public function setDecoratorTemplate($template)
-  {
-    if (false === $template)
+
+    /**
+     * Sets the module and action to be executed in place of a particular template attribute.
+     *
+     * @param string $attributeName A template attribute name
+     * @param string $moduleName    A module name
+     * @param string $componentName A component name
+     */
+    public function setComponentSlot($attributeName, $moduleName, $componentName)
     {
-      $this->setDecorator(false);
+        $this->componentSlots[$attributeName] = array();
+        $this->componentSlots[$attributeName]['module_name'] = $moduleName;
+        $this->componentSlots[$attributeName]['component_name'] = $componentName;
+    }
 
-      return;
+    /**
+     * Indicates whether or not a component slot exists.
+     *
+     * @param string $name The component slot name
+     *
+     * @return bool true, if the component slot exists, otherwise false
+     */
+    public function hasComponentSlot($name)
+    {
+        return isset($this->componentSlots[$name]);
     }
-    else if (null === $template)
+
+    /**
+     * Gets a component slot.
+     *
+     * @param string $name The component slot name
+     *
+     * @return array The component slot
+     */
+    public function getComponentSlot($name)
     {
-      return;
+        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 null;
     }
 
-    if (!strpos($template, '.'))
+    /**
+     * Sets the template for this view.
+     *
+     * If the template path is relative, it will be based on the currently
+     * executing module's template sub-directory.
+     *
+     * @param string $template An absolute or relative filesystem path to a template
+     */
+    public function setTemplate($template)
     {
-      $template .= $this->getExtension();
+        if (sfToolkit::isPathAbsolute($template)) {
+            $this->directory = dirname($template);
+            $this->template = basename($template);
+        } else {
+            $this->directory = $this->context->getConfiguration()->getTemplateDir($this->moduleName, $template);
+            $this->template = $template;
+        }
     }
 
-    if (sfToolkit::isPathAbsolute($template))
+    /**
+     * Retrieves the current view extension.
+     *
+     * @return string the extension for current view
+     */
+    public function getExtension()
     {
-      $this->decoratorDirectory = dirname($template);
-      $this->decoratorTemplate  = basename($template);
+        return $this->extension;
     }
-    else
+
+    /**
+     * Sets an extension for the current view.
+     *
+     * @param string $extension the extension name
+     */
+    public function setExtension($extension)
     {
-      $this->decoratorDirectory = $this->context->getConfiguration()->getDecoratorDir($template);
-      $this->decoratorTemplate = $template;
+        $this->extension = $extension;
     }
 
-    // set decorator status
-    $this->decorator = true;
-  }
-
-  /**
-   * Sets the template directory for this view.
-   *
-   * @param string $directory  An absolute filesystem path to a template directory
-   */
-  public function setDirectory($directory)
-  {
-    $this->directory = $directory;
-  }
-
-  /**
-   * Sets the module and action to be executed in place of a particular template attribute.
-   *
-   * @param string $attributeName  A template attribute name
-   * @param string $moduleName     A module name
-   * @param string $componentName  A component name
-   */
-  public function setComponentSlot($attributeName, $moduleName, $componentName)
-  {
-    $this->componentSlots[$attributeName]                   = array();
-    $this->componentSlots[$attributeName]['module_name']    = $moduleName;
-    $this->componentSlots[$attributeName]['component_name'] = $componentName;
-  }
-
-  /**
-   * Indicates whether or not a component slot exists.
-   *
-   * @param  string $name  The component slot name
-   *
-   * @return bool true, if the component slot exists, otherwise false
-   */
-  public function hasComponentSlot($name)
-  {
-    return isset($this->componentSlots[$name]);
-  }
-
-  /**
-   * Gets a component slot
-   *
-   * @param  string $name  The component slot name
-   *
-   * @return array The component slot
-   */
-  public function getComponentSlot($name)
-  {
-    if (isset($this->componentSlots[$name]) && $this->componentSlots[$name]['module_name'] && $this->componentSlots[$name]['component_name'])
+    /**
+     * Gets the module name associated with this view.
+     *
+     * @return string A module name
+     */
+    public function getModuleName()
     {
-      return array($this->componentSlots[$name]['module_name'], $this->componentSlots[$name]['component_name']);
+        return $this->moduleName;
     }
 
-    return null;
-  }
-
-  /**
-   * Sets the template for this view.
-   *
-   * If the template path is relative, it will be based on the currently
-   * executing module's template sub-directory.
-   *
-   * @param string $template  An absolute or relative filesystem path to a template
-   */
-  public function setTemplate($template)
-  {
-    if (sfToolkit::isPathAbsolute($template))
+    /**
+     * Gets the action name associated with this view.
+     *
+     * @return string An action name
+     */
+    public function getActionName()
     {
-      $this->directory = dirname($template);
-      $this->template  = basename($template);
+        return $this->actionName;
     }
-    else
+
+    /**
+     * Gets the view name associated with this view.
+     *
+     * @return string An action name
+     */
+    public function getViewName()
     {
-      $this->directory = $this->context->getConfiguration()->getTemplateDir($this->moduleName, $template);
-      $this->template = $template;
+        return $this->viewName;
     }
-  }
-
-  /**
-   * Retrieves the current view extension.
-   *
-   * @return string The extension for current view.
-   */
-  public function getExtension()
-  {
-    return $this->extension;
-  }
-
-  /**
-   * Sets an extension for the current view.
-   *
-   * @param string $extension  The extension name.
-   */
-  public function setExtension($extension)
-  {
-    $this->extension = $extension;
-  }
-
-  /**
-   * Gets the module name associated with this view.
-   *
-   * @return string A module name
-   */
-  public function getModuleName()
-  {
-    return $this->moduleName;
-  }
-
-  /**
-   * Gets the action name associated with this view.
-   *
-   * @return string An action name
-   */
-  public function getActionName()
-  {
-    return $this->actionName;
-  }
-
-  /**
-   * Gets the view name associated with this view.
-   *
-   * @return string An action name
-   */
-  public function getViewName()
-  {
-    return $this->viewName;
-  }
-
-  /**
-   * Calls methods defined via sfEventDispatcher.
-   *
-   * @param  string $method     The method name
-   * @param  array  $arguments  The method arguments
-   *
-   * @return mixed The returned value of the called method
-   *
-   * @throws sfException< If the calls fails
-   */
-  public function __call($method, $arguments)
-  {
-    $event = $this->dispatcher->notifyUntil(new sfEvent($this, 'view.method_not_found', array('method' => $method, 'arguments' => $arguments)));
-    if (!$event->isProcessed())
+
+    protected function initializeAttributeHolder($attributes = array())
     {
-      throw new sfException(sprintf('Call to undefined method %s::%s.', get_class($this), $method));
+        return new sfViewParameterHolder($this->dispatcher, $attributes, array(
+            'escaping_method' => sfConfig::get('sf_escaping_method'),
+            'escaping_strategy' => sfConfig::get('sf_escaping_strategy'),
+        ));
     }
 
-    return $event->getReturnValue();
-  }
+    /**
+     * 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
+     */
+    protected function preRenderCheck()
+    {
+        if (null === $this->template) {
+            // 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->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));
+            }
+        }
+    }
 }
diff --git a/lib/view/sfViewCacheManager.class.php b/lib/view/sfViewCacheManager.class.php
index 70198e10f..4ecffefec 100644
--- a/lib/view/sfViewCacheManager.class.php
+++ b/lib/view/sfViewCacheManager.class.php
@@ -15,1028 +15,819 @@
  *
  * To disable all caching, you can set the [sf_cache] constant to false.
  *
- * @package    symfony
- * @subpackage view
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfViewCacheManager
 {
-  protected
-    $cache       = null,
-    $cacheConfig = array(),
-    $context     = null,
-    $dispatcher  = null,
-    $controller  = null,
-    $routing     = null,
-    $request     = null,
-    $loaded      = array();
-
-  /**
-   * Class constructor.
-   *
-   * @see initialize()
-   */
-  public function __construct($context, sfCache $cache, $options = array())
-  {
-    $this->initialize($context, $cache, $options);
-  }
-
-  /**
-   * Initializes the cache manager.
-   *
-   * @param sfContext $context  Current application context
-   * @param sfCache   $cache    An sfCache instance
-   */
-  public function initialize($context, sfCache $cache, $options = array())
-  {
-    $this->context    = $context;
-    $this->dispatcher = $context->getEventDispatcher();
-    $this->controller = $context->getController();
-    $this->request    = $context->getRequest();
-    $this->options    = array_merge(array(
-        'cache_key_use_vary_headers' => true,
-        'cache_key_use_host_name'    => true,
-      ), $options);
-
-    if (sfConfig::get('sf_web_debug'))
-    {
-      $this->dispatcher->connect('view.cache.filter_content', array($this, 'decorateContentWithDebug'));
-    }
+    protected $cache;
+    protected $cacheConfig = array();
+    protected $context;
+    protected $dispatcher;
+    protected $controller;
+    protected $routing;
+    protected $request;
+    protected $loaded = array();
+
+    /**
+     * Class constructor.
+     *
+     * @see initialize()
+     *
+     * @param mixed $context
+     * @param mixed $options
+     */
+    public function __construct($context, sfCache $cache, $options = array())
+    {
+        $this->initialize($context, $cache, $options);
+    }
+
+    /**
+     * Initializes the cache manager.
+     *
+     * @param sfContext $context Current application context
+     * @param sfCache   $cache   An sfCache instance
+     * @param mixed     $options
+     */
+    public function initialize($context, sfCache $cache, $options = array())
+    {
+        $this->context = $context;
+        $this->dispatcher = $context->getEventDispatcher();
+        $this->controller = $context->getController();
+        $this->request = $context->getRequest();
+        $this->options = array_merge(array(
+            'cache_key_use_vary_headers' => true,
+            'cache_key_use_host_name' => true,
+        ), $options);
+
+        if (sfConfig::get('sf_web_debug')) {
+            $this->dispatcher->connect('view.cache.filter_content', array($this, 'decorateContentWithDebug'));
+        }
 
-    // empty configuration
-    $this->cacheConfig = array();
-
-    // cache instance
-    $this->cache = $cache;
-
-    // routing instance
-    $this->routing = $context->getRouting();
-  }
-
-  /**
-   * Retrieves the current cache context.
-   *
-   * @return sfContext The sfContext instance
-   */
-  public function getContext()
-  {
-    return $this->context;
-  }
-
-  /**
-   * Retrieves the current cache object.
-   *
-   * @return sfCache The current cache object
-   */
-  public function getCache()
-  {
-    return $this->cache;
-  }
-
-  /**
-   * Generates a unique cache key for an internal URI.
-   * This cache key can be used by any of the cache engines as a unique identifier to a cached resource
-   *
-   * Basically, the cache key generated for the following internal URI:
-   *   module/action?key1=value1&key2=value2
-   * Looks like:
-   *   /localhost/all/module/action/key1/value1/key2/value2
-   *
-   * @param  string $internalUri       The internal unified resource identifier
-   *                                   Accepts rules formatted like 'module/action?key1=value1&key2=value2'
-   *                                   Does not accept rules starting with a route name, except for '@sf_cache_partial'
-   * @param  string $hostName          The host name
-   *                                   Optional - defaults to the current host name bu default
-   * @param  string $vary              The vary headers, separated by |, or "all" for all vary headers
-   *                                   Defaults to 'all'
-   * @param  string $contextualPrefix  The contextual prefix for contextual partials.
-   *                                   Defaults to 'currentModule/currentAction/currentPAram1/currentvalue1'
-   *                                   Used only by the sfViewCacheManager::remove() method
-   *
-   * @return string The cache key
-   *                If some of the parameters contained wildcards (* or **), the generated key will also have wildcards
-   */
-  public function generateCacheKey($internalUri, $hostName = '', $vary = '', $contextualPrefix = '')
-  {
-    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)));
-      }
+        // empty configuration
+        $this->cacheConfig = array();
+
+        // cache instance
+        $this->cache = $cache;
+
+        // routing instance
+        $this->routing = $context->getRouting();
+    }
+
+    /**
+     * Retrieves the current cache context.
+     *
+     * @return sfContext The sfContext instance
+     */
+    public function getContext()
+    {
+        return $this->context;
+    }
+
+    /**
+     * Retrieves the current cache object.
+     *
+     * @return sfCache The current cache object
+     */
+    public function getCache()
+    {
+        return $this->cache;
+    }
+
+    /**
+     * Generates a unique cache key for an internal URI.
+     * This cache key can be used by any of the cache engines as a unique identifier to a cached resource.
+     *
+     * Basically, the cache key generated for the following internal URI:
+     *   module/action?key1=value1&key2=value2
+     * Looks like:
+     *   /localhost/all/module/action/key1/value1/key2/value2
+     *
+     * @param string $internalUri      The internal unified resource identifier
+     *                                 Accepts rules formatted like 'module/action?key1=value1&key2=value2'
+     *                                 Does not accept rules starting with a route name, except for '@sf_cache_partial'
+     * @param string $hostName         The host name
+     *                                 Optional - defaults to the current host name bu default
+     * @param string $vary             The vary headers, separated by |, or "all" for all vary headers
+     *                                 Defaults to 'all'
+     * @param string $contextualPrefix The contextual prefix for contextual partials.
+     *                                 Defaults to 'currentModule/currentAction/currentPAram1/currentvalue1'
+     *                                 Used only by the sfViewCacheManager::remove() method
+     *
+     * @return string The cache key
+     *                If some of the parameters contained wildcards (* or **), the generated key will also have wildcards
+     */
+    public function generateCacheKey($internalUri, $hostName = '', $vary = '', $contextualPrefix = '')
+    {
+        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)));
+            }
+
+            return call_user_func($callable, $internalUri, $hostName, $vary, $contextualPrefix, $this);
+        }
 
-      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 (strpos($internalUri, '@') === 0 && strpos($internalUri, '@sf_cache_partial') === false)
-    {
-      throw new sfException('A cache key cannot be generated for an internal URI using the @rule syntax');
-    }
+        $cacheKey = '';
+
+        if ($this->isContextual($internalUri)) {
+            // Contextual partial
+            if (!$contextualPrefix) {
+                list($route_name, $params) = $this->controller->convertUrlStringToParameters($this->routing->getCurrentInternalUri());
+
+                // 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');
+                }
+                $cacheKey = $this->convertParametersToKey($params);
+            } else {
+                $cacheKey = $contextualPrefix;
+            }
+            list($route_name, $params) = $this->controller->convertUrlStringToParameters($internalUri);
+            $cacheKey .= sprintf('/%s/%s/%s', $params['module'], $params['action'], isset($params['sf_cache_key']) ? $params['sf_cache_key'] : '');
+        } else {
+            // Regular action or non-contextual partial
+            list($route_name, $params) = $this->controller->convertUrlStringToParameters($internalUri);
+            if ('sf_cache_partial' == $route_name) {
+                $cacheKey = 'sf_cache_partial/';
+            }
+
+            $cacheKey .= $this->convertParametersToKey($params);
+        }
 
-    $cacheKey = '';
+        // add vary headers
+        if ($varyPart = $this->getCacheKeyVaryHeaderPart($internalUri, $vary)) {
+            $cacheKey = '/'.$varyPart.'/'.ltrim($cacheKey, '/');
+        }
 
-    if ($this->isContextual($internalUri))
-    {
-      // Contextual partial
-      if (!$contextualPrefix)
-      {
-        list($route_name, $params) = $this->controller->convertUrlStringToParameters($this->routing->getCurrentInternalUri());
-
-        // 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');
+        // add hostname
+        if ($hostNamePart = $this->getCacheKeyHostNamePart($hostName)) {
+            $cacheKey = '/'.$hostNamePart.'/'.ltrim($cacheKey, '/');
         }
-        $cacheKey = $this->convertParametersToKey($params);
-      }
-      else
-      {
-        $cacheKey = $contextualPrefix;
-      }
-      list($route_name, $params) = $this->controller->convertUrlStringToParameters($internalUri);
-      $cacheKey .= sprintf('/%s/%s/%s', $params['module'], $params['action'], isset($params['sf_cache_key']) ? $params['sf_cache_key'] : '');
-    }
-    else
-    {
-      // Regular action or non-contextual partial
-      list($route_name, $params) = $this->controller->convertUrlStringToParameters($internalUri);
-      if ($route_name == 'sf_cache_partial')
-      {
-        $cacheKey = 'sf_cache_partial/';
-      }
-
-      $cacheKey .= $this->convertParametersToKey($params);
-    }
 
-    // add vary headers
-    if ($varyPart = $this->getCacheKeyVaryHeaderPart($internalUri, $vary))
-    {
-      $cacheKey = '/'.$varyPart.'/'.ltrim($cacheKey, '/');
-    }
+        // normalize to a leading slash
+        if (0 !== strpos($cacheKey, '/')) {
+            $cacheKey = '/'.$cacheKey;
+        }
 
-    // add hostname
-    if ($hostNamePart = $this->getCacheKeyHostNamePart($hostName))
-    {
-      $cacheKey = '/'.$hostNamePart.'/'.ltrim($cacheKey, '/');
-    }
+        // distinguish multiple slashes
+        while (false !== strpos($cacheKey, '//')) {
+            $cacheKey = str_replace('//', '/'.substr(sha1($cacheKey), 0, 7).'/', $cacheKey);
+        }
 
-    // normalize to a leading slash
-    if (0 !== strpos($cacheKey, '/'))
-    {
-      $cacheKey = '/'.$cacheKey;
-    }
+        // prevent directory traversal
+        return strtr($cacheKey, array(
+            '/.' => '/_.',
+            '/_' => '/__',
+            '\\.' => '\\_.',
+            '\\_' => '\\__',
+        ));
+    }
+
+    /**
+     * Adds a cache to the manager.
+     *
+     * @param string $moduleName Module name
+     * @param string $actionName Action name
+     * @param array  $options    Options for the cache
+     */
+    public function addCache($moduleName, $actionName, $options = array())
+    {
+        // normalize vary headers
+        if (isset($options['vary'])) {
+            foreach ($options['vary'] as $key => $name) {
+                $options['vary'][$key] = str_replace('_', '-', strtolower($name));
+            }
+        }
 
-    // distinguish multiple slashes
-    while (false !== strpos($cacheKey, '//'))
-    {
-      $cacheKey = str_replace('//', '/'.substr(sha1($cacheKey), 0, 7).'/', $cacheKey);
+        $options['lifeTime'] = isset($options['lifeTime']) ? $options['lifeTime'] : 0;
+        if (!isset($this->cacheConfig[$moduleName])) {
+            $this->cacheConfig[$moduleName] = array();
+        }
+        $this->cacheConfig[$moduleName][$actionName] = array(
+            '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(),
+        );
+    }
+
+    /**
+     * Registers configuration options for the cache.
+     *
+     * @param string $moduleName Module name
+     */
+    public function registerConfiguration($moduleName)
+    {
+        if (!isset($this->loaded[$moduleName])) {
+            require $this->context->getConfigCache()->checkConfig('modules/'.$moduleName.'/config/cache.yml');
+            $this->loaded[$moduleName] = true;
+        }
     }
 
-    // prevent directory traversal
-    $cacheKey = strtr($cacheKey, array(
-      '/.'  => '/_.',
-      '/_'  => '/__',
-      '\\.' => '\\_.',
-      '\\_' => '\\__',
-    ));
-
-    return $cacheKey;
-  }
-
-  /**
-   * Gets the vary header part of view cache key.
-   *
-   * @param  string $vary
-   * @return string
-   */
-  protected function getCacheKeyVaryHeaderPart($internalUri, $vary = '')
-  {
-    if (!$this->options['cache_key_use_vary_headers'])
-    {
-      return '';
-    }
+    /**
+     * Retrieves the layout from the cache option list.
+     *
+     * @param string $internalUri Internal uniform resource identifier
+     *
+     * @return bool true, if have layout otherwise false
+     */
+    public function withLayout($internalUri)
+    {
+        return $this->getCacheConfig($internalUri, 'withLayout', false);
+    }
+
+    /**
+     * Retrieves lifetime from the cache option list.
+     *
+     * @param string $internalUri Internal uniform resource identifier
+     *
+     * @return int LifeTime
+     */
+    public function getLifeTime($internalUri)
+    {
+        return $this->getCacheConfig($internalUri, 'lifeTime', 0);
+    }
+
+    /**
+     * Retrieves client lifetime from the cache option list.
+     *
+     * @param string $internalUri Internal uniform resource identifier
+     *
+     * @return int Client lifetime
+     */
+    public function getClientLifeTime($internalUri)
+    {
+        return $this->getCacheConfig($internalUri, 'clientLifeTime', 0);
+    }
+
+    /**
+     * Retrieves contextual option from the cache option list.
+     *
+     * @param string $internalUri Internal uniform resource identifier
+     *
+     * @return bool true, if is contextual otherwise false
+     */
+    public function isContextual($internalUri)
+    {
+        return $this->getCacheConfig($internalUri, 'contextual', false);
+    }
+
+    /**
+     * Retrieves vary option from the cache option list.
+     *
+     * @param string $internalUri Internal uniform resource identifier
+     *
+     * @return array Vary options for the cache
+     */
+    public function getVary($internalUri)
+    {
+        return $this->getCacheConfig($internalUri, 'vary', array());
+    }
+
+    /**
+     * Returns true if the current content is cacheable.
+     *
+     * Possible break in backward compatibility: If the sf_lazy_cache_key
+     * setting is turned on in settings.yml, this method is not used when
+     * initially checking a partial's cacheability.
+     *
+     * @see sfPartialView, isActionCacheable()
+     *
+     * @param string $internalUri Internal uniform resource identifier
+     *
+     * @return bool true, if the content is cacheable otherwise false
+     */
+    public function isCacheable($internalUri)
+    {
+        if ($this->request instanceof sfWebRequest && !$this->request->isMethod(sfRequest::GET)) {
+            return false;
+        }
 
-    // prefix with vary headers
-    if (!$vary)
-    {
-      $varyHeaders = $this->getVary($internalUri);
-
-      if (!$varyHeaders)
-      {
-        return 'all';
-      }
-
-      sort($varyHeaders);
-      $request = $this->context->getRequest();
-      $varys = array();
-
-      foreach ($varyHeaders as $header)
-      {
-        $varys[] = $header . '-' . preg_replace('/\W+/', '_', $request->getHttpHeader($header));
-      }
-      $vary = implode('-', $varys);
-    }
+        list($route_name, $params) = $this->controller->convertUrlStringToParameters($internalUri);
 
-    return $vary;
-  }
-
-  /**
-   * Gets the hostname part of view cache key.
-   *
-   * @param string $hostName
-   * @return void
-   */
-  protected function getCacheKeyHostNamePart($hostName = '')
-  {
-    if (!$this->options['cache_key_use_host_name'])
-    {
-      return '';
-    }
+        if (!isset($params['module'])) {
+            return false;
+        }
 
-    if (!$hostName)
-    {
-      $hostName = $this->context->getRequest()->getHost();
-    }
+        $this->registerConfiguration($params['module']);
 
-    $hostName = preg_replace('/[^a-z0-9\*]/i', '_', $hostName);
-    $hostName = preg_replace('/_+/', '_', $hostName);
-
-    return strtolower($hostName);
-  }
-
-  /**
-   * Transforms an associative array of parameters from an URI into a unique key
-   *
-   * @param  array $params  Associative array of parameters from the URI (including, at least, module and action)
-   *
-   * @return string Unique key
-   */
-  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');
-    }
-    $module = $params['module'];
-    unset($params['module']);
-    $action = $params['action'];
-    unset($params['action']);
-    ksort($params);
-    $cacheKey = sprintf('%s/%s', $module, $action);
-    foreach ($params as $key => $value)
-    {
-      $cacheKey .= sprintf('/%s/%s', $key, $value);
-    }
+        if (isset($this->cacheConfig[$params['module']][$params['action']])) {
+            return $this->cacheConfig[$params['module']][$params['action']]['lifeTime'] > 0;
+        }
+        if (isset($this->cacheConfig[$params['module']]['DEFAULT'])) {
+            return $this->cacheConfig[$params['module']]['DEFAULT']['lifeTime'] > 0;
+        }
 
-    return $cacheKey;
-  }
-
-  /**
-   * Adds a cache to the manager.
-   *
-   * @param string $moduleName  Module name
-   * @param string $actionName  Action name
-   * @param array  $options     Options for the cache
-   */
-  public function addCache($moduleName, $actionName, $options = array())
-  {
-    // normalize vary headers
-    if (isset($options['vary']))
-    {
-      foreach ($options['vary'] as $key => $name)
-      {
-        $options['vary'][$key] = str_replace('_', '-', strtolower($name));
-      }
+        return false;
     }
 
-    $options['lifeTime'] = isset($options['lifeTime']) ? $options['lifeTime'] : 0;
-    if (!isset($this->cacheConfig[$moduleName]))
-    {
-      $this->cacheConfig[$moduleName] = array();
-    }
-    $this->cacheConfig[$moduleName][$actionName] = array(
-      '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(),
-    );
-  }
-
-  /**
-   * Registers configuration options for the cache.
-   *
-   * @param string $moduleName  Module name
-   */
-  public function registerConfiguration($moduleName)
-  {
-    if (!isset($this->loaded[$moduleName]))
-    {
-      require($this->context->getConfigCache()->checkConfig('modules/'.$moduleName.'/config/cache.yml'));
-      $this->loaded[$moduleName] = true;
-    }
-  }
-
-  /**
-   * Retrieves the layout from the cache option list.
-   *
-   * @param  string $internalUri  Internal uniform resource identifier
-   *
-   * @return bool true, if have layout otherwise false
-   */
-  public function withLayout($internalUri)
-  {
-    return $this->getCacheConfig($internalUri, 'withLayout', false);
-  }
-
-  /**
-   * Retrieves lifetime from the cache option list.
-   *
-   * @param  string $internalUri  Internal uniform resource identifier
-   *
-   * @return int LifeTime
-   */
-  public function getLifeTime($internalUri)
-  {
-    return $this->getCacheConfig($internalUri, 'lifeTime', 0);
-  }
-
-  /**
-   * Retrieves client lifetime from the cache option list
-   *
-   * @param  string $internalUri  Internal uniform resource identifier
-   *
-   * @return int Client lifetime
-   */
-  public function getClientLifeTime($internalUri)
-  {
-    return $this->getCacheConfig($internalUri, 'clientLifeTime', 0);
-  }
-
-  /**
-   * Retrieves contextual option from the cache option list.
-   *
-   * @param  string $internalUri  Internal uniform resource identifier
-   *
-   * @return boolean true, if is contextual otherwise false
-   */
-  public function isContextual($internalUri)
-  {
-    return $this->getCacheConfig($internalUri, 'contextual', false);
-  }
-
-  /**
-   * Retrieves vary option from the cache option list.
-   *
-   * @param  string $internalUri  Internal uniform resource identifier
-   *
-   * @return array Vary options for the cache
-   */
-  public function getVary($internalUri)
-  {
-    return $this->getCacheConfig($internalUri, 'vary', array());
-  }
-
-  /**
-   * Gets a config option from the cache.
-   *
-   * @param string $internalUri   Internal uniform resource identifier
-   * @param string $key           Option name
-   * @param string $defaultValue  Default value of the option
-   *
-   * @return mixed Value of the option
-   */
-  protected function getCacheConfig($internalUri, $key, $defaultValue = null)
-  {
-    list($route_name, $params) = $this->controller->convertUrlStringToParameters($internalUri);
-
-    if (!isset($params['module']))
-    {
-        return $defaultValue;
-    }
+    /**
+     * Returns true if the action is cacheable.
+     *
+     * @param string $moduleName A module name
+     * @param string $actionName An action or partial template name
+     *
+     * @return bool True if the action is cacheable
+     *
+     * @see isCacheable()
+     */
+    public function isActionCacheable($moduleName, $actionName)
+    {
+        if ($this->request instanceof sfWebRequest && !$this->request->isMethod(sfRequest::GET)) {
+            return false;
+        }
 
-    $this->registerConfiguration($params['module']);
+        $this->registerConfiguration($moduleName);
 
-    $value = $defaultValue;
-    if (isset($this->cacheConfig[$params['module']][$params['action']][$key]))
-    {
-      $value = $this->cacheConfig[$params['module']][$params['action']][$key];
-    }
-    else if (isset($this->cacheConfig[$params['module']]['DEFAULT'][$key]))
-    {
-      $value = $this->cacheConfig[$params['module']]['DEFAULT'][$key];
-    }
+        if (isset($this->cacheConfig[$moduleName][$actionName])) {
+            return $this->cacheConfig[$moduleName][$actionName]['lifeTime'] > 0;
+        }
+        if (isset($this->cacheConfig[$moduleName]['DEFAULT'])) {
+            return $this->cacheConfig[$moduleName]['DEFAULT']['lifeTime'] > 0;
+        }
 
-    return $value;
-  }
-
-  /**
-   * Returns true if the current content is cacheable.
-   *
-   * Possible break in backward compatibility: If the sf_lazy_cache_key
-   * setting is turned on in settings.yml, this method is not used when
-   * initially checking a partial's cacheability.
-   *
-   * @see sfPartialView, isActionCacheable()
-   *
-   * @param  string $internalUri  Internal uniform resource identifier
-   *
-   * @return bool true, if the content is cacheable otherwise false
-   */
-  public function isCacheable($internalUri)
-  {
-    if ($this->request instanceof sfWebRequest && !$this->request->isMethod(sfRequest::GET))
-    {
-      return false;
+        return false;
     }
 
-    list($route_name, $params) = $this->controller->convertUrlStringToParameters($internalUri);
-
-    if (!isset($params['module']))
+    /**
+     * Retrieves content in the cache.
+     *
+     * @param string $internalUri Internal uniform resource identifier
+     *
+     * @return string The content in the cache
+     */
+    public function get($internalUri)
     {
-        return false;
-    }
+        // no cache or no cache set for this action
+        if (!$this->isCacheable($internalUri) || $this->ignore()) {
+            return null;
+        }
 
-    $this->registerConfiguration($params['module']);
+        $retval = $this->cache->get($this->generateCacheKey($internalUri));
 
-    if (isset($this->cacheConfig[$params['module']][$params['action']]))
-    {
-      return ($this->cacheConfig[$params['module']][$params['action']]['lifeTime'] > 0);
+        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'))));
+        }
+
+        return $retval;
     }
-    else if (isset($this->cacheConfig[$params['module']]['DEFAULT']))
+
+    /**
+     * Returns true if there is a cache.
+     *
+     * @param string $internalUri Internal uniform resource identifier
+     *
+     * @return bool true, if there is a cache otherwise false
+     */
+    public function has($internalUri)
     {
-      return ($this->cacheConfig[$params['module']]['DEFAULT']['lifeTime'] > 0);
+        if (!$this->isCacheable($internalUri) || $this->ignore()) {
+            return null;
+        }
+
+        return $this->cache->has($this->generateCacheKey($internalUri));
     }
 
-    return false;
-  }
-
-  /**
-   * Returns true if the action is cacheable.
-   *
-   * @param  string $moduleName A module name
-   * @param  string $actionName An action or partial template name
-   *
-   * @return boolean True if the action is cacheable
-   *
-   * @see isCacheable()
-   */
-  public function isActionCacheable($moduleName, $actionName)
-  {
-    if ($this->request instanceof sfWebRequest && !$this->request->isMethod(sfRequest::GET))
+    /**
+     * Sets the cache content.
+     *
+     * @param string $data        Data to put in the cache
+     * @param string $internalUri Internal uniform resource identifier
+     *
+     * @return bool true, if the data get set successfully otherwise false
+     */
+    public function set($data, $internalUri)
     {
-      return false;
-    }
+        if (!$this->isCacheable($internalUri)) {
+            return false;
+        }
 
-    $this->registerConfiguration($moduleName);
+        try {
+            $ret = $this->cache->set($this->generateCacheKey($internalUri), $data, $this->getLifeTime($internalUri));
+        } catch (Exception $e) {
+            return false;
+        }
 
-    if (isset($this->cacheConfig[$moduleName][$actionName]))
-    {
-      return $this->cacheConfig[$moduleName][$actionName]['lifeTime'] > 0;
-    }
-    else if (isset($this->cacheConfig[$moduleName]['DEFAULT']))
-    {
-      return $this->cacheConfig[$moduleName]['DEFAULT']['lifeTime'] > 0;
+        if (sfConfig::get('sf_logging_enabled')) {
+            $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Save cache for "%s"', $internalUri))));
+        }
+
+        return true;
     }
 
-    return false;
-  }
-
-  /**
-   * Retrieves content in the cache.
-   *
-   * @param  string $internalUri  Internal uniform resource identifier
-   *
-   * @return string The content in the cache
-   */
-  public function get($internalUri)
-  {
-    // no cache or no cache set for this action
-    if (!$this->isCacheable($internalUri) || $this->ignore())
+    /**
+     * Removes the content in the cache.
+     *
+     * @param string $internalUri      Internal uniform resource identifier
+     * @param string $hostName         The host name
+     * @param string $vary             The vary headers, separated by |, or "all" for all vary headers
+     * @param string $contextualPrefix The removal prefix for contextual partials. Defaults to '**' (all actions, all params)
+     *
+     * @return bool true, if the remove happened, false otherwise
+     */
+    public function remove($internalUri, $hostName = '', $vary = '', $contextualPrefix = '**')
     {
-      return null;
-    }
+        if (sfConfig::get('sf_logging_enabled')) {
+            $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Remove cache for "%s"', $internalUri))));
+        }
 
-    $retval = $this->cache->get($this->generateCacheKey($internalUri));
+        $cacheKey = $this->generateCacheKey($internalUri, $hostName, $vary, $contextualPrefix);
 
-    if (sfConfig::get('sf_logging_enabled'))
-    {
-      $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Cache for "%s" %s', $internalUri, $retval !== null ? 'exists' : 'does not exist'))));
+        if (strpos($cacheKey, '*')) {
+            return $this->cache->removePattern($cacheKey);
+        }
+        if ($this->cache->has($cacheKey)) {
+            return $this->cache->remove($cacheKey);
+        }
     }
 
-    return $retval;
-  }
-
-  /**
-   * Returns true if there is a cache.
-   *
-   * @param  string $internalUri  Internal uniform resource identifier
-   *
-   * @return bool true, if there is a cache otherwise false
-   */
-  public function has($internalUri)
-  {
-    if (!$this->isCacheable($internalUri) || $this->ignore())
+    /**
+     * Retrieves the last modified time.
+     *
+     * @param string $internalUri Internal uniform resource identifier
+     *
+     * @return int The last modified datetime
+     */
+    public function getLastModified($internalUri)
     {
-      return null;
+        if (!$this->isCacheable($internalUri)) {
+            return 0;
+        }
+
+        return $this->cache->getLastModified($this->generateCacheKey($internalUri));
     }
 
-    return $this->cache->has($this->generateCacheKey($internalUri));
-  }
-
-  /**
-   * Ignores the cache functionality.
-   *
-   * @return bool true, if the cache is ignore otherwise false
-   */
-  protected function ignore()
-  {
-    // ignore cache parameter? (only available in debug mode)
-    if (sfConfig::get('sf_debug') && $this->context->getRequest()->getAttribute('sf_ignore_cache'))
+    /**
+     * Retrieves the timeout.
+     *
+     * @param string $internalUri Internal uniform resource identifier
+     *
+     * @return int The timeout datetime
+     */
+    public function getTimeout($internalUri)
     {
-      if (sfConfig::get('sf_logging_enabled'))
-      {
-        $this->dispatcher->notify(new sfEvent($this, 'application.log', array('Discard cache')));
-      }
+        if (!$this->isCacheable($internalUri)) {
+            return 0;
+        }
 
-      return true;
+        return $this->cache->getTimeout($this->generateCacheKey($internalUri));
     }
 
-    return false;
-  }
-
-  /**
-   * Sets the cache content.
-   *
-   * @param  string $data         Data to put in the cache
-   * @param  string $internalUri  Internal uniform resource identifier
-   *
-   * @return boolean true, if the data get set successfully otherwise false
-   */
-  public function set($data, $internalUri)
-  {
-    if (!$this->isCacheable($internalUri))
+    /**
+     * Starts the fragment cache.
+     *
+     * @param string $name           Unique fragment name
+     * @param string $lifeTime       Life time for the cache
+     * @param string $clientLifeTime Client life time for the cache
+     * @param array  $vary           Vary options for the cache
+     *
+     * @return bool true, if success otherwise false
+     */
+    public function start($name, $lifeTime, $clientLifeTime = null, $vary = array())
     {
-      return false;
-    }
+        $internalUri = $this->routing->getCurrentInternalUri();
 
-    try
-    {
-      $ret = $this->cache->set($this->generateCacheKey($internalUri), $data, $this->getLifeTime($internalUri));
-    }
-    catch (Exception $e)
-    {
-      return false;
-    }
+        if (!$clientLifeTime) {
+            $clientLifeTime = $lifeTime;
+        }
 
-    if (sfConfig::get('sf_logging_enabled'))
-    {
-      $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Save cache for "%s"', $internalUri))));
-    }
+        // 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));
 
-    return true;
-  }
-
-  /**
-   * Removes the content in the cache.
-   *
-   * @param  string $internalUri       Internal uniform resource identifier
-   * @param  string $hostName          The host name
-   * @param  string $vary              The vary headers, separated by |, or "all" for all vary headers
-   * @param  string $contextualPrefix  The removal prefix for contextual partials. Defaults to '**' (all actions, all params)
-   *
-   * @return bool true, if the remove happened, false otherwise
-   */
-  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))));
-    }
+        // get data from cache if available
+        $data = $this->get($internalUri.(strpos($internalUri, '?') ? '&' : '?').'_sf_cache_key='.$name);
+        if (null !== $data) {
+            return $data;
+        }
 
-    $cacheKey = $this->generateCacheKey($internalUri, $hostName, $vary, $contextualPrefix);
+        ob_start();
+        ob_implicit_flush(0);
 
-    if(strpos($cacheKey, '*'))
-    {
-      return $this->cache->removePattern($cacheKey);
-    }
-    elseif ($this->cache->has($cacheKey))
-    {
-      return $this->cache->remove($cacheKey);
-    }
-  }
-
-  /**
-   * Retrieves the last modified time.
-   *
-   * @param  string $internalUri  Internal uniform resource identifier
-   *
-   * @return int    The last modified datetime
-   */
-  public function getLastModified($internalUri)
-  {
-    if (!$this->isCacheable($internalUri))
-    {
-      return 0;
+        return null;
     }
 
-    return $this->cache->getLastModified($this->generateCacheKey($internalUri));
-  }
-
-  /**
-   * Retrieves the timeout.
-   *
-   * @param  string $internalUri  Internal uniform resource identifier
-   *
-   * @return int    The timeout datetime
-   */
-  public function getTimeout($internalUri)
-  {
-    if (!$this->isCacheable($internalUri))
+    /**
+     * Stops the fragment cache.
+     *
+     * @param string $name Unique fragment name
+     *
+     * @return bool true, if success otherwise false
+     */
+    public function stop($name)
     {
-      return 0;
-    }
+        $data = ob_get_clean();
 
-    return $this->cache->getTimeout($this->generateCacheKey($internalUri));
-  }
-
-  /**
-   * Starts the fragment cache.
-   *
-   * @param  string $name            Unique fragment name
-   * @param  string $lifeTime        Life time for the cache
-   * @param  string $clientLifeTime  Client life time for the cache
-   * @param  array  $vary            Vary options for the cache
-   *
-   * @return bool true, if success otherwise false
-   */
-  public function start($name, $lifeTime, $clientLifeTime = null, $vary = array())
-  {
-    $internalUri = $this->routing->getCurrentInternalUri();
-
-    if (!$clientLifeTime)
-    {
-      $clientLifeTime = $lifeTime;
-    }
+        // save content to cache
+        $internalUri = $this->routing->getCurrentInternalUri();
 
-    // 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));
+        try {
+            $this->set($data, $internalUri.(strpos($internalUri, '?') ? '&' : '?').'_sf_cache_key='.$name);
+        } catch (Exception $e) {
+        }
 
-    // get data from cache if available
-    $data = $this->get($internalUri.(strpos($internalUri, '?') ? '&' : '?').'_sf_cache_key='.$name);
-    if ($data !== null)
-    {
-      return $data;
+        return $data;
     }
-    else
-    {
-      ob_start();
-      ob_implicit_flush(0);
 
-      return null;
-    }
-  }
-
-  /**
-   * Stops the fragment cache.
-   *
-   * @param  string $name Unique fragment name
-   *
-   * @return bool true, if success otherwise false
-   */
-  public function stop($name)
-  {
-    $data = ob_get_clean();
-
-    // save content to cache
-    $internalUri = $this->routing->getCurrentInternalUri();
-    try
+    /**
+     * Computes the cache key based on the passed parameters.
+     *
+     * @param array $parameters An array of parameters
+     */
+    public function computeCacheKey(array $parameters)
     {
-      $this->set($data, $internalUri.(strpos($internalUri, '?') ? '&' : '?').'_sf_cache_key='.$name);
-    }
-    catch (Exception $e)
-    {
-    }
+        if (isset($parameters['sf_cache_key'])) {
+            return $parameters['sf_cache_key'];
+        }
 
-    return $data;
-  }
-
-  /**
-   * Computes the cache key based on the passed parameters.
-   *
-   * @param array $parameters  An array of parameters
-   */
-  public function computeCacheKey(array $parameters)
-  {
-    if (isset($parameters['sf_cache_key']))
-    {
-      return $parameters['sf_cache_key'];
-    }
+        if (sfConfig::get('sf_logging_enabled')) {
+            $this->dispatcher->notify(new sfEvent($this, 'application.log', array('Generate cache key')));
+        }
+        ksort($parameters);
+
+        return md5(serialize($parameters));
+    }
+
+    /**
+     * Checks that the supplied parameters include a cache key.
+     *
+     * If no 'sf_cache_key' parameter is present one is added to the array as
+     * it is passed by reference.
+     *
+     * @param array $parameters An array of parameters
+     *
+     * @return string The cache key
+     */
+    public function checkCacheKey(array &$parameters)
+    {
+        $parameters['sf_cache_key'] = $this->computeCacheKey($parameters);
+
+        return $parameters['sf_cache_key'];
+    }
+
+    /**
+     * Computes a partial internal URI.
+     *
+     * @param string $module   The module name
+     * @param string $action   The action name
+     * @param string $cacheKey The cache key
+     *
+     * @return string The internal URI
+     */
+    public function getPartialUri($module, $action, $cacheKey)
+    {
+        return sprintf('@sf_cache_partial?module=%s&action=%s&sf_cache_key=%s', $module, $action, $cacheKey);
+    }
+
+    /**
+     * Returns whether a partial template is in the cache.
+     *
+     * @param string $module   The module name
+     * @param string $action   The action name
+     * @param string $cacheKey The cache key
+     *
+     * @return bool true if a partial is in the cache, false otherwise
+     */
+    public function hasPartialCache($module, $action, $cacheKey)
+    {
+        return $this->has($this->getPartialUri($module, $action, $cacheKey));
+    }
+
+    /**
+     * Gets a partial template from the cache.
+     *
+     * @param string $module   The module name
+     * @param string $action   The action name
+     * @param string $cacheKey The cache key
+     *
+     * @return string The cache content
+     */
+    public function getPartialCache($module, $action, $cacheKey)
+    {
+        $uri = $this->getPartialUri($module, $action, $cacheKey);
+
+        if (!$this->isCacheable($uri)) {
+            return null;
+        }
 
-    if (sfConfig::get('sf_logging_enabled'))
-    {
-      $this->dispatcher->notify(new sfEvent($this, 'application.log', array('Generate cache key')));
-    }
-    ksort($parameters);
-
-    return md5(serialize($parameters));
-  }
-
-  /**
-   * Checks that the supplied parameters include a cache key.
-   *
-   * If no 'sf_cache_key' parameter is present one is added to the array as
-   * it is passed by reference.
-   *
-   * @param  array  $parameters An array of parameters
-   *
-   * @return string The cache key
-   */
-  public function checkCacheKey(array & $parameters)
-  {
-    $parameters['sf_cache_key'] = $this->computeCacheKey($parameters);
-
-    return $parameters['sf_cache_key'];
-  }
-
-  /**
-   * Computes a partial internal URI.
-   *
-   * @param  string $module    The module name
-   * @param  string $action    The action name
-   * @param  string $cacheKey  The cache key
-   *
-   * @return string The internal URI
-   */
-  public function getPartialUri($module, $action, $cacheKey)
-  {
-    return sprintf('@sf_cache_partial?module=%s&action=%s&sf_cache_key=%s', $module, $action, $cacheKey);
-  }
-
-  /**
-   * Returns whether a partial template is in the cache.
-   *
-   * @param  string $module    The module name
-   * @param  string $action    The action name
-   * @param  string $cacheKey  The cache key
-   *
-   * @return bool true if a partial is in the cache, false otherwise
-   */
-  public function hasPartialCache($module, $action, $cacheKey)
-  {
-    return $this->has($this->getPartialUri($module, $action, $cacheKey));
-  }
-
-  /**
-   * Gets a partial template from the cache.
-   *
-   * @param  string $module    The module name
-   * @param  string $action    The action name
-   * @param  string $cacheKey  The cache key
-   *
-   * @return string The cache content
-   */
-  public function getPartialCache($module, $action, $cacheKey)
-  {
-    $uri = $this->getPartialUri($module, $action, $cacheKey);
-
-    if (!$this->isCacheable($uri))
-    {
-      return null;
-    }
+        // retrieve content from cache
+        $cache = $this->get($uri);
 
-    // retrieve content from cache
-    $cache = $this->get($uri);
+        if (null === $cache) {
+            return null;
+        }
 
-    if (null === $cache)
-    {
-      return null;
-    }
+        $cache = unserialize($cache);
+        $content = $cache['content'];
+        $this->context->getResponse()->merge($cache['response']);
 
-    $cache = unserialize($cache);
-    $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', array('response' => $this->context->getResponse(), 'uri' => $uri, 'new' => false)), $content)->getReturnValue();
+        return $content;
     }
 
-    return $content;
-  }
-
-  /**
-   * Sets an action template in the cache.
-   *
-   * @param  string $module    The module name
-   * @param  string $action    The action name
-   * @param  string $cacheKey  The cache key
-   * @param  string $content   The content to cache
-   *
-   * @return string The cached content
-   */
-  public function setPartialCache($module, $action, $cacheKey, $content)
-  {
-    $uri = $this->getPartialUri($module, $action, $cacheKey);
-    if (!$this->isCacheable($uri))
+    /**
+     * Sets an action template in the cache.
+     *
+     * @param string $module   The module name
+     * @param string $action   The action name
+     * @param string $cacheKey The cache key
+     * @param string $content  The content to cache
+     *
+     * @return string The cached content
+     */
+    public function setPartialCache($module, $action, $cacheKey, $content)
     {
-      return $content;
-    }
+        $uri = $this->getPartialUri($module, $action, $cacheKey);
+        if (!$this->isCacheable($uri)) {
+            return $content;
+        }
 
-    $saved = $this->set(serialize(array('content' => $content, 'response' => $this->context->getResponse())), $uri);
+        $saved = $this->set(serialize(array('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', array('response' => $this->context->getResponse(), 'uri' => $uri, 'new' => true)), $content)->getReturnValue();
+        }
+
+        return $content;
     }
 
-    return $content;
-  }
-
-  /**
-   * Returns whether an action template is in the cache.
-   *
-   * @param  string  $uri  The internal URI
-   *
-   * @return bool true if an action is in the cache, false otherwise
-   */
-  public function hasActionCache($uri)
-  {
-    return $this->has($uri) && !$this->withLayout($uri);
-  }
-
-  /**
-   * Gets an action template from the cache.
-   *
-   * @param  string $uri  The internal URI
-   *
-   * @return array  An array composed of the cached content and the view attribute holder
-   */
-  public function getActionCache($uri)
-  {
-    if (!$this->isCacheable($uri) || $this->withLayout($uri))
+    /**
+     * Returns whether an action template is in the cache.
+     *
+     * @param string $uri The internal URI
+     *
+     * @return bool true if an action is in the cache, false otherwise
+     */
+    public function hasActionCache($uri)
     {
-      return null;
+        return $this->has($uri) && !$this->withLayout($uri);
     }
 
-    // retrieve content from cache
-    $cache = $this->get($uri);
-
-    if (null === $cache)
+    /**
+     * Gets an action template from the cache.
+     *
+     * @param string $uri The internal URI
+     *
+     * @return array An array composed of the cached content and the view attribute holder
+     */
+    public function getActionCache($uri)
     {
-      return null;
-    }
+        if (!$this->isCacheable($uri) || $this->withLayout($uri)) {
+            return null;
+        }
 
-    $cache = unserialize($cache);
-    $content = $cache['content'];
-    $cache['response']->setEventDispatcher($this->dispatcher);
-    $this->context->getResponse()->copyProperties($cache['response']);
+        // retrieve content from cache
+        $cache = $this->get($uri);
 
-    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 (null === $cache) {
+            return null;
+        }
 
-    return array($content, $cache['decoratorTemplate']);
-  }
-
-  /**
-   * Sets an action template in the cache.
-   *
-   * @param  string $uri                The internal URI
-   * @param  string $content            The content to cache
-   * @param  string $decoratorTemplate  The view attribute holder to cache
-   *
-   * @return string The cached content
-   */
-  public function setActionCache($uri, $content, $decoratorTemplate)
-  {
-    if (!$this->isCacheable($uri) || $this->withLayout($uri))
-    {
-      return $content;
-    }
+        $cache = unserialize($cache);
+        $content = $cache['content'];
+        $cache['response']->setEventDispatcher($this->dispatcher);
+        $this->context->getResponse()->copyProperties($cache['response']);
 
-    $saved = $this->set(serialize(array('content' => $content, 'decoratorTemplate' => $decoratorTemplate, 'response' => $this->context->getResponse())), $uri);
+        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 ($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();
+        return array($content, $cache['decoratorTemplate']);
     }
 
-    return $content;
-  }
-
-  /**
-   * Sets a page in the cache.
-   *
-   * @param string $uri  The internal URI
-   */
-  public function setPageCache($uri)
-  {
-    if (sfView::RENDER_CLIENT != $this->controller->getRenderMode())
+    /**
+     * Sets an action template in the cache.
+     *
+     * @param string $uri               The internal URI
+     * @param string $content           The content to cache
+     * @param string $decoratorTemplate The view attribute holder to cache
+     *
+     * @return string The cached content
+     */
+    public function setActionCache($uri, $content, $decoratorTemplate)
     {
-      return;
-    }
+        if (!$this->isCacheable($uri) || $this->withLayout($uri)) {
+            return $content;
+        }
 
-    // save content in cache
-    $saved = $this->set(serialize($this->context->getResponse()), $uri);
+        $saved = $this->set(serialize(array('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)), $this->context->getResponse()->getContent())->getReturnValue();
+        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();
+        }
 
-      $this->context->getResponse()->setContent($content);
+        return $content;
     }
-  }
-
-  /**
-   * Gets a page from the cache.
-   *
-   * @param  string $uri  The internal URI
-   *
-   * @return string The cached page
-   */
-  public function getPageCache($uri)
-  {
-    $retval = $this->get($uri);
-
-    if (null === $retval)
+
+    /**
+     * Sets a page in the cache.
+     *
+     * @param string $uri The internal URI
+     */
+    public function setPageCache($uri)
     {
-      return false;
-    }
+        if (sfView::RENDER_CLIENT != $this->controller->getRenderMode()) {
+            return;
+        }
 
-    $cachedResponse = unserialize($retval);
-    $cachedResponse->setEventDispatcher($this->dispatcher);
+        // save content in cache
+        $saved = $this->set(serialize($this->context->getResponse()), $uri);
 
-    if (sfView::RENDER_VAR == $this->controller->getRenderMode())
-    {
-      $this->controller->getActionStack()->getLastEntry()->setPresentation($cachedResponse->getContent());
-      $this->context->getResponse()->setContent('');
+        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();
+
+            $this->context->getResponse()->setContent($content);
+        }
     }
-    else
+
+    /**
+     * Gets a page from the cache.
+     *
+     * @param string $uri The internal URI
+     *
+     * @return string The cached page
+     */
+    public function getPageCache($uri)
     {
-      $this->context->setResponse($cachedResponse);
+        $retval = $this->get($uri);
+
+        if (null === $retval) {
+            return false;
+        }
+
+        $cachedResponse = unserialize($retval);
+        $cachedResponse->setEventDispatcher($this->dispatcher);
 
-      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 (sfView::RENDER_VAR == $this->controller->getRenderMode()) {
+            $this->controller->getActionStack()->getLastEntry()->setPresentation($cachedResponse->getContent());
+            $this->context->getResponse()->setContent('');
+        } else {
+            $this->context->setResponse($cachedResponse);
 
-        $this->context->getResponse()->setContent($content);
-      }
+            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();
+
+                $this->context->getResponse()->setContent($content);
+            }
+        }
+
+        return true;
     }
 
-    return true;
-  }
-
-  /**
-   * Returns the current request's cache key.
-   *
-   * This cache key is calculated based on the routing factory's current URI
-   * and any GET parameters from the current request factory.
-   *
-   * @return string The cache key for the current request
-   */
-  public function getCurrentCacheKey()
-  {
-    $cacheKey = $this->routing->getCurrentInternalUri();
-
-    if ($getParameters = $this->request->getGetParameters())
+    /**
+     * Returns the current request's cache key.
+     *
+     * This cache key is calculated based on the routing factory's current URI
+     * and any GET parameters from the current request factory.
+     *
+     * @return string The cache key for the current request
+     */
+    public function getCurrentCacheKey()
     {
-      $cacheKey .= false === strpos((string) $cacheKey, '?') ? '?' : '&';
-      $cacheKey .= http_build_query($getParameters, '', '&');
+        $cacheKey = $this->routing->getCurrentInternalUri();
+
+        if ($getParameters = $this->request->getGetParameters()) {
+            $cacheKey .= false === strpos((string) $cacheKey, '?') ? '?' : '&';
+            $cacheKey .= http_build_query($getParameters, '', '&');
+        }
+
+        return $cacheKey;
     }
 
-    return $cacheKey;
-  }
-
-  /**
-   * 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
-   *
-   * @return string The decorated HTML string
-   */
-  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'))
+    /**
+     * 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
+     *
+     * @return string The decorated HTML string
+     */
+    public function decorateContentWithDebug(sfEvent $event, $content)
     {
-      return $content;
-    }
+        // don't decorate if not html or if content is null
+        if (!$content || false === strpos($event['response']->getContentType(), 'html')) {
+            return $content;
+        }
 
-    $this->context->getConfiguration()->loadHelpers(array('Helper', 'Url', 'Asset', 'Tag'));
+        $this->context->getConfiguration()->loadHelpers(array('Helper', 'Url', 'Asset', 'Tag'));
 
-    $sf_cache_key = $this->generateCacheKey($event['uri']);
-    $bgColor      = $event['new'] ? '#9ff' : '#ff9';
-    $lastModified = $this->cache->getLastModified($sf_cache_key);
-    $cacheKey     = $this->cache->getOption('prefix').$sf_cache_key;
-    $id           = md5($event['uri']);
+        $sf_cache_key = $this->generateCacheKey($event['uri']);
+        $bgColor = $event['new'] ? '#9ff' : '#ff9';
+        $lastModified = $this->cache->getLastModified($sf_cache_key);
+        $cacheKey = $this->cache->getOption('prefix').$sf_cache_key;
+        $id = md5($event['uri']);
 
-    return '
+        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>
@@ -1051,5 +842,134 @@ public function decorateContentWithDebug(sfEvent $event, $content)
       '.$content.'
       </div></div>
     ';
-  }
+    }
+
+    /**
+     * Gets the vary header part of view cache key.
+     *
+     * @param string $vary
+     * @param mixed  $internalUri
+     *
+     * @return string
+     */
+    protected function getCacheKeyVaryHeaderPart($internalUri, $vary = '')
+    {
+        if (!$this->options['cache_key_use_vary_headers']) {
+            return '';
+        }
+
+        // prefix with vary headers
+        if (!$vary) {
+            $varyHeaders = $this->getVary($internalUri);
+
+            if (!$varyHeaders) {
+                return 'all';
+            }
+
+            sort($varyHeaders);
+            $request = $this->context->getRequest();
+            $varys = array();
+
+            foreach ($varyHeaders as $header) {
+                $varys[] = $header.'-'.preg_replace('/\W+/', '_', $request->getHttpHeader($header));
+            }
+            $vary = implode('-', $varys);
+        }
+
+        return $vary;
+    }
+
+    /**
+     * Gets the hostname part of view cache key.
+     *
+     * @param string $hostName
+     */
+    protected function getCacheKeyHostNamePart($hostName = '')
+    {
+        if (!$this->options['cache_key_use_host_name']) {
+            return '';
+        }
+
+        if (!$hostName) {
+            $hostName = $this->context->getRequest()->getHost();
+        }
+
+        $hostName = preg_replace('/[^a-z0-9\*]/i', '_', $hostName);
+        $hostName = preg_replace('/_+/', '_', $hostName);
+
+        return strtolower($hostName);
+    }
+
+    /**
+     * Transforms an associative array of parameters from an URI into a unique key.
+     *
+     * @param array $params Associative array of parameters from the URI (including, at least, module and action)
+     *
+     * @return string Unique key
+     */
+    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');
+        }
+        $module = $params['module'];
+        unset($params['module']);
+        $action = $params['action'];
+        unset($params['action']);
+        ksort($params);
+        $cacheKey = sprintf('%s/%s', $module, $action);
+        foreach ($params as $key => $value) {
+            $cacheKey .= sprintf('/%s/%s', $key, $value);
+        }
+
+        return $cacheKey;
+    }
+
+    /**
+     * Gets a config option from the cache.
+     *
+     * @param string $internalUri  Internal uniform resource identifier
+     * @param string $key          Option name
+     * @param string $defaultValue Default value of the option
+     *
+     * @return mixed Value of the option
+     */
+    protected function getCacheConfig($internalUri, $key, $defaultValue = null)
+    {
+        list($route_name, $params) = $this->controller->convertUrlStringToParameters($internalUri);
+
+        if (!isset($params['module'])) {
+            return $defaultValue;
+        }
+
+        $this->registerConfiguration($params['module']);
+
+        $value = $defaultValue;
+        if (isset($this->cacheConfig[$params['module']][$params['action']][$key])) {
+            $value = $this->cacheConfig[$params['module']][$params['action']][$key];
+        } elseif (isset($this->cacheConfig[$params['module']]['DEFAULT'][$key])) {
+            $value = $this->cacheConfig[$params['module']]['DEFAULT'][$key];
+        }
+
+        return $value;
+    }
+
+    /**
+     * Ignores the cache functionality.
+     *
+     * @return bool true, if the cache is ignore otherwise false
+     */
+    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')));
+            }
+
+            return true;
+        }
+
+        return false;
+    }
 }
diff --git a/lib/view/sfViewParameterHolder.class.php b/lib/view/sfViewParameterHolder.class.php
index 3d8c63f18..ca5b42e78 100644
--- a/lib/view/sfViewParameterHolder.class.php
+++ b/lib/view/sfViewParameterHolder.class.php
@@ -13,196 +13,189 @@
  *
  * It can also escape variables with an escaping method.
  *
- * @package    symfony
- * @subpackage view
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfViewParameterHolder extends sfParameterHolder
 {
-  protected
-    $dispatcher     = null,
-    $escaping       = null,
-    $escapingMethod = null;
-
-  /**
-   * Constructor.
-   */
-  public function __construct(sfEventDispatcher $dispatcher, $parameters = array(), $options = array())
-  {
-    $this->initialize($dispatcher, $parameters, $options);
-  }
-
-  /**
-   * 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.
-   *
-   * <b>Options:</b>
-   *
-   * # <b>escaping_strategy</b> - [off]              - The escaping strategy (on or off)
-   * # <b>escaping_method</b>   - [ESC_SPECIALCHARS] - The escaping method (ESC_RAW, ESC_ENTITIES, ESC_JS, ESC_JS_NO_ENTITIES, or ESC_SPECIALCHARS)
-   *
-   * @return bool true, if initialization completes successfully, otherwise false.
-   *
-   * @throws sfInitializationException If an error occurs while initializing this view parameter holder.
-   */
-  public function initialize(sfEventDispatcher $dispatcher, $parameters = array(), $options = array())
-  {
-    $this->dispatcher = $dispatcher;
-
-    $this->add($parameters);
-
-    $this->setEscaping(isset($options['escaping_strategy']) ? $options['escaping_strategy'] : false);
-    $this->setEscapingMethod(isset($options['escaping_method']) ? $options['escaping_method'] : 'ESC_SPECIALCHARS');
-  }
-
-  /**
-   * Returns true if the current object acts as an escaper.
-   *
-   * @return bool true if the current object acts as an escaper, false otherwise
-   */
-  public function isEscaped()
-  {
-    return in_array($this->getEscaping(), array('on', 'true', true), true);
-  }
-
-  /**
-   * Returns an array representation of the view parameters.
-   *
-   * @return array An array of view parameters
-   *
-   * @throws InvalidArgumentException
-   */
-  public function toArray()
-  {
-    $event = $this->dispatcher->filter(new sfEvent($this, 'template.filter_parameters'), $this->getAll());
-    $parameters = $event->getReturnValue();
-    $attributes = array();
-
-    if ($this->isEscaped())
+    protected $dispatcher;
+    protected $escaping;
+    protected $escapingMethod;
+
+    /**
+     * Constructor.
+     *
+     * @param mixed $parameters
+     * @param mixed $options
+     */
+    public function __construct(sfEventDispatcher $dispatcher, $parameters = array(), $options = array())
+    {
+        $this->initialize($dispatcher, $parameters, $options);
+    }
+
+    /**
+     * Serializes the current instance for PHP 7.4+.
+     *
+     * @return array
+     */
+    public function __serialize()
+    {
+        return array($this->getAll(), $this->escapingMethod, $this->escaping);
+    }
+
+    /**
+     * Unserializes a sfParameterHolder instance for PHP 7.4+.
+     *
+     * @param array $data
+     */
+    public function __unserialize($data)
+    {
+        list($this->parameters, $escapingMethod, $escaping) = $data;
+        $this->initialize(sfContext::hasInstance() ? sfContext::getInstance()->getEventDispatcher() : new sfEventDispatcher());
+
+        $this->setEscapingMethod($escapingMethod);
+        $this->setEscaping($escaping);
+    }
+
+    /**
+     * 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.
+     *
+     * <b>Options:</b>
+     *
+     * # <b>escaping_strategy</b> - [off]              - The escaping strategy (on or off)
+     * # <b>escaping_method</b>   - [ESC_SPECIALCHARS] - The escaping method (ESC_RAW, ESC_ENTITIES, ESC_JS, ESC_JS_NO_ENTITIES, or ESC_SPECIALCHARS)
+     *
+     * @return bool true, if initialization completes successfully, otherwise false
+     *
+     * @throws sfInitializationException if an error occurs while initializing this view parameter holder
+     */
+    public function initialize(sfEventDispatcher $dispatcher, $parameters = array(), $options = array())
+    {
+        $this->dispatcher = $dispatcher;
+
+        $this->add($parameters);
+
+        $this->setEscaping(isset($options['escaping_strategy']) ? $options['escaping_strategy'] : false);
+        $this->setEscapingMethod(isset($options['escaping_method']) ? $options['escaping_method'] : 'ESC_SPECIALCHARS');
+    }
+
+    /**
+     * Returns true if the current object acts as an escaper.
+     *
+     * @return bool true if the current object acts as an escaper, false otherwise
+     */
+    public function isEscaped()
+    {
+        return in_array($this->getEscaping(), array('on', 'true', true), true);
+    }
+
+    /**
+     * Returns an array representation of the view parameters.
+     *
+     * @return array An array of view parameters
+     *
+     * @throws InvalidArgumentException
+     */
+    public function toArray()
+    {
+        $event = $this->dispatcher->filter(new sfEvent($this, 'template.filter_parameters'), $this->getAll());
+        $parameters = $event->getReturnValue();
+        $attributes = array();
+
+        if ($this->isEscaped()) {
+            $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)) {
+            $attributes = $parameters;
+            $attributes['sf_data'] = sfOutputEscaper::escape(ESC_RAW, $parameters);
+        } else {
+            throw new InvalidArgumentException(sprintf('Unknown strategy "%s".', $this->getEscaping()));
+        }
+
+        return $attributes;
+    }
+
+    /**
+     * Gets the default escaping strategy associated with this view.
+     *
+     * The escaping strategy specifies how the variables get passed to the view.
+     *
+     * @return string the escaping strategy
+     */
+    public function getEscaping()
     {
-      $attributes['sf_data'] = sfOutputEscaper::escape($this->getEscapingMethod(), $parameters);
-      foreach ($attributes['sf_data'] as $key => $value)
-      {
-        $attributes[$key] = $value;
-      }
+        return $this->escaping;
     }
-    else if (in_array($this->getEscaping(), array('off', false), true))
+
+    /**
+     * Sets the escape character strategy.
+     *
+     * @param string $escaping Escape code
+     */
+    public function setEscaping($escaping)
     {
-      $attributes = $parameters;
-      $attributes['sf_data'] = sfOutputEscaper::escape(ESC_RAW, $parameters);
+        $this->escaping = $escaping;
     }
-    else
+
+    /**
+     * Returns the name of the function that is to be used as the escaping method.
+     *
+     * If the escaping method is empty, then that is returned. The default value
+     * specified by the sub-class will be used. If the method does not exist (in
+     * the sense there is no define associated with the method), an exception is
+     * thrown.
+     *
+     * @return string The escaping method as the name of the function to use
+     *
+     * @throws InvalidArgumentException If the method does not exist
+     */
+    public function getEscapingMethod()
     {
-      throw new InvalidArgumentException(sprintf('Unknown strategy "%s".', $this->getEscaping()));
+        if (empty($this->escapingMethod)) {
+            return $this->escapingMethod;
+        }
+
+        if (!defined($this->escapingMethod)) {
+            throw new InvalidArgumentException(sprintf('The escaping method "%s" is not available.', $this->escapingMethod));
+        }
+
+        return constant($this->escapingMethod);
     }
 
-    return $attributes;
-  }
-
-  /**
-   * Gets the default escaping strategy associated with this view.
-   *
-   * The escaping strategy specifies how the variables get passed to the view.
-   *
-   * @return string the escaping strategy
-   */
-  public function getEscaping()
-  {
-    return $this->escaping;
-  }
-
-  /**
-   * Sets the escape character strategy.
-   *
-   * @param string $escaping  Escape code
-   */
-  public function setEscaping($escaping)
-  {
-    $this->escaping = $escaping;
-  }
-
-  /**
-   * Returns the name of the function that is to be used as the escaping method.
-   *
-   * If the escaping method is empty, then that is returned. The default value
-   * specified by the sub-class will be used. If the method does not exist (in
-   * the sense there is no define associated with the method), an exception is
-   * thrown.
-   *
-   * @return string The escaping method as the name of the function to use
-   *
-   * @throws InvalidArgumentException If the method does not exist
-   */
-  public function getEscapingMethod()
-  {
-    if (empty($this->escapingMethod))
+    /**
+     * Sets the escaping method for the current view.
+     *
+     * @param string $method Method for escaping
+     */
+    public function setEscapingMethod($method)
     {
-      return $this->escapingMethod;
+        $this->escapingMethod = $method;
     }
 
-    if (!defined($this->escapingMethod))
+    /**
+     * Serializes the current instance.
+     *
+     * @return string Objects instance
+     */
+    public function serialize()
     {
-      throw new InvalidArgumentException(sprintf('The escaping method "%s" is not available.', $this->escapingMethod));
+        return serialize($this->__serialize());
     }
 
-    return constant($this->escapingMethod);
-  }
-
-  /**
-   * Sets the escaping method for the current view.
-   *
-   * @param string $method  Method for escaping
-   */
-  public function setEscapingMethod($method)
-  {
-    $this->escapingMethod = $method;
-  }
-
-  /**
-   * Serializes the current instance.
-   *
-   * @return string Objects instance
-   */
-  public function serialize()
-  {
-    return serialize($this->__serialize());
-  }
-
-  /**
-   * Unserializes a sfViewParameterHolder instance.
-   *
-   * @param string $serialized The serialized instance data
-   */
-  public function unserialize($serialized)
-  {
-    $this->__unserialize(unserialize($serialized));
-  }
-
-  /**
-   * Serializes the current instance for PHP 7.4+
-   *
-   * @return array
-   */
-  public function __serialize()
-  {
-    return array($this->getAll(), $this->escapingMethod, $this->escaping);
-  }
-
-  /**
-   * Unserializes a sfParameterHolder instance for PHP 7.4+
-   *
-   * @param array $data
-   */
-  public function __unserialize($data)
-  {
-    list($this->parameters, $escapingMethod, $escaping) = $data;
-    $this->initialize(sfContext::hasInstance() ? sfContext::getInstance()->getEventDispatcher() : new sfEventDispatcher());
-
-    $this->setEscapingMethod($escapingMethod);
-    $this->setEscaping($escaping);
-  }
+    /**
+     * Unserializes a sfViewParameterHolder instance.
+     *
+     * @param string $serialized The serialized instance data
+     */
+    public function unserialize($serialized)
+    {
+        $this->__unserialize(unserialize($serialized));
+    }
 }
diff --git a/lib/widget/i18n/sfWidgetFormI18nChoiceCountry.class.php b/lib/widget/i18n/sfWidgetFormI18nChoiceCountry.class.php
index 1735530fc..8d00f8c9d 100644
--- a/lib/widget/i18n/sfWidgetFormI18nChoiceCountry.class.php
+++ b/lib/widget/i18n/sfWidgetFormI18nChoiceCountry.class.php
@@ -11,47 +11,45 @@
 /**
  * sfWidgetFormI18nChoiceCountry represents a country choice widget.
  *
- * @package    symfony
- * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfWidgetFormI18nChoiceCountry extends sfWidgetFormChoice
 {
-  /**
-   * Constructor.
-   *
-   * Available options:
-   *
-   *  * culture:   The culture to use for internationalized strings
-   *  * countries: An array of country codes to use (ISO 3166)
-   *  * add_empty: Whether to add a first empty value or not (false by default)
-   *               If the option is not a Boolean, the value will be used as the text value
-   *
-   * @param array $options     An array of options
-   * @param array $attributes  An array of default HTML attributes
-   *
-   * @see sfWidgetFormChoice
-   */
-  protected function configure($options = array(), $attributes = array())
-  {
-    parent::configure($options, $attributes);
+    /**
+     * Constructor.
+     *
+     * Available options:
+     *
+     *  * culture:   The culture to use for internationalized strings
+     *  * countries: An array of country codes to use (ISO 3166)
+     *  * add_empty: Whether to add a first empty value or not (false by default)
+     *               If the option is not a Boolean, the value will be used as the text value
+     *
+     * @param array $options    An array of options
+     * @param array $attributes An array of default HTML attributes
+     *
+     * @see sfWidgetFormChoice
+     */
+    protected function configure($options = array(), $attributes = array())
+    {
+        parent::configure($options, $attributes);
 
-    $this->addOption('culture');
-    $this->addOption('countries');
-    $this->addOption('add_empty', false);
+        $this->addOption('culture');
+        $this->addOption('countries');
+        $this->addOption('add_empty', false);
 
-    // populate choices with all countries
-    $culture = isset($options['culture']) ? $options['culture'] : 'en';
+        // 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);
-    }
+        $addEmpty = isset($options['add_empty']) ? $options['add_empty'] : false;
+        if (false !== $addEmpty) {
+            $countries = array_merge(array('' => true === $addEmpty ? '' : $addEmpty), $countries);
+        }
 
-    $this->setOption('choices', $countries);
-  }
+        $this->setOption('choices', $countries);
+    }
 }
diff --git a/lib/widget/i18n/sfWidgetFormI18nChoiceCurrency.class.php b/lib/widget/i18n/sfWidgetFormI18nChoiceCurrency.class.php
index 0887acc79..24248a2f4 100644
--- a/lib/widget/i18n/sfWidgetFormI18nChoiceCurrency.class.php
+++ b/lib/widget/i18n/sfWidgetFormI18nChoiceCurrency.class.php
@@ -11,47 +11,45 @@
 /**
  * sfWidgetFormI18nChoiceCurrency represents a currency choice widget.
  *
- * @package    symfony
- * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfWidgetFormI18nChoiceCurrency extends sfWidgetFormChoice
 {
-  /**
-   * Constructor.
-   *
-   * Available options:
-   *
-   *  * culture:    The culture to use for internationalized strings
-   *  * currencies: An array of currency codes to use (ISO 4217)
-   *  * add_empty:  Whether to add a first empty value or not (false by default)
-   *                If the option is not a Boolean, the value will be used as the text value
-   *
-   * @param array $options     An array of options
-   * @param array $attributes  An array of default HTML attributes
-   *
-   * @see sfWidgetFormChoice
-   */
-  protected function configure($options = array(), $attributes = array())
-  {
-    parent::configure($options, $attributes);
+    /**
+     * Constructor.
+     *
+     * Available options:
+     *
+     *  * culture:    The culture to use for internationalized strings
+     *  * currencies: An array of currency codes to use (ISO 4217)
+     *  * add_empty:  Whether to add a first empty value or not (false by default)
+     *                If the option is not a Boolean, the value will be used as the text value
+     *
+     * @param array $options    An array of options
+     * @param array $attributes An array of default HTML attributes
+     *
+     * @see sfWidgetFormChoice
+     */
+    protected function configure($options = array(), $attributes = array())
+    {
+        parent::configure($options, $attributes);
 
-    $this->addOption('culture');
-    $this->addOption('currencies');
-    $this->addOption('add_empty', false);
+        $this->addOption('culture');
+        $this->addOption('currencies');
+        $this->addOption('add_empty', false);
 
-    // populate choices with all currencies
-    $culture = isset($options['culture']) ? $options['culture'] : 'en';
+        // 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);
-    }
+        $addEmpty = isset($options['add_empty']) ? $options['add_empty'] : false;
+        if (false !== $addEmpty) {
+            $currencies = array_merge(array('' => true === $addEmpty ? '' : $addEmpty), $currencies);
+        }
 
-    $this->setOption('choices', $currencies);
-  }
+        $this->setOption('choices', $currencies);
+    }
 }
diff --git a/lib/widget/i18n/sfWidgetFormI18nChoiceLanguage.class.php b/lib/widget/i18n/sfWidgetFormI18nChoiceLanguage.class.php
index 905309717..90fcc5caa 100644
--- a/lib/widget/i18n/sfWidgetFormI18nChoiceLanguage.class.php
+++ b/lib/widget/i18n/sfWidgetFormI18nChoiceLanguage.class.php
@@ -11,47 +11,45 @@
 /**
  * sfWidgetFormI18nChoiceLanguage represents a language choice widget.
  *
- * @package    symfony
- * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfWidgetFormI18nChoiceLanguage extends sfWidgetFormChoice
 {
-  /**
-   * Constructor.
-   *
-   * Available options:
-   *
-   *  * culture:   The culture to use for internationalized strings
-   *  * languages: An array of language codes to use
-   *  * add_empty: Whether to add a first empty value or not (false by default)
-   *               If the option is not a Boolean, the value will be used as the text value
-   *
-   * @param array $options     An array of options
-   * @param array $attributes  An array of default HTML attributes
-   *
-   * @see sfWidgetFormChoice
-   */
-  protected function configure($options = array(), $attributes = array())
-  {
-    parent::configure($options, $attributes);
+    /**
+     * Constructor.
+     *
+     * Available options:
+     *
+     *  * culture:   The culture to use for internationalized strings
+     *  * languages: An array of language codes to use
+     *  * add_empty: Whether to add a first empty value or not (false by default)
+     *               If the option is not a Boolean, the value will be used as the text value
+     *
+     * @param array $options    An array of options
+     * @param array $attributes An array of default HTML attributes
+     *
+     * @see sfWidgetFormChoice
+     */
+    protected function configure($options = array(), $attributes = array())
+    {
+        parent::configure($options, $attributes);
 
-    $this->addOption('culture');
-    $this->addOption('languages');
-    $this->addOption('add_empty', false);
+        $this->addOption('culture');
+        $this->addOption('languages');
+        $this->addOption('add_empty', false);
 
-    // populate choices with all languages
-    $culture = isset($options['culture']) ? $options['culture'] : 'en';
+        // 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);
-    }
+        $addEmpty = isset($options['add_empty']) ? $options['add_empty'] : false;
+        if (false !== $addEmpty) {
+            $languages = array_merge(array('' => true === $addEmpty ? '' : $addEmpty), $languages);
+        }
 
-    $this->setOption('choices', $languages);
-  }
+        $this->setOption('choices', $languages);
+    }
 }
diff --git a/lib/widget/i18n/sfWidgetFormI18nChoiceTimezone.class.php b/lib/widget/i18n/sfWidgetFormI18nChoiceTimezone.class.php
index d28dbbb21..19c1d1641 100644
--- a/lib/widget/i18n/sfWidgetFormI18nChoiceTimezone.class.php
+++ b/lib/widget/i18n/sfWidgetFormI18nChoiceTimezone.class.php
@@ -11,44 +11,42 @@
 /**
  * sfWidgetFormI18nChoiceTimezone represents a timezone choice widget.
  *
- * @package    symfony
- * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfWidgetFormI18nChoiceTimezone extends sfWidgetFormChoice
 {
-  /**
-   * Constructor.
-   *
-   * Available options:
-   *
-   *  * culture:   The culture to use for internationalized strings
-   *  * add_empty: Whether to add a first empty value or not (false by default)
-   *               If the option is not a Boolean, the value will be used as the text value
-   *
-   * @param array $options     An array of options
-   * @param array $attributes  An array of default HTML attributes
-   *
-   * @see sfWidgetFormChoice
-   */
-  protected function configure($options = array(), $attributes = array())
-  {
-    parent::configure($options, $attributes);
+    /**
+     * Constructor.
+     *
+     * Available options:
+     *
+     *  * culture:   The culture to use for internationalized strings
+     *  * add_empty: Whether to add a first empty value or not (false by default)
+     *               If the option is not a Boolean, the value will be used as the text value
+     *
+     * @param array $options    An array of options
+     * @param array $attributes An array of default HTML attributes
+     *
+     * @see sfWidgetFormChoice
+     */
+    protected function configure($options = array(), $attributes = array())
+    {
+        parent::configure($options, $attributes);
 
-    $this->addOption('culture');
-    $this->addOption('add_empty', false);
+        $this->addOption('culture');
+        $this->addOption('add_empty', false);
 
-    $culture = isset($options['culture']) ? $options['culture'] : 'en';
-    $timezones = array_keys(sfCultureInfo::getInstance($culture)->getTimeZones());
-    $timezones = array_combine($timezones, $timezones);
+        $culture = isset($options['culture']) ? $options['culture'] : 'en';
+        $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);
-    }
+        $addEmpty = isset($options['add_empty']) ? $options['add_empty'] : false;
+        if (false !== $addEmpty) {
+            $timezones = array_merge(array('' => true === $addEmpty ? '' : $addEmpty), $timezones);
+        }
 
-    $this->setOption('choices', $timezones);
-  }
+        $this->setOption('choices', $timezones);
+    }
 }
diff --git a/lib/widget/i18n/sfWidgetFormI18nDate.class.php b/lib/widget/i18n/sfWidgetFormI18nDate.class.php
index 3c74c71b7..b0e99d4ee 100644
--- a/lib/widget/i18n/sfWidgetFormI18nDate.class.php
+++ b/lib/widget/i18n/sfWidgetFormI18nDate.class.php
@@ -11,71 +11,71 @@
 /**
  * sfWidgetFormI18nDate represents a date widget.
  *
- * @package    symfony
- * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfWidgetFormI18nDate extends sfWidgetFormDate
 {
-  /**
-   * Constructor.
-   *
-   * Available options:
-   *
-   *  * culture:      The culture to use for internationalized strings (required)
-   *  * month_format: The month format (name - default, short_name, number)
-   *
-   * @param array $options     An array of options
-   * @param array $attributes  An array of default HTML attributes
-   *
-   * @see sfWidgetFormDate
-   */
-  protected function configure($options = array(), $attributes = array())
-  {
-    parent::configure($options, $attributes);
+    /**
+     * Constructor.
+     *
+     * Available options:
+     *
+     *  * culture:      The culture to use for internationalized strings (required)
+     *  * month_format: The month format (name - default, short_name, number)
+     *
+     * @param array $options    An array of options
+     * @param array $attributes An array of default HTML attributes
+     *
+     * @see sfWidgetFormDate
+     */
+    protected function configure($options = array(), $attributes = array())
+    {
+        parent::configure($options, $attributes);
 
-    $this->addRequiredOption('culture');
-    $this->addOption('month_format');
+        $this->addRequiredOption('culture');
+        $this->addOption('month_format');
 
-    $culture = isset($options['culture']) ? $options['culture'] : 'en';
-    $monthFormat = isset($options['month_format']) ? $options['month_format'] : 'name';
+        $culture = isset($options['culture']) ? $options['culture'] : 'en';
+        $monthFormat = isset($options['month_format']) ? $options['month_format'] : 'name';
 
-    // format
-    $this->setOption('format', $this->getDateFormat($culture));
+        // format
+        $this->setOption('format', $this->getDateFormat($culture));
 
-    // months
-    $this->setOption('months', $this->getMonthFormat($culture, $monthFormat));
-  }
+        // months
+        $this->setOption('months', $this->getMonthFormat($culture, $monthFormat));
+    }
 
-  protected function getMonthFormat($culture, $monthFormat)
-  {
-    switch ($monthFormat)
+    protected function getMonthFormat($culture, $monthFormat)
     {
-      case 'name':
-        return array_combine(range(1, 12), sfDateTimeFormatInfo::getInstance($culture)->getMonthNames());
-      case 'short_name':
-        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));
-    }
-  }
+        switch ($monthFormat) {
+            case 'name':
+                return array_combine(range(1, 12), sfDateTimeFormatInfo::getInstance($culture)->getMonthNames());
 
-  protected function getDateFormat($culture)
-  {
-    $dateFormat = sfDateTimeFormatInfo::getInstance($culture)->getShortDatePattern();
+            case 'short_name':
+                return array_combine(range(1, 12), sfDateTimeFormatInfo::getInstance($culture)->getAbbreviatedMonthNames());
 
-    if (false === ($dayPos = stripos($dateFormat, 'd')) || false === ($monthPos = stripos($dateFormat, 'm')) || false === ($yearPos = stripos($dateFormat, 'y')))
-    {
-      return $this->getOption('format');
+            case 'number':
+                return $this->getOption('months');
+
+            default:
+                throw new InvalidArgumentException(sprintf('The month format "%s" is invalid.', $monthFormat));
+        }
     }
 
-    return strtr($dateFormat, array(
-      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%',
-    ));
-  }
+    protected function getDateFormat($culture)
+    {
+        $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(
+            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 3dac59e6e..bcd1e52d8 100644
--- a/lib/widget/i18n/sfWidgetFormI18nDateTime.class.php
+++ b/lib/widget/i18n/sfWidgetFormI18nDateTime.class.php
@@ -11,50 +11,53 @@
 /**
  * sfWidgetFormI18nDateTime represents a date and time widget.
  *
- * @package    symfony
- * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfWidgetFormI18nDateTime extends sfWidgetFormDateTime
 {
-  /**
-   * Constructor.
-   *
-   * Available options:
-   *
-   *  * culture: The culture to use for internationalized strings (required)
-   *
-   * @param array $options     An array of options
-   * @param array $attributes  An array of default HTML attributes
-   *
-   * @see sfWidgetFormDateTime
-   */
-  protected function configure($options = array(), $attributes = array())
-  {
-    parent::configure($options, $attributes);
+    /**
+     * Constructor.
+     *
+     * Available options:
+     *
+     *  * culture: The culture to use for internationalized strings (required)
+     *
+     * @param array $options    An array of options
+     * @param array $attributes An array of default HTML attributes
+     *
+     * @see sfWidgetFormDateTime
+     */
+    protected function configure($options = array(), $attributes = array())
+    {
+        parent::configure($options, $attributes);
 
-    $this->addRequiredOption('culture');
+        $this->addRequiredOption('culture');
 
-    $culture = isset($options['culture']) ? $options['culture'] : 'en';
+        $culture = isset($options['culture']) ? $options['culture'] : 'en';
 
-    // format
-    $this->setOption('format', str_replace(array('{0}', '{1}'), array('%time%', '%date%'), sfDateTimeFormatInfo::getInstance($culture)->getDateTimeOrderPattern()));
-  }
+        // format
+        $this->setOption('format', str_replace(array('{0}', '{1}'), array('%time%', '%date%'), sfDateTimeFormatInfo::getInstance($culture)->getDateTimeOrderPattern()));
+    }
 
-  /**
-   * @see sfWidgetFormDateTime
-   */
-  protected function getDateWidget($attributes = array())
-  {
-    return new sfWidgetFormI18nDate(array_merge(array('culture' => $this->getOption('culture')), $this->getOptionsFor('date')), $this->getAttributesFor('date', $attributes));
-  }
+    /**
+     * @see sfWidgetFormDateTime
+     *
+     * @param mixed $attributes
+     */
+    protected function getDateWidget($attributes = array())
+    {
+        return new sfWidgetFormI18nDate(array_merge(array('culture' => $this->getOption('culture')), $this->getOptionsFor('date')), $this->getAttributesFor('date', $attributes));
+    }
 
-  /**
-   * @see sfWidgetFormDateTime
-   */
-  protected function getTimeWidget($attributes = array())
-  {
-    return new sfWidgetFormI18nTime(array_merge(array('culture' => $this->getOption('culture')), $this->getOptionsFor('time')), $this->getAttributesFor('time', $attributes));
-  }
+    /**
+     * @see sfWidgetFormDateTime
+     *
+     * @param mixed $attributes
+     */
+    protected function getTimeWidget($attributes = array())
+    {
+        return new sfWidgetFormI18nTime(array_merge(array('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 32bb53307..e6eac87c3 100644
--- a/lib/widget/i18n/sfWidgetFormI18nTime.class.php
+++ b/lib/widget/i18n/sfWidgetFormI18nTime.class.php
@@ -11,64 +11,60 @@
 /**
  * sfWidgetFormI18nTime represents a time widget.
  *
- * @package    symfony
- * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfWidgetFormI18nTime extends sfWidgetFormTime
 {
-  /**
-   * Constructor.
-   *
-   * Available options:
-   *
-   *  * culture: The culture to use for internationalized strings (required)
-   *
-   * @param array $options     An array of options
-   * @param array $attributes  An array of default HTML attributes
-   *
-   * @see sfWidgetFormTime
-   */
-  protected function configure($options = array(), $attributes = array())
-  {
-    parent::configure($options, $attributes);
-
-    $this->addRequiredOption('culture');
+    /**
+     * Constructor.
+     *
+     * Available options:
+     *
+     *  * culture: The culture to use for internationalized strings (required)
+     *
+     * @param array $options    An array of options
+     * @param array $attributes An array of default HTML attributes
+     *
+     * @see sfWidgetFormTime
+     */
+    protected function configure($options = array(), $attributes = array())
+    {
+        parent::configure($options, $attributes);
 
-    $culture = isset($options['culture']) ? $options['culture'] : 'en';
+        $this->addRequiredOption('culture');
 
-    // format
-    $this->setOption('format', $this->getTimeFormat($culture, true));
+        $culture = isset($options['culture']) ? $options['culture'] : 'en';
 
-    // format_without_seconds
-    $this->setOption('format_without_seconds', $this->getTimeFormat($culture, false));
-  }
+        // format
+        $this->setOption('format', $this->getTimeFormat($culture, true));
 
-  protected function getTimeFormat($culture, $withSeconds)
-  {
-    $timeFormat = $withSeconds ? sfDateTimeFormatInfo::getInstance($culture)->getMediumTimePattern() : sfDateTimeFormatInfo::getInstance($culture)->getShortTimePattern();
+        // format_without_seconds
+        $this->setOption('format_without_seconds', $this->getTimeFormat($culture, false));
+    }
 
-    if (false === ($hourPos = stripos($timeFormat, 'h')) || false === ($minutePos = stripos($timeFormat, 'm')))
+    protected function getTimeFormat($culture, $withSeconds)
     {
-      return $this->getOption('format');
-    }
+        $timeFormat = $withSeconds ? sfDateTimeFormatInfo::getInstance($culture)->getMediumTimePattern() : sfDateTimeFormatInfo::getInstance($culture)->getShortTimePattern();
 
-    $trans = array(
-      substr($timeFormat, $hourPos,   strripos($timeFormat, 'h') - $hourPos + 1)   => '%hour%',
-      substr($timeFormat, $minutePos, strripos($timeFormat, 'm') - $minutePos + 1) => '%minute%',
-    );
+        if (false === ($hourPos = stripos($timeFormat, 'h')) || false === ($minutePos = stripos($timeFormat, 'm'))) {
+            return $this->getOption('format');
+        }
 
-    if ($withSeconds)
-    {
-      if (false === $secondPos = stripos($timeFormat, 's'))
-      {
-        return $this->getOption('format');
-      }
+        $trans = array(
+            substr($timeFormat, $hourPos, strripos($timeFormat, 'h') - $hourPos + 1) => '%hour%',
+            substr($timeFormat, $minutePos, strripos($timeFormat, 'm') - $minutePos + 1) => '%minute%',
+        );
 
-      $trans[substr($timeFormat, $secondPos, strripos($timeFormat, 's') - $secondPos + 1)] = '%second%';
-    }
+        if ($withSeconds) {
+            if (false === $secondPos = stripos($timeFormat, 's')) {
+                return $this->getOption('format');
+            }
 
-    return strtr($timeFormat, $trans);
-  }
+            $trans[substr($timeFormat, $secondPos, strripos($timeFormat, 's') - $secondPos + 1)] = '%second%';
+        }
+
+        return strtr($timeFormat, $trans);
+    }
 }
diff --git a/lib/widget/sfWidget.class.php b/lib/widget/sfWidget.class.php
index 80a4c4b63..8bd37963e 100644
--- a/lib/widget/sfWidget.class.php
+++ b/lib/widget/sfWidget.class.php
@@ -11,401 +11,392 @@
 /**
  * sfWidget is the base class for all widgets.
  *
- * @package    symfony
- * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfWidget
 {
-  protected
-    $requiredOptions = array(),
-    $attributes      = array(),
-    $options         = array();
-
-  protected static
-    $xhtml   = true,
-    $charset = 'UTF-8';
-
-  /**
-   * Constructor.
-   *
-   * @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
-   */
-  public function __construct($options = array(), $attributes = array())
-  {
-    $this->configure($options, $attributes);
-
-    $currentOptionKeys = array_keys($this->options);
-    $optionKeys = array_keys($options);
-
-    // check option names
-    if ($diff = array_diff($optionKeys, array_merge($currentOptionKeys, $this->requiredOptions)))
+    protected $requiredOptions = array();
+    protected $attributes = array();
+    protected $options = array();
+
+    protected static $xhtml = true;
+    protected static $charset = 'UTF-8';
+
+    /**
+     * Constructor.
+     *
+     * @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
+     */
+    public function __construct($options = array(), $attributes = array())
+    {
+        $this->configure($options, $attributes);
+
+        $currentOptionKeys = array_keys($this->options);
+        $optionKeys = array_keys($options);
+
+        // 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)));
+        }
+
+        // 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)));
+        }
+
+        $this->options = array_merge($this->options, $options);
+        $this->attributes = array_merge($this->attributes, $attributes);
+    }
+
+    /**
+     * Renders the widget as HTML.
+     *
+     * All subclasses must implement this method.
+     *
+     * @param string $name       The name of the HTML widget
+     * @param mixed  $value      The value of the widget
+     * @param array  $attributes An array of HTML attributes
+     * @param array  $errors     An array of errors
+     *
+     * @return string A HTML representation of the widget
+     */
+    abstract public function render($name, $value = null, $attributes = array(), $errors = array());
+
+    /**
+     * Adds a required option.
+     *
+     * @param string $name The option name
+     *
+     * @return sfWidget The current widget instance
+     */
+    public function addRequiredOption($name)
+    {
+        $this->requiredOptions[] = $name;
+
+        return $this;
+    }
+
+    /**
+     * Returns all required option names.
+     *
+     * @return array An array of required option names
+     */
+    public function getRequiredOptions()
+    {
+        return $this->requiredOptions;
+    }
+
+    /**
+     * Adds a new option value with a default value.
+     *
+     * @param string $name  The option name
+     * @param mixed  $value The default value
+     *
+     * @return sfWidget The current widget instance
+     */
+    public function addOption($name, $value = null)
+    {
+        $this->options[$name] = $value;
+
+        return $this;
+    }
+
+    /**
+     * Changes an option value.
+     *
+     * @param string $name  The option name
+     * @param mixed  $value The value
+     *
+     * @return sfWidget The current widget instance
+     *
+     * @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));
+        }
+
+        $this->options[$name] = $value;
+
+        return $this;
+    }
+
+    /**
+     * Gets an option value.
+     *
+     * @param string $name    The option name
+     * @param string $default A default value if option does not exists
+     *
+     * @return mixed The option value
+     */
+    public function getOption($name, $default = null)
+    {
+        return isset($this->options[$name]) ? $this->options[$name] : $default;
+    }
+
+    /**
+     * Returns true if the option exists.
+     *
+     * @param string $name The option name
+     *
+     * @return bool true if the option exists, false otherwise
+     */
+    public function hasOption($name)
+    {
+        return array_key_exists($name, $this->options);
+    }
+
+    /**
+     * Gets all options.
+     *
+     * @return array An array of named options
+     */
+    public function getOptions()
+    {
+        return $this->options;
+    }
+
+    /**
+     * Sets the options.
+     *
+     * @param array $options An array of options
+     *
+     * @return sfWidget The current widget instance
+     */
+    public function setOptions($options)
+    {
+        $this->options = $options;
+
+        return $this;
+    }
+
+    /**
+     * Returns the default HTML attributes.
+     *
+     * @param array An array of HTML attributes
+     */
+    public function getAttributes()
     {
-      throw new InvalidArgumentException(sprintf('%s does not support the following options: \'%s\'.', get_class($this), implode('\', \'', $diff)));
+        return $this->attributes;
     }
 
-    // check required options
-    if ($diff = array_diff($this->requiredOptions, array_merge($currentOptionKeys, $optionKeys)))
+    /**
+     * Sets a default HTML attribute.
+     *
+     * @param string $name  The attribute name
+     * @param string $value The attribute value
+     *
+     * @return sfWidget The current widget instance
+     */
+    public function setAttribute($name, $value)
     {
-      throw new RuntimeException(sprintf('%s requires the following options: \'%s\'.', get_class($this), implode('\', \'', $diff)));
+        $this->attributes[$name] = $value;
+
+        return $this;
+    }
+
+    /**
+     * Returns the HTML attribute value for a given attribute name.
+     *
+     * @param string $name the attribute name
+     *
+     * @return string The attribute value, or null if the attribute does not exist
+     */
+    public function getAttribute($name)
+    {
+        return isset($this->attributes[$name]) ? $this->attributes[$name] : null;
+    }
+
+    /**
+     * Sets the HTML attributes.
+     *
+     * @param array $attributes An array of HTML attributes
+     *
+     * @return sfWidget The current widget instance
+     */
+    public function setAttributes($attributes)
+    {
+        $this->attributes = $attributes;
+
+        return $this;
     }
 
-    $this->options = array_merge($this->options, $options);
-    $this->attributes = array_merge($this->attributes, $attributes);
-  }
-
-  /**
-   * Configures the current widget.
-   *
-   * This method allows each widget to add options or HTML attributes
-   * during widget creation.
-   *
-   * If some options and HTML attributes are given in the sfWidget constructor
-   * they will take precedence over the options and HTML attributes you configure
-   * in this method.
-   *
-   * @param array $options     An array of options
-   * @param array $attributes  An array of HTML attributes
-   *
-   * @see __construct()
-   */
-  protected function configure($options = array(), $attributes = array())
-  {
-  }
-
-  /**
-   * Renders the widget as HTML.
-   *
-   * All subclasses must implement this method.
-   *
-   * @param  string $name       The name of the HTML widget
-   * @param  mixed  $value      The value of the widget
-   * @param  array  $attributes An array of HTML attributes
-   * @param  array  $errors     An array of errors
-   *
-   * @return string A HTML representation of the widget
-   */
-  abstract public function render($name, $value = null, $attributes = array(), $errors = array());
-
-  /**
-   * Adds a required option.
-   *
-   * @param string $name  The option name
-   *
-   * @return sfWidget The current widget instance
-   */
-  public function addRequiredOption($name)
-  {
-    $this->requiredOptions[] = $name;
-
-    return $this;
-  }
-
-  /**
-   * Returns all required option names.
-   *
-   * @return array An array of required option names
-   */
-  public function getRequiredOptions()
-  {
-    return $this->requiredOptions;
-  }
-
-  /**
-   * Adds a new option value with a default value.
-   *
-   * @param string $name   The option name
-   * @param mixed  $value  The default value
-   *
-   * @return sfWidget The current widget instance
-   */
-  public function addOption($name, $value = null)
-  {
-    $this->options[$name] = $value;
-
-    return $this;
-  }
-
-  /**
-   * Changes an option value.
-   *
-   * @param string $name   The option name
-   * @param mixed  $value  The value
-   *
-   * @return sfWidget The current widget instance
-   *
-   * @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)))
+    /**
+     * Gets the stylesheet paths associated with the widget.
+     *
+     * The array keys are files and values are the media names (separated by a ,):
+     *
+     *   array('/path/to/file.css' => 'all', '/another/file.css' => 'screen,print')
+     *
+     * @return array An array of stylesheet paths
+     */
+    public function getStylesheets()
     {
-      throw new InvalidArgumentException(sprintf('%s does not support the following option: \'%s\'.', get_class($this), $name));
+        return array();
     }
 
-    $this->options[$name] = $value;
-
-    return $this;
-  }
-
-  /**
-   * Gets an option value.
-   *
-   * @param  string $name The option name
-   * @param  string $default A default value if option does not exists
-   *
-   * @return mixed  The option value
-   */
-  public function getOption($name, $default = null)
-  {
-    return isset($this->options[$name]) ? $this->options[$name] : $default;
-  }
-
-  /**
-   * Returns true if the option exists.
-   *
-   * @param  string $name  The option name
-   *
-   * @return bool true if the option exists, false otherwise
-   */
-  public function hasOption($name)
-  {
-    return array_key_exists($name, $this->options);
-  }
-
-  /**
-   * Gets all options.
-   *
-   * @return array  An array of named options
-   */
-  public function getOptions()
-  {
-    return $this->options;
-  }
-
-  /**
-   * Sets the options.
-   *
-   * @param array $options  An array of options
-   *
-   * @return sfWidget The current widget instance
-   */
-  public function setOptions($options)
-  {
-    $this->options = $options;
-
-    return $this;
-  }
-
-  /**
-   * Returns the default HTML attributes.
-   *
-   * @param array An array of HTML attributes
-   */
-  public function getAttributes()
-  {
-    return $this->attributes;
-  }
-
-  /**
-   * Sets a default HTML attribute.
-   *
-   * @param string $name   The attribute name
-   * @param string $value  The attribute value
-   *
-   * @return sfWidget The current widget instance
-   */
-  public function setAttribute($name, $value)
-  {
-    $this->attributes[$name] = $value;
-
-    return $this;
-  }
-
-  /**
-   * Returns the HTML attribute value for a given attribute name.
-   *
-   * @param  string $name  The attribute name.
-   *
-   * @return string The attribute value, or null if the attribute does not exist
-   */
-  public function getAttribute($name)
-  {
-    return isset($this->attributes[$name]) ? $this->attributes[$name] : null;
-  }
-
-  /**
-   * Sets the HTML attributes.
-   *
-   * @param array $attributes  An array of HTML attributes
-   *
-   * @return sfWidget The current widget instance
-   */
-  public function setAttributes($attributes)
-  {
-    $this->attributes = $attributes;
-
-    return $this;
-  }
-
-  /**
-   * Gets the stylesheet paths associated with the widget.
-   *
-   * The array keys are files and values are the media names (separated by a ,):
-   *
-   *   array('/path/to/file.css' => 'all', '/another/file.css' => 'screen,print')
-   *
-   * @return array An array of stylesheet paths
-   */
-  public function getStylesheets()
-  {
-    return array();
-  }
-
-  /**
-   * Gets the JavaScript paths associated with the widget.
-   *
-   * @return array An array of JavaScript paths
-   */
-  public function getJavaScripts()
-  {
-    return array();
-  }
-
-  /**
-   * Sets the charset to use when rendering widgets.
-   *
-   * @param string $charset  The charset
-   */
-  static public function setCharset($charset)
-  {
-    self::$charset = $charset;
-  }
-
-  /**
-   * Returns the charset to use when rendering widgets.
-   *
-   * @return string The charset (defaults to UTF-8)
-   */
-  static public function getCharset()
-  {
-    return self::$charset;
-  }
-
-  /**
-   * Sets the XHTML generation flag.
-   *
-   * @param bool $boolean  true if widgets must be generated as XHTML, false otherwise
-   */
-  static public function setXhtml($boolean)
-  {
-    self::$xhtml = (boolean) $boolean;
-  }
-
-  /**
-   * Returns whether to generate XHTML tags or not.
-   *
-   * @return bool true if widgets must be generated as XHTML, false otherwise
-   */
-  static public function isXhtml()
-  {
-    return self::$xhtml;
-  }
-
-  /**
-   * Renders a HTML tag.
-   *
-   * @param string $tag         The tag name
-   * @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())
-  {
-    if (empty($tag))
+    /**
+     * Gets the JavaScript paths associated with the widget.
+     *
+     * @return array An array of JavaScript paths
+     */
+    public function getJavaScripts()
     {
-      return '';
+        return array();
     }
 
-    return sprintf('<%s%s%s', $tag, $this->attributesToHtml($attributes), self::$xhtml ? ' />' : (strtolower($tag) == 'input' ? '>' : sprintf('></%s>', $tag)));
-  }
-
-  /**
-   * Renders a HTML content tag.
-   *
-   * @param string $tag         The tag name
-   * @param string $content     The content of the tag
-   * @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())
-  {
-    if (empty($tag))
+    /**
+     * Sets the charset to use when rendering widgets.
+     *
+     * @param string $charset The charset
+     */
+    public static function setCharset($charset)
     {
-      return '';
+        self::$charset = $charset;
     }
 
-    return sprintf('<%s%s>%s</%s>', $tag, $this->attributesToHtml($attributes), $content, $tag);
-  }
-
-  /**
-   * Escapes a string.
-   *
-   * @param  string $value  string to escape
-   * @return string escaped string
-   */
-  static public function escapeOnce($value)
-  {
-    return self::fixDoubleEscape(htmlspecialchars((string) $value, ENT_QUOTES, self::getCharset()));
-  }
-
-  /**
-   * Fixes double escaped strings.
-   *
-   * @param  string $escaped  string to fix
-   * @return string single escaped string
-   */
-  static public function fixDoubleEscape($escaped)
-  {
-    return preg_replace('/&amp;([a-z]+|(#\d+)|(#x[\da-f]+));/i', '&$1;', $escaped);
-  }
-
-  /**
-   * Converts an array of attributes to its HTML representation.
-   *
-   * @param  array  $attributes An array of attributes
-   *
-   * @return string The HTML representation of the HTML attribute array.
-   */
-  public function attributesToHtml($attributes)
-  {
-    $attributes = array_merge($this->attributes, $attributes);
-    foreach ($attributes as $key => &$value)
+    /**
+     * Returns the charset to use when rendering widgets.
+     *
+     * @return string The charset (defaults to UTF-8)
+     */
+    public static function getCharset()
     {
-      $value = $this->attributesToHtmlCallback($key, $value);
+        return self::$charset;
     }
 
-    return implode('', $attributes);
-  }
-
-  /**
-   * Prepares an attribute key and value for HTML representation.
-   *
-   * It removes empty attributes, except for the value one.
-   *
-   * @param  string $k  The attribute key
-   * @param  string $v  The attribute value
-   *
-   * @return string The HTML representation of the HTML key attribute pair.
-   */
-  protected function attributesToHtmlCallback($k, $v)
-  {
-    return false === $v || null === $v || ('' === $v && 'value' != $k) ? '' : sprintf(' %s="%s"', $k, $this->escapeOnce($v));
-  }
+    /**
+     * Sets the XHTML generation flag.
+     *
+     * @param bool $boolean true if widgets must be generated as XHTML, false otherwise
+     */
+    public static function setXhtml($boolean)
+    {
+        self::$xhtml = (bool) $boolean;
+    }
+
+    /**
+     * Returns whether to generate XHTML tags or not.
+     *
+     * @return bool true if widgets must be generated as XHTML, false otherwise
+     */
+    public static function isXhtml()
+    {
+        return self::$xhtml;
+    }
+
+    /**
+     * Renders a HTML tag.
+     *
+     * @param string $tag        The tag name
+     * @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())
+    {
+        if (empty($tag)) {
+            return '';
+        }
+
+        return sprintf('<%s%s%s', $tag, $this->attributesToHtml($attributes), self::$xhtml ? ' />' : ('input' == strtolower($tag) ? '>' : sprintf('></%s>', $tag)));
+    }
+
+    /**
+     * Renders a HTML content tag.
+     *
+     * @param string $tag        The tag name
+     * @param string $content    The content of the tag
+     * @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())
+    {
+        if (empty($tag)) {
+            return '';
+        }
+
+        return sprintf('<%s%s>%s</%s>', $tag, $this->attributesToHtml($attributes), $content, $tag);
+    }
+
+    /**
+     * Escapes a string.
+     *
+     * @param string $value string to escape
+     *
+     * @return string escaped string
+     */
+    public static function escapeOnce($value)
+    {
+        return self::fixDoubleEscape(htmlspecialchars((string) $value, ENT_QUOTES, self::getCharset()));
+    }
+
+    /**
+     * Fixes double escaped strings.
+     *
+     * @param string $escaped string to fix
+     *
+     * @return string single escaped string
+     */
+    public static function fixDoubleEscape($escaped)
+    {
+        return preg_replace('/&amp;([a-z]+|(#\d+)|(#x[\da-f]+));/i', '&$1;', $escaped);
+    }
+
+    /**
+     * Converts an array of attributes to its HTML representation.
+     *
+     * @param array $attributes An array of attributes
+     *
+     * @return string the HTML representation of the HTML attribute array
+     */
+    public function attributesToHtml($attributes)
+    {
+        $attributes = array_merge($this->attributes, $attributes);
+        foreach ($attributes as $key => &$value) {
+            $value = $this->attributesToHtmlCallback($key, $value);
+        }
+
+        return implode('', $attributes);
+    }
+
+    /**
+     * Configures the current widget.
+     *
+     * This method allows each widget to add options or HTML attributes
+     * during widget creation.
+     *
+     * If some options and HTML attributes are given in the sfWidget constructor
+     * they will take precedence over the options and HTML attributes you configure
+     * in this method.
+     *
+     * @param array $options    An array of options
+     * @param array $attributes An array of HTML attributes
+     *
+     * @see __construct()
+     */
+    protected function configure($options = array(), $attributes = array())
+    {
+    }
+
+    /**
+     * Prepares an attribute key and value for HTML representation.
+     *
+     * It removes empty attributes, except for the value one.
+     *
+     * @param string $k The attribute key
+     * @param string $v The attribute value
+     *
+     * @return string the HTML representation of the HTML key attribute pair
+     */
+    protected function attributesToHtmlCallback($k, $v)
+    {
+        return false === $v || null === $v || ('' === $v && 'value' != $k) ? '' : sprintf(' %s="%s"', $k, $this->escapeOnce($v));
+    }
 }
diff --git a/lib/widget/sfWidgetForm.class.php b/lib/widget/sfWidgetForm.class.php
index 558ae285b..6c9abbb1e 100644
--- a/lib/widget/sfWidgetForm.class.php
+++ b/lib/widget/sfWidgetForm.class.php
@@ -11,344 +11,327 @@
 /**
  * sfWidgetForm is the base class for all form widgets.
  *
- * @package    symfony
- * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfWidgetForm extends sfWidget
 {
-  protected
-    $parent   = null;
-
-  /**
-   * Constructor.
-   *
-   * Available options:
-   *
-   *  * id_format:       The format for the generated HTML id attributes (%s by default)
-   *  * is_hidden:       true if the form widget must be hidden, false otherwise (false by default)
-   *  * needs_multipart: true if the form widget needs a multipart form, false otherwise (false by default)
-   *  * default:         The default value to use when rendering the widget
-   *  * label:           The label to use when the widget is rendered by a widget schema
-   *
-   * @param array $options     An array of options
-   * @param array $attributes  An array of default HTML attributes
-   *
-   * @see sfWidget
-   */
-  public function __construct($options = array(), $attributes = array())
-  {
-    $this->addOption('id_format', '%s');
-    $this->addOption('is_hidden', false);
-    $this->addOption('needs_multipart', false);
-    $this->addOption('default', null);
-    $this->addOption('label', null);
-
-    parent::__construct($options, $attributes);
-  }
-
-  /**
-   * Sets the default value for the widget.
-   *
-   * @param string $value The default value
-   *
-   * @return sfWidget The current widget instance
-   */
-  public function setDefault($value)
-  {
-    $this->setOption('default', $value);
-
-    return $this;
-  }
-
-  /**
-   * Returns the default value for the widget.
-   *
-   * @return string The default value
-   */
-  public function getDefault()
-  {
-    return $this->getOption('default');
-  }
-
-  /**
-   * Sets the label for the widget.
-   *
-   * @param string $value The label
-   *
-   * @return sfWidget The current widget instance
-   */
-  public function setLabel($value)
-  {
-    $this->setOption('label', $value);
-
-    return $this;
-  }
-
-  /**
-   * Returns the label for the widget.
-   *
-   * @return string The label
-   */
-  public function getLabel()
-  {
-    return $this->getOption('label');
-  }
-
-  /**
-   * Sets the format for HTML id attributes.
-   *
-   * @param string $format  The format string (must contain a %s for the id placeholder)
-   *
-   * @return sfWidget The current widget instance
-   */
-  public function setIdFormat($format)
-  {
-    $this->setOption('id_format', $format);
-
-    return $this;
-  }
-
-  /**
-   * Gets the HTML format string for id attributes.
-   *
-   * @return string The format string
-   */
-  public function getIdFormat()
-  {
-    return $this->getOption('id_format');
-  }
-
-  /**
-   * Returns true if the widget is hidden.
-   *
-   * @return Boolean true if the widget is hidden, false otherwise
-   */
-  public function isHidden()
-  {
-    return $this->getOption('is_hidden');
-  }
-
-  /**
-   * Sets the hidden flag for the widget.
-   *
-   * @param bool $boolean  true if the widget must be hidden, false otherwise
-   *
-   * @return sfWidget The current widget instance
-   */
-  public function setHidden($boolean)
-  {
-    $this->setOption('is_hidden', (boolean) $boolean);
-
-    return $this;
-  }
-
-  /**
-   * Returns true if the widget needs a multipart form.
-   *
-   * @return bool true if the widget needs a multipart form, false otherwise
-   */
-  public function needsMultipartForm()
-  {
-    return $this->getOption('needs_multipart');
-  }
-
-  /**
-   * Renders a HTML tag.
-   *
-   * The id attribute is added automatically to the array of attributes if none is specified.
-   * If uses for "id_format" option to generate the id.
-   *
-   * @param  string $tag        The tag name
-   * @param  array  $attributes An array of HTML attributes to be merged with the default HTML attributes
-   *
-   * @return string An HTML tag string
-   */
-  public function renderTag($tag, $attributes = array())
-  {
-    if (empty($tag))
+    protected $parent;
+
+    /**
+     * Constructor.
+     *
+     * Available options:
+     *
+     *  * id_format:       The format for the generated HTML id attributes (%s by default)
+     *  * is_hidden:       true if the form widget must be hidden, false otherwise (false by default)
+     *  * needs_multipart: true if the form widget needs a multipart form, false otherwise (false by default)
+     *  * default:         The default value to use when rendering the widget
+     *  * label:           The label to use when the widget is rendered by a widget schema
+     *
+     * @param array $options    An array of options
+     * @param array $attributes An array of default HTML attributes
+     *
+     * @see sfWidget
+     */
+    public function __construct($options = array(), $attributes = array())
+    {
+        $this->addOption('id_format', '%s');
+        $this->addOption('is_hidden', false);
+        $this->addOption('needs_multipart', false);
+        $this->addOption('default', null);
+        $this->addOption('label', null);
+
+        parent::__construct($options, $attributes);
+    }
+
+    /**
+     * Sets the default value for the widget.
+     *
+     * @param string $value The default value
+     *
+     * @return sfWidget The current widget instance
+     */
+    public function setDefault($value)
+    {
+        $this->setOption('default', $value);
+
+        return $this;
+    }
+
+    /**
+     * Returns the default value for the widget.
+     *
+     * @return string The default value
+     */
+    public function getDefault()
+    {
+        return $this->getOption('default');
+    }
+
+    /**
+     * Sets the label for the widget.
+     *
+     * @param string $value The label
+     *
+     * @return sfWidget The current widget instance
+     */
+    public function setLabel($value)
     {
-      return '';
+        $this->setOption('label', $value);
+
+        return $this;
     }
 
-    $attributes = $this->fixFormId($attributes);
-
-    return parent::renderTag($tag, $attributes);
-  }
-
-  /**
-   * Renders a HTML content tag.
-   *
-   * The id attribute is added automatically to the array of attributes if none is specified.
-   * If uses for "id_format" option to generate the id.
-   *
-   * @param  string $tag         The tag name
-   * @param  string $content     The content of the tag
-   * @param  array  $attributes  An array of HTML attributes to be merged with the default HTML attributes
-   *
-   * @return string An HTML tag string
-   */
-  public function renderContentTag($tag, $content = null, $attributes = array())
-  {
-    return parent::renderContentTag($tag, $content, $this->fixFormId($attributes));
-  }
-
-  /**
-   * Adds an HTML id attributes to the array of attributes if none is given and a name attribute exists.
-   *
-   * @param  array $attributes  An array of attributes
-   *
-   * @return array An array of attributes with an id.
-   */
-  protected function fixFormId($attributes)
-  {
-    if (!isset($attributes['id']) && isset($attributes['name']))
+    /**
+     * Returns the label for the widget.
+     *
+     * @return string The label
+     */
+    public function getLabel()
     {
-      $attributes['id'] = $this->generateId($attributes['name'], isset($attributes['value']) ? $attributes['value'] : null);
+        return $this->getOption('label');
     }
 
-    return $attributes;
-  }
-
-  /**
-   * Returns a formatted id based on the field name and optionally on the field value.
-   *
-   * This method determines the proper form field id name based on the parameters. If a form field has an
-   * array value as a name we need to convert them to proper and unique ids like so:
-   *
-   * <samp>
-   *  name[] => name (if value == null)
-   *  name[] => name_value (if value != null)
-   *  name[bob] => name_bob
-   *  name[item][total] => name_item_total
-   * </samp>
-   *
-   * This method also changes all invalid characters to an underscore (_):
-   *
-   * Ids must begin with a letter ([A-Za-z]) and may be followed by any number of letters, digits
-   * ([0-9]), hyphens ("-"), underscores ("_"), colons (":"), and periods (".").
-   *
-   * @param  string $name   The field name
-   * @param  string $value  The field value
-   *
-   * @return string The field id or null.
-   */
-  public function generateId($name, $value = null)
-  {
-    if (false === $this->getOption('id_format'))
+    /**
+     * Sets the format for HTML id attributes.
+     *
+     * @param string $format The format string (must contain a %s for the id placeholder)
+     *
+     * @return sfWidget The current widget instance
+     */
+    public function setIdFormat($format)
     {
-      return null;
+        $this->setOption('id_format', $format);
+
+        return $this;
     }
 
-    // check to see if we have an array variable for a field name
-    if (false !== strpos($name, '['))
+    /**
+     * Gets the HTML format string for id attributes.
+     *
+     * @return string The format string
+     */
+    public function getIdFormat()
     {
-      $name = str_replace(array('[]', '][', '[', ']'), array((null !== $value && !is_array($value) ? '_'.$value : ''), '_', '_', ''), $name);
+        return $this->getOption('id_format');
     }
 
-    if (false !== strpos($this->getOption('id_format'), '%s'))
+    /**
+     * Returns true if the widget is hidden.
+     *
+     * @return bool true if the widget is hidden, false otherwise
+     */
+    public function isHidden()
     {
-      $name = sprintf($this->getOption('id_format'), $name);
+        return $this->getOption('is_hidden');
     }
 
-    // remove illegal characters
-    $name = preg_replace(array('/^[^A-Za-z]+/', '/[^A-Za-z0-9\:_\.\-]/'), array('', '_'), $name);
-
-    return $name;
-  }
-
-  /**
-   * Generates a two chars range
-   *
-   * @param  int  $start
-   * @param  int  $stop
-   * @return array
-   */
-  static protected function generateTwoCharsRange($start, $stop)
-  {
-    $results = array();
-    for ($i = $start; $i <= $stop; $i++)
+    /**
+     * Sets the hidden flag for the widget.
+     *
+     * @param bool $boolean true if the widget must be hidden, false otherwise
+     *
+     * @return sfWidget The current widget instance
+     */
+    public function setHidden($boolean)
     {
-      $results[$i] = sprintf('%02d', $i);
+        $this->setOption('is_hidden', (bool) $boolean);
+
+        return $this;
     }
-    return $results;
-  }
-
-  /**
-   * Sets the parent widget schema.
-   *
-   * @param  sfWidgetFormSchema|null $widgetSchema
-   *
-   * @return sfWidgetForm The current widget instance
-   */
-  public function setParent(sfWidgetFormSchema $widgetSchema = null)
-  {
-    $this->parent = $widgetSchema;
-
-    return $this;
-  }
-
-  /**
-   * Returns the parent widget schema.
-   *
-   * If no schema has been set with setWidgetSchema(), NULL is returned.
-   *
-   * @return sfWidgetFormSchema|null
-   */
-  public function getParent()
-  {
-    return $this->parent;
-  }
-
-  /**
-   * Translates the given text.
-   *
-   * @param  string $text       The text with optional placeholders
-   * @param  array $parameters  The values to replace the placeholders
-   *
-   * @return string             The translated text
-   *
-   * @see sfWidgetFormSchemaFormatter::translate()
-   */
-  protected function translate($text, array $parameters = array())
-  {
-    if (null === $this->parent)
+
+    /**
+     * Returns true if the widget needs a multipart form.
+     *
+     * @return bool true if the widget needs a multipart form, false otherwise
+     */
+    public function needsMultipartForm()
     {
-      return $text;
+        return $this->getOption('needs_multipart');
     }
-    else
+
+    /**
+     * Renders a HTML tag.
+     *
+     * The id attribute is added automatically to the array of attributes if none is specified.
+     * If uses for "id_format" option to generate the id.
+     *
+     * @param string $tag        The tag name
+     * @param array  $attributes An array of HTML attributes to be merged with the default HTML attributes
+     *
+     * @return string An HTML tag string
+     */
+    public function renderTag($tag, $attributes = array())
     {
-      return $this->parent->getFormFormatter()->translate($text, $parameters);
+        if (empty($tag)) {
+            return '';
+        }
+
+        $attributes = $this->fixFormId($attributes);
+
+        return parent::renderTag($tag, $attributes);
     }
-  }
-
-  /**
-   * Translates all values of the given array.
-   *
-   * @param  array $texts       The texts with optional placeholders
-   * @param  array $parameters  The values to replace the placeholders
-   *
-   * @return array              The translated texts
-   *
-   * @see sfWidgetFormSchemaFormatter::translate()
-   */
-  protected function translateAll(array $texts, array $parameters = array())
-  {
-    if (null === $this->parent)
+
+    /**
+     * Renders a HTML content tag.
+     *
+     * The id attribute is added automatically to the array of attributes if none is specified.
+     * If uses for "id_format" option to generate the id.
+     *
+     * @param string $tag        The tag name
+     * @param string $content    The content of the tag
+     * @param array  $attributes An array of HTML attributes to be merged with the default HTML attributes
+     *
+     * @return string An HTML tag string
+     */
+    public function renderContentTag($tag, $content = null, $attributes = array())
     {
-      return $texts;
+        return parent::renderContentTag($tag, $content, $this->fixFormId($attributes));
     }
-    else
+
+    /**
+     * Returns a formatted id based on the field name and optionally on the field value.
+     *
+     * This method determines the proper form field id name based on the parameters. If a form field has an
+     * array value as a name we need to convert them to proper and unique ids like so:
+     *
+     * <samp>
+     *  name[] => name (if value == null)
+     *  name[] => name_value (if value != null)
+     *  name[bob] => name_bob
+     *  name[item][total] => name_item_total
+     * </samp>
+     *
+     * This method also changes all invalid characters to an underscore (_):
+     *
+     * Ids must begin with a letter ([A-Za-z]) and may be followed by any number of letters, digits
+     * ([0-9]), hyphens ("-"), underscores ("_"), colons (":"), and periods (".").
+     *
+     * @param string $name  The field name
+     * @param string $value The field value
+     *
+     * @return string the field id or null
+     */
+    public function generateId($name, $value = null)
     {
-      $result = array();
+        if (false === $this->getOption('id_format')) {
+            return 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 (false !== strpos($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);
+    }
+
+    /**
+     * Sets the parent widget schema.
+     *
+     * @return sfWidgetForm The current widget instance
+     */
+    public function setParent(sfWidgetFormSchema $widgetSchema = null)
+    {
+        $this->parent = $widgetSchema;
+
+        return $this;
+    }
+
+    /**
+     * Returns the parent widget schema.
+     *
+     * If no schema has been set with setWidgetSchema(), NULL is returned.
+     *
+     * @return sfWidgetFormSchema|null
+     */
+    public function getParent()
+    {
+        return $this->parent;
+    }
+
+    /**
+     * Adds an HTML id attributes to the array of attributes if none is given and a name attribute exists.
+     *
+     * @param array $attributes An array of attributes
+     *
+     * @return array an array of attributes with an id
+     */
+    protected function fixFormId($attributes)
+    {
+        if (!isset($attributes['id']) && isset($attributes['name'])) {
+            $attributes['id'] = $this->generateId($attributes['name'], isset($attributes['value']) ? $attributes['value'] : null);
+        }
+
+        return $attributes;
+    }
+
+    /**
+     * Generates a two chars range.
+     *
+     * @param int $start
+     * @param int $stop
+     *
+     * @return array
+     */
+    protected static function generateTwoCharsRange($start, $stop)
+    {
+        $results = array();
+        for ($i = $start; $i <= $stop; ++$i) {
+            $results[$i] = sprintf('%02d', $i);
+        }
+
+        return $results;
+    }
+
+    /**
+     * Translates the given text.
+     *
+     * @param string $text       The text with optional placeholders
+     * @param array  $parameters The values to replace the placeholders
+     *
+     * @return string The translated text
+     *
+     * @see sfWidgetFormSchemaFormatter::translate()
+     */
+    protected function translate($text, array $parameters = array())
+    {
+        if (null === $this->parent) {
+            return $text;
+        }
+
+        return $this->parent->getFormFormatter()->translate($text, $parameters);
+    }
+
+    /**
+     * Translates all values of the given array.
+     *
+     * @param array $texts      The texts with optional placeholders
+     * @param array $parameters The values to replace the placeholders
+     *
+     * @return array The translated texts
+     *
+     * @see sfWidgetFormSchemaFormatter::translate()
+     */
+    protected function translateAll(array $texts, array $parameters = array())
+    {
+        if (null === $this->parent) {
+            return $texts;
+        }
+
+        $result = array();
 
-      foreach ($texts as $key => $text)
-      {
-        $result[$key] = $this->parent->getFormFormatter()->translate($text, $parameters);
-      }
+        foreach ($texts as $key => $text) {
+            $result[$key] = $this->parent->getFormFormatter()->translate($text, $parameters);
+        }
 
-      return $result;
+        return $result;
     }
-  }
 }
diff --git a/lib/widget/sfWidgetFormChoice.class.php b/lib/widget/sfWidgetFormChoice.class.php
index 71cceec08..bf596c01e 100644
--- a/lib/widget/sfWidgetFormChoice.class.php
+++ b/lib/widget/sfWidgetFormChoice.class.php
@@ -11,134 +11,129 @@
 /**
  * sfWidgetFormChoice represents a choice widget.
  *
- * @package    symfony
- * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfWidgetFormChoice extends sfWidgetFormChoiceBase
 {
-  /**
-   * Constructor.
-   *
-   * Available options:
-   *
-   *  * choices:          An array of possible choices (required)
-   *  * multiple:         true if the select tag must allow multiple selections
-   *  * expanded:         true to display an expanded widget
-   *                        if expanded is false, then the widget will be a select
-   *                        if expanded is true and multiple is false, then the widget will be a list of radio
-   *                        if expanded is true and multiple is true, then the widget will be a list of checkbox
-   *  * renderer_class:   The class to use instead of the default ones
-   *  * renderer_options: The options to pass to the renderer constructor
-   *  * renderer:         A renderer widget (overrides the expanded and renderer_options options)
-   *                      The choices option must be: new sfCallable($thisWidgetInstance, 'getChoices')
-   * @param array $options     An array of options
-   * @param array $attributes  An array of default HTML attributes
-   *
-   * @see sfWidgetFormChoiceBase
-   */
-  protected function configure($options = array(), $attributes = array())
-  {
-    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', false);
-  }
-
-  /**
-   * Sets the format for HTML id attributes. This is made avaiable to the renderer,
-   * as this widget does not render itself, but delegates to the renderer instead.
-   *
-   * @param string $format  The format string (must contain a %s for the id placeholder)
-   *
-   * @see sfWidgetForm
-   */
-  public function setIdFormat($format)
-  {
-    $this->options['renderer_options']['id_format'] = $format;
-  }
-
-  /**
-   * Renders the widget.
-   *
-   * @param  string $name        The element name
-   * @param  string $value       The value selected in this widget
-   * @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
-   *
-   * @return string An HTML tag string
-   *
-   * @see sfWidgetForm
-   */
-  public function render($name, $value = null, $attributes = array(), $errors = array())
-  {
-    if ($this->getOption('multiple'))
+    /**
+     * Sets the format for HTML id attributes. This is made avaiable to the renderer,
+     * as this widget does not render itself, but delegates to the renderer instead.
+     *
+     * @param string $format The format string (must contain a %s for the id placeholder)
+     *
+     * @see sfWidgetForm
+     */
+    public function setIdFormat($format)
     {
-      $attributes['multiple'] = 'multiple';
-
-      if ('[]' != substr($name, -2))
-      {
-        $name .= '[]';
-      }
+        $this->options['renderer_options']['id_format'] = $format;
     }
 
-    if (!$this->getOption('renderer') && !$this->getOption('renderer_class') && $this->getOption('expanded'))
+    /**
+     * Renders the widget.
+     *
+     * @param string $name       The element name
+     * @param string $value      The value selected in this widget
+     * @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
+     *
+     * @return string An HTML tag string
+     *
+     * @see sfWidgetForm
+     */
+    public function render($name, $value = null, $attributes = array(), $errors = array())
     {
-      unset($attributes['multiple']);
+        if ($this->getOption('multiple')) {
+            $attributes['multiple'] = 'multiple';
+
+            if ('[]' != substr($name, -2)) {
+                $name .= '[]';
+            }
+        }
+
+        if (!$this->getOption('renderer') && !$this->getOption('renderer_class') && $this->getOption('expanded')) {
+            unset($attributes['multiple']);
+        }
+
+        return $this->getRenderer()->render($name, $value, $attributes, $errors);
     }
 
-    return $this->getRenderer()->render($name, $value, $attributes, $errors);
-  }
-
-  /**
-   * Gets the stylesheet paths associated with the widget.
-   *
-   * @return array An array of stylesheet paths
-   */
-  public function getStylesheets()
-  {
-    return $this->getRenderer()->getStylesheets();
-  }
-
-  /**
-   * Gets the JavaScript paths associated with the widget.
-   *
-   * @return array An array of JavaScript paths
-   */
-  public function getJavaScripts()
-  {
-    return $this->getRenderer()->getJavaScripts();
-  }
-
-  public function getRenderer()
-  {
-    if ($this->getOption('renderer'))
+    /**
+     * Gets the stylesheet paths associated with the widget.
+     *
+     * @return array An array of stylesheet paths
+     */
+    public function getStylesheets()
     {
-      return $this->getOption('renderer');
+        return $this->getRenderer()->getStylesheets();
     }
 
-    if (!$class = $this->getOption('renderer_class'))
+    /**
+     * Gets the JavaScript paths associated with the widget.
+     *
+     * @return array An array of JavaScript paths
+     */
+    public function getJavaScripts()
     {
-      $type = !$this->getOption('expanded') ? '' : ($this->getOption('multiple') ? 'checkbox' : 'radio');
-      $class = sprintf('sfWidgetFormSelect%s', ucfirst($type));
+        return $this->getRenderer()->getJavaScripts();
     }
 
-    $options = $this->options['renderer_options'];
-    $options['choices'] = new sfCallable(array($this, 'getChoices'));
+    public function getRenderer()
+    {
+        if ($this->getOption('renderer')) {
+            return $this->getOption('renderer');
+        }
+
+        if (!$class = $this->getOption('renderer_class')) {
+            $type = !$this->getOption('expanded') ? '' : ($this->getOption('multiple') ? 'checkbox' : 'radio');
+            $class = sprintf('sfWidgetFormSelect%s', ucfirst($type));
+        }
+
+        $options = $this->options['renderer_options'];
+        $options['choices'] = new sfCallable(array($this, 'getChoices'));
+
+        $renderer = new $class($options, $this->getAttributes());
 
-    $renderer = new $class($options, $this->getAttributes());
+        // choices returned by the callback will already be translated (so we need to avoid double-translation)
+        if ($renderer->hasOption('translate_choices')) {
+            $renderer->setOption('translate_choices', false);
+        }
 
-    // choices returned by the callback will already be translated (so we need to avoid double-translation)
-    if ($renderer->hasOption('translate_choices')) {
-        $renderer->setOption('translate_choices', false);
+        $renderer->setParent($this->getParent());
+
+        return $renderer;
     }
 
-    $renderer->setParent($this->getParent());
+    /**
+     * Constructor.
+     *
+     * Available options:
+     *
+     *  * choices:          An array of possible choices (required)
+     *  * multiple:         true if the select tag must allow multiple selections
+     *  * expanded:         true to display an expanded widget
+     *                        if expanded is false, then the widget will be a select
+     *                        if expanded is true and multiple is false, then the widget will be a list of radio
+     *                        if expanded is true and multiple is true, then the widget will be a list of checkbox
+     *  * renderer_class:   The class to use instead of the default ones
+     *  * renderer_options: The options to pass to the renderer constructor
+     *  * renderer:         A renderer widget (overrides the expanded and renderer_options options)
+     *                      The choices option must be: new sfCallable($thisWidgetInstance, 'getChoices')
+     *
+     * @param array $options    An array of options
+     * @param array $attributes An array of default HTML attributes
+     *
+     * @see sfWidgetFormChoiceBase
+     */
+    protected function configure($options = array(), $attributes = array())
+    {
+        parent::configure($options, $attributes);
 
-    return $renderer;
-  }
+        $this->addOption('multiple', false);
+        $this->addOption('expanded', false);
+        $this->addOption('renderer_class', false);
+        $this->addOption('renderer_options', array());
+        $this->addOption('renderer', false);
+    }
 }
diff --git a/lib/widget/sfWidgetFormChoiceBase.class.php b/lib/widget/sfWidgetFormChoiceBase.class.php
index 686674c19..8db910fe8 100644
--- a/lib/widget/sfWidgetFormChoiceBase.class.php
+++ b/lib/widget/sfWidgetFormChoiceBase.class.php
@@ -9,81 +9,72 @@
  */
 
 /**
- * sfWidgetFormChoiceBase is the base class for all choice/select widgets
+ * sfWidgetFormChoiceBase is the base class for all choice/select widgets.
  *
- * @package    symfony
- * @subpackage widget
  * @author     Bernhard Schussek <bernhard.schussek@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfWidgetFormChoiceBase extends sfWidgetForm
 {
-  /**
-   * Constructor.
-   *
-   * Available options:
-   *
-   *  * choices:         An array of possible choices (required)
-   *
-   * @param array $options     An array of options
-   * @param array $attributes  An array of default HTML attributes
-   *
-   * @see sfWidgetForm
-   */
-  protected function configure($options = array(), $attributes = array())
-  {
-    $this->addRequiredOption('choices');
-    $this->addOption('translate_choices', true);
-  }
-
-  /**
-   * Returns the translated choices configured for this widget
-   *
-   * @return array  An array of strings
-   */
-  public function getChoices()
-  {
-    $choices = $this->getOption('choices');
-
-    if ($choices instanceof sfCallable)
+    /**
+     * Clones this object.
+     */
+    public function __clone()
     {
-      $choices = $choices->call();
+        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));
+            }
+        }
     }
 
-    if (!$this->getOption('translate_choices'))
+    /**
+     * Returns the translated choices configured for this widget.
+     *
+     * @return array An array of strings
+     */
+    public function getChoices()
     {
-      return $choices;
-    }
+        $choices = $this->getOption('choices');
 
-    $results = array();
-    foreach ($choices as $key => $choice)
-    {
-      if (is_array($choice))
-      {
-        $results[$this->translate($key)] = $this->translateAll($choice);
-      }
-      else
-      {
-        $results[$key] = $this->translate($choice);
-      }
-    }
+        if ($choices instanceof sfCallable) {
+            $choices = $choices->call();
+        }
+
+        if (!$this->getOption('translate_choices')) {
+            return $choices;
+        }
 
-    return $results;
-  }
+        $results = array();
+        foreach ($choices as $key => $choice) {
+            if (is_array($choice)) {
+                $results[$this->translate($key)] = $this->translateAll($choice);
+            } else {
+                $results[$key] = $this->translate($choice);
+            }
+        }
+
+        return $results;
+    }
 
-  /**
-   * Clones this object
-   */
-  public function __clone()
-  {
-    if ($this->getOption('choices') instanceof sfCallable)
+    /**
+     * Constructor.
+     *
+     * Available options:
+     *
+     *  * choices:         An array of possible choices (required)
+     *
+     * @param array $options    An array of options
+     * @param array $attributes An array of default HTML attributes
+     *
+     * @see sfWidgetForm
+     */
+    protected function configure($options = array(), $attributes = array())
     {
-      $callable = $this->getOption('choices')->getCallable();
-      if (is_array($callable) && $callable[0] instanceof self)
-      {
-        $callable[0] = $this;
-        $this->setOption('choices', new sfCallable($callable));
-      }
+        $this->addRequiredOption('choices');
+        $this->addOption('translate_choices', true);
     }
-  }
-}
\ No newline at end of file
+}
diff --git a/lib/widget/sfWidgetFormDate.class.php b/lib/widget/sfWidgetFormDate.class.php
index 9c87946b7..cba225aac 100644
--- a/lib/widget/sfWidgetFormDate.class.php
+++ b/lib/widget/sfWidgetFormDate.class.php
@@ -11,122 +11,121 @@
 /**
  * sfWidgetFormDate represents a date widget.
  *
- * @package    symfony
- * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfWidgetFormDate extends sfWidgetForm
 {
-  /**
-   * Configures the current widget.
-   *
-   * Available options:
-   *
-   *  * format:       The date format string (%month%/%day%/%year% by default)
-   *  * years:        An array of years for the year select tag (optional)
-   *                  Be careful that the keys must be the years, and the values what will be displayed to the user
-   *  * months:       An array of months for the month select tag (optional)
-   *  * days:         An array of days for the day select tag (optional)
-   *  * can_be_empty: Whether the widget accept an empty value (true by default)
-   *  * empty_values: An array of values to use for the empty value (empty string for year, month, and day by default)
-   *
-   * @param array $options     An array of options
-   * @param array $attributes  An array of default HTML attributes
-   *
-   * @see sfWidgetForm
-   */
-  protected function configure($options = array(), $attributes = array())
-  {
-    $this->addOption('format', '%month%/%day%/%year%');
-    $this->addOption('days', parent::generateTwoCharsRange(1, 31));
-    $this->addOption('months', parent::generateTwoCharsRange(1, 12));
-    $years = range(date('Y') - 5, date('Y') + 5);
-    $this->addOption('years', array_combine($years, $years));
+    /**
+     * Renders the widget.
+     *
+     * @param string $name       The element name
+     * @param string $value      The date displayed in this widget
+     * @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
+     *
+     * @return string An HTML tag string
+     *
+     * @see sfWidgetForm
+     */
+    public function render($name, $value = null, $attributes = array(), $errors = array())
+    {
+        // convert value to an array
+        $default = array('year' => null, 'month' => null, 'day' => null);
+        if (is_array($value)) {
+            $value = array_merge($default, $value);
+        } else {
+            $value = (string) $value == (string) (int) $value ? (int) $value : strtotime((string) $value);
+            if (false === $value) {
+                $value = $default;
+            } else {
+                $value = array('year' => date('Y', $value), 'month' => date('n', $value), 'day' => date('j', $value));
+            }
+        }
 
-    $this->addOption('can_be_empty', true);
-    $this->addOption('empty_values', array('year' => '', 'month' => '', 'day' => ''));
-  }
+        $date = array();
+        $emptyValues = $this->getOption('empty_values');
 
-  /**
-   * Renders the widget.
-   *
-   * @param  string $name        The element name
-   * @param  string $value       The date displayed in this widget
-   * @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
-   *
-   * @return string An HTML tag string
-   *
-   * @see sfWidgetForm
-   */
-  public function render($name, $value = null, $attributes = array(), $errors = array())
-  {
-    // convert value to an array
-    $default = array('year' => null, 'month' => null, 'day' => null);
-    if (is_array($value))
-    {
-      $value = array_merge($default, $value);
+        $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));
+
+        return strtr($this->getOption('format'), $date);
     }
-    else
+
+    /**
+     * Configures the current widget.
+     *
+     * Available options:
+     *
+     *  * format:       The date format string (%month%/%day%/%year% by default)
+     *  * years:        An array of years for the year select tag (optional)
+     *                  Be careful that the keys must be the years, and the values what will be displayed to the user
+     *  * months:       An array of months for the month select tag (optional)
+     *  * days:         An array of days for the day select tag (optional)
+     *  * can_be_empty: Whether the widget accept an empty value (true by default)
+     *  * empty_values: An array of values to use for the empty value (empty string for year, month, and day by default)
+     *
+     * @param array $options    An array of options
+     * @param array $attributes An array of default HTML attributes
+     *
+     * @see sfWidgetForm
+     */
+    protected function configure($options = array(), $attributes = array())
     {
-      $value = (string) $value == (string) (integer) $value ? (integer) $value : strtotime((string) $value);
-      if (false === $value)
-      {
-        $value = $default;
-      }
-      else
-      {
-        $value = array('year' => date('Y', $value), 'month' => date('n', $value), 'day' => date('j', $value));
-      }
+        $this->addOption('format', '%month%/%day%/%year%');
+        $this->addOption('days', parent::generateTwoCharsRange(1, 31));
+        $this->addOption('months', parent::generateTwoCharsRange(1, 12));
+        $years = range(date('Y') - 5, date('Y') + 5);
+        $this->addOption('years', array_combine($years, $years));
+
+        $this->addOption('can_be_empty', true);
+        $this->addOption('empty_values', array('year' => '', 'month' => '', 'day' => ''));
     }
 
-    $date = array();
-    $emptyValues = $this->getOption('empty_values');
+    /**
+     * @param string $name
+     * @param string $value
+     * @param array  $options
+     * @param array  $attributes
+     *
+     * @return string rendered widget
+     */
+    protected function renderDayWidget($name, $value, $options, $attributes)
+    {
+        $widget = new sfWidgetFormSelect($options, $attributes);
 
-    $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));
+        return $widget->render($name, $value);
+    }
 
-    return strtr($this->getOption('format'), $date);
-  }
+    /**
+     * @param string $name
+     * @param string $value
+     * @param array  $options
+     * @param array  $attributes
+     *
+     * @return string rendered widget
+     */
+    protected function renderMonthWidget($name, $value, $options, $attributes)
+    {
+        $widget = new sfWidgetFormSelect($options, $attributes);
 
-  /**
-   * @param string $name
-   * @param string $value
-   * @param array $options
-   * @param array $attributes
-   * @return string rendered widget
-   */
-  protected function renderDayWidget($name, $value, $options, $attributes)
-  {
-    $widget = new sfWidgetFormSelect($options, $attributes);
-    return $widget->render($name, $value);
-  }
+        return $widget->render($name, $value);
+    }
 
-  /**
-   * @param string $name
-   * @param string $value
-   * @param array $options
-   * @param array $attributes
-   * @return string rendered widget
-   */
-  protected function renderMonthWidget($name, $value, $options, $attributes)
-  {
-    $widget = new sfWidgetFormSelect($options, $attributes);
-    return $widget->render($name, $value);
-  }
+    /**
+     * @param string $name
+     * @param string $value
+     * @param array  $options
+     * @param array  $attributes
+     *
+     * @return string rendered widget
+     */
+    protected function renderYearWidget($name, $value, $options, $attributes)
+    {
+        $widget = new sfWidgetFormSelect($options, $attributes);
 
-  /**
-   * @param string $name
-   * @param string $value
-   * @param array $options
-   * @param array $attributes
-   * @return string rendered widget
-   */
-  protected function renderYearWidget($name, $value, $options, $attributes)
-  {
-    $widget = new sfWidgetFormSelect($options, $attributes);
-    return $widget->render($name, $value);
-  }
+        return $widget->render($name, $value);
+    }
 }
diff --git a/lib/widget/sfWidgetFormDateRange.class.php b/lib/widget/sfWidgetFormDateRange.class.php
index a33314c84..58a619456 100644
--- a/lib/widget/sfWidgetFormDateRange.class.php
+++ b/lib/widget/sfWidgetFormDateRange.class.php
@@ -11,76 +11,75 @@
 /**
  * sfWidgetFormDateRange represents a date range widget.
  *
- * @package    symfony
- * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfWidgetFormDateRange extends sfWidgetForm
 {
-  /**
-   * Configures the current widget.
-   *
-   * Available options:
-   *
-   *  * from_date:   The from date widget (required)
-   *  * to_date:     The to date widget (required)
-   *  * template:    The template to use to render the widget
-   *                 Available placeholders: %from_date%, %to_date%
-   *
-   * @param array $options     An array of options
-   * @param array $attributes  An array of default HTML attributes
-   *
-   * @see sfWidgetForm
-   */
-  protected function configure($options = array(), $attributes = array())
-  {
-    $this->addRequiredOption('from_date');
-    $this->addRequiredOption('to_date');
+    /**
+     * Renders the widget.
+     *
+     * @param string $name       The element name
+     * @param string $value      The date displayed in this widget
+     * @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
+     *
+     * @return string An HTML tag string
+     *
+     * @see sfWidgetForm
+     */
+    public function render($name, $value = null, $attributes = array(), $errors = array())
+    {
+        $value = array_merge(array('from' => '', 'to' => ''), is_array($value) ? $value : array());
+        $attributes = array_merge(array('from' => array(), 'to' => array()), is_array($attributes) ? $attributes : array());
 
-    $this->addOption('template', 'from %from_date% to %to_date%');
-  }
+        return strtr($this->translate($this->getOption('template')), array(
+            '%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),
+        ));
+    }
 
-  /**
-   * Renders the widget.
-   *
-   * @param  string $name        The element name
-   * @param  string $value       The date displayed in this widget
-   * @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
-   *
-   * @return string An HTML tag string
-   *
-   * @see sfWidgetForm
-   */
-  public function render($name, $value = null, $attributes = array(), $errors = array())
-  {
-    $value = array_merge(array('from' => '', 'to' => ''), is_array($value) ? $value : array());
-    $attributes = array_merge(array('from' => array(), 'to' => array()), is_array($attributes) ? $attributes : array());
+    /**
+     * Gets the stylesheet paths associated with the widget.
+     *
+     * @return array An array of stylesheet paths
+     */
+    public function getStylesheets()
+    {
+        return array_merge($this->getOption('from_date')->getStylesheets(), $this->getOption('to_date')->getStylesheets());
+    }
 
-    return strtr($this->translate($this->getOption('template')), array(
-      '%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),
-    ));
-  }
+    /**
+     * Gets the JavaScript paths associated with the widget.
+     *
+     * @return array An array of JavaScript paths
+     */
+    public function getJavaScripts()
+    {
+        return array_merge($this->getOption('from_date')->getJavaScripts(), $this->getOption('to_date')->getJavaScripts());
+    }
 
-  /**
-   * Gets the stylesheet paths associated with the widget.
-   *
-   * @return array An array of stylesheet paths
-   */
-  public function getStylesheets()
-  {
-    return array_merge($this->getOption('from_date')->getStylesheets(), $this->getOption('to_date')->getStylesheets());
-  }
+    /**
+     * Configures the current widget.
+     *
+     * Available options:
+     *
+     *  * from_date:   The from date widget (required)
+     *  * to_date:     The to date widget (required)
+     *  * template:    The template to use to render the widget
+     *                 Available placeholders: %from_date%, %to_date%
+     *
+     * @param array $options    An array of options
+     * @param array $attributes An array of default HTML attributes
+     *
+     * @see sfWidgetForm
+     */
+    protected function configure($options = array(), $attributes = array())
+    {
+        $this->addRequiredOption('from_date');
+        $this->addRequiredOption('to_date');
 
-  /**
-   * Gets the JavaScript paths associated with the widget.
-   *
-   * @return array An array of JavaScript paths
-   */
-  public function getJavaScripts()
-  {
-    return array_merge($this->getOption('from_date')->getJavaScripts(), $this->getOption('to_date')->getJavaScripts());
-  }
+        $this->addOption('template', 'from %from_date% to %to_date%');
+    }
 }
diff --git a/lib/widget/sfWidgetFormDateTime.class.php b/lib/widget/sfWidgetFormDateTime.class.php
index 5415fa9a4..80c8209ef 100644
--- a/lib/widget/sfWidgetFormDateTime.class.php
+++ b/lib/widget/sfWidgetFormDateTime.class.php
@@ -11,127 +11,124 @@
 /**
  * sfWidgetFormDateTime represents a datetime widget.
  *
- * @package    symfony
- * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfWidgetFormDateTime extends sfWidgetForm
 {
-  /**
-   * Configures the current widget.
-   *
-   * The attributes are passed to both the date and the time widget.
-   *
-   * If you want to pass HTML attributes to one of the two widget, pass an
-   * attributes option to the date or time option (see below).
-   *
-   * Available options:
-   *
-   *  * date:      Options for the date widget (see sfWidgetFormDate)
-   *  * time:      Options for the time widget (see sfWidgetFormTime)
-   *  * with_time: Whether to include time (true by default)
-   *  * format:    The format string for the date and the time widget (default to %date% %time%)
-   *
-   * @param array $options     An array of options
-   * @param array $attributes  An array of default HTML attributes
-   *
-   * @see sfWidgetForm
-   */
-  protected function configure($options = array(), $attributes = array())
-  {
-    $this->addOption('date', array());
-    $this->addOption('time', array());
-    $this->addOption('with_time', true);
-    $this->addOption('format', '%date% %time%');
-  }
+    /**
+     * Renders the widget.
+     *
+     * @param string $name       The element name
+     * @param string $value      The date and time displayed in this widget
+     * @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
+     *
+     * @return string An HTML tag string
+     *
+     * @see sfWidgetForm
+     */
+    public function render($name, $value = null, $attributes = array(), $errors = array())
+    {
+        $date = $this->getDateWidget($attributes)->render($name, $value);
 
-  /**
-   * Renders the widget.
-   *
-   * @param  string $name        The element name
-   * @param  string $value       The date and time displayed in this widget
-   * @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
-   *
-   * @return string An HTML tag string
-   *
-   * @see sfWidgetForm
-   */
-  public function render($name, $value = null, $attributes = array(), $errors = array())
-  {
-    $date = $this->getDateWidget($attributes)->render($name, $value);
+        if (!$this->getOption('with_time')) {
+            return $date;
+        }
 
-    if (!$this->getOption('with_time'))
-    {
-      return $date;
+        return strtr($this->getOption('format'), array(
+            '%date%' => $date,
+            '%time%' => $this->getTimeWidget($attributes)->render($name, $value),
+        ));
     }
 
-    return strtr($this->getOption('format'), array(
-      '%date%' => $date,
-      '%time%' => $this->getTimeWidget($attributes)->render($name, $value),
-    ));
-  }
-
-  /**
-   * Returns the date widget.
-   *
-   * @param  array $attributes  An array of attributes
-   *
-   * @return sfWidgetForm A Widget representing the date
-   */
-  protected function getDateWidget($attributes = array())
-  {
-    return new sfWidgetFormDate($this->getOptionsFor('date'), $this->getAttributesFor('date', $attributes));
-  }
+    /**
+     * Configures the current widget.
+     *
+     * The attributes are passed to both the date and the time widget.
+     *
+     * If you want to pass HTML attributes to one of the two widget, pass an
+     * attributes option to the date or time option (see below).
+     *
+     * Available options:
+     *
+     *  * date:      Options for the date widget (see sfWidgetFormDate)
+     *  * time:      Options for the time widget (see sfWidgetFormTime)
+     *  * with_time: Whether to include time (true by default)
+     *  * format:    The format string for the date and the time widget (default to %date% %time%)
+     *
+     * @param array $options    An array of options
+     * @param array $attributes An array of default HTML attributes
+     *
+     * @see sfWidgetForm
+     */
+    protected function configure($options = array(), $attributes = array())
+    {
+        $this->addOption('date', array());
+        $this->addOption('time', array());
+        $this->addOption('with_time', true);
+        $this->addOption('format', '%date% %time%');
+    }
 
-  /**
-   * Returns the time widget.
-   *
-   * @param  array $attributes  An array of attributes
-   *
-   * @return sfWidgetForm A Widget representing the time
-   */
-  protected function getTimeWidget($attributes = array())
-  {
-    return new sfWidgetFormTime($this->getOptionsFor('time'), $this->getAttributesFor('time', $attributes));
-  }
+    /**
+     * Returns the date widget.
+     *
+     * @param array $attributes An array of attributes
+     *
+     * @return sfWidgetForm A Widget representing the date
+     */
+    protected function getDateWidget($attributes = array())
+    {
+        return new sfWidgetFormDate($this->getOptionsFor('date'), $this->getAttributesFor('date', $attributes));
+    }
 
-  /**
-   * Returns an array of options for the given type.
-   *
-   * @param  string $type  The type (date or time)
-   *
-   * @return array  An array of options
-   *
-   * @throws InvalidArgumentException when option date|time type is not array
-   */
-  protected function getOptionsFor($type)
-  {
-    $options = $this->getOption($type);
-    if (!is_array($options))
+    /**
+     * Returns the time widget.
+     *
+     * @param array $attributes An array of attributes
+     *
+     * @return sfWidgetForm A Widget representing the time
+     */
+    protected function getTimeWidget($attributes = array())
     {
-      throw new InvalidArgumentException(sprintf('You must pass an array for the %s option.', $type));
+        return new sfWidgetFormTime($this->getOptionsFor('time'), $this->getAttributesFor('time', $attributes));
     }
 
-    // add id_format if it's not there already
-    $options += array('id_format' => $this->getOption('id_format'));
+    /**
+     * Returns an array of options for the given type.
+     *
+     * @param string $type The type (date or time)
+     *
+     * @return array An array of options
+     *
+     * @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));
+        }
+
+        // add id_format if it's not there already
+        $options += array('id_format' => $this->getOption('id_format'));
 
-    return $options;
-  }
+        return $options;
+    }
 
-  /**
-   * Returns an array of HTML attributes for the given type.
-   *
-   * @param  string $type        The type (date or time)
-   * @param  array  $attributes  An array of attributes
-   *
-   * @return array  An array of HTML attributes
-   */
-  protected function getAttributesFor($type, $attributes)
-  {
-    $defaults = isset($this->attributes[$type]) ? $this->attributes[$type] : array();
+    /**
+     * Returns an array of HTML attributes for the given type.
+     *
+     * @param string $type       The type (date or time)
+     * @param array  $attributes An array of attributes
+     *
+     * @return array An array of HTML attributes
+     */
+    protected function getAttributesFor($type, $attributes)
+    {
+        $defaults = isset($this->attributes[$type]) ? $this->attributes[$type] : array();
 
-    return isset($attributes[$type]) ? array_merge($defaults, $attributes[$type]) : $defaults;
-  }
+        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 4f7369af8..115a33eab 100644
--- a/lib/widget/sfWidgetFormFilterDate.class.php
+++ b/lib/widget/sfWidgetFormFilterDate.class.php
@@ -11,60 +11,59 @@
 /**
  * sfWidgetFormFilterDate represents a date filter widget.
  *
- * @package    symfony
- * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfWidgetFormFilterDate extends sfWidgetFormDateRange
 {
-  /**
-   * Configures the current widget.
-   *
-   * Available options:
-   *
-   *  * with_empty:      Whether to add the empty checkbox (true by default)
-   *  * empty_label:     The label to use when using an empty checkbox
-   *  * template:        The template used for from date and to date
-   *                     Available placeholders: %from_date%, %to_date%
-   *  * filter_template: The template to use to render the widget
-   *                     Available placeholders: %date_range%, %empty_checkbox%, %empty_label%
-   *
-   * @param array $options     An array of options
-   * @param array $attributes  An array of default HTML attributes
-   *
-   * @see sfWidgetForm
-   */
-  protected function configure($options = array(), $attributes = array())
-  {
-    parent::configure($options, $attributes);
+    /**
+     * Renders the widget.
+     *
+     * @param string $name       The element name
+     * @param string $value      The date displayed in this widget
+     * @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
+     *
+     * @return string An HTML tag string
+     *
+     * @see sfWidgetForm
+     */
+    public function render($name, $value = null, $attributes = array(), $errors = array())
+    {
+        $values = array_merge(array('is_empty' => ''), is_array($value) ? $value : array());
 
-    $this->addOption('with_empty', true);
-    $this->addOption('empty_label', 'is empty');
-    $this->addOption('template', 'from %from_date%<br />to %to_date%');
-    $this->addOption('filter_template', '%date_range%<br />%empty_checkbox% %empty_label%');
-  }
+        return strtr($this->getOption('filter_template'), array(
+            '%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]'))) : '',
+        ));
+    }
 
-  /**
-   * Renders the widget.
-   *
-   * @param  string $name        The element name
-   * @param  string $value       The date displayed in this widget
-   * @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
-   *
-   * @return string An HTML tag string
-   *
-   * @see sfWidgetForm
-   */
-  public function render($name, $value = null, $attributes = array(), $errors = array())
-  {
-    $values = array_merge(array('is_empty' => ''), is_array($value) ? $value : array());
+    /**
+     * Configures the current widget.
+     *
+     * Available options:
+     *
+     *  * with_empty:      Whether to add the empty checkbox (true by default)
+     *  * empty_label:     The label to use when using an empty checkbox
+     *  * template:        The template used for from date and to date
+     *                     Available placeholders: %from_date%, %to_date%
+     *  * filter_template: The template to use to render the widget
+     *                     Available placeholders: %date_range%, %empty_checkbox%, %empty_label%
+     *
+     * @param array $options    An array of options
+     * @param array $attributes An array of default HTML attributes
+     *
+     * @see sfWidgetForm
+     */
+    protected function configure($options = array(), $attributes = array())
+    {
+        parent::configure($options, $attributes);
 
-    return strtr($this->getOption('filter_template'), array(
-      '%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]'))) : '',
-    ));
-  }
+        $this->addOption('with_empty', true);
+        $this->addOption('empty_label', 'is empty');
+        $this->addOption('template', 'from %from_date%<br />to %to_date%');
+        $this->addOption('filter_template', '%date_range%<br />%empty_checkbox% %empty_label%');
+    }
 }
diff --git a/lib/widget/sfWidgetFormFilterInput.class.php b/lib/widget/sfWidgetFormFilterInput.class.php
index 9b46e7921..82f5ddf64 100644
--- a/lib/widget/sfWidgetFormFilterInput.class.php
+++ b/lib/widget/sfWidgetFormFilterInput.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -11,55 +11,54 @@
 /**
  * sfWidgetFormFilterInput represents an HTML input tag used for filtering text.
  *
- * @package    symfony
- * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfWidgetFormFilterInput extends sfWidgetForm
 {
-  /**
-   * Constructor.
-   *
-   * Available options:
-   *
-   *  * with_empty:  Whether to add the empty checkbox (true by default)
-   *  * empty_label: The label to use when using an empty checkbox
-   *  * template:    The template to use to render the widget
-   *                 Available placeholders: %input%, %empty_checkbox%, %empty_label%
-   *
-   * @param array $options     An array of options
-   * @param array $attributes  An array of default HTML attributes
-   *
-   * @see sfWidgetForm
-   */
-  protected function configure($options = array(), $attributes = array())
-  {
-    $this->addOption('with_empty', true);
-    $this->addOption('empty_label', 'is empty');
-    $this->addOption('template', '%input%<br />%empty_checkbox% %empty_label%');
-  }
+    /**
+     * Renders the widget.
+     *
+     * @param string $name       The element name
+     * @param string $value      The value displayed in this widget
+     * @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
+     *
+     * @return string An HTML tag string
+     *
+     * @see sfWidgetForm
+     */
+    public function render($name, $value = null, $attributes = array(), $errors = array())
+    {
+        $values = array_merge(array('text' => '', 'is_empty' => false), is_array($value) ? $value : array());
 
-  /**
-   * Renders the widget.
-   *
-   * @param  string $name        The element name
-   * @param  string $value       The value displayed in this widget
-   * @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
-   *
-   * @return string An HTML tag string
-   *
-   * @see sfWidgetForm
-   */
-  public function render($name, $value = null, $attributes = array(), $errors = array())
-  {
-    $values = array_merge(array('text' => '', 'is_empty' => false), is_array($value) ? $value : array());
+        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'), 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]'))) : '',
-    ));
-  }
+    /**
+     * Constructor.
+     *
+     * Available options:
+     *
+     *  * with_empty:  Whether to add the empty checkbox (true by default)
+     *  * empty_label: The label to use when using an empty checkbox
+     *  * template:    The template to use to render the widget
+     *                 Available placeholders: %input%, %empty_checkbox%, %empty_label%
+     *
+     * @param array $options    An array of options
+     * @param array $attributes An array of default HTML attributes
+     *
+     * @see sfWidgetForm
+     */
+    protected function configure($options = array(), $attributes = array())
+    {
+        $this->addOption('with_empty', true);
+        $this->addOption('empty_label', 'is empty');
+        $this->addOption('template', '%input%<br />%empty_checkbox% %empty_label%');
+    }
 }
diff --git a/lib/widget/sfWidgetFormInput.class.php b/lib/widget/sfWidgetFormInput.class.php
index adab49faa..9a80b0416 100644
--- a/lib/widget/sfWidgetFormInput.class.php
+++ b/lib/widget/sfWidgetFormInput.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -11,47 +11,46 @@
 /**
  * sfWidgetFormInput represents an HTML input tag.
  *
- * @package    symfony
- * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfWidgetFormInput extends sfWidgetForm
 {
-  /**
-   * Constructor.
-   *
-   * Available options:
-   *
-   *  * type: The widget type
-   *
-   * @param array $options     An array of options
-   * @param array $attributes  An array of default HTML attributes
-   *
-   * @see sfWidgetForm
-   */
-  protected function configure($options = array(), $attributes = array())
-  {
-    $this->addRequiredOption('type');
+    /**
+     * Renders the widget.
+     *
+     * @param string $name       The element name
+     * @param string $value      The value displayed in this widget
+     * @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
+     *
+     * @return string An HTML tag string
+     *
+     * @see sfWidgetForm
+     */
+    public function render($name, $value = null, $attributes = array(), $errors = array())
+    {
+        return $this->renderTag('input', array_merge(array('type' => $this->getOption('type'), 'name' => $name, 'value' => $value), $attributes));
+    }
 
-    // to maintain BC with symfony 1.2
-    $this->setOption('type', 'text');
-  }
+    /**
+     * Constructor.
+     *
+     * Available options:
+     *
+     *  * type: The widget type
+     *
+     * @param array $options    An array of options
+     * @param array $attributes An array of default HTML attributes
+     *
+     * @see sfWidgetForm
+     */
+    protected function configure($options = array(), $attributes = array())
+    {
+        $this->addRequiredOption('type');
 
-  /**
-   * Renders the widget.
-   *
-   * @param  string $name        The element name
-   * @param  string $value       The value displayed in this widget
-   * @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
-   *
-   * @return string An HTML tag string
-   *
-   * @see sfWidgetForm
-   */
-  public function render($name, $value = null, $attributes = array(), $errors = array())
-  {
-    return $this->renderTag('input', array_merge(array('type' => $this->getOption('type'), 'name' => $name, 'value' => $value), $attributes));
-  }
+        // to maintain BC with symfony 1.2
+        $this->setOption('type', 'text');
+    }
 }
diff --git a/lib/widget/sfWidgetFormInputCheckbox.class.php b/lib/widget/sfWidgetFormInputCheckbox.class.php
index 9fd08b57c..250d1c185 100644
--- a/lib/widget/sfWidgetFormInputCheckbox.class.php
+++ b/lib/widget/sfWidgetFormInputCheckbox.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -11,74 +11,70 @@
 /**
  * sfWidgetFormInputCheckbox represents an HTML checkbox tag.
  *
- * @package    symfony
- * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfWidgetFormInputCheckbox extends sfWidgetFormInput
 {
-  /**
-   * Constructor.
-   *
-   * Available options:
-   *
-   *  - value_attribute_value: The "value" attribute value to set for the checkbox
-   *
-   * @param array  $options     An array of options
-   * @param array  $attributes  An array of default HTML attributes
-   *
-   * @see sfWidgetFormInput
-   */
-  public function __construct($options = array(), $attributes = array())
-  {
-    $this->addOption('value_attribute_value');
+    /**
+     * Constructor.
+     *
+     * Available options:
+     *
+     *  - value_attribute_value: The "value" attribute value to set for the checkbox
+     *
+     * @param array $options    An array of options
+     * @param array $attributes An array of default HTML attributes
+     *
+     * @see sfWidgetFormInput
+     */
+    public function __construct($options = array(), $attributes = array())
+    {
+        $this->addOption('value_attribute_value');
 
-    parent::__construct($options, $attributes);
-  }
+        parent::__construct($options, $attributes);
+    }
 
-  /**
-   * @param array $options     An array of options
-   * @param array $attributes  An array of default HTML attributes
-   *
-   * @see sfWidgetFormInput
-   */
-  protected function configure($options = array(), $attributes = array())
-  {
-    parent::configure($options, $attributes);
+    /**
+     * Renders the widget.
+     *
+     * @param string $name       The element name
+     * @param string $value      The this widget is checked if value is not null
+     * @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
+     *
+     * @return string An HTML tag string
+     *
+     * @see sfWidgetForm
+     */
+    public function render($name, $value = null, $attributes = array(), $errors = array())
+    {
+        if (null !== $value && false !== $value) {
+            $attributes['checked'] = 'checked';
+        }
 
-    $this->setOption('type', 'checkbox');
+        if (!isset($attributes['value']) && null !== $this->getOption('value_attribute_value')) {
+            $attributes['value'] = $this->getOption('value_attribute_value');
+        }
 
-    if (isset($attributes['value']))
-    {
-      $this->setOption('value_attribute_value', $attributes['value']);
+        return parent::render($name, null, $attributes, $errors);
     }
-  }
 
-  /**
-   * Renders the widget.
-   *
-   * @param  string $name        The element name
-   * @param  string $value       The this widget is checked if value is not null
-   * @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
-   *
-   * @return string An HTML tag string
-   *
-   * @see sfWidgetForm
-   */
-  public function render($name, $value = null, $attributes = array(), $errors = array())
-  {
-    if (null !== $value && $value !== false)
+    /**
+     * @param array $options    An array of options
+     * @param array $attributes An array of default HTML attributes
+     *
+     * @see sfWidgetFormInput
+     */
+    protected function configure($options = array(), $attributes = array())
     {
-      $attributes['checked'] = 'checked';
-    }
+        parent::configure($options, $attributes);
 
-    if (!isset($attributes['value']) && null !== $this->getOption('value_attribute_value'))
-    {
-      $attributes['value'] = $this->getOption('value_attribute_value');
-    }
+        $this->setOption('type', 'checkbox');
 
-    return parent::render($name, null, $attributes, $errors);
-  }
+        if (isset($attributes['value'])) {
+            $this->setOption('value_attribute_value', $attributes['value']);
+        }
+    }
 }
diff --git a/lib/widget/sfWidgetFormInputFile.class.php b/lib/widget/sfWidgetFormInputFile.class.php
index 26444e2a1..125545cf4 100644
--- a/lib/widget/sfWidgetFormInputFile.class.php
+++ b/lib/widget/sfWidgetFormInputFile.class.php
@@ -11,26 +11,25 @@
 /**
  * sfWidgetFormInputFile represents an upload HTML input tag.
  *
- * @package    symfony
- * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfWidgetFormInputFile extends sfWidgetFormInput
 {
-  /**
-   * Configures the current widget.
-   *
-   * @param array $options     An array of options
-   * @param array $attributes  An array of default HTML attributes
-   *
-   * @see sfWidgetFormInput
-   */
-  protected function configure($options = array(), $attributes = array())
-  {
-    parent::configure($options, $attributes);
+    /**
+     * Configures the current widget.
+     *
+     * @param array $options    An array of options
+     * @param array $attributes An array of default HTML attributes
+     *
+     * @see sfWidgetFormInput
+     */
+    protected function configure($options = array(), $attributes = array())
+    {
+        parent::configure($options, $attributes);
 
-    $this->setOption('type', 'file');
-    $this->setOption('needs_multipart', true);
-  }
+        $this->setOption('type', 'file');
+        $this->setOption('needs_multipart', true);
+    }
 }
diff --git a/lib/widget/sfWidgetFormInputFileEditable.class.php b/lib/widget/sfWidgetFormInputFileEditable.class.php
index 0bf04f0c9..508ad2ff2 100644
--- a/lib/widget/sfWidgetFormInputFileEditable.class.php
+++ b/lib/widget/sfWidgetFormInputFileEditable.class.php
@@ -12,101 +12,93 @@
  * sfWidgetFormInputFileEditable represents an upload HTML input tag with the possibility
  * to remove a previously uploaded file.
  *
- * @package    symfony
- * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfWidgetFormInputFileEditable extends sfWidgetFormInputFile
 {
-  /**
-   * Constructor.
-   *
-   * Available options:
-   *
-   *  * file_src:     The current image web source path (required)
-   *  * edit_mode:    A Boolean: true to enabled edit mode, false otherwise
-   *  * is_image:     Whether the file is a displayable image
-   *  * with_delete:  Whether to add a delete checkbox or not
-   *  * delete_label: The delete label used by the template
-   *  * template:     The HTML template to use to render this widget when in edit mode
-   *                  The available placeholders are:
-   *                    * %input% (the image upload widget)
-   *                    * %delete% (the delete checkbox)
-   *                    * %delete_label% (the delete label text)
-   *                    * %file% (the file tag)
-   *
-   * In edit mode, this widget renders an additional widget named after the
-   * file upload widget with a "_delete" suffix. So, when creating a form,
-   * don't forget to add a validator for this additional field.
-   *
-   * @param array $options     An array of options
-   * @param array $attributes  An array of default HTML attributes
-   *
-   * @see sfWidgetFormInputFile
-   */
-  protected function configure($options = array(), $attributes = array())
-  {
-    parent::configure($options, $attributes);
+    /**
+     * Renders the widget.
+     *
+     * @param string $name       The element name
+     * @param string $value      The value displayed in this widget
+     * @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
+     *
+     * @return string An HTML tag string
+     *
+     * @see sfWidgetForm
+     */
+    public function render($name, $value = null, $attributes = array(), $errors = array())
+    {
+        $input = parent::render($name, $value, $attributes, $errors);
 
-    $this->setOption('type', 'file');
-    $this->setOption('needs_multipart', true);
+        if (!$this->getOption('edit_mode')) {
+            return $input;
+        }
 
-    $this->addRequiredOption('file_src');
-    $this->addOption('is_image', false);
-    $this->addOption('edit_mode', true);
-    $this->addOption('with_delete', true);
-    $this->addOption('delete_label', 'remove the current file');
-    $this->addOption('template', '%file%<br />%input%<br />%delete% %delete_label%');
-  }
+        if ($this->getOption('with_delete')) {
+            $deleteName = ']' == substr($name, -1) ? substr($name, 0, -1).'_delete]' : $name.'_delete';
 
-  /**
-   * Renders the widget.
-   *
-   * @param  string $name        The element name
-   * @param  string $value       The value displayed in this widget
-   * @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
-   *
-   * @return string An HTML tag string
-   *
-   * @see sfWidgetForm
-   */
-  public function render($name, $value = null, $attributes = array(), $errors = array())
-  {
-    $input = parent::render($name, $value, $attributes, $errors);
+            $delete = $this->renderTag('input', array_merge(array('type' => 'checkbox', 'name' => $deleteName), $attributes));
+            $deleteLabel = $this->translate($this->getOption('delete_label'));
+            $deleteLabel = $this->renderContentTag('label', $deleteLabel, array_merge(array('for' => $this->generateId($deleteName))));
+        } else {
+            $delete = '';
+            $deleteLabel = '';
+        }
 
-    if (!$this->getOption('edit_mode'))
-    {
-      return $input;
+        return strtr($this->getOption('template'), array('%input%' => $input, '%delete%' => $delete, '%delete_label%' => $deleteLabel, '%file%' => $this->getFileAsTag($attributes)));
     }
 
-    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));
-      $deleteLabel = $this->translate($this->getOption('delete_label'));
-      $deleteLabel = $this->renderContentTag('label', $deleteLabel, array_merge(array('for' => $this->generateId($deleteName))));
-    }
-    else
+    /**
+     * Constructor.
+     *
+     * Available options:
+     *
+     *  * file_src:     The current image web source path (required)
+     *  * edit_mode:    A Boolean: true to enabled edit mode, false otherwise
+     *  * is_image:     Whether the file is a displayable image
+     *  * with_delete:  Whether to add a delete checkbox or not
+     *  * delete_label: The delete label used by the template
+     *  * template:     The HTML template to use to render this widget when in edit mode
+     *                  The available placeholders are:
+     *                    * %input% (the image upload widget)
+     *                    * %delete% (the delete checkbox)
+     *                    * %delete_label% (the delete label text)
+     *                    * %file% (the file tag)
+     *
+     * In edit mode, this widget renders an additional widget named after the
+     * file upload widget with a "_delete" suffix. So, when creating a form,
+     * don't forget to add a validator for this additional field.
+     *
+     * @param array $options    An array of options
+     * @param array $attributes An array of default HTML attributes
+     *
+     * @see sfWidgetFormInputFile
+     */
+    protected function configure($options = array(), $attributes = array())
     {
-      $delete = '';
-      $deleteLabel = '';
-    }
+        parent::configure($options, $attributes);
 
-    return strtr($this->getOption('template'), array('%input%' => $input, '%delete%' => $delete, '%delete_label%' => $deleteLabel, '%file%' => $this->getFileAsTag($attributes)));
-  }
+        $this->setOption('type', 'file');
+        $this->setOption('needs_multipart', true);
 
-  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)) : '';
+        $this->addRequiredOption('file_src');
+        $this->addOption('is_image', false);
+        $this->addOption('edit_mode', true);
+        $this->addOption('with_delete', true);
+        $this->addOption('delete_label', 'remove the current file');
+        $this->addOption('template', '%file%<br />%input%<br />%delete% %delete_label%');
     }
-    else
+
+    protected function getFileAsTag($attributes)
     {
-      return $this->getOption('file_src');
+        if ($this->getOption('is_image')) {
+            return false !== $this->getOption('file_src') ? $this->renderTag('img', array_merge(array('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 d6fddf76a..12ed8ff29 100644
--- a/lib/widget/sfWidgetFormInputFileMulti.class.php
+++ b/lib/widget/sfWidgetFormInputFileMulti.class.php
@@ -3,48 +3,46 @@
 /**
  * sfWidgetFormInputFileMulti represents an upload HTML input tag with multiple option.
  *
- * @package    symfony
- * @subpackage widget
  * @author     Vincent Chabot <vchabot@groupe-exp.com>
+ *
  * @version    SVN: $Id$
  */
 class sfWidgetFormInputFileMulti extends sfWidgetFormInputFile
 {
-  /**
-   * Configures the current widget.
-   *
-   * @param array $options     An array of options
-   * @param array $attributes  An array of default HTML attributes
-   *
-   * @see sfWidgetFormInput
-   */
-  protected function configure($options = array(), $attributes = array())
-  {
-    parent::configure($options, $attributes);
+    /**
+     * Renders the widget.
+     *
+     * @param string $name       The element name
+     * @param string $value      The value displayed in this widget
+     * @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
+     *
+     * @return string An HTML tag string
+     *
+     * @see sfWidgetForm
+     */
+    public function render($name, $value = null, $attributes = array(), $errors = array())
+    {
+        if ($this->getOption('multiple')) {
+            $name .= '[]';
+            $attributes['multiple'] = $this->getOption('multiple');
+        }
 
-    $this->addOption('multiple', true);
-  }
+        return parent::render($name, $value, $attributes, $errors);
+    }
 
-  /**
-   * Renders the widget.
-   *
-   * @param  string $name        The element name
-   * @param  string $value       The value displayed in this widget
-   * @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
-   *
-   * @return string An HTML tag string
-   *
-   * @see sfWidgetForm
-   */
-  public function render($name, $value = null, $attributes = array(), $errors = array())
-  {
-    if ($this->getOption('multiple'))
+    /**
+     * Configures the current widget.
+     *
+     * @param array $options    An array of options
+     * @param array $attributes An array of default HTML attributes
+     *
+     * @see sfWidgetFormInput
+     */
+    protected function configure($options = array(), $attributes = array())
     {
-      $name .= '[]';
-      $attributes['multiple'] = $this->getOption('multiple');
-    }
+        parent::configure($options, $attributes);
 
-    return parent::render($name, $value, $attributes, $errors);
-  }
+        $this->addOption('multiple', true);
+    }
 }
diff --git a/lib/widget/sfWidgetFormInputHidden.class.php b/lib/widget/sfWidgetFormInputHidden.class.php
index f1b434294..c5f23a571 100644
--- a/lib/widget/sfWidgetFormInputHidden.class.php
+++ b/lib/widget/sfWidgetFormInputHidden.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -11,26 +11,25 @@
 /**
  * sfWidgetFormInputHidden represents a hidden HTML input tag.
  *
- * @package    symfony
- * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfWidgetFormInputHidden extends sfWidgetFormInput
 {
-  /**
-   * Configures the current widget.
-   *
-   * @param array $options     An array of options
-   * @param array $attributes  An array of default HTML attributes
-   *
-   * @see sfWidgetFormInput
-   */
-  protected function configure($options = array(), $attributes = array())
-  {
-    parent::configure($options, $attributes);
+    /**
+     * Configures the current widget.
+     *
+     * @param array $options    An array of options
+     * @param array $attributes An array of default HTML attributes
+     *
+     * @see sfWidgetFormInput
+     */
+    protected function configure($options = array(), $attributes = array())
+    {
+        parent::configure($options, $attributes);
 
-    $this->setOption('is_hidden', true);
-    $this->setOption('type', 'hidden');
-  }
+        $this->setOption('is_hidden', true);
+        $this->setOption('type', 'hidden');
+    }
 }
diff --git a/lib/widget/sfWidgetFormInputPassword.class.php b/lib/widget/sfWidgetFormInputPassword.class.php
index 6998850e0..a5b1603f0 100644
--- a/lib/widget/sfWidgetFormInputPassword.class.php
+++ b/lib/widget/sfWidgetFormInputPassword.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -11,48 +11,47 @@
 /**
  * sfWidgetFormInputPassword represents a password HTML input tag.
  *
- * @package    symfony
- * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfWidgetFormInputPassword extends sfWidgetFormInput
 {
-  /**
-   * Configures the current widget.
-   *
-   * Available options:
-   *
-   *  * always_render_empty: true if you want the input value to be always empty when rendering (true by default)
-   *
-   * @param array $options     An array of options
-   * @param array $attributes  An array of default HTML attributes
-   *
-   * @see sfWidgetFormInput
-   */
-  protected function configure($options = array(), $attributes = array())
-  {
-    parent::configure($options, $attributes);
+    /**
+     * Renders the widget.
+     *
+     * @param string $name       The element name
+     * @param string $value      the password stored in this widget, will be masked by the browser
+     * @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
+     *
+     * @return string An HTML tag string
+     *
+     * @see sfWidgetForm
+     */
+    public function render($name, $value = null, $attributes = array(), $errors = array())
+    {
+        return parent::render($name, $this->getOption('always_render_empty') ? null : $value, $attributes, $errors);
+    }
 
-    $this->addOption('always_render_empty', true);
+    /**
+     * Configures the current widget.
+     *
+     * Available options:
+     *
+     *  * always_render_empty: true if you want the input value to be always empty when rendering (true by default)
+     *
+     * @param array $options    An array of options
+     * @param array $attributes An array of default HTML attributes
+     *
+     * @see sfWidgetFormInput
+     */
+    protected function configure($options = array(), $attributes = array())
+    {
+        parent::configure($options, $attributes);
 
-    $this->setOption('type', 'password');
-  }
+        $this->addOption('always_render_empty', true);
 
-  /**
-   * Renders the widget.
-   *
-   * @param  string $name        The element name
-   * @param  string $value       The password stored in this widget, will be masked by the browser.
-   * @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
-   *
-   * @return string An HTML tag string
-   *
-   * @see sfWidgetForm
-   */
-  public function render($name, $value = null, $attributes = array(), $errors = array())
-  {
-    return parent::render($name, $this->getOption('always_render_empty') ? null : $value, $attributes, $errors);
-  }
+        $this->setOption('type', 'password');
+    }
 }
diff --git a/lib/widget/sfWidgetFormInputRead.class.php b/lib/widget/sfWidgetFormInputRead.class.php
index 8d64272e9..0e7e131dd 100644
--- a/lib/widget/sfWidgetFormInputRead.class.php
+++ b/lib/widget/sfWidgetFormInputRead.class.php
@@ -11,61 +11,58 @@
 /**
  * sfWidgetFormInputRead represents an HTML text hidden input tag with readonly text input tag containing text to read.
  *
- * @package    symfony
- * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfWidgetFormInputRead extends sfWidgetFormInput
 {
-  /**
-   * Configures the current widget.
-   *
-   * @param array $options     An array of options
-   * @param array $attributes  An array of default HTML attributes
-   *
-   * @see sfWidgetForm
-   */
-  protected function configure($options = array(), $attributes = array())
-  {
-    parent::configure($options, $attributes);
+    /**
+     * Render the current widget.
+     *
+     * @param string $name       The element name
+     * @param string $value      The this widget is checked if value is not null
+     * @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
+     *
+     * @return string An HTML tag string
+     *
+     * @see sfWidgetForm
+     */
+    public function render($name, $value = null, $attributes = array(), $errors = array())
+    {
+        $attributes = array_merge($this->attributes, $attributes);
+        $this->attributes = array();
 
-    $this->addOption('text');
-    $this->setOption('type', 'hidden');
-  }
+        $tag = parent::render($name, $value, array(), $errors);
 
-  /**
-   * Render the current widget
-   *
-   * @param  string $name        The element name
-   * @param  string $value       The this widget is checked if value is not null
-   * @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
-   *
-   * @return string An HTML tag string
-   *
-   * @see sfWidgetForm
-   */
-  public function render($name, $value = null, $attributes = array(), $errors = array())
-  {
-    $attributes = array_merge($this->attributes, $attributes);
-    $this->attributes = array();
+        $style = 'border: 0;';
+        if (isset($attributes['style'])) {
+            $style .= ' '.$attributes['style'];
+            unset($attributes['style']);
+        }
 
-    $tag = parent::render($name, $value, array(), $errors);
+        return $tag.$this->renderTag('input', array_merge(array(
+            'type' => 'text',
+            'value' => $this->getOption('text', $value),
+            'readonly' => 'readonly',
+            'style' => $style,
+        ), $attributes));
+    }
 
-    $style = 'border: 0;';
-    if (isset($attributes['style']))
+    /**
+     * Configures the current widget.
+     *
+     * @param array $options    An array of options
+     * @param array $attributes An array of default HTML attributes
+     *
+     * @see sfWidgetForm
+     */
+    protected function configure($options = array(), $attributes = array())
     {
-      $style .= ' '.$attributes['style'];
-      unset($attributes['style']);
-    }
+        parent::configure($options, $attributes);
 
-    return $tag.$this->renderTag('input', array_merge(array(
-        'type'      => 'text',
-        'value'     => $this->getOption('text', $value),
-        'readonly'  => 'readonly',
-        'style'     => $style,
-      ), $attributes));
-  }
+        $this->addOption('text');
+        $this->setOption('type', 'hidden');
+    }
 }
-
diff --git a/lib/widget/sfWidgetFormInputText.class.php b/lib/widget/sfWidgetFormInputText.class.php
index 19dd68e84..1543a6628 100644
--- a/lib/widget/sfWidgetFormInputText.class.php
+++ b/lib/widget/sfWidgetFormInputText.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -11,25 +11,24 @@
 /**
  * sfWidgetFormInput represents an HTML text input tag.
  *
- * @package    symfony
- * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfWidgetFormInputText extends sfWidgetFormInput
 {
-  /**
-   * Configures the current widget.
-   *
-   * @param array $options     An array of options
-   * @param array $attributes  An array of default HTML attributes
-   *
-   * @see sfWidgetForm
-   */
-  protected function configure($options = array(), $attributes = array())
-  {
-    parent::configure($options, $attributes);
+    /**
+     * Configures the current widget.
+     *
+     * @param array $options    An array of options
+     * @param array $attributes An array of default HTML attributes
+     *
+     * @see sfWidgetForm
+     */
+    protected function configure($options = array(), $attributes = array())
+    {
+        parent::configure($options, $attributes);
 
-    $this->setOption('type', 'text');
-  }
+        $this->setOption('type', 'text');
+    }
 }
diff --git a/lib/widget/sfWidgetFormSchema.class.php b/lib/widget/sfWidgetFormSchema.class.php
index 079db376f..20126c1e6 100644
--- a/lib/widget/sfWidgetFormSchema.class.php
+++ b/lib/widget/sfWidgetFormSchema.class.php
@@ -13,861 +13,803 @@
  *
  * A field is a named validator.
  *
- * @package    symfony
- * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfWidgetFormSchema extends sfWidgetForm implements ArrayAccess
 {
-  const
-    FIRST  = 'first',
-    LAST   = 'last',
-    BEFORE = 'before',
-    AFTER  = 'after';
-
-  protected static
-    $defaultFormatterName = 'table';
-
-  protected
-    $formFormatters = array(),
-    $fields         = array(),
-    $positions      = array(),
-    $helps          = array();
-
-  /**
-   * Constructor.
-   *
-   * The first argument can be:
-   *
-   *  * null
-   *  * an array of sfWidget instances
-   *
-   * Available options:
-   *
-   *  * name_format:    The sprintf pattern to use for input names
-   *  * form_formatter: The form formatter name (table and list are bundled)
-   *
-   * @param mixed $fields     Initial fields
-   * @param array $options    An array of options
-   * @param array $attributes An array of default HTML attributes
-   * @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
-   *
-   * @see sfWidgetForm
-   */
-  public function __construct($fields = null, $options = array(), $attributes = array(), $labels = array(), $helps = array())
-  {
-    $this->addOption('name_format', '%s');
-    $this->addOption('form_formatter', null);
-
-    parent::__construct($options, $attributes);
-
-    if (is_array($fields))
-    {
-      foreach ($fields as $name => $widget)
-      {
-        $this[$name] = $widget;
-      }
-    }
-    else if (null !== $fields)
-    {
-      throw new InvalidArgumentException('sfWidgetFormSchema constructor takes an array of sfWidget objects.');
-    }
-
-    $this->setLabels($labels);
-    $this->helps = $helps;
-  }
-
-  /**
-   * Sets the default value for a field.
-   *
-   * @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
-   */
-  public function setDefault($name, $value = null)
-  {
-    $this[$name]->setDefault($value);
-
-    return $this;
-  }
-
-  /**
-   * Gets the default value of a field.
-   *
-   * @param string $name The field name (required - the default value is here because PHP do not allow signature changes with inheritance)
-   *
-   * @return string The default value
-   */
-  public function getDefault($name = null)
-  {
-    return $this[$name]->getDefault();
-  }
-
-  /**
-   * Sets the default values for the widget.
-   *
-   * @param array $values The default values for the widget
-   *
-   * @return sfWidget The current widget instance
-   */
-  public function setDefaults(array $values)
-  {
-    foreach ($this->fields as $name => $widget)
-    {
-      if (array_key_exists($name, $values))
-      {
-        $widget->setDefault($values[$name]);
-      }
-    }
-
-    return $this;
-  }
-
-  /**
-   * Returns the defaults values for the widget schema.
-   *
-   * @return array An array of default values
-   */
-  public function getDefaults()
-  {
-    $defaults = array();
-
-    foreach ($this->fields as $name => $widget)
-    {
-      $defaults[$name] = $widget instanceof sfWidgetFormSchema ? $widget->getDefaults() : $widget->getDefault();
-    }
-
-    return $defaults;
-  }
-
-  /**
-   * Adds a form formatter.
-   *
-   * @param string                      $name      The formatter name
-   * @param sfWidgetFormSchemaFormatter $formatter An sfWidgetFormSchemaFormatter instance
-   *
-   * @return sfWidget The current widget instance
-   */
-  public function addFormFormatter($name, sfWidgetFormSchemaFormatter $formatter)
-  {
-    $this->formFormatters[$name] = $formatter;
-
-    return $this;
-  }
-
-  /**
-   * Returns all the form formats defined for this form schema.
-   *
-   * @return array An array of named form formats
-   */
-  public function getFormFormatters()
-  {
-    return $this->formFormatters;
-  }
-
-  /**
-   * Sets the generic default formatter name used by the class. If you want all
-   * of your forms to be generated with the <code>list</code> format, you can
-   * do it in a project or application configuration class:
-   *
-   * <pre>
-   * class ProjectConfiguration extends sfProjectConfiguration
-   * {
-   *   public function setup()
-   *   {
-   *     sfWidgetFormSchema::setDefaultFormFormatterName('list');
-   *   }
-   * }
-   * </pre>
-   *
-   * @param string $name New default formatter name
-   */
-  static public function setDefaultFormFormatterName($name)
-  {
-    self::$defaultFormatterName = $name;
-  }
-
-  /**
-   * Sets the form formatter name to use when rendering the widget schema.
-   *
-   * @param string $name The form formatter name
-   *
-   * @return sfWidget The current widget instance
-   */
-  public function setFormFormatterName($name)
-  {
-    $this->options['form_formatter'] = $name;
-
-    return $this;
-  }
-
-  /**
-   * Gets the form formatter name that will be used to render the widget schema.
-   *
-   * @return string The form formatter name
-   */
-  public function getFormFormatterName()
-  {
-    return null === $this->options['form_formatter'] ? self::$defaultFormatterName : $this->options['form_formatter'];
-  }
-
-  /**
-   * Returns the form formatter to use for widget schema rendering
-   *
-   * @return sfWidgetFormSchemaFormatter sfWidgetFormSchemaFormatter instance
-   *
-   * @throws InvalidArgumentException when the form formatter not exists
-   */
-  public function getFormFormatter()
-  {
-    $name = $this->getFormFormatterName();
-
-    if (!isset($this->formFormatters[$name]))
-    {
-      $class = 'sfWidgetFormSchemaFormatter'.ucfirst($name);
-
-      if (!class_exists($class))
-      {
-        throw new InvalidArgumentException(sprintf('The form formatter "%s" does not exist.', $name));
-      }
-
-      $this->formFormatters[$name] = new $class($this);
-    }
-
-    return $this->formFormatters[$name];
-  }
-
-  /**
-   * Sets the format string for the name HTML attribute.
-   *
-   * If you are using the form framework with symfony, do not use a reserved word in the
-   * name format.  If you do, symfony may act in an unexpected manner.
-   *
-   * For symfony 1.1+, the following words are reserved and must NOT be used as
-   * the name format:
-   *
-   *  * module    (example: module[%s])
-   *  * action    (example: action[%s])
-   *
-   * However, you CAN use other variations, such as actions[%s] (note the s).
-   *
-   * @param string $format The format string (must contain a %s for the name placeholder)
-   *
-   * @return sfWidget The current widget instance
-   *
-   * @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));
-    }
-
-    $this->options['name_format'] = $format;
-
-    return $this;
-  }
-
-  /**
-   * Gets the format string for the name HTML attribute.
-   *
-   * @return string The format string
-   */
-  public function getNameFormat()
-  {
-    return $this->options['name_format'];
-  }
-
-  /**
-   * Sets the label names to render for each field.
-   *
-   * @param array $labels  An array of label names
-   *
-   * @return sfWidget The current widget instance
-   */
-  public function setLabels(array $labels)
-  {
-    foreach ($this->fields as $name => $widget)
-    {
-      if (array_key_exists($name, $labels))
-      {
-        $widget->setLabel($labels[$name]);
-      }
-    }
-
-    return $this;
-  }
-
-  /**
-   * Gets the labels.
-   *
-   * @return array An array of label names
-   */
-  public function getLabels()
-  {
-    $labels = array();
-
-    foreach ($this->fields as $name => $widget)
-    {
-      $labels[$name] = $widget->getLabel();
-    }
-
-    return $labels;
-  }
-
-  /**
-   * Sets a label.
-   *
-   * @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
-   *
-   * @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));
-      }
-
-      $this->fields[$name]->setLabel($value);
-    }
-    else
-    {
-      // set the label for this widget schema
-      parent::setLabel($name);
-    }
-
-    return $this;
-  }
-
-  /**
-   * Gets a label by field name.
-   *
-   * @param  string $name  The field name (required - the default value is here because PHP do not allow signature changes with inheritance)
-   *
-   * @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
-   */
-  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));
-      }
-
-      return $this->fields[$name]->getLabel();
-    }
-    else
-    {
-      // label for this widget schema
-      return parent::getLabel();
-    }
-  }
-
-  /**
-   * Sets the help texts to render for each field.
-   *
-   * @param array $helps An array of help texts
-   *
-   * @return sfWidget The current widget instance
-   */
-  public function setHelps(array $helps)
-  {
-    $this->helps = $helps;
-
-    return $this;
-  }
-
-  /**
-   * Sets the help texts.
-   *
-   * @return array An array of help texts
-   */
-  public function getHelps()
-  {
-    return $this->helps;
-  }
-
-  /**
-   * Sets a help text.
-   *
-   * @param string $name The field name
-   * @param string $help The help text
-   *
-   * @return sfWidget The current widget instance
-   */
-  public function setHelp($name, $help)
-  {
-    $this->helps[$name] = $help;
-
-    return $this;
-  }
-
-  /**
-   * Gets a text help by field name.
-   *
-   * @param string $name The field name
-   *
-   * @return string The help text or an empty string if it is not defined
-   */
-  public function getHelp($name)
-  {
-    return array_key_exists($name, $this->helps) ? $this->helps[$name] : '';
-  }
-
-  /**
-   * Gets the stylesheet paths associated with the widget.
-   *
-   * @return array An array of stylesheet paths
-   */
-  public function getStylesheets()
-  {
-    $stylesheets = array();
-
-    foreach ($this->fields as $field)
-    {
-      $stylesheets = array_merge($stylesheets, $field->getStylesheets());
-    }
-
-    return $stylesheets;
-  }
-
-  /**
-   * Gets the JavaScript paths associated with the widget.
-   *
-   * @return array An array of JavaScript paths
-   */
-  public function getJavaScripts()
-  {
-    $javascripts = array();
-
-    foreach ($this->fields as $field)
-    {
-      $javascripts = array_merge($javascripts, $field->getJavaScripts());
-    }
-
-    return array_unique($javascripts);
-  }
-
-  /**
-   * Returns true if the widget schema needs a multipart form.
-   *
-   * @return bool true if the widget schema needs a multipart form, false otherwise
-   */
-  public function needsMultipartForm()
-  {
-    foreach ($this->fields as $field)
-    {
-      if ($field->needsMultipartForm())
-      {
-        return true;
-      }
-    }
-
-    return false;
-  }
-
-  /**
-   * Renders a field by name.
-   *
-   * @param string $name       The field name
-   * @param string $value      The field value
-   * @param array  $attributes An array of HTML attributes to be merged with the current HTML attributes
-   * @param array  $errors     An array of errors for the field
-   *
-   * @return string An HTML string representing the rendered widget
-   *
-   * @throws InvalidArgumentException when the widget not exist
-   */
-  public function renderField($name, $value = null, $attributes = array(), $errors = array())
-  {
-    if (null === $widget = $this[$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());
-      $schema->addError($errors);
-      $errors = $schema;
-    }
-
-    // we clone the widget because we want to change the id format temporarily
-    $clone = clone $widget;
-    $clone->setIdFormat($this->options['id_format']);
+    public const FIRST = 'first';
+    public const LAST = 'last';
+    public const BEFORE = 'before';
+    public const AFTER = 'after';
+
+    protected static $defaultFormatterName = 'table';
+
+    protected $formFormatters = array();
+    protected $fields = array();
+    protected $positions = array();
+    protected $helps = array();
+
+    /**
+     * Constructor.
+     *
+     * The first argument can be:
+     *
+     *  * null
+     *  * an array of sfWidget instances
+     *
+     * Available options:
+     *
+     *  * name_format:    The sprintf pattern to use for input names
+     *  * form_formatter: The form formatter name (table and list are bundled)
+     *
+     * @param mixed $fields     Initial fields
+     * @param array $options    An array of options
+     * @param array $attributes An array of default HTML attributes
+     * @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
+     *
+     * @see sfWidgetForm
+     */
+    public function __construct($fields = null, $options = array(), $attributes = array(), $labels = array(), $helps = array())
+    {
+        $this->addOption('name_format', '%s');
+        $this->addOption('form_formatter', null);
+
+        parent::__construct($options, $attributes);
+
+        if (is_array($fields)) {
+            foreach ($fields as $name => $widget) {
+                $this[$name] = $widget;
+            }
+        } elseif (null !== $fields) {
+            throw new InvalidArgumentException('sfWidgetFormSchema constructor takes an array of sfWidget objects.');
+        }
+
+        $this->setLabels($labels);
+        $this->helps = $helps;
+    }
+
+    public function __clone()
+    {
+        foreach ($this->fields as $name => $field) {
+            // offsetSet will clone the field and change the parent
+            $this[$name] = $field;
+        }
+
+        foreach ($this->formFormatters as &$formFormatter) {
+            $formFormatter = clone $formFormatter;
+            $formFormatter->setWidgetSchema($this);
+        }
+    }
+
+    /**
+     * Sets the default value for a field.
+     *
+     * @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
+     */
+    public function setDefault($name, $value = null)
+    {
+        $this[$name]->setDefault($value);
+
+        return $this;
+    }
+
+    /**
+     * Gets the default value of a field.
+     *
+     * @param string $name The field name (required - the default value is here because PHP do not allow signature changes with inheritance)
+     *
+     * @return string The default value
+     */
+    public function getDefault($name = null)
+    {
+        return $this[$name]->getDefault();
+    }
+
+    /**
+     * Sets the default values for the widget.
+     *
+     * @param array $values The default values for the widget
+     *
+     * @return sfWidget The current widget instance
+     */
+    public function setDefaults(array $values)
+    {
+        foreach ($this->fields as $name => $widget) {
+            if (array_key_exists($name, $values)) {
+                $widget->setDefault($values[$name]);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns the defaults values for the widget schema.
+     *
+     * @return array An array of default values
+     */
+    public function getDefaults()
+    {
+        $defaults = array();
+
+        foreach ($this->fields as $name => $widget) {
+            $defaults[$name] = $widget instanceof sfWidgetFormSchema ? $widget->getDefaults() : $widget->getDefault();
+        }
+
+        return $defaults;
+    }
 
-    return $clone->render($this->generateName($name), $value, array_merge($clone->getAttributes(), $attributes), $errors);
-  }
+    /**
+     * Adds a form formatter.
+     *
+     * @param string                      $name      The formatter name
+     * @param sfWidgetFormSchemaFormatter $formatter An sfWidgetFormSchemaFormatter instance
+     *
+     * @return sfWidget The current widget instance
+     */
+    public function addFormFormatter($name, sfWidgetFormSchemaFormatter $formatter)
+    {
+        $this->formFormatters[$name] = $formatter;
 
-  /**
-   * Renders the widget.
-   *
-   * @param string $name       The name of the HTML widget
-   * @param mixed  $values     The values of the widget
-   * @param array  $attributes An array of HTML attributes
-   * @param array  $errors     An array of errors
-   *
-   * @return string An HTML representation of the widget
-   *
-   * @throws InvalidArgumentException when values type is not array|ArrayAccess
-   */
-  public function render($name, $values = array(), $attributes = array(), $errors = array())
-  {
-    if (null === $values)
+        return $this;
+    }
+
+    /**
+     * Returns all the form formats defined for this form schema.
+     *
+     * @return array An array of named form formats
+     */
+    public function getFormFormatters()
     {
-      $values = array();
+        return $this->formFormatters;
     }
 
-    if (!is_array($values) && !$values instanceof ArrayAccess)
+    /**
+     * Sets the generic default formatter name used by the class. If you want all
+     * of your forms to be generated with the <code>list</code> format, you can
+     * do it in a project or application configuration class:.
+     *
+     * <pre>
+     * class ProjectConfiguration extends sfProjectConfiguration
+     * {
+     *   public function setup()
+     *   {
+     *     sfWidgetFormSchema::setDefaultFormFormatterName('list');
+     *   }
+     * }
+     * </pre>
+     *
+     * @param string $name New default formatter name
+     */
+    public static function setDefaultFormFormatterName($name)
     {
-      throw new InvalidArgumentException('You must pass an array of values or an instanceof ArrayAccess to render a widget schema');
+        self::$defaultFormatterName = $name;
     }
 
-    $formFormat = $this->getFormFormatter();
+    /**
+     * Sets the form formatter name to use when rendering the widget schema.
+     *
+     * @param string $name The form formatter name
+     *
+     * @return sfWidget The current widget instance
+     */
+    public function setFormFormatterName($name)
+    {
+        $this->options['form_formatter'] = $name;
 
-    $rows = array();
-    $hiddenRows = array();
-    $errorRows = array();
+        return $this;
+    }
+
+    /**
+     * Gets the form formatter name that will be used to render the widget schema.
+     *
+     * @return string The form formatter name
+     */
+    public function getFormFormatterName()
+    {
+        return null === $this->options['form_formatter'] ? self::$defaultFormatterName : $this->options['form_formatter'];
+    }
 
-    // render each field
-    foreach ($this->positions as $name)
+    /**
+     * Returns the form formatter to use for widget schema rendering.
+     *
+     * @return sfWidgetFormSchemaFormatter sfWidgetFormSchemaFormatter instance
+     *
+     * @throws InvalidArgumentException when the form formatter not exists
+     */
+    public function getFormFormatter()
     {
-      $widget = $this[$name];
-      $value = isset($values[$name]) ? $values[$name] : null;
-      $error = isset($errors[$name]) ? $errors[$name] : array();
-      $widgetAttributes = isset($attributes[$name]) ? $attributes[$name] : array();
+        $name = $this->getFormFormatterName();
+
+        if (!isset($this->formFormatters[$name])) {
+            $class = 'sfWidgetFormSchemaFormatter'.ucfirst($name);
+
+            if (!class_exists($class)) {
+                throw new InvalidArgumentException(sprintf('The form formatter "%s" does not exist.', $name));
+            }
+
+            $this->formFormatters[$name] = new $class($this);
+        }
+
+        return $this->formFormatters[$name];
+    }
+
+    /**
+     * Sets the format string for the name HTML attribute.
+     *
+     * If you are using the form framework with symfony, do not use a reserved word in the
+     * name format.  If you do, symfony may act in an unexpected manner.
+     *
+     * For symfony 1.1+, the following words are reserved and must NOT be used as
+     * the name format:
+     *
+     *  * module    (example: module[%s])
+     *  * action    (example: action[%s])
+     *
+     * However, you CAN use other variations, such as actions[%s] (note the s).
+     *
+     * @param string $format The format string (must contain a %s for the name placeholder)
+     *
+     * @return sfWidget The current widget instance
+     *
+     * @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));
+        }
+
+        $this->options['name_format'] = $format;
+
+        return $this;
+    }
+
+    /**
+     * Gets the format string for the name HTML attribute.
+     *
+     * @return string The format string
+     */
+    public function getNameFormat()
+    {
+        return $this->options['name_format'];
+    }
+
+    /**
+     * Sets the label names to render for each field.
+     *
+     * @param array $labels An array of label names
+     *
+     * @return sfWidget The current widget instance
+     */
+    public function setLabels(array $labels)
+    {
+        foreach ($this->fields as $name => $widget) {
+            if (array_key_exists($name, $labels)) {
+                $widget->setLabel($labels[$name]);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Gets the labels.
+     *
+     * @return array An array of label names
+     */
+    public function getLabels()
+    {
+        $labels = array();
+
+        foreach ($this->fields as $name => $widget) {
+            $labels[$name] = $widget->getLabel();
+        }
+
+        return $labels;
+    }
+
+    /**
+     * Sets a label.
+     *
+     * @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
+     *
+     * @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));
+            }
+
+            $this->fields[$name]->setLabel($value);
+        } else {
+            // set the label for this widget schema
+            parent::setLabel($name);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Gets a label by field name.
+     *
+     * @param string $name The field name (required - the default value is here because PHP do not allow signature changes with inheritance)
+     *
+     * @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
+     */
+    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));
+            }
+
+            return $this->fields[$name]->getLabel();
+        }
+
+        // label for this widget schema
+        return parent::getLabel();
+    }
+
+    /**
+     * Sets the help texts to render for each field.
+     *
+     * @param array $helps An array of help texts
+     *
+     * @return sfWidget The current widget instance
+     */
+    public function setHelps(array $helps)
+    {
+        $this->helps = $helps;
+
+        return $this;
+    }
 
-      if ($widget instanceof sfWidgetForm && $widget->isHidden())
-      {
-        $hiddenRows[] = $this->renderField($name, $value, $widgetAttributes);
-      }
-      else
-      {
-        $field = $this->renderField($name, $value, $widgetAttributes, $error);
+    /**
+     * Sets the help texts.
+     *
+     * @return array An array of help texts
+     */
+    public function getHelps()
+    {
+        return $this->helps;
+    }
 
-        // 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;
+    /**
+     * Sets a help text.
+     *
+     * @param string $name The field name
+     * @param string $help The help text
+     *
+     * @return sfWidget The current widget instance
+     */
+    public function setHelp($name, $help)
+    {
+        $this->helps[$name] = $help;
 
-        $rows[] = $formFormat->formatRow($label, $field, $error, $this->getHelp($name));
-      }
+        return $this;
     }
 
-    if ($rows)
+    /**
+     * Gets a text help by field name.
+     *
+     * @param string $name The field name
+     *
+     * @return string The help text or an empty string if it is not defined
+     */
+    public function getHelp($name)
     {
-      // 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) : ''));
-      }
+        return array_key_exists($name, $this->helps) ? $this->helps[$name] : '';
     }
-    else
+
+    /**
+     * Gets the stylesheet paths associated with the widget.
+     *
+     * @return array An array of stylesheet paths
+     */
+    public function getStylesheets()
     {
-      // only hidden fields
-      $rows[0] = implode("\n", $hiddenRows);
+        $stylesheets = array();
+
+        foreach ($this->fields as $field) {
+            $stylesheets = array_merge($stylesheets, $field->getStylesheets());
+        }
+
+        return $stylesheets;
     }
 
-    return $formFormat->formatErrorRow($this->getGlobalErrors($errors)).implode('', $rows);
-  }
+    /**
+     * Gets the JavaScript paths associated with the widget.
+     *
+     * @return array An array of JavaScript paths
+     */
+    public function getJavaScripts()
+    {
+        $javascripts = array();
+
+        foreach ($this->fields as $field) {
+            $javascripts = array_merge($javascripts, $field->getJavaScripts());
+        }
 
-  /**
-   * Gets errors that need to be included in global errors.
-   *
-   * @param array $errors An array of errors
-   *
-   * @return string An HTML representation of global errors for the widget
-   */
-  public function getGlobalErrors($errors)
-  {
-    $globalErrors = array();
+        return array_unique($javascripts);
+    }
 
-    // global errors and errors for non existent fields
-    if (null !== $errors)
+    /**
+     * Returns true if the widget schema needs a multipart form.
+     *
+     * @return bool true if the widget schema needs a multipart form, false otherwise
+     */
+    public function needsMultipartForm()
     {
-      foreach ($errors as $name => $error)
-      {
-        if (!isset($this->fields[$name]))
-        {
-          $globalErrors[] = $error;
+        foreach ($this->fields as $field) {
+            if ($field->needsMultipartForm()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Renders a field by name.
+     *
+     * @param string $name       The field name
+     * @param string $value      The field value
+     * @param array  $attributes An array of HTML attributes to be merged with the current HTML attributes
+     * @param array  $errors     An array of errors for the field
+     *
+     * @return string An HTML string representing the rendered widget
+     *
+     * @throws InvalidArgumentException when the widget not exist
+     */
+    public function renderField($name, $value = null, $attributes = array(), $errors = array())
+    {
+        if (null === $widget = $this[$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());
+            $schema->addError($errors);
+            $errors = $schema;
+        }
+
+        // we clone the widget because we want to change the id format temporarily
+        $clone = clone $widget;
+        $clone->setIdFormat($this->options['id_format']);
+
+        return $clone->render($this->generateName($name), $value, array_merge($clone->getAttributes(), $attributes), $errors);
+    }
+
+    /**
+     * Renders the widget.
+     *
+     * @param string $name       The name of the HTML widget
+     * @param mixed  $values     The values of the widget
+     * @param array  $attributes An array of HTML attributes
+     * @param array  $errors     An array of errors
+     *
+     * @return string An HTML representation of the widget
+     *
+     * @throws InvalidArgumentException when values type is not array|ArrayAccess
+     */
+    public function render($name, $values = array(), $attributes = array(), $errors = array())
+    {
+        if (null === $values) {
+            $values = array();
+        }
+
+        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();
+
+        // 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();
+
+            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;
+
+                $rows[] = $formFormat->formatRow($label, $field, $error, $this->getHelp($name));
+            }
+        }
+
+        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) : ''));
+            }
+        } else {
+            // only hidden fields
+            $rows[0] = implode("\n", $hiddenRows);
         }
-      }
+
+        return $formFormat->formatErrorRow($this->getGlobalErrors($errors)).implode('', $rows);
     }
 
-    // errors for hidden fields
-    foreach ($this->positions as $name)
+    /**
+     * Gets errors that need to be included in global errors.
+     *
+     * @param array $errors An array of errors
+     *
+     * @return string An HTML representation of global errors for the widget
+     */
+    public function getGlobalErrors($errors)
     {
-      /** @var $this sfWidgetForm[] */
-      if ($this[$name] instanceof sfWidgetForm && $this[$name]->isHidden())
-      {
-        if (isset($errors[$name]))
-        {
-          $globalErrors[$this->getFormFormatter()->generateLabelName($name)] = $errors[$name];
+        $globalErrors = array();
+
+        // global errors and errors for non existent fields
+        if (null !== $errors) {
+            foreach ($errors as $name => $error) {
+                if (!isset($this->fields[$name])) {
+                    $globalErrors[] = $error;
+                }
+            }
+        }
+
+        // errors for hidden fields
+        foreach ($this->positions as $name) {
+            /** @var sfWidgetForm[] $this */
+            if ($this[$name] instanceof sfWidgetForm && $this[$name]->isHidden()) {
+                if (isset($errors[$name])) {
+                    $globalErrors[$this->getFormFormatter()->generateLabelName($name)] = $errors[$name];
+                }
+            }
         }
-      }
+
+        return $globalErrors;
     }
 
-    return $globalErrors;
-  }
+    /**
+     * Generates a name.
+     *
+     * @param string $name The name
+     *
+     * @return string The generated name
+     */
+    public function generateName($name)
+    {
+        $format = $this->getNameFormat();
 
-  /**
-   * Generates a name.
-   *
-   * @param string $name The name
-   *
-   * @return string The generated name
-   */
-  public function generateName($name)
-  {
-    $format = $this->getNameFormat();
+        if ('[%s]' == substr($format, -4) && preg_match('/^(.+?)\[(.+)\]$/', $name, $match)) {
+            $name = sprintf('%s[%s][%s]', substr($format, 0, -4), $match[1], $match[2]);
+        } elseif (false !== $format) {
+            $name = sprintf($format, $name);
+        }
 
-    if ('[%s]' == substr($format, -4) && preg_match('/^(.+?)\[(.+)\]$/', $name, $match))
+        if ($parent = $this->getParent()) {
+            $name = $parent->generateName($name);
+        }
+
+        return $name;
+    }
+
+    /**
+     * Returns true if the schema has a field with the given name (implements the ArrayAccess interface).
+     *
+     * @param string $name The field name
+     *
+     * @return bool true if the schema has a field with the given name, false otherwise
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetExists($name)
     {
-      $name = sprintf('%s[%s][%s]', substr($format, 0, -4), $match[1], $match[2]);
+        return isset($this->fields[$name]);
     }
-    else if (false !== $format)
+
+    /**
+     * Gets the field associated with the given name (implements the ArrayAccess interface).
+     *
+     * @param string $name The field name
+     *
+     * @return sfWidget|null The sfWidget instance associated with the given name, null if it does not exist
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetGet($name)
     {
-      $name = sprintf($format, $name);
+        return isset($this->fields[$name]) ? $this->fields[$name] : null;
     }
 
-    if ($parent = $this->getParent())
-    {
-      $name = $parent->generateName($name);
-    }
-
-    return $name;
-  }
-
-  /**
-   * Returns true if the schema has a field with the given name (implements the ArrayAccess interface).
-   *
-   * @param string $name The field name
-   *
-   * @return bool true if the schema has a field with the given name, false otherwise
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetExists($name)
-  {
-    return isset($this->fields[$name]);
-  }
-
-  /**
-   * Gets the field associated with the given name (implements the ArrayAccess interface).
-   *
-   * @param string $name The field name
-   *
-   * @return sfWidget|null The sfWidget instance associated with the given name, null if it does not exist
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetGet($name)
-  {
-    return isset($this->fields[$name]) ? $this->fields[$name] : null;
-  }
+    /**
+     * Sets a field (implements the ArrayAccess interface).
+     *
+     * @param string   $name   The field name
+     * @param sfWidget $widget An sfWidget instance
+     *
+     * @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 (!isset($this->fields[$name])) {
+            $this->positions[] = (string) $name;
+        }
+
+        $this->fields[$name] = clone $widget;
+        $this->fields[$name]->setParent($this);
 
-  /**
-   * Sets a field (implements the ArrayAccess interface).
-   *
-   * @param string   $name   The field name
-   * @param sfWidget $widget An sfWidget instance
-   *
-   * @throws InvalidArgumentException when the field is not instance of sfWidget
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetSet($name, $widget)
-  {
-    if (!$widget instanceof sfWidget)
+        if ($widget instanceof sfWidgetFormSchema) {
+            $this->fields[$name]->setNameFormat($name.'[%s]');
+        }
+    }
+
+    /**
+     * Removes a field by name (implements the ArrayAccess interface).
+     *
+     * @param string $name field name
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetUnset($name)
     {
-      throw new InvalidArgumentException('A field must be an instance of sfWidget.');
+        unset($this->fields[$name]);
+        if (false !== $position = array_search((string) $name, $this->positions)) {
+            unset($this->positions[$position]);
+
+            $this->positions = array_values($this->positions);
+        }
     }
 
-    if (!isset($this->fields[$name]))
+    /**
+     * Returns an array of fields.
+     *
+     * @return sfWidget[] An array of sfWidget instance
+     */
+    public function getFields()
     {
-      $this->positions[] = (string) $name;
-    }
-
-    $this->fields[$name] = clone $widget;
-    $this->fields[$name]->setParent($this);
-
-    if ($widget instanceof sfWidgetFormSchema)
-    {
-      $this->fields[$name]->setNameFormat($name.'[%s]');
-    }
-  }
-
-  /**
-   * Removes a field by name (implements the ArrayAccess interface).
-   *
-   * @param string $name field name
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetUnset($name)
-  {
-    unset($this->fields[$name]);
-    if (false !== $position = array_search((string) $name, $this->positions))
-    {
-      unset($this->positions[$position]);
-
-      $this->positions = array_values($this->positions);
-    }
-  }
-
-  /**
-   * Returns an array of fields.
-   *
-   * @return sfWidget[] An array of sfWidget instance
-   */
-  public function getFields()
-  {
-    return $this->fields;
-  }
-
-  /**
-   * Gets the positions of the fields.
-   *
-   * The field positions are only used when rendering the schema with ->render().
-   *
-   * @return array An ordered array of field names
-   */
-  public function getPositions()
-  {
-    return $this->positions;
-  }
-
-  /**
-   * Sets the positions of the fields.
-   *
-   * @param array $positions An ordered array of field names
-   *
-   * @return sfWidget The current widget instance
-   *
-   * @throws InvalidArgumentException when not all fields set in $positions
-   *
-   * @see getPositions()
-   */
-  public function setPositions(array $positions)
-  {
-    $positions = array_unique(array_values($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));
-    }
-
-    if ($diff = array_diff($current, $positions))
-    {
-      throw new InvalidArgumentException('Positions array must include all fields. Missing: '.implode(', ', $diff));
-    }
-
-    foreach ($positions as &$position)
-    {
-      $position = (string) $position;
-    }
-
-    $this->positions = $positions;
-
-    return $this;
-  }
-
-  /**
-   * Moves a field in a given position
-   *
-   * Available actions are:
-   *
-   *  * sfWidgetFormSchema::BEFORE
-   *  * sfWidgetFormSchema::AFTER
-   *  * sfWidgetFormSchema::LAST
-   *  * sfWidgetFormSchema::FIRST
-   *
-   * @param string   $field  The field name to move
-   * @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
-   */
-  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));
-    }
-    unset($this->positions[$fieldPosition]);
-    $this->positions = array_values($this->positions);
-
-    if (null !== $pivot)
-    {
-      $pivot = (string) $pivot;
-      if (false === $pivotPosition = array_search($pivot, $this->positions))
-      {
-        throw new InvalidArgumentException(sprintf('Field "%s" does not exist.', $pivot));
-      }
-    }
-
-    switch ($action)
-    {
-      case sfWidgetFormSchema::FIRST:
-        array_unshift($this->positions, $field);
-        break;
-      case sfWidgetFormSchema::LAST:
-        $this->positions []= $field;
-        break;
-      case sfWidgetFormSchema::BEFORE:
-        if (null === $pivot)
-        {
-          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),
-          array_slice($this->positions, $pivotPosition)
-        );
-        break;
-      case sfWidgetFormSchema::AFTER:
-        if (null === $pivot)
-        {
-          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),
-          array_slice($this->positions, $pivotPosition + 1)
-        );
-        break;
-      default:
-        throw new LogicException(sprintf('Unknown move operation for field "%s".', $field));
-    }
-  }
+        return $this->fields;
+    }
 
-  public function __clone()
-  {
-    foreach ($this->fields as $name => $field)
+    /**
+     * Gets the positions of the fields.
+     *
+     * The field positions are only used when rendering the schema with ->render().
+     *
+     * @return array An ordered array of field names
+     */
+    public function getPositions()
     {
-      // offsetSet will clone the field and change the parent
-      $this[$name] = $field;
+        return $this->positions;
     }
 
-    foreach ($this->formFormatters as &$formFormatter)
+    /**
+     * Sets the positions of the fields.
+     *
+     * @param array $positions An ordered array of field names
+     *
+     * @return sfWidget The current widget instance
+     *
+     * @throws InvalidArgumentException when not all fields set in $positions
+     *
+     * @see getPositions()
+     */
+    public function setPositions(array $positions)
     {
-      $formFormatter = clone $formFormatter;
-      $formFormatter->setWidgetSchema($this);
-    }
-  }
+        $positions = array_unique(array_values($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));
+        }
+
+        if ($diff = array_diff($current, $positions)) {
+            throw new InvalidArgumentException('Positions array must include all fields. Missing: '.implode(', ', $diff));
+        }
+
+        foreach ($positions as &$position) {
+            $position = (string) $position;
+        }
+
+        $this->positions = $positions;
+
+        return $this;
+    }
+
+    /**
+     * Moves a field in a given position.
+     *
+     * Available actions are:
+     *
+     *  * sfWidgetFormSchema::BEFORE
+     *  * sfWidgetFormSchema::AFTER
+     *  * sfWidgetFormSchema::LAST
+     *  * sfWidgetFormSchema::FIRST
+     *
+     * @param string $field  The field name to move
+     * @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
+     */
+    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));
+        }
+        unset($this->positions[$fieldPosition]);
+        $this->positions = array_values($this->positions);
+
+        if (null !== $pivot) {
+            $pivot = (string) $pivot;
+            if (false === $pivotPosition = array_search($pivot, $this->positions)) {
+                throw new InvalidArgumentException(sprintf('Field "%s" does not exist.', $pivot));
+            }
+        }
+
+        switch ($action) {
+            case sfWidgetFormSchema::FIRST:
+                array_unshift($this->positions, $field);
+
+                break;
+
+            case sfWidgetFormSchema::LAST:
+                $this->positions[] = $field;
+
+                break;
+
+            case sfWidgetFormSchema::BEFORE:
+                if (null === $pivot) {
+                    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),
+                    array_slice($this->positions, $pivotPosition)
+                );
+
+                break;
+
+            case sfWidgetFormSchema::AFTER:
+                if (null === $pivot) {
+                    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),
+                    array_slice($this->positions, $pivotPosition + 1)
+                );
+
+                break;
+
+            default:
+                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 5bc26bc5c..5db5c0b3a 100644
--- a/lib/widget/sfWidgetFormSchemaDecorator.class.php
+++ b/lib/widget/sfWidgetFormSchemaDecorator.class.php
@@ -11,379 +11,374 @@
 /**
  * sfWidgetFormSchemaDecorator wraps a form schema widget inside a given HTML snippet.
  *
- * @package    symfony
- * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfWidgetFormSchemaDecorator extends sfWidgetFormSchema
 {
-  protected
-    $widget    = null,
-    $decorator = '';
-
-  /**
-   * Constructor.
-   *
-   * @param sfWidgetFormSchema $widget     A sfWidgetFormSchema instance
-   * @param string             $decorator  A decorator string
-   *
-   * @see sfWidgetFormSchema
-   */
-  public function __construct(sfWidgetFormSchema $widget, $decorator)
-  {
-    $this->widget    = $widget;
-    $this->decorator = $decorator;
-
-    parent::__construct();
-  }
-
-  /**
-   * Returns the decorated widget.
-   *
-   * @return sfWidget The decorated widget
-   */
-  public function getWidget()
-  {
-    return $this->widget;
-  }
-
-  /**
-   * Renders the widget.
-   *
-   * @param  string $name       The element name
-   * @param  array  $values     The value displayed in this widget
-   * @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
-   *
-   * @return string
-   */
-  public function render($name, $values = array(), $attributes = array(), $errors = array())
-  {
-    return strtr($this->decorator, array('%content%' => $this->widget->render($name, $values, $attributes, $errors)));
-  }
-
-  /**
-   * @see sfWidgetFormSchema
-   * @inheritdoc
-   */
-  public function addFormFormatter($name, sfWidgetFormSchemaFormatter $formatter)
-  {
-    $this->widget->addFormFormatter($name, $formatter);
-
-    return $this;
-  }
-
-  /**
-   * @see sfWidgetFormSchema
-   */
-  public function getFormFormatters()
-  {
-    return $this->widget->getFormFormatters();
-  }
-
-  /**
-   * @see sfWidgetFormSchema
-   * @inheritdoc
-   */
-  public function setFormFormatterName($name)
-  {
-    $this->widget->setFormFormatterName($name);
-
-    return $this;
-  }
-
-  /**
-   * @see sfWidgetFormSchema
-   * @inheritdoc
-   */
-  public function getFormFormatterName()
-  {
-    return $this->widget->getFormFormatterName();
-  }
-
-  /**
-   * @see sfWidgetFormSchema
-   * @inheritdoc
-   */
-  public function getFormFormatter()
-  {
-    return $this->widget->getFormFormatter();
-  }
-
-  /**
-   * @see sfWidgetFormSchema
-   * @inheritdoc
-   */
-  public function setNameFormat($format)
-  {
-    $this->widget->setNameFormat($format);
-
-    return $this;
-  }
-
-  /**
-   * @see sfWidgetFormSchema
-   * @inheritdoc
-   */
-  public function getNameFormat()
-  {
-    return $this->widget->getNameFormat();
-  }
-
-  /**
-   * @see sfWidgetFormSchema
-   * @inheritdoc
-   */
-  public function setLabels(array $labels)
-  {
-    $this->widget->setLabels($labels);
-
-    return $this;
-  }
-
-  /**
-   * @see sfWidgetFormSchema
-   * @inheritdoc
-   */
-  public function getLabels()
-  {
-    return $this->widget->getLabels();
-  }
-
-  /**
-   * @see sfWidgetFormSchema
-   * @inheritdoc
-   */
-  public function setLabel($name, $value = null)
-  {
-    if (2 == func_num_args())
-    {
-      $this->widget->setLabel($name, $value);
-    }
-    else
-    {
-      $this->widget->setLabel($name);
-    }
-
-    return $this;
-  }
-
-  /**
-   * @see sfWidgetFormSchema
-   * @inheritdoc
-   */
-  public function getLabel($name = null)
-  {
-    return 1 == func_num_args() ? $this->widget->getLabel($name) : $this->widget->getLabel();
-  }
-
-  /**
-   * @see sfWidgetFormSchema
-   * @inheritdoc
-   */
-  public function setHelps(array $helps)
-  {
-    $this->widget->setHelps($helps);
-
-    return $this;
-  }
-
-  /**
-   * @see sfWidgetFormSchema
-   * @inheritdoc
-   */
-  public function getHelps()
-  {
-    return $this->widget->getHelps();
-  }
-
-  /**
-   * @see sfWidgetFormSchema
-   * @inheritdoc
-   */
-  public function setHelp($name, $help)
-  {
-    $this->widget->setHelp($name, $help);
-
-    return $this;
-  }
-
-  /**
-   * @see sfWidgetFormSchema
-   * @inheritdoc
-   */
-  public function getHelp($name)
-  {
-    return $this->widget->getHelp($name);
-  }
-
-  /**
-   * Gets the stylesheet paths associated with the widget.
-   *
-   * @return array An array of stylesheet paths
-   */
-  public function getStylesheets()
-  {
-    return $this->widget->getStylesheets();
-  }
-
-  /**
-   * Gets the JavaScript paths associated with the widget.
-   *
-   * @return array An array of JavaScript paths
-   */
-  public function getJavaScripts()
-  {
-    return $this->widget->getJavaScripts();
-  }
-
-  /**
-   * @see sfWidgetFormSchema
-   */
-  public function needsMultipartForm()
-  {
-    return $this->widget->needsMultipartForm();
-  }
-
-  /**
-   * @see sfWidgetFormSchema
-   * @inheritdoc
-   */
-  public function renderField($name, $value = null, $attributes = array(), $errors = array())
-  {
-    return $this->widget->renderField($name, $value, $attributes, $errors);
-  }
-
-  /**
-   * @see sfWidgetFormSchemaFormatter
-   * @inheritdoc
-   */
-  public function generateLabel($name)
-  {
-    return $this->widget->getFormFormatter()->generateLabel($name);
-  }
-
-  /**
-   * @see sfWidgetFormSchemaFormatter
-   * @inheritdoc
-   */
-  public function generateLabelName($name)
-  {
-    return $this->widget->getFormFormatter()->generateLabelName($name);
-  }
-
-  /**
-   * @see sfWidgetFormSchema
-   * @inheritdoc
-   */
-  public function generateName($name)
-  {
-    return $this->widget->generateName($name);
-  }
-
-  /**
-   * @see sfWidgetFormSchema
-   * @inheritdoc
-   */
-  public function getParent()
-  {
-    return $this->widget->getParent();
-  }
-
-  /**
-   * @see sfWidgetFormSchema
-   * @inheritdoc
-   */
-  public function setParent(sfWidgetFormSchema $parent = null)
-  {
-    $this->widget->setParent($parent);
-
-    return $this;
-  }
-
-  /**
-   * @see sfWidgetFormSchema
-   * @inheritdoc
-   */
-  public function getFields()
-  {
-    return $this->widget->getFields();
-  }
-
-  /**
-   * @see sfWidgetFormSchema
-   * @inheritdoc
-   */
-  public function getPositions()
-  {
-    return $this->widget->getPositions();
-  }
-
-  /**
-   * @see sfWidgetFormSchema
-   * @inheritdoc
-   */
-  public function setPositions(array $positions)
-  {
-    $this->widget->setPositions($positions);
-
-    return $this;
-  }
-
-  /**
-   * @see sfWidgetFormSchema
-   * @inheritdoc
-   */
-  public function moveField($field, $action, $pivot = null)
-  {
-    return $this->widget->moveField($field, $action, $pivot);
-  }
-
-  /**
-   * @see sfWidgetFormSchema
-   * @inheritdoc
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetExists($name)
-  {
-    return isset($this->widget[$name]);
-  }
-
-  /**
-   * @see sfWidgetFormSchema
-   * @inheritdoc
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetGet($name)
-  {
-    return $this->widget[$name];
-  }
-
-  /**
-   * @see sfWidgetFormSchema
-   * @inheritdoc
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetSet($name, $widget)
-  {
-    $this->widget[$name] = $widget;
-  }
-
-  /**
-   * @see sfWidgetFormSchema
-   * @inheritdoc
-   */
-  #[\ReturnTypeWillChange]
-  public function offsetUnset($name)
-  {
-    unset($this->widget[$name]);
-  }
-
-  public function __clone()
-  {
-    $this->widget = clone $this->widget;
-  }
+    protected $widget;
+    protected $decorator = '';
+
+    /**
+     * Constructor.
+     *
+     * @param sfWidgetFormSchema $widget    A sfWidgetFormSchema instance
+     * @param string             $decorator A decorator string
+     *
+     * @see sfWidgetFormSchema
+     */
+    public function __construct(sfWidgetFormSchema $widget, $decorator)
+    {
+        $this->widget = $widget;
+        $this->decorator = $decorator;
+
+        parent::__construct();
+    }
+
+    public function __clone()
+    {
+        $this->widget = clone $this->widget;
+    }
+
+    /**
+     * Returns the decorated widget.
+     *
+     * @return sfWidget The decorated widget
+     */
+    public function getWidget()
+    {
+        return $this->widget;
+    }
+
+    /**
+     * Renders the widget.
+     *
+     * @param string $name       The element name
+     * @param array  $values     The value displayed in this widget
+     * @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
+     *
+     * @return string
+     */
+    public function render($name, $values = array(), $attributes = array(), $errors = array())
+    {
+        return strtr($this->decorator, array('%content%' => $this->widget->render($name, $values, $attributes, $errors)));
+    }
+
+    /**
+     * @see sfWidgetFormSchema
+     * {@inheritdoc}
+     */
+    public function addFormFormatter($name, sfWidgetFormSchemaFormatter $formatter)
+    {
+        $this->widget->addFormFormatter($name, $formatter);
+
+        return $this;
+    }
+
+    /**
+     * @see sfWidgetFormSchema
+     */
+    public function getFormFormatters()
+    {
+        return $this->widget->getFormFormatters();
+    }
+
+    /**
+     * @see sfWidgetFormSchema
+     * {@inheritdoc}
+     */
+    public function setFormFormatterName($name)
+    {
+        $this->widget->setFormFormatterName($name);
+
+        return $this;
+    }
+
+    /**
+     * @see sfWidgetFormSchema
+     * {@inheritdoc}
+     */
+    public function getFormFormatterName()
+    {
+        return $this->widget->getFormFormatterName();
+    }
+
+    /**
+     * @see sfWidgetFormSchema
+     * {@inheritdoc}
+     */
+    public function getFormFormatter()
+    {
+        return $this->widget->getFormFormatter();
+    }
+
+    /**
+     * @see sfWidgetFormSchema
+     * {@inheritdoc}
+     */
+    public function setNameFormat($format)
+    {
+        $this->widget->setNameFormat($format);
+
+        return $this;
+    }
+
+    /**
+     * @see sfWidgetFormSchema
+     * {@inheritdoc}
+     */
+    public function getNameFormat()
+    {
+        return $this->widget->getNameFormat();
+    }
+
+    /**
+     * @see sfWidgetFormSchema
+     * {@inheritdoc}
+     */
+    public function setLabels(array $labels)
+    {
+        $this->widget->setLabels($labels);
+
+        return $this;
+    }
+
+    /**
+     * @see sfWidgetFormSchema
+     * {@inheritdoc}
+     */
+    public function getLabels()
+    {
+        return $this->widget->getLabels();
+    }
+
+    /**
+     * @see sfWidgetFormSchema
+     * {@inheritdoc}
+     */
+    public function setLabel($name, $value = null)
+    {
+        if (2 == func_num_args()) {
+            $this->widget->setLabel($name, $value);
+        } else {
+            $this->widget->setLabel($name);
+        }
+
+        return $this;
+    }
+
+    /**
+     * @see sfWidgetFormSchema
+     * {@inheritdoc}
+     */
+    public function getLabel($name = null)
+    {
+        return 1 == func_num_args() ? $this->widget->getLabel($name) : $this->widget->getLabel();
+    }
+
+    /**
+     * @see sfWidgetFormSchema
+     * {@inheritdoc}
+     */
+    public function setHelps(array $helps)
+    {
+        $this->widget->setHelps($helps);
+
+        return $this;
+    }
+
+    /**
+     * @see sfWidgetFormSchema
+     * {@inheritdoc}
+     */
+    public function getHelps()
+    {
+        return $this->widget->getHelps();
+    }
+
+    /**
+     * @see sfWidgetFormSchema
+     * {@inheritdoc}
+     */
+    public function setHelp($name, $help)
+    {
+        $this->widget->setHelp($name, $help);
+
+        return $this;
+    }
+
+    /**
+     * @see sfWidgetFormSchema
+     * {@inheritdoc}
+     */
+    public function getHelp($name)
+    {
+        return $this->widget->getHelp($name);
+    }
+
+    /**
+     * Gets the stylesheet paths associated with the widget.
+     *
+     * @return array An array of stylesheet paths
+     */
+    public function getStylesheets()
+    {
+        return $this->widget->getStylesheets();
+    }
+
+    /**
+     * Gets the JavaScript paths associated with the widget.
+     *
+     * @return array An array of JavaScript paths
+     */
+    public function getJavaScripts()
+    {
+        return $this->widget->getJavaScripts();
+    }
+
+    /**
+     * @see sfWidgetFormSchema
+     */
+    public function needsMultipartForm()
+    {
+        return $this->widget->needsMultipartForm();
+    }
+
+    /**
+     * @see sfWidgetFormSchema
+     * {@inheritdoc}
+     */
+    public function renderField($name, $value = null, $attributes = array(), $errors = array())
+    {
+        return $this->widget->renderField($name, $value, $attributes, $errors);
+    }
+
+    /**
+     * @see sfWidgetFormSchemaFormatter
+     * {@inheritdoc}
+     */
+    public function generateLabel($name)
+    {
+        return $this->widget->getFormFormatter()->generateLabel($name);
+    }
+
+    /**
+     * @see sfWidgetFormSchemaFormatter
+     * {@inheritdoc}
+     */
+    public function generateLabelName($name)
+    {
+        return $this->widget->getFormFormatter()->generateLabelName($name);
+    }
+
+    /**
+     * @see sfWidgetFormSchema
+     * {@inheritdoc}
+     */
+    public function generateName($name)
+    {
+        return $this->widget->generateName($name);
+    }
+
+    /**
+     * @see sfWidgetFormSchema
+     * {@inheritdoc}
+     */
+    public function getParent()
+    {
+        return $this->widget->getParent();
+    }
+
+    /**
+     * @see sfWidgetFormSchema
+     * {@inheritdoc}
+     */
+    public function setParent(sfWidgetFormSchema $parent = null)
+    {
+        $this->widget->setParent($parent);
+
+        return $this;
+    }
+
+    /**
+     * @see sfWidgetFormSchema
+     * {@inheritdoc}
+     */
+    public function getFields()
+    {
+        return $this->widget->getFields();
+    }
+
+    /**
+     * @see sfWidgetFormSchema
+     * {@inheritdoc}
+     */
+    public function getPositions()
+    {
+        return $this->widget->getPositions();
+    }
+
+    /**
+     * @see sfWidgetFormSchema
+     * {@inheritdoc}
+     */
+    public function setPositions(array $positions)
+    {
+        $this->widget->setPositions($positions);
+
+        return $this;
+    }
+
+    /**
+     * @see sfWidgetFormSchema
+     * {@inheritdoc}
+     */
+    public function moveField($field, $action, $pivot = null)
+    {
+        return $this->widget->moveField($field, $action, $pivot);
+    }
+
+    /**
+     * @see sfWidgetFormSchema
+     * {@inheritdoc}
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetExists($name)
+    {
+        return isset($this->widget[$name]);
+    }
+
+    /**
+     * @see sfWidgetFormSchema
+     * {@inheritdoc}
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetGet($name)
+    {
+        return $this->widget[$name];
+    }
+
+    /**
+     * @see sfWidgetFormSchema
+     * {@inheritdoc}
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetSet($name, $widget)
+    {
+        $this->widget[$name] = $widget;
+    }
+
+    /**
+     * @see sfWidgetFormSchema
+     * {@inheritdoc}
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetUnset($name)
+    {
+        unset($this->widget[$name]);
+    }
 }
diff --git a/lib/widget/sfWidgetFormSchemaFormatter.class.php b/lib/widget/sfWidgetFormSchemaFormatter.class.php
index 6a332080e..0b9f3c9df 100644
--- a/lib/widget/sfWidgetFormSchemaFormatter.class.php
+++ b/lib/widget/sfWidgetFormSchemaFormatter.class.php
@@ -11,336 +11,308 @@
 /**
  * sfWidgetFormSchemaFormatter allows to format a form schema with HTML formats.
  *
- * @package    symfony
- * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 abstract class sfWidgetFormSchemaFormatter
 {
-  protected static
-    $translationCallable       = null;
-
-  protected
-    $rowFormat                 = '',
-    $helpFormat                = '%help%',
-    $errorRowFormat            = '%errors%',
-    $errorListFormatInARow     = "  <ul class=\"error_list\">\n%errors%  </ul>\n",
-    $errorRowFormatInARow      = "    <li>%error%</li>\n",
-    $namedErrorRowFormatInARow = "    <li>%name%: %error%</li>\n",
-    $decoratorFormat           = '',
-    $widgetSchema              = null,
-    $translationCatalogue      = null;
-
-  /**
-   * Constructor
-   *
-   * @param sfWidgetFormSchema $widgetSchema
-   */
-  public function __construct(sfWidgetFormSchema $widgetSchema)
-  {
-    $this->setWidgetSchema($widgetSchema);
-  }
-
-  public function formatRow($label, $field, $errors = array(), $help = '', $hiddenFields = null)
-  {
-    return strtr($this->getRowFormat(), array(
-      '%label%'         => $label,
-      '%field%'         => $field,
-      '%error%'         => $this->formatErrorsForRow($errors),
-      '%help%'          => $this->formatHelp($help),
-      '%hidden_fields%' => null === $hiddenFields ? '%hidden_fields%' : $hiddenFields,
-    ));
-  }
-
-  /**
-   * Translates a string using an i18n callable, if it has been provided
-   *
-   * @param  mixed  $subject     The subject to translate
-   * @param  array  $parameters  Additional parameters to pass back to the callable
-   * @return string
-   */
-  public function translate($subject, $parameters = array())
-  {
-    if (false === $subject)
+    protected static $translationCallable;
+
+    protected $rowFormat = '';
+    protected $helpFormat = '%help%';
+    protected $errorRowFormat = '%errors%';
+    protected $errorListFormatInARow = "  <ul class=\"error_list\">\n%errors%  </ul>\n";
+    protected $errorRowFormatInARow = "    <li>%error%</li>\n";
+    protected $namedErrorRowFormatInARow = "    <li>%name%: %error%</li>\n";
+    protected $decoratorFormat = '';
+    protected $widgetSchema;
+    protected $translationCatalogue;
+
+    /**
+     * Constructor.
+     */
+    public function __construct(sfWidgetFormSchema $widgetSchema)
     {
-      return false;
+        $this->setWidgetSchema($widgetSchema);
     }
 
-    if (null === self::$translationCallable)
+    public function formatRow($label, $field, $errors = array(), $help = '', $hiddenFields = null)
     {
-      // replace object with strings
-      foreach ($parameters as $key => $value)
-      {
-        if (is_object($value) && method_exists($value, '__toString'))
-        {
-          $parameters[$key] = $value->__toString();
+        return strtr($this->getRowFormat(), array(
+            '%label%' => $label,
+            '%field%' => $field,
+            '%error%' => $this->formatErrorsForRow($errors),
+            '%help%' => $this->formatHelp($help),
+            '%hidden_fields%' => null === $hiddenFields ? '%hidden_fields%' : $hiddenFields,
+        ));
+    }
+
+    /**
+     * Translates a string using an i18n callable, if it has been provided.
+     *
+     * @param mixed $subject    The subject to translate
+     * @param array $parameters Additional parameters to pass back to the callable
+     *
+     * @return string
+     */
+    public function translate($subject, $parameters = array())
+    {
+        if (false === $subject) {
+            return false;
+        }
+
+        if (null === self::$translationCallable) {
+            // replace object with strings
+            foreach ($parameters as $key => $value) {
+                if (is_object($value) && method_exists($value, '__toString')) {
+                    $parameters[$key] = $value->__toString();
+                }
+            }
+
+            return strtr($subject, $parameters);
+        }
+
+        $catalogue = $this->getTranslationCatalogue();
+
+        if (self::$translationCallable instanceof sfCallable) {
+            return self::$translationCallable->call($subject, $parameters, $catalogue);
         }
-      }
 
-      return strtr($subject, $parameters);
+        return call_user_func(self::$translationCallable, $subject, $parameters, $catalogue);
     }
 
-    $catalogue = $this->getTranslationCatalogue();
+    /**
+     * Returns the current i18n callable.
+     *
+     * @return mixed
+     */
+    public static function getTranslationCallable()
+    {
+        return self::$translationCallable;
+    }
 
-    if (self::$translationCallable instanceof sfCallable)
+    /**
+     * Sets a callable which aims to translate form labels, errors and help messages.
+     *
+     * @param mixed $callable
+     *
+     * @throws InvalidArgumentException if an invalid php callable or sfCallable has been provided
+     */
+    public static function setTranslationCallable($callable)
     {
-      return self::$translationCallable->call($subject, $parameters, $catalogue);
+        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;
     }
 
-    return call_user_func(self::$translationCallable, $subject, $parameters, $catalogue);
-  }
-
-  /**
-   * Returns the current i18n callable
-   *
-   * @return mixed
-   */
-  static public function getTranslationCallable()
-  {
-    return self::$translationCallable;
-  }
-
-  /**
-   * Sets a callable which aims to translate form labels, errors and help messages
-   *
-   * @param  mixed  $callable
-   *
-   * @throws InvalidArgumentException if an invalid php callable or sfCallable has been provided
-   */
-  static public function setTranslationCallable($callable)
-  {
-    if (!$callable instanceof sfCallable && !is_callable($callable))
+    public function formatHelp($help)
     {
-      throw new InvalidArgumentException('Provided i18n callable should be either an instance of sfCallable or a valid PHP callable');
+        if (!$help) {
+            return '';
+        }
+
+        return strtr($this->getHelpFormat(), array('%help%' => $this->translate($help)));
     }
 
-    self::$translationCallable = $callable;
-  }
+    public function formatErrorRow($errors)
+    {
+        if (null === $errors || !$errors) {
+            return '';
+        }
 
-  public function formatHelp($help)
-  {
-    if (!$help)
+        return strtr($this->getErrorRowFormat(), array('%errors%' => $this->formatErrorsForRow($errors)));
+    }
+
+    public function formatErrorsForRow($errors)
     {
-      return '';
+        if (null === $errors || !$errors) {
+            return '';
+        }
+
+        if (!is_array($errors)) {
+            $errors = array($errors);
+        }
+
+        return strtr($this->getErrorListFormatInARow(), array('%errors%' => implode('', $this->unnestErrors($errors))));
     }
 
-    return strtr($this->getHelpFormat(), array('%help%' => $this->translate($help)));
-  }
+    /**
+     * Generates a label for the given field name.
+     *
+     * @param string $name       The field name
+     * @param array  $attributes Optional html attributes for the label tag
+     *
+     * @return string The label tag
+     */
+    public function generateLabel($name, $attributes = array())
+    {
+        $labelName = $this->generateLabelName($name);
+
+        if (false === $labelName) {
+            return '';
+        }
+
+        if (!isset($attributes['for'])) {
+            $attributes['for'] = $this->widgetSchema->generateId($this->widgetSchema->generateName($name));
+        }
+
+        return $this->widgetSchema->renderContentTag('label', $labelName, $attributes);
+    }
 
-  public function formatErrorRow($errors)
-  {
-    if (null === $errors || !$errors)
+    /**
+     * Generates the label name for the given field name.
+     *
+     * @param string $name The field name
+     *
+     * @return string The label name
+     */
+    public function generateLabelName($name)
     {
-      return '';
+        $label = $this->widgetSchema->getLabel($name);
+
+        if (!$label && false !== $label) {
+            $label = str_replace('_', ' ', ucfirst('_id' == substr($name, -3) ? substr($name, 0, -3) : $name));
+        }
+
+        return $this->translate($label);
     }
 
-    return strtr($this->getErrorRowFormat(), array('%errors%' => $this->formatErrorsForRow($errors)));
-  }
+    /**
+     * Get i18n catalogue name.
+     *
+     * @return string
+     */
+    public function getTranslationCatalogue()
+    {
+        return $this->translationCatalogue;
+    }
 
-  public function formatErrorsForRow($errors)
-  {
-    if (null === $errors || !$errors)
+    /**
+     * Set an i18n catalogue name.
+     *
+     * @param string $catalogue
+     *
+     * @throws InvalidArgumentException when the catalogue is not a string
+     */
+    public function setTranslationCatalogue($catalogue)
     {
-      return '';
+        if (!is_string($catalogue)) {
+            throw new InvalidArgumentException('Catalogue name must be a string');
+        }
+
+        $this->translationCatalogue = $catalogue;
     }
 
-    if (!is_array($errors))
+    public function setRowFormat($format)
     {
-      $errors = array($errors);
+        $this->rowFormat = $format;
     }
 
-    return strtr($this->getErrorListFormatInARow(), array('%errors%' => implode('', $this->unnestErrors($errors))));
-  }
-
-  /**
-   * Generates a label for the given field name.
-   *
-   * @param  string $name        The field name
-   * @param  array  $attributes  Optional html attributes for the label tag
-   *
-   * @return string The label tag
-   */
-  public function generateLabel($name, $attributes = array())
-  {
-    $labelName = $this->generateLabelName($name);
-
-    if (false === $labelName)
+    public function getRowFormat()
     {
-      return '';
+        return $this->rowFormat;
     }
 
-    if (!isset($attributes['for']))
+    public function setErrorRowFormat($format)
     {
-      $attributes['for'] = $this->widgetSchema->generateId($this->widgetSchema->generateName($name));
+        $this->errorRowFormat = $format;
     }
 
-    return $this->widgetSchema->renderContentTag('label', $labelName, $attributes);
-  }
-
-  /**
-   * Generates the label name for the given field name.
-   *
-   * @param  string $name  The field name
-   *
-   * @return string The label name
-   */
-  public function generateLabelName($name)
-  {
-    $label = $this->widgetSchema->getLabel($name);
-
-    if (!$label && false !== $label)
+    public function getErrorRowFormat()
     {
-      $label = str_replace('_', ' ', ucfirst('_id' == substr($name, -3) ? substr($name, 0, -3) : $name));
+        return $this->errorRowFormat;
     }
 
-    return $this->translate($label);
-  }
-
-  /**
-   * Get i18n catalogue name
-   *
-   * @return string
-   */
-  public function getTranslationCatalogue()
-  {
-    return $this->translationCatalogue;
-  }
-
-  /**
-   * Set an i18n catalogue name
-   *
-   * @param  string  $catalogue
-   *
-   * @throws InvalidArgumentException when the catalogue is not a string
-   */
-  public function setTranslationCatalogue($catalogue)
-  {
-    if (!is_string($catalogue))
+    public function setErrorListFormatInARow($format)
     {
-      throw new InvalidArgumentException('Catalogue name must be a string');
+        $this->errorListFormatInARow = $format;
     }
 
-    $this->translationCatalogue = $catalogue;
-  }
+    public function getErrorListFormatInARow()
+    {
+        return $this->errorListFormatInARow;
+    }
 
-  protected function unnestErrors($errors, $prefix = '')
-  {
-    $newErrors = array();
+    public function setErrorRowFormatInARow($format)
+    {
+        $this->errorRowFormatInARow = $format;
+    }
 
-    foreach ($errors as $name => $error)
+    public function getErrorRowFormatInARow()
     {
-      if ($error instanceof ArrayAccess || is_array($error))
-      {
-        $newErrors = array_merge($newErrors, $this->unnestErrors($error, ($prefix ? $prefix.' > ' : '').$name));
-      }
-      else
-      {
-        if ($error instanceof sfValidatorError)
-        {
-          $err = $this->translate($error->getMessageFormat(), $error->getArguments());
-        }
-        else
-        {
-          $err = $this->translate($error);
-        }
+        return $this->errorRowFormatInARow;
+    }
 
-        if (!is_int($name))
-        {
-          $newErrors[] = strtr($this->getNamedErrorRowFormatInARow(), array('%error%' => $err, '%name%' => ($prefix ? $prefix.' > ' : '').$name));
-        }
-        else
-        {
-          $newErrors[] = strtr($this->getErrorRowFormatInARow(), array('%error%' => $err));
-        }
-      }
+    public function setNamedErrorRowFormatInARow($format)
+    {
+        $this->namedErrorRowFormatInARow = $format;
+    }
+
+    public function getNamedErrorRowFormatInARow()
+    {
+        return $this->namedErrorRowFormatInARow;
+    }
+
+    public function setDecoratorFormat($format)
+    {
+        $this->decoratorFormat = $format;
+    }
+
+    public function getDecoratorFormat()
+    {
+        return $this->decoratorFormat;
+    }
+
+    public function setHelpFormat($format)
+    {
+        $this->helpFormat = $format;
+    }
+
+    public function getHelpFormat()
+    {
+        return $this->helpFormat;
+    }
+
+    /**
+     * Sets the widget schema associated with this formatter instance.
+     *
+     * @param sfWidgetFormSchema $widgetSchema A sfWidgetFormSchema instance
+     */
+    public function setWidgetSchema(sfWidgetFormSchema $widgetSchema)
+    {
+        $this->widgetSchema = $widgetSchema;
+    }
+
+    public function getWidgetSchema()
+    {
+        return $this->widgetSchema;
     }
 
-    return $newErrors;
-  }
-
-  public function setRowFormat($format)
-  {
-    $this->rowFormat = $format;
-  }
-
-  public function getRowFormat()
-  {
-    return $this->rowFormat;
-  }
-
-  public function setErrorRowFormat($format)
-  {
-    $this->errorRowFormat = $format;
-  }
-
-  public function getErrorRowFormat()
-  {
-    return $this->errorRowFormat;
-  }
-
-  public function setErrorListFormatInARow($format)
-  {
-    $this->errorListFormatInARow = $format;
-  }
-
-  public function getErrorListFormatInARow()
-  {
-    return $this->errorListFormatInARow;
-  }
-
-  public function setErrorRowFormatInARow($format)
-  {
-    $this->errorRowFormatInARow = $format;
-  }
-
-  public function getErrorRowFormatInARow()
-  {
-    return $this->errorRowFormatInARow;
-  }
-
-  public function setNamedErrorRowFormatInARow($format)
-  {
-    $this->namedErrorRowFormatInARow = $format;
-  }
-
-  public function getNamedErrorRowFormatInARow()
-  {
-    return $this->namedErrorRowFormatInARow;
-  }
-
-  public function setDecoratorFormat($format)
-  {
-    $this->decoratorFormat = $format;
-  }
-
-  public function getDecoratorFormat()
-  {
-    return $this->decoratorFormat;
-  }
-
-  public function setHelpFormat($format)
-  {
-    $this->helpFormat = $format;
-  }
-
-  public function getHelpFormat()
-  {
-    return $this->helpFormat;
-  }
-
-  /**
-   * Sets the widget schema associated with this formatter instance.
-   *
-   * @param sfWidgetFormSchema $widgetSchema A sfWidgetFormSchema instance
-   */
-  public function setWidgetSchema(sfWidgetFormSchema $widgetSchema)
-  {
-    $this->widgetSchema = $widgetSchema;
-  }
-
-  public function getWidgetSchema()
-  {
-    return $this->widgetSchema;
-  }
+    protected function unnestErrors($errors, $prefix = '')
+    {
+        $newErrors = array();
+
+        foreach ($errors as $name => $error) {
+            if ($error instanceof ArrayAccess || is_array($error)) {
+                $newErrors = array_merge($newErrors, $this->unnestErrors($error, ($prefix ? $prefix.' > ' : '').$name));
+            } else {
+                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));
+                } else {
+                    $newErrors[] = strtr($this->getErrorRowFormatInARow(), array('%error%' => $err));
+                }
+            }
+        }
+
+        return $newErrors;
+    }
 }
diff --git a/lib/widget/sfWidgetFormSchemaFormatterList.class.php b/lib/widget/sfWidgetFormSchemaFormatterList.class.php
index 069c9e58c..7e768037e 100644
--- a/lib/widget/sfWidgetFormSchemaFormatterList.class.php
+++ b/lib/widget/sfWidgetFormSchemaFormatterList.class.php
@@ -3,24 +3,20 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 /**
- * 
- *
- * @package    symfony
- * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfWidgetFormSchemaFormatterList extends sfWidgetFormSchemaFormatter
 {
-  protected
-    $rowFormat       = "<li>\n  %error%%label%\n  %field%%help%\n%hidden_fields%</li>\n",
-    $errorRowFormat  = "<li>\n%errors%</li>\n",
-    $helpFormat      = '<br />%help%',
-    $decoratorFormat = "<ul>\n  %content%</ul>";
+    protected $rowFormat = "<li>\n  %error%%label%\n  %field%%help%\n%hidden_fields%</li>\n";
+    protected $errorRowFormat = "<li>\n%errors%</li>\n";
+    protected $helpFormat = '<br />%help%';
+    protected $decoratorFormat = "<ul>\n  %content%</ul>";
 }
diff --git a/lib/widget/sfWidgetFormSchemaFormatterTable.class.php b/lib/widget/sfWidgetFormSchemaFormatterTable.class.php
index 67dc04769..e0db9ae4f 100644
--- a/lib/widget/sfWidgetFormSchemaFormatterTable.class.php
+++ b/lib/widget/sfWidgetFormSchemaFormatterTable.class.php
@@ -3,24 +3,20 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 /**
- * 
- *
- * @package    symfony
- * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfWidgetFormSchemaFormatterTable extends sfWidgetFormSchemaFormatter
 {
-  protected
-    $rowFormat       = "<tr>\n  <th>%label%</th>\n  <td>%error%%field%%help%%hidden_fields%</td>\n</tr>\n",
-    $errorRowFormat  = "<tr><td colspan=\"2\">\n%errors%</td></tr>\n",
-    $helpFormat      = '<br />%help%',
-    $decoratorFormat = "<table>\n  %content%</table>";
+    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";
+    protected $helpFormat = '<br />%help%';
+    protected $decoratorFormat = "<table>\n  %content%</table>";
 }
diff --git a/lib/widget/sfWidgetFormSelect.class.php b/lib/widget/sfWidgetFormSelect.class.php
index 34f4438b8..6f58a5cb6 100644
--- a/lib/widget/sfWidgetFormSelect.class.php
+++ b/lib/widget/sfWidgetFormSelect.class.php
@@ -11,107 +11,97 @@
 /**
  * sfWidgetFormSelect represents a select HTML tag.
  *
- * @package    symfony
- * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfWidgetFormSelect extends sfWidgetFormChoiceBase
 {
-  /**
-   * Constructor.
-   *
-   * Available options:
-   *
-   *  * choices:  An array of possible choices (required)
-   *  * multiple: true if the select tag must allow multiple selections
-   *
-   * @param array $options     An array of options
-   * @param array $attributes  An array of default HTML attributes
-   *
-   * @see sfWidgetFormChoiceBase
-   */
-  protected function configure($options = array(), $attributes = array())
-  {
-    parent::configure($options, $attributes);
-
-    $this->addOption('multiple', false);
-  }
-
-  /**
-   * Renders the widget.
-   *
-   * @param  string $name        The element name
-   * @param  string $value       The value selected in this widget
-   * @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
-   *
-   * @return string An HTML tag string
-   *
-   * @see sfWidgetForm
-   */
-  public function render($name, $value = null, $attributes = array(), $errors = array())
-  {
-    if ($this->getOption('multiple'))
+    /**
+     * Renders the widget.
+     *
+     * @param string $name       The element name
+     * @param string $value      The value selected in this widget
+     * @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
+     *
+     * @return string An HTML tag string
+     *
+     * @see sfWidgetForm
+     */
+    public function render($name, $value = null, $attributes = array(), $errors = array())
     {
-      $attributes['multiple'] = 'multiple';
-
-      if ('[]' != substr($name, -2))
-      {
-        $name .= '[]';
-      }
-    }
-
-    $choices = $this->getChoices();
+        if ($this->getOption('multiple')) {
+            $attributes['multiple'] = 'multiple';
 
-    return $this->renderContentTag('select', "\n".implode("\n", $this->getOptionsForSelect($value, $choices))."\n", array_merge(array('name' => $name), $attributes));
-  }
+            if ('[]' != substr($name, -2)) {
+                $name .= '[]';
+            }
+        }
 
-  /**
-   * Returns an array of option tags for the given choices
-   *
-   * @param  string $value    The selected value
-   * @param  array  $choices  An array of choices
-   *
-   * @return array  An array of option tags
-   */
-  protected function getOptionsForSelect($value, $choices)
-  {
-    $mainAttributes = $this->attributes;
-    $this->attributes = array();
+        $choices = $this->getChoices();
 
-    if (!is_array($value))
-    {
-      $value = array($value);
+        return $this->renderContentTag('select', "\n".implode("\n", $this->getOptionsForSelect($value, $choices))."\n", array_merge(array('name' => $name), $attributes));
     }
 
-    $value_set = array();
-    foreach ($value as $v)
+    /**
+     * Constructor.
+     *
+     * Available options:
+     *
+     *  * choices:  An array of possible choices (required)
+     *  * multiple: true if the select tag must allow multiple selections
+     *
+     * @param array $options    An array of options
+     * @param array $attributes An array of default HTML attributes
+     *
+     * @see sfWidgetFormChoiceBase
+     */
+    protected function configure($options = array(), $attributes = array())
     {
-      $value_set[(string) $v] = true;
+        parent::configure($options, $attributes);
+
+        $this->addOption('multiple', false);
     }
 
-    $options = array();
-    foreach ($choices as $key => $option)
+    /**
+     * Returns an array of option tags for the given choices.
+     *
+     * @param string $value   The selected value
+     * @param array  $choices An array of choices
+     *
+     * @return array An array of option tags
+     */
+    protected function getOptionsForSelect($value, $choices)
     {
-      if (is_array($option))
-      {
-        $options[] = $this->renderContentTag('optgroup', implode("\n", $this->getOptionsForSelect($value, $option)), array('label' => self::escapeOnce($key)));
-      }
-      else
-      {
-        $attributes = array('value' => self::escapeOnce($key));
-        if (isset($value_set[(string) $key]))
-        {
-          $attributes['selected'] = 'selected';
+        $mainAttributes = $this->attributes;
+        $this->attributes = array();
+
+        if (!is_array($value)) {
+            $value = array($value);
         }
 
-        $options[] = $this->renderContentTag('option', self::escapeOnce($option), $attributes);
-      }
-    }
+        $value_set = array();
+        foreach ($value as $v) {
+            $value_set[(string) $v] = true;
+        }
 
-    $this->attributes = $mainAttributes;
+        $options = array();
+        foreach ($choices as $key => $option) {
+            if (is_array($option)) {
+                $options[] = $this->renderContentTag('optgroup', implode("\n", $this->getOptionsForSelect($value, $option)), array('label' => self::escapeOnce($key)));
+            } else {
+                $attributes = array('value' => self::escapeOnce($key));
+                if (isset($value_set[(string) $key])) {
+                    $attributes['selected'] = 'selected';
+                }
 
-    return $options;
-  }
+                $options[] = $this->renderContentTag('option', self::escapeOnce($option), $attributes);
+            }
+        }
+
+        $this->attributes = $mainAttributes;
+
+        return $options;
+    }
 }
diff --git a/lib/widget/sfWidgetFormSelectCheckbox.class.php b/lib/widget/sfWidgetFormSelectCheckbox.class.php
index 336058335..7294e307e 100644
--- a/lib/widget/sfWidgetFormSelectCheckbox.class.php
+++ b/lib/widget/sfWidgetFormSelectCheckbox.class.php
@@ -11,119 +11,109 @@
 /**
  * sfWidgetFormSelectCheckbox represents an array of checkboxes.
  *
- * @package    symfony
- * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfWidgetFormSelectCheckbox extends sfWidgetFormChoiceBase
 {
-  /**
-   * Constructor.
-   *
-   * Available options:
-   *
-   *  * choices:         An array of possible choices (required)
-   *  * label_separator: The separator to use between the input checkbox and the label
-   *  * class:           The class to use for the main <ul> tag
-   *  * separator:       The separator to use between each input checkbox
-   *  * formatter:       A callable to call to format the checkbox choices
-   *                     The formatter callable receives the widget and the array of inputs as arguments
-   *  * template:        The template to use when grouping option in groups (%group% %options%)
-   *
-   * @param array $options     An array of options
-   * @param array $attributes  An array of default HTML attributes
-   *
-   * @see sfWidgetFormChoiceBase
-   */
-  protected function configure($options = array(), $attributes = array())
-  {
-    parent::configure($options, $attributes);
+    /**
+     * Renders the widget.
+     *
+     * @param string $name       The element name
+     * @param string $value      The value selected in this widget
+     * @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
+     *
+     * @return string An HTML tag string
+     *
+     * @see sfWidgetForm
+     */
+    public function render($name, $value = null, $attributes = array(), $errors = array())
+    {
+        if ('[]' != substr($name, -2)) {
+            $name .= '[]';
+        }
 
-    $this->addOption('class', 'checkbox_list');
-    $this->addOption('label_separator', '&nbsp;');
-    $this->addOption('separator', "\n");
-    $this->addOption('formatter', array($this, 'formatter'));
-    $this->addOption('template', '%group% %options%');
-  }
+        if (null === $value) {
+            $value = array();
+        }
 
-  /**
-   * Renders the widget.
-   *
-   * @param  string $name        The element name
-   * @param  string $value       The value selected in this widget
-   * @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
-   *
-   * @return string An HTML tag string
-   *
-   * @see sfWidgetForm
-   */
-  public function render($name, $value = null, $attributes = array(), $errors = array())
-  {
-    if ('[]' != substr($name, -2))
-    {
-      $name .= '[]';
-    }
+        $choices = $this->getChoices();
 
-    if (null === $value)
-    {
-      $value = array();
-    }
+        // with groups?
+        if (count($choices) && is_array(current($choices))) {
+            $parts = array();
+            foreach ($choices as $key => $option) {
+                $parts[] = strtr($this->getOption('template'), array('%group%' => $key, '%options%' => $this->formatChoices($name, $value, $option, $attributes)));
+            }
+
+            return implode("\n", $parts);
+        }
 
-    $choices = $this->getChoices();
+        return $this->formatChoices($name, $value, $choices, $attributes);
+    }
 
-    // with groups?
-    if (count($choices) && is_array(current($choices)))
+    public function formatter($widget, $inputs)
     {
-      $parts = array();
-      foreach ($choices as $key => $option)
-      {
-        $parts[] = strtr($this->getOption('template'), array('%group%' => $key, '%options%' => $this->formatChoices($name, $value, $option, $attributes)));
-      }
+        $rows = array();
+        foreach ($inputs as $input) {
+            $rows[] = $this->renderContentTag('li', $input['input'].$this->getOption('label_separator').$input['label']);
+        }
 
-      return implode("\n", $parts);
+        return !$rows ? '' : $this->renderContentTag('ul', implode($this->getOption('separator'), $rows), array('class' => $this->getOption('class')));
     }
-    else
+
+    /**
+     * Constructor.
+     *
+     * Available options:
+     *
+     *  * choices:         An array of possible choices (required)
+     *  * label_separator: The separator to use between the input checkbox and the label
+     *  * class:           The class to use for the main <ul> tag
+     *  * separator:       The separator to use between each input checkbox
+     *  * formatter:       A callable to call to format the checkbox choices
+     *                     The formatter callable receives the widget and the array of inputs as arguments
+     *  * template:        The template to use when grouping option in groups (%group% %options%)
+     *
+     * @param array $options    An array of options
+     * @param array $attributes An array of default HTML attributes
+     *
+     * @see sfWidgetFormChoiceBase
+     */
+    protected function configure($options = array(), $attributes = array())
     {
-      return $this->formatChoices($name, $value, $choices, $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('template', '%group% %options%');
     }
-  }
 
-  protected function formatChoices($name, $value, $choices, $attributes)
-  {
-    $inputs = array();
-    foreach ($choices as $key => $option)
+    protected function formatChoices($name, $value, $choices, $attributes)
     {
-      $baseAttributes = array(
-        'name'  => $name,
-        'type'  => 'checkbox',
-        'value' => self::escapeOnce($key),
-        'id'    => $id = $this->generateId($name, self::escapeOnce($key)),
-      );
+        $inputs = array();
+        foreach ($choices as $key => $option) {
+            $baseAttributes = array(
+                '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';
-      }
+            if ((is_array($value) && in_array((string) $key, $value)) || (is_string($value) && (string) $key == (string) $value)) {
+                $baseAttributes['checked'] = 'checked';
+            }
 
-      $inputs[$id] = array(
-        'input' => $this->renderTag('input', array_merge($baseAttributes, $attributes)),
-        'label' => $this->renderContentTag('label', self::escapeOnce($option), array('for' => $id)),
-      );
-    }
+            $inputs[$id] = array(
+                'input' => $this->renderTag('input', array_merge($baseAttributes, $attributes)),
+                'label' => $this->renderContentTag('label', self::escapeOnce($option), array('for' => $id)),
+            );
+        }
 
-    return call_user_func($this->getOption('formatter'), $this, $inputs);
-  }
-
-  public function formatter($widget, $inputs)
-  {
-    $rows = array();
-    foreach ($inputs as $input)
-    {
-      $rows[] = $this->renderContentTag('li', $input['input'].$this->getOption('label_separator').$input['label']);
+        return call_user_func($this->getOption('formatter'), $this, $inputs);
     }
-
-    return !$rows ? '' : $this->renderContentTag('ul', implode($this->getOption('separator'), $rows), array('class' => $this->getOption('class')));
-  }
 }
diff --git a/lib/widget/sfWidgetFormSelectMany.class.php b/lib/widget/sfWidgetFormSelectMany.class.php
index 9a3413797..b9515fb1b 100644
--- a/lib/widget/sfWidgetFormSelectMany.class.php
+++ b/lib/widget/sfWidgetFormSelectMany.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -11,25 +11,24 @@
 /**
  * sfWidgetFormSelectMany represents a select HTML tag where you can select multiple values.
  *
- * @package    symfony
- * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfWidgetFormSelectMany extends sfWidgetFormSelect
 {
-  /**
-   * Configures the current widget.
-   *
-   * @param array $options     An array of options
-   * @param array $attributes  An array of default HTML attributes
-   *
-   * @see sfWidgetFormSelect
-   */
-  protected function configure($options = array(), $attributes = array())
-  {
-    parent::configure($options, $attributes);
+    /**
+     * Configures the current widget.
+     *
+     * @param array $options    An array of options
+     * @param array $attributes An array of default HTML attributes
+     *
+     * @see sfWidgetFormSelect
+     */
+    protected function configure($options = array(), $attributes = array())
+    {
+        parent::configure($options, $attributes);
 
-    $this->setOption('multiple', true);
-  }
+        $this->setOption('multiple', true);
+    }
 }
diff --git a/lib/widget/sfWidgetFormSelectRadio.class.php b/lib/widget/sfWidgetFormSelectRadio.class.php
index aae552db3..6df7bccc2 100644
--- a/lib/widget/sfWidgetFormSelectRadio.class.php
+++ b/lib/widget/sfWidgetFormSelectRadio.class.php
@@ -11,114 +11,105 @@
 /**
  * sfWidgetFormSelectRadio represents radio HTML tags.
  *
- * @package    symfony
- * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfWidgetFormSelectRadio extends sfWidgetFormChoiceBase
 {
-  /**
-   * Constructor.
-   *
-   * Available options:
-   *
-   *  * choices:         An array of possible choices (required)
-   *  * label_separator: The separator to use between the input radio and the label
-   *  * separator:       The separator to use between each input radio
-   *  * class:           The class to use for the main <ul> tag
-   *  * formatter:       A callable to call to format the radio choices
-   *                     The formatter callable receives the widget and the array of inputs as arguments
-   *  * template:        The template to use when grouping option in groups (%group% %options%)
-   *
-   * @param array $options     An array of options
-   * @param array $attributes  An array of default HTML attributes
-   *
-   * @see sfWidgetFormChoiceBase
-   */
-  protected function configure($options = array(), $attributes = array())
-  {
-    parent::configure($options, $attributes);
+    /**
+     * Renders the widget.
+     *
+     * @param string $name       The element name
+     * @param string $value      The value selected in this widget
+     * @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
+     *
+     * @return string An HTML tag string
+     *
+     * @see sfWidgetForm
+     */
+    public function render($name, $value = null, $attributes = array(), $errors = array())
+    {
+        if ('[]' != substr($name, -2)) {
+            $name .= '[]';
+        }
 
-    $this->addOption('class', 'radio_list');
-    $this->addOption('label_separator', '&nbsp;');
-    $this->addOption('separator', "\n");
-    $this->addOption('formatter', array($this, 'formatter'));
-    $this->addOption('template', '%group% %options%');
-  }
+        $choices = $this->getChoices();
 
-  /**
-   * Renders the widget.
-   *
-   * @param  string $name        The element name
-   * @param  string $value       The value selected in this widget
-   * @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
-   *
-   * @return string An HTML tag string
-   *
-   * @see sfWidgetForm
-   */
-  public function render($name, $value = null, $attributes = array(), $errors = array())
-  {
-    if ('[]' != substr($name, -2))
-    {
-      $name .= '[]';
-    }
+        // with groups?
+        if (count($choices) && is_array(next($choices))) {
+            $parts = array();
+            foreach ($choices as $key => $option) {
+                $parts[] = strtr($this->getOption('template'), array('%group%' => $key, '%options%' => $this->formatChoices($name, $value, $option, $attributes)));
+            }
+
+            return implode("\n", $parts);
+        }
 
-    $choices = $this->getChoices();
+        return $this->formatChoices($name, $value, $choices, $attributes);
+    }
 
-    // with groups?
-    if (count($choices) && is_array(next($choices)))
+    public function formatter($widget, $inputs)
     {
-      $parts = array();
-      foreach ($choices as $key => $option)
-      {
-        $parts[] = strtr($this->getOption('template'), array('%group%' => $key, '%options%' => $this->formatChoices($name, $value, $option, $attributes)));
-      }
+        $rows = array();
+        foreach ($inputs as $input) {
+            $rows[] = $this->renderContentTag('li', $input['input'].$this->getOption('label_separator').$input['label']);
+        }
 
-      return implode("\n", $parts);
+        return !$rows ? '' : $this->renderContentTag('ul', implode($this->getOption('separator'), $rows), array('class' => $this->getOption('class')));
     }
-    else
+
+    /**
+     * Constructor.
+     *
+     * Available options:
+     *
+     *  * choices:         An array of possible choices (required)
+     *  * label_separator: The separator to use between the input radio and the label
+     *  * separator:       The separator to use between each input radio
+     *  * class:           The class to use for the main <ul> tag
+     *  * formatter:       A callable to call to format the radio choices
+     *                     The formatter callable receives the widget and the array of inputs as arguments
+     *  * template:        The template to use when grouping option in groups (%group% %options%)
+     *
+     * @param array $options    An array of options
+     * @param array $attributes An array of default HTML attributes
+     *
+     * @see sfWidgetFormChoiceBase
+     */
+    protected function configure($options = array(), $attributes = array())
     {
-      return $this->formatChoices($name, $value, $choices, $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('template', '%group% %options%');
     }
-  }
 
-  protected function formatChoices($name, $value, $choices, $attributes)
-  {
-    $inputs = array();
-    foreach ($choices as $key => $option)
+    protected function formatChoices($name, $value, $choices, $attributes)
     {
-      $baseAttributes = array(
-        'name'  => substr($name, 0, -2),
-        'type'  => 'radio',
-        'value' => self::escapeOnce($key),
-        'id'    => $id = $this->generateId($name, self::escapeOnce($key)),
-      );
-
-      if ((string) $key == (string) ($value === false ? 0 : $value))
-      {
-        $baseAttributes['checked'] = 'checked';
-      }
+        $inputs = array();
+        foreach ($choices as $key => $option) {
+            $baseAttributes = array(
+                'name' => substr($name, 0, -2),
+                'type' => 'radio',
+                'value' => self::escapeOnce($key),
+                'id' => $id = $this->generateId($name, self::escapeOnce($key)),
+            );
 
-      $inputs[$id] = array(
-        'input' => $this->renderTag('input', array_merge($baseAttributes, $attributes)),
-        'label' => $this->renderContentTag('label', self::escapeOnce($option), array('for' => $id)),
-      );
-    }
+            if ((string) $key == (string) (false === $value ? 0 : $value)) {
+                $baseAttributes['checked'] = 'checked';
+            }
 
-    return call_user_func($this->getOption('formatter'), $this, $inputs);
-  }
+            $inputs[$id] = array(
+                'input' => $this->renderTag('input', array_merge($baseAttributes, $attributes)),
+                'label' => $this->renderContentTag('label', self::escapeOnce($option), array('for' => $id)),
+            );
+        }
 
-  public function formatter($widget, $inputs)
-  {
-    $rows = array();
-    foreach ($inputs as $input)
-    {
-      $rows[] = $this->renderContentTag('li', $input['input'].$this->getOption('label_separator').$input['label']);
+        return call_user_func($this->getOption('formatter'), $this, $inputs);
     }
-
-    return !$rows ? '' : $this->renderContentTag('ul', implode($this->getOption('separator'), $rows), array('class' => $this->getOption('class')));
-  }
 }
diff --git a/lib/widget/sfWidgetFormTextarea.class.php b/lib/widget/sfWidgetFormTextarea.class.php
index 89c150a3a..088f8772e 100644
--- a/lib/widget/sfWidgetFormTextarea.class.php
+++ b/lib/widget/sfWidgetFormTextarea.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -11,41 +11,40 @@
 /**
  * sfWidgetFormTextarea represents a textarea HTML tag.
  *
- * @package    symfony
- * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfWidgetFormTextarea extends sfWidgetForm
 {
-  /**
-   * Configures the current widget.
-   *
-   * @param array $options     An array of options
-   * @param array $attributes  An array of default HTML attributes
-   *
-   * @see sfWidgetForm
-   */
-  protected function configure($options = array(), $attributes = array())
-  {
-    $this->setAttribute('rows', 4);
-    $this->setAttribute('cols', 30);
-  }
+    /**
+     * Renders the widget.
+     *
+     * @param string $name       The element name
+     * @param string $value      The value displayed in this widget
+     * @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
+     *
+     * @return string An HTML tag string
+     *
+     * @see sfWidgetForm
+     */
+    public function render($name, $value = null, $attributes = array(), $errors = array())
+    {
+        return $this->renderContentTag('textarea', self::escapeOnce($value), array_merge(array('name' => $name), $attributes));
+    }
 
-  /**
-   * Renders the widget.
-   *
-   * @param  string $name        The element name
-   * @param  string $value       The value displayed in this widget
-   * @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
-   *
-   * @return string An HTML tag string
-   *
-   * @see sfWidgetForm
-   */
-  public function render($name, $value = null, $attributes = array(), $errors = array())
-  {
-    return $this->renderContentTag('textarea', self::escapeOnce($value), array_merge(array('name' => $name), $attributes));
-  }
+    /**
+     * Configures the current widget.
+     *
+     * @param array $options    An array of options
+     * @param array $attributes An array of default HTML attributes
+     *
+     * @see sfWidgetForm
+     */
+    protected function configure($options = array(), $attributes = array())
+    {
+        $this->setAttribute('rows', 4);
+        $this->setAttribute('cols', 30);
+    }
 }
diff --git a/lib/widget/sfWidgetFormTime.class.php b/lib/widget/sfWidgetFormTime.class.php
index 4a90d957b..f866f1f92 100644
--- a/lib/widget/sfWidgetFormTime.class.php
+++ b/lib/widget/sfWidgetFormTime.class.php
@@ -11,97 +11,89 @@
 /**
  * sfWidgetFormTime represents a time widget.
  *
- * @package    symfony
- * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfWidgetFormTime extends sfWidgetForm
 {
-  /**
-   * Constructor.
-   *
-   * Available options:
-   *
-   *  * format:                 The time format string (%hour%:%minute%:%second%)
-   *  * format_without_seconds: The time format string without seconds (%hour%:%minute%)
-   *  * with_seconds:           Whether to include a select for seconds (false by default)
-   *  * hours:                  An array of hours for the hour select tag (optional)
-   *  * minutes:                An array of minutes for the minute select tag (optional)
-   *  * seconds:                An array of seconds for the second select tag (optional)
-   *  * can_be_empty:           Whether the widget accept an empty value (true by default)
-   *  * empty_values:           An array of values to use for the empty value (empty string for hours, minutes, and seconds by default)
-   *
-   * @param array $options     An array of options
-   * @param array $attributes  An array of default HTML attributes
-   *
-   * @see sfWidgetForm
-   */
-  protected function configure($options = array(), $attributes = array())
-  {
-    $this->addOption('format', '%hour%:%minute%:%second%');
-    $this->addOption('format_without_seconds', '%hour%:%minute%');
-    $this->addOption('with_seconds', false);
-    $this->addOption('hours', parent::generateTwoCharsRange(0, 23));
-    $this->addOption('minutes', parent::generateTwoCharsRange(0, 59));
-    $this->addOption('seconds', parent::generateTwoCharsRange(0, 59));
+    /**
+     * Renders the widget.
+     *
+     * @param string $name       The element name
+     * @param string $value      The time displayed in this widget
+     * @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
+     *
+     * @return string An HTML tag string
+     *
+     * @see sfWidgetForm
+     */
+    public function render($name, $value = null, $attributes = array(), $errors = array())
+    {
+        // convert value to an array
+        $default = array('hour' => null, 'minute' => null, 'second' => null);
+        if (is_array($value)) {
+            $value = array_merge($default, $value);
+        } else {
+            $value = ctype_digit((string) $value) ? (int) $value : strtotime((string) $value);
+            if (false === $value) {
+                $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));
+            }
+        }
 
-    $this->addOption('can_be_empty', true);
-    $this->addOption('empty_values', array('hour' => '', 'minute' => '', 'second' => ''));
-  }
+        $time = array();
+        $emptyValues = $this->getOption('empty_values');
 
-  /**
-   * Renders the widget.
-   *
-   * @param  string $name        The element name
-   * @param  string $value       The time displayed in this widget
-   * @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
-   *
-   * @return string An HTML tag string
-   *
-   * @see sfWidgetForm
-   */
-  public function render($name, $value = null, $attributes = array(), $errors = array())
-  {
-    // convert value to an array
-    $default = array('hour' => null, 'minute' => null, 'second' => null);
-    if (is_array($value))
-    {
-      $value = array_merge($default, $value);
-    }
-    else
-    {
-      $value = ctype_digit((string) $value) ? (integer) $value : strtotime((string) $value);
-      if (false === $value)
-      {
-        $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));
-      }
-    }
+        // 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));
+        $time['%hour%'] = $widget->render($name.'[hour]', $value['hour']);
 
-    $time = array();
-    $emptyValues = $this->getOption('empty_values');
+        // 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));
+        $time['%minute%'] = $widget->render($name.'[minute]', $value['minute']);
 
-    // 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));
-    $time['%hour%'] = $widget->render($name.'[hour]', $value['hour']);
+        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));
+            $time['%second%'] = $widget->render($name.'[second]', $value['second']);
+        }
 
-    // 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));
-    $time['%minute%'] = $widget->render($name.'[minute]', $value['minute']);
+        return strtr($this->getOption('with_seconds') ? $this->getOption('format') : $this->getOption('format_without_seconds'), $time);
+    }
 
-    if ($this->getOption('with_seconds'))
+    /**
+     * Constructor.
+     *
+     * Available options:
+     *
+     *  * format:                 The time format string (%hour%:%minute%:%second%)
+     *  * format_without_seconds: The time format string without seconds (%hour%:%minute%)
+     *  * with_seconds:           Whether to include a select for seconds (false by default)
+     *  * hours:                  An array of hours for the hour select tag (optional)
+     *  * minutes:                An array of minutes for the minute select tag (optional)
+     *  * seconds:                An array of seconds for the second select tag (optional)
+     *  * can_be_empty:           Whether the widget accept an empty value (true by default)
+     *  * empty_values:           An array of values to use for the empty value (empty string for hours, minutes, and seconds by default)
+     *
+     * @param array $options    An array of options
+     * @param array $attributes An array of default HTML attributes
+     *
+     * @see sfWidgetForm
+     */
+    protected function configure($options = array(), $attributes = array())
     {
-      // 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));
-      $time['%second%'] = $widget->render($name.'[second]', $value['second']);
-    }
+        $this->addOption('format', '%hour%:%minute%:%second%');
+        $this->addOption('format_without_seconds', '%hour%:%minute%');
+        $this->addOption('with_seconds', false);
+        $this->addOption('hours', parent::generateTwoCharsRange(0, 23));
+        $this->addOption('minutes', parent::generateTwoCharsRange(0, 59));
+        $this->addOption('seconds', parent::generateTwoCharsRange(0, 59));
 
-    return strtr($this->getOption('with_seconds') ? $this->getOption('format') : $this->getOption('format_without_seconds'), $time);
-  }
+        $this->addOption('can_be_empty', true);
+        $this->addOption('empty_values', array('hour' => '', 'minute' => '', 'second' => ''));
+    }
 }
diff --git a/lib/yaml/sfYaml.class.php b/lib/yaml/sfYaml.class.php
index 80085856c..cd9027fe1 100644
--- a/lib/yaml/sfYaml.class.php
+++ b/lib/yaml/sfYaml.class.php
@@ -11,157 +11,142 @@
 /**
  * sfYaml offers convenience methods to load and dump YAML.
  *
- * @package    symfony
- * @subpackage yaml
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id: sfYaml.class.php 8988 2008-05-15 20:24:26Z fabien $
  */
 class sfYaml
 {
-  static protected
-    $spec = '1.2';
-
-  /**
-   * Sets the YAML specification version to use.
-   *
-   * @param string $version The YAML specification version
-   */
-  static public function setSpecVersion($version)
-  {
-    if (!in_array($version, array('1.1', '1.2')))
+    protected static $spec = '1.2';
+
+    /**
+     * Sets the YAML specification version to use.
+     *
+     * @param string $version The YAML specification version
+     */
+    public static function setSpecVersion($version)
     {
-      throw new InvalidArgumentException(sprintf('Version %s of the YAML specifications is not supported', $version));
-    }
-
-    self::$spec = $version;
-  }
-
-  /**
-   * Gets the YAML specification version to use.
-   *
-   * @return string The YAML specification version
-   */
-  static public function getSpecVersion()
-  {
-    return self::$spec;
-  }
-
-  /**
-   * Loads YAML into a PHP array.
-   *
-   * The load method, when supplied with a YAML stream (string or file),
-   * will do its best to convert YAML in a file into a PHP array.
-   *
-   *  Usage:
-   *  <code>
-   *   $array = sfYaml::load('config.yml');
-   *   print_r($array);
-   *  </code>
-   *
-   * @param string $input Path of YAML file or string containing YAML
-   *
-   * @return array The YAML converted to a PHP array
-   *
-   * @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 (strpos($input, "\n") === false && is_file($input))
-    {
-      $file = $input;
-
-      ob_start();
-      $retval = include($input);
-      $content = ob_get_clean();
+        if (!in_array($version, array('1.1', '1.2'))) {
+            throw new InvalidArgumentException(sprintf('Version %s of the YAML specifications is not supported', $version));
+        }
 
-      // if an array is returned by the config file assume it's in plain php form else in YAML
-      $input = is_array($retval) ? $retval : $content;
+        self::$spec = $version;
     }
 
-    // if an array is returned by the config file assume it's in plain php form else in YAML
-    if (is_array($input))
+    /**
+     * Gets the YAML specification version to use.
+     *
+     * @return string The YAML specification version
+     */
+    public static function getSpecVersion()
     {
-      return $input;
+        return self::$spec;
     }
 
-    $mbConvertEncoding = false;
-    $encoding = strtoupper($encoding);
-    if ('UTF-8' != $encoding && function_exists('mb_convert_encoding'))
+    /**
+     * Loads YAML into a PHP array.
+     *
+     * The load method, when supplied with a YAML stream (string or file),
+     * will do its best to convert YAML in a file into a PHP array.
+     *
+     *  Usage:
+     *  <code>
+     *   $array = sfYaml::load('config.yml');
+     *   print_r($array);
+     *  </code>
+     *
+     * @param string $input    Path of YAML file or string containing YAML
+     * @param mixed  $encoding
+     *
+     * @return array The YAML converted to a PHP array
+     *
+     * @throws InvalidArgumentException If the YAML is not valid
+     */
+    public static function load($input, $encoding = 'UTF-8')
     {
-      $input = mb_convert_encoding($input, 'UTF-8', $encoding);
-      $mbConvertEncoding = true;
-    }
+        $file = '';
 
-    $yaml = new sfYamlParser();
+        // if input is a file, process it
+        if (false === strpos($input, "\n") && is_file($input)) {
+            $file = $input;
 
-    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()));
+            ob_start();
+            $retval = include $input;
+            $content = ob_get_clean();
+
+            // if an array is returned by the config file assume it's in plain php form else in YAML
+            $input = is_array($retval) ? $retval : $content;
+        }
+
+        // if an array is returned by the config file assume it's in plain php form else in YAML
+        if (is_array($input)) {
+            return $input;
+        }
+
+        $mbConvertEncoding = false;
+        $encoding = strtoupper($encoding);
+        if ('UTF-8' != $encoding && function_exists('mb_convert_encoding')) {
+            $input = mb_convert_encoding($input, 'UTF-8', $encoding);
+            $mbConvertEncoding = true;
+        }
+
+        $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()));
+        }
+
+        if ($ret && $mbConvertEncoding) {
+            $ret = self::arrayConvertEncoding($ret, $encoding);
+        }
+
+        return $ret;
     }
 
-    if ($ret && $mbConvertEncoding)
+    /**
+     * Dumps a PHP array to a YAML string.
+     *
+     * The dump method, when supplied with an array, will do its best
+     * to convert the array into friendly YAML.
+     *
+     * @param array $array  PHP array
+     * @param int   $inline The level where you switch to inline YAML
+     *
+     * @return string A YAML string representing the original PHP array
+     */
+    public static function dump($array, $inline = 2)
     {
-      $ret = self::arrayConvertEncoding($ret, $encoding);
+        $yaml = new sfYamlDumper();
+
+        return $yaml->dump($array, $inline);
     }
 
-    return $ret;
-  }
-
-  /**
-   * Dumps a PHP array to a YAML string.
-   *
-   * The dump method, when supplied with an array, will do its best
-   * to convert the array into friendly YAML.
-   *
-   * @param array   $array PHP array
-   * @param integer $inline The level where you switch to inline YAML
-   *
-   * @return string A YAML string representing the original PHP array
-   */
-  public static function dump($array, $inline = 2)
-  {
-    $yaml = new sfYamlDumper();
-
-    return $yaml->dump($array, $inline);
-  }
-
-  /**
-   * Converts all kayes and values from UTF-8 to given encoding
-   *
-   * @param  array  $result   Original result
-   * @param  string $encoding The expected encoding
-   * @return array
-   */
-  protected static function arrayConvertEncoding(array $result, $encoding)
-  {
-    $convertedResult = array();
-    foreach ($result as $key => $value)
+    /**
+     * Converts all kayes and values from UTF-8 to given encoding.
+     *
+     * @param array  $result   Original result
+     * @param string $encoding The expected encoding
+     *
+     * @return array
+     */
+    protected static function arrayConvertEncoding(array $result, $encoding)
     {
-      if (is_string($key))
-      {
-        $key = mb_convert_encoding($key, $encoding, 'UTF-8');
-      }
-      if (is_array($value))
-      {
-        $convertedResult[$key] = self::arrayConvertEncoding($value, $encoding);
-      }
-      else if (is_string($value))
-      {
-        $convertedResult[$key] = mb_convert_encoding($value, $encoding, 'UTF-8');
-      }
-      else
-      {
-        $convertedResult[$key] = $value;
-      }
+        $convertedResult = array();
+        foreach ($result as $key => $value) {
+            if (is_string($key)) {
+                $key = mb_convert_encoding($key, $encoding, 'UTF-8');
+            }
+            if (is_array($value)) {
+                $convertedResult[$key] = self::arrayConvertEncoding($value, $encoding);
+            } elseif (is_string($value)) {
+                $convertedResult[$key] = mb_convert_encoding($value, $encoding, 'UTF-8');
+            } else {
+                $convertedResult[$key] = $value;
+            }
+        }
+
+        return $convertedResult;
     }
-
-    return $convertedResult;
-  }
 }
diff --git a/lib/yaml/sfYamlDumper.class.php b/lib/yaml/sfYamlDumper.class.php
index 130f2366d..4c37d7648 100644
--- a/lib/yaml/sfYamlDumper.class.php
+++ b/lib/yaml/sfYamlDumper.class.php
@@ -11,48 +11,44 @@
 /**
  * sfYamlDumper dumps PHP variables to YAML strings.
  *
- * @package    symfony
- * @subpackage yaml
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id: sfYamlDumper.class.php 10575 2008-08-01 13:08:42Z nicolas $
  */
 class sfYamlDumper
 {
-  /**
-   * Dumps a PHP value to YAML.
-   *
-   * @param  mixed   $input  The PHP value
-   * @param  integer $inline The level where you switch to inline YAML
-   * @param  integer $indent The level o indentation indentation (used internally)
-   *
-   * @return string  The YAML representation of the PHP value
-   */
-  public function dump($input, $inline = 0, $indent = 0)
-  {
-    $output = '';
-    $prefix = $indent ? str_repeat(' ', $indent) : '';
-
-    if ($inline <= 0 || !is_array($input) || empty($input))
-    {
-      $output .= $prefix.sfYamlInline::dump($input);
-    }
-    else
+    /**
+     * Dumps a PHP value to YAML.
+     *
+     * @param mixed $input  The PHP value
+     * @param int   $inline The level where you switch to inline YAML
+     * @param int   $indent The level o indentation indentation (used internally)
+     *
+     * @return string The YAML representation of the PHP value
+     */
+    public function dump($input, $inline = 0, $indent = 0)
     {
-      $isAHash = array_keys($input) !== range(0, count($input) - 1);
+        $output = '';
+        $prefix = $indent ? str_repeat(' ', $indent) : '';
 
-      foreach ($input as $key => $value)
-      {
-        $willBeInlined = $inline - 1 <= 0 || !is_array($value) || empty($value);
+        if ($inline <= 0 || !is_array($input) || empty($input)) {
+            $output .= $prefix.sfYamlInline::dump($input);
+        } else {
+            $isAHash = array_keys($input) !== range(0, count($input) - 1);
 
-        $output .= sprintf('%s%s%s%s',
-          $prefix,
-          $isAHash ? sfYamlInline::dump($key).':' : '-',
-          $willBeInlined ? ' ' : "\n",
-          $this->dump($value, $inline - 1, $willBeInlined ? 0 : $indent + 2)
-        ).($willBeInlined ? "\n" : '');
-      }
-    }
+            foreach ($input as $key => $value) {
+                $willBeInlined = $inline - 1 <= 0 || !is_array($value) || empty($value);
+
+                $output .= sprintf(
+                    '%s%s%s%s',
+                    $prefix,
+                    $isAHash ? sfYamlInline::dump($key).':' : '-',
+                    $willBeInlined ? ' ' : "\n",
+                    $this->dump($value, $inline - 1, $willBeInlined ? 0 : $indent + 2)
+                ).($willBeInlined ? "\n" : '');
+            }
+        }
 
-    return $output;
-  }
+        return $output;
+    }
 }
diff --git a/lib/yaml/sfYamlInline.class.php b/lib/yaml/sfYamlInline.class.php
index 97d8c5b03..577d0b8ee 100644
--- a/lib/yaml/sfYamlInline.class.php
+++ b/lib/yaml/sfYamlInline.class.php
@@ -11,425 +11,430 @@
 /**
  * sfYamlInline implements a YAML parser/dumper for the YAML inline syntax.
  *
- * @package    symfony
- * @subpackage yaml
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id: sfYamlInline.class.php 16177 2009-03-11 08:32:48Z fabien $
  */
 class sfYamlInline
 {
-  const REGEX_QUOTED_STRING = '(?:"([^"\\\\]*(?:\\\\.[^"\\\\]*)*)"|\'([^\']*(?:\'\'[^\']*)*)\')';
-
-  /**
-   * Convert a YAML string to a PHP array.
-   *
-   * @param string $value A YAML string
-   *
-   * @return array A PHP array representing the YAML string
-   */
-  static public function load($value)
-  {
-    $value = trim($value);
-
-    if ('' === $value)
+    public const REGEX_QUOTED_STRING = '(?:"([^"\\\\]*(?:\\\\.[^"\\\\]*)*)"|\'([^\']*(?:\'\'[^\']*)*)\')';
+
+    /**
+     * Convert a YAML string to a PHP array.
+     *
+     * @param string $value A YAML string
+     *
+     * @return array A PHP array representing the YAML string
+     */
+    public static function load($value)
     {
-      return '';
-    }
+        $value = trim($value);
 
-    if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2)
-    {
-      $mbEncoding = mb_internal_encoding();
-      mb_internal_encoding('ASCII');
-    }
+        if ('' === $value) {
+            return '';
+        }
 
-    switch ($value[0])
-    {
-      case '[':
-        $result = self::parseSequence($value);
-        break;
-      case '{':
-        $result = self::parseMapping($value);
-        break;
-      default:
-        $result = self::parseScalar($value);
-    }
+        if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2) {
+            $mbEncoding = mb_internal_encoding();
+            mb_internal_encoding('ASCII');
+        }
 
-    if (isset($mbEncoding))
-    {
-      mb_internal_encoding($mbEncoding);
-    }
+        switch ($value[0]) {
+            case '[':
+                $result = self::parseSequence($value);
 
-    return $result;
-  }
-
-  /**
-   * Dumps a given PHP variable to a YAML string.
-   *
-   * @param mixed $value The PHP variable to convert
-   *
-   * @return string The YAML string representing the PHP array
-   */
-  static public function dump($value)
-  {
-    if ('1.1' === sfYaml::getSpecVersion())
-    {
-      $trueValues = array('true', 'on', '+', 'yes', 'y');
-      $falseValues = array('false', 'off', '-', 'no', 'n');
-    }
-    else
-    {
-      $trueValues = array('true');
-      $falseValues = array('false');
-    }
+                break;
 
-    switch (true)
-    {
-      case is_resource($value):
-        return stream_get_contents($value);
-        // throw new InvalidArgumentException('Unable to dump PHP resources in a YAML file.');
-      case is_object($value):
-        return '!!php/object:'.serialize($value);
-      case is_array($value):
-        return self::dumpArray($value);
-      case null === $value:
-        return 'null';
-      case true === $value:
-        return 'true';
-      case false === $value:
-        return 'false';
-      case (is_string($value) && ctype_digit($value)):
-        return is_string($value) ? "'$value'" : (int) $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 preg_match('/[ \s \' " \: \{ \} \[ \] , & \* \# \?] | \A[ - ? | < > = ! % @ ` ]/x', $value):
-        return sprintf("'%s'", str_replace('\'', '\'\'', $value));
-      case '' == $value:
-        return "''";
-      case preg_match(self::getTimestampRegex(), $value):
-        return "'$value'";
-      case in_array(strtolower($value), $trueValues):
-        return "'$value'";
-      case in_array(strtolower($value), $falseValues):
-        return "'$value'";
-      case in_array(strtolower($value), array('null', '~')):
-        return "'$value'";
-      default:
-        return $value;
-    }
-  }
-
-  /**
-   * Dumps a PHP array to a YAML string.
-   *
-   * @param array $value The PHP array to dump
-   *
-   * @return string The YAML string representing the PHP array
-   */
-  static protected function dumpArray($value)
-  {
-    // array
-    $keys = array_keys($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();
-      foreach ($value as $val)
-      {
-        $output[] = self::dump($val);
-      }
+            case '{':
+                $result = self::parseMapping($value);
 
-      return sprintf('[%s]', implode(', ', $output));
-    }
+                break;
 
-    // mapping
-    $output = array();
-    foreach ($value as $key => $val)
-    {
-      $output[] = sprintf('%s: %s', self::dump($key), self::dump($val));
-    }
+            default:
+                $result = self::parseScalar($value);
+        }
 
-    return sprintf('{ %s }', implode(', ', $output));
-  }
-
-  /**
-   * Parses a scalar to a YAML string.
-   *
-   * @param scalar  $scalar
-   * @param string  $delimiters
-   * @param array   $stringDelimiter
-   * @param integer $i
-   * @param boolean $evaluate
-   *
-   * @return string A YAML string
-   */
-  static public function parseScalar($scalar, $delimiters = null, $stringDelimiters = array('"', "'"), &$i = 0, $evaluate = true)
-  {
-    if (is_string($scalar) && in_array($scalar[$i], $stringDelimiters))
-    {
-      // quoted scalar
-      $output = self::parseQuotedScalar($scalar, $i);
-    }
-    else
-    {
-      // "normal" string
-      if (!$delimiters)
-      {
-        $output = substr($scalar, $i);
-        $i += strlen($output);
-
-        // remove comments
-        if (false !== $strpos = strpos($output, ' #'))
-        {
-          $output = rtrim(substr($output, 0, $strpos));
+        if (isset($mbEncoding)) {
+            mb_internal_encoding($mbEncoding);
         }
-      }
-      else if (preg_match('/^(.+?)('.implode('|', $delimiters).')/', substr($scalar, $i), $match))
-      {
-        $output = $match[1];
-        $i += strlen($output);
-      }
-      else
-      {
-        throw new InvalidArgumentException(sprintf('Malformed inline YAML string (%s).', $scalar));
-      }
-
-      $output = $evaluate ? self::evaluateScalar($output) : $output;
+
+        return $result;
     }
 
-    return $output;
-  }
-
-  /**
-   * Parses a quoted scalar to YAML.
-   *
-   * @param string  $scalar
-   * @param integer $i
-   *
-   * @return string A YAML string
-   */
-  static protected function parseQuotedScalar($scalar, &$i)
-  {
-    if (!preg_match('/'.self::REGEX_QUOTED_STRING.'/Au', substr($scalar, $i), $match))
+    /**
+     * Dumps a given PHP variable to a YAML string.
+     *
+     * @param mixed $value The PHP variable to convert
+     *
+     * @return string The YAML string representing the PHP array
+     */
+    public static function dump($value)
     {
-      throw new InvalidArgumentException(sprintf('Malformed inline YAML string (%s).', substr($scalar, $i)));
-    }
+        if ('1.1' === sfYaml::getSpecVersion()) {
+            $trueValues = array('true', 'on', '+', 'yes', 'y');
+            $falseValues = array('false', 'off', '-', 'no', 'n');
+        } else {
+            $trueValues = array('true');
+            $falseValues = array('false');
+        }
 
-    $output = substr($match[0], 1, strlen($match[0]) - 2);
+        switch (true) {
+            case is_resource($value):
+                return stream_get_contents($value);
+                // throw new InvalidArgumentException('Unable to dump PHP resources in a YAML file.');
+            case is_object($value):
+                return '!!php/object:'.serialize($value);
 
-    if ('"' == $scalar[$i])
-    {
-      // evaluate the string
-      $output = str_replace(array('\\"', '\\n', '\\r'), array('"', "\n", "\r"), $output);
+            case is_array($value):
+                return self::dumpArray($value);
+
+            case null === $value:
+                return 'null';
+
+            case true === $value:
+                return 'true';
+
+            case false === $value:
+                return 'false';
+
+            case is_string($value) && ctype_digit($value):
+                return is_string($value) ? "'{$value}'" : (int) $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 preg_match('/[ \s \' " \: \{ \} \[ \] , & \* \# \?] | \A[ - ? | < > = ! % @ ` ]/x', $value):
+                return sprintf("'%s'", str_replace('\'', '\'\'', $value));
+
+            case '' == $value:
+                return "''";
+
+            case preg_match(self::getTimestampRegex(), $value):
+                return "'{$value}'";
+
+            case in_array(strtolower($value), $trueValues):
+                return "'{$value}'";
+
+            case in_array(strtolower($value), $falseValues):
+                return "'{$value}'";
+
+            case in_array(strtolower($value), array('null', '~')):
+                return "'{$value}'";
+
+            default:
+                return $value;
+        }
     }
-    else
+
+    /**
+     * Parses a scalar to a YAML string.
+     *
+     * @param scalar $scalar
+     * @param string $delimiters
+     * @param array  $stringDelimiter
+     * @param int    $i
+     * @param bool   $evaluate
+     * @param mixed  $stringDelimiters
+     *
+     * @return string A YAML string
+     */
+    public static function parseScalar($scalar, $delimiters = null, $stringDelimiters = array('"', "'"), &$i = 0, $evaluate = true)
     {
-      // unescape '
-      $output = str_replace('\'\'', '\'', $output);
+        if (is_string($scalar) && in_array($scalar[$i], $stringDelimiters)) {
+            // quoted scalar
+            $output = self::parseQuotedScalar($scalar, $i);
+        } else {
+            // "normal" string
+            if (!$delimiters) {
+                $output = substr($scalar, $i);
+                $i += strlen($output);
+
+                // remove comments
+                if (false !== $strpos = strpos($output, ' #')) {
+                    $output = rtrim(substr($output, 0, $strpos));
+                }
+            } elseif (preg_match('/^(.+?)('.implode('|', $delimiters).')/', substr($scalar, $i), $match)) {
+                $output = $match[1];
+                $i += strlen($output);
+            } else {
+                throw new InvalidArgumentException(sprintf('Malformed inline YAML string (%s).', $scalar));
+            }
+
+            $output = $evaluate ? self::evaluateScalar($output) : $output;
+        }
+
+        return $output;
     }
 
-    $i += strlen($match[0]);
-
-    return $output;
-  }
-
-  /**
-   * Parses a sequence to a YAML string.
-   *
-   * @param string  $sequence
-   * @param integer $i
-   *
-   * @return string A YAML string
-   */
-  static protected function parseSequence($sequence, &$i = 0)
-  {
-    $output = array();
-    $len = strlen($sequence);
-    ++$i;
-
-    // [foo, bar, ...]
-    while ($i < $len)
+    /**
+     * Dumps a PHP array to a YAML string.
+     *
+     * @param array $value The PHP array to dump
+     *
+     * @return string The YAML string representing the PHP array
+     */
+    protected static function dumpArray($value)
     {
-      switch ($sequence[$i])
-      {
-        case '[':
-          // nested sequence
-          $output[] = self::parseSequence($sequence, $i);
-          break;
-        case '{':
-          // nested mapping
-          $output[] = self::parseMapping($sequence, $i);
-          break;
-        case ']':
-          return $output;
-        case ',':
-        case ' ':
-          break;
-        default:
-          $isQuoted = in_array($sequence[$i], array('"', "'"));
-          $value = self::parseScalar($sequence, array(',', ']'), array('"', "'"), $i);
-
-          if (!$isQuoted && false !== strpos((string) $value, ': '))
-          {
-            // embedded mapping?
-            try
-            {
-              $value = self::parseMapping('{'.$value.'}');
+        // array
+        $keys = array_keys($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();
+            foreach ($value as $val) {
+                $output[] = self::dump($val);
             }
-            catch (InvalidArgumentException $e)
-            {
-              // no, it's not
-            }
-          }
 
-          $output[] = $value;
+            return sprintf('[%s]', implode(', ', $output));
+        }
 
-          --$i;
-      }
+        // mapping
+        $output = array();
+        foreach ($value as $key => $val) {
+            $output[] = sprintf('%s: %s', self::dump($key), self::dump($val));
+        }
 
-      ++$i;
+        return sprintf('{ %s }', implode(', ', $output));
     }
 
-    throw new InvalidArgumentException(sprintf('Malformed inline YAML string %s', $sequence));
-  }
-
-  /**
-   * Parses a mapping to a YAML string.
-   *
-   * @param string  $mapping
-   * @param integer $i
-   *
-   * @return string A YAML string
-   */
-  static protected function parseMapping($mapping, &$i = 0)
-  {
-    $output = array();
-    $len = strlen($mapping);
-    ++$i;
-
-    // {foo: bar, bar:foo, ...}
-    while ($i < $len)
+    /**
+     * Parses a quoted scalar to YAML.
+     *
+     * @param string $scalar
+     * @param int    $i
+     *
+     * @return string A YAML string
+     */
+    protected static function parseQuotedScalar($scalar, &$i)
     {
-      switch ($mapping[$i])
-      {
-        case ' ':
-        case ',':
-          ++$i;
-          continue 2;
-        case '}':
-          return $output;
-      }
-
-      // key
-      $key = self::parseScalar($mapping, array(':', ' '), array('"', "'"), $i, false);
-
-      // value
-      $done = false;
-      while ($i < $len)
-      {
-        switch ($mapping[$i])
-        {
-          case '[':
-            // nested sequence
-            $output[$key] = self::parseSequence($mapping, $i);
-            $done = true;
-            break;
-          case '{':
-            // nested mapping
-            $output[$key] = self::parseMapping($mapping, $i);
-            $done = true;
-            break;
-          case ':':
-          case ' ':
-            break;
-          default:
-            $output[$key] = self::parseScalar($mapping, array(',', '}'), array('"', "'"), $i);
-            $done = true;
-            --$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)));
         }
 
-        ++$i;
+        $output = substr($match[0], 1, strlen($match[0]) - 2);
 
-        if ($done)
-        {
-          continue 2;
+        if ('"' == $scalar[$i]) {
+            // evaluate the string
+            $output = str_replace(array('\\"', '\\n', '\\r'), array('"', "\n", "\r"), $output);
+        } else {
+            // unescape '
+            $output = str_replace('\'\'', '\'', $output);
         }
-      }
+
+        $i += strlen($match[0]);
+
+        return $output;
     }
 
-    throw new InvalidArgumentException(sprintf('Malformed inline YAML string %s', $mapping));
-  }
-
-  /**
-   * Evaluates scalars and replaces magic values.
-   *
-   * @param string $scalar
-   *
-   * @return string A YAML string
-   */
-  static protected function evaluateScalar($scalar)
-  {
-    $scalar = trim($scalar);
-
-    if ('1.1' === sfYaml::getSpecVersion())
+    /**
+     * Parses a sequence to a YAML string.
+     *
+     * @param string $sequence
+     * @param int    $i
+     *
+     * @return string A YAML string
+     */
+    protected static function parseSequence($sequence, &$i = 0)
     {
-      $trueValues = array('true', 'on', '+', 'yes', 'y');
-      $falseValues = array('false', 'off', '-', 'no', 'n');
+        $output = array();
+        $len = strlen($sequence);
+        ++$i;
+
+        // [foo, bar, ...]
+        while ($i < $len) {
+            switch ($sequence[$i]) {
+                case '[':
+                    // nested sequence
+                    $output[] = self::parseSequence($sequence, $i);
+
+                    break;
+
+                case '{':
+                    // nested mapping
+                    $output[] = self::parseMapping($sequence, $i);
+
+                    break;
+
+                case ']':
+                    return $output;
+
+                case ',':
+                case ' ':
+                    break;
+
+                default:
+                    $isQuoted = in_array($sequence[$i], array('"', "'"));
+                    $value = self::parseScalar($sequence, array(',', ']'), array('"', "'"), $i);
+
+                    if (!$isQuoted && false !== strpos((string) $value, ': ')) {
+                        // embedded mapping?
+                        try {
+                            $value = self::parseMapping('{'.$value.'}');
+                        } catch (InvalidArgumentException $e) {
+                            // no, it's not
+                        }
+                    }
+
+                    $output[] = $value;
+
+                    --$i;
+            }
+
+            ++$i;
+        }
+
+        throw new InvalidArgumentException(sprintf('Malformed inline YAML string %s', $sequence));
     }
-    else
+
+    /**
+     * Parses a mapping to a YAML string.
+     *
+     * @param string $mapping
+     * @param int    $i
+     *
+     * @return string A YAML string
+     */
+    protected static function parseMapping($mapping, &$i = 0)
     {
-      $trueValues = array('true');
-      $falseValues = array('false');
+        $output = array();
+        $len = strlen($mapping);
+        ++$i;
+
+        // {foo: bar, bar:foo, ...}
+        while ($i < $len) {
+            switch ($mapping[$i]) {
+                case ' ':
+                case ',':
+                    ++$i;
+
+                    continue 2;
+                case '}':
+                    return $output;
+            }
+
+            // key
+            $key = self::parseScalar($mapping, array(':', ' '), array('"', "'"), $i, false);
+
+            // value
+            $done = false;
+            while ($i < $len) {
+                switch ($mapping[$i]) {
+                    case '[':
+                        // nested sequence
+                        $output[$key] = self::parseSequence($mapping, $i);
+                        $done = true;
+
+                        break;
+
+                    case '{':
+                        // nested mapping
+                        $output[$key] = self::parseMapping($mapping, $i);
+                        $done = true;
+
+                        break;
+
+                    case ':':
+                    case ' ':
+                        break;
+
+                    default:
+                        $output[$key] = self::parseScalar($mapping, array(',', '}'), array('"', "'"), $i);
+                        $done = true;
+                        --$i;
+                }
+
+                ++$i;
+
+                if ($done) {
+                    continue 2;
+                }
+            }
+        }
+
+        throw new InvalidArgumentException(sprintf('Malformed inline YAML string %s', $mapping));
     }
 
-    switch (true)
+    /**
+     * Evaluates scalars and replaces magic values.
+     *
+     * @param string $scalar
+     *
+     * @return string A YAML string
+     */
+    protected static function evaluateScalar($scalar)
     {
-      case 'null' == strtolower($scalar):
-      case '' == $scalar:
-      case '~' == $scalar:
-        return null;
-      case 0 === strpos($scalar, '!str'):
-        return (string) substr($scalar, 5);
-      case 0 === strpos($scalar, '! '):
-        return (int) self::parseScalar(substr($scalar, 2));
-      case 0 === strpos($scalar, '!!php/object:'):
-        return unserialize(substr($scalar, 13));
-      case ctype_digit($scalar):
-        $raw = $scalar;
-        $cast = (int) $scalar;
-        return '0' == $scalar[0] ? octdec($scalar) : (((string) $raw == (string) $cast) ? $cast : $raw);
-      case in_array(strtolower($scalar), $trueValues):
-        return true;
-      case in_array(strtolower($scalar), $falseValues):
-        return false;
-      case 0 === strpos($scalar, '0x'):
-        return hexdec($scalar);
-      case is_numeric($scalar):
-        return floatval($scalar);
-      case 0 == strcasecmp($scalar, '.inf'):
-      case 0 == strcasecmp($scalar, '.NaN'):
-        return -log(0);
-      case 0 == strcasecmp($scalar, '-.inf'):
-        return log(0);
-      case preg_match('/^(-|\+)?[0-9,]+(\.\d+)?$/', $scalar):
-        $replaced = str_replace(',', '', $scalar);
-        $replaced = str_replace('+', '', $replaced);
-        $floatval = floatval($replaced);
-        $intval = intval($replaced);
-        return $floatval == $intval ? $intval : $floatval;
-      case preg_match(self::getTimestampRegex(), $scalar):
-        return strtotime($scalar);
-      default:
-        return (string) $scalar;
+        $scalar = trim($scalar);
+
+        if ('1.1' === sfYaml::getSpecVersion()) {
+            $trueValues = array('true', 'on', '+', 'yes', 'y');
+            $falseValues = array('false', 'off', '-', 'no', 'n');
+        } else {
+            $trueValues = array('true');
+            $falseValues = array('false');
+        }
+
+        switch (true) {
+            case 'null' == strtolower($scalar):
+            case '' == $scalar:
+            case '~' == $scalar:
+                return null;
+
+            case 0 === strpos($scalar, '!str'):
+                return (string) substr($scalar, 5);
+
+            case 0 === strpos($scalar, '! '):
+                return (int) self::parseScalar(substr($scalar, 2));
+
+            case 0 === strpos($scalar, '!!php/object:'):
+                return unserialize(substr($scalar, 13));
+
+            case ctype_digit($scalar):
+                $raw = $scalar;
+                $cast = (int) $scalar;
+
+                return '0' == $scalar[0] ? octdec($scalar) : (((string) $raw == (string) $cast) ? $cast : $raw);
+
+            case in_array(strtolower($scalar), $trueValues):
+                return true;
+
+            case in_array(strtolower($scalar), $falseValues):
+                return false;
+
+            case 0 === strpos($scalar, '0x'):
+                return hexdec($scalar);
+
+            case is_numeric($scalar):
+                return floatval($scalar);
+
+            case 0 == strcasecmp($scalar, '.inf'):
+            case 0 == strcasecmp($scalar, '.NaN'):
+                return -log(0);
+
+            case 0 == strcasecmp($scalar, '-.inf'):
+                return log(0);
+
+            case preg_match('/^(-|\+)?[0-9,]+(\.\d+)?$/', $scalar):
+                $replaced = str_replace(',', '', $scalar);
+                $replaced = str_replace('+', '', $replaced);
+                $floatval = floatval($replaced);
+                $intval = intval($replaced);
+
+                return $floatval == $intval ? $intval : $floatval;
+
+            case preg_match(self::getTimestampRegex(), $scalar):
+                return strtotime($scalar);
+
+            default:
+                return (string) $scalar;
+        }
     }
-  }
 
-  static protected function getTimestampRegex()
-  {
-    return <<<EOF
+    protected static function getTimestampRegex()
+    {
+        return <<<EOF
     ~^
     (?P<year>[0-9][0-9][0-9][0-9])
     -(?P<month>[0-9][0-9]?)
@@ -438,10 +443,10 @@ static protected function getTimestampRegex()
     (?P<hour>[0-9][0-9]?)
     :(?P<minute>[0-9][0-9])
     :(?P<second>[0-9][0-9])
-    (?:\.(?P<fraction>[0-9]*))?
+    (?:\\.(?P<fraction>[0-9]*))?
     (?:[ \t]*(?P<tz>Z|(?P<tz_sign>[-+])(?P<tz_hour>[0-9][0-9]?)
     (?::(?P<tz_minute>[0-9][0-9]))?))?)?
     $~x
 EOF;
-  }
+    }
 }
diff --git a/lib/yaml/sfYamlParser.class.php b/lib/yaml/sfYamlParser.class.php
index 3cf5580b1..c472a731f 100644
--- a/lib/yaml/sfYamlParser.class.php
+++ b/lib/yaml/sfYamlParser.class.php
@@ -8,618 +8,538 @@
  * file that was distributed with this source code.
  */
 
-if (!defined('PREG_BAD_UTF8_OFFSET_ERROR'))
-{
-  define('PREG_BAD_UTF8_OFFSET_ERROR', 5);
+if (!defined('PREG_BAD_UTF8_OFFSET_ERROR')) {
+    define('PREG_BAD_UTF8_OFFSET_ERROR', 5);
 }
 
 /**
  * sfYamlParser parses YAML strings to convert them to PHP arrays.
  *
- * @package    symfony
- * @subpackage yaml
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id: sfYamlParser.class.php 10832 2008-08-13 07:46:08Z fabien $
  */
 class sfYamlParser
 {
-  protected
-    $offset        = 0,
-    $lines         = array(),
-    $currentLineNb = -1,
-    $currentLine   = '',
-    $refs          = array();
-
-  /**
-   * Constructor
-   *
-   * @param integer $offset The offset of YAML document (used for line numbers in error messages)
-   */
-  public function __construct($offset = 0)
-  {
-    $this->offset = $offset;
-  }
-
-  /**
-   * Parses a YAML string to a PHP value.
-   *
-   * @param  string $value A YAML string
-   *
-   * @return mixed  A PHP value
-   *
-   * @throws InvalidArgumentException If the YAML is not valid
-   */
-  public function parse($value)
-  {
-    $this->currentLineNb = -1;
-    $this->currentLine = '';
-    $this->lines = explode("\n", $this->cleanup($value));
-
-    if (function_exists('mb_detect_encoding') && false === mb_detect_encoding($value, 'UTF-8', true))
+    protected $offset = 0;
+    protected $lines = array();
+    protected $currentLineNb = -1;
+    protected $currentLine = '';
+    protected $refs = array();
+
+    /**
+     * Constructor.
+     *
+     * @param int $offset The offset of YAML document (used for line numbers in error messages)
+     */
+    public function __construct($offset = 0)
     {
-      throw new InvalidArgumentException('The YAML value does not appear to be valid UTF-8.');
+        $this->offset = $offset;
     }
 
-    if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2)
+    /**
+     * Parses a YAML string to a PHP value.
+     *
+     * @param string $value A YAML string
+     *
+     * @return mixed A PHP value
+     *
+     * @throws InvalidArgumentException If the YAML is not valid
+     */
+    public function parse($value)
     {
-      $mbEncoding = mb_internal_encoding();
-      mb_internal_encoding('UTF-8');
-    }
+        $this->currentLineNb = -1;
+        $this->currentLine = '';
+        $this->lines = explode("\n", $this->cleanup($value));
 
-    $data = array();
-    while ($this->moveToNextLine())
-    {
-      if ($this->isCurrentLineEmpty())
-      {
-        continue;
-      }
-
-      // 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));
-      }
-
-      $isRef = $isInPlace = $isProcessed = false;
-      if (preg_match('#^\-((?P<leadspaces>\s+)(?P<value>.+?))?\s*$#u', $this->currentLine, $values))
-      {
-        if (isset($values['value']) && preg_match('#^&(?P<ref>[^ ]+) *(?P<value>.*)#u', $values['value'], $matches))
-        {
-          $isRef = $matches['ref'];
-          $values['value'] = $matches['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.');
         }
 
-        // array
-        if (!isset($values['value']) || '' == trim($values['value'], ' ') || 0 === strpos(ltrim($values['value'], ' '), '#'))
-        {
-          $c = $this->getRealCurrentLineNb() + 1;
-          $parser = new sfYamlParser($c);
-          $parser->refs =& $this->refs;
-          $data[] = $parser->parse($this->getNextEmbedBlock());
+        if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2) {
+            $mbEncoding = mb_internal_encoding();
+            mb_internal_encoding('UTF-8');
         }
-        else
-        {
-          if (isset($values['leadspaces'])
-            && ' ' == $values['leadspaces']
-            && 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->refs =& $this->refs;
-
-            $block = $values['value'];
-            if (!$this->isNextLineIndented())
-            {
-              $block .= "\n".$this->getNextEmbedBlock($this->getCurrentLineIndentation() + 2);
-            }
 
-            $data[] = $parser->parse($block);
-          }
-          else
-          {
-            $data[] = $this->parseValue($values['value']);
-          }
-        }
-      }
-      else if (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));
-            }
-          }
-          else
-          {
-            if (isset($values['value']) && $values['value'] !== '')
-            {
-              $value = $values['value'];
+        $data = array();
+        while ($this->moveToNextLine()) {
+            if ($this->isCurrentLineEmpty()) {
+                continue;
             }
-            else
-            {
-              $value = $this->getNextEmbedBlock();
-            }
-            $c = $this->getRealCurrentLineNb() + 1;
-            $parser = new sfYamlParser($c);
-            $parser->refs =& $this->refs;
-            $parsed = $parser->parse($value);
-
-            $merged = array();
-            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));
+
+            // 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));
             }
-            else 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));
+
+            $isRef = $isInPlace = $isProcessed = false;
+            if (preg_match('#^\-((?P<leadspaces>\s+)(?P<value>.+?))?\s*$#u', $this->currentLine, $values)) {
+                if (isset($values['value']) && preg_match('#^&(?P<ref>[^ ]+) *(?P<value>.*)#u', $values['value'], $matches)) {
+                    $isRef = $matches['ref'];
+                    $values['value'] = $matches['value'];
                 }
-                $merged = array_merge($parsedItem, $merged);
-              }
-            }
-            else
-            {
-              // Associative array, merge
-              $merged = array_merge($merged, $parsed);
-            }
 
-            $isProcessed = $merged;
-          }
-        }
-        else if (isset($values['value']) && preg_match('#^&(?P<ref>[^ ]+) *(?P<value>.*)#u', $values['value'], $matches))
-        {
-          $isRef = $matches['ref'];
-          $values['value'] = $matches['value'];
-        }
+                // array
+                if (!isset($values['value']) || '' == trim($values['value'], ' ') || 0 === strpos(ltrim($values['value'], ' '), '#')) {
+                    $c = $this->getRealCurrentLineNb() + 1;
+                    $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)) {
+                        // this is a compact notation element, add to next block and parse
+                        $c = $this->getRealCurrentLineNb();
+                        $parser = new sfYamlParser($c);
+                        $parser->refs = &$this->refs;
+
+                        $block = $values['value'];
+                        if (!$this->isNextLineIndented()) {
+                            $block .= "\n".$this->getNextEmbedBlock($this->getCurrentLineIndentation() + 2);
+                        }
+
+                        $data[] = $parser->parse($block);
+                    } else {
+                        $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']);
+
+                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));
+                        }
+                    } else {
+                        if (isset($values['value']) && '' !== $values['value']) {
+                            $value = $values['value'];
+                        } else {
+                            $value = $this->getNextEmbedBlock();
+                        }
+                        $c = $this->getRealCurrentLineNb() + 1;
+                        $parser = new sfYamlParser($c);
+                        $parser->refs = &$this->refs;
+                        $parsed = $parser->parse($value);
+
+                        $merged = array();
+                        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));
+                        }
+                        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));
+                                }
+                                $merged = array_merge($parsedItem, $merged);
+                            }
+                        } else {
+                            // Associative array, merge
+                            $merged = array_merge($merged, $parsed);
+                        }
+
+                        $isProcessed = $merged;
+                    }
+                } elseif (isset($values['value']) && preg_match('#^&(?P<ref>[^ ]+) *(?P<value>.*)#u', $values['value'], $matches)) {
+                    $isRef = $matches['ref'];
+                    $values['value'] = $matches['value'];
+                }
 
-        if ($isProcessed)
-        {
-          // Merge keys
-          $data = $isProcessed;
-        }
-        // hash
-        else if (!isset($values['value']) || '' == trim($values['value'], ' ') || 0 === strpos(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->refs =& $this->refs;
-            $data[$key] = $parser->parse($this->getNextEmbedBlock());
-          }
-        }
-        else
-        {
-          if ($isInPlace)
-          {
-            $data = $this->refs[$isInPlace];
-          }
-          else
-          {
-            $data[$key] = $this->parseValue($values['value']);
-          }
-        }
-      }
-      else
-      {
-        // 1-liner followed by newline
-        if (2 == count($this->lines) && empty($this->lines[1]))
-        {
-          $value = sfYamlInline::load($this->lines[0]);
-          if (is_array($value))
-          {
-            $first = reset($value);
-            if ('*' === substr($first, 0, 1))
-            {
-              $data = array();
-              foreach ($value as $alias)
-              {
-                $data[] = $this->refs[substr($alias, 1)];
-              }
-              $value = $data;
-            }
-          }
+                if ($isProcessed) {
+                    // Merge keys
+                    $data = $isProcessed;
+                }
+                // hash
+                elseif (!isset($values['value']) || '' == trim($values['value'], ' ') || 0 === strpos(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->refs = &$this->refs;
+                        $data[$key] = $parser->parse($this->getNextEmbedBlock());
+                    }
+                } else {
+                    if ($isInPlace) {
+                        $data = $this->refs[$isInPlace];
+                    } else {
+                        $data[$key] = $this->parseValue($values['value']);
+                    }
+                }
+            } else {
+                // 1-liner followed by newline
+                if (2 == count($this->lines) && empty($this->lines[1])) {
+                    $value = sfYamlInline::load($this->lines[0]);
+                    if (is_array($value)) {
+                        $first = reset($value);
+                        if ('*' === substr($first, 0, 1)) {
+                            $data = array();
+                            foreach ($value as $alias) {
+                                $data[] = $this->refs[substr($alias, 1)];
+                            }
+                            $value = $data;
+                        }
+                    }
+
+                    if (isset($mbEncoding)) {
+                        mb_internal_encoding($mbEncoding);
+                    }
+
+                    return $value;
+                }
 
-          if (isset($mbEncoding))
-          {
-            mb_internal_encoding($mbEncoding);
-          }
+                switch (preg_last_error()) {
+                    case PREG_INTERNAL_ERROR:
+                        $error = 'Internal PCRE error on line';
 
-          return $value;
-        }
+                        break;
+
+                    case PREG_BACKTRACK_LIMIT_ERROR:
+                        $error = 'pcre.backtrack_limit reached on line';
+
+                        break;
+
+                    case PREG_RECURSION_LIMIT_ERROR:
+                        $error = 'pcre.recursion_limit reached on line';
 
-        switch (preg_last_error())
-        {
-          case PREG_INTERNAL_ERROR:
-            $error = 'Internal PCRE error on line';
-            break;
-          case PREG_BACKTRACK_LIMIT_ERROR:
-            $error = 'pcre.backtrack_limit reached on line';
-            break;
-          case PREG_RECURSION_LIMIT_ERROR:
-            $error = 'pcre.recursion_limit reached on line';
-            break;
-          case PREG_BAD_UTF8_ERROR:
-            $error = 'Malformed UTF-8 data on line';
-            break;
-          case PREG_BAD_UTF8_OFFSET_ERROR:
-            $error = 'Offset doesn\'t correspond to the begin of a valid UTF-8 code point on line';
-            break;
-          default:
-            $error = 'Unable to parse line';
+                        break;
+
+                    case PREG_BAD_UTF8_ERROR:
+                        $error = 'Malformed UTF-8 data on line';
+
+                        break;
+
+                    case PREG_BAD_UTF8_OFFSET_ERROR:
+                        $error = 'Offset doesn\'t correspond to the begin of a valid UTF-8 code point on line';
+
+                        break;
+
+                    default:
+                        $error = 'Unable to parse line';
+                }
+
+                throw new InvalidArgumentException(sprintf('%s %d (%s).', $error, $this->getRealCurrentLineNb() + 1, $this->currentLine));
+            }
+
+            if ($isRef) {
+                $this->refs[$isRef] = end($data);
+            }
         }
 
-        throw new InvalidArgumentException(sprintf('%s %d (%s).', $error, $this->getRealCurrentLineNb() + 1, $this->currentLine));
-      }
+        if (isset($mbEncoding)) {
+            mb_internal_encoding($mbEncoding);
+        }
 
-      if ($isRef)
-      {
-        $this->refs[$isRef] = end($data);
-      }
+        return empty($data) ? null : $data;
     }
 
-    if (isset($mbEncoding))
+    /**
+     * Returns the current line number (takes the offset into account).
+     *
+     * @return int The current line number
+     */
+    protected function getRealCurrentLineNb()
     {
-      mb_internal_encoding($mbEncoding);
+        return $this->currentLineNb + $this->offset;
     }
 
-    return empty($data) ? null : $data;
-  }
-
-  /**
-   * Returns the current line number (takes the offset into account).
-   *
-   * @return integer The current line number
-   */
-  protected function getRealCurrentLineNb()
-  {
-    return $this->currentLineNb + $this->offset;
-  }
-
-  /**
-   * Returns the current line indentation.
-   *
-   * @return integer The current line indentation
-   */
-  protected function getCurrentLineIndentation()
-  {
-    return strlen($this->currentLine) - strlen(ltrim($this->currentLine, ' '));
-  }
-
-  /**
-   * Returns the next embed block of YAML.
-   *
-   * @param integer $indentation The indent level at which the block is to be read, or null for default
-   *
-   * @return string A YAML string
-   */
-  protected function getNextEmbedBlock($indentation = null)
-  {
-    $this->moveToNextLine();
-
-    if (null === $indentation)
+    /**
+     * Returns the current line indentation.
+     *
+     * @return int The current line indentation
+     */
+    protected function getCurrentLineIndentation()
     {
-      $newIndent = $this->getCurrentLineIndentation();
-
-      if (!$this->isCurrentLineEmpty() && 0 == $newIndent)
-      {
-        throw new InvalidArgumentException(sprintf('Indentation problem at line %d (%s)', $this->getRealCurrentLineNb() + 1, $this->currentLine));
-      }
+        return strlen($this->currentLine) - strlen(ltrim($this->currentLine, ' '));
     }
-    else
+
+    /**
+     * Returns the next embed block of YAML.
+     *
+     * @param int $indentation The indent level at which the block is to be read, or null for default
+     *
+     * @return string A YAML string
+     */
+    protected function getNextEmbedBlock($indentation = null)
     {
-      $newIndent = $indentation;
-    }
+        $this->moveToNextLine();
 
-    $data = array(substr($this->currentLine, $newIndent));
+        if (null === $indentation) {
+            $newIndent = $this->getCurrentLineIndentation();
 
-    while ($this->moveToNextLine())
-    {
-      if ($this->isCurrentLineEmpty())
-      {
-        if ($this->isCurrentLineBlank())
-        {
-          $data[] = substr($this->currentLine, $newIndent);
+            if (!$this->isCurrentLineEmpty() && 0 == $newIndent) {
+                throw new InvalidArgumentException(sprintf('Indentation problem at line %d (%s)', $this->getRealCurrentLineNb() + 1, $this->currentLine));
+            }
+        } else {
+            $newIndent = $indentation;
         }
 
-        continue;
-      }
-
-      $indent = $this->getCurrentLineIndentation();
-
-      if (preg_match('#^(?P<text> *)$#', $this->currentLine, $match))
-      {
-        // empty line
-        $data[] = $match['text'];
-      }
-      else if ($indent >= $newIndent)
-      {
-        $data[] = substr($this->currentLine, $newIndent);
-      }
-      else if (0 == $indent)
-      {
-        $this->moveToPreviousLine();
+        $data = array(substr($this->currentLine, $newIndent));
 
-        break;
-      }
-      else
-      {
-        throw new InvalidArgumentException(sprintf('Indentation problem at line %d (%s)', $this->getRealCurrentLineNb() + 1, $this->currentLine));
-      }
-    }
+        while ($this->moveToNextLine()) {
+            if ($this->isCurrentLineEmpty()) {
+                if ($this->isCurrentLineBlank()) {
+                    $data[] = substr($this->currentLine, $newIndent);
+                }
 
-    return implode("\n", $data);
-  }
+                continue;
+            }
 
-  /**
-   * Moves the parser to the next line.
-   */
-  protected function moveToNextLine()
-  {
-    if ($this->currentLineNb >= count($this->lines) - 1)
-    {
-      return false;
-    }
+            $indent = $this->getCurrentLineIndentation();
 
-    $this->currentLine = $this->lines[++$this->currentLineNb];
-
-    return true;
-  }
-
-  /**
-   * Moves the parser to the previous line.
-   */
-  protected function moveToPreviousLine()
-  {
-    $this->currentLine = $this->lines[--$this->currentLineNb];
-  }
-
-  /**
-   * Parses a YAML value.
-   *
-   * @param  string $value A YAML value
-   *
-   * @return mixed  A PHP value
-   */
-  protected function parseValue($value)
-  {
-    if ('*' === substr($value, 0, 1))
-    {
-      if (false !== $pos = strpos($value, '#'))
-      {
-        $value = substr($value, 1, $pos - 2);
-      }
-      else
-      {
-        $value = substr($value, 1);
-      }
-
-      if (!array_key_exists($value, $this->refs))
-      {
-        throw new InvalidArgumentException(sprintf('Reference "%s" does not exist (%s).', $value, $this->currentLine));
-      }
-      return $this->refs[$value];
-    }
+            if (preg_match('#^(?P<text> *)$#', $this->currentLine, $match)) {
+                // empty line
+                $data[] = $match['text'];
+            } elseif ($indent >= $newIndent) {
+                $data[] = substr($this->currentLine, $newIndent);
+            } elseif (0 == $indent) {
+                $this->moveToPreviousLine();
 
-    if (preg_match('/^(?P<separator>\||>)(?P<modifiers>\+|\-|\d+|\+\d+|\-\d+|\d+\+|\d+\-)?(?P<comments> +#.*)?$/', $value, $matches))
-    {
-      $modifiers = isset($matches['modifiers']) ? $matches['modifiers'] : '';
+                break;
+            } else {
+                throw new InvalidArgumentException(sprintf('Indentation problem at line %d (%s)', $this->getRealCurrentLineNb() + 1, $this->currentLine));
+            }
+        }
 
-      return $this->parseFoldedScalar($matches['separator'], preg_replace('#\d+#', '', $modifiers), abs((int) $modifiers));
+        return implode("\n", $data);
     }
-    else
-    {
-      return sfYamlInline::load($value);
-    }
-  }
-
-  /**
-   * Parses a folded scalar.
-   *
-   * @param  string  $separator   The separator that was used to begin this folded scalar (| or >)
-   * @param  string  $indicator   The indicator that was used to begin this folded scalar (+ or -)
-   * @param  integer $indentation The indentation that was used to begin this folded scalar
-   *
-   * @return string  The text value
-   */
-  protected function parseFoldedScalar($separator, $indicator = '', $indentation = 0)
-  {
-    $separator = '|' == $separator ? "\n" : ' ';
-    $text = '';
-
-    $notEOF = $this->moveToNextLine();
-
-    while ($notEOF && $this->isCurrentLineBlank())
+
+    /**
+     * Moves the parser to the next line.
+     */
+    protected function moveToNextLine()
     {
-      $text .= "\n";
+        if ($this->currentLineNb >= count($this->lines) - 1) {
+            return false;
+        }
 
-      $notEOF = $this->moveToNextLine();
+        $this->currentLine = $this->lines[++$this->currentLineNb];
+
+        return true;
     }
 
-    if (!$notEOF)
+    /**
+     * Moves the parser to the previous line.
+     */
+    protected function moveToPreviousLine()
     {
-      return '';
+        $this->currentLine = $this->lines[--$this->currentLineNb];
     }
 
-    if (!preg_match('#^(?P<indent>'.($indentation ? str_repeat(' ', $indentation) : ' +').')(?P<text>.*)$#u', $this->currentLine, $matches))
+    /**
+     * Parses a YAML value.
+     *
+     * @param string $value A YAML value
+     *
+     * @return mixed A PHP value
+     */
+    protected function parseValue($value)
     {
-      $this->moveToPreviousLine();
+        if ('*' === substr($value, 0, 1)) {
+            if (false !== $pos = strpos($value, '#')) {
+                $value = substr($value, 1, $pos - 2);
+            } else {
+                $value = substr($value, 1);
+            }
 
-      return '';
-    }
+            if (!array_key_exists($value, $this->refs)) {
+                throw new InvalidArgumentException(sprintf('Reference "%s" does not exist (%s).', $value, $this->currentLine));
+            }
 
-    $textIndent = $matches['indent'];
-    $previousIndent = 0;
+            return $this->refs[$value];
+        }
 
-    $text .= $matches['text'].$separator;
-    while ($this->currentLineNb + 1 < count($this->lines))
-    {
-      $this->moveToNextLine();
+        if (preg_match('/^(?P<separator>\||>)(?P<modifiers>\+|\-|\d+|\+\d+|\-\d+|\d+\+|\d+\-)?(?P<comments> +#.*)?$/', $value, $matches)) {
+            $modifiers = isset($matches['modifiers']) ? $matches['modifiers'] : '';
 
-      if (preg_match('#^(?P<indent> {'.strlen($textIndent).',})(?P<text>.+)$#u', $this->currentLine, $matches))
-      {
-        if (' ' == $separator && ($previousIndent && $previousIndent != $matches['indent']))
-        {
-          $text = substr($text, 0, -1)."\n";
+            return $this->parseFoldedScalar($matches['separator'], preg_replace('#\d+#', '', $modifiers), abs((int) $modifiers));
         }
-        $previousIndent = $matches['indent'];
-
-        $text .= str_repeat(' ', $diff = strlen($matches['indent']) - strlen($textIndent)).$matches['text'].($diff ? "\n" : $separator);
-      }
-      else if (preg_match('#^(?P<text> *)$#', $this->currentLine, $matches))
-      {
-        $text .= preg_replace('#^ {1,'.strlen($textIndent).'}#', '', $matches['text'])."\n";
-      }
-      else
-      {
-        $this->moveToPreviousLine();
 
-        break;
-      }
+        return sfYamlInline::load($value);
     }
 
-    if (' ' == $separator)
+    /**
+     * Parses a folded scalar.
+     *
+     * @param string $separator   The separator that was used to begin this folded scalar (| or >)
+     * @param string $indicator   The indicator that was used to begin this folded scalar (+ or -)
+     * @param int    $indentation The indentation that was used to begin this folded scalar
+     *
+     * @return string The text value
+     */
+    protected function parseFoldedScalar($separator, $indicator = '', $indentation = 0)
     {
-      // replace last separator by a newline
-      $text = preg_replace('/ (\n*)$/', "\n$1", $text);
-    }
+        $separator = '|' == $separator ? "\n" : ' ';
+        $text = '';
 
-    switch ($indicator)
-    {
-      case '':
-        $text = preg_replace('#\n+$#s', "\n", $text);
-        break;
-      case '+':
-        break;
-      case '-':
-        $text = preg_replace('#\n+$#s', '', $text);
-        break;
-    }
+        $notEOF = $this->moveToNextLine();
 
-    return $text;
-  }
+        while ($notEOF && $this->isCurrentLineBlank()) {
+            $text .= "\n";
 
-  /**
-   * Returns true if the next line is indented.
-   *
-   * @return Boolean Returns true if the next line is indented, false otherwise
-   */
-  protected function isNextLineIndented()
-  {
-    $currentIndentation = $this->getCurrentLineIndentation();
-    $notEOF = $this->moveToNextLine();
+            $notEOF = $this->moveToNextLine();
+        }
 
-    while ($notEOF && $this->isCurrentLineEmpty())
-    {
-      $notEOF = $this->moveToNextLine();
+        if (!$notEOF) {
+            return '';
+        }
+
+        if (!preg_match('#^(?P<indent>'.($indentation ? str_repeat(' ', $indentation) : ' +').')(?P<text>.*)$#u', $this->currentLine, $matches)) {
+            $this->moveToPreviousLine();
+
+            return '';
+        }
+
+        $textIndent = $matches['indent'];
+        $previousIndent = 0;
+
+        $text .= $matches['text'].$separator;
+        while ($this->currentLineNb + 1 < count($this->lines)) {
+            $this->moveToNextLine();
+
+            if (preg_match('#^(?P<indent> {'.strlen($textIndent).',})(?P<text>.+)$#u', $this->currentLine, $matches)) {
+                if (' ' == $separator && ($previousIndent && $previousIndent != $matches['indent'])) {
+                    $text = substr($text, 0, -1)."\n";
+                }
+                $previousIndent = $matches['indent'];
+
+                $text .= str_repeat(' ', $diff = strlen($matches['indent']) - strlen($textIndent)).$matches['text'].($diff ? "\n" : $separator);
+            } elseif (preg_match('#^(?P<text> *)$#', $this->currentLine, $matches)) {
+                $text .= preg_replace('#^ {1,'.strlen($textIndent).'}#', '', $matches['text'])."\n";
+            } else {
+                $this->moveToPreviousLine();
+
+                break;
+            }
+        }
+
+        if (' ' == $separator) {
+            // replace last separator by a newline
+            $text = preg_replace('/ (\n*)$/', "\n$1", $text);
+        }
+
+        switch ($indicator) {
+            case '':
+                $text = preg_replace('#\n+$#s', "\n", $text);
+
+                break;
+
+            case '+':
+                break;
+
+            case '-':
+                $text = preg_replace('#\n+$#s', '', $text);
+
+                break;
+        }
+
+        return $text;
     }
 
-    if (false === $notEOF)
+    /**
+     * Returns true if the next line is indented.
+     *
+     * @return bool Returns true if the next line is indented, false otherwise
+     */
+    protected function isNextLineIndented()
     {
-      return false;
+        $currentIndentation = $this->getCurrentLineIndentation();
+        $notEOF = $this->moveToNextLine();
+
+        while ($notEOF && $this->isCurrentLineEmpty()) {
+            $notEOF = $this->moveToNextLine();
+        }
+
+        if (false === $notEOF) {
+            return false;
+        }
+
+        $ret = false;
+        if ($this->getCurrentLineIndentation() <= $currentIndentation) {
+            $ret = true;
+        }
+
+        $this->moveToPreviousLine();
+
+        return $ret;
     }
 
-    $ret = false;
-    if ($this->getCurrentLineIndentation() <= $currentIndentation)
+    /**
+     * Returns true if the current line is blank or if it is a comment line.
+     *
+     * @return bool Returns true if the current line is empty or if it is a comment line, false otherwise
+     */
+    protected function isCurrentLineEmpty()
     {
-      $ret = true;
+        return $this->isCurrentLineBlank() || $this->isCurrentLineComment();
     }
 
-    $this->moveToPreviousLine();
-
-    return $ret;
-  }
-
-  /**
-   * Returns true if the current line is blank or if it is a comment line.
-   *
-   * @return Boolean Returns true if the current line is empty or if it is a comment line, false otherwise
-   */
-  protected function isCurrentLineEmpty()
-  {
-    return $this->isCurrentLineBlank() || $this->isCurrentLineComment();
-  }
-
-  /**
-   * Returns true if the current line is blank.
-   *
-   * @return Boolean Returns true if the current line is blank, false otherwise
-   */
-  protected function isCurrentLineBlank()
-  {
-    return '' == trim($this->currentLine, ' ');
-  }
-
-  /**
-   * Returns true if the current line is a comment line.
-   *
-   * @return Boolean Returns true if the current line is a comment line, false otherwise
-   */
-  protected function isCurrentLineComment()
-  {
-    //checking explicitly the first char of the trim is faster than loops or strpos
-    $ltrimmedLine = ltrim($this->currentLine, ' ');
-    return $ltrimmedLine[0] === '#';
-  }
-
-  /**
-   * Cleanups a YAML string to be parsed.
-   *
-   * @param  string $value The input YAML string
-   *
-   * @return string A cleaned up YAML string
-   */
-  protected function cleanup($value)
-  {
-    $value = str_replace(array("\r\n", "\r"), "\n", $value);
-
-    if (!preg_match("#\n$#", $value))
+    /**
+     * Returns true if the current line is blank.
+     *
+     * @return bool Returns true if the current line is blank, false otherwise
+     */
+    protected function isCurrentLineBlank()
     {
-      $value .= "\n";
+        return '' == trim($this->currentLine, ' ');
     }
 
-    // strip YAML header
-    $count = 0;
-    $value = preg_replace('#^\%YAML[: ][\d\.]+.*\n#su', '', $value, -1, $count);
-    $this->offset += $count;
-
-    // remove leading comments
-    $trimmedValue = preg_replace('#^(\#.*?\n)+#s', '', $value, -1, $count);
-    if ($count == 1)
+    /**
+     * Returns true if the current line is a comment line.
+     *
+     * @return bool Returns true if the current line is a comment line, false otherwise
+     */
+    protected function isCurrentLineComment()
     {
-      // items have been removed, update the offset
-      $this->offset += substr_count($value, "\n") - substr_count($trimmedValue, "\n");
-      $value = $trimmedValue;
+        // checking explicitly the first char of the trim is faster than loops or strpos
+        $ltrimmedLine = ltrim($this->currentLine, ' ');
+
+        return '#' === $ltrimmedLine[0];
     }
 
-    // remove start of the document marker (---)
-    $trimmedValue = preg_replace('#^\-\-\-.*?\n#s', '', $value, -1, $count);
-    if ($count == 1)
+    /**
+     * Cleanups a YAML string to be parsed.
+     *
+     * @param string $value The input YAML string
+     *
+     * @return string A cleaned up YAML string
+     */
+    protected function cleanup($value)
     {
-      // items have been removed, update the offset
-      $this->offset += substr_count($value, "\n") - substr_count($trimmedValue, "\n");
-      $value = $trimmedValue;
+        $value = str_replace(array("\r\n", "\r"), "\n", $value);
 
-      // remove end of the document marker (...)
-      $value = preg_replace('#\.\.\.\s*$#s', '', $value);
-    }
+        if (!preg_match("#\n$#", $value)) {
+            $value .= "\n";
+        }
+
+        // strip YAML header
+        $count = 0;
+        $value = preg_replace('#^\%YAML[: ][\d\.]+.*\n#su', '', $value, -1, $count);
+        $this->offset += $count;
+
+        // remove leading comments
+        $trimmedValue = preg_replace('#^(\#.*?\n)+#s', '', $value, -1, $count);
+        if (1 == $count) {
+            // items have been removed, update the offset
+            $this->offset += substr_count($value, "\n") - substr_count($trimmedValue, "\n");
+            $value = $trimmedValue;
+        }
+
+        // remove start of the document marker (---)
+        $trimmedValue = preg_replace('#^\-\-\-.*?\n#s', '', $value, -1, $count);
+        if (1 == $count) {
+            // items have been removed, update the offset
+            $this->offset += substr_count($value, "\n") - substr_count($trimmedValue, "\n");
+            $value = $trimmedValue;
 
-    return $value;
-  }
+            // remove end of the document marker (...)
+            $value = preg_replace('#\.\.\.\s*$#s', '', $value);
+        }
+
+        return $value;
+    }
 }
diff --git a/test/bin/coverage.php b/test/bin/coverage.php
index e4f7cc40b..409634821 100644
--- a/test/bin/coverage.php
+++ b/test/bin/coverage.php
@@ -11,14 +11,14 @@
 $name = '*';
 $verbose = false;
 
-if (isset($argv[1]))
-{
-  $name = $argv[1];
-  $verbose = true;
+if (isset($argv[1])) {
+    $name = $argv[1];
+    $verbose = true;
 }
 
-require_once(__DIR__.'/../../lib/vendor/lime/lime.php');
-require_once(__DIR__.'/../../lib/util/sfFinder.class.php');
+require_once __DIR__.'/../../lib/vendor/lime/lime.php';
+
+require_once __DIR__.'/../../lib/util/sfFinder.class.php';
 
 $h = new lime_harness();
 $h->base_dir = realpath(__DIR__.'/..');
diff --git a/test/bin/loc.php b/test/bin/loc.php
index a5462174f..a140870d5 100755
--- a/test/bin/loc.php
+++ b/test/bin/loc.php
@@ -1,10 +1,12 @@
 <?php
 
 $root_dir = realpath(__DIR__.'/../..');
-require_once($root_dir.'/lib/vendor/lime/lime.php');
-require_once($root_dir.'/lib/util/sfFinder.class.php');
 
-require_once($root_dir.'/lib/autoload/sfCoreAutoload.class.php');
+require_once $root_dir.'/lib/vendor/lime/lime.php';
+
+require_once $root_dir.'/lib/util/sfFinder.class.php';
+
+require_once $root_dir.'/lib/autoload/sfCoreAutoload.class.php';
 $version = SYMFONY_VERSION;
 
 printf("symfony LOC (%s)\n", $version);
@@ -13,28 +15,25 @@
 // symfony core LOC
 $total_loc = 0;
 $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));
+foreach ($files as $file) {
+    $total_loc += count(lime_coverage::get_php_lines($file));
 }
 $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));
+foreach ($files as $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(
-  $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',
+    $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));
+foreach ($files as $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 875adbeb8..fd1f3a96a 100644
--- a/test/bootstrap/functional.php
+++ b/test/bootstrap/functional.php
@@ -14,9 +14,8 @@
 ini_set('arg_separator.output', '&amp;');
 ini_set('allow_url_fopen', 'on');
 
-if (!isset($root_dir))
-{
-  $root_dir = realpath(__DIR__.sprintf('/../%s/fixtures', isset($type) ? $type : 'functional'));
+if (!isset($root_dir)) {
+    $root_dir = realpath(__DIR__.sprintf('/../%s/fixtures', isset($type) ? $type : 'functional'));
 }
 
 require_once $root_dir.'/config/ProjectConfiguration.class.php';
@@ -30,44 +29,36 @@
 
 function sf_functional_test_shutdown_cleanup()
 {
-  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);
-    @rmdir($sf_root_dir);
-  }
+    sfToolkit::clearDirectory(sfConfig::get('sf_cache_dir'));
+    sfToolkit::clearDirectory(sfConfig::get('sf_log_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);
-  foreach ($files as $file)
-  {
-    if (is_dir($file))
-    {
-      sfToolkit::clearDirectory($file);
-      @rmdir($file);
+    $sf_root_dir = sys_get_temp_dir().'/sf_test_project';
+    if (is_dir($sf_root_dir)) {
+        sfToolkit::clearDirectory($sf_root_dir);
+        @rmdir($sf_root_dir);
     }
-    else
-    {
-      @unlink($file);
+
+    $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);
+    foreach ($files as $file) {
+        if (is_dir($file)) {
+            sfToolkit::clearDirectory($file);
+            @rmdir($file);
+        } else {
+            @unlink($file);
+        }
     }
-  }
 }
 
 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)
-  {
-    echo $e.PHP_EOL;
-  }
+    // try/catch needed due to http://bugs.php.net/bug.php?id=33598
+    try {
+        sf_functional_test_shutdown_cleanup();
+    } catch (Exception $e) {
+        echo $e.PHP_EOL;
+    }
 }
 
 return true;
diff --git a/test/bootstrap/task.php b/test/bootstrap/task.php
index a2cd12931..5518afada 100644
--- a/test/bootstrap/task.php
+++ b/test/bootstrap/task.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/unit.php');
+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/sfSymfonyCommandApplication.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';
 
 $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'),
+    'symfony_lib_dir' => sfConfig::get('sf_symfony_lib_dir'),
 ));
diff --git a/test/bootstrap/unit.php b/test/bootstrap/unit.php
index b46c8f5e4..616ca94eb 100644
--- a/test/bootstrap/unit.php
+++ b/test/bootstrap/unit.php
@@ -15,14 +15,16 @@
 ini_set('allow_url_fopen', 'on');
 
 $_test_dir = realpath(__DIR__.'/..');
-require_once($_test_dir.'/../lib/vendor/lime/lime.php');
-require_once($_test_dir.'/../lib/config/sfConfig.class.php');
+
+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'));
 
-require_once(__DIR__.'/../../lib/autoload/sfCoreAutoload.class.php');
+require_once __DIR__.'/../../lib/autoload/sfCoreAutoload.class.php';
 sfCoreAutoload::register();
 
-require_once(__DIR__.'/../../lib/util/sfToolkit.class.php');
+require_once __DIR__.'/../../lib/util/sfToolkit.class.php';
 sfConfig::set('sf_test_cache_dir', sys_get_temp_dir().'/sf_test_project');
 
 // remove all test cache
@@ -36,33 +38,28 @@
 
 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);
-    @rmdir($sf_root_dir);
-  }
+    $sf_root_dir = sys_get_temp_dir().'/sf_test_project';
+    if (is_dir($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*');
+    $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));
-  foreach ($files as $file)
-  {
-    if(is_dir($file))
-    {
-      sfToolkit::clearDirectory($file);
-      @rmdir($file);
-    }
-    else
-    {
-      @unlink($file);
+    $files = array_merge(empty($sessions) ? array() : $sessions, empty($tmp_files) ? array() : $tmp_files);
+    foreach ($files as $file) {
+        if (is_dir($file)) {
+            sfToolkit::clearDirectory($file);
+            @rmdir($file);
+        } else {
+            @unlink($file);
+        }
     }
-  }
 }
 
 // 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(array("\r\n", "\n", "\r"), "\n", $content);
 }
diff --git a/test/functional/authTest.php b/test/functional/authTest.php
index 022208060..44d142ffe 100644
--- a/test/functional/authTest.php
+++ b/test/functional/authTest.php
@@ -3,52 +3,51 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 $app = 'frontend';
-if (!include(__DIR__.'/../bootstrap/functional.php'))
-{
-  return;
+if (!include(__DIR__.'/../bootstrap/functional.php')) {
+    return;
 }
 
 class sfAuthTestBrowser extends sfTestBrowser
 {
-  public function checkNonAuth()
-  {
-    return $this->
-      get('/auth/basic')->
-      with('request')->begin()->
-        isParameter('module', 'auth')->
-        isParameter('action', 'basic')->
-      end()->
-      with('response')->begin()->
-        isStatusCode(401)->
-        checkElement('#user', '')->
-        checkElement('#password', '')->
-        checkElement('#msg', 'KO')->
-      end()
-    ;
-  }
+    public function checkNonAuth()
+    {
+        return $this->
+          get('/auth/basic')->
+          with('request')->begin()->
+            isParameter('module', 'auth')->
+            isParameter('action', 'basic')->
+          end()->
+          with('response')->begin()->
+            isStatusCode(401)->
+            checkElement('#user', '')->
+            checkElement('#password', '')->
+            checkElement('#msg', 'KO')->
+          end()
+        ;
+    }
 
-  public function checkAuth()
-  {
-    return $this->
-      get('/auth/basic')->
-      with('request')->begin()->
-        isParameter('module', 'auth')->
-        isParameter('action', 'basic')->
-      end()->
-      with('response')->begin()->
-        isStatusCode(200)->
-        checkElement('#user', 'foo')->
-        checkElement('#password', 'bar')->
-        checkElement('#msg', 'OK')->
-      end()
-    ;
-  }
+    public function checkAuth()
+    {
+        return $this->
+          get('/auth/basic')->
+          with('request')->begin()->
+            isParameter('module', 'auth')->
+            isParameter('action', 'basic')->
+          end()->
+          with('response')->begin()->
+            isStatusCode(200)->
+            checkElement('#user', 'foo')->
+            checkElement('#password', 'bar')->
+            checkElement('#msg', 'OK')->
+          end()
+        ;
+    }
 }
 
 $b = new sfAuthTestBrowser();
diff --git a/test/functional/autoloadTest.php b/test/functional/autoloadTest.php
index 0888a30b0..0c226b67d 100755
--- a/test/functional/autoloadTest.php
+++ b/test/functional/autoloadTest.php
@@ -9,9 +9,8 @@
  */
 
 $app = 'frontend';
-if (!include(__DIR__.'/../bootstrap/functional.php'))
-{
-  return;
+if (!include(__DIR__.'/../bootstrap/functional.php')) {
+    return;
 }
 
 $b = new sfTestBrowser();
diff --git a/test/functional/cacheTest.php b/test/functional/cacheTest.php
index 83ca3b91b..09ba506d6 100644
--- a/test/functional/cacheTest.php
+++ b/test/functional/cacheTest.php
@@ -3,320 +3,319 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 $app = 'cache';
-if (!include(__DIR__.'/../bootstrap/functional.php'))
-{
-  return;
+if (!include(__DIR__.'/../bootstrap/functional.php')) {
+    return;
 }
 
 class myTestBrowser extends sfTestBrowser
 {
-  function checkResponseContent($content, $message)
-  {
-    $this->test()->ok($this->getResponse()->getContent() == $content, $message);
-
-    return $this;
-  }
-
-  function getMultiAction($parameter = null)
-  {
-    return $this->
-      get('/cache/multi'.(null !== $parameter ? '/param/'.$parameter : ''))->
-      with('request')->begin()->
-        isParameter('module', 'cache')->
-        isParameter('action', 'multi')->
-      end()->
-
-      with('response')->begin()->
-        isStatusCode(200)->
-
-        // partials
-        checkElement('#partial .partial')->
-
-        // contextual partials
-        checkElement('#contextualPartial .contextualPartial')->
-        checkElement('#contextualCacheablePartial .contextualCacheablePartial__'.$parameter, 'Param: '.$parameter)->
-        checkElement('#contextualCacheablePartialVarParam .contextualCacheablePartial_varParam_'.$parameter, 'Param: '.$parameter)->
-
-        // components
-        checkElement('#component .component__componentParam_'.$parameter)->
-        checkElement('#componentVarParam .component_varParam_componentParam_'.$parameter)->
-
-        // contextual components
-        checkElement('#contextualComponent .contextualComponent__componentParam_'.$parameter)->
-        checkElement('#contextualComponentVarParam .contextualComponent_varParam_componentParam_'.$parameter)->
-        checkElement('#contextualCacheableComponent .contextualCacheableComponent__componentParam_'.$parameter, 'Param: '.$parameter)->
-        checkElement('#contextualCacheableComponentVarParam .contextualCacheableComponent_varParam_componentParam_'.$parameter, 'Param: '.$parameter)->
-      end()->
-
-      with('view_cache')->begin()->
-        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=_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(array('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=_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(array('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=_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(array('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=_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(array('varParam' => 'another'))), false)->
-      end()
-    ;
-  }
-
-  public function launch()
-  {
-    $b = $this;
-
-    // default page is in cache (without layout)
-    $b->
-      get('/')->
-      with('request')->begin()->
-        isParameter('module', 'default')->
-        isParameter('action', 'index')->
-      end()->
-
-      with('response')->begin()->
-        isStatusCode(200)->
-        checkElement('body', '/congratulations/i')->
-      end()->
-
-      with('view_cache')->isCached(true)
-    ;
-
-    $b->
-      get('/nocache')->
-      with('request')->begin()->
-        isParameter('module', 'nocache')->
-        isParameter('action', 'index')->
-      end()->
-      with('response')->begin()->
-        isStatusCode(200)->
-        checkElement('body', '/nocache/i')->
-      end()->
-      with('view_cache')->isCached(false)
-    ;
-
-    $b->
-      get('/cache/page')->
-      with('request')->begin()->
-        isParameter('module', 'cache')->
-        isParameter('action', 'page')->
-      end()->
-      with('response')->begin()->
-        isStatusCode(200)->
-        checkElement('body', '/page in cache/')->
-      end()->
-      with('view_cache')->isCached(true, true)
-    ;
-
-    $b->
-      get('/cache/forward')->
-      with('request')->begin()->
-        isParameter('module', 'cache')->
-        isParameter('action', 'forward')->
-      end()->
-      with('response')->begin()->
-        isStatusCode(200)->
-        checkElement('body', '/page in cache/')->
-      end()->
-      with('view_cache')->isCached(true)
-    ;
-
-    // remove all cache
-    sfToolkit::clearDirectory(sfConfig::get('sf_app_cache_dir'));
-
-    $b->
-      getMultiAction()->
-
-      getMultiAction('requestParam')->
-
-      // component already in cache and not contextual, so request parameter is not there
-      with('response')->begin()->
-        checkElement('#cacheableComponent .cacheableComponent__componentParam_')->
-        checkElement('#cacheableComponentVarParam .cacheableComponent_varParam_componentParam_')->
-        checkElement('#cacheablePartial .cacheablePartial__')->
-        checkElement('#cacheablePartialVarParam .cacheablePartial_varParam_')->
-      end()
-    ;
-
-    // remove all cache
-    sfToolkit::clearDirectory(sfConfig::get('sf_app_cache_dir'));
-
-    $b->
-      getMultiAction('requestParam')->
-
-      with('response')->begin()->
-        checkElement('#cacheableComponent .cacheableComponent__componentParam_requestParam')->
-        checkElement('#cacheableComponentVarParam .cacheableComponent_varParam_componentParam_requestParam')->
-        checkElement('#cacheablePartial .cacheablePartial__requestParam')->
-        checkElement('#cacheablePartialVarParam .cacheablePartial_varParam_requestParam')->
-      end()->
-
-      getMultiAction()->
-
-      with('response')->begin()->
-        checkElement('#cacheableComponent .cacheableComponent__componentParam_requestParam')->
-        checkElement('#cacheableComponentVarParam .cacheableComponent_varParam_componentParam_requestParam')->
-        checkElement('#cacheablePartial .cacheablePartial__requestParam')->
-        checkElement('#cacheablePartialVarParam .cacheablePartial_varParam_requestParam')->
-      end()->
-
-      getMultiAction('anotherRequestParam')->
-
-      with('response')->begin()->
-        checkElement('#cacheableComponent .cacheableComponent__componentParam_requestParam')->
-        checkElement('#cacheableComponentVarParam .cacheableComponent_varParam_componentParam_requestParam')->
-        checkElement('#cacheablePartial .cacheablePartial__requestParam')->
-        checkElement('#cacheablePartialVarParam .cacheablePartial_varParam_requestParam')->
-      end()
-    ;
-
-    // check contextual cache with another action
-    $b->
-      get('/cache/multiBis')->
-      with('request')->begin()->
-        isParameter('module', 'cache')->
-        isParameter('action', 'multiBis')->
-      end()->
-
-      with('response')->begin()->
-        isStatusCode(200)->
-
-        // partials
-        checkElement('#cacheablePartial .cacheablePartial__requestParam')->
-
-        // contextual partials
-        checkElement('#contextualCacheablePartial .contextualCacheablePartial__')->
-
-        // components
-        checkElement('#cacheableComponent .cacheableComponent__componentParam_requestParam')->
-
-        // contextual components
-        checkElement('#contextualCacheableComponent .contextualCacheableComponent__componentParam_')->
-      end()->
-
-      with('view_cache')->begin()->
-        isCached(false)->
-        // partial cache
-        isUriCached('@sf_cache_partial?module=cache&action=_cacheablePartial&sf_cache_key='.md5(serialize(array())), true)->
-
-        // contextual partial cache
-        isUriCached('@sf_cache_partial?module=cache&action=_contextualCacheableComponent&sf_cache_key='.md5(serialize(array())), true)->
-
-        // component cache
-        isUriCached('@sf_cache_partial?module=cache&action=_cacheableComponent&sf_cache_key='.md5(serialize(array())), true)->
-
-        // contextual component cache
-        isUriCached('@sf_cache_partial?module=cache&action=_contextualCacheableComponent&sf_cache_key='.md5(serialize(array())), true)->
-      end()
-    ;
-
-    // remove all cache
-    sfToolkit::clearDirectory(sfConfig::get('sf_app_cache_dir'));
-
-    // check user supplied cache key for partials and components
-    $b->
-      get('/cache/specificCacheKey')->
-      with('request')->begin()->
-        isParameter('module', 'cache')->
-        isParameter('action', 'specificCacheKey')->
-      end()->
-
-      with('response')->isStatusCode(200)->
-      with('view_cache')->begin(200)->
-        isCached(false)->
-
-        // partial cache
-        isUriCached('@sf_cache_partial?module=cache&action=_cacheablePartial&sf_cache_key=cacheablePartial', true)->
-
-        // contextual partial cache
-        isUriCached('@sf_cache_partial?module=cache&action=_contextualCacheableComponent&sf_cache_key=contextualCacheableComponent', true)->
-
-        // component cache
-        isUriCached('@sf_cache_partial?module=cache&action=_cacheableComponent&sf_cache_key=cacheableComponent', true)->
-
-        // contextual component cache
-        isUriCached('@sf_cache_partial?module=cache&action=_contextualCacheableComponent&sf_cache_key=contextualCacheableComponent', true)->
-      end()
-    ;
-
-    // check cache content for actions
-
-    // remove all cache
-    sfToolkit::clearDirectory(sfConfig::get('sf_app_cache_dir'));
-
-    $b->
-      get('/cache/action')->
-      with('request')->begin()->
-        isParameter('module', 'cache')->
-        isParameter('action', 'action')->
-      end()->
-      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);
-
-    $response = $b->getResponse();
-    $content1 = $response->getContent();
-    $contentType1 = $response->getContentType();
-    $headers1 = $response->getHttpHeaders();
-
-    $b->
-      get('/cache/action')->
-      with('request')->begin()->
-        isParameter('module', 'cache')->
-        isParameter('action', 'action')->
-      end()->
-      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');
-
-    $response = $b->getResponse();
-    $content2 = $response->getContent();
-    $contentType2 = $response->getContentType();
-    $headers2 = $response->getHttpHeaders();
-
-    $b->test()->is($content1, $content2, 'response content is the same');
-    $b->test()->is($contentType1, $contentType2, 'response content type is the same');
-    $b->test()->is($headers1, $headers2, 'response http headers are the same');
-  }
+    public function checkResponseContent($content, $message)
+    {
+        $this->test()->ok($this->getResponse()->getContent() == $content, $message);
+
+        return $this;
+    }
+
+    public function getMultiAction($parameter = null)
+    {
+        return $this->
+          get('/cache/multi'.(null !== $parameter ? '/param/'.$parameter : ''))->
+          with('request')->begin()->
+            isParameter('module', 'cache')->
+            isParameter('action', 'multi')->
+          end()->
+
+          with('response')->begin()->
+            isStatusCode(200)->
+
+            // partials
+            checkElement('#partial .partial')->
+
+            // contextual partials
+            checkElement('#contextualPartial .contextualPartial')->
+            checkElement('#contextualCacheablePartial .contextualCacheablePartial__'.$parameter, 'Param: '.$parameter)->
+            checkElement('#contextualCacheablePartialVarParam .contextualCacheablePartial_varParam_'.$parameter, 'Param: '.$parameter)->
+
+            // components
+            checkElement('#component .component__componentParam_'.$parameter)->
+            checkElement('#componentVarParam .component_varParam_componentParam_'.$parameter)->
+
+            // contextual components
+            checkElement('#contextualComponent .contextualComponent__componentParam_'.$parameter)->
+            checkElement('#contextualComponentVarParam .contextualComponent_varParam_componentParam_'.$parameter)->
+            checkElement('#contextualCacheableComponent .contextualCacheableComponent__componentParam_'.$parameter, 'Param: '.$parameter)->
+            checkElement('#contextualCacheableComponentVarParam .contextualCacheableComponent_varParam_componentParam_'.$parameter, 'Param: '.$parameter)->
+          end()->
+
+          with('view_cache')->begin()->
+            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=_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(array('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=_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(array('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=_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(array('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=_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(array('varParam' => 'another'))), false)->
+          end()
+        ;
+    }
+
+    public function launch()
+    {
+        $b = $this;
+
+        // default page is in cache (without layout)
+        $b->
+          get('/')->
+          with('request')->begin()->
+            isParameter('module', 'default')->
+            isParameter('action', 'index')->
+          end()->
+
+          with('response')->begin()->
+            isStatusCode(200)->
+            checkElement('body', '/congratulations/i')->
+          end()->
+
+          with('view_cache')->isCached(true)
+        ;
+
+        $b->
+          get('/nocache')->
+          with('request')->begin()->
+            isParameter('module', 'nocache')->
+            isParameter('action', 'index')->
+          end()->
+          with('response')->begin()->
+            isStatusCode(200)->
+            checkElement('body', '/nocache/i')->
+          end()->
+          with('view_cache')->isCached(false)
+        ;
+
+        $b->
+          get('/cache/page')->
+          with('request')->begin()->
+            isParameter('module', 'cache')->
+            isParameter('action', 'page')->
+          end()->
+          with('response')->begin()->
+            isStatusCode(200)->
+            checkElement('body', '/page in cache/')->
+          end()->
+          with('view_cache')->isCached(true, true)
+        ;
+
+        $b->
+          get('/cache/forward')->
+          with('request')->begin()->
+            isParameter('module', 'cache')->
+            isParameter('action', 'forward')->
+          end()->
+          with('response')->begin()->
+            isStatusCode(200)->
+            checkElement('body', '/page in cache/')->
+          end()->
+          with('view_cache')->isCached(true)
+        ;
+
+        // remove all cache
+        sfToolkit::clearDirectory(sfConfig::get('sf_app_cache_dir'));
+
+        $b->
+          getMultiAction()->
+
+          getMultiAction('requestParam')->
+
+          // component already in cache and not contextual, so request parameter is not there
+          with('response')->begin()->
+            checkElement('#cacheableComponent .cacheableComponent__componentParam_')->
+            checkElement('#cacheableComponentVarParam .cacheableComponent_varParam_componentParam_')->
+            checkElement('#cacheablePartial .cacheablePartial__')->
+            checkElement('#cacheablePartialVarParam .cacheablePartial_varParam_')->
+          end()
+        ;
+
+        // remove all cache
+        sfToolkit::clearDirectory(sfConfig::get('sf_app_cache_dir'));
+
+        $b->
+          getMultiAction('requestParam')->
+
+          with('response')->begin()->
+            checkElement('#cacheableComponent .cacheableComponent__componentParam_requestParam')->
+            checkElement('#cacheableComponentVarParam .cacheableComponent_varParam_componentParam_requestParam')->
+            checkElement('#cacheablePartial .cacheablePartial__requestParam')->
+            checkElement('#cacheablePartialVarParam .cacheablePartial_varParam_requestParam')->
+          end()->
+
+          getMultiAction()->
+
+          with('response')->begin()->
+            checkElement('#cacheableComponent .cacheableComponent__componentParam_requestParam')->
+            checkElement('#cacheableComponentVarParam .cacheableComponent_varParam_componentParam_requestParam')->
+            checkElement('#cacheablePartial .cacheablePartial__requestParam')->
+            checkElement('#cacheablePartialVarParam .cacheablePartial_varParam_requestParam')->
+          end()->
+
+          getMultiAction('anotherRequestParam')->
+
+          with('response')->begin()->
+            checkElement('#cacheableComponent .cacheableComponent__componentParam_requestParam')->
+            checkElement('#cacheableComponentVarParam .cacheableComponent_varParam_componentParam_requestParam')->
+            checkElement('#cacheablePartial .cacheablePartial__requestParam')->
+            checkElement('#cacheablePartialVarParam .cacheablePartial_varParam_requestParam')->
+          end()
+        ;
+
+        // check contextual cache with another action
+        $b->
+          get('/cache/multiBis')->
+          with('request')->begin()->
+            isParameter('module', 'cache')->
+            isParameter('action', 'multiBis')->
+          end()->
+
+          with('response')->begin()->
+            isStatusCode(200)->
+
+            // partials
+            checkElement('#cacheablePartial .cacheablePartial__requestParam')->
+
+            // contextual partials
+            checkElement('#contextualCacheablePartial .contextualCacheablePartial__')->
+
+            // components
+            checkElement('#cacheableComponent .cacheableComponent__componentParam_requestParam')->
+
+            // contextual components
+            checkElement('#contextualCacheableComponent .contextualCacheableComponent__componentParam_')->
+          end()->
+
+          with('view_cache')->begin()->
+            isCached(false)->
+            // partial cache
+            isUriCached('@sf_cache_partial?module=cache&action=_cacheablePartial&sf_cache_key='.md5(serialize(array())), true)->
+
+            // contextual partial cache
+            isUriCached('@sf_cache_partial?module=cache&action=_contextualCacheableComponent&sf_cache_key='.md5(serialize(array())), true)->
+
+            // component cache
+            isUriCached('@sf_cache_partial?module=cache&action=_cacheableComponent&sf_cache_key='.md5(serialize(array())), true)->
+
+            // contextual component cache
+            isUriCached('@sf_cache_partial?module=cache&action=_contextualCacheableComponent&sf_cache_key='.md5(serialize(array())), true)->
+          end()
+        ;
+
+        // remove all cache
+        sfToolkit::clearDirectory(sfConfig::get('sf_app_cache_dir'));
+
+        // check user supplied cache key for partials and components
+        $b->
+          get('/cache/specificCacheKey')->
+          with('request')->begin()->
+            isParameter('module', 'cache')->
+            isParameter('action', 'specificCacheKey')->
+          end()->
+
+          with('response')->isStatusCode(200)->
+          with('view_cache')->begin(200)->
+            isCached(false)->
+
+            // partial cache
+            isUriCached('@sf_cache_partial?module=cache&action=_cacheablePartial&sf_cache_key=cacheablePartial', true)->
+
+            // contextual partial cache
+            isUriCached('@sf_cache_partial?module=cache&action=_contextualCacheableComponent&sf_cache_key=contextualCacheableComponent', true)->
+
+            // component cache
+            isUriCached('@sf_cache_partial?module=cache&action=_cacheableComponent&sf_cache_key=cacheableComponent', true)->
+
+            // contextual component cache
+            isUriCached('@sf_cache_partial?module=cache&action=_contextualCacheableComponent&sf_cache_key=contextualCacheableComponent', true)->
+          end()
+        ;
+
+        // check cache content for actions
+
+        // remove all cache
+        sfToolkit::clearDirectory(sfConfig::get('sf_app_cache_dir'));
+
+        $b->
+          get('/cache/action')->
+          with('request')->begin()->
+            isParameter('module', 'cache')->
+            isParameter('action', 'action')->
+          end()->
+          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);
+
+        $response = $b->getResponse();
+        $content1 = $response->getContent();
+        $contentType1 = $response->getContentType();
+        $headers1 = $response->getHttpHeaders();
+
+        $b->
+          get('/cache/action')->
+          with('request')->begin()->
+            isParameter('module', 'cache')->
+            isParameter('action', 'action')->
+          end()->
+          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');
+
+        $response = $b->getResponse();
+        $content2 = $response->getContent();
+        $contentType2 = $response->getContentType();
+        $headers2 = $response->getHttpHeaders();
+
+        $b->test()->is($content1, $content2, 'response content is the same');
+        $b->test()->is($contentType1, $contentType2, 'response content type is the same');
+        $b->test()->is($headers1, $headers2, 'response http headers are the same');
+    }
 }
 
 $b = new myTestBrowser();
@@ -473,41 +472,40 @@ public function launch()
 ;
 
 $b->get('/')
-  ->with('view_cache')->isUriCached('cache/list', false)
-  ->get('/cache/list')
-  ->with('view_cache')->isUriCached('cache/list', true)
+    ->with('view_cache')->isUriCached('cache/list', false)
+    ->get('/cache/list')
+    ->with('view_cache')->isUriCached('cache/list', true)
 
   // include GET parameters
-  ->with('view_cache')->isUriCached('cache/list?page=10', false)
-  ->get('/cache/list?page=10')
-  ->with('response')->checkElement('#page', '10')
-  ->with('view_cache')->isUriCached('cache/list?page=10', true)
+    ->with('view_cache')->isUriCached('cache/list?page=10', false)
+    ->get('/cache/list?page=10')
+    ->with('response')->checkElement('#page', '10')
+    ->with('view_cache')->isUriCached('cache/list?page=10', true)
 
   // include different GET parameters
-  ->with('view_cache')->isUriCached('cache/list?page=20', false)
-  ->get('/cache/list?page=20')
-  ->with('response')->checkElement('#page', '20')
-  ->with('view_cache')->isUriCached('cache/list?page=20', true)
+    ->with('view_cache')->isUriCached('cache/list?page=20', false)
+    ->get('/cache/list?page=20')
+    ->with('response')->checkElement('#page', '20')
+    ->with('view_cache')->isUriCached('cache/list?page=20', true)
 ;
 
 // check for 304 response
 sfConfig::set('LAST_MODIFIED', strtotime('2010-01-01'));
 $b->get('/cache/lastModifiedResponse')
-  ->with('response')->isStatusCode(200)
+    ->with('response')->isStatusCode(200)
 ;
 
 $b->setHttpHeader('If-Modified-Since', sfWebResponse::getDate(sfConfig::get('LAST_MODIFIED')))
-  ->get('/cache/lastModifiedResponse')
-  ->with('response')->isStatusCode(304)
+    ->get('/cache/lastModifiedResponse')
+    ->with('response')->isStatusCode(304)
 ;
 
 // test with sfFileCache class (default)
 $b->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'));
-  $b->launch();
+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'));
+    $b->launch();
 }
diff --git a/test/functional/escapingTest.php b/test/functional/escapingTest.php
index 4803f137c..f8c3ca28f 100644
--- a/test/functional/escapingTest.php
+++ b/test/functional/escapingTest.php
@@ -3,27 +3,24 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 $app = 'frontend';
-if (!include(__DIR__.'/../bootstrap/functional.php'))
-{
-  return;
+if (!include(__DIR__.'/../bootstrap/functional.php')) {
+    return;
 }
 
 $b = new sfTestBrowser();
 
 $b->get('/escaping/on')
-
-  ->with('request')->begin()
+    ->with('request')->begin()
     ->isParameter('module', 'escaping')
     ->isParameter('action', 'on')
-  ->end()
-
-  ->with('response')->begin()
+    ->end()
+    ->with('response')->begin()
     ->isStatusCode(200)
     ->matches('#<h1>Lorem &lt;strong&gt;ipsum&lt;/strong&gt; dolor sit amet.</h1>#')
     ->matches('#<h2>Lorem &lt;strong&gt;ipsum&lt;/strong&gt; dolor sit amet.</h2>#')
@@ -32,19 +29,17 @@
     ->matches('#<h5>Lorem &lt;strong&gt;ipsum&lt;/strong&gt; dolor sit amet.</h5>#')
     ->matches('#<h6>Lorem <strong>ipsum</strong> dolor sit amet.</h6>#')
     ->checkElement('span.no', 2)
-  ->end()
+    ->end()
 ;
 
 $b->get('/escaping/off')
-
-  ->with('request')->begin()
+    ->with('request')->begin()
     ->isParameter('module', 'escaping')
     ->isParameter('action', 'off')
-  ->end()
-
-  ->with('response')->begin()
+    ->end()
+    ->with('response')->begin()
     ->isStatusCode(200)
     ->matches('#<h1>Lorem <strong>ipsum</strong> dolor sit amet.</h1>#')
     ->matches('#<h2>Lorem <strong>ipsum</strong> dolor sit amet.</h2>#')
-  ->end()
+    ->end()
 ;
diff --git a/test/functional/filterTest.php b/test/functional/filterTest.php
index b34f9372a..39930c10d 100644
--- a/test/functional/filterTest.php
+++ b/test/functional/filterTest.php
@@ -3,15 +3,14 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 $app = 'frontend';
-if (!include(__DIR__.'/../bootstrap/functional.php'))
-{
-  return;
+if (!include(__DIR__.'/../bootstrap/functional.php')) {
+    return;
 }
 
 $b = new sfTestBrowser();
diff --git a/test/functional/fixtures/apps/cache/config/cacheConfiguration.class.php b/test/functional/fixtures/apps/cache/config/cacheConfiguration.class.php
index 8778b4b23..52660cd15 100644
--- a/test/functional/fixtures/apps/cache/config/cacheConfiguration.class.php
+++ b/test/functional/fixtures/apps/cache/config/cacheConfiguration.class.php
@@ -2,7 +2,7 @@
 
 class cacheConfiguration extends sfApplicationConfiguration
 {
-  public function configure()
-  {
-  }
+    public function configure()
+    {
+    }
 }
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 0aa42dbe7..de7cefa92 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
@@ -3,102 +3,101 @@
 /**
  * cache actions.
  *
- * @package    project
- * @subpackage cache
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class cacheActions extends sfActions
 {
-  public function executeIndex()
-  {
-  }
-
-  public function executePage()
-  {
-  }
-
-  public function executeList($request)
-  {
-    $this->page = $request->getParameter('page', 1);
-  }
-
-  public function executeForward()
-  {
-    $this->forward('cache', 'page');
-  }
-
-  public function executeMulti()
-  {
-    $this->getResponse()->setTitle('Param: '.$this->getRequestParameter('param'));
-  }
-
-  public function executeMultiBis()
-  {
-  }
-
-  public function executePartial()
-  {
-  }
-
-  public function executeAnotherPartial()
-  {
-  }
-
-  public function executeComponent()
-  {
-  }
-
-  public function executeSpecificCacheKey()
-  {
-  }
-
-  public function executeAction()
-  {
-    $response = $this->getResponse();
-    $response->setHttpHeader('symfony', 'foo');
-    $response->setContentType('text/plain');
-    $response->setTitle('My title');
-    $response->addMeta('meta1', 'bar');
-    $response->addHttpMeta('httpmeta1', 'foobar');
-
-    sfConfig::set('ACTION_EXECUTED', true);
-  }
-
-  public function executeImageWithLayoutCacheWithLayout()
-  {
-    $this->prepareImage();
-    $this->setLayout('image');
-  }
-
-  public function executeImageWithLayoutCacheNoLayout()
-  {
-    $this->prepareImage();
-    $this->setLayout('image');
-  }
-
-  public function executeImageNoLayoutCacheWithLayout()
-  {
-    $this->prepareImage();
-    $this->setLayout(false);
-  }
-
-  public function executeImageNoLayoutCacheNoLayout()
-  {
-    $this->prepareImage();
-    $this->setLayout(false);
-  }
-
-  protected function prepareImage()
-  {
-    $this->getResponse()->setContentType('image/png');
-    $this->image = file_get_contents(__DIR__.'/../data/ok48.png');
-    $this->setTemplate('image');
-  }
-
-  public function executeLastModifiedResponse()
-  {
-    $this->getResponse()->setHttpHeader('Last-Modified', $this->getResponse()->getDate(sfConfig::get('LAST_MODIFIED')));
-    $this->setTemplate('action');
-  }
+    public function executeIndex()
+    {
+    }
+
+    public function executePage()
+    {
+    }
+
+    public function executeList($request)
+    {
+        $this->page = $request->getParameter('page', 1);
+    }
+
+    public function executeForward()
+    {
+        $this->forward('cache', 'page');
+    }
+
+    public function executeMulti()
+    {
+        $this->getResponse()->setTitle('Param: '.$this->getRequestParameter('param'));
+    }
+
+    public function executeMultiBis()
+    {
+    }
+
+    public function executePartial()
+    {
+    }
+
+    public function executeAnotherPartial()
+    {
+    }
+
+    public function executeComponent()
+    {
+    }
+
+    public function executeSpecificCacheKey()
+    {
+    }
+
+    public function executeAction()
+    {
+        $response = $this->getResponse();
+        $response->setHttpHeader('symfony', 'foo');
+        $response->setContentType('text/plain');
+        $response->setTitle('My title');
+        $response->addMeta('meta1', 'bar');
+        $response->addHttpMeta('httpmeta1', 'foobar');
+
+        sfConfig::set('ACTION_EXECUTED', true);
+    }
+
+    public function executeImageWithLayoutCacheWithLayout()
+    {
+        $this->prepareImage();
+        $this->setLayout('image');
+    }
+
+    public function executeImageWithLayoutCacheNoLayout()
+    {
+        $this->prepareImage();
+        $this->setLayout('image');
+    }
+
+    public function executeImageNoLayoutCacheWithLayout()
+    {
+        $this->prepareImage();
+        $this->setLayout(false);
+    }
+
+    public function executeImageNoLayoutCacheNoLayout()
+    {
+        $this->prepareImage();
+        $this->setLayout(false);
+    }
+
+    public function executeLastModifiedResponse()
+    {
+        $this->getResponse()->setHttpHeader('Last-Modified', $this->getResponse()->getDate(sfConfig::get('LAST_MODIFIED')));
+        $this->setTemplate('action');
+    }
+
+    protected function prepareImage()
+    {
+        $this->getResponse()->setContentType('image/png');
+        $this->image = file_get_contents(__DIR__.'/../data/ok48.png');
+        $this->setTemplate('image');
+    }
 }
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 c552dad45..67397db75 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
@@ -3,34 +3,33 @@
 /**
  * cache components.
  *
- * @package    project
- * @subpackage cache
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class cacheComponents extends sfComponents
 {
-  public function executeComponent()
-  {
-    $this->componentParam = 'componentParam';
-    $this->requestParam = $this->getRequestParameter('param');
-  }
+    public function executeComponent()
+    {
+        $this->componentParam = 'componentParam';
+        $this->requestParam = $this->getRequestParameter('param');
+    }
 
-  public function executeCacheableComponent()
-  {
-    $this->componentParam = 'componentParam';
-    $this->requestParam = $this->getRequestParameter('param');
-  }
+    public function executeCacheableComponent()
+    {
+        $this->componentParam = 'componentParam';
+        $this->requestParam = $this->getRequestParameter('param');
+    }
 
-  public function executeContextualComponent()
-  {
-    $this->componentParam = 'componentParam';
-    $this->requestParam = $this->getRequestParameter('param');
-  }
+    public function executeContextualComponent()
+    {
+        $this->componentParam = 'componentParam';
+        $this->requestParam = $this->getRequestParameter('param');
+    }
 
-  public function executeContextualCacheableComponent()
-  {
-    $this->componentParam = 'componentParam';
-    $this->requestParam = $this->getRequestParameter('param');
-  }
+    public function executeContextualCacheableComponent()
+    {
+        $this->componentParam = 'componentParam';
+        $this->requestParam = $this->getRequestParameter('param');
+    }
 }
diff --git a/test/functional/fixtures/apps/cache/modules/cache/templates/_anotherCacheablePartial.php b/test/functional/fixtures/apps/cache/modules/cache/templates/_anotherCacheablePartial.php
index e3f6d98b7..3fb3ec9ea 100644
--- a/test/functional/fixtures/apps/cache/modules/cache/templates/_anotherCacheablePartial.php
+++ b/test/functional/fixtures/apps/cache/modules/cache/templates/_anotherCacheablePartial.php
@@ -1,10 +1,10 @@
-<?php use_stylesheet('another_partial_css') ?>
-<?php use_javascript('another_partial_js') ?>
+<?php use_stylesheet('another_partial_css'); ?>
+<?php use_javascript('another_partial_js'); ?>
 
-<div class="cacheablePartial_<?php echo isset($varParam) ? $varParam : '' ?>_<?php echo $sf_params->get('param') ?>">OK</div>
-<?php use_stylesheet('another_partial_css') ?>
-<?php use_javascript('another_partial_js') ?>
+<div class="cacheablePartial_<?php echo isset($varParam) ? $varParam : ''; ?>_<?php echo $sf_params->get('param'); ?>">OK</div>
+<?php use_stylesheet('another_partial_css'); ?>
+<?php use_javascript('another_partial_js'); ?>
 
-<div class="cacheablePartial_<?php echo isset($varParam) ? $varParam : '' ?>_<?php echo $sf_params->get('param') ?>">OK</div>
+<div class="cacheablePartial_<?php echo isset($varParam) ? $varParam : ''; ?>_<?php echo $sf_params->get('param'); ?>">OK</div>
 
-<?php slot('another_partial') ?>Another Partial<?php end_slot() ?>
+<?php slot('another_partial'); ?>Another Partial<?php end_slot(); ?>
diff --git a/test/functional/fixtures/apps/cache/modules/cache/templates/_cacheableComponent.php b/test/functional/fixtures/apps/cache/modules/cache/templates/_cacheableComponent.php
index 5db8decc0..b810029bc 100644
--- a/test/functional/fixtures/apps/cache/modules/cache/templates/_cacheableComponent.php
+++ b/test/functional/fixtures/apps/cache/modules/cache/templates/_cacheableComponent.php
@@ -1,6 +1,6 @@
-<?php use_stylesheet('component_css') ?>
-<?php use_javascript('component_js') ?>
+<?php use_stylesheet('component_css'); ?>
+<?php use_javascript('component_js'); ?>
 
-<div class="cacheableComponent_<?php echo isset($varParam) ? $varParam : '' ?>_<?php echo isset($componentParam) ? $componentParam : '' ?>_<?php echo isset($requestParam) ? $requestParam : '' ?>">OK</div>
+<div class="cacheableComponent_<?php echo isset($varParam) ? $varParam : ''; ?>_<?php echo isset($componentParam) ? $componentParam : ''; ?>_<?php echo isset($requestParam) ? $requestParam : ''; ?>">OK</div>
 
-<?php slot('component') ?>Component<?php end_slot() ?>
+<?php slot('component'); ?>Component<?php end_slot(); ?>
diff --git a/test/functional/fixtures/apps/cache/modules/cache/templates/_cacheablePartial.php b/test/functional/fixtures/apps/cache/modules/cache/templates/_cacheablePartial.php
index 8165bfa86..bbd50133b 100644
--- a/test/functional/fixtures/apps/cache/modules/cache/templates/_cacheablePartial.php
+++ b/test/functional/fixtures/apps/cache/modules/cache/templates/_cacheablePartial.php
@@ -1,8 +1,8 @@
-<?php use_stylesheet('partial_css') ?>
-<?php use_javascript('partial_js') ?>
+<?php use_stylesheet('partial_css'); ?>
+<?php use_javascript('partial_js'); ?>
 
-<div class="cacheablePartial_<?php echo isset($varParam) ? $varParam : '' ?>_<?php echo $sf_params->get('param') ?>">OK</div>
+<div class="cacheablePartial_<?php echo isset($varParam) ? $varParam : ''; ?>_<?php echo $sf_params->get('param'); ?>">OK</div>
 
-<div id="anotherCacheablePartial"><?php include_partial('cache/anotherCacheablePartial') ?></div>
+<div id="anotherCacheablePartial"><?php include_partial('cache/anotherCacheablePartial'); ?></div>
 
-<?php slot('partial') ?>Partial<?php end_slot() ?>
+<?php slot('partial'); ?>Partial<?php end_slot(); ?>
diff --git a/test/functional/fixtures/apps/cache/modules/cache/templates/_component.php b/test/functional/fixtures/apps/cache/modules/cache/templates/_component.php
index 1ff855f52..ce7e7fc6c 100644
--- a/test/functional/fixtures/apps/cache/modules/cache/templates/_component.php
+++ b/test/functional/fixtures/apps/cache/modules/cache/templates/_component.php
@@ -1 +1 @@
-<div class="component_<?php echo isset($varParam) ? $varParam : '' ?>_<?php echo isset($componentParam) ? $componentParam : '' ?>_<?php echo isset($requestParam) ? $requestParam : '' ?>">OK</div>
+<div class="component_<?php echo isset($varParam) ? $varParam : ''; ?>_<?php echo isset($componentParam) ? $componentParam : ''; ?>_<?php echo isset($requestParam) ? $requestParam : ''; ?>">OK</div>
diff --git a/test/functional/fixtures/apps/cache/modules/cache/templates/_contextualCacheableComponent.php b/test/functional/fixtures/apps/cache/modules/cache/templates/_contextualCacheableComponent.php
index d4360dc37..8b2aa634a 100644
--- a/test/functional/fixtures/apps/cache/modules/cache/templates/_contextualCacheableComponent.php
+++ b/test/functional/fixtures/apps/cache/modules/cache/templates/_contextualCacheableComponent.php
@@ -1 +1 @@
-<div class="contextualCacheableComponent_<?php echo isset($varParam) ? $varParam : '' ?>_<?php echo isset($componentParam) ? $componentParam : '' ?>_<?php echo isset($requestParam) ? $requestParam : '' ?>"><?php echo $sf_response->getTitle() ?></div>
+<div class="contextualCacheableComponent_<?php echo isset($varParam) ? $varParam : ''; ?>_<?php echo isset($componentParam) ? $componentParam : ''; ?>_<?php echo isset($requestParam) ? $requestParam : ''; ?>"><?php echo $sf_response->getTitle(); ?></div>
diff --git a/test/functional/fixtures/apps/cache/modules/cache/templates/_contextualCacheablePartial.php b/test/functional/fixtures/apps/cache/modules/cache/templates/_contextualCacheablePartial.php
index dfc0f42b1..dcc1febf7 100644
--- a/test/functional/fixtures/apps/cache/modules/cache/templates/_contextualCacheablePartial.php
+++ b/test/functional/fixtures/apps/cache/modules/cache/templates/_contextualCacheablePartial.php
@@ -1 +1 @@
-<div class="contextualCacheablePartial_<?php echo isset($varParam) ? $varParam : '' ?>_<?php echo $sf_params->get('param') ?>"><?php echo $sf_response->getTitle() ?></div>
+<div class="contextualCacheablePartial_<?php echo isset($varParam) ? $varParam : ''; ?>_<?php echo $sf_params->get('param'); ?>"><?php echo $sf_response->getTitle(); ?></div>
diff --git a/test/functional/fixtures/apps/cache/modules/cache/templates/_contextualComponent.php b/test/functional/fixtures/apps/cache/modules/cache/templates/_contextualComponent.php
index 2b70ac02e..4024ae5c1 100644
--- a/test/functional/fixtures/apps/cache/modules/cache/templates/_contextualComponent.php
+++ b/test/functional/fixtures/apps/cache/modules/cache/templates/_contextualComponent.php
@@ -1 +1 @@
-<div class="contextualComponent_<?php echo isset($varParam) ? $varParam : '' ?>_<?php echo isset($componentParam) ? $componentParam : '' ?>_<?php echo isset($requestParam) ? $requestParam : '' ?>">OK</div>
+<div class="contextualComponent_<?php echo isset($varParam) ? $varParam : ''; ?>_<?php echo isset($componentParam) ? $componentParam : ''; ?>_<?php echo isset($requestParam) ? $requestParam : ''; ?>">OK</div>
diff --git a/test/functional/fixtures/apps/cache/modules/cache/templates/anotherPartialSuccess.php b/test/functional/fixtures/apps/cache/modules/cache/templates/anotherPartialSuccess.php
index d387fe219..ce43651dc 100644
--- a/test/functional/fixtures/apps/cache/modules/cache/templates/anotherPartialSuccess.php
+++ b/test/functional/fixtures/apps/cache/modules/cache/templates/anotherPartialSuccess.php
@@ -1 +1 @@
-<div id="anotherCacheablePartial"><?php include_partial('cache/anotherCacheablePartial') ?></div>
+<div id="anotherCacheablePartial"><?php include_partial('cache/anotherCacheablePartial'); ?></div>
diff --git a/test/functional/fixtures/apps/cache/modules/cache/templates/componentSuccess.php b/test/functional/fixtures/apps/cache/modules/cache/templates/componentSuccess.php
index 5f0736bce..c62eb42a0 100644
--- a/test/functional/fixtures/apps/cache/modules/cache/templates/componentSuccess.php
+++ b/test/functional/fixtures/apps/cache/modules/cache/templates/componentSuccess.php
@@ -1,2 +1,2 @@
-<div id="cacheableComponent"><?php include_component('cache', 'cacheableComponent') ?></div>
-<div id="cacheableComponent"><?php include_component('cache', 'cacheableComponent') ?></div>
+<div id="cacheableComponent"><?php include_component('cache', 'cacheableComponent'); ?></div>
+<div id="cacheableComponent"><?php include_component('cache', 'cacheableComponent'); ?></div>
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 8cb71a75e..ccd622d7d 100644
--- a/test/functional/fixtures/apps/cache/modules/cache/templates/imageSuccess.php
+++ b/test/functional/fixtures/apps/cache/modules/cache/templates/imageSuccess.php
@@ -1 +1,3 @@
-<?php echo $image ?>
\ No newline at end of file
+<?php
+
+echo $image;
diff --git a/test/functional/fixtures/apps/cache/modules/cache/templates/listSuccess.php b/test/functional/fixtures/apps/cache/modules/cache/templates/listSuccess.php
index ddc89ec4d..e5239a608 100644
--- a/test/functional/fixtures/apps/cache/modules/cache/templates/listSuccess.php
+++ b/test/functional/fixtures/apps/cache/modules/cache/templates/listSuccess.php
@@ -1 +1 @@
-<span id="page"><?php echo $page ?></span>
+<span id="page"><?php echo $page; ?></span>
diff --git a/test/functional/fixtures/apps/cache/modules/cache/templates/multiBisSuccess.php b/test/functional/fixtures/apps/cache/modules/cache/templates/multiBisSuccess.php
index 91d379d58..795a569ac 100644
--- a/test/functional/fixtures/apps/cache/modules/cache/templates/multiBisSuccess.php
+++ b/test/functional/fixtures/apps/cache/modules/cache/templates/multiBisSuccess.php
@@ -1,10 +1,10 @@
-<?php use_stylesheet('main_css') ?>
-<?php use_javascript('main_js') ?>
+<?php use_stylesheet('main_css'); ?>
+<?php use_javascript('main_js'); ?>
 
-<div id="cacheablePartial"><?php include_partial('cache/cacheablePartial') ?></div>
+<div id="cacheablePartial"><?php include_partial('cache/cacheablePartial'); ?></div>
 
-<div id="contextualCacheablePartial"><?php include_partial('cache/contextualCacheablePartial') ?></div>
+<div id="contextualCacheablePartial"><?php include_partial('cache/contextualCacheablePartial'); ?></div>
 
-<div id="cacheableComponent"><?php include_component('cache', 'cacheableComponent') ?></div>
+<div id="cacheableComponent"><?php include_component('cache', 'cacheableComponent'); ?></div>
 
-<div id="contextualCacheableComponent"><?php include_component('cache', 'contextualCacheableComponent') ?></div>
+<div id="contextualCacheableComponent"><?php include_component('cache', 'contextualCacheableComponent'); ?></div>
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 083bc44b5..24b0b705c 100644
--- a/test/functional/fixtures/apps/cache/modules/cache/templates/multiSuccess.php
+++ b/test/functional/fixtures/apps/cache/modules/cache/templates/multiSuccess.php
@@ -1,30 +1,30 @@
-<div id="partial"><?php include_partial('cache/partial') ?></div>
+<div id="partial"><?php include_partial('cache/partial'); ?></div>
 
-<div id="cacheablePartial"><?php include_partial('cache/cacheablePartial') ?></div>
+<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', array('varParam' => 'varParam')); ?></div>
 
 
-<div id="contextualPartial"><?php include_partial('cache/contextualPartial') ?></div>
+<div id="contextualPartial"><?php include_partial('cache/contextualPartial'); ?></div>
 
-<div id="contextualCacheablePartial"><?php include_partial('cache/contextualCacheablePartial') ?></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', array('varParam' => 'varParam')); ?></div>
 
 
-<div id="component"><?php include_component('cache', 'component') ?></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', array('varParam' => 'varParam')); ?></div>
 
-<div id="cacheableComponent"><?php include_component('cache', 'cacheableComponent') ?></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', array('varParam' => 'varParam')); ?></div>
 
 
-<div id="contextualComponent"><?php include_component('cache', 'contextualComponent') ?></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', array('varParam' => 'varParam')); ?></div>
 
-<div id="contextualCacheableComponent"><?php include_component('cache', 'contextualCacheableComponent') ?></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', array('varParam' => 'varParam')); ?></div>
diff --git a/test/functional/fixtures/apps/cache/modules/cache/templates/partialSuccess.php b/test/functional/fixtures/apps/cache/modules/cache/templates/partialSuccess.php
index 6df7d9ab6..f6b4e8aea 100644
--- a/test/functional/fixtures/apps/cache/modules/cache/templates/partialSuccess.php
+++ b/test/functional/fixtures/apps/cache/modules/cache/templates/partialSuccess.php
@@ -1 +1 @@
-<div id="cacheablePartial"><?php include_partial('cache/cacheablePartial') ?></div>
+<div id="cacheablePartial"><?php include_partial('cache/cacheablePartial'); ?></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 40a7609f0..036dac29a 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', 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="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', array('varParam' => 'varParam', 'sf_cache_key' => 'cacheableComponent')); ?></div>
+<div id="contextualCacheableComponentVarParam"><?php include_component('cache', 'contextualCacheableComponent', array('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 dfc903fba..d4b0a20a2 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
@@ -2,27 +2,27 @@
 
 class httpcacheActions extends sfActions
 {
-  public function executePage1(sfWebRequest $request)
-  {
-    $this->setTemplate('index');
-  }
+    public function executePage1(sfWebRequest $request)
+    {
+        $this->setTemplate('index');
+    }
 
-  public function executePage2(sfWebRequest $request)
-  {
-    $this->setTemplate('index');
-  }
+    public function executePage2(sfWebRequest $request)
+    {
+        $this->setTemplate('index');
+    }
 
-  public function executePage3(sfWebRequest $request)
-  {
-    $this->getResponse()->setHttpHeader('Last-Modified', sfWebResponse::getDate(time() - 86400));
+    public function executePage3(sfWebRequest $request)
+    {
+        $this->getResponse()->setHttpHeader('Last-Modified', sfWebResponse::getDate(time() - 86400));
 
-    $this->setTemplate('index');
-  }
+        $this->setTemplate('index');
+    }
 
-  public function executePage4(sfWebRequest $request)
-  {
-    $this->getResponse()->setHttpHeader('Last-Modified', sfWebResponse::getDate(time() - 86400));
+    public function executePage4(sfWebRequest $request)
+    {
+        $this->getResponse()->setHttpHeader('Last-Modified', sfWebResponse::getDate(time() - 86400));
 
-    $this->setTemplate('index');
-  }
+        $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 4ef42234f..a2639d4f0 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
@@ -3,18 +3,16 @@
 /**
  * nocache actions.
  *
- * @package    project
- * @subpackage nocache
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class nocacheActions extends sfActions
 {
-  /**
-   * Executes index action
-   *
-   */
-  public function executeIndex()
-  {
-  }
+    /**
+     * Executes index action.
+     */
+    public function executeIndex()
+    {
+    }
 }
diff --git a/test/functional/fixtures/apps/cache/templates/image.php b/test/functional/fixtures/apps/cache/templates/image.php
index 185daeb3c..9ee5d02c2 100644
--- a/test/functional/fixtures/apps/cache/templates/image.php
+++ b/test/functional/fixtures/apps/cache/templates/image.php
@@ -1 +1,3 @@
-<?php echo $sf_content ?>
\ No newline at end of file
+<?php
+
+echo $sf_content;
diff --git a/test/functional/fixtures/apps/cache/templates/layout.php b/test/functional/fixtures/apps/cache/templates/layout.php
index 89c6db62c..979624c3e 100644
--- a/test/functional/fixtures/apps/cache/templates/layout.php
+++ b/test/functional/fixtures/apps/cache/templates/layout.php
@@ -2,24 +2,24 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 
-<?php echo include_http_metas() ?>
-<?php echo include_metas() ?>
+<?php echo include_http_metas(); ?>
+<?php echo include_metas(); ?>
 
-<?php echo include_title() ?>
+<?php echo include_title(); ?>
 
 <link rel="shortcut icon" href="/favicon.ico" />
 
 
-    <?php include_stylesheets() ?>
-    <?php include_javascripts() ?>
+    <?php include_stylesheets(); ?>
+    <?php include_javascripts(); ?>
 </head>
 <body>
 
-<?php echo $sf_content ?>
+<?php echo $sf_content; ?>
 
-<div id="component_slot_content"><?php echo get_slot('component') ?></div>
-<div id="partial_slot_content"><?php echo get_slot('partial') ?></div>
-<div id="another_partial_slot_content"><?php echo get_slot('another_partial') ?></div>
+<div id="component_slot_content"><?php echo get_slot('component'); ?></div>
+<div id="partial_slot_content"><?php echo get_slot('partial'); ?></div>
+<div id="another_partial_slot_content"><?php echo get_slot('another_partial'); ?></div>
 
 </body>
 </html>
diff --git a/test/functional/fixtures/apps/frontend/config/frontendConfiguration.class.php b/test/functional/fixtures/apps/frontend/config/frontendConfiguration.class.php
index 9b0b90c90..6d6e4e9a7 100644
--- a/test/functional/fixtures/apps/frontend/config/frontendConfiguration.class.php
+++ b/test/functional/fixtures/apps/frontend/config/frontendConfiguration.class.php
@@ -2,41 +2,38 @@
 
 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'));
-  }
-
-  public function filter_parameters(sfEvent $event, $parameters)
-  {
-    if (false !== stripos((string) $event->getSubject()->getHttpHeader('user-agent'), 'iPhone'))
+    public function configure()
     {
-      $event->getSubject()->setRequestFormat('iphone');
+        $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'));
     }
 
-    return $parameters;
-  }
-
-  public function configure_iphone_format(sfEvent $event)
-  {
-    if ('iphone' == $event['format'])
+    public function filter_parameters(sfEvent $event, $parameters)
     {
-      $event['response']->addStylesheet('iphone.css');
+        if (false !== stripos((string) $event->getSubject()->getHttpHeader('user-agent'), 'iPhone')) {
+            $event->getSubject()->setRequestFormat('iphone');
+        }
 
-      $event->getSubject()->setDecorator(true);
+        return $parameters;
     }
-  }
 
-  public function configure_format_foo(sfEvent $event)
-  {
-    if ('foo' != $event['format'])
+    public function configure_iphone_format(sfEvent $event)
     {
-      return;
+        if ('iphone' == $event['format']) {
+            $event['response']->addStylesheet('iphone.css');
+
+            $event->getSubject()->setDecorator(true);
+        }
     }
 
-    $event['response']->setHttpHeader('x-foo', 'true');
-    $event->getSubject()->setExtension('.php');
-  }
+    public function configure_format_foo(sfEvent $event)
+    {
+        if ('foo' != $event['format']) {
+            return;
+        }
+
+        $event['response']->setHttpHeader('x-foo', 'true');
+        $event->getSubject()->setExtension('.php');
+    }
 }
diff --git a/test/functional/fixtures/apps/frontend/lib/myAppsFrontendLibClass.class.php b/test/functional/fixtures/apps/frontend/lib/myAppsFrontendLibClass.class.php
index 01f173a64..2d1e483fb 100644
--- a/test/functional/fixtures/apps/frontend/lib/myAppsFrontendLibClass.class.php
+++ b/test/functional/fixtures/apps/frontend/lib/myAppsFrontendLibClass.class.php
@@ -2,8 +2,8 @@
 
 class myAppsFrontendLibClass
 {
-  static public function ping()
-  {
-    return 'pong';
-  }
+    public static function ping()
+    {
+        return 'pong';
+    }
 }
diff --git a/test/functional/fixtures/apps/frontend/lib/myAutoload.class.php b/test/functional/fixtures/apps/frontend/lib/myAutoload.class.php
index e26c9944d..5ab655bee 100644
--- a/test/functional/fixtures/apps/frontend/lib/myAutoload.class.php
+++ b/test/functional/fixtures/apps/frontend/lib/myAutoload.class.php
@@ -2,15 +2,14 @@
 
 class myAutoload
 {
-  static public function autoload($class)
-  {
-    if ('myAutoloadedClass' == $class)
+    public static function autoload($class)
     {
-      require_once(__DIR__.'/myAutoloadedClass.class.php');
+        if ('myAutoloadedClass' == $class) {
+            require_once __DIR__.'/myAutoloadedClass.class.php';
 
-      return true;
-    }
+            return true;
+        }
 
-    return false;
-  }
+        return false;
+    }
 }
diff --git a/test/functional/fixtures/apps/frontend/lib/myAutoloadedClass.class.php b/test/functional/fixtures/apps/frontend/lib/myAutoloadedClass.class.php
index cf70db6e8..bab3c741c 100644
--- a/test/functional/fixtures/apps/frontend/lib/myAutoloadedClass.class.php
+++ b/test/functional/fixtures/apps/frontend/lib/myAutoloadedClass.class.php
@@ -2,8 +2,8 @@
 
 class myAutoloadedClass
 {
-  public function getFoo()
-  {
-    return 'foo';
-  }
+    public function getFoo()
+    {
+        return 'foo';
+    }
 }
diff --git a/test/functional/fixtures/apps/frontend/lib/myFilter.class.php b/test/functional/fixtures/apps/frontend/lib/myFilter.class.php
index 7710d888a..de4a4799c 100644
--- a/test/functional/fixtures/apps/frontend/lib/myFilter.class.php
+++ b/test/functional/fixtures/apps/frontend/lib/myFilter.class.php
@@ -2,21 +2,21 @@
 
 class myFilter extends sfFilter
 {
-  public function execute($filterChain)
-  {
-    // only activate if we are in the filter module
-    if ('filter' != $this->getContext()->getModuleName())
+    public function execute($filterChain)
     {
-      $filterChain->execute();
-      return;
-    }
+        // only activate if we are in the filter module
+        if ('filter' != $this->getContext()->getModuleName()) {
+            $filterChain->execute();
+
+            return;
+        }
 
-    $response = $this->getContext()->getResponse();
+        $response = $this->getContext()->getResponse();
 
-    $response->setContent($response->getContent().'<div class="before" />');
+        $response->setContent($response->getContent().'<div class="before" />');
 
-    $filterChain->execute();
+        $filterChain->execute();
 
-    $response->setContent($response->getContent().'<div class="after" />');
-  }
+        $response->setContent($response->getContent().'<div class="after" />');
+    }
 }
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 698c51d9d..a276e02ba 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
@@ -3,14 +3,13 @@
 /**
  * assetInclusion actions.
  *
- * @package    project
- * @subpackage assetInclusion
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class assetInclusionActions extends sfActions
 {
-  public function executeIndex()
-  {
-  }
+    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 3843adedf..514eba23d 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
@@ -3,31 +3,27 @@
 /**
  * auth actions.
  *
- * @package    project
- * @subpackage view
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class authActions extends sfActions
 {
-  public function executeBasic()
-  {
-    $response = $this->getResponse();
-
-    if (!isset($_SERVER['PHP_AUTH_USER']))
+    public function executeBasic()
     {
-      $response->setStatusCode(401);
-      $response->setHttpHeader('WWW-Authenticate', 'Basic realm="My Realm"');
+        $response = $this->getResponse();
 
-      $this->auth_user = '';
-      $this->auth_password = '';
-      $this->msg = 'KO';
-    }
-    else
-    {
-      $this->auth_user = $_SERVER['PHP_AUTH_USER'];
-      $this->auth_password = $_SERVER['PHP_AUTH_PW'];
-      $this->msg = 'OK';
+        if (!isset($_SERVER['PHP_AUTH_USER'])) {
+            $response->setStatusCode(401);
+            $response->setHttpHeader('WWW-Authenticate', 'Basic realm="My Realm"');
+
+            $this->auth_user = '';
+            $this->auth_password = '';
+            $this->msg = 'KO';
+        } else {
+            $this->auth_user = $_SERVER['PHP_AUTH_USER'];
+            $this->auth_password = $_SERVER['PHP_AUTH_PW'];
+            $this->msg = 'OK';
+        }
     }
-  }
 }
diff --git a/test/functional/fixtures/apps/frontend/modules/auth/templates/basicSuccess.php b/test/functional/fixtures/apps/frontend/modules/auth/templates/basicSuccess.php
index df2abe4c1..2803d5f97 100644
--- a/test/functional/fixtures/apps/frontend/modules/auth/templates/basicSuccess.php
+++ b/test/functional/fixtures/apps/frontend/modules/auth/templates/basicSuccess.php
@@ -1,3 +1,3 @@
-<div id="user"><?php echo $auth_user ?></div>
-<div id="password"><?php echo $auth_password ?></div>
-<div id='msg'><?php echo $msg ?></div>
+<div id="user"><?php echo $auth_user; ?></div>
+<div id="password"><?php echo $auth_password; ?></div>
+<div id='msg'><?php echo $msg; ?></div>
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 b65e901ab..5b0cd69ef 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
@@ -3,23 +3,22 @@
 /**
  * autoload actions.
  *
- * @package    project
- * @subpackage autoload
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class autoloadActions extends sfActions
 {
-  public function executeIndex()
-  {
-    $this->lib1 = myLibClass::ping();
-    $this->lib2 = myAppsFrontendLibClass::ping();
-    $this->lib3 = myAppsFrontendModulesAutoloadLibClass::ping();
-    $this->lib4 = class_exists('myPluginsSfAutoloadPluginModulesAutoloadPluginLibClass') ? 'pong' : 'nopong';
-  }
+    public function executeIndex()
+    {
+        $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();
-  }
+    public function executeMyAutoload()
+    {
+        $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 2b991e9bf..bbd72ec76 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
@@ -2,8 +2,8 @@
 
 class myAppsFrontendModulesAutoloadLibClass
 {
-  static public function ping()
-  {
-    return 'pong';
-  }
+    public static function ping()
+    {
+        return 'pong';
+    }
 }
diff --git a/test/functional/fixtures/apps/frontend/modules/autoload/templates/indexSuccess.php b/test/functional/fixtures/apps/frontend/modules/autoload/templates/indexSuccess.php
index ce26f4b51..378b486f3 100644
--- a/test/functional/fixtures/apps/frontend/modules/autoload/templates/indexSuccess.php
+++ b/test/functional/fixtures/apps/frontend/modules/autoload/templates/indexSuccess.php
@@ -1,4 +1,4 @@
-<div id="lib1"><?php echo $lib1 ?></div>
-<div id="lib2"><?php echo $lib2 ?></div>
-<div id="lib3"><?php echo $lib3 ?></div>
-<div id="lib4"><?php echo $lib4 ?></div>
+<div id="lib1"><?php echo $lib1; ?></div>
+<div id="lib2"><?php echo $lib2; ?></div>
+<div id="lib3"><?php echo $lib3; ?></div>
+<div id="lib4"><?php echo $lib4; ?></div>
diff --git a/test/functional/fixtures/apps/frontend/modules/autoload/templates/myAutoloadSuccess.php b/test/functional/fixtures/apps/frontend/modules/autoload/templates/myAutoloadSuccess.php
index a212c986e..bb7d2528d 100644
--- a/test/functional/fixtures/apps/frontend/modules/autoload/templates/myAutoloadSuccess.php
+++ b/test/functional/fixtures/apps/frontend/modules/autoload/templates/myAutoloadSuccess.php
@@ -1 +1 @@
-<div><?php echo $o->getFoo() ?></div>
+<div><?php echo $o->getFoo(); ?></div>
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 1ca9763a3..3f4b72c07 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
@@ -3,60 +3,58 @@
 /**
  * browser actions.
  *
- * @package    project
- * @subpackage browser
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class browserActions extends sfActions
 {
-  public function executeIndex()
-  {
-    return $this->renderText('<html><body><h1>html</h1></body></html>');
-  }
+    public function executeIndex()
+    {
+        return $this->renderText('<html><body><h1>html</h1></body></html>');
+    }
 
-  public function executeText()
-  {
-    $this->getResponse()->setContentType('text/plain');
+    public function executeText()
+    {
+        $this->getResponse()->setContentType('text/plain');
 
-    return $this->renderText('text');
-  }
+        return $this->renderText('text');
+    }
 
-  public function executeResponseHeader()
-  {
-    $response = $this->getResponse();
+    public function executeResponseHeader()
+    {
+        $response = $this->getResponse();
 
-    $response->setContentType('text/plain');
-    $response->setHttpHeader('foo', 'bar', true);
-    $response->setHttpHeader('foo', 'foobar', false);
+        $response->setContentType('text/plain');
+        $response->setHttpHeader('foo', 'bar', true);
+        $response->setHttpHeader('foo', 'foobar', false);
 
-    return $this->renderText('ok');
-  }
+        return $this->renderText('ok');
+    }
 
-  public function executeTemplateCustom($request)
-  {
-    if ($request->getParameter('custom'))
+    public function executeTemplateCustom($request)
     {
-      $this->setTemplate('templateCustomCustom');
+        if ($request->getParameter('custom')) {
+            $this->setTemplate('templateCustomCustom');
+        }
     }
-  }
 
-  public function executeRedirect1()
-  {
-    $this->redirect('browser/redirectTarget1');
-  }
+    public function executeRedirect1()
+    {
+        $this->redirect('browser/redirectTarget1');
+    }
 
-  public function executeRedirectTarget1()
-  {
-  }
+    public function executeRedirectTarget1()
+    {
+    }
 
-  public function executeRedirect2()
-  {
-    $this->redirect('browser/redirectTarget2');
-  }
+    public function executeRedirect2()
+    {
+        $this->redirect('browser/redirectTarget2');
+    }
 
-  public function executeRedirectTarget2()
-  {
-    return $this->renderText('ok');
-  }
+    public function executeRedirectTarget2()
+    {
+        return $this->renderText('ok');
+    }
 }
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 005d74837..2eaffc78d 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
@@ -3,14 +3,13 @@
 /**
  * configFiltersSimpleFilter actions.
  *
- * @package    project
- * @subpackage configFiltersSimpleFilter
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class configFiltersSimpleFilterActions extends sfActions
 {
-  public function executeIndex()
-  {
-  }
+    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 163d53c89..c34af24b6 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
@@ -2,11 +2,11 @@
 
 class configFiltersSimpleFilterFilter extends sfFilter
 {
-  public function execute ($filterChain)
-  {
-    $this->getContext()->getRequest()->setParameter('filter', 'in a filter');
+    public function execute($filterChain)
+    {
+        $this->getContext()->getRequest()->setParameter('filter', 'in a filter');
 
-    // execute next filter
-    $filterChain->execute();
-  }
+        // execute next filter
+        $filterChain->execute();
+    }
 }
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 00ab85092..fcb6754b3 100644
--- a/test/functional/fixtures/apps/frontend/modules/configFiltersSimpleFilter/templates/indexSuccess.php
+++ b/test/functional/fixtures/apps/frontend/modules/configFiltersSimpleFilter/templates/indexSuccess.php
@@ -1 +1,3 @@
-<?php echo $sf_params->get('filter') ?>
+<?php
+
+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 020894314..401423512 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
@@ -3,14 +3,13 @@
 /**
  * configModuleDisabled actions.
  *
- * @package    project
- * @subpackage configModuleDisabled
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class configModuleDisabledActions extends sfActions
 {
-  public function executeIndex()
-  {
-  }
+    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 48d14ef9c..65f183268 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
@@ -3,14 +3,13 @@
 /**
  * configSecurityIsSecure actions.
  *
- * @package    project
- * @subpackage configSecurityIsSecure
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class configSecurityIsSecureActions extends sfActions
 {
-  public function executeIndex()
-  {
-  }
+    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 9e0489bc6..82e82f6b2 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
@@ -3,14 +3,13 @@
 /**
  * configSecurityIsSecure actions.
  *
- * @package    project
- * @subpackage configSecurityIsSecure
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class configSecurityIsSecureActionActions extends sfActions
 {
-  public function executeIndex()
-  {
-  }
+    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 a4b50e581..229a77092 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
@@ -3,15 +3,14 @@
 /**
  * configSettingsMaxForwards actions.
  *
- * @package    project
- * @subpackage configSettingsMaxForwards
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class configSettingsMaxForwardsActions extends sfActions
 {
-  public function executeSelfForward()
-  {
-    $this->forward('configSettingsMaxForwards', 'selfForward');
-  }
+    public function executeSelfForward()
+    {
+        $this->forward('configSettingsMaxForwards', 'selfForward');
+    }
 }
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 343eb97cf..c15812526 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
@@ -3,14 +3,13 @@
 /**
  * configViewHasLayout actions.
  *
- * @package    project
- * @subpackage configViewHasLayout
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class configViewHasLayoutActions extends sfActions
 {
-  public function executeWithoutLayout()
-  {
-  }
+    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 9de75fa9e..d4b3f98b6 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
@@ -3,29 +3,28 @@
 /**
  * cookie actions.
  *
- * @package    project
- * @subpackage cookie
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class cookieActions extends sfActions
 {
-  public function executeIndex($request)
-  {
-    return $this->renderText('<p>'.$request->getCookie('foo').'.'.$request->getCookie('bar').'-'.$request->getCookie('foobar').'</p>');
-  }
+    public function executeIndex($request)
+    {
+        return $this->renderText('<p>'.$request->getCookie('foo').'.'.$request->getCookie('bar').'-'.$request->getCookie('foobar').'</p>');
+    }
 
-  public function executeSetCookie($request)
-  {
-    $this->getResponse()->setCookie('foobar', 'barfoo');
+    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);
+    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 f491689f2..f48078308 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
@@ -3,27 +3,26 @@
 /**
  * escaping actions.
  *
- * @package    project
- * @subpackage escaping
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class escapingActions extends sfActions
 {
-  public function preExecute()
-  {
-    $this->var = 'Lorem <strong>ipsum</strong> dolor sit amet.';
-    $this->setLayout(false);
-    $this->setTemplate('index');
-  }
+    public function preExecute()
+    {
+        $this->var = 'Lorem <strong>ipsum</strong> dolor sit amet.';
+        $this->setLayout(false);
+        $this->setTemplate('index');
+    }
 
-  public function executeOn()
-  {
-    sfConfig::set('sf_escaping_strategy', true);
-  }
+    public function executeOn()
+    {
+        sfConfig::set('sf_escaping_strategy', true);
+    }
 
-  public function executeOff()
-  {
-    sfConfig::set('sf_escaping_strategy', false);
-  }
+    public function executeOff()
+    {
+        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 fe4fadcc8..6db1dc574 100644
--- a/test/functional/fixtures/apps/frontend/modules/escaping/templates/_partial1.php
+++ b/test/functional/fixtures/apps/frontend/modules/escaping/templates/_partial1.php
@@ -1,6 +1,6 @@
-<h3><?php echo $var ?></h3>
-<h4><?php echo $sf_data->getRaw('var') ?></h4>
+<h3><?php echo $var; ?></h3>
+<h4><?php echo $sf_data->getRaw('var'); ?></h4>
 
-<span class="<?php echo $sf_data->getRaw('arr') ? 'yes' : 'no' ?>"></span>
+<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', array('var' => $var, 'arr' => $arr)); ?>
diff --git a/test/functional/fixtures/apps/frontend/modules/escaping/templates/_partial2.php b/test/functional/fixtures/apps/frontend/modules/escaping/templates/_partial2.php
index b0224e1d1..43df1b6d4 100644
--- a/test/functional/fixtures/apps/frontend/modules/escaping/templates/_partial2.php
+++ b/test/functional/fixtures/apps/frontend/modules/escaping/templates/_partial2.php
@@ -1,4 +1,4 @@
-<h5><?php echo $var ?></h5>
-<h6><?php echo $sf_data->getRaw('var') ?></h6>
+<h5><?php echo $var; ?></h5>
+<h6><?php echo $sf_data->getRaw('var'); ?></h6>
 
-<span class="<?php echo $sf_data->getRaw('arr') ? 'yes' : 'no' ?>"></span>
+<span class="<?php echo $sf_data->getRaw('arr') ? 'yes' : 'no'; ?>"></span>
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 5163d1079..dd4e6bb8b 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>
+<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', array('var' => $var, 'arr' => array())); ?>
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 8d8048922..0c265b988 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
@@ -3,25 +3,24 @@
 /**
  * exception actions.
  *
- * @package    project
- * @subpackage exception
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class exceptionActions extends sfActions
 {
-  public function executeNoException()
-  {
-    return $this->renderText('foo');
-  }
+    public function executeNoException()
+    {
+        return $this->renderText('foo');
+    }
 
-  public function executeThrowsException()
-  {
-    throw new Exception('Exception message');
-  }
+    public function executeThrowsException()
+    {
+        throw new Exception('Exception message');
+    }
 
-  public function executeThrowsSfException()
-  {
-    throw new sfException('sfException message');
-  }
+    public function executeThrowsSfException()
+    {
+        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 21b1b8275..9ceb65023 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
@@ -3,20 +3,19 @@
 /**
  * filter actions.
  *
- * @package    project
- * @subpackage filter
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class filterActions extends sfActions
 {
-  public function executeIndex()
-  {
-    return $this->renderText('foo');
-  }
+    public function executeIndex()
+    {
+        return $this->renderText('foo');
+    }
 
-  public function executeIndexWithForward()
-  {
-    $this->forward('filter', 'index');
-  }
+    public function executeIndexWithForward()
+    {
+        $this->forward('filter', 'index');
+    }
 }
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 86a61e43e..a2cbb8aef 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
@@ -3,44 +3,43 @@
 /**
  * format actions.
  *
- * @package    project
- * @subpackage format
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class formatActions extends sfActions
 {
-  public function executeIndex($request)
-  {
-    if ('xml' == $request->getRequestFormat())
+    public function executeIndex($request)
+    {
+        if ('xml' == $request->getRequestFormat()) {
+            $this->setLayout('layout');
+        }
+    }
+
+    public function executeForTheIPhone($request)
     {
-      $this->setLayout('layout');
+        $this->setTemplate('index');
     }
-  }
 
-  public function executeForTheIPhone($request)
-  {
-    $this->setTemplate('index');
-  }
+    public function executeJs($request)
+    {
+        $request->setRequestFormat('js');
+    }
 
-  public function executeJs($request)
-  {
-    $request->setRequestFormat('js');
-  }
+    public function executeJsWithAccept()
+    {
+        $this->setTemplate('index');
+    }
 
-  public function executeJsWithAccept()
-  {
-    $this->setTemplate('index');
-  }
+    public function executeThrowsException()
+    {
+        throw new Exception('Descriptive message');
+    }
 
-  public function executeThrowsException()
-  {
-    throw new Exception('Descriptive message');
-  }
+    public function executeThrowsNonDebugException()
+    {
+        sfConfig::set('sf_debug', false);
 
-  public function executeThrowsNonDebugException()
-  {
-    sfConfig::set('sf_debug', false);
-    throw new Exception('Descriptive message');
-  }
+        throw new Exception('Descriptive message');
+    }
 }
diff --git a/test/functional/fixtures/apps/frontend/modules/format/templates/indexSuccess.js.php b/test/functional/fixtures/apps/frontend/modules/format/templates/indexSuccess.js.php
index 7f26e8dc8..776fe092a 100644
--- a/test/functional/fixtures/apps/frontend/modules/format/templates/indexSuccess.js.php
+++ b/test/functional/fixtures/apps/frontend/modules/format/templates/indexSuccess.js.php
@@ -1,3 +1,3 @@
-<?php include_partial('format/js_header') ?>
+<?php include_partial('format/js_header'); ?>
 
 This is a js file
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 d39ee1022..9148da1fa 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
@@ -3,17 +3,16 @@
 /**
  * notfound actions.
  *
- * @package    project
- * @subpackage notfound
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class notfoundActions extends sfActions
 {
-  public function executeIndex()
-  {
-    $this->getResponse()->setStatusCode(404);
+    public function executeIndex()
+    {
+        $this->getResponse()->setStatusCode(404);
 
-    return $this->renderText('404');
-  }
+        return $this->renderText('404');
+    }
 }
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 f84af61ae..93bb4605f 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
@@ -3,20 +3,19 @@
 /**
  * presentation actions.
  *
- * @package    project
- * @subpackage view
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class presentationActions extends sfActions
 {
-  public function executeIndex()
-  {
-    $this->foo = $this->getController()->getPresentationFor('presentation', 'foo');
-  }
+    public function executeIndex()
+    {
+        $this->foo = $this->getController()->getPresentationFor('presentation', 'foo');
+    }
 
-  public function executeFoo()
-  {
-    $this->setLayout(false);
-  }
+    public function executeFoo()
+    {
+        $this->setLayout(false);
+    }
 }
diff --git a/test/functional/fixtures/apps/frontend/modules/presentation/templates/indexSuccess.php b/test/functional/fixtures/apps/frontend/modules/presentation/templates/indexSuccess.php
index 91c08d4ac..785f1ad0a 100644
--- a/test/functional/fixtures/apps/frontend/modules/presentation/templates/indexSuccess.php
+++ b/test/functional/fixtures/apps/frontend/modules/presentation/templates/indexSuccess.php
@@ -1,2 +1,2 @@
-<div id="foo"><?php echo $foo ?></div>
-<div id="foo_bis"><?php echo $sf_context->getController()->getPresentationFor('presentation', 'foo') ?></div>
+<div id="foo"><?php echo $foo; ?></div>
+<div id="foo_bis"><?php echo $sf_context->getController()->getPresentationFor('presentation', 'foo'); ?></div>
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 46a693a77..391001738 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
@@ -3,15 +3,14 @@
 /**
  * renderText actions.
  *
- * @package    project
- * @subpackage renderText
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class renderTextActions extends sfActions
 {
-  public function executeIndex()
-  {
-    return $this->renderText('foo');
-  }
+    public function executeIndex()
+    {
+        return $this->renderText('foo');
+    }
 }
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 c8d16b7e2..7bd56d590 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
@@ -3,23 +3,22 @@
 /**
  * view actions.
  *
- * @package    project
- * @subpackage view
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class viewActions extends sfActions
 {
-  public function executeIndex()
-  {
-    $this->setTemplate('foo');
-  }
+    public function executeIndex()
+    {
+        $this->setTemplate('foo');
+    }
 
-  public function executePlain()
-  {
-  }
+    public function executePlain()
+    {
+    }
 
-  public function executeImage()
-  {
-  }
+    public function executeImage()
+    {
+    }
 }
diff --git a/test/functional/fixtures/apps/frontend/templates/layout.iphone.php b/test/functional/fixtures/apps/frontend/templates/layout.iphone.php
index 6d75aa8e4..463bfb71a 100644
--- a/test/functional/fixtures/apps/frontend/templates/layout.iphone.php
+++ b/test/functional/fixtures/apps/frontend/templates/layout.iphone.php
@@ -2,20 +2,20 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 
-<?php echo include_http_metas() ?>
-<?php echo include_metas() ?>
+<?php echo include_http_metas(); ?>
+<?php echo include_metas(); ?>
 
-<?php echo include_title() ?>
+<?php echo include_title(); ?>
 
 <link rel="shortcut icon" href="/favicon.ico" />
 
 
-    <?php include_stylesheets() ?>
-    <?php include_javascripts() ?>
+    <?php include_stylesheets(); ?>
+    <?php include_javascripts(); ?>
 </head>
 <body>
 
-<?php echo $sf_content ?>
+<?php echo $sf_content; ?>
 
 </body>
 </html>
diff --git a/test/functional/fixtures/apps/frontend/templates/layout.php b/test/functional/fixtures/apps/frontend/templates/layout.php
index 6d75aa8e4..463bfb71a 100644
--- a/test/functional/fixtures/apps/frontend/templates/layout.php
+++ b/test/functional/fixtures/apps/frontend/templates/layout.php
@@ -2,20 +2,20 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 
-<?php echo include_http_metas() ?>
-<?php echo include_metas() ?>
+<?php echo include_http_metas(); ?>
+<?php echo include_metas(); ?>
 
-<?php echo include_title() ?>
+<?php echo include_title(); ?>
 
 <link rel="shortcut icon" href="/favicon.ico" />
 
 
-    <?php include_stylesheets() ?>
-    <?php include_javascripts() ?>
+    <?php include_stylesheets(); ?>
+    <?php include_javascripts(); ?>
 </head>
 <body>
 
-<?php echo $sf_content ?>
+<?php echo $sf_content; ?>
 
 </body>
 </html>
diff --git a/test/functional/fixtures/apps/frontend/templates/layout.xml.php b/test/functional/fixtures/apps/frontend/templates/layout.xml.php
index c34fd8087..bbb2e0ec3 100644
--- a/test/functional/fixtures/apps/frontend/templates/layout.xml.php
+++ b/test/functional/fixtures/apps/frontend/templates/layout.xml.php
@@ -1,3 +1,3 @@
 <sentences>
-  <?php echo $sf_content ?>
+  <?php echo $sf_content; ?>
 </sentences>
diff --git a/test/functional/fixtures/apps/i18n/config/i18nConfiguration.class.php b/test/functional/fixtures/apps/i18n/config/i18nConfiguration.class.php
index f3ff11b5f..bf098cfb6 100644
--- a/test/functional/fixtures/apps/i18n/config/i18nConfiguration.class.php
+++ b/test/functional/fixtures/apps/i18n/config/i18nConfiguration.class.php
@@ -2,9 +2,9 @@
 
 class i18nConfiguration extends sfApplicationConfiguration
 {
-  public function setup()
-  {
-    parent::setup();
-    $this->enablePlugins('sfI18NPlugin');
-  }
+    public function setup()
+    {
+        parent::setup();
+        $this->enablePlugins('sfI18NPlugin');
+    }
 }
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 5c34b094f..f18d733f5 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
@@ -3,45 +3,43 @@
 /**
  * i18n actions.
  *
- * @package    project
- * @subpackage i18n
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class i18nActions extends sfActions
 {
-  public function executeIndex()
-  {
-    $i18n = $this->getContext()->getI18N();
+    public function executeIndex()
+    {
+        $i18n = $this->getContext()->getI18N();
 
-    $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->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');
+    }
+
+    public function executeIndexForFr()
+    {
+        // change user culture
+        $this->getUser()->setCulture('fr');
+        $this->getUser()->setCulture('en');
+        $this->getUser()->setCulture('fr');
 
-  public function executeIndexForFr()
-  {
-    // change user culture
-    $this->getUser()->setCulture('fr');
-    $this->getUser()->setCulture('en');
-    $this->getUser()->setCulture('fr');
+        $this->forward('i18n', 'index');
+    }
+
+    public function executeI18nForm(sfWebRequest $request)
+    {
+        $this->form = new I18nForm();
+        if ($request->isMethod('post')) {
+            $this->form->bind($request->getParameter('i18n'));
+        }
+    }
 
-    $this->forward('i18n', 'index');
-  }
-  
-  public function executeI18nForm(sfWebRequest $request)
-  {
-    $this->form = new I18nForm();
-    if ($request->isMethod('post'))
+    public function executeI18nCustomCatalogueForm(sfWebRequest $request)
     {
-      $this->form->bind($request->getParameter('i18n'));
+        $this->form = new I18nCustomCatalogueForm();
+        $this->setTemplate('i18nForm');
     }
-  }
-  
-  public function executeI18nCustomCatalogueForm(sfWebRequest $request)
-  {
-    $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 1ef7ebb8f..f35f55c1e 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,9 +1,10 @@
 <?php
+
 class I18nCustomCatalogueForm extends I18nForm
 {
-  public function configure()
-  {
-    parent::configure();
-    $this->widgetSchema->getFormFormatter()->setTranslationCatalogue('custom');
-  }
+    public function configure()
+    {
+        parent::configure();
+        $this->widgetSchema->getFormFormatter()->setTranslationCatalogue('custom');
+    }
 }
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 c95729a2b..c55f02b4d 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,24 +1,27 @@
 <?php
+
 class I18nForm extends sfForm
 {
-  public function configure()
-  {
-    $this->setWidgets(array(
-      '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->widgetSchema->setLabel('email', 'Email address');
-    $this->widgetSchema->setHelp('first_name', 'Put your first name here');
-    
-    $this->widgetSchema->setNameFormat('i18n[%s]');
-  }
+    public function configure()
+    {
+        $this->setWidgets(array(
+            '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->widgetSchema->setLabel('email', 'Email address');
+        $this->widgetSchema->setHelp('first_name', 'Put your first name here');
+
+        $this->widgetSchema->setNameFormat('i18n[%s]');
+    }
 }
diff --git a/test/functional/fixtures/apps/i18n/modules/i18n/templates/i18nFormSuccess.php b/test/functional/fixtures/apps/i18n/modules/i18n/templates/i18nFormSuccess.php
index 24e723ba0..7d63f5cd8 100644
--- a/test/functional/fixtures/apps/i18n/modules/i18n/templates/i18nFormSuccess.php
+++ b/test/functional/fixtures/apps/i18n/modules/i18n/templates/i18nFormSuccess.php
@@ -1,6 +1,6 @@
-<form action="<?php echo url_for('i18n/i18nForm') ?>" method="post">
+<form action="<?php echo url_for('i18n/i18nForm'); ?>" method="post">
 <table>
-  <?php echo $form ?>
+  <?php echo $form; ?>
   <tr>
     <td><input type="submit" value="Submit" /></td>
   </tr>
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 9b3f811ea..550290c85 100644
--- a/test/functional/fixtures/apps/i18n/modules/i18n/templates/indexSuccess.php
+++ b/test/functional/fixtures/apps/i18n/modules/i18n/templates/indexSuccess.php
@@ -1,13 +1,13 @@
-<?php use_helper('I18N') ?>
+<?php use_helper('I18N'); ?>
 
-<div id="action"><?php echo $test ?></div>
-<div id="template"><?php echo __('an english sentence') ?></div>
+<div id="action"><?php echo $test; ?></div>
+<div id="template"><?php echo __('an english sentence'); ?></div>
 
-<div id="action_local"><?php echo $localTest ?></div>
-<div id="template_local"><?php echo __('a local english sentence') ?></div>
+<div id="action_local"><?php echo $localTest; ?></div>
+<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="action_other"><?php echo $otherTest; ?></div>
+<div id="template_other"><?php echo __('an english sentence', array(), '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="action_other_local"><?php echo $otherLocalTest; ?></div>
+<div id="template_other_local"><?php echo __('a local english sentence', array(), 'other'); ?></div>
diff --git a/test/functional/fixtures/apps/i18n/templates/layout.php b/test/functional/fixtures/apps/i18n/templates/layout.php
index 6d75aa8e4..463bfb71a 100644
--- a/test/functional/fixtures/apps/i18n/templates/layout.php
+++ b/test/functional/fixtures/apps/i18n/templates/layout.php
@@ -2,20 +2,20 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 
-<?php echo include_http_metas() ?>
-<?php echo include_metas() ?>
+<?php echo include_http_metas(); ?>
+<?php echo include_metas(); ?>
 
-<?php echo include_title() ?>
+<?php echo include_title(); ?>
 
 <link rel="shortcut icon" href="/favicon.ico" />
 
 
-    <?php include_stylesheets() ?>
-    <?php include_javascripts() ?>
+    <?php include_stylesheets(); ?>
+    <?php include_javascripts(); ?>
 </head>
 <body>
 
-<?php echo $sf_content ?>
+<?php echo $sf_content; ?>
 
 </body>
 </html>
diff --git a/test/functional/fixtures/config/ProjectConfiguration.class.php b/test/functional/fixtures/config/ProjectConfiguration.class.php
index e9ef1b327..9d3e52ae1 100644
--- a/test/functional/fixtures/config/ProjectConfiguration.class.php
+++ b/test/functional/fixtures/config/ProjectConfiguration.class.php
@@ -5,9 +5,9 @@
 
 class ProjectConfiguration extends sfProjectConfiguration
 {
-  public function setup()
-  {
-    $this->enableAllPluginsExcept(array('sfDoctrinePlugin'));
-    $this->enablePlugins('sfAutoloadPlugin');
-  }
+    public function setup()
+    {
+        $this->enableAllPluginsExcept(array('sfDoctrinePlugin'));
+        $this->enablePlugins('sfAutoloadPlugin');
+    }
 }
diff --git a/test/functional/fixtures/lib/form/BaseForm.class.php b/test/functional/fixtures/lib/form/BaseForm.class.php
index 395d5a061..f7ffaad5e 100644
--- a/test/functional/fixtures/lib/form/BaseForm.class.php
+++ b/test/functional/fixtures/lib/form/BaseForm.class.php
@@ -2,10 +2,9 @@
 
 /**
  * Base project form.
- * 
- * @package    ##PROJECT_NAME##
- * @subpackage form
+ *
  * @author     Your name here
+ *
  * @version    SVN: $Id$
  */
 class BaseForm extends sfFormSymfony
diff --git a/test/functional/fixtures/lib/myLibClass.class.php b/test/functional/fixtures/lib/myLibClass.class.php
index f25d576fa..008ad8d9b 100644
--- a/test/functional/fixtures/lib/myLibClass.class.php
+++ b/test/functional/fixtures/lib/myLibClass.class.php
@@ -2,8 +2,8 @@
 
 class myLibClass
 {
-  static public function ping()
-  {
-    return 'pong';
-  }
+    public static function ping()
+    {
+        return 'pong';
+    }
 }
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 498b15d4b..ebf2a9c5a 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
@@ -2,10 +2,10 @@
 
 class autoloadPluginActions extends sfActions
 {
-  public function executeIndex()
-  {
-    $this->lib1 = myLibClass::ping();
-    $this->lib2 = myAppsFrontendLibClass::ping();
-    $this->lib3 = myPluginsSfAutoloadPluginModulesAutoloadPluginLibClass::ping();
-  }
+    public function executeIndex()
+    {
+        $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 798adb256..5a62975aa 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
@@ -2,8 +2,8 @@
 
 class myPluginsSfAutoloadPluginModulesAutoloadPluginLibClass
 {
-  static public function ping()
-  {
-    return 'pong';
-  }
+    public static function ping()
+    {
+        return 'pong';
+    }
 }
diff --git a/test/functional/fixtures/plugins/sfAutoloadPlugin/modules/autoloadPlugin/templates/indexSuccess.php b/test/functional/fixtures/plugins/sfAutoloadPlugin/modules/autoloadPlugin/templates/indexSuccess.php
index b31a396e6..d7429c6b1 100644
--- a/test/functional/fixtures/plugins/sfAutoloadPlugin/modules/autoloadPlugin/templates/indexSuccess.php
+++ b/test/functional/fixtures/plugins/sfAutoloadPlugin/modules/autoloadPlugin/templates/indexSuccess.php
@@ -1,3 +1,3 @@
-<div id="lib1"><?php echo $lib1 ?></div>
-<div id="lib2"><?php echo $lib2 ?></div>
-<div id="lib3"><?php echo $lib3 ?></div>
+<div id="lib1"><?php echo $lib1; ?></div>
+<div id="lib2"><?php echo $lib2; ?></div>
+<div id="lib3"><?php echo $lib3; ?></div>
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 03c16d8fb..764a65d0a 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
@@ -3,22 +3,21 @@
 /**
  * sfI18NPlugin actions.
  *
- * @package    project
- * @subpackage i18n
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
  */
 class sfI18NPluginActions extends sfActions
 {
-  public function executeIndex()
-  {
-    $i18n = $this->getContext()->getI18N();
+    public function executeIndex()
+    {
+        $i18n = $this->getContext()->getI18N();
 
-    $this->test = $i18n->__('an english sentence from plugin');
-    $this->localTest = $i18n->__('a local english sentence from plugin');
-    $this->otherTest = $i18n->__('another english sentence from plugin');
-    $this->yetAnotherTest = $i18n->__('yet another english sentence from plugin');
+        $this->test = $i18n->__('an english sentence from plugin');
+        $this->localTest = $i18n->__('a local english sentence from plugin');
+        $this->otherTest = $i18n->__('another english sentence from plugin');
+        $this->yetAnotherTest = $i18n->__('yet another english sentence from plugin');
 
-    $this->testForPluginI18N = $i18n->__('an english sentence from plugin - global');
-  }
+        $this->testForPluginI18N = $i18n->__('an english sentence from plugin - global');
+    }
 }
diff --git a/test/functional/fixtures/plugins/sfI18NPlugin/modules/sfI18NPlugin/templates/indexSuccess.php b/test/functional/fixtures/plugins/sfI18NPlugin/modules/sfI18NPlugin/templates/indexSuccess.php
index 1c62e8d36..b39c4b6b4 100644
--- a/test/functional/fixtures/plugins/sfI18NPlugin/modules/sfI18NPlugin/templates/indexSuccess.php
+++ b/test/functional/fixtures/plugins/sfI18NPlugin/modules/sfI18NPlugin/templates/indexSuccess.php
@@ -1,16 +1,16 @@
-<?php use_helper('I18N') ?>
+<?php use_helper('I18N'); ?>
 
-<div id="action"><?php echo $test ?></div>
-<div id="template"><?php echo __('an english sentence from plugin') ?></div>
+<div id="action"><?php echo $test; ?></div>
+<div id="template"><?php echo __('an english sentence from plugin'); ?></div>
 
-<div id="action_local"><?php echo $localTest ?></div>
-<div id="template_local"><?php echo __('a local english sentence from plugin') ?></div>
+<div id="action_local"><?php echo $localTest; ?></div>
+<div id="template_local"><?php echo __('a local english sentence from plugin'); ?></div>
 
-<div id="action_other"><?php echo $otherTest ?></div>
-<div id="template_other"><?php echo __('another english sentence from plugin') ?></div>
+<div id="action_other"><?php echo $otherTest; ?></div>
+<div id="template_other"><?php echo __('another english sentence from plugin'); ?></div>
 
-<div id="action_yetAnother"><?php echo $yetAnotherTest ?></div>
-<div id="template_yetAnother"><?php echo __('yet another english sentence from plugin') ?></div>
+<div id="action_yetAnother"><?php echo $yetAnotherTest; ?></div>
+<div id="template_yetAnother"><?php echo __('yet another english sentence from plugin'); ?></div>
 
-<div id="action_testForPluginI18N"><?php echo $testForPluginI18N ?></div>
-<div id="template_testForPluginI18N"><?php echo __('an english sentence from plugin - global') ?></div>
+<div id="action_testForPluginI18N"><?php echo $testForPluginI18N; ?></div>
+<div id="template_testForPluginI18N"><?php echo __('an english sentence from plugin - global'); ?></div>
diff --git a/test/functional/formatTest.php b/test/functional/formatTest.php
index b401171d6..4857782ef 100644
--- a/test/functional/formatTest.php
+++ b/test/functional/formatTest.php
@@ -3,15 +3,14 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 $app = 'frontend';
-if (!include(__DIR__.'/../bootstrap/functional.php'))
-{
-  return;
+if (!include(__DIR__.'/../bootstrap/functional.php')) {
+    return;
 }
 
 $b = new sfTestBrowser();
diff --git a/test/functional/genericTest.php b/test/functional/genericTest.php
index 3e6544f89..1fcbcc250 100644
--- a/test/functional/genericTest.php
+++ b/test/functional/genericTest.php
@@ -9,9 +9,8 @@
  */
 
 $app = 'frontend';
-if (!include(__DIR__.'/../bootstrap/functional.php'))
-{
-  return;
+if (!include(__DIR__.'/../bootstrap/functional.php')) {
+    return;
 }
 
 $b = new sfTestBrowser();
diff --git a/test/functional/httpcacheTest.php b/test/functional/httpcacheTest.php
index c38cb9bfa..0594310a5 100644
--- a/test/functional/httpcacheTest.php
+++ b/test/functional/httpcacheTest.php
@@ -3,15 +3,14 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 $app = 'cache';
-if (!include(__DIR__.'/../bootstrap/functional.php'))
-{
-  return;
+if (!include(__DIR__.'/../bootstrap/functional.php')) {
+    return;
 }
 
 $b = new sfTestFunctional(new sfBrowser());
diff --git a/test/functional/i18nFormTest.php b/test/functional/i18nFormTest.php
index 645e91508..aa392642c 100644
--- a/test/functional/i18nFormTest.php
+++ b/test/functional/i18nFormTest.php
@@ -3,15 +3,14 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 $app = 'i18n';
-if (!include(__DIR__.'/../bootstrap/functional.php'))
-{
-  return;
+if (!include(__DIR__.'/../bootstrap/functional.php')) {
+    return;
 }
 
 $b = new sfTestBrowser();
diff --git a/test/functional/i18nTest.php b/test/functional/i18nTest.php
index 6cf49b819..5b9ced072 100644
--- a/test/functional/i18nTest.php
+++ b/test/functional/i18nTest.php
@@ -3,41 +3,40 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 $app = 'i18n';
-if (!include(__DIR__.'/../bootstrap/functional.php'))
-{
-  return;
+if (!include(__DIR__.'/../bootstrap/functional.php')) {
+    return;
 }
 
 class myTestBrowser extends sfTestBrowser
 {
-  public function checkResponseForCulture($culture = 'fr')
-  {
-    return $this->
-      with('response')->begin()->
-        // messages in the global directories
-        checkElement('#action', '/une phrase en français/i')->
-        checkElement('#template', '/une phrase en français/i')->
+    public function checkResponseForCulture($culture = 'fr')
+    {
+        return $this->
+          with('response')->begin()->
+            // messages in the global directories
+            checkElement('#action', '/une phrase en français/i')->
+            checkElement('#template', '/une phrase en français/i')->
 
-        // messages in the module directories
-        checkElement('#action_local', '/une phrase locale en français/i')->
-        checkElement('#template_local', '/une phrase locale en français/i')->
+            // messages in the module directories
+            checkElement('#action_local', '/une phrase locale en français/i')->
+            checkElement('#template_local', '/une phrase locale en français/i')->
 
-        // messages in another global catalogue
-        checkElement('#action_other', '/une autre phrase en français/i')->
-        checkElement('#template_other', '/une autre phrase en français/i')->
+            // messages in another global catalogue
+            checkElement('#action_other', '/une autre phrase en français/i')->
+            checkElement('#template_other', '/une autre phrase en français/i')->
 
-        // messages in another module catalogue
-        checkElement('#action_other_local', '/une autre phrase locale en français/i')->
-        checkElement('#template_other_local', '/une autre phrase locale en français/i')->
-      end()
-    ;
-  }
+            // messages in another module catalogue
+            checkElement('#action_other_local', '/une autre phrase locale en français/i')->
+            checkElement('#template_other_local', '/une autre phrase locale en français/i')->
+          end()
+        ;
+    }
 }
 
 $b = new myTestBrowser();
diff --git a/test/functional/prodTest.php b/test/functional/prodTest.php
index 127e88a74..cb50442dd 100644
--- a/test/functional/prodTest.php
+++ b/test/functional/prodTest.php
@@ -3,16 +3,15 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 $app = 'frontend';
 $debug = false;
-if (!include(__DIR__.'/../bootstrap/functional.php'))
-{
-  return;
+if (!include(__DIR__.'/../bootstrap/functional.php')) {
+    return;
 }
 
 $b = new sfTestBrowser();
diff --git a/test/functional/sfTestBrowserTest.php b/test/functional/sfTestBrowserTest.php
index f93f5727a..76c88a2ee 100644
--- a/test/functional/sfTestBrowserTest.php
+++ b/test/functional/sfTestBrowserTest.php
@@ -9,18 +9,18 @@
  */
 
 $app = 'frontend';
-if (!include(__DIR__.'/../bootstrap/functional.php'))
-{
-  return;
+if (!include(__DIR__.'/../bootstrap/functional.php')) {
+    return;
 }
 
 class TestBrowser extends sfTestBrowser
 {
-  public $events = array();
-  public function listen(sfEvent $event)
-  {
-    $this->events[] = $event;
-  }
+    public $events = array();
+
+    public function listen(sfEvent $event)
+    {
+        $this->events[] = $event;
+    }
 }
 
 $b = new TestBrowser();
@@ -105,14 +105,11 @@ public function listen(sfEvent $event)
   end()
 ;
 
-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)
-{
-  $b->test()->pass('The DOM is not accessible if the response content type is not HTML');
+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) {
+    $b->test()->pass('The DOM is not accessible if the response content type is not HTML');
 }
 
 // check response headers
@@ -239,25 +236,18 @@ public function listen(sfEvent $event)
 ;
 
 $b
-  ->getAndCheck('browser', 'redirect1', null, 302)
-
-  ->followRedirect()
-
-  ->with('request')->begin()
+    ->getAndCheck('browser', 'redirect1', null, 302)
+    ->followRedirect()
+    ->with('request')->begin()
     ->isParameter('module', 'browser')
     ->isParameter('action', 'redirectTarget1')
-  ->end()
-
-  ->with('response')->isStatusCode(200)
-
-  ->getAndCheck('browser', 'redirect2', null, 302)
-
-  ->followRedirect()
-
-  ->with('request')->begin()
+    ->end()
+    ->with('response')->isStatusCode(200)
+    ->getAndCheck('browser', 'redirect2', null, 302)
+    ->followRedirect()
+    ->with('request')->begin()
     ->isParameter('module', 'browser')
     ->isParameter('action', 'redirectTarget2')
-  ->end()
-
-  ->with('response')->isStatusCode(200)
+    ->end()
+    ->with('response')->isStatusCode(200)
 ;
diff --git a/test/other/fixtures/task/myPluginTask.class.php b/test/other/fixtures/task/myPluginTask.class.php
index 18efefb9f..4bd4628a9 100644
--- a/test/other/fixtures/task/myPluginTask.class.php
+++ b/test/other/fixtures/task/myPluginTask.class.php
@@ -1,12 +1,14 @@
 <?php
-class myPluginTask extends sfBaseTask 
+
+class myPluginTask extends sfBaseTask
 {
-  public function configure()
-  {
-    $this->namespace = 'p';
-    $this->name = 'run';
-  }
-  public function execute($arguments = array(), $options = array())
-  {
-  }
-}
\ No newline at end of file
+    public function configure()
+    {
+        $this->namespace = 'p';
+        $this->name = 'run';
+    }
+
+    public function execute($arguments = array(), $options = array())
+    {
+    }
+}
diff --git a/test/other/fixtures/test/unit/testTest.php b/test/other/fixtures/test/unit/testTest.php
index c1c6a48e1..1a99b8ad2 100644
--- a/test/other/fixtures/test/unit/testTest.php
+++ b/test/other/fixtures/test/unit/testTest.php
@@ -1,6 +1,6 @@
 <?php
 
-include(__DIR__.'/../bootstrap/unit.php');
+include __DIR__.'/../bootstrap/unit.php';
 
 $t = new lime_test(1);
 
diff --git a/test/other/tasksTest.php b/test/other/tasksTest.php
index 945b4fa18..22c88a4a0 100644
--- a/test/other/tasksTest.php
+++ b/test/other/tasksTest.php
@@ -1,78 +1,78 @@
 <?php
 
 $_test_dir = realpath(__DIR__.'/..');
-require_once($_test_dir.'/../lib/vendor/lime/lime.php');
-require_once($_test_dir.'/../lib/util/sfToolkit.class.php');
+
+require_once $_test_dir.'/../lib/vendor/lime/lime.php';
+
+require_once $_test_dir.'/../lib/util/sfToolkit.class.php';
 
 define('DS', DIRECTORY_SEPARATOR);
 
 class sf_test_project
 {
-  public $php_cli = null;
-  public $tmp_dir = null;
-  public $t = null;
-  public $current_dir = null;
+    public $php_cli;
+    public $tmp_dir;
+    public $t;
+    public $current_dir;
 
-  public function initialize($t)
-  {
-    $this->t = $t;
+    public function initialize($t)
+    {
+        $this->t = $t;
 
-    $this->tmp_dir = sys_get_temp_dir().DS.'sf_test_project';
+        $this->tmp_dir = sys_get_temp_dir().DS.'sf_test_project';
 
-    if (is_dir($this->tmp_dir))
-    {
-      $this->clearTmpDir();
-      rmdir($this->tmp_dir);
-    }
+        if (is_dir($this->tmp_dir)) {
+            $this->clearTmpDir();
+            rmdir($this->tmp_dir);
+        }
 
-    mkdir($this->tmp_dir, 0777);
+        mkdir($this->tmp_dir, 0777);
 
-    $this->current_dir = getcwd();
-    chdir($this->tmp_dir);
+        $this->current_dir = getcwd();
+        chdir($this->tmp_dir);
 
-    $this->php_cli = sfToolkit::getPhpCli();
-  }
+        $this->php_cli = sfToolkit::getPhpCli();
+    }
 
-  public function shutdown()
-  {
-    $this->clearTmpDir();
-    rmdir($this->tmp_dir);
-    chdir($this->current_dir);
-  }
+    public function shutdown()
+    {
+        $this->clearTmpDir();
+        rmdir($this->tmp_dir);
+        chdir($this->current_dir);
+    }
 
-  protected function clearTmpDir()
-  {
-    require_once(__DIR__.'/../../lib/util/sfToolkit.class.php');
-    sfToolkit::clearDirectory($this->tmp_dir);
-  }
+    public function execute_command($cmd, $awaited_return = 0)
+    {
+        chdir($this->tmp_dir);
+        $symfony = file_exists('symfony') ? 'symfony' : __DIR__.'/../../data/bin/symfony';
 
-  public function execute_command($cmd, $awaited_return=0)
-  {
-    chdir($this->tmp_dir);
-    $symfony = file_exists('symfony') ? 'symfony' : __DIR__.'/../../data/bin/symfony';
+        ob_start();
+        passthru(sprintf('%s "%s" %s 2>&1', $this->php_cli, $symfony, $cmd), $return);
+        $content = ob_get_clean();
+        $this->t->cmp_ok($return, '==', $awaited_return, sprintf('"symfony %s" returns awaited value (%d)', $cmd, $awaited_return));
 
-    ob_start();
-    passthru(sprintf('%s "%s" %s 2>&1', $this->php_cli, $symfony, $cmd), $return);
-    $content = ob_get_clean();
-    $this->t->cmp_ok($return, '==', $awaited_return, sprintf('"symfony %s" returns awaited value (%d)', $cmd, $awaited_return));
+        return $content;
+    }
 
-    return $content;
-  }
+    public function get_fixture_content($file)
+    {
+        return str_replace("\r\n", "\n", file_get_contents(__DIR__.'/fixtures/'.$file));
+    }
 
-  public function get_fixture_content($file)
-  {
-    return str_replace("\r\n", "\n", file_get_contents(__DIR__.'/fixtures/'.$file));
-  }
+    protected function clearTmpDir()
+    {
+        require_once __DIR__.'/../../lib/util/sfToolkit.class.php';
+        sfToolkit::clearDirectory($this->tmp_dir);
+    }
 }
 
 $plan = 18;
 $t = new lime_test($plan);
 
-if (!extension_loaded('SQLite') && !extension_loaded('pdo_SQLite'))
-{
-  $t->skip('You need SQLite to run these tests', $plan);
+if (!extension_loaded('SQLite') && !extension_loaded('pdo_SQLite')) {
+    $t->skip('You need SQLite to run these tests', $plan);
 
-  return;
+    return;
 }
 
 $c = new sf_test_project();
@@ -119,12 +119,12 @@ public function get_fixture_content($file)
 mkdir($pluginDir = $c->tmp_dir.DS.'plugins'.DS.'myFooPlugin'.DS.'lib'.DS.'task', 0777, true);
 copy(__DIR__.'/fixtures/task/myPluginTask.class.php', $pluginDir.DS.'myPluginTask.class.php');
 file_put_contents(
-  $projectConfigurationFile = $c->tmp_dir.DS.'config'.DS.'ProjectConfiguration.class.php',
-  str_replace(
-    '$this->enablePlugins(\'sfDoctrinePlugin\')',
-    '$this->enablePlugins(array(\'sfDoctrinePlugin\', \'myFooPlugin\'))',
-    file_get_contents($projectConfigurationFile)
-  )
+    $projectConfigurationFile = $c->tmp_dir.DS.'config'.DS.'ProjectConfiguration.class.php',
+    str_replace(
+        '$this->enablePlugins(\'sfDoctrinePlugin\')',
+        '$this->enablePlugins(array(\'sfDoctrinePlugin\', \'myFooPlugin\'))',
+        file_get_contents($projectConfigurationFile)
+    )
 );
 
 $c->execute_command('p:run');
diff --git a/test/unit/action/sfComponentTest.php b/test/unit/action/sfComponentTest.php
index edbf9b0d7..215245b0e 100644
--- a/test/unit/action/sfComponentTest.php
+++ b/test/unit/action/sfComponentTest.php
@@ -3,25 +3,29 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please component the LICENSE
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
-require_once($_test_dir.'/unit/sfContextMock.class.php');
-require_once($_test_dir.'/unit/sfNoRouting.class.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
+
+require_once $_test_dir.'/unit/sfContextMock.class.php';
+
+require_once $_test_dir.'/unit/sfNoRouting.class.php';
 
 $t = new lime_test(8);
 
 class myComponent extends sfComponent
 {
-  function execute($request) {}
+    public function execute($request)
+    {
+    }
 }
 
 $context = sfContext::getInstance(array(
-  'routing' => 'sfNoRouting',
-  'request' => 'sfWebRequest',
+    'routing' => 'sfNoRouting',
+    'request' => 'sfWebRequest',
 ));
 
 // ->initialize()
@@ -53,6 +57,6 @@ function execute($request) {}
 $t->is($component->foo, array('bar'), '__set() populates component variables');
 
 // new methods via sfEventDispatcher
-require_once($_test_dir.'/unit/sfEventDispatcherTest.class.php');
+require_once $_test_dir.'/unit/sfEventDispatcherTest.class.php';
 $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 b588238fc..7b5df6286 100644
--- a/test/unit/addon/sfPagerTest.php
+++ b/test/unit/addon/sfPagerTest.php
@@ -1,43 +1,48 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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(2);
-class myPager extends sfPager
-{
-  function init() {}
-  function retrieveObject($offset) {}
-  function getResults() 
-  {
-    $this->setNbResults(2);
-    return array("foo", "bar");
-  }
-}
-
-$pager = new myPager("fooClass");
-
-// #8021
-// ->rewind()
-$t->diag('->rewind()');
-$countRuns = 0;
-foreach ($pager as $item)
-{
-  $countRuns++;
-}
-$t->is($countRuns, $pager->count(), 'iterating first time will invoke on all items');
-
-$countRuns = 0;
-$pager->rewind();
-foreach ($pager as $item)
-{
-  $countRuns++;
-}
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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(2);
+class myPager extends sfPager
+{
+    public function init()
+    {
+    }
+
+    public function retrieveObject($offset)
+    {
+    }
+
+    public function getResults()
+    {
+        $this->setNbResults(2);
+
+        return array('foo', 'bar');
+    }
+}
+
+$pager = new myPager('fooClass');
+
+// #8021
+// ->rewind()
+$t->diag('->rewind()');
+$countRuns = 0;
+foreach ($pager as $item) {
+    ++$countRuns;
+}
+$t->is($countRuns, $pager->count(), 'iterating first time will invoke on all items');
+
+$countRuns = 0;
+$pager->rewind();
+foreach ($pager as $item) {
+    ++$countRuns;
+}
 $t->is($countRuns, $pager->count(), '->rewind will allow reiterating');
diff --git a/test/unit/autoload/sfCoreAutoloadTest.php b/test/unit/autoload/sfCoreAutoloadTest.php
index 299b7f099..4d86f6902 100644
--- a/test/unit/autoload/sfCoreAutoloadTest.php
+++ b/test/unit/autoload/sfCoreAutoloadTest.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please component the LICENSE
  * file that was distributed with this source code.
  */
diff --git a/test/unit/autoload/sfSimpleAutoloadTest.php b/test/unit/autoload/sfSimpleAutoloadTest.php
index 0ce066686..a6b02d32b 100644
--- a/test/unit/autoload/sfSimpleAutoloadTest.php
+++ b/test/unit/autoload/sfSimpleAutoloadTest.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please component the LICENSE
  * file that was distributed with this source code.
  */
diff --git a/test/unit/cache/sfAPCCacheTest.php b/test/unit/cache/sfAPCCacheTest.php
index 343a68fac..dcfd902c3 100644
--- a/test/unit/cache/sfAPCCacheTest.php
+++ b/test/unit/cache/sfAPCCacheTest.php
@@ -3,33 +3,31 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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 __DIR__.'/../../bootstrap/unit.php';
 
 $plan = 64;
 $t = new lime_test($plan);
 
-try
-{
-  new sfAPCCache();
-}
-catch (sfInitializationException $e)
-{
-  $t->skip($e->getMessage(), $plan);
-  return;
+try {
+    new sfAPCCache();
+} catch (sfInitializationException $e) {
+    $t->skip($e->getMessage(), $plan);
+
+    return;
 }
 
-if (!ini_get('apc.enable_cli'))
-{
-  $t->skip('APC must be enable on CLI to run these tests', $plan);
-  return;
+if (!ini_get('apc.enable_cli')) {
+    $t->skip('APC must be enable on CLI to run these tests', $plan);
+
+    return;
 }
 
-require_once(__DIR__.'/sfCacheDriverTests.class.php');
+require_once __DIR__.'/sfCacheDriverTests.class.php';
 
 // setup
 sfConfig::set('sf_logging_enabled', false);
diff --git a/test/unit/cache/sfCacheDriverTests.class.php b/test/unit/cache/sfCacheDriverTests.class.php
index 703cc53fb..13e502f1c 100644
--- a/test/unit/cache/sfCacheDriverTests.class.php
+++ b/test/unit/cache/sfCacheDriverTests.class.php
@@ -3,179 +3,174 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 class sfCacheDriverTests
 {
-  static public function launch($t, $cache)
-  {
-    // ->set() ->get() ->has()
-    $t->diag('->set() ->get() ->has()');
-    $data = 'some random data to store in the cache system... (\'"!#/é$£)';
-    $t->ok($cache->set('test', $data, 86400), '->set() returns true if data are stored in cache');
-    $t->is($cache->get('test'), $data, '->get() retrieves data form the cache');
-    $t->is($cache->has('test'), true, '->has() returns true if the cache exists');
-
-    $t->ok($cache->set('test', $data, -10), '->set() takes a lifetime as its third argument');
-    $t->is($cache->get('test', 'default'), 'default', '->get() returns the default value if cache has expired');
-    $t->is($cache->has('test'), false, '->has() returns true if the cache exists');
-
-    $t->is($cache->get('foo'), null, '->get() returns null if the cache does not exist');
-    $t->is($cache->get('foo', 'default'), 'default', '->get() takes a default value as its second argument');
-    $t->is($cache->has('foo'), false, '->has() returns false if the cache does not exist');
-
-    $data = 'another some random data to store in the cache system...';
-    $t->ok($cache->set('test', $data), '->set() overrides previous data stored in the cache');
-    $t->is($cache->get('test'), $data, '->get() retrieves the latest data form the cache');
-
-    $data = false;
-    $t->ok($cache->set('test', $data), '->set() false data are stored in the cache');
-    $t->is($cache->has('test'), true, '->has() returns true if the cache exists with false value');
-    $t->is($cache->get('test'), $data, '->get() retrieves the latest data form the cache');
-	$t->is($cache->get('test', 'foo'), $data, '->get() does not return default value if false is stored');
-
-    $cache->clean();
-    $cache->set('foo', 'foo');
-    $cache->set('foo:bar', 'bar');
-    $cache->set('foo:bar:foo:bar:foo', 'foobar');
-    $t->is($cache->get('foo'), 'foo', '->set() accepts a "namespaced" cache key');
-    $t->is($cache->get('foo:bar'), 'bar', '->set() accepts a "namespaced" cache key');
-    $t->is($cache->get('foo:bar:foo:bar:foo'), 'foobar', '->set() accepts a "namespaced" cache key');
-
-    // ->clean()
-    $t->diag('->clean()');
-    $data = 'some random data to store in the cache system...';
-    $cache->set('foo', $data, -10);
-    $cache->set('bar', $data, 86400);
-
-    $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');
-
-    $cache->set('foo', $data, -10);
-    $cache->set('bar', $data, 86400);
-
-    $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');
-
-    $cache->set('foo', $data, -10);
-    $cache->set('bar', $data, 86400);
-
-    $cache->clean();
-    $t->is($cache->has('foo'), false, '->clean() cleans all cache key if given no argument');
-    $t->is($cache->has('bar'), false, '->clean() cleans all cache key if given no argument');
-
-    $cache->clean();
-    $cache->setOption('automatic_cleaning_factor', 1);
-    $cache->set('foo', $data);
-    $cache->set('foo', $data);
-    $cache->set('foo', $data);
-    $cache->setOption('automatic_cleaning_factor', 1000);
-
-    // ->remove()
-    $t->diag('->remove()');
-    $data = 'some random data to store in the cache system...';
-    $cache->clean();
-    $cache->set('foo', $data);
-    $cache->set('bar', $data);
-
-    $cache->remove('foo');
-    $t->is($cache->has('foo'), false, '->remove() takes a cache key as its first argument');
-    $t->is($cache->get('foo'), null, '->remove() takes a cache key as its first argument');
-    $t->is($cache->has('bar'), true, '->remove() takes a cache key as its first argument');
-
-    // ->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),
-    );
-
-    foreach ($tests as $pattern => $results)
+    public static function launch($t, $cache)
     {
-      $t->diag($pattern);
-
-      $cache->clean();
-
-      $cache->set('foo:bar:foo', 'foo');
-      $cache->set('bar:bar:foo', 'foo');
-      $cache->set('foo:bar:foo1', 'foo');
-      $cache->set('foo:bar:foo:bar', 'foo');
-
-      $cache->removePattern($pattern);
-
-      $t->is($cache->has('foo:bar:foo'), $results[0], '->removePattern() takes a pattern as its first argument');
-      $t->is($cache->has('bar:bar:foo'), $results[1], '->removePattern() takes a pattern as its first argument');
-      $t->is($cache->has('foo:bar:foo1'), $results[2], '->removePattern() takes a pattern as its first argument');
-      $t->is($cache->has('foo:bar:foo:bar'), $results[3], '->removePattern() takes a pattern as its first argument');
-    }
-
-    // ->getTimeout()
-    $t->diag('->getTimeout()');
-    foreach (array(86400, 10) as $lifetime)
-    {
-      $cache->set('foo', 'bar', $lifetime);
-
-      $delta = $cache->getTimeout('foo') - time();
-      $t->ok($delta >= $lifetime - 1 && $delta <= $lifetime, '->getTimeout() returns the timeout time for a given cache key');
+        // ->set() ->get() ->has()
+        $t->diag('->set() ->get() ->has()');
+        $data = 'some random data to store in the cache system... (\'"!#/é$£)';
+        $t->ok($cache->set('test', $data, 86400), '->set() returns true if data are stored in cache');
+        $t->is($cache->get('test'), $data, '->get() retrieves data form the cache');
+        $t->is($cache->has('test'), true, '->has() returns true if the cache exists');
+
+        $t->ok($cache->set('test', $data, -10), '->set() takes a lifetime as its third argument');
+        $t->is($cache->get('test', 'default'), 'default', '->get() returns the default value if cache has expired');
+        $t->is($cache->has('test'), false, '->has() returns true if the cache exists');
+
+        $t->is($cache->get('foo'), null, '->get() returns null if the cache does not exist');
+        $t->is($cache->get('foo', 'default'), 'default', '->get() takes a default value as its second argument');
+        $t->is($cache->has('foo'), false, '->has() returns false if the cache does not exist');
+
+        $data = 'another some random data to store in the cache system...';
+        $t->ok($cache->set('test', $data), '->set() overrides previous data stored in the cache');
+        $t->is($cache->get('test'), $data, '->get() retrieves the latest data form the cache');
+
+        $data = false;
+        $t->ok($cache->set('test', $data), '->set() false data are stored in the cache');
+        $t->is($cache->has('test'), true, '->has() returns true if the cache exists with false value');
+        $t->is($cache->get('test'), $data, '->get() retrieves the latest data form the cache');
+        $t->is($cache->get('test', 'foo'), $data, '->get() does not return default value if false is stored');
+
+        $cache->clean();
+        $cache->set('foo', 'foo');
+        $cache->set('foo:bar', 'bar');
+        $cache->set('foo:bar:foo:bar:foo', 'foobar');
+        $t->is($cache->get('foo'), 'foo', '->set() accepts a "namespaced" cache key');
+        $t->is($cache->get('foo:bar'), 'bar', '->set() accepts a "namespaced" cache key');
+        $t->is($cache->get('foo:bar:foo:bar:foo'), 'foobar', '->set() accepts a "namespaced" cache key');
+
+        // ->clean()
+        $t->diag('->clean()');
+        $data = 'some random data to store in the cache system...';
+        $cache->set('foo', $data, -10);
+        $cache->set('bar', $data, 86400);
+
+        $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');
+
+        $cache->set('foo', $data, -10);
+        $cache->set('bar', $data, 86400);
+
+        $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');
+
+        $cache->set('foo', $data, -10);
+        $cache->set('bar', $data, 86400);
+
+        $cache->clean();
+        $t->is($cache->has('foo'), false, '->clean() cleans all cache key if given no argument');
+        $t->is($cache->has('bar'), false, '->clean() cleans all cache key if given no argument');
+
+        $cache->clean();
+        $cache->setOption('automatic_cleaning_factor', 1);
+        $cache->set('foo', $data);
+        $cache->set('foo', $data);
+        $cache->set('foo', $data);
+        $cache->setOption('automatic_cleaning_factor', 1000);
+
+        // ->remove()
+        $t->diag('->remove()');
+        $data = 'some random data to store in the cache system...';
+        $cache->clean();
+        $cache->set('foo', $data);
+        $cache->set('bar', $data);
+
+        $cache->remove('foo');
+        $t->is($cache->has('foo'), false, '->remove() takes a cache key as its first argument');
+        $t->is($cache->get('foo'), null, '->remove() takes a cache key as its first argument');
+        $t->is($cache->has('bar'), true, '->remove() takes a cache key as its first argument');
+
+        // ->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),
+        );
+
+        foreach ($tests as $pattern => $results) {
+            $t->diag($pattern);
+
+            $cache->clean();
+
+            $cache->set('foo:bar:foo', 'foo');
+            $cache->set('bar:bar:foo', 'foo');
+            $cache->set('foo:bar:foo1', 'foo');
+            $cache->set('foo:bar:foo:bar', 'foo');
+
+            $cache->removePattern($pattern);
+
+            $t->is($cache->has('foo:bar:foo'), $results[0], '->removePattern() takes a pattern as its first argument');
+            $t->is($cache->has('bar:bar:foo'), $results[1], '->removePattern() takes a pattern as its first argument');
+            $t->is($cache->has('foo:bar:foo1'), $results[2], '->removePattern() takes a pattern as its first argument');
+            $t->is($cache->has('foo:bar:foo:bar'), $results[3], '->removePattern() takes a pattern as its first argument');
+        }
+
+        // ->getTimeout()
+        $t->diag('->getTimeout()');
+        foreach (array(86400, 10) as $lifetime) {
+            $cache->set('foo', 'bar', $lifetime);
+
+            $delta = $cache->getTimeout('foo') - time();
+            $t->ok($delta >= $lifetime - 1 && $delta <= $lifetime, '->getTimeout() returns the timeout time for a given cache key');
+        }
+
+        $cache->set('bar', 'foo', -10);
+        $t->is($cache->getTimeout('bar'), 0, '->getTimeout() returns the timeout time for a given cache key');
+
+        foreach (array(86400, 10) as $lifetime) {
+            $cache->setOption('lifetime', $lifetime);
+            $cache->set('foo', 'bar');
+
+            $delta = $cache->getTimeout('foo') - time();
+            $t->ok($delta >= $lifetime - 1 && $delta <= $lifetime, '->getTimeout() returns the timeout time for a given cache key');
+        }
+
+        $t->is($cache->getTimeout('nonexistantkey'), 0, '->getTimeout() returns 0 if the cache key does not exist');
+
+        // ->getLastModified()
+        $t->diag('->getLastModified()');
+        foreach (array(86400, 10) as $lifetime) {
+            $cache->set('bar', 'foo', $lifetime);
+            $now = time();
+            $lastModified = $cache->getLastModified('bar');
+            $t->ok($lastModified >= time() - 1 && $lastModified <= time(), '->getLastModified() returns the last modified time for a given cache key');
+        }
+
+        $cache->set('bar', 'foo', -10);
+        $t->is($cache->getLastModified('bar'), 0, '->getLastModified() returns the last modified time for a given cache key');
+
+        foreach (array(86400, 10) as $lifetime) {
+            $cache->setOption('lifetime', $lifetime);
+            $cache->set('bar', 'foo');
+
+            $now = time();
+            $lastModified = $cache->getLastModified('bar');
+            $t->ok($lastModified >= time() - 1 && $lastModified <= time(), '->getLastModified() returns the last modified time for a given cache key');
+        }
+
+        $t->is($cache->getLastModified('nonexistantkey'), 0, '->getLastModified() returns 0 if the cache key does not exist');
+
+        // ->getMany()
+        $t->diag('->getMany()');
+        $cache->clean();
+
+        $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');
+
+        $cache->clean();
     }
-
-    $cache->set('bar', 'foo', -10);
-    $t->is($cache->getTimeout('bar'), 0, '->getTimeout() returns the timeout time for a given cache key');
-
-    foreach (array(86400, 10) as $lifetime)
-    {
-      $cache->setOption('lifetime', $lifetime);
-      $cache->set('foo', 'bar');
-
-      $delta = $cache->getTimeout('foo') - time();
-      $t->ok($delta >= $lifetime - 1 && $delta <= $lifetime, '->getTimeout() returns the timeout time for a given cache key');
-    }
-
-    $t->is($cache->getTimeout('nonexistantkey'), 0, '->getTimeout() returns 0 if the cache key does not exist');
-
-    // ->getLastModified()
-    $t->diag('->getLastModified()');
-    foreach (array(86400, 10) as $lifetime)
-    {
-      $cache->set('bar', 'foo', $lifetime);
-      $now = time();
-      $lastModified = $cache->getLastModified('bar');
-      $t->ok($lastModified >= time() - 1 && $lastModified <= time(), '->getLastModified() returns the last modified time for a given cache key');
-    }
-
-    $cache->set('bar', 'foo', -10);
-    $t->is($cache->getLastModified('bar'), 0, '->getLastModified() returns the last modified time for a given cache key');
-
-    foreach (array(86400, 10) as $lifetime)
-    {
-      $cache->setOption('lifetime', $lifetime);
-      $cache->set('bar', 'foo');
-
-      $now = time();
-      $lastModified = $cache->getLastModified('bar');
-      $t->ok($lastModified >= time() - 1 && $lastModified <= time(), '->getLastModified() returns the last modified time for a given cache key');
-    }
-
-    $t->is($cache->getLastModified('nonexistantkey'), 0, '->getLastModified() returns 0 if the cache key does not exist');
-
-    // ->getMany()
-    $t->diag('->getMany()');
-    $cache->clean();
-
-    $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');
-
-    $cache->clean();
-  }
 }
diff --git a/test/unit/cache/sfCacheTest.php b/test/unit/cache/sfCacheTest.php
index 8be6dd5e1..4f6dfe76f 100644
--- a/test/unit/cache/sfCacheTest.php
+++ b/test/unit/cache/sfCacheTest.php
@@ -3,23 +3,46 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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 __DIR__.'/../../bootstrap/unit.php';
 
 class myCache extends sfCache
 {
-  public function get($key, $default = null) {}
-  public function has($key) {}
-  public function set($key, $data, $lifetime = null) {}
-  public function remove($key) {}
-  public function clean($mode = sfCache::ALL) {}
-  public function getTimeout($key) {}
-  public function getLastModified($key) {}
-  public function removePattern($pattern, $delimiter = ':') {}
+    public function get($key, $default = null)
+    {
+    }
+
+    public function has($key)
+    {
+    }
+
+    public function set($key, $data, $lifetime = null)
+    {
+    }
+
+    public function remove($key)
+    {
+    }
+
+    public function clean($mode = sfCache::ALL)
+    {
+    }
+
+    public function getTimeout($key)
+    {
+    }
+
+    public function getLastModified($key)
+    {
+    }
+
+    public function removePattern($pattern, $delimiter = ':')
+    {
+    }
 }
 
 class fakeCache
diff --git a/test/unit/cache/sfEAcceleratorCacheTest.php b/test/unit/cache/sfEAcceleratorCacheTest.php
index 7b4f57de5..eec5da301 100644
--- a/test/unit/cache/sfEAcceleratorCacheTest.php
+++ b/test/unit/cache/sfEAcceleratorCacheTest.php
@@ -3,27 +3,25 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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 __DIR__.'/../../bootstrap/unit.php';
 
 $plan = 64;
 $t = new lime_test($plan);
 
-try
-{
-  new sfEAcceleratorCache();
-}
-catch (sfInitializationException $e)
-{
-  $t->skip($e->getMessage(), $plan);
-  return;
+try {
+    new sfEAcceleratorCache();
+} catch (sfInitializationException $e) {
+    $t->skip($e->getMessage(), $plan);
+
+    return;
 }
 
-require_once(__DIR__.'/sfCacheDriverTests.class.php');
+require_once __DIR__.'/sfCacheDriverTests.class.php';
 
 // setup
 sfConfig::set('sf_logging_enabled', false);
diff --git a/test/unit/cache/sfFileCacheTest.php b/test/unit/cache/sfFileCacheTest.php
index 20b5166d1..5b01fc803 100644
--- a/test/unit/cache/sfFileCacheTest.php
+++ b/test/unit/cache/sfFileCacheTest.php
@@ -3,13 +3,14 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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(__DIR__.'/sfCacheDriverTests.class.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
+
+require_once __DIR__.'/sfCacheDriverTests.class.php';
 
 $t = new lime_test(65);
 
@@ -21,14 +22,12 @@
 
 // ->initialize()
 $t->diag('->initialize()');
-try
-{
-  $cache = new sfFileCache();
-  $t->fail('->initialize() throws an sfInitializationException exception if you don\'t pass a "cache_dir" parameter');
-}
-catch (sfInitializationException $e)
-{
-  $t->pass('->initialize() throws an sfInitializationException exception if you don\'t pass a "cache_dir" parameter');
+
+try {
+    $cache = new sfFileCache();
+    $t->fail('->initialize() throws an sfInitializationException exception if you don\'t pass a "cache_dir" parameter');
+} 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));
diff --git a/test/unit/cache/sfFunctionCacheTest.php b/test/unit/cache/sfFunctionCacheTest.php
index 1434bc317..b4f5b4702 100644
--- a/test/unit/cache/sfFunctionCacheTest.php
+++ b/test/unit/cache/sfFunctionCacheTest.php
@@ -3,81 +3,82 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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(__DIR__.'/sfCacheDriverTests.class.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
+
+require_once __DIR__.'/sfCacheDriverTests.class.php';
 
 $t = new lime_test(15);
 
 class sfSimpleCache extends sfCache
 {
-  public $data = array();
-
-  public function get($key, $default = null)
-  {
-    return isset($this->data[$key]) ? $this->data[$key] : $default;
-  }
-
-  public function set($key, $data, $lifetime = null)
-  {
-    $this->data[$key] = $data;
-  }
-
-  public function remove($key)
-  {
-    unset($this->data[$key]);
-  }
-
-  public function removePattern($pattern, $delimiter = ':')
-  {
-    $this->data = array();
-  }
-
-  public function has($key)
-  {
-    return isset($this->data[$key]);
-  }
-
-  public function clean($mode = sfCache::ALL)
-  {
-    $this->data = array();
-  }
-
-  public function getLastModified($key)
-  {
-    return 0;
-  }
-
-  public function getTimeout($key)
-  {
-    return 0;
-  }
+    public $data = array();
+
+    public function get($key, $default = null)
+    {
+        return isset($this->data[$key]) ? $this->data[$key] : $default;
+    }
+
+    public function set($key, $data, $lifetime = null)
+    {
+        $this->data[$key] = $data;
+    }
+
+    public function remove($key)
+    {
+        unset($this->data[$key]);
+    }
+
+    public function removePattern($pattern, $delimiter = ':')
+    {
+        $this->data = array();
+    }
+
+    public function has($key)
+    {
+        return isset($this->data[$key]);
+    }
+
+    public function clean($mode = sfCache::ALL)
+    {
+        $this->data = array();
+    }
+
+    public function getLastModified($key)
+    {
+        return 0;
+    }
+
+    public function getTimeout($key)
+    {
+        return 0;
+    }
 }
 
 class testFunctionCache
 {
-  static $count = 0;
+    public static $count = 0;
 
-  static function test($arg1, $arg2)
-  {
-    ++self::$count;
+    public static function test($arg1, $arg2)
+    {
+        ++self::$count;
 
-    return $arg1.$arg2;
-  }
+        return $arg1.$arg2;
+    }
 }
 
 $count = 0;
 function testFunctionCache($arg1, $arg2)
 {
-  global $count;
+    global $count;
 
-  ++$count;
+    ++$count;
 
-  return $arg1.$arg2;
+    return $arg1.$arg2;
 }
 
 // ->call()
diff --git a/test/unit/cache/sfMemcacheCacheTest.php b/test/unit/cache/sfMemcacheCacheTest.php
index ceba9b39e..241f604ba 100644
--- a/test/unit/cache/sfMemcacheCacheTest.php
+++ b/test/unit/cache/sfMemcacheCacheTest.php
@@ -8,40 +8,39 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $plan = 73;
 $t = new lime_test($plan);
 
-if (!class_exists('Memcache'))
-{
-  $t->skip('Memcache needed to run these tests', $plan);
-  return;
+if (!class_exists('Memcache')) {
+    $t->skip('Memcache needed to run these tests', $plan);
+
+    return;
 }
 
-require_once(__DIR__.'/sfCacheDriverTests.class.php');
+require_once __DIR__.'/sfCacheDriverTests.class.php';
 
 // setup
 sfConfig::set('sf_logging_enabled', false);
 
 // ->initialize()
 $t->diag('->initialize()');
-try
-{
-  $memcachedHost = getenv('MEMCACHED_HOST');
-  if (!$memcachedHost) {
-    $memcachedHost = null;
-  }
 
-  $cache = new sfMemcacheCache(array(
-    'storeCacheInfo' => true,
-    'host' => $memcachedHost,
-  ));
-}
-catch (sfInitializationException $e)
-{
-  $t->skip('Memcached must be active to run these tests', $plan);
-  return;
+try {
+    $memcachedHost = getenv('MEMCACHED_HOST');
+    if (!$memcachedHost) {
+        $memcachedHost = null;
+    }
+
+    $cache = new sfMemcacheCache(array(
+        'storeCacheInfo' => true,
+        'host' => $memcachedHost,
+    ));
+} catch (sfInitializationException $e) {
+    $t->skip('Memcached must be active to run these tests', $plan);
+
+    return;
 }
 
 sfCacheDriverTests::launch($t, $cache);
@@ -55,10 +54,10 @@
 $cache->set('test_2', 'abc');
 $cache->remove('test_1');
 $cacheInfo = $backend->get($prefix.'_metadata');
-$t->ok(is_array($cacheInfo),'Cache info is an array');
-$t->is(count($cacheInfo),1,'Cache info contains 1 element');
-$t->ok(!in_array($prefix.'test_1',$cacheInfo),'Cache info no longer contains the removed key');
-$t->ok(in_array($prefix.'test_2',$cacheInfo),'Cache info still contains the key that was not removed');
+$t->ok(is_array($cacheInfo), 'Cache info is an array');
+$t->is(count($cacheInfo), 1, 'Cache info contains 1 element');
+$t->ok(!in_array($prefix.'test_1', $cacheInfo), 'Cache info no longer contains the removed key');
+$t->ok(in_array($prefix.'test_2', $cacheInfo), 'Cache info still contains the key that was not removed');
 
 // ->removePattern() test for ticket #6220
 $t->diag('->removePattern() test for ticket #6220');
@@ -70,8 +69,8 @@
 $cache->set('test3', 'abc');
 $cache->removePattern('test_*');
 $cacheInfo = $backend->get($prefix.'_metadata');
-$t->ok(is_array($cacheInfo),'Cache info is an array');
-$t->is(count($cacheInfo),1,'Cache info contains 1 element');
-$t->ok(!in_array($prefix.'test_1',$cacheInfo),'Cache info no longer contains the key that matches the pattern (first key)');
-$t->ok(!in_array($prefix.'test_2',$cacheInfo),'Cache info no longer contains the key that matches the pattern (second key)');
-$t->ok(in_array($prefix.'test3',$cacheInfo),'Cache info still contains the key that did not match the pattern (third key)');
+$t->ok(is_array($cacheInfo), 'Cache info is an array');
+$t->is(count($cacheInfo), 1, 'Cache info contains 1 element');
+$t->ok(!in_array($prefix.'test_1', $cacheInfo), 'Cache info no longer contains the key that matches the pattern (first key)');
+$t->ok(!in_array($prefix.'test_2', $cacheInfo), 'Cache info no longer contains the key that matches the pattern (second key)');
+$t->ok(in_array($prefix.'test3', $cacheInfo), 'Cache info still contains the key that did not match the pattern (third key)');
diff --git a/test/unit/cache/sfNoCacheTest.php b/test/unit/cache/sfNoCacheTest.php
index 144a638a8..764b5fd31 100644
--- a/test/unit/cache/sfNoCacheTest.php
+++ b/test/unit/cache/sfNoCacheTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(8);
 
diff --git a/test/unit/cache/sfSQLiteCacheTest.php b/test/unit/cache/sfSQLiteCacheTest.php
index e0d82302d..e79acde67 100644
--- a/test/unit/cache/sfSQLiteCacheTest.php
+++ b/test/unit/cache/sfSQLiteCacheTest.php
@@ -3,43 +3,40 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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(__DIR__.'/sfCacheDriverTests.class.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
+
+require_once __DIR__.'/sfCacheDriverTests.class.php';
 
 $plan = 129;
 $t = new lime_test($plan);
 
-if (!extension_loaded('SQLite') && !extension_loaded('pdo_SQLite')) 
-{
-  $t->skip('SQLite extension not loaded, skipping tests', $plan);
-  return;
-}
+if (!extension_loaded('SQLite') && !extension_loaded('pdo_SQLite')) {
+    $t->skip('SQLite extension not loaded, skipping tests', $plan);
 
-try
-{
-  new sfSQLiteCache(array('database' => ':memory:'));
+    return;
 }
-catch (sfInitializationException $e)
-{
-  $t->skip($e->getMessage(), $plan);
-  return;
+
+try {
+    new sfSQLiteCache(array('database' => ':memory:'));
+} catch (sfInitializationException $e) {
+    $t->skip($e->getMessage(), $plan);
+
+    return;
 }
 
 // ->initialize()
 $t->diag('->initialize()');
-try
-{
-  $cache = new sfSQLiteCache();
-  $t->fail('->initialize() throws an sfInitializationException exception if you don\'t pass a "database" parameter');
-}
-catch (sfInitializationException $e)
-{
-  $t->pass('->initialize() throws an sfInitializationException exception if you don\'t pass a "database" parameter');
+
+try {
+    $cache = new sfSQLiteCache();
+    $t->fail('->initialize() throws an sfInitializationException exception if you don\'t pass a "database" parameter');
+} catch (sfInitializationException $e) {
+    $t->pass('->initialize() throws an sfInitializationException exception if you don\'t pass a "database" parameter');
 }
 
 // database in memory
diff --git a/test/unit/cache/sfXCacheCacheTest.php b/test/unit/cache/sfXCacheCacheTest.php
index fbe5cd94c..e0d37b030 100644
--- a/test/unit/cache/sfXCacheCacheTest.php
+++ b/test/unit/cache/sfXCacheCacheTest.php
@@ -3,27 +3,25 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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 __DIR__.'/../../bootstrap/unit.php';
 
 $plan = 64;
 $t = new lime_test($plan);
 
-try
-{
-  new sfXCacheCache();
-}
-catch (sfInitializationException $e)
-{
-  $t->skip($e->getMessage(), $plan);
-  return;
+try {
+    new sfXCacheCache();
+} catch (sfInitializationException $e) {
+    $t->skip($e->getMessage(), $plan);
+
+    return;
 }
 
-require_once(__DIR__.'/sfCacheDriverTests.class.php');
+require_once __DIR__.'/sfCacheDriverTests.class.php';
 
 // setup
 sfConfig::set('sf_logging_enabled', false);
diff --git a/test/unit/command/sfCommandArgumentSetTest.php b/test/unit/command/sfCommandArgumentSetTest.php
index fc36b2f88..f18712eb6 100644
--- a/test/unit/command/sfCommandArgumentSetTest.php
+++ b/test/unit/command/sfCommandArgumentSetTest.php
@@ -3,12 +3,12 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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 __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(21);
 
@@ -51,39 +51,32 @@
 $t->is($argumentSet->getArguments(), array('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)
-{
-  $t->pass('->addArgument() throws a sfCommandException if another argument is already registered with the same name');
+try {
+    $argumentSet->addArgument($foo1);
+    $t->fail('->addArgument() throws a sfCommandException if another argument is already registered with the same name');
+} 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));
-try
-{
-  $argumentSet->addArgument(new sfCommandArgument('anotherbar'));
-  $t->fail('->addArgument() throws a sfCommandException if there is an array parameter already registered');
-}
-catch (sfCommandException $e)
-{
-  $t->pass('->addArgument() throws a sfCommandException if there is an array parameter already registered');
+
+try {
+    $argumentSet->addArgument(new sfCommandArgument('anotherbar'));
+    $t->fail('->addArgument() throws a sfCommandException if there is an array parameter already registered');
+} 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->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)
-{
-  $t->pass('->addArgument() throws an exception if you try to add a required argument after an optional one');
+
+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) {
+    $t->pass('->addArgument() throws an exception if you try to add a required argument after an optional one');
 }
 
 // ->getArgument()
@@ -91,14 +84,12 @@
 $argumentSet = new sfCommandArgumentSet();
 $argumentSet->addArguments(array($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)
-{
-  $t->pass('->getArgument() throws an exception if the Argument name does not exist');
+
+try {
+    $argumentSet->getArgument('bar');
+    $t->fail('->getArgument() throws an exception if the Argument name does not exist');
+} catch (sfCommandException $e) {
+    $t->pass('->getArgument() throws an exception if the Argument name does not exist');
 }
 
 // ->hasArgument()
@@ -128,15 +119,15 @@
 $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),
-//  new sfCommandArgument('foo4', sfCommandArgument::OPTIONAL | sfCommandArgument::IS_ARRAY, '', array(1, 2)),
+    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)),
+    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');
diff --git a/test/unit/command/sfCommandArgumentTest.php b/test/unit/command/sfCommandArgumentTest.php
index 892f4b776..97ea2f8a2 100644
--- a/test/unit/command/sfCommandArgumentTest.php
+++ b/test/unit/command/sfCommandArgumentTest.php
@@ -3,12 +3,12 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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 __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(16);
 
@@ -30,14 +30,11 @@
 $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');
-  $t->fail('__construct() throws an sfCommandException if the mode is not valid');
-}
-catch (sfCommandException $e)
-{
-  $t->pass('__construct() throws an sfCommandException if the mode is not valid');
+try {
+    $argument = new sfCommandArgument('foo', 'ANOTHER_ONE');
+    $t->fail('__construct() throws an sfCommandException if the mode is not valid');
+} catch (sfCommandException $e) {
+    $t->pass('__construct() throws an sfCommandException if the mode is not valid');
 }
 
 // ->isArray()
@@ -71,24 +68,18 @@
 $argument->setDefault(array(1, 2));
 $t->is($argument->getDefault(), array(1, 2), '->setDefault() changes the default value');
 
-try
-{
-  $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)
-{
-  $t->pass('->setDefault() throws an sfCommandException if you give a default value for a required argument');
+try {
+    $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) {
+    $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->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)
-{
-  $t->pass('->setDefault() throws an sfCommandException if you give a default value which is not an array for a IS_ARRAY option');
+try {
+    $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) {
+    $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 67d1676c3..2e78ff6e8 100644
--- a/test/unit/command/sfCommandManagerTest.php
+++ b/test/unit/command/sfCommandManagerTest.php
@@ -3,12 +3,12 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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 __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(41);
 
@@ -45,40 +45,40 @@
 // ->process()
 $t->diag('->process()');
 $argumentSet = new sfCommandArgumentSet(array(
-  new sfCommandArgument('foo1', sfCommandArgument::REQUIRED),
-  new sfCommandArgument('foo2', sfCommandArgument::OPTIONAL | sfCommandArgument::IS_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'),
+    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(
-  'foo1' => true,
-  'foo2' => true,
-  'foo3' => 'default3',
-  'foo4' => 'foo4',
-  'foo5' => 'foo5',
-  'foo6' => 'foo6 foo6',
-  'foo7' => 'foo7',
-  'foo8' => array('foo', 'bar'),
-  'foo9' => 'default9',
-  'foo10' => 'foo10',
-  'foo11' => 'foo11',
+    'foo1' => true,
+    'foo2' => true,
+    'foo3' => 'default3',
+    'foo4' => 'foo4',
+    'foo5' => 'foo5',
+    'foo6' => 'foo6 foo6',
+    'foo7' => 'foo7',
+    'foo8' => array('foo', 'bar'),
+    'foo9' => 'default9',
+    'foo10' => 'foo10',
+    'foo11' => 'foo11',
 );
 $arguments = array(
-  'foo1' => 'foo1',
-  'foo2' => array('foo2', 'foo3', 'foo4')
+    'foo1' => 'foo1',
+    'foo2' => array('foo2', 'foo3', 'foo4'),
 );
 $t->ok($manager->isValid(), '->process() processes CLI options');
 $t->is($manager->getOptionValues(), $options, '->process() processes CLI options');
@@ -86,36 +86,28 @@
 
 // ->getOptionValue()
 $t->diag('->getOptionValue()');
-foreach ($options as $name => $value)
-{
-  $t->is($manager->getOptionValue($name), $value, '->getOptionValue() returns the value for the given option name');
+foreach ($options as $name => $value) {
+    $t->is($manager->getOptionValue($name), $value, '->getOptionValue() returns the value for the given option name');
 }
 
-try
-{
-  $manager->getOptionValue('nonexistant');
-  $t->fail('->getOptionValue() throws a sfCommandException if the option name does not exist');
-}
-catch (sfCommandException $e)
-{
-  $t->pass('->getOptionValue() throws a sfCommandException if the option name does not exist');
+try {
+    $manager->getOptionValue('nonexistant');
+    $t->fail('->getOptionValue() throws a sfCommandException if the option name does not exist');
+} catch (sfCommandException $e) {
+    $t->pass('->getOptionValue() throws a sfCommandException if the option name does not exist');
 }
 
 // ->getArgumentValue()
 $t->diag('->getArgumentValue()');
-foreach ($arguments as $name => $value)
-{
-  $t->is($manager->getArgumentValue($name), $value, '->getArgumentValue() returns the value for the given argument name');
+foreach ($arguments as $name => $value) {
+    $t->is($manager->getArgumentValue($name), $value, '->getArgumentValue() returns the value for the given argument name');
 }
 
-try
-{
-  $manager->getArgumentValue('nonexistant');
-  $t->fail('->getArgumentValue() throws a sfCommandException if the argument name does not exist');
-}
-catch (sfCommandException $e)
-{
-  $t->pass('->getArgumentValue() throws a sfCommandException if the argument name does not exist');
+try {
+    $manager->getArgumentValue('nonexistant');
+    $t->fail('->getArgumentValue() throws a sfCommandException if the argument name does not exist');
+} catch (sfCommandException $e) {
+    $t->pass('->getArgumentValue() throws a sfCommandException if the argument name does not exist');
 }
 
 // ->isValid() ->getErrors()
diff --git a/test/unit/command/sfCommandOptionSetTest.php b/test/unit/command/sfCommandOptionSetTest.php
index 5e26d5e37..b69f523cc 100644
--- a/test/unit/command/sfCommandOptionSetTest.php
+++ b/test/unit/command/sfCommandOptionSetTest.php
@@ -3,12 +3,12 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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 __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(20);
 
@@ -32,14 +32,12 @@
 $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');
-try
-{
-  $optionSet->getOptionForShortcut('f');
-  $t->fail('->setOptions() clears all sfCommandOption objects');
-}
-catch (sfCommandException $e)
-{
-  $t->pass('->setOptions() clears all sfCommandOption objects');
+
+try {
+    $optionSet->getOptionForShortcut('f');
+    $t->fail('->setOptions() clears all sfCommandOption objects');
+} catch (sfCommandException $e) {
+    $t->pass('->setOptions() clears all sfCommandOption objects');
 }
 
 // ->addOptions()
@@ -57,23 +55,19 @@
 $t->is($optionSet->getOptions(), array('foo' => $foo), '->addOption() adds a sfCommandOption object');
 $optionSet->addOption($bar);
 $t->is($optionSet->getOptions(), array('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)
-{
-  $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');
+
+try {
+    $optionSet->addOption($foo2);
+    $t->fail('->addOption() throws a sfCommandException if the another option is already registered with the same name');
+} catch (sfCommandException $e) {
+    $t->pass('->addOption() throws a sfCommandException if the another option is already registered with the same name');
 }
-catch (sfCommandException $e)
-{
-  $t->pass('->addOption() throws a sfCommandException if the another option is already registered with the same shortcut');
+
+try {
+    $optionSet->addOption($foo1);
+    $t->fail('->addOption() throws a sfCommandException if the another option is already registered with the same shortcut');
+} catch (sfCommandException $e) {
+    $t->pass('->addOption() throws a sfCommandException if the another option is already registered with the same shortcut');
 }
 
 // ->getOption()
@@ -81,14 +75,12 @@
 $optionSet = new sfCommandOptionSet();
 $optionSet->addOptions(array($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)
-{
-  $t->pass('->getOption() throws an exception if the option name does not exist');
+
+try {
+    $optionSet->getOption('bar');
+    $t->fail('->getOption() throws an exception if the option name does not exist');
+} catch (sfCommandException $e) {
+    $t->pass('->getOption() throws an exception if the option name does not exist');
 }
 
 // ->hasOption()
@@ -110,35 +102,33 @@
 $optionSet = new sfCommandOptionSet();
 $optionSet->addOptions(array($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)
-{
-  $t->pass('->getOption() throws an exception if the shortcut does not exist');
+
+try {
+    $optionSet->getOptionForShortcut('l');
+    $t->fail('->getOption() throws an exception if the shortcut does not exist');
+} 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)),
+    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(
-  'foo1' => null,
-  'foo2' => null,
-  'foo3' => 'default',
-  'foo4' => null,
-  'foo5' => 'default',
-  'foo6' => array(),
-  'foo7' => array(1, 2),
+    'foo1' => null,
+    'foo2' => null,
+    'foo3' => 'default',
+    'foo4' => null,
+    'foo5' => 'default',
+    'foo6' => array(),
+    'foo7' => array(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 c9cb32d9e..8a8cc8e53 100644
--- a/test/unit/command/sfCommandOptionTest.php
+++ b/test/unit/command/sfCommandOptionTest.php
@@ -3,12 +3,12 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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 __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(34);
 
@@ -51,14 +51,11 @@
 $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');
-  $t->fail('__construct() throws an sfCommandException if the mode is not valid');
-}
-catch (sfCommandException $e)
-{
-  $t->pass('__construct() throws an sfCommandException if the mode is not valid');
+try {
+    $option = new sfCommandOption('foo', 'f', 'ANOTHER_ONE');
+    $t->fail('__construct() throws an sfCommandException if the mode is not valid');
+} catch (sfCommandException $e) {
+    $t->pass('__construct() throws an sfCommandException if the mode is not valid');
 }
 
 // ->isArray()
@@ -90,7 +87,7 @@
 $t->is($option->getDefault(), array(), '->getDefault() returns an empty array if option is an array');
 
 $option = new sfCommandOption('foo', null, sfCommandOption::PARAMETER_NONE);
-$t->ok($option->getDefault() === false, '->getDefault() returns false if the option does not take a parameter');
+$t->ok(false === $option->getDefault(), '->getDefault() returns false if the option does not take a parameter');
 
 // ->setDefault()
 $t->diag('->setDefault()');
@@ -104,24 +101,18 @@
 $option->setDefault(array(1, 2));
 $t->is($option->getDefault(), array(1, 2), '->setDefault() changes the default value');
 
-try
-{
-  $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)
-{
-  $t->pass('->setDefault() throws an sfCommandException if you give a default value for a PARAMETER_NONE option');
+try {
+    $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) {
+    $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->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)
-{
-  $t->pass('->setDefault() throws an sfCommandException if you give a default value which is not an array for a IS_ARRAY option');
+try {
+    $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) {
+    $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 9c67bf939..eb21987f4 100644
--- a/test/unit/config/sfCompileConfigHandlerTest.php
+++ b/test/unit/config/sfCompileConfigHandlerTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(2);
 
@@ -21,8 +21,8 @@
 
 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');
+$t->ok(false !== strpos($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');
+$t->ok(false !== strpos($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 c90d804cd..f04a4d2c8 100644
--- a/test/unit/config/sfConfigHandlerTest.php
+++ b/test/unit/config/sfConfigHandlerTest.php
@@ -3,18 +3,20 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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 __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(8);
 
 class myConfigHandler extends sfConfigHandler
 {
-  public function execute($configFiles) {}
+    public function execute($configFiles)
+    {
+    }
 }
 
 $config = new myConfigHandler();
@@ -34,10 +36,10 @@ public function execute($configFiles) {}
 
 sfConfig::set('foo', 'bar');
 $value = array(
-  'foo' => 'my value with a %foo% constant',
-  'bar' => array(
     'foo' => 'my value with a %foo% constant',
-  ),
+    'bar' => array(
+        'foo' => 'my value with a %foo% constant',
+    ),
 );
 $value = sfConfigHandler::replaceConstants($value);
 $t->is($value['foo'], 'my value with a bar constant', '::replaceConstants() replaces constants in arrays recursively');
@@ -45,7 +47,7 @@ public function execute($configFiles) {}
 
 // ->getParameterHolder()
 $t->diag('->getParameterHolder()');
-$t->isa_ok($config->getParameterHolder(), 'sfParameterHolder', "->getParameterHolder() returns a parameter holder instance");
+$t->isa_ok($config->getParameterHolder(), 'sfParameterHolder', '->getParameterHolder() returns a parameter holder instance');
 
 // ->replacePath()
 $t->diag('->replacePath()');
diff --git a/test/unit/config/sfConfigTest.php b/test/unit/config/sfConfigTest.php
index ebcc6d332..bf2f53e17 100644
--- a/test/unit/config/sfConfigTest.php
+++ b/test/unit/config/sfConfigTest.php
@@ -3,12 +3,12 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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 __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(9);
 
diff --git a/test/unit/config/sfDefineEnvironmentConfigHandlerTest.php b/test/unit/config/sfDefineEnvironmentConfigHandlerTest.php
index 8436bfbea..a7c17841f 100644
--- a/test/unit/config/sfDefineEnvironmentConfigHandlerTest.php
+++ b/test/unit/config/sfDefineEnvironmentConfigHandlerTest.php
@@ -3,12 +3,12 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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 __DIR__.'/../../bootstrap/unit.php';
 
 sfConfig::set('sf_symfony_lib_dir', realpath(__DIR__.'/../../../lib'));
 
@@ -21,8 +21,8 @@
 $dir = __DIR__.DIRECTORY_SEPARATOR.'fixtures'.DIRECTORY_SEPARATOR.'sfDefineEnvironmentConfigHandler'.DIRECTORY_SEPARATOR;
 
 $files = array(
-  $dir.'prefix_default.yml',
-  $dir.'prefix_all.yml',
+    $dir.'prefix_default.yml',
+    $dir.'prefix_all.yml',
 );
 
 sfConfig::set('sf_environment', 'prod');
diff --git a/test/unit/config/sfFilterConfigHandlerTest.php b/test/unit/config/sfFilterConfigHandlerTest.php
index 00e69d5a4..14b42ef29 100644
--- a/test/unit/config/sfFilterConfigHandlerTest.php
+++ b/test/unit/config/sfFilterConfigHandlerTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(8);
 
@@ -20,58 +20,48 @@
 // parse errors
 $t->diag('parse errors');
 $files = array(
-  $dir.'no_class.yml',
+    $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)
-{
-  $t->like($e->getMessage(), '/with missing class key/', 'filters.yml must have a "class" section for each filter entry');
+try {
+    $data = $handler->execute($files);
+    $t->fail('filters.yml must have a "class" section for each filter entry');
+} 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(
-    $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)
-  {
-    $t->like($e->getMessage(), sprintf('/must register a filter of type "%s"/', $key), sprintf('filters.yml must have a filter of type "%s"', $key));
-  }
+foreach (array('execution', 'rendering') as $key) {
+    $files = array(
+        $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) {
+        $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(
-  $dir.'default_filters.yml',
-  $dir.'not_disabled.yml',
+    $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)
-{
-  $t->like($e->getMessage(), '/but not present/', 'filters.yml must keep all filters when inheriting from a master filters configuration file');
+try {
+    $data = $handler->execute($files);
+    $t->fail('filters.yml must keep all filters when inheriting from a master filters configuration file');
+} 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(
-  $dir.'disable.yml',
+    $dir.'disable.yml',
 );
 
 $t->unlike($handler->execute($files), '/defaultFilterClass/', 'you can disable a filter by settings "enabled" to false');
@@ -79,7 +69,7 @@
 // condition support
 $t->diag('condition support');
 $files = array(
-  $dir.'condition.yml',
+    $dir.'condition.yml',
 );
 
 sfConfig::set('default_test', true);
@@ -91,8 +81,8 @@
 // usual configuration
 $t->diag('usual configuration');
 $files = array(
-  $dir.'default_filters.yml',
-  $dir.'filters.yml',
+    $dir.'default_filters.yml',
+    $dir.'filters.yml',
 );
 
 $data = $handler->execute($files);
diff --git a/test/unit/config/sfGeneratorConfigHandlerTest.php b/test/unit/config/sfGeneratorConfigHandlerTest.php
index feaa01bbe..864427f7b 100644
--- a/test/unit/config/sfGeneratorConfigHandlerTest.php
+++ b/test/unit/config/sfGeneratorConfigHandlerTest.php
@@ -3,12 +3,12 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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 __DIR__.'/../../bootstrap/unit.php';
 
 sfConfig::set('sf_symfony_lib_dir', realpath(__DIR__.'/../../../lib'));
 
@@ -21,76 +21,61 @@
 
 $t->diag('parse errors');
 $files = array(
-  $dir.'empty.yml',
-  $dir.'no_generator_class.yml',
+    $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)
-{
-  $t->like($e->getMessage(), '/must specify a generator class section under the generator section/', 'generator.yml must have a "class" section');
+try {
+    $data = $handler->execute($files);
+    $t->fail('generator.yml must have a "class" section');
+} 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(
-  $dir.'empty.yml',
-  $dir.'no_generator_section.yml',
+    $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)
-{
-  $t->like($e->getMessage(), '/must specify a generator section/', 'generator.yml must have a "generator" section');
+try {
+    $data = $handler->execute($files);
+    $t->fail('generator.yml must have a "generator" section');
+} catch (sfParseException $e) {
+    $t->like($e->getMessage(), '/must specify a generator section/', 'generator.yml must have a "generator" section');
 }
 
 $files = array(
-  $dir.'empty.yml',
-  $dir.'root_fields_section.yml',
+    $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)
-{
-  $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"');
+try {
+    $data = $handler->execute($files);
+    $t->fail('generator.yml can have a "fields" section but only under "param"');
+} 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(
-  $dir.'empty.yml',
-  $dir.'root_list_section.yml',
+    $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)
-{
-  $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"');
+try {
+    $data = $handler->execute($files);
+    $t->fail('generator.yml can have a "list" section but only under "param"');
+} 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(
-  $dir.'empty.yml',
-  $dir.'root_edit_section.yml',
+    $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)
-{
-  $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"');
+try {
+    $data = $handler->execute($files);
+    $t->fail('generator.yml can have a "edit" section but only under "param"');
+} 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 2f592d9ea..565305711 100644
--- a/test/unit/config/sfPluginConfigurationTest.php
+++ b/test/unit/config/sfPluginConfigurationTest.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -19,10 +19,10 @@
 
 class ProjectConfiguration extends sfProjectConfiguration
 {
-  public function setup()
-  {
-    $this->enablePlugins('sfAutoloadPlugin');
-  }
+    public function setup()
+    {
+        $this->enablePlugins('sfAutoloadPlugin');
+    }
 }
 
 // ->guessRootDir() ->guessName()
diff --git a/test/unit/config/sfProjectConfigurationTest.php b/test/unit/config/sfProjectConfigurationTest.php
index b28259b47..0cd354d20 100644
--- a/test/unit/config/sfProjectConfigurationTest.php
+++ b/test/unit/config/sfProjectConfigurationTest.php
@@ -3,22 +3,22 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.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 __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(6);
 
 class ProjectConfiguration extends sfProjectConfiguration
 {
-  public function setup()
-  {
-    $this->enablePlugins(array('sfAutoloadPlugin', 'sfConfigPlugin'));
-    $this->setPluginPath('sfConfigPlugin', $this->rootDir.'/lib/plugins/sfConfigPlugin');
-  }
+    public function setup()
+    {
+        $this->enablePlugins(array('sfAutoloadPlugin', 'sfConfigPlugin'));
+        $this->setPluginPath('sfConfigPlugin', $this->rootDir.'/lib/plugins/sfConfigPlugin');
+    }
 }
 
 $configuration = new ProjectConfiguration(__DIR__.'/../../functional/fixtures');
@@ -26,25 +26,21 @@ public function setup()
 // ->setPlugins() ->disablePlugins() ->enablePlugins() ->enableAllPluginsExcept()
 $t->diag('->setPlugins() ->disablePlugins() ->enablePlugins() ->enableAllPluginsExcept()');
 
-foreach (array('setPlugins', 'disablePlugins', 'enablePlugins', 'enableAllPluginsExcept') as $method)
-{
-  try
-  {
-    $configuration->$method(array());
-    $t->fail('->'.$method.'() throws an exception if called too late');
-  }
-  catch (Exception $e)
-  {
-    $t->pass('->'.$method.'() throws an exception if called too late');
-  }
+foreach (array('setPlugins', 'disablePlugins', 'enablePlugins', 'enableAllPluginsExcept') as $method) {
+    try {
+        $configuration->{$method}(array());
+        $t->fail('->'.$method.'() throws an exception if called too late');
+    } catch (Exception $e) {
+        $t->pass('->'.$method.'() throws an exception if called too late');
+    }
 }
 
 class ProjectConfiguration2 extends sfProjectConfiguration
 {
-  public function setup()
-  {
-    $this->enablePlugins('sfAutoloadPlugin', 'sfConfigPlugin');
-  }
+    public function setup()
+    {
+        $this->enablePlugins('sfAutoloadPlugin', 'sfConfigPlugin');
+    }
 }
 
 $configuration = new ProjectConfiguration2(__DIR__.'/../../functional/fixtures');
@@ -55,18 +51,15 @@ public function setup()
 
 class ProjectConfiguration3 extends sfProjectConfiguration
 {
-  public function setup()
-  {
-    $this->enablePlugins('NonExistantPlugin');
-  }
+    public function setup()
+    {
+        $this->enablePlugins('NonExistantPlugin');
+    }
 }
 
-try
-{
-  $configuration = new ProjectConfiguration3(__DIR__.'/../../functional/fixtures');
-  $t->fail('->__construct() throws an exception if a non-existant plugin is enabled');
-}
-catch (Exception $e)
-{
-  $t->pass('->__construct() throws an exception if a non-existant plugin is enabled');
+try {
+    $configuration = new ProjectConfiguration3(__DIR__.'/../../functional/fixtures');
+    $t->fail('->__construct() throws an exception if a non-existant plugin is enabled');
+} 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 267902fed..6a596290d 100644
--- a/test/unit/config/sfSimpleYamlConfigHandlerTest.php
+++ b/test/unit/config/sfSimpleYamlConfigHandlerTest.php
@@ -3,12 +3,12 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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 __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(2);
 
@@ -25,9 +25,9 @@
 
 function get_retval($config, $files)
 {
-  $retval = $config->execute($files);
-  $retval = preg_replace('#^<\?php#', '', $retval);
-  $retval = preg_replace('#<\?php$#s', '', $retval);
+    $retval = $config->execute($files);
+    $retval = preg_replace('#^<\?php#', '', $retval);
+    $retval = preg_replace('#<\?php$#s', '', $retval);
 
-  return eval($retval);
+    return eval($retval);
 }
diff --git a/test/unit/config/sfViewConfigHandlerTest.php b/test/unit/config/sfViewConfigHandlerTest.php
index d62743a96..d6b24160d 100644
--- a/test/unit/config/sfViewConfigHandlerTest.php
+++ b/test/unit/config/sfViewConfigHandlerTest.php
@@ -3,26 +3,26 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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 __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(22);
 
 class myViewConfigHandler extends sfViewConfigHandler
 {
-  public function setConfiguration($config)
-  {
-    $this->yamlConfig = self::mergeConfig($config);
-  }
-
-  public function addHtmlAsset($viewName = '')
-  {
-    return parent::addHtmlAsset($viewName);
-  }
+    public function setConfiguration($config)
+    {
+        $this->yamlConfig = self::mergeConfig($config);
+    }
+
+    public function addHtmlAsset($viewName = '')
+    {
+        return parent::addHtmlAsset($viewName);
+    }
 }
 
 $handler = new myViewConfigHandler();
@@ -31,45 +31,45 @@ public function addHtmlAsset($viewName = '')
 $t->diag('addHtmlAsset() basic asset addition');
 
 $handler->setConfiguration(array(
-  'myView' => array(
-    'stylesheets' => array('foobar'),
-  ),
+    'myView' => array(
+        'stylesheets' => array('foobar'),
+    ),
 ));
-$content = <<<EOF
-  \$response->addStylesheet('foobar', '', array ());
+$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'))),
-  ),
+    'myView' => array(
+        'stylesheets' => array(array('foobar' => array('position' => 'last'))),
+    ),
 ));
-$content = <<<EOF
-  \$response->addStylesheet('foobar', 'last', array ());
+$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'),
-  ),
+    'myView' => array(
+        'javascripts' => array('foobar'),
+    ),
 ));
-$content = <<<EOF
-  \$response->addJavascript('foobar', '', array ());
+$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'))),
-  ),
+    'myView' => array(
+        'javascripts' => array(array('foobar' => array('position' => 'last'))),
+    ),
 ));
-$content = <<<EOF
-  \$response->addJavascript('foobar', 'last', array ());
+$content = <<<'EOF'
+  $response->addJavascript('foobar', 'last', array ());
 
 EOF;
 $t->is(fix_linebreaks($handler->addHtmlAsset('myView')), fix_linebreaks($content), 'addHtmlAsset() adds JavaScript to the response');
@@ -78,91 +78,91 @@ public function addHtmlAsset($viewName = '')
 $t->diag('addHtmlAsset() insertion order for stylesheets');
 
 $handler->setConfiguration(array(
-  'myView' => array(
-    'stylesheets' => array('foobar'),
-  ),
-  'all' => array(
-    'stylesheets' => array('all_foobar'),
-  ),
+    'myView' => array(
+        'stylesheets' => array('foobar'),
+    ),
+    'all' => array(
+        'stylesheets' => array('all_foobar'),
+    ),
 ));
-$content = <<<EOF
-  \$response->addStylesheet('all_foobar', '', array ());
-  \$response->addStylesheet('foobar', '', array ());
+$content = <<<'EOF'
+  $response->addStylesheet('all_foobar', '', array ());
+  $response->addStylesheet('foobar', '', array ());
 
 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'),
-  ),
+    'all' => array(
+        'stylesheets' => array('all_foobar'),
+    ),
+    'myView' => array(
+        'stylesheets' => array('foobar'),
+    ),
 ));
-$content = <<<EOF
-  \$response->addStylesheet('all_foobar', '', array ());
-  \$response->addStylesheet('foobar', '', array ());
+$content = <<<'EOF'
+  $response->addStylesheet('all_foobar', '', array ());
+  $response->addStylesheet('foobar', '', array ());
 
 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'),
-  ),
+    'myView' => array(
+        'stylesheets' => array('foobar'),
+    ),
+    'default' => array(
+        'stylesheets' => array('default_foobar'),
+    ),
 ));
-$content = <<<EOF
-  \$response->addStylesheet('default_foobar', '', array ());
-  \$response->addStylesheet('foobar', '', array ());
+$content = <<<'EOF'
+  $response->addStylesheet('default_foobar', '', array ());
+  $response->addStylesheet('foobar', '', array ());
 
 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'),
-  ),
+    'default' => array(
+        'stylesheets' => array('default_foobar'),
+    ),
+    'myView' => array(
+        'stylesheets' => array('foobar'),
+    ),
 ));
-$content = <<<EOF
-  \$response->addStylesheet('default_foobar', '', array ());
-  \$response->addStylesheet('foobar', '', array ());
+$content = <<<'EOF'
+  $response->addStylesheet('default_foobar', '', array ());
+  $response->addStylesheet('foobar', '', array ());
 
 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'),
-  ),
+    'default' => array(
+        'stylesheets' => array('default_foobar'),
+    ),
+    'all' => array(
+        'stylesheets' => array('all_foobar'),
+    ),
 ));
-$content = <<<EOF
-  \$response->addStylesheet('default_foobar', '', array ());
-  \$response->addStylesheet('all_foobar', '', array ());
+$content = <<<'EOF'
+  $response->addStylesheet('default_foobar', '', array ());
+  $response->addStylesheet('all_foobar', '', array ());
 
 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'),
-  ),
+    'all' => array(
+        'stylesheets' => array('all_foobar'),
+    ),
+    'default' => array(
+        'stylesheets' => array('default_foobar'),
+    ),
 ));
-$content = <<<EOF
-  \$response->addStylesheet('default_foobar', '', array ());
-  \$response->addStylesheet('all_foobar', '', array ());
+$content = <<<'EOF'
+  $response->addStylesheet('default_foobar', '', array ());
+  $response->addStylesheet('all_foobar', '', array ());
 
 EOF;
 $t->is(fix_linebreaks($handler->addHtmlAsset('myView')), fix_linebreaks($content), 'addHtmlAsset() adds application-specific stylesheets after default assets');
@@ -171,91 +171,91 @@ public function addHtmlAsset($viewName = '')
 $t->diag('addHtmlAsset() insertion order for javascripts');
 
 $handler->setConfiguration(array(
-  'myView' => array(
-    'javascripts' => array('foobar'),
-  ),
-  'all' => array(
-    'javascripts' => array('all_foobar'),
-  ),
+    'myView' => array(
+        'javascripts' => array('foobar'),
+    ),
+    'all' => array(
+        'javascripts' => array('all_foobar'),
+    ),
 ));
-$content = <<<EOF
-  \$response->addJavascript('all_foobar', '', array ());
-  \$response->addJavascript('foobar', '', array ());
+$content = <<<'EOF'
+  $response->addJavascript('all_foobar', '', array ());
+  $response->addJavascript('foobar', '', array ());
 
 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'),
-  ),
+    'all' => array(
+        'javascripts' => array('all_foobar'),
+    ),
+    'myView' => array(
+        'javascripts' => array('foobar'),
+    ),
 ));
-$content = <<<EOF
-  \$response->addJavascript('all_foobar', '', array ());
-  \$response->addJavascript('foobar', '', array ());
+$content = <<<'EOF'
+  $response->addJavascript('all_foobar', '', array ());
+  $response->addJavascript('foobar', '', array ());
 
 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'),
-  ),
+    'myView' => array(
+        'javascripts' => array('foobar'),
+    ),
+    'default' => array(
+        'javascripts' => array('default_foobar'),
+    ),
 ));
-$content = <<<EOF
-  \$response->addJavascript('default_foobar', '', array ());
-  \$response->addJavascript('foobar', '', array ());
+$content = <<<'EOF'
+  $response->addJavascript('default_foobar', '', array ());
+  $response->addJavascript('foobar', '', array ());
 
 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'),
-  ),
+    'default' => array(
+        'javascripts' => array('default_foobar'),
+    ),
+    'myView' => array(
+        'javascripts' => array('foobar'),
+    ),
 ));
-$content = <<<EOF
-  \$response->addJavascript('default_foobar', '', array ());
-  \$response->addJavascript('foobar', '', array ());
+$content = <<<'EOF'
+  $response->addJavascript('default_foobar', '', array ());
+  $response->addJavascript('foobar', '', array ());
 
 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'),
-  ),
+    'default' => array(
+        'javascripts' => array('default_foobar'),
+    ),
+    'all' => array(
+        'javascripts' => array('all_foobar'),
+    ),
 ));
-$content = <<<EOF
-  \$response->addJavascript('default_foobar', '', array ());
-  \$response->addJavascript('all_foobar', '', array ());
+$content = <<<'EOF'
+  $response->addJavascript('default_foobar', '', array ());
+  $response->addJavascript('all_foobar', '', array ());
 
 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'),
-  ),
+    'all' => array(
+        'javascripts' => array('all_foobar'),
+    ),
+    'default' => array(
+        'javascripts' => array('default_foobar'),
+    ),
 ));
-$content = <<<EOF
-  \$response->addJavascript('default_foobar', '', array ());
-  \$response->addJavascript('all_foobar', '', array ());
+$content = <<<'EOF'
+  $response->addJavascript('default_foobar', '', array ());
+  $response->addJavascript('all_foobar', '', array ());
 
 EOF;
 $t->is(fix_linebreaks($handler->addHtmlAsset('myView')), fix_linebreaks($content), 'addHtmlAsset() adds application-specific javascripts after default assets');
@@ -264,88 +264,88 @@ public function addHtmlAsset($viewName = '')
 $t->diag('addHtmlAsset() removal of assets');
 
 $handler->setConfiguration(array(
-  'all' => array(
-    'stylesheets' => array('all_foo', 'all_bar'),
-  ),
-  'myView' => array(
-    'stylesheets' => array('foobar', '-all_bar'),
-  ),
+    'all' => array(
+        'stylesheets' => array('all_foo', 'all_bar'),
+    ),
+    'myView' => array(
+        'stylesheets' => array('foobar', '-all_bar'),
+    ),
 ));
-$content = <<<EOF
-  \$response->addStylesheet('all_foo', '', array ());
-  \$response->addStylesheet('foobar', '', array ());
+$content = <<<'EOF'
+  $response->addStylesheet('all_foo', '', array ());
+  $response->addStylesheet('foobar', '', array ());
 
 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'),
-  ),
+    'all' => array(
+        'javascripts' => array('all_foo', 'all_bar'),
+    ),
+    'myView' => array(
+        'javascripts' => array('foobar', '-all_bar'),
+    ),
 ));
-$content = <<<EOF
-  \$response->addJavascript('all_foo', '', array ());
-  \$response->addJavascript('foobar', '', array ());
+$content = <<<'EOF'
+  $response->addJavascript('all_foo', '', array ());
+  $response->addJavascript('foobar', '', array ());
 
 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'),
-  ),
+    'all' => array(
+        'stylesheets' => array('foo', 'bar', '-*', 'baz'),
+    ),
 ));
-$content = <<<EOF
-  \$response->addStylesheet('baz', '', array ());
+$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'),
-  ),
+    'all' => array(
+        'javascripts' => array('foo', 'bar', '-*', 'baz'),
+    ),
 ));
-$content = <<<EOF
-  \$response->addJavascript('baz', '', array ());
+$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'),
-  ),
+    'all' => array(
+        'stylesheets' => array('-*', 'foobar'),
+    ),
+    'default' => array(
+        'stylesheets' => array('default_foo', 'default_bar'),
+    ),
 ));
-$content = <<<EOF
-  \$response->addStylesheet('foobar', '', array ());
+$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'),
-  ),
+    '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'),
+    ),
 ));
-$content = <<<EOF
-  \$response->addStylesheet('bar', '', array ());
-  \$response->addJavascript('bar', '', array ());
+$content = <<<'EOF'
+  $response->addStylesheet('bar', '', array ());
+  $response->addJavascript('bar', '', array ());
 
 EOF;
 $t->is(fix_linebreaks($handler->addHtmlAsset('myView')), fix_linebreaks($content), 'addHtmlAsset() supports the -* option to remove all assets previously added');
diff --git a/test/unit/config/sfYamlConfigHandlerTest.php b/test/unit/config/sfYamlConfigHandlerTest.php
index 4a8aed384..caf09e976 100644
--- a/test/unit/config/sfYamlConfigHandlerTest.php
+++ b/test/unit/config/sfYamlConfigHandlerTest.php
@@ -3,40 +3,42 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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 __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(7);
 
 class myConfigHandler extends sfYamlConfigHandler
 {
-  public $yamlConfig = null;
+    public $yamlConfig;
 
-  public function execute($configFiles) {}
+    public function execute($configFiles)
+    {
+    }
 
-  static public function parseYamls($configFiles)
-  {
-    return parent::parseYamls($configFiles);
-  }
+    public static function parseYamls($configFiles)
+    {
+        return parent::parseYamls($configFiles);
+    }
 
-  static public function parseYaml($configFile)
-  {
-    return parent::parseYaml($configFile);
-  }
+    public static function parseYaml($configFile)
+    {
+        return parent::parseYaml($configFile);
+    }
 
-  public function mergeConfigValue($keyName, $category)
-  {
-    return parent::mergeConfigValue($keyName, $category);
-  }
+    public function mergeConfigValue($keyName, $category)
+    {
+        return parent::mergeConfigValue($keyName, $category);
+    }
 
-  public function getConfigValue($keyName, $category, $defaultValue = null)
-  {
-    return parent::getConfigValue($keyName, $category, $defaultValue);
-  }
+    public function getConfigValue($keyName, $category, $defaultValue = null)
+    {
+        return parent::getConfigValue($keyName, $category, $defaultValue);
+    }
 }
 
 $config = new myConfigHandler();
@@ -51,18 +53,18 @@ public function getConfigValue($keyName, $category, $defaultValue = null)
 // ->mergeConfigValue()
 $t->diag('->mergeConfigValue()');
 $config->yamlConfig = array(
-  'bar' => array(
-    'foo' => array(
-      'foo' => 'foobar',
-      'bar' => 'bar',
+    'bar' => array(
+        'foo' => array(
+            'foo' => 'foobar',
+            'bar' => 'bar',
+        ),
     ),
-  ),
-  'all' => array(
-    'foo' => array(
-      'foo' => 'fooall',
-      'barall' => 'barall',
+    'all' => array(
+        'foo' => array(
+            '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');
@@ -72,12 +74,12 @@ public function getConfigValue($keyName, $category, $defaultValue = null)
 // ->getConfigValue()
 $t->diag('->getConfigValue()');
 $config->yamlConfig = array(
-  'bar' => array(
-    'foo' => 'foobar'
-  ),
-  'all' => array(
-    'foo' => 'fooall'
-  ),
+    'bar' => array(
+        'foo' => 'foobar',
+    ),
+    'all' => array(
+        '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');
diff --git a/test/unit/controller/sfControllerTest.php b/test/unit/controller/sfControllerTest.php
index fcbb62877..4ab303491 100644
--- a/test/unit/controller/sfControllerTest.php
+++ b/test/unit/controller/sfControllerTest.php
@@ -3,19 +3,22 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please controller the LICENSE
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
-require_once($_test_dir.'/unit/sfContextMock.class.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
+
+require_once $_test_dir.'/unit/sfContextMock.class.php';
 
 $t = new lime_test(2);
 
 class myController extends sfController
 {
-  function execute () {}
+    public function execute()
+    {
+    }
 }
 
 $context = sfContext::getInstance();
@@ -23,6 +26,6 @@ function execute () {}
 $controller = new myController($context);
 
 // new methods via sfEventDispatcher
-require_once($_test_dir.'/unit/sfEventDispatcherTest.class.php');
+require_once $_test_dir.'/unit/sfEventDispatcherTest.class.php';
 $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 a433e5b17..9b90bb709 100644
--- a/test/unit/controller/sfWebControllerTest.php
+++ b/test/unit/controller/sfWebControllerTest.php
@@ -3,169 +3,167 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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($_test_dir.'/unit/sfContextMock.class.php');
-require_once($_test_dir.'/unit/sfNoRouting.class.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
+
+require_once $_test_dir.'/unit/sfContextMock.class.php';
+
+require_once $_test_dir.'/unit/sfNoRouting.class.php';
 
 $t = new lime_test(21);
 
 class myWebResponse extends sfWebResponse
 {
-  public function sendHttpHeaders()
-  {
-  }
+    public function sendHttpHeaders()
+    {
+    }
 
-  public function send()
-  {
-  }
+    public function send()
+    {
+    }
 }
 
 $_SERVER['HTTP_HOST'] = 'localhost';
 $_SERVER['SCRIPT_NAME'] = '/index.php';
 sfConfig::set('sf_max_forwards', 10);
 $context = sfContext::getInstance(array(
-  'routing'  => 'sfNoRouting',
-  'request'  => 'sfWebRequest',
-  'response' => 'myWebResponse',
+    'routing' => 'sfNoRouting',
+    'request' => 'sfWebRequest',
+    'response' => 'myWebResponse',
 ));
 
 $controller = new sfFrontWebController($context, null);
 
 $tests = array(
-  'module/action' => array(
-    '',
-    array(
-      'module' => 'module',
-      'action' => 'action',
+    'module/action' => array(
+        '',
+        array(
+            'module' => 'module',
+            'action' => 'action',
+        ),
     ),
-  ),
-  'module/action?id=12' => array(
-    '',
-    array(
-      'module' => 'module',
-      'action' => 'action',
-      'id'     => 12,
+    'module/action?id=12' => array(
+        '',
+        array(
+            'module' => 'module',
+            'action' => 'action',
+            'id' => 12,
+        ),
     ),
-  ),
-  'module/action?id=12&' => array(
-    '',
-    array(
-      'module' => 'module',
-      'action' => 'action',
-      'id'     => '12&',
+    'module/action?id=12&' => array(
+        '',
+        array(
+            'module' => 'module',
+            'action' => 'action',
+            'id' => '12&',
+        ),
     ),
-  ),
-  'module/action?id=12&test=4&toto=9' => array(
-    '',
-    array(
-      'module' => 'module',
-      'action' => 'action',
-      'id'     => 12,
-      'test'   => 4,
-      'toto'   => 9,
+    'module/action?id=12&test=4&toto=9' => array(
+        '',
+        array(
+            'module' => 'module',
+            'action' => 'action',
+            'id' => 12,
+            'test' => 4,
+            'toto' => 9,
+        ),
     ),
-  ),
-  'module/action?id=12&test=4&5&6&7&&toto=9' => array(
-    '',
-    array(
-      'module' => 'module',
-      'action' => 'action',
-      'id'     => 12,
-      'test'   => '4&5&6&7&',
-      'toto'   => 9,
+    'module/action?id=12&test=4&5&6&7&&toto=9' => array(
+        '',
+        array(
+            'module' => 'module',
+            'action' => 'action',
+            'id' => 12,
+            'test' => '4&5&6&7&',
+            'toto' => 9,
+        ),
     ),
-  ),
-  'module/action?test=value1&value2&toto=9' => array(
-    '',
-    array(
-      'module' => 'module',
-      'action' => 'action',
-      'test'   => 'value1&value2',
-      'toto'   => 9,
+    'module/action?test=value1&value2&toto=9' => array(
+        '',
+        array(
+            'module' => 'module',
+            'action' => 'action',
+            'test' => 'value1&value2',
+            'toto' => 9,
+        ),
     ),
-  ),
-  'module/action?test=value1&value2' => array(
-    '',
-    array(
-      'module' => 'module',
-      'action' => 'action',
-      'test'   => 'value1&value2',
+    'module/action?test=value1&value2' => array(
+        '',
+        array(
+            'module' => 'module',
+            'action' => 'action',
+            'test' => 'value1&value2',
+        ),
     ),
-  ),
-  'module/action?test=value1=value2&toto=9' => array(
-    '',
-    array(
-      'module' => 'module',
-      'action' => 'action',
-      'test'   => 'value1=value2',
-      'toto'   => 9,
+    'module/action?test=value1=value2&toto=9' => array(
+        '',
+        array(
+            'module' => 'module',
+            'action' => 'action',
+            'test' => 'value1=value2',
+            'toto' => 9,
+        ),
     ),
-  ),
-  'module/action?test=value1=value2' => array(
-    '',
-    array(
-      'module' => 'module',
-      'action' => 'action',
-      'test'   => 'value1=value2',
+    'module/action?test=value1=value2' => array(
+        '',
+        array(
+            'module' => 'module',
+            'action' => 'action',
+            'test' => 'value1=value2',
+        ),
     ),
-  ),
-  'module/action?test=4&5&6&7&&toto=9&id=' => array(
-    '',
-    array(
-      'module' => 'module',
-      'action' => 'action',
-      'test'   => '4&5&6&7&',
-      'toto'   => 9,
-      'id'     => '',
+    'module/action?test=4&5&6&7&&toto=9&id=' => array(
+        '',
+        array(
+            'module' => 'module',
+            'action' => 'action',
+            'test' => '4&5&6&7&',
+            'toto' => 9,
+            'id' => '',
+        ),
     ),
-  ),
-  '@test?test=4' => array(
-    'test',
-    array(
-      'test' => 4
+    '@test?test=4' => array(
+        'test',
+        array(
+            'test' => 4,
+        ),
     ),
-  ),
-  '@test' => array(
-    'test',
-    array(
+    '@test' => array(
+        'test',
+        array(
+        ),
     ),
-  ),
-  '@test?id=12&foo=bar' => array(
-    'test',
-    array(
-      'id' => 12,
-      'foo' => 'bar',
+    '@test?id=12&foo=bar' => array(
+        'test',
+        array(
+            'id' => 12,
+            'foo' => 'bar',
+        ),
     ),
-  ),
-  '@test?id=foo%26bar&foo=bar%3Dfoo' => array(
-    'test',
-    array(
-      'id' => 'foo&bar',
-      'foo' => 'bar=foo',
+    '@test?id=foo%26bar&foo=bar%3Dfoo' => array(
+        'test',
+        array(
+            'id' => 'foo&bar',
+            'foo' => 'bar=foo',
+        ),
     ),
-  ),
 );
 
 // ->convertUrlStringToParameters()
 $t->diag('->convertUrlStringToParameters()');
-foreach ($tests as $url => $result)
-{
-  $t->is($controller->convertUrlStringToParameters($url), $result, sprintf('->convertUrlStringToParameters() converts a symfony internal URI to an array of parameters (%s)', $url));
+foreach ($tests as $url => $result) {
+    $t->is($controller->convertUrlStringToParameters($url), $result, sprintf('->convertUrlStringToParameters() converts a symfony internal URI to an array of parameters (%s)', $url));
 }
 
-try
-{
-  $controller->convertUrlStringToParameters('@test?foobar');
-  $t->fail('->convertUrlStringToParameters() throw a sfParseException if it cannot parse the query string');
-}
-catch (sfParseException $e)
-{
-  $t->pass('->convertUrlStringToParameters() throw a sfParseException if it cannot parse the query string');
+try {
+    $controller->convertUrlStringToParameters('@test?foobar');
+    $t->fail('->convertUrlStringToParameters() throw a sfParseException if it cannot parse the query string');
+} catch (sfParseException $e) {
+    $t->pass('->convertUrlStringToParameters() throw a sfParseException if it cannot parse the query string');
 }
 
 // ->redirect()
@@ -176,33 +174,23 @@ public function send()
 $t->like($response->getHttpHeader('Location'), '~http\://localhost/index.php/\?module=module&action=action&id=1#photos~', '->redirect() adds a Location HTTP header');
 
 // Test null url argument for ->redirect()
-try
-{
-  $controller->redirect(null);
-  $t->fail('->redirect() throw an InvalidArgumentException when the url argument is null');
-}
-catch (InvalidArgumentException $iae)
-{
-  $t->pass('->redirect() throw an InvalidArgumentException when the url argument is null');
-}
-catch(Exception $e)
-{
-  $t->fail('->redirect() throw an InvalidArgumentException when the url argument is null. '.get_class($e).' was received');
+try {
+    $controller->redirect(null);
+    $t->fail('->redirect() throw an InvalidArgumentException when the url argument is null');
+} catch (InvalidArgumentException $iae) {
+    $t->pass('->redirect() throw an InvalidArgumentException when the url argument is null');
+} catch (Exception $e) {
+    $t->fail('->redirect() throw an InvalidArgumentException when the url argument is null. '.get_class($e).' was received');
 }
 
 // Test empty string url argument for ->redirect()
-try
-{
-  $controller->redirect('');
-  $t->fail('->redirect() throw an InvalidArgumentException when the url argument is an empty string');
-}
-catch (InvalidArgumentException $iae)
-{
-  $t->pass('->redirect() throw an InvalidArgumentException when the url argument is an empty string');
-}
-catch(Exception $e)
-{
-  $t->fail('->redirect() throw an InvalidArgumentException when the url argument is an empty string. '.get_class($e).' was received');
+try {
+    $controller->redirect('');
+    $t->fail('->redirect() throw an InvalidArgumentException when the url argument is an empty string');
+} catch (InvalidArgumentException $iae) {
+    $t->pass('->redirect() throw an InvalidArgumentException when the url argument is an empty string');
+} catch (Exception $e) {
+    $t->fail('->redirect() throw an InvalidArgumentException when the url argument is an empty string. '.get_class($e).' was received');
 }
 
 // ->genUrl()
diff --git a/test/unit/database/sfDatabaseTest.php b/test/unit/database/sfDatabaseTest.php
index ef13767f8..7a0ab91d0 100644
--- a/test/unit/database/sfDatabaseTest.php
+++ b/test/unit/database/sfDatabaseTest.php
@@ -3,20 +3,26 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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($_test_dir.'/unit/sfContextMock.class.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
+
+require_once $_test_dir.'/unit/sfContextMock.class.php';
 
 $t = new lime_test(10);
 
 class myDatabase extends sfDatabase
 {
-  function connect () {}
-  function shutdown () {}
+    public function connect()
+    {
+    }
+
+    public function shutdown()
+    {
+    }
 }
 
 $context = sfContext::getInstance();
@@ -25,6 +31,6 @@ function shutdown () {}
 $database->initialize($context);
 
 // parameter holder proxy
-require_once($_test_dir.'/unit/sfParameterHolderTest.class.php');
+require_once $_test_dir.'/unit/sfParameterHolderTest.class.php';
 $pht = new sfParameterHolderProxyTest($t);
 $pht->launchTests($database, 'parameter');
diff --git a/test/unit/debug/sfDebugTest.php b/test/unit/debug/sfDebugTest.php
index d1a76fe32..7b8cc019c 100644
--- a/test/unit/debug/sfDebugTest.php
+++ b/test/unit/debug/sfDebugTest.php
@@ -3,12 +3,12 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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 __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(1);
 
diff --git a/test/unit/debug/sfTimerTest.php b/test/unit/debug/sfTimerTest.php
index 92540224a..ca547bf77 100644
--- a/test/unit/debug/sfTimerTest.php
+++ b/test/unit/debug/sfTimerTest.php
@@ -3,12 +3,12 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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 __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(6);
 
diff --git a/test/unit/debug/sfWebDebugTest.php b/test/unit/debug/sfWebDebugTest.php
index 85df62484..28b3b238c 100644
--- a/test/unit/debug/sfWebDebugTest.php
+++ b/test/unit/debug/sfWebDebugTest.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -12,13 +12,18 @@
 
 $t = new lime_test(10);
 
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
 class sfWebDebugTest extends sfWebDebug
 {
-  public function __construct()
-  {
-    $this->options['image_root_path'] = '';
-    $this->options['request_parameters'] = array();
-  }
+    public function __construct()
+    {
+        $this->options['image_root_path'] = '';
+        $this->options['request_parameters'] = array();
+    }
 }
 
 $debug = new sfWebDebugTest();
@@ -40,7 +45,7 @@ public function __construct()
 $t->unlike($after, '/<script type="text\/javascript">/', '->injectToolbar() does not add javascripts if there is no body');
 $t->like($after, '/<div id="sfWebDebug">/', '->injectToolbar() adds the toolbar if there is no body');
 
-$before = <<<HTML
+$before = <<<'HTML'
 <html>
 <head></head>
 <body>
diff --git a/test/unit/escaper/sfOutputEscaperArrayDecoratorTest.php b/test/unit/escaper/sfOutputEscaperArrayDecoratorTest.php
index 63b12489f..874534574 100644
--- a/test/unit/escaper/sfOutputEscaperArrayDecoratorTest.php
+++ b/test/unit/escaper/sfOutputEscaperArrayDecoratorTest.php
@@ -8,15 +8,21 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../../lib/vendor/lime/lime.php');
-require_once(__DIR__.'/../../../lib/escaper/sfOutputEscaper.class.php');
-require_once(__DIR__.'/../../../lib/escaper/sfOutputEscaperGetterDecorator.class.php');
-require_once(__DIR__.'/../../../lib/escaper/sfOutputEscaperArrayDecorator.class.php');
-require_once(__DIR__.'/../../../lib/escaper/sfOutputEscaperObjectDecorator.class.php');
-require_once(__DIR__.'/../../../lib/escaper/sfOutputEscaperIteratorDecorator.class.php');
+require_once __DIR__.'/../../../lib/vendor/lime/lime.php';
 
-require_once(__DIR__.'/../../../lib/helper/EscapingHelper.php');
-require_once(__DIR__.'/../../../lib/config/sfConfig.class.php');
+require_once __DIR__.'/../../../lib/escaper/sfOutputEscaper.class.php';
+
+require_once __DIR__.'/../../../lib/escaper/sfOutputEscaperGetterDecorator.class.php';
+
+require_once __DIR__.'/../../../lib/escaper/sfOutputEscaperArrayDecorator.class.php';
+
+require_once __DIR__.'/../../../lib/escaper/sfOutputEscaperObjectDecorator.class.php';
+
+require_once __DIR__.'/../../../lib/escaper/sfOutputEscaperIteratorDecorator.class.php';
+
+require_once __DIR__.'/../../../lib/helper/EscapingHelper.php';
+
+require_once __DIR__.'/../../../lib/config/sfConfig.class.php';
 
 class sfException extends Exception
 {
@@ -42,46 +48,46 @@ class sfException extends Exception
 $t->ok(isset($escaped[1]), 'The escaped object behaves like an array (isset)');
 
 $t->diag('ArrayAccess interface is read only');
-try
-{
-  unset($escaped[0]);
-  $t->fail('The escaped object is read only (unset)');
-}
-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)');
+try {
+    unset($escaped[0]);
+    $t->fail('The escaped object is read only (unset)');
+} catch (sfException $e) {
+    $t->pass('The escaped object is read only (unset)');
 }
-catch (sfException $e)
-{
-  $t->pass('The escaped object is read only (set)');
+
+try {
+    $escaped[0] = 12;
+    $t->fail('The escaped object is read only (set)');
+} catch (sfException $e) {
+    $t->pass('The escaped object is read only (set)');
 }
 
 // Iterator interface
 $t->diag('Iterator interface');
-foreach ($escaped as $key => $value)
-{
-  switch ($key)
-  {
-    case 0:
-      $t->is($value, '&lt;strong&gt;escaped!&lt;/strong&gt;', 'The escaped object behaves like an array');
-      break;
-    case 1:
-      $t->is($value, 1, 'The escaped object behaves like an array');
-      break;
-    case 2:
-      $t->is($value, null, 'The escaped object behaves like an array');
-      break;
-    case 3:
-      break;
-    default:
-      $t->fail('The escaped object behaves like an array');
-  }
+foreach ($escaped as $key => $value) {
+    switch ($key) {
+        case 0:
+            $t->is($value, '&lt;strong&gt;escaped!&lt;/strong&gt;', 'The escaped object behaves like an array');
+
+            break;
+
+        case 1:
+            $t->is($value, 1, 'The escaped object behaves like an array');
+
+            break;
+
+        case 2:
+            $t->is($value, null, 'The escaped object behaves like an array');
+
+            break;
+
+        case 3:
+            break;
+
+        default:
+            $t->fail('The escaped object behaves like an array');
+    }
 }
 
 // ->valid()
diff --git a/test/unit/escaper/sfOutputEscaperObjectDecoratorTest.php b/test/unit/escaper/sfOutputEscaperObjectDecoratorTest.php
index caff163b2..c818d7a96 100644
--- a/test/unit/escaper/sfOutputEscaperObjectDecoratorTest.php
+++ b/test/unit/escaper/sfOutputEscaperObjectDecoratorTest.php
@@ -8,15 +8,21 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../../lib/vendor/lime/lime.php');
-require_once(__DIR__.'/../../../lib/escaper/sfOutputEscaper.class.php');
-require_once(__DIR__.'/../../../lib/escaper/sfOutputEscaperGetterDecorator.class.php');
-require_once(__DIR__.'/../../../lib/escaper/sfOutputEscaperArrayDecorator.class.php');
-require_once(__DIR__.'/../../../lib/escaper/sfOutputEscaperObjectDecorator.class.php');
-require_once(__DIR__.'/../../../lib/escaper/sfOutputEscaperIteratorDecorator.class.php');
+require_once __DIR__.'/../../../lib/vendor/lime/lime.php';
 
-require_once(__DIR__.'/../../../lib/helper/EscapingHelper.php');
-require_once(__DIR__.'/../../../lib/config/sfConfig.class.php');
+require_once __DIR__.'/../../../lib/escaper/sfOutputEscaper.class.php';
+
+require_once __DIR__.'/../../../lib/escaper/sfOutputEscaperGetterDecorator.class.php';
+
+require_once __DIR__.'/../../../lib/escaper/sfOutputEscaperArrayDecorator.class.php';
+
+require_once __DIR__.'/../../../lib/escaper/sfOutputEscaperObjectDecorator.class.php';
+
+require_once __DIR__.'/../../../lib/escaper/sfOutputEscaperIteratorDecorator.class.php';
+
+require_once __DIR__.'/../../../lib/helper/EscapingHelper.php';
+
+require_once __DIR__.'/../../../lib/config/sfConfig.class.php';
 
 class sfException extends Exception
 {
@@ -28,20 +34,20 @@ class sfException extends Exception
 
 class OutputEscaperTest
 {
-  public function __toString()
-  {
-    return $this->getTitle();
-  }
-
-  public function getTitle()
-  {
-    return '<strong>escaped!</strong>';
-  }
-
-  public function getTitles()
-  {
-    return array(1, 2, '<strong>escaped!</strong>');
-  }
+    public function __toString()
+    {
+        return $this->getTitle();
+    }
+
+    public function getTitle()
+    {
+        return '<strong>escaped!</strong>';
+    }
+
+    public function getTitles()
+    {
+        return array(1, 2, '<strong>escaped!</strong>');
+    }
 }
 
 $object = new OutputEscaperTest();
@@ -57,15 +63,12 @@ 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);
-  $t->is((string) $escaped, (string) $element, '->__toString() is compatible with SimpleXMLElement');
-}
-else
-{
-  $t->skip('->__toString() is compatible with SimpleXMLElement');
+if (class_exists('SimpleXMLElement')) {
+    $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');
 }
 
 class Foo
@@ -74,11 +77,11 @@ class Foo
 
 class FooCountable implements Countable
 {
-  #[\ReturnTypeWillChange]
-  public function count()
-  {
-    return 2;
-  }
+    #[\ReturnTypeWillChange]
+    public function count()
+    {
+        return 2;
+    }
 }
 
 // implements Countable
diff --git a/test/unit/escaper/sfOutputEscaperSafeTest.php b/test/unit/escaper/sfOutputEscaperSafeTest.php
index b25079b6e..f47cc9650 100644
--- a/test/unit/escaper/sfOutputEscaperSafeTest.php
+++ b/test/unit/escaper/sfOutputEscaperSafeTest.php
@@ -8,9 +8,11 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../../lib/vendor/lime/lime.php');
-require_once(__DIR__.'/../../../lib/helper/EscapingHelper.php');
-require_once(__DIR__.'/../../../lib/escaper/sfOutputEscaperSafe.class.php');
+require_once __DIR__.'/../../../lib/vendor/lime/lime.php';
+
+require_once __DIR__.'/../../../lib/helper/EscapingHelper.php';
+
+require_once __DIR__.'/../../../lib/escaper/sfOutputEscaperSafe.class.php';
 
 $t = new lime_test(13);
 
@@ -24,7 +26,7 @@
 
 class TestClass1
 {
-  public $foo = 'bar';
+    public $foo = 'bar';
 }
 
 $safe = new sfOutputEscaperSafe(new TestClass1());
@@ -38,10 +40,10 @@ class TestClass1
 
 class TestClass2
 {
-  public function doSomething()
-  {
-    return 'ok';
-  }
+    public function doSomething()
+    {
+        return 'ok';
+    }
 }
 
 $safe = new sfOutputEscaperSafe(new TestClass2());
@@ -52,9 +54,8 @@ public function doSomething()
 
 class TestClass3
 {
-  public
-    $boolValue = true,
-    $nullValue = null;
+    public $boolValue = true;
+    public $nullValue;
 }
 
 $safe = new sfOutputEscaperSafe(new TestClass3());
@@ -73,9 +74,8 @@ class TestClass3
 $output = array();
 
 $safe = new sfOutputEscaperSafe($input);
-foreach ($safe as $key => $value)
-{
-  $output[$key] = $value;
+foreach ($safe as $key => $value) {
+    $output[$key] = $value;
 }
 $t->is_deeply($output, $input, '"Iterator" implementation imitates an array');
 
diff --git a/test/unit/escaper/sfOutputEscaperTest.php b/test/unit/escaper/sfOutputEscaperTest.php
index 9d96acd0f..a01c07794 100644
--- a/test/unit/escaper/sfOutputEscaperTest.php
+++ b/test/unit/escaper/sfOutputEscaperTest.php
@@ -8,16 +8,23 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../../lib/vendor/lime/lime.php');
-require_once(__DIR__.'/../../../lib/escaper/sfOutputEscaper.class.php');
-require_once(__DIR__.'/../../../lib/escaper/sfOutputEscaperGetterDecorator.class.php');
-require_once(__DIR__.'/../../../lib/escaper/sfOutputEscaperArrayDecorator.class.php');
-require_once(__DIR__.'/../../../lib/escaper/sfOutputEscaperObjectDecorator.class.php');
-require_once(__DIR__.'/../../../lib/escaper/sfOutputEscaperIteratorDecorator.class.php');
-require_once(__DIR__.'/../../../lib/escaper/sfOutputEscaperSafe.class.php');
+require_once __DIR__.'/../../../lib/vendor/lime/lime.php';
 
-require_once(__DIR__.'/../../../lib/helper/EscapingHelper.php');
-require_once(__DIR__.'/../../../lib/config/sfConfig.class.php');
+require_once __DIR__.'/../../../lib/escaper/sfOutputEscaper.class.php';
+
+require_once __DIR__.'/../../../lib/escaper/sfOutputEscaperGetterDecorator.class.php';
+
+require_once __DIR__.'/../../../lib/escaper/sfOutputEscaperArrayDecorator.class.php';
+
+require_once __DIR__.'/../../../lib/escaper/sfOutputEscaperObjectDecorator.class.php';
+
+require_once __DIR__.'/../../../lib/escaper/sfOutputEscaperIteratorDecorator.class.php';
+
+require_once __DIR__.'/../../../lib/escaper/sfOutputEscaperSafe.class.php';
+
+require_once __DIR__.'/../../../lib/helper/EscapingHelper.php';
+
+require_once __DIR__.'/../../../lib/config/sfConfig.class.php';
 
 sfConfig::set('sf_charset', 'UTF-8');
 
@@ -25,19 +32,19 @@
 
 class OutputEscaperTestClass
 {
-  public $title = '<strong>escaped!</strong>';
+    public $title = '<strong>escaped!</strong>';
 
-  public function getTitle()
-  {
-    return $this->title;
-  }
+    public function getTitle()
+    {
+        return $this->title;
+    }
 
-  public function getTitleTitle()
-  {
-    $o = new self;
+    public function getTitleTitle()
+    {
+        $o = new self();
 
-    return $o->getTitle();
-  }
+        return $o->getTitle();
+    }
 }
 
 class OutputEscaperTestClassChild extends OutputEscaperTestClass
@@ -47,9 +54,9 @@ class OutputEscaperTestClassChild extends OutputEscaperTestClass
 // ::escape()
 $t->diag('::escape()');
 $t->diag('::escape() does not escape special values');
-$t->ok(sfOutputEscaper::escape('esc_entities', null) === null, '::escape() returns null if the value to escape is null');
-$t->ok(sfOutputEscaper::escape('esc_entities', false) === false, '::escape() returns false if the value to escape is false');
-$t->ok(sfOutputEscaper::escape('esc_entities', true) === 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');
@@ -60,8 +67,8 @@ class OutputEscaperTestClassChild extends OutputEscaperTestClass
 
 $t->diag('::escape() escapes arrays');
 $input = array(
-  'foo' => '<strong>escaped!</strong>',
-  'bar' => array('foo' => '<strong>escaped!</strong>'),
+    'foo' => '<strong>escaped!</strong>',
+    'bar' => array('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');
@@ -90,22 +97,20 @@ class OutputEscaperTestClassChild extends OutputEscaperTestClass
 
 $t->diag('::escape() cannot escape resources');
 $fh = fopen(__FILE__, 'r');
-try
-{
-  sfOutputEscaper::escape('esc_entities', $fh);
-  $t->fail('::escape() throws an InvalidArgumentException if the value cannot be escaped');
-}
-catch (InvalidArgumentException $e)
-{
-  $t->pass('::escape() throws an InvalidArgumentException if the value cannot be escaped');
+
+try {
+    sfOutputEscaper::escape('esc_entities', $fh);
+    $t->fail('::escape() throws an InvalidArgumentException if the value cannot be escaped');
+} 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(sfOutputEscaper::unescape(null) === null, '::unescape() returns null if the value to unescape is null');
-$t->ok(sfOutputEscaper::unescape(false) === false, '::unescape() returns false if the value to unescape is false');
-$t->ok(sfOutputEscaper::unescape(true) === 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');
@@ -113,8 +118,8 @@ class OutputEscaperTestClassChild extends OutputEscaperTestClass
 
 $t->diag('::unescape() unescapes arrays');
 $input = sfOutputEscaper::escape('esc_entities', array(
-  'foo' => '<strong>escaped!</strong>',
-  'bar' => array('foo' => '<strong>escaped!</strong>'),
+    'foo' => '<strong>escaped!</strong>',
+    'bar' => array('foo' => '<strong>escaped!</strong>'),
 ));
 $output = sfOutputEscaper::unescape($input);
 $t->ok(is_array($output), '::unescape() returns an array if the input is a sfOutputEscaperArrayDecorator object');
@@ -146,13 +151,13 @@ class OutputEscaperTestClassChild extends OutputEscaperTestClass
 $t->diag('::unescape() unescapes mixed arrays');
 $object = new OutputEscaperTestClass();
 $input = array(
-  'foo'    => 'bar',
-  'bar'    => sfOutputEscaper::escape('esc_entities', '<strong>bar</strong>'),
-  'foobar' => sfOutputEscaper::escape('esc_entities', $object),
+    'foo' => 'bar',
+    'bar' => sfOutputEscaper::escape('esc_entities', '<strong>bar</strong>'),
+    'foobar' => sfOutputEscaper::escape('esc_entities', $object),
 );
 $output = array(
-  'foo'    => 'bar',
-  'bar'    => '<strong>bar</strong>',
-  'foobar' => $object,
+    'foo' => 'bar',
+    'bar' => '<strong>bar</strong>',
+    'foobar' => $object,
 );
 $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 dcfe99717..51a49c681 100644
--- a/test/unit/event/sfEventDispatcherTest.php
+++ b/test/unit/event/sfEventDispatcherTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(19);
 
@@ -26,7 +26,7 @@
 $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->ok($dispatcher->disconnect('foobar', 'listen') === false, '->disconnect() returns false if the listener does not exist');
+$t->ok(false === $dispatcher->disconnect('foobar', 'listen'), '->disconnect() returns false if the listener does not exist');
 
 // ->getListeners() ->hasListeners()
 $t->diag('->getListeners() ->hasListeners()');
@@ -94,38 +94,37 @@
 
 class Listener
 {
-  protected
-    $value = '';
-
-  function filterFoo(sfEvent $event, $foo)
-  {
-    return "*$foo*";
-  }
-
-  function filterFooBis(sfEvent $event, $foo)
-  {
-    return "-$foo-";
-  }
-
-  function listenToFoo(sfEvent $event)
-  {
-    $this->value .= 'listenToFoo';
-  }
-
-  function listenToFooBis(sfEvent $event)
-  {
-    $this->value .= 'listenToFooBis';
-
-    return true;
-  }
-
-  function getValue()
-  {
-    return $this->value;
-  }
-
-  function reset()
-  {
-    $this->value = '';
-  }
+    protected $value = '';
+
+    public function filterFoo(sfEvent $event, $foo)
+    {
+        return "*{$foo}*";
+    }
+
+    public function filterFooBis(sfEvent $event, $foo)
+    {
+        return "-{$foo}-";
+    }
+
+    public function listenToFoo(sfEvent $event)
+    {
+        $this->value .= 'listenToFoo';
+    }
+
+    public function listenToFooBis(sfEvent $event)
+    {
+        $this->value .= 'listenToFooBis';
+
+        return true;
+    }
+
+    public function getValue()
+    {
+        return $this->value;
+    }
+
+    public function reset()
+    {
+        $this->value = '';
+    }
 }
diff --git a/test/unit/event/sfEventTest.php b/test/unit/event/sfEventTest.php
index 48b6ea9c1..9abb5af6b 100644
--- a/test/unit/event/sfEventTest.php
+++ b/test/unit/event/sfEventTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(11);
 
@@ -46,14 +46,11 @@
 $event['foo'] = 'foo';
 $t->is($event['foo'], 'foo', 'sfEvent implements the ArrayAccess interface');
 
-try
-{
-  $event['foobar'];
-  $t->fail('::offsetGet() throws an InvalidArgumentException exception when the parameter does not exist');
-}
-catch (InvalidArgumentException $e)
-{
-  $t->pass('::offsetGet() throws an InvalidArgumentException exception when the parameter does not exist');
+try {
+    $event['foobar'];
+    $t->fail('::offsetGet() throws an InvalidArgumentException exception when the parameter does not exist');
+} catch (InvalidArgumentException $e) {
+    $t->pass('::offsetGet() throws an InvalidArgumentException exception when the parameter does not exist');
 }
 
 $t->ok(isset($event['foo']), 'sfEvent implements the ArrayAccess interface');
diff --git a/test/unit/exception/sfExceptionsTest.php b/test/unit/exception/sfExceptionsTest.php
index af8a35e98..fba024289 100644
--- a/test/unit/exception/sfExceptionsTest.php
+++ b/test/unit/exception/sfExceptionsTest.php
@@ -3,32 +3,31 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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 __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(24);
 
 foreach (array(
-  'cache', 'configuration', 'controller', 'database', 
-  'error404', 'factory', 'file', 'filter', 'forward', 'initialization', 'parse', 'render', 'security',
-  'stop', 'storage', 'view'
-) as $class)
-{
-  $class = sprintf('sf%sException', ucfirst($class));
-  $e = new $class();
-  $t->ok($e instanceof sfException, sprintf('"%s" inherits from sfException', $class));
+    'cache', 'configuration', 'controller', 'database',
+    'error404', 'factory', 'file', 'filter', 'forward', 'initialization', 'parse', 'render', 'security',
+    'stop', 'storage', 'view',
+) as $class) {
+    $class = sprintf('sf%sException', ucfirst($class));
+    $e = new $class();
+    $t->ok($e instanceof sfException, sprintf('"%s" inherits from sfException', $class));
 }
 
 class myException extends sfException
 {
-  static public function formatArgsTest($args, $single = false, $format = 'html')
-  {
-    return parent::formatArgs($args, $single, $format);
-  }
+    public static function formatArgsTest($args, $single = false, $format = 'html')
+    {
+        return parent::formatArgs($args, $single, $format);
+    }
 }
 
 // sfException::formatArgs()
@@ -36,8 +35,8 @@ static public function formatArgsTest($args, $single = false, $format = 'html')
 $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(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('&', true), "'&amp;'", 'formatArgs() escapes strings');
diff --git a/test/unit/filter/sfFilterTest.php b/test/unit/filter/sfFilterTest.php
index 50d5bd120..8518d3426 100644
--- a/test/unit/filter/sfFilterTest.php
+++ b/test/unit/filter/sfFilterTest.php
@@ -3,22 +3,23 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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($_test_dir.'/unit/sfContextMock.class.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
+
+require_once $_test_dir.'/unit/sfContextMock.class.php';
 
 $t = new lime_test(17);
 
 class myFilter extends sfFilter
 {
-  public function isFirstCall()
-  {
-    return parent::isFirstCall();
-  }
+    public function isFirstCall()
+    {
+        return parent::isFirstCall();
+    }
 }
 
 $context = sfContext::getInstance();
@@ -47,6 +48,6 @@ public function isFirstCall()
 $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');
+require_once $_test_dir.'/unit/sfParameterHolderTest.class.php';
 $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 0c2f90efd..ab1f2f1f5 100644
--- a/test/unit/form/addon/sfFormSymfonyTest.php
+++ b/test/unit/form/addon/sfFormSymfonyTest.php
@@ -8,30 +8,30 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../../bootstrap/unit.php');
+require_once __DIR__.'/../../../bootstrap/unit.php';
 
 $t = new lime_test(8);
 
 class FormListener
 {
-  public $events = array();
+    public $events = array();
 
-  public function listen(sfEvent $event)
-  {
-    $this->events[] = func_get_args();
-  }
+    public function listen(sfEvent $event)
+    {
+        $this->events[] = func_get_args();
+    }
 
-  public function filter(sfEvent $event, $value)
-  {
-    $this->events[] = func_get_args();
+    public function filter(sfEvent $event, $value)
+    {
+        $this->events[] = func_get_args();
 
-    return $value;
-  }
+        return $value;
+    }
 
-  public function reset()
-  {
-    $this->events = array();
-  }
+    public function reset()
+    {
+        $this->events = array();
+    }
 }
 
 $listener = new FormListener();
@@ -45,13 +45,13 @@ public function reset()
 
 class TestForm extends sfFormSymfony
 {
-  public function configure()
-  {
-    $this->setValidators(array(
-      'first_name' => new sfValidatorString(),
-      'last_name'  => new sfValidatorString(),
-    ));
-  }
+    public function configure()
+    {
+        $this->setValidators(array(
+            'first_name' => new sfValidatorString(),
+            'last_name' => new sfValidatorString(),
+        ));
+    }
 }
 
 // ->__construct()
@@ -68,8 +68,8 @@ public function configure()
 $form = new TestForm();
 $listener->reset();
 $form->bind(array(
-  'first_name' => 'John',
-  'last_name'  => 'Doe',
+    'first_name' => 'John',
+    'last_name' => 'Doe',
 ));
 
 $t->is(count($listener->events), 1, '->bind() notifies one event when validation is successful');
diff --git a/test/unit/form/sfFormFieldSchemaTest.php b/test/unit/form/sfFormFieldSchemaTest.php
index 13f1f89be..4d1715ca6 100644
--- a/test/unit/form/sfFormFieldSchemaTest.php
+++ b/test/unit/form/sfFormFieldSchemaTest.php
@@ -8,19 +8,19 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(11);
 
 // widgets
 $authorSchema = new sfWidgetFormSchema(array(
-  'name' => $nameWidget = new sfWidgetFormInputText(),
+    'name' => $nameWidget = new sfWidgetFormInputText(),
 ));
 $authorSchema->setNameFormat('article[author][%s]');
 
 $schema = new sfWidgetFormSchema(array(
-  'title'  => $titleWidget = new sfWidgetFormInputText(),
-  'author' => $authorSchema,
+    'title' => $titleWidget = new sfWidgetFormInputText(),
+    'author' => $authorSchema,
 ));
 $schema->setNameFormat('article[%s]');
 
@@ -41,41 +41,33 @@
 $t->is(isset($parent['title']), true, 'sfFormField implements the ArrayAccess interface');
 $t->is(isset($parent['title1']), false, 'sfFormField implements the ArrayAccess interface');
 $t->is($parent['title'], $f, 'sfFormField implements the ArrayAccess interface');
-try
-{
-  unset($parent['title']);
-  $t->fail('sfFormField implements the ArrayAccess interface but in read-only mode');
-}
-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)
-{
-  $t->pass('sfFormField implements the ArrayAccess interface but in read-only mode');
+try {
+    unset($parent['title']);
+    $t->fail('sfFormField implements the ArrayAccess interface but in read-only mode');
+} 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');
+try {
+    $parent['title'] = null;
+    $t->fail('sfFormField implements the ArrayAccess interface but in read-only mode');
+} catch (LogicException $e) {
+    $t->pass('sfFormField implements the ArrayAccess interface but in read-only mode');
 }
-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) {
+    $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(),
+    'w1' => $w1 = new sfWidgetFormInputText(),
+    'w2' => $w2 = new sfWidgetFormInputText(),
 ));
 $f = new sfFormFieldSchema($widgetSchema, null, 'article', array());
 $t->is(count($f), 2, 'sfFormFieldSchema implements the Countable interface');
@@ -85,9 +77,8 @@
 $f = new sfFormFieldSchema($widgetSchema, null, 'article', array());
 
 $values = array();
-foreach ($f as $name => $value)
-{
-  $values[$name] = $value;
+foreach ($f as $name => $value) {
+    $values[$name] = $value;
 }
 $t->is(isset($values['w1']), true, 'sfFormFieldSchema implements the Iterator interface');
 $t->is(isset($values['w2']), true, 'sfFormFieldSchema implements the Iterator interface');
@@ -98,8 +89,7 @@
 $f = new sfFormFieldSchema($widgetSchema, null, 'article', array());
 
 $values = array();
-foreach ($f as $name => $value)
-{
-  $values[$name] = $value;
+foreach ($f as $name => $value) {
+    $values[$name] = $value;
 }
 $t->is(array_keys($values), array('w2', 'w1'), 'sfFormFieldSchema keeps the order');
diff --git a/test/unit/form/sfFormFieldTest.php b/test/unit/form/sfFormFieldTest.php
index 1c8687dc8..902bd6852 100644
--- a/test/unit/form/sfFormFieldTest.php
+++ b/test/unit/form/sfFormFieldTest.php
@@ -8,20 +8,20 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(31);
 
 // widgets
 $authorSchema = new sfWidgetFormSchema(array(
-  'id'   => new sfWidgetFormInputHidden(),
-  'name' => $nameWidget = new sfWidgetFormInputText(),
+    'id' => new sfWidgetFormInputHidden(),
+    'name' => $nameWidget = new sfWidgetFormInputText(),
 ));
 $authorSchema->setNameFormat('article[author][%s]');
 
 $schema = new sfWidgetFormSchema(array(
-  'title'  => $titleWidget = new sfWidgetFormInputText(),
-  'author' => $authorSchema,
+    'title' => $titleWidget = new sfWidgetFormInputText(),
+    'author' => $authorSchema,
 ));
 $schema->setNameFormat('article[%s]');
 $titleWidget->setParent($schema);
@@ -63,7 +63,7 @@
 
 // ->renderRow()
 $t->diag('->renderRow()');
-$output = <<<EOF
+$output = <<<'EOF'
 <tr>
   <th><label for="article_title">Title</label></th>
   <td>  <ul class="error_list">
@@ -75,7 +75,7 @@
 EOF;
 $t->is($f->renderRow(), fix_linebreaks($output), '->renderRow() renders a row');
 
-$output = <<<EOF
+$output = <<<'EOF'
 <tr>
   <th><label for="article_title">Title</label></th>
   <td>  <ul class="error_list">
@@ -87,7 +87,7 @@
 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');
 
-$output = <<<EOF
+$output = <<<'EOF'
 <tr>
   <th><label for="article_title">My title</label></th>
   <td>  <ul class="error_list">
@@ -99,7 +99,7 @@
 EOF;
 $t->is($f->renderRow(array(), 'My title'), fix_linebreaks($output), '->renderRow() can take a label name as its second argument');
 
-$output = <<<EOF
+$output = <<<'EOF'
 <tr>
   <th><label for="article_title">Title</label></th>
   <td>  <ul class="error_list">
@@ -111,7 +111,7 @@
 EOF;
 $t->is($f->renderRow(array(), null, 'help'), fix_linebreaks($output), '->renderRow() can take a help message as its third argument');
 
-$output = <<<EOF
+$output = <<<'EOF'
 <tr>
   <th><label for="article_author">Author</label></th>
   <td><tr>
@@ -127,41 +127,34 @@
 EOF;
 $t->is($child->renderRow(), fix_linebreaks($output), '->renderRow() renders a row when the widget has a parent');
 
-try
-{
-  $parent->renderRow();
-  $t->fail('->renderRow() throws an LogicException if the form field has no parent');
-}
-catch (LogicException $e)
-{
-  $t->pass('->renderRow() throws an LogicException if the form field has no parent');
+try {
+    $parent->renderRow();
+    $t->fail('->renderRow() throws an LogicException if the form field has no parent');
+} 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');
-try
-{
-  $parent->renderLabel();
-  $t->fail('->renderLabel() throws an LogicException if the form field has no parent');
-}
-catch (LogicException $e)
-{
-  $t->pass('->renderLabel() throws an LogicException if the form field has no parent');
+
+try {
+    $parent->renderLabel();
+    $t->fail('->renderLabel() throws an LogicException if the form field has no parent');
+} catch (LogicException $e) {
+    $t->pass('->renderLabel() throws an LogicException if the form field has no parent');
 }
 
 // ->renderLabelName()
 $t->diag('->renderLabelName()');
 $t->is($f->renderLabelName(), 'Title', '->renderLabelName() renders the label name');
-try
-{
-  $parent->renderLabelName();
-  $t->fail('->renderLabelName() throws an LogicException if the form field has no parent');
-}
-catch (LogicException $e)
-{
-  $t->pass('->renderLabelName() throws an LogicException if the form field has no parent');
+
+try {
+    $parent->renderLabelName();
+    $t->fail('->renderLabelName() throws an LogicException if the form field has no parent');
+} catch (LogicException $e) {
+    $t->pass('->renderLabelName() throws an LogicException if the form field has no parent');
 }
 
 // ->renderName()
@@ -180,7 +173,7 @@
 
 // ->renderError();
 $t->diag('->renderError()');
-$output = <<<EOF
+$output = <<<'EOF'
   <ul class="error_list">
     <li>title error</li>
   </ul>
@@ -188,7 +181,7 @@
 EOF;
 $t->is($f->renderError(), fix_linebreaks($output), '->renderError() renders errors as HTML');
 $t->is($child->renderError(), '', '->renderRow() renders errors as HTML when the widget has a parent');
-$output = <<<EOF
+$output = <<<'EOF'
   <ul class="error_list">
     <li>name error</li>
   </ul>
@@ -196,14 +189,11 @@
 EOF;
 $t->is($child['name']->renderError(), fix_linebreaks($output), '->renderRow() renders errors as HTML when the widget has a parent');
 
-try
-{
-  $parent->renderError();
-  $t->fail('->renderError() throws an LogicException if the form field has no parent');
-}
-catch (LogicException $e)
-{
-  $t->pass('->renderError() throws an LogicException if the form field has no parent');
+try {
+    $parent->renderError();
+    $t->fail('->renderError() throws an LogicException if the form field has no parent');
+} catch (LogicException $e) {
+    $t->pass('->renderError() throws an LogicException if the form field has no parent');
 }
 
 // global errors
@@ -218,7 +208,7 @@
 
 $parent = new sfFormFieldSchema($schema, null, 'article', array('title' => 'symfony', 'author' => array('name' => 'Fabien')), $articleErrorSchema);
 $child = $parent['author'];
-$output = <<<EOF
+$output = <<<'EOF'
   <ul class="error_list">
     <li>non existent field error</li>
     <li>Id: hidden field error</li>
diff --git a/test/unit/form/sfFormTest.php b/test/unit/form/sfFormTest.php
index ecaf8aa48..2944a0d4d 100644
--- a/test/unit/form/sfFormTest.php
+++ b/test/unit/form/sfFormTest.php
@@ -8,103 +8,128 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(157);
 
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
 class FormTest extends sfForm
 {
-  public function getCSRFToken($secret = null)
-  {
-    return "*$secret*";
-  }
+    public function getCSRFToken($secret = null)
+    {
+        return "*{$secret}*";
+    }
 }
 
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
 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(
-      'a' => '1_a',
-      'b' => '1_b',
-      'c' => '1_c',
-    ));
-    $this->getWidgetSchema()->setHelps(array(
-      'a' => '1_a',
-      'b' => '1_b',
-      'c' => '1_c',
-    ));
-  }
+    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(
+            'a' => '1_a',
+            'b' => '1_b',
+            'c' => '1_c',
+        ));
+        $this->getWidgetSchema()->setHelps(array(
+            'a' => '1_a',
+            'b' => '1_b',
+            'c' => '1_c',
+        ));
+    }
 }
 
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
 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(
-      'c' => '2_c',
-      'd' => '2_d',
-    ));
-    $this->getWidgetSchema()->setHelps(array(
-      'c' => '2_c',
-      'd' => '2_d',
-    ));
-    $this->validatorSchema->setPreValidator(new sfValidatorPass());
-    $this->validatorSchema->setPostValidator(new sfValidatorPass());
-  }
+    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(
+            'c' => '2_c',
+            'd' => '2_d',
+        ));
+        $this->getWidgetSchema()->setHelps(array(
+            'c' => '2_c',
+            'd' => '2_d',
+        ));
+        $this->validatorSchema->setPreValidator(new sfValidatorPass());
+        $this->validatorSchema->setPostValidator(new sfValidatorPass());
+    }
 }
 
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
 class TestForm3 extends FormTest
 {
-  public function configure()
-  {
-    $this->disableLocalCSRFProtection();
-  }
+    public function configure()
+    {
+        $this->disableLocalCSRFProtection();
+    }
 }
 
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
 class TestForm4 extends FormTest
 {
-  public function configure()
-  {
-    $this->enableLocalCSRFProtection($this->getOption('csrf_secret'));
-  }
+    public function configure()
+    {
+        $this->enableLocalCSRFProtection($this->getOption('csrf_secret'));
+    }
 }
 
 class NumericFieldsForm extends sfForm
 {
-  public function configure()
-  {
-    $this->setWidgets(array(
-      '5' => new sfWidgetFormInputText(),
-    ));
-
-    $this->setValidators(array(
-      '5' => new sfValidatorString(),
-    ));
-
-    $this->widgetSchema->setLabels(array('5' => 'label'.$this->getOption('salt')));
-    $this->widgetSchema->setHelps(array('5' => 'help'.$this->getOption('salt')));
-  }
+    public function configure()
+    {
+        $this->setWidgets(array(
+            '5' => new sfWidgetFormInputText(),
+        ));
+
+        $this->setValidators(array(
+            '5' => new sfValidatorString(),
+        ));
+
+        $this->widgetSchema->setLabels(array('5' => 'label'.$this->getOption('salt')));
+        $this->widgetSchema->setHelps(array('5' => 'help'.$this->getOption('salt')));
+    }
 }
 
 sfForm::disableCSRFProtection();
@@ -167,9 +192,9 @@ public function configure()
 $f = new FormTest();
 $w = new sfWidgetFormSchema();
 $f->setWidgetSchema($w);
-$t->ok($f->getName() === false, '->getName() returns false if the name format is not an array');
+$t->ok(false === $f->getName(), '->getName() returns false if the name format is not an array');
 $w->setNameFormat('foo_%s');
-$t->ok($f->getName() === false, '->getName() returns false if the name format is not an array');
+$t->ok(false === $f->getName(), '->getName() returns false if the name format is not an array');
 $w->setNameFormat('foo[%s]');
 $t->is($f->getName(), 'foo', '->getName() returns the name under which user data can be retrieved');
 
@@ -177,13 +202,13 @@ public function configure()
 $t->diag('::enableCSRFProtection() ::disableCSRFProtection()');
 sfForm::enableCSRFProtection();
 $f1 = new FormTest();
-$t->ok($f1->isCSRFProtected(),'::enableCSRFProtection() enabled CSRF protection for all future forms');
+$t->ok($f1->isCSRFProtected(), '::enableCSRFProtection() enabled CSRF protection for all future forms');
 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');
+$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();
-$t->ok(!$f2->isCSRFProtected(),'::disableCSRFProtection() disables CSRF protection for all future forms');
+$t->ok(!$f2->isCSRFProtected(), '::disableCSRFProtection() disables CSRF protection for all future forms');
 
 $f = new FormTest(array(), array(), false);
 $t->ok(!$f->isCSRFProtected(), '->isCSRFProtected() returns true if the form is CSRF protected');
@@ -197,11 +222,11 @@ public function configure()
 $t->diag('->enableLocalCSRFProtection() ->disableLocalCSRFProtection()');
 $f = new TestForm3();
 sfForm::disableCSRFProtection();
-$t->ok(!$f->isCSRFProtected(),'->disableLocalCSRFProtection() disabled CSRF protection for the current form');
+$t->ok(!$f->isCSRFProtected(), '->disableLocalCSRFProtection() disabled CSRF protection for the current form');
 sfForm::enableCSRFProtection();
-$t->ok(!$f->isCSRFProtected(),'->disableLocalCSRFProtection() disabled CSRF protection for the current form, even if the global CSRF protection is enabled');
+$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');
-$t->ok(!$f->isCSRFProtected(),'->disableLocalCSRFProtection() disabled CSRF protection for the current form, even a CSRF secret is provided in the constructor');
+$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();
 $t->ok($f->isCSRFProtected(), '->enableLocalCSRFProtection() enables CSRF protection when passed null and global CSRF is disabled');
@@ -220,16 +245,16 @@ public function configure()
 // ->isMultipart()
 $t->diag('->isMultipart()');
 $f = new FormTest();
-$t->ok(!$f->isMultipart(),'->isMultipart() returns false if the form does not need a multipart form');
+$t->ok(!$f->isMultipart(), '->isMultipart() returns false if the form does not need a multipart form');
 $f->setWidgetSchema(new sfWidgetFormSchema(array('image' => new sfWidgetFormInputFile())));
-$t->ok($f->isMultipart(),'->isMultipart() returns true if the form needs a multipart form');
+$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(),
+    'first_name' => new sfValidatorPass(),
+    'last_name' => new sfValidatorPass(),
 );
 $validatorSchema = new sfValidatorSchema($validators);
 $f->setValidatorSchema($validatorSchema);
@@ -245,15 +270,16 @@ public function configure()
 $t->diag('->setWidgets() ->setWidgetSchema() ->getWidgetSchema()');
 $f = new FormTest();
 $widgets = array(
-  'first_name' => new sfWidgetFormInputText(),
-  'last_name'  => new sfWidgetFormInputText(),
+    '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);
 $schema = $f->getWidgetSchema();
-$widgets['first_name']->setParent($schema); $widgets['last_name']->setParent($schema);
+$widgets['first_name']->setParent($schema);
+$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());
@@ -264,30 +290,27 @@ public function configure()
 $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(),
+    '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(),
+    'first_name' => new sfValidatorPass(),
+    'last_name' => new sfValidatorPass(),
+    'image' => new sfValidatorPass(),
 )));
 $f->setDefaults(array(
-  'image' => 'default.gif',
+    'image' => 'default.gif',
 ));
 $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)
-{
-  $t->pass('"sfForm" ArrayAccess implementation does not permit to set a form field');
+try {
+    $f['image'] = 'image';
+    $t->fail('"sfForm" ArrayAccess implementation does not permit to set a form field');
+} 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');
 unset($f['image']);
@@ -297,22 +320,20 @@ public function configure()
 $t->ok(!isset($v['image']), '"sfForm" ArrayAccess implementation removes the widget and the validator');
 $w = $f->getWidgetSchema();
 $t->ok(!isset($w['image']), '"sfForm" ArrayAccess implementation removes the widget and the validator');
-try
-{
-  $f['nonexistant'];
-  $t->fail('"sfForm" ArrayAccess implementation throws a LogicException if the form field does not exist');
-}
-catch (LogicException $e)
-{
-  $t->pass('"sfForm" ArrayAccess implementation throws a LogicException if the form field does not exist');
+
+try {
+    $f['nonexistant'];
+    $t->fail('"sfForm" ArrayAccess implementation throws a LogicException if the form field does not exist');
+} 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(
-  'first_name' => 'John',
-  'last_name'  => 'Doe',
+    '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');
@@ -323,9 +344,9 @@ public function configure()
 $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(),
+    'first_name' => new sfWidgetFormInputText(array('default' => 'Fabien')),
+    'last_name' => new sfWidgetFormInputText(),
+    'image' => new sfWidgetFormInputFile(),
 )));
 $t->is(count($f), 3, '"sfForm" implements the Countable interface');
 
@@ -333,13 +354,12 @@ public function configure()
 $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(),
+    'first_name' => new sfWidgetFormInputText(array('default' => 'Fabien')),
+    'last_name' => new sfWidgetFormInputText(),
+    'image' => new sfWidgetFormInputFile(),
 )));
-foreach ($f as $name => $value)
-{
-  $values[$name] = $value;
+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');
@@ -349,31 +369,31 @@ public function configure()
 $t->diag('->useFields()');
 $f = new FormTest();
 $f->setWidgetSchema(new sfWidgetFormSchema(array(
-  'first_name' => new sfWidgetFormInputText(),
-  'last_name'  => new sfWidgetFormInputText(),
-  'email'      => new sfWidgetFormInputText(),
+    '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(),
+    '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(),
+    '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(),
+    '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');
@@ -382,8 +402,8 @@ public function configure()
 $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)),
+    'first_name' => new sfValidatorString(array('min_length' => 2)),
+    'last_name' => new sfValidatorString(array('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');
@@ -408,8 +428,8 @@ public function configure()
 $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)),
+    1 => new sfValidatorString(array('min_length' => 2)),
+    2 => new sfValidatorString(array('min_length' => 2)),
 )));
 $f->bind(array(1 => 'fabien', 2 => 'potencier'));
 $t->ok($f->isValid(), '->bind() behaves correctly when field names are numeric');
@@ -417,64 +437,60 @@ public function configure()
 $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)),
+    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)
+    'file' => array('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'));
-  $t->fail('->bind() second argument is mandatory if the form is multipart');
-}
-catch (InvalidArgumentException $e)
-{
-  $t->pass('->bind() second argument is mandatory if the form is multipart');
+try {
+    $f->bind(array(1 => 'f', 2 => 'potencier'));
+    $t->fail('->bind() second argument is mandatory if the form is multipart');
+} 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)),
+    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())));
 $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)
+    'file' => array('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)),
+    '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(),
+    'id' => new sfWidgetFormInputHidden(),
+    'first_name' => new sfWidgetFormInputText(),
+    'last_name' => new sfWidgetFormInputText(),
 )));
 $f->bind(array(
-  'id'         => 'dddd',
-  'first_name' => 'f',
-  'last_name'  => 'potencier',
+    'id' => 'dddd',
+    'first_name' => 'f',
+    'last_name' => 'potencier',
 ));
-$output = <<<EOF
+$output = <<<'EOF'
   <ul class="error_list">
     <li>Id: "dddd" is not an integer.</li>
   </ul>
@@ -486,18 +502,18 @@ public function configure()
 $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)),
+    '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(),
+    'id' => new sfWidgetFormInputHidden(array('default' => 3)),
+    'first_name' => new sfWidgetFormInputText(array('default' => 'Thomas')),
+    'last_name' => new sfWidgetFormInputText(),
 ));
 
 // unbound
-$output = <<<EOF
+$output = <<<'EOF'
 <tr>
   <th><label for="first_name">First name</label></th>
   <td><input type="text" name="first_name" value="Fabien" id="first_name" /></td>
@@ -509,7 +525,7 @@ public function configure()
 
 EOF;
 $t->is($f->__toString(), fix_linebreaks($output), '->__toString() renders the form as HTML');
-$output = <<<EOF
+$output = <<<'EOF'
 <tr>
   <th><label for="first_name">First name</label></th>
   <td><input type="text" name="first_name" value="Fabien" class="foo" id="first_name" /></td>
@@ -527,11 +543,11 @@ public function configure()
 
 // bound
 $f->bind(array(
-  'id'         => '1',
-  'first_name' => 'Fabien',
-  'last_name'  => 'Potencier',
+    'id' => '1',
+    'first_name' => 'Fabien',
+    'last_name' => 'Potencier',
 ));
-$output = <<<EOF
+$output = <<<'EOF'
 <tr>
   <th><label for="first_name">First name</label></th>
   <td><input type="text" name="first_name" value="Fabien" id="first_name" /></td>
@@ -543,7 +559,7 @@ public function configure()
 
 EOF;
 $t->is($f->__toString(), fix_linebreaks($output), '->__toString() renders the form as HTML');
-$output = <<<EOF
+$output = <<<'EOF'
 <tr>
   <th><label for="first_name">First name</label></th>
   <td><input type="text" name="first_name" value="Fabien" class="foo" id="first_name" /></td>
@@ -563,7 +579,7 @@ public function configure()
 $t->diag('->renderUsing()');
 $f = new sfForm();
 $f->setWidgets(array('name' => new sfWidgetFormInputText()));
-$output = <<<EOF
+$output = <<<'EOF'
 <li>
   <label for="name">Name</label>
   <input type="text" name="name" id="name" />
@@ -577,23 +593,20 @@ public function configure()
 $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)
-{
-  $t->pass('renderUsing() throws an exception if formatter name does not exist');
+try {
+    $f->renderUsing('nonexistant');
+    $t->fail('renderUsing() throws an exception if formatter name does not exist');
+} 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(),
+    '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');
@@ -621,7 +634,6 @@ public function configure()
 $author->setValidatorSchema($author_validator_schema = new sfValidatorSchema(array('first_name' => new sfValidatorString(array('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)))));
@@ -643,7 +655,8 @@ public function configure()
 
 $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);
+$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');
@@ -654,14 +667,12 @@ public function configure()
 
 // tests for ticket #56
 $t->ok($author->getValidator('company') == $company_validator_schema, '->getValidator() gets a validator schema for an embedded form');
-try
-{
-  $author->setValidator('company', new sfValidatorPass());
-  $t->fail('"sfForm" Trying to set a validator for an embedded form field throws a LogicException');
-}
-catch (LogicException $e)
-{
-  $t->pass('"sfForm" Trying to set a validator for an embedded form field throws a LogicException');
+
+try {
+    $author->setValidator('company', new sfValidatorPass());
+    $t->fail('"sfForm" Trying to set a validator for an embedded form field throws a LogicException');
+} catch (LogicException $e) {
+    $t->pass('"sfForm" Trying to set a validator for an embedded form field throws a LogicException');
 }
 
 // tests for ticket #4754
@@ -681,12 +692,12 @@ public function configure()
 $containerForm->embedForm('1', clone $list);
 $list->embedForm('items', $containerForm);
 $list->bind(array(
-  'title' => 'list title',
-  'items' => array(
-    array('title' => 'item 1'),
-    array('title' => 'item 2'),
-    array('title' => 'extra item'),
-  ),
+    'title' => 'list title',
+    'items' => array(
+        array('title' => 'item 1'),
+        array('title' => 'item 2'),
+        array('title' => 'extra item'),
+    ),
 ));
 
 $t->isa_ok($list['items'][0]->getError(), 'sfValidatorErrorSchema', '"sfFormFieldSchema" is given an error schema when an extra embedded form is bound');
@@ -706,150 +717,148 @@ public function configure()
 $t->is(array_keys($forms), array('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)
-{
-  $t->pass('->getEmbeddedForm() throws an exception if the embedded form does not exist');
+
+try {
+    $article->getEmbeddedForm('nonexistant');
+    $t->fail('->getEmbeddedForm() throws an exception if the embedded form does not exist');
+} catch (InvalidArgumentException $e) {
+    $t->pass('->getEmbeddedForm() throws an exception if the embedded form does not exist');
 }
 
 // ::convertFileInformation()
 $t->diag('::convertFileInformation()');
 $input = array(
-  'file' => array(
-    'name' => 'test1.txt',
-    'type' => 'text/plain',
-    'tmp_name' => '/tmp/test1.txt',
-    'error' => 0,
-    'size' => 100,
-  ),
-  'file1' => array(
-    'name' => 'test2.txt',
-    'type' => 'text/plain',
-    'tmp_name' => '/tmp/test1.txt',
-    'error' => 0,
-    'size' => 200,
-  ),
+    'file' => array(
+        'name' => 'test1.txt',
+        'type' => 'text/plain',
+        'tmp_name' => '/tmp/test1.txt',
+        'error' => 0,
+        'size' => 100,
+    ),
+    'file1' => array(
+        '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');
 
 $input = array(
-  'article' => array(
-    'name' => array(
-      'file1' => 'test1.txt',
-      'file2' => 'test2.txt',
-    ),
-    'type' => array(
-      'file1' => 'text/plain',
-      'file2' => 'text/plain',
-    ),
-    'tmp_name' => array(
-      'file1' => '/tmp/test1.txt',
-      'file2' => '/tmp/test2.txt',
-    ),
-    'error' => array(
-      'file1' => 0,
-      'file2' => 0,
-    ),
-    'size' => array(
-      'file1' => 100,
-      'file2' => 200,
+    'article' => array(
+        'name' => array(
+            'file1' => 'test1.txt',
+            'file2' => 'test2.txt',
+        ),
+        'type' => array(
+            'file1' => 'text/plain',
+            'file2' => 'text/plain',
+        ),
+        'tmp_name' => array(
+            'file1' => '/tmp/test1.txt',
+            'file2' => '/tmp/test2.txt',
+        ),
+        'error' => array(
+            'file1' => 0,
+            'file2' => 0,
+        ),
+        'size' => array(
+            'file1' => 100,
+            'file2' => 200,
+        ),
     ),
-  ),
 );
 $expected = array(
-  'article' => array(
-    'file1' => array(
-      'name' => 'test1.txt',
-      'type' => 'text/plain',
-      'tmp_name' => '/tmp/test1.txt',
-      'error' => 0,
-      'size' => 100,
-    ),
-    'file2' => array(
-      'name' => 'test2.txt',
-      'type' => 'text/plain',
-      'tmp_name' => '/tmp/test2.txt',
-      'error' => 0,
-      'size' => 200,
+    'article' => array(
+        'file1' => array(
+            'name' => 'test1.txt',
+            'type' => 'text/plain',
+            'tmp_name' => '/tmp/test1.txt',
+            'error' => 0,
+            'size' => 100,
+        ),
+        'file2' => array(
+            '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(
-    'name' => 'test.txt',
-    'type' => 'text/plain',
-    'tmp_name' => '/tmp/test.txt',
-    'error' => 0,
-    'size' => 100,
-  ),
-  'article' => array(
-    'name' => array(
-      'name' => array(
-        'name' => 'test1.txt',
-        'another' => array('file2' => 'test2.txt'),
-      ),
-    ),
-    'type' => array(
-      'name' => array(
-        'name' => 'text/plain',
-        'another' => array('file2' => 'text/plain'),
-      ),
-    ),
-    'tmp_name' => array(
-      'name' => array(
-        'name' => '/tmp/test1.txt',
-        'another' => array('file2' => '/tmp/test2.txt'),
-      ),
-    ),
-    'error' => array(
-      'name' => array(
-        'name' => 0,
-        'another' => array('file2' => 0),
-      ),
+    'file' => array(
+        'name' => 'test.txt',
+        'type' => 'text/plain',
+        'tmp_name' => '/tmp/test.txt',
+        'error' => 0,
+        'size' => 100,
     ),
-    'size' => array(
-      'name' => array(
-        'name' => 100,
-        'another' => array('file2' => 200),
-      ),
+    'article' => array(
+        'name' => array(
+            'name' => array(
+                'name' => 'test1.txt',
+                'another' => array('file2' => 'test2.txt'),
+            ),
+        ),
+        'type' => array(
+            'name' => array(
+                'name' => 'text/plain',
+                'another' => array('file2' => 'text/plain'),
+            ),
+        ),
+        'tmp_name' => array(
+            'name' => array(
+                'name' => '/tmp/test1.txt',
+                'another' => array('file2' => '/tmp/test2.txt'),
+            ),
+        ),
+        'error' => array(
+            'name' => array(
+                'name' => 0,
+                'another' => array('file2' => 0),
+            ),
+        ),
+        'size' => array(
+            'name' => array(
+                'name' => 100,
+                'another' => array('file2' => 200),
+            ),
+        ),
     ),
-  ),
 );
 $expected = array(
-  'file' => array(
-    'name' => 'test.txt',
-    'type' => 'text/plain',
-    'tmp_name' => '/tmp/test.txt',
-    'error' => 0,
-    'size' => 100,
-  ),
-  'article' => array(
-    'name' => array(
-      'name' => array(
-        'name' => 'test1.txt',
+    'file' => array(
+        'name' => 'test.txt',
         'type' => 'text/plain',
-        'tmp_name' => '/tmp/test1.txt',
+        'tmp_name' => '/tmp/test.txt',
         'error' => 0,
         'size' => 100,
-      ),
-      'another' => array(
-        'file2' => array(
-          'name' => 'test2.txt',
-          'type' => 'text/plain',
-          'tmp_name' => '/tmp/test2.txt',
-          'error' => 0,
-          'size' => 200,
+    ),
+    'article' => array(
+        'name' => array(
+            'name' => array(
+                'name' => 'test1.txt',
+                'type' => 'text/plain',
+                'tmp_name' => '/tmp/test1.txt',
+                'error' => 0,
+                'size' => 100,
+            ),
+            'another' => array(
+                'file2' => array(
+                    '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');
@@ -866,7 +875,7 @@ public function configure()
 $t->diag('__clone()');
 $a = new FormTest();
 $a->setValidatorSchema(new sfValidatorSchema(array(
-  'first_name' => new sfValidatorString(array('min_length' => 2)),
+    'first_name' => new sfValidatorString(array('min_length' => 2)),
 )));
 $a->bind(array('first_name' => 'F'));
 $a1 = clone $a;
@@ -900,15 +909,12 @@ public function configure()
 $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->mergeForm($f2);
-  $t->fail('mergeForm() disallows merging already bound forms');
-}
-catch (LogicException $e)
-{
-  $t->pass('mergeForm() disallows merging already bound forms');
+try {
+    $f1->bind(array('a' => 'foo', 'b' => 'bar', 'd' => 'far_too_long_value'));
+    $f1->mergeForm($f2);
+    $t->fail('mergeForm() disallows merging already bound forms');
+} catch (LogicException $e) {
+    $t->pass('mergeForm() disallows merging already bound forms');
 }
 
 $errorSchema = $f1->getErrorSchema();
@@ -918,10 +924,10 @@ public function configure()
 $f1->getWidgetSchema()->moveField('a', 'last');
 
 // is moved field well positioned when accessed with iterator interface? (#5551)
-foreach($f1 as $f1name => $f1field)
-{
-  $t->is ($f1name, 'b', 'iterating on form takes in account ->moveField() operations.');
-  break;
+foreach ($f1 as $f1name => $f1field) {
+    $t->is($f1name, 'b', 'iterating on form takes in account ->moveField() operations.');
+
+    break;
 }
 
 $f2 = new TestForm2();
@@ -942,31 +948,31 @@ public function configure()
 
 class MyWidget extends sfWidgetForm
 {
-  protected function configure($options = array(), $attributes = array())
-  {
-    $this->addRequiredOption('name');
-  }
-
-  public function render($name, $value = null, $attributes = array(), $errors = array())
-  {
-    return null;
-  }
-
-  public function getJavaScripts()
-  {
-    return array('/path/to/a/'.$this->getOption('name').'.js');
-  }
-
-  public function getStylesheets()
-  {
-    return array('/path/to/a/'.$this->getOption('name').'.css' => 'all');
-  }
+    public function render($name, $value = null, $attributes = array(), $errors = array())
+    {
+        return null;
+    }
+
+    public function getJavaScripts()
+    {
+        return array('/path/to/a/'.$this->getOption('name').'.js');
+    }
+
+    public function getStylesheets()
+    {
+        return array('/path/to/a/'.$this->getOption('name').'.css' => 'all');
+    }
+
+    protected function configure($options = array(), $attributes = array())
+    {
+        $this->addRequiredOption('name');
+    }
 }
 
 $f = new FormTest();
 $f->setWidgets(array(
-  'foo' => new MyWidget(array('name' => 'foo')),
-  'bar' => new MyWidget(array('name' => 'bar')),
+    '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');
@@ -988,63 +994,57 @@ public function getStylesheets()
 $f2->embedForm('F21', $f21);
 $f1->embedForm('F2', $f2);
 $f1->bind(array());
-$expected = array (
-  '1_a' => 'Required.',
-  '1_b' => 'Required.',
-  '1_c' => 'Required.',
-  'F2' =>
-  array (
-    '2_d' => 'Required.',
-    'F21' =>
-    array (
-      '1_a' => 'Required.',
-      '1_b' => 'Required.',
-      '1_c' => 'Required.',
+$expected = array(
+    '1_a' => 'Required.',
+    '1_b' => 'Required.',
+    '1_c' => 'Required.',
+    'F2' => array(
+        '2_d' => 'Required.',
+        'F21' => array(
+            '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();
-try
-{
-  $f->bind(array(
-    'file' => array(
-      '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)
-{
-  $t->pass('Cannot fake a file upload with a POST');
-}
 
-$f = new FormTest();
-try
-{
-  $f->bind(array(
-      'foo' => array(
-        'bar' => array(
-          'file' => array(
+try {
+    $f->bind(array(
+        'file' => array(
             'name' => 'foo.txt',
             'type' => 'text/plain',
             'tmp_name' => 'somefile',
             'error' => 0,
             'size' => 10,
-          ),
         ),
-      ),
-  ));
-  $t->fail('Cannot fake a file upload with a POST');
+    ));
+    $t->fail('Cannot fake a file upload with a POST');
+} catch (InvalidArgumentException $e) {
+    $t->pass('Cannot fake a file upload with a POST');
 }
-catch (InvalidArgumentException $e)
-{
-  $t->pass('Cannot fake a file upload with a POST');
+
+$f = new FormTest();
+
+try {
+    $f->bind(array(
+        'foo' => array(
+            'bar' => array(
+                'file' => array(
+                    '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) {
+    $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 94f0fcbb4..e2f48bd1c 100644
--- a/test/unit/generator/sfGeneratorTest.php
+++ b/test/unit/generator/sfGeneratorTest.php
@@ -3,18 +3,20 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please generator the LICENSE
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(0);
 
 class myGenerator extends sfGenerator
 {
-  public function generate($params = array()) {}
+    public function generate($params = array())
+    {
+    }
 }
 
 class ProjectConfiguration extends sfProjectConfiguration
diff --git a/test/unit/generator/sfModelGeneratorConfigurationFieldTest.php b/test/unit/generator/sfModelGeneratorConfigurationFieldTest.php
index 3b986e461..47a457d8d 100644
--- a/test/unit/generator/sfModelGeneratorConfigurationFieldTest.php
+++ b/test/unit/generator/sfModelGeneratorConfigurationFieldTest.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please generator the LICENSE
  * file that was distributed with this source code.
  */
diff --git a/test/unit/helper/AssetHelperTest.php b/test/unit/helper/AssetHelperTest.php
index 91b09a8e3..7d78f3d5b 100644
--- a/test/unit/helper/AssetHelperTest.php
+++ b/test/unit/helper/AssetHelperTest.php
@@ -3,55 +3,58 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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($_test_dir.'/unit/sfContextMock.class.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
-require_once(__DIR__.'/../../../lib/helper/TagHelper.php');
-require_once(__DIR__.'/../../../lib/helper/UrlHelper.php');
-require_once(__DIR__.'/../../../lib/helper/AssetHelper.php');
+require_once $_test_dir.'/unit/sfContextMock.class.php';
+
+require_once __DIR__.'/../../../lib/helper/TagHelper.php';
+
+require_once __DIR__.'/../../../lib/helper/UrlHelper.php';
+
+require_once __DIR__.'/../../../lib/helper/AssetHelper.php';
 
 $t = new lime_test(68);
 
 class myRequest
 {
-  public $relativeUrlRoot = '';
-
-  public function getRelativeUrlRoot()
-  {
-    return $this->relativeUrlRoot;
-  }
-
-  public function isSecure()
-  {
-    return false;
-  }
-
-  public function getHost()
-  {
-    return 'localhost';
-  }
+    public $relativeUrlRoot = '';
+
+    public function getRelativeUrlRoot()
+    {
+        return $this->relativeUrlRoot;
+    }
+
+    public function isSecure()
+    {
+        return false;
+    }
+
+    public function getHost()
+    {
+        return 'localhost';
+    }
 }
 
 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()));
-  }
+    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()));
+    }
 }
 
 class myController
 {
-  public function genUrl($parameters = array(), $absolute = false)
-  {
-    return ($absolute ? '/' : '').$parameters;
-  }
+    public function genUrl($parameters = array(), $absolute = false)
+    {
+        return ($absolute ? '/' : '').$parameters;
+    }
 }
 
 $context = sfContext::getInstance(array('request' => 'myRequest', 'response' => 'myResponse', 'controller' => 'myController'));
@@ -84,47 +87,71 @@ public function genUrl($parameters = array(), $absolute = false)
 
 // stylesheet_tag()
 $t->diag('stylesheet_tag()');
-$t->is(stylesheet_tag('style'), 
-  '<link rel="stylesheet" type="text/css" media="screen" href="/css/style.css" />'."\n", 
-  'stylesheet_tag() takes a stylesheet name as its first argument');
-$t->is(stylesheet_tag('random.styles', '/css/stylish'),
-  '<link rel="stylesheet" type="text/css" media="screen" href="/css/random.styles" />'."\n".
-  '<link rel="stylesheet" type="text/css" media="screen" href="/css/stylish.css" />'."\n", 
-  'stylesheet_tag() can takes n stylesheet names as its arguments');
-$t->is(stylesheet_tag('style', array('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)), 
-  '<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)), 
-  '<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')),
-  '<!--[if IE 6]><link rel="stylesheet" type="text/css" media="screen" href="/css/style.css" /><![endif]-->'."\n",
-  'stylesheet_tag() can take a condition option');
+$t->is(
+    stylesheet_tag('style'),
+    '<link rel="stylesheet" type="text/css" media="screen" href="/css/style.css" />'."\n",
+    'stylesheet_tag() takes a stylesheet name as its first argument'
+);
+$t->is(
+    stylesheet_tag('random.styles', '/css/stylish'),
+    '<link rel="stylesheet" type="text/css" media="screen" href="/css/random.styles" />'."\n".
+    '<link rel="stylesheet" type="text/css" media="screen" href="/css/stylish.css" />'."\n",
+    'stylesheet_tag() can takes n stylesheet names as its arguments'
+);
+$t->is(
+    stylesheet_tag('style', array('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)),
+    '<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)),
+    '<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')),
+    '<!--[if IE 6]><link rel="stylesheet" type="text/css" media="screen" href="/css/style.css" /><![endif]-->'."\n",
+    'stylesheet_tag() can take a condition option'
+);
 
 // javascript_include_tag()
 $t->diag('javascript_include_tag()');
-$t->is(javascript_include_tag('xmlhr'),
-  '<script type="text/javascript" src="/js/xmlhr.js"></script>'."\n", 
-  'javascript_include_tag() takes a javascript name as its first argument');
-$t->is(javascript_include_tag('common.javascript', '/elsewhere/cools'),
-  '<script type="text/javascript" src="/js/common.javascript"></script>'."\n".
-  '<script type="text/javascript" src="/elsewhere/cools.js"></script>'."\n",
-  'javascript_include_tag() can takes n javascript file names as its arguments');
-$t->is(javascript_include_tag('xmlhr', array('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)),
-  '<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')),
-  '<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')),
-  '<!--[if IE 6]><script type="text/javascript" src="/js/xmlhr.js"></script><![endif]-->'."\n",
-  'javascript_include_tag() can take a condition option');
+$t->is(
+    javascript_include_tag('xmlhr'),
+    '<script type="text/javascript" src="/js/xmlhr.js"></script>'."\n",
+    'javascript_include_tag() takes a javascript name as its first argument'
+);
+$t->is(
+    javascript_include_tag('common.javascript', '/elsewhere/cools'),
+    '<script type="text/javascript" src="/js/common.javascript"></script>'."\n".
+    '<script type="text/javascript" src="/elsewhere/cools.js"></script>'."\n",
+    'javascript_include_tag() can takes n javascript file names as its arguments'
+);
+$t->is(
+    javascript_include_tag('xmlhr', array('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)),
+    '<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')),
+    '<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')),
+    '<!--[if IE 6]><script type="text/javascript" src="/js/xmlhr.js"></script><![endif]-->'."\n",
+    'javascript_include_tag() can take a condition option'
+);
 
 // javascript_path()
 $t->diag('javascript_path()');
@@ -150,42 +177,58 @@ public function genUrl($parameters = array(), $absolute = false)
 // use_javascript() get_javascripts()
 $t->diag('use_javascript() get_javascripts()');
 use_javascript('xmlhr');
-$t->is(get_javascripts(),
-  '<script type="text/javascript" src="/js/xmlhr.js"></script>'."\n", 
-  'get_javascripts() returns a javascript previously added by use_javascript()');
+$t->is(
+    get_javascripts(),
+    '<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));
-$t->is(get_javascripts(),
-  '<script type="text/javascript" src="xmlhr"></script>'."\n", 
-  'use_javascript() accepts an array of options as a third parameter');
+$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));
-$t->is(get_javascripts(),
-  '<script type="text/javascript" src="http://localhost/js/xmlhr.js"></script>'."\n", 
-  'use_javascript() accepts an array of options as a third parameter');
+$t->is(
+    get_javascripts(),
+    '<script type="text/javascript" src="http://localhost/js/xmlhr.js"></script>'."\n",
+    'use_javascript() accepts an array of options as a third parameter'
+);
 use_javascript('xmlhr');
 use_javascript('xmlhr2');
-$t->is(get_javascripts(),
-  '<script type="text/javascript" src="/js/xmlhr.js"></script>'."\n".'<script type="text/javascript" src="/js/xmlhr2.js"></script>'."\n", 
-  'get_javascripts() returns all the javascripts previously added by use_javascript()');
+$t->is(
+    get_javascripts(),
+    '<script type="text/javascript" src="/js/xmlhr.js"></script>'."\n".'<script type="text/javascript" src="/js/xmlhr2.js"></script>'."\n",
+    'get_javascripts() returns all the javascripts previously added by use_javascript()'
+);
 
 // use_stylesheet() get_stylesheets()
 $t->diag('use_stylesheet() get_stylesheets()');
 use_stylesheet('style');
-$t->is(get_stylesheets(),
-  '<link rel="stylesheet" type="text/css" media="screen" href="/css/style.css" />'."\n", 
-  'get_stylesheets() returns a stylesheet previously added by use_stylesheet()');
+$t->is(
+    get_stylesheets(),
+    '<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));
-$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');
+$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));
-$t->is(get_stylesheets(),
-  '<link rel="stylesheet" type="text/css" media="screen" href="http://localhost/css/style.css" />'."\n", 
-  'use_stylesheet() accepts an array of options as a third parameter');
+$t->is(
+    get_stylesheets(),
+    '<link rel="stylesheet" type="text/css" media="screen" href="http://localhost/css/style.css" />'."\n",
+    'use_stylesheet() accepts an array of options as a third parameter'
+);
 use_stylesheet('style');
 use_stylesheet('style2');
-$t->is(get_stylesheets(),
-  '<link rel="stylesheet" type="text/css" media="screen" href="/css/style.css" />'."\n".'<link rel="stylesheet" type="text/css" media="screen" href="/css/style2.css" />'."\n",
-  'get_stylesheets() returns all the stylesheets previously added by use_stylesheet()');
+$t->is(
+    get_stylesheets(),
+    '<link rel="stylesheet" type="text/css" media="screen" href="/css/style.css" />'."\n".'<link rel="stylesheet" type="text/css" media="screen" href="/css/style2.css" />'."\n",
+    'get_stylesheets() returns all the stylesheets previously added by use_stylesheet()'
+);
 
 // _dynamic_path()
 $t->diag('_dynamic_path()');
@@ -204,42 +247,44 @@ public function genUrl($parameters = array(), $absolute = false)
 // use_dynamic_javascript()
 $t->diag('use_dynamic_javascript()');
 use_dynamic_javascript('module/action');
-$t->is(get_javascripts(),
-  '<script type="text/javascript" src="module/action?sf_format=js"></script>'."\n",
-  'use_dynamic_javascript() register a dynamic javascript in the response'
+$t->is(
+    get_javascripts(),
+    '<script type="text/javascript" src="module/action?sf_format=js"></script>'."\n",
+    'use_dynamic_javascript() register a dynamic javascript in the response'
 );
 
 // use_dynamic_stylesheet()
 $t->diag('use_dynamic_stylesheet()');
 use_dynamic_stylesheet('module/action');
-$t->is(get_stylesheets(),
-  '<link rel="stylesheet" type="text/css" media="screen" href="module/action?sf_format=css" />'."\n", 
-  'use_dynamic_stylesheet() register a dynamic stylesheet in the response'
+$t->is(
+    get_stylesheets(),
+    '<link rel="stylesheet" type="text/css" media="screen" href="module/action?sf_format=css" />'."\n",
+    'use_dynamic_stylesheet() register a dynamic stylesheet in the response'
 );
 
 class MyForm extends sfForm
 {
-  public function getStylesheets()
-  {
-    return array('/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');
-  }
+    public function getStylesheets()
+    {
+        return array('/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');
+    }
 }
 
 // get_javascripts_for_form() get_stylesheets_for_form()
 $t->diag('get_javascripts_for_form() get_stylesheets_for_form()');
 $form = new MyForm();
-$output = <<<EOF
+$output = <<<'EOF'
 <script type="text/javascript" src="/path/to/a/foo.js"></script>
 <script type="text/javascript" src="/path/to/a/bar.js"></script>
 
 EOF;
 $t->is(get_javascripts_for_form($form), fix_linebreaks($output), 'get_javascripts_for_form() returns script tags');
-$output = <<<EOF
+$output = <<<'EOF'
 <link rel="stylesheet" type="text/css" media="all" href="/path/to/a/foo.css" />
 <link rel="stylesheet" type="text/css" media="print" href="/path/to/a/bar.css" />
 
@@ -265,15 +310,19 @@ public function getJavaScripts()
 
 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'),
-  '<script type="text/javascript" src="/static/js/xmlhr.js"></script>'."\n", 
-  'javascript_include_tag() takes a javascript name as its first argument');
+$t->is(
+    javascript_include_tag('xmlhr'),
+    '<script type="text/javascript" src="/static/js/xmlhr.js"></script>'."\n",
+    'javascript_include_tag() takes a javascript name as its first argument'
+);
 
 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'), 
-  '<link rel="stylesheet" type="text/css" media="screen" href="/static/css/style.css" />'."\n", 
-  'stylesheet_tag() takes a stylesheet name as its first argument');
+$t->is(
+    stylesheet_tag('style'),
+    '<link rel="stylesheet" type="text/css" media="screen" href="/static/css/style.css" />'."\n",
+    'stylesheet_tag() takes a stylesheet name as its first argument'
+);
 
 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');
diff --git a/test/unit/helper/DateHelperTest.php b/test/unit/helper/DateHelperTest.php
index 03303b924..8338ad984 100644
--- a/test/unit/helper/DateHelperTest.php
+++ b/test/unit/helper/DateHelperTest.php
@@ -3,33 +3,36 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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($_test_dir.'/unit/sfContextMock.class.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
+
+require_once $_test_dir.'/unit/sfContextMock.class.php';
 
 $t = new lime_test(592);
 
 class sfUser
 {
-  public $culture = 'en';
+    public $culture = 'en';
 
-  public function getCulture()
-  {
-    return $this->culture;
-  }
+    public function getCulture()
+    {
+        return $this->culture;
+    }
 }
 
 sfConfig::set('sf_charset', 'utf-8');
 
 $context = sfContext::getInstance(array('user' => 'sfUser'));
 
-require_once(__DIR__.'/../../../lib/helper/UrlHelper.php');
-require_once(__DIR__.'/../../../lib/helper/TagHelper.php');
-require_once(__DIR__.'/../../../lib/helper/DateHelper.php');
+require_once __DIR__.'/../../../lib/helper/UrlHelper.php';
+
+require_once __DIR__.'/../../../lib/helper/TagHelper.php';
+
+require_once __DIR__.'/../../../lib/helper/DateHelper.php';
 
 // get a fixed timestamp to test with
 $now = time();
@@ -95,14 +98,12 @@ public function getCulture()
 $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();
-foreach ($cultures as $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'));
-    $t->is($df->format($dateTime, 'I', $df->getInputPattern('g')), date('Y-m-d H:i:', $now).'00', sprintf('"%s": Conversion "g" to "I"', $culture));
-  }
+foreach ($cultures as $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'));
+        $t->is($df->format($dateTime, 'I', $df->getInputPattern('g')), date('Y-m-d H:i:', $now).'00', sprintf('"%s": Conversion "g" to "I"', $culture));
+    }
 }
diff --git a/test/unit/helper/EscapingHelperTest.php b/test/unit/helper/EscapingHelperTest.php
index b03948af6..012c228fb 100644
--- a/test/unit/helper/EscapingHelperTest.php
+++ b/test/unit/helper/EscapingHelperTest.php
@@ -3,14 +3,14 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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 __DIR__.'/../../bootstrap/unit.php';
 
-require_once(__DIR__.'/../../../lib/helper/EscapingHelper.php');
+require_once __DIR__.'/../../../lib/helper/EscapingHelper.php';
 
 $t = new lime_test(11);
 
@@ -36,7 +36,7 @@
 $t->is(esc_js_no_entities('alert(\'foo\' + "bar")'), 'alert(\\\'foo\\\' + \\"bar\\")', 'esc_js_no_entities() escapes javascripts');
 $t->is(esc_js_no_entities('alert("hi\\there")'), 'alert(\\"hi\\\\there\\")', 'esc_js_no_entities() handles slashes correctly');
 $t->is(esc_js_no_entities('alert("été")'), 'alert(\\"été\\")', 'esc_js_no_entities() preserves utf-8');
-$output = <<<EOF
+$output = <<<'EOF'
 alert('hello
 world')
 EOF;
diff --git a/test/unit/helper/JavascriptBaseHelperTest.php b/test/unit/helper/JavascriptBaseHelperTest.php
index a15a5848a..e72ca3056 100644
--- a/test/unit/helper/JavascriptBaseHelperTest.php
+++ b/test/unit/helper/JavascriptBaseHelperTest.php
@@ -8,9 +8,11 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
-require_once(__DIR__.'/../../../lib/helper/TagHelper.php');
-require_once(__DIR__.'/../../../lib/helper/JavascriptBaseHelper.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
+
+require_once __DIR__.'/../../../lib/helper/TagHelper.php';
+
+require_once __DIR__.'/../../../lib/helper/JavascriptBaseHelper.php';
 
 $t = new lime_test(9, new lime_output_color());
 
@@ -18,17 +20,17 @@
 $t->diag('boolean_for_javascript()');
 $t->is(boolean_for_javascript(true), 'true', 'boolean_for_javascript() makes a javascript representation of the boolean if the param is boolean');
 $t->is(boolean_for_javascript(false), 'false', 'boolean_for_javascript() makes a javascript representation of the boolean if the param is boolean');
-$t->is(boolean_for_javascript(1==0), 'false', 'boolean_for_javascript() makes a javascript representation of the boolean if the param is boolean');
+$t->is(boolean_for_javascript(1 == 0), 'false', 'boolean_for_javascript() makes a javascript representation of the boolean if the param is boolean');
 $t->is(boolean_for_javascript('dummy'), 'dummy', 'boolean_for_javascript() makes a javascript representation of the boolean if the param is boolean');
 
-//options_for_javascript()
+// 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(array("'a'" => array("'b'" => "'c'"))), "{'a':{'b':'c'}}", 'options_for_javascript() works with nested arrays');
 
-//javascript_tag()
+// javascript_tag()
 $t->diag('javascript_tag()');
-$expect = <<<EOT
+$expect = <<<'EOT'
 <script type="text/javascript">
 //<![CDATA[
 alert("foo");
@@ -37,8 +39,8 @@
 EOT;
 $t->is(javascript_tag('alert("foo");'), $expect, 'javascript_tag() takes the content as string parameter');
 
-//link_to_function()
+// link_to_function()
 $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
+// #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');
diff --git a/test/unit/helper/NumberHelperTest.php b/test/unit/helper/NumberHelperTest.php
index 6976f4ec0..3f70110d8 100644
--- a/test/unit/helper/NumberHelperTest.php
+++ b/test/unit/helper/NumberHelperTest.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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(__DIR__.'/../../../lib/helper/NumberHelper.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
+
+require_once __DIR__.'/../../../lib/helper/NumberHelper.php';
 
 $t = new lime_test(12);
 
 // format_number()
 $t->diag('format_number()');
 $t->is(format_number(10012.1, 'en'), '10,012.1', 'format_number() takes a number as its first argument');
-//$t->is(format_number(10012.1, 'fr'), '10.012,1', 'format_number() takes a culture as its second argument');
+// $t->is(format_number(10012.1, 'fr'), '10.012,1', 'format_number() takes a culture as its second argument');
 
 $t->todo('format_number() takes the current user culture if no second argument is given');
 
@@ -29,8 +30,8 @@
 
 $t->is(format_currency(-1200000, 'USD', 'en'), '($1,200,000.00)', 'format_currency() takes a number as its first argument');
 $t->is(format_currency(-1200000, 'USD', 'en_GB'), '-$1,200,000.00', 'format_currency() takes a number as its first argument');
-//$t->is(format_currency(1200000, 'USD', 'de'), '1.200.000,00 $', 'format_currency() takes a number as its first argument');
-//$t->is(format_currency(-1200000, 'USD', 'de'), '-1.200.000,00 $', 'format_currency() takes a number as its first argument');
+// $t->is(format_currency(1200000, 'USD', 'de'), '1.200.000,00 $', 'format_currency() takes a number as its first argument');
+// $t->is(format_currency(-1200000, 'USD', 'de'), '-1.200.000,00 $', 'format_currency() takes a number as its first argument');
 
 $t->is(format_currency('11.50999', 'USD', 'en'), '$11.50', 'format_currency() takes a number as its first argument');
 $t->is(format_currency('11.50999', 'EUR', 'fr'), '11,50 €', 'format_currency() takes a number as its first argument');
diff --git a/test/unit/helper/PartialHelperTest.php b/test/unit/helper/PartialHelperTest.php
index 507aa34b5..aeaaf915e 100644
--- a/test/unit/helper/PartialHelperTest.php
+++ b/test/unit/helper/PartialHelperTest.php
@@ -3,14 +3,16 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.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($_test_dir.'/unit/sfContextMock.class.php');
-require_once(__DIR__.'/../../../lib/helper/PartialHelper.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
+
+require_once $_test_dir.'/unit/sfContextMock.class.php';
+
+require_once __DIR__.'/../../../lib/helper/PartialHelper.php';
 
 // Fixme: make this test more beautiful and extend it
 
@@ -18,18 +20,18 @@
 
 class MyTestPartialView extends sfPartialView
 {
-  public function render()
-  {
-    return '==RENDERED==';
-  }
-
-  public function initialize($context, $moduleName, $actionName, $viewName)
-  {
-  }
-
-  public function setPartialVars(array $partialVars)
-  {
-  }
+    public function render()
+    {
+        return '==RENDERED==';
+    }
+
+    public function initialize($context, $moduleName, $actionName, $viewName)
+    {
+    }
+
+    public function setPartialVars(array $partialVars)
+    {
+    }
 }
 
 $t->diag('get_partial()');
diff --git a/test/unit/helper/TagHelperTest.php b/test/unit/helper/TagHelperTest.php
index d8930979c..efec8f6a7 100644
--- a/test/unit/helper/TagHelperTest.php
+++ b/test/unit/helper/TagHelperTest.php
@@ -3,19 +3,20 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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($_test_dir.'/unit/sfContextMock.class.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
+
+require_once $_test_dir.'/unit/sfContextMock.class.php';
 
 $t = new lime_test(21);
 
 $context = sfContext::getInstance();
 
-require_once(__DIR__.'/../../../lib/helper/TagHelper.php');
+require_once __DIR__.'/../../../lib/helper/TagHelper.php';
 
 // tag()
 $t->diag('tag()');
@@ -25,7 +26,7 @@
 $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 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('br', array('class' => '"foo"')), '<br class="&quot;foo&quot;" />');
+// $t->is(tag('br', array('class' => '"foo"')), '<br class="&quot;foo&quot;" />');
 
 // content_tag()
 $t->diag('content_tag()');
@@ -46,8 +47,8 @@
 // _get_option()
 $t->diag('_get_option()');
 $options = array(
-  'foo' => 'bar',
-  'bar' => 'foo',
+    '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');
diff --git a/test/unit/helper/TestObject.php b/test/unit/helper/TestObject.php
index b5e838097..a20c98ed2 100644
--- a/test/unit/helper/TestObject.php
+++ b/test/unit/helper/TestObject.php
@@ -3,43 +3,43 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 class TestObject
 {
-  protected $value = 'value';
-  protected $text  = 'text';
-
-  public function getValue()
-  {
-    return $this->value;
-  }
-
-  public function getText()
-  {
-    return $this->text;
-  }
-
-  public function setText($text)
-  {
-    $this->text = $text;
-  }
-
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-
-  public function getBooleanTrue()
-  {
-    return true;
-  }
-
-  public function getBooleanFalse()
-  {
-    return false;
-  }
+    protected $value = 'value';
+    protected $text = 'text';
+
+    public function getValue()
+    {
+        return $this->value;
+    }
+
+    public function getText()
+    {
+        return $this->text;
+    }
+
+    public function setText($text)
+    {
+        $this->text = $text;
+    }
+
+    public function setValue($value)
+    {
+        $this->value = $value;
+    }
+
+    public function getBooleanTrue()
+    {
+        return true;
+    }
+
+    public function getBooleanFalse()
+    {
+        return false;
+    }
 }
diff --git a/test/unit/helper/TextHelperTest.php b/test/unit/helper/TextHelperTest.php
index 9d111eb84..b956d2182 100644
--- a/test/unit/helper/TextHelperTest.php
+++ b/test/unit/helper/TextHelperTest.php
@@ -8,10 +8,11 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../../test/bootstrap/unit.php');
+require_once __DIR__.'/../../../test/bootstrap/unit.php';
 
-require_once(__DIR__.'/../../../lib/helper/TagHelper.php');
-require_once(__DIR__.'/../../../lib/helper/TextHelper.php');
+require_once __DIR__.'/../../../lib/helper/TagHelper.php';
+
+require_once __DIR__.'/../../../lib/helper/TextHelper.php';
 
 $t = new lime_test(60);
 
@@ -39,15 +40,12 @@
 $t->is(truncate_text($text, 15, '...', false), $truncated_false, 'truncate_text() accepts a truncate lastspace boolean as its fourth argument');
 $t->is(truncate_text($text, 15, '...', true), $truncated_true, 'truncate_text() accepts a truncate lastspace boolean as its fourth argument');
 
-if (extension_loaded('mbstring'))
-{
-  $oldEncoding = mb_internal_encoding();
-  $t->is(truncate_text('のビヘイビアにパラメーターを渡すことで特定のモデルでのフォーム生成を無効にできます', 11), 'のビヘイビアにパ...', 'truncate_text() handles unicode characters using mbstring if available');
-  $t->is(mb_internal_encoding(), $oldEncoding, 'truncate_text() sets back the internal encoding in case it changes it');
-}
-else
-{
-  $t->skip('mbstring extension is not enabled', 2);
+if (extension_loaded('mbstring')) {
+    $oldEncoding = mb_internal_encoding();
+    $t->is(truncate_text('のビヘイビアにパラメーターを渡すことで特定のモデルでのフォーム生成を無効にできます', 11), 'のビヘイビアにパ...', 'truncate_text() handles unicode characters using mbstring if available');
+    $t->is(mb_internal_encoding(), $oldEncoding, 'truncate_text() sets back the internal encoding in case it changes it');
+} else {
+    $t->skip('mbstring extension is not enabled', 2);
 }
 
 $text = 'Web applications spend a large share of their code transforming arrays of data. PHP is a wonderful language for that, because it offers a lot of array manipulation functions. But web developers are actually required to translate business logic into a program - not to mess up with arrays. In fact, web developers should spend the least possible amount of tim';
@@ -67,19 +65,22 @@
 
 // highlight_text()
 $t->diag('highlight_text()');
-$t->is(highlight_text("This is a beautiful morning", "beautiful"),
-  "This is a <strong class=\"highlight\">beautiful</strong> morning",
-  'text_highlighter() highlights a word given as its second argument'
+$t->is(
+    highlight_text('This is a beautiful morning', 'beautiful'),
+    'This is a <strong class="highlight">beautiful</strong> morning',
+    'text_highlighter() highlights a word given as its second argument'
 );
 
-$t->is(highlight_text("This is a beautiful morning, but also a beautiful day", "beautiful"),
-  "This is a <strong class=\"highlight\">beautiful</strong> morning, but also a <strong class=\"highlight\">beautiful</strong> day",
-  'text_highlighter() highlights all occurrences of a word given as its second argument'
+$t->is(
+    highlight_text('This is a beautiful morning, but also a beautiful day', 'beautiful'),
+    'This is a <strong class="highlight">beautiful</strong> morning, but also a <strong class="highlight">beautiful</strong> day',
+    'text_highlighter() highlights all occurrences of a word given as its second argument'
 );
 
-$t->is(highlight_text("This is a beautiful morning, but also a beautiful day", "beautiful", '<b>\\1</b>'),
-  "This is a <b>beautiful</b> morning, but also a <b>beautiful</b> day",
-  'text_highlighter() takes a pattern as its third argument'
+$t->is(
+    highlight_text('This is a beautiful morning, but also a beautiful day', 'beautiful', '<b>\\1</b>'),
+    'This is a <b>beautiful</b> morning, but also a <b>beautiful</b> day',
+    'text_highlighter() takes a pattern as its third argument'
 );
 
 $t->is(highlight_text('', 'beautiful'), '', 'text_highlighter() returns an empty string if input is empty');
@@ -87,23 +88,23 @@
 $t->is(highlight_text('foobar', 'beautiful'), 'foobar', 'text_highlighter() does nothing is string to highlight is not present');
 $t->is(highlight_text('foobar', ''), 'foobar', 'text_highlighter() returns input if string to highlight is not present');
 
-$t->is(highlight_text("This is a beautiful! morning", "beautiful!"), "This is a <strong class=\"highlight\">beautiful!</strong> morning", 'text_highlighter() escapes search string to be safe in a regex');
-$t->is(highlight_text("This is a beautiful! morning", "beautiful! morning"), "This is a <strong class=\"highlight\">beautiful! morning</strong>", 'text_highlighter() escapes search string to be safe in a regex');
-$t->is(highlight_text("This is a beautiful? morning", "beautiful? morning"), "This is a <strong class=\"highlight\">beautiful? morning</strong>", 'text_highlighter() escapes search string to be safe in a regex');
+$t->is(highlight_text('This is a beautiful! morning', 'beautiful!'), 'This is a <strong class="highlight">beautiful!</strong> morning', 'text_highlighter() escapes search string to be safe in a regex');
+$t->is(highlight_text('This is a beautiful! morning', 'beautiful! morning'), 'This is a <strong class="highlight">beautiful! morning</strong>', 'text_highlighter() escapes search string to be safe in a regex');
+$t->is(highlight_text('This is a beautiful? morning', 'beautiful? morning'), 'This is a <strong class="highlight">beautiful? morning</strong>', 'text_highlighter() escapes search string to be safe in a regex');
 
-$t->is(highlight_text("The http://www.google.com/ website is great", "http://www.google.com/"), "The <strong class=\"highlight\">http://www.google.com/</strong> website is great", 'text_highlighter() escapes search string to be safe in a regex');
+$t->is(highlight_text('The http://www.google.com/ website is great', 'http://www.google.com/'), 'The <strong class="highlight">http://www.google.com/</strong> website is great', 'text_highlighter() escapes search string to be safe in a regex');
 
 // excerpt_text()
 $t->diag('excerpt_text()');
 $t->is(excerpt_text('', 'foo', 5), '', 'text_excerpt() return an empty string if argument is empty');
 $t->is(excerpt_text('foo', '', 5), '', 'text_excerpt() return an empty string if phrase is empty');
-$t->is(excerpt_text("This is a beautiful morning", "beautiful", 5), "...is a beautiful morn...", 'text_excerpt() creates an excerpt of a text');
-$t->is(excerpt_text("This is a beautiful morning", "this", 5), "This is a...", 'text_excerpt() creates an excerpt of a text');
-$t->is(excerpt_text("This is a beautiful morning", "morning", 5), "...iful morning", 'text_excerpt() creates an excerpt of a text');
-$t->is(excerpt_text("This is a beautiful morning", "morning", 5, '...', true), "... morning", 'text_excerpt() takes a fifth argument allowing excerpt on whitespace');
-$t->is(excerpt_text("This is a beautiful morning", "beautiful", 5, '...', true), "... a beautiful ...", 'text_excerpt() takes a fifth argument allowing excerpt on whitespace');
-$t->is(excerpt_text("This is a beautiful morning", "This", 5, '...', true), "This is ...", 'text_excerpt() takes a fifth argument allowing excerpt on whitespace');
-$t->is(excerpt_text("This is a beautiful morning", "day"), '', 'text_excerpt() does nothing if the search string is not in input');
+$t->is(excerpt_text('This is a beautiful morning', 'beautiful', 5), '...is a beautiful morn...', 'text_excerpt() creates an excerpt of a text');
+$t->is(excerpt_text('This is a beautiful morning', 'this', 5), 'This is a...', 'text_excerpt() creates an excerpt of a text');
+$t->is(excerpt_text('This is a beautiful morning', 'morning', 5), '...iful morning', 'text_excerpt() creates an excerpt of a text');
+$t->is(excerpt_text('This is a beautiful morning', 'morning', 5, '...', true), '... morning', 'text_excerpt() takes a fifth argument allowing excerpt on whitespace');
+$t->is(excerpt_text('This is a beautiful morning', 'beautiful', 5, '...', true), '... a beautiful ...', 'text_excerpt() takes a fifth argument allowing excerpt on whitespace');
+$t->is(excerpt_text('This is a beautiful morning', 'This', 5, '...', true), 'This is ...', 'text_excerpt() takes a fifth argument allowing excerpt on whitespace');
+$t->is(excerpt_text('This is a beautiful morning', 'day'), '', 'text_excerpt() does nothing if the search string is not in input');
 
 // wrap_text()
 $t->diag('wrap_text()');
@@ -115,15 +116,15 @@
 // simple_format_text()
 $t->diag('simple_format_text()');
 $t->is(simple_format_text("crazy\r\n cross\r platform linebreaks"), "<p>crazy\n<br /> cross\n<br /> platform linebreaks</p>", 'text_simple_format() replaces \n by <br />');
-$t->is(simple_format_text("A paragraph\n\nand another one!"), "<p>A paragraph</p><p>and another one!</p>", 'text_simple_format() replaces \n\n by <p>');
-$t->is(simple_format_text("A paragraph\n\n\n\nand another one!"), "<p>A paragraph</p><p>and another one!</p>", 'text_simple_format() replaces \n\n\n\n by <p>');
+$t->is(simple_format_text("A paragraph\n\nand another one!"), '<p>A paragraph</p><p>and another one!</p>', 'text_simple_format() replaces \n\n by <p>');
+$t->is(simple_format_text("A paragraph\n\n\n\nand another one!"), '<p>A paragraph</p><p>and another one!</p>', 'text_simple_format() replaces \n\n\n\n by <p>');
 $t->is(simple_format_text("A paragraph\n With a newline"), "<p>A paragraph\n<br /> With a newline</p>", 'text_simple_format() wrap all string with <p>');
 $t->is(simple_format_text("1\n2\n3"), "<p>1\n<br />2\n<br />3</p>", 'text_simple_format() Ticket #6824');
 
 // text_strip_links()
 $t->diag('text_strip_links()');
-$t->is(strip_links_text("<a href='almost'>on my mind</a>"), "on my mind", 'text_strip_links() strips all links in input');
-$t->is(strip_links_text('<a href="first.html">first</a> and <a href="second.html">second</a>'), "first and second", 'text_strip_links() strips all links in input');
+$t->is(strip_links_text("<a href='almost'>on my mind</a>"), 'on my mind', 'text_strip_links() strips all links in input');
+$t->is(strip_links_text('<a href="first.html">first</a> and <a href="second.html">second</a>'), 'first and second', 'text_strip_links() strips all links in input');
 
 // auto_link_text()
 $t->diag('auto_link_text()');
@@ -147,7 +148,7 @@
 $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://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");
-$t->is(auto_link_text('<p>Link '.$link_result.'</p>'), '<p>Link '.$link_result.'</p>', "auto_link_text() does not double-link emails");
+$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');
+$t->is(auto_link_text('<p>Link '.$link_result.'</p>'), '<p>Link '.$link_result.'</p>', 'auto_link_text() does not double-link emails');
diff --git a/test/unit/helper/UrlHelperTest.php b/test/unit/helper/UrlHelperTest.php
index e97862d99..e4a746055 100644
--- a/test/unit/helper/UrlHelperTest.php
+++ b/test/unit/helper/UrlHelperTest.php
@@ -3,47 +3,49 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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($_test_dir.'/unit/sfContextMock.class.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
+
+require_once $_test_dir.'/unit/sfContextMock.class.php';
 
 class myController
 {
-  public function genUrl($parameters = array(), $absolute = false)
-  {
-    $url = is_array($parameters) && isset($parameters['sf_route']) ? $parameters['sf_route'] : 'module/action';
-    return ($absolute ? '/' : '').$url;
-  }
+    public function genUrl($parameters = array(), $absolute = false)
+    {
+        $url = is_array($parameters) && isset($parameters['sf_route']) ? $parameters['sf_route'] : 'module/action';
+
+        return ($absolute ? '/' : '').$url;
+    }
 }
 
 class myRequest
 {
-  public function getRelativeUrlRoot()
-  {
-    return '/public';
-  }
-  
-  public function isSecure()
-  {
-    return true;
-  }
-
-  public function getHost()
-  {
-    return 'example.org';
-  }
+    public function getRelativeUrlRoot()
+    {
+        return '/public';
+    }
+
+    public function isSecure()
+    {
+        return true;
+    }
+
+    public function getHost()
+    {
+        return 'example.org';
+    }
 }
 
 class BaseForm extends sfForm
 {
-  public function getCSRFToken($secret = null)
-  {
-    return '==TOKEN==';
-  }
+    public function getCSRFToken($secret = null)
+    {
+        return '==TOKEN==';
+    }
 }
 
 sfForm::enableCSRFProtection();
@@ -52,9 +54,11 @@ public function getCSRFToken($secret = null)
 
 $context = sfContext::getInstance(array('controller' => 'myController', 'request' => 'myRequest'));
 
-require_once(__DIR__.'/../../../lib/helper/AssetHelper.php');
-require_once(__DIR__.'/../../../lib/helper/UrlHelper.php');
-require_once(__DIR__.'/../../../lib/helper/TagHelper.php');
+require_once __DIR__.'/../../../lib/helper/AssetHelper.php';
+
+require_once __DIR__.'/../../../lib/helper/UrlHelper.php';
+
+require_once __DIR__.'/../../../lib/helper/TagHelper.php';
 
 // url_for()
 $t->diag('url_for()');
@@ -87,23 +91,20 @@ class testObject
 {
 }
 
-try
-{
-  $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)
-{
-  $t->pass('link_to() can take an object as its first argument if __toString() method is defined');
+try {
+    $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) {
+    $t->pass('link_to() can take an object as its first argument if __toString() method is defined');
 }
 
 class testObjectWithToString
 {
-  public function __toString()
-  {
-    return 'test';
-  }
+    public function __toString()
+    {
+        return 'test';
+    }
 }
 $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');
@@ -140,10 +141,10 @@ public function __toString()
 $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->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->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', '', 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');
diff --git a/test/unit/i18n/dataTest.php b/test/unit/i18n/dataTest.php
index b731ab72a..d0c18a917 100644
--- a/test/unit/i18n/dataTest.php
+++ b/test/unit/i18n/dataTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(92);
 
@@ -16,9 +16,8 @@
 $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)
-{
-  $t->ok(isset($en[$entry]), sprintf('i18n data files may contain a "%s" entry', $entry));
+foreach (array('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));
 }
 
 // Countries
@@ -60,19 +59,16 @@
 
 $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)
-{
-  $t->is($a[$key], $name, '"calendar" contains abrreviated day names');
+foreach (array(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)
-{
-  $t->is($a[$key], $name, '"calendar" contains narrow day names');
+foreach (array(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)
-{
-  $t->is($a[$key], $name, '"calendar" contains day names');
+foreach (array(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');
@@ -80,27 +76,23 @@
 
 $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)
-{
-  $t->is($a[$key], $name, '"calendar" contains abrreviated month names');
+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) {
+    $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)
-{
-  $t->is($a[$key], $name, '"calendar" contains narrow month names');
+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) {
+    $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)
-{
-  $t->is($a[$key], $name, '"calendar" contains month names');
+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) {
+    $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)
-{
-  $t->is($a[$key], $name, '"zoneStrings" contains time zone names');
+foreach (array('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');
 }
 
 // Types
diff --git a/test/unit/i18n/extract/sfI18nExtractTest.php b/test/unit/i18n/extract/sfI18nExtractTest.php
index 334692ca9..ba519c3b9 100644
--- a/test/unit/i18n/extract/sfI18nExtractTest.php
+++ b/test/unit/i18n/extract/sfI18nExtractTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../../bootstrap/unit.php');
+require_once __DIR__.'/../../../bootstrap/unit.php';
 
 $t = new lime_test(3);
 
@@ -18,27 +18,32 @@ class ProjectConfiguration extends sfProjectConfiguration
 
 class TestConfiguration extends sfApplicationConfiguration
 {
-  public function getI18NGlobalDirs()
-  {
-    return array(__DIR__.'/../fixtures');
-  }
+    public function getI18NGlobalDirs()
+    {
+        return array(__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);
 
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
 class sfI18nExtractTest extends sfI18nExtract
 {
-  public function extract()
-  {
-    $this->updateMessages($this->getMessages());
-  }
-
-  public function getMessages()
-  {
-    return array('toto', 'an english sentence');
-  }
+    public function extract()
+    {
+        $this->updateMessages($this->getMessages());
+    }
+
+    public function getMessages()
+    {
+        return array('toto', 'an english sentence');
+    }
 }
 
 // ->initialize()
diff --git a/test/unit/i18n/extract/sfI18nPhpExtractorTest.php b/test/unit/i18n/extract/sfI18nPhpExtractorTest.php
index 04f194cb0..9d70099cc 100644
--- a/test/unit/i18n/extract/sfI18nPhpExtractorTest.php
+++ b/test/unit/i18n/extract/sfI18nPhpExtractorTest.php
@@ -3,12 +3,12 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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 __DIR__.'/../../../bootstrap/unit.php';
 
 $t = new lime_test(7);
 
@@ -20,31 +20,31 @@
 // ->extract();
 $t->diag('->extract()');
 
-$content = <<<EOF
+$content = <<<'EOF'
 __('bar')
 
 <?php __('foo') ?>
 
 <?php __('I\'m "happy"') ?>
 <?php __("I'm very \"happy\"") ?>
-<?php __("I\\'m so \"happy\"") ?>
+<?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');
 
-$content = <<<EOF
+$content = <<<'EOF'
 <?php format_number_choice('foo') ?>
 EOF;
 
 $t->is($e->extract($content), array('foo'), '->extract() takes into account the format_number_choice() helper');
 
-$content = <<<EOF
-<?php \$this->getContext()->getI18N()->__('foo') ?>
+$content = <<<'EOF'
+<?php $this->getContext()->getI18N()->__('foo') ?>
 EOF;
 
 $t->is($e->extract($content), array('foo'), '->extract() takes into account calls in an action file');
 
-$content = <<<EOF
+$content = <<<'EOF'
 <?php
   echo __('foo');
   echo __("bar");
@@ -55,7 +55,7 @@
 
 $t->is($e->extract($content), array('foo', 'bar', 'foobar', 'foo %a% bar'), '->extract() extracts strings from \'\' and "" quoted strings');
 
-$content = <<<EOF
+$content = <<<'EOF'
 <?php
   echo __ ( 'foo' );
 
@@ -67,7 +67,7 @@
 
 $t->is($e->extract($content), array('foo', 'bar'), '->extract() does not care if you add some whitespaces');
 
-$content = <<<EOF
+$content = <<<'EOF'
 <?php
   echo __(<<<EOD
 foo
diff --git a/test/unit/i18n/extract/sfI18nYamlGeneratorExtractorTest.php b/test/unit/i18n/extract/sfI18nYamlGeneratorExtractorTest.php
index d612b8395..701c1fb08 100644
--- a/test/unit/i18n/extract/sfI18nYamlGeneratorExtractorTest.php
+++ b/test/unit/i18n/extract/sfI18nYamlGeneratorExtractorTest.php
@@ -3,12 +3,12 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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 __DIR__.'/../../../bootstrap/unit.php';
 
 $t = new lime_test(3);
 
@@ -20,7 +20,7 @@
 // ->extract();
 $t->diag('->extract()');
 
-$content = <<<EOF
+$content = <<<'EOF'
 generator:
   param:
     config:
@@ -41,19 +41,19 @@
 EOF;
 
 $t->is($e->extract($content), array(
-  'List title',
-  'Edit title',
-  'Global Field Name',
-  'Global Help for Name',
-  'List Field Name',
-  'List Help for Name',
-  'Edit Field Name',
-  'Edit Help for Name',
-  'First category',
-  'Last category',
+    'List title',
+    'Edit title',
+    'Global Field Name',
+    'Global Help for Name',
+    'List Field Name',
+    'List Help for Name',
+    'Edit Field Name',
+    'Edit Help for Name',
+    'First category',
+    'Last category',
 ), '->extract() extracts strings from generator.yml files');
 
-$content = <<<EOF
+$content = <<<'EOF'
 generator:
   param:
     edit:
diff --git a/test/unit/i18n/extract/sfI18nYamlValidateExtractorTest.php b/test/unit/i18n/extract/sfI18nYamlValidateExtractorTest.php
index 22d57b85d..f8189bbbc 100644
--- a/test/unit/i18n/extract/sfI18nYamlValidateExtractorTest.php
+++ b/test/unit/i18n/extract/sfI18nYamlValidateExtractorTest.php
@@ -3,12 +3,12 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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 __DIR__.'/../../../bootstrap/unit.php';
 
 $t = new lime_test(2);
 
@@ -20,7 +20,7 @@
 // ->extract();
 $t->diag('->extract()');
 
-$content = <<<EOF
+$content = <<<'EOF'
 fields:
   name:
     required:
@@ -37,8 +37,8 @@ class: sfStringValidator
 EOF;
 
 $t->is($e->extract($content), array(
-  'Name is required',
-  'The name is too short',
-  'The name is really too short',
-  'The name is really too long',
+    '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');
diff --git a/test/unit/i18n/sfChoiceFormatTest.php b/test/unit/i18n/sfChoiceFormatTest.php
index 3e386a81a..a5e6356bf 100644
--- a/test/unit/i18n/sfChoiceFormatTest.php
+++ b/test/unit/i18n/sfChoiceFormatTest.php
@@ -8,59 +8,58 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(90);
 
 $n = new sfChoiceFormat();
 
 $strings = array(
-  array(
-    '[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(
+            array('[1,2]'),
+            array('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(
+            array('(1,2)'),
+            array('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(
+            array('{1,2,3,4}'),
+            array('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(
+            array('[-Inf,0)'),
+            array('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] no file|[1] one file|(1,Inf] {number} files',
+        array(
+            array('[0]', '[1]', '(1,Inf]'),
+            array('no file', 'one file', '{number} files'),
+        ),
     ),
-  ),
 );
 
 // ->parse()
 $t->diag('->parse()');
-foreach ($strings as $string)
-{
-  $t->is($n->parse($string[0]), $string[1], '->parse() takes a choice strings as its first parameters');
+foreach ($strings as $string) {
+    $t->is($n->parse($string[0]), $string[1], '->parse() takes a choice strings as its first parameters');
 }
 
 // ->isValid()
@@ -79,14 +78,11 @@
 $t->is($n->isValid(10000000, '[0,Inf]'), true, '->isValid() determines if a given number belongs to the given set');
 $t->is($n->isValid(-10000000, '[-Inf,+Inf]'), true, '->isValid() determines if a given number belongs to the given set');
 
-try
-{
-  $n->isValid(1, '[1');
-  $t->fail('->isValid() throw an exception if the set is not valid');
-}
-catch (sfException $e)
-{
-  $t->pass('->isValid() throw an exception if the set is not valid');
+try {
+    $n->isValid(1, '[1');
+    $t->fail('->isValid() throw an exception if the set is not valid');
+} catch (sfException $e) {
+    $t->pass('->isValid() throw an exception if the set is not valid');
 }
 
 // ->format()
@@ -98,7 +94,7 @@
 $t->is($n->format($strings[4][0], 12), $strings[4][1][1][2], '->format() returns the string that match the number');
 
 // test strings with some set notation
-$t->is($n->format("[0]Some text|[1,Inf] Some text (10)", 12), 'Some text (10)', '->format() does not take into account ranges that are not prefixed with |');
+$t->is($n->format('[0]Some text|[1,Inf] Some text (10)', 12), 'Some text (10)', '->format() does not take into account ranges that are not prefixed with |');
 
 // test set notation
 // tests adapted from Prado unit test suite
@@ -113,16 +109,14 @@
 $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),
+    '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),
 );
-foreach ($wants as $want => $numbers)
-{
-  foreach ($numbers as $number)
-  {
-    $t->is($n->format($string, $number), $want, '->format() can deal with polish!');
-  }
+foreach ($wants as $want => $numbers) {
+    foreach ($numbers as $number) {
+        $t->is($n->format($string, $number), $want, '->format() can deal with polish!');
+    }
 }
 
 $t->diag('set notation for russian');
@@ -132,32 +126,28 @@
 |{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),
+    '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),
 );
-foreach ($wants as $want => $numbers)
-{
-  foreach ($numbers as $number)
-  {
-    $t->is($n->format($string, $number), $want, '->format() can deal with russian!');
-  }
+foreach ($wants as $want => $numbers) {
+    foreach ($numbers as $number) {
+        $t->is($n->format($string, $number), $want, '->format() can deal with russian!');
+    }
 }
 
 $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),
+    '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),
 );
-foreach ($wants as $want => $numbers)
-{
-  foreach ($numbers as $number)
-  {
-    $t->is($n->format($string, $number), $want, '->format() can deal with english!');
-  }
+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 f45c2df41..66f690631 100644
--- a/test/unit/i18n/sfCultureInfoTest.php
+++ b/test/unit/i18n/sfCultureInfoTest.php
@@ -3,12 +3,12 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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 __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(67);
 
@@ -26,14 +26,11 @@
 $c = sfCultureInfo::getInstance();
 $t->is($c->__toString(), 'en', '->__toString() returns the name of the culture');
 
-try
-{
-  $c = sfCultureInfo::getInstance('xxx');
-  $t->fail('->__construct() throws an exception if the culture is not valid');
-}
-catch (sfException $e)
-{
-  $t->pass('->__construct() throws an exception if the culture is not valid');
+try {
+    $c = sfCultureInfo::getInstance('xxx');
+    $t->fail('->__construct() throws an exception if the culture is not valid');
+} catch (sfException $e) {
+    $t->pass('->__construct() throws an exception if the culture is not valid');
 }
 
 $c_en = sfCultureInfo::getInstance();
@@ -46,14 +43,11 @@
 $t->is($language_en, 'French', '->getLanguage() returns the language name for the current culture');
 $t->is($language_fr, 'français', '->getLanguage() returns the language name for the current culture');
 
-try
-{
-  $c_en->getLanguage('gb');
-  $t->fail('->getLanguage() throws an Exception if the given language is invalid.');
-}
-catch (Exception $e)
-{
-  $t->pass('->getLanguage() throws an Exception if the given language is invalid.');
+try {
+    $c_en->getLanguage('gb');
+    $t->fail('->getLanguage() throws an Exception if the given language is invalid.');
+} catch (Exception $e) {
+    $t->pass('->getLanguage() throws an Exception if the given language is invalid.');
 }
 
 // ->getCurrency()
@@ -63,14 +57,11 @@
 $t->is($currency_en, 'Euro', '->getCurrency() returns the currency name for the current culture');
 $t->is($currency_fr, 'euro', '->getCurrency() returns the currency name for the current culture');
 
-try
-{
-  $c_en->getCurrency('FRANCS');
-  $t->fail('->getCurrency() throws an Exception if the given currency is invalid.');
-}
-catch (Exception $e)
-{
-  $t->pass('->getCurrency() throws an Exception if the given currency is invalid.');
+try {
+    $c_en->getCurrency('FRANCS');
+    $t->fail('->getCurrency() throws an Exception if the given currency is invalid.');
+} catch (Exception $e) {
+    $t->pass('->getCurrency() throws an Exception if the given currency is invalid.');
 }
 
 // ->getCountry()
@@ -80,14 +71,11 @@
 $t->is($country_en, 'France', '->getCountry() returns the country name for the current culture');
 $t->is($country_fr, 'France', '->getCountry() returns the country name for the current culture');
 
-try
-{
-  $c_en->getCountry('en');
-  $t->fail('->getCountry() throws an Exception if the given country is invalid.');
-}
-catch (Exception $e)
-{
-  $t->pass('->getCountry() throws an Exception if the given country is invalid.');
+try {
+    $c_en->getCountry('en');
+    $t->fail('->getCountry() throws an Exception if the given country is invalid.');
+} catch (Exception $e) {
+    $t->pass('->getCountry() throws an Exception if the given country is invalid.');
 }
 
 // ->getLanguages()
@@ -101,14 +89,11 @@
 $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');
 
-try
-{
-  $c_en->getLanguages(array('fr', 'gb'));
-  $t->fail('->getLanguages() throws an Exception if the list of given languages contains some invalid ones.');
-}
-catch (Exception $e)
-{
-  $t->pass('->getLanguages() throws an Exception if the list of given languages contains some invalid ones.');
+try {
+    $c_en->getLanguages(array('fr', 'gb'));
+    $t->fail('->getLanguages() throws an Exception if the list of given languages contains some invalid ones.');
+} catch (Exception $e) {
+    $t->pass('->getLanguages() throws an Exception if the list of given languages contains some invalid ones.');
 }
 
 // ->getCurrencies()
@@ -122,14 +107,11 @@
 $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');
 
-try
-{
-  $c_en->getCurrencies(array('USD', 'FRANCS'));
-  $t->fail('->getCurrencies() throws an Exception if the list of given currencies contains some invalid ones.');
-}
-catch (Exception $e)
-{
-  $t->pass('->getCurrencies() throws an Exception if the list of given currencies contains some invalid ones.');
+try {
+    $c_en->getCurrencies(array('USD', 'FRANCS'));
+    $t->fail('->getCurrencies() throws an Exception if the list of given currencies contains some invalid ones.');
+} catch (Exception $e) {
+    $t->pass('->getCurrencies() throws an Exception if the list of given currencies contains some invalid ones.');
 }
 
 // ->getCountries()
@@ -143,14 +125,11 @@
 $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');
 
-try
-{
-  $c_en->getCountries(array('FR', 'EN'));
-  $t->fail('->getCountries() throws an Exception if the list of given countries contains some invalid ones.');
-}
-catch (Exception $e)
-{
-  $t->pass('->getCountries() throws an Exception if the list of given countries contains some invalid ones.');
+try {
+    $c_en->getCountries(array('FR', 'EN'));
+    $t->fail('->getCountries() throws an Exception if the list of given countries contains some invalid ones.');
+} catch (Exception $e) {
+    $t->pass('->getCountries() throws an Exception if the list of given countries contains some invalid ones.');
 }
 
 // ->getScripts()
@@ -174,9 +153,8 @@
 $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)
-{
-  $t->is($c->validCulture($culture), false, '->validCulture() returns false if the culture does not exist');
+foreach (array('xxx', 'pp', 'frFR') as $culture) {
+    $t->is($c->validCulture($culture), false, '->validCulture() returns false if the culture does not exist');
 }
 
 // ::getCultures()
@@ -232,26 +210,22 @@
 
 // __get()
 $t->diag('__get()');
-try
-{
-  $c->NonExistant;
-  $t->fail('__get() throws an exception if the property does not exist');
-}
-catch (sfException $e)
-{
-  $t->pass('__get() throws an exception if the property does not exist');
+
+try {
+    $c->NonExistant;
+    $t->fail('__get() throws an exception if the property does not exist');
+} catch (sfException $e) {
+    $t->pass('__get() throws an exception if the property does not exist');
 }
 
 // __set()
 $t->diag('__set()');
-try
-{
-  $c->NonExistant = 12;
-  $t->fail('__set() throws an exception if the property does not exist');
-}
-catch (sfException $e)
-{
-  $t->pass('__set() throws an exception if the property does not exist');
+
+try {
+    $c->NonExistant = 12;
+    $t->fail('__set() throws an exception if the property does not exist');
+} catch (sfException $e) {
+    $t->pass('__set() throws an exception if the property does not exist');
 }
 
 // ->getDateTimeFormat()
diff --git a/test/unit/i18n/sfI18NTest.php b/test/unit/i18n/sfI18NTest.php
index 4117ee033..a1ea000bf 100644
--- a/test/unit/i18n/sfI18NTest.php
+++ b/test/unit/i18n/sfI18NTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(34);
 
@@ -18,10 +18,10 @@ class ProjectConfiguration extends sfProjectConfiguration
 
 class TestConfiguration extends sfApplicationConfiguration
 {
-  public function getI18NGlobalDirs()
-  {
-    return array(__DIR__.'/fixtures');
-  }
+    public function getI18NGlobalDirs()
+    {
+        return array(__DIR__.'/fixtures');
+    }
 }
 
 $configuration = new TestConfiguration('test', true, sfConfig::get('sf_test_cache_dir', sys_get_temp_dir()));
@@ -35,17 +35,14 @@ public function getI18NGlobalDirs()
 $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));
-  $frLocale = localeconv();
-  $i18n = new sfI18N($configuration, $cache, array('culture' => $en));
-  $enLocale = localeconv();
-  $t->isnt(serialize($frLocale), serialize($enLocale), '->initialize() sets the PHP locale when a "culture" option is provided');
-}
-else
-{
-  $t->skip('PHP version > 5.2 or Locale class or English and French locales are not installed');
+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));
+    $frLocale = localeconv();
+    $i18n = new sfI18N($configuration, $cache, array('culture' => $en));
+    $enLocale = localeconv();
+    $t->isnt(serialize($frLocale), serialize($enLocale), '->initialize() sets the PHP locale when a "culture" option is provided');
+} else {
+    $t->skip('PHP version > 5.2 or Locale class or English and French locales are not installed');
 }
 
 // ->getCulture() ->setCulture()
@@ -62,10 +59,10 @@ public function getI18NGlobalDirs()
 $t->is($i18n->__('an english sentence'), 'une phrase en français', '->__() translates a string');
 class EnglishSentence
 {
-  public function __toString()
-  {
-    return 'an english sentence';
-  }
+    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());
diff --git a/test/unit/i18n/sfMessageSourceTest.php b/test/unit/i18n/sfMessageSourceTest.php
index f259ec408..7e38efbbf 100644
--- a/test/unit/i18n/sfMessageSourceTest.php
+++ b/test/unit/i18n/sfMessageSourceTest.php
@@ -3,23 +3,40 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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 __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(3);
 
 class sfMessageSource_Simple extends sfMessageSource
 {
-  function __construct($source) {}
-  function delete($message, $catalogue = 'messages') {}
-  function update($text, $target, $comments, $catalogue = 'messages') {}
-  function catalogues() {}
-  function save($catalogue = 'messages') {}
-  function getId() {}
+    public function __construct($source)
+    {
+    }
+
+    public function delete($message, $catalogue = 'messages')
+    {
+    }
+
+    public function update($text, $target, $comments, $catalogue = 'messages')
+    {
+    }
+
+    public function catalogues()
+    {
+    }
+
+    public function save($catalogue = 'messages')
+    {
+    }
+
+    public function getId()
+    {
+    }
 }
 
 // ::factory()
diff --git a/test/unit/i18n/sfMessageSource_AggregateTest.php b/test/unit/i18n/sfMessageSource_AggregateTest.php
index e853137b3..1a36e5886 100644
--- a/test/unit/i18n/sfMessageSource_AggregateTest.php
+++ b/test/unit/i18n/sfMessageSource_AggregateTest.php
@@ -3,12 +3,12 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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 __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(9);
 
@@ -75,8 +75,8 @@
 
 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', array($source1, $source2));
 }
diff --git a/test/unit/i18n/sfMessageSource_FileTest.php b/test/unit/i18n/sfMessageSource_FileTest.php
index 5bd44855b..1d963717d 100644
--- a/test/unit/i18n/sfMessageSource_FileTest.php
+++ b/test/unit/i18n/sfMessageSource_FileTest.php
@@ -3,27 +3,35 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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 __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(7);
 
 class sfMessageSource_Simple extends sfMessageSource_File
 {
-  protected $dataExt = '.xml';
+    protected $dataExt = '.xml';
 
-  function delete($message, $catalogue = 'messages') {}
-  function update($text, $target, $comments, $catalogue = 'messages') {}
-  function save($catalogue = 'messages') {}
+    public function delete($message, $catalogue = 'messages')
+    {
+    }
 
-  public function getCatalogueByDir($catalogue)
-  {
-    return parent::getCatalogueByDir($catalogue);
-  }
+    public function update($text, $target, $comments, $catalogue = 'messages')
+    {
+    }
+
+    public function save($catalogue = 'messages')
+    {
+    }
+
+    public function getCatalogueByDir($catalogue)
+    {
+        return parent::getCatalogueByDir($catalogue);
+    }
 }
 
 $source = sfMessageSource::factory('Simple', __DIR__.'/fixtures');
diff --git a/test/unit/i18n/sfMessageSource_SQLiteTest.php b/test/unit/i18n/sfMessageSource_SQLiteTest.php
index 6e71be1fa..1da839fe4 100644
--- a/test/unit/i18n/sfMessageSource_SQLiteTest.php
+++ b/test/unit/i18n/sfMessageSource_SQLiteTest.php
@@ -8,15 +8,15 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $plan = 10;
 $t = new lime_test($plan);
 
-if (!extension_loaded('SQLite') && !extension_loaded('pdo_SQLite'))
-{
-  $t->skip('SQLite needed to run these tests', $plan);
-  return;
+if (!extension_loaded('SQLite') && !extension_loaded('pdo_SQLite')) {
+    $t->skip('SQLite needed to run these tests', $plan);
+
+    return;
 }
 
 // setup
@@ -27,12 +27,11 @@
 
 function sf_test_shutdown()
 {
-  global $temp;
+    global $temp;
 
-  if (file_exists($temp))
-  {
-    unlink($temp);
-  }
+    if (file_exists($temp)) {
+        unlink($temp);
+    }
 }
 
 $source = init_fixtures($temp);
@@ -84,37 +83,32 @@ function sf_test_shutdown()
 
 function init_fixtures($temp)
 {
-  $queries = array(
-    '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);
-
-    foreach ($queries as $query)
-    {
-      $db->exec($query);
+    $queries = array(
+        '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);
+
+        foreach ($queries as $query) {
+            $db->exec($query);
+        }
+
+        $db->close();
+    } else {
+        $db = sqlite_open($temp);
+
+        foreach ($queries as $query) {
+            sqlite_query($query, $db);
+        }
+
+        sqlite_close($db);
     }
 
-    $db->close();
-  }
-  else
-  {
-    $db = sqlite_open($temp);
-
-    foreach ($queries as $query)
-    {
-      sqlite_query($query, $db);
-    }
-
-    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 8c4abe6f1..67b968c01 100644
--- a/test/unit/i18n/sfMessageSource_XLIFFTest.php
+++ b/test/unit/i18n/sfMessageSource_XLIFFTest.php
@@ -3,12 +3,12 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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 __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(11);
 
diff --git a/test/unit/i18n/sfNumberFormatInfoTest.php b/test/unit/i18n/sfNumberFormatInfoTest.php
index 641fde3fa..8842acc0c 100644
--- a/test/unit/i18n/sfNumberFormatInfoTest.php
+++ b/test/unit/i18n/sfNumberFormatInfoTest.php
@@ -3,25 +3,23 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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 __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(75);
 
 // __construct()
 $t->diag('__construct()');
-try
-{
-  $c = new sfNumberFormatInfo();
-  $t->fail('__construct() takes a mandatory ICU array as its first argument');
-}
-catch (sfException $e)
-{
-  $t->pass('__construct() takes a mandatory ICU array as its first argument');
+
+try {
+    $c = new sfNumberFormatInfo();
+    $t->fail('__construct() takes a mandatory ICU array as its first argument');
+} catch (sfException $e) {
+    $t->pass('__construct() takes a mandatory ICU array as its first argument');
 }
 
 // ::getInstance()
@@ -64,72 +62,68 @@
 $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(
-    'DecimalDigits'          => -1,
-    'DecimalSeparator'       => ',',
-    'GroupSeparator'         => ' ',
-    'CurrencySymbol'         => '$US',
-    'NegativeInfinitySymbol' => '-∞',
-    'PositiveInfinitySymbol' => '+∞',
-    'NegativeSign'           => '-',
-    'PositiveSign'           => '+',
-    'NaNSymbol'              => 'NaN',
-    'PercentSymbol'          => '%',
-    'PerMilleSymbol'         => '‰',
-  ),
-  'en' => array(
-    'DecimalDigits'          => -1,
-    'DecimalSeparator'       => '.',
-    'GroupSeparator'         => ',',
-    'CurrencySymbol'         => '$',
-    'NegativeInfinitySymbol' => '-∞',
-    'PositiveInfinitySymbol' => '+∞',
-    'NegativeSign'           => '-',
-    'PositiveSign'           => '+',
-    'NaNSymbol'              => 'NaN',
-    'PercentSymbol'          => '%',
-    'PerMilleSymbol'         => '‰',
-  ),
+    'fr' => array(
+        'DecimalDigits' => -1,
+        'DecimalSeparator' => ',',
+        'GroupSeparator' => ' ',
+        'CurrencySymbol' => '$US',
+        'NegativeInfinitySymbol' => '-∞',
+        'PositiveInfinitySymbol' => '+∞',
+        'NegativeSign' => '-',
+        'PositiveSign' => '+',
+        'NaNSymbol' => 'NaN',
+        'PercentSymbol' => '%',
+        'PerMilleSymbol' => '‰',
+    ),
+    'en' => array(
+        'DecimalDigits' => -1,
+        'DecimalSeparator' => '.',
+        'GroupSeparator' => ',',
+        'CurrencySymbol' => '$',
+        'NegativeInfinitySymbol' => '-∞',
+        'PositiveInfinitySymbol' => '+∞',
+        'NegativeSign' => '-',
+        'PositiveSign' => '+',
+        'NaNSymbol' => 'NaN',
+        'PercentSymbol' => '%',
+        'PerMilleSymbol' => '‰',
+    ),
 );
 
-foreach ($tests as $culture => $fixtures)
-{
-  $n = sfNumberFormatInfo::getInstance($culture);
+foreach ($tests as $culture => $fixtures) {
+    $n = sfNumberFormatInfo::getInstance($culture);
 
-  foreach ($fixtures as $method => $result)
-  {
-    $getter = 'get'.$method;
-    $t->is($n->$getter(), $result, sprintf('->%s() returns "%s" for culture "%s"', $getter, $result, $culture));
-  }
+    foreach ($fixtures as $method => $result) {
+        $getter = 'get'.$method;
+        $t->is($n->{$getter}(), $result, sprintf('->%s() returns "%s" for culture "%s"', $getter, $result, $culture));
+    }
 }
 
 // setters/getters
 foreach (array(
-  'DecimalDigits', 'DecimalSeparator', 'GroupSeparator', 
-  'CurrencySymbol', 'NegativeInfinitySymbol', 'PositiveInfinitySymbol',
-  'NegativeSign', 'PositiveSign', 'NaNSymbol', 'PercentSymbol', 'PerMilleSymbol',
-) as $method)
-{
-  $t->diag(sprintf('->get%s() ->set%s()', $method, $method));
-  $n = sfNumberFormatInfo::getInstance();
-  $setter = 'set'.$method;
-  $getter = 'get'.$method;
-  $n->$setter('foo');
-  $t->is($n->$getter(), '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 = 'bar';
-  $t->is($n->$getter(), 'bar', sprintf('->%s() is equivalent to ->%s = ', $setter, $method));
+    'DecimalDigits', 'DecimalSeparator', 'GroupSeparator',
+    'CurrencySymbol', 'NegativeInfinitySymbol', 'PositiveInfinitySymbol',
+    'NegativeSign', 'PositiveSign', 'NaNSymbol', 'PercentSymbol', 'PerMilleSymbol',
+) as $method) {
+    $t->diag(sprintf('->get%s() ->set%s()', $method, $method));
+    $n = sfNumberFormatInfo::getInstance();
+    $setter = 'set'.$method;
+    $getter = 'get'.$method;
+    $n->{$setter}('foo');
+    $t->is($n->{$getter}(), '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} = 'bar';
+    $t->is($n->{$getter}(), 'bar', sprintf('->%s() is equivalent to ->%s = ', $setter, $method));
 }
 
-foreach (array('GroupSizes', 'NegativePattern', 'PositivePattern') as $method)
-{
-  $t->diag(sprintf('->get%s() ->set%s()', $method, $method));
-  $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));
-  $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));
+foreach (array('GroupSizes', 'NegativePattern', 'PositivePattern') as $method) {
+    $t->diag(sprintf('->get%s() ->set%s()', $method, $method));
+    $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));
+    $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));
 }
diff --git a/test/unit/log/sfAggregateLoggerTest.php b/test/unit/log/sfAggregateLoggerTest.php
index 550249d76..04fb4f380 100644
--- a/test/unit/log/sfAggregateLoggerTest.php
+++ b/test/unit/log/sfAggregateLoggerTest.php
@@ -3,22 +3,21 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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 __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(6);
 
 $dispatcher = new sfEventDispatcher();
 
-require_once(__DIR__.'/../../../lib/util/sfToolkit.class.php');
+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);
+if (file_exists($file)) {
+    unlink($file);
 }
 $fileLogger = new sfFileLogger($dispatcher, array('file' => $file));
 $buffer = fopen('php://memory', 'rw');
diff --git a/test/unit/log/sfConsoleLoggerTest.php b/test/unit/log/sfConsoleLoggerTest.php
index e694aa01c..989ff3a41 100644
--- a/test/unit/log/sfConsoleLoggerTest.php
+++ b/test/unit/log/sfConsoleLoggerTest.php
@@ -3,12 +3,12 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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 __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(1);
 
diff --git a/test/unit/log/sfFileLoggerTest.php b/test/unit/log/sfFileLoggerTest.php
index 3fbb66f9b..72ab44dba 100644
--- a/test/unit/log/sfFileLoggerTest.php
+++ b/test/unit/log/sfFileLoggerTest.php
@@ -8,29 +8,26 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(7);
 
-require_once(__DIR__.'/../../../lib/util/sfToolkit.class.php');
+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);
+if (file_exists($file)) {
+    unlink($file);
 }
 
 $dispatcher = new sfEventDispatcher();
 
 // ->initialize()
 $t->diag('->initialize()');
-try
-{
-  $logger = new sfFileLogger($dispatcher);
-  $t->fail('->initialize() parameters must contains a "file" parameter');
-}
-catch (sfConfigurationException $e)
-{
-  $t->pass('->initialize() parameters must contains a "file" parameter');
+
+try {
+    $logger = new sfFileLogger($dispatcher);
+    $t->fail('->initialize() parameters must contains a "file" parameter');
+} catch (sfConfigurationException $e) {
+    $t->pass('->initialize() parameters must contains a "file" parameter');
 }
 
 // ->log()
@@ -45,15 +42,15 @@
 
 class TestLogger extends sfFileLogger
 {
-  public function getTimeFormat()
-  {
-    return $this->timeFormat;
-  }
-
-  protected function getPriority($priority)
-  {
-    return '*'.$priority.'*';
-  }
+    public function getTimeFormat()
+    {
+        return $this->timeFormat;
+    }
+
+    protected function getPriority($priority)
+    {
+        return '*'.$priority.'*';
+    }
 }
 
 // option: format
diff --git a/test/unit/log/sfLoggerTest.php b/test/unit/log/sfLoggerTest.php
index 70e9d04dc..36ed81572 100644
--- a/test/unit/log/sfLoggerTest.php
+++ b/test/unit/log/sfLoggerTest.php
@@ -8,18 +8,18 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(136);
 
 class myLogger extends sfLogger
 {
-  public $log = '';
+    public $log = '';
 
-  protected function doLog($message, $priority)
-  {
-    $this->log .= $message;
-  }
+    protected function doLog($message, $priority)
+    {
+        $this->log .= $message;
+    }
 }
 
 class notaLogger
@@ -48,14 +48,12 @@ class notaLogger
 // ::getPriorityName()
 $t->diag('::getPriorityName()');
 $t->is(sfLogger::getPriorityName(sfLogger::INFO), 'info', '::getPriorityName() returns the name of a priority class constant');
-try
-{
-  sfLogger::getPriorityName(100);
-  $t->fail('::getPriorityName() throws an sfException if the priority constant does not exist');
-}
-catch (sfException $e)
-{
-  $t->pass('::getPriorityName() throws an sfException if the priority constant does not exist');
+
+try {
+    sfLogger::getPriorityName(100);
+    $t->fail('::getPriorityName() throws an sfException if the priority constant does not exist');
+} catch (sfException $e) {
+    $t->pass('::getPriorityName() throws an sfException if the priority constant does not exist');
 }
 
 // ->log()
@@ -66,40 +64,36 @@ class notaLogger
 
 // log level
 $t->diag('log levels');
-foreach (array('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 $level) {
+    $levelConstant = 'sfLogger::'.strtoupper($level);
 
-  foreach (array('emerg', 'alert', 'crit', 'err', 'warning', 'notice', 'info', 'debug') as $logLevel)
-  {
-    $logLevelConstant = 'sfLogger::'.strtoupper($logLevel);
-    $logger->setLogLevel(constant($logLevelConstant));
+    foreach (array('emerg', 'alert', 'crit', 'err', 'warning', 'notice', 'info', 'debug') as $logLevel) {
+        $logLevelConstant = 'sfLogger::'.strtoupper($logLevel);
+        $logger->setLogLevel(constant($logLevelConstant));
 
-    $logger->log = '';
-    $logger->log('foo', constant($levelConstant));
+        $logger->log = '';
+        $logger->log('foo', constant($levelConstant));
 
-    $t->is($logger->log, constant($logLevelConstant) >= constant($levelConstant) ? 'foo' : '', sprintf('->log() only logs if the level is >= to the defined log level (%s >= %s)', $logLevelConstant, $levelConstant));
-  }
+        $t->is($logger->log, constant($logLevelConstant) >= constant($levelConstant) ? 'foo' : '', sprintf('->log() only logs if the level is >= to the defined log level (%s >= %s)', $logLevelConstant, $levelConstant));
+    }
 }
 
 // shortcuts
 $t->diag('log shortcuts');
-foreach (array('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 $level) {
+    $levelConstant = 'sfLogger::'.strtoupper($level);
 
-  foreach (array('emerg', 'alert', 'crit', 'err', 'warning', 'notice', 'info', 'debug') as $logLevel)
-  {
-    $logger->setLogLevel(constant('sfLogger::'.strtoupper($logLevel)));
+    foreach (array('emerg', 'alert', 'crit', 'err', 'warning', 'notice', 'info', 'debug') as $logLevel) {
+        $logger->setLogLevel(constant('sfLogger::'.strtoupper($logLevel)));
 
-    $logger->log = '';
-    $logger->log('foo', constant($levelConstant));
-    $log1 = $logger->log;
+        $logger->log = '';
+        $logger->log('foo', constant($levelConstant));
+        $log1 = $logger->log;
 
-    $logger->log = '';
-    $logger->$level('foo');
-    $log2 = $logger->log;
+        $logger->log = '';
+        $logger->{$level}('foo');
+        $log2 = $logger->log;
 
-    $t->is($log1, $log2, sprintf('->%s($msg) is a shortcut for ->log($msg, %s)', $level, $levelConstant));
-  }
+        $t->is($log1, $log2, sprintf('->%s($msg) is a shortcut for ->log($msg, %s)', $level, $levelConstant));
+    }
 }
diff --git a/test/unit/log/sfLoggerWrapperTest.php b/test/unit/log/sfLoggerWrapperTest.php
index f3def97ce..78f5a2d2d 100644
--- a/test/unit/log/sfLoggerWrapperTest.php
+++ b/test/unit/log/sfLoggerWrapperTest.php
@@ -3,31 +3,31 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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 __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(2);
 
 class myLogger implements sfLoggerInterface
 {
-  public $log = '';
+    public $log = '';
 
-  public function log($message, $priority = null)
-  {
-    $this->log = $message;
-  }
+    public function log($message, $priority = null)
+    {
+        $this->log = $message;
+    }
 }
 
 class myLoggerWrapper extends sfLoggerWrapper
 {
-  public function getLogger()
-  {
-    return $this->logger;
-  }
+    public function getLogger()
+    {
+        return $this->logger;
+    }
 }
 
 $myLogger = new myLogger();
diff --git a/test/unit/log/sfStreamLoggerTest.php b/test/unit/log/sfStreamLoggerTest.php
index ce8dadd15..c0700eab1 100644
--- a/test/unit/log/sfStreamLoggerTest.php
+++ b/test/unit/log/sfStreamLoggerTest.php
@@ -3,12 +3,12 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.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 __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(1);
 
diff --git a/test/unit/log/sfVarLoggerTest.php b/test/unit/log/sfVarLoggerTest.php
index 946e7b7f5..2332c032c 100644
--- a/test/unit/log/sfVarLoggerTest.php
+++ b/test/unit/log/sfVarLoggerTest.php
@@ -3,12 +3,12 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.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 __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(9);
 
diff --git a/test/unit/log/sfWebDebugLoggerTest.php b/test/unit/log/sfWebDebugLoggerTest.php
index 2c7bd5928..78be837f4 100644
--- a/test/unit/log/sfWebDebugLoggerTest.php
+++ b/test/unit/log/sfWebDebugLoggerTest.php
@@ -3,12 +3,13 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.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 __DIR__.'/../sfContextMock.class.php';
 
 $t = new lime_test(1);
diff --git a/test/unit/mailer/fixtures/TestMailMessage.class.php b/test/unit/mailer/fixtures/TestMailMessage.class.php
index 966e80afa..1e43fc076 100644
--- a/test/unit/mailer/fixtures/TestMailMessage.class.php
+++ b/test/unit/mailer/fixtures/TestMailMessage.class.php
@@ -9,11 +9,11 @@
  */
 class TestMailMessage
 {
-  public function setMessage(Swift_Mime_Message $message)
-  {
-  }
+    public function setMessage(Swift_Mime_Message $message)
+    {
+    }
 
-  public function getMessage()
-  {
-  }
+    public function getMessage()
+    {
+    }
 }
diff --git a/test/unit/mailer/fixtures/TestMailerTransport.class.php b/test/unit/mailer/fixtures/TestMailerTransport.class.php
index 0d88f554b..bcb8f43bd 100644
--- a/test/unit/mailer/fixtures/TestMailerTransport.class.php
+++ b/test/unit/mailer/fixtures/TestMailerTransport.class.php
@@ -9,52 +9,64 @@
  */
 class TestMailerTransport implements Swift_Transport
 {
-  protected
-    $sleep = null,
-    $foo = null,
-    $started = false,
-    $count = 0;
-
-  public function __construct($sleep = null)
-  {
-    $this->sleep = $sleep;
-  }
-
-  public function isStarted() { return $this->started; }
-  public function start() { $this->started = true; }
-  public function stop() { $this->started = false; }
-  public function registerPlugin(Swift_Events_EventListener $plugin) {}
-
-  public function setFoo($foo)
-  {
-    $this->foo = $foo;
-  }
-
-  public function getFoo()
-  {
-    return $this->foo;
-  }
-
-  public function getSentCount()
-  {
-    return $this->count;
-  }
-
-  public function send(Swift_Mime_Message $message, &$failedRecipients = null)
-  {
-    ++$this->count;
-
-    if ($this->sleep)
-    {
-      sleep($this->sleep);
-    }
-
-    return 1;
-  }
-
-  public function reset()
-  {
-    $this->count = 0;
-    $this->started = false;
-  }
+    protected $sleep;
+    protected $foo;
+    protected $started = false;
+    protected $count = 0;
+
+    public function __construct($sleep = null)
+    {
+        $this->sleep = $sleep;
+    }
+
+    public function isStarted()
+    {
+        return $this->started;
+    }
+
+    public function start()
+    {
+        $this->started = true;
+    }
+
+    public function stop()
+    {
+        $this->started = false;
+    }
+
+    public function registerPlugin(Swift_Events_EventListener $plugin)
+    {
+    }
+
+    public function setFoo($foo)
+    {
+        $this->foo = $foo;
+    }
+
+    public function getFoo()
+    {
+        return $this->foo;
+    }
+
+    public function getSentCount()
+    {
+        return $this->count;
+    }
+
+    public function send(Swift_Mime_Message $message, &$failedRecipients = null)
+    {
+        ++$this->count;
+
+        if ($this->sleep) {
+            sleep($this->sleep);
+        }
+
+        return 1;
+    }
+
+    public function reset()
+    {
+        $this->count = 0;
+        $this->started = false;
+    }
 }
diff --git a/test/unit/mailer/fixtures/TestSpool.class.php b/test/unit/mailer/fixtures/TestSpool.class.php
index fa8fc9dd1..f0a80ec00 100644
--- a/test/unit/mailer/fixtures/TestSpool.class.php
+++ b/test/unit/mailer/fixtures/TestSpool.class.php
@@ -9,55 +9,53 @@
  */
 class TestSpool implements Swift_Spool
 {
-  protected
-    $messages = array();
+    protected $messages = array();
 
-  public function __construct()
-  {
-  }
+    public function __construct()
+    {
+    }
 
-  public function isStarted()
-  {
-    return true;
-  }
+    public function isStarted()
+    {
+        return true;
+    }
 
-  public function start()
-  {
-  }
+    public function start()
+    {
+    }
 
-  public function stop()
-  {
-  }
+    public function stop()
+    {
+    }
 
-  public function queueMessage(Swift_Mime_Message $message)
-  {
-    $this->messages[] = $message;
+    public function queueMessage(Swift_Mime_Message $message)
+    {
+        $this->messages[] = $message;
 
-    return 0;
-  }
+        return 0;
+    }
 
-  public function flushQueue(Swift_Transport $transport, &$failedRecipients = null)
-  {
-    foreach ($this->messages as $message)
+    public function flushQueue(Swift_Transport $transport, &$failedRecipients = null)
     {
-      $transport->send($message);
-    }
+        foreach ($this->messages as $message) {
+            $transport->send($message);
+        }
 
-    $this->messages = array();
-  }
+        $this->messages = array();
+    }
 
-  public function getMessages()
-  {
-    return $this->messages;
-  }
+    public function getMessages()
+    {
+        return $this->messages;
+    }
 
-  public function getQueuedCount()
-  {
-    return count($this->messages);
-  }
+    public function getQueuedCount()
+    {
+        return count($this->messages);
+    }
 
-  public function reset()
-  {
-    $this->messages = array();
-  }
+    public function reset()
+    {
+        $this->messages = array();
+    }
 }
diff --git a/test/unit/mailer/sfMailerTest.php b/test/unit/mailer/sfMailerTest.php
index ab1972706..68a3ff23f 100755
--- a/test/unit/mailer/sfMailerTest.php
+++ b/test/unit/mailer/sfMailerTest.php
@@ -7,10 +7,14 @@
  * 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 __DIR__.'/../../bootstrap/unit.php';
+
 require_once sfConfig::get('sf_symfony_lib_dir').'/vendor/swiftmailer/lib/swift_required.php';
+
 require_once __DIR__.'/fixtures/TestMailerTransport.class.php';
+
 require_once __DIR__.'/fixtures/TestSpool.class.php';
+
 require_once __DIR__.'/fixtures/TestMailMessage.class.php';
 
 $t = new lime_test(34);
@@ -19,44 +23,39 @@
 
 // __construct()
 $t->diag('__construct()');
-try
-{
-  new sfMailer($dispatcher, array('delivery_strategy' => 'foo'));
 
-  $t->fail('__construct() throws an InvalidArgumentException exception if the strategy is not valid');
-}
-catch (InvalidArgumentException $e)
-{
-  $t->pass('__construct() throws an InvalidArgumentException exception if the strategy is not valid');
+try {
+    new sfMailer($dispatcher, array('delivery_strategy' => 'foo'));
+
+    $t->fail('__construct() throws an InvalidArgumentException exception if the strategy is not valid');
+} catch (InvalidArgumentException $e) {
+    $t->pass('__construct() throws an InvalidArgumentException exception if the strategy is not valid');
 }
 
 // main transport
 $mailer = new sfMailer($dispatcher, array(
-  'logging'           => true,
-  'delivery_strategy' => 'realtime',
-  'transport'         => array('class' => 'TestMailerTransport', 'param' => array('foo' => 'bar', 'bar' => 'foo')),
+    'logging' => true,
+    'delivery_strategy' => 'realtime',
+    'transport' => array('class' => 'TestMailerTransport', 'param' => array('foo' => 'bar', 'bar' => 'foo')),
 ));
 $t->is($mailer->getTransport()->getFoo(), 'bar', '__construct() passes the parameters to the main transport');
 
 // spool
 $mailer = new sfMailer($dispatcher, array(
-  'logging'           => true,
-  'delivery_strategy' => 'spool',
-  'spool_class'       => 'TestSpool',
-  'spool_arguments'   => array('TestMailMessage'),
-  'transport'         => array('class' => 'Swift_SmtpTransport', 'param' => array('username' => 'foo')),
+    'logging' => true,
+    'delivery_strategy' => 'spool',
+    'spool_class' => 'TestSpool',
+    'spool_arguments' => array('TestMailMessage'),
+    'transport' => array('class' => 'Swift_SmtpTransport', 'param' => array('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'));
+try {
+    $mailer = new sfMailer($dispatcher, array('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)
-{
-  $t->pass('__construct() throws an InvalidArgumentException exception if the spool_class option is not set with the spool delivery strategy');
+    $t->fail('__construct() throws an InvalidArgumentException exception if the spool_class option is not set with the spool delivery strategy');
+} 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'));
@@ -64,15 +63,12 @@
 $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'));
+try {
+    $mailer = new sfMailer($dispatcher, array('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)
-{
-  $t->pass('__construct() throws an InvalidArgumentException exception if the delivery_address option is not set with the spool single_address strategy');
+    $t->fail('__construct() throws an InvalidArgumentException exception if the delivery_address option is not set with the spool single_address strategy');
+} 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'));
@@ -109,22 +105,20 @@
 $t->diag('->flushQueue()');
 $mailer = new sfMailer($dispatcher, array('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)
-{
-  $t->pass('->flushQueue() throws a LogicException exception if the delivery_strategy is not spool');
+try {
+    $mailer->flushQueue();
+
+    $t->fail('->flushQueue() throws a LogicException exception if the delivery_strategy is not spool');
+} catch (LogicException $e) {
+    $t->pass('->flushQueue() throws a LogicException exception if the delivery_strategy is not spool');
 }
 
 $mailer = new sfMailer($dispatcher, array(
-  'delivery_strategy' => 'spool',
-  'spool_class'       => 'TestSpool',
-  'spool_arguments'   => array('TestMailMessage'),
-  'transport'         => array('class' => 'TestMailerTransport'),
+    'delivery_strategy' => 'spool',
+    'spool_class' => 'TestSpool',
+    'spool_arguments' => array('TestMailMessage'),
+    'transport' => array('class' => 'TestMailerTransport'),
 ));
 $transport = $mailer->getRealtimeTransport();
 $spool = $mailer->getTransport()->getSpool();
@@ -139,11 +133,11 @@
 // ->sendNextImmediately()
 $t->diag('->sendNextImmediately()');
 $mailer = new sfMailer($dispatcher, array(
-  'logging'           => true,
-  'delivery_strategy' => 'spool',
-  'spool_class'       => 'TestSpool',
-  'spool_arguments'   => array('TestMailMessage'),
-  'transport'         => array('class' => 'TestMailerTransport'),
+    'logging' => true,
+    'delivery_strategy' => 'spool',
+    'spool_class' => 'TestSpool',
+    'spool_arguments' => array('TestMailMessage'),
+    'transport' => array('class' => 'TestMailerTransport'),
 ));
 $transport = $mailer->getRealtimeTransport();
 $spool = $mailer->getTransport()->getSpool();
diff --git a/test/unit/plugin/sfPearDownloaderTest.class.php b/test/unit/plugin/sfPearDownloaderTest.class.php
index 3f8e8c286..3061be907 100644
--- a/test/unit/plugin/sfPearDownloaderTest.class.php
+++ b/test/unit/plugin/sfPearDownloaderTest.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -13,32 +13,39 @@
 /**
  * sfPearDownloaderTest is a class to be able to test a PEAR channel without the HTTP layer.
  *
- * @package    symfony
- * @subpackage plugin
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
+ *
+ * @internal
+ *
+ * @coversNothing
  */
 class sfPearDownloaderTest extends sfPearDownloader
 {
-  /**
-   * @see PEAR_REST::downloadHttp()
-   */
-  public function downloadHttp($url, &$ui, $save_dir = '.', $callback = null, $lastmodified = null, $accept = false, $channel = false)
-  {
-    try
-    {
-      $file = sfPluginTestHelper::convertUrlToFixture($url);
-    }
-    catch (sfException $e)
+    /**
+     * @see PEAR_REST::downloadHttp()
+     *
+     * @param mixed      $url
+     * @param mixed      $ui
+     * @param mixed      $save_dir
+     * @param mixed|null $callback
+     * @param mixed|null $lastmodified
+     * @param mixed      $accept
+     * @param mixed      $channel
+     */
+    public function downloadHttp($url, &$ui, $save_dir = '.', $callback = null, $lastmodified = null, $accept = false, $channel = false)
     {
-      return PEAR::raiseError($e->getMessage());
-    }
+        try {
+            $file = sfPluginTestHelper::convertUrlToFixture($url);
+        } catch (sfException $e) {
+            return PEAR::raiseError($e->getMessage());
+        }
 
-    if ($lastmodified === false || $lastmodified)
-    {
-      return array($file, 0, array());
-    }
+        if (false === $lastmodified || $lastmodified) {
+            return array($file, 0, array());
+        }
 
-    return $file;
-  }
+        return $file;
+    }
 }
diff --git a/test/unit/plugin/sfPearEnvironmentTest.php b/test/unit/plugin/sfPearEnvironmentTest.php
index 4f54c8996..72c72b552 100644
--- a/test/unit/plugin/sfPearEnvironmentTest.php
+++ b/test/unit/plugin/sfPearEnvironmentTest.php
@@ -10,19 +10,21 @@
 
 error_reporting(error_reporting() & ~E_STRICT);
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(3);
 
-@include_once('PEAR.php');
-if (!class_exists('PEAR'))
-{
-  $t->skip('PEAR must be installed', 3);
-  return;
+@include_once 'PEAR.php';
+if (!class_exists('PEAR')) {
+    $t->skip('PEAR must be installed', 3);
+
+    return;
 }
 
 require_once __DIR__.'/sfPearDownloaderTest.class.php';
+
 require_once __DIR__.'/sfPearRestTest.class.php';
+
 require_once __DIR__.'/sfPluginTestHelper.class.php';
 
 // setup
@@ -33,11 +35,11 @@
 define('SF_PLUGIN_TEST_DIR', $temp);
 
 $options = array(
-  'plugin_dir'            => $temp.'/plugins',
-  'cache_dir'             => $temp.'/cache',
-  'preferred_state'       => 'stable',
-  'rest_base_class'       => 'sfPearRestTest',
-  'downloader_base_class' => 'sfPearDownloaderTest',
+    'plugin_dir' => $temp.'/plugins',
+    'cache_dir' => $temp.'/cache',
+    'preferred_state' => 'stable',
+    'rest_base_class' => 'sfPearRestTest',
+    'downloader_base_class' => 'sfPearDownloaderTest',
 );
 
 $dispatcher = new sfEventDispatcher();
@@ -45,20 +47,16 @@
 // ->initialize()
 $t->diag('->initialize()');
 
-foreach (array('plugin_dir', 'cache_dir') as $option)
-{
-  try
-  {
-    $localOptions = $options;
-    unset($localOptions[$option]);
-    $environment = new sfPearEnvironment($dispatcher, $localOptions);
-
-    $t->fail(sprintf('->initialize() throws an exception if you don\'t pass a "%s" option', $option));
-  }
-  catch (sfException $e)
-  {
-    $t->pass(sprintf('->initialize() throws an exception if you don\'t pass a "%s" option', $option));
-  }
+foreach (array('plugin_dir', 'cache_dir') as $option) {
+    try {
+        $localOptions = $options;
+        unset($localOptions[$option]);
+        $environment = new sfPearEnvironment($dispatcher, $localOptions);
+
+        $t->fail(sprintf('->initialize() throws an exception if you don\'t pass a "%s" option', $option));
+    } catch (sfException $e) {
+        $t->pass(sprintf('->initialize() throws an exception if you don\'t pass a "%s" option', $option));
+    }
 }
 
 // ->registerChannel()
diff --git a/test/unit/plugin/sfPearRestPluginTest.php b/test/unit/plugin/sfPearRestPluginTest.php
index b511055d9..5c9b8a5c5 100644
--- a/test/unit/plugin/sfPearRestPluginTest.php
+++ b/test/unit/plugin/sfPearRestPluginTest.php
@@ -10,19 +10,21 @@
 
 error_reporting(error_reporting() & ~E_STRICT);
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(5);
 
-@include_once('PEAR.php');
-if (!class_exists('PEAR'))
-{
-  $t->skip('PEAR must be installed', 5); 
-  return;
+@include_once 'PEAR.php';
+if (!class_exists('PEAR')) {
+    $t->skip('PEAR must be installed', 5);
+
+    return;
 }
 
 require_once __DIR__.'/sfPearDownloaderTest.class.php';
+
 require_once __DIR__.'/sfPearRestTest.class.php';
+
 require_once __DIR__.'/sfPluginTestHelper.class.php';
 
 // setup
@@ -33,11 +35,11 @@
 define('SF_PLUGIN_TEST_DIR', $temp);
 
 $options = array(
-  'plugin_dir'            => $temp.'/plugins',
-  'cache_dir'             => $temp.'/cache',
-  'preferred_state'       => 'stable',
-  'rest_base_class'       => 'sfPearRestTest',
-  'downloader_base_class' => 'sfPearDownloaderTest',
+    'plugin_dir' => $temp.'/plugins',
+    'cache_dir' => $temp.'/cache',
+    'preferred_state' => 'stable',
+    'rest_base_class' => 'sfPearRestTest',
+    'downloader_base_class' => 'sfPearDownloaderTest',
 );
 
 $dispatcher = new sfEventDispatcher();
diff --git a/test/unit/plugin/sfPearRestTest.class.php b/test/unit/plugin/sfPearRestTest.class.php
index df3138708..b7b126336 100644
--- a/test/unit/plugin/sfPearRestTest.class.php
+++ b/test/unit/plugin/sfPearRestTest.class.php
@@ -11,37 +11,42 @@
 /**
  * sfPearRestTest is a class to be able to test a PEAR channel without the HTTP layer.
  *
- * @package    symfony
- * @subpackage plugin
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id$
+ *
+ * @internal
+ *
+ * @coversNothing
  */
 class sfPearRestTest extends sfPearRest
 {
-  /**
-   * @see PEAR_REST::downloadHttp()
-   */
-  public function downloadHttp($url, $lastmodified = null, $accept = false, $channel = false)
-  {
-    try
-    {
-      $file = sfPluginTestHelper::convertUrlToFixture($url);
-    }
-    catch (sfException $e)
+    /**
+     * @see PEAR_REST::downloadHttp()
+     *
+     * @param mixed      $url
+     * @param mixed|null $lastmodified
+     * @param mixed      $accept
+     * @param mixed      $channel
+     */
+    public function downloadHttp($url, $lastmodified = null, $accept = false, $channel = false)
     {
-      return PEAR::raiseError($e->getMessage());
-    }
+        try {
+            $file = sfPluginTestHelper::convertUrlToFixture($url);
+        } catch (sfException $e) {
+            return PEAR::raiseError($e->getMessage());
+        }
 
-    $headers = array(
-      'content-type' => preg_match('/\.xml$/', $file) ? 'text/xml' : 'text/plain',
-    );
+        $headers = array(
+            'content-type' => preg_match('/\.xml$/', $file) ? 'text/xml' : 'text/plain',
+        );
 
-    return array(file_get_contents($file), 0, $headers);
-  }
+        return array(file_get_contents($file), 0, $headers);
+    }
 
-  // Disable caching for testing
-  public function saveCache($url, $contents, $lastmodified, $nochange = false, $cacheid = null)
-  {
-    return false;
-  }
+    // Disable caching for testing
+    public function saveCache($url, $contents, $lastmodified, $nochange = false, $cacheid = null)
+    {
+        return false;
+    }
 }
diff --git a/test/unit/plugin/sfPluginManagerTest.php b/test/unit/plugin/sfPluginManagerTest.php
index 76cd7e394..3fd790832 100644
--- a/test/unit/plugin/sfPluginManagerTest.php
+++ b/test/unit/plugin/sfPluginManagerTest.php
@@ -10,19 +10,21 @@
 
 error_reporting(error_reporting() & ~E_STRICT);
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(40);
 
-@include_once('PEAR.php');
-if (!class_exists('PEAR'))
-{
-  $t->skip('PEAR must be installed', 40); 
-  return;
+@include_once 'PEAR.php';
+if (!class_exists('PEAR')) {
+    $t->skip('PEAR must be installed', 40);
+
+    return;
 }
 
 require_once __DIR__.'/sfPearDownloaderTest.class.php';
+
 require_once __DIR__.'/sfPearRestTest.class.php';
+
 require_once __DIR__.'/sfPluginTestHelper.class.php';
 
 // setup
@@ -33,66 +35,63 @@
 define('SF_PLUGIN_TEST_DIR', $temp);
 
 $options = array(
-  'plugin_dir'            => $temp.'/plugins',
-  'cache_dir'             => $temp.'/cache',
-  'preferred_state'       => 'stable',
-  'rest_base_class'       => 'sfPearRestTest',
-  'downloader_base_class' => 'sfPearDownloaderTest',
+    'plugin_dir' => $temp.'/plugins',
+    'cache_dir' => $temp.'/cache',
+    'preferred_state' => 'stable',
+    'rest_base_class' => 'sfPearRestTest',
+    'downloader_base_class' => 'sfPearDownloaderTest',
 );
 
 $dispatcher = new sfEventDispatcher();
 
 class myPluginManager extends sfPluginManager
 {
-  protected
-    $mainPackageVersion = '1.0.0';
-
-  public function setMainPackageVersion($version)
-  {
-    $this->mainPackageVersion = $version;
-    $this->configure();
-  }
-
-  public function configure()
-  {
-    $this->environment->registerChannel('pear.example.com', true);
-
-    $mainPackage = new PEAR_PackageFile_v2_rw();
-    $mainPackage->setPackage('sfMainPackage');
-    $mainPackage->setChannel('pear.example.com');
-    $mainPackage->setConfig($this->environment->getConfig());
-    $mainPackage->setPackageType('php');
-    $mainPackage->setAPIVersion('1.0.0');
-    $mainPackage->setAPIStability('stable');
-    $mainPackage->setReleaseVersion($this->mainPackageVersion);
-    $mainPackage->setReleaseStability('stable');
-    $mainPackage->setDate(date('Y-m-d'));
-    $mainPackage->setDescription('sfMainPackage');
-    $mainPackage->setSummary('sfMainPackage');
-    $mainPackage->setLicense('MIT License');
-    $mainPackage->clearContents();
-    $mainPackage->resetFilelist();
-    $mainPackage->addMaintainer('lead', 'fabpot', 'Fabien Potencier', 'fabien.potencier@symfony-project.com');
-    $mainPackage->setNotes('-');
-    $mainPackage->setPearinstallerDep('1.4.3');
-    $mainPackage->setPhpDep('5.1.0');
-
-    $this->environment->getRegistry()->deletePackage('sfMainPackage', 'pear.example.com');
-    if (!$this->environment->getRegistry()->addPackage2($mainPackage))
+    protected $mainPackageVersion = '1.0.0';
+
+    public function setMainPackageVersion($version)
     {
-      throw new sfException('Unable to register our sfMainPackage');
+        $this->mainPackageVersion = $version;
+        $this->configure();
     }
-  }
 
-  protected function isPluginCompatibleWithDependency($dependency)
-  {
-    if (isset($dependency['channel']) && 'sfMainPackage' == $dependency['name'] && 'pear.example.com' == $dependency['channel'])
+    public function configure()
     {
-      return $this->checkDependency($dependency);
+        $this->environment->registerChannel('pear.example.com', true);
+
+        $mainPackage = new PEAR_PackageFile_v2_rw();
+        $mainPackage->setPackage('sfMainPackage');
+        $mainPackage->setChannel('pear.example.com');
+        $mainPackage->setConfig($this->environment->getConfig());
+        $mainPackage->setPackageType('php');
+        $mainPackage->setAPIVersion('1.0.0');
+        $mainPackage->setAPIStability('stable');
+        $mainPackage->setReleaseVersion($this->mainPackageVersion);
+        $mainPackage->setReleaseStability('stable');
+        $mainPackage->setDate(date('Y-m-d'));
+        $mainPackage->setDescription('sfMainPackage');
+        $mainPackage->setSummary('sfMainPackage');
+        $mainPackage->setLicense('MIT License');
+        $mainPackage->clearContents();
+        $mainPackage->resetFilelist();
+        $mainPackage->addMaintainer('lead', 'fabpot', 'Fabien Potencier', 'fabien.potencier@symfony-project.com');
+        $mainPackage->setNotes('-');
+        $mainPackage->setPearinstallerDep('1.4.3');
+        $mainPackage->setPhpDep('5.1.0');
+
+        $this->environment->getRegistry()->deletePackage('sfMainPackage', 'pear.example.com');
+        if (!$this->environment->getRegistry()->addPackage2($mainPackage)) {
+            throw new sfException('Unable to register our sfMainPackage');
+        }
     }
 
-    return true;
-  }
+    protected function isPluginCompatibleWithDependency($dependency)
+    {
+        if (isset($dependency['channel']) && 'sfMainPackage' == $dependency['name'] && 'pear.example.com' == $dependency['channel']) {
+            return $this->checkDependency($dependency);
+        }
+
+        return true;
+    }
 }
 
 // ->initialize()
@@ -123,15 +122,12 @@ 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'));
+try {
+    $pluginManager->installPlugin('sfTestPlugin', array('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)
-{
-  $t->pass('->installPlugin() throws an exception if you try to install a version that is not compatible with our main package');
+    $t->fail('->installPlugin() throws an exception if you try to install a version that is not compatible with our main package');
+} catch (sfPluginDependencyException $e) {
+    $t->pass('->installPlugin() throws an exception if you try to install a version that is not compatible with our main package');
 }
 
 $t->diag('Upgrade our main package to 1.1.0');
@@ -153,15 +149,13 @@ protected function isPluginCompatibleWithDependency($dependency)
 $t->ok(!$pluginManager->uninstallPlugin('sfFooPlugin'), '->uninstallPlugin() returns false if the plugin is not installed');
 
 $t->diag('try to install a non existant plugin');
-try
-{
-  $pluginManager->installPlugin('sfBarPlugin');
 
-  $t->fail('->installPlugin() throws an exception if the plugin does not exist');
-}
-catch (sfPluginException $e)
-{
-  $t->pass('->installPlugin() throws an exception if the plugin does not exist');
+try {
+    $pluginManager->installPlugin('sfBarPlugin');
+
+    $t->fail('->installPlugin() throws an exception if the plugin does not exist');
+} catch (sfPluginException $e) {
+    $t->pass('->installPlugin() throws an exception if the plugin does not exist');
 }
 
 $pluginManager->installPlugin('http://pear.example.com/get/sfTestPlugin/sfTestPlugin-1.1.4.tgz');
@@ -199,14 +193,12 @@ protected function isPluginCompatibleWithDependency($dependency)
 $pluginManager->uninstallPlugin('sfTestPlugin');
 
 $t->diag('install a plugin with a dependency must fail');
-try
-{
-  $pluginManager->installPlugin('sfFooPlugin');
-  $t->fail('->installPlugin() throws an exception if the plugin needs a dependency to be installed');
-}
-catch (sfPluginDependencyException $e)
-{
-  $t->pass('->installPlugin() throws an exception if the plugin needs a dependency to be installed');
+
+try {
+    $pluginManager->installPlugin('sfFooPlugin');
+    $t->fail('->installPlugin() throws an exception if the plugin needs a dependency to be installed');
+} 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');
@@ -226,14 +218,12 @@ protected function isPluginCompatibleWithDependency($dependency)
 $t->diag('try to uninstall a plugin with a depedency must fail');
 $pluginManager->installPlugin('sfTestPlugin', array('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)
-{
-  $t->pass('->uninstallPlugin() throws an exception if you try to uninstall a plugin that is needed for another one');
+
+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) {
+    $t->pass('->uninstallPlugin() throws an exception if you try to uninstall a plugin that is needed for another one');
 }
 $pluginManager->uninstallPlugin('sfFooPlugin');
 $pluginManager->uninstallPlugin('sfTestPlugin');
@@ -242,14 +232,12 @@ protected function isPluginCompatibleWithDependency($dependency)
 $pluginManager->setMainPackageVersion('1.0.0');
 $pluginManager->installPlugin('sfTestPlugin', array('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)
-{
-  $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');
+
+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) {
+    $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');
 
diff --git a/test/unit/plugin/sfPluginTestHelper.class.php b/test/unit/plugin/sfPluginTestHelper.class.php
index 102fc09be..bb6376581 100644
--- a/test/unit/plugin/sfPluginTestHelper.class.php
+++ b/test/unit/plugin/sfPluginTestHelper.class.php
@@ -1,28 +1,26 @@
-<?php 
+<?php
 
 class sfPluginTestHelper
 {
-  static public function convertUrlToFixture($url)
-  {
-    $file = preg_replace(array('/_+/', '#/+#', '#_/#'), array('_', '/', '/'), preg_replace('#[^a-zA-Z0-9\-/\.]#', '_', $url));
+    public static function convertUrlToFixture($url)
+    {
+        $file = preg_replace(array('/_+/', '#/+#', '#_/#'), array('_', '/', '/'), preg_replace('#[^a-zA-Z0-9\-/\.]#', '_', $url));
 
-    $dir  = dirname($file);
-    $file = basename($file);
+        $dir = dirname($file);
+        $file = basename($file);
 
-    $dest = SF_PLUGIN_TEST_DIR.'/'.$dir.'/'.$file;
+        $dest = SF_PLUGIN_TEST_DIR.'/'.$dir.'/'.$file;
 
-    if (!is_dir(dirname($dest)))
-    {
-      mkdir(dirname($dest), 0777, true);
-    }
+        if (!is_dir(dirname($dest))) {
+            mkdir(dirname($dest), 0777, true);
+        }
 
-    if (!file_exists(__DIR__.'/fixtures/'.$dir.'/'.$file))
-    {
-      throw new sfException(sprintf('Unable to find fixture for %s (%s)', $url, $file));
-    }
+        if (!file_exists(__DIR__.'/fixtures/'.$dir.'/'.$file)) {
+            throw new sfException(sprintf('Unable to find fixture for %s (%s)', $url, $file));
+        }
 
-    copy(__DIR__.'/fixtures/'.$dir.'/'.$file, $dest);
+        copy(__DIR__.'/fixtures/'.$dir.'/'.$file, $dest);
 
-    return $dest;
-  }
+        return $dest;
+    }
 }
diff --git a/test/unit/request/sfRequestTest.php b/test/unit/request/sfRequestTest.php
index f91fd1941..e816325f9 100755
--- a/test/unit/request/sfRequestTest.php
+++ b/test/unit/request/sfRequestTest.php
@@ -8,14 +8,14 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 class myRequest extends sfRequest
 {
-  public function getEventDispatcher()
-  {
-    return $this->dispatcher;
-  }
+    public function getEventDispatcher()
+    {
+        return $this->dispatcher;
+    }
 }
 
 class fakeRequest
@@ -41,14 +41,11 @@ class fakeRequest
 $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)
-{
-  $t->pass('->setMethod() throws a sfException if the method is not valid');
+try {
+    $request->setMethod('foo');
+    $t->fail('->setMethod() throws a sfException if the method is not valid');
+} catch (sfException $e) {
+    $t->pass('->setMethod() throws a sfException if the method is not valid');
 }
 
 // ->extractParameters()
@@ -88,7 +85,7 @@ class fakeRequest
 $request = new myRequest($dispatcher);
 
 // parameter holder proxy
-require_once($_test_dir.'/unit/sfParameterHolderTest.class.php');
+require_once $_test_dir.'/unit/sfParameterHolderTest.class.php';
 $pht = new sfParameterHolderProxyTest($t);
 $pht->launchTests($request, 'parameter');
 
@@ -97,6 +94,6 @@ class fakeRequest
 $pht->launchTests($request, 'attribute');
 
 // new methods via sfEventDispatcher
-require_once($_test_dir.'/unit/sfEventDispatcherTest.class.php');
+require_once $_test_dir.'/unit/sfEventDispatcherTest.class.php';
 $dispatcherTest = new sfEventDispatcherTest($t);
 $dispatcherTest->launchTests($dispatcher, $request, 'request');
diff --git a/test/unit/request/sfWebRequestTest.php b/test/unit/request/sfWebRequestTest.php
index 5af4a4e23..f505e358c 100644
--- a/test/unit/request/sfWebRequestTest.php
+++ b/test/unit/request/sfWebRequestTest.php
@@ -8,48 +8,44 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(109);
 
 class myRequest extends sfWebRequest
 {
-  static protected $initialPathArrayKeys;
+    public $languages;
+    public $charsets;
+    public $acceptableContentTypes;
+    protected static $initialPathArrayKeys;
 
-  public $languages = null;
-  public $charsets = null;
-  public $acceptableContentTypes = null;
-
-  public function initialize(sfEventDispatcher $dispatcher, $parameters = array(), $attributes = array(), $options = array())
-  {
-    if (isset($options['content_custom_only_for_test']))
+    public function initialize(sfEventDispatcher $dispatcher, $parameters = array(), $attributes = array(), $options = array())
     {
-      $this->content = $options['content_custom_only_for_test'];
-      unset($options['content_custom_only_for_test']);
-    }
+        if (isset($options['content_custom_only_for_test'])) {
+            $this->content = $options['content_custom_only_for_test'];
+            unset($options['content_custom_only_for_test']);
+        }
 
-    parent::initialize($dispatcher, $parameters, $attributes, $options);
+        parent::initialize($dispatcher, $parameters, $attributes, $options);
 
-    if (null === self::$initialPathArrayKeys)
-    {
-      self::$initialPathArrayKeys = array_keys($this->getPathInfoArray());
-    }
+        if (null === self::$initialPathArrayKeys) {
+            self::$initialPathArrayKeys = array_keys($this->getPathInfoArray());
+        }
 
-    $this->resetPathInfoArray();
-  }
+        $this->resetPathInfoArray();
+    }
 
-  public function setOption($key, $value)
-  {
-    $this->options[$key] = $value;
-  }
+    public function setOption($key, $value)
+    {
+        $this->options[$key] = $value;
+    }
 
-  public function resetPathInfoArray()
-  {
-    foreach (array_diff(array_keys($this->getPathInfoArray()), self::$initialPathArrayKeys) as $key)
+    public function resetPathInfoArray()
     {
-      unset($this->pathInfoArray[$key]);
+        foreach (array_diff(array_keys($this->getPathInfoArray()), self::$initialPathArrayKeys) as $key) {
+            unset($this->pathInfoArray[$key]);
+        }
     }
-  }
 }
 
 $dispatcher = new sfEventDispatcher();
@@ -72,7 +68,6 @@ public function resetPathInfoArray()
 $_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'i-cherokee';
 $t->is($request->getLanguages(), array('cherokee'), '->getLanguages() returns an array with all accepted languages');
 
-
 // ->getPreferredCulture()
 $t->diag('->getPreferredCulture()');
 
@@ -441,7 +436,7 @@ public function resetPathInfoArray()
 
 $request = new myRequest($dispatcher);
 $_SERVER['QUERY_STRING'] = 'test';
-$_SERVER['REQUEST_URI']  = '/frontend_test.php/test/klaus2?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();
@@ -479,35 +474,31 @@ public function resetPathInfoArray()
 
 class BaseForm extends sfForm
 {
-  public function getCSRFToken($secret = null)
-  {
-    return '==TOKEN==';
-  }
+    public function getCSRFToken($secret = null)
+    {
+        return '==TOKEN==';
+    }
 }
 
 sfForm::enableCSRFProtection();
 
 $request = new myRequest($dispatcher);
-try
-{
-  $request->checkCSRFProtection();
-  $t->fail('->checkCSRFProtection() throws a validator error if CSRF protection fails');
-}
-catch (sfValidatorErrorSchema $error)
-{
-  $t->pass('->checkCSRFProtection() throws a validator error if CSRF protection fails');
+
+try {
+    $request->checkCSRFProtection();
+    $t->fail('->checkCSRFProtection() throws a validator error if CSRF protection fails');
+} catch (sfValidatorErrorSchema $error) {
+    $t->pass('->checkCSRFProtection() throws a validator error if CSRF protection fails');
 }
 
 $request = new myRequest($dispatcher);
 $request->setParameter('_csrf_token', '==TOKEN==');
-try
-{
-  $request->checkCSRFProtection();
-  $t->pass('->checkCSRFProtection() checks token from BaseForm');
-}
-catch (sfValidatorErrorSchema $error)
-{
-  $t->fail('->checkCSRFProtection() checks token from BaseForm');
+
+try {
+    $request->checkCSRFProtection();
+    $t->pass('->checkCSRFProtection() checks token from BaseForm');
+} catch (sfValidatorErrorSchema $error) {
+    $t->fail('->checkCSRFProtection() checks token from BaseForm');
 }
 
 // ->getContentType()
@@ -548,34 +539,33 @@ public function getCSRFToken($secret = null)
 $t->diag('->getFiles()');
 
 $_FILES = array(
-  'article' => array(
-    'name' => array(
-      'media' => '1.png',
+    'article' => array(
+        'name' => array(
+            'media' => '1.png',
+        ),
+        'type' => array(
+            'media' => 'image/png',
+        ),
+        'tmp_name' => array(
+            'media' => '/private/var/tmp/phpnTrAJG',
+        ),
+        'error' => array(
+            'media' => 0,
+        ),
+        'size' => array(
+            'media' => 899,
+        ),
     ),
-    'type' => array(
-      'media' => 'image/png',
-    ),
-    'tmp_name' => array(
-      'media' => '/private/var/tmp/phpnTrAJG',
-    ),
-    'error' => array(
-      'media' => 0,
-    ),
-    'size' => array(
-      'media' => 899,
-    ),
-  ),
 );
 $taintedFiles = array(
-  'article' => array(
-    'media' => array (
-      'error'    => 0,
-      'name'     => '1.png',
-      'type'     => 'image/png',
-      'tmp_name' => '/private/var/tmp/phpnTrAJG',
-      'size'     => 899,
+    'article' => array(
+        'media' => array(
+            '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 c6f357f41..997b2d800 100644
--- a/test/unit/response/sfResponseTest.php
+++ b/test/unit/response/sfResponseTest.php
@@ -8,14 +8,25 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 class myResponse extends sfResponse
 {
-  function serialize() {}
-  function unserialize($serialized) {}
-  function __serialize() {}
-  function __unserialize($data) {}
+    public function __serialize()
+    {
+    }
+
+    public function __unserialize($data)
+    {
+    }
+
+    public function serialize()
+    {
+    }
+
+    public function unserialize($serialized)
+    {
+    }
 }
 
 class fakeResponse
@@ -51,6 +62,6 @@ class fakeResponse
 $t->ok(new myResponse($dispatcher) instanceof Serializable, 'sfResponse implements the Serializable interface');
 
 // new methods via sfEventDispatcher
-require_once($_test_dir.'/unit/sfEventDispatcherTest.class.php');
+require_once $_test_dir.'/unit/sfEventDispatcherTest.class.php';
 $dispatcherTest = new sfEventDispatcherTest($t);
 $dispatcherTest->launchTests($dispatcher, $response, 'response');
diff --git a/test/unit/response/sfWebResponseTest.php b/test/unit/response/sfWebResponseTest.php
index 916a8298c..b8a81c3eb 100644
--- a/test/unit/response/sfWebResponseTest.php
+++ b/test/unit/response/sfWebResponseTest.php
@@ -8,21 +8,21 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(89);
 
 class myWebResponse extends sfWebResponse
 {
-  public function getStatusText()
-  {
-    return $this->statusText;
-  }
-
-  public function normalizeHeaderName($name)
-  {
-    return parent::normalizeHeaderName($name);
-  }
+    public function getStatusText()
+    {
+        return $this->statusText;
+    }
+
+    public function normalizeHeaderName($name)
+    {
+        return parent::normalizeHeaderName($name);
+    }
 }
 
 $dispatcher = new sfEventDispatcher();
@@ -89,18 +89,17 @@ public function normalizeHeaderName($name)
 // ->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)
-{
-  $t->is($response->normalizeHeaderName($test[0]), $test[1], '->normalizeHeaderName() normalizes http header name');
+    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) {
+    $t->is($response->normalizeHeaderName($test[0]), $test[1], '->normalizeHeaderName() normalizes http header name');
 }
 
 // ->getContentType() ->setContentType()
@@ -215,14 +214,11 @@ public function normalizeHeaderName($name)
 $stylesheets = $response->getStylesheets();
 $t->is($stylesheets['bar'], array('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)
-{
-  $t->pass('->addStylesheet() throws an InvalidArgumentException if the position is not first, the empty string, or last');
+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) {
+    $t->pass('->addStylesheet() throws an InvalidArgumentException if the position is not first, the empty string, or last');
 }
 
 // ->getStylesheets()
@@ -256,14 +252,11 @@ public function normalizeHeaderName($name)
 $response->addJavascript('last_js', 'last');
 $t->ok(array_key_exists('last_js', $response->getJavascripts('last')), '->addJavascript() takes a position as its second argument');
 
-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)
-{
-  $t->pass('->addJavascript() throws an InvalidArgumentException if the position is not first, the empty string, or last');
+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) {
+    $t->pass('->addJavascript() throws an InvalidArgumentException if the position is not first, the empty string, or last');
 }
 
 // ->getJavascripts()
diff --git a/test/unit/routing/fixtures/config_routing.yml.php b/test/unit/routing/fixtures/config_routing.yml.php
index 2dc4a8a32..5efcef50d 100644
--- a/test/unit/routing/fixtures/config_routing.yml.php
+++ b/test/unit/routing/fixtures/config_routing.yml.php
@@ -1,3 +1,4 @@
 <?php
+
 // auto-generated by sfRoutingConfigHandler
 $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 6d949f242..5595f4bd3 100644
--- a/test/unit/routing/sfObjectRouteCollectionTest.php
+++ b/test/unit/routing/sfObjectRouteCollectionTest.php
@@ -3,26 +3,23 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.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 __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(25);
 
 // ->__construct()
 $t->diag('->__construct()');
 
-try
-{
-  $collection = new sfObjectRouteCollection(array('name' => 'test'));
-  $t->fail('->__construct() throws an exception if no "model" option is provided');
-}
-catch (InvalidArgumentException $e)
-{
-  $t->pass('->__construct() throws an exception if no "model" option is provided');
+try {
+    $collection = new sfObjectRouteCollection(array('name' => 'test'));
+    $t->fail('->__construct() throws an exception if no "model" option is provided');
+} catch (InvalidArgumentException $e) {
+    $t->pass('->__construct() throws an exception if no "model" option is provided');
 }
 
 $collection = new sfObjectRouteCollection(array('name' => 'test', 'model' => 'TestModel'));
@@ -39,9 +36,9 @@
 $t->diag('with_wildcard_routes');
 
 $collection = new sfObjectRouteCollection(array(
-  'name'                 => 'test',
-  'model'                => 'TestModel',
-  'with_wildcard_routes' => true,
+    'name' => 'test',
+    'model' => 'TestModel',
+    'with_wildcard_routes' => true,
 ));
 
 $routes = $collection->getRoutes();
@@ -52,13 +49,12 @@
 $t->isa_ok($routes['test_object']->matchesUrl($url, array('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')))
-  {
-    $match = $name;
-    break;
-  }
+foreach ($routes as $name => $route) {
+    if ($route->matchesUrl($url, array('method' => 'get'))) {
+        $match = $name;
+
+        break;
+    }
 }
 $t->is($match, 'test_object', '->generateRoutes() orders routes so URLs generated by the wildcard object route are matched by that route');
 
@@ -66,13 +62,12 @@
 $t->isa_ok($routes['test_collection']->matchesUrl($url, array('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')))
-  {
-    $match = $name;
-    break;
-  }
+foreach ($routes as $name => $route) {
+    if ($route->matchesUrl($url, array('method' => 'post'))) {
+        $match = $name;
+
+        break;
+    }
 }
 $t->is($match, 'test_collection', '->generateRoutes() orders routes so URLs generated by the wildcard collection route are matched by that route');
 
@@ -80,11 +75,11 @@
 $t->diag('collection_actions');
 
 $collection = new sfObjectRouteCollection(array(
-  'name'                 => 'test',
-  'model'                => 'TestModel',
-  'with_wildcard_routes' => true,
-  'collection_actions'   => array('export' => array('post')),
-  'default_params'       => array('foo' => 'bar'),
+    'name' => 'test',
+    'model' => 'TestModel',
+    'with_wildcard_routes' => true,
+    'collection_actions' => array('export' => array('post')),
+    'default_params' => array('foo' => 'bar'),
 ));
 
 $routes = $collection->getRoutes();
@@ -94,33 +89,30 @@
 $t->isa_ok($routes['test_export']->matchesUrl($url, array('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')))
-  {
-    $match = $name;
-    break;
-  }
+foreach ($routes as $name => $route) {
+    if ($route->matchesUrl($url, array('method' => 'post'))) {
+        $match = $name;
+
+        break;
+    }
 }
 $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'));
 $match = null;
-foreach ($routes as $name => $route)
-{
-  if ($route->matchesUrl($url, array('method' => 'post')))
-  {
-    $match = $name;
-    break;
-  }
+foreach ($routes as $name => $route) {
+    if ($route->matchesUrl($url, array('method' => 'post'))) {
+        $match = $name;
+
+        break;
+    }
 }
 $t->is($match, 'test_collection', '->generateRoutes() orders routes so URLs generated by the wildcard collection and collection action routes do not conflict');
 
 // default_params
 $t->diag('default_params');
 
-foreach ($routes as $name => $route)
-{
-  $defaults = $route->getDefaults();
-  $t->is($defaults['foo'], 'bar', sprintf('->generateRoutes() dispatches the "default_params" option to the "%s" route', $name));
+foreach ($routes as $name => $route) {
+    $defaults = $route->getDefaults();
+    $t->is($defaults['foo'], 'bar', sprintf('->generateRoutes() dispatches the "default_params" option to the "%s" route', $name));
 }
diff --git a/test/unit/routing/sfObjectRouteTest.php b/test/unit/routing/sfObjectRouteTest.php
index 441d753f0..c4673b12e 100644
--- a/test/unit/routing/sfObjectRouteTest.php
+++ b/test/unit/routing/sfObjectRouteTest.php
@@ -8,34 +8,32 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(1);
 
 class Foo
 {
-  public function getid()
-  {
-    return 1;
-  }
+    public function getid()
+    {
+        return 1;
+    }
 }
 
 // simulate Doctrine route
 class ObjectRoute extends sfObjectRoute
 {
-  protected function doConvertObjectToArray($object)
-  {
-    $parameters = array();
-    foreach ($this->getRealVariables() as $variable)
+    protected function doConvertObjectToArray($object)
     {
-      if (method_exists($object, $method = 'get'.$variable))
-      {
-        $parameters[$variable] = $object->$method();
-      }
-    }
+        $parameters = array();
+        foreach ($this->getRealVariables() as $variable) {
+            if (method_exists($object, $method = 'get'.$variable)) {
+                $parameters[$variable] = $object->{$method}();
+            }
+        }
 
-    return $parameters;
-  }
+        return $parameters;
+    }
 }
 
 // ->generate()
diff --git a/test/unit/routing/sfPatternRoutingTest.php b/test/unit/routing/sfPatternRoutingTest.php
index 20398fbe6..da07786f7 100644
--- a/test/unit/routing/sfPatternRoutingTest.php
+++ b/test/unit/routing/sfPatternRoutingTest.php
@@ -8,51 +8,56 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(149);
 
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
 class sfPatternRoutingTest extends sfPatternRouting
 {
-  public function initialize(sfEventDispatcher $dispatcher, sfCache $cache = null, $options = array())
-  {
-    parent::initialize($dispatcher, $cache, $options);
-
-    $this->options['context']['host'] = 'localhost';
-  }
-
-  public function parse($url)
-  {
-    $parameters = parent::parse($url);
-    unset($parameters['_sf_route']);
-
-    return $parameters;
-  }
-
-  public function getCurrentRouteName()
-  {
-    return $this->currentRouteName;
-  }
-
-  public function isRouteLoaded($name)
-  {
-    return isset($this->routes[$name]) && is_object($this->routes[$name]);
-  }
-
-  protected function getConfigFileName()
-  {
-    return __DIR__.'/fixtures/config_routing.yml.php';
-  }
+    public function initialize(sfEventDispatcher $dispatcher, sfCache $cache = null, $options = array())
+    {
+        parent::initialize($dispatcher, $cache, $options);
+
+        $this->options['context']['host'] = 'localhost';
+    }
+
+    public function parse($url)
+    {
+        $parameters = parent::parse($url);
+        unset($parameters['_sf_route']);
+
+        return $parameters;
+    }
+
+    public function getCurrentRouteName()
+    {
+        return $this->currentRouteName;
+    }
+
+    public function isRouteLoaded($name)
+    {
+        return isset($this->routes[$name]) && is_object($this->routes[$name]);
+    }
+
+    protected function getConfigFileName()
+    {
+        return __DIR__.'/fixtures/config_routing.yml.php';
+    }
 }
 
 class sfAlwaysAbsoluteRoute extends sfRoute
 {
-  public function generate($params, $context = array(), $absolute = false)
-  {
-    $url = parent::generate($params, $context, $absolute);
+    public function generate($params, $context = array(), $absolute = false)
+    {
+        $url = parent::generate($params, $context, $absolute);
 
-    return 'http://'.$context['host'].$url;
-  }
+        return 'http://'.$context['host'].$url;
+    }
 }
 
 $options = array('generate_shortest_url' => false, 'extra_parameters_as_query_string' => false);
@@ -161,14 +166,14 @@ public function generate($params, $context = array(), $absolute = false)
 $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' => '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->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($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');
 
 $r = new sfPatternRoutingTest(new sfEventDispatcher(), null, $options);
 
@@ -184,17 +189,29 @@ public function generate($params, $context = array(), $absolute = false)
 $t->diag('default values');
 $r->clearRoutes();
 $r->connect('test', new sfRoute('/:module/:action', array('module' => 'default', 'action' => 'index')));
-$t->is($r->generate('', array('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'),
-    '->parse() finds route for URL   with missing parameter if parameter is set in the default values');
+$t->is(
+    $r->generate('', array('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'),
+    '->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')));
-$t->is($r->generate('', array('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'),
-    '->parse() finds route for URL   with more than one missing parameter if default values are set');
+$t->is(
+    $r->generate('', array('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'),
+    '->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')));
@@ -263,7 +280,7 @@ 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('test', new sfRoute('/:module', array('action' => 'index')));
 $r->connect('test1', new sfRoute('/:module/:action/*', array()));
 $params = array('module' => 'default', 'action' => 'index', 'toto' => 'titi');
 $url = '/default/index/toto/titi';
@@ -330,7 +347,7 @@ public function generate($params, $context = array(), $absolute = false)
 // 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('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()));
@@ -436,22 +453,22 @@ 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('test', new sfRoute('/:module', array('action' => 'index')));
 $r->connect('test1', new sfRoute('/:module/:action/*', array()));
 $routes = $r->getRoutes();
 $r->clearRoutes();
-$r->appendRoute('test',  new sfRoute('/:module', array('action' => 'index')));
+$r->appendRoute('test', new sfRoute('/:module', array('action' => 'index')));
 $r->appendRoute('test1', new sfRoute('/:module/:action/*', array()));
 $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('test', new sfRoute('/:module', array('action' => 'index')));
 $r->connect('test1', new sfRoute('/:module/:action/*', array()));
 $route_names = array_keys($r->getRoutes());
 $r->clearRoutes();
-$r->prependRoute('test',  new sfRoute('/:module', array('action' => 'index')));
+$r->prependRoute('test', new sfRoute('/:module', array('action' => 'index')));
 $r->prependRoute('test1', new sfRoute('/:module/:action/*', array()));
 $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');
@@ -471,21 +488,19 @@ public function generate($params, $context = array(), $absolute = false)
 $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')));
-  $t->fail($msg);
-}
-catch (sfConfigurationException $e)
-{
-  $t->pass($msg);
+
+try {
+    $r->insertRouteBefore('test2', 'test', new sfRoute('/index.php/:module/:action', array('module' => 'default', 'action' => 'index')));
+    $t->fail($msg);
+} 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('test', new sfRoute('/:module', array('action' => 'index')));
 $r->connect('test1', new sfRoute('/:module/:action/*', array()));
 $r->connect('test3', new sfRoute('/', array()));
 $r->parse('/');
@@ -501,7 +516,7 @@ public function generate($params, $context = array(), $absolute = false)
 $dispatcher->connect('routing.load_configuration', 'configureRouting');
 function configureRouting($event)
 {
-    $event->getSubject()->connect('first',  new sfRoute('/first'));
+    $event->getSubject()->connect('first', new sfRoute('/first'));
     $event->getSubject()->connect('second', new sfRoute('/', array()));
 }
 
@@ -512,7 +527,7 @@ function configureRouting($event)
 
 // 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('test', new sfRoute('/:module', array('action' => 'index')));
 $rCached->connect('test2', new sfRoute('/', array()));
 $rCached->parse('/');
 $t->is($rCached->getCurrentInternalUri(), 'default/index', '->getCurrentInternalUri() returns the internal URI for last parsed URL using cache');
@@ -522,9 +537,11 @@ function configureRouting($event)
 $t->is($rCached->getCurrentInternalUri(), 'default/index', '->getCurrentInternalUri() returns the internal URI for last parsed URL using cache');
 // findRoute was added to be the side effectless version to check an uri
 $parameters = $rCached->findRoute('/test');
-$t->is($parameters,
-       array('name' => 'test', 'pattern' => '/:module', 'parameters' => array('action' => 'index', 'module' => 'test')),
-       '->findRoute() returns information about matching route');
+$t->is(
+    $parameters,
+    array('name' => 'test', 'pattern' => '/:module', 'parameters' => array('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');
 $t->is($rCached->findRoute('/no/match/found'), null, '->findRoute() returns null on non-matching route');
 
@@ -546,14 +563,12 @@ function configureRouting($event)
 $params = array('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');
-try
-{
-  $r->generate('', $params);
-  $t->fail('->generate() throws a sfConfigurationException if no route matches the params');
-}
-catch (sfConfigurationException $e)
-{
-  $t->pass('->generate() throws a sfConfigurationException if no route matches the params');
+
+try {
+    $r->generate('', $params);
+    $t->fail('->generate() throws a sfConfigurationException if no route matches the params');
+} catch (sfConfigurationException $e) {
+    $t->pass('->generate() throws a sfConfigurationException if no route matches the params');
 }
 
 // mandatory parameters
@@ -561,14 +576,12 @@ function configureRouting($event)
 $r->clearRoutes();
 $r->connect('test', new sfRoute('/test/:foo/:bar'));
 $params = array('foo' => 'bar');
-try
-{
-  $r->generate('test', $params);
-  $t->fail('->generate() throws a InvalidArgumentException if some mandatory parameters are not provided');
-}
-catch (InvalidArgumentException $e)
-{
-  $t->pass('->generate() throws a InvalidArgumentException if some mandatory parameters are not provided');
+
+try {
+    $r->generate('test', $params);
+    $t->fail('->generate() throws a InvalidArgumentException if some mandatory parameters are not provided');
+} catch (InvalidArgumentException $e) {
+    $t->pass('->generate() throws a InvalidArgumentException if some mandatory parameters are not provided');
 }
 
 // default module/action overriding
@@ -608,7 +621,6 @@ function configureRouting($event)
 $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');
 
-
 $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'));
@@ -633,7 +645,6 @@ function configureRouting($event)
 $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->diag('load_configuration with serialized routes');
 
 // see fixtures/config_routing.yml.php
diff --git a/test/unit/routing/sfRequestRouteTest.php b/test/unit/routing/sfRequestRouteTest.php
index 811fcfb51..01cc457b6 100644
--- a/test/unit/routing/sfRequestRouteTest.php
+++ b/test/unit/routing/sfRequestRouteTest.php
@@ -3,12 +3,12 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.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 __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(8);
 
diff --git a/test/unit/routing/sfRouteTest.php b/test/unit/routing/sfRouteTest.php
index ff50cee0b..ecfcba102 100644
--- a/test/unit/routing/sfRouteTest.php
+++ b/test/unit/routing/sfRouteTest.php
@@ -3,12 +3,12 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.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 __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(65);
 
@@ -190,46 +190,40 @@
 
 class MyRoute extends sfRoute
 {
-  protected function tokenizeBufferBefore(&$buffer, &$tokens, &$afterASeparator, &$currentSeparator)
-  {
-    if ($afterASeparator && preg_match('#^=('.$this->options['variable_regex'].')#', $buffer, $match))
+    protected function tokenizeBufferBefore(&$buffer, &$tokens, &$afterASeparator, &$currentSeparator)
     {
-      // a labelled variable
-      $this->tokens[] = array('label', $currentSeparator, $match[0], $match[1]);
-
-      $currentSeparator = '';
-      $buffer = substr($buffer, strlen($match[0]));
-      $afterASeparator = false;
-    }
-    else
-    {
-      return false;
+        if ($afterASeparator && preg_match('#^=('.$this->options['variable_regex'].')#', $buffer, $match)) {
+            // a labelled variable
+            $this->tokens[] = array('label', $currentSeparator, $match[0], $match[1]);
+
+            $currentSeparator = '';
+            $buffer = substr($buffer, strlen($match[0]));
+            $afterASeparator = false;
+        } else {
+            return false;
+        }
     }
-  }
 
-  protected function compileForLabel($separator, $name, $variable)
-  {
-    if (!isset($this->requirements[$variable]))
+    protected function compileForLabel($separator, $name, $variable)
     {
-      $this->requirements[$variable] = $this->options['variable_content_regex'];
-    }
+        if (!isset($this->requirements[$variable])) {
+            $this->requirements[$variable] = $this->options['variable_content_regex'];
+        }
 
-    $this->segments[] = preg_quote($separator, '#').$variable.$separator.'(?P<'.$variable.'>'.$this->requirements[$variable].')';
-    $this->variables[$variable] = $name;
+        $this->segments[] = preg_quote($separator, '#').$variable.$separator.'(?P<'.$variable.'>'.$this->requirements[$variable].')';
+        $this->variables[$variable] = $name;
 
-    if (!isset($this->defaults[$variable]))
-    {
-      $this->firstOptional = count($this->segments);
+        if (!isset($this->defaults[$variable])) {
+            $this->firstOptional = count($this->segments);
+        }
     }
-  }
 
-  protected function generateForLabel($optional, $tparams, $separator, $name, $variable)
-  {
-    if (!empty($tparams[$variable]) && (!$optional || !isset($this->defaults[$variable]) || $tparams[$variable] != $this->defaults[$variable]))
+    protected function generateForLabel($optional, $tparams, $separator, $name, $variable)
     {
-      return $variable . '/' . urlencode($tparams[$variable]);
+        if (!empty($tparams[$variable]) && (!$optional || !isset($this->defaults[$variable]) || $tparams[$variable] != $this->defaults[$variable])) {
+            return $variable.'/'.urlencode($tparams[$variable]);
+        }
     }
-  }
 }
 
 $route = new MyRoute('/=foo');
@@ -238,10 +232,10 @@ protected function generateForLabel($optional, $tparams, $separator, $name, $var
 
 class CompileCheckRoute extends sfRoute
 {
-  public function isCompiled()
-  {
-    return $this->compiled;
-  }
+    public function isCompiled()
+    {
+        return $this->compiled;
+    }
 }
 
 // state checking
diff --git a/test/unit/service/fixtures/containers/container8.php b/test/unit/service/fixtures/containers/container8.php
index 19dc7819d..0b5e37f9b 100644
--- a/test/unit/service/fixtures/containers/container8.php
+++ b/test/unit/service/fixtures/containers/container8.php
@@ -2,9 +2,9 @@
 
 $container = new sfServiceContainerBuilder();
 $container->setParameters(array(
-  'FOO'    => 'bar',
-  'bar'    => 'foo is %foo bar',
-  'values' => array(true, false, null, 0, 1000.3, 'true', 'false', 'null'),
+    'FOO' => 'bar',
+    'bar' => 'foo is %foo bar',
+    'values' => array(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 c787ffa87..fc72a46a7 100644
--- a/test/unit/service/fixtures/containers/container9.php
+++ b/test/unit/service/fixtures/containers/container9.php
@@ -26,9 +26,9 @@
 ;
 $container->register('foo_bar', 'FooClass');
 $container->setParameters(array(
-  'baz_class' => 'BazClass',
-  'foo' => 'bar',
-  'foo_bar' => new sfServiceReference('foo_bar'),
+    'baz_class' => 'BazClass',
+    'foo' => 'bar',
+    'foo_bar' => new sfServiceReference('foo_bar'),
 ));
 $container->setAlias('alias_for_foo', 'foo');
 
diff --git a/test/unit/service/fixtures/includes/classes.php b/test/unit/service/fixtures/includes/classes.php
index 764e259f6..f7a3290f7 100644
--- a/test/unit/service/fixtures/includes/classes.php
+++ b/test/unit/service/fixtures/includes/classes.php
@@ -2,7 +2,7 @@
 
 function sc_configure($instance)
 {
-  $instance->configure();
+    $instance->configure();
 }
 
 class BarClass
@@ -11,22 +11,22 @@ class BarClass
 
 class BazClass
 {
-  public function configure($instance)
-  {
-    $instance->configure();
-  }
+    public function configure($instance)
+    {
+        $instance->configure();
+    }
 
-  static public function getInstance()
-  {
-    return new self();
-  }
+    public static function getInstance()
+    {
+        return new self();
+    }
 
-  static public function configureStatic($instance)
-  {
-    $instance->configure();
-  }
+    public static function configureStatic($instance)
+    {
+        $instance->configure();
+    }
 
-  static public function configureStatic1()
-  {
-  }
+    public static function configureStatic1()
+    {
+    }
 }
diff --git a/test/unit/service/fixtures/includes/foo.php b/test/unit/service/fixtures/includes/foo.php
index 841815155..c67db482f 100644
--- a/test/unit/service/fixtures/includes/foo.php
+++ b/test/unit/service/fixtures/includes/foo.php
@@ -2,33 +2,37 @@
 
 class FooClass
 {
-  public $bar = null, $initialized = false, $configured = false, $called = false, $arguments = array();
+    public $bar;
+    public $initialized = false;
+    public $configured = false;
+    public $called = false;
+    public $arguments = array();
 
-  public function __construct($arguments = array())
-  {
-    $this->arguments = $arguments;
-  }
+    public function __construct($arguments = array())
+    {
+        $this->arguments = $arguments;
+    }
 
-  static public function getInstance($arguments = array())
-  {
-    $obj = new self($arguments);
-    $obj->called = true;
+    public static function getInstance($arguments = array())
+    {
+        $obj = new self($arguments);
+        $obj->called = true;
 
-    return $obj;
-  }
+        return $obj;
+    }
 
-  public function initialize()
-  {
-    $this->initialized = true;
-  }
+    public function initialize()
+    {
+        $this->initialized = true;
+    }
 
-  public function configure()
-  {
-    $this->configured = true;
-  }
+    public function configure()
+    {
+        $this->configured = true;
+    }
 
-  public function setBar($value = null)
-  {
-    $this->bar = $value;
-  }
+    public function setBar($value = null)
+    {
+        $this->bar = $value;
+    }
 }
diff --git a/test/unit/service/sfServiceContainerBuilderTest.php b/test/unit/service/sfServiceContainerBuilderTest.php
index 85db8a138..79595468c 100644
--- a/test/unit/service/sfServiceContainerBuilderTest.php
+++ b/test/unit/service/sfServiceContainerBuilderTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(48);
 
@@ -16,8 +16,8 @@
 $t->diag('->setServiceDefinitions() ->addServiceDefinitions() ->getServiceDefinitions() ->setServiceDefinition() ->getServiceDefinition() ->hasServiceDefinition()');
 $builder = new sfServiceContainerBuilder();
 $definitions = array(
-  'foo' => new sfServiceDefinition('FooClass'),
-  'bar' => new sfServiceDefinition('BarClass'),
+    'foo' => new sfServiceDefinition('FooClass'),
+    'bar' => new sfServiceDefinition('BarClass'),
 );
 $builder->setServiceDefinitions($definitions);
 $t->is($builder->getServiceDefinitions(), $definitions, '->setServiceDefinitions() sets the service definitions');
@@ -31,14 +31,11 @@
 $builder->addServiceDefinitions($defs = array('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)
-{
-  $t->pass('->getServiceDefinition() throws an InvalidArgumentException if the service definition does not exist');
+try {
+    $builder->getServiceDefinition('baz');
+    $t->fail('->getServiceDefinition() throws an InvalidArgumentException if the service definition does not exist');
+} catch (InvalidArgumentException $e) {
+    $t->pass('->getServiceDefinition() throws an InvalidArgumentException if the service definition does not exist');
 }
 
 // ->register()
@@ -83,14 +80,12 @@
 // ->getService()
 $t->diag('->getService()');
 $builder = new sfServiceContainerBuilder();
-try
-{
-  $builder->getService('foo');
-  $t->fail('->getService() throws an InvalidArgumentException if the service does not exist');
-}
-catch (InvalidArgumentException $e)
-{
-  $t->pass('->getService() throws an InvalidArgumentException if the service does not exist');
+
+try {
+    $builder->getService('foo');
+    $t->fail('->getService() throws an InvalidArgumentException if the service does not exist');
+} 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');
@@ -100,14 +95,12 @@
 $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')));
-try
-{
-  @$builder->getService('baz');
-  $t->fail('->getService() throws a LogicException if the service has a circular reference to itself');
-}
-catch (LogicException $e)
-{
-  $t->pass('->getService() throws a LogicException if the service has a circular reference to itself');
+
+try {
+    @$builder->getService('baz');
+    $t->fail('->getService() throws a LogicException if the service has a circular reference to itself');
+} catch (LogicException $e) {
+    $t->pass('->getService() throws a LogicException if the service has a circular reference to itself');
 }
 
 $builder->register('foobar', 'stdClass')->setShared(true);
@@ -178,14 +171,12 @@
 $t->ok($builder->getService('foo3')->configured, '->createService() calls the configurator');
 
 $builder->register('foo4', 'FooClass')->setConfigurator('foo');
-try
-{
-  $builder->getService('foo4');
-  $t->fail('->createService() throws an InvalidArgumentException if the configure callable is not a valid callable');
-}
-catch (InvalidArgumentException $e)
-{
-  $t->pass('->createService() throws an InvalidArgumentException if the configure callable is not a valid callable');
+
+try {
+    $builder->getService('foo4');
+    $t->fail('->createService() throws an InvalidArgumentException if the configure callable is not a valid callable');
+} catch (InvalidArgumentException $e) {
+    $t->pass('->createService() throws an InvalidArgumentException if the configure callable is not a valid callable');
 }
 
 // ->resolveValue()
@@ -195,7 +186,7 @@
 $builder->setParameter('foo', 'bar');
 $t->is($builder->resolveValue('I\'m a %foo%'), 'I\'m a bar', '->resolveValue() replaces placeholders by their values');
 $builder->setParameter('foo', true);
-$t->ok($builder->resolveValue('%foo%') === true, '->resolveValue() replaces arguments that are just a placeholder by their value without casting them to strings');
+$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');
@@ -205,24 +196,18 @@
 $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');
 
-try
-{
-  $builder->resolveValue('%foobar%');
-  $t->fail('->resolveValue() throws a InvalidArgumentException if a placeholder references a non-existant parameter');
-}
-catch (InvalidArgumentException $e)
-{
-  $t->pass('->resolveValue() throws a InvalidArgumentException if a placeholder references a non-existant parameter');
+try {
+    $builder->resolveValue('%foobar%');
+    $t->fail('->resolveValue() throws a InvalidArgumentException if a placeholder references a non-existant parameter');
+} 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)
-{
-  $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) {
+    $t->pass('->resolveValue() throws a InvalidArgumentException if a placeholder references a non-existant parameter');
 }
 
 // ->resolveServices()
diff --git a/test/unit/service/sfServiceContainerDumperGraphvizTest.php b/test/unit/service/sfServiceContainerDumperGraphvizTest.php
index 69d3b10d0..e00f0ee8a 100644
--- a/test/unit/service/sfServiceContainerDumperGraphvizTest.php
+++ b/test/unit/service/sfServiceContainerDumperGraphvizTest.php
@@ -8,13 +8,12 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(4);
 
 $dir = __DIR__.'/fixtures/graphviz';
 
-
 // ->dump()
 $t->diag('->dump()');
 $dumper = new sfServiceContainerDumperGraphviz($container = new sfServiceContainerBuilder());
@@ -35,10 +34,10 @@
 $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'),
+    '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');
diff --git a/test/unit/service/sfServiceContainerDumperPhpTest.php b/test/unit/service/sfServiceContainerDumperPhpTest.php
index e9abc0b10..911c5f107 100644
--- a/test/unit/service/sfServiceContainerDumperPhpTest.php
+++ b/test/unit/service/sfServiceContainerDumperPhpTest.php
@@ -8,13 +8,12 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(5);
 
 $dir = __DIR__.'/fixtures/php';
 
-
 // ->dump()
 $t->diag('->dump()');
 $dumper = new sfServiceContainerDumperPhp($container = new sfServiceContainerBuilder());
@@ -39,12 +38,10 @@
 
 $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)
-{
-  $t->pass('->dump() throws a RuntimeException if the container to be dumped has reference to objects or resources');
+
+try {
+    $dumper->dump();
+    $t->fail('->dump() throws a RuntimeException if the container to be dumped has reference to objects or resources');
+} 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 8e4f44f74..b482aa0d3 100644
--- a/test/unit/service/sfServiceContainerDumperTest.php
+++ b/test/unit/service/sfServiceContainerDumperTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(1);
 
@@ -18,12 +18,10 @@ class ProjectDumper extends sfServiceContainerDumper
 
 $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)
-{
-  $t->pass('->dump() returns a LogicException if the dump() method has not been overriden by a children class');
+
+try {
+    $dumper->dump();
+    $t->fail('->dump() returns a LogicException if the dump() method has not been overriden by a children class');
+} 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 5000013e2..e624e126f 100644
--- a/test/unit/service/sfServiceContainerLoaderArrayTest.php
+++ b/test/unit/service/sfServiceContainerLoaderArrayTest.php
@@ -8,39 +8,33 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(20);
 
 class ProjectLoader extends sfServiceContainerLoaderArray
 {
-  public function validate($content)
-  {
-    return parent::validate($content);
-  }
+    public function validate($content)
+    {
+        return parent::validate($content);
+    }
 }
 
 $loader = new ProjectLoader(null);
 
 // ->validate()
-try
-{
-  $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)
-{
-  $t->pass('->validate() throws an InvalidArgumentException if the loaded definition is not an array');
+try {
+    $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) {
+    $t->pass('->validate() throws an InvalidArgumentException if the loaded definition is not an array');
 }
 
-try
-{
-  $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)
-{
-  $t->pass('->validate() throws an InvalidArgumentException if the loaded definition is not a valid array');
+try {
+    $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) {
+    $t->pass('->validate() throws an InvalidArgumentException if the loaded definition is not a valid array');
 }
 
 // ->load() # parameters
diff --git a/test/unit/service/sfServiceContainerLoaderTest.php b/test/unit/service/sfServiceContainerLoaderTest.php
index 7dc33dc11..e1526d56d 100644
--- a/test/unit/service/sfServiceContainerLoaderTest.php
+++ b/test/unit/service/sfServiceContainerLoaderTest.php
@@ -8,18 +8,18 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(11);
 
 class ProjectLoader extends sfServiceContainerLoader
 {
-  public $container;
+    public $container;
 
-  public function doLoad($resource)
-  {
-    return $resource;
-  }
+    public function doLoad($resource)
+    {
+        return $resource;
+    }
 }
 
 // __construct()
@@ -36,14 +36,12 @@ public function doLoad($resource)
 // ->load()
 $t->diag('->load()');
 $loader = new ProjectLoader();
-try
-{
-  $loader->load('foo');
-  $t->fail('->load() throws a LogicException if no container is attached to the loader');
-}
-catch (LogicException $e)
-{
-  $t->pass('->load() throws a LogicException if no container is attached to the loader');
+
+try {
+    $loader->load('foo');
+    $t->fail('->load() throws a LogicException if no container is attached to the loader');
+} 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')));
diff --git a/test/unit/service/sfServiceContainerTest.php b/test/unit/service/sfServiceContainerTest.php
index ae35adb3f..a4c8f0ec7 100644
--- a/test/unit/service/sfServiceContainerTest.php
+++ b/test/unit/service/sfServiceContainerTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(27);
 
@@ -50,14 +50,11 @@
 $t->is($sc->getParameter('foo'), 'baz1', '->setParameter() converts the key to lowercase');
 $t->is($sc->getParameter('FOO'), 'baz1', '->getParameter() converts the key to lowercase');
 
-try
-{
-  $sc->getParameter('baba');
-  $t->fail('->getParameter() thrown an InvalidArgumentException if the key does not exist');
-}
-catch (InvalidArgumentException $e)
-{
-  $t->pass('->getParameter() thrown an InvalidArgumentException if the key does not exist');
+try {
+    $sc->getParameter('baba');
+    $t->fail('->getParameter() thrown an InvalidArgumentException if the key does not exist');
+} catch (InvalidArgumentException $e) {
+    $t->pass('->getParameter() thrown an InvalidArgumentException if the key does not exist');
 }
 
 // ->hasParameter()
@@ -94,31 +91,33 @@
 
 class ProjectServiceContainer extends sfServiceContainer
 {
-  public $__bar, $__foo_bar, $__foo_baz;
-
-  public function __construct()
-  {
-    parent::__construct();
-
-    $this->__bar = new stdClass();
-    $this->__foo_bar = new stdClass();
-    $this->__foo_baz = new stdClass();
-  }
-
-  protected function getBarService()
-  {
-    return $this->__bar;
-  }
-
-  protected function getFooBarService()
-  {
-    return $this->__foo_bar;
-  }
-
-  protected function getFoo_BazService()
-  {
-    return $this->__foo_baz;
-  }
+    public $__bar;
+    public $__foo_bar;
+    public $__foo_baz;
+
+    public function __construct()
+    {
+        parent::__construct();
+
+        $this->__bar = new stdClass();
+        $this->__foo_bar = new stdClass();
+        $this->__foo_baz = new stdClass();
+    }
+
+    protected function getBarService()
+    {
+        return $this->__bar;
+    }
+
+    protected function getFooBarService()
+    {
+        return $this->__foo_bar;
+    }
+
+    protected function getFoo_BazService()
+    {
+        return $this->__foo_baz;
+    }
 }
 
 $sc = new ProjectServiceContainer();
@@ -128,14 +127,11 @@ protected function getFoo_BazService()
 $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)
-{
-  $t->pass('->getService() thrown an InvalidArgumentException if the service does not exist');
+try {
+    $sc->getService('baba');
+    $t->fail('->getService() thrown an InvalidArgumentException if the service does not exist');
+} catch (InvalidArgumentException $e) {
+    $t->pass('->getService() thrown an InvalidArgumentException if the service does not exist');
 }
 
 $t->is(spl_object_hash($sc->getService('foo_bar')), spl_object_hash($sc->__foo_bar), '->getService() camelizes the service id when looking for a method');
diff --git a/test/unit/service/sfServiceDefinitionTest.php b/test/unit/service/sfServiceDefinitionTest.php
index 5a9c98b05..dd0a5170c 100644
--- a/test/unit/service/sfServiceDefinitionTest.php
+++ b/test/unit/service/sfServiceDefinitionTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(21);
 
diff --git a/test/unit/service/sfServiceParameterTest.php b/test/unit/service/sfServiceParameterTest.php
index 1cd18333d..b8bc55fc4 100644
--- a/test/unit/service/sfServiceParameterTest.php
+++ b/test/unit/service/sfServiceParameterTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(1);
 
diff --git a/test/unit/service/sfServiceReferenceTest.php b/test/unit/service/sfServiceReferenceTest.php
index 19f11a36a..176ba263b 100644
--- a/test/unit/service/sfServiceReferenceTest.php
+++ b/test/unit/service/sfServiceReferenceTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(1);
 
diff --git a/test/unit/sfContextMock.class.php b/test/unit/sfContextMock.class.php
index 453567bad..97d67a8bd 100644
--- a/test/unit/sfContextMock.class.php
+++ b/test/unit/sfContextMock.class.php
@@ -3,125 +3,124 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 class sfContext
 {
-  protected static
-    $instance = null;
-
-  public
-    $configuration = null,
-    $request       = null,
-    $response      = null,
-    $controller    = null,
-    $routing       = null,
-    $user          = null,
-    $storage       = null;
-
-  protected
-    $sessionPath = '';
-
-  static public function getInstance($factories = array(), $force = false)
-  {
-    if (!isset(self::$instance) || $force)
+    public $configuration;
+    public $request;
+    public $response;
+    public $controller;
+    public $routing;
+    public $user;
+    public $storage;
+    protected static $instance;
+
+    protected $sessionPath = '';
+
+    public function __destruct()
     {
-      self::$instance = new sfContext();
+        sfToolkit::clearDirectory($this->sessionPath);
+    }
+
+    public static function getInstance($factories = array(), $force = false)
+    {
+        if (!isset(self::$instance) || $force) {
+            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->dispatcher = new sfEventDispatcher();
+
+            foreach ($factories as $type => $class) {
+                self::$instance->inject($type, $class);
+            }
+        }
+
+        return self::$instance;
+    }
+
+    public static function hasInstance()
+    {
+        return true;
+    }
 
-      self::$instance->sessionPath = sys_get_temp_dir().'/sessions_'.rand(11111, 99999);
-      self::$instance->storage = new sfSessionTestStorage(array('session_path' => self::$instance->sessionPath));
+    public function getEventDispatcher()
+    {
+        return self::$instance->dispatcher;
+    }
 
-      self::$instance->dispatcher = new sfEventDispatcher();
+    public function getModuleName()
+    {
+        return 'module';
+    }
 
-      foreach ($factories as $type => $class)
-      {
-        self::$instance->inject($type, $class);
-      }
+    public function getActionName()
+    {
+        return 'action';
+    }
+
+    public function getConfiguration()
+    {
+        return $this->configuration;
+    }
+
+    public function getRequest()
+    {
+        return $this->request;
     }
 
-    return self::$instance;
-  }
-
-  public function __destruct()
-  {
-    sfToolkit::clearDirectory($this->sessionPath);
-  }
-
-  static public function hasInstance()
-  {
-    return true;
-  }
-
-  public function getEventDispatcher()
-  {
-    return self::$instance->dispatcher;
-  }
-
-  public function getModuleName()
-  {
-    return 'module';
-  }
-
-  public function getActionName()
-  {
-    return 'action';
-  }
-
-  public function getConfiguration()
-  {
-    return $this->configuration;
-  }
-
-  public function getRequest()
-  {
-    return $this->request;
-  }
-
-  public function getResponse()
-  {
-    return $this->response;
-  }
-
-  public function getRouting()
-  {
-    return $this->routing;
-  }
-
-  public function getStorage()
-  {
-    return $this->storage;
-  }
-
-  public function getUser()
-  {
-    return $this->user;
-  }
-
-  public function getController()
-  {
-    return $this->controller;
-  }
-
-  public function inject($type, $class, $parameters = array())
-  {
-    switch ($type)
+    public function getResponse()
     {
-      case 'routing':
-        $object = new $class($this->dispatcher, null, $parameters);
-        break;
-      case 'response':
-        $object = new $class($this->dispatcher, $parameters);
-        break;
-      case 'request':
-        $object = new $class($this->dispatcher, $this->routing, $parameters);
-        break;
-      default:
-        $object = new $class($this, $parameters);
+        return $this->response;
     }
 
-    $this->$type = $object;
-  }
+    public function getRouting()
+    {
+        return $this->routing;
+    }
+
+    public function getStorage()
+    {
+        return $this->storage;
+    }
+
+    public function getUser()
+    {
+        return $this->user;
+    }
+
+    public function getController()
+    {
+        return $this->controller;
+    }
+
+    public function inject($type, $class, $parameters = array())
+    {
+        switch ($type) {
+            case 'routing':
+                $object = new $class($this->dispatcher, null, $parameters);
+
+                break;
+
+            case 'response':
+                $object = new $class($this->dispatcher, $parameters);
+
+                break;
+
+            case 'request':
+                $object = new $class($this->dispatcher, $this->routing, $parameters);
+
+                break;
+
+            default:
+                $object = new $class($this, $parameters);
+        }
+
+        $this->{$type} = $object;
+    }
 }
diff --git a/test/unit/sfEventDispatcherTest.class.php b/test/unit/sfEventDispatcherTest.class.php
index bc08f4b09..c65769463 100644
--- a/test/unit/sfEventDispatcherTest.class.php
+++ b/test/unit/sfEventDispatcherTest.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -11,41 +11,37 @@
 // helper class to test the event dispatcher
 class sfEventDispatcherTest
 {
-  protected $t = null;
+    protected $t;
 
-  public function __construct($testObject)
-  {
-    $this->t = $testObject;
-  }
-
-  public function launchTests($dispatcher, $object, $class)
-  {
-    $this->t->diag('New methods via sfEventDispatcher');
-    $dispatcher->connect($class.'.method_not_found', array('myEventDispatcherTest', 'newMethod'));
-    $this->t->is($object->newMethod('ok'), 'ok', '__call() accepts new methods via sfEventDispatcher');
-
-    try
+    public function __construct($testObject)
     {
-      $object->nonexistantmethodname();
-      $this->t->fail('__call() throws an exception if the method does not exist as a sfEventDispatcher listener');
+        $this->t = $testObject;
     }
-    catch (sfException $e)
+
+    public function launchTests($dispatcher, $object, $class)
     {
-      $this->t->pass('__call() throws an exception if the method does not exist as a sfEventDispatcher listener');
+        $this->t->diag('New methods via sfEventDispatcher');
+        $dispatcher->connect($class.'.method_not_found', array('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) {
+            $this->t->pass('__call() throws an exception if the method does not exist as a sfEventDispatcher listener');
+        }
     }
-  }
 }
 
 class myEventDispatcherTest
 {
-  static public function newMethod(sfEvent $event)
-  {
-    if ($event['method'] == 'newMethod')
+    public static function newMethod(sfEvent $event)
     {
-      $arguments = $event['arguments'];
-      $event->setReturnValue($arguments[0]);
+        if ('newMethod' == $event['method']) {
+            $arguments = $event['arguments'];
+            $event->setReturnValue($arguments[0]);
 
-      return true;
+            return true;
+        }
     }
-  }
 }
diff --git a/test/unit/sfNoRouting.class.php b/test/unit/sfNoRouting.class.php
index fc13704c4..724387f47 100644
--- a/test/unit/sfNoRouting.class.php
+++ b/test/unit/sfNoRouting.class.php
@@ -11,103 +11,111 @@
 /**
  * sfNoRouting class is a very simple routing class that uses GET parameters.
  *
- * @package    symfony
- * @subpackage routing
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
  * @version    SVN: $Id: sfNoRouting.class.php 20566 2009-07-29 07:04:01Z fabien $
  */
 class sfNoRouting extends sfRouting
 {
-  /**
-   * @see sfRouting
-   */
-  public function getCurrentInternalUri($with_route_name = false)
-  {
-    $parameters = $this->mergeArrays($this->defaultParameters, $_GET);
-    $action = sprintf('%s/%s', $parameters['module'], $parameters['action']);
-
-    // other parameters
-    unset($parameters['module'], $parameters['action']);
-    ksort($parameters);
-    $parameters = count($parameters) ? '?'.http_build_query($parameters, '', '&') : '';
+    /**
+     * @see sfRouting
+     *
+     * @param mixed $with_route_name
+     */
+    public function getCurrentInternalUri($with_route_name = false)
+    {
+        $parameters = $this->mergeArrays($this->defaultParameters, $_GET);
+        $action = sprintf('%s/%s', $parameters['module'], $parameters['action']);
 
-    return sprintf('%s%s', $action, $parameters);
-  }
+        // other parameters
+        unset($parameters['module'], $parameters['action']);
+        ksort($parameters);
+        $parameters = count($parameters) ? '?'.http_build_query($parameters, '', '&') : '';
 
- /**
-  * @see sfRouting
-  */
-  public function generate($name, $params = array(), $absolute = false)
-  {
-    $parameters = $this->mergeArrays($this->defaultParameters, $params);
-    if ($this->getDefaultParameter('module') == $parameters['module'])
-    {
-      unset($parameters['module']);
-    }
-    if ($this->getDefaultParameter('action') == $parameters['action'])
-    {
-      unset($parameters['action']);
+        return sprintf('%s%s', $action, $parameters);
     }
 
-    $parameters = http_build_query($parameters, '', '&');
+    /**
+     * @see sfRouting
+     *
+     * @param mixed $name
+     * @param mixed $params
+     * @param mixed $absolute
+     */
+    public function generate($name, $params = array(), $absolute = false)
+    {
+        $parameters = $this->mergeArrays($this->defaultParameters, $params);
+        if ($this->getDefaultParameter('module') == $parameters['module']) {
+            unset($parameters['module']);
+        }
+        if ($this->getDefaultParameter('action') == $parameters['action']) {
+            unset($parameters['action']);
+        }
 
-    return $this->fixGeneratedUrl('/'.($parameters ? '?'.$parameters : ''), $absolute);
-  }
+        $parameters = http_build_query($parameters, '', '&');
 
- /**
-  * @see sfRouting
-  */
-  public function parse($url)
-  {
-    return array();
-  }
+        return $this->fixGeneratedUrl('/'.($parameters ? '?'.$parameters : ''), $absolute);
+    }
 
-  /**
-   * @see sfRouting
-   */
-  public function getRoutes()
-  {
-    return array();
-  }
+    /**
+     * @see sfRouting
+     *
+     * @param mixed $url
+     */
+    public function parse($url)
+    {
+        return array();
+    }
 
-  /**
-   * @see sfRouting
-   */
-  public function getRoute($name)
-  {
-    return null;
-  }
+    /**
+     * @see sfRouting
+     */
+    public function getRoutes()
+    {
+        return array();
+    }
 
-  /**
-   * @see sfRouting
-   */
-  public function setRoutes($routes)
-  {
-    return array();
-  }
+    /**
+     * @see sfRouting
+     *
+     * @param mixed $name
+     */
+    public function getRoute($name)
+    {
+        return null;
+    }
 
-  /**
-   * @see sfRouting
-   */
-  public function hasRoutes()
-  {
-    return false;
-  }
+    /**
+     * @see sfRouting
+     *
+     * @param mixed $routes
+     */
+    public function setRoutes($routes)
+    {
+        return array();
+    }
 
-  /**
-   * @see sfRouting
-   */
-  public function clearRoutes()
-  {
-  }
+    /**
+     * @see sfRouting
+     */
+    public function hasRoutes()
+    {
+        return false;
+    }
 
-  protected function mergeArrays($arr1, $arr2)
-  {
-    foreach ($arr2 as $key => $value)
+    /**
+     * @see sfRouting
+     */
+    public function clearRoutes()
     {
-      $arr1[$key] = $value;
     }
 
-    return $arr1;
-  }
+    protected function mergeArrays($arr1, $arr2)
+    {
+        foreach ($arr2 as $key => $value) {
+            $arr1[$key] = $value;
+        }
+
+        return $arr1;
+    }
 }
diff --git a/test/unit/sfParameterHolderTest.class.php b/test/unit/sfParameterHolderTest.class.php
index c9c122d6f..e22377426 100644
--- a/test/unit/sfParameterHolderTest.class.php
+++ b/test/unit/sfParameterHolderTest.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -11,47 +11,46 @@
 // helper class to test parameter holder proxies
 class sfParameterHolderProxyTest
 {
-  protected $t = null;
+    protected $t;
 
-  public function __construct($testObject)
-  {
-    $this->t = $testObject;
-  }
-
-  public function launchTests($object, $methodName = 'parameter')
-  {
-    $t = $this->t;
-
-    $hasMethod = 'has'.ucfirst($methodName);
-    $getMethod = 'get'.ucfirst($methodName);
-    $setMethod = 'set'.ucfirst($methodName);
-    $holderMethod = 'get'.ucfirst($methodName).'Holder';
-
-    $t->diag(ucfirst($methodName).' holder proxy');
-
-    $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");
-    $t->is($object->$getMethod('foo', 'default'), 'default', "->$getMethod() returns the default value if $methodName does not exist");
-    $object->$setMethod('foo', 'bar');
-    $t->is($object->$hasMethod('foo'), true, "->$hasMethod() returns true if the $methodName exists");
-    $t->is($object->$hasMethod('foo'), $object->$holderMethod()->has('foo'), "->$hasMethod() is a proxy method");
-    $t->is($object->$getMethod('foo'), 'bar', "->$getMethod() returns the value of the $methodName");
-    $t->is($object->$getMethod('foo'), $object->$holderMethod()->get('foo'), "->$getMethod() is a proxy method");
-    $t->is($object->$getMethod('foo', 'default'), 'bar', "->$getMethod() does not return the default value if the $methodName exists");
-
-    if ($namespaced)
+    public function __construct($testObject)
     {
-      $object->$setMethod('foo1', 'bar1', 'mynamespace');
-      $t->is($object->$hasMethod('foo1'), false, "->$hasMethod() takes a namespace as its second parameter");
-      $t->is($object->$hasMethod('foo1', 'mynamespace'), true, "->$hasMethod() takes a namespace as its second parameter");
-      $t->is($object->$getMethod('foo1', 'default', 'mynamespace'), 'bar1', "->$getMethod() takes a namespace as its third parameter");
+        $this->t = $testObject;
     }
 
-    $object->$setMethod('foo2', 'bar2');
-    $object->$holderMethod()->set('foo3', 'bar3');
-    $t->is($object->$getMethod('foo2'), $object->$holderMethod()->get('foo2'), "->$setMethod() is a proxy method");
-    $t->is($object->$getMethod('foo3'), $object->$holderMethod()->get('foo3'), "->$setMethod() is a proxy method");
-  }
+    public function launchTests($object, $methodName = 'parameter')
+    {
+        $t = $this->t;
+
+        $hasMethod = 'has'.ucfirst($methodName);
+        $getMethod = 'get'.ucfirst($methodName);
+        $setMethod = 'set'.ucfirst($methodName);
+        $holderMethod = 'get'.ucfirst($methodName).'Holder';
+
+        $t->diag(ucfirst($methodName).' holder proxy');
+
+        $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");
+        $t->is($object->{$getMethod}('foo', 'default'), 'default', "->{$getMethod}() returns the default value if {$methodName} does not exist");
+        $object->{$setMethod}('foo', 'bar');
+        $t->is($object->{$hasMethod}('foo'), true, "->{$hasMethod}() returns true if the {$methodName} exists");
+        $t->is($object->{$hasMethod}('foo'), $object->{$holderMethod}()->has('foo'), "->{$hasMethod}() is a proxy method");
+        $t->is($object->{$getMethod}('foo'), 'bar', "->{$getMethod}() returns the value of the {$methodName}");
+        $t->is($object->{$getMethod}('foo'), $object->{$holderMethod}()->get('foo'), "->{$getMethod}() is a proxy method");
+        $t->is($object->{$getMethod}('foo', 'default'), 'bar', "->{$getMethod}() does not return the default value if the {$methodName} exists");
+
+        if ($namespaced) {
+            $object->{$setMethod}('foo1', 'bar1', 'mynamespace');
+            $t->is($object->{$hasMethod}('foo1'), false, "->{$hasMethod}() takes a namespace as its second parameter");
+            $t->is($object->{$hasMethod}('foo1', 'mynamespace'), true, "->{$hasMethod}() takes a namespace as its second parameter");
+            $t->is($object->{$getMethod}('foo1', 'default', 'mynamespace'), 'bar1', "->{$getMethod}() takes a namespace as its third parameter");
+        }
+
+        $object->{$setMethod}('foo2', 'bar2');
+        $object->{$holderMethod}()->set('foo3', 'bar3');
+        $t->is($object->{$getMethod}('foo2'), $object->{$holderMethod}()->get('foo2'), "->{$setMethod}() is a proxy method");
+        $t->is($object->{$getMethod}('foo3'), $object->{$holderMethod}()->get('foo3'), "->{$setMethod}() is a proxy method");
+    }
 }
diff --git a/test/unit/storage/sfCacheSessionStorageTest.php b/test/unit/storage/sfCacheSessionStorageTest.php
index 6e1c64064..7f8cd7298 100644
--- a/test/unit/storage/sfCacheSessionStorageTest.php
+++ b/test/unit/storage/sfCacheSessionStorageTest.php
@@ -3,40 +3,37 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 $app = 'frontend';
 
-require_once(__DIR__.'/../../bootstrap/functional.php');
+require_once __DIR__.'/../../bootstrap/functional.php';
 
 $_test_dir = realpath(__DIR__.'/../../');
-require_once($_test_dir.'/../lib/vendor/lime/lime.php');
+
+require_once $_test_dir.'/../lib/vendor/lime/lime.php';
 
 sfConfig::set('sf_symfony_lib_dir', realpath($_test_dir.'/../lib'));
 
 $plan = 8;
 $t = new lime_test($plan);
 
-if (!ini_get('apc.enable_cli'))
-{
-  $t->skip('APC must be enable on CLI to run these tests', $plan);
-  return;
+if (!ini_get('apc.enable_cli')) {
+    $t->skip('APC must be enable on CLI to run these tests', $plan);
+
+    return;
 }
 
 // initialize the storage
-try
-{
-  $storage = new sfCacheSessionStorage();
-  $t->fail('->__construct() does not throw an exception when not provided a cache option');
+try {
+    $storage = new sfCacheSessionStorage();
+    $t->fail('->__construct() does not throw an exception when not provided a cache option');
+} catch (InvalidArgumentException $e) {
+    $t->pass('->__construct() throws an exception when not provided a cache option');
 }
-catch (InvalidArgumentException $e)
-{
-  $t->pass('->__construct() throws an exception when not provided a cache option');
-}
-
 
 $storage = new sfCacheSessionStorage(array('cache' => array('class' => 'sfAPCCache', 'param' => array())));
 $t->ok($storage instanceof sfStorage, '->__construct() is an instance of sfStorage');
diff --git a/test/unit/storage/sfMySQLStorageTest.php b/test/unit/storage/sfMySQLStorageTest.php
index 8cbb0d683..8d2639de8 100644
--- a/test/unit/storage/sfMySQLStorageTest.php
+++ b/test/unit/storage/sfMySQLStorageTest.php
@@ -9,42 +9,39 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 ob_start();
 $plan = 16;
 $t = new lime_test($plan);
 
-if (!extension_loaded('mysql'))
-{
-  $t->skip('Mysql extension must be loaded', $plan);
-  return;
+if (!extension_loaded('mysql')) {
+    $t->skip('Mysql extension must be loaded', $plan);
+
+    return;
 }
 
 // Configure your database with the settings below in order to run the test
 $mysql_config = array(
-  'host'     => 'localhost',
-  'username' => 'root', 
-  'password' => '', 
-);
+    'host' => 'localhost',
+    'username' => 'root',
+    'password' => '', );
 
-if (!isset($mysql_config))
-{
-  $t->skip('Mysql credentials needed to run these tests', $plan);
-  return;
-}
+if (!isset($mysql_config)) {
+    $t->skip('Mysql credentials needed to run these tests', $plan);
 
-try
-{
-  // Creating mysql database connection
-  $database = new sfMySQLDatabase($mysql_config);
-  $connection = $database->getResource();
+    return;
 }
-catch (sfDatabaseException $e)
-{
-  $t->diag($e->getMessage());
-  $t->skip('Unable to connect to MySQL database, skipping', $plan);
-  return;
+
+try {
+    // Creating mysql database connection
+    $database = new sfMySQLDatabase($mysql_config);
+    $connection = $database->getResource();
+} catch (sfDatabaseException $e) {
+    $t->diag($e->getMessage());
+    $t->skip('Unable to connect to MySQL database, skipping', $plan);
+
+    return;
 }
 
 // Creates test database
@@ -55,16 +52,17 @@
   `sess_id` varchar(40) NOT NULL PRIMARY KEY,
   `sess_time` int(10) unsigned NOT NULL default '0',
   `sess_data` text collate utf8_unicode_ci
-) ENGINE=MyISAM", $connection) 
+) ENGINE=MyISAM", $connection)
   or $t->fail('Can not create table session');
 
 ini_set('session.use_cookies', 0);
-$session_id = "1";
+$session_id = '1';
 
-$storage = new sfMySQLSessionStorage(array(
-  'db_table'   => 'session',
-  'session_id' => $session_id,
-  'database'   => $database)
+$storage = new sfMySQLSessionStorage(
+    array(
+        'db_table' => 'session',
+        'session_id' => $session_id,
+        'database' => $database)
 );
 
 $t->ok($storage instanceof sfStorage, 'sfMySQLSessionStorage is an instance of sfStorage');
@@ -103,41 +101,33 @@
 unset($thisSessData, $result);
 
 // sessionRead()
-try
-{
-  $retrieved_data = $storage->sessionRead($session_id);
-  $t->pass('sessionRead() does not throw an exception');
-}
-catch (Exception $e)
-{
-  $t->fail('sessionRead() does not throw an exception');
+try {
+    $retrieved_data = $storage->sessionRead($session_id);
+    $t->pass('sessionRead() does not throw an exception');
+} catch (Exception $e) {
+    $t->fail('sessionRead() does not throw an exception');
 }
 $t->is($retrieved_data, $newSessionData, 'sessionRead() reads session data');
 
 // sessionWrite()
 $otherSessionData = 'foo:foo:foo';
-try
-{
-  $write = $storage->sessionWrite($session_id, $otherSessionData);
-  $t->pass('sessionWrite() does not throw an exception');
-}
-catch (Exception $e)
-{
-  $t->fail('sessionWrite() does not throw an exception');
+
+try {
+    $write = $storage->sessionWrite($session_id, $otherSessionData);
+    $t->pass('sessionWrite() does not throw an exception');
+} catch (Exception $e) {
+    $t->fail('sessionWrite() does not throw an exception');
 }
 
 $t->ok($write, 'sessionWrite() returns true');
 $t->is($storage->sessionRead($session_id), $otherSessionData, 'sessionWrite() wrote session data');
 
 // sessionDestroy()
-try
-{
-  $storage->sessionDestroy($session_id);
-  $t->pass('sessionDestroy() does not throw an exception');
-}
-catch (Exception $e)
-{
-  $t->fail('sessionDestroy() does not throw an exception');
+try {
+    $storage->sessionDestroy($session_id);
+    $t->pass('sessionDestroy() does not throw an exception');
+} catch (Exception $e) {
+    $t->fail('sessionDestroy() does not throw an exception');
 }
 
 $result = mysql_query(sprintf('SELECT COUNT(sess_id) FROM session WHERE sess_id = "%s"', $session_id), $connection);
diff --git a/test/unit/storage/sfMySQLiStorageTest.php b/test/unit/storage/sfMySQLiStorageTest.php
index ebf0ccba6..062a0f2c2 100644
--- a/test/unit/storage/sfMySQLiStorageTest.php
+++ b/test/unit/storage/sfMySQLiStorageTest.php
@@ -9,44 +9,39 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 ob_start();
 $plan = 12;
 $t = new lime_test($plan);
 
-if (!extension_loaded('mysqli'))
-{
-  $t->skip('Mysqli extension must be loaded', $plan);
+if (!extension_loaded('mysqli')) {
+    $t->skip('Mysqli extension must be loaded', $plan);
 
-  return;
+    return;
 }
 
 // Configure your database with the settings below in order to run the test
 $mysqli_config = array(
-  'host'     => 'localhost',
-  'username' => 'root', 
-  'password' => '', 
-);
+    'host' => 'localhost',
+    'username' => 'root',
+    'password' => '', );
 
-if (!isset($mysqli_config))
-{
-  $t->skip('Mysql credentials needed to run these tests', $plan);
+if (!isset($mysqli_config)) {
+    $t->skip('Mysql credentials needed to run these tests', $plan);
 
-  return;
+    return;
 }
 
-try
-{
-  // Creating mysql database connection
-  $database = new sfMySQLiDatabase($mysqli_config);
-  $connection = $database->getResource();
-}
-catch (sfDatabaseException $e)
-{
-  $t->diag($e->getMessage());
-  $t->skip('Unable to connect to MySQL database, skipping', $plan);
-  return;
+try {
+    // Creating mysql database connection
+    $database = new sfMySQLiDatabase($mysqli_config);
+    $connection = $database->getResource();
+} catch (sfDatabaseException $e) {
+    $t->diag($e->getMessage());
+    $t->skip('Unable to connect to MySQL database, skipping', $plan);
+
+    return;
 }
 
 // Creates test database
@@ -57,16 +52,17 @@
   `sess_id` varchar(40) NOT NULL PRIMARY KEY,
   `sess_time` int(10) unsigned NOT NULL default '0',
   `sess_data` text collate utf8_unicode_ci
-) ENGINE=MyISAM") 
+) ENGINE=MyISAM")
   or $t->fail('Can not create table session');
 
 ini_set('session.use_cookies', 0);
-$session_id = "1";
+$session_id = '1';
 
-$storage = new sfMySQLiSessionStorage(array(
-  'db_table'   => 'session',
-  'session_id' => $session_id,
-  'database'   => $database)
+$storage = new sfMySQLiSessionStorage(
+    array(
+        'db_table' => 'session',
+        'session_id' => $session_id,
+        'database' => $database)
 );
 
 $t->ok($storage instanceof sfStorage, 'sfMySQLSessionStorage is an instance of sfStorage');
@@ -96,42 +92,34 @@
 unset($thisSessData, $result);
 
 // sessionRead()
-try
-{
-  $retrieved_data = $storage->sessionRead($session_id);
-  $t->pass('sessionRead() does not throw an exception');
-}
-catch (Exception $e)
-{
-  $t->fail('sessionRead() does not throw an exception');
+try {
+    $retrieved_data = $storage->sessionRead($session_id);
+    $t->pass('sessionRead() does not throw an exception');
+} catch (Exception $e) {
+    $t->fail('sessionRead() does not throw an exception');
 }
 $t->is($retrieved_data, $session_data, 'sessionRead() reads session data');
 
 // sessionWrite()
 $_SESSION['baz'] = 'woo';
 $session_data = session_encode();
-try
-{
-  $write = $storage->sessionWrite($session_id, $session_data);
-  $t->pass('sessionWrite() does not throw an exception');
-}
-catch (Exception $e)
-{
-  $t->fail('sessionWrite() does not throw an exception');
+
+try {
+    $write = $storage->sessionWrite($session_id, $session_data);
+    $t->pass('sessionWrite() does not throw an exception');
+} catch (Exception $e) {
+    $t->fail('sessionWrite() does not throw an exception');
 }
 
 $t->ok($write, 'sessionWrite() returns true');
 $t->is($storage->sessionRead($session_id), $session_data, 'sessionWrite() wrote session data');
 
 // sessionDestroy()
-try
-{
-  $storage->sessionDestroy($session_id);
-  $t->pass('sessionDestroy() does not throw an exception');
-}
-catch (Exception $e)
-{
-  $t->fail('sessionDestroy() does not throw an exception');
+try {
+    $storage->sessionDestroy($session_id);
+    $t->pass('sessionDestroy() does not throw an exception');
+} catch (Exception $e) {
+    $t->fail('sessionDestroy() does not throw an exception');
 }
 
 $result = mysqli_query($connection, sprintf('SELECT COUNT(sess_id) FROM session WHERE sess_id = "%s"', $session_id));
diff --git a/test/unit/storage/sfNoStorageTest.php b/test/unit/storage/sfNoStorageTest.php
index 0fcd82f57..300373e48 100644
--- a/test/unit/storage/sfNoStorageTest.php
+++ b/test/unit/storage/sfNoStorageTest.php
@@ -3,12 +3,12 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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 __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(1);
 
diff --git a/test/unit/storage/sfPDOSessionStorageTest.php b/test/unit/storage/sfPDOSessionStorageTest.php
index 4e055d4df..d68b115cc 100644
--- a/test/unit/storage/sfPDOSessionStorageTest.php
+++ b/test/unit/storage/sfPDOSessionStorageTest.php
@@ -3,21 +3,21 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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 __DIR__.'/../../bootstrap/unit.php';
 
 ob_start();
 $plan = 14;
 $t = new lime_test($plan);
 
-if (!extension_loaded('SQLite') && !extension_loaded('pdo_SQLite'))
-{
-  $t->skip('SQLite needed to run these tests', $plan);
-  return;
+if (!extension_loaded('SQLite') && !extension_loaded('pdo_SQLite')) {
+    $t->skip('SQLite needed to run these tests', $plan);
+
+    return;
 }
 
 // initialize the storage
@@ -26,7 +26,7 @@
 $connection->exec('CREATE TABLE session (sess_id, sess_data, sess_time)');
 
 ini_set('session.use_cookies', 0);
-$session_id = "1";
+$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');
@@ -55,52 +55,41 @@
 $session_id = session_id();
 
 // sessionRead()
-try
-{
-  $retrieved_data = $storage->sessionRead($session_id);
-  $t->pass('sessionRead() does not throw an exception');
-}
-catch (Exception $e)
-{
-  $t->fail('sessionRead() does not throw an exception');
+try {
+    $retrieved_data = $storage->sessionRead($session_id);
+    $t->pass('sessionRead() does not throw an exception');
+} catch (Exception $e) {
+    $t->fail('sessionRead() does not throw an exception');
 }
 $t->is($retrieved_data, $newSessionData, 'sessionRead() reads session data');
 
 // sessionWrite()
 $otherSessionData = 'foo:foo:foo';
-try
-{
-  $write = $storage->sessionWrite($session_id, $otherSessionData);
-  $t->pass('sessionWrite() does not throw an exception');
-}
-catch (Exception $e)
-{
-  $t->fail('sessionWrite() does not throw an exception');
+
+try {
+    $write = $storage->sessionWrite($session_id, $otherSessionData);
+    $t->pass('sessionWrite() does not throw an exception');
+} catch (Exception $e) {
+    $t->fail('sessionWrite() does not throw an exception');
 }
 
 $t->ok($write, 'sessionWrite() returns true');
 $t->is($storage->sessionRead($session_id), $otherSessionData, 'sessionWrite() wrote session data');
 
 // sessionGC()
-try
-{
-  $storage->sessionGC(0);
-  $t->pass('sessionGC() does not throw an exception');
-}
-catch (Exception $e)
-{
-  $t->fail('sessionGC() does not throw an exception');
+try {
+    $storage->sessionGC(0);
+    $t->pass('sessionGC() does not throw an exception');
+} catch (Exception $e) {
+    $t->fail('sessionGC() does not throw an exception');
 }
 
 // destroy the session
-try
-{
-  $storage->sessionDestroy($session_id);
-  $t->pass('sessionDestroy() does not throw an exception');
-}
-catch (Exception $e)
-{
-  $t->fail('sessionClose() does not throw an exception');
+try {
+    $storage->sessionDestroy($session_id);
+    $t->pass('sessionDestroy() does not throw an exception');
+} 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));
 $data = $result->fetchAll();
diff --git a/test/unit/storage/sfSessionStorageTest.php b/test/unit/storage/sfSessionStorageTest.php
index 2349ee02b..1a54e0091 100644
--- a/test/unit/storage/sfSessionStorageTest.php
+++ b/test/unit/storage/sfSessionStorageTest.php
@@ -10,30 +10,27 @@
 
 $app = 'frontend';
 
-require_once(__DIR__.'/../../bootstrap/functional.php');
+require_once __DIR__.'/../../bootstrap/functional.php';
 
 ob_start();
 
 $_test_dir = realpath(__DIR__.'/../../');
-require_once($_test_dir.'/../lib/vendor/lime/lime.php');
+
+require_once $_test_dir.'/../lib/vendor/lime/lime.php';
 
 sfConfig::set('sf_symfony_lib_dir', realpath($_test_dir.'/../lib'));
 
 $t = new lime_test(8);
 
 // initialize the storage
-try
-{
-  $storage = new sfSessionStorage();
-  $t->pass('->__construct() does not throw an exception when not provided with options');
-  $storage->shutdown();
-}
-catch (InvalidArgumentException $e)
-{
-  $t->fail('->__construct() Startup failure');
+try {
+    $storage = new sfSessionStorage();
+    $t->pass('->__construct() does not throw an exception when not provided with options');
+    $storage->shutdown();
+} catch (InvalidArgumentException $e) {
+    $t->fail('->__construct() Startup failure');
 }
 
-
 $storage = new sfSessionStorage();
 $t->ok($storage instanceof sfStorage, '->__construct() is an instance of sfStorage');
 
diff --git a/test/unit/storage/sfStorageTest.php b/test/unit/storage/sfStorageTest.php
index ab8a1dd63..6ba8fcec1 100644
--- a/test/unit/storage/sfStorageTest.php
+++ b/test/unit/storage/sfStorageTest.php
@@ -3,22 +3,36 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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 __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(0);
 
 class myStorage extends sfStorage
 {
-  public function read($key) {}
-  public function remove($key) {}
-  public function shutdown() {}
-  public function write($key, $data) {}
-  public function regenerate($destroy = false) {}
+    public function read($key)
+    {
+    }
+
+    public function remove($key)
+    {
+    }
+
+    public function shutdown()
+    {
+    }
+
+    public function write($key, $data)
+    {
+    }
+
+    public function regenerate($destroy = false)
+    {
+    }
 }
 
 class fakeStorage
diff --git a/test/unit/task/cache/sfCacheClearTaskTest.php b/test/unit/task/cache/sfCacheClearTaskTest.php
index 6f4a7c370..5f82e6545 100644
--- a/test/unit/task/cache/sfCacheClearTaskTest.php
+++ b/test/unit/task/cache/sfCacheClearTaskTest.php
@@ -3,12 +3,12 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../../bootstrap/task.php');
+require_once __DIR__.'/../../../bootstrap/task.php';
 
 $t = new lime_test(2);
 
diff --git a/test/unit/task/sfBaseTaskTest.php b/test/unit/task/sfBaseTaskTest.php
index 7a070e3fc..7da390a11 100644
--- a/test/unit/task/sfBaseTaskTest.php
+++ b/test/unit/task/sfBaseTaskTest.php
@@ -3,35 +3,37 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.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';
+
 require_once sfConfig::get('sf_symfony_lib_dir').'/vendor/lime/lime.php';
 
 class TestTask extends sfBaseTask
 {
-  protected function execute($arguments = array(), $options = array())
-  {
-  }
-
-  public function reloadAutoload()
-  {
-    parent::reloadAutoload();
-  }
-
-  public function initializeAutoload(sfProjectConfiguration $configuration, $reload = false)
-  {
-    parent::initializeAutoload($configuration, $reload);
-  }
+    public function reloadAutoload()
+    {
+        parent::reloadAutoload();
+    }
+
+    public function initializeAutoload(sfProjectConfiguration $configuration, $reload = false)
+    {
+        parent::initializeAutoload($configuration, $reload);
+    }
+
+    protected function execute($arguments = array(), $options = array())
+    {
+    }
 }
 
 $rootDir = __DIR__.'/../../functional/fixtures';
 sfToolkit::clearDirectory($rootDir.'/cache');
 
 $dispatcher = new sfEventDispatcher();
+
 require_once $rootDir.'/config/ProjectConfiguration.class.php';
 $configuration = new ProjectConfiguration($rootDir, $dispatcher);
 $autoload = sfSimpleAutoload::getInstance();
@@ -58,60 +60,55 @@ public function initializeAutoload(sfProjectConfiguration $configuration, $reloa
 
 class ApplicationTask extends sfBaseTask
 {
-  protected function configure()
-  {
-    $this->addOption('application', null, sfCommandOption::PARAMETER_REQUIRED, '', true);
-  }
-
-  protected function execute($arguments = array(), $options = array())
-  {
-    if (!$this->configuration instanceof sfApplicationConfiguration)
+    public function getServiceContainer()
+    {
+        return parent::getServiceContainer();
+    }
+
+    public function getRouting()
+    {
+        return parent::getRouting();
+    }
+
+    public function getMailer()
+    {
+        return parent::getMailer();
+    }
+
+    protected function configure()
     {
-      throw new Exception('This task requires an application configuration be loaded.');
+        $this->addOption('application', null, sfCommandOption::PARAMETER_REQUIRED, '', true);
+    }
+
+    protected function execute($arguments = array(), $options = array())
+    {
+        if (!$this->configuration instanceof sfApplicationConfiguration) {
+            throw new Exception('This task requires an application configuration be loaded.');
+        }
     }
-  }
-
-  public function getServiceContainer()
-  {
-    return parent::getServiceContainer();
-  }
-
-  public function getRouting()
-  {
-    return parent::getRouting();
-  }
-
-  public function getMailer()
-  {
-    return parent::getMailer();
-  }
 }
 
 chdir($rootDir);
 
 $task = new ApplicationTask($dispatcher, new sfFormatter());
-try
-{
-  $task->run();
-  $t->pass('->run() creates an application configuration if none is set');
-}
-catch (Exception $e)
-{
-  $t->diag($e->getMessage());
-  $t->fail('->run() creates an application configuration if none is set');
+
+try {
+    $task->run();
+    $t->pass('->run() creates an application configuration if none is set');
+} 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->setConfiguration($configuration);
-try
-{
-  $task->run();
-  $t->pass('->run() creates an application configuration if only a project configuration is set');
-}
-catch (Exception $e)
-{
-  $t->diag($e->getMessage());
-  $t->fail('->run() creates an application configuration if only a project configuration is set');
+
+try {
+    $task->run();
+    $t->pass('->run() creates an application configuration if only a project configuration is set');
+} catch (Exception $e) {
+    $t->diag($e->getMessage());
+    $t->fail('->run() creates an application configuration if only a project configuration is set');
 }
 
 // ->getServiceContainer()
diff --git a/test/unit/task/sfFilesystemTest.php b/test/unit/task/sfFilesystemTest.php
index 538d21580..0d930cc03 100644
--- a/test/unit/task/sfFilesystemTest.php
+++ b/test/unit/task/sfFilesystemTest.php
@@ -7,21 +7,22 @@
  * 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 __DIR__.'/../../bootstrap/unit.php';
 
-//lazy constant, cause it is so often used in this test
-define("DS", DIRECTORY_SEPARATOR);
+// lazy constant, cause it is so often used in this test
+define('DS', DIRECTORY_SEPARATOR);
 
 class myFilesystem extends sfFilesystem
 {
-  public function calculateRelativeDir($from, $to)
-  {
-    return parent::calculateRelativeDir($from, $to);
-  }
-  public function canonicalizePath($path)
-  {
-    return parent::canonicalizePath($path);
-  }
+    public function calculateRelativeDir($from, $to)
+    {
+        return parent::calculateRelativeDir($from, $to);
+    }
+
+    public function canonicalizePath($path)
+    {
+        return parent::canonicalizePath($path);
+    }
 }
 
 $t = new lime_test(8);
@@ -62,4 +63,3 @@ public function canonicalizePath($path)
 $source = $common.'..'.DS.'web'.DS.'myplugin';
 $target = $common.'lib'.DS.'vendor'.DS.'symfony'.DS.'plugins'.DS.'myplugin'.DS.'web';
 $t->is($filesystem->calculateRelativeDir($source, $target), '..'.DS.'sfproject'.DS.'lib'.DS.'vendor'.DS.'symfony'.DS.'plugins'.DS.'myplugin'.DS.'web', '->calculateRelativeDir() correctly calculates the relative path for dirs that share chars');
-
diff --git a/test/unit/task/sfTaskTest.php b/test/unit/task/sfTaskTest.php
index 29cd0a9ba..f6da65a22 100644
--- a/test/unit/task/sfTaskTest.php
+++ b/test/unit/task/sfTaskTest.php
@@ -13,21 +13,20 @@
 
 abstract class BaseTestTask extends sfTask
 {
-  public
-    $lastArguments = array(),
-    $lastOptions   = array();
-
-  public function __construct()
-  {
-    // lazy constructor
-    parent::__construct(new sfEventDispatcher(), new sfFormatter());
-  }
-
-  protected function execute($arguments = array(), $options = array())
-  {
-    $this->lastArguments = $arguments;
-    $this->lastOptions = $options;
-  }
+    public $lastArguments = array();
+    public $lastOptions = array();
+
+    public function __construct()
+    {
+        // lazy constructor
+        parent::__construct(new sfEventDispatcher(), new sfFormatter());
+    }
+
+    protected function execute($arguments = array(), $options = array())
+    {
+        $this->lastArguments = $arguments;
+        $this->lastOptions = $options;
+    }
 }
 
 // ->run()
@@ -35,13 +34,13 @@ protected function execute($arguments = array(), $options = array())
 
 class ArgumentsTest1Task extends BaseTestTask
 {
-  protected function configure()
-  {
-    $this->addArguments(array(
-      new sfCommandArgument('foo', sfCommandArgument::REQUIRED),
-      new sfCommandArgument('bar', sfCommandArgument::OPTIONAL),
-    ));
-  }
+    protected function configure()
+    {
+        $this->addArguments(array(
+            new sfCommandArgument('foo', sfCommandArgument::REQUIRED),
+            new sfCommandArgument('bar', sfCommandArgument::OPTIONAL),
+        ));
+    }
 }
 
 $task = new ArgumentsTest1Task();
@@ -65,12 +64,12 @@ protected function configure()
 
 class ArgumentsTest2Task extends BaseTestTask
 {
-  protected function configure()
-  {
-    $this->addArguments(array(
-      new sfCommandArgument('foo', sfCommandArgument::OPTIONAL | sfCommandArgument::IS_ARRAY),
-    ));
-  }
+    protected function configure()
+    {
+        $this->addArguments(array(
+            new sfCommandArgument('foo', sfCommandArgument::OPTIONAL | sfCommandArgument::IS_ARRAY),
+        ));
+    }
 }
 
 $task = new ArgumentsTest2Task();
@@ -82,15 +81,15 @@ protected function configure()
 
 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),
-    ));
-  }
+    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),
+        ));
+    }
 }
 
 $task = new OptionsTest1Task();
@@ -120,13 +119,13 @@ protected function configure()
 
 class DetailedDescriptionTestTask extends BaseTestTask
 {
-  protected function configure()
-  {
-    $this->detailedDescription = <<<EOF
+    protected function configure()
+    {
+        $this->detailedDescription = <<<'EOF'
 The [detailedDescription|INFO] formats special string like [...|COMMENT] or [--xml|COMMENT]
 EOF;
-  }
+    }
 }
 
 $task = new DetailedDescriptionTestTask();
-$t->is($task->getDetailedDescription(), "The detailedDescription formats special string like ... or --xml", "->getDetailedDescription() formats special string");
+$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 d8b2cb6ff..c3e641016 100644
--- a/test/unit/test/limeTestTest.php
+++ b/test/unit/test/limeTestTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(28);
 
diff --git a/test/unit/test/sfTestFunctionalTest.php b/test/unit/test/sfTestFunctionalTest.php
index 667f28d06..509f97182 100644
--- a/test/unit/test/sfTestFunctionalTest.php
+++ b/test/unit/test/sfTestFunctionalTest.php
@@ -8,39 +8,39 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(2);
 
 class mockBrowser extends sfBrowser
 {
-  public function setResponseContent($content)
-  {
-    $this->dom = new DomDocument('1.0');
-    $this->dom->validateOnParse = true;
-    @$this->dom->loadHTML($content);
-    $this->domCssSelector = new sfDomCssSelector($this->dom);
-  }
+    public function setResponseContent($content)
+    {
+        $this->dom = new DOMDocument('1.0');
+        $this->dom->validateOnParse = true;
+        @$this->dom->loadHTML($content);
+        $this->domCssSelector = new sfDomCssSelector($this->dom);
+    }
 }
 
 class mockLime extends lime_test
 {
-  public function __destruct()
-  {
-  }
+    public function __destruct()
+    {
+    }
 }
 
 class mockTestFunctional extends sfTestFunctional
 {
-  public $called = array();
+    public $called = array();
 
-  public function call($uri, $method = 'get', $parameters = array(), $changeStack = true)
-  {
-    $this->called[] = func_get_args();
-  }
+    public function call($uri, $method = 'get', $parameters = array(), $changeStack = true)
+    {
+        $this->called[] = func_get_args();
+    }
 }
 
-$html = <<<HTML
+$html = <<<'HTML'
 <html>
 <head>
 </head>
@@ -56,15 +56,12 @@ public function call($uri, $method = 'get', $parameters = array(), $changeStack
 $lime = new mockLime();
 $tester = new mockTestFunctional($browser, $lime);
 
-try
-{
-  $tester->click('a.clickme');
-  $t->pass('->click() accepts a CSS selector');
-}
-catch (Exception $e)
-{
-  $t->diag($e->getMessage());
-  $t->fail('->click() accepts a CSS selector');
+try {
+    $tester->click('a.clickme');
+    $t->pass('->click() accepts a CSS selector');
+} 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');
diff --git a/test/unit/user/sfBasicSecurityUserTest.php b/test/unit/user/sfBasicSecurityUserTest.php
index 5535076a6..d7e74ccb9 100644
--- a/test/unit/user/sfBasicSecurityUserTest.php
+++ b/test/unit/user/sfBasicSecurityUserTest.php
@@ -3,23 +3,23 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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 __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(47);
 
 class MySessionStorage extends sfSessionTestStorage
 {
-  public function regenerate($destroy = false)
-  {
-    $this->sessionId = rand(1, 9999);
+    public function regenerate($destroy = false)
+    {
+        $this->sessionId = rand(1, 9999);
 
-    return true;
-  }
+        return true;
+    }
 }
 
 $dispatcher = new sfEventDispatcher();
diff --git a/test/unit/user/sfUserTest.php b/test/unit/user/sfUserTest.php
index 23cea5bd9..2fe116d25 100644
--- a/test/unit/user/sfUserTest.php
+++ b/test/unit/user/sfUserTest.php
@@ -3,12 +3,12 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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 __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(32);
 
@@ -77,12 +77,12 @@
 $user = new sfUser($dispatcher, $storage);
 
 // attribute holder proxy
-require_once($_test_dir.'/unit/sfParameterHolderTest.class.php');
+require_once $_test_dir.'/unit/sfParameterHolderTest.class.php';
 $pht = new sfParameterHolderProxyTest($t);
 $pht->launchTests($user, 'attribute');
 
 // new methods via sfEventDispatcher
-require_once($_test_dir.'/unit/sfEventDispatcherTest.class.php');
+require_once $_test_dir.'/unit/sfEventDispatcherTest.class.php';
 $dispatcherTest = new sfEventDispatcherTest($t);
 $dispatcherTest->launchTests($dispatcher, $user, 'user');
 
@@ -90,11 +90,11 @@
 
 function user_flush($dispatcher, $user, $storage, $options = array())
 {
-  $user->shutdown();
-  $user->initialize($dispatcher, $storage, $options);
-  $parameters = $storage->getOptions();
-  $storage->shutdown();
-  $storage->initialize($parameters);
+    $user->shutdown();
+    $user->initialize($dispatcher, $storage, $options);
+    $parameters = $storage->getOptions();
+    $storage->shutdown();
+    $storage->initialize($parameters);
 }
 
 sfToolkit::clearDirectory($sessionPath);
diff --git a/test/unit/util/sfBrowserTest.php b/test/unit/util/sfBrowserTest.php
index 7166e2c2b..a3b1ef50f 100755
--- a/test/unit/util/sfBrowserTest.php
+++ b/test/unit/util/sfBrowserTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(76);
 
@@ -17,38 +17,38 @@
 
 class myClickBrowser extends sfBrowser
 {
-  public function setHtml($html)
-  {
-    $this->dom = new DomDocument('1.0', 'UTF-8');
-    $this->dom->validateOnParse = true;
-    $this->dom->loadHTML($html);
-    $this->domCssSelector = new sfDomCssSelector($this->dom);
-  }
-
-  public function getFiles()
-  {
-    $f = $this->files;
-    $this->files = array();
-
-    return $f;
-  }
-
-  public function call($uri, $method = 'get', $parameters = array(), $changeStack = true)
-  {
-    $uri = $this->fixUri($uri);
-
-    $this->fields = array();
-
-    return array($method, $uri, $parameters);
-  }
-
-  public function getDefaultServerArray($name)
-  {
-    return isset($this->defaultServerArray[$name]) ? $this->defaultServerArray[$name] : false;
-  }
+    public function setHtml($html)
+    {
+        $this->dom = new DOMDocument('1.0', 'UTF-8');
+        $this->dom->validateOnParse = true;
+        $this->dom->loadHTML($html);
+        $this->domCssSelector = new sfDomCssSelector($this->dom);
+    }
+
+    public function getFiles()
+    {
+        $f = $this->files;
+        $this->files = array();
+
+        return $f;
+    }
+
+    public function call($uri, $method = 'get', $parameters = array(), $changeStack = true)
+    {
+        $uri = $this->fixUri($uri);
+
+        $this->fields = array();
+
+        return array($method, $uri, $parameters);
+    }
+
+    public function getDefaultServerArray($name)
+    {
+        return isset($this->defaultServerArray[$name]) ? $this->defaultServerArray[$name] : false;
+    }
 }
 
-$html = <<<EOF
+$html = <<<'EOF'
 <html>
   <body>
     <a href="/mylink" id="clickable-link" class="one-of-many-clickable-links">test link</a>
@@ -150,24 +150,18 @@ public function getDefaultServerArray($name)
 $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)
-{
-  $t->pass('->click() throws an error if the name does not exist');
+try {
+    $b->click('nonexistantname');
+    $t->fail('->click() throws an error if the name does not exist');
+} 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)
-{
-  $t->fail('->click() clicks on button links');
+try {
+    list($method, $uri, $parameters) = $b->click('submit5');
+    $t->pass('->click() clicks on button links');
+} catch (Exception $e) {
+    $t->fail('->click() clicks on button links');
 }
 
 list($method, $uri, $parameters) = $b->click('test link');
@@ -225,16 +219,16 @@ public function getDefaultServerArray($name)
 $t->is($uri, '/myform4?submit_image=image', '->click() can click on image button in forms');
 
 list($method, $uri, $parameters) = $b->click('submit', array(
-  'text_default_value' => 'myvalue',
-  'text' => 'myothervalue',
-  'textarea' => 'mycontent',
-  'select' => 'last',
-  'select_multiple' => array('first', 'selected', 'last'),
-  'article' => array(
-    'title' => 'mytitle',
-    'category' => array(1, 2, 3),
-    'or' => array('much' => array('longer' => 'long')),
-  ),
+    'text_default_value' => 'myvalue',
+    'text' => 'myothervalue',
+    'textarea' => 'mycontent',
+    'select' => 'last',
+    'select_multiple' => array('first', 'selected', 'last'),
+    'article' => array(
+        'title' => 'mytitle',
+        'category' => array(1, 2, 3),
+        'or' => array('much' => array('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');
@@ -260,14 +254,11 @@ public function getDefaultServerArray($name)
 $t->is($method, 'post', '->click() accepts a CSS selector for a submit input');
 $t->is($uri, '/myform', '->click() accepts a CSS selector for a submit input');
 
-try
-{
-  $b->click('#orphaned-input-submit');
-  $t->fail('->click() throws an error if a submit is clicked outside a form');
-}
-catch (Exception $e)
-{
-  $t->pass('->click() throws an error if a submit is clicked outside a form');
+try {
+    $b->click('#orphaned-input-submit');
+    $t->fail('->click() throws an error if a submit is clicked outside a form');
+} catch (Exception $e) {
+    $t->pass('->click() throws an error if a submit is clicked outside a form');
 }
 
 // ->setField()
@@ -311,14 +302,11 @@ public function getDefaultServerArray($name)
 ;
 $t->is($parameters['radio1'], 'a', '->select() toggles radiobuttons');
 
-try
-{
-  $b->deselect('b-radio');
-  $t->fail('->deselect() cannot deselect radiobuttons');
-}
-catch(Exception $e)
-{
-  $t->pass('->deselect() cannot deselect radiobuttons');
+try {
+    $b->deselect('b-radio');
+    $t->fail('->deselect() cannot deselect radiobuttons');
+} catch (Exception $e) {
+    $t->pass('->deselect() cannot deselect radiobuttons');
 }
 
 list($method, $uri, $parameters) = $b->click('li:contains("first") a');
@@ -335,16 +323,16 @@ 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', array('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(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($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));
diff --git a/test/unit/util/sfCallableTest.php b/test/unit/util/sfCallableTest.php
index 450fee011..36594c8b1 100644
--- a/test/unit/util/sfCallableTest.php
+++ b/test/unit/util/sfCallableTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(5);
 
@@ -19,15 +19,15 @@
 
 class TrimTest
 {
-  static public function trimStatic($text)
-  {
-    return trim($text);
-  }
-
-  public function trim($text)
-  {
-    return trim($text);
-  }
+    public static function trimStatic($text)
+    {
+        return trim($text);
+    }
+
+    public function trim($text)
+    {
+        return trim($text);
+    }
 }
 
 $c = new sfCallable(array('TrimTest', 'trimStatic'));
@@ -37,14 +37,12 @@ public function trim($text)
 $t->is($c->call('  foo  '), 'foo', '->call() calls the callable with the given arguments');
 
 $c = new sfCallable('nonexistantcallable');
-try
-{
-  $c->call();
-  $t->fail('->call() throws an sfException if the callable is not valid');
-}
-catch (sfException $e)
-{
-  $t->pass('->call() throws an sfException if the callable is not valid');
+
+try {
+    $c->call();
+    $t->fail('->call() throws an sfException if the callable is not valid');
+} catch (sfException $e) {
+    $t->pass('->call() throws an sfException if the callable is not valid');
 }
 
 // ->getCallable()
diff --git a/test/unit/util/sfClassManipulatorTest.php b/test/unit/util/sfClassManipulatorTest.php
index b3c25af8b..8111118ec 100644
--- a/test/unit/util/sfClassManipulatorTest.php
+++ b/test/unit/util/sfClassManipulatorTest.php
@@ -8,11 +8,11 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(18);
 
-$source = <<<EOF
+$source = <<<'EOF'
 <?php
 
 class Foo
@@ -35,7 +35,7 @@ function baz()
 }
 EOF;
 
-$sourceWithCodeBefore = <<<EOF
+$sourceWithCodeBefore = <<<'EOF'
 <?php
 
 class Foo
@@ -59,7 +59,7 @@ function baz()
 }
 EOF;
 
-$sourceWithCodeAfter = <<<EOF
+$sourceWithCodeAfter = <<<'EOF'
 <?php
 
 class Foo
@@ -83,7 +83,7 @@ function baz()
 }
 EOF;
 
-$sourceWithCodeBeforeAndAfter = <<<EOF
+$sourceWithCodeBeforeAndAfter = <<<'EOF'
 <?php
 
 class Foo
@@ -152,33 +152,34 @@ function baz()
 
 class MethodFilterer
 {
-  public $lines = array();
+    public $lines = array();
 
-  public function filter1($line)
-  {
-    $this->lines[] = $line;
-    return $line;
-  }
+    public function filter1($line)
+    {
+        $this->lines[] = $line;
 
-  public function filter2($line)
-  {
-    return str_replace(array(
-      'if (true)',
-      'function foo()',
-    ), array(
-      'if (false)',
-      'function foo($arg)',
-    ), $line);
-  }
+        return $line;
+    }
+
+    public function filter2($line)
+    {
+        return str_replace(array(
+            'if (true)',
+            'function foo()',
+        ), array(
+            'if (false)',
+            'function foo($arg)',
+        ), $line);
+    }
 }
 $f = new MethodFilterer();
 
-$sourceFiltered = <<<EOF
+$sourceFiltered = <<<'EOF'
 <?php
 
 class Foo
 {
-  function foo(\$arg)
+  function foo($arg)
   {
     if (false)
     {
@@ -213,13 +214,13 @@ function baz()
 $m->filterMethod('foo', array($f, 'filter1'));
 $t->is($m->getCode(), $sourceCRLF, '->filterMethod() does not change the code if the filter does nothing');
 $t->is_deeply($f->lines, array(
-  "  function foo()\r\n",
-  "  {\r\n",
-  "    if (true)\r\n",
-  "    {\r\n",
-  "      return;\r\n",
-  "    }\r\n",
-  "  }",
+    "  function foo()\r\n",
+    "  {\r\n",
+    "    if (true)\r\n",
+    "    {\r\n",
+    "      return;\r\n",
+    "    }\r\n",
+    '  }',
 ), '->filterMethod() filters each line of the method');
 $m->filterMethod('foo', array($f, 'filter2'));
 $t->is($m->getCode(), $sourceFilteredCRLF, '->filterMethod() modifies the method');
@@ -232,13 +233,13 @@ function baz()
 $m->filterMethod('foo', array($f, 'filter1'));
 $t->is($m->getCode(), $sourceLF, '->filterMethod() does not change the code if the filter does nothing');
 $t->is_deeply($f->lines, array(
-  "  function foo()\n",
-  "  {\n",
-  "    if (true)\n",
-  "    {\n",
-  "      return;\n",
-  "    }\n",
-  "  }",
+    "  function foo()\n",
+    "  {\n",
+    "    if (true)\n",
+    "    {\n",
+    "      return;\n",
+    "    }\n",
+    '  }',
 ), '->filterMethod() filters each line of the method');
 $m->filterMethod('foo', array($f, 'filter2'));
 $t->is($m->getCode(), $sourceFilteredLF, '->filterMethod() modifies the method');
@@ -261,11 +262,11 @@ function baz()
 $f->lines = array();
 $m->filterMethod('foo', array($f, 'filter1'));
 $t->is_deeply($f->lines, array(
-  "  function foo()\r\n",
-  "  {\n",
-  "    if (true)\r\n",
-  "    {\n",
-  "      return;\r\n",
-  "    }\n",
-  "  }",
+    "  function foo()\r\n",
+    "  {\n",
+    "    if (true)\r\n",
+    "    {\n",
+    "      return;\r\n",
+    "    }\n",
+    '  }',
 ), '->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 3737a0bee..27746aac1 100644
--- a/test/unit/util/sfContextTest.php
+++ b/test/unit/util/sfContextTest.php
@@ -8,15 +8,15 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(29);
 
 class myContext extends sfContext
 {
-  public function initialize(sfApplicationConfiguration $configuration)
-  {
-  }
+    public function initialize(sfApplicationConfiguration $configuration)
+    {
+    }
 }
 
 /*
@@ -64,14 +64,12 @@ class frontendConfiguration extends sfApplicationConfiguration
 $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');
-try
-{
-  $context1->get('object1');
-  $t->fail('->get() throws an sfException if no object is stored for the given name');
-}
-catch (sfException $e)
-{
-  $t->pass('->get() throws an sfException if no object is stored for the given name');
+
+try {
+    $context1->get('object1');
+    $t->fail('->get() throws an sfException if no object is stored for the given name');
+} catch (sfException $e) {
+    $t->pass('->get() throws an sfException if no object is stored for the given name');
 }
 
 $context['foo'] = $frontend_context;
@@ -92,14 +90,11 @@ class frontendConfiguration extends sfApplicationConfiguration
 $t->is($context->has('foo4'), true, '->__call() sets context objects by name using setName()');
 $t->isa_ok($context->getFoo4(), 'sfContext', '->__call() returns context objects by name using getName()');
 
-try
-{
-  $context->unknown();
-  $t->fail('->__call() throws an sfException if factory / method does not exist');
-}
-catch (sfException $e)
-{
-  $t->pass('->__call() throws an sfException if factory / method does not exist');
+try {
+    $context->unknown();
+    $t->fail('->__call() throws an sfException if factory / method does not exist');
+} catch (sfException $e) {
+    $t->pass('->__call() throws an sfException if factory / method does not exist');
 }
 
 $t->diag('->getServiceContainer() test');
diff --git a/test/unit/util/sfDomCssSelectorTest.php b/test/unit/util/sfDomCssSelectorTest.php
index c742c7f38..c307b3de8 100644
--- a/test/unit/util/sfDomCssSelectorTest.php
+++ b/test/unit/util/sfDomCssSelectorTest.php
@@ -8,11 +8,11 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(72);
 
-$html = <<<EOF
+$html = <<<'EOF'
 <html>
   <head>
   </head>
@@ -78,7 +78,7 @@
 </html>
 EOF;
 
-$dom = new DomDocument('1.0', 'utf-8');
+$dom = new DOMDocument('1.0', 'utf-8');
 $dom->validateOnParse = true;
 $dom->loadHTML($html);
 
@@ -188,19 +188,21 @@
 
 // Iterator interface
 $t->diag('Iterator interface');
-foreach ($c->matchAll('h2') as $key => $value)
-{
-  switch ($key)
-  {
-    case 0:
-      $t->is($value->nodeValue, 'Title 1', 'The object is an iterator');
-      break;
-    case 1:
-      $t->is($value->nodeValue, 'Title 2', 'The object is an iterator');
-      break;
-    default:
-      $t->fail('The object is an iterator');
-  }
+foreach ($c->matchAll('h2') as $key => $value) {
+    switch ($key) {
+        case 0:
+            $t->is($value->nodeValue, 'Title 1', 'The object is an iterator');
+
+            break;
+
+        case 1:
+            $t->is($value->nodeValue, 'Title 2', 'The object is an iterator');
+
+            break;
+
+        default:
+            $t->fail('The object is an iterator');
+    }
 }
 
 // Countable interface
diff --git a/test/unit/util/sfFinderTest.php b/test/unit/util/sfFinderTest.php
index 22e247ed7..82119f99e 100644
--- a/test/unit/util/sfFinderTest.php
+++ b/test/unit/util/sfFinderTest.php
@@ -8,92 +8,92 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 class my_lime_test extends lime_test
 {
-  public function arrays_are_equal($a, $b, $message)
-  {
-    sort($a);
-    sort($b);
+    public function arrays_are_equal($a, $b, $message)
+    {
+        sort($a);
+        sort($b);
 
-    return $this->is($a, $b, $message);
-  }
+        return $this->is($a, $b, $message);
+    }
 }
 $t = new my_lime_test(39);
 
-require_once($_test_dir.'/../lib/util/sfFinder.class.php');
+require_once $_test_dir.'/../lib/util/sfFinder.class.php';
 
 $fixtureDir = __DIR__.'/fixtures/finder';
 $phpFiles = array(
-  'dir1/dir2/file21.php',
-  'dir1/file12.php',
+    'dir1/dir2/file21.php',
+    'dir1/file12.php',
 );
 $txtFiles = array(
-  'FILE5.txt',
-  'file2.txt',
+    'FILE5.txt',
+    'file2.txt',
 );
 $regexpFiles = array(
-  'dir1/dir2/file21.php',
-  'dir1/dir2/file22',
-  'dir1/dir2/file23',
-  'dir1/dir2/file24',
-  'file2.txt',
+    'dir1/dir2/file21.php',
+    'dir1/dir2/file22',
+    'dir1/dir2/file23',
+    'dir1/dir2/file24',
+    'file2.txt',
 );
 $regexpWithModifierFiles = array(
-  'dir1/dir2/file21.php',
-  'dir1/dir2/file22',
-  'dir1/dir2/file23',
-  'dir1/dir2/file24',
-  'FILE5.txt',
-  'file2.txt',
+    'dir1/dir2/file21.php',
+    'dir1/dir2/file22',
+    'dir1/dir2/file23',
+    'dir1/dir2/file24',
+    'FILE5.txt',
+    'file2.txt',
 );
 $allFiles = array(
-  'dir1/dir2/dir3/file31',
-  'dir1/dir2/dir4/file41',
-  'dir1/dir2/file21.php',
-  'dir1/dir2/file22',
-  'dir1/dir2/file23',
-  'dir1/dir2/file24',
-  'dir1/file11',
-  'dir1/file12.php',
-  'dir1/file13',
-  'file1',
-  'FILE5.txt',
-  'file2.txt',
+    'dir1/dir2/dir3/file31',
+    'dir1/dir2/dir4/file41',
+    'dir1/dir2/file21.php',
+    'dir1/dir2/file22',
+    'dir1/dir2/file23',
+    'dir1/dir2/file24',
+    'dir1/file11',
+    'dir1/file12.php',
+    'dir1/file13',
+    'file1',
+    'FILE5.txt',
+    'file2.txt',
 );
 $minDepth1Files = array(
-  'dir1/dir2/dir3/file31',
-  'dir1/dir2/dir4/file41',
-  'dir1/dir2/file21.php',
-  'dir1/dir2/file22',
-  'dir1/dir2/file23',
-  'dir1/dir2/file24',
-  'dir1/file11',
-  'dir1/file12.php',
-  'dir1/file13',
+    'dir1/dir2/dir3/file31',
+    'dir1/dir2/dir4/file41',
+    'dir1/dir2/file21.php',
+    'dir1/dir2/file22',
+    'dir1/dir2/file23',
+    'dir1/dir2/file24',
+    'dir1/file11',
+    'dir1/file12.php',
+    'dir1/file13',
 );
 $maxDepth2Files = array(
-  'dir1/dir2/file21.php',
-  'dir1/dir2/file22',
-  'dir1/dir2/file23',
-  'dir1/dir2/file24',
-  'dir1/file11',
-  'dir1/file12.php',
-  'dir1/file13',
-  'file1',
-  'FILE5.txt',
-  'file2.txt',
+    'dir1/dir2/file21.php',
+    'dir1/dir2/file22',
+    'dir1/dir2/file23',
+    'dir1/dir2/file24',
+    'dir1/file11',
+    'dir1/file12.php',
+    'dir1/file13',
+    'file1',
+    'FILE5.txt',
+    'file2.txt',
 );
 $anyWithoutDir2 = array(
-  'dir1',
-  'dir1/dir2',
-  'dir1/file11',
-  'dir1/file12.php',
-  'dir1/file13',
-  'file1',
-  'FILE5.txt',
-  'file2.txt',
+    'dir1',
+    'dir1/dir2',
+    'dir1/file11',
+    'dir1/file12.php',
+    'dir1/file13',
+    'file1',
+    'FILE5.txt',
+    'file2.txt',
 );
 
 // ::type()
diff --git a/test/unit/util/sfInflectorTest.php b/test/unit/util/sfInflectorTest.php
index fb6e01baa..db0e64281 100644
--- a/test/unit/util/sfInflectorTest.php
+++ b/test/unit/util/sfInflectorTest.php
@@ -3,14 +3,16 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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($_test_dir.'/../lib/util/sfToolkit.class.php');
-require_once($_test_dir.'/../lib/util/sfInflector.class.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
+
+require_once $_test_dir.'/../lib/util/sfToolkit.class.php';
+
+require_once $_test_dir.'/../lib/util/sfInflector.class.php';
 
 $t = new lime_test(7);
 
diff --git a/test/unit/util/sfNamespacedParameterHolderTest.php b/test/unit/util/sfNamespacedParameterHolderTest.php
index 6df398bd2..1e9005c81 100644
--- a/test/unit/util/sfNamespacedParameterHolderTest.php
+++ b/test/unit/util/sfNamespacedParameterHolderTest.php
@@ -3,12 +3,12 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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 __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(50);
 
diff --git a/test/unit/util/sfParameterHolderTest.php b/test/unit/util/sfParameterHolderTest.php
index e9b40f982..872b26387 100644
--- a/test/unit/util/sfParameterHolderTest.php
+++ b/test/unit/util/sfParameterHolderTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(28);
 
@@ -33,17 +33,17 @@
 $ph->set('ref', 'foobar');
 
 $ref1 = null;
-$ref1 = & $ph->get('ref');
+$ref1 = &$ph->get('ref');
 $t->is($ref1, 'foobar');
 
 $ref2 = null;
-$ref2 = & $ph->get('ref'); // obtain the very same reference and modify it
+$ref2 = &$ph->get('ref'); // obtain the very same reference and modify it
 $ref2 = 'barfoo';
 
 $t->is($ref1, 'barfoo');
 $t->is($ref2, 'barfoo');
 $t->is($ph->get('ref'), 'barfoo');
-$t->is($ref2 , $ref1, '->get() returns a reference for the given key');
+$t->is($ref2, $ref1, '->get() returns a reference for the given key');
 
 $ph = new sfParameterHolder();
 $t->is('default_value', $ph->get('foo1', 'default_value'), '->get() takes the default value as its second argument');
diff --git a/test/unit/util/sfToolkitTest.php b/test/unit/util/sfToolkitTest.php
index cbf2160f8..e40bfc308 100644
--- a/test/unit/util/sfToolkitTest.php
+++ b/test/unit/util/sfToolkitTest.php
@@ -8,31 +8,30 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(95);
 
 // ::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'),
+    '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'),
 );
 
-foreach ($tests as $string => $attributes)
-{
-  $t->is(sfToolkit::stringToArray($string), $attributes, '->stringToArray()');
+foreach ($tests as $string => $attributes) {
+    $t->is(sfToolkit::stringToArray($string), $attributes, '->stringToArray()');
 }
 
 // ::isUTF8()
@@ -46,34 +45,28 @@
 
 // ::literalize()
 $t->diag('::literalize()');
-foreach (array('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(' '.$param.' '), true, sprintf('::literalize() returns true with "%s"', ' '.$param.' '));
+foreach (array('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(' '.$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));
-  if (strtoupper($param) != $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.' '));
+foreach (array('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(' '.$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));
-  if (strtoupper($param) != $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.' '));
+foreach (array('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(' '.$param.' '), null, sprintf('::literalize() returns null with "%s"', ' '.$param.' '));
 }
 
 // ::replaceConstants()
@@ -100,7 +93,7 @@
 // ::stripComments()
 $t->diag('::stripComments()');
 
-$php = <<<EOF
+$php = <<<'EOF'
 <?php
 
 # A perl like comment
@@ -110,23 +103,22 @@
 on several lines
 */
 
-\$i = 1; // A comment on a PHP line
+$i = 1; // A comment on a PHP line
 EOF;
 
 $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');
 
-$php = <<<EOF
+$php = <<<'EOF'
 <?php
-  \$pluginDirs = '/*/modules/lib/helper';
-  \$pluginDirs = '/*/lib/helper';
+  $pluginDirs = '/*/modules/lib/helper';
+  $pluginDirs = '/*/lib/helper';
 
 EOF;
 
 $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');
@@ -166,38 +158,38 @@
 // ::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'),
-  '::arrayDeepMerge() merges linear arrays preserving literal keys'
+    sfToolkit::arrayDeepMerge(array('d' => 'due', 't' => 'tre'), array('d' => 'bis', 'q' => 'quattro')),
+    array('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')),
-  '::arrayDeepMerge() recursively merges arrays preserving literal keys'
+    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')),
+    '::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'),
-  '::arrayDeepMerge() merges linear arrays preserving numerical keys'
+    sfToolkit::arrayDeepMerge(array(2 => 'due', 3 => 'tre'), array(2 => 'bis', 4 => 'quattro')),
+    array(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'),
-  '::arrayDeepMerge() recursively merges arrays preserving numerical keys'
+    sfToolkit::arrayDeepMerge(array(2 => array('due'), 3 => 'tre'), array(2 => array('bis', 'bes'), 4 => 'quattro')),
+    array(2 => array('bis', 'bes'), 3 => 'tre', 4 => 'quattro'),
+    '::arrayDeepMerge() recursively merges arrays preserving numerical keys'
 );
 
 $arr = array(
-  'foobar' => 'foo',
-  'foo' => array(
+    'foobar' => 'foo',
+    'foo' => array(
+        'bar' => array(
+            'baz' => 'foo bar',
+        ),
+    ),
     'bar' => array(
-      'baz' => 'foo bar',
+        'foo',
+        'bar',
     ),
-  ),
-  'bar' => array(
-    'foo',
-    'bar',
-  ),
-  'simple' => 'string',
+    'simple' => 'string',
 );
 
 // ::getArrayValueForPath()
@@ -232,24 +224,20 @@
 $t->is(get_include_path(), $path.PATH_SEPARATOR.__DIR__, '::addIncludePath() moves a path to the end of include_path');
 
 sfToolkit::addIncludePath(array(
-  __DIR__,
-  __DIR__.'/..',
+    __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(
-  __DIR__,
-  __DIR__.'/..',
+    __DIR__,
+    __DIR__.'/..',
 ), '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');
-  $t->fail('::addIncludePath() throws an exception if position is not valid');
+try {
+    sfToolkit::addIncludePath(__DIR__, 'foobar');
+    $t->fail('::addIncludePath() throws an exception if position is not valid');
+} catch (Exception $e) {
+    $t->pass('::addIncludePath() throws an exception if position is not valid');
 }
-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 8bcd2a3cd..8fed7a0d5 100644
--- a/test/unit/validator/i18n/sfValidatorI18nChoiceCountryTest.php
+++ b/test/unit/validator/i18n/sfValidatorI18nChoiceCountryTest.php
@@ -8,21 +8,18 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../../bootstrap/unit.php');
+require_once __DIR__.'/../../../bootstrap/unit.php';
 
 $t = new lime_test(3);
 
 // ->configure()
 $t->diag('->configure()');
 
-try
-{
-  new sfValidatorI18nChoiceCountry(array('countries' => array('EN')));
-  $t->fail('->configure() throws an InvalidArgumentException if a country does not exist');
-}
-catch (InvalidArgumentException $e)
-{
-  $t->pass('->configure() throws an InvalidArgumentException if a country does not exist');
+try {
+    new sfValidatorI18nChoiceCountry(array('countries' => array('EN')));
+    $t->fail('->configure() throws an InvalidArgumentException if a country does not exist');
+} catch (InvalidArgumentException $e) {
+    $t->pass('->configure() throws an InvalidArgumentException if a country does not exist');
 }
 
 $v = new sfValidatorI18nChoiceCountry(array('countries' => array('FR', 'GB')));
diff --git a/test/unit/validator/i18n/sfValidatorI18nChoiceLanguageTest.php b/test/unit/validator/i18n/sfValidatorI18nChoiceLanguageTest.php
index 33081578b..202bb71a4 100644
--- a/test/unit/validator/i18n/sfValidatorI18nChoiceLanguageTest.php
+++ b/test/unit/validator/i18n/sfValidatorI18nChoiceLanguageTest.php
@@ -8,21 +8,18 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../../bootstrap/unit.php');
+require_once __DIR__.'/../../../bootstrap/unit.php';
 
 $t = new lime_test(3);
 
 // ->configure()
 $t->diag('->configure()');
 
-try
-{
-  new sfValidatorI18nChoiceLanguage(array('languages' => array('xx')));
-  $t->fail('->configure() throws an InvalidArgumentException if a language does not exist');
-}
-catch (InvalidArgumentException $e)
-{
-  $t->pass('->configure() throws an InvalidArgumentException if a language does not exist');
+try {
+    new sfValidatorI18nChoiceLanguage(array('languages' => array('xx')));
+    $t->fail('->configure() throws an InvalidArgumentException if a language does not exist');
+} catch (InvalidArgumentException $e) {
+    $t->pass('->configure() throws an InvalidArgumentException if a language does not exist');
 }
 
 $v = new sfValidatorI18nChoiceLanguage(array('languages' => array('fr', 'en')));
diff --git a/test/unit/validator/i18n/sfValidatorI18nChoiceTimezoneTest.php b/test/unit/validator/i18n/sfValidatorI18nChoiceTimezoneTest.php
index 8e4e954c3..8d6f10e30 100644
--- a/test/unit/validator/i18n/sfValidatorI18nChoiceTimezoneTest.php
+++ b/test/unit/validator/i18n/sfValidatorI18nChoiceTimezoneTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../../bootstrap/unit.php');
+require_once __DIR__.'/../../../bootstrap/unit.php';
 
 $t = new lime_test(1);
 
diff --git a/test/unit/validator/sfValidatorAndTest.php b/test/unit/validator/sfValidatorAndTest.php
index 9d3fb0f22..ae0d5dee5 100644
--- a/test/unit/validator/sfValidatorAndTest.php
+++ b/test/unit/validator/sfValidatorAndTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(25);
 
@@ -25,14 +25,12 @@
 $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');
-try
-{
-  $v = new sfValidatorAnd('string');
-  $t->fail('__construct() throws an exception when passing a non supported first argument');
-}
-catch (InvalidArgumentException $e)
-{
-  $t->pass('__construct() throws an exception when passing a non supported first argument');
+
+try {
+    $v = new sfValidatorAnd('string');
+    $t->fail('__construct() throws an exception when passing a non supported first argument');
+} catch (InvalidArgumentException $e) {
+    $t->pass('__construct() throws an exception when passing a non supported first argument');
 }
 
 // ->addValidator()
@@ -46,76 +44,64 @@
 $t->diag('->clean()');
 $t->is($v->clean('foo'), 'foo', '->clean() returns the string unmodified');
 
-try
-{
-  $v->setOption('required', true);
-  $v->clean(null);
-  $t->fail('->clean() throws an sfValidatorError exception if the input value is required');
-  $t->skip('', 1);
-}
-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');
+try {
+    $v->setOption('required', true);
+    $v->clean(null);
+    $t->fail('->clean() throws an sfValidatorError exception if the input value is required');
+    $t->skip('', 1);
+} 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');
 }
 
 $v2->setOption('max_length', 2);
-try
-{
-  $v->clean('foo');
-  $t->fail('->clean() throws an sfValidatorError exception if one of the validators fails');
-  $t->skip('', 2);
-}
-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');
+
+try {
+    $v->clean('foo');
+    $t->fail('->clean() throws an sfValidatorError exception if one of the validators fails');
+    $t->skip('', 2);
+} 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');
 }
 
 $v1->setOption('max_length', 2);
-try
-{
-  $v->clean('foo');
-  $t->fail('->clean() throws an sfValidatorError exception if one of the validators fails');
-  $t->skip('', 4);
-}
-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');
+
+try {
+    $v->clean('foo');
+    $t->fail('->clean() throws an sfValidatorError exception if one of the validators fails');
+    $t->skip('', 4);
+} 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');
 }
 
 $v->setOption('halt_on_error', true);
-try
-{
-  $v->clean('foo');
-  $t->fail('->clean() throws an sfValidatorError exception if one of the validators fails');
-  $t->skip('', 3);
-}
-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');
-}
 
-try
-{
-  $v->setMessage('invalid', 'Invalid.');
-  $v->clean('foo');
-  $t->fail('->clean() throws an sfValidatorError exception if one of the validators fails');
-  $t->skip('', 2);
+try {
+    $v->clean('foo');
+    $t->fail('->clean() throws an sfValidatorError exception if one of the validators fails');
+    $t->skip('', 3);
+} 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');
 }
-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');
+
+try {
+    $v->setMessage('invalid', 'Invalid.');
+    $v->clean('foo');
+    $t->fail('->clean() throws an sfValidatorError exception if one of the validators fails');
+    $t->skip('', 2);
+} 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');
 }
 
 // ->asString()
@@ -123,9 +109,7 @@
 $v1 = new sfValidatorString(array('max_length' => 3));
 $v2 = new sfValidatorString(array('min_length' => 3));
 $v = new sfValidatorAnd(array($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');
+$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.'));
-$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');
+$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 d71c3fdbf..012779336 100644
--- a/test/unit/validator/sfValidatorBaseTest.php
+++ b/test/unit/validator/sfValidatorBaseTest.php
@@ -8,40 +8,40 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(47);
 
 class ValidatorIdentity extends sfValidatorBase
 {
-  protected function configure($options = array(), $messages = array())
-  {
-    $this->addOption('foo', 'bar');
-    $this->addMessage('foo', 'bar');
-  }
-
-  public function testIsEmpty($value)
-  {
-    return $this->isEmpty($value);
-  }
-
-  protected function doClean($value)
-  {
-    return $value;
-  }
+    public function testIsEmpty($value)
+    {
+        return $this->isEmpty($value);
+    }
+
+    protected function configure($options = array(), $messages = array())
+    {
+        $this->addOption('foo', 'bar');
+        $this->addMessage('foo', 'bar');
+    }
+
+    protected function doClean($value)
+    {
+        return $value;
+    }
 }
 
 class ValidatorIdentityWithRequired extends sfValidatorBase
 {
-  protected function configure($options = array(), $messages = array())
-  {
-    $this->addRequiredOption('foo');
-  }
-
-  protected function doClean($value)
-  {
-    return $value;
-  }
+    protected function configure($options = array(), $messages = array())
+    {
+        $this->addRequiredOption('foo');
+    }
+
+    protected function doClean($value)
+    {
+        return $value;
+    }
 }
 
 // ->configure()
@@ -55,28 +55,22 @@ protected function doClean($value)
 $v = new ValidatorIdentity(array(), array('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));
-  $t->fail('__construct() throws an InvalidArgumentException if you pass some non existant options');
-  $t->skip();
-}
-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('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) {
+    $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));
-  $t->fail('__construct() throws an InvalidArgumentException if you pass some non existant error codes');
-  $t->skip();
-}
-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');
+try {
+    new ValidatorIdentity(array(), array('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) {
+    $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()
@@ -84,14 +78,11 @@ protected function doClean($value)
 $v = new ValidatorIdentityWithRequired(array('foo' => 'bar'));
 $t->is($v->getRequiredOptions(), array('foo'), '->getRequiredOptions() returns an array of required option names');
 
-try
-{
-  new ValidatorIdentityWithRequired();
-  $t->fail('__construct() throws an RuntimeException if you don\'t pass a required option');
-}
-catch (RuntimeException $e)
-{
-  $t->pass('__construct() throws an RuntimeException if you don\'t pass a required option');
+try {
+    new ValidatorIdentityWithRequired();
+    $t->fail('__construct() throws an RuntimeException if you don\'t pass a required option');
+} catch (RuntimeException $e) {
+    $t->pass('__construct() throws an RuntimeException if you don\'t pass a required option');
 }
 
 $v = new ValidatorIdentity();
@@ -99,16 +90,14 @@ protected function doClean($value)
 // ->clean()
 $t->diag('->clean()');
 $t->is($v->clean('foo'), 'foo', '->clean() returns a cleanup version of the data to validate');
-try
-{
-  $t->is($v->clean(''), '');
-  $t->fail('->clean() throws a sfValidatorError exception if the data does not validate');
-  $t->skip('', 1);
-}
-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');
+
+try {
+    $t->is($v->clean(''), '');
+    $t->fail('->clean() throws a sfValidatorError exception if the data does not validate');
+    $t->skip('', 1);
+} 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');
 }
 $t->is($v->clean('  foo  '), 'foo', '->clean() trim whitespaces by default');
 
@@ -132,14 +121,12 @@ protected function doClean($value)
 $t->is($v->clean(''), null, '->setOption() changes options (required for example)');
 $v->setOption('trim', true);
 $t->is($v->clean('  foo  '), 'foo', '->setOption() can turn on whitespace trimming');
-try
-{
-  $v->setOption('foobar', 'foo');
-  $t->fail('->setOption() throws an InvalidArgumentException if the option is not registered');
-}
-catch (InvalidArgumentException $e)
-{
-  $t->pass('->setOption() throws an InvalidArgumentException if the option is not registered');
+
+try {
+    $v->setOption('foobar', 'foo');
+    $t->fail('->setOption() throws an InvalidArgumentException if the option is not registered');
+} catch (InvalidArgumentException $e) {
+    $t->pass('->setOption() throws an InvalidArgumentException if the option is not registered');
 }
 
 // ->hasOption()
@@ -175,24 +162,19 @@ protected function doClean($value)
 // ->setMessage()
 $t->diag('->setMessage()');
 $v->setMessage('required', 'The field is required.');
-try
-{
-  $v->clean('');
-  $t->isnt($e->getMessage(), 'The field is required.', '->setMessage() changes the default error message string');
-}
-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');
+try {
+    $v->clean('');
+    $t->isnt($e->getMessage(), 'The field is required.', '->setMessage() changes the default error message string');
+} catch (sfValidatorError $e) {
+    $t->is($e->getMessage(), 'The field is required.', '->setMessage() changes the default error message string');
 }
-catch (InvalidArgumentException $e)
-{
-  $t->pass('->setMessage() throws an InvalidArgumentException if the message is not registered');
+
+try {
+    $v->setMessage('foobar', 'foo');
+    $t->fail('->setMessage() throws an InvalidArgumentException if the message is not registered');
+} catch (InvalidArgumentException $e) {
+    $t->pass('->setMessage() throws an InvalidArgumentException if the message is not registered');
 }
 
 // ->setMessages()
diff --git a/test/unit/validator/sfValidatorBooleanTest.php b/test/unit/validator/sfValidatorBooleanTest.php
index 981f814c2..80405d33d 100755
--- a/test/unit/validator/sfValidatorBooleanTest.php
+++ b/test/unit/validator/sfValidatorBooleanTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(23);
 
@@ -19,16 +19,14 @@
 
 // true values
 $t->diag('true values');
-foreach ($v->getOption('true_values') as $true_value)
-{
-  $t->is($v->clean($true_value), true, '->clean() returns true if the value is in the true_values option');
+foreach ($v->getOption('true_values') as $true_value) {
+    $t->is($v->clean($true_value), true, '->clean() returns true if the value is in the true_values option');
 }
 
 // false values
 $t->diag('false values');
-foreach ($v->getOption('false_values') as $false_value)
-{
-  $t->is($v->clean($false_value), false, '->clean() returns false if the value is in the false_values option');
+foreach ($v->getOption('false_values') as $false_value) {
+    $t->is($v->clean($false_value), false, '->clean() returns false if the value is in the false_values option');
 }
 
 // other special test cases
@@ -40,31 +38,28 @@
 
 class MyFalseClass
 {
-  public function __toString()
-  {
-    return 'false';
-  }
+    public function __toString()
+    {
+        return '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');
 
-try
-{
-  $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)
-{
-  $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');
+try {
+    $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) {
+    $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');
 }
 
 // empty
 $t->diag('empty');
 $v->setOption('required', false);
-$t->ok($v->clean(null) === false, '->clean() returns false if no value is given');
+$t->ok(false === $v->clean(null), '->clean() returns false if no value is given');
 $v->setOption('empty_value', true);
-$t->ok($v->clean(null) === true, '->clean() returns the value of the empty_value option if no value is given');
+$t->ok(true === $v->clean(null), '->clean() returns the value of the empty_value option if no value is given');
diff --git a/test/unit/validator/sfValidatorCSRFTokenTest.php b/test/unit/validator/sfValidatorCSRFTokenTest.php
index 23daba8ba..877225a9c 100644
--- a/test/unit/validator/sfValidatorCSRFTokenTest.php
+++ b/test/unit/validator/sfValidatorCSRFTokenTest.php
@@ -8,20 +8,18 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(5);
 
 // __construct()
 $t->diag('__construct()');
-try
-{
-  new sfValidatorCSRFToken();
-  $t->fail('__construct() throws an RuntimeException if you don\'t pass a token option');
-}
-catch (RuntimeException $e)
-{
-  $t->pass('__construct() throws an RuntimeException if you don\'t pass a token option');
+
+try {
+    new sfValidatorCSRFToken();
+    $t->fail('__construct() throws an RuntimeException if you don\'t pass a token option');
+} catch (RuntimeException $e) {
+    $t->pass('__construct() throws an RuntimeException if you don\'t pass a token option');
 }
 
 $v = new sfValidatorCSRFToken(array('token' => 'symfony'));
@@ -30,16 +28,13 @@
 $t->diag('->clean()');
 $t->is($v->clean('symfony'), 'symfony', '->clean() checks that the token is valid');
 
-try
-{
-  $v->clean('another');
-  $t->fail('->clean() throws an sfValidatorError if the token is not valid');
-  $t->skip('', 1);
-}
-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');
+try {
+    $v->clean('another');
+    $t->fail('->clean() throws an sfValidatorError if the token is not valid');
+    $t->skip('', 1);
+} 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');
 }
 
 // ->asString()
diff --git a/test/unit/validator/sfValidatorCallbackTest.php b/test/unit/validator/sfValidatorCallbackTest.php
index a0b0597d2..fae548b43 100644
--- a/test/unit/validator/sfValidatorCallbackTest.php
+++ b/test/unit/validator/sfValidatorCallbackTest.php
@@ -8,30 +8,27 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(7);
 
 function clean_test($validator, $value, $arguments)
 {
-  if ($value != 'foo')
-  {
-    throw new sfValidatorError($validator, 'must_be_foo');
-  }
+    if ('foo' != $value) {
+        throw new sfValidatorError($validator, 'must_be_foo');
+    }
 
-  return "*$value*".implode('-', $arguments);
+    return "*{$value}*".implode('-', $arguments);
 }
 
 // __construct()
 $t->diag('__construct()');
-try
-{
-  new sfValidatorCallback();
-  $t->fail('__construct() throws an RuntimeException if you don\'t pass a callback option');
-}
-catch (RuntimeException $e)
-{
-  $t->pass('__construct() throws an RuntimeException if you don\'t pass a callback option');
+
+try {
+    new sfValidatorCallback();
+    $t->fail('__construct() throws an RuntimeException if you don\'t pass a callback option');
+} catch (RuntimeException $e) {
+    $t->pass('__construct() throws an RuntimeException if you don\'t pass a callback option');
 }
 
 $v = new sfValidatorCallback(array('callback' => 'clean_test'));
@@ -43,16 +40,14 @@ function clean_test($validator, $value, $arguments)
 // ->clean()
 $t->diag('->clean()');
 $t->is($v->clean('foo'), '*foo*', '->clean() calls our validator callback');
-try
-{
-  $v->clean('bar');
-  $t->fail('->clean() throws a sfValidatorError');
-  $t->skip('', 1);
-}
-catch (sfValidatorError $e)
-{
-  $t->pass('->clean() throws a sfValidatorError');
-  $t->is($e->getCode(), 'must_be_foo', '->clean() throws a sfValidatorError');
+
+try {
+    $v->clean('bar');
+    $t->fail('->clean() throws a sfValidatorError');
+    $t->skip('', 1);
+} 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');
diff --git a/test/unit/validator/sfValidatorChoiceTest.php b/test/unit/validator/sfValidatorChoiceTest.php
index bb5241852..2569597ee 100644
--- a/test/unit/validator/sfValidatorChoiceTest.php
+++ b/test/unit/validator/sfValidatorChoiceTest.php
@@ -8,33 +8,31 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(14);
 
 function choice_callable()
 {
-  return array(1, 2, 3);
+    return array(1, 2, 3);
 }
 
 class ValidatorChoiceTestIsEmpty extends sfValidatorChoice
 {
-  public function run($value)
-  {
-    return $this->isEmpty($value);
-  }
+    public function run($value)
+    {
+        return $this->isEmpty($value);
+    }
 }
 
 // __construct()
 $t->diag('__construct()');
-try
-{
-  new sfValidatorChoice();
-  $t->fail('__construct() throws an RuntimeException if you don\'t pass an expected option');
-}
-catch (RuntimeException $e)
-{
-  $t->pass('__construct() throws an RuntimeException if you don\'t pass an expected option');
+
+try {
+    new sfValidatorChoice();
+    $t->fail('__construct() throws an RuntimeException if you don\'t pass an expected option');
+} 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')));
@@ -50,16 +48,13 @@ public function run($value)
 $t->is($v->clean('foo'), 'foo', '->clean() checks that the value is an expected value');
 $t->is($v->clean('bar'), 'bar', '->clean() checks that the value is an expected value');
 
-try
-{
-  $v->clean('foobar');
-  $t->fail('->clean() throws an sfValidatorError if the value is not an expected value');
-  $t->skip('', 1);
-}
-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');
+try {
+    $v->clean('foobar');
+    $t->fail('->clean() throws an sfValidatorError if the value is not an expected value');
+    $t->skip('', 1);
+} 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');
 }
 
 // ->asString()
@@ -73,40 +68,33 @@ public function run($value)
 
 // see bug #4212
 $v = new sfValidatorChoice(array('choices' => array(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)
-{
-  $t->pass('->clean() throws an sfValidatorError if the value is not strictly an expected value');
-  $t->is($e->getCode(), 'invalid', '->clean() throws a sfValidatorError');
+
+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) {
+    $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));
-try
-{
-  $v->clean(array(0));
-  $t->fail('->clean() throws an sfValidatorError if the minimum number of values are not selected');
-  $t->skip('', 1);
-}
-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));
-  $t->fail('->clean() throws an sfValidatorError if more than the maximum number of values are selected');
-  $t->skip('', 1);
+try {
+    $v->clean(array(0));
+    $t->fail('->clean() throws an sfValidatorError if the minimum number of values are not selected');
+    $t->skip('', 1);
+} 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');
 }
-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');
+
+try {
+    $v->clean(array(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) {
+    $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 f3b375583..4beb005f5 100644
--- a/test/unit/validator/sfValidatorDateRangeTest.php
+++ b/test/unit/validator/sfValidatorDateRangeTest.php
@@ -8,24 +8,21 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(6);
 
-try
-{
-  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)
-{
-  $t->pass('__construct() throws a RuntimeException if you don\'t pass a from_date and a to_date option');
+try {
+    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) {
+    $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))
+    'from_date' => new sfValidatorDate(array('required' => false)),
+    'to_date' => new sfValidatorDate(array('required' => false)),
 ));
 
 // ->clean()
@@ -34,36 +31,30 @@
 $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');
 
-try
-{
-  $v->clean(array('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)
-{
-  $t->pass('->clean() throws a sfValidatorError if the from date is after the to date');
-  $t->is($e->getCode(), 'invalid', '->clean() throws a sfValidatorError');
+try {
+    $v->clean(array('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) {
+    $t->pass('->clean() throws a sfValidatorError if the from date is after the to date');
+    $t->is($e->getCode(), 'invalid', '->clean() throws a sfValidatorError');
 }
 
 // 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)),
-  'from_field' => 'custom_from',
-  'to_field'   => 'custom_to',
+    'from_date' => new sfValidatorDate(array('required' => true)),
+    'to_date' => new sfValidatorDate(array('required' => true)),
+    'from_field' => 'custom_from',
+    'to_field' => 'custom_to',
 ));
 
-try
-{
-  $v->clean(array('from' => '2008-01-01', 'to' => '1998-01-01'));
-  $t->fail('->clean() take into account custom fields');
-}
-catch (sfValidatorError $e)
-{
-  $t->pass('->clean() take into account custom fields');
+try {
+    $v->clean(array('from' => '2008-01-01', 'to' => '1998-01-01'));
+    $t->fail('->clean() take into account custom fields');
+} 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'));
diff --git a/test/unit/validator/sfValidatorDateTest.php b/test/unit/validator/sfValidatorDateTest.php
index e695bb792..a1b2b1921 100644
--- a/test/unit/validator/sfValidatorDateTest.php
+++ b/test/unit/validator/sfValidatorDateTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(52);
 
@@ -18,23 +18,20 @@
 $t->diag('->clean()');
 
 $v->setOption('required', false);
-$t->ok($v->clean(null) === null, '->clean() returns null if not required');
+$t->ok(null === $v->clean(null), '->clean() returns null if not required');
 
 // validate strtotime formats
 $t->diag('validate strtotime formats');
 $t->is($v->clean('18 october 2005'), '2005-10-18', '->clean() accepts dates parsable by strtotime');
 $t->is($v->clean('+1 day'), date('Y-m-d', time() + 86400), '->clean() accepts dates parsable by strtotime');
 
-try
-{
-  $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)
-{
-  $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');
+try {
+    $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) {
+    $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');
 }
 
 // validate timestamp
@@ -48,40 +45,31 @@
 $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');
 
-try
-{
-  $v->clean(array('year' => '', 'month' => 1, 'day' => 15));
-  $t->fail('->clean() throws a sfValidatorError if the date is not valid');
-  $t->skip('', 1);
-}
-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' => '', 'month' => 1, 'day' => 15));
+    $t->fail('->clean() throws a sfValidatorError if the date is not valid');
+    $t->skip('', 1);
+} 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));
-  $t->fail('->clean() throws a sfValidatorError if the date is not valid');
-  $t->skip('', 1);
-}
-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));
+    $t->fail('->clean() throws a sfValidatorError if the date is not valid');
+    $t->skip('', 1);
+} 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));
-  $t->fail('->clean() throws a sfValidatorError if the date is not valid');
-  $t->skip('', 1);
-}
-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));
+    $t->fail('->clean() throws a sfValidatorError if the date is not valid');
+    $t->skip('', 1);
+} catch (sfValidatorError $e) {
+    $t->pass('->clean() throws a sfValidatorError if the date is not valid');
+    $t->is($e->getCode(), 'invalid', '->clean() throws a sfValidatorError');
 }
 
 // validate regex
@@ -90,28 +78,23 @@
 $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');
 
-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)
-{
-  $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');
+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) {
+    $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');
 }
 
 $v->setOption('date_format_error', 'dd/mm/YYYY');
-try
-{
-  $v->clean('2005-10-18');
-  $t->skip('', 1);
-}
-catch (sfValidatorError $e)
-{
-  $t->like($e->getMessage(), '/'.preg_quote('dd/mm/YYYY', '/').'/', '->clean() returns the expected date format error if provided');
+
+try {
+    $v->clean('2005-10-18');
+    $t->skip('', 1);
+} catch (sfValidatorError $e) {
+    $t->like($e->getMessage(), '/'.preg_quote('dd/mm/YYYY', '/').'/', '->clean() returns the expected date format error if provided');
 }
 
 $v->setOption('date_format', null);
@@ -128,14 +111,12 @@
 $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');
-try
-{
-  $v->clean(array('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)
-{
-  $t->pass('->clean() throws a sfValidatorError if the time is not valid');
+
+try {
+    $v->clean(array('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) {
+    $t->pass('->clean() throws a sfValidatorError if the time is not valid');
 }
 
 $t->is($v->clean('18 october 2005 12:30'), '2005-10-18 12:30:00', '->clean() can accept date time with the with_time option');
@@ -158,21 +139,17 @@
 // required
 $v = new sfValidatorDate();
 foreach (array(
-  array('year' => '', 'month' => '', 'day' => ''),
-  array('year' => null, 'month' => null, 'day' => null),
-  '',
-  null,
-) as $input)
-{
-  try
-  {
-    $v->clean($input);
-    $t->fail('->clean() throws an exception if the date is empty and required is true');
-  }
-  catch (sfValidatorError $e)
-  {
-    $t->pass('->clean() throws an exception if the date is empty and required is true');
-  }
+    array('year' => '', 'month' => '', 'day' => ''),
+    array('year' => null, 'month' => null, 'day' => null),
+    '',
+    null,
+) as $input) {
+    try {
+        $v->clean($input);
+        $t->fail('->clean() throws an exception if the date is empty and required is true');
+    } catch (sfValidatorError $e) {
+        $t->pass('->clean() throws an exception if the date is empty and required is true');
+    }
 }
 
 // max and min options
@@ -180,23 +157,19 @@
 $v->setOption('min', strtotime('1 Jan 2005'));
 $v->setOption('max', strtotime('31 Dec 2007'));
 $t->is($v->clean('18 october 2005'), '2005-10-18', '->clean() can accept a max/min option');
-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)
-{
-  $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');
+
+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) {
+    $t->pass('->clean() throws an exception if the date is not within the range provided by the min/max options');
 }
-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) {
+    $t->pass('->clean() throws an exception if the date is not within the range provided by the min/max options');
 }
 
 // max and min options out off timestamp range
@@ -205,33 +178,28 @@
 $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');
-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)
-{
-  $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');
-}
-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');
+
+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) {
+    $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');
 }
-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');
+
+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) {
+    $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');
+if ($defaultTimezone->getOffset(new DateTime()) == $otherTimezone->getOffset(new DateTime())) {
+    $otherTimezone = new DateTimeZone('US/Eastern');
 }
 
 $date = new DateTime('2000-01-01T00:00:00-00:00');
diff --git a/test/unit/validator/sfValidatorDateTimeTest.php b/test/unit/validator/sfValidatorDateTimeTest.php
index b09bd4f73..32145ff5e 100644
--- a/test/unit/validator/sfValidatorDateTimeTest.php
+++ b/test/unit/validator/sfValidatorDateTimeTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(4);
 
diff --git a/test/unit/validator/sfValidatorDecoratorTest.php b/test/unit/validator/sfValidatorDecoratorTest.php
index b42669f0f..06031db28 100644
--- a/test/unit/validator/sfValidatorDecoratorTest.php
+++ b/test/unit/validator/sfValidatorDecoratorTest.php
@@ -8,16 +8,16 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(20);
 
 class MyValidator extends sfValidatorDecorator
 {
-  public function getValidator()
-  {
-    return new sfValidatorString(array('min_length' => 2, 'trim' => true), array('required' => 'This string is required.'));
-  }
+    public function getValidator()
+    {
+        return new sfValidatorString(array('min_length' => 2, 'trim' => true), array('required' => 'This string is required.'));
+    }
 }
 
 // __construct()
@@ -25,16 +25,14 @@ public function getValidator()
 $v = new MyValidator(array('required' => false));
 $t->is($v->clean(null), null, '__construct() options override the embedded validator options');
 $v = new MyValidator(array(), array('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)
-{
-  $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');
+
+try {
+    $v->clean(null);
+    $t->fail('->clean() throws a sfValidatorError if the value is required');
+    $t->skip('', 1);
+} 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();
@@ -77,46 +75,38 @@ public function getValidator()
 
 // ->clean()
 $t->diag('->clean()');
-try
-{
-  $v->clean(null);
-  $t->fail('->clean() throws a sfValidatorError if the value is required');
-  $t->skip('', 1);
-}
-catch (sfValidatorError $e)
-{
-  $t->pass('->clean() throws a sfValidatorError if the value is required');
-  $t->is($e->getCode(), 'required', '->clean() throws a sfValidatorError');
-}
 
-try
-{
-  $v->clean('f');
-  $t->fail('->clean() throws a sfValidatorError if the wrapped validator failed');
-  $t->skip('', 1);
+try {
+    $v->clean(null);
+    $t->fail('->clean() throws a sfValidatorError if the value is required');
+    $t->skip('', 1);
+} catch (sfValidatorError $e) {
+    $t->pass('->clean() throws a sfValidatorError if the value is required');
+    $t->is($e->getCode(), 'required', '->clean() throws a sfValidatorError');
 }
-catch (sfValidatorError $e)
-{
-  $t->pass('->clean() throws a sfValidatorError if the wrapped validator failed');
-  $t->is($e->getCode(), 'min_length', '->clean() throws a sfValidatorError');
+
+try {
+    $v->clean('f');
+    $t->fail('->clean() throws a sfValidatorError if the wrapped validator failed');
+    $t->skip('', 1);
+} 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
 {
-  protected function getValidator()
-  {
-    return 'foo';
-  }
+    protected function getValidator()
+    {
+        return 'foo';
+    }
 }
 
-try
-{
-  $v = new FakeValidator();
-  $t->fail('->clean() throws a RuntimeException if getValidator() does not return a sfValidator instance');
-}
-catch (RuntimeException $e)
-{
-  $t->pass('->clean() throws a RuntimeException if getValidator() does not return a sfValidator instance');
+try {
+    $v = new FakeValidator();
+    $t->fail('->clean() throws a RuntimeException if getValidator() does not return a sfValidator instance');
+} 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 dbfe50e9c..922e12413 100644
--- a/test/unit/validator/sfValidatorEmailTest.php
+++ b/test/unit/validator/sfValidatorEmailTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(11);
 
@@ -17,30 +17,25 @@
 // ->clean()
 $t->diag('->clean()');
 foreach (array(
-  'fabien.potencier@symfony-project.com',
-  'example@example.co.uk',
-  'fabien_potencier@example.fr',
-) as $url)
-{
-  $t->is($v->clean($url), $url, '->clean() checks that the value is a valid email');
+    'fabien.potencier@symfony-project.com',
+    'example@example.co.uk',
+    'fabien_potencier@example.fr',
+) as $url) {
+    $t->is($v->clean($url), $url, '->clean() checks that the value is a valid email');
 }
 
 foreach (array(
-  'example',
-  'example@',
-  'example@localhost',
-  'example@example.com@example.com',
-) 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)
-  {
-    $t->pass('->clean() throws an sfValidatorError if the value is not a valid email');
-    $t->is($e->getCode(), 'invalid', '->clean() throws a sfValidatorError');
-  }
+    'example',
+    'example@',
+    'example@localhost',
+    'example@example.com@example.com',
+) 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) {
+        $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 9dbe1cc82..a8e7f6361 100644
--- a/test/unit/validator/sfValidatorEqualTest.php
+++ b/test/unit/validator/sfValidatorEqualTest.php
@@ -8,20 +8,18 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(9);
 
 // __construct()
 $t->diag('__construct()');
-try
-{
-  new sfValidatorEqual();
-  $t->fail('->__construct() throws an "RuntimeException" if you don\'t pass a "value" option');
-}
-catch (RuntimeException $e)
-{
-  $t->pass('->__construct() throws an "RuntimeException" if you don\'t pass a "value" option');
+
+try {
+    new sfValidatorEqual();
+    $t->fail('->__construct() throws an "RuntimeException" if you don\'t pass a "value" option');
+} catch (RuntimeException $e) {
+    $t->pass('->__construct() throws an "RuntimeException" if you don\'t pass a "value" option');
 }
 
 $v = new sfValidatorEqual(array('value' => 'foo'));
@@ -31,53 +29,43 @@
 $t->is($v->clean('foo'), 'foo', '->clean() returns the value unmodified');
 
 $v->setOption('value', '0');
-$t->ok($v->clean(0) === 0, '->clean() returns the value unmodified');
+$t->ok(0 === $v->clean(0), '->clean() returns the value unmodified');
 
-try
-{
-  $v->clean('bar');
-  $t->fail('->clean() fails values are not equal');
-  $t->skip('', 1);
-}
-catch (sfValidatorError $e)
-{
-  $t->pass('->clean() fails values are not equal');
-  $t->is($e->getCode(), 'not_equal', '->clean() throws a sfValidatorError');
+try {
+    $v->clean('bar');
+    $t->fail('->clean() fails values are not equal');
+    $t->skip('', 1);
+} catch (sfValidatorError $e) {
+    $t->pass('->clean() fails values are not equal');
+    $t->is($e->getCode(), 'not_equal', '->clean() throws a sfValidatorError');
 }
 
 $v->setMessage('not_equal', 'Not equal');
-try
-{
-  $v->clean('bar');
-  $t->fail('"not_equal" error message customization');
-}
-catch (sfValidatorError $e)
-{
-  $t->is($e->getMessage(), 'Not equal', '"not_equal" error message customization');
+
+try {
+    $v->clean('bar');
+    $t->fail('"not_equal" error message customization');
+} catch (sfValidatorError $e) {
+    $t->is($e->getMessage(), 'Not equal', '"not_equal" error message customization');
 }
 
 $v->setOption('strict', true);
 $v->setOption('value', '0');
 
-try
-{
-  $v->clean(0);
-  $t->fail('"strict" option set the operator for comparaison');
-  $t->skip('', 1);
-}
-catch (sfValidatorError $e)
-{
-  $t->pass('"strict" option set the operator for comparaison');
-  $t->is($e->getCode(), 'not_strictly_equal', '->clean() throws a sfValidatorError');
+try {
+    $v->clean(0);
+    $t->fail('"strict" option set the operator for comparaison');
+    $t->skip('', 1);
+} catch (sfValidatorError $e) {
+    $t->pass('"strict" option set the operator for comparaison');
+    $t->is($e->getCode(), 'not_strictly_equal', '->clean() throws a sfValidatorError');
 }
 
 $v->setMessage('not_strictly_equal', 'Not strictly equal');
-try
-{
-  $v->clean(0);
-  $t->fail('"not_strictly_equal" error message customization');
-}
-catch (sfValidatorError $e)
-{
-  $t->is($e->getMessage(), 'Not strictly equal', '"not_strictly_equal" error message customization');
+
+try {
+    $v->clean(0);
+    $t->fail('"not_strictly_equal" error message customization');
+} 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 7ca40047f..71d685421 100644
--- a/test/unit/validator/sfValidatorErrorSchemaTest.php
+++ b/test/unit/validator/sfValidatorErrorSchemaTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(33);
 
@@ -66,7 +66,6 @@
 $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->addError($e1);
 $es1->addError($e1, 'e1');
@@ -146,9 +145,8 @@
 $e->addError($e2);
 $e->addError($e2, '2');
 $errors = array();
-foreach ($e as $name => $error)
-{
-  $errors[$name] = $error;
+foreach ($e as $name => $error) {
+    $errors[$name] = $error;
 }
 $t->is($errors, array('e1' => $e1, 0 => $e2, '2' => $e2), '"sfValidatorErrorSchema" implements the Iterator interface');
 
@@ -163,14 +161,12 @@
 $t->is($e['2'], $e2, '"sfValidatorErrorSchema" implements the ArrayAccess interface');
 $t->is(isset($e['e1']), true, '"sfValidatorErrorSchema" implements the ArrayAccess interface');
 $t->is(isset($e['e2']), false, '"sfValidatorErrorSchema" implements the ArrayAccess interface');
-try
-{
-  $e['e1'] = $e2;
-  $t->fail('"sfValidatorErrorSchema" implements the ArrayAccess interface');
-}
-catch (LogicException $e)
-{
-  $t->pass('"sfValidatorErrorSchema" implements the ArrayAccess interface');
+
+try {
+    $e['e1'] = $e2;
+    $t->fail('"sfValidatorErrorSchema" implements the ArrayAccess interface');
+} catch (LogicException $e) {
+    $t->pass('"sfValidatorErrorSchema" implements the ArrayAccess interface');
 }
 
 // implements Serializable
@@ -178,42 +174,39 @@
 
 class NotSerializable implements Serializable
 {
-  public function serialize()
-  {
-    throw new Exception('Not serializable');
-  }
-
-  public function unserialize($serialized)
-  {
-    throw new Exception('Not serializable');
-  }
-
-  public function __serialize()
-  {
-    throw new Exception('Not serializable');
-  }
-
-  public function __unserialize($data)
-  {
-    throw new Exception('Not serializable');
-  }
+    public function __serialize()
+    {
+        throw new Exception('Not serializable');
+    }
+
+    public function __unserialize($data)
+    {
+        throw new Exception('Not serializable');
+    }
+
+    public function serialize()
+    {
+        throw new Exception('Not serializable');
+    }
+
+    public function unserialize($serialized)
+    {
+        throw new Exception('Not serializable');
+    }
 }
 
 function will_crash($a)
 {
-  return serialize(new sfValidatorErrorSchema(new sfValidatorString()));
+    return serialize(new sfValidatorErrorSchema(new sfValidatorString()));
 }
 
 $a = new NotSerializable();
 
-try
-{
-  $serialized = will_crash($a);
-  $t->pass('"sfValidatorErrorSchema" implements Serializable');
-}
-catch (Exception $e)
-{
-  $t->fail('"sfValidatorErrorSchema" implements Serializable');
+try {
+    $serialized = will_crash($a);
+    $t->pass('"sfValidatorErrorSchema" implements Serializable');
+} catch (Exception $e) {
+    $t->fail('"sfValidatorErrorSchema" implements Serializable');
 }
 
 $e = new sfValidatorErrorSchema($v1);
diff --git a/test/unit/validator/sfValidatorErrorTest.php b/test/unit/validator/sfValidatorErrorTest.php
index f3b37ea46..2c235fd37 100644
--- a/test/unit/validator/sfValidatorErrorTest.php
+++ b/test/unit/validator/sfValidatorErrorTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(14);
 
@@ -56,42 +56,39 @@
 // even if you use PDO as a session handler
 class NotSerializable implements Serializable
 {
-  public function serialize()
-  {
-    throw new Exception('Not serializable');
-  }
-
-  public function unserialize($serialized)
-  {
-    throw new Exception('Not serializable');
-  }
-
-  public function __serialize()
-  {
-    throw new Exception('Not serializable');
-  }
-
-  public function __unserialize($data)
-  {
-    throw new Exception('Not serializable');
-  }
+    public function __serialize()
+    {
+        throw new Exception('Not serializable');
+    }
+
+    public function __unserialize($data)
+    {
+        throw new Exception('Not serializable');
+    }
+
+    public function serialize()
+    {
+        throw new Exception('Not serializable');
+    }
+
+    public function unserialize($serialized)
+    {
+        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', array('value' => 'foo<br />', 'max_length' => 1)));
 }
 
 $a = new NotSerializable();
 
-try
-{
-  $serialized = will_crash($a);
-  $t->pass('sfValidatorError implements Serializable');
-}
-catch (Exception $e)
-{
-  $t->fail('sfValidatorError implements Serializable');
+try {
+    $serialized = will_crash($a);
+    $t->pass('sfValidatorError implements Serializable');
+} catch (Exception $e) {
+    $t->fail('sfValidatorError implements Serializable');
 }
 
 $e1 = unserialize($serialized);
diff --git a/test/unit/validator/sfValidatorFileMultiTest.php b/test/unit/validator/sfValidatorFileMultiTest.php
index 59b54727e..8c2e267b6 100644
--- a/test/unit/validator/sfValidatorFileMultiTest.php
+++ b/test/unit/validator/sfValidatorFileMultiTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(9);
 
@@ -23,8 +23,8 @@
 $v = new sfValidatorFileMulti();
 
 $f = $v->clean(array(
-  array('tmp_name' => $tmpDir.'/test.txt'),
-  array('tmp_name' => $tmpDir.'/test2.txt'),
+    array('tmp_name' => $tmpDir.'/test.txt'),
+    array('tmp_name' => $tmpDir.'/test2.txt'),
 ));
 
 $t->ok(is_array($f), '->clean() returns an array of sfValidatedFile instances');
diff --git a/test/unit/validator/sfValidatorFileTest.php b/test/unit/validator/sfValidatorFileTest.php
index d7d101d6d..ae34001cd 100755
--- a/test/unit/validator/sfValidatorFileTest.php
+++ b/test/unit/validator/sfValidatorFileTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(70);
 
@@ -18,48 +18,46 @@
 
 class testValidatorFile extends sfValidatorFile
 {
-  public function getMimeType($file, $fallback)
-  {
-    return parent::getMimeType($file, $fallback);
-  }
-
-  public function guessFromNothing($file)
-  {
-    return 'nothing/plain';
-  }
-
-  public function guessFromFileinfo($file)
-  {
-    return parent::guessFromFileinfo($file);
-  }
-
-  public function guessFromMimeContentType($file)
-  {
-    return parent::guessFromMimeContentType($file);
-  }
-
-  public function guessFromFileBinary($file)
-  {
-    return parent::guessFromFileBinary($file);
-  }
-
-  public function getMimeTypesFromCategory($category)
-  {
-    return parent::getMimeTypesFromCategory($category);
-  }
+    public function getMimeType($file, $fallback)
+    {
+        return parent::getMimeType($file, $fallback);
+    }
+
+    public function guessFromNothing($file)
+    {
+        return 'nothing/plain';
+    }
+
+    public function guessFromFileinfo($file)
+    {
+        return parent::guessFromFileinfo($file);
+    }
+
+    public function guessFromMimeContentType($file)
+    {
+        return parent::guessFromMimeContentType($file);
+    }
+
+    public function guessFromFileBinary($file)
+    {
+        return parent::guessFromFileBinary($file);
+    }
+
+    public function getMimeTypesFromCategory($category)
+    {
+        return parent::getMimeTypesFromCategory($category);
+    }
 }
 
 // ->getMimeTypesFromCategory()
 $t->diag('->getMimeTypesFromCategory()');
 $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)
-{
-  $t->pass('->getMimeTypesFromCategory() throws an InvalidArgumentException if the category does not exist');
+
+try {
+    $t->is($v->getMimeTypesFromCategory('non_existant_category'), '');
+    $t->fail('->getMimeTypesFromCategory() throws an InvalidArgumentException if the category does not exist');
+} 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');
@@ -68,36 +66,27 @@ public function getMimeTypesFromCategory($category)
 
 // ->guessFromFileinfo()
 $t->diag('->guessFromFileinfo()');
-if (!function_exists('finfo_open'))
-{
-  $t->skip('finfo_open is not available', 2);
-}
-else
-{
-  $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');
+if (!function_exists('finfo_open')) {
+    $t->skip('finfo_open is not available', 2);
+} else {
+    $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');
 }
 
 // ->guessFromMimeContentType()
 $t->diag('->guessFromMimeContentType()');
-if (!function_exists('mime_content_type'))
-{
-  $t->skip('mime_content_type is not available', 2);
-}
-else
-{
-  $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);
-  }
-  else
-  {
-    $t->is($mimeType, 'text/plain', '->guessFromMimeContentType() guesses the type of a given file');
-  }
-  $t->is($v->guessFromMimeContentType($tmpDir.'/foo.txt'), null, '->guessFromMimeContentType() returns null if the file type is not guessable');
+if (!function_exists('mime_content_type')) {
+    $t->skip('mime_content_type is not available', 2);
+} else {
+    $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);
+    } else {
+        $t->is($mimeType, 'text/plain', '->guessFromMimeContentType() guesses the type of a given file');
+    }
+    $t->is($v->guessFromMimeContentType($tmpDir.'/foo.txt'), null, '->guessFromMimeContentType() returns null if the file type is not guessable');
 }
 
 // ->guessFromFileBinary()
@@ -120,16 +109,14 @@ public function getMimeTypesFromCategory($category)
 // ->clean()
 $t->diag('->clean()');
 $v = new testValidatorFile();
-try
-{
-  $v->clean(array('test' => true));
-  $t->fail('->clean() throws an sfValidatorError if the given value is not well formatted');
-  $t->skip('', 1);
-}
-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');
+
+try {
+    $v->clean(array('test' => true));
+    $t->fail('->clean() throws an sfValidatorError if the given value is not well formatted');
+    $t->skip('', 1);
+} 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');
@@ -145,74 +132,62 @@ class myValidatedFile extends sfValidatedFile
 $f = $v->clean(array('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)
-{
-  try
-  {
-    $v->clean(array('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)
-  {
-    $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);
-  }
+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) {
+    try {
+        $v->clean(array('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) {
+        $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);
+    }
 }
 
 // max file size
 $t->diag('max file size');
 $v->setOption('max_size', 4);
-try
-{
-  $v->clean(array('tmp_name' => $tmpDir.'/test.txt'));
-  $t->skip();
-}
-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');
+
+try {
+    $v->clean(array('tmp_name' => $tmpDir.'/test.txt'));
+    $t->skip();
+} 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');
 }
 $v->setOption('max_size', null);
 
 // mime types
 $t->diag('mime types');
 $v->setOption('mime_types', 'web_images');
-try
-{
-  $v->clean(array('tmp_name' => $tmpDir.'/test.txt'));
-  $t->skip();
-}
-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');
+
+try {
+    $v->clean(array('tmp_name' => $tmpDir.'/test.txt'));
+    $t->skip();
+} 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();
-try
-{
-  $v->clean(array('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)
-{
-  $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');
-}
-try
-{
-  $v->clean(null);
-  $t->fail('->clean() throws an sfValidatorError if the file is required and no file is uploaded');
-  $t->skip();
+
+try {
+    $v->clean(array('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) {
+    $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');
 }
-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');
+
+try {
+    $v->clean(null);
+    $t->fail('->clean() throws an sfValidatorError if the file is required and no file is uploaded');
+    $t->skip();
+} 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');
@@ -222,9 +197,8 @@ class myValidatedFile extends sfValidatedFile
 // ->getOriginalName() ->getTempName() ->getSize() ->getType()
 $t->diag('->getOriginalName() ->getTempName() ->getSize() ->getType()');
 sfToolkit::clearDirectory($tmpDir.'/foo');
-if (is_dir($tmpDir.'/foo'))
-{
-  rmdir($tmpDir.'/foo');
+if (is_dir($tmpDir.'/foo')) {
+    rmdir($tmpDir.'/foo');
 }
 $f = new sfValidatedFile('test.txt', 'text/plain', $tmpDir.'/test.txt', strlen($content));
 $t->is($f->getOriginalName(), 'test.txt', '->getOriginalName() returns the original name');
@@ -258,25 +232,19 @@ class myValidatedFile extends sfValidatedFile
 $t->is(file_get_contents($tmpDir.'/'.$filename), file_get_contents($tmpDir.'/test.txt'), '->save() returns the generated file name is none was given');
 $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->save();
-  $t->fail('->save() throws an Exception if you don\'t give a filename and the path is empty');
-}
-catch (Exception $e)
-{
-  $t->pass('->save() throws an Exception if you don\'t give a filename and the path is empty');
+try {
+    $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) {
+    $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)
-{
-  $t->pass('->save() throws an Exception if the directory already exists and is not a directory');
+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) {
+    $t->pass('->save() throws an Exception if the directory already exists and is not a directory');
 }
 
 // ->getExtension()
diff --git a/test/unit/validator/sfValidatorFromDescriptionTest.php b/test/unit/validator/sfValidatorFromDescriptionTest.php
index 099b06895..3fc2c1f2f 100644
--- a/test/unit/validator/sfValidatorFromDescriptionTest.php
+++ b/test/unit/validator/sfValidatorFromDescriptionTest.php
@@ -8,81 +8,81 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(98);
 
 $tests = array(
-  'Integer',
-  'Integer()',
-  'Integer({min: 18})',
-  'Integer(  {  min:  18  }  )',
-  'Integer({min: 18}, {required: "This is required"})',
-  '(Integer)',
-  '
+    'Integer',
+    'Integer()',
+    'Integer({min: 18})',
+    'Integer(  {  min:  18  }  )',
+    'Integer({min: 18}, {required: "This is required"})',
+    '(Integer)',
+    '
    (Integer)
   ',
-  '(
+    '(
     Integer
    )',
 
-  'Integer and String',
-  'Integer or String',
-  'Integer and (String or Email)',
+    'Integer and String',
+    'Integer or String',
+    'Integer and (String or Email)',
 
-  'age:Integer',
-  'age:Integer()',
-  'age:Integer({min: 18})',
-  'age:Integer({min: 18}, {required: "This is required"})',
-  '(age:Integer)',
-  '
+    'age:Integer',
+    'age:Integer()',
+    'age:Integer({min: 18})',
+    'age:Integer({min: 18}, {required: "This is required"})',
+    '(age:Integer)',
+    '
     (age:Integer)
   ',
-  '(
+    '(
     age:Integer
    )',
 
-  'age == password',
-  'age ==() password',
-  'age ==({}, {invalid: "Not equal."}) password',
-  'age ==(  {  },  {  invalid:  "Not equal."  }  ) password',
-  'age ==({required: true}, {invalid: "Not equal."}) password',
-  'age ==({}) password',
-  "age
+    'age == password',
+    'age ==() password',
+    'age ==({}, {invalid: "Not equal."}) password',
+    'age ==(  {  },  {  invalid:  "Not equal."  }  ) password',
+    'age ==({required: true}, {invalid: "Not equal."}) password',
+    'age ==({}) password',
+    'age
    ==
-   password",
-  '(age == password)',
-  '
+   password',
+    '(age == password)',
+    '
     (age == password)
   ',
-  '(
+    '(
     age == password
    )',
 
-  'age != password',
-  'age > password',
-  'age >= password',
-  'age <= password',
-  'age > password',
-
-  'age:Integer and password:String',
-  'age:Integer and() password:String()',
-  'age:Integer and({}, {invalid: "This is invalid."}) password:String({required: true}, {min_length: Min length error message.})',
-  'age:Integer and({required: true}, {invalid: "This is invalid."}) password:String',
-  'age:Integer and({}) password:String({}, {})',
-  "age:Integer
+    'age != password',
+    'age > password',
+    'age >= password',
+    'age <= password',
+    'age > password',
+
+    'age:Integer and password:String',
+    'age:Integer and() password:String()',
+    'age:Integer and({}, {invalid: "This is invalid."}) password:String({required: true}, {min_length: Min length error message.})',
+    'age:Integer and({required: true}, {invalid: "This is invalid."}) password:String',
+    'age:Integer and({}) password:String({}, {})',
+    'age:Integer
    and
-   password:String",
-   '(age:Integer and password:String)',
-   'age:Integer or password:String',
-   '
+   password:String',
+    '(age:Integer and password:String)',
+    'age:Integer or password:String',
+    '
     (age:Integer or password:String)
    ',
-   '(age:Integer or password:String)',
-   '(
+    '(age:Integer or password:String)',
+    '(
      age:Integer or password:String
     )',
-  '
+    '
    (
     age:Integer
      or
@@ -90,36 +90,35 @@
    )
   ',
 
-  "
+    '
    (first_name:String or age:Integer)
     and
-   age:Integer({min: 18}, {required: \"This is required.\"})
+   age:Integer({min: 18}, {required: "This is required."})
     or
    (
      age:Integer({max: 18})
       and
      is_young:Boolean({required: true})
    )
-  ",
+  ',
 
-  '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})',
+    '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);
-  $embedValidator = $v->getValidator();
+foreach ($tests as $test) {
+    $v = new sfValidatorFromDescription($test);
+    $embedValidator = $v->getValidator();
 
-  eval('$evaledValidator = '.$v->asPhp().';');
+    eval('$evaledValidator = '.$v->asPhp().';');
 
-  $t->is($evaledValidator->asString(), $v->asString(), sprintf('sfValidatorFromDescription is able to parse "%s"', str_replace("\n", '\n', $test)));
+    $t->is($evaledValidator->asString(), $v->asString(), sprintf('sfValidatorFromDescription is able to parse "%s"', str_replace("\n", '\n', $test)));
 
-  $v1 = new sfValidatorFromDescription($embedValidator->asString());
-  $embedValidator1 = $v1->getValidator();
+    $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)));
+    $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 fcde4a357..2a90b23bc 100644
--- a/test/unit/validator/sfValidatorIntegerTest.php
+++ b/test/unit/validator/sfValidatorIntegerTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(15);
 
@@ -19,83 +19,69 @@
 $t->is($v->clean(12), 12, '->clean() returns the numbers unmodified');
 $t->is($v->clean('12'), 12, '->clean() converts strings to integers');
 
-try
-{
-  $v->clean('not an integer');
-  $t->fail('->clean() throws a sfValidatorError if the value is not an integer');
-  $t->skip('', 1);
-}
-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');
+try {
+    $v->clean('not an integer');
+    $t->fail('->clean() throws a sfValidatorError if the value is not an integer');
+    $t->skip('', 1);
+} 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');
 }
 
-try
-{
-  $v->clean(12.3);
-  $t->fail('->clean() throws a sfValidatorError if the value is not an integer');
-  $t->skip('', 1);
-}
-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');
+try {
+    $v->clean(12.3);
+    $t->fail('->clean() throws a sfValidatorError if the value is not an integer');
+    $t->skip('', 1);
+} 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');
 }
 
 $v->setOption('required', false);
-$t->ok($v->clean(null) === null, '->clean() returns null for null values');
+$t->ok(null === $v->clean(null), '->clean() returns null for null values');
 
 $v->setOption('max', 2);
 $t->is($v->clean(1), 1, '->clean() checks the maximum number allowed');
-try
-{
-  $v->clean(3);
-  $t->fail('"max" option set the maximum number allowed');
-  $t->skip('', 1);
-}
-catch (sfValidatorError $e)
-{
-  $t->pass('"max" option set the maximum number allowed');
-  $t->is($e->getCode(), 'max', '->clean() throws a sfValidatorError');
+
+try {
+    $v->clean(3);
+    $t->fail('"max" option set the maximum number allowed');
+    $t->skip('', 1);
+} catch (sfValidatorError $e) {
+    $t->pass('"max" option set the maximum number allowed');
+    $t->is($e->getCode(), 'max', '->clean() throws a sfValidatorError');
 }
 
 $v->setMessage('max', 'Too large');
-try
-{
-  $v->clean(5);
-  $t->fail('"max" error message customization');
-}
-catch (sfValidatorError $e)
-{
-  $t->is($e->getMessage(), 'Too large', '"max" error message customization');
+
+try {
+    $v->clean(5);
+    $t->fail('"max" error message customization');
+} catch (sfValidatorError $e) {
+    $t->is($e->getMessage(), 'Too large', '"max" error message customization');
 }
 
 $v->setOption('max', null);
 
 $v->setOption('min', 3);
 $t->is($v->clean(5), 5, '->clean() checks the minimum number allowed');
-try
-{
-  $v->clean('1');
-  $t->fail('"min" option set the minimum number allowed');
-  $t->skip('', 1);
-}
-catch (sfValidatorError $e)
-{
-  $t->pass('"min" option set the minimum number allowed');
-  $t->is($e->getCode(), 'min', '->clean() throws a sfValidatorError');
+
+try {
+    $v->clean('1');
+    $t->fail('"min" option set the minimum number allowed');
+    $t->skip('', 1);
+} catch (sfValidatorError $e) {
+    $t->pass('"min" option set the minimum number allowed');
+    $t->is($e->getCode(), 'min', '->clean() throws a sfValidatorError');
 }
 
 $v->setMessage('min', 'Too small');
-try
-{
-  $v->clean(1);
-  $t->fail('"min" error message customization');
-}
-catch (sfValidatorError $e)
-{
-  $t->is($e->getMessage(), 'Too small', '"min" error message customization');
+
+try {
+    $v->clean(1);
+    $t->fail('"min" error message customization');
+} catch (sfValidatorError $e) {
+    $t->is($e->getMessage(), 'Too small', '"min" error message customization');
 }
 
 $v->setOption('min', null);
diff --git a/test/unit/validator/sfValidatorIpTest.php b/test/unit/validator/sfValidatorIpTest.php
index e6094b455..ce2e9a163 100644
--- a/test/unit/validator/sfValidatorIpTest.php
+++ b/test/unit/validator/sfValidatorIpTest.php
@@ -8,269 +8,219 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $validV4Ips = array(
-  '0.0.0.0',
-  '10.0.0.0',
-  '123.45.67.178',
-  '172.16.0.0',
-  '192.168.1.0',
-  '224.0.0.1',
-  '255.255.255.255',
-  '127.0.0.0',
+    '0.0.0.0',
+    '10.0.0.0',
+    '123.45.67.178',
+    '172.16.0.0',
+    '192.168.1.0',
+    '224.0.0.1',
+    '255.255.255.255',
+    '127.0.0.0',
 );
 
 $invalidV4Ips = array(
-  '0',
-  '0.0',
-  '0.0.0',
-  '256.0.0.0',
-  '0.256.0.0',
-  '0.0.256.0',
-  '0.0.0.256',
-  '-1.0.0.0',
-  'foobar',
+    '0',
+    '0.0',
+    '0.0.0',
+    '256.0.0.0',
+    '0.256.0.0',
+    '0.0.256.0',
+    '0.0.0.256',
+    '-1.0.0.0',
+    'foobar',
 );
 
 $invalidPrivateV4Ips = array(
-  '10.0.0.0',
-  '172.16.0.0',
-  '192.168.1.0'
+    '10.0.0.0',
+    '172.16.0.0',
+    '192.168.1.0',
 );
 
 $invalidReservedV4Ips = array(
-  '0.0.0.0',
-  '240.0.0.1',
-  '255.255.255.255'
+    '0.0.0.0',
+    '240.0.0.1',
+    '255.255.255.255',
 );
 
 $validV6Ips = array(
-  '2001:0db8:85a3:0000:0000:8a2e:0370:7334',
-  '2001:0DB8:85A3:0000:0000:8A2E:0370:7334',
-  '2001:0Db8:85a3:0000:0000:8A2e:0370:7334',
-  'fdfe:dcba:9876:ffff:fdc6:c46b:bb8f:7d4c',
-  'fdc6:c46b:bb8f:7d4c:fdc6:c46b:bb8f:7d4c',
-  'fdc6:c46b:bb8f:7d4c:0000:8a2e:0370:7334',
-  'fe80:0000:0000:0000:0202:b3ff:fe1e:8329',
-  'fe80:0:0:0:202:b3ff:fe1e:8329',
-  'fe80::202:b3ff:fe1e:8329',
-  '0:0:0:0:0:0:0:0',
-  '::',
-  '0::',
-  '::0',
-  '0::0',
-  // IPv4 mapped to IPv6
-  '2001:0db8:85a3:0000:0000:8a2e:0.0.0.0',
-  '::0.0.0.0',
-  '::255.255.255.255',
-  '::123.45.67.178',
+    '2001:0db8:85a3:0000:0000:8a2e:0370:7334',
+    '2001:0DB8:85A3:0000:0000:8A2E:0370:7334',
+    '2001:0Db8:85a3:0000:0000:8A2e:0370:7334',
+    'fdfe:dcba:9876:ffff:fdc6:c46b:bb8f:7d4c',
+    'fdc6:c46b:bb8f:7d4c:fdc6:c46b:bb8f:7d4c',
+    'fdc6:c46b:bb8f:7d4c:0000:8a2e:0370:7334',
+    'fe80:0000:0000:0000:0202:b3ff:fe1e:8329',
+    'fe80:0:0:0:202:b3ff:fe1e:8329',
+    'fe80::202:b3ff:fe1e:8329',
+    '0:0:0:0:0:0:0:0',
+    '::',
+    '0::',
+    '::0',
+    '0::0',
+    // IPv4 mapped to IPv6
+    '2001:0db8:85a3:0000:0000:8a2e:0.0.0.0',
+    '::0.0.0.0',
+    '::255.255.255.255',
+    '::123.45.67.178',
 );
 
 $invalidV6Ips = array(
-  'z001:0db8:85a3:0000:0000:8a2e:0370:7334',
-  'fe80',
-  'fe80:8329',
-  'fe80:::202:b3ff:fe1e:8329',
-  'fe80::202:b3ff::fe1e:8329',
-  // IPv4 mapped to IPv6
-  '2001:0db8:85a3:0000:0000:8a2e:0370:0.0.0.0',
-  '::0.0',
-  '::0.0.0',
-  '::256.0.0.0',
-  '::0.256.0.0',
-  '::0.0.256.0',
-  '::0.0.0.256',
+    'z001:0db8:85a3:0000:0000:8a2e:0370:7334',
+    'fe80',
+    'fe80:8329',
+    'fe80:::202:b3ff:fe1e:8329',
+    'fe80::202:b3ff::fe1e:8329',
+    // IPv4 mapped to IPv6
+    '2001:0db8:85a3:0000:0000:8a2e:0370:0.0.0.0',
+    '::0.0',
+    '::0.0.0',
+    '::256.0.0.0',
+    '::0.256.0.0',
+    '::0.0.256.0',
+    '::0.0.0.256',
 );
 
 $invalidPrivateV6Ips = array(
-  'fdfe:dcba:9876:ffff:fdc6:c46b:bb8f:7d4c',
-  'fdc6:c46b:bb8f:7d4c:fdc6:c46b:bb8f:7d4c',
-  'fdc6:c46b:bb8f:7d4c:0000:8a2e:0370:7334'
+    '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->diag('testing against empty IP');
 
 $v = new sfValidatorIp(array('required' => false));
 
-foreach (array(null, '') as $ip)
-{
-  try
-  {
-    $v->clean($ip);
-    $t->pass("Empty IP is considered as valid");
-  }
-  catch (sfValidatorError $e)
-  {
-    $t->fail("Empty IP is considered as valid");
-  }
+foreach (array(null, '') as $ip) {
+    try {
+        $v->clean($ip);
+        $t->pass('Empty IP is considered as valid');
+    } catch (sfValidatorError $e) {
+        $t->fail('Empty IP is considered as valid');
+    }
 }
 
 $t->diag('testing against valid IP all');
-foreach (array_merge($validV4Ips, $validV6Ips) as $ip)
-{
-  try
-  {
-    $v->clean($ip);
-    $t->pass(sprintf("%s is considered as valid ip", $ip));
-  }
-  catch (sfValidatorError $e)
-  {
-    $t->fail(sprintf("%s is considered as valid ip", $ip));
-  }
+foreach (array_merge($validV4Ips, $validV6Ips) as $ip) {
+    try {
+        $v->clean($ip);
+        $t->pass(sprintf('%s is considered as valid ip', $ip));
+    } 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)
-{
-  $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));
+foreach (array(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) {
+            $t->fail(sprintf('%s is considered as valid ip', $ip));
+        }
     }
-    catch (sfValidatorError $e)
-    {
-      $t->fail(sprintf("%s is considered as valid ip", $ip));
-    }
-  }
 }
 
 $t->diag('testing against invalid IP all');
-foreach (array_merge($invalidV4Ips, $invalidV6Ips) as $ip)
-{
-  try
-  {
-    $v->clean($ip);
-    $t->fail(sprintf("%s is not considered as valid ip", $ip));
-  }
-  catch (sfValidatorError $e)
-  {
-    $t->pass(sprintf("%s is not considered as valid ip", $ip));
-  }
+foreach (array_merge($invalidV4Ips, $invalidV6Ips) as $ip) {
+    try {
+        $v->clean($ip);
+        $t->fail(sprintf('%s is not considered as valid ip', $ip));
+    } 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)
-{
-  $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)
-    {
-      $t->pass(sprintf("%s is not considered as valid ip", $ip));
+foreach (array(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) {
+            $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)
-{
-  $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));
+foreach (array(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) {
+            $t->pass(sprintf('%s is not considered as valid ip', $ip));
+        }
     }
-    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)
-{
-  $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)
-    {
-      $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) {
+    $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) {
+            $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)
-{
-  $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)
-    {
-      $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) {
+    $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) {
+            $t->pass(sprintf('%s is not considered as valid ip', $ip));
+        }
     }
-  }
 }
 
 $t->diag('testing against invalid private IP all');
 
 $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)
-  {
-    $t->pass(sprintf("%s is not considered as valid ip", $ip));
-  }
+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) {
+        $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);
-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)
-  {
-    $t->pass(sprintf("%s is not considered as valid ip", $ip));
-  }
+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) {
+        $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);
-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)
-  {
-    $t->pass(sprintf("%s is not considered as valid ip", $ip));
-  }
+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) {
+        $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 1882106ec..509d1292c 100644
--- a/test/unit/validator/sfValidatorNumberTest.php
+++ b/test/unit/validator/sfValidatorNumberTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(13);
 
@@ -22,67 +22,56 @@
 $t->is($v->clean(12.12345678901234), 12.12345678901234, '->clean() returns the numbers unmodified');
 $t->is($v->clean('12.12345678901234'), 12.12345678901234, '->clean() converts strings to numbers');
 
-try
-{
-  $v->clean('not a float');
-  $t->fail('->clean() throws a sfValidatorError if the value is not a number');
-}
-catch (sfValidatorError $e)
-{
-  $t->pass('->clean() throws a sfValidatorError if the value is not a number');
+try {
+    $v->clean('not a float');
+    $t->fail('->clean() throws a sfValidatorError if the value is not a number');
+} catch (sfValidatorError $e) {
+    $t->pass('->clean() throws a sfValidatorError if the value is not a number');
 }
 
 $v->setOption('required', false);
-$t->ok($v->clean(null) === null, '->clean() returns null for null values');
+$t->ok(null === $v->clean(null), '->clean() returns null for null values');
 
 $v->setOption('max', 2);
 $t->is($v->clean(1), 1, '->clean() checks the maximum number allowed');
-try
-{
-  $v->clean(3.4);
-  $t->fail('"max" option set the maximum number allowed');
-}
-catch (sfValidatorError $e)
-{
-  $t->pass('"max" option set the maximum number allowed');
+
+try {
+    $v->clean(3.4);
+    $t->fail('"max" option set the maximum number allowed');
+} catch (sfValidatorError $e) {
+    $t->pass('"max" option set the maximum number allowed');
 }
 
 $v->setMessage('max', 'Too large');
-try
-{
-  $v->clean(5);
-  $t->fail('"max" error message customization');
-}
-catch (sfValidatorError $e)
-{
-  $t->is($e->getMessage(), 'Too large', '"max" error message customization');
+
+try {
+    $v->clean(5);
+    $t->fail('"max" error message customization');
+} catch (sfValidatorError $e) {
+    $t->is($e->getMessage(), 'Too large', '"max" error message customization');
 }
 
 $v->setOption('max', null);
 
 $v->setOption('min', 3);
 $t->is($v->clean(5), 5, '->clean() checks the minimum number allowed');
-try
-{
-  $v->clean('1');
-  $t->fail('"min" option set the minimum number allowed');
-  $t->skip('', 1);
-}
-catch (sfValidatorError $e)
-{
-  $t->pass('"min" option set the minimum number allowed');
-  $t->is($e->getCode(), 'min', '->clean() throws a sfValidatorError');
+
+try {
+    $v->clean('1');
+    $t->fail('"min" option set the minimum number allowed');
+    $t->skip('', 1);
+} catch (sfValidatorError $e) {
+    $t->pass('"min" option set the minimum number allowed');
+    $t->is($e->getCode(), 'min', '->clean() throws a sfValidatorError');
 }
 
 $v->setMessage('min', 'Too small');
-try
-{
-  $v->clean(1);
-  $t->fail('"min" error message customization');
-}
-catch (sfValidatorError $e)
-{
-  $t->is($e->getMessage(), 'Too small', '"min" error message customization');
+
+try {
+    $v->clean(1);
+    $t->fail('"min" error message customization');
+} catch (sfValidatorError $e) {
+    $t->is($e->getMessage(), 'Too small', '"min" error message customization');
 }
 
 $v->setOption('min', null);
diff --git a/test/unit/validator/sfValidatorOrTest.php b/test/unit/validator/sfValidatorOrTest.php
index a1fb4ab5b..42c9a066b 100644
--- a/test/unit/validator/sfValidatorOrTest.php
+++ b/test/unit/validator/sfValidatorOrTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(18);
 
@@ -25,14 +25,12 @@
 $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');
-try
-{
-  $v = new sfValidatorOr('string');
-  $t->fail('_construct() throws an exception when passing a non supported first argument');
-}
-catch (InvalidArgumentException $e)
-{
-  $t->pass('_construct() throws an exception when passing a non supported first argument');
+
+try {
+    $v = new sfValidatorOr('string');
+    $t->fail('_construct() throws an exception when passing a non supported first argument');
+} catch (InvalidArgumentException $e) {
+    $t->pass('_construct() throws an exception when passing a non supported first argument');
 }
 
 // ->addValidator()
@@ -46,47 +44,39 @@
 $t->diag('->clean()');
 $t->is($v->clean('foo'), 'foo', '->clean() returns the string unmodified');
 
-try
-{
-  $v->setOption('required', true);
-  $v->clean(null);
-  $t->fail('->clean() throws an sfValidatorError exception if the input value is required');
-  $t->skip('', 1);
-}
-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');
+try {
+    $v->setOption('required', true);
+    $v->clean(null);
+    $t->fail('->clean() throws an sfValidatorError exception if the input value is required');
+    $t->skip('', 1);
+} 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');
 }
 
 $v1->setOption('max_length', 1);
 $v2->setOption('min_length', 5);
-try
-{
-  $v->clean('foo');
-  $t->fail('->clean() throws an sfValidatorError exception if all the validators fails');
-  $t->skip('', 3);
-}
-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');
-}
 
-try
-{
-  $v->setMessage('invalid', 'Invalid.');
-  $v->clean('foo');
-  $t->fail('->clean() throws an sfValidatorError exception if one of the validators fails');
-  $t->skip('', 2);
+try {
+    $v->clean('foo');
+    $t->fail('->clean() throws an sfValidatorError exception if all the validators fails');
+    $t->skip('', 3);
+} 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');
 }
-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');
+
+try {
+    $v->setMessage('invalid', 'Invalid.');
+    $v->clean('foo');
+    $t->fail('->clean() throws an sfValidatorError exception if one of the validators fails');
+    $t->skip('', 2);
+} 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');
 }
 
 $v1->setOption('max_length', 3);
@@ -98,9 +88,7 @@
 $v1 = new sfValidatorString(array('max_length' => 3));
 $v2 = new sfValidatorString(array('min_length' => 3));
 $v = new sfValidatorOr(array($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');
+$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.'));
-$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');
+$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 aa58574f3..64a290b7c 100644
--- a/test/unit/validator/sfValidatorPassTest.php
+++ b/test/unit/validator/sfValidatorPassTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(2);
 
diff --git a/test/unit/validator/sfValidatorRegexTest.php b/test/unit/validator/sfValidatorRegexTest.php
index 2b5df4bbe..80e5bc475 100644
--- a/test/unit/validator/sfValidatorRegexTest.php
+++ b/test/unit/validator/sfValidatorRegexTest.php
@@ -8,25 +8,23 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 function generate_regex()
 {
-  return '/^123$/';
+    return '/^123$/';
 }
 
 $t = new lime_test(11);
 
 // __construct()
 $t->diag('__construct()');
-try
-{
-  new sfValidatorRegex();
-  $t->fail('__construct() throws an RuntimeException if you don\'t pass a pattern option');
-}
-catch (RuntimeException $e)
-{
-  $t->pass('__construct() throws an RuntimeException if you don\'t pass a pattern option');
+
+try {
+    new sfValidatorRegex();
+    $t->fail('__construct() throws an RuntimeException if you don\'t pass a pattern option');
+} catch (RuntimeException $e) {
+    $t->pass('__construct() throws an RuntimeException if you don\'t pass a pattern option');
 }
 
 // ->clean()
@@ -35,43 +33,34 @@ function generate_regex()
 $v = new sfValidatorRegex(array('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)
-{
-  $t->pass('->clean() throws an sfValidatorError if the value does not match the pattern');
-  $t->is($e->getCode(), 'invalid', '->clean() throws a sfValidatorError');
+try {
+    $v->clean('symfony');
+    $t->fail('->clean() throws an sfValidatorError if the value does not match the pattern');
+    $t->skip('', 1);
+} 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));
 $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)
-{
-  $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');
+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) {
+    $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')));
 
-try
-{
-  $v->clean('123');
-  $t->pass('->clean() uses the pattern returned by a sfCallable pattern option');
-}
-catch (sfValidatorError $e)
-{
-  $t->fail('->clean() uses the pattern returned by a sfCallable pattern option');
+try {
+    $v->clean('123');
+    $t->pass('->clean() uses the pattern returned by a sfCallable pattern option');
+} catch (sfValidatorError $e) {
+    $t->fail('->clean() uses the pattern returned by a sfCallable pattern option');
 }
 
 // ->asString()
diff --git a/test/unit/validator/sfValidatorSchemaCompareTest.php b/test/unit/validator/sfValidatorSchemaCompareTest.php
index c8b79d280..04f8e3e80 100644
--- a/test/unit/validator/sfValidatorSchemaCompareTest.php
+++ b/test/unit/validator/sfValidatorSchemaCompareTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(114);
 
@@ -17,99 +17,89 @@
 // ->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),
+    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),
 
-  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)
-{
-  $v->setOption('operator', $values[1]);
-  $t->is($v->clean($values[0]), $values[0], '->clean() checks that the values match the comparison');
+    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) {
+    $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),
+    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),
 
-  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)
-{
-  $v->setOption('operator', $values[1]);
+    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) {
+    $v->setOption('operator', $values[1]);
 
-  foreach (array(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)
-    {
-      $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');
+    foreach (array(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) {
+            $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');
+        }
     }
-  }
 }
 
-try
-{
-  $v->clean('foo');
-  $t->fail('->clean() throws an InvalidArgumentException exception if the first argument is not an array of value');
-}
-catch (InvalidArgumentException $e)
-{
-  $t->pass('->clean() throws an InvalidArgumentException exception if the first argument is not an array of value');
+try {
+    $v->clean('foo');
+    $t->fail('->clean() throws an InvalidArgumentException exception if the first argument is not an array of value');
+} 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');
-try
-{
-  $v->clean(array());
-  $t->fail('->clean() throws an InvalidArgumentException exception if the operator does not exist');
-}
-catch (InvalidArgumentException $e)
-{
-  $t->pass('->clean() throws an InvalidArgumentException exception if the operator does not exist');
+
+try {
+    $v->clean(array());
+    $t->fail('->clean() throws an InvalidArgumentException exception if the operator does not exist');
+} catch (InvalidArgumentException $e) {
+    $t->pass('->clean() throws an InvalidArgumentException exception if the operator does not exist');
 }
 
 // ->asString()
diff --git a/test/unit/validator/sfValidatorSchemaFilterTest.php b/test/unit/validator/sfValidatorSchemaFilterTest.php
index 26a72b902..87bb1e5d9 100644
--- a/test/unit/validator/sfValidatorSchemaFilterTest.php
+++ b/test/unit/validator/sfValidatorSchemaFilterTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(6);
 
@@ -20,36 +20,27 @@
 $t->diag('->clean()');
 $t->is($v->clean(array('first_name' => '  foo  ')), array('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)
-{
-  $t->pass('->clean() throws a InvalidArgumentException if the input value is not an array');
+try {
+    $v->clean('string');
+    $t->fail('->clean() throws a InvalidArgumentException if the input value is not an array');
+} catch (InvalidArgumentException $e) {
+    $t->pass('->clean() throws a InvalidArgumentException if the input value is not an array');
 }
 
-try
-{
-  $v->clean(null);
-  $t->fail('->clean() throws a sfValidatorError if the embedded validator failed');
-  $t->skip('', 1);
-}
-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(null);
+    $t->fail('->clean() throws a sfValidatorError if the embedded validator failed');
+    $t->skip('', 1);
+} 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'));
-  $t->fail('->clean() throws a sfValidatorError if the embedded validator failed');
-  $t->skip('', 1);
-}
-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');
+try {
+    $v->clean(array('first_name' => 'f'));
+    $t->fail('->clean() throws a sfValidatorError if the embedded validator failed');
+    $t->skip('', 1);
+} 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 83708a608..dd8d0610b 100644
--- a/test/unit/validator/sfValidatorSchemaTest.php
+++ b/test/unit/validator/sfValidatorSchemaTest.php
@@ -8,52 +8,50 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(94);
 
 class PreValidator extends sfValidatorBase
 {
-  protected function doClean($values)
-  {
-    if (isset($values['s1']) && isset($values['s2']))
+    protected function doClean($values)
     {
-      throw new sfValidatorError($this, 's1_or_s2', array('value' => $values));
-    }
+        if (isset($values['s1'], $values['s2'])) {
+            throw new sfValidatorError($this, 's1_or_s2', array('value' => $values));
+        }
 
-    return array_map('strtoupper', $values);
-  }
+        return array_map('strtoupper', $values);
+    }
 }
 
 class PostValidator extends sfValidatorBase
 {
-  protected function doClean($values)
-  {
-    foreach ($values as $key => $value)
+    protected function doClean($values)
     {
-      $values[$key] = "*$value*";
-    }
+        foreach ($values as $key => $value) {
+            $values[$key] = "*{$value}*";
+        }
 
-    return $values;
-  }
+        return $values;
+    }
 }
 
 class Post1Validator extends sfValidatorBase
 {
-  protected function doClean($values)
-  {
-    if ($values['s1'] == $values['s2'])
-
-    throw new sfValidatorError($this, 's1_not_equal_s2', array('value' => $values));
-  }
+    protected function doClean($values)
+    {
+        if ($values['s1'] == $values['s2']) {
+            throw new sfValidatorError($this, 's1_not_equal_s2', array('value' => $values));
+        }
+    }
 }
 
 class BytesValidatorSchema extends sfValidatorSchema
 {
-  public function getBytes($value)
-  {
-    return parent::getBytes($value);
-  }
+    public function getBytes($value)
+    {
+        return parent::getBytes($value);
+    }
 }
 
 $v1 = new sfValidatorString(array('max_length' => 3));
@@ -65,14 +63,12 @@ public function getBytes($value)
 $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');
-try
-{
-  $v = new sfValidatorSchema('string');
-  $t->fail('__construct() throws an InvalidArgumentException when passing a non supported first argument');
-}
-catch (InvalidArgumentException $e)
-{
-  $t->pass('__construct() throws an InvalidArgumentException when passing a non supported first argument');
+
+try {
+    $v = new sfValidatorSchema('string');
+    $t->fail('__construct() throws an InvalidArgumentException when passing a non supported first argument');
+} catch (InvalidArgumentException $e) {
+    $t->pass('__construct() throws an InvalidArgumentException when passing a non supported first argument');
 }
 
 // implements ArrayAccess
@@ -82,14 +78,11 @@ public function getBytes($value)
 $v['s2'] = $v2;
 $t->is($v->getFields(), array('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)
-{
-  $t->pass('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) {
+    $t->pass('sfValidatorSchema implements the ArrayAccess interface for the fields');
 }
 
 $v = new sfValidatorSchema(array('s1' => $v1));
@@ -125,43 +118,35 @@ public function getBytes($value)
 
 $v = new sfValidatorSchema(array('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)
-{
-  $t->pass('->clean() throws an InvalidArgumentException exception if the first argument is not an array of value');
+try {
+    $v->clean('foo');
+    $t->fail('->clean() throws an InvalidArgumentException exception if the first argument is not an array of value');
+} 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');
 
-try
-{
-  $v->clean(array('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)
-{
-  $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');
+try {
+    $v->clean(array('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) {
+    $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');
 }
 
 $t->diag('required fields');
-try
-{
-  $v->clean(array('s1' => 'foo'));
-  $t->fail('->clean() throws an sfValidatorErrorSchema exception if a required field is not provided');
-  $t->skip('', 2);
-}
-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');
+
+try {
+    $v->clean(array('s1' => 'foo'));
+    $t->fail('->clean() throws an sfValidatorErrorSchema exception if a required field is not provided');
+    $t->skip('', 2);
+} 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');
 }
 
 // ->getPreValidator() ->setPreValidator()
@@ -171,17 +156,15 @@ public function getBytes($value)
 $v = new sfValidatorSchema(array('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'));
-  $t->fail('->clean() throws an sfValidatorErrorSchema exception if a pre-validator fails');
-  $t->skip('', 2);
-}
-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');
+
+try {
+    $v->clean(array('s1' => 'foo', 's2' => 'bar'));
+    $t->fail('->clean() throws an sfValidatorErrorSchema exception if a pre-validator fails');
+    $t->skip('', 2);
+} 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'));
@@ -198,17 +181,15 @@ public function getBytes($value)
 
 $v = new sfValidatorSchema(array('s1' => $v1, 's2' => $v2));
 $v->setPostValidator(new Post1Validator());
-try
-{
-  $v->clean(array('s1' => 'foo', 's2' => 'foo'));
-  $t->fail('->clean() throws an sfValidatorErrorSchema exception if a post-validator fails');
-  $t->skip('', 2);
-}
-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');
+
+try {
+    $v->clean(array('s1' => 'foo', 's2' => 'foo'));
+    $t->fail('->clean() throws an sfValidatorErrorSchema exception if a post-validator fails');
+    $t->skip('', 2);
+} 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));
@@ -234,157 +215,141 @@ public function getBytes($value)
 
 $t->diag('one validator fails');
 $v['s2']->setOption('max_length', 2);
-try
-{
-  $v->clean(array('s1' => 'foo', 's2' => 'bar'));
-  $t->fail('->clean() throws an sfValidatorErrorSchema exception if one of the validators fails');
-  $t->skip('', 2);
-}
-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');
+
+try {
+    $v->clean(array('s1' => 'foo', 's2' => 'bar'));
+    $t->fail('->clean() throws an sfValidatorErrorSchema exception if one of the validators fails');
+    $t->skip('', 2);
+} 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');
 }
 
 $t->diag('several validators fail');
 $v['s1']->setOption('max_length', 2);
 $v['s2']->setOption('max_length', 2);
-try
-{
-  $v->clean(array('s1' => 'foo', 's2' => 'bar'));
-  $t->fail('->clean() throws an sfValidatorErrorSchema exception if one of the validators fails');
-  $t->skip('', 3);
-}
-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');
-  $t->is($e['s1']->getCode(), 'max_length', '->clean() throws an exception with all error messages');
+
+try {
+    $v->clean(array('s1' => 'foo', 's2' => 'bar'));
+    $t->fail('->clean() throws an sfValidatorErrorSchema exception if one of the validators fails');
+    $t->skip('', 3);
+} 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');
+    $t->is($e['s1']->getCode(), 'max_length', '->clean() throws an exception with all error messages');
 }
 
 $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)),
+    'test' => new sfValidatorString(array('min_length' => 10)),
+    'left' => new sfValidatorString(array('min_length' => 2)),
+    'right' => new sfValidatorString(array('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)),
-  'embedded' => $userValidator,
+    'test' => new sfValidatorString(array('min_length' => 10)),
+    'left' => new sfValidatorString(array('min_length' => 2)),
+    'right' => new sfValidatorString(array('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)
-{
-  $validator->setOption('throw_global_error', true);
-}
-try
-{
-  $v->clean(array('test' => 'fabien', 'right' => 'bar', 'embedded' => array('test' => 'fabien', 'left' => 'oof', 'right' => 'rab')));
-  $t->skip('', 7);
+foreach (array($userValidator->getPostValidator(), $v->getPostValidator(), $v['embedded']->getPostValidator()) as $validator) {
+    $validator->setOption('throw_global_error', true);
 }
-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');
-  $t->is(count($e['embedded']->getGlobalErrors()), 1, '->clean() throws an exception with all error messages');
-  $t->is(isset($e['left']) ? $e['left']->getCode() : '', 'required', '->clean() throws an exception with all error messages');
-  $t->is(isset($e['embedded']['left']) ? $e['embedded']['left']->getCode() : '', '', '->clean() throws an exception with all error messages');
-  $t->is($e->getCode(), 'invalid test [min_length] embedded [invalid test [min_length]] left [required]', '->clean() throws an exception with all error messages');
+
+try {
+    $v->clean(array('test' => 'fabien', 'right' => 'bar', 'embedded' => array('test' => 'fabien', 'left' => 'oof', 'right' => 'rab')));
+    $t->skip('', 7);
+} 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');
+    $t->is(count($e['embedded']->getGlobalErrors()), 1, '->clean() throws an exception with all error messages');
+    $t->is(isset($e['left']) ? $e['left']->getCode() : '', 'required', '->clean() throws an exception with all error messages');
+    $t->is(isset($e['embedded']['left']) ? $e['embedded']['left']->getCode() : '', '', '->clean() throws an exception with all error messages');
+    $t->is($e->getCode(), 'invalid test [min_length] embedded [invalid test [min_length]] left [required]', '->clean() throws an exception with all error messages');
 }
 
 $t->diag('postValidator throws named errors');
-foreach (array($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')));
-  $t->skip('', 7);
+foreach (array($userValidator->getPostValidator(), $v->getPostValidator(), $v['embedded']->getPostValidator()) as $validator) {
+    $validator->setOption('throw_global_error', false);
 }
-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');
-  $t->is(count($e['embedded']->getGlobalErrors()), 0, '->clean() throws an exception with all error messages');
-  $t->is(isset($e['left']) ? $e['left']->getCode() : '', 'required invalid', '->clean() throws an exception with all error messages');
-  $t->is(isset($e['embedded']['left']) ? $e['embedded']['left']->getCode() : '', 'invalid', '->clean() throws an exception with all error messages');
-  $t->is($e->getCode(), 'test [min_length] embedded [test [min_length] left [invalid]] left [required invalid]', '->clean() throws an exception with all error messages');
+
+try {
+    $v->clean(array('test' => 'fabien', 'right' => 'bar', 'embedded' => array('test' => 'fabien', 'left' => 'oof', 'right' => 'rab')));
+    $t->skip('', 7);
+} 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');
+    $t->is(count($e['embedded']->getGlobalErrors()), 0, '->clean() throws an exception with all error messages');
+    $t->is(isset($e['left']) ? $e['left']->getCode() : '', 'required invalid', '->clean() throws an exception with all error messages');
+    $t->is(isset($e['embedded']['left']) ? $e['embedded']['left']->getCode() : '', 'invalid', '->clean() throws an exception with all error messages');
+    $t->is($e->getCode(), 'test [min_length] embedded [test [min_length] left [invalid]] left [required invalid]', '->clean() throws an exception with all error messages');
 }
 
 $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)),
+    '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)));
-try
-{
-  $v->clean(array('left' => 'foo', 'right' => 'bar', 'password' => 'oof', 'password_bis' => 'rab'));
-  $t->skip('', 3);
-}
-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');
+
+try {
+    $v->clean(array('left' => 'foo', 'right' => 'bar', 'password' => 'oof', 'password_bis' => 'rab'));
+    $t->skip('', 3);
+} 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');
 }
 
 $comparator->setOption('throw_global_error', true);
-try
-{
-  $v->clean(array('left' => 'foo', 'right' => 'bar', 'password' => 'oof', 'password_bis' => 'rab'));
-  $t->skip('', 3);
-}
-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');
+
+try {
+    $v->clean(array('left' => 'foo', 'right' => 'bar', 'password' => 'oof', 'password_bis' => 'rab'));
+    $t->skip('', 3);
+} 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)),
+    '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)),
-  'user'         => $userValidator,
+    '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)),
+    'user' => $userValidator,
 ));
 $v->setPostValidator(new sfValidatorAnd(array($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')));
-  $t->skip('', 7);
-}
-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');
-  $t->is(count($e['user']->getGlobalErrors()), 1, '->clean() throws an exception with all error messages');
-  $t->is(isset($e['user']) ? $e['user']->getCode() : '', 'invalid password [invalid]', '->clean() throws an exception with all error messages');
-  $t->is(isset($e['user']['password']) ? $e['user']['password']->getCode() : '', 'invalid', '->clean() throws an exception with all error messages');
-  $t->is($e->getCode(), 'invalid user [invalid password [invalid]] password [invalid]', '->clean() throws an exception with all error messages');
+
+try {
+    $v->clean(array('left' => 'foo', 'right' => 'bar', 'password' => 'oof', 'password_bis' => 'rab', 'user' => array('left' => 'foo', 'right' => 'bar', 'password' => 'oof', 'password_bis' => 'rab')));
+    $t->skip('', 7);
+} 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');
+    $t->is(count($e['user']->getGlobalErrors()), 1, '->clean() throws an exception with all error messages');
+    $t->is(isset($e['user']) ? $e['user']->getCode() : '', 'invalid password [invalid]', '->clean() throws an exception with all error messages');
+    $t->is(isset($e['user']['password']) ? $e['user']['password']->getCode() : '', 'invalid', '->clean() throws an exception with all error messages');
+    $t->is($e->getCode(), 'invalid user [invalid password [invalid]] password [invalid]', '->clean() throws an exception with all error messages');
 }
 
 // __clone()
@@ -394,10 +359,9 @@ public function getBytes($value)
 $f1 = $v1->getFields();
 $f = $v->getFields();
 $t->is(array_keys($f1), array_keys($f), '__clone() clones embedded validators');
-foreach ($f1 as $name => $validator)
-{
-  $t->ok($validator !== $f[$name], '__clone() clones embedded validators');
-  $t->ok($validator == $f[$name], '__clone() clones embedded validators');
+foreach ($f1 as $name => $validator) {
+    $t->ok($validator !== $f[$name], '__clone() clones embedded validators');
+    $t->ok($validator == $f[$name], '__clone() clones embedded validators');
 }
 $t->is($v1->getPreValidator(), null, '__clone() clones the pre validator');
 $t->is($v1->getPostValidator(), null, '__clone() clones the post validator');
diff --git a/test/unit/validator/sfValidatorStringTest.php b/test/unit/validator/sfValidatorStringTest.php
index 072ee267f..97fddfd12 100644
--- a/test/unit/validator/sfValidatorStringTest.php
+++ b/test/unit/validator/sfValidatorStringTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(12);
 
@@ -19,70 +19,59 @@
 $t->is($v->clean('foo'), 'foo', '->clean() returns the string unmodified');
 
 $v->setOption('required', false);
-$t->ok($v->clean(null) === '', '->clean() converts the value to a string');
-$t->ok($v->clean(1) === '1', '->clean() converts the value to a string');
+$t->ok('' === $v->clean(null), '->clean() converts the value to a string');
+$t->ok('1' === $v->clean(1), '->clean() converts the value to a string');
 
 $v->setOption('max_length', 2);
 $t->is($v->clean('fo'), 'fo', '->clean() checks the maximum length allowed');
-try
-{
-  $v->clean('foo');
-  $t->fail('"max_length" option set the maximum length of the string');
-  $t->skip('', 1);
-}
-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');
+
+try {
+    $v->clean('foo');
+    $t->fail('"max_length" option set the maximum length of the string');
+    $t->skip('', 1);
+} 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');
 }
 
 $v->setMessage('max_length', 'Too long');
-try
-{
-  $v->clean('foo');
-  $t->fail('"max_length" error message customization');
-}
-catch (sfValidatorError $e)
-{
-  $t->is($e->getMessage(), 'Too long', '"max_length" error message customization');
+
+try {
+    $v->clean('foo');
+    $t->fail('"max_length" error message customization');
+} catch (sfValidatorError $e) {
+    $t->is($e->getMessage(), 'Too long', '"max_length" error message customization');
 }
 
 $v->setOption('max_length', null);
 
 $v->setOption('min_length', 3);
 $t->is($v->clean('foo'), 'foo', '->clean() checks the minimum length allowed');
-try
-{
-  $v->clean('fo');
-  $t->fail('"min_length" option set the minimum length of the string');
-  $t->skip('', 1);
-}
-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');
+
+try {
+    $v->clean('fo');
+    $t->fail('"min_length" option set the minimum length of the string');
+    $t->skip('', 1);
+} 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');
 }
 
 $v->setMessage('min_length', 'Too short');
-try
-{
-  $v->clean('fo');
-  $t->fail('"min_length" error message customization');
-}
-catch (sfValidatorError $e)
-{
-  $t->is($e->getMessage(), 'Too short', '"min_length" error message customization');
+
+try {
+    $v->clean('fo');
+    $t->fail('"min_length" error message customization');
+} catch (sfValidatorError $e) {
+    $t->is($e->getMessage(), 'Too short', '"min_length" error message customization');
 }
 
 $v->setOption('min_length', null);
 
 $t->diag('UTF-8 support');
-if (!function_exists('mb_strlen'))
-{
-  $t->skip('UTF-8 support needs mb_strlen');
-}
-else
-{
-  $v->setOption('max_length', 4);
-  $t->is($v->clean('été'), 'été', '"sfValidatorString" supports UTF-8');
+if (!function_exists('mb_strlen')) {
+    $t->skip('UTF-8 support needs mb_strlen');
+} else {
+    $v->setOption('max_length', 4);
+    $t->is($v->clean('été'), 'été', '"sfValidatorString" supports UTF-8');
 }
diff --git a/test/unit/validator/sfValidatorTimeTest.php b/test/unit/validator/sfValidatorTimeTest.php
index 751687f59..1eb4f2d6f 100644
--- a/test/unit/validator/sfValidatorTimeTest.php
+++ b/test/unit/validator/sfValidatorTimeTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(27);
 
@@ -18,23 +18,20 @@
 $t->diag('->clean()');
 
 $v->setOption('required', false);
-$t->ok($v->clean(null) === null, '->clean() returns null if not required');
+$t->ok(null === $v->clean(null), '->clean() returns null if not required');
 
 // validate strtotime formats
 $t->diag('validate strtotime formats');
 $t->is($v->clean('16:35:12'), '16:35:12', '->clean() accepts times parsable by strtotime');
 $t->is($v->clean('+1 hour'), date('H:i:s', time() + 3600), '->clean() accepts times parsable by strtotime');
 
-try
-{
-  $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)
-{
-  $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');
+try {
+    $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) {
+    $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');
 }
 
 // validate timestamp
@@ -46,43 +43,34 @@
 $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'); 
-
-try
-{
-  $v->clean(array('hour' => '', 'minute' => 0, 'second' => 0));
-  $t->fail('->clean() throws a sfValidatorError if time date is not valid');
-  $t->skip('', 1);
-}
-catch (sfValidatorError $e)
-{
-  $t->pass('->clean() throws a sfValidatorError if the time is not valid');
-  $t->is($e->getCode(), 'invalid', '->clean() throws a sfValidatorError');
+$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');
+
+try {
+    $v->clean(array('hour' => '', 'minute' => 0, 'second' => 0));
+    $t->fail('->clean() throws a sfValidatorError if time date is not valid');
+    $t->skip('', 1);
+} 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));
-  $t->fail('->clean() throws a sfValidatorError if time date is not valid');
-  $t->skip('', 1);
-}
-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));
+    $t->fail('->clean() throws a sfValidatorError if time date is not valid');
+    $t->skip('', 1);
+} 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));
-  $t->fail('->clean() throws a sfValidatorError if the time is not valid');
-  $t->skip('', 1);
-}
-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));
+    $t->fail('->clean() throws a sfValidatorError if the time is not valid');
+    $t->skip('', 1);
+} catch (sfValidatorError $e) {
+    $t->pass('->clean() throws a sfValidatorError if the time is not valid');
+    $t->is($e->getCode(), 'invalid', '->clean() throws a sfValidatorError');
 }
 
 // validate regex
@@ -90,28 +78,23 @@
 $v->setOption('time_format', '~(?P<hour>\d{2})-(?P<minute>\d{2}).(?P<second>\d{2})~');
 $t->is($v->clean('20-10.18'), '20:10:18', '->clean() accepts a regular expression to match times');
 
-try
-{
-  $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)
-{
-  $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');
+try {
+    $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) {
+    $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');
 }
 
 $v->setOption('time_format_error', 'hh/mm/ss');
-try
-{
-  $v->clean('20.10-18');
-  $t->skip('', 1);
-}
-catch (sfValidatorError $e)
-{
-  $t->like($e->getMessage(), '/'.preg_quote('hh/mm/ss', '/').'/', '->clean() returns the expected time format error if provided');
+
+try {
+    $v->clean('20.10-18');
+    $t->skip('', 1);
+} catch (sfValidatorError $e) {
+    $t->like($e->getMessage(), '/'.preg_quote('hh/mm/ss', '/').'/', '->clean() returns the expected time format error if provided');
 }
 
 $v->setOption('time_format', null);
@@ -124,19 +107,15 @@
 // required
 $v = new sfValidatorTime();
 foreach (array(
-  array('hour' => '', 'minute' => '', 'second' => ''),
-  array('hour' => null, 'minute' => null, 'second' => null),
-  '',
-  null,
-) as $input)
-{
-  try
-  {
-    $v->clean($input);
-    $t->fail('->clean() throws an exception if the time is empty and required is true');
-  }
-  catch (sfValidatorError $e)
-  {
-    $t->pass('->clean() throws an exception if the time is empty and required is true');
-  }
+    array('hour' => '', 'minute' => '', 'second' => ''),
+    array('hour' => null, 'minute' => null, 'second' => null),
+    '',
+    null,
+) as $input) {
+    try {
+        $v->clean($input);
+        $t->fail('->clean() throws an exception if the time is empty and required is true');
+    } 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 9d1a083b6..754b61fd4 100644
--- a/test/unit/validator/sfValidatorUrlTest.php
+++ b/test/unit/validator/sfValidatorUrlTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(15);
 
@@ -17,45 +17,37 @@
 // ->clean()
 $t->diag('->clean()');
 foreach (array(
-  'http://www.google.com',
-  'https://google.com/',
-  'https://google.com:80/',
-  'http://www.symfony-project.com/',
-  'http://127.0.0.1/',
-  'http://127.0.0.1:80/',
-  'ftp://google.com/foo.tgz', 
-  'ftps://google.com/foo.tgz', 
-) as $url)
-{
-  $t->is($v->clean($url), $url, '->clean() checks that the value is a valid URL');
+    'http://www.google.com',
+    'https://google.com/',
+    'https://google.com:80/',
+    'http://www.symfony-project.com/',
+    'http://127.0.0.1/',
+    'http://127.0.0.1:80/',
+    'ftp://google.com/foo.tgz',
+    'ftps://google.com/foo.tgz', ) as $url) {
+    $t->is($v->clean($url), $url, '->clean() checks that the value is a valid URL');
 }
 
 foreach (array(
-  'google.com',
-  'http:/google.com',
-  'http://google.com::aa',
-) 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)
-  {
-    $t->pass('->clean() throws an sfValidatorError if the value is not a valid URL');
-    $t->is($e->getCode(), 'invalid', '->clean() throws a sfValidatorError');
-  }
+    'google.com',
+    'http:/google.com',
+    'http://google.com::aa',
+) 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) {
+        $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')));
-try
-{
-  $v->clean('ftp://google.com/foo.tgz');
-  $t->fail('->clean() only allows protocols specified in the protocols option');
-}
-catch (sfValidatorError $e)
-{
-  $t->pass('->clean() only allows protocols specified in the protocols option');
+
+try {
+    $v->clean('ftp://google.com/foo.tgz');
+    $t->fail('->clean() only allows protocols specified in the protocols option');
+} 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 4d115cc55..24f004c57 100644
--- a/test/unit/view/sfViewCacheManagerTest.php
+++ b/test/unit/view/sfViewCacheManagerTest.php
@@ -8,35 +8,35 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
-require_once($_test_dir.'/unit/sfContextMock.class.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
+
+require_once $_test_dir.'/unit/sfContextMock.class.php';
 
 $t = new lime_test(41);
 
 function get_cache_manager($context)
 {
-  myCache::clear();
-  $m = new myViewCacheManager($context, new myCache());
+    myCache::clear();
 
-  return $m;
+    return new myViewCacheManager($context, new myCache());
 }
 
 function get_cache_config($contextual = false)
 {
-  return array(
-    'withLayout'     => false,
-    'lifeTime'       => 86400,
-    'clientLifeTime' => 86400,
-    'contextual'     => $contextual,
-    'vary'           => array(),
-  );
+    return array(
+        'withLayout' => false,
+        'lifeTime' => 86400,
+        'clientLifeTime' => 86400,
+        'contextual' => $contextual,
+        'vary' => array(),
+    );
 }
 
 class myViewCacheManager extends sfViewCacheManager
 {
-  public function registerConfiguration($moduleName)
-  {
-  }
+    public function registerConfiguration($moduleName)
+    {
+    }
 }
 
 class myController extends sfWebController
@@ -45,98 +45,96 @@ class myController extends sfWebController
 
 class myRequest
 {
-  public $getParameters = array('page' => 5, 'sort' => 'asc');
-
-  public function getHost()
-  {
-    return 'localhost';
-  }
-
-  public function getScriptName()
-  {
-    return 'index.php';
-  }
-
-  public function getHttpHeader($headerName)
-  {
-    return '/foo#|#/bar/';
-  }
-
-  public function getGetParameters()
-  {
-    return $this->getParameters;
-  }
+    public $getParameters = array('page' => 5, 'sort' => 'asc');
+
+    public function getHost()
+    {
+        return 'localhost';
+    }
+
+    public function getScriptName()
+    {
+        return 'index.php';
+    }
+
+    public function getHttpHeader($headerName)
+    {
+        return '/foo#|#/bar/';
+    }
+
+    public function getGetParameters()
+    {
+        return $this->getParameters;
+    }
 }
 
 class myCache extends sfCache
 {
-  static public $cache = array();
-
-  public function initialize($parameters = array())
-  {
-  }
-
-  public function get($key, $default = null)
-  {
-    return isset(self::$cache[$key]) ? self::$cache[$key] : $default;
-  }
-
-  public function has($key)
-  {
-    return isset(self::$cache[$key]);
-  }
-
-  public function set($key, $data, $lifetime = null)
-  {
-    self::$cache[$key] = $data;
-  }
-
-  public function remove($key)
-  {
-    unset(self::$cache[$key]);
-  }
-
-  public function removePattern($pattern, $delimiter = ':')
-  {
-    $pattern = '#^' . str_replace('*', '.*', $pattern) . '$#';
-    foreach(self::$cache as $key => $value)
+    public static $cache = array();
+
+    public function initialize($parameters = array())
+    {
+    }
+
+    public function get($key, $default = null)
+    {
+        return isset(self::$cache[$key]) ? self::$cache[$key] : $default;
+    }
+
+    public function has($key)
+    {
+        return isset(self::$cache[$key]);
+    }
+
+    public function set($key, $data, $lifetime = null)
+    {
+        self::$cache[$key] = $data;
+    }
+
+    public function remove($key)
     {
-      if(preg_match($pattern, $key))
-      {
         unset(self::$cache[$key]);
-      }
     }
-  }
-
-  public function clean($mode = sfCache::ALL)
-  {
-    self::$cache = array();
-  }
-
-  public function getTimeout($key)
-  {
-    return time() - 60;
-  }
-
-  public function getLastModified($key)
-  {
-    return time() - 600;
-  }
-
-  static public function clear()
-  {
-    self::$cache = array();
-  }
+
+    public function removePattern($pattern, $delimiter = ':')
+    {
+        $pattern = '#^'.str_replace('*', '.*', $pattern).'$#';
+        foreach (self::$cache as $key => $value) {
+            if (preg_match($pattern, $key)) {
+                unset(self::$cache[$key]);
+            }
+        }
+    }
+
+    public function clean($mode = sfCache::ALL)
+    {
+        self::$cache = array();
+    }
+
+    public function getTimeout($key)
+    {
+        return time() - 60;
+    }
+
+    public function getLastModified($key)
+    {
+        return time() - 600;
+    }
+
+    public static function clear()
+    {
+        self::$cache = array();
+    }
 }
 
 class myRouting extends sfPatternRouting
 {
-  public $currentInternalUri = 'currentModule/currentAction?currentKey=currentValue';
+    public $currentInternalUri = 'currentModule/currentAction?currentKey=currentValue';
 
-  public function getCurrentInternalUri($with_route_name = false)
-  {
-    return $this->currentInternalUri;
-  }
+    public function getCurrentInternalUri($with_route_name = false)
+    {
+        return $this->currentInternalUri;
+    }
 }
 
 $context = sfContext::getInstance(array('controller' => 'myController', 'routing' => 'myRouting', 'request' => 'myRequest'));
@@ -158,32 +156,25 @@ public function getCurrentInternalUri($with_route_name = false)
 $t->is($m->generateCacheKey('mymodule/myaction?key1=value1&key2=value2'), '/localhost/all/mymodule/myaction/key1/value1/key2/value2', '->generateCacheKey() includes request parameters as key/value pairs');
 $t->is($m->generateCacheKey('mymodule/myaction?akey=value1&ckey=value2&bkey=value3'), '/localhost/all/mymodule/myaction/akey/value1/bkey/value3/ckey/value2', '->generateCacheKey() reorders request parameters alphabetically');
 
-try
-{
-  $m->generateCacheKey('@rule?key=value');
-  $t->fail('->generateCacheKey() throws an sfException when passed an internal URI with a rule');
-}
-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)
-{
-  $t->fail('->generateCacheKey() does not throw an sfException when passed an internal URI with a @sf_cache_partial rule');
+try {
+    $m->generateCacheKey('@rule?key=value');
+    $t->fail('->generateCacheKey() throws an sfException when passed an internal URI with a rule');
+} catch (sfException $e) {
+    $t->pass('->generateCacheKey() throws an sfException when passed an internal URI with a 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');
+
+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) {
+    $t->fail('->generateCacheKey() does not throw an sfException when passed an internal URI with a @sf_cache_partial rule');
 }
-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');
+
+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) {
+    $t->pass('->generateCacheKey() throws an sfException when passed an internal URI with a @sf_cache_partial rule with no module or action param');
 }
 
 $t->is($m->generateCacheKey('@sf_cache_partial?module=foo&action=bar&sf_cache_key=value'), '/localhost/all/sf_cache_partial/foo/bar/sf_cache_key/value', '->generateCacheKey() can deal with internal URIs to partials');
diff --git a/test/unit/view/sfViewParameterHolderTest.php b/test/unit/view/sfViewParameterHolderTest.php
index f6ffbf749..743007538 100644
--- a/test/unit/view/sfViewParameterHolderTest.php
+++ b/test/unit/view/sfViewParameterHolderTest.php
@@ -3,34 +3,35 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.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($_test_dir.'/unit/sfContextMock.class.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
+
+require_once $_test_dir.'/unit/sfContextMock.class.php';
 
 $t = new lime_test(21);
 
 define('ESC_SPECIALCHARS', 'esc_specialchars');
 function esc_specialchars($value)
 {
-  return "-ESCAPED-$value-ESCAPED-";
+    return "-ESCAPED-{$value}-ESCAPED-";
 }
 
 define('ESC_RAW', 'esc_raw');
 function esc_raw($value)
 {
-  return $value;
+    return $value;
 }
 
 class myRequest
 {
-  public function getParameterHolder()
-  {
-    return new sfParameterHolder();
-  }
+    public function getParameterHolder()
+    {
+        return new sfParameterHolder();
+    }
 }
 
 $context = sfContext::getInstance();
@@ -69,15 +70,12 @@ public function getParameterHolder()
 $p->setEscapingMethod('');
 $t->is($p->getEscapingMethod(), '', '->getEscapingMethod() returns an empty value if the method is empty');
 
-try
-{
-  $p->setEscapingMethod('nonexistant');
-  $p->getEscapingMethod();
-  $t->fail('->getEscapingMethod() throws an InvalidArgumentException if the escaping method does not exist');
-}
-catch (InvalidArgumentException $e)
-{
-  $t->pass('->getEscapingMethod() throws an InvalidArgumentException if the escaping method does not exist');
+try {
+    $p->setEscapingMethod('nonexistant');
+    $p->getEscapingMethod();
+    $t->fail('->getEscapingMethod() throws an InvalidArgumentException if the escaping method does not exist');
+} catch (InvalidArgumentException $e) {
+    $t->pass('->getEscapingMethod() throws an InvalidArgumentException if the escaping method does not exist');
 }
 
 // ->toArray()
@@ -89,15 +87,12 @@ public function getParameterHolder()
 // escaping strategies
 $p = new sfViewParameterHolder(new sfEventDispatcher(), array('foo' => 'bar'));
 
-try
-{
-  $p->setEscaping('null');
-  $p->toArray();
-  $t->fail('->toArray() throws an InvalidArgumentException if the escaping strategy does not exist');
-}
-catch (InvalidArgumentException $e)
-{
-  $t->pass('->toArray() throws an InvalidArgumentException if the escaping strategy does not exist');
+try {
+    $p->setEscaping('null');
+    $p->toArray();
+    $t->fail('->toArray() throws an InvalidArgumentException if the escaping strategy does not exist');
+} catch (InvalidArgumentException $e) {
+    $t->pass('->toArray() throws an InvalidArgumentException if the escaping strategy does not exist');
 }
 
 $t->diag('Escaping strategy to on');
diff --git a/test/unit/view/sfViewTest.php b/test/unit/view/sfViewTest.php
index 450aede22..69e8b1d7e 100644
--- a/test/unit/view/sfViewTest.php
+++ b/test/unit/view/sfViewTest.php
@@ -3,34 +3,46 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.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($_test_dir.'/unit/sfContextMock.class.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
+
+require_once $_test_dir.'/unit/sfContextMock.class.php';
 
 $t = new lime_test(19);
 
 class myView extends sfView
 {
-  function execute() {}
-  function configure() {}
-  function getEngine() {}
-  function render() {}
+    public function execute()
+    {
+    }
+
+    public function configure()
+    {
+    }
+
+    public function getEngine()
+    {
+    }
+
+    public function render()
+    {
+    }
 }
 
 class configuredView extends myView
 {
-  static public $isDecorated = false;
+    public static $isDecorated = false;
 
-  function initialize($context, $moduleName, $actionName, $viewName)
-  {
-    $this->setDecorator(self::$isDecorated);
+    public function initialize($context, $moduleName, $actionName, $viewName)
+    {
+        $this->setDecorator(self::$isDecorated);
 
-    parent::initialize($context, $moduleName, $actionName, $viewName);
-  }
+        parent::initialize($context, $moduleName, $actionName, $viewName);
+    }
 }
 
 $context = sfContext::getInstance(array('request' => 'sfWebRequest', 'response' => 'sfWebResponse'));
@@ -63,19 +75,19 @@ function initialize($context, $moduleName, $actionName, $viewName)
 $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');
+require_once $_test_dir.'/unit/sfParameterHolderTest.class.php';
 $pht = new sfParameterHolderProxyTest($t);
 $pht->launchTests($view, 'parameter');
 
 // new methods via sfEventDispatcher
-require_once($_test_dir.'/unit/sfEventDispatcherTest.class.php');
+require_once $_test_dir.'/unit/sfEventDispatcherTest.class.php';
 $dispatcherTest = new sfEventDispatcherTest($t);
 $dispatcherTest->launchTests($context->getEventDispatcher(), $view, 'view');
 
 function configure_format(sfEvent $event)
 {
-  $event->getSubject()->setDecorator(true);
-  $event['response']->setContentType('application/javascript');
+    $event->getSubject()->setDecorator(true);
+    $event['response']->setContentType('application/javascript');
 
-  return true;
+    return true;
 }
diff --git a/test/unit/widget/i18n/sfWidgetFormI18nChoiceCountryTest.php b/test/unit/widget/i18n/sfWidgetFormI18nChoiceCountryTest.php
index b0187961d..af98334e4 100644
--- a/test/unit/widget/i18n/sfWidgetFormI18nChoiceCountryTest.php
+++ b/test/unit/widget/i18n/sfWidgetFormI18nChoiceCountryTest.php
@@ -8,23 +8,21 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../../bootstrap/unit.php');
+require_once __DIR__.'/../../../bootstrap/unit.php';
 
 $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')));
-  $t->fail('->configure() throws an InvalidArgumentException if a country does not exist');
-}
-catch (InvalidArgumentException $e)
-{
-  $t->pass('->configure() throws an InvalidArgumentException if a country does not exist');
+
+try {
+    new sfWidgetFormI18nChoiceCountry(array('culture' => 'en', 'countries' => array('EN')));
+    $t->fail('->configure() throws an InvalidArgumentException if a country does not exist');
+} 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')));
diff --git a/test/unit/widget/i18n/sfWidgetFormI18nChoiceCurrencyTest.php b/test/unit/widget/i18n/sfWidgetFormI18nChoiceCurrencyTest.php
index 367dc3b8b..75757b805 100644
--- a/test/unit/widget/i18n/sfWidgetFormI18nChoiceCurrencyTest.php
+++ b/test/unit/widget/i18n/sfWidgetFormI18nChoiceCurrencyTest.php
@@ -8,23 +8,21 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../../bootstrap/unit.php');
+require_once __DIR__.'/../../../bootstrap/unit.php';
 
 $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')));
-  $t->fail('->configure() throws an InvalidArgumentException if a currency does not exist');
-}
-catch (InvalidArgumentException $e)
-{
-  $t->pass('->configure() throws an InvalidArgumentException if a currency does not exist');
+
+try {
+    new sfWidgetFormI18nChoiceCurrency(array('culture' => 'en', 'currencies' => array('xx')));
+    $t->fail('->configure() throws an InvalidArgumentException if a currency does not exist');
+} 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')));
diff --git a/test/unit/widget/i18n/sfWidgetFormI18nChoiceLanguageTest.php b/test/unit/widget/i18n/sfWidgetFormI18nChoiceLanguageTest.php
index c954d7c4b..a5f477c1c 100644
--- a/test/unit/widget/i18n/sfWidgetFormI18nChoiceLanguageTest.php
+++ b/test/unit/widget/i18n/sfWidgetFormI18nChoiceLanguageTest.php
@@ -8,23 +8,21 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../../bootstrap/unit.php');
+require_once __DIR__.'/../../../bootstrap/unit.php';
 
 $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')));
-  $t->fail('->configure() throws an InvalidArgumentException if a language does not exist');
-}
-catch (InvalidArgumentException $e)
-{
-  $t->pass('->configure() throws an InvalidArgumentException if a language does not exist');
+
+try {
+    new sfWidgetFormI18nChoiceLanguage(array('culture' => 'en', 'languages' => array('xx')));
+    $t->fail('->configure() throws an InvalidArgumentException if a language does not exist');
+} 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')));
diff --git a/test/unit/widget/i18n/sfWidgetFormI18nChoiceTimezoneTest.php b/test/unit/widget/i18n/sfWidgetFormI18nChoiceTimezoneTest.php
index 99d4903ef..7447df752 100644
--- a/test/unit/widget/i18n/sfWidgetFormI18nChoiceTimezoneTest.php
+++ b/test/unit/widget/i18n/sfWidgetFormI18nChoiceTimezoneTest.php
@@ -8,11 +8,11 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../../bootstrap/unit.php');
+require_once __DIR__.'/../../../bootstrap/unit.php';
 
 $t = new lime_test(4);
 
-$dom = new DomDocument('1.0', 'utf-8');
+$dom = new DOMDocument('1.0', 'utf-8');
 $dom->validateOnParse = true;
 
 // ->render()
diff --git a/test/unit/widget/i18n/sfWidgetFormI18nDateTest.php b/test/unit/widget/i18n/sfWidgetFormI18nDateTest.php
index 8c11d2b63..d4e0a8408 100644
--- a/test/unit/widget/i18n/sfWidgetFormI18nDateTest.php
+++ b/test/unit/widget/i18n/sfWidgetFormI18nDateTest.php
@@ -8,11 +8,11 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../../bootstrap/unit.php');
+require_once __DIR__.'/../../../bootstrap/unit.php';
 
 $t = new lime_test(7);
 
-$dom = new DomDocument('1.0', 'utf-8');
+$dom = new DOMDocument('1.0', 'utf-8');
 $dom->validateOnParse = true;
 
 // ->configure()
@@ -37,12 +37,9 @@
 $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'));
-  $t->fail('->configure() throws an InvalidArgumentException if the month_format type does not exist');
-}
-catch (InvalidArgumentException $e)
-{
-  $t->pass('->configure() throws an InvalidArgumentException if the month_format type does not exist');
+try {
+    new sfWidgetFormI18nDate(array('culture' => 'fr', 'month_format' => 'nonexistant'));
+    $t->fail('->configure() throws an InvalidArgumentException if the month_format type does not exist');
+} 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 a12d4901b..897b37748 100644
--- a/test/unit/widget/i18n/sfWidgetFormI18nDateTimeTest.php
+++ b/test/unit/widget/i18n/sfWidgetFormI18nDateTimeTest.php
@@ -8,11 +8,11 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../../bootstrap/unit.php');
+require_once __DIR__.'/../../../bootstrap/unit.php';
 
 $t = new lime_test(1);
 
-$dom = new DomDocument('1.0', 'utf-8');
+$dom = new DOMDocument('1.0', 'utf-8');
 $dom->validateOnParse = true;
 
 // ->configure()
diff --git a/test/unit/widget/i18n/sfWidgetFormI18nTimeTest.php b/test/unit/widget/i18n/sfWidgetFormI18nTimeTest.php
index 75f37bf73..32e7e0a66 100644
--- a/test/unit/widget/i18n/sfWidgetFormI18nTimeTest.php
+++ b/test/unit/widget/i18n/sfWidgetFormI18nTimeTest.php
@@ -8,11 +8,11 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../../bootstrap/unit.php');
+require_once __DIR__.'/../../../bootstrap/unit.php';
 
 $t = new lime_test(4);
 
-$dom = new DomDocument('1.0', 'utf-8');
+$dom = new DOMDocument('1.0', 'utf-8');
 $dom->validateOnParse = true;
 
 // ->configure()
diff --git a/test/unit/widget/sfWidgetFormChoiceTest.php b/test/unit/widget/sfWidgetFormChoiceTest.php
index eb3c90a54..86a5f02c6 100644
--- a/test/unit/widget/sfWidgetFormChoiceTest.php
+++ b/test/unit/widget/sfWidgetFormChoiceTest.php
@@ -8,21 +8,23 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 class FormFormatterStub extends sfWidgetFormSchemaFormatter
 {
-  public function __construct() {}
-
-  public function translate($subject, $parameters = array())
-  {
-    return sprintf('translation[%s]', $subject);
-  }
+    public function __construct()
+    {
+    }
+
+    public function translate($subject, $parameters = array())
+    {
+        return sprintf('translation[%s]', $subject);
+    }
 }
 
 $t = new lime_test(19);
 
-$dom = new DomDocument('1.0', 'utf-8');
+$dom = new DOMDocument('1.0', 'utf-8');
 $dom->validateOnParse = true;
 
 // ->getRenderer()
@@ -38,20 +40,20 @@ public function translate($subject, $parameters = array())
 
 class MyWidget extends sfWidgetFormChoice
 {
-  public function render($name, $value = null, $attributes = array(), $errors = array())
-  {
-    return null;
-  }
-
-  public function getJavaScripts()
-  {
-    return array('/path/to/a/file.js');
-  }
-
-  public function getStylesheets()
-  {
-    return array('/path/to/a/file.css' => 'all');
-  }
+    public function render($name, $value = null, $attributes = array(), $errors = array())
+    {
+        return null;
+    }
+
+    public function getJavaScripts()
+    {
+        return array('/path/to/a/file.js');
+    }
+
+    public function getStylesheets()
+    {
+        return array('/path/to/a/file.css' => 'all');
+    }
 }
 
 $w->setOption('renderer_class', 'MyWidget');
diff --git a/test/unit/widget/sfWidgetFormDateRangeTest.php b/test/unit/widget/sfWidgetFormDateRangeTest.php
index a0278a817..5e273bdbb 100644
--- a/test/unit/widget/sfWidgetFormDateRangeTest.php
+++ b/test/unit/widget/sfWidgetFormDateRangeTest.php
@@ -8,32 +8,36 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 class FormFormatterMock extends sfWidgetFormSchemaFormatter
 {
-  public $translateSubjects = array();
+    public $translateSubjects = array();
 
-  public function __construct() {}
+    public function __construct()
+    {
+    }
 
-  public function translate($subject, $parameters = array())
-  {
-    $this->translateSubjects[] = $subject;
-    return sprintf('translation[%s]', $subject);
-  }
+    public function translate($subject, $parameters = array())
+    {
+        $this->translateSubjects[] = $subject;
+
+        return sprintf('translation[%s]', $subject);
+    }
 }
 
 class WidgetFormStub extends sfWidget
 {
-  public function __construct() {}
-
-  public function render($name, $value = null, $attributes = array(), $errors = array())
-  {
-    return sprintf('##%s##', __CLASS__);
-  }
+    public function __construct()
+    {
+    }
+
+    public function render($name, $value = null, $attributes = array(), $errors = array())
+    {
+        return sprintf('##%s##', __CLASS__);
+    }
 }
 
-
 $t = new lime_test(2);
 
 // ->render()
diff --git a/test/unit/widget/sfWidgetFormDateTest.php b/test/unit/widget/sfWidgetFormDateTest.php
index 85d62d113..bd4dd4f4f 100644
--- a/test/unit/widget/sfWidgetFormDateTest.php
+++ b/test/unit/widget/sfWidgetFormDateTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $year = date('Y');
 
@@ -16,25 +16,24 @@
 
 $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)
-{
-  $dom->loadHTML($w->render('foo', $date));
-  $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');
-  $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');
+    $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) {
+    $dom->loadHTML($w->render('foo', $date));
+    $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');
+    $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');
 }
 
 // pre-epoch date
diff --git a/test/unit/widget/sfWidgetFormDateTimeTest.php b/test/unit/widget/sfWidgetFormDateTimeTest.php
index 582ec0625..5143de336 100644
--- a/test/unit/widget/sfWidgetFormDateTimeTest.php
+++ b/test/unit/widget/sfWidgetFormDateTimeTest.php
@@ -8,13 +8,13 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $year = date('Y');
 
 $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)));
@@ -23,21 +23,20 @@
 $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)
-{
-  $dom->loadHTML($w->render('foo', $date));
-  $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');
-  $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');
-  $t->is($css->matchSingle('#foo_hour option[value="'.$values['hour'].'"][selected="selected"]')->getValue(), $values['hour'], '->render() renders a select tag for the hour');
-  $t->is($css->matchSingle('#foo_minute option[value="'.$values['minute'].'"][selected="selected"]')->getValue(), $values['minute'], '->render() renders a select tag for the minute');
-  $t->is($css->matchSingle('#foo_second option[value="'.$values['second'].'"][selected="selected"]')->getValue(), $values['second'], '->render() renders a select tag for the second');
+    $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) {
+    $dom->loadHTML($w->render('foo', $date));
+    $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');
+    $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');
+    $t->is($css->matchSingle('#foo_hour option[value="'.$values['hour'].'"][selected="selected"]')->getValue(), $values['hour'], '->render() renders a select tag for the hour');
+    $t->is($css->matchSingle('#foo_minute option[value="'.$values['minute'].'"][selected="selected"]')->getValue(), $values['minute'], '->render() renders a select tag for the minute');
+    $t->is($css->matchSingle('#foo_second option[value="'.$values['second'].'"][selected="selected"]')->getValue(), $values['second'], '->render() renders a select tag for the second');
 }
 
 // selected date / time
@@ -112,14 +111,12 @@
 // date and time options as array
 $t->diag('date and time options as array');
 $w = new sfWidgetFormDateTime(array('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)
-{
-  $t->pass('__construct() throws a InvalidArgumentException if the date/time options is not an array');
+
+try {
+    $w->render('foo');
+    $t->fail('__construct() throws a InvalidArgumentException if the date/time options is not an array');
+} catch (InvalidArgumentException $e) {
+    $t->pass('__construct() throws a InvalidArgumentException if the date/time options is not an array');
 }
 
 // attributes
diff --git a/test/unit/widget/sfWidgetFormFilterDateTest.php b/test/unit/widget/sfWidgetFormFilterDateTest.php
index 62a1a2f7b..653fdad05 100644
--- a/test/unit/widget/sfWidgetFormFilterDateTest.php
+++ b/test/unit/widget/sfWidgetFormFilterDateTest.php
@@ -8,31 +8,35 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 class FormFormatterStub extends sfWidgetFormSchemaFormatter
 {
-  public function __construct() {}
-
-  public function translate($subject, $parameters = array())
-  {
-    return sprintf('translation[%s]', $subject);
-  }
+    public function __construct()
+    {
+    }
+
+    public function translate($subject, $parameters = array())
+    {
+        return sprintf('translation[%s]', $subject);
+    }
 }
 
 class WidgetFormStub extends sfWidget
 {
-  public function __construct() {}
-
-  public function render($name, $value = null, $attributes = array(), $errors = array())
-  {
-    return sprintf('##%s##', __CLASS__);
-  }
+    public function __construct()
+    {
+    }
+
+    public function render($name, $value = null, $attributes = array(), $errors = array())
+    {
+        return sprintf('##%s##', __CLASS__);
+    }
 }
 
 $t = new lime_test(1);
 
-$dom = new DomDocument('1.0', 'utf-8');
+$dom = new DOMDocument('1.0', 'utf-8');
 $dom->validateOnParse = true;
 
 // ->render()
@@ -46,4 +50,3 @@ public function render($name, $value = null, $attributes = array(), $errors = ar
 $dom->loadHTML($w->render('foo'));
 $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 94a3cbab0..0b2fbd7d5 100644
--- a/test/unit/widget/sfWidgetFormFilterInputTest.php
+++ b/test/unit/widget/sfWidgetFormFilterInputTest.php
@@ -8,21 +8,23 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 class FormFormatterStub extends sfWidgetFormSchemaFormatter
 {
-  public function __construct() {}
-
-  public function translate($subject, $parameters = array())
-  {
-    return sprintf('translation[%s]', $subject);
-  }
+    public function __construct()
+    {
+    }
+
+    public function translate($subject, $parameters = array())
+    {
+        return sprintf('translation[%s]', $subject);
+    }
 }
 
 $t = new lime_test(1);
 
-$dom = new DomDocument('1.0', 'utf-8');
+$dom = new DOMDocument('1.0', 'utf-8');
 $dom->validateOnParse = true;
 
 // ->render()
@@ -36,4 +38,3 @@ public function translate($subject, $parameters = array())
 $dom->loadHTML($w->render('foo'));
 $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 3d6f4af8f..e7e0c14a7 100644
--- a/test/unit/widget/sfWidgetFormInputCheckboxTest.php
+++ b/test/unit/widget/sfWidgetFormInputCheckboxTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(7);
 
@@ -25,4 +25,3 @@
 $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', '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 0d2ea3646..6978b74f4 100644
--- a/test/unit/widget/sfWidgetFormInputFileEditableTest.php
+++ b/test/unit/widget/sfWidgetFormInputFileEditableTest.php
@@ -8,16 +8,18 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 class FormFormatterStub extends sfWidgetFormSchemaFormatter
 {
-  public function __construct() {}
+    public function __construct()
+    {
+    }
 
-  public function translate($subject, $parameters = array())
-  {
-    return sprintf('translation[%s]', $subject);
-  }
+    public function translate($subject, $parameters = array())
+    {
+        return sprintf('translation[%s]', $subject);
+    }
 }
 
 $t = new lime_test(7);
@@ -25,33 +27,30 @@ public function translate($subject, $parameters = array())
 // ->render()
 $t->diag('->render()');
 
-try
-{
-  new sfWidgetFormInputFileEditable();
-  $t->fail('->render() throws an exception if you don\' pass a "file_src" option.');
-}
-catch (RuntimeException $e)
-{
-  $t->pass('->render() throws an exception if you don\' pass a "file_src" option.');
+try {
+    new sfWidgetFormInputFileEditable();
+    $t->fail('->render() throws an exception if you don\' pass a "file_src" option.');
+} catch (RuntimeException $e) {
+    $t->pass('->render() throws an exception if you don\' pass a "file_src" option.');
 }
 
 $w = new sfWidgetFormInputFileEditable(array(
-  'file_src' => '-foo-',
+    '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(
-  'file_src' => '-foo-',
-  'with_delete' => false,
+    '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(
-  'file_src' => '-foo-',
-  'delete_label' => 'delete',
+    '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');
 
@@ -60,21 +59,21 @@ public function translate($subject, $parameters = array())
 $ws->addFormFormatter('stub', new FormFormatterStub());
 $ws->setFormFormatterName('stub');
 $w = new sfWidgetFormInputFileEditable(array(
-  'file_src' => '-foo-',
+    '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(
-  'file_src' => '-foo-',
-  'is_image' => true,
+    '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(
-  'file_src' => '-foo-',
-  'template' => '%input%',
+    '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 cc83e6571..666fc8abb 100644
--- a/test/unit/widget/sfWidgetFormInputFileMultiTest.php
+++ b/test/unit/widget/sfWidgetFormInputFileMultiTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(1);
 
@@ -9,5 +9,3 @@
 // ->render()
 $t->diag('->render() multiple file upload');
 $t->is($w->render('foo'), '<input type="file" name="foo[]" multiple="1" id="foo" />', '->render() renders the widget as HTML');
-
-
diff --git a/test/unit/widget/sfWidgetFormInputFileTest.php b/test/unit/widget/sfWidgetFormInputFileTest.php
index 60d994132..5053c385c 100644
--- a/test/unit/widget/sfWidgetFormInputFileTest.php
+++ b/test/unit/widget/sfWidgetFormInputFileTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(1);
 
diff --git a/test/unit/widget/sfWidgetFormInputHiddenTest.php b/test/unit/widget/sfWidgetFormInputHiddenTest.php
index 7bb3cfbcd..abbc2a6fe 100644
--- a/test/unit/widget/sfWidgetFormInputHiddenTest.php
+++ b/test/unit/widget/sfWidgetFormInputHiddenTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(2);
 
diff --git a/test/unit/widget/sfWidgetFormInputPasswordTest.php b/test/unit/widget/sfWidgetFormInputPasswordTest.php
index 12755af4b..07c5bf99e 100644
--- a/test/unit/widget/sfWidgetFormInputPasswordTest.php
+++ b/test/unit/widget/sfWidgetFormInputPasswordTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(3);
 
diff --git a/test/unit/widget/sfWidgetFormInputReadTest.php b/test/unit/widget/sfWidgetFormInputReadTest.php
index 7a662e1a0..f5702dc88 100644
--- a/test/unit/widget/sfWidgetFormInputReadTest.php
+++ b/test/unit/widget/sfWidgetFormInputReadTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(6);
 
diff --git a/test/unit/widget/sfWidgetFormInputTextTest.php b/test/unit/widget/sfWidgetFormInputTextTest.php
index c3412a9c8..8c59f4668 100644
--- a/test/unit/widget/sfWidgetFormInputTextTest.php
+++ b/test/unit/widget/sfWidgetFormInputTextTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(5);
 
diff --git a/test/unit/widget/sfWidgetFormSchemaDecoratorTest.php b/test/unit/widget/sfWidgetFormSchemaDecoratorTest.php
index 1efd9914e..50b52fc98 100644
--- a/test/unit/widget/sfWidgetFormSchemaDecoratorTest.php
+++ b/test/unit/widget/sfWidgetFormSchemaDecoratorTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(16);
 
@@ -24,7 +24,7 @@
 
 // ->render()
 $t->diag('->render()');
-$output = <<<EOF
+$output = <<<'EOF'
 <table>
 <tr>
   <th><label for="w1">W1</label></th>
@@ -37,18 +37,16 @@
 // implements ArrayAccess
 $t->diag('implements ArrayAccess');
 $w['w2'] = $w2;
-$w1->setParent($ws); $w2->setParent($ws);
+$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');
 
-try
-{
-  $w['w1'] = 'string';
-  $t->fail('sfWidgetFormSchemaDecorator implements the ArrayAccess interface for the fields');
-}
-catch (LogicException $e)
-{
-  $t->pass('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) {
+    $t->pass('sfWidgetFormSchemaDecorator implements the ArrayAccess interface for the fields');
 }
 
 $w = new sfWidgetFormSchemaDecorator($ws, "<table>\n%content%</table>");
@@ -72,4 +70,4 @@
 $t->diag('__clone()');
 $w1 = clone $w;
 $t->ok($w1->getWidget() !== $w->getWidget(), '__clone() clones the embedded widget');
-//$t->ok($w1->getWidget() == $w->getWidget(), '__clone() clones the embedded widget');
+// $t->ok($w1->getWidget() == $w->getWidget(), '__clone() clones the embedded widget');
diff --git a/test/unit/widget/sfWidgetFormSchemaFormatterListTest.php b/test/unit/widget/sfWidgetFormSchemaFormatterListTest.php
index 7196afeaa..041690bb7 100644
--- a/test/unit/widget/sfWidgetFormSchemaFormatterListTest.php
+++ b/test/unit/widget/sfWidgetFormSchemaFormatterListTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(2);
 
@@ -16,7 +16,7 @@
 
 // ->formatRow()
 $t->diag('->formatRow()');
-$output = <<<EOF
+$output = <<<'EOF'
 <li>
   label
   <input /><br />help
@@ -27,7 +27,7 @@
 
 // ->formatErrorRow()
 $t->diag('->formatErrorRow()');
-$output = <<<EOF
+$output = <<<'EOF'
 <li>
   <ul class="error_list">
     <li>Global error</li>
diff --git a/test/unit/widget/sfWidgetFormSchemaFormatterTableTest.php b/test/unit/widget/sfWidgetFormSchemaFormatterTableTest.php
index 4e165d73e..6361250c6 100644
--- a/test/unit/widget/sfWidgetFormSchemaFormatterTableTest.php
+++ b/test/unit/widget/sfWidgetFormSchemaFormatterTableTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(2);
 
@@ -16,7 +16,7 @@
 
 // ->formatRow()
 $t->diag('->formatRow()');
-$output = <<<EOF
+$output = <<<'EOF'
 <tr>
   <th>label</th>
   <td><input /><br />help</td>
@@ -27,7 +27,7 @@
 
 // ->formatErrorRow()
 $t->diag('->formatErrorRow()');
-$output = <<<EOF
+$output = <<<'EOF'
 <tr><td colspan="2">
   <ul class="error_list">
     <li>Global error</li>
diff --git a/test/unit/widget/sfWidgetFormSchemaFormatterTest.php b/test/unit/widget/sfWidgetFormSchemaFormatterTest.php
index 173722d73..398157797 100644
--- a/test/unit/widget/sfWidgetFormSchemaFormatterTest.php
+++ b/test/unit/widget/sfWidgetFormSchemaFormatterTest.php
@@ -8,26 +8,25 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(28);
 
 class MyFormatter extends sfWidgetFormSchemaFormatter
 {
-  protected
-    $rowFormat       = "<li>\n  %error%%label%\n  %field%%help%\n%hidden_fields%</li>\n",
-    $errorRowFormat  = "<li>\n%errors%</li>\n",
-    $decoratorFormat = "<ul>\n  %content%</ul>";
-
-  public function unnestErrors($errors, $prefix = '')
-  {
-    return parent::unnestErrors($errors, $prefix);
-  }
-  
-  static public function dropTranslationCallable()
-  {
-    self::$translationCallable = null;
-  }
+    protected $rowFormat = "<li>\n  %error%%label%\n  %field%%help%\n%hidden_fields%</li>\n";
+    protected $errorRowFormat = "<li>\n%errors%</li>\n";
+    protected $decoratorFormat = "<ul>\n  %content%</ul>";
+
+    public function unnestErrors($errors, $prefix = '')
+    {
+        return parent::unnestErrors($errors, $prefix);
+    }
+
+    public static function dropTranslationCallable()
+    {
+        self::$translationCallable = null;
+    }
 }
 
 $w1 = new sfWidgetFormInputText();
@@ -37,7 +36,7 @@ static public function dropTranslationCallable()
 
 // ->formatRow()
 $t->diag('->formatRow()');
-$output = <<<EOF
+$output = <<<'EOF'
 <li>
   <label>label</label>
   <input /><p>help</p>
@@ -48,7 +47,7 @@ static public function dropTranslationCallable()
 
 // ->formatErrorRow()
 $t->diag('->formatErrorRow()');
-$output = <<<EOF
+$output = <<<'EOF'
 <li>
   <ul class="error_list">
     <li>Global error</li>
@@ -62,34 +61,33 @@ static public function dropTranslationCallable()
 
 // ->unnestErrors()
 $t->diag('->unnestErrors()');
-$f->setErrorRowFormatInARow("<li>%error%</li>");
-$f->setNamedErrorRowFormatInARow("<li>%name%: %error%</li>");
+$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');
 
-foreach (array('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));
-  $f->$setter($value = rand(1, 99999));
-  $t->is($f->$getter(), $value, sprintf('->%s() ->%s()', $getter, $setter));
+foreach (array('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));
+    $f->{$setter}($value = rand(1, 99999));
+    $t->is($f->{$getter}(), $value, sprintf('->%s() ->%s()', $getter, $setter));
 }
 
 $t->diag('::setTranslationCallable() ::getTranslationCallable()');
 function my__($string)
 {
-  return sprintf('[%s]', $string);
+    return sprintf('[%s]', $string);
 }
 
 class myI18n
 {
-  static public function __($string)
-  {
-    return my__($string);
-  }
+    public static function __($string)
+    {
+        return my__($string);
+    }
 }
 MyFormatter::setTranslationCallable('my__');
 
@@ -98,18 +96,13 @@ static public function __($string)
 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)
-{
-  $t->pass('setTranslationCallable() throws InvalidException if i18n callable is not a valid callable');
-}
-catch (Exception $e)
-{
-  $t->fail('setTranslationCallable() throws unexpected exception');
+try {
+    $f->setTranslationCallable('foo');
+    $t->fail('setTranslationCallable() does not throw InvalidException when i18n callable is invalid');
+} catch (InvalidArgumentException $e) {
+    $t->pass('setTranslationCallable() throws InvalidException if i18n callable is not a valid callable');
+} catch (Exception $e) {
+    $t->fail('setTranslationCallable() throws unexpected exception');
 }
 
 $t->diag('->translate()');
@@ -122,9 +115,9 @@ static public function __($string)
 $t->diag('->generateLabel() ->generateLabelName() ->setLabel() ->setLabels()');
 MyFormatter::dropTranslationCallable();
 $w = new sfWidgetFormSchema(array(
-  'author_id'  => new sfWidgetFormInputText(),
-  'first_name' => new sfWidgetFormInputText(),
-  'last_name'  => new sfWidgetFormInputText(),
+    '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');
@@ -152,26 +145,23 @@ static public function __($string)
 // ->setTranslationCatalogue() ->getTranslationCatalogue()
 class MyFormatter2 extends sfWidgetFormSchemaFormatter
 {
-  
 }
 
 $f = new MyFormatter2(new sfWidgetFormSchema(array()));
 $f->setTranslationCatalogue('foo');
 $t->is($f->getTranslationCatalogue(), 'foo', 'setTranslationCatalogue() has set the i18n catalogue correctly');
 $t->diag('->setTranslationCatalogue() ->getTranslationCatalogue()');
-try
-{
-  $f->setTranslationCatalogue(array('foo'));
-  $t->fail('setTranslationCatalogue() does not throw an exception when catalogue name is incorrectly typed');
-}
-catch (InvalidArgumentException $e)
-{
-  $t->pass('setTranslationCatalogue() throws an exception when catalogue name is incorrectly typed');
+
+try {
+    $f->setTranslationCatalogue(array('foo'));
+    $t->fail('setTranslationCatalogue() does not throw an exception when catalogue name is incorrectly typed');
+} catch (InvalidArgumentException $e) {
+    $t->pass('setTranslationCatalogue() throws an exception when catalogue name is incorrectly typed');
 }
 
 function ___my($s, $p, $c)
 {
-  return $c;
+    return $c;
 }
 
 $f = new MyFormatter2(new sfWidgetFormSchema());
diff --git a/test/unit/widget/sfWidgetFormSchemaTest.php b/test/unit/widget/sfWidgetFormSchemaTest.php
index cb1bc19f9..54c393ba3 100644
--- a/test/unit/widget/sfWidgetFormSchemaTest.php
+++ b/test/unit/widget/sfWidgetFormSchemaTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(95);
 
@@ -20,16 +20,15 @@
 $w = new sfWidgetFormSchema();
 $t->is($w->getFields(), array(), '__construct() can take no argument');
 $w = new sfWidgetFormSchema(array('w1' => $w1, 'w2' => $w2));
-$w1->setParent($w); $w2->setParent($w);
+$w1->setParent($w);
+$w2->setParent($w);
 $t->ok($w->getFields() == array('w1' => $w1, 'w2' => $w2), '__construct() can take an array of named sfWidget objects');
-try
-{
-  $w = new sfWidgetFormSchema('string');
-  $t->fail('__construct() throws a exception when passing a non supported first argument');
-}
-catch (InvalidArgumentException $e)
-{
-  $t->pass('__construct() throws an exception when passing a non supported first argument');
+
+try {
+    $w = new sfWidgetFormSchema('string');
+    $t->fail('__construct() throws a exception when passing a non supported first argument');
+} 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');
@@ -45,19 +44,17 @@
 $w = new sfWidgetFormSchema();
 $w['w1'] = $w1;
 $w['w2'] = $w2;
-$w1->setParent($w); $w2->setParent($w);
+$w1->setParent($w);
+$w2->setParent($w);
 $t->ok($w->getFields() == array('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)
-{
-  $t->pass('"sfWidgetFormSchema" implements the ArrayAccess interface for the fields');
+try {
+    $w['w1'] = 'string';
+    $t->fail('"sfWidgetFormSchema" implements the ArrayAccess interface for the fields');
+} catch (LogicException $e) {
+    $t->pass('"sfWidgetFormSchema" implements the ArrayAccess interface for the fields');
 }
 
 $w = new sfWidgetFormSchema(array('w1' => $w1));
@@ -65,7 +62,8 @@
 $t->is(isset($w['w2']), false, '"sfWidgetFormSchema" implements the ArrayAccess interface for the fields');
 
 $w = new sfWidgetFormSchema(array('w1' => $w1));
-$w1->setParent($w); $w2->setParent($w);
+$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');
 
@@ -85,7 +83,6 @@
 $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');
 
-
 // ->addFormFormatter() ->setFormFormatterName() ->getFormFormatterName() ->getFormFormatter() ->getFormFormatters()
 $t->diag('->addFormFormatter() ->setFormFormatterName() ->getFormFormatterName() ->getFormFormatter() ->getFormFormatters()');
 $w = new sfWidgetFormSchema(array('w1' => $w1));
@@ -100,14 +97,12 @@
 $t->is(get_class($w->getFormFormatter()), 'sfWidgetFormSchemaFormatterList', '->setFormFormatterName() set the names of the formatter to use when rendering');
 
 $w->setFormFormatterName('nonexistant');
-try
-{
-  $w->getFormFormatter();
-  $t->fail('->setFormFormatterName() throws a InvalidArgumentException when the form format name is not associated with a formatter');
-}
-catch (InvalidArgumentException $e)
-{
-  $t->pass('->setFormFormatterName() throws a InvalidArgumentException when the form format name is not associated with a formatter');
+
+try {
+    $w->getFormFormatter();
+    $t->fail('->setFormFormatterName() throws a InvalidArgumentException when the form format name is not associated with a formatter');
+} 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());
@@ -125,23 +120,20 @@
 $w->setNameFormat(false);
 $t->is($w->generateName('foo'), 'foo', '->generateName() returns the name unchanged if the format is false');
 
-try
-{
-  $w->setNameFormat('foo');
-  $t->fail('->setNameFormat() throws an InvalidArgumentException if the format does not contain %s');
-}
-catch (InvalidArgumentException $e)
-{
-  $t->pass('->setNameFormat() throws an InvalidArgumentException if the format does not contain %s');
+try {
+    $w->setNameFormat('foo');
+    $t->fail('->setNameFormat() throws an InvalidArgumentException if the format does not contain %s');
+} 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(),
+    'author' => new sfWidgetFormSchema(array(
+        'first_name' => new sfWidgetFormInputText(),
+        'company' => new sfWidgetFormSchema(array(
+            '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');
@@ -213,14 +205,11 @@
 $w = new sfWidgetFormSchema(array('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)
-{
-  $t->pass('->renderField() throws an InvalidArgumentException if the field does not exist');
+try {
+    $w->renderField('last_name', 'Potencier');
+    $t->fail('->renderField() throws an InvalidArgumentException if the field does not exist');
+} catch (InvalidArgumentException $e) {
+    $t->pass('->renderField() throws an InvalidArgumentException if the field does not exist');
 }
 
 // ->setPositions() ->getPositions()
@@ -245,24 +234,18 @@
 $w->setPositions(array('w1', 'w2', 'w1'));
 $t->is($w->getPositions(), array('w1', 'w2'), '->setPositions() does not repeat the fields');
 
-try
-{
-  $w->setPositions(array('w1', 'w2', 'w3'));
-  $t->fail('->setPositions() throws an InvalidArgumentException if you give it a non existant field name');
-}
-catch (InvalidArgumentException $e)
-{
-  $t->pass('->setPositions() throws an InvalidArgumentException if you give it a non existant field name');
+try {
+    $w->setPositions(array('w1', 'w2', 'w3'));
+    $t->fail('->setPositions() throws an InvalidArgumentException if you give it a non existant field name');
+} catch (InvalidArgumentException $e) {
+    $t->pass('->setPositions() throws an InvalidArgumentException if you give it a non existant field name');
 }
 
-try
-{
-  $w->setPositions(array('w1'));
-  $t->fail('->setPositions() throws an InvalidArgumentException if you miss a field name');
-}
-catch (InvalidArgumentException $e)
-{
-  $t->pass('->setPositions() throws an InvalidArgumentException if you miss a field name');
+try {
+    $w->setPositions(array('w1'));
+    $t->fail('->setPositions() throws an InvalidArgumentException if you miss a field name');
+} catch (InvalidArgumentException $e) {
+    $t->pass('->setPositions() throws an InvalidArgumentException if you miss a field name');
 }
 
 // ->moveField()
@@ -280,23 +263,19 @@
 $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');
-try
-{
-  $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)
-{
-  $t->pass('->moveField() throws an LogicException if you don\'t pass a relative field name with AFTER');
-}
-try
-{
-  $w->moveField('w1', sfWidgetFormSchema::BEFORE);
-  $t->fail('->moveField() throws an LogicException if you don\'t pass a relative field name with BEFORE');
+
+try {
+    $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) {
+    $t->pass('->moveField() throws an LogicException if you don\'t pass a relative field name with AFTER');
 }
-catch (LogicException $e)
-{
-  $t->pass('->moveField() throws an LogicException if you don\'t pass a relative field name with BEFORE');
+
+try {
+    $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) {
+    $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
@@ -326,15 +305,15 @@
 $w['w3']['w1'] = $w1;
 $w['w3']['w2'] = new sfWidgetFormInputHidden();
 $errors = array(
-  'global error',
-  'w1' => 'error for w1',
-  'w2' => 'error for w2',
-  'w4' => array(
-    'w1' => 'error for w4/w1',
-    'w2' => 'error for w4/w2',
-    'w3' => 'error for w4/w3',
-  ),
-  'w4' => 'error for w4',
+    'global error',
+    'w1' => 'error for w1',
+    'w2' => 'error for w2',
+    'w4' => array(
+        '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');
 
@@ -342,14 +321,11 @@
 $t->diag('->render()');
 $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)
-{
-  $t->pass('->render() throws an InvalidArgumentException if the second argument is not an array');
+try {
+    $w->render(null, 'string');
+    $t->fail('->render() throws an InvalidArgumentException if the second argument is not an array');
+} catch (InvalidArgumentException $e) {
+    $t->pass('->render() throws an InvalidArgumentException if the second argument is not an array');
 }
 
 $w['first_name'] = $w1;
@@ -358,7 +334,7 @@
 $w->setAttribute('style', 'padding: 5px');
 $w->setNameFormat('article[%s]');
 $w->setIdFormat('id_%s');
-$expected = <<<EOF
+$expected = <<<'EOF'
 <tr><td colspan="2">
   <ul class="error_list">
     <li>Global error message</li>
@@ -390,7 +366,7 @@
 $w['w1'] = new sfWidgetFormInputHidden();
 $ew = new sfWidgetFormSchema(array('w3' => new sfWidgetFormInputText()));
 $w['w4'] = new sfWidgetFormSchemaDecorator($ew, $w->getFormFormatter()->getDecoratorFormat());
-$expected = <<<EOF
+$expected = <<<'EOF'
 <tr>
   <th>W4</th>
   <td>
@@ -410,7 +386,8 @@
 // __clone()
 $t->diag('__clone()');
 $w = new sfWidgetFormSchema(array('w1' => $w1, 'w2' => $w2));
-$w1->setParent($w); $w2->setParent($w);
+$w1->setParent($w);
+$w2->setParent($w);
 $format1 = new sfWidgetFormSchemaFormatterList($w);
 $format1->setTranslationCatalogue('english');
 $w->addFormFormatter('testFormatter', $format1);
@@ -418,17 +395,17 @@
 $f1 = $w1->getFields();
 $f = $w->getFields();
 $t->is(array_keys($f1), array_keys($f), '__clone() clones embedded widgets');
-foreach ($f1 as $name => $widget)
-{
-  $t->ok($widget !== $f[$name], '__clone() clones embedded widgets');
-  $t->ok($widget->getParent() === $w1, 'The parents hafe been changed');
-  // avoid recursive dependencies at comparing
-  $widget->setParent(null); $f[$name]->setParent(null);
-  $t->ok($widget == $f[$name], '__clone() clones embedded widgets');
+foreach ($f1 as $name => $widget) {
+    $t->ok($widget !== $f[$name], '__clone() clones embedded widgets');
+    $t->ok($widget->getParent() === $w1, 'The parents hafe been changed');
+    // avoid recursive dependencies at comparing
+    $widget->setParent(null);
+    $f[$name]->setParent(null);
+    $t->ok($widget == $f[$name], '__clone() clones embedded widgets');
 }
 $format1->setTranslationCatalogue('french');
 $formatters = $w1->getFormFormatters();
-$t->is(count($formatters), 1 , '__clone() returns a sfWidgetFormSchema that has the Formatters attached');
+$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();
@@ -438,13 +415,12 @@
 $f1 = $w1->getFormFormatters();
 $f = $w->getFormFormatters();
 $t->is(array_keys($f1), array_keys($f), '__clone() clones form formatters');
-foreach ($f1 as $key => $formFormatter)
-{
-  $t->ok($formFormatter !== $f[$key], '__clone() clones form formatters');
-  $t->is(get_class($formFormatter), get_class($f[$key]), '__clone() clones form formatters');
+foreach ($f1 as $key => $formFormatter) {
+    $t->ok($formFormatter !== $f[$key], '__clone() clones form formatters');
+    $t->is(get_class($formFormatter), get_class($f[$key]), '__clone() clones form formatters');
 
-  $t->ok($formFormatter->getWidgetSchema() !== $f[$key]->getWidgetSchema(), '__clone() clones form formatters');
-  $t->is(get_class($formFormatter->getWidgetSchema()), get_class($f[$key]->getWidgetSchema()), '__clone() clones form formatters');
+    $t->ok($formFormatter->getWidgetSchema() !== $f[$key]->getWidgetSchema(), '__clone() clones form formatters');
+    $t->is(get_class($formFormatter->getWidgetSchema()), get_class($f[$key]->getWidgetSchema()), '__clone() clones form formatters');
 }
 
 // setDefaultFormFormatterName()
@@ -458,32 +434,32 @@
 
 class MyWidget extends sfWidgetForm
 {
-  protected function configure($options = array(), $attributes = array())
-  {
-    $this->addRequiredOption('name');
-  }
-
-  public function render($name, $value = null, $attributes = array(), $errors = array())
-  {
-    return null;
-  }
-
-  public function getJavaScripts()
-  {
-    return array('/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');
-  }
+    public function render($name, $value = null, $attributes = array(), $errors = array())
+    {
+        return null;
+    }
+
+    public function getJavaScripts()
+    {
+        return array('/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');
+    }
+
+    protected function configure($options = array(), $attributes = array())
+    {
+        $this->addRequiredOption('name');
+    }
 }
 
 // ->getJavaScripts() ->getStylesheets()
 $t->diag('->getJavaScripts() ->getStylesheets()');
 $w = new sfWidgetFormSchema(array(
-  'foo' => new MyWidget(array('name' => 'foo')),
-  'bar' => new MyWidget(array('name' => 'bar')),
+    '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');
diff --git a/test/unit/widget/sfWidgetFormSelectCheckboxTest.php b/test/unit/widget/sfWidgetFormSelectCheckboxTest.php
index 122932427..c0a0a6f89 100644
--- a/test/unit/widget/sfWidgetFormSelectCheckboxTest.php
+++ b/test/unit/widget/sfWidgetFormSelectCheckboxTest.php
@@ -8,21 +8,23 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 class FormFormatterStub extends sfWidgetFormSchemaFormatter
 {
-  public function __construct() {}
-
-  public function translate($subject, $parameters = array())
-  {
-    return sprintf('translation[%s]', $subject);
-  }
+    public function __construct()
+    {
+    }
+
+    public function translate($subject, $parameters = array())
+    {
+        return sprintf('translation[%s]', $subject);
+    }
 }
 
 $t = new lime_test(13);
 
-$dom = new DomDocument('1.0', 'utf-8');
+$dom = new DOMDocument('1.0', 'utf-8');
 $dom->validateOnParse = true;
 
 // ->render()
@@ -44,14 +46,14 @@ public function translate($subject, $parameters = array())
 $t->is($w->render('foo', array('foobar'), array('onChange' => 'alert(42)')), $onChange, '->render() renders a checkbox tag using extra attributes');
 
 $w = new sfWidgetFormSelectCheckbox(array('choices' => array('0' => 'bar', '1' => 'foo')));
-$output = <<< EOF
+$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');
 
 $w = new sfWidgetFormSelectCheckbox(array('choices' => array('0' => 'bar', '1' => 'foo')));
-$output = <<< EOF
+$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;
@@ -63,7 +65,7 @@ public function translate($subject, $parameters = array())
 // group support
 $t->diag('group support');
 $w = new sfWidgetFormSelectCheckbox(array('choices' => array('foo' => array('foo' => 'bar', 'bar' => 'foo'), 'bar' => array('foobar' => 'barfoo'))));
-$output = <<<EOF
+$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>
@@ -71,20 +73,17 @@ public function translate($subject, $parameters = array())
 $t->is($w->render('foo', array('foo', 'foobar')), fix_linebreaks($output), '->render() has support for groups');
 
 $w->setOption('choices', array('foo' => array('foo' => 'bar', 'bar' => 'foo')));
-$output = <<<EOF
+$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');
 
-try
-{
-  $w = new sfWidgetFormSelectCheckbox();
-  $t->fail('__construct() throws an RuntimeException if you don\'t pass a choices option');
-}
-catch (RuntimeException $e)
-{
-  $t->pass('__construct() throws an RuntimeException if you don\'t pass a choices option');
+try {
+    $w = new sfWidgetFormSelectCheckbox();
+    $t->fail('__construct() throws an RuntimeException if you don\'t pass a choices option');
+} catch (RuntimeException $e) {
+    $t->pass('__construct() throws an RuntimeException if you don\'t pass a choices option');
 }
 
 // choices as a callable
@@ -92,7 +91,7 @@ public function translate($subject, $parameters = array())
 
 function choice_callable()
 {
-  return array(1, 2, 3);
+    return array(1, 2, 3);
 }
 $w = new sfWidgetFormSelectCheckbox(array('choices' => new sfCallable('choice_callable')));
 $dom->loadHTML($w->render('foo'));
diff --git a/test/unit/widget/sfWidgetFormSelectManyTest.php b/test/unit/widget/sfWidgetFormSelectManyTest.php
index 066936830..2290a4bd7 100644
--- a/test/unit/widget/sfWidgetFormSelectManyTest.php
+++ b/test/unit/widget/sfWidgetFormSelectManyTest.php
@@ -8,11 +8,11 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(1);
 
-$dom = new DomDocument('1.0', 'utf-8');
+$dom = new DOMDocument('1.0', 'utf-8');
 $dom->validateOnParse = true;
 
 // ->render()
diff --git a/test/unit/widget/sfWidgetFormSelectRadioTest.php b/test/unit/widget/sfWidgetFormSelectRadioTest.php
index 6b744f1af..cc2a4d710 100644
--- a/test/unit/widget/sfWidgetFormSelectRadioTest.php
+++ b/test/unit/widget/sfWidgetFormSelectRadioTest.php
@@ -8,21 +8,23 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 class FormFormatterStub extends sfWidgetFormSchemaFormatter
 {
-  public function __construct() {}
-
-  public function translate($subject, $parameters = array())
-  {
-    return sprintf('translation[%s]', $subject);
-  }
+    public function __construct()
+    {
+    }
+
+    public function translate($subject, $parameters = array())
+    {
+        return sprintf('translation[%s]', $subject);
+    }
 }
 
 $t = new lime_test(12);
 
-$dom = new DomDocument('1.0', 'utf-8');
+$dom = new DOMDocument('1.0', 'utf-8');
 $dom->validateOnParse = true;
 
 // ->render()
@@ -44,14 +46,14 @@ public function translate($subject, $parameters = array())
 $t->is($w->render('foo', 'foobar', array('onChange' => 'alert(42)')), $onChange, '->render() renders a radio tag using extra attributes');
 
 $w = new sfWidgetFormSelectRadio(array('choices' => array('0' => 'bar', '1' => 'foo')));
-$output = <<< EOF
+$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')));
-$output = <<< EOF
+$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;
@@ -63,21 +65,18 @@ public function translate($subject, $parameters = array())
 // group support
 $t->diag('group support');
 $w = new sfWidgetFormSelectRadio(array('choices' => array('foo' => array('foo' => 'bar', 'bar' => 'foo'), 'bar' => array('foobar' => 'barfoo'))));
-$output = <<<EOF
+$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>
 bar <ul class="radio_list"><li><input name="foo" type="radio" value="foobar" id="foo_foobar" />&nbsp;<label for="foo_foobar">barfoo</label></li></ul>
 EOF;
 $t->is($w->render('foo', 'foo'), fix_linebreaks($output), '->render() has support for groups');
 
-try
-{
-  $w = new sfWidgetFormSelectRadio();
-  $t->fail('__construct() throws an RuntimeException if you don\'t pass a choices option');
-}
-catch (RuntimeException $e)
-{
-  $t->pass('__construct() throws an RuntimeException if you don\'t pass a choices option');
+try {
+    $w = new sfWidgetFormSelectRadio();
+    $t->fail('__construct() throws an RuntimeException if you don\'t pass a choices option');
+} catch (RuntimeException $e) {
+    $t->pass('__construct() throws an RuntimeException if you don\'t pass a choices option');
 }
 
 // choices as a callable
@@ -85,7 +84,7 @@ public function translate($subject, $parameters = array())
 
 function choice_callable()
 {
-  return array(1, 2, 3);
+    return array(1, 2, 3);
 }
 $w = new sfWidgetFormSelectRadio(array('choices' => new sfCallable('choice_callable')));
 $dom->loadHTML($w->render('foo'));
diff --git a/test/unit/widget/sfWidgetFormSelectTest.php b/test/unit/widget/sfWidgetFormSelectTest.php
index 85d7bde7b..d3668963c 100644
--- a/test/unit/widget/sfWidgetFormSelectTest.php
+++ b/test/unit/widget/sfWidgetFormSelectTest.php
@@ -8,21 +8,23 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 class FormFormatterStub extends sfWidgetFormSchemaFormatter
 {
-  public function __construct() {}
-
-  public function translate($subject, $parameters = array())
-  {
-    return sprintf('translation[%s]', $subject);
-  }
+    public function __construct()
+    {
+    }
+
+    public function translate($subject, $parameters = array())
+    {
+        return sprintf('translation[%s]', $subject);
+    }
 }
 
 $t = new lime_test(22);
 
-$dom = new DomDocument('1.0', 'utf-8');
+$dom = new DOMDocument('1.0', 'utf-8');
 $dom->validateOnParse = true;
 
 // ->render()
@@ -64,14 +66,11 @@ public function translate($subject, $parameters = array())
 $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();
-  $t->fail('__construct() throws an RuntimeException if you don\'t pass a choices option');
-}
-catch (RuntimeException $e)
-{
-  $t->pass('__construct() throws an RuntimeException if you don\'t pass a choices option');
+try {
+    $w = new sfWidgetFormSelect();
+    $t->fail('__construct() throws an RuntimeException if you don\'t pass a choices option');
+} catch (RuntimeException $e) {
+    $t->pass('__construct() throws an RuntimeException if you don\'t pass a choices option');
 }
 
 // choices are translated
@@ -105,7 +104,7 @@ public function translate($subject, $parameters = array())
 
 function choice_callable()
 {
-  return array(1, 2, 3);
+    return array(1, 2, 3);
 }
 $w = new sfWidgetFormSelect(array('choices' => new sfCallable('choice_callable')));
 $dom->loadHTML($w->render('foo'));
diff --git a/test/unit/widget/sfWidgetFormTest.php b/test/unit/widget/sfWidgetFormTest.php
index cfff314e3..20457aafa 100644
--- a/test/unit/widget/sfWidgetFormTest.php
+++ b/test/unit/widget/sfWidgetFormTest.php
@@ -8,21 +8,21 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(35);
 
 class MyWidgetForm extends sfWidgetForm
 {
-  public function render($name, $value = null, $attributes = array(), $errors = array())
-  {
-    return $this->renderTag('input', array_merge(array('name' => $name), $attributes)).$this->renderContentTag('textarea', null, array_merge(array('name' => $name), $attributes));
-  }
-
-  public function generateId($name, $value = null)
-  {
-    return parent::generateId($name, $value);
-  }
+    public function render($name, $value = null, $attributes = array(), $errors = array())
+    {
+        return $this->renderTag('input', array_merge(array('name' => $name), $attributes)).$this->renderContentTag('textarea', null, array_merge(array('name' => $name), $attributes));
+    }
+
+    public function generateId($name, $value = null)
+    {
+        return parent::generateId($name, $value);
+    }
 }
 
 // __construct()
diff --git a/test/unit/widget/sfWidgetFormTextareaTest.php b/test/unit/widget/sfWidgetFormTextareaTest.php
index c69ab0949..4db3121ac 100644
--- a/test/unit/widget/sfWidgetFormTextareaTest.php
+++ b/test/unit/widget/sfWidgetFormTextareaTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(4);
 
diff --git a/test/unit/widget/sfWidgetFormTimeTest.php b/test/unit/widget/sfWidgetFormTimeTest.php
index 123360716..e99fa7764 100644
--- a/test/unit/widget/sfWidgetFormTimeTest.php
+++ b/test/unit/widget/sfWidgetFormTimeTest.php
@@ -8,30 +8,29 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(43);
 
 $w = new sfWidgetFormTime(array('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(
-  '12:30:35',
-  mktime(12, 30, 35, 15, 10, 2005),
-) as $date)
-{
-  $dom->loadHTML($w->render('foo', $date));
-  $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');
-  $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');
+    '12:30:35',
+    mktime(12, 30, 35, 15, 10, 2005),
+) as $date) {
+    $dom->loadHTML($w->render('foo', $date));
+    $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');
+    $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');
 }
 
 // time as an array
diff --git a/test/unit/widget/sfWidgetTest.php b/test/unit/widget/sfWidgetTest.php
index 09b8d3f1b..5e7e83463 100644
--- a/test/unit/widget/sfWidgetTest.php
+++ b/test/unit/widget/sfWidgetTest.php
@@ -8,29 +8,29 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(33);
 
 class MyWidget extends sfWidget
 {
-  protected function configure($options = array(), $attributes = array())
-  {
-    $this->addOption('foo');
-  }
-
-  public function render($name, $value = null, $attributes = array(), $errors = array())
-  {
-    return $this->attributesToHtml(array_merge($this->attributes, $attributes));
-  }
+    public function render($name, $value = null, $attributes = array(), $errors = array())
+    {
+        return $this->attributesToHtml(array_merge($this->attributes, $attributes));
+    }
+
+    protected function configure($options = array(), $attributes = array())
+    {
+        $this->addOption('foo');
+    }
 }
 
 class MyWidgetWithRequired extends MyWidget
 {
-  protected function configure($options = array(), $attributes = array())
-  {
-    $this->addRequiredOption('foo');
-  }
+    protected function configure($options = array(), $attributes = array())
+    {
+        $this->addRequiredOption('foo');
+    }
 }
 
 // __construct()
@@ -40,30 +40,24 @@ protected function configure($options = array(), $attributes = array())
 $w = new MyWidget(array(), array('class' => 'foo'));
 $t->is($w->getAttributes(), array('class' => 'foo'), '->__construct() can take an array of default HTML attributes');
 
-try
-{
-  new MyWidget(array('nonexistant' => false));
-  $t->fail('__construct() throws an InvalidArgumentException if you pass some non existant options');
-  $t->skip();
-}
-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');
+try {
+    new MyWidget(array('nonexistant' => false));
+    $t->fail('__construct() throws an InvalidArgumentException if you pass some non existant options');
+    $t->skip();
+} 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');
 
-try
-{
-  new MyWidgetWithRequired();
-  $t->fail('__construct() throws an RuntimeException if you don\'t pass a required option');
-}
-catch (RuntimeException $e)
-{
-  $t->pass('__construct() throws an RuntimeException if you don\'t pass a required option');
+try {
+    new MyWidgetWithRequired();
+    $t->fail('__construct() throws an RuntimeException if you don\'t pass a required option');
+} catch (RuntimeException $e) {
+    $t->pass('__construct() throws an RuntimeException if you don\'t pass a required option');
 }
 
 $w = new MyWidget();
@@ -76,14 +70,12 @@ protected function configure($options = array(), $attributes = array())
 $t->is($w->getOption('nonexistant', 'default value'), 'default value', '->getOption() returns default value if the option does not exist');
 $t->is($w->hasOption('foo'), true, '->hasOption() returns true if the option exist');
 $t->is($w->hasOption('nonexistant'), false, '->hasOption() returns false if the option does not exist');
-try
-{
-  $w->setOption('foobar', 'foo');
-  $t->fail('->setOption() throws an InvalidArgumentException if the option is not registered');
-}
-catch (InvalidArgumentException $e)
-{
-  $t->pass('->setOption() throws an InvalidArgumentException if the option is not registered');
+
+try {
+    $w->setOption('foobar', 'foo');
+    $t->fail('->setOption() throws an InvalidArgumentException if the option is not registered');
+} catch (InvalidArgumentException $e) {
+    $t->pass('->setOption() throws an InvalidArgumentException if the option is not registered');
 }
 
 // ->addOption()
@@ -137,10 +129,10 @@ protected function configure($options = array(), $attributes = array())
 
 class MyClass
 {
-  public function __toString()
-  {
-    return 'mycontent';
-  }
+    public function __toString()
+    {
+        return 'mycontent';
+    }
 }
 $t->is(sfWidget::escapeOnce(new MyClass()), 'mycontent', '::escapeOnce() converts objects to string');
 
diff --git a/test/unit/yaml/sfYamlDumperTest.php b/test/unit/yaml/sfYamlDumperTest.php
index 05124c97a..58315c5a0 100644
--- a/test/unit/yaml/sfYamlDumperTest.php
+++ b/test/unit/yaml/sfYamlDumperTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 sfYaml::setSpecVersion('1.1');
 
@@ -19,61 +19,54 @@
 
 $path = __DIR__.'/fixtures';
 $files = $parser->parse(file_get_contents($path.'/index.yml'));
-foreach ($files as $file)
-{
-  $t->diag($file);
-
-  $yamls = file_get_contents($path.'/'.$file.'.yml');
-
-  // split YAMLs documents
-  foreach (preg_split('/^---( %YAML\:1\.0)?/m', $yamls) as $yaml)
-  {
-    if (!$yaml)
-    {
-      continue;
-    }
-
-    $test = $parser->parse($yaml);
-    if (isset($test['dump_skip']) && $test['dump_skip'])
-    {
-      continue;
-    }
-    else if (isset($test['todo']) && $test['todo'])
-    {
-      $t->todo($test['test']);
-    }
-    else
-    {
-      $expected = eval('return '.trim($test['php']).';');
-
-      $t->is_deeply($parser->parse($dumper->dump($expected, 10)), $expected, $test['test']);
+foreach ($files as $file) {
+    $t->diag($file);
+
+    $yamls = file_get_contents($path.'/'.$file.'.yml');
+
+    // split YAMLs documents
+    foreach (preg_split('/^---( %YAML\:1\.0)?/m', $yamls) as $yaml) {
+        if (!$yaml) {
+            continue;
+        }
+
+        $test = $parser->parse($yaml);
+        if (isset($test['dump_skip']) && $test['dump_skip']) {
+            continue;
+        }
+        if (isset($test['todo']) && $test['todo']) {
+            $t->todo($test['test']);
+        } else {
+            $expected = eval('return '.trim($test['php']).';');
+
+            $t->is_deeply($parser->parse($dumper->dump($expected, 10)), $expected, $test['test']);
+        }
     }
-  }
 }
 
 // inline level
 $array = array(
-  '' => 'bar',
-  'foo' => '#bar',
-  'foo\'bar' => array(),
-  'bar' => array(1, 'foo'),
-  'foobar' => array(
-    'foo' => 'bar',
+    '' => 'bar',
+    'foo' => '#bar',
+    'foo\'bar' => array(),
     'bar' => array(1, 'foo'),
     'foobar' => array(
-      'foo' => 'bar',
-      'bar' => array(1, 'foo'),
+        'foo' => 'bar',
+        'bar' => array(1, 'foo'),
+        'foobar' => array(
+            'foo' => 'bar',
+            'bar' => array(1, 'foo'),
+        ),
     ),
-  ),
 );
 
-$expected = <<<EOF
+$expected = <<<'EOF'
 { '': bar, foo: '#bar', 'foo''bar': {  }, bar: [1, foo], foobar: { foo: bar, bar: [1, foo], foobar: { foo: bar, bar: [1, foo] } } }
 EOF;
 $t->is($dumper->dump($array, -10), $expected, '->dump() takes an inline level argument');
 $t->is($dumper->dump($array, 0), $expected, '->dump() takes an inline level argument');
 
-$expected = <<<EOF
+$expected = <<<'EOF'
 '': bar
 foo: '#bar'
 'foo''bar': {  }
@@ -83,7 +76,7 @@
 EOF;
 $t->is($dumper->dump($array, 1), $expected, '->dump() takes an inline level argument');
 
-$expected = <<<EOF
+$expected = <<<'EOF'
 '': bar
 foo: '#bar'
 'foo''bar': {  }
@@ -98,7 +91,7 @@
 EOF;
 $t->is($dumper->dump($array, 2), $expected, '->dump() takes an inline level argument');
 
-$expected = <<<EOF
+$expected = <<<'EOF'
 '': bar
 foo: '#bar'
 'foo''bar': {  }
@@ -117,7 +110,7 @@
 EOF;
 $t->is($dumper->dump($array, 3), $expected, '->dump() takes an inline level argument');
 
-$expected = <<<EOF
+$expected = <<<'EOF'
 '': bar
 foo: '#bar'
 'foo''bar': {  }
@@ -143,7 +136,7 @@
 $t->diag('Objects support');
 class A
 {
-  public $a = 'foo';
+    public $a = 'foo';
 }
 $a = array('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 b87ad2f6b..29fb32ee4 100644
--- a/test/unit/yaml/sfYamlInlineTest.php
+++ b/test/unit/yaml/sfYamlInlineTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 sfYaml::setSpecVersion('1.1');
 
@@ -18,128 +18,122 @@
 $t->diag('::load()');
 
 $testsForLoad = array(
-  '' => '',
-  'null' => null,
-  'false' => false,
-  'true' => true,
-  '12' => 12,
-  '"quoted string"' => 'quoted string',
-  "'quoted string'" => 'quoted string',
-  '12.30e+02' => 12.30e+02,
-  '0x4D2' => 0x4D2,
-  '02333' => 02333,
-  '.Inf' => -log(0),
-  '-.Inf' => log(0),
-  '123456789123456789000' => '123456789123456789000',
-  '"foo\r\nbar"' => "foo\r\nbar",
-  "'foo#bar'" => 'foo#bar',
-  "'foo # bar'" => 'foo # bar',
-  "'#cfcfcf'" => '#cfcfcf',
-
-  '2007-10-30' => mktime(0, 0, 0, 10, 30, 2007),
-  '2007-10-30T02:59:43Z' => gmmktime(2, 59, 43, 10, 30, 2007),
-  '2007-10-30 02:59:43 Z' => gmmktime(2, 59, 43, 10, 30, 2007),
-
-  '"a \\"string\\" with \'quoted strings inside\'"' => 'a "string" with \'quoted strings inside\'',
-  "'a \"string\" with ''quoted strings inside'''" => 'a "string" with \'quoted strings inside\'',
-
-  // 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'),
-
-  // 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'),
-
-  // 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  ]  ]' => array('foo', array('bar', 'foo')),
-
-  '[{ foo: {bar: foo} }]' => array(array('foo' => array('bar' => 'foo'))),
-
-  '[foo, [bar, [foo, [bar, foo]], foo]]' => array('foo', array('bar', array('foo', array('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: bar }]' => array('foo', '1' => array('bar' => array('foo' => 'bar'))),
+    '' => '',
+    'null' => null,
+    'false' => false,
+    'true' => true,
+    '12' => 12,
+    '"quoted string"' => 'quoted string',
+    "'quoted string'" => 'quoted string',
+    '12.30e+02' => 12.30e+02,
+    '0x4D2' => 0x4D2,
+    '02333' => 02333,
+    '.Inf' => -log(0),
+    '-.Inf' => log(0),
+    '123456789123456789000' => '123456789123456789000',
+    '"foo\r\nbar"' => "foo\r\nbar",
+    "'foo#bar'" => 'foo#bar',
+    "'foo # bar'" => 'foo # bar',
+    "'#cfcfcf'" => '#cfcfcf',
+
+    '2007-10-30' => mktime(0, 0, 0, 10, 30, 2007),
+    '2007-10-30T02:59:43Z' => gmmktime(2, 59, 43, 10, 30, 2007),
+    '2007-10-30 02:59:43 Z' => gmmktime(2, 59, 43, 10, 30, 2007),
+
+    '"a \\"string\\" with \'quoted strings inside\'"' => 'a "string" with \'quoted strings inside\'',
+    "'a \"string\" with ''quoted strings inside'''" => 'a "string" with \'quoted strings inside\'',
+
+    // 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'),
+
+    // 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'),
+
+    // 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  ]  ]' => array('foo', array('bar', 'foo')),
+
+    '[{ foo: {bar: foo} }]' => array(array('foo' => array('bar' => 'foo'))),
+
+    '[foo, [bar, [foo, [bar, foo]], foo]]' => array('foo', array('bar', array('foo', array('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: bar }]' => array('foo', '1' => array('bar' => array('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));
+foreach ($testsForLoad as $yaml => $value) {
+    $t->is_deeply(sfYamlInline::load($yaml), $value, sprintf('::load() converts an inline YAML to a PHP structure (%s)', $yaml));
 }
 
 $testsForDump = array(
-  'null' => null,
-  'false' => false,
-  'true' => true,
-  '12' => 12,
-  "'quoted string'" => 'quoted string',
-  '12.30e+02' => 12.30e+02,
-  '1234' => 0x4D2,
-  '1243' => 02333,
-  '.Inf' => -log(0),
-  '-.Inf' => log(0),
-  '"foo\r\nbar"' => "foo\r\nbar",
-  "'foo#bar'" => 'foo#bar',
-  "'foo # bar'" => 'foo # bar',
-  "'#cfcfcf'" => '#cfcfcf',
+    'null' => null,
+    'false' => false,
+    'true' => true,
+    '12' => 12,
+    "'quoted string'" => 'quoted string',
+    '12.30e+02' => 12.30e+02,
+    '1234' => 0x4D2,
+    '1243' => 02333,
+    '.Inf' => -log(0),
+    '-.Inf' => log(0),
+    '"foo\r\nbar"' => "foo\r\nbar",
+    "'foo#bar'" => 'foo#bar',
+    "'foo # bar'" => 'foo # bar',
+    "'#cfcfcf'" => '#cfcfcf',
 
-  "'a \"string\" with ''quoted strings inside'''" => 'a "string" with \'quoted strings inside\'',
+    "'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'),
+    // sequences
+    '[foo, bar, false, null, 12]' => array('foo', 'bar', false, null, 12),
+    '[\'foo,bar\', \'foo bar\']' => array('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'),
+    // 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'),
 
-  // nested sequences and mappings
-  '[foo, [bar, foo]]' => array('foo', array('bar', 'foo')),
+    // nested sequences and mappings
+    '[foo, [bar, foo]]' => array('foo', array('bar', 'foo')),
 
-  '[foo, [bar, [foo, [bar, foo]], foo]]' => array('foo', array('bar', array('foo', array('bar', 'foo')), 'foo')),
+    '[foo, [bar, [foo, [bar, foo]], foo]]' => array('foo', array('bar', array('foo', array('bar', 'foo')), '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 }]' => array('foo', array('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 }]]' => array('foo', array('bar' => 'foo', 'foo' => array('foo', array('bar' => 'foo'))), array('foo', array('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));
+foreach ($testsForDump as $yaml => $value) {
+    $t->is(sfYamlInline::dump($value), $yaml, sprintf('::dump() converts a PHP structure to an inline YAML (%s)', $yaml));
 }
 
-foreach ($testsForLoad as $yaml => $value)
-{
-  if ($value == 1230)
-  {
-    continue;
-  }
+foreach ($testsForLoad as $yaml => $value) {
+    if (1230 == $value) {
+        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)
-{
-  if ($value == 1230)
-  {
-    continue;
-  }
+foreach ($testsForDump as $yaml => $value) {
+    if (1230 == $value) {
+        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 7e17b2a3e..29c93a9cd 100644
--- a/test/unit/yaml/sfYamlParserTest.php
+++ b/test/unit/yaml/sfYamlParserTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 sfYaml::setSpecVersion('1.1');
 
@@ -18,56 +18,46 @@
 
 $path = __DIR__.'/fixtures';
 $files = $parser->parse(file_get_contents($path.'/index.yml'));
-foreach ($files as $file)
-{
-  $t->diag($file);
+foreach ($files as $file) {
+    $t->diag($file);
 
-  $yamls = file_get_contents($path.'/'.$file.'.yml');
+    $yamls = file_get_contents($path.'/'.$file.'.yml');
 
-  // split YAMLs documents
-  foreach (preg_split('/^---( %YAML\:1\.0)?/m', $yamls) as $yaml)
-  {
-    if (!$yaml)
-    {
-      continue;
-    }
+    // split YAMLs documents
+    foreach (preg_split('/^---( %YAML\:1\.0)?/m', $yamls) as $yaml) {
+        if (!$yaml) {
+            continue;
+        }
 
-    $test = $parser->parse($yaml);
-    if (isset($test['todo']) && $test['todo'])
-    {
-      $t->todo($test['test']);
-    }
-    else
-    {
-      $expected = var_export(eval('return '.trim($test['php']).';'), true);
+        $test = $parser->parse($yaml);
+        if (isset($test['todo']) && $test['todo']) {
+            $t->todo($test['test']);
+        } else {
+            $expected = var_export(eval('return '.trim($test['php']).';'), true);
 
-      $t->is(var_export($parser->parse($test['yaml']), true), $expected, $test['test']);
+            $t->is(var_export($parser->parse($test['yaml']), true), $expected, $test['test']);
+        }
     }
-  }
 }
 
 // test tabs in YAML
 $yamls = array(
-  "foo:\n	bar",
-  "foo:\n 	bar",
-  "foo:\n	 bar",
-  "foo:\n 	 bar",
+    "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)
-  {
-    $t->pass('YAML files must not contain tabs');
-  }
+foreach ($yamls as $yaml) {
+    try {
+        $content = $parser->parse($yaml);
+        $t->fail('YAML files must not contain tabs');
+    } catch (InvalidArgumentException $e) {
+        $t->pass('YAML files must not contain tabs');
+    }
 }
 
-$yaml = <<<EOF
+$yaml = <<<'EOF'
 --- %YAML:1.0
 foo
 ...
@@ -79,10 +69,11 @@
 $t->diag('Objects support');
 class A
 {
-  public $a = 'foo';
+    public $a = 'foo';
 }
 $a = array('foo' => new A(), 'bar' => 1);
-$t->is($parser->parse(<<<EOF
+$t->is($parser->parse(
+    <<<'EOF'
 foo: !!php/object:O:1:"A":1:{s:1:"a";s:3:"foo";}
 bar: 1
 EOF

From dc824de74b696ec9c70ab2ddb2f5af5e640fdda1 Mon Sep 17 00:00:00 2001
From: thePanz <thepanz@gmail.com>
Date: Wed, 22 Feb 2023 09:19:57 +0100
Subject: [PATCH 75/78] Add(gitattributes) Add .gitattributes to repository

---
 .gitattributes | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..9645b77e9
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,11 @@
+.docker/               export-ignore
+.editorconfig          export-ignore
+.env.dist              export-ignore
+.gitattributes         export-ignore
+.github/               export-ignore
+.gitignore             export-ignore
+.php-cs-fixer.dist.php export-ignore
+docker-compose.yml     export-ignore
+phpstan.neon           export-ignore
+phpunit.xml            export-ignore
+tests/                 export-ignore

From 3c59273c34c9684bb4d0ee1576f3865e3052f629 Mon Sep 17 00:00:00 2001
From: Vincent Mariani <541354+vimar@users.noreply.github.com>
Date: Fri, 17 Nov 2023 09:34:40 +0100
Subject: [PATCH 76/78] Fix: avoid creating dynamic property $options in
 sfViewCacheManager (#290)

Dynamic properties are deprecated since PHP8.2
---
 lib/view/sfViewCacheManager.class.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/view/sfViewCacheManager.class.php b/lib/view/sfViewCacheManager.class.php
index 4ecffefec..dde3b65ab 100644
--- a/lib/view/sfViewCacheManager.class.php
+++ b/lib/view/sfViewCacheManager.class.php
@@ -21,6 +21,8 @@
  */
 class sfViewCacheManager
 {
+    public $options = array();
+
     protected $cache;
     protected $cacheConfig = array();
     protected $context;

From ef9f881a9d1ba701ecf79b51fd3bdef93057b161 Mon Sep 17 00:00:00 2001
From: thePanz <thepanz@gmail.com>
Date: Thu, 16 Nov 2023 23:07:26 +0100
Subject: [PATCH 77/78] Update(github) Update github workflows, include cache
 for composer install

---
 .editorconfig                                |  4 +
 .github/workflows/continuous-integration.yml | 95 +++++++++++---------
 .github/workflows/lint.yml                   | 18 ++--
 3 files changed, 66 insertions(+), 51 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 779f99a12..92af3f94c 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -10,3 +10,7 @@ insert_final_newline = true
 
 [*.md]
 trim_trailing_whitespace = false
+
+[.github/**.yml]
+indent_size = 2
+indent_style = space
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index b27f75493..08fc2566c 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -1,49 +1,60 @@
 name: "Continuous Integration"
 
 on:
-    push:
-      branches:
-        - master
-    pull_request:
+  push:
+    branches:
+      - master
+  pull_request:
 
 env:
-    fail-fast: true
+  fail-fast: true
 
 jobs:
-    tests:
-        name: "Symfony1 Tests"
-        runs-on: "ubuntu-22.04"
-
-        strategy:
-            matrix:
-                php-version:
-                    - "7.4"
-                    - "8.0"
-                    - "8.1"
-                    - "8.2"
-                memcached-version:
-                    - "1.6"
-
-        services:
-            memcached:
-              image: "memcached:${{ matrix.memcached-version }}"
-
-        steps:
-            - name: "Checkout"
-              uses: "actions/checkout@v3"
-              with:
-                submodules: "true"
-
-            - name: "Install PHP"
-              uses: "shivammathur/setup-php@v2"
-              with:
-                  php-version: "${{ matrix.php-version }}"
-
-            - name: "Install dependencies with Composer"
-              uses: "ramsey/composer-install@v2"
-
-            - name: "Run Check configuration"
-              run: "php data/bin/check_configuration.php"
-
-            - name: "Run Tests"
-              run: "php data/bin/symfony symfony:test --trace"
+  tests:
+    name: "Symfony1 Tests"
+    runs-on: "ubuntu-latest"
+
+    strategy:
+      matrix:
+        php-version:
+          - "7.4"
+          - "8.0"
+          - "8.1"
+          - "8.2"
+        memcached-version:
+          - "1.6"
+
+    services:
+      memcached:
+        image: "memcached:${{ matrix.memcached-version }}"
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: "true"
+
+      - name: Install PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: "${{ matrix.php-version }}"
+
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+      - name: Cache dependencies
+        uses: actions/cache@v3
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Install dependencies
+        run: composer install --prefer-dist
+
+      - name: Run Check configuration
+        run: php data/bin/check_configuration.php
+
+      - name: Run Tests
+        run: php data/bin/symfony symfony:test --trace
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 3f797cef8..2c31663d6 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -10,22 +10,22 @@ jobs:
     name: 'PHP-CS-Fixer'
     runs-on: 'ubuntu-latest'
     steps:
-      - uses: 'actions/checkout@v3'
+      - uses: actions/checkout@v3
 
-      - name: 'Setup PHP'
-        uses: 'shivammathur/setup-php@v2'
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.1'
+          php-version: 8.2
           tools: php-cs-fixer, cs2pr
 
-      - uses: 'actions/cache@v3'
+      - uses: actions/cache@v3
         with:
           path: '.php-cs-fixer.cache'
-          key: '${{ github.repository }}-8.1-phpcsfixer-${{ github.ref_name }}'
+          key: ${{ github.repository }}-8.2-phpcsfixer-${{ github.ref_name }}
           restore-keys: |
-            ${{ github.repository }}-8.1-phpcsfixer-main
-            ${{ github.repository }}-8.1-phpcsfixer-
+            ${{ github.repository }}-8.2-phpcsfixer-master
+            ${{ github.repository }}-8.2-phpcsfixer-
 
-      - name: 'Run PHP-CS-Fixer'
+      - name: Run PHP-CS-Fixer
         # Using cs2pr settings, see: https://github.com/shivammathur/setup-php#tools-with-checkstyle-support
         run: 'php-cs-fixer fix --dry-run --format checkstyle | cs2pr'

From 2826410bbfdb8dd69db968b9c44ca2550a38a9da Mon Sep 17 00:00:00 2001
From: thePanz <thepanz@gmail.com>
Date: Fri, 17 Nov 2023 08:42:16 +0100
Subject: [PATCH 78/78] Fix(php-cs-fixer) Fix php-cs-fixer warnings, according
 to new checks

---
 data/bin/check_configuration.php              |  8 +--
 lib/action/sfAction.class.php                 | 10 +---
 lib/action/sfComponents.class.php             |  2 -
 lib/addon/sfPager.class.php                   | 13 +----
 lib/autoload/sfAutoload.class.php             |  4 +-
 lib/autoload/sfAutoloadAgain.class.php        |  4 +-
 lib/cache/sfAPCCache.class.php                | 13 ++---
 lib/cache/sfCache.class.php                   |  2 -
 lib/cache/sfEAcceleratorCache.class.php       |  9 +--
 lib/cache/sfFileCache.class.php               | 13 ++---
 lib/cache/sfMemcacheCache.class.php           | 14 ++---
 lib/cache/sfNoCache.class.php                 | 12 ++--
 lib/cache/sfSQLiteCache.class.php             | 14 ++---
 lib/cache/sfXCacheCache.class.php             | 13 ++---
 lib/command/sfCommandApplication.class.php    |  1 -
 .../sfCommandArgumentsException.class.php     |  4 +-
 lib/command/sfCommandException.class.php      |  4 +-
 lib/command/sfFormatter.class.php             |  4 +-
 .../sfApplicationConfiguration.class.php      | 10 +---
 lib/config/sfAutoloadConfigHandler.class.php  |  1 -
 lib/config/sfCacheConfigHandler.class.php     |  1 -
 lib/config/sfCompileConfigHandler.class.php   |  1 -
 lib/config/sfDatabaseConfigHandler.class.php  |  1 -
 ...sfDefineEnvironmentConfigHandler.class.php |  1 -
 lib/config/sfFactoryConfigHandler.class.php   |  1 -
 lib/config/sfFilterConfigHandler.class.php    |  1 -
 lib/config/sfGeneratorConfigHandler.class.php |  1 -
 lib/config/sfPluginConfiguration.class.php    | 12 +---
 lib/config/sfProjectConfiguration.class.php   |  8 +--
 lib/config/sfSecurityConfigHandler.class.php  |  1 -
 lib/config/sfServiceConfigHandler.class.php   |  1 -
 .../sfSimpleYamlConfigHandler.class.php       |  1 -
 lib/config/sfViewConfigHandler.class.php      |  1 -
 .../default/actions/actions.class.php         | 24 ++------
 lib/database/sfPDODatabase.class.php          |  2 -
 lib/debug/sfWebDebug.class.php                |  4 +-
 lib/debug/sfWebDebugPanel.class.php           |  4 +-
 lib/debug/sfWebDebugPanelCache.class.php      |  4 +-
 lib/debug/sfWebDebugPanelMemory.class.php     |  8 +--
 .../sfWebDebugPanelSymfonyVersion.class.php   |  8 +--
 lib/debug/sfWebDebugPanelView.class.php       |  2 -
 lib/escaper/sfOutputEscaper.class.php         |  2 -
 .../sfOutputEscaperArrayDecorator.class.php   |  1 -
 .../sfOutputEscaperObjectDecorator.class.php  |  2 -
 lib/exception/sfCacheException.class.php      |  4 +-
 .../sfConfigurationException.class.php        |  4 +-
 lib/exception/sfControllerException.class.php |  4 +-
 lib/exception/sfDatabaseException.class.php   |  4 +-
 lib/exception/sfFactoryException.class.php    |  4 +-
 lib/exception/sfFileException.class.php       |  4 +-
 lib/exception/sfFilterException.class.php     |  4 +-
 lib/exception/sfForwardException.class.php    |  4 +-
 .../sfInitializationException.class.php       |  4 +-
 lib/exception/sfParseException.class.php      |  4 +-
 lib/exception/sfRenderException.class.php     |  4 +-
 lib/exception/sfSecurityException.class.php   |  4 +-
 lib/exception/sfStopException.class.php       |  4 +-
 lib/exception/sfStorageException.class.php    |  4 +-
 lib/exception/sfViewException.class.php       |  4 +-
 lib/filter/sfBasicSecurityFilter.class.php    |  4 +-
 lib/form/addon/sfFormFilter.class.php         |  4 +-
 lib/form/addon/sfFormSymfony.class.php        |  6 +-
 lib/form/sfForm.class.php                     | 13 +----
 .../sfModelGeneratorConfiguration.class.php   |  4 +-
 lib/helper/AssetHelper.php                    | 20 -------
 lib/helper/CacheHelper.php                    |  3 -
 lib/helper/DateHelper.php                     |  6 --
 lib/helper/EscapingHelper.php                 |  2 -
 lib/helper/I18NHelper.php                     |  4 --
 lib/helper/JavascriptBaseHelper.php           | 11 ----
 lib/helper/NumberHelper.php                   |  1 -
 lib/helper/PartialHelper.php                  |  4 --
 lib/helper/TagHelper.php                      |  6 --
 lib/helper/TextHelper.php                     | 33 -----------
 lib/helper/UrlHelper.php                      | 33 -----------
 lib/i18n/Gettext/MO.php                       |  2 -
 lib/i18n/Gettext/PO.php                       |  1 -
 lib/i18n/extract/sfI18nExtract.class.php      |  7 +--
 .../extract/sfI18nYamlExtractor.class.php     |  4 +-
 lib/i18n/sfCultureInfo.class.php              |  6 --
 lib/i18n/sfDateTimeFormatInfo.class.php       | 10 ----
 lib/i18n/sfI18N.class.php                     |  2 -
 lib/i18n/sfMessageSource_Aggregate.class.php  |  8 ---
 lib/i18n/sfMessageSource_MySQL.class.php      |  3 -
 lib/i18n/sfMessageSource_SQLite.class.php     |  4 --
 lib/i18n/sfMessageSource_SQLite3.class.php    |  3 -
 lib/i18n/sfNumberFormatInfo.class.php         | 11 ----
 lib/log/sfEventLogger.class.php               |  6 --
 lib/log/sfFileLogger.class.php                |  4 --
 lib/log/sfLogger.class.php                    |  5 +-
 lib/log/sfNoLogger.class.php                  |  8 +--
 lib/log/sfPsrLoggerAdapter.class.php          |  2 -
 .../sfMailerMessageLoggerPlugin.class.php     |  4 +-
 lib/mailer/sfNoMailer.class.php               | 16 ++----
 lib/plugin/sfPearDownloader.class.php         |  5 --
 lib/plugin/sfPearRest.class.php               |  3 -
 lib/plugin/sfPearRest10.class.php             |  3 -
 lib/plugin/sfPearRest11.class.php             |  3 -
 .../sfPluginDependencyException.class.php     |  4 +-
 lib/plugin/sfPluginException.class.php        |  4 +-
 lib/plugin/sfPluginManager.class.php          |  7 +--
 ...uginRecursiveDependencyException.class.php |  4 +-
 lib/plugin/sfPluginRestException.class.php    |  4 +-
 lib/plugin/sfSymfonyPluginManager.class.php   |  3 +-
 .../sfDoctrineConnectionProfiler.class.php    |  3 -
 .../lib/form/sfFormDoctrine.class.php         |  6 +-
 .../lib/form/sfFormFilterDoctrine.class.php   |  4 +-
 .../sfDoctrineFormFilterGenerator.class.php   |  2 -
 .../sfDoctrineFormGenerator.class.php         |  3 -
 .../lib/mailer/Swift_DoctrineSpool.class.php  | 11 +---
 .../sfDoctrineRecordI18nFilter.class.php      |  4 +-
 .../lib/sfDoctrineException.class.php         |  4 +-
 .../lib/task/sfDoctrineBaseTask.class.php     |  2 -
 .../lib/task/sfDoctrineBuildDbTask.class.php  |  3 -
 .../task/sfDoctrineBuildFiltersTask.class.php |  3 -
 .../task/sfDoctrineBuildFormsTask.class.php   |  3 -
 .../task/sfDoctrineBuildModelTask.class.php   |  3 -
 .../task/sfDoctrineBuildSchemaTask.class.php  |  3 -
 .../lib/task/sfDoctrineBuildSqlTask.class.php |  3 -
 .../lib/task/sfDoctrineBuildTask.class.php    |  3 -
 .../sfDoctrineCleanModelFilesTask.class.php   |  9 ---
 .../lib/task/sfDoctrineCompileTask.class.php  |  3 -
 .../sfDoctrineConfigureDatabaseTask.class.php |  3 -
 .../lib/task/sfDoctrineDataDumpTask.class.php |  3 -
 .../lib/task/sfDoctrineDataLoadTask.class.php |  3 -
 .../sfDoctrineDeleteModelFilesTask.class.php  |  3 -
 .../lib/task/sfDoctrineDqlTask.class.php      |  3 -
 .../lib/task/sfDoctrineDropDbTask.class.php   |  3 -
 .../sfDoctrineGenerateAdminTask.class.php     |  3 -
 .../sfDoctrineGenerateMigrationTask.class.php |  3 -
 ...DoctrineGenerateMigrationsDbTask.class.php |  3 -
 ...ctrineGenerateMigrationsDiffTask.class.php |  3 -
 ...rineGenerateMigrationsModelsTask.class.php |  3 -
 ...ctrineGenerateModuleForRouteTask.class.php |  3 -
 .../sfDoctrineGenerateModuleTask.class.php    |  3 -
 .../task/sfDoctrineInsertSqlTask.class.php    |  3 -
 .../lib/task/sfDoctrineMigrateTask.class.php  |  3 -
 .../lib/test/sfTesterDoctrine.class.php       |  8 +--
 .../sfValidatorDoctrineChoice.class.php       |  5 --
 .../sfValidatorDoctrineUnique.class.php       |  8 ---
 .../sfWidgetFormDoctrineArrayChoice.class.php |  6 --
 .../sfWidgetFormDoctrineChoice.class.php      |  6 --
 .../test/functional/AdminGenBrowser.class.php | 15 ++---
 .../test/functional/RouteTest.php             |  3 +-
 .../config/backendConfiguration.class.php     |  4 +-
 .../apps/backend/lib/myUser.class.php         |  4 +-
 .../my_articles/actions/actions.class.php     |  4 +-
 ...y_articlesGeneratorConfiguration.class.php |  4 +-
 .../lib/my_articlesGeneratorHelper.class.php  |  4 +-
 .../config/frontendConfiguration.class.php    |  4 +-
 .../apps/frontend/lib/myUser.class.php        |  4 +-
 .../doctrine/ArticleFormFilter.class.php      |  4 +-
 .../ArticleTranslationFormFilter.class.php    |  4 +-
 .../doctrine/AttachmentFormFilter.class.php   |  4 +-
 .../doctrine/AuthorFormFilter.class.php       |  4 +-
 ...horInheritanceConcreteFormFilter.class.php |  4 +-
 .../AuthorInheritanceFormFilter.class.php     |  4 +-
 .../doctrine/BaseFormFilterDoctrine.class.php |  4 +-
 ...BlogArticleTranslationFormFilter.class.php |  4 +-
 .../doctrine/CamelCaseFormFilter.class.php    |  4 +-
 .../DefaultValueTestFormFilter.class.php      |  4 +-
 .../FormGeneratorTest2FormFilter.class.php    |  4 +-
 .../filter/doctrine/GroupFormFilter.class.php |  4 +-
 .../doctrine/PermissionFormFilter.class.php   |  4 +-
 .../doctrine/ProfileFormFilter.class.php      |  4 +-
 .../doctrine/ResourceTypeFormFilter.class.php |  4 +-
 .../SettingFormFilter.class.php               |  4 +-
 .../doctrine/SubscriptionFormFilter.class.php |  4 +-
 .../doctrine/UniqueTestFormFilter.class.php   |  4 +-
 .../filter/doctrine/UserFormFilter.class.php  |  4 +-
 .../fixtures/lib/form/BaseForm.class.php      |  4 +-
 .../doctrine/ArticleTranslationForm.class.php |  4 +-
 .../lib/form/doctrine/AuthorForm.class.php    |  4 +-
 .../doctrine/AuthorInheritanceForm.class.php  |  4 +-
 .../form/doctrine/BaseFormDoctrine.class.php  |  4 +-
 .../BlogArticleTranslationForm.class.php      |  4 +-
 .../lib/form/doctrine/CamelCaseForm.class.php |  4 +-
 .../doctrine/DefaultValueTestForm.class.php   |  4 +-
 .../doctrine/FormGeneratorTestForm.class.php  |  4 +-
 .../lib/form/doctrine/GroupForm.class.php     |  4 +-
 .../form/doctrine/PermissionForm.class.php    |  4 +-
 .../lib/form/doctrine/ProfileForm.class.php   |  4 +-
 .../form/doctrine/ResourceTypeForm.class.php  |  4 +-
 .../SettingsPlugin/SettingForm.class.php      |  4 +-
 .../form/doctrine/SubscriptionForm.class.php  |  4 +-
 .../form/doctrine/UniqueTestForm.class.php    |  4 +-
 .../lib/model/doctrine/Attachment.class.php   |  4 +-
 .../model/doctrine/AttachmentTable.class.php  |  4 +-
 .../doctrine/AuthorInheritance.class.php      |  4 +-
 .../AuthorInheritanceConcrete.class.php       |  4 +-
 .../AuthorInheritanceConcreteTable.class.php  |  4 +-
 .../doctrine/AuthorInheritanceTable.class.php |  4 +-
 .../lib/model/doctrine/BlogArticle.class.php  |  4 +-
 .../model/doctrine/BlogArticleTable.class.php |  4 +-
 .../lib/model/doctrine/BlogAuthor.class.php   |  4 +-
 .../model/doctrine/BlogAuthorTable.class.php  |  4 +-
 .../lib/model/doctrine/CamelCase.class.php    |  4 +-
 .../model/doctrine/CamelCaseTable.class.php   |  4 +-
 .../model/doctrine/DefaultValueTest.class.php |  4 +-
 .../doctrine/DefaultValueTestTable.class.php  |  4 +-
 .../doctrine/FormGeneratorTest.class.php      |  4 +-
 .../doctrine/FormGeneratorTest2.class.php     |  4 +-
 .../FormGeneratorTest2Table.class.php         |  4 +-
 .../doctrine/FormGeneratorTest3.class.php     |  4 +-
 .../FormGeneratorTest3Table.class.php         |  4 +-
 .../doctrine/FormGeneratorTestTable.class.php |  4 +-
 .../lib/model/doctrine/Group.class.php        |  4 +-
 .../model/doctrine/GroupPermission.class.php  |  4 +-
 .../doctrine/GroupPermissionTable.class.php   |  4 +-
 .../lib/model/doctrine/GroupTable.class.php   |  4 +-
 .../doctrine/ModelFromLinkedSchema.class.php  |  4 +-
 .../ModelFromLinkedSchemaTable.class.php      |  4 +-
 .../ModelWithNumberInColumn.class.php         |  4 +-
 .../ModelWithNumberInColumnTable.class.php    |  4 +-
 .../lib/model/doctrine/Permission.class.php   |  4 +-
 .../model/doctrine/PermissionTable.class.php  |  4 +-
 .../lib/model/doctrine/Profile.class.php      |  4 +-
 .../lib/model/doctrine/ProfileTable.class.php |  4 +-
 .../lib/model/doctrine/ResourceType.class.php |  4 +-
 .../doctrine/ResourceTypeTable.class.php      |  4 +-
 .../doctrine/SettingsPlugin/Setting.class.php |  4 +-
 .../lib/model/doctrine/Subscription.class.php |  4 +-
 .../doctrine/SubscriptionTable.class.php      |  4 +-
 .../lib/model/doctrine/UniqueTest.class.php   |  4 +-
 .../model/doctrine/UniqueTestTable.class.php  |  4 +-
 .../lib/model/doctrine/UserGroup.class.php    |  4 +-
 .../model/doctrine/UserGroupTable.class.php   |  4 +-
 .../model/doctrine/UserPermission.class.php   |  4 +-
 .../doctrine/UserPermissionTable.class.php    |  4 +-
 .../fixtures/lib/myDoctrineRecord.class.php   |  4 +-
 .../PluginSettingFormFilter.class.php         |  4 +-
 .../form/doctrine/PluginSettingForm.class.php |  4 +-
 .../model/doctrine/PluginSetting.class.php    |  4 +-
 .../test/unit/form/sfFormDoctrineTest.php     |  4 +-
 .../test/unit/sfDoctrineDatabaseTest.php      |  4 +-
 lib/request/sfRequest.class.php               |  2 -
 lib/request/sfWebRequest.class.php            |  3 +-
 lib/response/sfWebResponse.class.php          |  1 -
 lib/routing/sfPatternRouting.class.php        | 12 ----
 lib/routing/sfRequestRoute.class.php          |  5 --
 lib/routing/sfRoute.class.php                 |  5 +-
 lib/routing/sfRouting.class.php               |  7 +--
 .../sfServiceContainerDumperPhp.class.php     |  6 +-
 lib/storage/sfMySQLSessionStorage.class.php   |  2 +-
 lib/storage/sfNoStorage.class.php             |  8 +--
 lib/task/app/sfAppRoutesTask.class.php        |  3 -
 lib/task/cache/sfCacheClearTask.class.php     |  3 -
 .../configure/sfConfigureAuthorTask.class.php |  3 -
 .../generator/sfGenerateAppTask.class.php     |  3 -
 .../generator/sfGenerateModuleTask.class.php  |  3 -
 .../generator/sfGenerateProjectTask.class.php |  5 --
 .../generator/sfGenerateTaskTask.class.php    |  3 -
 .../generator/sfGeneratorBaseTask.class.php   |  4 +-
 lib/task/help/sfHelpTask.class.php            |  3 -
 lib/task/help/sfListTask.class.php            |  3 -
 lib/task/i18n/sfI18nExtractTask.class.php     |  3 -
 lib/task/i18n/sfI18nFindTask.class.php        |  3 -
 lib/task/log/sfLogClearTask.class.php         |  3 -
 lib/task/log/sfLogRotateTask.class.php        |  3 -
 .../plugin/sfPluginAddChannelTask.class.php   |  3 -
 lib/task/plugin/sfPluginBaseTask.class.php    |  4 +-
 lib/task/plugin/sfPluginInstallTask.class.php |  3 -
 lib/task/plugin/sfPluginListTask.class.php    |  3 -
 .../sfPluginPublishAssetsTask.class.php       |  8 +--
 .../plugin/sfPluginUninstallTask.class.php    |  3 -
 lib/task/plugin/sfPluginUpgradeTask.class.php |  3 -
 .../sfProjectClearControllersTask.class.php   |  3 -
 .../project/sfProjectDeployTask.class.php     |  3 -
 .../project/sfProjectDisableTask.class.php    |  3 -
 .../project/sfProjectEnableTask.class.php     |  3 -
 .../project/sfProjectOptimizeTask.class.php   |  3 -
 .../sfProjectPermissionsTask.class.php        |  7 ---
 .../project/sfProjectValidateTask.class.php   |  3 -
 lib/task/sfBaseTask.class.php                 |  5 --
 lib/task/sfCommandApplicationTask.class.php   |  4 +-
 lib/task/sfTask.class.php                     | 42 +++++++-------
 lib/task/symfony/sfSymfonyTestTask.class.php  |  3 -
 lib/task/test/sfTestAllTask.class.php         |  3 -
 lib/task/test/sfTestCoverageTask.class.php    |  3 -
 lib/task/test/sfTestFunctionalTask.class.php  |  3 -
 lib/task/test/sfTestPluginTask.class.php      |  3 -
 lib/task/test/sfTestUnitTask.class.php        |  3 -
 lib/test/sfTestFunctional.class.php           |  1 -
 lib/test/sfTestFunctionalBase.class.php       |  4 +-
 lib/test/sfTesterMailer.class.php             |  4 +-
 lib/test/sfTesterRequest.class.php            |  4 +-
 lib/test/sfTesterResponse.class.php           |  5 +-
 lib/test/sfTesterUser.class.php               |  9 +--
 lib/test/sfTesterViewCache.class.php          |  4 +-
 lib/user/sfBasicSecurityUser.class.php        |  5 +-
 lib/util/sfClassManipulator.class.php         |  1 -
 lib/util/sfParameterHolder.class.php          |  4 +-
 lib/util/sfToolkit.class.php                  |  3 -
 lib/validator/sfValidatorAnd.class.php        |  4 --
 lib/validator/sfValidatorBase.class.php       |  4 +-
 lib/validator/sfValidatorBoolean.class.php    |  2 -
 lib/validator/sfValidatorCSRFToken.class.php  |  5 --
 lib/validator/sfValidatorCallback.class.php   |  2 -
 lib/validator/sfValidatorChoice.class.php     |  5 +-
 lib/validator/sfValidatorDate.class.php       |  7 +--
 lib/validator/sfValidatorDateRange.class.php  |  2 -
 lib/validator/sfValidatorDateTime.class.php   |  3 -
 lib/validator/sfValidatorDecorator.class.php  | 25 --------
 lib/validator/sfValidatorEmail.class.php      |  3 -
 lib/validator/sfValidatorEqual.class.php      |  2 -
 lib/validator/sfValidatorError.class.php      |  3 -
 .../sfValidatorErrorSchema.class.php          |  8 +--
 lib/validator/sfValidatorFile.class.php       |  4 --
 lib/validator/sfValidatorFileMulti.class.php  |  2 -
 .../sfValidatorFromDescription.class.php      |  4 --
 lib/validator/sfValidatorInteger.class.php    |  2 -
 lib/validator/sfValidatorNumber.class.php     |  2 -
 lib/validator/sfValidatorOr.class.php         |  7 ---
 lib/validator/sfValidatorPass.class.php       |  4 --
 lib/validator/sfValidatorRegex.class.php      |  2 -
 lib/validator/sfValidatorSchema.class.php     |  6 --
 .../sfValidatorSchemaCompare.class.php        |  4 --
 .../sfValidatorSchemaFilter.class.php         |  4 --
 lib/validator/sfValidatorString.class.php     |  2 -
 lib/validator/sfValidatorTime.class.php       |  4 --
 lib/view/sfPHPView.class.php                  |  4 +-
 lib/view/sfPartialView.class.php              |  9 +--
 lib/view/sfView.class.php                     |  5 --
 lib/view/sfViewCacheManager.class.php         |  5 --
 lib/view/sfViewParameterHolder.class.php      |  3 -
 .../i18n/sfWidgetFormI18nDateTime.class.php   |  4 --
 lib/widget/sfWidget.class.php                 |  4 +-
 .../sfWidgetFormSchemaDecorator.class.php     | 36 +++---------
 .../sfWidgetFormSchemaFormatter.class.php     |  4 --
 lib/yaml/sfYaml.class.php                     |  3 +-
 lib/yaml/sfYamlInline.class.php               |  2 -
 test/functional/authTest.php                  |  9 +--
 test/functional/autoloadTest.php              |  3 +-
 test/functional/cacheTest.php                 | 42 +++++---------
 test/functional/filterTest.php                |  6 +-
 .../cache/config/cacheConfiguration.class.php |  4 +-
 .../fixtures/apps/cache/lib/myUser.class.php  |  4 +-
 .../modules/cache/actions/actions.class.php   | 28 +++------
 .../modules/nocache/actions/actions.class.php |  4 +-
 .../apps/frontend/lib/myUser.class.php        |  4 +-
 .../assetInclusion/actions/actions.class.php  |  4 +-
 .../modules/browser/actions/actions.class.php |  4 +-
 .../actions/actions.class.php                 |  4 +-
 .../actions/actions.class.php                 |  4 +-
 .../actions/actions.class.php                 |  4 +-
 .../actions/actions.class.php                 |  4 +-
 .../actions/actions.class.php                 |  4 +-
 .../modules/view/actions/actions.class.php    |  8 +--
 .../fixtures/apps/i18n/lib/myUser.class.php   |  4 +-
 .../fixtures/lib/ExtendMe.class.php           |  4 +-
 .../fixtures/lib/form/BaseForm.class.php      |  4 +-
 .../config/NotInLib.class.php                 |  4 +-
 .../sfAutoloadPluginConfiguration.class.php   |  4 +-
 .../lib/BaseExtendMe.class.php                |  4 +-
 .../sfAutoloadPlugin/lib/ExtendMe.class.php   |  4 +-
 test/functional/formatTest.php                | 24 +++-----
 test/functional/genericTest.php               | 57 +++++++------------
 test/functional/httpcacheTest.php             | 12 ++--
 test/functional/i18nFormTest.php              |  9 +--
 test/functional/i18nTest.php                  | 15 ++---
 test/functional/prodTest.php                  | 15 ++---
 test/functional/sfTestBrowserTest.php         | 21 +++----
 .../fixtures/task/myPluginTask.class.php      |  4 +-
 test/unit/action/sfComponentTest.php          |  4 +-
 test/unit/addon/sfPagerTest.php               |  8 +--
 test/unit/cache/sfCacheTest.php               | 36 +++---------
 test/unit/config/sfConfigHandlerTest.php      |  4 +-
 test/unit/config/sfYamlConfigHandlerTest.php  |  4 +-
 test/unit/controller/sfControllerTest.php     |  4 +-
 test/unit/controller/sfWebControllerTest.php  |  8 +--
 test/unit/database/sfDatabaseTest.php         |  8 +--
 .../sfOutputEscaperArrayDecoratorTest.php     |  4 +-
 .../sfOutputEscaperObjectDecoratorTest.php    |  8 +--
 test/unit/escaper/sfOutputEscaperTest.php     |  4 +-
 test/unit/generator/sfGeneratorTest.php       |  8 +--
 test/unit/helper/PartialHelperTest.php        |  8 +--
 test/unit/helper/UrlHelperTest.php            |  4 +-
 test/unit/i18n/extract/sfI18nExtractTest.php  |  4 +-
 test/unit/i18n/sfI18NTest.php                 |  4 +-
 test/unit/i18n/sfMessageSourceTest.php        | 24 ++------
 test/unit/i18n/sfMessageSource_FileTest.php   | 12 +---
 test/unit/log/sfLoggerTest.php                |  4 +-
 .../mailer/fixtures/TestMailMessage.class.php |  8 +--
 .../fixtures/TestMailerTransport.class.php    |  4 +-
 test/unit/mailer/fixtures/TestSpool.class.php | 12 +---
 .../plugin/sfPearDownloaderTest.class.php     |  5 --
 test/unit/plugin/sfPearRestTest.class.php     |  3 -
 test/unit/request/sfRequestTest.php           |  4 +-
 test/unit/response/sfResponseTest.php         | 20 ++-----
 .../fixtures/containers/container10.php       |  3 +-
 .../fixtures/containers/container9.php        |  9 +--
 .../service/fixtures/includes/classes.php     |  8 +--
 .../service/sfServiceContainerDumperTest.php  |  4 +-
 test/unit/sfNoRouting.class.php               | 16 +-----
 test/unit/storage/sfStorageTest.php           | 24 ++------
 test/unit/task/sfBaseTaskTest.php             |  4 +-
 test/unit/test/sfTestFunctionalTest.php       |  4 +-
 test/unit/util/sfBrowserTest.php              | 12 ++--
 test/unit/util/sfContextTest.php              |  4 +-
 test/unit/validator/sfValidatorFileTest.php   |  4 +-
 test/unit/view/sfViewCacheManagerTest.php     | 12 +---
 test/unit/view/sfViewTest.php                 | 16 ++----
 test/unit/widget/sfWidgetFormChoiceTest.php   |  4 +-
 .../unit/widget/sfWidgetFormDateRangeTest.php |  8 +--
 .../widget/sfWidgetFormFilterDateTest.php     |  8 +--
 .../widget/sfWidgetFormFilterInputTest.php    |  4 +-
 .../sfWidgetFormInputFileEditableTest.php     |  4 +-
 .../sfWidgetFormSchemaFormatterTest.php       |  4 +-
 .../widget/sfWidgetFormSelectCheckboxTest.php |  4 +-
 .../widget/sfWidgetFormSelectRadioTest.php    |  4 +-
 test/unit/widget/sfWidgetFormSelectTest.php   |  4 +-
 411 files changed, 454 insertions(+), 1852 deletions(-)

diff --git a/data/bin/check_configuration.php b/data/bin/check_configuration.php
index 10b10adc8..cdb3276e5 100644
--- a/data/bin/check_configuration.php
+++ b/data/bin/check_configuration.php
@@ -7,11 +7,6 @@ function is_cli()
 
 /**
  * Checks a configuration.
- *
- * @param mixed $boolean
- * @param mixed $message
- * @param mixed $help
- * @param mixed $fatal
  */
 function check($boolean, $message, $help = '', $fatal = false)
 {
@@ -84,8 +79,7 @@ function get_ini_path()
 $accelerator =
   (function_exists('apc_store') && ini_get('apc.enabled'))
   || function_exists('eaccelerator_put') && ini_get('eaccelerator.enable')
-  || function_exists('xcache_set')
-;
+  || function_exists('xcache_set');
 check($accelerator, 'A PHP accelerator is installed', 'Install a PHP accelerator like APC (highly recommended)', false);
 
 check(!ini_get('short_open_tag'), 'php.ini has short_open_tag set to off', 'Set it to off in php.ini', false);
diff --git a/lib/action/sfAction.class.php b/lib/action/sfAction.class.php
index 5fdcc49c9..4753c3c6a 100644
--- a/lib/action/sfAction.class.php
+++ b/lib/action/sfAction.class.php
@@ -46,18 +46,14 @@ public function initialize($context, $moduleName, $actionName)
      *
      * By default, this method is empty.
      */
-    public function preExecute()
-    {
-    }
+    public function preExecute() {}
 
     /**
      * Execute an application defined process immediately after execution of this sfAction object.
      *
      * By default, this method is empty.
      */
-    public function postExecute()
-    {
-    }
+    public function postExecute() {}
 
     /**
      * Forwards current action to the default 404 error action.
@@ -385,8 +381,6 @@ public function setSecurityConfiguration($security)
      *
      * @param string $name    The name of the value to pull from security.yml
      * @param mixed  $default The default value to return if none is found in security.yml
-     *
-     * @return mixed
      */
     public function getSecurityValue($name, $default = null)
     {
diff --git a/lib/action/sfComponents.class.php b/lib/action/sfComponents.class.php
index 967d7cbff..ce96e70e5 100644
--- a/lib/action/sfComponents.class.php
+++ b/lib/action/sfComponents.class.php
@@ -20,8 +20,6 @@ abstract class sfComponents extends sfComponent
     /**
      * @param sfRequest $request
      *
-     * @return mixed
-     *
      * @throws sfInitializationException
      *
      * @see sfComponent
diff --git a/lib/addon/sfPager.class.php b/lib/addon/sfPager.class.php
index 9709060d7..1800e3fc3 100644
--- a/lib/addon/sfPager.class.php
+++ b/lib/addon/sfPager.class.php
@@ -155,8 +155,6 @@ public function setCursor($pos)
      * Returns an object by cursor position.
      *
      * @param int $pos
-     *
-     * @return mixed
      */
     public function getObjectByCursor($pos)
     {
@@ -167,8 +165,6 @@ public function getObjectByCursor($pos)
 
     /**
      * Returns the current object.
-     *
-     * @return mixed
      */
     public function getCurrent()
     {
@@ -396,10 +392,8 @@ public function getParameterHolder()
     /**
      * Returns a parameter.
      *
-     * @param string $name
-     * @param mixed  $default
-     *
-     * @return mixed
+     * @param string     $name
+     * @param mixed|null $default
      */
     public function getParameter($name, $default = null)
     {
@@ -422,7 +416,6 @@ public function hasParameter($name)
      * Sets a parameter.
      *
      * @param string $name
-     * @param mixed  $value
      */
     public function setParameter($name, $value)
     {
@@ -525,8 +518,6 @@ public function count()
      * Used internally by {@link getCurrent()}.
      *
      * @param int $offset
-     *
-     * @return mixed
      */
     abstract protected function retrieveObject($offset);
 
diff --git a/lib/autoload/sfAutoload.class.php b/lib/autoload/sfAutoload.class.php
index f3e238e27..8e3ddc439 100644
--- a/lib/autoload/sfAutoload.class.php
+++ b/lib/autoload/sfAutoload.class.php
@@ -26,9 +26,7 @@ class sfAutoload
     protected $overriden = array();
     protected $classes = array();
 
-    protected function __construct()
-    {
-    }
+    protected function __construct() {}
 
     /**
      * Retrieves the singleton instance of this class.
diff --git a/lib/autoload/sfAutoloadAgain.class.php b/lib/autoload/sfAutoloadAgain.class.php
index edf0c9461..d44d70ed3 100644
--- a/lib/autoload/sfAutoloadAgain.class.php
+++ b/lib/autoload/sfAutoloadAgain.class.php
@@ -25,9 +25,7 @@ class sfAutoloadAgain
     /**
      * Constructor.
      */
-    protected function __construct()
-    {
-    }
+    protected function __construct() {}
 
     /**
      * Returns the singleton autoloader.
diff --git a/lib/cache/sfAPCCache.class.php b/lib/cache/sfAPCCache.class.php
index 41b65505c..721bea021 100644
--- a/lib/cache/sfAPCCache.class.php
+++ b/lib/cache/sfAPCCache.class.php
@@ -27,7 +27,6 @@ class sfAPCCache extends sfCache
      * * see sfCache for options available for all drivers
      *
      * @see sfCache
-     * {@inheritdoc}
      */
     public function initialize($options = array())
     {
@@ -38,7 +37,8 @@ public function initialize($options = array())
 
     /**
      * @see sfCache
-     * {@inheritdoc}
+     *
+     * @param mixed|null $default
      */
     public function get($key, $default = null)
     {
@@ -53,7 +53,6 @@ public function get($key, $default = null)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
      */
     public function has($key)
     {
@@ -68,7 +67,8 @@ public function has($key)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
+     *
+     * @param mixed|null $lifetime
      */
     public function set($key, $data, $lifetime = null)
     {
@@ -81,7 +81,6 @@ public function set($key, $data, $lifetime = null)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
      */
     public function remove($key)
     {
@@ -94,7 +93,6 @@ public function remove($key)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
      */
     public function clean($mode = sfCache::ALL)
     {
@@ -109,7 +107,6 @@ public function clean($mode = sfCache::ALL)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
      */
     public function getLastModified($key)
     {
@@ -122,7 +119,6 @@ public function getLastModified($key)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
      */
     public function getTimeout($key)
     {
@@ -135,7 +131,6 @@ public function getTimeout($key)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
      */
     public function removePattern($pattern)
     {
diff --git a/lib/cache/sfCache.class.php b/lib/cache/sfCache.class.php
index 4668af3b5..656e3fc71 100644
--- a/lib/cache/sfCache.class.php
+++ b/lib/cache/sfCache.class.php
@@ -201,8 +201,6 @@ public function getOption($name, $default = null)
      *
      * @param string $name  The option name
      * @param mixed  $value The option value
-     *
-     * @return mixed
      */
     public function setOption($name, $value)
     {
diff --git a/lib/cache/sfEAcceleratorCache.class.php b/lib/cache/sfEAcceleratorCache.class.php
index 88342cdbc..c97092456 100644
--- a/lib/cache/sfEAcceleratorCache.class.php
+++ b/lib/cache/sfEAcceleratorCache.class.php
@@ -42,8 +42,8 @@ public function initialize($options = array())
     /**
      * @see sfCache
      *
-     * @param string $key
-     * @param mixed  $default
+     * @param string     $key
+     * @param mixed|null $default
      *
      * @return string|null
      */
@@ -82,7 +82,6 @@ public function set($key, $data, $lifetime = null)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
      */
     public function remove($key)
     {
@@ -91,7 +90,6 @@ public function remove($key)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
      */
     public function removePattern($pattern)
     {
@@ -110,7 +108,6 @@ public function removePattern($pattern)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
      */
     public function clean($mode = sfCache::ALL)
     {
@@ -136,7 +133,6 @@ public function clean($mode = sfCache::ALL)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
      */
     public function getLastModified($key)
     {
@@ -149,7 +145,6 @@ public function getLastModified($key)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
      */
     public function getTimeout($key)
     {
diff --git a/lib/cache/sfFileCache.class.php b/lib/cache/sfFileCache.class.php
index 9be20aadc..11d2d3c84 100644
--- a/lib/cache/sfFileCache.class.php
+++ b/lib/cache/sfFileCache.class.php
@@ -33,7 +33,6 @@ class sfFileCache extends sfCache
      * * see sfCache for options available for all drivers
      *
      * @see sfCache
-     * {@inheritdoc}
      */
     public function initialize($options = array())
     {
@@ -48,7 +47,8 @@ public function initialize($options = array())
 
     /**
      * @see sfCache
-     * {@inheritdoc}
+     *
+     * @param mixed|null $default
      */
     public function get($key, $default = null)
     {
@@ -68,7 +68,6 @@ public function get($key, $default = null)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
      */
     public function has($key)
     {
@@ -79,7 +78,8 @@ public function has($key)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
+     *
+     * @param mixed|null $lifetime
      */
     public function set($key, $data, $lifetime = null)
     {
@@ -92,7 +92,6 @@ public function set($key, $data, $lifetime = null)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
      */
     public function remove($key)
     {
@@ -101,7 +100,6 @@ public function remove($key)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
      */
     public function removePattern($pattern)
     {
@@ -130,7 +128,6 @@ public function removePattern($pattern)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
      */
     public function clean($mode = sfCache::ALL)
     {
@@ -150,7 +147,6 @@ public function clean($mode = sfCache::ALL)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
      */
     public function getTimeout($key)
     {
@@ -167,7 +163,6 @@ public function getTimeout($key)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
      */
     public function getLastModified($key)
     {
diff --git a/lib/cache/sfMemcacheCache.class.php b/lib/cache/sfMemcacheCache.class.php
index be29229d9..7d69a6336 100644
--- a/lib/cache/sfMemcacheCache.class.php
+++ b/lib/cache/sfMemcacheCache.class.php
@@ -36,7 +36,6 @@ class sfMemcacheCache extends sfCache
      * * see sfCache for options available for all drivers
      *
      * @see sfCache
-     * {@inheritdoc}
      */
     public function initialize($options = array())
     {
@@ -79,7 +78,8 @@ public function getBackend()
 
     /**
      * @see sfCache
-     * {@inheritdoc}
+     *
+     * @param mixed|null $default
      */
     public function get($key, $default = null)
     {
@@ -90,7 +90,6 @@ public function get($key, $default = null)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
      */
     public function has($key)
     {
@@ -104,7 +103,8 @@ public function has($key)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
+     *
+     * @param mixed|null $lifetime
      */
     public function set($key, $data, $lifetime = null)
     {
@@ -127,7 +127,6 @@ public function set($key, $data, $lifetime = null)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
      */
     public function remove($key)
     {
@@ -142,7 +141,6 @@ public function remove($key)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
      */
     public function clean($mode = sfCache::ALL)
     {
@@ -153,7 +151,6 @@ public function clean($mode = sfCache::ALL)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
      */
     public function getLastModified($key)
     {
@@ -166,7 +163,6 @@ public function getLastModified($key)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
      */
     public function getTimeout($key)
     {
@@ -179,7 +175,6 @@ public function getTimeout($key)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
      *
      * @throws sfCacheException
      */
@@ -199,7 +194,6 @@ public function removePattern($pattern)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
      */
     public function getMany($keys)
     {
diff --git a/lib/cache/sfNoCache.class.php b/lib/cache/sfNoCache.class.php
index 8b08e5eba..10d62b188 100644
--- a/lib/cache/sfNoCache.class.php
+++ b/lib/cache/sfNoCache.class.php
@@ -19,7 +19,8 @@ class sfNoCache extends sfCache
 {
     /**
      * @see sfCache
-     * {@inheritdoc}
+     *
+     * @param mixed|null $default
      */
     public function get($key, $default = null)
     {
@@ -28,7 +29,6 @@ public function get($key, $default = null)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
      */
     public function has($key)
     {
@@ -37,7 +37,8 @@ public function has($key)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
+     *
+     * @param mixed|null $lifetime
      */
     public function set($key, $data, $lifetime = null)
     {
@@ -46,7 +47,6 @@ public function set($key, $data, $lifetime = null)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
      */
     public function remove($key)
     {
@@ -55,7 +55,6 @@ public function remove($key)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
      */
     public function removePattern($pattern)
     {
@@ -64,7 +63,6 @@ public function removePattern($pattern)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
      */
     public function clean($mode = self::ALL)
     {
@@ -73,7 +71,6 @@ public function clean($mode = self::ALL)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
      */
     public function getLastModified($key)
     {
@@ -82,7 +79,6 @@ public function getLastModified($key)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
      */
     public function getTimeout($key)
     {
diff --git a/lib/cache/sfSQLiteCache.class.php b/lib/cache/sfSQLiteCache.class.php
index fb81e4a4b..5200cb60d 100644
--- a/lib/cache/sfSQLiteCache.class.php
+++ b/lib/cache/sfSQLiteCache.class.php
@@ -31,7 +31,6 @@ class sfSQLiteCache extends sfCache
      * * see sfCache for options available for all drivers
      *
      * @see sfCache
-     * {@inheritdoc}
      */
     public function initialize($options = array())
     {
@@ -62,7 +61,8 @@ public function getBackend()
 
     /**
      * @see sfCache
-     * {@inheritdoc}
+     *
+     * @param mixed|null $default
      */
     public function get($key, $default = null)
     {
@@ -77,7 +77,6 @@ public function get($key, $default = null)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
      */
     public function has($key)
     {
@@ -90,7 +89,8 @@ public function has($key)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
+     *
+     * @param mixed|null $lifetime
      */
     public function set($key, $data, $lifetime = null)
     {
@@ -107,7 +107,6 @@ public function set($key, $data, $lifetime = null)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
      */
     public function remove($key)
     {
@@ -120,7 +119,6 @@ public function remove($key)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
      */
     public function removePattern($pattern)
     {
@@ -133,7 +131,6 @@ public function removePattern($pattern)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
      */
     public function clean($mode = sfCache::ALL)
     {
@@ -152,7 +149,6 @@ public function clean($mode = sfCache::ALL)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
      */
     public function getTimeout($key)
     {
@@ -169,7 +165,6 @@ public function getTimeout($key)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
      */
     public function getLastModified($key)
     {
@@ -199,7 +194,6 @@ public function removePatternRegexpCallback($regexp, $key)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
      */
     public function getMany($keys)
     {
diff --git a/lib/cache/sfXCacheCache.class.php b/lib/cache/sfXCacheCache.class.php
index 9e8427364..8c5c53e5e 100644
--- a/lib/cache/sfXCacheCache.class.php
+++ b/lib/cache/sfXCacheCache.class.php
@@ -25,7 +25,6 @@ class sfXCacheCache extends sfCache
      * * see sfCache for options available for all drivers
      *
      * @see sfCache
-     * {@inheritdoc}
      */
     public function initialize($options = array())
     {
@@ -42,7 +41,8 @@ public function initialize($options = array())
 
     /**
      * @see sfCache
-     * {@inheritdoc}
+     *
+     * @param mixed|null $default
      */
     public function get($key, $default = null)
     {
@@ -57,7 +57,6 @@ public function get($key, $default = null)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
      */
     public function has($key)
     {
@@ -66,7 +65,8 @@ public function has($key)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
+     *
+     * @param mixed|null $lifetime
      */
     public function set($key, $data, $lifetime = null)
     {
@@ -83,7 +83,6 @@ public function set($key, $data, $lifetime = null)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
      */
     public function remove($key)
     {
@@ -92,7 +91,6 @@ public function remove($key)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
      */
     public function clean($mode = sfCache::ALL)
     {
@@ -113,7 +111,6 @@ public function clean($mode = sfCache::ALL)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
      */
     public function getLastModified($key)
     {
@@ -128,7 +125,6 @@ public function getLastModified($key)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
      */
     public function getTimeout($key)
     {
@@ -153,7 +149,6 @@ public function getBaseValue($key)
 
     /**
      * @see sfCache
-     * {@inheritdoc}
      */
     public function removePattern($pattern)
     {
diff --git a/lib/command/sfCommandApplication.class.php b/lib/command/sfCommandApplication.class.php
index 7d05b0eec..c232f2ae5 100644
--- a/lib/command/sfCommandApplication.class.php
+++ b/lib/command/sfCommandApplication.class.php
@@ -53,7 +53,6 @@ abstract class sfCommandApplication
     /** @var sfFormatter */
     protected $formatter;
 
-    /** @var mixed */
     protected $commandOptions;
 
     /**
diff --git a/lib/command/sfCommandArgumentsException.class.php b/lib/command/sfCommandArgumentsException.class.php
index 0dff151aa..e489fa311 100644
--- a/lib/command/sfCommandArgumentsException.class.php
+++ b/lib/command/sfCommandArgumentsException.class.php
@@ -15,6 +15,4 @@
  *
  * @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..3a680ad9d 100644
--- a/lib/command/sfCommandException.class.php
+++ b/lib/command/sfCommandException.class.php
@@ -15,6 +15,4 @@
  *
  * @version    SVN: $Id$
  */
-class sfCommandException extends sfException
-{
-}
+class sfCommandException extends sfException {}
diff --git a/lib/command/sfFormatter.class.php b/lib/command/sfFormatter.class.php
index c5b776ff0..a73feedc1 100644
--- a/lib/command/sfFormatter.class.php
+++ b/lib/command/sfFormatter.class.php
@@ -39,9 +39,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 = array()) {}
 
     /**
      * Formats a text according to the given parameters.
diff --git a/lib/config/sfApplicationConfiguration.class.php b/lib/config/sfApplicationConfiguration.class.php
index f89b42735..298d34550 100644
--- a/lib/config/sfApplicationConfiguration.class.php
+++ b/lib/config/sfApplicationConfiguration.class.php
@@ -66,18 +66,14 @@ public function __construct($environment, $debug, $rootDir = null, sfEventDispat
      *
      * Override this method if you want to customize your application configuration.
      */
-    public function configure()
-    {
-    }
+    public function configure() {}
 
     /**
      * Initialized the current configuration.
      *
      * Override this method if you want to customize your application initialization.
      */
-    public function initialize()
-    {
-    }
+    public function initialize() {}
 
     public function activate()
     {
@@ -244,8 +240,6 @@ public function setAppDir($appDir)
 
     /**
      * @see sfProjectConfiguration
-     *
-     * @param mixed $cacheDir
      */
     public function setCacheDir($cacheDir)
     {
diff --git a/lib/config/sfAutoloadConfigHandler.class.php b/lib/config/sfAutoloadConfigHandler.class.php
index ece3fea65..09faea48e 100755
--- a/lib/config/sfAutoloadConfigHandler.class.php
+++ b/lib/config/sfAutoloadConfigHandler.class.php
@@ -85,7 +85,6 @@ public static function parseFile($path, $file, $prefix)
 
     /**
      * @see sfConfigHandler
-     * {@inheritdoc}
      */
     public static function getConfiguration(array $configFiles)
     {
diff --git a/lib/config/sfCacheConfigHandler.class.php b/lib/config/sfCacheConfigHandler.class.php
index 4e64bf451..45b87138f 100644
--- a/lib/config/sfCacheConfigHandler.class.php
+++ b/lib/config/sfCacheConfigHandler.class.php
@@ -65,7 +65,6 @@ public function execute($configFiles)
 
     /**
      * @see sfConfigHandler
-     * {@inheritdoc}
      */
     public static function getConfiguration(array $configFiles)
     {
diff --git a/lib/config/sfCompileConfigHandler.class.php b/lib/config/sfCompileConfigHandler.class.php
index 149156991..70f29f2be 100644
--- a/lib/config/sfCompileConfigHandler.class.php
+++ b/lib/config/sfCompileConfigHandler.class.php
@@ -78,7 +78,6 @@ public function execute($configFiles)
 
     /**
      * @see sfConfigHandler
-     * {@inheritdoc}
      */
     public static function getConfiguration(array $configFiles)
     {
diff --git a/lib/config/sfDatabaseConfigHandler.class.php b/lib/config/sfDatabaseConfigHandler.class.php
index 027d861d4..8113693f7 100644
--- a/lib/config/sfDatabaseConfigHandler.class.php
+++ b/lib/config/sfDatabaseConfigHandler.class.php
@@ -72,7 +72,6 @@ public function evaluate($configFiles)
 
     /**
      * @see sfConfigHandler
-     * {@inheritdoc}
      */
     public static function getConfiguration(array $configFiles)
     {
diff --git a/lib/config/sfDefineEnvironmentConfigHandler.class.php b/lib/config/sfDefineEnvironmentConfigHandler.class.php
index 9fe7c7e19..979817859 100644
--- a/lib/config/sfDefineEnvironmentConfigHandler.class.php
+++ b/lib/config/sfDefineEnvironmentConfigHandler.class.php
@@ -65,7 +65,6 @@ public function execute($configFiles)
 
     /**
      * @see sfConfigHandler
-     * {@inheritdoc}
      */
     public static function getConfiguration(array $configFiles)
     {
diff --git a/lib/config/sfFactoryConfigHandler.class.php b/lib/config/sfFactoryConfigHandler.class.php
index 8e0ddc3c6..eb61473ca 100644
--- a/lib/config/sfFactoryConfigHandler.class.php
+++ b/lib/config/sfFactoryConfigHandler.class.php
@@ -260,7 +260,6 @@ public function execute($configFiles)
 
     /**
      * @see sfConfigHandler
-     * {@inheritdoc}
      */
     public static function getConfiguration(array $configFiles)
     {
diff --git a/lib/config/sfFilterConfigHandler.class.php b/lib/config/sfFilterConfigHandler.class.php
index 2eccac23b..076c2af9e 100644
--- a/lib/config/sfFilterConfigHandler.class.php
+++ b/lib/config/sfFilterConfigHandler.class.php
@@ -117,7 +117,6 @@ public function execute($configFiles)
 
     /**
      * @see sfConfigHandler
-     * {@inheritdoc}
      */
     public static function getConfiguration(array $configFiles)
     {
diff --git a/lib/config/sfGeneratorConfigHandler.class.php b/lib/config/sfGeneratorConfigHandler.class.php
index e79827ff9..adcf8700c 100644
--- a/lib/config/sfGeneratorConfigHandler.class.php
+++ b/lib/config/sfGeneratorConfigHandler.class.php
@@ -78,7 +78,6 @@ public static function getContent(sfGeneratorManager $generatorManager, $class,
 
     /**
      * @see sfConfigHandler
-     * {@inheritdoc}
      */
     public static function getConfiguration(array $configFiles)
     {
diff --git a/lib/config/sfPluginConfiguration.class.php b/lib/config/sfPluginConfiguration.class.php
index babc1c5f1..e5caac9b6 100644
--- a/lib/config/sfPluginConfiguration.class.php
+++ b/lib/config/sfPluginConfiguration.class.php
@@ -50,18 +50,14 @@ public function __construct(sfProjectConfiguration $configuration, $rootDir = nu
      *
      * This method can be used when creating a base plugin configuration class for other plugins to extend.
      */
-    public function setup()
-    {
-    }
+    public function setup() {}
 
     /**
      * Configures the plugin.
      *
      * This method is called before the plugin's classes have been added to sfAutoload.
      */
-    public function configure()
-    {
-    }
+    public function configure() {}
 
     /**
      * Initializes the plugin.
@@ -70,9 +66,7 @@ public function configure()
      *
      * @return bool|null If false sfApplicationConfiguration will look for a config.php (maintains BC with symfony < 1.2)
      */
-    public function initialize()
-    {
-    }
+    public function initialize() {}
 
     /**
      * Returns the plugin root directory.
diff --git a/lib/config/sfProjectConfiguration.class.php b/lib/config/sfProjectConfiguration.class.php
index 0f8c12fed..a733381ad 100644
--- a/lib/config/sfProjectConfiguration.class.php
+++ b/lib/config/sfProjectConfiguration.class.php
@@ -100,9 +100,7 @@ public function __call($method, $arguments)
      *
      * Override this method if you want to customize your project configuration.
      */
-    public function setup()
-    {
-    }
+    public function setup() {}
 
     /**
      * Loads the project's plugin configurations.
@@ -133,9 +131,7 @@ public function loadPlugins()
      *
      * Override this method if you want to customize plugin configurations.
      */
-    public function setupPlugins()
-    {
-    }
+    public function setupPlugins() {}
 
     /**
      * Sets the project root directory.
diff --git a/lib/config/sfSecurityConfigHandler.class.php b/lib/config/sfSecurityConfigHandler.class.php
index 6c4dccb01..092f8e267 100644
--- a/lib/config/sfSecurityConfigHandler.class.php
+++ b/lib/config/sfSecurityConfigHandler.class.php
@@ -47,7 +47,6 @@ public function execute($configFiles)
 
     /**
      * @see sfConfigHandler
-     * {@inheritdoc}
      */
     public static function getConfiguration(array $configFiles)
     {
diff --git a/lib/config/sfServiceConfigHandler.class.php b/lib/config/sfServiceConfigHandler.class.php
index 55e3935bb..2bc86f8d0 100644
--- a/lib/config/sfServiceConfigHandler.class.php
+++ b/lib/config/sfServiceConfigHandler.class.php
@@ -59,7 +59,6 @@ public function execute($configFiles)
 
     /**
      * @see sfConfigHandler
-     * {@inheritdoc}
      */
     public static function getConfiguration(array $configFiles)
     {
diff --git a/lib/config/sfSimpleYamlConfigHandler.class.php b/lib/config/sfSimpleYamlConfigHandler.class.php
index 56e8d336e..827f77e24 100644
--- a/lib/config/sfSimpleYamlConfigHandler.class.php
+++ b/lib/config/sfSimpleYamlConfigHandler.class.php
@@ -39,7 +39,6 @@ public function execute($configFiles)
 
     /**
      * @see sfConfigHandler
-     * {@inheritdoc}
      */
     public static function getConfiguration(array $configFiles)
     {
diff --git a/lib/config/sfViewConfigHandler.class.php b/lib/config/sfViewConfigHandler.class.php
index af565b723..c34d6d539 100644
--- a/lib/config/sfViewConfigHandler.class.php
+++ b/lib/config/sfViewConfigHandler.class.php
@@ -105,7 +105,6 @@ public function execute($configFiles)
 
     /**
      * @see sfConfigHandler
-     * {@inheritdoc}
      */
     public static function getConfiguration(array $configFiles)
     {
diff --git a/lib/controller/default/actions/actions.class.php b/lib/controller/default/actions/actions.class.php
index 5dfa30554..65a7626b7 100644
--- a/lib/controller/default/actions/actions.class.php
+++ b/lib/controller/default/actions/actions.class.php
@@ -20,42 +20,30 @@ class defaultActions extends sfActions
     /**
      * Congratulations page for creating an application.
      */
-    public function executeIndex()
-    {
-    }
+    public function executeIndex() {}
 
     /**
      * Congratulations page for creating a module.
      */
-    public function executeModule()
-    {
-    }
+    public function executeModule() {}
 
     /**
      * Error page for page not found (404) error.
      */
-    public function executeError404()
-    {
-    }
+    public function executeError404() {}
 
     /**
      * Warning page for restricted area - requires login.
      */
-    public function executeSecure()
-    {
-    }
+    public function executeSecure() {}
 
     /**
      * Warning page for restricted area - requires credentials.
      */
-    public function executeLogin()
-    {
-    }
+    public function executeLogin() {}
 
     /**
      * Module disabled in settings.yml.
      */
-    public function executeDisabled()
-    {
-    }
+    public function executeDisabled() {}
 }
diff --git a/lib/database/sfPDODatabase.class.php b/lib/database/sfPDODatabase.class.php
index b648a6ee2..591f09119 100644
--- a/lib/database/sfPDODatabase.class.php
+++ b/lib/database/sfPDODatabase.class.php
@@ -26,8 +26,6 @@ class sfPDODatabase extends sfDatabase
      *
      * @param string $method
      * @param array  $arguments
-     *
-     * @return mixed
      */
     public function __call($method, $arguments)
     {
diff --git a/lib/debug/sfWebDebug.class.php b/lib/debug/sfWebDebug.class.php
index 5f6a71508..c7dd17415 100644
--- a/lib/debug/sfWebDebug.class.php
+++ b/lib/debug/sfWebDebug.class.php
@@ -129,8 +129,8 @@ public function removePanel($name)
     /**
      * Gets an option value by name.
      *
-     * @param string $name    The option name
-     * @param mixed  $default
+     * @param string     $name    The option name
+     * @param mixed|null $default
      *
      * @return mixed The option value
      */
diff --git a/lib/debug/sfWebDebugPanel.class.php b/lib/debug/sfWebDebugPanel.class.php
index 61a8495e0..a6b3dc3b8 100644
--- a/lib/debug/sfWebDebugPanel.class.php
+++ b/lib/debug/sfWebDebugPanel.class.php
@@ -35,9 +35,7 @@ public function __construct(sfWebDebug $webDebug)
      *
      * @return string The URL link
      */
-    public function getTitleUrl()
-    {
-    }
+    public function getTitleUrl() {}
 
     /**
      * Gets the text for the link.
diff --git a/lib/debug/sfWebDebugPanelCache.class.php b/lib/debug/sfWebDebugPanelCache.class.php
index ba8fb9805..ca98cee95 100644
--- a/lib/debug/sfWebDebugPanelCache.class.php
+++ b/lib/debug/sfWebDebugPanelCache.class.php
@@ -39,7 +39,5 @@ public function getPanelTitle()
         return 'reload and ignore cache';
     }
 
-    public function getPanelContent()
-    {
-    }
+    public function getPanelContent() {}
 }
diff --git a/lib/debug/sfWebDebugPanelMemory.class.php b/lib/debug/sfWebDebugPanelMemory.class.php
index dc1ffe2b9..c24d2f209 100644
--- a/lib/debug/sfWebDebugPanelMemory.class.php
+++ b/lib/debug/sfWebDebugPanelMemory.class.php
@@ -24,11 +24,7 @@ public function getTitle()
         return '<img src="'.$this->webDebug->getOption('image_root_path').'/memory.png" alt="Memory" /> '.$totalMemory.' KB';
     }
 
-    public function getPanelTitle()
-    {
-    }
+    public function getPanelTitle() {}
 
-    public function getPanelContent()
-    {
-    }
+    public function getPanelContent() {}
 }
diff --git a/lib/debug/sfWebDebugPanelSymfonyVersion.class.php b/lib/debug/sfWebDebugPanelSymfonyVersion.class.php
index e97bbd8ee..38fe66566 100644
--- a/lib/debug/sfWebDebugPanelSymfonyVersion.class.php
+++ b/lib/debug/sfWebDebugPanelSymfonyVersion.class.php
@@ -22,11 +22,7 @@ public function getTitle()
         return '<span id="sfWebDebugSymfonyVersion">'.SYMFONY_VERSION.'</span>';
     }
 
-    public function getPanelTitle()
-    {
-    }
+    public function getPanelTitle() {}
 
-    public function getPanelContent()
-    {
-    }
+    public function getPanelContent() {}
 }
diff --git a/lib/debug/sfWebDebugPanelView.class.php b/lib/debug/sfWebDebugPanelView.class.php
index 3ff51c3a6..7072ea25a 100644
--- a/lib/debug/sfWebDebugPanelView.class.php
+++ b/lib/debug/sfWebDebugPanelView.class.php
@@ -158,7 +158,6 @@ protected function renderTemplateInformation($file, $parameters, $label = 'Templ
      * Formats information about a parameter as HTML.
      *
      * @param string $name
-     * @param mixed  $parameter
      *
      * @return string
      */
@@ -254,7 +253,6 @@ protected function formatFormFieldSchemaAsHtml(sfFormFieldSchema $fieldSchema, $
      * Formats information about a parameter as HTML.
      *
      * @param string     $name
-     * @param mixed      $parameter
      * @param mixed|null $nameFormat
      * @param mixed|null $typeFormat
      *
diff --git a/lib/escaper/sfOutputEscaper.class.php b/lib/escaper/sfOutputEscaper.class.php
index 4ff181c4a..58711724c 100644
--- a/lib/escaper/sfOutputEscaper.class.php
+++ b/lib/escaper/sfOutputEscaper.class.php
@@ -19,8 +19,6 @@ abstract class sfOutputEscaper
 {
     /**
      * The value that is to be escaped.
-     *
-     * @var mixed
      */
     protected $value;
 
diff --git a/lib/escaper/sfOutputEscaperArrayDecorator.class.php b/lib/escaper/sfOutputEscaperArrayDecorator.class.php
index d4d483b98..59f58c489 100644
--- a/lib/escaper/sfOutputEscaperArrayDecorator.class.php
+++ b/lib/escaper/sfOutputEscaperArrayDecorator.class.php
@@ -30,7 +30,6 @@ class sfOutputEscaperArrayDecorator extends sfOutputEscaperGetterDecorator imple
      * Constructor.
      *
      * @see sfOutputEscaper
-     * {@inheritdoc}
      */
     public function __construct($escapingMethod, $value)
     {
diff --git a/lib/escaper/sfOutputEscaperObjectDecorator.class.php b/lib/escaper/sfOutputEscaperObjectDecorator.class.php
index c063a4dbc..5183dd31a 100644
--- a/lib/escaper/sfOutputEscaperObjectDecorator.class.php
+++ b/lib/escaper/sfOutputEscaperObjectDecorator.class.php
@@ -73,8 +73,6 @@ public function __toString()
     /**
      * Asks the wrapped object whether a property is set.
      *
-     * @param mixed $key
-     *
      * @return bool
      */
     public function __isset($key)
diff --git a/lib/exception/sfCacheException.class.php b/lib/exception/sfCacheException.class.php
index 3080e585d..bc3d9f281 100644
--- a/lib/exception/sfCacheException.class.php
+++ b/lib/exception/sfCacheException.class.php
@@ -17,6 +17,4 @@
  *
  * @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..39e48d3c6 100644
--- a/lib/exception/sfConfigurationException.class.php
+++ b/lib/exception/sfConfigurationException.class.php
@@ -18,6 +18,4 @@
  *
  * @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..de8bd9c6d 100644
--- a/lib/exception/sfControllerException.class.php
+++ b/lib/exception/sfControllerException.class.php
@@ -18,6 +18,4 @@
  *
  * @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..1310bad20 100644
--- a/lib/exception/sfDatabaseException.class.php
+++ b/lib/exception/sfDatabaseException.class.php
@@ -17,6 +17,4 @@
  *
  * @version    SVN: $Id$
  */
-class sfDatabaseException extends sfException
-{
-}
+class sfDatabaseException extends sfException {}
diff --git a/lib/exception/sfFactoryException.class.php b/lib/exception/sfFactoryException.class.php
index 09ace8583..affd12ab2 100644
--- a/lib/exception/sfFactoryException.class.php
+++ b/lib/exception/sfFactoryException.class.php
@@ -18,6 +18,4 @@
  *
  * @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..fcae38c5a 100644
--- a/lib/exception/sfFileException.class.php
+++ b/lib/exception/sfFileException.class.php
@@ -17,6 +17,4 @@
  *
  * @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..9b7b70047 100644
--- a/lib/exception/sfFilterException.class.php
+++ b/lib/exception/sfFilterException.class.php
@@ -18,6 +18,4 @@
  *
  * @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..085ab5021 100644
--- a/lib/exception/sfForwardException.class.php
+++ b/lib/exception/sfForwardException.class.php
@@ -18,6 +18,4 @@
  *
  * @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..2eb54db5d 100644
--- a/lib/exception/sfInitializationException.class.php
+++ b/lib/exception/sfInitializationException.class.php
@@ -17,6 +17,4 @@
  *
  * @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..7e286e729 100644
--- a/lib/exception/sfParseException.class.php
+++ b/lib/exception/sfParseException.class.php
@@ -18,6 +18,4 @@
  *
  * @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..fd0ab73f2 100644
--- a/lib/exception/sfRenderException.class.php
+++ b/lib/exception/sfRenderException.class.php
@@ -17,6 +17,4 @@
  *
  * @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..a12a587c3 100644
--- a/lib/exception/sfSecurityException.class.php
+++ b/lib/exception/sfSecurityException.class.php
@@ -17,6 +17,4 @@
  *
  * @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..ebf92f655 100644
--- a/lib/exception/sfStopException.class.php
+++ b/lib/exception/sfStopException.class.php
@@ -20,7 +20,5 @@ class sfStopException extends sfException
     /**
      * Stops the current action.
      */
-    public function printStackTrace()
-    {
-    }
+    public function printStackTrace() {}
 }
diff --git a/lib/exception/sfStorageException.class.php b/lib/exception/sfStorageException.class.php
index 7bf258518..4b7ba1653 100644
--- a/lib/exception/sfStorageException.class.php
+++ b/lib/exception/sfStorageException.class.php
@@ -18,6 +18,4 @@
  *
  * @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..a576bd7d0 100644
--- a/lib/exception/sfViewException.class.php
+++ b/lib/exception/sfViewException.class.php
@@ -17,6 +17,4 @@
  *
  * @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 98de43078..edffbcda1 100644
--- a/lib/filter/sfBasicSecurityFilter.class.php
+++ b/lib/filter/sfBasicSecurityFilter.class.php
@@ -39,8 +39,8 @@ public function execute($filterChain)
         }
 
         // NOTE: the nice thing about the Action class is that getCredential()
-    //       is vague enough to describe any level of security and can be
-    //       used to retrieve such data and should never have to be altered
+        //       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')))));
diff --git a/lib/form/addon/sfFormFilter.class.php b/lib/form/addon/sfFormFilter.class.php
index 24be7b5bf..376994537 100644
--- a/lib/form/addon/sfFormFilter.class.php
+++ b/lib/form/addon/sfFormFilter.class.php
@@ -17,6 +17,4 @@
  *
  * @version    SVN: $Id$
  */
-class sfFormFilter extends BaseForm
-{
-}
+class sfFormFilter extends BaseForm {}
diff --git a/lib/form/addon/sfFormSymfony.class.php b/lib/form/addon/sfFormSymfony.class.php
index 31efc2e54..b352fa672 100644
--- a/lib/form/addon/sfFormSymfony.class.php
+++ b/lib/form/addon/sfFormSymfony.class.php
@@ -26,7 +26,8 @@ class sfFormSymfony extends sfForm
      * Notifies the 'form.post_configure' event.
      *
      * @see sfForm
-     * {@inheritdoc}
+     *
+     * @param mixed|null $CSRFSecret
      */
     public function __construct($defaults = array(), $options = array(), $CSRFSecret = null)
     {
@@ -61,8 +62,6 @@ public function __call($method, $arguments)
 
     /**
      * Sets the event dispatcher to be used by all forms.
-     *
-     * @param sfEventDispatcher $dispatcher
      */
     public static function setEventDispatcher(sfEventDispatcher $dispatcher = null)
     {
@@ -83,7 +82,6 @@ public static function getEventDispatcher()
      * Notifies the 'form.filter_values' and 'form.validation_error' events.
      *
      * @see sfForm
-     * {@inheritdoc}
      */
     protected function doBind(array $values)
     {
diff --git a/lib/form/sfForm.class.php b/lib/form/sfForm.class.php
index 89b21de26..4852027bf 100644
--- a/lib/form/sfForm.class.php
+++ b/lib/form/sfForm.class.php
@@ -120,16 +120,12 @@ public function __clone()
      *
      * @see configure()
      */
-    public function setup()
-    {
-    }
+    public function setup() {}
 
     /**
      * Configures the current form.
      */
-    public function configure()
-    {
-    }
+    public function configure() {}
 
     /**
      * Renders the widget schema associated with this form.
@@ -255,9 +251,6 @@ public function bind(array $taintedValues = null, array $taintedFiles = null)
 
     /**
      * Bind embedded forms (recursivly).
-     *
-     * @param array $taintedValues
-     * @param array $taintedFiles
      */
     public function bindEmbeddedForms(array $taintedValues = null, array $taintedFiles = null)
     {
@@ -765,8 +758,6 @@ public function setOption($name, $value)
      *
      * @param string $name    The option name
      * @param mixed  $default The default value (null by default)
-     *
-     * @return mixed
      */
     public function getOption($name, $default = null)
     {
diff --git a/lib/generator/sfModelGeneratorConfiguration.class.php b/lib/generator/sfModelGeneratorConfiguration.class.php
index b9bc723e8..af957893a 100644
--- a/lib/generator/sfModelGeneratorConfiguration.class.php
+++ b/lib/generator/sfModelGeneratorConfiguration.class.php
@@ -296,8 +296,8 @@ public function getPager($model)
     /**
      * Gets a new form object.
      *
-     * @param mixed $object
-     * @param array $options An array of options to merge with the options returned by getFormOptions()
+     * @param array      $options An array of options to merge with the options returned by getFormOptions()
+     * @param mixed|null $object
      *
      * @return sfForm
      */
diff --git a/lib/helper/AssetHelper.php b/lib/helper/AssetHelper.php
index 57fe9b612..d4effc844 100644
--- a/lib/helper/AssetHelper.php
+++ b/lib/helper/AssetHelper.php
@@ -16,10 +16,6 @@
  * @author     David Heinemeier Hansson
  *
  * @version    SVN: $Id$
- *
- * @param mixed $type
- * @param mixed $url
- * @param mixed $tag_options
  */
 
 /**
@@ -236,10 +232,6 @@ function stylesheet_tag()
  * Adds a stylesheet to the response object.
  *
  * @see sfResponse->addStylesheet()
- *
- * @param mixed $css
- * @param mixed $position
- * @param mixed $options
  */
 function use_stylesheet($css, $position = '', $options = array())
 {
@@ -250,10 +242,6 @@ function use_stylesheet($css, $position = '', $options = array())
  * Adds a javascript to the response object.
  *
  * @see sfResponse->addJavascript()
- *
- * @param mixed $js
- * @param mixed $position
- * @param mixed $options
  */
 function use_javascript($js, $position = '', $options = array())
 {
@@ -577,10 +565,6 @@ function dynamic_javascript_include_tag($uri, $absolute = false, $options = arra
  * The helper automatically adds the sf_format to the internal URI, so you don't have to.
  *
  * @see sfResponse->addJavascript()
- *
- * @param mixed $js
- * @param mixed $position
- * @param mixed $options
  */
 function use_dynamic_javascript($js, $position = '', $options = array())
 {
@@ -596,10 +580,6 @@ function use_dynamic_javascript($js, $position = '', $options = array())
  * The helper automatically adds the sf_format to the internal URI, so you don't have to.
  *
  * @see sfResponse->addStylesheet()
- *
- * @param mixed $css
- * @param mixed $position
- * @param mixed $options
  */
 function use_dynamic_stylesheet($css, $position = '', $options = array())
 {
diff --git a/lib/helper/CacheHelper.php b/lib/helper/CacheHelper.php
index 08a6ba5a3..0f75e3bf1 100644
--- a/lib/helper/CacheHelper.php
+++ b/lib/helper/CacheHelper.php
@@ -14,9 +14,6 @@
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  *
  * @version    SVN: $Id$
- *
- * @param mixed $name
- * @param mixed $lifeTime
  */
 
 /* Usage
diff --git a/lib/helper/DateHelper.php b/lib/helper/DateHelper.php
index 75ec5cb53..c8e6e0973 100644
--- a/lib/helper/DateHelper.php
+++ b/lib/helper/DateHelper.php
@@ -15,12 +15,6 @@
  *
  * @version    SVN: $Id$
  *
- * @param mixed      $start_date
- * @param mixed      $end_date
- * @param mixed      $format
- * @param mixed      $full_text
- * @param mixed      $start_text
- * @param mixed      $end_text
  * @param mixed|null $culture
  * @param mixed|null $charset
  */
diff --git a/lib/helper/EscapingHelper.php b/lib/helper/EscapingHelper.php
index bb57f79d8..b72f27ad0 100644
--- a/lib/helper/EscapingHelper.php
+++ b/lib/helper/EscapingHelper.php
@@ -28,8 +28,6 @@
  * @author     Mike Squire <mike@somosis.co.uk>
  *
  * @version    SVN: $Id$
- *
- * @param mixed $value
  */
 
 /**
diff --git a/lib/helper/I18NHelper.php b/lib/helper/I18NHelper.php
index e3768f7b7..5f981b5d9 100644
--- a/lib/helper/I18NHelper.php
+++ b/lib/helper/I18NHelper.php
@@ -14,10 +14,6 @@
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  *
  * @version    SVN: $Id$
- *
- * @param mixed $text
- * @param mixed $args
- * @param mixed $catalogue
  */
 function __($text, $args = array(), $catalogue = 'messages')
 {
diff --git a/lib/helper/JavascriptBaseHelper.php b/lib/helper/JavascriptBaseHelper.php
index 003fd877f..233b3a564 100644
--- a/lib/helper/JavascriptBaseHelper.php
+++ b/lib/helper/JavascriptBaseHelper.php
@@ -18,10 +18,6 @@
  * @author     Fabian Lange <fabian.lange@symfony-project.com>
  *
  * @version    SVN: $Id$
- *
- * @param mixed $name
- * @param mixed $function
- * @param mixed $html_options
  */
 
 // Provides a set basic of helpers for calling JavaScript functions.
@@ -55,10 +51,6 @@ function link_to_function($name, $function, $html_options = array())
  *
  * Examples:
  *   <?php echo button_to_function('Greeting', "alert('Hello world!')") ?>
- *
- * @param mixed $name
- * @param mixed $function
- * @param mixed $html_options
  */
 function button_to_function($name, $function, $html_options = array())
 {
@@ -128,7 +120,6 @@ function end_if_javascript()
  * javascript strings need to be single quoted.
  *
  * @param option (typically from option array)
- * @param mixed $option
  *
  * @return string javascript string or array equivalent
  */
@@ -148,7 +139,6 @@ function array_or_string_for_javascript($option)
  * converts the the PHP options array into a javscript array.
  *
  * @param array
- * @param mixed $options
  *
  * @return string javascript arry equivalent
  */
@@ -171,7 +161,6 @@ function options_for_javascript($options)
  * booleans need to be true or false (php would print 1 or nothing).
  *
  * @param bool (typically from option array)
- * @param mixed $bool
  *
  * @return string javascript boolean equivalent
  */
diff --git a/lib/helper/NumberHelper.php b/lib/helper/NumberHelper.php
index 8d49784c0..6ae599b28 100644
--- a/lib/helper/NumberHelper.php
+++ b/lib/helper/NumberHelper.php
@@ -15,7 +15,6 @@
  *
  * @version    SVN: $Id$
  *
- * @param mixed      $number
  * @param mixed|null $culture
  */
 function format_number($number, $culture = null)
diff --git a/lib/helper/PartialHelper.php b/lib/helper/PartialHelper.php
index e3d687eda..feeb897dd 100644
--- a/lib/helper/PartialHelper.php
+++ b/lib/helper/PartialHelper.php
@@ -14,9 +14,6 @@
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  *
  * @version    SVN: $Id$
- *
- * @param mixed $name
- * @param mixed $vars
  */
 
 /**
@@ -74,7 +71,6 @@ function get_component_slot($name, $vars = array())
  * Returns true if component slot exists.
  *
  * @param  string slot name
- * @param mixed $name
  *
  * @return bool true if component slot exists, false otherwise
  */
diff --git a/lib/helper/TagHelper.php b/lib/helper/TagHelper.php
index 0e0769ac6..35b7578a7 100644
--- a/lib/helper/TagHelper.php
+++ b/lib/helper/TagHelper.php
@@ -16,10 +16,6 @@
  * @author     David Heinemeier Hansson
  *
  * @version    SVN: $Id$
- *
- * @param mixed $name
- * @param mixed $options
- * @param mixed $open
  */
 
 /**
@@ -71,8 +67,6 @@ function comment_as_conditional($condition, $content)
 
 /**
  * Escape carrier returns and single and double quotes for Javascript segments.
- *
- * @param mixed $javascript
  */
 function escape_javascript($javascript = '')
 {
diff --git a/lib/helper/TextHelper.php b/lib/helper/TextHelper.php
index 6ea35986e..b518fcf0c 100644
--- a/lib/helper/TextHelper.php
+++ b/lib/helper/TextHelper.php
@@ -17,10 +17,6 @@
  *
  * @version    SVN: $Id$
  *
- * @param mixed      $text
- * @param mixed      $length
- * @param mixed      $truncate_string
- * @param mixed      $truncate_lastspace
  * @param mixed|null $truncate_pattern
  * @param mixed|null $length_max
  */
@@ -126,12 +122,6 @@ function highlight_text($text, $phrase, $highlighter = '<strong class="highlight
  * If +excerpt_space+ is true the text will only be truncated on whitespace, never inbetween words.
  * This might return a smaller radius than specified.
  *   excerpt("hello my world", "my", 3, "...", true) => "... my ...".
- *
- * @param mixed $text
- * @param mixed $phrase
- * @param mixed $radius
- * @param mixed $excerpt_string
- * @param mixed $excerpt_space
  */
 function excerpt_text($text, $phrase, $radius = 100, $excerpt_string = '...', $excerpt_space = false)
 {
@@ -180,9 +170,6 @@ function excerpt_text($text, $phrase, $radius = 100, $excerpt_string = '...', $e
 
 /**
  * Word wrap long lines to line_width.
- *
- * @param mixed $text
- * @param mixed $line_width
  */
 function wrap_text($text, $line_width = 80)
 {
@@ -194,9 +181,6 @@ function wrap_text($text, $line_width = 80)
  * Surrounds paragraphs with <tt>&lt;p&gt;</tt> tags, and converts line breaks into <tt>&lt;br /&gt;</tt>
  * 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.
- *
- * @param mixed $text
- * @param mixed $options
  */
 function simple_format_text($text, $options = array())
 {
@@ -219,13 +203,6 @@ function simple_format_text($text, $options = array())
  *   auto_link("Go to http://www.symfony-project.com and say hello to fabien.potencier@example.com") =>
  *     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>
- *
- * @param mixed $text
- * @param mixed $link
- * @param mixed $href_options
- * @param mixed $truncate
- * @param mixed $truncate_len
- * @param mixed $pad
  */
 function auto_link_text($text, $link = 'all', $href_options = array(), $truncate = false, $truncate_len = 35, $pad = '...')
 {
@@ -242,8 +219,6 @@ function auto_link_text($text, $link = 'all', $href_options = array(), $truncate
 
 /**
  * Turns all links into words, like "<a href="something">else</a>" to "else".
- *
- * @param mixed $text
  */
 function strip_links_text($text)
 {
@@ -275,12 +250,6 @@ function strip_links_text($text)
 
 /**
  * Turns all urls into clickable links.
- *
- * @param mixed $text
- * @param mixed $href_options
- * @param mixed $truncate
- * @param mixed $truncate_len
- * @param mixed $pad
  */
 function _auto_link_urls($text, $href_options = array(), $truncate = false, $truncate_len = 40, $pad = '...')
 {
@@ -310,8 +279,6 @@ function _auto_link_urls($text, $href_options = array(), $truncate = false, $tru
 
 /**
  * Turns all email addresses into clickable links.
- *
- * @param mixed $text
  */
 function _auto_link_email_addresses($text)
 {
diff --git a/lib/helper/UrlHelper.php b/lib/helper/UrlHelper.php
index c30195b29..7f30dc77d 100644
--- a/lib/helper/UrlHelper.php
+++ b/lib/helper/UrlHelper.php
@@ -14,11 +14,6 @@
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  *
  * @version    SVN: $Id$
- *
- * @param mixed $name
- * @param mixed $routeName
- * @param mixed $params
- * @param mixed $options
  */
 
 /**
@@ -33,10 +28,6 @@ function link_to2($name, $routeName, $params, $options = array())
 
 /**
  * @ignore
- *
- * @param mixed $name
- * @param mixed $internal_uri
- * @param mixed $options
  */
 function link_to1($name, $internal_uri, $options = array())
 {
@@ -83,10 +74,6 @@ function link_to1($name, $internal_uri, $options = array())
 
 /**
  * @ignore
- *
- * @param mixed $routeName
- * @param mixed $params
- * @param mixed $absolute
  */
 function url_for2($routeName, $params = array(), $absolute = false)
 {
@@ -97,9 +84,6 @@ function url_for2($routeName, $params = array(), $absolute = false)
 
 /**
  * @ignore
- *
- * @param mixed $internal_uri
- * @param mixed $absolute
  */
 function url_for1($internal_uri, $absolute = false)
 {
@@ -120,9 +104,6 @@ function url_for1($internal_uri, $absolute = false)
  *    => http://myapp.example.com/path/to/my/action
  * </code>
  *
- * @param string $internal_uri 'module/action' or '@rule' of the action
- * @param bool   $absolute     return absolute path?
- *
  * @return string routed URL
  */
 function url_for()
@@ -169,10 +150,6 @@ function url_for()
  *    => <a href="http://myapp.example.com/path/to/my/action" id="myid" onclick="return confirm('Are you sure?');">Delete this page</a>
  * </code>
  *
- * @param string $name         name of the link, i.e. string to appear between the <a> tags
- * @param string $internal_uri 'module/action' or '@rule' of the action
- * @param array  $options      additional HTML compliant <a> tag parameters
- *
  * @return string XHTML compliant <a href> tag
  *
  * @see    url_for
@@ -233,11 +210,6 @@ function form_tag_for(sfForm $form, $routePrefix, $attributes = array())
  *    => <span>Delete this page</span>
  * </code>
  *
- * @param bool   $condition    condition
- * @param string $name         name of the link, i.e. string to appear between the <a> tags
- * @param string $internal_uri 'module/action' or '@rule' of the action
- * @param array  $options      additional HTML compliant <a> tag parameters
- *
  * @return string XHTML compliant <a href> tag or name
  *
  * @see    link_to
@@ -289,11 +261,6 @@ function link_to_if()
  *    => <a href="/path/to/my/action">Delete this page</a>
  * </code>
  *
- * @param bool   $condition    condition
- * @param string $name         name of the link, i.e. string to appear between the <a> tags
- * @param string $internal_uri 'module/action' or '@rule' of the action
- * @param array  $options      additional HTML compliant <a> tag parameters
- *
  * @return string XHTML compliant <a href> tag or name
  *
  * @see    link_to
diff --git a/lib/i18n/Gettext/MO.php b/lib/i18n/Gettext/MO.php
index 900fdde60..3c43306e4 100644
--- a/lib/i18n/Gettext/MO.php
+++ b/lib/i18n/Gettext/MO.php
@@ -65,8 +65,6 @@ public function __construct($file = '')
      * _read.
      *
      * @param int $bytes
-     *
-     * @return mixed
      */
     public function _read($bytes = 1)
     {
diff --git a/lib/i18n/Gettext/PO.php b/lib/i18n/Gettext/PO.php
index fda62f5b7..ff4c1eec8 100644
--- a/lib/i18n/Gettext/PO.php
+++ b/lib/i18n/Gettext/PO.php
@@ -37,7 +37,6 @@ class TGettext_PO extends TGettext
      * Constructor.
      *
      * @param   string      path to GNU PO file
-     * @param mixed $file
      *
      * @return object File_Gettext_PO
      */
diff --git a/lib/i18n/extract/sfI18nExtract.class.php b/lib/i18n/extract/sfI18nExtract.class.php
index 69f2469cb..969409bc7 100644
--- a/lib/i18n/extract/sfI18nExtract.class.php
+++ b/lib/i18n/extract/sfI18nExtract.class.php
@@ -26,9 +26,6 @@ abstract class sfI18nExtract
      * Class constructor.
      *
      * @see initialize()
-     *
-     * @param mixed $culture
-     * @param mixed $parameters
      */
     public function __construct(sfI18N $i18n, $culture, $parameters = array())
     {
@@ -62,9 +59,7 @@ public function initialize(sfI18N $i18n, $culture, $parameters = array())
     /**
      * Configures the current extract object.
      */
-    public function configure()
-    {
-    }
+    public function configure() {}
 
     /**
      * Extracts i18n strings.
diff --git a/lib/i18n/extract/sfI18nYamlExtractor.class.php b/lib/i18n/extract/sfI18nYamlExtractor.class.php
index c11f3b48c..7b13b8348 100644
--- a/lib/i18n/extract/sfI18nYamlExtractor.class.php
+++ b/lib/i18n/extract/sfI18nYamlExtractor.class.php
@@ -13,6 +13,4 @@
  *
  * @version    SVN: $Id$
  */
-abstract class sfI18nYamlExtractor implements sfI18nExtractorInterface
-{
-}
+abstract class sfI18nYamlExtractor implements sfI18nExtractorInterface {}
diff --git a/lib/i18n/sfCultureInfo.class.php b/lib/i18n/sfCultureInfo.class.php
index f8c980c16..da0a30c23 100644
--- a/lib/i18n/sfCultureInfo.class.php
+++ b/lib/i18n/sfCultureInfo.class.php
@@ -176,8 +176,6 @@ public function __toString()
      * as an attribute/property to retrieve the value.
      *
      * @param string $name The property to get
-     *
-     * @return mixed
      */
     public function __get($name)
     {
@@ -644,7 +642,6 @@ public function getTimeZones()
      * sorts the passed array according to the locale of this sfCultureInfo class.
      *
      * @param  array the array to be sorted with "asort" and this locale
-     * @param mixed $array
      */
     public function sortArray(&$array)
     {
@@ -816,9 +813,6 @@ protected function searchArray($info, $path = '/')
      * Adds an array to an already existing array.
      * If an element is already existing in array1 it is not overwritten.
      * If this element is an array this logic will be applied recursively.
-     *
-     * @param mixed $array1
-     * @param mixed $array2
      */
     private function array_add($array1, $array2)
     {
diff --git a/lib/i18n/sfDateTimeFormatInfo.class.php b/lib/i18n/sfDateTimeFormatInfo.class.php
index 874faaede..ec8574f0c 100644
--- a/lib/i18n/sfDateTimeFormatInfo.class.php
+++ b/lib/i18n/sfDateTimeFormatInfo.class.php
@@ -106,10 +106,6 @@ public function __construct($data = array())
     /**
      * Allows functions that begins with 'set' to be called directly
      * as an attribute/property to retrieve the value.
-     *
-     * @param mixed $name
-     *
-     * @return mixed
      */
     public function __get($name)
     {
@@ -124,9 +120,6 @@ public function __get($name)
     /**
      * Allows functions that begins with 'set' to be called directly
      * as an attribute/property to set the value.
-     *
-     * @param mixed $name
-     * @param mixed $value
      */
     public function __set($name, $value)
     {
@@ -527,9 +520,6 @@ public function getDateTimeOrderPattern()
      * Formats the date and time in a culture sensitive paterrn.
      * The default is "Date Time".
      *
-     * @param mixed $date
-     * @param mixed $time
-     *
      * @return string date and time formated
      */
     public function formatDateTime($date, $time)
diff --git a/lib/i18n/sfI18N.class.php b/lib/i18n/sfI18N.class.php
index 0a9803db3..9c0332558 100644
--- a/lib/i18n/sfI18N.class.php
+++ b/lib/i18n/sfI18N.class.php
@@ -29,8 +29,6 @@ class sfI18N
      * Class constructor.
      *
      * @see initialize()
-     *
-     * @param mixed $options
      */
     public function __construct(sfApplicationConfiguration $configuration, sfCache $cache = null, $options = array())
     {
diff --git a/lib/i18n/sfMessageSource_Aggregate.class.php b/lib/i18n/sfMessageSource_Aggregate.class.php
index c8d64141d..d0d336683 100644
--- a/lib/i18n/sfMessageSource_Aggregate.class.php
+++ b/lib/i18n/sfMessageSource_Aggregate.class.php
@@ -46,9 +46,6 @@ public function setCulture($culture)
     /**
      * Determines if the source is valid.
      *
-     * @param string $source  catalogue+variant
-     * @param mixed  $sources
-     *
      * @return bool true if valid, false otherwise
      */
     public function isValidSource($sources)
@@ -85,8 +82,6 @@ public function getSource($variant)
      * Loads the message for a particular catalogue+variant.
      * This methods needs to implemented by subclasses.
      *
-     * @param mixed $sources
-     *
      * @return array of translation messages
      */
     public function &loadData($sources)
@@ -226,9 +221,6 @@ public function catalogues()
     /**
      * Gets the last modified unix-time for this particular catalogue+variant.
      *
-     * @param string $source  catalogue+variant
-     * @param mixed  $sources
-     *
      * @return int last modified in unix-time format
      */
     protected function getLastModified($sources)
diff --git a/lib/i18n/sfMessageSource_MySQL.class.php b/lib/i18n/sfMessageSource_MySQL.class.php
index 381808c8e..8e18a0426 100644
--- a/lib/i18n/sfMessageSource_MySQL.class.php
+++ b/lib/i18n/sfMessageSource_MySQL.class.php
@@ -437,9 +437,6 @@ protected function getCatalogueDetails($catalogue = 'messages')
     /**
      * Updates the catalogue last modified time.
      *
-     * @param mixed $cat_id
-     * @param mixed $variant
-     *
      * @return bool true if updated, false otherwise
      */
     protected function updateCatalogueTime($cat_id, $variant)
diff --git a/lib/i18n/sfMessageSource_SQLite.class.php b/lib/i18n/sfMessageSource_SQLite.class.php
index c6b268f8e..58515889e 100644
--- a/lib/i18n/sfMessageSource_SQLite.class.php
+++ b/lib/i18n/sfMessageSource_SQLite.class.php
@@ -370,10 +370,6 @@ protected function getCatalogueDetails($catalogue = 'messages')
     /**
      * Updates the catalogue last modified time.
      *
-     * @param mixed $cat_id
-     * @param mixed $variant
-     * @param mixed $db
-     *
      * @return bool true if updated, false otherwise
      */
     protected function updateCatalogueTime($cat_id, $variant, $db)
diff --git a/lib/i18n/sfMessageSource_SQLite3.class.php b/lib/i18n/sfMessageSource_SQLite3.class.php
index 270781321..6485ee7df 100644
--- a/lib/i18n/sfMessageSource_SQLite3.class.php
+++ b/lib/i18n/sfMessageSource_SQLite3.class.php
@@ -380,9 +380,6 @@ protected function getCatalogueDetails($catalogue = 'messages')
     /**
      * Updates the catalogue last modified time.
      *
-     * @param mixed $cat_id
-     * @param mixed $variant
-     *
      * @return bool true if updated, false otherwise
      */
     protected function updateCatalogueTime($cat_id, $variant)
diff --git a/lib/i18n/sfNumberFormatInfo.class.php b/lib/i18n/sfNumberFormatInfo.class.php
index 85dd16761..e047be56f 100644
--- a/lib/i18n/sfNumberFormatInfo.class.php
+++ b/lib/i18n/sfNumberFormatInfo.class.php
@@ -95,10 +95,6 @@ public function __construct($data = array(), $type = sfNumberFormatInfo::DECIMAL
     /**
      * Allows functions that begins with 'set' to be called directly
      * as an attribute/property to retrieve the value.
-     *
-     * @param mixed $name
-     *
-     * @return mixed
      */
     public function __get($name)
     {
@@ -113,9 +109,6 @@ public function __get($name)
     /**
      * Allows functions that begins with 'set' to be called directly
      * as an attribute/property to set the value.
-     *
-     * @param mixed $name
-     * @param mixed $value
      */
     public function __set($name, $value)
     {
@@ -155,8 +148,6 @@ public function getPattern()
     /**
      * Gets the default sfNumberFormatInfo that is culture-independent (invariant).
      *
-     * @param mixed $type
-     *
      * @return sfNumberFormatInfo default sfNumberFormatInfo
      */
     public static function getInvariantInfo($type = sfNumberFormatInfo::DECIMAL)
@@ -414,8 +405,6 @@ public function setPositivePattern($pattern)
     /**
      * Gets the string to use as the currency symbol.
      *
-     * @param mixed $currency
-     *
      * @return string $currency currency symbol
      */
     public function getCurrencySymbol($currency = 'USD')
diff --git a/lib/log/sfEventLogger.class.php b/lib/log/sfEventLogger.class.php
index 26ddf9f92..dc90a06e8 100644
--- a/lib/log/sfEventLogger.class.php
+++ b/lib/log/sfEventLogger.class.php
@@ -8,9 +8,6 @@
  */
 class sfEventLogger extends sfLogger
 {
-    /**
-     * {@inheritDoc}
-     */
     public function initialize(sfEventDispatcher $dispatcher, $options = array())
     {
         $this->dispatcher = $dispatcher;
@@ -26,9 +23,6 @@ public function initialize(sfEventDispatcher $dispatcher, $options = array())
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
     protected function doLog($message, $priority)
     {
         $this->dispatcher->notify(new sfEvent($this, $this->options['event_name'], array($message, 'priority' => $priority)));
diff --git a/lib/log/sfFileLogger.class.php b/lib/log/sfFileLogger.class.php
index 87d98b698..1c6c357e3 100644
--- a/lib/log/sfFileLogger.class.php
+++ b/lib/log/sfFileLogger.class.php
@@ -88,8 +88,6 @@ public function shutdown()
     }
 
     /**
-     * @param mixed $format
-     *
      * @return false|string
      */
     public static function strftime($format)
@@ -148,8 +146,6 @@ protected function getPriority($priority)
      *
      * A better solution is to use : IntlDateFormatter, but it will require to load a new php extension, which could break some setup.
      *
-     * @param mixed $strftimeFormat
-     *
      * @return array|string|string[]
      */
     private static function _strftimeFormatToDateFormat($strftimeFormat)
diff --git a/lib/log/sfLogger.class.php b/lib/log/sfLogger.class.php
index 72fb1681a..faaa70a24 100644
--- a/lib/log/sfLogger.class.php
+++ b/lib/log/sfLogger.class.php
@@ -100,7 +100,6 @@ public function getOptions()
      * Returns the options for the logger instance.
      *
      * @param string $name
-     * @param mixed  $value
      */
     public function setOption($name, $value)
     {
@@ -253,9 +252,7 @@ public function listenToLogEvent(sfEvent $event)
      *
      * Cleans up the current logger instance.
      */
-    public function shutdown()
-    {
-    }
+    public function shutdown() {}
 
     /**
      * Returns the priority name given a priority class constant.
diff --git a/lib/log/sfNoLogger.class.php b/lib/log/sfNoLogger.class.php
index e307cdf9d..ab123f88a 100644
--- a/lib/log/sfNoLogger.class.php
+++ b/lib/log/sfNoLogger.class.php
@@ -23,9 +23,7 @@ class sfNoLogger extends sfLogger
      * @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 = array()) {}
 
     /**
      * Logs a message.
@@ -33,7 +31,5 @@ public function initialize(sfEventDispatcher $dispatcher, $options = array())
      * @param string $message  Message
      * @param int    $priority Message priority
      */
-    protected function doLog($message, $priority)
-    {
-    }
+    protected function doLog($message, $priority) {}
 }
diff --git a/lib/log/sfPsrLoggerAdapter.class.php b/lib/log/sfPsrLoggerAdapter.class.php
index 286965d12..412f01366 100644
--- a/lib/log/sfPsrLoggerAdapter.class.php
+++ b/lib/log/sfPsrLoggerAdapter.class.php
@@ -73,8 +73,6 @@ public function listenContextLoadFactoriesEvent(sfEvent $event)
 
     /**
      * Set the logger.
-     *
-     * @param \Psr\Log\LoggerInterface $logger
      */
     public function setLogger(Psr\Log\LoggerInterface $logger)
     {
diff --git a/lib/mailer/sfMailerMessageLoggerPlugin.class.php b/lib/mailer/sfMailerMessageLoggerPlugin.class.php
index 0f552beb4..1fc49b1fb 100644
--- a/lib/mailer/sfMailerMessageLoggerPlugin.class.php
+++ b/lib/mailer/sfMailerMessageLoggerPlugin.class.php
@@ -73,7 +73,5 @@ public function beforeSendPerformed(Swift_Events_SendEvent $evt)
     /**
      * 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..2b7650c15 100644
--- a/lib/mailer/sfNoMailer.class.php
+++ b/lib/mailer/sfNoMailer.class.php
@@ -5,27 +5,21 @@
  */
 class sfNoMailer
 {
-    public function __construct(sfEventDispatcher $dispatcher, $options)
-    {
-    }
+    public function __construct(sfEventDispatcher $dispatcher, $options) {}
 
     public function getRealtimeTransport()
     {
         return null;
     }
 
-    public function setRealtimeTransport(Swift_Transport $transport)
-    {
-    }
+    public function setRealtimeTransport(Swift_Transport $transport) {}
 
     public function getLogger()
     {
         return null;
     }
 
-    public function setLogger($logger)
-    {
-    }
+    public function setLogger($logger) {}
 
     public function getDeliveryStrategy()
     {
@@ -37,9 +31,7 @@ public function getDeliveryAddress()
         return null;
     }
 
-    public function setDeliveryAddress($address)
-    {
-    }
+    public function setDeliveryAddress($address) {}
 
     public function compose($from = null, $to = null, $subject = null, $body = null)
     {
diff --git a/lib/plugin/sfPearDownloader.class.php b/lib/plugin/sfPearDownloader.class.php
index c820f82e5..00d3be637 100644
--- a/lib/plugin/sfPearDownloader.class.php
+++ b/lib/plugin/sfPearDownloader.class.php
@@ -22,13 +22,8 @@ class sfPearDownloader extends PEAR_Downloader
     /**
      * @see PEAR_REST::downloadHttp()
      *
-     * @param mixed      $url
-     * @param mixed      $ui
-     * @param mixed      $save_dir
      * @param mixed|null $callback
      * @param mixed|null $lastmodified
-     * @param mixed      $accept
-     * @param mixed      $channel
      */
     public function downloadHttp($url, &$ui, $save_dir = '.', $callback = null, $lastmodified = null, $accept = false, $channel = false)
     {
diff --git a/lib/plugin/sfPearRest.class.php b/lib/plugin/sfPearRest.class.php
index c27bfd34c..d8cd6e6ad 100644
--- a/lib/plugin/sfPearRest.class.php
+++ b/lib/plugin/sfPearRest.class.php
@@ -22,10 +22,7 @@ class sfPearRest extends PEAR_REST
     /**
      * @see PEAR_REST::downloadHttp()
      *
-     * @param mixed      $url
      * @param mixed|null $lastmodified
-     * @param mixed      $accept
-     * @param mixed      $channel
      */
     public function downloadHttp($url, $lastmodified = null, $accept = false, $channel = false)
     {
diff --git a/lib/plugin/sfPearRest10.class.php b/lib/plugin/sfPearRest10.class.php
index 2fc3f6412..007c15202 100644
--- a/lib/plugin/sfPearRest10.class.php
+++ b/lib/plugin/sfPearRest10.class.php
@@ -21,9 +21,6 @@ class sfPearRest10 extends PEAR_REST_10
 {
     /**
      * @see PEAR_REST_10
-     *
-     * @param mixed $config
-     * @param mixed $options
      */
     public function __construct($config, $options = array())
     {
diff --git a/lib/plugin/sfPearRest11.class.php b/lib/plugin/sfPearRest11.class.php
index cd9538c95..239df17f5 100644
--- a/lib/plugin/sfPearRest11.class.php
+++ b/lib/plugin/sfPearRest11.class.php
@@ -21,9 +21,6 @@ class sfPearRest11 extends PEAR_REST_11
 {
     /**
      * @see PEAR_REST_11
-     *
-     * @param mixed $config
-     * @param mixed $options
      */
     public function __construct($config, $options = array())
     {
diff --git a/lib/plugin/sfPluginDependencyException.class.php b/lib/plugin/sfPluginDependencyException.class.php
index 67ede6c99..11e684c92 100644
--- a/lib/plugin/sfPluginDependencyException.class.php
+++ b/lib/plugin/sfPluginDependencyException.class.php
@@ -15,6 +15,4 @@
  *
  * @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..f77721df6 100644
--- a/lib/plugin/sfPluginException.class.php
+++ b/lib/plugin/sfPluginException.class.php
@@ -15,6 +15,4 @@
  *
  * @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 ed522d1d2..0b23c29ba 100644
--- a/lib/plugin/sfPluginManager.class.php
+++ b/lib/plugin/sfPluginManager.class.php
@@ -52,9 +52,7 @@ public function initialize(sfEventDispatcher $dispatcher, sfPearEnvironment $env
     /**
      * Configures this plugin manager.
      */
-    public function configure()
-    {
-    }
+    public function configure() {}
 
     /**
      * Returns the sfPearEnvironment instance.
@@ -287,9 +285,6 @@ public function getPluginLicense($plugin, $options = array())
      * Installs a plugin.
      *
      * @see installPlugin()
-     *
-     * @param mixed $plugin
-     * @param mixed $options
      */
     protected function doInstallPlugin($plugin, $options = array())
     {
diff --git a/lib/plugin/sfPluginRecursiveDependencyException.class.php b/lib/plugin/sfPluginRecursiveDependencyException.class.php
index b4171d0ff..ce83a61fd 100644
--- a/lib/plugin/sfPluginRecursiveDependencyException.class.php
+++ b/lib/plugin/sfPluginRecursiveDependencyException.class.php
@@ -15,6 +15,4 @@
  *
  * @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..b4aba88a3 100644
--- a/lib/plugin/sfPluginRestException.class.php
+++ b/lib/plugin/sfPluginRestException.class.php
@@ -15,6 +15,4 @@
  *
  * @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 2e37ea6d3..c8cfcf0ec 100644
--- a/lib/plugin/sfSymfonyPluginManager.class.php
+++ b/lib/plugin/sfSymfonyPluginManager.class.php
@@ -60,8 +60,7 @@ public function configure()
     /**
      * Installs web content for a plugin.
      *
-     * @param string $plugin          The plugin name
-     * @param mixed  $sourceDirectory
+     * @param string $plugin The plugin name
      */
     public function installWebContent($plugin, $sourceDirectory)
     {
diff --git a/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionProfiler.class.php b/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionProfiler.class.php
index 1202199bc..d70e7b559 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionProfiler.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionProfiler.class.php
@@ -35,8 +35,6 @@ public function __construct(sfEventDispatcher $dispatcher, $options = array())
      * Returns an option value.
      *
      * @param string $name
-     *
-     * @return mixed
      */
     public function getOption($name)
     {
@@ -47,7 +45,6 @@ public function getOption($name)
      * Sets an option value.
      *
      * @param string $name
-     * @param mixed  $value
      */
     public function setOption($name, $value)
     {
diff --git a/lib/plugins/sfDoctrinePlugin/lib/form/sfFormDoctrine.class.php b/lib/plugins/sfDoctrinePlugin/lib/form/sfFormDoctrine.class.php
index 550ffcd55..c3ae68a81 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/form/sfFormDoctrine.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/form/sfFormDoctrine.class.php
@@ -232,8 +232,6 @@ public function getI18nModelI18nField()
 
     /**
      * @see sfFormObject
-     *
-     * @param mixed $values
      */
     protected function doUpdateObject($values)
     {
@@ -372,9 +370,7 @@ protected function saveFile($field, $filename = null, sfValidatedFile $file = nu
     /**
      * Used in generated forms when models use inheritance.
      */
-    protected function setupInheritance()
-    {
-    }
+    protected function setupInheritance() {}
 
     /**
      * Returns the name of the related model.
diff --git a/lib/plugins/sfDoctrinePlugin/lib/form/sfFormFilterDoctrine.class.php b/lib/plugins/sfDoctrinePlugin/lib/form/sfFormFilterDoctrine.class.php
index 07234f7a6..be77d8b30 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/form/sfFormFilterDoctrine.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/form/sfFormFilterDoctrine.class.php
@@ -251,9 +251,7 @@ protected function addDateQuery(Doctrine_Query $query, $field, $values)
     /**
      * Used in generated forms when models use inheritance.
      */
-    protected function setupInheritance()
-    {
-    }
+    protected function setupInheritance() {}
 
     /**
      * Returns the name of the related model.
diff --git a/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormFilterGenerator.class.php b/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormFilterGenerator.class.php
index 61d752dc6..3f296dac2 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormFilterGenerator.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormFilterGenerator.class.php
@@ -355,8 +355,6 @@ protected function arrayExport($values)
     /**
      * Filter out models that have disabled generation of form classes.
      *
-     * @param mixed $models
-     *
      * @return array $models Array of models to generate forms for
      */
     protected function filterModels($models)
diff --git a/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormGenerator.class.php b/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormGenerator.class.php
index ac3ad2185..1729370bc 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormGenerator.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormGenerator.class.php
@@ -52,7 +52,6 @@ public function initialize(sfGeneratorManager $generatorManager)
      * Generates classes and templates in cache.
      *
      * @param array The parameters
-     * @param mixed $params
      *
      * @return string The data to put in configuration cache
      */
@@ -651,8 +650,6 @@ protected function loadModels()
     /**
      * Filter out models that have disabled generation of form classes.
      *
-     * @param mixed $models
-     *
      * @return array $models Array of models to generate forms for
      */
     protected function filterModels($models)
diff --git a/lib/plugins/sfDoctrinePlugin/lib/mailer/Swift_DoctrineSpool.class.php b/lib/plugins/sfDoctrinePlugin/lib/mailer/Swift_DoctrineSpool.class.php
index 060a336f0..eb424b15a 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/mailer/Swift_DoctrineSpool.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/mailer/Swift_DoctrineSpool.class.php
@@ -34,9 +34,6 @@ class Swift_DoctrineSpool extends Swift_ConfigurableSpool
      * @param string The Doctrine model to use to store the messages (MailMessage by default)
      * @param string The column name to use for message storage (message by default)
      * @param string The method to call to retrieve the query to execute (optional)
-     * @param mixed $model
-     * @param mixed $column
-     * @param mixed $method
      */
     public function __construct($model = 'MailMessage', $column = 'message', $method = 'createQuery')
     {
@@ -58,16 +55,12 @@ public function isStarted()
     /**
      * Starts this Transport mechanism.
      */
-    public function start()
-    {
-    }
+    public function start() {}
 
     /**
      * Stops this Transport mechanism.
      */
-    public function stop()
-    {
-    }
+    public function stop() {}
 
     /**
      * Stores a message in the queue.
diff --git a/lib/plugins/sfDoctrinePlugin/lib/record/sfDoctrineRecordI18nFilter.class.php b/lib/plugins/sfDoctrinePlugin/lib/record/sfDoctrineRecordI18nFilter.class.php
index 43e82ce65..8e9b11cc3 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/record/sfDoctrineRecordI18nFilter.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/record/sfDoctrineRecordI18nFilter.class.php
@@ -21,9 +21,7 @@ class sfDoctrineRecordI18nFilter extends Doctrine_Record_Filter
     /**
      * @see Doctrine_Table::unshiftFilter()
      */
-    public function init()
-    {
-    }
+    public function init() {}
 
     /**
      * Calls set on Translation relationship.
diff --git a/lib/plugins/sfDoctrinePlugin/lib/sfDoctrineException.class.php b/lib/plugins/sfDoctrinePlugin/lib/sfDoctrineException.class.php
index d42b25720..8a21b0351 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/sfDoctrineException.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/sfDoctrineException.class.php
@@ -17,6 +17,4 @@
  *
  * @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 3fc6d2b8f..8df114ab7 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBaseTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBaseTask.class.php
@@ -113,8 +113,6 @@ protected function getDoctrineDatabases(sfDatabaseManager $databaseManager, arra
      * A schema file is any file saved in a plugin or project's config/doctrine/
      * directory that matches the "*.yml" glob.
      *
-     * @param mixed $yamlSchemaPath
-     *
      * @return string Absolute path to the consolidated schema file
      */
     protected function prepareSchemaFile($yamlSchemaPath)
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildDbTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildDbTask.class.php
index 950c024dd..d6224071f 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildDbTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildDbTask.class.php
@@ -54,9 +54,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildFiltersTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildFiltersTask.class.php
index c4241c5a6..0ea03d7a7 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildFiltersTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildFiltersTask.class.php
@@ -51,9 +51,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildFormsTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildFormsTask.class.php
index 3a572fa0f..91f277c38 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildFormsTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildFormsTask.class.php
@@ -51,9 +51,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildModelTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildModelTask.class.php
index 0f21b9059..53e4873a4 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildModelTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildModelTask.class.php
@@ -52,9 +52,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildSchemaTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildSchemaTask.class.php
index 122d35e7a..0d9c602a0 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildSchemaTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildSchemaTask.class.php
@@ -46,9 +46,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildSqlTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildSqlTask.class.php
index 04281ccf9..37ccd13f5 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildSqlTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildSqlTask.class.php
@@ -48,9 +48,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildTask.class.php
index cb7f61e43..618d353ae 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildTask.class.php
@@ -117,9 +117,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCleanModelFilesTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCleanModelFilesTask.class.php
index eb69d4c6d..9632a5e71 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCleanModelFilesTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCleanModelFilesTask.class.php
@@ -40,9 +40,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
@@ -84,8 +81,6 @@ protected function execute($arguments = array(), $options = array())
     /**
      * Returns models defined in YAML.
      *
-     * @param mixed $yamlSchemaPath
-     *
      * @return array
      */
     protected function getYamlModels($yamlSchemaPath)
@@ -96,8 +91,6 @@ protected function getYamlModels($yamlSchemaPath)
     /**
      * Returns the schema as defined in YAML.
      *
-     * @param mixed $yamlSchemaPath
-     *
      * @return array
      */
     protected function getYamlSchema($yamlSchemaPath)
@@ -108,8 +101,6 @@ protected function getYamlSchema($yamlSchemaPath)
     /**
      * Returns models that have class files.
      *
-     * @param mixed $modelsPath
-     *
      * @return array
      */
     protected function getFileModels($modelsPath)
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCompileTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCompileTask.class.php
index 27537733d..ebfed326f 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCompileTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCompileTask.class.php
@@ -48,9 +48,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineConfigureDatabaseTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineConfigureDatabaseTask.class.php
index a32859f57..d6cd89407 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineConfigureDatabaseTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineConfigureDatabaseTask.class.php
@@ -63,9 +63,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDataDumpTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDataDumpTask.class.php
index 8593eeddb..55d7bdfc7 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDataDumpTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDataDumpTask.class.php
@@ -55,9 +55,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDataLoadTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDataLoadTask.class.php
index a4a4e8853..8ef11f564 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDataLoadTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDataLoadTask.class.php
@@ -62,9 +62,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDeleteModelFilesTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDeleteModelFilesTask.class.php
index 51c84c5d9..ba683c6b9 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDeleteModelFilesTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDeleteModelFilesTask.class.php
@@ -46,9 +46,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDqlTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDqlTask.class.php
index 57d0ede3d..b2760dadc 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDqlTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDqlTask.class.php
@@ -60,9 +60,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDropDbTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDropDbTask.class.php
index 970f86d8e..be555f57e 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDropDbTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDropDbTask.class.php
@@ -59,9 +59,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateAdminTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateAdminTask.class.php
index 77d805245..591acdcd5 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateAdminTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateAdminTask.class.php
@@ -72,9 +72,6 @@ class: sfDoctrineRouteCollection
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationTask.class.php
index 8cef5a32d..17ae5faaa 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationTask.class.php
@@ -54,9 +54,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsDbTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsDbTask.class.php
index d07d4e11b..3b4bce034 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsDbTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsDbTask.class.php
@@ -45,9 +45,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsDiffTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsDiffTask.class.php
index 5c521d7bb..43178c255 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsDiffTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsDiffTask.class.php
@@ -45,9 +45,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsModelsTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsModelsTask.class.php
index 970010747..a7caaf768 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsModelsTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsModelsTask.class.php
@@ -45,9 +45,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateModuleForRouteTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateModuleForRouteTask.class.php
index 3b931cb46..5599f5105 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateModuleForRouteTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateModuleForRouteTask.class.php
@@ -54,9 +54,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateModuleTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateModuleTask.class.php
index ef7c22ca5..3402cbbd9 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateModuleTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateModuleTask.class.php
@@ -76,9 +76,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineInsertSqlTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineInsertSqlTask.class.php
index 37cd7efff..1cefab957 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineInsertSqlTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineInsertSqlTask.class.php
@@ -47,9 +47,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineMigrateTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineMigrateTask.class.php
index ed4692229..526a541ef 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineMigrateTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineMigrateTask.class.php
@@ -64,9 +64,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/plugins/sfDoctrinePlugin/lib/test/sfTesterDoctrine.class.php b/lib/plugins/sfDoctrinePlugin/lib/test/sfTesterDoctrine.class.php
index 187326f08..8aaf9fdc5 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/test/sfTesterDoctrine.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/test/sfTesterDoctrine.class.php
@@ -20,16 +20,12 @@ class sfTesterDoctrine extends sfTester
     /**
      * Prepares the tester.
      */
-    public function prepare()
-    {
-    }
+    public function prepare() {}
 
     /**
      * Initializes the tester.
      */
-    public function initialize()
-    {
-    }
+    public function initialize() {}
 
     /**
      * Tests a model.
diff --git a/lib/plugins/sfDoctrinePlugin/lib/validator/sfValidatorDoctrineChoice.class.php b/lib/plugins/sfDoctrinePlugin/lib/validator/sfValidatorDoctrineChoice.class.php
index e4148d260..da720236b 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/validator/sfValidatorDoctrineChoice.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/validator/sfValidatorDoctrineChoice.class.php
@@ -33,9 +33,6 @@ class sfValidatorDoctrineChoice extends sfValidatorBase
      *  * max:        The maximum number of values that need to be selected (this option is only active if multiple is true)
      *
      * @see sfValidatorBase
-     *
-     * @param mixed $options
-     * @param mixed $messages
      */
     protected function configure($options = array(), $messages = array())
     {
@@ -52,8 +49,6 @@ protected function configure($options = array(), $messages = array())
 
     /**
      * @see sfValidatorBase
-     *
-     * @param mixed $value
      */
     protected function doClean($value)
     {
diff --git a/lib/plugins/sfDoctrinePlugin/lib/validator/sfValidatorDoctrineUnique.class.php b/lib/plugins/sfDoctrinePlugin/lib/validator/sfValidatorDoctrineUnique.class.php
index f709867b9..08e24c8ab 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/validator/sfValidatorDoctrineUnique.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/validator/sfValidatorDoctrineUnique.class.php
@@ -28,8 +28,6 @@ class sfValidatorDoctrineUnique extends sfValidatorSchema
      *
      * @param array  An array of options
      * @param array  An array of error messages
-     * @param mixed $options
-     * @param mixed $messages
      *
      * @see sfValidatorSchema
      */
@@ -52,9 +50,6 @@ public function __construct($options = array(), $messages = array())
      *  * 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
-     *
-     * @param mixed $options
-     * @param mixed $messages
      */
     protected function configure($options = array(), $messages = array())
     {
@@ -69,8 +64,6 @@ protected function configure($options = array(), $messages = array())
 
     /**
      * @see sfValidatorBase
-     *
-     * @param mixed $values
      */
     protected function doClean($values)
     {
@@ -125,7 +118,6 @@ protected function doClean($values)
      * @param BaseObject  A Doctrine object
      * @param array       An array of values
      * @param bool     true if the object is being updated, false otherwise
-     * @param mixed $values
      */
     protected function isUpdate(Doctrine_Record $object, $values)
     {
diff --git a/lib/plugins/sfDoctrinePlugin/lib/widget/sfWidgetFormDoctrineArrayChoice.class.php b/lib/plugins/sfDoctrinePlugin/lib/widget/sfWidgetFormDoctrineArrayChoice.class.php
index 8157cfa73..0c14c9bd0 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/widget/sfWidgetFormDoctrineArrayChoice.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/widget/sfWidgetFormDoctrineArrayChoice.class.php
@@ -21,9 +21,6 @@ class sfWidgetFormDoctrineArrayChoice extends sfWidgetFormChoice
 {
     /**
      * @see sfWidget
-     *
-     * @param mixed $options
-     * @param mixed $attributes
      */
     public function __construct($options = array(), $attributes = array())
     {
@@ -69,9 +66,6 @@ public function getChoices()
      *  * multiple:             true if the select tag must allow multiple selections (false by default)
      *
      * @see sfWidgetFormChoice
-     *
-     * @param mixed $options
-     * @param mixed $attributes
      */
     protected function configure($options = array(), $attributes = array())
     {
diff --git a/lib/plugins/sfDoctrinePlugin/lib/widget/sfWidgetFormDoctrineChoice.class.php b/lib/plugins/sfDoctrinePlugin/lib/widget/sfWidgetFormDoctrineChoice.class.php
index c95252e45..5bf5e9354 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/widget/sfWidgetFormDoctrineChoice.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/widget/sfWidgetFormDoctrineChoice.class.php
@@ -21,9 +21,6 @@ class sfWidgetFormDoctrineChoice extends sfWidgetFormChoice
 {
     /**
      * @see sfWidget
-     *
-     * @param mixed $options
-     * @param mixed $attributes
      */
     public function __construct($options = array(), $attributes = array())
     {
@@ -94,9 +91,6 @@ public function getChoices()
      *  * table_method: A method to return either a query, collection or single object
      *
      * @see sfWidgetFormSelect
-     *
-     * @param mixed $options
-     * @param mixed $attributes
      */
     protected function configure($options = array(), $attributes = array())
     {
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/AdminGenBrowser.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/AdminGenBrowser.class.php
index bf778c6bd..c33a0ee82 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/AdminGenBrowser.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/AdminGenBrowser.class.php
@@ -103,8 +103,7 @@ protected function _testAdminGenTableMethod()
     {
         $this->
           get('/my_articles')->
-          with('response')->isStatusCode('200')
-        ;
+          with('response')->isStatusCode('200');
     }
 
     protected function _testArticleI18nEmbedded()
@@ -137,8 +136,7 @@ protected function _testArticleI18nEmbedded()
               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'))->
-            end()
-        ;
+            end();
     }
 
     protected function _testEnumDropdown()
@@ -149,8 +147,7 @@ protected function _testEnumDropdown()
           get('/subscriptions/new')->
             with('response')->begin()->
               checkElement('select', '/^New\R?Active\R?Pending\R?Expired\R?$/m')->
-            end()
-        ;
+            end();
     }
 
     protected function _testUserEmbedsProfileForm()
@@ -163,8 +160,7 @@ protected function _testUserEmbedsProfileForm()
               matches('/Profile/')->
               matches('/First name/')->
               matches('/Last name/')->
-            end()
-        ;
+            end();
 
         $this->info('Test the Profile form saves and attached to user properly');
 
@@ -198,8 +194,7 @@ protected function _testUserEmbedsProfileForm()
               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))->
-            end()
-        ;
+            end();
 
         unset($userInfo['user']['Profile']['user_id']);
         $tester = $this->get('/users/new')->
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/RouteTest.php b/lib/plugins/sfDoctrinePlugin/test/functional/RouteTest.php
index 34be2c712..b4bf2d60f 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/RouteTest.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/RouteTest.php
@@ -32,8 +32,7 @@
       with('response')->begin()->
         isStatusCode('200')->
         matches($check)->
-      end()
-    ;
+      end();
 }
 
 $article = Doctrine_Core::getTable('Article')->find(1);
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..2218be6cd 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
@@ -2,7 +2,5 @@
 
 class backendConfiguration extends sfApplicationConfiguration
 {
-    public function configure()
-    {
-    }
+    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..ad920b971 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,3 @@
 <?php
 
-class myUser extends sfBasicSecurityUser
-{
-}
+class myUser extends sfBasicSecurityUser {}
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..0810977f2 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
@@ -11,6 +11,4 @@
  *
  * @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..3c2ad3277 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
@@ -7,6 +7,4 @@
  *
  * @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..5fe626da9 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
@@ -7,6 +7,4 @@
  *
  * @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..717abc3af 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
@@ -2,7 +2,5 @@
 
 class frontendConfiguration extends sfApplicationConfiguration
 {
-    public function configure()
-    {
-    }
+    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..ad920b971 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,3 @@
 <?php
 
-class myUser extends sfBasicSecurityUser
-{
-}
+class myUser extends sfBasicSecurityUser {}
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..5d0856bbf 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
@@ -7,7 +7,5 @@
  */
 class ArticleFormFilter extends BaseArticleFormFilter
 {
-    public function configure()
-    {
-    }
+    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..335776951 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
@@ -7,7 +7,5 @@
  */
 class ArticleTranslationFormFilter extends BaseArticleTranslationFormFilter
 {
-    public function configure()
-    {
-    }
+    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..44b464815 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
@@ -9,7 +9,5 @@
  */
 class AttachmentFormFilter extends BaseAttachmentFormFilter
 {
-    public function configure()
-    {
-    }
+    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..a7e248118 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
@@ -7,7 +7,5 @@
  */
 class AuthorFormFilter extends BaseAuthorFormFilter
 {
-    public function configure()
-    {
-    }
+    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..e32b507b2 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
@@ -9,7 +9,5 @@
  */
 class AuthorInheritanceConcreteFormFilter extends BaseAuthorInheritanceConcreteFormFilter
 {
-    public function configure()
-    {
-    }
+    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..b7470fab7 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
@@ -7,7 +7,5 @@
  */
 class AuthorInheritanceFormFilter extends BaseAuthorInheritanceFormFilter
 {
-    public function configure()
-    {
-    }
+    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..b22afeb1a 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
@@ -7,7 +7,5 @@
  */
 abstract class BaseFormFilterDoctrine extends sfFormFilterDoctrine
 {
-    public function setup()
-    {
-    }
+    public function setup() {}
 }
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..47ee6ccef 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
@@ -9,7 +9,5 @@
  */
 class BlogArticleTranslationFormFilter extends BaseBlogArticleTranslationFormFilter
 {
-    public function configure()
-    {
-    }
+    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..b64485ebd 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
@@ -7,7 +7,5 @@
  */
 class CamelCaseFormFilter extends BaseCamelCaseFormFilter
 {
-    public function configure()
-    {
-    }
+    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..2fd08c1ef 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
@@ -9,7 +9,5 @@
  */
 class DefaultValueTestFormFilter extends BaseDefaultValueTestFormFilter
 {
-    public function configure()
-    {
-    }
+    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..851f13bbf 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
@@ -7,7 +7,5 @@
  */
 class FormGeneratorTest2FormFilter extends BaseFormGeneratorTest2FormFilter
 {
-    public function configure()
-    {
-    }
+    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..f34057fe5 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
@@ -7,7 +7,5 @@
  */
 class GroupFormFilter extends BaseGroupFormFilter
 {
-    public function configure()
-    {
-    }
+    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..dabc72dd2 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
@@ -7,7 +7,5 @@
  */
 class PermissionFormFilter extends BasePermissionFormFilter
 {
-    public function configure()
-    {
-    }
+    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..be708e899 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
@@ -7,7 +7,5 @@
  */
 class ProfileFormFilter extends BaseProfileFormFilter
 {
-    public function configure()
-    {
-    }
+    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..e30216179 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
@@ -9,7 +9,5 @@
  */
 class ResourceTypeFormFilter extends BaseResourceTypeFormFilter
 {
-    public function configure()
-    {
-    }
+    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..ed6926476 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
@@ -9,7 +9,5 @@
  */
 class SettingFormFilter extends PluginSettingFormFilter
 {
-    public function configure()
-    {
-    }
+    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..d6248e052 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
@@ -7,7 +7,5 @@
  */
 class SubscriptionFormFilter extends BaseSubscriptionFormFilter
 {
-    public function configure()
-    {
-    }
+    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..6f24238fb 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
@@ -7,7 +7,5 @@
  */
 class UniqueTestFormFilter extends BaseUniqueTestFormFilter
 {
-    public function configure()
-    {
-    }
+    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..ff5fd5a00 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
@@ -7,7 +7,5 @@
  */
 class UserFormFilter extends BaseUserFormFilter
 {
-    public function configure()
-    {
-    }
+    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..27bb788e8 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
@@ -7,6 +7,4 @@
  *
  * @version    SVN: $Id$
  */
-class BaseForm extends sfFormSymfony
-{
-}
+class BaseForm extends sfFormSymfony {}
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..616caf7a5 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
@@ -7,7 +7,5 @@
  */
 class ArticleTranslationForm extends BaseArticleTranslationForm
 {
-    public function configure()
-    {
-    }
+    public function configure() {}
 }
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..d257898f5 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
@@ -7,7 +7,5 @@
  */
 class AuthorForm extends BaseAuthorForm
 {
-    public function configure()
-    {
-    }
+    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..e86acb48e 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
@@ -7,7 +7,5 @@
  */
 class AuthorInheritanceForm extends BaseAuthorInheritanceForm
 {
-    public function configure()
-    {
-    }
+    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..c237bb58b 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
@@ -7,7 +7,5 @@
  */
 abstract class BaseFormDoctrine extends sfFormDoctrine
 {
-    public function setup()
-    {
-    }
+    public function setup() {}
 }
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..ef83d9ad1 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
@@ -9,7 +9,5 @@
  */
 class BlogArticleTranslationForm extends BaseBlogArticleTranslationForm
 {
-    public function configure()
-    {
-    }
+    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..ca1aa2405 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
@@ -7,7 +7,5 @@
  */
 class CamelCaseForm extends BaseCamelCaseForm
 {
-    public function configure()
-    {
-    }
+    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..d586a2d47 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
@@ -9,7 +9,5 @@
  */
 class DefaultValueTestForm extends BaseDefaultValueTestForm
 {
-    public function configure()
-    {
-    }
+    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..9dc4a506e 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
@@ -7,7 +7,5 @@
  */
 class FormGeneratorTestForm extends BaseFormGeneratorTestForm
 {
-    public function configure()
-    {
-    }
+    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..d62d735f3 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
@@ -7,7 +7,5 @@
  */
 class GroupForm extends BaseGroupForm
 {
-    public function configure()
-    {
-    }
+    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..76b2d21e3 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
@@ -7,7 +7,5 @@
  */
 class PermissionForm extends BasePermissionForm
 {
-    public function configure()
-    {
-    }
+    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..1a4f62405 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
@@ -7,7 +7,5 @@
  */
 class ProfileForm extends BaseProfileForm
 {
-    public function configure()
-    {
-    }
+    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..d8ab80c18 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
@@ -9,7 +9,5 @@
  */
 class ResourceTypeForm extends BaseResourceTypeForm
 {
-    public function configure()
-    {
-    }
+    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..cc84af95f 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
@@ -9,7 +9,5 @@
  */
 class SettingForm extends PluginSettingForm
 {
-    public function configure()
-    {
-    }
+    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..81bbeda30 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
@@ -7,7 +7,5 @@
  */
 class SubscriptionForm extends BaseSubscriptionForm
 {
-    public function configure()
-    {
-    }
+    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..37ccf7e85 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
@@ -7,7 +7,5 @@
  */
 class UniqueTestForm extends BaseUniqueTestForm
 {
-    public function configure()
-    {
-    }
+    public function configure() {}
 }
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..9f5f56521 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
@@ -9,6 +9,4 @@
  *
  * @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..33830b770 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,3 @@
 <?php
 
-class AttachmentTable extends Doctrine_Table
-{
-}
+class AttachmentTable extends Doctrine_Table {}
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..6849c1f97 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
@@ -9,6 +9,4 @@
  *
  * @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..ca2a6b378 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
@@ -9,6 +9,4 @@
  *
  * @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..cc8b608f8 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,3 @@
 <?php
 
-class AuthorInheritanceConcreteTable extends AuthorTable
-{
-}
+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..4b7a66af2 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,3 @@
 <?php
 
-class AuthorInheritanceTable extends AuthorTable
-{
-}
+class AuthorInheritanceTable extends AuthorTable {}
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..36061e1a5 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
@@ -9,6 +9,4 @@
  *
  * @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..a10b8a71d 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,3 @@
 <?php
 
-class BlogArticleTable extends ArticleTable
-{
-}
+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..05c0bf163 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
@@ -9,6 +9,4 @@
  *
  * @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..4c28c8505 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,3 @@
 <?php
 
-class BlogAuthorTable extends AuthorTable
-{
-}
+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..f09031451 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
@@ -9,6 +9,4 @@
  *
  * @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..7abd6b1c5 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,3 @@
 <?php
 
-class CamelCaseTable extends Doctrine_Table
-{
-}
+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..b780828c1 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
@@ -13,6 +13,4 @@
  *
  * @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..f14d35a6f 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,3 @@
 <?php
 
-class DefaultValueTestTable extends Doctrine_Table
-{
-}
+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..c202ba121 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
@@ -13,6 +13,4 @@
  *
  * @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..07a253c80 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
@@ -9,6 +9,4 @@
  *
  * @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..576fe4f45 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,3 @@
 <?php
 
-class FormGeneratorTest2Table extends Doctrine_Table
-{
-}
+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..0a2d851e9 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
@@ -9,6 +9,4 @@
  *
  * @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..c22a6f45f 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,3 @@
 <?php
 
-class FormGeneratorTest3Table extends Doctrine_Table
-{
-}
+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..5364bff4e 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,3 @@
 <?php
 
-class FormGeneratorTestTable extends Doctrine_Table
-{
-}
+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..af3b06188 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
@@ -3,6 +3,4 @@
 /**
  * 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..b22cc27c4 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
@@ -3,6 +3,4 @@
 /**
  * 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..50b56a478 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
@@ -2,6 +2,4 @@
 /**
  * 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..8b45d9faa 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
@@ -2,6 +2,4 @@
 /**
  * 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..871b820ba 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
@@ -9,6 +9,4 @@
  *
  * @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..2b926135e 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,3 @@
 <?php
 
-class ModelFromLinkedSchemaTable extends Doctrine_Table
-{
-}
+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..b2c0690d7 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
@@ -9,6 +9,4 @@
  *
  * @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..c96c232a2 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,3 @@
 <?php
 
-class ModelWithNumberInColumnTable extends Doctrine_Table
-{
-}
+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..e59613899 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
@@ -3,6 +3,4 @@
 /**
  * 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..e29d1a957 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
@@ -2,6 +2,4 @@
 /**
  * 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..f85dff767 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
@@ -3,6 +3,4 @@
 /**
  * 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..fcdf179df 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
@@ -2,6 +2,4 @@
 /**
  * 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..83b8d8137 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
@@ -9,6 +9,4 @@
  *
  * @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..6302d5d4e 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,3 @@
 <?php
 
-class ResourceTypeTable extends Doctrine_Table
-{
-}
+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..fcf103825 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
@@ -9,6 +9,4 @@
  *
  * @version    SVN: $Id$
  */
-class Setting extends PluginSetting
-{
-}
+class Setting extends PluginSetting {}
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..aec0e509e 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
@@ -3,6 +3,4 @@
 /**
  * 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..693dbfd71 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
@@ -2,6 +2,4 @@
 /**
  * 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..9e9fac18d 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
@@ -7,6 +7,4 @@
  *
  * @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..a651fe7f9 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
@@ -2,6 +2,4 @@
 /**
  * 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/UserGroup.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/UserGroup.class.php
index 5253c65af..4bd17d071 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
@@ -3,6 +3,4 @@
 /**
  * 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..584d43879 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
@@ -2,6 +2,4 @@
 /**
  * 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..50b4a86ac 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
@@ -3,6 +3,4 @@
 /**
  * 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..5da61d618 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
@@ -2,6 +2,4 @@
 /**
  * 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/myDoctrineRecord.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/myDoctrineRecord.class.php
index e4c7f680f..eb7cfc34d 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,3 @@
 <?php
 
-abstract class myDoctrineRecord extends sfDoctrineRecord
-{
-}
+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..6609bcd71 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
@@ -7,6 +7,4 @@
  *
  * @version    SVN: $Id$
  */
-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..7fe33442a 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
@@ -7,6 +7,4 @@
  *
  * @version    SVN: $Id$
  */
-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..d1ff7574a 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
@@ -9,6 +9,4 @@
  *
  * @version    SVN: $Id$
  */
-abstract class PluginSetting extends BaseSetting
-{
-}
+abstract class PluginSetting extends BaseSetting {}
diff --git a/lib/plugins/sfDoctrinePlugin/test/unit/form/sfFormDoctrineTest.php b/lib/plugins/sfDoctrinePlugin/test/unit/form/sfFormDoctrineTest.php
index e27dc6668..0dc2d386b 100644
--- a/lib/plugins/sfDoctrinePlugin/test/unit/form/sfFormDoctrineTest.php
+++ b/lib/plugins/sfDoctrinePlugin/test/unit/form/sfFormDoctrineTest.php
@@ -45,9 +45,7 @@ public function configure()
 // ->embedRelation()
 $t->diag('->embedRelation()');
 
-class myArticleForm extends ArticleForm
-{
-}
+class myArticleForm extends ArticleForm {}
 
 $table = Doctrine_Core::getTable('Author');
 $form = new AuthorForm($table->create(array(
diff --git a/lib/plugins/sfDoctrinePlugin/test/unit/sfDoctrineDatabaseTest.php b/lib/plugins/sfDoctrinePlugin/test/unit/sfDoctrineDatabaseTest.php
index c6e2be61a..489212aea 100644
--- a/lib/plugins/sfDoctrinePlugin/test/unit/sfDoctrineDatabaseTest.php
+++ b/lib/plugins/sfDoctrinePlugin/test/unit/sfDoctrineDatabaseTest.php
@@ -12,9 +12,7 @@
 
 $t = new lime_test(4);
 
-class ProjectConfiguration extends sfProjectConfiguration
-{
-}
+class ProjectConfiguration extends sfProjectConfiguration {}
 
 $configuration = new ProjectConfiguration(dirname(__FILE__).'/../../lib', new sfEventDispatcher());
 
diff --git a/lib/request/sfRequest.class.php b/lib/request/sfRequest.class.php
index 4e42fc5d5..354c3f430 100644
--- a/lib/request/sfRequest.class.php
+++ b/lib/request/sfRequest.class.php
@@ -298,8 +298,6 @@ public function setAttribute($name, $value)
      *
      * @param string $name    Parameter name
      * @param string $default Parameter default value
-     *
-     * @return mixed
      */
     public function getParameter($name, $default = null)
     {
diff --git a/lib/request/sfWebRequest.class.php b/lib/request/sfWebRequest.class.php
index 61c9fefa7..554c04c54 100644
--- a/lib/request/sfWebRequest.class.php
+++ b/lib/request/sfWebRequest.class.php
@@ -577,8 +577,7 @@ public function isSecure()
         return
           (isset($pathArray['HTTPS']) && ('on' == strtolower($pathArray['HTTPS']) || 1 == $pathArray['HTTPS']))
           || ($this->getOption('trust_proxy') && isset($pathArray['HTTP_SSL_HTTPS']) && ('on' == strtolower($pathArray['HTTP_SSL_HTTPS']) || 1 == $pathArray['HTTP_SSL_HTTPS']))
-          || ($this->getOption('trust_proxy') && $this->isForwardedSecure())
-        ;
+          || ($this->getOption('trust_proxy') && $this->isForwardedSecure());
     }
 
     /**
diff --git a/lib/response/sfWebResponse.class.php b/lib/response/sfWebResponse.class.php
index a6126730d..e1a78c9a3 100644
--- a/lib/response/sfWebResponse.class.php
+++ b/lib/response/sfWebResponse.class.php
@@ -827,7 +827,6 @@ public function serialize()
 
     /**
      * @see sfResponse
-     * {@inheritdoc}
      */
     public function unserialize($serialized)
     {
diff --git a/lib/routing/sfPatternRouting.class.php b/lib/routing/sfPatternRouting.class.php
index 753413c83..7b5b145bc 100644
--- a/lib/routing/sfPatternRouting.class.php
+++ b/lib/routing/sfPatternRouting.class.php
@@ -44,7 +44,6 @@ class sfPatternRouting extends sfRouting
      *                                      cache backend (like sfAPCCache).
      *
      * @see sfRouting
-     * {@inheritdoc}
      */
     public function initialize(sfEventDispatcher $dispatcher, sfCache $cache = null, $options = array())
     {
@@ -73,7 +72,6 @@ public function initialize(sfEventDispatcher $dispatcher, sfCache $cache = null,
 
     /**
      * @see sfRouting
-     * {@inheritdoc}
      */
     public function loadConfiguration()
     {
@@ -86,7 +84,6 @@ public function loadConfiguration()
 
     /**
      * @see sfRouting
-     * {@inheritdoc}
      */
     public function setDefaultParameter($key, $value)
     {
@@ -101,7 +98,6 @@ public function setDefaultParameter($key, $value)
 
     /**
      * @see sfRouting
-     * {@inheritdoc}
      */
     public function setDefaultParameters($parameters)
     {
@@ -116,7 +112,6 @@ public function setDefaultParameters($parameters)
 
     /**
      * @see sfRouting
-     * {@inheritdoc}
      */
     public function getCurrentInternalUri($withRouteName = false)
     {
@@ -135,7 +130,6 @@ public function getCurrentRouteName()
 
     /**
      * @see sfRouting
-     * {@inheritdoc}
      */
     public function getRoutes()
     {
@@ -144,7 +138,6 @@ public function getRoutes()
 
     /**
      * @see  sfRouting
-     * {@inheritdoc}
      */
     public function getRoute($name)
     {
@@ -164,7 +157,6 @@ public function getRoute($name)
 
     /**
      * @see sfRouting
-     * {@inheritdoc}
      */
     public function setRoutes($routes)
     {
@@ -175,7 +167,6 @@ public function setRoutes($routes)
 
     /**
      * @see sfRouting
-     * {@inheritdoc}
      */
     public function hasRoutes()
     {
@@ -184,7 +175,6 @@ public function hasRoutes()
 
     /**
      * @see sfRouting
-     * {@inheritdoc}
      */
     public function clearRoutes()
     {
@@ -310,7 +300,6 @@ public function configureRoute(sfRoute $route)
 
     /**
      * @see sfRouting
-     * {@inheritdoc}
      */
     public function generate($name, $params = array(), $absolute = false)
     {
@@ -351,7 +340,6 @@ public function generate($name, $params = array(), $absolute = false)
 
     /**
      * @see sfRouting
-     * {@inheritdoc}
      */
     public function parse($url)
     {
diff --git a/lib/routing/sfRequestRoute.class.php b/lib/routing/sfRequestRoute.class.php
index 3e1c08bbb..8933bbf96 100644
--- a/lib/routing/sfRequestRoute.class.php
+++ b/lib/routing/sfRequestRoute.class.php
@@ -25,11 +25,6 @@ class sfRequestRoute extends sfRoute
      * Applies a default sf_method requirements of GET or HEAD.
      *
      * @see sfRoute
-     *
-     * @param mixed $pattern
-     * @param mixed $defaults
-     * @param mixed $requirements
-     * @param mixed $options
      */
     public function __construct($pattern, $defaults = array(), $requirements = array(), $options = array())
     {
diff --git a/lib/routing/sfRoute.class.php b/lib/routing/sfRoute.class.php
index 399c9186a..5fd858b78 100644
--- a/lib/routing/sfRoute.class.php
+++ b/lib/routing/sfRoute.class.php
@@ -69,6 +69,7 @@ public function __serialize()
     {
         // always serialize compiled routes
         $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);
     }
@@ -653,9 +654,7 @@ protected function compileForVariable($separator, $name, $variable)
         }
     }
 
-    protected function compileForSeparator($separator, $regexSeparator)
-    {
-    }
+    protected function compileForSeparator($separator, $regexSeparator) {}
 
     protected function initializeOptions()
     {
diff --git a/lib/routing/sfRouting.class.php b/lib/routing/sfRouting.class.php
index d94dfa30b..cc2d90311 100644
--- a/lib/routing/sfRouting.class.php
+++ b/lib/routing/sfRouting.class.php
@@ -30,8 +30,7 @@ abstract class sfRouting
      *
      * @see initialize()
      *
-     * @param sfCache $cache
-     * @param array   $options
+     * @param array $options
      */
     public function __construct(sfEventDispatcher $dispatcher, sfCache $cache = null, $options = array())
     {
@@ -262,9 +261,7 @@ public function filterParametersEvent(sfEvent $event, $parameters)
     /**
      * Execute the shutdown procedure.
      */
-    public function shutdown()
-    {
-    }
+    public function shutdown() {}
 
     protected function fixGeneratedUrl($url, $absolute = false)
     {
diff --git a/lib/service/sfServiceContainerDumperPhp.class.php b/lib/service/sfServiceContainerDumperPhp.class.php
index 5edc36516..b356006b5 100644
--- a/lib/service/sfServiceContainerDumperPhp.class.php
+++ b/lib/service/sfServiceContainerDumperPhp.class.php
@@ -41,8 +41,7 @@ public function dump(array $options = array())
           $this->addConstructor().
           $this->addServices().
           $this->addDefaultParametersMethod().
-          $this->endClass()
-        ;
+          $this->endClass();
     }
 
     public function replaceParameter($match)
@@ -192,8 +191,7 @@ protected function get{$name}Service()
           $this->addServiceInstance($id, $definition).
           $this->addServiceMethodCalls($id, $definition).
           $this->addServiceConfigurator($id, $definition).
-          $this->addServiceReturn($id, $definition)
-        ;
+          $this->addServiceReturn($id, $definition);
 
         return $code;
     }
diff --git a/lib/storage/sfMySQLSessionStorage.class.php b/lib/storage/sfMySQLSessionStorage.class.php
index 029a4adcd..9ce5c1cf8 100644
--- a/lib/storage/sfMySQLSessionStorage.class.php
+++ b/lib/storage/sfMySQLSessionStorage.class.php
@@ -66,7 +66,7 @@ public function sessionGC($lifetime)
         $db_table = $this->options['db_table'];
         $db_time_col = $this->options['db_time_col'];
 
-    // delete the record older than the authorised session life time
+        // delete the record older than the authorised session life time
         $lifetime = $this->db_escape($lifetime); // We never know...
         $sql = "DELETE FROM {$db_table} WHERE {$db_time_col} + {$lifetime} < UNIX_TIMESTAMP()";
 
diff --git a/lib/storage/sfNoStorage.class.php b/lib/storage/sfNoStorage.class.php
index 81906e3bb..a98ae86c4 100644
--- a/lib/storage/sfNoStorage.class.php
+++ b/lib/storage/sfNoStorage.class.php
@@ -64,9 +64,7 @@ public function remove($key)
      *
      * @throws <b>sfStorageException</b> If an error occurs while writing to this storage
      */
-    public function write($key, $data)
-    {
-    }
+    public function write($key, $data) {}
 
     /**
      * Regenerates id that represents this storage.
@@ -85,7 +83,5 @@ public function regenerate($destroy = false)
      *
      * @throws <b>sfStorageException</b> If an error occurs while shutting down this storage
      */
-    public function shutdown()
-    {
-    }
+    public function shutdown() {}
 }
diff --git a/lib/task/app/sfAppRoutesTask.class.php b/lib/task/app/sfAppRoutesTask.class.php
index 53375c4c6..af7113fae 100644
--- a/lib/task/app/sfAppRoutesTask.class.php
+++ b/lib/task/app/sfAppRoutesTask.class.php
@@ -42,9 +42,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/task/cache/sfCacheClearTask.class.php b/lib/task/cache/sfCacheClearTask.class.php
index 447867d23..af975e83a 100644
--- a/lib/task/cache/sfCacheClearTask.class.php
+++ b/lib/task/cache/sfCacheClearTask.class.php
@@ -106,9 +106,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/task/configure/sfConfigureAuthorTask.class.php b/lib/task/configure/sfConfigureAuthorTask.class.php
index 23e461260..fc239867c 100644
--- a/lib/task/configure/sfConfigureAuthorTask.class.php
+++ b/lib/task/configure/sfConfigureAuthorTask.class.php
@@ -44,9 +44,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/task/generator/sfGenerateAppTask.class.php b/lib/task/generator/sfGenerateAppTask.class.php
index aeaa610fb..68e5eee89 100644
--- a/lib/task/generator/sfGenerateAppTask.class.php
+++ b/lib/task/generator/sfGenerateAppTask.class.php
@@ -76,9 +76,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/task/generator/sfGenerateModuleTask.class.php b/lib/task/generator/sfGenerateModuleTask.class.php
index aa47cb0bd..c40899f15 100644
--- a/lib/task/generator/sfGenerateModuleTask.class.php
+++ b/lib/task/generator/sfGenerateModuleTask.class.php
@@ -61,9 +61,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/task/generator/sfGenerateProjectTask.class.php b/lib/task/generator/sfGenerateProjectTask.class.php
index 281123a84..28d2eeeb5 100755
--- a/lib/task/generator/sfGenerateProjectTask.class.php
+++ b/lib/task/generator/sfGenerateProjectTask.class.php
@@ -21,8 +21,6 @@ class sfGenerateProjectTask extends sfGeneratorBaseTask
 {
     /**
      * @see sfTask
-     *
-     * @param mixed $options
      */
     protected function doRun(sfCommandManager $commandManager, $options)
     {
@@ -80,9 +78,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/task/generator/sfGenerateTaskTask.class.php b/lib/task/generator/sfGenerateTaskTask.class.php
index f6d17ed8b..030c53fd1 100644
--- a/lib/task/generator/sfGenerateTaskTask.class.php
+++ b/lib/task/generator/sfGenerateTaskTask.class.php
@@ -67,9 +67,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/task/generator/sfGeneratorBaseTask.class.php b/lib/task/generator/sfGeneratorBaseTask.class.php
index 6324a094b..8444862fb 100644
--- a/lib/task/generator/sfGeneratorBaseTask.class.php
+++ b/lib/task/generator/sfGeneratorBaseTask.class.php
@@ -15,6 +15,4 @@
  *
  * @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 abdf8a9f3..e04b3d878 100644
--- a/lib/task/help/sfHelpTask.class.php
+++ b/lib/task/help/sfHelpTask.class.php
@@ -45,9 +45,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/task/help/sfListTask.class.php b/lib/task/help/sfListTask.class.php
index 0d08f34cf..132a7d696 100644
--- a/lib/task/help/sfListTask.class.php
+++ b/lib/task/help/sfListTask.class.php
@@ -49,9 +49,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/task/i18n/sfI18nExtractTask.class.php b/lib/task/i18n/sfI18nExtractTask.class.php
index a45952586..388ed14ed 100644
--- a/lib/task/i18n/sfI18nExtractTask.class.php
+++ b/lib/task/i18n/sfI18nExtractTask.class.php
@@ -25,9 +25,6 @@ class sfI18nExtractTask extends sfBaseTask
 {
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     public function execute($arguments = array(), $options = array())
     {
diff --git a/lib/task/i18n/sfI18nFindTask.class.php b/lib/task/i18n/sfI18nFindTask.class.php
index bcea6f1a4..9209799db 100644
--- a/lib/task/i18n/sfI18nFindTask.class.php
+++ b/lib/task/i18n/sfI18nFindTask.class.php
@@ -19,9 +19,6 @@ class sfI18nFindTask extends sfBaseTask
 {
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     public function execute($arguments = array(), $options = array())
     {
diff --git a/lib/task/log/sfLogClearTask.class.php b/lib/task/log/sfLogClearTask.class.php
index 5aa7f9c52..63913680f 100644
--- a/lib/task/log/sfLogClearTask.class.php
+++ b/lib/task/log/sfLogClearTask.class.php
@@ -35,9 +35,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/task/log/sfLogRotateTask.class.php b/lib/task/log/sfLogRotateTask.class.php
index 1f2623bb4..db8edd525 100644
--- a/lib/task/log/sfLogRotateTask.class.php
+++ b/lib/task/log/sfLogRotateTask.class.php
@@ -141,9 +141,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/task/plugin/sfPluginAddChannelTask.class.php b/lib/task/plugin/sfPluginAddChannelTask.class.php
index a1fd40672..c5889327d 100644
--- a/lib/task/plugin/sfPluginAddChannelTask.class.php
+++ b/lib/task/plugin/sfPluginAddChannelTask.class.php
@@ -42,9 +42,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/task/plugin/sfPluginBaseTask.class.php b/lib/task/plugin/sfPluginBaseTask.class.php
index b7c657c90..4b8890c2d 100644
--- a/lib/task/plugin/sfPluginBaseTask.class.php
+++ b/lib/task/plugin/sfPluginBaseTask.class.php
@@ -15,6 +15,4 @@
  *
  * @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 0689f7689..0a646f210 100644
--- a/lib/task/plugin/sfPluginInstallTask.class.php
+++ b/lib/task/plugin/sfPluginInstallTask.class.php
@@ -88,9 +88,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/task/plugin/sfPluginListTask.class.php b/lib/task/plugin/sfPluginListTask.class.php
index fbb779ad3..9d5957b44 100644
--- a/lib/task/plugin/sfPluginListTask.class.php
+++ b/lib/task/plugin/sfPluginListTask.class.php
@@ -40,9 +40,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/task/plugin/sfPluginPublishAssetsTask.class.php b/lib/task/plugin/sfPluginPublishAssetsTask.class.php
index 3ca4831e7..f1de99698 100644
--- a/lib/task/plugin/sfPluginPublishAssetsTask.class.php
+++ b/lib/task/plugin/sfPluginPublishAssetsTask.class.php
@@ -57,9 +57,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
@@ -87,9 +84,8 @@ protected function execute($arguments = array(), $options = array())
     /**
      * Installs web content for a plugin.
      *
-     * @param string $plugin   The plugin name
-     * @param string $dir      The plugin directory
-     * @param mixed  $relative
+     * @param string $plugin The plugin name
+     * @param string $dir    The plugin directory
      */
     protected function installPluginAssets($plugin, $dir, $relative)
     {
diff --git a/lib/task/plugin/sfPluginUninstallTask.class.php b/lib/task/plugin/sfPluginUninstallTask.class.php
index 620b7a317..cc5d01a12 100644
--- a/lib/task/plugin/sfPluginUninstallTask.class.php
+++ b/lib/task/plugin/sfPluginUninstallTask.class.php
@@ -66,9 +66,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/task/plugin/sfPluginUpgradeTask.class.php b/lib/task/plugin/sfPluginUpgradeTask.class.php
index 753ea2b67..7159efda6 100644
--- a/lib/task/plugin/sfPluginUpgradeTask.class.php
+++ b/lib/task/plugin/sfPluginUpgradeTask.class.php
@@ -55,9 +55,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/task/project/sfProjectClearControllersTask.class.php b/lib/task/project/sfProjectClearControllersTask.class.php
index bbbd43480..1335876a4 100644
--- a/lib/task/project/sfProjectClearControllersTask.class.php
+++ b/lib/task/project/sfProjectClearControllersTask.class.php
@@ -56,9 +56,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/task/project/sfProjectDeployTask.class.php b/lib/task/project/sfProjectDeployTask.class.php
index a4d91b7fd..aa7db60a3 100644
--- a/lib/task/project/sfProjectDeployTask.class.php
+++ b/lib/task/project/sfProjectDeployTask.class.php
@@ -108,9 +108,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/task/project/sfProjectDisableTask.class.php b/lib/task/project/sfProjectDisableTask.class.php
index b891c0dae..3069cd6d9 100644
--- a/lib/task/project/sfProjectDisableTask.class.php
+++ b/lib/task/project/sfProjectDisableTask.class.php
@@ -45,9 +45,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/task/project/sfProjectEnableTask.class.php b/lib/task/project/sfProjectEnableTask.class.php
index c106124da..2330c6a36 100644
--- a/lib/task/project/sfProjectEnableTask.class.php
+++ b/lib/task/project/sfProjectEnableTask.class.php
@@ -45,9 +45,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/task/project/sfProjectOptimizeTask.class.php b/lib/task/project/sfProjectOptimizeTask.class.php
index 2aae397f2..bb29bdc6b 100644
--- a/lib/task/project/sfProjectOptimizeTask.class.php
+++ b/lib/task/project/sfProjectOptimizeTask.class.php
@@ -43,9 +43,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/task/project/sfProjectPermissionsTask.class.php b/lib/task/project/sfProjectPermissionsTask.class.php
index c0c13d43c..fe5911182 100644
--- a/lib/task/project/sfProjectPermissionsTask.class.php
+++ b/lib/task/project/sfProjectPermissionsTask.class.php
@@ -25,10 +25,6 @@ class sfProjectPermissionsTask extends sfBaseTask
      *
      * @see http://www.php.net/set_error_handler
      *
-     * @param mixed      $no
-     * @param mixed      $string
-     * @param mixed      $file
-     * @param mixed      $line
      * @param mixed|null $context
      */
     public function handleError($no, $string, $file, $line, $context = null)
@@ -54,9 +50,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/task/project/sfProjectValidateTask.class.php b/lib/task/project/sfProjectValidateTask.class.php
index 65881ec1f..2b30cf29b 100644
--- a/lib/task/project/sfProjectValidateTask.class.php
+++ b/lib/task/project/sfProjectValidateTask.class.php
@@ -38,9 +38,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/task/sfBaseTask.class.php b/lib/task/sfBaseTask.class.php
index f83f4dd45..f6d8af988 100644
--- a/lib/task/sfBaseTask.class.php
+++ b/lib/task/sfBaseTask.class.php
@@ -25,8 +25,6 @@ abstract class sfBaseTask extends sfCommandApplicationTask
 
     /**
      * Sets the current task's configuration.
-     *
-     * @param sfProjectConfiguration $configuration
      */
     public function setConfiguration(sfProjectConfiguration $configuration = null)
     {
@@ -100,7 +98,6 @@ public function checkModuleExists($app, $module)
 
     /**
      * @see sfTask
-     * {@inheritdoc}
      */
     protected function doRun(sfCommandManager $commandManager, $options)
     {
@@ -396,8 +393,6 @@ protected function getPluginManager()
 
     /**
      * @see sfCommandApplicationTask
-     *
-     * @param mixed $name
      */
     protected function createTask($name)
     {
diff --git a/lib/task/sfCommandApplicationTask.class.php b/lib/task/sfCommandApplicationTask.class.php
index 33f89d6d3..bf3c23635 100644
--- a/lib/task/sfCommandApplicationTask.class.php
+++ b/lib/task/sfCommandApplicationTask.class.php
@@ -44,7 +44,6 @@ public function setCommandApplication(sfCommandApplication $commandApplication =
 
     /**
      * @see sfTask
-     * {@inheritdoc}
      */
     public function log($messages)
     {
@@ -55,7 +54,8 @@ public function log($messages)
 
     /**
      * @see sfTask
-     * {@inheritdoc}
+     *
+     * @param mixed|null $size
      */
     public function logSection($section, $message, $size = null, $style = 'INFO')
     {
diff --git a/lib/task/sfTask.class.php b/lib/task/sfTask.class.php
index 355ffa6ca..7059f10ea 100644
--- a/lib/task/sfTask.class.php
+++ b/lib/task/sfTask.class.php
@@ -184,10 +184,10 @@ public function addArguments($arguments)
      *
      * @see sfCommandArgument::__construct()
      *
-     * @param string $name
-     * @param int    $mode
-     * @param string $help
-     * @param mixed  $default
+     * @param string     $name
+     * @param int        $mode
+     * @param string     $help
+     * @param mixed|null $default
      */
     public function addArgument($name, $mode = null, $help = '', $default = null)
     {
@@ -221,11 +221,11 @@ public function addOptions($options)
      *
      * @see sfCommandOption::__construct()
      *
-     * @param string $name
-     * @param string $shortcut
-     * @param int    $mode
-     * @param string $help
-     * @param mixed  $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)
     {
@@ -458,8 +458,6 @@ public function askConfirmation($question, $style = 'QUESTION', $default = true)
      *
      * @param array|string $question
      *
-     * @return mixed
-     *
      * @throws sfValidatorError
      */
     public function askAndValidate($question, sfValidatorBase $validator, array $options = array())
@@ -577,9 +575,7 @@ public function asXml()
     /**
      * Configures the current task.
      */
-    protected function configure()
-    {
-    }
+    protected function configure() {}
 
     protected function process(sfCommandManager $commandManager, $options)
     {
@@ -609,15 +605,15 @@ protected function doRun(sfCommandManager $commandManager, $options)
         return $ret;
     }
 
-     /**
-      * Executes the current task.
-      *
-      * @param array    $arguments  An array of arguments
-      * @param array    $options    An array of options
-      *
-      * @return int 0 if everything went fine, or an error code
-      */
-     abstract protected function execute($arguments = array(), $options = array());
+    /**
+     * Executes the current task.
+     *
+     * @param array $arguments An array of arguments
+     * @param array $options   An array of options
+     *
+     * @return int 0 if everything went fine, or an error code
+     */
+    abstract protected function execute($arguments = array(), $options = array());
 
     protected function strlen($string)
     {
diff --git a/lib/task/symfony/sfSymfonyTestTask.class.php b/lib/task/symfony/sfSymfonyTestTask.class.php
index fc6864e97..70065aca7 100644
--- a/lib/task/symfony/sfSymfonyTestTask.class.php
+++ b/lib/task/symfony/sfSymfonyTestTask.class.php
@@ -42,9 +42,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/task/test/sfTestAllTask.class.php b/lib/task/test/sfTestAllTask.class.php
index bc80f13c0..b3287c668 100644
--- a/lib/task/test/sfTestAllTask.class.php
+++ b/lib/task/test/sfTestAllTask.class.php
@@ -72,9 +72,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/task/test/sfTestCoverageTask.class.php b/lib/task/test/sfTestCoverageTask.class.php
index e885d097d..df4fcd9b5 100644
--- a/lib/task/test/sfTestCoverageTask.class.php
+++ b/lib/task/test/sfTestCoverageTask.class.php
@@ -51,9 +51,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/task/test/sfTestFunctionalTask.class.php b/lib/task/test/sfTestFunctionalTask.class.php
index f8493d025..c3a78b382 100644
--- a/lib/task/test/sfTestFunctionalTask.class.php
+++ b/lib/task/test/sfTestFunctionalTask.class.php
@@ -66,9 +66,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/task/test/sfTestPluginTask.class.php b/lib/task/test/sfTestPluginTask.class.php
index ce04c2925..c8422d405 100644
--- a/lib/task/test/sfTestPluginTask.class.php
+++ b/lib/task/test/sfTestPluginTask.class.php
@@ -48,9 +48,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/task/test/sfTestUnitTask.class.php b/lib/task/test/sfTestUnitTask.class.php
index 1c7cd7d2c..42a01e8f2 100644
--- a/lib/task/test/sfTestUnitTask.class.php
+++ b/lib/task/test/sfTestUnitTask.class.php
@@ -63,9 +63,6 @@ protected function configure()
 
     /**
      * @see sfTask
-     *
-     * @param mixed $arguments
-     * @param mixed $options
      */
     protected function execute($arguments = array(), $options = array())
     {
diff --git a/lib/test/sfTestFunctional.class.php b/lib/test/sfTestFunctional.class.php
index 3be0a9f10..a176cf774 100644
--- a/lib/test/sfTestFunctional.class.php
+++ b/lib/test/sfTestFunctional.class.php
@@ -22,7 +22,6 @@ class sfTestFunctional extends sfTestFunctionalBase
      *
      * @param sfBrowserBase $browser A sfBrowserBase instance
      * @param lime_test     $lime    A lime instance
-     * @param mixed         $testers
      */
     public function __construct(sfBrowserBase $browser, lime_test $lime = null, $testers = array())
     {
diff --git a/lib/test/sfTestFunctionalBase.class.php b/lib/test/sfTestFunctionalBase.class.php
index e846e7eba..e9125d678 100644
--- a/lib/test/sfTestFunctionalBase.class.php
+++ b/lib/test/sfTestFunctionalBase.class.php
@@ -31,7 +31,6 @@ abstract class sfTestFunctionalBase
      *
      * @param sfBrowserBase $browser A sfBrowserBase instance
      * @param lime_test     $lime    A lime instance
-     * @param mixed         $testers
      */
     public function __construct(sfBrowserBase $browser, lime_test $lime = null, $testers = array())
     {
@@ -197,8 +196,7 @@ public function getAndCheck($module, $action, $url = null, $code = 200)
             isParameter('module', $module)->
             isParameter('action', $action)->
           end()->
-          with('response')->isStatusCode($code)
-        ;
+          with('response')->isStatusCode($code);
     }
 
     /**
diff --git a/lib/test/sfTesterMailer.class.php b/lib/test/sfTesterMailer.class.php
index acdd755ff..98492c6e6 100644
--- a/lib/test/sfTesterMailer.class.php
+++ b/lib/test/sfTesterMailer.class.php
@@ -23,9 +23,7 @@ class sfTesterMailer extends sfTester
     /**
      * Prepares the tester.
      */
-    public function prepare()
-    {
-    }
+    public function prepare() {}
 
     /**
      * Initializes the tester.
diff --git a/lib/test/sfTesterRequest.class.php b/lib/test/sfTesterRequest.class.php
index bd66957f8..1758b3174 100644
--- a/lib/test/sfTesterRequest.class.php
+++ b/lib/test/sfTesterRequest.class.php
@@ -22,9 +22,7 @@ class sfTesterRequest extends sfTester
     /**
      * Prepares the tester.
      */
-    public function prepare()
-    {
-    }
+    public function prepare() {}
 
     /**
      * Initializes the tester.
diff --git a/lib/test/sfTesterResponse.class.php b/lib/test/sfTesterResponse.class.php
index 4b2080c56..d49e4655c 100644
--- a/lib/test/sfTesterResponse.class.php
+++ b/lib/test/sfTesterResponse.class.php
@@ -24,9 +24,7 @@ class sfTesterResponse extends sfTester
     /**
      * Prepares the tester.
      */
-    public function prepare()
-    {
-    }
+    public function prepare() {}
 
     /**
      * Initializes the tester.
@@ -322,7 +320,6 @@ public function setsCookie($name, $value = null, $attributes = array())
      * Tests the response content against a regex.
      *
      * @param string Regex
-     * @param mixed $regex
      *
      * @return sfTester|sfTestFunctionalBase
      */
diff --git a/lib/test/sfTesterUser.class.php b/lib/test/sfTesterUser.class.php
index b40ad3bc7..9dfd7e117 100644
--- a/lib/test/sfTesterUser.class.php
+++ b/lib/test/sfTesterUser.class.php
@@ -22,9 +22,7 @@ class sfTesterUser extends sfTester
     /**
      * Prepares the tester.
      */
-    public function prepare()
-    {
-    }
+    public function prepare() {}
 
     /**
      * Initializes the tester.
@@ -96,9 +94,8 @@ public function isAuthenticated($boolean = true)
     /**
      * Tests if the user has some credentials.
      *
-     * @param mixed $credentials
-     * @param bool  $boolean     Whether to check if the user have some credentials or not
-     * @param bool  $useAnd      specify the mode, either AND or OR
+     * @param bool $boolean Whether to check if the user have some credentials or not
+     * @param bool $useAnd  specify the mode, either AND or OR
      *
      * @return sfTester|sfTestFunctionalBase
      */
diff --git a/lib/test/sfTesterViewCache.class.php b/lib/test/sfTesterViewCache.class.php
index c4ae4991d..000e697cf 100644
--- a/lib/test/sfTesterViewCache.class.php
+++ b/lib/test/sfTesterViewCache.class.php
@@ -24,9 +24,7 @@ class sfTesterViewCache extends sfTester
     /**
      * Prepares the tester.
      */
-    public function prepare()
-    {
-    }
+    public function prepare() {}
 
     /**
      * Initializes the tester.
diff --git a/lib/user/sfBasicSecurityUser.class.php b/lib/user/sfBasicSecurityUser.class.php
index 32b61f499..4a82bfa0a 100644
--- a/lib/user/sfBasicSecurityUser.class.php
+++ b/lib/user/sfBasicSecurityUser.class.php
@@ -74,8 +74,6 @@ public function removeCredential($credential)
 
     /**
      * Adds a credential.
-     *
-     * @param mixed $credential
      */
     public function addCredential($credential)
     {
@@ -116,8 +114,7 @@ public function addCredentials()
     /**
      * Returns true if user has credential.
      *
-     * @param mixed $credentials
-     * @param bool  $useAnd      specify the mode, either AND or OR
+     * @param bool $useAnd specify the mode, either AND or OR
      *
      * @return bool
      *
diff --git a/lib/util/sfClassManipulator.class.php b/lib/util/sfClassManipulator.class.php
index cd0e09c6a..45b628b72 100644
--- a/lib/util/sfClassManipulator.class.php
+++ b/lib/util/sfClassManipulator.class.php
@@ -95,7 +95,6 @@ public function getFile()
      * Sets the file associated with this instance.
      *
      * @param string A file name
-     * @param mixed $file
      */
     public function setFile($file)
     {
diff --git a/lib/util/sfParameterHolder.class.php b/lib/util/sfParameterHolder.class.php
index 0e643a5a2..3dd5c5b31 100644
--- a/lib/util/sfParameterHolder.class.php
+++ b/lib/util/sfParameterHolder.class.php
@@ -27,9 +27,7 @@ class sfParameterHolder implements Serializable
     /**
      * The constructor for sfParameterHolder.
      */
-    public function __construct()
-    {
-    }
+    public function __construct() {}
 
     /**
      * Serializes the current instance for PHP 7.4+.
diff --git a/lib/util/sfToolkit.class.php b/lib/util/sfToolkit.class.php
index a9d7c0e17..543440ac0 100644
--- a/lib/util/sfToolkit.class.php
+++ b/lib/util/sfToolkit.class.php
@@ -269,8 +269,6 @@ public static function stringToArray($string)
      *
      * @param string $value
      * @param bool   $quoted Quote?
-     *
-     * @return mixed
      */
     public static function literalize($value, $quoted = false)
     {
@@ -355,7 +353,6 @@ public static function isArrayValuesEmpty($array)
      * Licensed under the BSD open source license
      *
      * @param string
-     * @param mixed $string
      *
      * @return bool true if $string is valid UTF-8 and false otherwise
      */
diff --git a/lib/validator/sfValidatorAnd.class.php b/lib/validator/sfValidatorAnd.class.php
index 142f50b8d..24c9e45d4 100644
--- a/lib/validator/sfValidatorAnd.class.php
+++ b/lib/validator/sfValidatorAnd.class.php
@@ -71,8 +71,6 @@ public function getValidators()
 
     /**
      * @see sfValidatorBase
-     *
-     * @param mixed $indent
      */
     public function asString($indent = 0)
     {
@@ -122,8 +120,6 @@ protected function configure($options = array(), $messages = array())
 
     /**
      * @see sfValidatorBase
-     *
-     * @param mixed $value
      */
     protected function doClean($value)
     {
diff --git a/lib/validator/sfValidatorBase.class.php b/lib/validator/sfValidatorBase.class.php
index ec150533d..28bcd1d75 100644
--- a/lib/validator/sfValidatorBase.class.php
+++ b/lib/validator/sfValidatorBase.class.php
@@ -385,9 +385,7 @@ public function asString($indent = 0)
      *
      * @see __construct()
      */
-    protected function configure($options = array(), $messages = array())
-    {
-    }
+    protected function configure($options = array(), $messages = array()) {}
 
     /**
      * Cleans the input value.
diff --git a/lib/validator/sfValidatorBoolean.class.php b/lib/validator/sfValidatorBoolean.class.php
index 98abfc434..6319b7b59 100755
--- a/lib/validator/sfValidatorBoolean.class.php
+++ b/lib/validator/sfValidatorBoolean.class.php
@@ -41,8 +41,6 @@ protected function configure($options = array(), $messages = array())
 
     /**
      * @see sfValidatorBase
-     *
-     * @param mixed $value
      */
     protected function doClean($value)
     {
diff --git a/lib/validator/sfValidatorCSRFToken.class.php b/lib/validator/sfValidatorCSRFToken.class.php
index 4e1c09d18..2fcf5b2d1 100644
--- a/lib/validator/sfValidatorCSRFToken.class.php
+++ b/lib/validator/sfValidatorCSRFToken.class.php
@@ -19,9 +19,6 @@ class sfValidatorCSRFToken extends sfValidatorBase
 {
     /**
      * @see sfValidatorBase
-     *
-     * @param mixed $options
-     * @param mixed $messages
      */
     protected function configure($options = array(), $messages = array())
     {
@@ -34,8 +31,6 @@ protected function configure($options = array(), $messages = array())
 
     /**
      * @see sfValidatorBase
-     *
-     * @param mixed $value
      */
     protected function doClean($value)
     {
diff --git a/lib/validator/sfValidatorCallback.class.php b/lib/validator/sfValidatorCallback.class.php
index 94a2562ce..57a0fa5c8 100644
--- a/lib/validator/sfValidatorCallback.class.php
+++ b/lib/validator/sfValidatorCallback.class.php
@@ -40,8 +40,6 @@ protected function configure($options = array(), $messages = array())
 
     /**
      * @see sfValidatorBase
-     *
-     * @param mixed $value
      */
     protected function doClean($value)
     {
diff --git a/lib/validator/sfValidatorChoice.class.php b/lib/validator/sfValidatorChoice.class.php
index d092816af..6b9c64c97 100644
--- a/lib/validator/sfValidatorChoice.class.php
+++ b/lib/validator/sfValidatorChoice.class.php
@@ -60,8 +60,6 @@ protected function configure($options = array(), $messages = array())
 
     /**
      * @see sfValidatorBase
-     *
-     * @param mixed $value
      */
     protected function doClean($value)
     {
@@ -81,8 +79,7 @@ protected function doClean($value)
     /**
      * Cleans a value when multiple is true.
      *
-     * @param mixed $value   The submitted value
-     * @param mixed $choices
+     * @param mixed $value The submitted value
      *
      * @return array The cleaned value
      */
diff --git a/lib/validator/sfValidatorDate.class.php b/lib/validator/sfValidatorDate.class.php
index a8d5f2902..a4366932a 100644
--- a/lib/validator/sfValidatorDate.class.php
+++ b/lib/validator/sfValidatorDate.class.php
@@ -62,8 +62,6 @@ protected function configure($options = array(), $messages = array())
 
     /**
      * @see sfValidatorBase
-     *
-     * @param mixed $value
      */
     protected function doClean($value)
     {
@@ -166,8 +164,7 @@ protected function convertDateArrayToString($value)
         $empties =
           (!isset($value['year']) || !$value['year'] ? 1 : 0) +
           (!isset($value['month']) || !$value['month'] ? 1 : 0) +
-          (!isset($value['day']) || !$value['day'] ? 1 : 0)
-        ;
+          (!isset($value['day']) || !$value['day'] ? 1 : 0);
         if ($empties > 0 && $empties < 3) {
             throw new sfValidatorError($this, 'invalid', array('value' => $value));
         }
@@ -220,8 +217,6 @@ protected function isValueSet($values, $key)
 
     /**
      * @see sfValidatorBase
-     *
-     * @param mixed $value
      */
     protected function isEmpty($value)
     {
diff --git a/lib/validator/sfValidatorDateRange.class.php b/lib/validator/sfValidatorDateRange.class.php
index b16c6ab49..48cd2f5d1 100644
--- a/lib/validator/sfValidatorDateRange.class.php
+++ b/lib/validator/sfValidatorDateRange.class.php
@@ -44,8 +44,6 @@ protected function configure($options = array(), $messages = array())
 
     /**
      * @see sfValidatorBase
-     *
-     * @param mixed $value
      */
     protected function doClean($value)
     {
diff --git a/lib/validator/sfValidatorDateTime.class.php b/lib/validator/sfValidatorDateTime.class.php
index 493e4412e..ebd7aa783 100644
--- a/lib/validator/sfValidatorDateTime.class.php
+++ b/lib/validator/sfValidatorDateTime.class.php
@@ -19,9 +19,6 @@ class sfValidatorDateTime extends sfValidatorDate
 {
     /**
      * @see sfValidatorDate
-     *
-     * @param mixed $options
-     * @param mixed $messages
      */
     protected function configure($options = array(), $messages = array())
     {
diff --git a/lib/validator/sfValidatorDecorator.class.php b/lib/validator/sfValidatorDecorator.class.php
index 5136db45f..c197eb4a1 100644
--- a/lib/validator/sfValidatorDecorator.class.php
+++ b/lib/validator/sfValidatorDecorator.class.php
@@ -25,9 +25,6 @@ abstract class sfValidatorDecorator extends sfValidatorBase
 
     /**
      * @see sfValidatorBase
-     *
-     * @param mixed $options
-     * @param mixed $messages
      */
     public function __construct($options = array(), $messages = array())
     {
@@ -48,8 +45,6 @@ public function __construct($options = array(), $messages = array())
 
     /**
      * @see sfValidatorBase
-     *
-     * @param mixed $value
      */
     public function clean($value)
     {
@@ -58,8 +53,6 @@ public function clean($value)
 
     /**
      * @see sfValidatorBase
-     *
-     * @param mixed $name
      */
     public function getMessage($name)
     {
@@ -68,9 +61,6 @@ public function getMessage($name)
 
     /**
      * @see sfValidatorBase
-     *
-     * @param mixed $name
-     * @param mixed $value
      */
     public function setMessage($name, $value)
     {
@@ -87,8 +77,6 @@ public function getMessages()
 
     /**
      * @see sfValidatorBase
-     *
-     * @param mixed $values
      */
     public function setMessages($values)
     {
@@ -97,8 +85,6 @@ public function setMessages($values)
 
     /**
      * @see sfValidatorBase
-     *
-     * @param mixed $name
      */
     public function getOption($name)
     {
@@ -107,9 +93,6 @@ public function getOption($name)
 
     /**
      * @see sfValidatorBase
-     *
-     * @param mixed $name
-     * @param mixed $value
      */
     public function setOption($name, $value)
     {
@@ -118,8 +101,6 @@ public function setOption($name, $value)
 
     /**
      * @see sfValidatorBase
-     *
-     * @param mixed $name
      */
     public function hasOption($name)
     {
@@ -136,8 +117,6 @@ public function getOptions()
 
     /**
      * @see sfValidatorBase
-     *
-     * @param mixed $values
      */
     public function setOptions($values)
     {
@@ -146,8 +125,6 @@ public function setOptions($values)
 
     /**
      * @see sfValidatorBase
-     *
-     * @param mixed $indent
      */
     public function asString($indent = 0)
     {
@@ -181,8 +158,6 @@ abstract protected function getValidator();
 
     /**
      * @see sfValidatorBase
-     *
-     * @param mixed $value
      */
     protected function doClean($value)
     {
diff --git a/lib/validator/sfValidatorEmail.class.php b/lib/validator/sfValidatorEmail.class.php
index a383edb20..39b218164 100644
--- a/lib/validator/sfValidatorEmail.class.php
+++ b/lib/validator/sfValidatorEmail.class.php
@@ -21,9 +21,6 @@ class sfValidatorEmail extends sfValidatorRegex
 
     /**
      * @see sfValidatorRegex
-     *
-     * @param mixed $options
-     * @param mixed $messages
      */
     protected function configure($options = array(), $messages = array())
     {
diff --git a/lib/validator/sfValidatorEqual.class.php b/lib/validator/sfValidatorEqual.class.php
index c6ad69272..bc5b16cda 100644
--- a/lib/validator/sfValidatorEqual.class.php
+++ b/lib/validator/sfValidatorEqual.class.php
@@ -46,8 +46,6 @@ protected function configure($options = array(), $messages = array())
 
     /**
      * @see sfValidatorBase
-     *
-     * @param mixed $value
      */
     protected function doClean($value)
     {
diff --git a/lib/validator/sfValidatorError.class.php b/lib/validator/sfValidatorError.class.php
index 71d338f6c..f94ff6bc0 100644
--- a/lib/validator/sfValidatorError.class.php
+++ b/lib/validator/sfValidatorError.class.php
@@ -63,9 +63,6 @@ public function __serialize()
 
     /**
      * Unserializes a sfValidatorError instance for php 7.4+.
-     *
-     * @param string $serialized A serialized sfValidatorError instance
-     * @param mixed  $data
      */
     public function __unserialize($data)
     {
diff --git a/lib/validator/sfValidatorErrorSchema.class.php b/lib/validator/sfValidatorErrorSchema.class.php
index f56d9447f..1a242b3e0 100644
--- a/lib/validator/sfValidatorErrorSchema.class.php
+++ b/lib/validator/sfValidatorErrorSchema.class.php
@@ -86,8 +86,6 @@ public function addError(sfValidatorError $error, $name = null)
     /**
      * Adds a collection of errors.
      *
-     * @param sfValidatorErrorSchema $errorsAn sfValidatorErrorSchema instance
-     *
      * @return sfValidatorErrorSchema The current error schema instance
      */
     public function addErrors(sfValidatorErrorSchema $errors)
@@ -143,8 +141,6 @@ public function getValue()
 
     /**
      * @see sfValidatorError
-     *
-     * @param mixed $raw
      */
     public function getArguments($raw = false)
     {
@@ -271,9 +267,7 @@ public function offsetSet($offset, $value)
      * @param string $offset (ignored)
      */
     #[\ReturnTypeWillChange]
-    public function offsetUnset($offset)
-    {
-    }
+    public function offsetUnset($offset) {}
 
     /**
      * Serializes the current instance.
diff --git a/lib/validator/sfValidatorFile.class.php b/lib/validator/sfValidatorFile.class.php
index e46cb07b2..368bea6f1 100644
--- a/lib/validator/sfValidatorFile.class.php
+++ b/lib/validator/sfValidatorFile.class.php
@@ -93,8 +93,6 @@ protected function configure($options = array(), $messages = array())
      *  * size:     The file size in bytes (optional)
      *
      * @see sfValidatorBase
-     *
-     * @param mixed $value
      */
     protected function doClean($value)
     {
@@ -270,8 +268,6 @@ protected function getMimeTypesFromCategory($category)
 
     /**
      * @see sfValidatorBase
-     *
-     * @param mixed $value
      */
     protected function isEmpty($value)
     {
diff --git a/lib/validator/sfValidatorFileMulti.class.php b/lib/validator/sfValidatorFileMulti.class.php
index a21c1a9ca..df726d1c3 100644
--- a/lib/validator/sfValidatorFileMulti.class.php
+++ b/lib/validator/sfValidatorFileMulti.class.php
@@ -4,8 +4,6 @@ class sfValidatorFileMulti extends sfValidatorFile
 {
     /**
      * @see sfValidatorBase
-     *
-     * @param mixed $value
      */
     protected function doClean($value)
     {
diff --git a/lib/validator/sfValidatorFromDescription.class.php b/lib/validator/sfValidatorFromDescription.class.php
index 49abf6f3b..11bcd93fc 100644
--- a/lib/validator/sfValidatorFromDescription.class.php
+++ b/lib/validator/sfValidatorFromDescription.class.php
@@ -22,10 +22,6 @@ class sfValidatorFromDescription extends sfValidatorDecorator
 
     /**
      * @see sfValidatorBase
-     *
-     * @param mixed $string
-     * @param mixed $options
-     * @param mixed $messages
      */
     public function __construct($string, $options = array(), $messages = array())
     {
diff --git a/lib/validator/sfValidatorInteger.class.php b/lib/validator/sfValidatorInteger.class.php
index 594e9f7af..48169a187 100644
--- a/lib/validator/sfValidatorInteger.class.php
+++ b/lib/validator/sfValidatorInteger.class.php
@@ -48,8 +48,6 @@ protected function configure($options = array(), $messages = array())
 
     /**
      * @see sfValidatorBase
-     *
-     * @param mixed $value
      */
     protected function doClean($value)
     {
diff --git a/lib/validator/sfValidatorNumber.class.php b/lib/validator/sfValidatorNumber.class.php
index 0cd54cc2b..aa3656e15 100644
--- a/lib/validator/sfValidatorNumber.class.php
+++ b/lib/validator/sfValidatorNumber.class.php
@@ -48,8 +48,6 @@ protected function configure($options = array(), $messages = array())
 
     /**
      * @see sfValidatorBase
-     *
-     * @param mixed $value
      */
     protected function doClean($value)
     {
diff --git a/lib/validator/sfValidatorOr.class.php b/lib/validator/sfValidatorOr.class.php
index 354da8997..910b14f05 100644
--- a/lib/validator/sfValidatorOr.class.php
+++ b/lib/validator/sfValidatorOr.class.php
@@ -71,8 +71,6 @@ public function getValidators()
 
     /**
      * @see sfValidatorBase
-     *
-     * @param mixed $indent
      */
     public function asString($indent = 0)
     {
@@ -103,9 +101,6 @@ public function asString($indent = 0)
 
     /**
      * @see sfValidatorBase
-     *
-     * @param mixed $options
-     * @param mixed $messages
      */
     protected function configure($options = array(), $messages = array())
     {
@@ -114,8 +109,6 @@ protected function configure($options = array(), $messages = array())
 
     /**
      * @see sfValidatorBase
-     *
-     * @param mixed $value
      */
     protected function doClean($value)
     {
diff --git a/lib/validator/sfValidatorPass.class.php b/lib/validator/sfValidatorPass.class.php
index def7dd3eb..24cf7592d 100644
--- a/lib/validator/sfValidatorPass.class.php
+++ b/lib/validator/sfValidatorPass.class.php
@@ -19,8 +19,6 @@ class sfValidatorPass extends sfValidatorBase
 {
     /**
      * @see sfValidatorBase
-     *
-     * @param mixed $value
      */
     public function clean($value)
     {
@@ -29,8 +27,6 @@ public function clean($value)
 
     /**
      * @see sfValidatorBase
-     *
-     * @param mixed $value
      */
     protected function doClean($value)
     {
diff --git a/lib/validator/sfValidatorRegex.class.php b/lib/validator/sfValidatorRegex.class.php
index c72127827..4e2ba6cd5 100644
--- a/lib/validator/sfValidatorRegex.class.php
+++ b/lib/validator/sfValidatorRegex.class.php
@@ -52,8 +52,6 @@ protected function configure($options = array(), $messages = array())
 
     /**
      * @see sfValidatorString
-     *
-     * @param mixed $value
      */
     protected function doClean($value)
     {
diff --git a/lib/validator/sfValidatorSchema.class.php b/lib/validator/sfValidatorSchema.class.php
index 21a77afde..9064138c9 100644
--- a/lib/validator/sfValidatorSchema.class.php
+++ b/lib/validator/sfValidatorSchema.class.php
@@ -67,8 +67,6 @@ public function __clone()
 
     /**
      * @see sfValidatorBase
-     *
-     * @param mixed $values
      */
     public function clean($values)
     {
@@ -232,8 +230,6 @@ public function getFields()
 
     /**
      * @see sfValidatorBase
-     *
-     * @param mixed $indent
      */
     public function asString($indent = 0)
     {
@@ -268,8 +264,6 @@ protected function configure($options = array(), $messages = array())
 
     /**
      * @see sfValidatorBase
-     *
-     * @param mixed $values
      */
     protected function doClean($values)
     {
diff --git a/lib/validator/sfValidatorSchemaCompare.class.php b/lib/validator/sfValidatorSchemaCompare.class.php
index 93bddc007..3572aa1cb 100644
--- a/lib/validator/sfValidatorSchemaCompare.class.php
+++ b/lib/validator/sfValidatorSchemaCompare.class.php
@@ -65,8 +65,6 @@ public function __construct($leftField, $operator, $rightField, $options = array
 
     /**
      * @see sfValidatorBase
-     *
-     * @param mixed $indent
      */
     public function asString($indent = 0)
     {
@@ -95,8 +93,6 @@ public function asString($indent = 0)
 
     /**
      * @see sfValidatorBase
-     *
-     * @param mixed $values
      */
     protected function doClean($values)
     {
diff --git a/lib/validator/sfValidatorSchemaFilter.class.php b/lib/validator/sfValidatorSchemaFilter.class.php
index 5ca9920ec..6c15bd0d5 100644
--- a/lib/validator/sfValidatorSchemaFilter.class.php
+++ b/lib/validator/sfValidatorSchemaFilter.class.php
@@ -37,8 +37,6 @@ public function __construct($field, sfValidatorBase $validator, $options = array
 
     /**
      * @see sfValidatorBase
-     *
-     * @param mixed $indent
      */
     public function asString($indent = 0)
     {
@@ -47,8 +45,6 @@ public function asString($indent = 0)
 
     /**
      * @see sfValidatorBase
-     *
-     * @param mixed $values
      */
     protected function doClean($values)
     {
diff --git a/lib/validator/sfValidatorString.class.php b/lib/validator/sfValidatorString.class.php
index 23786f779..35574e7d9 100644
--- a/lib/validator/sfValidatorString.class.php
+++ b/lib/validator/sfValidatorString.class.php
@@ -48,8 +48,6 @@ protected function configure($options = array(), $messages = array())
 
     /**
      * @see sfValidatorBase
-     *
-     * @param mixed $value
      */
     protected function doClean($value)
     {
diff --git a/lib/validator/sfValidatorTime.class.php b/lib/validator/sfValidatorTime.class.php
index a8ec40d07..bda409397 100644
--- a/lib/validator/sfValidatorTime.class.php
+++ b/lib/validator/sfValidatorTime.class.php
@@ -47,8 +47,6 @@ protected function configure($options = array(), $messages = array())
 
     /**
      * @see sfValidatorBase
-     *
-     * @param mixed $value
      */
     protected function doClean($value)
     {
@@ -119,8 +117,6 @@ protected function isValueSet($values, $key)
 
     /**
      * @see sfValidatorBase
-     *
-     * @param mixed $value
      */
     protected function isEmpty($value)
     {
diff --git a/lib/view/sfPHPView.class.php b/lib/view/sfPHPView.class.php
index 6ccd701cd..43d19ce6c 100644
--- a/lib/view/sfPHPView.class.php
+++ b/lib/view/sfPHPView.class.php
@@ -22,9 +22,7 @@ class sfPHPView extends sfView
     /**
      * Executes any presentation logic for this view.
      */
-    public function execute()
-    {
-    }
+    public function execute() {}
 
     /**
      * Retrieves the template engine associated with this view.
diff --git a/lib/view/sfPartialView.class.php b/lib/view/sfPartialView.class.php
index 7c7711552..0e9d89061 100644
--- a/lib/view/sfPartialView.class.php
+++ b/lib/view/sfPartialView.class.php
@@ -26,11 +26,6 @@ class sfPartialView extends sfPHPView
      * Constructor.
      *
      * @see sfView
-     *
-     * @param mixed $context
-     * @param mixed $moduleName
-     * @param mixed $actionName
-     * @param mixed $viewName
      */
     public function initialize($context, $moduleName, $actionName, $viewName)
     {
@@ -48,9 +43,7 @@ public function initialize($context, $moduleName, $actionName, $viewName)
     /**
      * Executes any presentation logic for this view.
      */
-    public function execute()
-    {
-    }
+    public function execute() {}
 
     public function setPartialVars(array $partialVars)
     {
diff --git a/lib/view/sfView.class.php b/lib/view/sfView.class.php
index 35bc3a3bc..3efbf0f8a 100644
--- a/lib/view/sfView.class.php
+++ b/lib/view/sfView.class.php
@@ -85,11 +85,6 @@ abstract class sfView
      * Class constructor.
      *
      * @see initialize()
-     *
-     * @param mixed $context
-     * @param mixed $moduleName
-     * @param mixed $actionName
-     * @param mixed $viewName
      */
     public function __construct($context, $moduleName, $actionName, $viewName)
     {
diff --git a/lib/view/sfViewCacheManager.class.php b/lib/view/sfViewCacheManager.class.php
index dde3b65ab..dd5201b00 100644
--- a/lib/view/sfViewCacheManager.class.php
+++ b/lib/view/sfViewCacheManager.class.php
@@ -36,9 +36,6 @@ class sfViewCacheManager
      * Class constructor.
      *
      * @see initialize()
-     *
-     * @param mixed $context
-     * @param mixed $options
      */
     public function __construct($context, sfCache $cache, $options = array())
     {
@@ -50,7 +47,6 @@ public function __construct($context, sfCache $cache, $options = array())
      *
      * @param sfContext $context Current application context
      * @param sfCache   $cache   An sfCache instance
-     * @param mixed     $options
      */
     public function initialize($context, sfCache $cache, $options = array())
     {
@@ -850,7 +846,6 @@ public function decorateContentWithDebug(sfEvent $event, $content)
      * Gets the vary header part of view cache key.
      *
      * @param string $vary
-     * @param mixed  $internalUri
      *
      * @return string
      */
diff --git a/lib/view/sfViewParameterHolder.class.php b/lib/view/sfViewParameterHolder.class.php
index ca5b42e78..817b1d127 100644
--- a/lib/view/sfViewParameterHolder.class.php
+++ b/lib/view/sfViewParameterHolder.class.php
@@ -25,9 +25,6 @@ class sfViewParameterHolder extends sfParameterHolder
 
     /**
      * Constructor.
-     *
-     * @param mixed $parameters
-     * @param mixed $options
      */
     public function __construct(sfEventDispatcher $dispatcher, $parameters = array(), $options = array())
     {
diff --git a/lib/widget/i18n/sfWidgetFormI18nDateTime.class.php b/lib/widget/i18n/sfWidgetFormI18nDateTime.class.php
index bcd1e52d8..c2b3e2d88 100644
--- a/lib/widget/i18n/sfWidgetFormI18nDateTime.class.php
+++ b/lib/widget/i18n/sfWidgetFormI18nDateTime.class.php
@@ -43,8 +43,6 @@ protected function configure($options = array(), $attributes = array())
 
     /**
      * @see sfWidgetFormDateTime
-     *
-     * @param mixed $attributes
      */
     protected function getDateWidget($attributes = array())
     {
@@ -53,8 +51,6 @@ protected function getDateWidget($attributes = array())
 
     /**
      * @see sfWidgetFormDateTime
-     *
-     * @param mixed $attributes
      */
     protected function getTimeWidget($attributes = array())
     {
diff --git a/lib/widget/sfWidget.class.php b/lib/widget/sfWidget.class.php
index 8bd37963e..6ddf589a6 100644
--- a/lib/widget/sfWidget.class.php
+++ b/lib/widget/sfWidget.class.php
@@ -381,9 +381,7 @@ public function attributesToHtml($attributes)
      *
      * @see __construct()
      */
-    protected function configure($options = array(), $attributes = array())
-    {
-    }
+    protected function configure($options = array(), $attributes = array()) {}
 
     /**
      * Prepares an attribute key and value for HTML representation.
diff --git a/lib/widget/sfWidgetFormSchemaDecorator.class.php b/lib/widget/sfWidgetFormSchemaDecorator.class.php
index 5db5c0b3a..3a01e96a7 100644
--- a/lib/widget/sfWidgetFormSchemaDecorator.class.php
+++ b/lib/widget/sfWidgetFormSchemaDecorator.class.php
@@ -70,7 +70,6 @@ public function render($name, $values = array(), $attributes = array(), $errors
 
     /**
      * @see sfWidgetFormSchema
-     * {@inheritdoc}
      */
     public function addFormFormatter($name, sfWidgetFormSchemaFormatter $formatter)
     {
@@ -89,7 +88,6 @@ public function getFormFormatters()
 
     /**
      * @see sfWidgetFormSchema
-     * {@inheritdoc}
      */
     public function setFormFormatterName($name)
     {
@@ -100,7 +98,6 @@ public function setFormFormatterName($name)
 
     /**
      * @see sfWidgetFormSchema
-     * {@inheritdoc}
      */
     public function getFormFormatterName()
     {
@@ -109,7 +106,6 @@ public function getFormFormatterName()
 
     /**
      * @see sfWidgetFormSchema
-     * {@inheritdoc}
      */
     public function getFormFormatter()
     {
@@ -118,7 +114,6 @@ public function getFormFormatter()
 
     /**
      * @see sfWidgetFormSchema
-     * {@inheritdoc}
      */
     public function setNameFormat($format)
     {
@@ -129,7 +124,6 @@ public function setNameFormat($format)
 
     /**
      * @see sfWidgetFormSchema
-     * {@inheritdoc}
      */
     public function getNameFormat()
     {
@@ -138,7 +132,6 @@ public function getNameFormat()
 
     /**
      * @see sfWidgetFormSchema
-     * {@inheritdoc}
      */
     public function setLabels(array $labels)
     {
@@ -149,7 +142,6 @@ public function setLabels(array $labels)
 
     /**
      * @see sfWidgetFormSchema
-     * {@inheritdoc}
      */
     public function getLabels()
     {
@@ -158,7 +150,8 @@ public function getLabels()
 
     /**
      * @see sfWidgetFormSchema
-     * {@inheritdoc}
+     *
+     * @param mixed|null $value
      */
     public function setLabel($name, $value = null)
     {
@@ -173,7 +166,8 @@ public function setLabel($name, $value = null)
 
     /**
      * @see sfWidgetFormSchema
-     * {@inheritdoc}
+     *
+     * @param mixed|null $name
      */
     public function getLabel($name = null)
     {
@@ -182,7 +176,6 @@ public function getLabel($name = null)
 
     /**
      * @see sfWidgetFormSchema
-     * {@inheritdoc}
      */
     public function setHelps(array $helps)
     {
@@ -193,7 +186,6 @@ public function setHelps(array $helps)
 
     /**
      * @see sfWidgetFormSchema
-     * {@inheritdoc}
      */
     public function getHelps()
     {
@@ -202,7 +194,6 @@ public function getHelps()
 
     /**
      * @see sfWidgetFormSchema
-     * {@inheritdoc}
      */
     public function setHelp($name, $help)
     {
@@ -213,7 +204,6 @@ public function setHelp($name, $help)
 
     /**
      * @see sfWidgetFormSchema
-     * {@inheritdoc}
      */
     public function getHelp($name)
     {
@@ -250,7 +240,8 @@ public function needsMultipartForm()
 
     /**
      * @see sfWidgetFormSchema
-     * {@inheritdoc}
+     *
+     * @param mixed|null $value
      */
     public function renderField($name, $value = null, $attributes = array(), $errors = array())
     {
@@ -259,7 +250,6 @@ public function renderField($name, $value = null, $attributes = array(), $errors
 
     /**
      * @see sfWidgetFormSchemaFormatter
-     * {@inheritdoc}
      */
     public function generateLabel($name)
     {
@@ -268,7 +258,6 @@ public function generateLabel($name)
 
     /**
      * @see sfWidgetFormSchemaFormatter
-     * {@inheritdoc}
      */
     public function generateLabelName($name)
     {
@@ -277,7 +266,6 @@ public function generateLabelName($name)
 
     /**
      * @see sfWidgetFormSchema
-     * {@inheritdoc}
      */
     public function generateName($name)
     {
@@ -286,7 +274,6 @@ public function generateName($name)
 
     /**
      * @see sfWidgetFormSchema
-     * {@inheritdoc}
      */
     public function getParent()
     {
@@ -295,7 +282,6 @@ public function getParent()
 
     /**
      * @see sfWidgetFormSchema
-     * {@inheritdoc}
      */
     public function setParent(sfWidgetFormSchema $parent = null)
     {
@@ -306,7 +292,6 @@ public function setParent(sfWidgetFormSchema $parent = null)
 
     /**
      * @see sfWidgetFormSchema
-     * {@inheritdoc}
      */
     public function getFields()
     {
@@ -315,7 +300,6 @@ public function getFields()
 
     /**
      * @see sfWidgetFormSchema
-     * {@inheritdoc}
      */
     public function getPositions()
     {
@@ -324,7 +308,6 @@ public function getPositions()
 
     /**
      * @see sfWidgetFormSchema
-     * {@inheritdoc}
      */
     public function setPositions(array $positions)
     {
@@ -335,7 +318,8 @@ public function setPositions(array $positions)
 
     /**
      * @see sfWidgetFormSchema
-     * {@inheritdoc}
+     *
+     * @param mixed|null $pivot
      */
     public function moveField($field, $action, $pivot = null)
     {
@@ -344,7 +328,6 @@ public function moveField($field, $action, $pivot = null)
 
     /**
      * @see sfWidgetFormSchema
-     * {@inheritdoc}
      */
     #[\ReturnTypeWillChange]
     public function offsetExists($name)
@@ -354,7 +337,6 @@ public function offsetExists($name)
 
     /**
      * @see sfWidgetFormSchema
-     * {@inheritdoc}
      */
     #[\ReturnTypeWillChange]
     public function offsetGet($name)
@@ -364,7 +346,6 @@ public function offsetGet($name)
 
     /**
      * @see sfWidgetFormSchema
-     * {@inheritdoc}
      */
     #[\ReturnTypeWillChange]
     public function offsetSet($name, $widget)
@@ -374,7 +355,6 @@ public function offsetSet($name, $widget)
 
     /**
      * @see sfWidgetFormSchema
-     * {@inheritdoc}
      */
     #[\ReturnTypeWillChange]
     public function offsetUnset($name)
diff --git a/lib/widget/sfWidgetFormSchemaFormatter.class.php b/lib/widget/sfWidgetFormSchemaFormatter.class.php
index 0b9f3c9df..863e0e3be 100644
--- a/lib/widget/sfWidgetFormSchemaFormatter.class.php
+++ b/lib/widget/sfWidgetFormSchemaFormatter.class.php
@@ -84,8 +84,6 @@ public function translate($subject, $parameters = array())
 
     /**
      * Returns the current i18n callable.
-     *
-     * @return mixed
      */
     public static function getTranslationCallable()
     {
@@ -95,8 +93,6 @@ public static function getTranslationCallable()
     /**
      * Sets a callable which aims to translate form labels, errors and help messages.
      *
-     * @param mixed $callable
-     *
      * @throws InvalidArgumentException if an invalid php callable or sfCallable has been provided
      */
     public static function setTranslationCallable($callable)
diff --git a/lib/yaml/sfYaml.class.php b/lib/yaml/sfYaml.class.php
index cd9027fe1..e5246c1fe 100644
--- a/lib/yaml/sfYaml.class.php
+++ b/lib/yaml/sfYaml.class.php
@@ -55,8 +55,7 @@ public static function getSpecVersion()
      *   print_r($array);
      *  </code>
      *
-     * @param string $input    Path of YAML file or string containing YAML
-     * @param mixed  $encoding
+     * @param string $input Path of YAML file or string containing YAML
      *
      * @return array The YAML converted to a PHP array
      *
diff --git a/lib/yaml/sfYamlInline.class.php b/lib/yaml/sfYamlInline.class.php
index 577d0b8ee..d1028416f 100644
--- a/lib/yaml/sfYamlInline.class.php
+++ b/lib/yaml/sfYamlInline.class.php
@@ -134,10 +134,8 @@ public static function dump($value)
      *
      * @param scalar $scalar
      * @param string $delimiters
-     * @param array  $stringDelimiter
      * @param int    $i
      * @param bool   $evaluate
-     * @param mixed  $stringDelimiters
      *
      * @return string A YAML string
      */
diff --git a/test/functional/authTest.php b/test/functional/authTest.php
index 44d142ffe..2c771d0f8 100644
--- a/test/functional/authTest.php
+++ b/test/functional/authTest.php
@@ -28,8 +28,7 @@ public function checkNonAuth()
             checkElement('#user', '')->
             checkElement('#password', '')->
             checkElement('#msg', 'KO')->
-          end()
-        ;
+          end();
     }
 
     public function checkAuth()
@@ -45,8 +44,7 @@ public function checkAuth()
             checkElement('#user', 'foo')->
             checkElement('#password', 'bar')->
             checkElement('#msg', 'OK')->
-          end()
-        ;
+          end();
     }
 }
 
@@ -62,5 +60,4 @@ public function checkAuth()
 
   restart()->
 
-  checkNonAuth()
-;
+  checkNonAuth();
diff --git a/test/functional/autoloadTest.php b/test/functional/autoloadTest.php
index 0c226b67d..1391b678e 100755
--- a/test/functional/autoloadTest.php
+++ b/test/functional/autoloadTest.php
@@ -24,8 +24,7 @@
   with('response')->begin()->
     isStatusCode(200)->
     checkElement('body div', 'foo')->
-  end()
-;
+  end();
 
 $t = $b->test();
 
diff --git a/test/functional/cacheTest.php b/test/functional/cacheTest.php
index 09ba506d6..878eef54c 100644
--- a/test/functional/cacheTest.php
+++ b/test/functional/cacheTest.php
@@ -91,8 +91,7 @@ public function getMultiAction($parameter = null)
             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(array('varParam' => 'another'))), false)->
-          end()
-        ;
+          end();
     }
 
     public function launch()
@@ -112,8 +111,7 @@ public function launch()
             checkElement('body', '/congratulations/i')->
           end()->
 
-          with('view_cache')->isCached(true)
-        ;
+          with('view_cache')->isCached(true);
 
         $b->
           get('/nocache')->
@@ -125,8 +123,7 @@ public function launch()
             isStatusCode(200)->
             checkElement('body', '/nocache/i')->
           end()->
-          with('view_cache')->isCached(false)
-        ;
+          with('view_cache')->isCached(false);
 
         $b->
           get('/cache/page')->
@@ -138,8 +135,7 @@ public function launch()
             isStatusCode(200)->
             checkElement('body', '/page in cache/')->
           end()->
-          with('view_cache')->isCached(true, true)
-        ;
+          with('view_cache')->isCached(true, true);
 
         $b->
           get('/cache/forward')->
@@ -151,8 +147,7 @@ public function launch()
             isStatusCode(200)->
             checkElement('body', '/page in cache/')->
           end()->
-          with('view_cache')->isCached(true)
-        ;
+          with('view_cache')->isCached(true);
 
         // remove all cache
         sfToolkit::clearDirectory(sfConfig::get('sf_app_cache_dir'));
@@ -168,8 +163,7 @@ public function launch()
             checkElement('#cacheableComponentVarParam .cacheableComponent_varParam_componentParam_')->
             checkElement('#cacheablePartial .cacheablePartial__')->
             checkElement('#cacheablePartialVarParam .cacheablePartial_varParam_')->
-          end()
-        ;
+          end();
 
         // remove all cache
         sfToolkit::clearDirectory(sfConfig::get('sf_app_cache_dir'));
@@ -200,8 +194,7 @@ public function launch()
             checkElement('#cacheableComponentVarParam .cacheableComponent_varParam_componentParam_requestParam')->
             checkElement('#cacheablePartial .cacheablePartial__requestParam')->
             checkElement('#cacheablePartialVarParam .cacheablePartial_varParam_requestParam')->
-          end()
-        ;
+          end();
 
         // check contextual cache with another action
         $b->
@@ -240,8 +233,7 @@ public function launch()
 
             // contextual component cache
             isUriCached('@sf_cache_partial?module=cache&action=_contextualCacheableComponent&sf_cache_key='.md5(serialize(array())), true)->
-          end()
-        ;
+          end();
 
         // remove all cache
         sfToolkit::clearDirectory(sfConfig::get('sf_app_cache_dir'));
@@ -269,8 +261,7 @@ public function launch()
 
             // contextual component cache
             isUriCached('@sf_cache_partial?module=cache&action=_contextualCacheableComponent&sf_cache_key=contextualCacheableComponent', true)->
-          end()
-        ;
+          end();
 
         // check cache content for actions
 
@@ -284,8 +275,7 @@ public function launch()
             isParameter('action', 'action')->
           end()->
           with('response')->isStatusCode(200)->
-          with('view_cache')->isCached(true)
-        ;
+          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);
@@ -302,8 +292,7 @@ public function launch()
             isParameter('action', 'action')->
           end()->
           with('response')->isStatusCode(200)->
-          with('view_cache')->isCached(true)
-        ;
+          with('view_cache')->isCached(true);
 
         $b->test()->is(sfConfig::get('ACTION_EXECUTED', false), false, 'action is not executed when in cache');
 
@@ -347,8 +336,7 @@ public function launch()
   checkResponseContent($image, 'image (no layout/action cache) in cache is not decorated when web_debug is on')->
   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')
-;
+  checkResponseContent($image, 'image (no layout/action cache) in cache is not decorated when web_debug is on');
 sfConfig::set('sf_web_debug', false);
 
 // check stylesheets, javascripts inclusions
@@ -394,8 +382,7 @@ public function launch()
     checkElement('#partial_slot_content', 'Partial')->
     checkElement('#another_partial_slot_content', 'Another Partial')->
     checkElement('#component_slot_content', 'Component')->
-  end()
-;
+  end();
 
 $b->
   get('/cache/partial')->
@@ -468,8 +455,7 @@ public function launch()
     checkElement('#partial_slot_content', '')->
     checkElement('#another_partial_slot_content', '')->
     checkElement('#component_slot_content', 'Component')->
-  end()
-;
+  end();
 
 $b->get('/')
     ->with('view_cache')->isUriCached('cache/list', false)
diff --git a/test/functional/filterTest.php b/test/functional/filterTest.php
index 39930c10d..e1bd3c462 100644
--- a/test/functional/filterTest.php
+++ b/test/functional/filterTest.php
@@ -26,8 +26,7 @@
     isStatusCode(200)->
     checkElement('div[class="before"]', 1)->
     checkElement('div[class="after"]', 1)->
-  end()
-;
+  end();
 
 // filter with a forward in the same module
 $b->
@@ -40,5 +39,4 @@
     isStatusCode(200)->
     checkElement('div[class="before"]', 2)->
     checkElement('div[class="after"]', 1)->
-  end()
-;
+  end();
diff --git a/test/functional/fixtures/apps/cache/config/cacheConfiguration.class.php b/test/functional/fixtures/apps/cache/config/cacheConfiguration.class.php
index 52660cd15..ccea20685 100644
--- a/test/functional/fixtures/apps/cache/config/cacheConfiguration.class.php
+++ b/test/functional/fixtures/apps/cache/config/cacheConfiguration.class.php
@@ -2,7 +2,5 @@
 
 class cacheConfiguration extends sfApplicationConfiguration
 {
-    public function configure()
-    {
-    }
+    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..ad920b971 100644
--- a/test/functional/fixtures/apps/cache/lib/myUser.class.php
+++ b/test/functional/fixtures/apps/cache/lib/myUser.class.php
@@ -1,5 +1,3 @@
 <?php
 
-class myUser extends sfBasicSecurityUser
-{
-}
+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..a9e322fd8 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
@@ -9,13 +9,9 @@
  */
 class cacheActions extends sfActions
 {
-    public function executeIndex()
-    {
-    }
+    public function executeIndex() {}
 
-    public function executePage()
-    {
-    }
+    public function executePage() {}
 
     public function executeList($request)
     {
@@ -32,25 +28,15 @@ public function executeMulti()
         $this->getResponse()->setTitle('Param: '.$this->getRequestParameter('param'));
     }
 
-    public function executeMultiBis()
-    {
-    }
+    public function executeMultiBis() {}
 
-    public function executePartial()
-    {
-    }
+    public function executePartial() {}
 
-    public function executeAnotherPartial()
-    {
-    }
+    public function executeAnotherPartial() {}
 
-    public function executeComponent()
-    {
-    }
+    public function executeComponent() {}
 
-    public function executeSpecificCacheKey()
-    {
-    }
+    public function executeSpecificCacheKey() {}
 
     public function executeAction()
     {
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..1ac7fd13d 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
@@ -12,7 +12,5 @@ class nocacheActions extends sfActions
     /**
      * Executes index action.
      */
-    public function executeIndex()
-    {
-    }
+    public function executeIndex() {}
 }
diff --git a/test/functional/fixtures/apps/frontend/lib/myUser.class.php b/test/functional/fixtures/apps/frontend/lib/myUser.class.php
index 4c793028e..ad920b971 100644
--- a/test/functional/fixtures/apps/frontend/lib/myUser.class.php
+++ b/test/functional/fixtures/apps/frontend/lib/myUser.class.php
@@ -1,5 +1,3 @@
 <?php
 
-class myUser extends sfBasicSecurityUser
-{
-}
+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..31944dc89 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
@@ -9,7 +9,5 @@
  */
 class assetInclusionActions extends sfActions
 {
-    public function executeIndex()
-    {
-    }
+    public function executeIndex() {}
 }
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..5f52abfee 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
@@ -44,9 +44,7 @@ public function executeRedirect1()
         $this->redirect('browser/redirectTarget1');
     }
 
-    public function executeRedirectTarget1()
-    {
-    }
+    public function executeRedirectTarget1() {}
 
     public function executeRedirect2()
     {
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..7907f3ddb 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
@@ -9,7 +9,5 @@
  */
 class configFiltersSimpleFilterActions extends sfActions
 {
-    public function executeIndex()
-    {
-    }
+    public function executeIndex() {}
 }
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..13d44d326 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
@@ -9,7 +9,5 @@
  */
 class configModuleDisabledActions extends sfActions
 {
-    public function executeIndex()
-    {
-    }
+    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..005c93896 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
@@ -9,7 +9,5 @@
  */
 class configSecurityIsSecureActions extends sfActions
 {
-    public function executeIndex()
-    {
-    }
+    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..98c610bb5 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
@@ -9,7 +9,5 @@
  */
 class configSecurityIsSecureActionActions extends sfActions
 {
-    public function executeIndex()
-    {
-    }
+    public function executeIndex() {}
 }
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..363542071 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
@@ -9,7 +9,5 @@
  */
 class configViewHasLayoutActions extends sfActions
 {
-    public function executeWithoutLayout()
-    {
-    }
+    public function executeWithoutLayout() {}
 }
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..9d2a25462 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
@@ -14,11 +14,7 @@ public function executeIndex()
         $this->setTemplate('foo');
     }
 
-    public function executePlain()
-    {
-    }
+    public function executePlain() {}
 
-    public function executeImage()
-    {
-    }
+    public function executeImage() {}
 }
diff --git a/test/functional/fixtures/apps/i18n/lib/myUser.class.php b/test/functional/fixtures/apps/i18n/lib/myUser.class.php
index 4c793028e..ad920b971 100644
--- a/test/functional/fixtures/apps/i18n/lib/myUser.class.php
+++ b/test/functional/fixtures/apps/i18n/lib/myUser.class.php
@@ -1,5 +1,3 @@
 <?php
 
-class myUser extends sfBasicSecurityUser
-{
-}
+class myUser extends sfBasicSecurityUser {}
diff --git a/test/functional/fixtures/lib/ExtendMe.class.php b/test/functional/fixtures/lib/ExtendMe.class.php
index 5802db328..0def4ebc7 100644
--- a/test/functional/fixtures/lib/ExtendMe.class.php
+++ b/test/functional/fixtures/lib/ExtendMe.class.php
@@ -1,5 +1,3 @@
 <?php
 
-class ExtendMe extends BaseExtendMe
-{
-}
+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..27bb788e8 100644
--- a/test/functional/fixtures/lib/form/BaseForm.class.php
+++ b/test/functional/fixtures/lib/form/BaseForm.class.php
@@ -7,6 +7,4 @@
  *
  * @version    SVN: $Id$
  */
-class BaseForm extends sfFormSymfony
-{
-}
+class BaseForm extends sfFormSymfony {}
diff --git a/test/functional/fixtures/plugins/sfAutoloadPlugin/config/NotInLib.class.php b/test/functional/fixtures/plugins/sfAutoloadPlugin/config/NotInLib.class.php
index faf367bd2..646360371 100644
--- a/test/functional/fixtures/plugins/sfAutoloadPlugin/config/NotInLib.class.php
+++ b/test/functional/fixtures/plugins/sfAutoloadPlugin/config/NotInLib.class.php
@@ -1,5 +1,3 @@
 <?php
 
-class NotInLib
-{
-}
+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..430e539d5 100644
--- a/test/functional/fixtures/plugins/sfAutoloadPlugin/config/sfAutoloadPluginConfiguration.class.php
+++ b/test/functional/fixtures/plugins/sfAutoloadPlugin/config/sfAutoloadPluginConfiguration.class.php
@@ -1,5 +1,3 @@
 <?php
 
-class sfAutoloadPluginConfiguration extends sfPluginConfiguration
-{
-}
+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..7fc55ee65 100644
--- a/test/functional/fixtures/plugins/sfAutoloadPlugin/lib/BaseExtendMe.class.php
+++ b/test/functional/fixtures/plugins/sfAutoloadPlugin/lib/BaseExtendMe.class.php
@@ -1,5 +1,3 @@
 <?php
 
-class BaseExtendMe
-{
-}
+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..0def4ebc7 100644
--- a/test/functional/fixtures/plugins/sfAutoloadPlugin/lib/ExtendMe.class.php
+++ b/test/functional/fixtures/plugins/sfAutoloadPlugin/lib/ExtendMe.class.php
@@ -1,5 +1,3 @@
 <?php
 
-class ExtendMe extends BaseExtendMe
-{
-}
+class ExtendMe extends BaseExtendMe {}
diff --git a/test/functional/formatTest.php b/test/functional/formatTest.php
index 4857782ef..47f058f96 100644
--- a/test/functional/formatTest.php
+++ b/test/functional/formatTest.php
@@ -28,8 +28,7 @@
     matches('!/<body>/')->
     matches('/Some js headers/')->
     matches('/This is a js file/')->
-  end()
-;
+  end();
 
 $b->
   get('/format_test.css')->
@@ -42,8 +41,7 @@
     isStatusCode(200)->
     isHeader('content-type', 'text/css; charset=utf-8')->
     matches('/This is a css file/')->
-  end()
-;
+  end();
 
 $b->
   get('/format_test')->
@@ -56,8 +54,7 @@
     isStatusCode(200)->
     isHeader('content-type', 'text/html; charset=utf-8')->
     checkElement('body #content', 'This is an HTML file')->
-  end()
-;
+  end();
 
 $b->
   get('/format_test.xml')->
@@ -70,8 +67,7 @@
     isStatusCode(200)->
     isHeader('content-type', 'text/xml; charset=utf-8')->
     checkElement('sentences sentence:first', 'This is a XML file')->
-  end()
-;
+  end();
 
 $b->
   get('/format_test.foo')->
@@ -85,8 +81,7 @@
     isHeader('content-type', 'text/html; charset=utf-8')->
     isHeader('x-foo', 'true')->
     checkElement('body #content', 'This is an HTML file')->
-  end()
-;
+  end();
 
 $b->
   get('/format/js')->
@@ -99,8 +94,7 @@
     isStatusCode(200)->
     isHeader('content-type', 'application/javascript')->
     matches('/A js file/')->
-  end()
-;
+  end();
 
 $b->
   setHttpHeader('User-Agent', 'Mozilla/5.0 (iPhone; U; CPU like Mac OS X; en) AppleWebKit/420+ (KHTML, like Gecko) Version/3.0 Mobile/1A543a Safari/419.3')->
@@ -115,10 +109,8 @@
     isHeader('content-type', 'text/html; charset=utf-8')->
     checkElement('#content', 'This is an HTML file for the iPhone')->
     checkElement('link[href*="iphone.css"]')->
-  end()
-;
+  end();
 
 $b->
   getAndCheck('format', 'throwsException', null, 500)->
-  throwsException('Exception', '/message/')
-;
+  throwsException('Exception', '/message/');
diff --git a/test/functional/genericTest.php b/test/functional/genericTest.php
index 1fcbcc250..964820cc1 100644
--- a/test/functional/genericTest.php
+++ b/test/functional/genericTest.php
@@ -24,14 +24,12 @@
     checkElement('link[href="/css/main.css"]')->
     checkElement('link[href="/css/multiple_media.css"][media="print,handheld"]')->
     matches('#'.preg_quote('<!--[if lte IE 6]><link rel="stylesheet" type="text/css" media="screen" href="/css/ie6.css" /><![endif]-->').'#')->
-  end()
-;
+  end();
 
 // default 404
 $b->
   get('/nonexistant')->
-  with('response')->isStatusCode(404)
-;
+  with('response')->isStatusCode(404);
 /*
 $b->
   get('/nonexistant/')->
@@ -60,16 +58,14 @@
   with('response')->begin()->
     isStatusCode(404)->
     checkElement('body', '/404/')->
-  end()
-;
+  end();
 sfConfig::set('sf_cache', false);
 sfConfig::set('sf_etag', false);
 
 // unexistant action
 $b->
   get('/default/nonexistantaction')->
-  with('response')->isStatusCode(404)
-;
+  with('response')->isStatusCode(404);
 
 // module.yml: enabled
 $b->
@@ -82,8 +78,7 @@
     checkElement('body', '/module is unavailable/i')->
     checkElement('body', '!/congratulations/i')->
     checkElement('link[href="/sf/sf_default/css/screen.css"]')->
-  end()
-;
+  end();
 
 // view.yml: has_layout
 $b->
@@ -92,8 +87,7 @@
     isStatusCode(200)->
     checkElement('body', '/no layout/i')->
     checkElement('head title', false)->
-  end()
-;
+  end();
 
 // security.yml: is_secure
 $b->
@@ -108,8 +102,7 @@
     // check that there is no double output caused by the forwarding in a filter
     checkElement('body', 1)->
     checkElement('link[href="/sf/sf_default/css/screen.css"]')->
-  end()
-;
+  end();
 
 // security.yml: case sensitivity
 $b->
@@ -120,8 +113,7 @@
   with('response')->begin()->
     isStatusCode(200)->
     checkElement('body', '/Login Required/i')->
-  end()
-;
+  end();
 
 $b->
   get('/configSecurityIsSecureAction/Index')->
@@ -131,15 +123,13 @@
   with('response')->begin()->
     isStatusCode(200)->
     checkElement('body', '/Login Required/i')->
-  end()
-;
+  end();
 
 // Max forwards
 $b->
   get('/configSettingsMaxForwards/selfForward')->
   with('response')->isStatusCode(500)->
-  throwsException(null, '/Too many forwards have been detected for this request/i')
-;
+  throwsException(null, '/Too many forwards have been detected for this request/i');
 
 // filters.yml: add a filter
 $b->
@@ -148,8 +138,7 @@
     isStatusCode(200)->
     checkElement('body', '/in a filter/i')->
     checkElement('body', '!/congratulation/i')->
-  end()
-;
+  end();
 
 // css and js inclusions
 $b->
@@ -158,8 +147,7 @@
     isStatusCode(200)->
     checkElement('head link[rel="stylesheet"]', false)->
     checkElement('head script[type="text/javascript"]', false)->
-  end()
-;
+  end();
 
 // libraries autoloading
 $b->
@@ -170,8 +158,7 @@
     checkElement('#lib2', 'pong')->
     checkElement('#lib3', 'pong')->
     checkElement('#lib4', 'nopong')->
-  end()
-;
+  end();
 
 // libraries autoloading in a plugin
 $b->
@@ -181,8 +168,7 @@
     checkElement('#lib1', 'pong')->
     checkElement('#lib2', 'pong')->
     checkElement('#lib3', 'pong')->
-  end()
-;
+  end();
 
 // renderText
 $b->
@@ -190,8 +176,7 @@
   with('response')->begin()->
     isStatusCode(200)->
     matches('/foo/')->
-  end()
-;
+  end();
 
 // view.yml when changing template
 $b->
@@ -200,8 +185,7 @@
     isStatusCode(200)->
     isHeader('Content-Type', 'text/html; charset=utf-8')->
     checkElement('head title', 'foo title')->
-  end()
-;
+  end();
 
 // view.yml with other than default content-type
 $b->
@@ -211,8 +195,7 @@
     isStatusCode(200)->
     matches('/<head>/')->
     matches('/plaintext/')->
-  end()
-;
+  end();
 
 // view.yml with other than default content-type and no layout
 $b->
@@ -221,8 +204,7 @@
     isStatusCode(200)->
     isHeader('Content-Type', 'image/jpg')->
     matches('/image/')->
-  end()
-;
+  end();
 
 // getPresentationFor()
 $b->
@@ -231,5 +213,4 @@
     isStatusCode(200)->
     checkElement('#foo', 'foo')->
     checkElement('#foo_bis', 'foo')->
-  end()
-;
+  end();
diff --git a/test/functional/httpcacheTest.php b/test/functional/httpcacheTest.php
index 0594310a5..a26b6e161 100644
--- a/test/functional/httpcacheTest.php
+++ b/test/functional/httpcacheTest.php
@@ -23,8 +23,7 @@
     isHeader('ETag', true)->
     isHeader('Expires', false)->
     isHeader('Cache-Control', false)->
-  end()
-;
+  end();
 
 $b->
   info('Expiration (client_lifetime is 86400)')->
@@ -34,8 +33,7 @@
     isHeader('ETag', false)->
     isHeader('Expires', '/^'.substr(preg_quote(sfWebResponse::getDate(time() + 86400), '/'), 5, 16).'/')->
     isHeader('Cache-Control', '/max-age=86400/')->
-  end()
-;
+  end();
 
 $b->
   info('Expiration (client_lifetime is 86400) but the developer has set a Last-Modified header')->
@@ -45,8 +43,7 @@
     isHeader('ETag', false)->
     isHeader('Expires', false)->
     isHeader('Cache-Control', false)->
-  end()
-;
+  end();
 
 $b->
   info('No expiration and the developer has set a Last-Modified header')->
@@ -56,5 +53,4 @@
     isHeader('ETag', true)->
     isHeader('Expires', false)->
     isHeader('Cache-Control', false)->
-  end()
-;
+  end();
diff --git a/test/functional/i18nFormTest.php b/test/functional/i18nFormTest.php
index aa392642c..4f5d30ff1 100644
--- a/test/functional/i18nFormTest.php
+++ b/test/functional/i18nFormTest.php
@@ -35,8 +35,7 @@
   with('response')->begin()->
     checkElement('ul li', 'Required.', array('position' => 0))->
     checkElement('ul li', 'foo/bar is an invalid email address', array('position' => 2))->
-  end()
-;
+  end();
 
 // changed culture (fr)
 $b->
@@ -58,8 +57,7 @@
   with('response')->begin()->
     checkElement('ul li', 'Champ requis.', array('position' => 0))->
     checkElement('ul li', 'foo/bar est une adresse email invalide', array('position' => 2))->
-  end()
-;
+  end();
 
 // forms label custom catalogue test
 $b->
@@ -74,5 +72,4 @@
     checkElement('label', 'Prénom!!!', array('position' => 0))->
     checkElement('label', 'Nom!!!', array('position' => 1))->
     checkElement('label', 'Adresse email!!!', array('position' => 2))->
-  end()
-;
+  end();
diff --git a/test/functional/i18nTest.php b/test/functional/i18nTest.php
index 5b9ced072..615745a86 100644
--- a/test/functional/i18nTest.php
+++ b/test/functional/i18nTest.php
@@ -34,8 +34,7 @@ public function checkResponseForCulture($culture = 'fr')
             // messages in another module catalogue
             checkElement('#action_other_local', '/une autre phrase locale en français/i')->
             checkElement('#template_other_local', '/une autre phrase locale en français/i')->
-          end()
-        ;
+          end();
     }
 }
 
@@ -53,8 +52,7 @@ public function checkResponseForCulture($culture = 'fr')
     checkElement('#action', '/an english sentence/i')->
     checkElement('#template', '/an english sentence/i')->
   end()->
-  with('user')->isCulture('en')
-;
+  with('user')->isCulture('en');
 
 $b->
   get('/fr/i18n/index')->
@@ -64,8 +62,7 @@ public function checkResponseForCulture($culture = 'fr')
   end()->
   with('response')->isStatusCode(200)->
   with('user')->isCulture('fr')->
-  checkResponseForCulture('fr')
-;
+  checkResponseForCulture('fr');
 
 // change user culture in the action
 $b->
@@ -76,8 +73,7 @@ public function checkResponseForCulture($culture = 'fr')
   end()->
   with('response')->isStatusCode(200)->
   with('user')->isCulture('fr')->
-  checkResponseForCulture('fr')
-;
+  checkResponseForCulture('fr');
 
 // messages for a module plugin
 $b->
@@ -99,5 +95,4 @@ public function checkResponseForCulture($culture = 'fr')
     checkElement('#template_yetAnother', '/encore une autre phrase en français - from plugin but translation overridden in the application/i')->
     checkElement('#action_testForPluginI18N', '/une phrase en français depuis un plugin - global/i')->
     checkElement('#template_testForPluginI18N', '/une phrase en français depuis un plugin - global/i')->
-  end()
-;
+  end();
diff --git a/test/functional/prodTest.php b/test/functional/prodTest.php
index cb50442dd..7a5757db5 100644
--- a/test/functional/prodTest.php
+++ b/test/functional/prodTest.php
@@ -26,8 +26,7 @@
   with('response')->begin()->
     isStatusCode(200)->
     checkElement('body', '/congratulations/i')->
-  end()
-;
+  end();
 
 // default main page (with cache)
 $b->
@@ -39,8 +38,7 @@
   with('response')->begin()->
     isStatusCode(200)->
     checkElement('body', '/congratulations/i')->
-  end()
-;
+  end();
 
 // 404
 $b->
@@ -52,8 +50,7 @@
     isStatusCode(404)->
     checkElement('body', '!/congratulations/i')->
     checkElement('link[href="/sf/sf_default/css/screen.css"]')->
-  end()
-;
+  end();
 
 $b->
   get('/nonexistant/')->
@@ -64,8 +61,7 @@
     isStatusCode(404)->
     checkElement('body', '!/congratulations/i')->
     checkElement('link[href="/sf/sf_default/css/screen.css"]')->
-  end()
-;
+  end();
 
 // unexistant action
 $b->
@@ -77,5 +73,4 @@
     isStatusCode(404)->
     checkElement('body', '!/congratulations/i')->
     checkElement('link[href="/sf/sf_default/css/screen.css"]')->
-  end()
-;
+  end();
diff --git a/test/functional/sfTestBrowserTest.php b/test/functional/sfTestBrowserTest.php
index 76c88a2ee..5aea35569 100644
--- a/test/functional/sfTestBrowserTest.php
+++ b/test/functional/sfTestBrowserTest.php
@@ -89,8 +89,7 @@ public function listen(sfEvent $event)
     isParameter('action', 'throwsSfException')->
   end()->
   with('response')->isStatusCode(500)->
-  throwsException('sfException', 'sfException message')
-;
+  throwsException('sfException', 'sfException message');
 
 $b->
   get('/browser')->
@@ -102,8 +101,7 @@ public function listen(sfEvent $event)
   get('/browser/text')->
   with('response')->begin()->
     matches('/text/')->
-  end()
-;
+  end();
 
 try {
     $b->with('response')->checkElement('h1', 'text');
@@ -122,8 +120,7 @@ public function listen(sfEvent $event)
     isHeader('content-type', '!#text/html#')->
     isHeader('foo', 'bar')->
     isHeader('foo', 'foobar')->
-  end()
-;
+  end();
 
 // cookies
 $b->
@@ -161,8 +158,7 @@ public function listen(sfEvent $event)
     hasCookie('foo', false)->
     hasCookie('bar', false)->
   end()->
-  with('response')->checkElement('p', '.-')
-;
+  with('response')->checkElement('p', '.-');
 
 $b->
   setCookie('foo', 'bar')->
@@ -211,8 +207,7 @@ public function listen(sfEvent $event)
     hasCookie('foo', false)->
     hasCookie('bar', false)->
   end()->
-  with('response')->checkElement('p', '.-')
-;
+  with('response')->checkElement('p', '.-');
 
 $b->
   get('/browser')->
@@ -220,8 +215,7 @@ public function listen(sfEvent $event)
   post('/browser')->
   with('request')->isMethod('post')->
   call('/browser', 'put')->
-  with('request')->isMethod('put')
-;
+  with('request')->isMethod('put');
 
 // sfBrowser: clean the custom view templates
 $b->
@@ -232,8 +226,7 @@ public function listen(sfEvent $event)
   with('response')->checkElement('#test', 'template 1')->
 
   get('/browser/templateCustom')->
-  with('response')->checkElement('#test', 'template')
-;
+  with('response')->checkElement('#test', 'template');
 
 $b
     ->getAndCheck('browser', 'redirect1', null, 302)
diff --git a/test/other/fixtures/task/myPluginTask.class.php b/test/other/fixtures/task/myPluginTask.class.php
index 4bd4628a9..af7b2ac7c 100644
--- a/test/other/fixtures/task/myPluginTask.class.php
+++ b/test/other/fixtures/task/myPluginTask.class.php
@@ -8,7 +8,5 @@ public function configure()
         $this->name = 'run';
     }
 
-    public function execute($arguments = array(), $options = array())
-    {
-    }
+    public function execute($arguments = array(), $options = array()) {}
 }
diff --git a/test/unit/action/sfComponentTest.php b/test/unit/action/sfComponentTest.php
index 215245b0e..b62b4e5d1 100644
--- a/test/unit/action/sfComponentTest.php
+++ b/test/unit/action/sfComponentTest.php
@@ -18,9 +18,7 @@
 
 class myComponent extends sfComponent
 {
-    public function execute($request)
-    {
-    }
+    public function execute($request) {}
 }
 
 $context = sfContext::getInstance(array(
diff --git a/test/unit/addon/sfPagerTest.php b/test/unit/addon/sfPagerTest.php
index 7b5df6286..6712298c4 100644
--- a/test/unit/addon/sfPagerTest.php
+++ b/test/unit/addon/sfPagerTest.php
@@ -13,13 +13,9 @@
 $t = new lime_test(2);
 class myPager extends sfPager
 {
-    public function init()
-    {
-    }
+    public function init() {}
 
-    public function retrieveObject($offset)
-    {
-    }
+    public function retrieveObject($offset) {}
 
     public function getResults()
     {
diff --git a/test/unit/cache/sfCacheTest.php b/test/unit/cache/sfCacheTest.php
index 4f6dfe76f..668793bcd 100644
--- a/test/unit/cache/sfCacheTest.php
+++ b/test/unit/cache/sfCacheTest.php
@@ -12,42 +12,24 @@
 
 class myCache extends sfCache
 {
-    public function get($key, $default = null)
-    {
-    }
+    public function get($key, $default = null) {}
 
-    public function has($key)
-    {
-    }
+    public function has($key) {}
 
-    public function set($key, $data, $lifetime = null)
-    {
-    }
+    public function set($key, $data, $lifetime = null) {}
 
-    public function remove($key)
-    {
-    }
+    public function remove($key) {}
 
-    public function clean($mode = sfCache::ALL)
-    {
-    }
+    public function clean($mode = sfCache::ALL) {}
 
-    public function getTimeout($key)
-    {
-    }
+    public function getTimeout($key) {}
 
-    public function getLastModified($key)
-    {
-    }
+    public function getLastModified($key) {}
 
-    public function removePattern($pattern, $delimiter = ':')
-    {
-    }
+    public function removePattern($pattern, $delimiter = ':') {}
 }
 
-class fakeCache
-{
-}
+class fakeCache {}
 
 $t = new lime_test(1);
 
diff --git a/test/unit/config/sfConfigHandlerTest.php b/test/unit/config/sfConfigHandlerTest.php
index f04a4d2c8..da6cd449a 100644
--- a/test/unit/config/sfConfigHandlerTest.php
+++ b/test/unit/config/sfConfigHandlerTest.php
@@ -14,9 +14,7 @@
 
 class myConfigHandler extends sfConfigHandler
 {
-    public function execute($configFiles)
-    {
-    }
+    public function execute($configFiles) {}
 }
 
 $config = new myConfigHandler();
diff --git a/test/unit/config/sfYamlConfigHandlerTest.php b/test/unit/config/sfYamlConfigHandlerTest.php
index caf09e976..4d204ca32 100644
--- a/test/unit/config/sfYamlConfigHandlerTest.php
+++ b/test/unit/config/sfYamlConfigHandlerTest.php
@@ -16,9 +16,7 @@ class myConfigHandler extends sfYamlConfigHandler
 {
     public $yamlConfig;
 
-    public function execute($configFiles)
-    {
-    }
+    public function execute($configFiles) {}
 
     public static function parseYamls($configFiles)
     {
diff --git a/test/unit/controller/sfControllerTest.php b/test/unit/controller/sfControllerTest.php
index 4ab303491..61f562928 100644
--- a/test/unit/controller/sfControllerTest.php
+++ b/test/unit/controller/sfControllerTest.php
@@ -16,9 +16,7 @@
 
 class myController extends sfController
 {
-    public function execute()
-    {
-    }
+    public function execute() {}
 }
 
 $context = sfContext::getInstance();
diff --git a/test/unit/controller/sfWebControllerTest.php b/test/unit/controller/sfWebControllerTest.php
index 9b90bb709..db3e7e998 100644
--- a/test/unit/controller/sfWebControllerTest.php
+++ b/test/unit/controller/sfWebControllerTest.php
@@ -18,13 +18,9 @@
 
 class myWebResponse extends sfWebResponse
 {
-    public function sendHttpHeaders()
-    {
-    }
+    public function sendHttpHeaders() {}
 
-    public function send()
-    {
-    }
+    public function send() {}
 }
 
 $_SERVER['HTTP_HOST'] = 'localhost';
diff --git a/test/unit/database/sfDatabaseTest.php b/test/unit/database/sfDatabaseTest.php
index 7a0ab91d0..9ce8d376c 100644
--- a/test/unit/database/sfDatabaseTest.php
+++ b/test/unit/database/sfDatabaseTest.php
@@ -16,13 +16,9 @@
 
 class myDatabase extends sfDatabase
 {
-    public function connect()
-    {
-    }
+    public function connect() {}
 
-    public function shutdown()
-    {
-    }
+    public function shutdown() {}
 }
 
 $context = sfContext::getInstance();
diff --git a/test/unit/escaper/sfOutputEscaperArrayDecoratorTest.php b/test/unit/escaper/sfOutputEscaperArrayDecoratorTest.php
index 874534574..471a9b5b3 100644
--- a/test/unit/escaper/sfOutputEscaperArrayDecoratorTest.php
+++ b/test/unit/escaper/sfOutputEscaperArrayDecoratorTest.php
@@ -24,9 +24,7 @@
 
 require_once __DIR__.'/../../../lib/config/sfConfig.class.php';
 
-class sfException extends Exception
-{
-}
+class sfException extends Exception {}
 
 sfConfig::set('sf_charset', 'UTF-8');
 
diff --git a/test/unit/escaper/sfOutputEscaperObjectDecoratorTest.php b/test/unit/escaper/sfOutputEscaperObjectDecoratorTest.php
index c818d7a96..7e1bfeaf0 100644
--- a/test/unit/escaper/sfOutputEscaperObjectDecoratorTest.php
+++ b/test/unit/escaper/sfOutputEscaperObjectDecoratorTest.php
@@ -24,9 +24,7 @@
 
 require_once __DIR__.'/../../../lib/config/sfConfig.class.php';
 
-class sfException extends Exception
-{
-}
+class sfException extends Exception {}
 
 sfConfig::set('sf_charset', 'UTF-8');
 
@@ -71,9 +69,7 @@ public function getTitles()
     $t->skip('->__toString() is compatible with SimpleXMLElement');
 }
 
-class Foo
-{
-}
+class Foo {}
 
 class FooCountable implements Countable
 {
diff --git a/test/unit/escaper/sfOutputEscaperTest.php b/test/unit/escaper/sfOutputEscaperTest.php
index a01c07794..9288d2425 100644
--- a/test/unit/escaper/sfOutputEscaperTest.php
+++ b/test/unit/escaper/sfOutputEscaperTest.php
@@ -47,9 +47,7 @@ public function getTitleTitle()
     }
 }
 
-class OutputEscaperTestClassChild extends OutputEscaperTestClass
-{
-}
+class OutputEscaperTestClassChild extends OutputEscaperTestClass {}
 
 // ::escape()
 $t->diag('::escape()');
diff --git a/test/unit/generator/sfGeneratorTest.php b/test/unit/generator/sfGeneratorTest.php
index e2f48bd1c..3dbaf796c 100644
--- a/test/unit/generator/sfGeneratorTest.php
+++ b/test/unit/generator/sfGeneratorTest.php
@@ -14,14 +14,10 @@
 
 class myGenerator extends sfGenerator
 {
-    public function generate($params = array())
-    {
-    }
+    public function generate($params = array()) {}
 }
 
-class ProjectConfiguration extends sfProjectConfiguration
-{
-}
+class ProjectConfiguration extends sfProjectConfiguration {}
 
 $manager = new sfGeneratorManager(new ProjectConfiguration());
 $generator = new myGenerator($manager);
diff --git a/test/unit/helper/PartialHelperTest.php b/test/unit/helper/PartialHelperTest.php
index aeaaf915e..580fb157b 100644
--- a/test/unit/helper/PartialHelperTest.php
+++ b/test/unit/helper/PartialHelperTest.php
@@ -25,13 +25,9 @@ public function render()
         return '==RENDERED==';
     }
 
-    public function initialize($context, $moduleName, $actionName, $viewName)
-    {
-    }
+    public function initialize($context, $moduleName, $actionName, $viewName) {}
 
-    public function setPartialVars(array $partialVars)
-    {
-    }
+    public function setPartialVars(array $partialVars) {}
 }
 
 $t->diag('get_partial()');
diff --git a/test/unit/helper/UrlHelperTest.php b/test/unit/helper/UrlHelperTest.php
index e4a746055..9799296e6 100644
--- a/test/unit/helper/UrlHelperTest.php
+++ b/test/unit/helper/UrlHelperTest.php
@@ -87,9 +87,7 @@ public function getCSRFToken($secret = null)
 $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');
 
-class testObject
-{
-}
+class testObject {}
 
 try {
     $o1 = new testObject();
diff --git a/test/unit/i18n/extract/sfI18nExtractTest.php b/test/unit/i18n/extract/sfI18nExtractTest.php
index ba519c3b9..65eac36c5 100644
--- a/test/unit/i18n/extract/sfI18nExtractTest.php
+++ b/test/unit/i18n/extract/sfI18nExtractTest.php
@@ -12,9 +12,7 @@
 
 $t = new lime_test(3);
 
-class ProjectConfiguration extends sfProjectConfiguration
-{
-}
+class ProjectConfiguration extends sfProjectConfiguration {}
 
 class TestConfiguration extends sfApplicationConfiguration
 {
diff --git a/test/unit/i18n/sfI18NTest.php b/test/unit/i18n/sfI18NTest.php
index a1ea000bf..82bcf8b51 100644
--- a/test/unit/i18n/sfI18NTest.php
+++ b/test/unit/i18n/sfI18NTest.php
@@ -12,9 +12,7 @@
 
 $t = new lime_test(34);
 
-class ProjectConfiguration extends sfProjectConfiguration
-{
-}
+class ProjectConfiguration extends sfProjectConfiguration {}
 
 class TestConfiguration extends sfApplicationConfiguration
 {
diff --git a/test/unit/i18n/sfMessageSourceTest.php b/test/unit/i18n/sfMessageSourceTest.php
index 7e38efbbf..c81e9a5f6 100644
--- a/test/unit/i18n/sfMessageSourceTest.php
+++ b/test/unit/i18n/sfMessageSourceTest.php
@@ -14,29 +14,17 @@
 
 class sfMessageSource_Simple extends sfMessageSource
 {
-    public function __construct($source)
-    {
-    }
+    public function __construct($source) {}
 
-    public function delete($message, $catalogue = 'messages')
-    {
-    }
+    public function delete($message, $catalogue = 'messages') {}
 
-    public function update($text, $target, $comments, $catalogue = 'messages')
-    {
-    }
+    public function update($text, $target, $comments, $catalogue = 'messages') {}
 
-    public function catalogues()
-    {
-    }
+    public function catalogues() {}
 
-    public function save($catalogue = 'messages')
-    {
-    }
+    public function save($catalogue = 'messages') {}
 
-    public function getId()
-    {
-    }
+    public function getId() {}
 }
 
 // ::factory()
diff --git a/test/unit/i18n/sfMessageSource_FileTest.php b/test/unit/i18n/sfMessageSource_FileTest.php
index 1d963717d..c4415fdff 100644
--- a/test/unit/i18n/sfMessageSource_FileTest.php
+++ b/test/unit/i18n/sfMessageSource_FileTest.php
@@ -16,17 +16,11 @@ class sfMessageSource_Simple extends sfMessageSource_File
 {
     protected $dataExt = '.xml';
 
-    public function delete($message, $catalogue = 'messages')
-    {
-    }
+    public function delete($message, $catalogue = 'messages') {}
 
-    public function update($text, $target, $comments, $catalogue = 'messages')
-    {
-    }
+    public function update($text, $target, $comments, $catalogue = 'messages') {}
 
-    public function save($catalogue = 'messages')
-    {
-    }
+    public function save($catalogue = 'messages') {}
 
     public function getCatalogueByDir($catalogue)
     {
diff --git a/test/unit/log/sfLoggerTest.php b/test/unit/log/sfLoggerTest.php
index 36ed81572..7aa352332 100644
--- a/test/unit/log/sfLoggerTest.php
+++ b/test/unit/log/sfLoggerTest.php
@@ -22,9 +22,7 @@ protected function doLog($message, $priority)
     }
 }
 
-class notaLogger
-{
-}
+class notaLogger {}
 
 $dispatcher = new sfEventDispatcher();
 $logger = new myLogger($dispatcher, array('log_dir_name' => '/tmp'));
diff --git a/test/unit/mailer/fixtures/TestMailMessage.class.php b/test/unit/mailer/fixtures/TestMailMessage.class.php
index 1e43fc076..7a97cd1a7 100644
--- a/test/unit/mailer/fixtures/TestMailMessage.class.php
+++ b/test/unit/mailer/fixtures/TestMailMessage.class.php
@@ -9,11 +9,7 @@
  */
 class TestMailMessage
 {
-    public function setMessage(Swift_Mime_Message $message)
-    {
-    }
+    public function setMessage(Swift_Mime_Message $message) {}
 
-    public function getMessage()
-    {
-    }
+    public function getMessage() {}
 }
diff --git a/test/unit/mailer/fixtures/TestMailerTransport.class.php b/test/unit/mailer/fixtures/TestMailerTransport.class.php
index bcb8f43bd..c714b6088 100644
--- a/test/unit/mailer/fixtures/TestMailerTransport.class.php
+++ b/test/unit/mailer/fixtures/TestMailerTransport.class.php
@@ -34,9 +34,7 @@ public function stop()
         $this->started = false;
     }
 
-    public function registerPlugin(Swift_Events_EventListener $plugin)
-    {
-    }
+    public function registerPlugin(Swift_Events_EventListener $plugin) {}
 
     public function setFoo($foo)
     {
diff --git a/test/unit/mailer/fixtures/TestSpool.class.php b/test/unit/mailer/fixtures/TestSpool.class.php
index f0a80ec00..39a4e87b5 100644
--- a/test/unit/mailer/fixtures/TestSpool.class.php
+++ b/test/unit/mailer/fixtures/TestSpool.class.php
@@ -11,22 +11,16 @@ class TestSpool implements Swift_Spool
 {
     protected $messages = array();
 
-    public function __construct()
-    {
-    }
+    public function __construct() {}
 
     public function isStarted()
     {
         return true;
     }
 
-    public function start()
-    {
-    }
+    public function start() {}
 
-    public function stop()
-    {
-    }
+    public function stop() {}
 
     public function queueMessage(Swift_Mime_Message $message)
     {
diff --git a/test/unit/plugin/sfPearDownloaderTest.class.php b/test/unit/plugin/sfPearDownloaderTest.class.php
index 3061be907..45094e94a 100644
--- a/test/unit/plugin/sfPearDownloaderTest.class.php
+++ b/test/unit/plugin/sfPearDownloaderTest.class.php
@@ -26,13 +26,8 @@ class sfPearDownloaderTest extends sfPearDownloader
     /**
      * @see PEAR_REST::downloadHttp()
      *
-     * @param mixed      $url
-     * @param mixed      $ui
-     * @param mixed      $save_dir
      * @param mixed|null $callback
      * @param mixed|null $lastmodified
-     * @param mixed      $accept
-     * @param mixed      $channel
      */
     public function downloadHttp($url, &$ui, $save_dir = '.', $callback = null, $lastmodified = null, $accept = false, $channel = false)
     {
diff --git a/test/unit/plugin/sfPearRestTest.class.php b/test/unit/plugin/sfPearRestTest.class.php
index b7b126336..133bbf358 100644
--- a/test/unit/plugin/sfPearRestTest.class.php
+++ b/test/unit/plugin/sfPearRestTest.class.php
@@ -24,10 +24,7 @@ class sfPearRestTest extends sfPearRest
     /**
      * @see PEAR_REST::downloadHttp()
      *
-     * @param mixed      $url
      * @param mixed|null $lastmodified
-     * @param mixed      $accept
-     * @param mixed      $channel
      */
     public function downloadHttp($url, $lastmodified = null, $accept = false, $channel = false)
     {
diff --git a/test/unit/request/sfRequestTest.php b/test/unit/request/sfRequestTest.php
index e816325f9..518a63f95 100755
--- a/test/unit/request/sfRequestTest.php
+++ b/test/unit/request/sfRequestTest.php
@@ -18,9 +18,7 @@ public function getEventDispatcher()
     }
 }
 
-class fakeRequest
-{
-}
+class fakeRequest {}
 
 $t = new lime_test(41);
 
diff --git a/test/unit/response/sfResponseTest.php b/test/unit/response/sfResponseTest.php
index 997b2d800..5f219e5bd 100644
--- a/test/unit/response/sfResponseTest.php
+++ b/test/unit/response/sfResponseTest.php
@@ -12,26 +12,16 @@
 
 class myResponse extends sfResponse
 {
-    public function __serialize()
-    {
-    }
+    public function __serialize() {}
 
-    public function __unserialize($data)
-    {
-    }
+    public function __unserialize($data) {}
 
-    public function serialize()
-    {
-    }
+    public function serialize() {}
 
-    public function unserialize($serialized)
-    {
-    }
+    public function unserialize($serialized) {}
 }
 
-class fakeResponse
-{
-}
+class fakeResponse {}
 
 $t = new lime_test(8);
 
diff --git a/test/unit/service/fixtures/containers/container10.php b/test/unit/service/fixtures/containers/container10.php
index 99b200a34..6a8555c33 100644
--- a/test/unit/service/fixtures/containers/container10.php
+++ b/test/unit/service/fixtures/containers/container10.php
@@ -5,7 +5,6 @@
 $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/container9.php b/test/unit/service/fixtures/containers/container9.php
index fc72a46a7..1728e6d6b 100644
--- a/test/unit/service/fixtures/containers/container9.php
+++ b/test/unit/service/fixtures/containers/container9.php
@@ -11,19 +11,16 @@
   setShared(false)->
   addMethodCall('setBar', array('bar'))->
   addMethodCall('initialize')->
-  setConfigurator('sc_configure')
-;
+  setConfigurator('sc_configure');
 $container->
   register('bar', 'FooClass')->
   setArguments(array('foo', new sfServiceReference('foo.baz'), new sfServiceParameter('foo_bar')))->
   setShared(true)->
-  setConfigurator(array(new sfServiceReference('foo.baz'), 'configure'))
-;
+  setConfigurator(array(new sfServiceReference('foo.baz'), 'configure'));
 $container->
   register('foo.baz', '%baz_class%')->
   setConstructor('getInstance')->
-  setConfigurator(array('%baz_class%', 'configureStatic1'))
-;
+  setConfigurator(array('%baz_class%', 'configureStatic1'));
 $container->register('foo_bar', 'FooClass');
 $container->setParameters(array(
     'baz_class' => 'BazClass',
diff --git a/test/unit/service/fixtures/includes/classes.php b/test/unit/service/fixtures/includes/classes.php
index f7a3290f7..3b6cd0931 100644
--- a/test/unit/service/fixtures/includes/classes.php
+++ b/test/unit/service/fixtures/includes/classes.php
@@ -5,9 +5,7 @@ function sc_configure($instance)
     $instance->configure();
 }
 
-class BarClass
-{
-}
+class BarClass {}
 
 class BazClass
 {
@@ -26,7 +24,5 @@ public static function configureStatic($instance)
         $instance->configure();
     }
 
-    public static function configureStatic1()
-    {
-    }
+    public static function configureStatic1() {}
 }
diff --git a/test/unit/service/sfServiceContainerDumperTest.php b/test/unit/service/sfServiceContainerDumperTest.php
index b482aa0d3..420bbafca 100644
--- a/test/unit/service/sfServiceContainerDumperTest.php
+++ b/test/unit/service/sfServiceContainerDumperTest.php
@@ -12,9 +12,7 @@
 
 $t = new lime_test(1);
 
-class ProjectDumper extends sfServiceContainerDumper
-{
-}
+class ProjectDumper extends sfServiceContainerDumper {}
 
 $builder = new sfServiceContainerBuilder();
 $dumper = new ProjectDumper($builder);
diff --git a/test/unit/sfNoRouting.class.php b/test/unit/sfNoRouting.class.php
index 724387f47..71cdb4170 100644
--- a/test/unit/sfNoRouting.class.php
+++ b/test/unit/sfNoRouting.class.php
@@ -19,8 +19,6 @@ class sfNoRouting extends sfRouting
 {
     /**
      * @see sfRouting
-     *
-     * @param mixed $with_route_name
      */
     public function getCurrentInternalUri($with_route_name = false)
     {
@@ -37,10 +35,6 @@ public function getCurrentInternalUri($with_route_name = false)
 
     /**
      * @see sfRouting
-     *
-     * @param mixed $name
-     * @param mixed $params
-     * @param mixed $absolute
      */
     public function generate($name, $params = array(), $absolute = false)
     {
@@ -59,8 +53,6 @@ public function generate($name, $params = array(), $absolute = false)
 
     /**
      * @see sfRouting
-     *
-     * @param mixed $url
      */
     public function parse($url)
     {
@@ -77,8 +69,6 @@ public function getRoutes()
 
     /**
      * @see sfRouting
-     *
-     * @param mixed $name
      */
     public function getRoute($name)
     {
@@ -87,8 +77,6 @@ public function getRoute($name)
 
     /**
      * @see sfRouting
-     *
-     * @param mixed $routes
      */
     public function setRoutes($routes)
     {
@@ -106,9 +94,7 @@ public function hasRoutes()
     /**
      * @see sfRouting
      */
-    public function clearRoutes()
-    {
-    }
+    public function clearRoutes() {}
 
     protected function mergeArrays($arr1, $arr2)
     {
diff --git a/test/unit/storage/sfStorageTest.php b/test/unit/storage/sfStorageTest.php
index 6ba8fcec1..a3f76105e 100644
--- a/test/unit/storage/sfStorageTest.php
+++ b/test/unit/storage/sfStorageTest.php
@@ -14,27 +14,15 @@
 
 class myStorage extends sfStorage
 {
-    public function read($key)
-    {
-    }
+    public function read($key) {}
 
-    public function remove($key)
-    {
-    }
+    public function remove($key) {}
 
-    public function shutdown()
-    {
-    }
+    public function shutdown() {}
 
-    public function write($key, $data)
-    {
-    }
+    public function write($key, $data) {}
 
-    public function regenerate($destroy = false)
-    {
-    }
+    public function regenerate($destroy = false) {}
 }
 
-class fakeStorage
-{
-}
+class fakeStorage {}
diff --git a/test/unit/task/sfBaseTaskTest.php b/test/unit/task/sfBaseTaskTest.php
index 7da390a11..d04039085 100644
--- a/test/unit/task/sfBaseTaskTest.php
+++ b/test/unit/task/sfBaseTaskTest.php
@@ -24,9 +24,7 @@ public function initializeAutoload(sfProjectConfiguration $configuration, $reloa
         parent::initializeAutoload($configuration, $reload);
     }
 
-    protected function execute($arguments = array(), $options = array())
-    {
-    }
+    protected function execute($arguments = array(), $options = array()) {}
 }
 
 $rootDir = __DIR__.'/../../functional/fixtures';
diff --git a/test/unit/test/sfTestFunctionalTest.php b/test/unit/test/sfTestFunctionalTest.php
index 509f97182..45e9b1372 100644
--- a/test/unit/test/sfTestFunctionalTest.php
+++ b/test/unit/test/sfTestFunctionalTest.php
@@ -25,9 +25,7 @@ public function setResponseContent($content)
 
 class mockLime extends lime_test
 {
-    public function __destruct()
-    {
-    }
+    public function __destruct() {}
 }
 
 class mockTestFunctional extends sfTestFunctional
diff --git a/test/unit/util/sfBrowserTest.php b/test/unit/util/sfBrowserTest.php
index a3b1ef50f..137c2d43e 100755
--- a/test/unit/util/sfBrowserTest.php
+++ b/test/unit/util/sfBrowserTest.php
@@ -270,8 +270,7 @@ public function getDefaultServerArray($name)
   setField('myarray[0]', 'value0')->
   setField('myarray[1]', 'value1')->
   setField('myarray[2]', 'value2')->
-  click('submit')
-;
+  click('submit');
 $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');
@@ -280,8 +279,7 @@ public function getDefaultServerArray($name)
 list($method, $uri, $parameters) = $b->
   setField('text_default_value', 'myvalue')->
   setField('text', 'myothervalue')->
-  click('submit', array('text_default_value' => 'yourvalue', 'text' => 'yourothervalue'))
-;
+  click('submit', array('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');
 
@@ -291,15 +289,13 @@ public function getDefaultServerArray($name)
   deselect('checkbox1')->
   select('checkbox3')->
   select('b-radio')->
-  click('submit')
-;
+  click('submit');
 $t->is(isset($parameters['checkbox1']), false, '->deselect() unckecks a checkbox');
 $t->is(isset($parameters['checkbox3']), true, '->select() ckecks a checkbox');
 $t->is($parameters['radio1'], 'b', '->select() selects a radiobutton');
 list($method, $uri, $parameters) = $b->
   select('a-radio')->
-  click('submit')
-;
+  click('submit');
 $t->is($parameters['radio1'], 'a', '->select() toggles radiobuttons');
 
 try {
diff --git a/test/unit/util/sfContextTest.php b/test/unit/util/sfContextTest.php
index 27746aac1..7acafc492 100644
--- a/test/unit/util/sfContextTest.php
+++ b/test/unit/util/sfContextTest.php
@@ -14,9 +14,7 @@
 
 class myContext extends sfContext
 {
-    public function initialize(sfApplicationConfiguration $configuration)
-    {
-    }
+    public function initialize(sfApplicationConfiguration $configuration) {}
 }
 
 /*
diff --git a/test/unit/validator/sfValidatorFileTest.php b/test/unit/validator/sfValidatorFileTest.php
index ae34001cd..be9457fc0 100755
--- a/test/unit/validator/sfValidatorFileTest.php
+++ b/test/unit/validator/sfValidatorFileTest.php
@@ -124,9 +124,7 @@ public function getMimeTypesFromCategory($category)
 $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'));
diff --git a/test/unit/view/sfViewCacheManagerTest.php b/test/unit/view/sfViewCacheManagerTest.php
index 24f004c57..aa8fd7328 100644
--- a/test/unit/view/sfViewCacheManagerTest.php
+++ b/test/unit/view/sfViewCacheManagerTest.php
@@ -34,14 +34,10 @@ function get_cache_config($contextual = false)
 
 class myViewCacheManager extends sfViewCacheManager
 {
-    public function registerConfiguration($moduleName)
-    {
-    }
+    public function registerConfiguration($moduleName) {}
 }
 
-class myController extends sfWebController
-{
-}
+class myController extends sfWebController {}
 
 class myRequest
 {
@@ -72,9 +68,7 @@ class myCache extends sfCache
 {
     public static $cache = array();
 
-    public function initialize($parameters = array())
-    {
-    }
+    public function initialize($parameters = array()) {}
 
     public function get($key, $default = null)
     {
diff --git a/test/unit/view/sfViewTest.php b/test/unit/view/sfViewTest.php
index 69e8b1d7e..8ddaf99ae 100644
--- a/test/unit/view/sfViewTest.php
+++ b/test/unit/view/sfViewTest.php
@@ -16,21 +16,13 @@
 
 class myView extends sfView
 {
-    public function execute()
-    {
-    }
+    public function execute() {}
 
-    public function configure()
-    {
-    }
+    public function configure() {}
 
-    public function getEngine()
-    {
-    }
+    public function getEngine() {}
 
-    public function render()
-    {
-    }
+    public function render() {}
 }
 
 class configuredView extends myView
diff --git a/test/unit/widget/sfWidgetFormChoiceTest.php b/test/unit/widget/sfWidgetFormChoiceTest.php
index 86a5f02c6..2a6f5ae53 100644
--- a/test/unit/widget/sfWidgetFormChoiceTest.php
+++ b/test/unit/widget/sfWidgetFormChoiceTest.php
@@ -12,9 +12,7 @@
 
 class FormFormatterStub extends sfWidgetFormSchemaFormatter
 {
-    public function __construct()
-    {
-    }
+    public function __construct() {}
 
     public function translate($subject, $parameters = array())
     {
diff --git a/test/unit/widget/sfWidgetFormDateRangeTest.php b/test/unit/widget/sfWidgetFormDateRangeTest.php
index 5e273bdbb..2b23f94a4 100644
--- a/test/unit/widget/sfWidgetFormDateRangeTest.php
+++ b/test/unit/widget/sfWidgetFormDateRangeTest.php
@@ -14,9 +14,7 @@ class FormFormatterMock extends sfWidgetFormSchemaFormatter
 {
     public $translateSubjects = array();
 
-    public function __construct()
-    {
-    }
+    public function __construct() {}
 
     public function translate($subject, $parameters = array())
     {
@@ -28,9 +26,7 @@ public function translate($subject, $parameters = array())
 
 class WidgetFormStub extends sfWidget
 {
-    public function __construct()
-    {
-    }
+    public function __construct() {}
 
     public function render($name, $value = null, $attributes = array(), $errors = array())
     {
diff --git a/test/unit/widget/sfWidgetFormFilterDateTest.php b/test/unit/widget/sfWidgetFormFilterDateTest.php
index 653fdad05..40bf6b492 100644
--- a/test/unit/widget/sfWidgetFormFilterDateTest.php
+++ b/test/unit/widget/sfWidgetFormFilterDateTest.php
@@ -12,9 +12,7 @@
 
 class FormFormatterStub extends sfWidgetFormSchemaFormatter
 {
-    public function __construct()
-    {
-    }
+    public function __construct() {}
 
     public function translate($subject, $parameters = array())
     {
@@ -24,9 +22,7 @@ public function translate($subject, $parameters = array())
 
 class WidgetFormStub extends sfWidget
 {
-    public function __construct()
-    {
-    }
+    public function __construct() {}
 
     public function render($name, $value = null, $attributes = array(), $errors = array())
     {
diff --git a/test/unit/widget/sfWidgetFormFilterInputTest.php b/test/unit/widget/sfWidgetFormFilterInputTest.php
index 0b2fbd7d5..08b0962ef 100644
--- a/test/unit/widget/sfWidgetFormFilterInputTest.php
+++ b/test/unit/widget/sfWidgetFormFilterInputTest.php
@@ -12,9 +12,7 @@
 
 class FormFormatterStub extends sfWidgetFormSchemaFormatter
 {
-    public function __construct()
-    {
-    }
+    public function __construct() {}
 
     public function translate($subject, $parameters = array())
     {
diff --git a/test/unit/widget/sfWidgetFormInputFileEditableTest.php b/test/unit/widget/sfWidgetFormInputFileEditableTest.php
index 6978b74f4..694d16f51 100644
--- a/test/unit/widget/sfWidgetFormInputFileEditableTest.php
+++ b/test/unit/widget/sfWidgetFormInputFileEditableTest.php
@@ -12,9 +12,7 @@
 
 class FormFormatterStub extends sfWidgetFormSchemaFormatter
 {
-    public function __construct()
-    {
-    }
+    public function __construct() {}
 
     public function translate($subject, $parameters = array())
     {
diff --git a/test/unit/widget/sfWidgetFormSchemaFormatterTest.php b/test/unit/widget/sfWidgetFormSchemaFormatterTest.php
index 398157797..876de73ab 100644
--- a/test/unit/widget/sfWidgetFormSchemaFormatterTest.php
+++ b/test/unit/widget/sfWidgetFormSchemaFormatterTest.php
@@ -143,9 +143,7 @@ public static function __($string)
 $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->setTranslationCatalogue('foo');
diff --git a/test/unit/widget/sfWidgetFormSelectCheckboxTest.php b/test/unit/widget/sfWidgetFormSelectCheckboxTest.php
index c0a0a6f89..0dcaa565e 100644
--- a/test/unit/widget/sfWidgetFormSelectCheckboxTest.php
+++ b/test/unit/widget/sfWidgetFormSelectCheckboxTest.php
@@ -12,9 +12,7 @@
 
 class FormFormatterStub extends sfWidgetFormSchemaFormatter
 {
-    public function __construct()
-    {
-    }
+    public function __construct() {}
 
     public function translate($subject, $parameters = array())
     {
diff --git a/test/unit/widget/sfWidgetFormSelectRadioTest.php b/test/unit/widget/sfWidgetFormSelectRadioTest.php
index cc2a4d710..a5ba5ea0a 100644
--- a/test/unit/widget/sfWidgetFormSelectRadioTest.php
+++ b/test/unit/widget/sfWidgetFormSelectRadioTest.php
@@ -12,9 +12,7 @@
 
 class FormFormatterStub extends sfWidgetFormSchemaFormatter
 {
-    public function __construct()
-    {
-    }
+    public function __construct() {}
 
     public function translate($subject, $parameters = array())
     {
diff --git a/test/unit/widget/sfWidgetFormSelectTest.php b/test/unit/widget/sfWidgetFormSelectTest.php
index d3668963c..578be108e 100644
--- a/test/unit/widget/sfWidgetFormSelectTest.php
+++ b/test/unit/widget/sfWidgetFormSelectTest.php
@@ -12,9 +12,7 @@
 
 class FormFormatterStub extends sfWidgetFormSchemaFormatter
 {
-    public function __construct()
-    {
-    }
+    public function __construct() {}
 
     public function translate($subject, $parameters = array())
     {