acquia / df

modules/df/df_tools/df_tools_map/df_tools_map.views.inc

Spacing +3 added lines, -3 removed lines

@@ -10,13 +10,13 @@
   foreach ($geofield_map as $entity_type_id => $fields) {
     foreach ($fields as $field_name => $info) {
       $args = array('@field_name' => $field_name);
-      $data_key = $entity_type_id . '__' . $field_name;
+      $data_key = $entity_type_id.'__'.$field_name;
 
       $field_coordinates_table_data = $data[$data_key][$field_name];
-      $data[$data_key][$data_key . '_simple_proximity'] = [
+      $data[$data_key][$data_key.'_simple_proximity'] = [
         'group' => 'Content',
         'title' => t('Simple Proximity (@field_name)', $args),
-        'title short' => $field_coordinates_table_data['title short'] . t(' Simple Proximity'),
+        'title short' => $field_coordinates_table_data['title short'].t(' Simple Proximity'),
         'help' => $field_coordinates_table_data['help'],
         'real field' => $field_name,
         'filter' => [

modules/df/df_tools/df_tools_map/src/Plugin/views/filter/SimpleProximity.php

Spacing +11 added lines, -11 removed lines

@@ -56,9 +56,9 @@ 
     // Don't show this element in the context of an admin menu.
     if (!isset($form['admin_label'])) {
       $form['value']['#suffix'] =
-        '<a class="simple-proximity-location-button button" title="' . $this->t('Use your current location') . '">' .
-        '  <i class="fa fa-map-marker" aria-hidden="true"></i>' .
-        '</a>' . $form['value']['#suffix'];
+        '<a class="simple-proximity-location-button button" title="'.$this->t('Use your current location').'">'.
+        '  <i class="fa fa-map-marker" aria-hidden="true"></i>'.
+        '</a>'.$form['value']['#suffix'];
       $form['value']['#attached'] = ['library' => ['df_tools_map/main']];
     }
   }
@@ -109,15 +109,15 @@ 
 
     // Geocode the location if it's present.
     if (!empty($location)) {
-      if ($collection = \Drupal::service('geocoder')->geocode($location,['googlemaps'])) {
+      if ($collection = \Drupal::service('geocoder')->geocode($location, ['googlemaps'])) {
         $coordinates = $collection->first()->getCoordinates();
 
         // Generate a distance formula programatically.
         $haversine_options = [
           'origin_latitude' => $coordinates->getLatitude(),
           'origin_longitude' => $coordinates->getLongitude(),
-          'destination_latitude' => $this->table . '.' . $this->realField . '_lat',
-          'destination_longitude' => $this->table . '.' . $this->realField . '_lon',
+          'destination_latitude' => $this->table.'.'.$this->realField.'_lat',
+          'destination_longitude' => $this->table.'.'.$this->realField.'_lon',
           'earth_radius' => GEOFIELD_KILOMETERS,
         ];
 
@@ -125,13 +125,13 @@ 
 
         /** @var \Drupal\views\Plugin\views\query\Sql $query */
         $query = $this->query;
-        $query->addOrderBy(NULL, $formula, 'ASC', $this->table . '_simple_proximity');
+        $query->addOrderBy(NULL, $formula, 'ASC', $this->table.'_simple_proximity');
 
         // Add a where expression if a distance is used.
         if ($this->options['expose']['distance']) {
           $distance = $this->options['expose']['distance'];
-          $placeholder = $query->placeholder($this->table . '_simple_proximity');
-          $query->addWhereExpression(0, '(' . $formula . ' <= ' . $placeholder . ')', [$placeholder => $distance]);
+          $placeholder = $query->placeholder($this->table.'_simple_proximity');
+          $query->addWhereExpression(0, '('.$formula.' <= '.$placeholder.')', [$placeholder => $distance]);
         }
       }
     }
@@ -149,10 +149,10 @@ 
 
     foreach ($options as $key => $option) {
       if (is_numeric($option)) {
-        $formula = str_replace(':' . $key, $option, $formula);
+        $formula = str_replace(':'.$key, $option, $formula);
       }
       else {
-        $formula = str_replace(':' . $key, db_escape_field($option), $formula);
+        $formula = str_replace(':'.$key, db_escape_field($option), $formula);
       }
     }
 

Braces +2 added lines, -4 removed lines

@@ -102,8 +102,7 @@ 
     $this->ensureMyTable();
     if (is_array($this->value)) {
       $location = $this->value[0];
-    }
-    else {
+    } else {
       $location = $this->value;
     }
 
@@ -150,8 +149,7 @@ 
     foreach ($options as $key => $option) {
       if (is_numeric($option)) {
         $formula = str_replace(':' . $key, $option, $formula);
-      }
-      else {
+      } else {
         $formula = str_replace(':' . $key, db_escape_field($option), $formula);
       }
     }

Doc Comments +1 added lines, -1 removed lines

@@ -142,7 +142,7 @@
    *
    * @param $options
    *
-   * @return mixed|string
+   * @return string
    */
   protected function haversine($options) {
     $formula = '( :earth_radius * ACOS( COS( RADIANS(:origin_latitude) ) * COS( RADIANS(:destination_latitude) ) * COS( RADIANS(:destination_longitude) - RADIANS(:origin_longitude) ) + SIN( RADIANS(:origin_latitude) ) * SIN( RADIANS(:destination_latitude) ) ) )';

modules/df/df_tools/df_tools_map/src/Plugin/migrate/source/MapBlock.php

Spacing +2 added lines, -2 removed lines

@@ -17,7 +17,7 @@ 
   public function prepareRow(Row $row) {
     // Prefix the state per the normal Address schema.
     if ($state = $row->getSourceProperty('Address State')) {
-      $row->setSourceProperty('Address State', 'US-' . $state);
+      $row->setSourceProperty('Address State', 'US-'.$state);
     }
 
     // Use a cached geolocation if possible.
@@ -34,7 +34,7 @@ 
       $zip = $row->getSourceProperty('Address Zip');
 
       if ($address && $city && $zip && $state) {
-        $address2 = $address2 ? $address2 . "\n" : '';
+        $address2 = $address2 ? $address2."\n" : '';
         $address_string = "$address\n$address2$city, $state $zip\nUS";
         if ($collection = \Drupal::service('geocoder')->geocode($address_string, ['googlemaps'])) {
           // Set our value in a similar way to Geofield's LatLon Widget.

Braces +1 added lines, -2 removed lines

@@ -25,8 +25,7 @@
       list($lat, $lon) = explode(',', $geolocation);
       $point = [$lon, $lat];
       $row->setSourceProperty('Geofield', \Drupal::service('geofield.wkt_generator')->WktBuildPoint($point));
-    }
-    else {
+    } else {
       // Manually geocode from source information.
       $address = $row->getSourceProperty('Address Line 1');
       $address2 = $row->getSourceProperty('Address Line 2');

modules/df/df_tools/df_tools_frontend/df_tools_frontend.module

Spacing +1 added lines, -1 removed lines

@@ -6,6 +6,6 @@
 function df_tools_frontend_library_info_alter(&$libraries, $extension) {
   if ($extension == 'image') {
     $path = drupal_get_path('module', 'df_tools_frontend');
-    $libraries['quickedit.inPlaceEditor.image']['js']['/' . $path . '/js/quickedit_image_browser.js'] = [];
+    $libraries['quickedit.inPlaceEditor.image']['js']['/'.$path.'/js/quickedit_image_browser.js'] = [];
   }
 }

modules/df/df_tools/df_tools_frontend/src/Controller/QuickEditImageBrowserController.php

Braces +2 added lines, -4 removed lines

@@ -90,8 +90,7 @@ 
       $entity_view_mode_ids = array_keys($this->entityManager()->getViewModes($entity->getEntityTypeId()));
       if (in_array($view_mode_id, $entity_view_mode_ids)) {
         $output = $entity->$field_name->view($view_mode_id);
-      }
-      else {
+      } else {
         // Each part of a custom (non-Entity Display) view mode ID is separated
         // by a dash; the first part must be the module name.
         $mode_id_parts = explode('-', $view_mode_id, 2);
@@ -108,8 +107,7 @@ 
         'html' => $this->renderer->renderRoot($output),
       ];
       return new JsonResponse($data);
-    }
-    else {
+    } else {
       return new JsonResponse(['main_error' => $this->t('File does not exist.')]);
     }
   }

modules/df/df_tools/df_tools_migration/df_tools_migration.drush.inc

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
   if ($migration != null) {
     $definition = $migration->getPluginDefinition();
     $dump = Yaml::dump($definition);
-    $file_url = $destination . $migration->id() . '.yml';
+    $file_url = $destination.$migration->id().'.yml';
     $message = t('Export migration @name?', ['@name' => $name]);
     if (drush_confirm($message) && $data = file_save_data($dump, $file_url)) {
       drush_print(t('File saved: @file', ['@file' => $data->getFileUri()]));

modules/df/df_tools/df_tools_image/df_tools_image.module

Braces +1 added lines, -2 removed lines

@@ -75,8 +75,7 @@
   $dir = rtrim($dir, '/');
   if ($dir == 'public') {
     $file_pattern = "[^\/]*"; // Finds anything that does not contain "/", should be fine.
-  }
-  else {
+  } else {
     $file_pattern = $dir ? $dir . ".+" : ".+";
   }
 

Spacing +6 added lines, -6 removed lines

@@ -55,14 +55,14 @@ 
     $file_pattern = "[^\/]*"; // Finds anything that does not contain "/", should be fine.
   }
   else {
-    $file_pattern = $dir ? $dir . ".+" : ".+";
+    $file_pattern = $dir ? $dir.".+" : ".+";
   }
 
-  $regex = "^public:\/\/(" . $file_pattern . ")\.(" . implode($extensions, '|') . ")$";
+  $regex = "^public:\/\/(".$file_pattern.")\.(".implode($extensions, '|').")$";
 
   // Query the database for files that match this pattern.
   $query = db_select('file_managed', 'f')
-      ->condition('filemime', $mimetypes , 'IN')
+      ->condition('filemime', $mimetypes, 'IN')
       ->condition('uri', $regex, 'REGEXP');
   $total_count = $query->countQuery()->execute()->fetchField();
 
@@ -81,12 +81,12 @@ 
 
   foreach (\Drupal\image\Entity\ImageStyle::loadMultiple() as $name => $style) {
     if (!empty($excludes) && in_array($style->getName(), $excludes)) {
-      $operations[] = array('drush_log', array('Excluding ' . $name, 'success'));
+      $operations[] = array('drush_log', array('Excluding '.$name, 'success'));
       continue;
     }
 
     if (empty($includes[0]) || in_array($style->getName(), $includes)) {
-      $operations[] = array('drush_log', array('Processing ' . $name, 'success'));
+      $operations[] = array('drush_log', array('Processing '.$name, 'success'));
       $count = 1;
       $last_progress = 0;
       foreach ($files as $file) {
@@ -99,7 +99,7 @@ 
         if (($progress % 25 === 0 || $progress % 7 === 0) && $progress != $last_progress) {
           // If we're in the command line, print the percentage, otherwise hide it
           if (PHP_SAPI === 'cli') {
-            $operations[] = array('drush_print', array('...' . $progress . '%', 0, NULL, ($progress == 100)));
+            $operations[] = array('drush_print', array('...'.$progress.'%', 0, NULL, ($progress == 100)));
           }
         $last_progress = $progress;
         }

modules/df/df_tools/df_tools_color/df_tools_color.module

Doc Comments +1 added lines

@@ -231,6 +231,7 @@
  * Copied from color.module and modified to add variable replacement support.
  *
  * @see _color_rewrite_stylesheet
+ * @param string $style
  */
 function _df_tools_color_color_rewrite_stylesheet($theme, &$info, &$paths, $palette, $style) {
   // Prepare color conversion table.

Spacing +16 added lines, -16 removed lines

@@ -50,7 +50,7 @@ 
     return;
   }
 
-  $config = \Drupal::configFactory()->getEditable('color.theme.' . $theme);
+  $config = \Drupal::configFactory()->getEditable('color.theme.'.$theme);
 
   // Resolve palette.
   if ($scheme != '') {
@@ -65,7 +65,7 @@ 
   // Make sure enough memory is available.
   if (isset($info['base_image'])) {
     // Fetch source image dimensions.
-    $source = drupal_get_path('theme', $theme) . '/' . $info['base_image'];
+    $source = drupal_get_path('theme', $theme).'/'.$info['base_image'];
     list($width, $height) = getimagesize($source);
 
     // We need at least a copy of the source and a target buffer of the same
@@ -102,28 +102,28 @@ 
   }
 
   // Prepare target locations for generated files.
-  $id = $theme . '-' . substr(hash('sha256', serialize($palette) . microtime()), 0, 8);
+  $id = $theme.'-'.substr(hash('sha256', serialize($palette).microtime()), 0, 8);
   $paths['color'] = 'public://color';
-  $paths['target'] = $paths['color'] . '/' . $id;
+  $paths['target'] = $paths['color'].'/'.$id;
   foreach ($paths as $path) {
     file_prepare_directory($path, FILE_CREATE_DIRECTORY);
   }
-  $paths['target'] = $paths['target'] . '/';
+  $paths['target'] = $paths['target'].'/';
   $paths['id'] = $id;
-  $paths['source'] = drupal_get_path('theme', $theme) . '/';
+  $paths['source'] = drupal_get_path('theme', $theme).'/';
   $paths['files'] = $paths['map'] = array();
 
   // Save palette and logo location.
   $config
     ->set('palette', $palette)
-    ->set('logo', $paths['target'] . 'logo.svg')
+    ->set('logo', $paths['target'].'logo.svg')
     ->save();
 
   // Copy over neutral images.
   foreach ($info['copy'] as $file) {
     $base = drupal_basename($file);
-    $source = $paths['source'] . $file;
-    $filepath = file_unmanaged_copy($source, $paths['target'] . $base);
+    $source = $paths['source'].$file;
+    $filepath = file_unmanaged_copy($source, $paths['target'].$base);
     $paths['map'][$file] = $base;
     $paths['files'][] = $filepath;
   }
@@ -138,7 +138,7 @@ 
   foreach ($info['css'] as $stylesheet) {
     // Build a temporary array with CSS files.
     $files = array();
-    if (file_exists($paths['source'] . $stylesheet)) {
+    if (file_exists($paths['source'].$stylesheet)) {
       $files[] = $stylesheet;
     }
 
@@ -147,11 +147,11 @@ 
       // Aggregate @imports recursively for each configured top level CSS file
       // without optimization. Aggregation and optimization will be
       // handled by drupal_build_css_cache() only.
-      $style = $css_optimizer->loadFile($paths['source'] . $file, FALSE);
+      $style = $css_optimizer->loadFile($paths['source'].$file, FALSE);
 
       // Return the path to where this CSS file originated from, stripping
       // off the name of the file at the end of the path.
-      $css_optimizer->rewriteFileURIBasePath = base_path() . dirname($paths['source'] . $file) . '/';
+      $css_optimizer->rewriteFileURIBasePath = base_path().dirname($paths['source'].$file).'/';
 
       // Prefix all paths within this CSS file, ignoring absolute paths.
       $style = preg_replace_callback('/url\([\'"]?(?![a-z]+:|\/+)([^\'")]+)[\'"]?\)/i', array($css_optimizer, 'rewriteFileURI'), $style);
@@ -159,8 +159,8 @@ 
       // Rewrite stylesheet with new colors.
       $style = _df_tools_color_color_rewrite_stylesheet($theme, $info, $paths, $palette, $style);
       $base_file = drupal_basename($file);
-      $css[] = $paths['target'] . $base_file;
-      _color_save_stylesheet($paths['target'] . $base_file, $style, $paths);
+      $css[] = $paths['target'].$base_file;
+      _color_save_stylesheet($paths['target'].$base_file, $style, $paths);
     }
   }
 
@@ -216,7 +216,7 @@ 
 
     // Convert placeholder ids to the format we handle.
     foreach ($palette_template as $color_id => $color_placeholder) {
-      $palette_template[$color_id] = '#__' . Html::cleanCssIdentifier((string) $color_placeholder, $filter) . '__';
+      $palette_template[$color_id] = '#__'.Html::cleanCssIdentifier((string) $color_placeholder, $filter).'__';
     }
 
     return $palette_template;
@@ -291,7 +291,7 @@ 
 
   // Replace paths to images.
   foreach ($paths['map'] as $before => $after) {
-    $before = base_path() . $paths['source'] . $before;
+    $before = base_path().$paths['source'].$before;
     $before = preg_replace('`(^|/)(?!../)([^/]+)/../`', '$1', $before);
     $output = str_replace($before, $after, $output);
   }

Braces +1 added lines, -2 removed lines

@@ -264,8 +264,7 @@
       else {
         $chunk = _color_shift($palette[$base], $default_color_mapping[$base], $chunk, $info['blend_target']);
       }
-    }
-    else {
+    } else {
       // Determine the most suitable base color for the next color.
 
       // 'a' declarations. Use link.

modules/df/df_tools/df_tools_translation/df_tools_translation.module

Doc Comments +1 added lines, -1 removed lines

@@ -235,7 +235,7 @@
  * @param string $type The project type.
  * @param string $name The name of the project.
  *
- * @return bool FALSE if the project does not exist.
+ * @return false|null FALSE if the project does not exist.
  */
 function df_tools_translation_import_translations($type, $name) {
   // Attempt to pull module path.

Spacing +5 added lines, -5 removed lines

@@ -25,7 +25,7 @@ 
   $source = $migration->getSourcePlugin();
   /** @var Drupal\migrate_source_csv\CSVFileObject $iterator */
   $iterator = $source->initializeIterator();
-  $filename = $iterator->getPath() . '/' . $iterator->getFilename();
+  $filename = $iterator->getPath().'/'.$iterator->getFilename();
 
   /** @var \Drupal\migrate\Plugin\migrate\destination\EntityContentBase $destination_plugin */
   $destination_plugin = $migration->getDestinationPlugin();
@@ -224,7 +224,7 @@ 
   batch_set($batch);
   // Set a batch to update configuration as well.
   if ($batch = locale_config_batch_update_components($options, $langcodes)) {
-    $batch['file'] = drupal_get_path('module', 'df_tools_translation') . '/df_tools_translation.batch.inc';
+    $batch['file'] = drupal_get_path('module', 'df_tools_translation').'/df_tools_translation.batch.inc';
     batch_set($batch);
   }
 }
@@ -250,7 +250,7 @@ 
 
   // Import each file.
   foreach ($langcodes as $langcode) {
-    $filepath = DRUPAL_ROOT . '/' . $path . '/translations/' . $langcode . '.po';
+    $filepath = DRUPAL_ROOT.'/'.$path.'/translations/'.$langcode.'.po';
     if (file_exists($filepath)) {
       \Drupal::moduleHandler()->loadInclude('locale', 'bulk.inc');
       \Drupal::moduleHandler()->loadInclude('locale', 'translation.inc');
@@ -264,7 +264,7 @@ 
       ]);
 
       $original_file = (object) [
-        'filename' => $langcode . '.po',
+        'filename' => $langcode.'.po',
         'uri' => $filepath
       ];
       $file = locale_translate_file_attach_properties($original_file, $options);
@@ -307,7 +307,7 @@ 
       if ($langcode == 'en') {
         $langcode = '';
       }
-      $url = \Drupal\Core\Url::fromUri('base:/' . $langcode . $alias);
+      $url = \Drupal\Core\Url::fromUri('base:/'.$langcode.$alias);
 
       $current_name = [
         '#markup' => t($language->getName())

Braces +2 added lines, -4 removed lines

@@ -39,8 +39,7 @@ 
   // Prefer UUIDs to other fields.
   if (in_array('UUID', $ids, TRUE)) {
     $id_map = ['uuid', 'UUID'];
-  }
-  else {
+  } else {
     foreach ($processes as $field => $process) {
       if (isset($process[0]['source']) && $process[0]['source'] == $ids[0]) {
         $id_map = [$field, $ids[0]];
@@ -98,8 +97,7 @@ 
           $entity_values = $entity->toArray();
           $entity_values['path'] = [];
           $translation = $entity->addTranslation($langcode, $entity_values);
-        }
-        else {
+        } else {
           $translation = $entity->getTranslation($langcode);
         }