acquia / df

modules/df/df_core/df_core.module

Unused Use Statements -2 removed lines

@@ -1,7 +1,5 @@
 <?php
 
-use Drupal\user\Entity\User;
-
 /**
  * @file
  * Contains core functionality for the DF distribution.

src/DFExtension/Context/BlockContext.behat.inc

Spacing +2 added lines, -2 removed lines

@@ -38,9 +38,9 @@
    * @When I instantiate the :plugin_id block in :theme
    */
   public function instantiateBlock($plugin_id, $theme) {
-    $this->visitPath('/admin/structure/block/add/' . $plugin_id . '/' . $theme);
+    $this->visitPath('/admin/structure/block/add/'.$plugin_id.'/'.$theme);
 
-    $id = uniqid($theme . '_');
+    $id = uniqid($theme.'_');
     $this->minkContext->fillField('id', $id);
 
     /** @var UndoContext $undo */

src/DFExtension/Context/UtilityContext.behat.inc

Spacing +4 added lines, -4 removed lines

@@ -45,7 +45,7 @@ 
 
     if ($result != $count) {
       throw new ExpectationException(
-        '"' . $selector . '" matched ' . $result . ' element(s), expected ' . $count . '.',
+        '"'.$selector.'" matched '.$result.' element(s), expected '.$count.'.',
         $session->getDriver()
       );
     }
@@ -71,7 +71,7 @@ 
 
     if ($result < $count) {
       throw new ExpectationException(
-        '"' . $selector . '" matched ' . $result . ' element(s), expected at least ' . $count . '.',
+        '"'.$selector.'" matched '.$result.' element(s), expected at least '.$count.'.',
         $session->getDriver()
       );
     }
@@ -106,7 +106,7 @@ 
 
     if (trim($content)) {
       throw new ExpectationException(
-        'Expected ' . $selector . ' to be empty but it is not.',
+        'Expected '.$selector.' to be empty but it is not.',
         $this->getSession()->getDriver()
       );
     }
@@ -163,7 +163,7 @@ 
     $entity_type_manager = \Drupal::entityTypeManager();
 
     for ($i = 0; $i < $count; $i++) {
-      $uri = $random->image(uniqid('public://random_') . '.png', '240x240', '640x480');
+      $uri = $random->image(uniqid('public://random_').'.png', '240x240', '640x480');
 
       /** @var \Drupal\file\FileInterface $file */
       $file = $entity_type_manager->getStorage('file')->create(['uri' => $uri]);

Braces +1 added lines, -2 removed lines

@@ -200,8 +200,7 @@
       while (true) {
         try {
           $driver->getWebDriverSession()->accept_alert();
-        }
-        catch (NoAlertOpenError $e) {
+        } catch (NoAlertOpenError $e) {
           break;
         }
       }

src/DFExtension/Context/PanelsInPlaceContext.behat.inc

Spacing +3 added lines, -3 removed lines

@@ -116,7 +116,7 @@ 
     // Assert that the category exists...
     $link = $this->assertSession()
       ->elementExists('css',
-        '.ipe-category[data-category="' . $category . '"]',
+        '.ipe-category[data-category="'.$category.'"]',
         $tab
       );
 
@@ -147,7 +147,7 @@ 
     return $this->assertSession()
       ->elementExists(
         'css',
-        '.ipe-block-plugin a[data-plugin-id="' . $plugin_id . '"]',
+        '.ipe-block-plugin a[data-plugin-id="'.$plugin_id.'"]',
         $category ? $this->openCategory($category) : $this->getActiveTab()
       );
   }
@@ -167,7 +167,7 @@ 
     $this->assertSession()
       ->elementNotExists(
         'css',
-        '.ipe-block-plugin a[data-plugin-id="' . $plugin_id . '"]',
+        '.ipe-block-plugin a[data-plugin-id="'.$plugin_id.'"]',
         $category ? $this->openCategory($category) : $this->getActiveTab()
       );
   }

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 
 namespace Acquia\DFExtension\Context;
 
-use Behat\Mink\Driver\Selenium2Driver;
 use Drupal\DrupalExtension\Context\DrupalSubContextBase;
 use Drupal\DrupalExtension\Context\MinkContext;
 

src/DFExtension/Context/CkEditorContext.behat.inc

Spacing +5 added lines, -5 removed lines

@@ -26,7 +26,7 @@ 
    * @Then CKEditor :id should exist
    */
   public function assertEditor($id = NULL) {
-    $js = "CKEDITOR.instances['" . ($id ?: $this->getDefault()) . "']";
+    $js = "CKEDITOR.instances['".($id ?: $this->getDefault())."']";
 
     $this->getSession()->wait(10000, "$js.status === 'ready'");
 
@@ -68,7 +68,7 @@ 
 
     if ($position == FALSE) {
       throw new ExpectationException(
-        'Expected CKEditor ' . $id . ' to contain "' . $text . '".',
+        'Expected CKEditor '.$id.' to contain "'.$text.'".',
         $this->getSession()->getDriver()
       );
     }
@@ -93,7 +93,7 @@ 
 
     if ($match == 0) {
       throw new ExpectationException(
-        'Expected CKEditor ' . $id . ' to match "' . $expr . '".',
+        'Expected CKEditor '.$id.' to match "'.$expr.'".',
         $this->getSession()->getDriver()
       );
     }
@@ -134,11 +134,11 @@ 
 
     $session = $this->getSession();
 
-    $return = Json::decode($session->evaluateScript("$js.execCommand('$command', " . Json::encode($data) . ')'));
+    $return = Json::decode($session->evaluateScript("$js.execCommand('$command', ".Json::encode($data).')'));
 
     if (empty($return)) {
       throw new ExpectationException(
-        'CKEditor command ' . $command . ' returned ' . var_export($return, TRUE) . ', expected truthy.',
+        'CKEditor command '.$command.' returned '.var_export($return, TRUE).', expected truthy.',
         $session->getDriver()
       );
     }

src/DFExtension/Context/DisplayModeContext.behat.inc

Braces +1 added lines, -2 removed lines

@@ -42,8 +42,7 @@
       // If the display was created anew, its previous status is effectively
       // FALSE.
       $original_status = FALSE;
-    }
-    else {
+    } else {
       $original_status = $display->status();
     }
 

src/DFExtension/Context/EntityBrowserContext.behat.inc

Spacing +2 added lines, -2 removed lines

@@ -42,7 +42,7 @@ 
     $session->switchToWindow();
     // @TODO: Make this smarter, because we can't be sure that #edit-submit
     // exists at all, or that it's the correct submit button.
-    $session->executeScript('frames["' . $frame . '"].document.forms[0].querySelector("#edit-submit").click()');
+    $session->executeScript('frames["'.$frame.'"].document.forms[0].querySelector("#edit-submit").click()');
     sleep(10);
     $this->minkContext->iWaitForAjaxToFinish();
   }
@@ -91,7 +91,7 @@ 
    */
   public function selectItem($n, $browser_id = NULL) {
     if ($browser_id) {
-      $selector = 'form#entity-browser-' . Html::cleanCssIdentifier($browser_id) . '-form';
+      $selector = 'form#entity-browser-'.Html::cleanCssIdentifier($browser_id).'-form';
     }
     else {
       $selector = 'form[data-entity-browser-uuid]';

Braces +2 added lines, -4 removed lines

@@ -71,8 +71,7 @@ 
       $session->switchToIFrame('entity_browser_iframe_image_browser');
       // This might be vestigial.
       sleep(10);
-    }
-    else {
+    } else {
       throw new ElementNotFoundException($session->getDriver(), 'collapsible element');
     }
   }
@@ -92,8 +91,7 @@ 
   public function selectItem($n, $browser_id = NULL) {
     if ($browser_id) {
       $selector = 'form#entity-browser-' . Html::cleanCssIdentifier($browser_id) . '-form';
-    }
-    else {
+    } else {
       $selector = 'form[data-entity-browser-uuid]';
     }
 

modules/df/df_tools/df_tools_panelizer/df_tools_panelizer.module

Spacing +3 added lines, -3 removed lines

@@ -22,7 +22,7 @@ 
   /** @var Drupal\migrate_source_csv\CSVFileObject $iterator */
   $iterator = $source->initializeIterator();
   $base_path = $iterator->getPath();
-  $filename = $base_path . '/' . $iterator->getFilename();
+  $filename = $base_path.'/'.$iterator->getFilename();
 
   $destination = $migration->getDestinationPlugin();
   $entity_type = explode(':', $destination->getPluginId())[1];
@@ -73,14 +73,14 @@ 
         $entity = $entity_storage->load($id);
 
         // See if a Panelizer config file exists for this Node.
-        $panels_file = $base_path . '/panelizer.panels_display.' . $entity_type . '.' . $entity->uuid() . '.yml';
+        $panels_file = $base_path.'/panelizer.panels_display.'.$entity_type.'.'.$entity->uuid().'.yml';
         if (file_exists($panels_file) && isset($entity->panelizer)) {
           $yaml = file_get_contents($panels_file);
 
           $panels_display = Yaml::parse($yaml);
 
           // The storage ID isn't based on UUIDs, unfortunately. Hotswap it with current info.
-          $panels_display['storage_id'] = $entity_type . ':' . $entity->id() . ':full:' . $entity->getRevisionId();
+          $panels_display['storage_id'] = $entity_type.':'.$entity->id().':full:'.$entity->getRevisionId();
 
           // Set the Panels Display to match what's defined in YAML.
           $entity->panelizer->panels_display = $panels_display;

modules/df/df_tools/df_tools_moderation/df_tools_moderation.module

Braces +2 added lines, -4 removed lines

@@ -68,8 +68,7 @@ 
     if (isset($options['langcode'])) {
       $url_options['language'] = \Drupal::languageManager()->getLanguage($options['langcode']);
       $langcode = $options['langcode'];
-    }
-    else {
+    } else {
       $langcode = NULL;
     }
 
@@ -93,8 +92,7 @@ 
             $replacements[$original] = Url::fromRoute('entity.node.latest_version', [
               'node' => $node->id(),
             ], $url_options)->toString();
-          }
-          else {
+          } else {
             $replacements[$original] = $latest->toUrl('canonical', $url_options)->toString();
           }
           break;