Changeset 7400

Timestamp:

02/08/08 08:57:06 (10 months ago)

Author:

fabien

Message:

fixed CLI verbose switch

Files:

• branches/1.1/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildAllLoadTask.class.php (modified) (1 diff)
• branches/1.1/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildAllTask.class.php (modified) (1 diff)
• branches/1.1/lib/task/generator/sfGenerateAppTask.class.php (modified) (1 diff)
• branches/1.1/lib/task/generator/sfGenerateProjectTask.class.php (modified) (1 diff)
• branches/1.1/lib/task/project/sfProjectEnableTask.class.php (modified) (1 diff)
• branches/1.1/lib/task/project/sfUpgradeTo11Task.class.php (modified) (1 diff)
• branches/1.1/lib/task/sfBaseTask.class.php (modified) (1 diff)
• branches/1.1/lib/task/sfCommandApplicationTask.class.php (modified) (1 diff)

branches/1.1/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildAllLoadTask.class.php

@@ -56 +56 @@
-  {
-    $buildAll = new sfPropelBuildAllTask($this->dispatcher, $this->formatter);
+    $buildAll->setCommandApplication($this->commandApplication);
-    $buildAll->run();
-
-    $loadData = new sfPropelLoadDataTask($this->dispatcher, $this->formatter);
+    $loadData->setCommandApplication($this->commandApplication);
-    $loadData->run(array('application' => $arguments['application']));
-  }

branches/1.1/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildAllTask.class.php

@@ -53 +53 @@
-  {
-    $buildModel = new sfPropelBuildModelTask($this->dispatcher, $this->formatter);
+    $buildModel->setCommandApplication($this->commandApplication);
-    $buildModel->run();
-
-    $buildSql = new sfPropelBuildSqlTask($this->dispatcher, $this->formatter);
+    $buildSql->setCommandApplication($this->commandApplication);
-    $buildSql->run();
-
-    $buildForms = new sfPropelBuildFormsTask($this->dispatcher, $this->formatter);
+    $buildForms->setCommandApplication($this->commandApplication);
-    $buildForms->run();
-
-    $insertSql = new sfPropelInsertSqlTask($this->dispatcher, $this->formatter);
+    $insertSql->setCommandApplication($this->commandApplication);
-    $insertSql->run();
-  }

branches/1.1/lib/task/generator/sfGenerateAppTask.class.php

@@ -105 +105 @@
-
-    $fixPerms = new sfProjectPermissionsTask($this->dispatcher, $this->formatter);
+    $fixPerms->setCommandApplication($this->commandApplication);
-    $fixPerms->run();
-

branches/1.1/lib/task/generator/sfGenerateProjectTask.class.php

@@ -82 +82 @@
-
-    $fixPerms = new sfProjectPermissionsTask($this->dispatcher, $this->formatter);
+    $fixPerms->setCommandApplication($this->commandApplication);
-    $fixPerms->run();
-  }

branches/1.1/lib/task/project/sfProjectEnableTask.class.php

@@ -58 +58 @@
-
-    $clearCache = new sfCacheClearTask($this->dispatcher, $this->formatter);
+    $clearCache->setCommandApplication($this->commandApplication);
-    $clearCache->run();
-

branches/1.1/lib/task/project/sfUpgradeTo11Task.class.php

@@ -46 +46 @@
-    {
-      $upgrader = new $class($this->dispatcher, $this->formatter);
+      $upgrader->setCommandApplication($this->commandApplication);
-      $upgrader->upgrade();
-    }

branches/1.1/lib/task/sfBaseTask.class.php

@@ -49 +49 @@
-        if (!isset($this->filesystem))
-        {
-
+
+
+
+
+
+
+
+
-        }
-

branches/1.1/lib/task/sfCommandApplicationTask.class.php

@@ -22 +22 @@
-    $commandApplication = null;
-
-
+ = null
-  {
-    $this->commandApplication = $commandApplication;
-  }
+
+  /**
+   * @see sfTask
+   */
+  protected function log($messages)
+  {
+    if (is_null($this->commandApplication) || $this->commandApplication->isVerbose())
+    {
+      parent::log($messages);
+    }
+  }
+
+  /**
+   * @see sfTask
+   */
+  protected function logSection($section, $message, $size = null)
+  {
+    if (is_null($this->commandApplication) || $this->commandApplication->isVerbose())
+    {
+      parent::logSection($section, $message, $size);
+    }
+  }
-}