RELEASE_1_4_15 => v1.4.15 commit

Author: pylebecq

CHANGELOG

@@ -1,3 +1,17 @@
+CHANGELOG
+=========
+
+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
 ------------------------
 

lib/autoload/sfCoreAutoload.class.php

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

lib/command/sfCommandApplication.class.php

@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage command
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @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/helper/AssetHelper.php

@@ -16,7 +16,7 @@
  * @subpackage helper
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @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/helper/PartialHelper.php

@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage helper
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @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/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/admin/parts/batchAction.php

@@ -54,6 +54,8 @@ protected function executeBatchDelete(sfWebRequest $request)
 
     foreach ($records as $record)
     {
+      $this->dispatcher->notify(new sfEvent($this, 'admin.delete_object', array('object' => $record)));
+
       $record->delete();
     }
 

lib/plugins/sfDoctrinePlugin/lib/form/sfFormFilterDoctrine.class.php

@@ -21,7 +21,7 @@
  * @subpackage form
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
- * @version    SVN: $Id: sfFormFilterDoctrine.class.php 32740 2011-07-09 09:24:03Z fabien $
+ * @version    SVN: $Id: sfFormFilterDoctrine.class.php 33150 2011-10-24 07:57:16Z fabien $
  */
 abstract class sfFormFilterDoctrine extends sfFormFilter
 {

lib/plugins/sfPropelPlugin/lib/addon/sfPropelData.class.php

@@ -15,7 +15,7 @@
  * @package    symfony
  * @subpackage propel
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPropelData.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id: sfPropelData.class.php 33137 2011-10-18 13:05:25Z fabien $
  */
 class sfPropelData extends sfData
 {
@@ -38,7 +38,7 @@ public function loadData($directoryOrFile = null, $connectionName = 'propel')
     $files = $this->getFiles($directoryOrFile);
 
     // load map classes
-    $this->loadMapBuilders();
+    $this->loadMapBuilders($connectionName);
     $this->dbMap = Propel::getDatabaseMap($connectionName);
 
     // wrap all database operations in a single transaction
@@ -267,14 +267,14 @@ protected function doDeleteCurrentData($files)
    *
    * @throws sfException If the class cannot be found
    */
-  protected function loadMapBuilders()
+  protected function loadMapBuilders($connectionName)
   {
     $dbMap = Propel::getDatabaseMap();
     $files = sfFinder::type('file')->name('*TableMap.php')->in(sfProjectConfiguration::getActive()->getModelDirs());
     foreach ($files as $file)
     {
       $omClass = basename($file, 'TableMap.php');
-      if (class_exists($omClass) && is_subclass_of($omClass, 'BaseObject'))
+      if (class_exists($omClass) && is_subclass_of($omClass, 'BaseObject') && constant($omClass.'Peer::DATABASE_NAME') == $connectionName)
       {
         $tableMapClass = basename($file, '.php');
         $dbMap->addTableFromMapClass($tableMapClass);
@@ -323,7 +323,7 @@ public function dumpData($directoryOrFile, $tables = 'all', $connectionName = 'p
    */
   public function getData($tables = 'all', $connectionName = 'propel')
   {
-    $this->loadMapBuilders();
+    $this->loadMapBuilders($connectionName);
     $this->con = Propel::getConnection($connectionName);
     $this->dbMap = Propel::getDatabaseMap($connectionName);
 

lib/plugins/sfPropelPlugin/lib/generator/sfPropelFormFilterGenerator.class.php

@@ -16,7 +16,7 @@
  * @package    symfony
  * @subpackage generator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPropelFormFilterGenerator.class.php 24392 2009-11-25 18:35:39Z FabianLange $
+ * @version    SVN: $Id: sfPropelFormFilterGenerator.class.php 33137 2011-10-18 13:05:25Z fabien $
  */
 class sfPropelFormFilterGenerator extends sfPropelFormGenerator
 {
@@ -60,8 +60,6 @@ public function generate($params = array())
 
     $this->loadBuilders();
 
-    $this->dbMap = Propel::getDatabaseMap($this->params['connection']);
-
     // create the project base class for all forms
     $file = sfConfig::get('sf_lib_dir').'/filter/BaseFormFilterPropel.class.php';
     if (!file_exists($file))

lib/plugins/sfPropelPlugin/lib/generator/sfPropelFormGenerator.class.php

@@ -16,7 +16,7 @@
  * @package    symfony
  * @subpackage generator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPropelFormGenerator.class.php 29661 2010-05-28 16:56:42Z Kris.Wallsmith $
+ * @version    SVN: $Id: sfPropelFormGenerator.class.php 33137 2011-10-18 13:05:25Z fabien $
  */
 class sfPropelFormGenerator extends sfGenerator
 {
@@ -61,10 +61,8 @@ public function generate($params = array())
       $this->params['form_dir_name'] = 'form';
     }
 
-    $this->dbMap = Propel::getDatabaseMap($this->params['connection']);
-
     $this->loadBuilders();
-    
+
     // create the project base class for all forms
     $file = sfConfig::get('sf_lib_dir').'/form/BaseFormPropel.class.php';
     if (!file_exists($file))
@@ -515,12 +513,11 @@ protected function loadBuilders()
     foreach ($classes as $class)
     {
       $omClass = basename($class, 'TableMap.php');
-      if (class_exists($omClass) && is_subclass_of($omClass, 'BaseObject'))
+      if (class_exists($omClass) && is_subclass_of($omClass, 'BaseObject') && constant($omClass.'Peer::DATABASE_NAME') == $this->params['connection'])
       {
         $tableMapClass = basename($class, '.php');
         $this->dbMap->addTableFromMapClass($tableMapClass);
       }
     }
   }
 }
-

lib/plugins/sfPropelPlugin/test/functional/fixtures/data/database.sqlite

@@ -7,7 +7,7 @@
  *
  * This class was autogenerated by Propel 1.4.2 on:
  *
- * Fri Sep 16 11:31:31 2011
+ * Thu Oct 27 07:31:26 2011
  *
  *
  * This map class is used by Propel to do runtime db structure discovery.

lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/map/ArticleTableMap.php

@@ -7,7 +7,7 @@
  *
  * This class was autogenerated by Propel 1.4.2 on:
  *
- * Fri Sep 16 11:31:32 2011
+ * Thu Oct 27 07:31:28 2011
  *
  *
  * This map class is used by Propel to do runtime db structure discovery.

lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/map/AttachmentTableMap.php

@@ -7,7 +7,7 @@
  *
  * This class was autogenerated by Propel 1.4.2 on:
  *
- * Fri Sep 16 11:31:32 2011
+ * Thu Oct 27 07:31:27 2011
  *
  *
  * This map class is used by Propel to do runtime db structure discovery.

lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/map/AuthorArticleTableMap.php

@@ -7,7 +7,7 @@
  *
  * This class was autogenerated by Propel 1.4.2 on:
  *
- * Fri Sep 16 11:31:31 2011
+ * Thu Oct 27 07:31:26 2011
  *
  *
  * This map class is used by Propel to do runtime db structure discovery.

lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/map/AuthorTableMap.php

@@ -7,7 +7,7 @@
  *
  * This class was autogenerated by Propel 1.4.2 on:
  *
- * Fri Sep 16 11:31:31 2011
+ * Thu Oct 27 07:31:26 2011
  *
  *
  * This map class is used by Propel to do runtime db structure discovery.

lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/map/BookTableMap.php

@@ -7,7 +7,7 @@
  *
  * This class was autogenerated by Propel 1.4.2 on:
  *
- * Fri Sep 16 11:31:31 2011
+ * Thu Oct 27 07:31:26 2011
  *
  *
  * This map class is used by Propel to do runtime db structure discovery.

lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/map/CategoryTableMap.php

@@ -7,7 +7,7 @@
  *
  * This class was autogenerated by Propel 1.4.2 on:
  *
- * Fri Sep 16 11:31:32 2011
+ * Thu Oct 27 07:31:28 2011
  *
  *
  * This map class is used by Propel to do runtime db structure discovery.

lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/map/MovieI18nTableMap.php

@@ -7,7 +7,7 @@
  *
  * This class was autogenerated by Propel 1.4.2 on:
  *
- * Fri Sep 16 11:31:32 2011
+ * Thu Oct 27 07:31:27 2011
  *
  *
  * This map class is used by Propel to do runtime db structure discovery.

lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/map/MovieTableMap.php

@@ -7,7 +7,7 @@
  *
  * This class was autogenerated by Propel 1.4.2 on:
  *
- * Fri Sep 16 11:31:32 2011
+ * Thu Oct 27 07:31:27 2011
  *
  *
  * This map class is used by Propel to do runtime db structure discovery.

lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/map/ProductI18nTableMap.php

@@ -7,7 +7,7 @@
  *
  * This class was autogenerated by Propel 1.4.2 on:
  *
- * Fri Sep 16 11:31:32 2011
+ * Thu Oct 27 07:31:27 2011
  *
  *
  * This map class is used by Propel to do runtime db structure discovery.

lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/map/ProductTableMap.php

@@ -7,7 +7,7 @@
  *
  * This class was autogenerated by Propel 1.4.2 on:
  *
- * Fri Sep 16 11:31:31 2011
+ * Thu Oct 27 07:31:26 2011
  *
  * @package    lib.model.om
  */

lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/om/BaseArticle.php

@@ -7,7 +7,7 @@
  *
  * This class was autogenerated by Propel 1.4.2 on:
  *
- * Fri Sep 16 11:31:31 2011
+ * Thu Oct 27 07:31:26 2011
  *
  * @package    lib.model.om
  */

lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/om/BaseArticlePeer.php

@@ -7,7 +7,7 @@
  *
  * This class was autogenerated by Propel 1.4.2 on:
  *
- * Fri Sep 16 11:31:32 2011
+ * Thu Oct 27 07:31:28 2011
  *
  * @package    lib.model.om
  */

lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/om/BaseAttachment.php

@@ -7,7 +7,7 @@
  *
  * This class was autogenerated by Propel 1.4.2 on:
  *
- * Fri Sep 16 11:31:32 2011
+ * Thu Oct 27 07:31:28 2011
  *
  * @package    lib.model.om
  */

lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/om/BaseAttachmentPeer.php

@@ -7,7 +7,7 @@
  *
  * This class was autogenerated by Propel 1.4.2 on:
  *
- * Fri Sep 16 11:31:31 2011
+ * Thu Oct 27 07:31:26 2011
  *
  * @package    lib.model.om
  */

lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/om/BaseAuthor.php

@@ -7,7 +7,7 @@
  *
  * This class was autogenerated by Propel 1.4.2 on:
  *
- * Fri Sep 16 11:31:32 2011
+ * Thu Oct 27 07:31:27 2011
  *
  * @package    lib.model.om
  */

lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/om/BaseAuthorArticle.php

@@ -7,7 +7,7 @@
  *
  * This class was autogenerated by Propel 1.4.2 on:
  *
- * Fri Sep 16 11:31:31 2011
+ * Thu Oct 27 07:31:26 2011
  *
  * @package    lib.model.om
  */

lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/om/BaseAuthorArticlePeer.php

@@ -7,7 +7,7 @@
  *
  * This class was autogenerated by Propel 1.4.2 on:
  *
- * Fri Sep 16 11:31:31 2011
+ * Thu Oct 27 07:31:26 2011
  *
  * @package    lib.model.om
  */

lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/om/BaseAuthorPeer.php

@@ -7,7 +7,7 @@
  *
  * This class was autogenerated by Propel 1.4.2 on:
  *
- * Fri Sep 16 11:31:31 2011
+ * Thu Oct 27 07:31:26 2011
  *
  * @package    lib.model.om
  */

lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/om/BaseBook.php

@@ -7,7 +7,7 @@
  *
  * This class was autogenerated by Propel 1.4.2 on:
  *
- * Fri Sep 16 11:31:31 2011
+ * Thu Oct 27 07:31:26 2011
  *
  * @package    lib.model.om
  */

lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/om/BaseBookPeer.php

@@ -7,7 +7,7 @@
  *
  * This class was autogenerated by Propel 1.4.2 on:
  *
- * Fri Sep 16 11:31:31 2011
+ * Thu Oct 27 07:31:26 2011
  *
  * @package    lib.model.om
  */