Changeset 4624

Timestamp:

07/16/07 14:38:05 (1 year ago)

Author:

fabien

Message:

moved some propel-load-data arguments to options (closes #1972)

Before: symfony propel-load-data frontend dev fixtures append
After: symfony propel-load-data frontend --env=dev --dir[]=fixtures --append

Files:

• trunk/data/tasks/sfPakePropel.php (modified) (5 diffs)

trunk/data/tasks/sfPakePropel.php

@@ -283 +283 @@
- * Loads yml data from fixtures directory and inserts into database.
- *
-
-
-
-
+
+
- *
- * @param object $task
-
+ 
- */
-
+, $options
-{
-  if (!count($args))
@@ -302 +300 @@
-  if (!is_dir(sfConfig::get('sf_app_dir').DIRECTORY_SEPARATOR.$app))
-  {
-'The app "'.$app.'" does not exist.'
-
-
-count($args) > 1 && $args[count($args) - 1] == 'append'
+sprintf('The app "%s" does not exist.', $app)
+
+
+isset($options['append'])
-  {
-    array_pop($args);
@@ -315 +313 @@
-  }
-
-empty($args[1]) ? 'dev' : $args[1]
+isset($options['env']) ? $options['env'] : 'dev'
-
-  // define constants
@@ -326 +324 @@
-  require_once SF_ROOT_DIR.DIRECTORY_SEPARATOR.'apps'.DIRECTORY_SEPARATOR.SF_APP.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'config.php';
-
-
+
+
+
+
+
-  {
-    if (!$pluginDirs = glob(sfConfig::get('sf_root_dir').'/plugins/*/data'))
@@ -333 +335 @@
-    }
-    $fixtures_dirs = pakeFinder::type('dir')->name('fixtures')->in(array_merge($pluginDirs, array(sfConfig::get('sf_data_dir'))));
-  }
-  else
-  {
-    $fixtures_dirs = array_slice($args, 1);
-  }
-