(fixed #4142, BP from #3887) updated to symfony 1.4.20

lib/vendor/symfony/CHANGELOG

@@ -1,3 +1,71 @@
+CHANGELOG
+=========
+
+11/25/12: Versions 1.4.20
+-------------------------
+
+ * [33598] fixed the possibility to fake a file upload
+ * [33545] fixed sfPDOSessionStorage for Oracle (closes #10022)
+ * [33544] fixed sfWebRequest::splitHttpAcceptHeader incorrect result order (closes #10069, patch by Keri Henare)
+ * [33539] fixed exception format when using the PHP 5.4 built-in server (closes #10067, based on a patch from jgskin)
+ * [33486] fixed sfPDODatabase::call() method (closes #10044)
+
+10/09/12: Versions 1.4.19
+-------------------------
+
+ * [33545] fixed sfPDOSessionStorage for Oracle (closes #10022)
+ * [33544] fixed sfWebRequest::splitHttpAcceptHeader incorrect result order (closes #10069, patch by Keri Henare)
+ * [33539] fixed exception format when using the PHP 5.4 built-in server (closes #10067, based on a patch from jgskin)
+ * [33486] fixed sfPDODatabase::call() method (closes #10044)
+
+05/30/12: Versions 1.4.18
+-------------------------
+
+ * [33466] fixed a possible DB session fixation attack (patch from Dmitri Groutso)
+ * [33373] fixed test browser click function does not handle css selector without [ or ] (closes #9982, patch from mouette)
+
+03/08/12: Versions 1.4.17
+-------------------------
+
+ * [33363] added some tests (closes #3237, patch from Stephen.Ostrow)
+ * [33362] fixed a notice on PHP 5.4 (closes #9985, patch from bshaffer)
+ * [33358] fixed Notice with PHP 5.4 (closes #10003)
+ * [33309] fixed error in Debug mode from sfDebug.class.php when myUser implements sfSecurityUser (closes #9996)
+ * [33299] reverted [33226] because of side effects (refs #8348)
+ * [33292] fixed test for PHP 5.3 (patch from pylebecq)
+
+12/13/11: Version 1.4.16
+------------------------
+
+ * [33251] fixed sfChoiceFormat when a string to translate contains a valid range (closes #9973)
+ * [33250] fixed saving i18n fields in subforms (closes #7626, patch from yoshy71)
+ * [33249] fixed last modified date calculation in sfMessageSource_Aggregate (closes #9981, patch from jamiel)
+ * [33226] fixed merging problem for the routing configuration (closes #8348)
+ * [33214] fixed ob_start() behavior on CLI (closes #9970)
+ * [33208] fixed ob_start usage (to avoid warning in PHP 5.4, closes #9970)
+
+10/27/11: Version 1.4.15
+------------------------
+
+ * [33151] fixed usage of mb_strlen in tasks (closes #9940)
+ * [33149] added missing admin.delete_object event (closes #9943)
+ * [33137] fixed multiple database support in Propel plugin (for the generator and sfPropelData, closes #8345)
+ * [33125] fixed the possibility to include files included in an exclude rule in the deploy task (closes #9912)
+ * [33122] fixed include|get_component when sfPartialView class is customized (closes #9932)
+ * [33121] fixed protocol relative URL in the asset helper (closes #9936)
+ * [33053] fixed typo (closes #9927, based on a patch from pmallet)
+
+09/16/11: Version 1.4.14
+------------------------
+
+ * [33025] fixed sfCacheSessionStorage does not always check whether HTTP_USER_AGENT is set (closes #9921, patch from boutell)
+ * [33022] fixed auto_link_text() when an email address is already linked (closes #9915, based on a patch from klemens_u)
+ * [33021] fixed sfCacheSessionStorage does not serialize properly, also uses wrong option name for httponly (closes #9919, based on a patch from boutell)
+ * [32939] fixed memory leak in sfRoute::generate() (closes #9886 - patch from acf0)
+ * [32892] fixed Doctrine form generation when a schema has abstract tables (closes #9885 - patch from chok)
+ * [32891] fixed sfFinder bug when mirroring file with twice the path inside it (closes #9892 - based on a patch from shordeaux)
+ * [32890] fixed bad value of property 'list-style' in css of WebDebug toolbar (closes #9891 - patch from tomi)
+
 08/05/11: Version 1.4.13
 ------------------------
 

lib/vendor/symfony/lib/autoload/sfAutoloadAgain.class.php

@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage autoload
  * @author     Kris Wallsmith <[email protected]>
- * @version    SVN: $Id: sfAutoloadAgain.class.php 22248 2009-09-22 17:15:16Z fabien $
+ * @version    SVN: $Id: sfAutoloadAgain.class.php 33561 2012-10-18 11:42:28Z fabien $
  */
 class sfAutoloadAgain
 {
@@ -69,7 +69,7 @@ public function autoload($class)
     {
       foreach ($autoloads as $position => $autoload)
       {
-        if ($this === $autoload[0])
+        if (is_array($autoload) && $this === $autoload[0])
         {
           break;
         }

lib/vendor/symfony/lib/autoload/sfCoreAutoload.class.php

@@ -11,7 +11,7 @@
 /**
  * The current symfony version.
  */
-define('SYMFONY_VERSION', '1.4.13');
+define('SYMFONY_VERSION', '1.4.20');
 
 /**
  * sfCoreAutoload class.

lib/vendor/symfony/lib/command/sfCommandApplication.class.php

@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage command
  * @author     Fabien Potencier <[email protected]>
- * @version    SVN: $Id: sfCommandApplication.class.php 23218 2009-10-20 20:59:02Z FabianLange $
+ * @version    SVN: $Id: sfCommandApplication.class.php 33151 2011-10-24 08:55:03Z fabien $
  */
 abstract class sfCommandApplication
 {
@@ -519,7 +519,15 @@ public function getTaskToExecute($name)
 
   protected function strlen($string)
   {
-    return function_exists('mb_strlen') ? mb_strlen($string) : 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);
   }
 
   /**

lib/vendor/symfony/lib/config/sfApplicationConfiguration.class.php

@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage config
  * @author     Fabien Potencier <[email protected]>
- * @version    SVN: $Id: sfApplicationConfiguration.class.php 29526 2010-05-19 13:06:40Z fabien $
+ * @version    SVN: $Id: sfApplicationConfiguration.class.php 33214 2011-11-19 13:47:24Z fabien $
  */
 abstract class sfApplicationConfiguration extends ProjectConfiguration
 {
@@ -150,9 +150,9 @@ public function initConfiguration()
     $this->initializePlugins();
 
     // compress output
-    if (!self::$coreLoaded)
+    if (!self::$coreLoaded && sfConfig::get('sf_compressed'))
     {
-      ob_start(sfConfig::get('sf_compressed') ? 'ob_gzhandler' : '');
+      ob_start('ob_gzhandler');
     }
 
     self::$coreLoaded = true;

lib/vendor/symfony/lib/config/sfFactoryConfigHandler.class.php

@@ -17,7 +17,7 @@
  * @subpackage config
  * @author     Fabien Potencier <[email protected]>
  * @author     Sean Kerr <[email protected]>
- * @version    SVN: $Id: sfFactoryConfigHandler.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id: sfFactoryConfigHandler.class.php 33299 2011-12-30 17:42:47Z fabien $
  */
 class sfFactoryConfigHandler extends sfYamlConfigHandler
 {

lib/vendor/symfony/lib/controller/sfController.class.php

@@ -16,7 +16,7 @@
  * @subpackage controller
  * @author     Fabien Potencier <[email protected]>
  * @author     Sean Kerr <[email protected]>
- * @version    SVN: $Id: sfController.class.php 30912 2010-09-15 11:10:46Z fabien $
+ * @version    SVN: $Id: sfController.class.php 33539 2012-09-19 05:36:02Z fabien $
  */
 abstract class sfController
 {
@@ -489,7 +489,7 @@ public function setRenderMode($mode)
    */
   public function inCLI()
   {
-    return 0 == strncasecmp(PHP_SAPI, 'cli', 3);
+    return 'cli' == PHP_SAPI;
   }
 
   /**

lib/vendor/symfony/lib/database/sfPDODatabase.class.php

@@ -18,7 +18,7 @@
  * @author     Fabien Potencier <[email protected]>
  * @author     Sean Kerr <[email protected]>
  * @author     Dustin Whittle <[email protected]>
- * @version    SVN: $Id: sfPDODatabase.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id: sfPDODatabase.class.php 33486 2012-07-09 08:57:29Z fabien $
  */
 class sfPDODatabase extends sfDatabase
 {
@@ -109,6 +109,6 @@ public function shutdown()
    */
   public function __call($method, $arguments)
   {
-    return $this->getConnection()->$method($arguments);
+    return call_user_func_array(array($this->getConnection(), $method), $arguments);
   }
 }

lib/vendor/symfony/lib/debug/sfDebug.class.php

@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage debug
  * @author     Fabien Potencier <[email protected]>
- * @version    SVN: $Id: sfDebug.class.php 31250 2010-10-26 14:18:26Z fabien $
+ * @version    SVN: $Id: sfDebug.class.php 33309 2012-01-20 13:06:21Z fabien $
  */
 class sfDebug
 {
@@ -167,7 +167,7 @@ public static function userAsArray(sfUser $user = null)
       'culture'         => $user->getCulture(),
     );
 
-    if ($user instanceof sfSecurityUser)
+    if ($user instanceof sfBasicSecurityUser)
     {
       $data = array_merge($data, array(
           'authenticated'   => $user->isAuthenticated(),

lib/vendor/symfony/lib/debug/sfTimerManager.class.php

@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage util
  * @author     Fabien Potencier <[email protected]>
- * @version    SVN: $Id: sfTimerManager.class.php 13339 2008-11-25 14:58:05Z fabien $
+ * @version    SVN: $Id: sfTimerManager.class.php 33570 2012-10-25 09:44:55Z fabien $
  */
 class sfTimerManager
 {
@@ -29,14 +29,16 @@ class sfTimerManager
    *
    * @return sfTimer The timer instance
    */
-  public static function getTimer($name)
+  public static function getTimer($name,$reset=true)
   {
     if (!isset(self::$timers[$name]))
     {
       self::$timers[$name] = new sfTimer($name);
     }
 
-    self::$timers[$name]->startTimer();
+    if($reset){
+       self::$timers[$name]->startTimer();
+    }
 
     return self::$timers[$name];
   }

lib/vendor/symfony/lib/debug/sfWebDebug.class.php

@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage debug
  * @author     Fabien Potencier <[email protected]>
- * @version    SVN: $Id: sfWebDebug.class.php 31254 2010-10-26 15:26:03Z fabien $
+ * @version    SVN: $Id: sfWebDebug.class.php 32890 2011-08-05 07:44:44Z fabien $
  */
 class sfWebDebug
 {
@@ -780,7 +780,7 @@ public function getStylesheet()
   margin: 0;
   padding: 0;
   margin-left: 20px;
-  list-style: number;
+  list-style: decimal;
 }
 
 #sfWebDebugDatabaseLogs li

lib/vendor/symfony/lib/exception/sfException.class.php

@@ -18,7 +18,7 @@
  * @subpackage exception
  * @author     Fabien Potencier <[email protected]>
  * @author     Sean Kerr <[email protected]>
- * @version    SVN: $Id: sfException.class.php 32641 2011-06-11 13:39:35Z fabien $
+ * @version    SVN: $Id: sfException.class.php 33539 2012-09-19 05:36:02Z fabien $
  */
 class sfException extends Exception
 {
@@ -100,7 +100,9 @@ public function printStackTrace()
         }
       }
 
-      ob_start(sfConfig::get('sf_compressed') ? 'ob_gzhandler' : '');
+      if (sfConfig::get('sf_compressed')) {
+          ob_start('ob_gzhandler');
+      }
 
       header('HTTP/1.0 500 Internal Server Error');
     }
@@ -193,8 +195,9 @@ static protected function outputStackTrace(Exception $exception)
       }
     }
 
-    // when using CLI, we force the format to be TXT
-    if (0 == strncasecmp(PHP_SAPI, 'cli', 3))
+    // 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';
     }

lib/vendor/symfony/lib/form/addon/sfFormObject.class.php

@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage form
  * @author     Kris Wallsmith <[email protected]>
- * @version    SVN: $Id: sfFormObject.class.php 22917 2009-10-10 13:44:53Z Kris.Wallsmith $
+ * @version    SVN: $Id: sfFormObject.class.php 33250 2011-12-12 16:02:15Z fabien $
  */
 abstract class sfFormObject extends BaseForm
 {
@@ -241,8 +241,8 @@ public function saveEmbeddedForms($con = null, $forms = null)
     {
       if ($form instanceof sfFormObject)
       {
-        $form->saveEmbeddedForms($con);
         $form->getObject()->save($con);
+        $form->saveEmbeddedForms($con);
       }
       else
       {

lib/vendor/symfony/lib/form/sfForm.class.php

@@ -23,7 +23,7 @@
  * @package    symfony
  * @subpackage form
  * @author     Fabien Potencier <[email protected]>
- * @version    SVN: $Id: sfForm.class.php 29678 2010-05-30 14:38:42Z Kris.Wallsmith $
+ * @version    SVN: $Id: sfForm.class.php 33598 2012-11-25 09:57:29Z fabien $
  */
 class sfForm implements ArrayAccess, Iterator, Countable
 {

lib/vendor/symfony/lib/helper/AssetHelper.php

@@ -16,7 +16,7 @@
  * @subpackage helper
  * @author     Fabien Potencier <[email protected]>
  * @author     David Heinemeier Hansson
- * @version    SVN: $Id: AssetHelper.php 24289 2009-11-23 19:45:06Z Kris.Wallsmith $
+ * @version    SVN: $Id: AssetHelper.php 33121 2011-10-07 12:29:09Z fabien $
  */
 
 /**
@@ -374,7 +374,7 @@ function image_tag($source, $options = array())
 
 function _compute_public_path($source, $dir, $ext, $absolute = false)
 {
-  if (strpos($source, '://'))
+  if (strpos($source, '://') || strpos($source, '//') === 0)
   {
     return $source;
   }

lib/vendor/symfony/lib/helper/PartialHelper.php

@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage helper
  * @author     Fabien Potencier <[email protected]>
- * @version    SVN: $Id: PartialHelper.php 27755 2010-02-08 20:51:02Z Kris.Wallsmith $
+ * @version    SVN: $Id: PartialHelper.php 33122 2011-10-07 12:42:49Z fabien $
  */
 
 /**
@@ -136,6 +136,8 @@ function get_component($moduleName, $componentName, $vars = array())
   $context = sfContext::getInstance();
   $actionName = '_'.$componentName;
 
+  require($context->getConfigCache()->checkConfig('modules/'.$moduleName.'/config/module.yml'));
+
   $class = sfConfig::get('mod_'.strtolower($moduleName).'_partial_view_class', 'sf').'PartialView';
   $view = new $class($context, $moduleName, $actionName, '');
   $view->setPartialVars(true === sfConfig::get('sf_escaping_strategy') ? sfOutputEscaper::unescape($vars) : $vars);

lib/vendor/symfony/lib/helper/TextHelper.php

@@ -16,7 +16,7 @@
  * @subpackage helper
  * @author     Fabien Potencier <[email protected]>
  * @author     David Heinemeier Hansson
- * @version    SVN: $Id: TextHelper.php 31895 2011-01-24 18:37:43Z fabien $
+ * @version    SVN: $Id: TextHelper.php 33022 2011-09-15 05:27:12Z fabien $
  */
 
 /**
@@ -283,5 +283,10 @@ function _auto_link_urls($text, $href_options = array(), $truncate = false, $tru
  */
 function _auto_link_email_addresses($text)
 {
-  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:[email protected]">bar</a> gets <a href="mailto:[email protected]">bar</a> gets <a href="mailto:<a href="mailto:[email protected]">bar</a>
+  //return preg_replace('/([\w\.!#\$%\-+.]+@[A-Za-z0-9\-]+(\.[A-Za-z0-9\-]+)+)/', '<a href="mailto:\\1">\\1</a>', $text);
 }

lib/vendor/symfony/lib/i18n/sfChoiceFormat.class.php

@@ -13,7 +13,7 @@
  * {@link http://prado.sourceforge.net/}
  *
  * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version    $Id: sfChoiceFormat.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    $Id: sfChoiceFormat.class.php 33251 2011-12-12 16:30:59Z fabien $
  * @package    symfony
  * @subpackage i18n
  */
@@ -65,7 +65,7 @@ class sfChoiceFormat
   /**
    * The pattern to parse the formatting string.
    */
-  protected $parse = '/\s*\|?([\(\[\{]([-Inf\d:\s]+,?[\+Inf\d\s:\?\-=!><%\|&\(\)]*)+[\)\]\}])\s*/';
+  protected $parse = '/(?:^\s*|\s*\|)([\(\[\{]([-Inf\d:\s]+,?[\+Inf\d\s:\?\-=!><%\|&\(\)]*)+[\)\]\}])\s*/';
 
   /**
    * The value for positive infinity.