acquia / df

modules/df/df_commerce/df_commerce.module

Spacing +2 added lines, -2 removed lines

@@ -104,8 +104,8 @@
   $products = entity_load('commerce_product');
   $products_key = array_keys($products);
   $products_number = count($products_key);
-  $count = $products_number < $items_number ? $products_number: $items_number;
-  for($i = 0; $i < $count; $i++) {
+  $count = $products_number < $items_number ? $products_number : $items_number;
+  for ($i = 0; $i < $count; $i++) {
     $product = $products[$products_key[rand(0, $products_number - 1)]];
     $line_item = commerce_product_line_item_new($product, 1, $order->order_id);
     commerce_line_item_save($line_item);

Doc Comments +4 added lines, -1 removed lines

@@ -89,6 +89,9 @@ 
  * @param $items_number
  * @param $order_state
  */
+/**
+ * @param integer $items_number
+ */
 function _df_commerce_create_order($uid, $items_number, $is_cart = FALSE) {
   // Create order as a cart.
   $order = commerce_order_new($uid, 'cart');
@@ -171,7 +174,7 @@ 
  * Helper function to update the order status and set the message.
  *
  * @param $order
- * @param $status
+ * @param string $status
  */
 function _df_commerce_update_order_status($order, $status) {
   // We need to harcode the previous state, as the entity will not

modules/df/df_admin/df_admin.uninstall.inc

Braces +3 added lines, -6 removed lines

@@ -22,8 +22,7 @@ 
   if (!$scenario = variable_get('df_admin_installed_scenario', FALSE)) {
     drupal_set_message(t('No Demo Framework Scenario is currently installed.'));
     return FALSE;
-  }
-  else{
+  } else{
     drupal_set_message(t('Uninstalling Demo Framework Scenario @scenario', array('@scenario' => $scenario)));
   }
 
@@ -111,13 +110,11 @@ 
     if ($enable_module) {
       $options = array('query' => array('token' => drupal_get_token(DRUPAL_ROOT . '/df/enable/' . $enable_module)));
       $path = array('admin/df/enable/' . $enable_module, $options);
-    }
-    else {
+    } else {
       $path = '';
     }
     batch_process($path);
-  }
-  else {
+  } else {
     drush_backend_batch_process();
   }
 

Spacing +6 added lines, -6 removed lines

@@ -8,7 +8,7 @@ 
  * Page callback; uninstall a scenario.
  */
 function df_admin_page_uninstall() {
-  if (!isset($_GET['token']) || !drupal_valid_token($_GET['token'], DRUPAL_ROOT . '/df/uninstall')) {
+  if (!isset($_GET['token']) || !drupal_valid_token($_GET['token'], DRUPAL_ROOT.'/df/uninstall')) {
     return drupal_access_denied();
   }
   return df_admin_uninstall_scenario();
@@ -23,12 +23,12 @@ 
     drupal_set_message(t('No Demo Framework Scenario is currently installed.'));
     return FALSE;
   }
-  else{
+  else {
     drupal_set_message(t('Uninstalling Demo Framework Scenario @scenario', array('@scenario' => $scenario)));
   }
 
   // Load info file to grab dependencies.
-  if (!$info = drupal_parse_info_file(drupal_get_path('module', $scenario) . '/' . $scenario . '.info')) {
+  if (!$info = drupal_parse_info_file(drupal_get_path('module', $scenario).'/'.$scenario.'.info')) {
     drupal_set_message(t('Unable to load Scenario .info file'), 'error');
     return FALSE;
   }
@@ -99,7 +99,7 @@ 
     'operations' => $operations,
     'title' => t('Uninstall processing'),
     'init_message' => t('Starting uninstall process'),
-    'file' => drupal_get_path('module', 'migrate_ui') . '/migrate_ui.pages.inc',
+    'file' => drupal_get_path('module', 'migrate_ui').'/migrate_ui.pages.inc',
     'progress_message' => t('Uninstalling Demo Framework Scenario...'),
     'error_message' => t('An error occurred. Some or all of the uninstall processing has failed.'),
     'finished' => 'df_admin_batch_finish',
@@ -109,8 +109,8 @@ 
     // If we're being called from the enable function, redirect to enable after
     // the current module is uninstalled.
     if ($enable_module) {
-      $options = array('query' => array('token' => drupal_get_token(DRUPAL_ROOT . '/df/enable/' . $enable_module)));
-      $path = array('admin/df/enable/' . $enable_module, $options);
+      $options = array('query' => array('token' => drupal_get_token(DRUPAL_ROOT.'/df/enable/'.$enable_module)));
+      $path = array('admin/df/enable/'.$enable_module, $options);
     }
     else {
       $path = '';

modules/df/df_admin/df_admin.enable.inc

Braces +1 added lines, -2 removed lines

@@ -76,8 +76,7 @@
       watchdog('demo framework', 'Enabled module: ' . $module);
       drupal_set_message(t('@module enabled.', array('@module' => $module)), 'status');
       return TRUE;
-    }
-    else {
+    } else {
       drupal_set_message(t('@module does not exist or dependencies are missing.', array('@module' => $module)), 'error');
       return FALSE;
     }

Spacing +5 added lines, -5 removed lines

@@ -9,7 +9,7 @@ 
  * Page callback; enable a scenario.
  */
 function df_admin_page_enable($module) {
-  if (!isset($_GET['token']) || !drupal_valid_token($_GET['token'], DRUPAL_ROOT . '/df/enable/' . $module)) {
+  if (!isset($_GET['token']) || !drupal_valid_token($_GET['token'], DRUPAL_ROOT.'/df/enable/'.$module)) {
     return drupal_access_denied();
   }
   return df_admin_enable_scenario($module);
@@ -34,7 +34,7 @@ 
   }
 
   // Load info file to grab dependencies.
-  if (!$info = drupal_parse_info_file(drupal_get_path('module', $module) . '/' . $module . '.info')) {
+  if (!$info = drupal_parse_info_file(drupal_get_path('module', $module).'/'.$module.'.info')) {
     drupal_set_message(t('Unable to load Scenario .info file'), 'error');
     return FALSE;
   }
@@ -58,8 +58,8 @@ 
   // Not all DFS require a batch content import, but some need this.
   // Resolves to the DF admin page if no reset callback present.
   if (!drupal_is_cli()) {
-    $path = 'admin/df/reset/' . $module;
-    $token = drupal_get_token(DRUPAL_ROOT . '/df/reset/' . $module);
+    $path = 'admin/df/reset/'.$module;
+    $token = drupal_get_token(DRUPAL_ROOT.'/df/reset/'.$module);
     drupal_goto($path, array('query' => array('token' => $token)));
   }
 
@@ -73,7 +73,7 @@ 
   // Enable a disabled Features module.
   if (!module_exists($module)) {
     if (module_enable(array($module))) {
-      watchdog('demo framework', 'Enabled module: ' . $module);
+      watchdog('demo framework', 'Enabled module: '.$module);
       drupal_set_message(t('@module enabled.', array('@module' => $module)), 'status');
       return TRUE;
     }

modules/df/df_admin/df_admin.drush.inc

Indentation +1 added lines, -1 removed lines

@@ -137,7 +137,7 @@
  *   The machine name of the scenario feature.
  * @param string $rollback
  *   Boolean: rollback existing demo content.
-  */
+ */
 function drush_df_admin_reset_scenario($scenario) {
   $rollback = drush_get_option('rollback', TRUE);
   $seed = drush_get_option('seed', TRUE);

Doc Comments -2 removed lines

@@ -135,8 +135,6 @@
  *
  * @param string $scenario
  *   The machine name of the scenario feature.
- * @param string $rollback
- *   Boolean: rollback existing demo content.
   */
 function drush_df_admin_reset_scenario($scenario) {
   $rollback = drush_get_option('rollback', TRUE);

modules/df/df_admin/df_admin.reset.inc

Braces +2 added lines, -4 removed lines

@@ -108,8 +108,7 @@ 
     foreach ($messages as $message) {
       $operations[] = array('drupal_get_messages', array($message, TRUE));
     }
-  }
-  else {
+  } else {
     // Determine the current alias
     $alias_context = drush_get_context('alias');
     $alias = !empty($alias_context) ? $alias_context : '@self';
@@ -139,8 +138,7 @@ 
       $options = array('query' => array('token' => drupal_get_token(DRUPAL_ROOT . '/df/imagestyles')));
       // The ability to send an array for $redirect is undocumented on Drupal.org, yay!
       batch_process(array('admin/df/imagestyles', $options));
-    }
-    else {
+    } else {
       drush_backend_batch_process();
     }
   }

Spacing +4 added lines, -4 removed lines

@@ -9,7 +9,7 @@ 
  * Page callback; reset a scenario.
  */
 function df_admin_page_reset($module) {
-  if (!isset($_GET['token']) || !drupal_valid_token($_GET['token'], DRUPAL_ROOT . '/df/reset/' . $module)) {
+  if (!isset($_GET['token']) || !drupal_valid_token($_GET['token'], DRUPAL_ROOT.'/df/reset/'.$module)) {
     return drupal_access_denied();
   }
   return df_admin_reset_scenario($module, TRUE, TRUE);
@@ -79,7 +79,7 @@ 
     // Confirm if there was an attempt to run scenario migrations.
     $migrations_count = count($migrations[$scenario]);
     if ($migrations_count > 0 && drupal_is_cli()) {
-      $message = $migrations_count . ' demo migrations attempted.';
+      $message = $migrations_count.' demo migrations attempted.';
       $operations[] = array('drush_print', array($message, 0, NULL, TRUE));
     }
 
@@ -129,14 +129,14 @@ 
       'operations' => $operations,
       'title' => t('Import processing'),
       'init_message' => t('Starting import process'),
-      'file' => drupal_get_path('module', 'migrate_ui') . '/migrate_ui.pages.inc',
+      'file' => drupal_get_path('module', 'migrate_ui').'/migrate_ui.pages.inc',
       'progress_message' => t('Importing Demo Framework Scenario...'),
       'error_message' => t('An error occurred. Some or all of the import processing has failed.'),
       'finished' => 'df_admin_batch_finish',
     );
     batch_set($batch);
     if (!drupal_is_cli()) {
-      $options = array('query' => array('token' => drupal_get_token(DRUPAL_ROOT . '/df/imagestyles')));
+      $options = array('query' => array('token' => drupal_get_token(DRUPAL_ROOT.'/df/imagestyles')));
       // The ability to send an array for $redirect is undocumented on Drupal.org, yay!
       batch_process(array('admin/df/imagestyles', $options));
     }

modules/df/df_tools/df_tools_hero/df_tools_hero.module

Braces +1 added lines, -2 removed lines

@@ -51,8 +51,7 @@
           $vars['content'][$field_name][0]['file']['#muted'] = TRUE;
           $vars['content'][$field_name][0]['file']['#autoplay'] = 'auto';
         }
-      }
-      else if ($field_name != 'title') {
+      } else if ($field_name != 'title') {
         $container[$field_name] = $field_value;
         unset($vars['content'][$field_name]);
       }

Spacing +2 added lines, -2 removed lines

@@ -23,10 +23,10 @@
  * Implements hook_lightning_fpp_types().
  */
 function df_tools_hero_lightning_fpp_types_alter(&$types) {
-  $icon_path = drupal_get_path('module', 'df_tools_hero') . '/images/';
+  $icon_path = drupal_get_path('module', 'df_tools_hero').'/images/';
   $types['hero'] = array(
     'title' => 'hero',
-    'icon' => $icon_path . 'icon_hero.png',
+    'icon' => $icon_path.'icon_hero.png',
     'path' => 'hero',
   );
 }

modules/df/df_tools/df_tools_hero/df_tools_hero.fpp.hero.inc

Braces +1 added lines, -2 removed lines

@@ -34,8 +34,7 @@
     // Create a MigrateSource object.
     if (isset($arguments['path'])) {
       $import_path = $arguments['path'];
-    }
-    else {
+    } else {
       $import_path = drupal_get_path('module', 'df_tools_hero') . '/import/df_tools_hero.fpp.hero.csv';
     }
     $this->source = new MigrateSourceCSV($import_path, array(), array('header_rows' => 1));

Spacing +2 added lines, -2 removed lines

@@ -36,14 +36,14 @@
       $import_path = $arguments['path'];
     }
     else {
-      $import_path = drupal_get_path('module', 'df_tools_hero') . '/import/df_tools_hero.fpp.hero.csv';
+      $import_path = drupal_get_path('module', 'df_tools_hero').'/import/df_tools_hero.fpp.hero.csv';
     }
     $this->source = new MigrateSourceCSV($import_path, array(), array('header_rows' => 1));
     $this->destination = new MigrateDestinationFieldablePanelsPanes('hero', array('text_format' => 'full_html'));
 
     $this->addFieldMapping('field_hero_image', 'Image');
     $this->addFieldMapping('field_hero_image:file_replace')->defaultValue(FILE_EXISTS_REPLACE);
-    $this->addFieldMapping('field_hero_image:source_dir')->defaultValue(dirname($import_path) . '/images');
+    $this->addFieldMapping('field_hero_image:source_dir')->defaultValue(dirname($import_path).'/images');
     $this->addFieldMapping('field_hero_image:destination_file', 'filename');
 
     $this->addFieldMapping('field_hero_headline_1', 'Headline 1');

modules/df/df_tools/df_tools_rest/df_tools_rest.module

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
   //  have control over that file via build scripts.
   // If RestWS had a real way to deal with CORS/preflight, we would use that.
   if ($_SERVER['REQUEST_METHOD'] == 'OPTIONS') {
-    echo "";die;
+    echo ""; die;
   }
 }
 

modules/df/df_tools/df_tools_user/df_tools_user.users.inc

Braces +2 added lines, -4 removed lines

@@ -12,8 +12,7 @@ 
     // Create a MigrateSource object.
     if (isset($arguments['path'])) {
       $import_path = $arguments['path'];
-    }
-    else {
+    } else {
       $import_path = drupal_get_path('module', 'df_tools_user') . '/import/df_tools_user.users.csv';
     }
     $this->source = new MigrateSourceCSV($import_path, $this->csvcolumns(), array('header_rows' => 1));
@@ -68,8 +67,7 @@ 
     parent::__construct($arguments);
     if (isset($arguments['path'])) {
       $import_path = $arguments['path'];
-    }
-    else {
+    } else {
       $import_path = drupal_get_path('module', 'df_tools_user') . '/import/df_tools_user.users.csv';
     }
     $this->source = new MigrateSourceCSV($import_path, $this->csvcolumns(), array('header_rows' => 1));

Spacing +3 added lines, -3 removed lines

@@ -14,7 +14,7 @@ 
       $import_path = $arguments['path'];
     }
     else {
-      $import_path = drupal_get_path('module', 'df_tools_user') . '/import/df_tools_user.users.csv';
+      $import_path = drupal_get_path('module', 'df_tools_user').'/import/df_tools_user.users.csv';
     }
     $this->source = new MigrateSourceCSV($import_path, $this->csvcolumns(), array('header_rows' => 1));
 
@@ -70,13 +70,13 @@ 
       $import_path = $arguments['path'];
     }
     else {
-      $import_path = drupal_get_path('module', 'df_tools_user') . '/import/df_tools_user.users.csv';
+      $import_path = drupal_get_path('module', 'df_tools_user').'/import/df_tools_user.users.csv';
     }
     $this->source = new MigrateSourceCSV($import_path, $this->csvcolumns(), array('header_rows' => 1));
 
     // Get the base path, which is where we assume /images is located
     $base_path = dirname($import_path);
-    $this->addFieldMapping('source_dir')->defaultValue($base_path . '/images');
+    $this->addFieldMapping('source_dir')->defaultValue($base_path.'/images');
   }
 
   function csvcolumns() {