Changeset 13051

Timestamp:

11/17/08 00:46:03 (1 year ago)

Author:

fabien

Message:

[1.2] fixed project:freeze does not update symbolic links of default plugins in /web (closes #4899)

Files:

• branches/1.2/lib/task/plugin/sfPluginPublishAssetsTask.class.php (modified) (2 diffs)
• branches/1.2/lib/task/project/sfProjectFreezeTask.class.php (modified) (2 diffs)
• branches/1.2/lib/task/project/sfProjectUnfreezeTask.class.php (modified) (1 diff)

branches/1.2/lib/task/plugin/sfPluginPublishAssetsTask.class.php

@@ -28 +28 @@
-    $this->addOptions(array(
-      new sfCommandOption('core-only', '', sfCommandOption::PARAMETER_NONE, 'If set only core plugins will publish their assets'),
+      new sfCommandOption('symfony-lib-dir', '', sfCommandOption::PARAMETER_REQUIRED, 'The symfony lib dir'),
-    ));
-
@@ -51 +52 @@
-  protected function execute($arguments = array(), $options = array())
-  {
-sfConfig::get('sf_symfony_lib_dir'
+($options['symfony-lib-dir'] ? $options['symfony-lib-dir'] : sfConfig::get('sf_symfony_lib_dir')
-    foreach (sfFinder::type('dir')->relative()->maxdepth(0)->in($corePluginsDir) as $plugin)
-    {

branches/1.2/lib/task/project/sfProjectFreezeTask.class.php

@@ -89 +89 @@
-    $this->getFilesystem()->rename(sfConfig::get('sf_data_dir').'/symfony/web/sf', sfConfig::get('sf_web_dir').'/sf');
-
+    $publishAssets = new sfPluginPublishAssetsTask($this->dispatcher, $this->formatter);
+    $publishAssets->setCommandApplication($this->commandApplication);
+
-    // change symfony path in ProjectConfiguration.class.php
-    $config = sfConfig::get('sf_config_dir').'/ProjectConfiguration.class.php';
@@ -95 +98 @@
-    $content = preg_replace('#(\'|")'.preg_quote($symfonyLibDir, '#').'#', "dirname(__FILE__).$1/../lib/symfony", $content);
-    file_put_contents($config, $content);
+
+    // re-publish assets
+    $publishAssets->run(array(), array('--symfony-lib-dir='.sfConfig::get('sf_lib_dir').'/symfony'));
-  }
-

branches/1.2/lib/task/project/sfProjectUnfreezeTask.class.php

@@ -56 +56 @@
-    if (preg_match('/^# FROZEN_SF_LIB_DIR\: (.+?)$/m', $content, $match))
-    {
+      $publishAssets = new sfPluginPublishAssetsTask($this->dispatcher, $this->formatter);
+      $publishAssets->setCommandApplication($this->commandApplication);
+
+      $symfonyLibDir = $match[1];
+
-      $content = str_replace("# FROZEN_SF_LIB_DIR: {$match[1]}\n\n", '', $content);
-match[1]
+symfonyLibDir
-      file_put_contents($config, $content);
+
+      // re-publish assets
+      $publishAssets->run(array(), array('--symfony-lib-dir='.$symfonyLibDir));
+
+      // remove files
+      $finder = sfFinder::type('any');
+      $this->getFilesystem()->remove($finder->in(sfConfig::get('sf_lib_dir').'/symfony'));
+      $this->getFilesystem()->remove(sfConfig::get('sf_lib_dir').'/symfony');
+      $this->getFilesystem()->remove($finder->in(sfConfig::get('sf_data_dir').'/symfony'));
+      $this->getFilesystem()->remove(sfConfig::get('sf_data_dir').'/symfony');
+      $this->getFilesystem()->remove($finder->in(sfConfig::get('sf_web_dir').'/sf'));
+      $this->getFilesystem()->remove(sfConfig::get('sf_web_dir').'/sf');
-    }
-
-    $finder = sfFinder::type('any');
-    $this->getFilesystem()->remove($finder->in(sfConfig::get('sf_lib_dir').'/symfony'));
-    $this->getFilesystem()->remove(sfConfig::get('sf_lib_dir').'/symfony');
-    $this->getFilesystem()->remove($finder->in(sfConfig::get('sf_data_dir').'/symfony'));
-    $this->getFilesystem()->remove(sfConfig::get('sf_data_dir').'/symfony');
-    $this->getFilesystem()->remove($finder->in(sfConfig::get('sf_web_dir').'/sf'));
-    $this->getFilesystem()->remove(sfConfig::get('sf_web_dir').'/sf');
-  }
-}