drupal-media / url_embed

src/Form/UrlEmbedDialog.php

Braces +2 added lines, -4 removed lines

@@ -109,8 +109,7 @@ 
       if (!empty($url_element['data-embed-url']) && $info = $this->urlEmbed()->getEmbed($url_element['data-embed-url'])) {
         $url_element['data-url-provider'] = $info->getProviderName();
       }
-    }
-    catch (\Exception $e) {
+    } catch (\Exception $e) {
       watchdog_exception('url_embed', $e);
     }
 
@@ -160,8 +159,7 @@ 
         '#weight' => -10,
       );
       $response->addCommand(new HtmlCommand('#url-embed-dialog-form', $form));
-    }
-    else {
+    } else {
       $response->addCommand(new EditorDialogSave($values));
       $response->addCommand(new CloseModalDialogCommand());
     }

src/Plugin/Filter/UrlEmbedFilter.php

Braces +2 added lines, -4 removed lines

@@ -77,8 +77,7 @@ 
             $url_output = $info->getCode();
             $node->setAttribute('data-url-provider', $info->getProviderName());
           }
-        }
-        catch (\Exception $e) {
+        } catch (\Exception $e) {
           watchdog_exception('url_embed', $e);
         }
 
@@ -100,8 +99,7 @@ 
         <ul>
           <li><code>&lt;drupal-url data-embed-url="https://www.youtube.com/watch?v=xxXXxxXxxxX" data-url-provider="YouTube" /&gt;</code></li>
         </ul>');
-    }
-    else {
+    } else {
       return $this->t('You can embed URLs.');
     }
   }

src/Plugin/CKEditorPlugin/DrupalUrl.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
    * {@inheritdoc}
    */
   public function getFile() {
-    return drupal_get_path('module', 'url_embed') . '/js/plugins/drupalurl/plugin.js';
+    return drupal_get_path('module', 'url_embed').'/js/plugins/drupalurl/plugin.js';
   }
 
   /**

src/Plugin/EmbedType/Url.php

Spacing +1 added lines, -1 removed lines

@@ -23,6 +23,6 @@
    * {@inheritdoc}
    */
   public function getDefaultIconUrl() {
-    return file_create_url(drupal_get_path('module', 'url_embed') . '/js/plugins/drupalurl/urlembed.png');
+    return file_create_url(drupal_get_path('module', 'url_embed').'/js/plugins/drupalurl/urlembed.png');
   }
 }

src/Tests/UrlEmbedDialogTest.php

Spacing +2 added lines, -2 removed lines

@@ -66,9 +66,9 @@
   public function getEmbedDialog($filter_format_id = NULL, $embed_button_id = NULL) {
     $url = 'url-embed/dialog';
     if (!empty($filter_format_id)) {
-      $url .= '/' . $filter_format_id;
+      $url .= '/'.$filter_format_id;
       if (!empty($embed_button_id)) {
-        $url .= '/' . $embed_button_id;
+        $url .= '/'.$embed_button_id;
       }
     }
     return $this->drupalGet($url);

src/Tests/UrlEmbedFilterTest.php

Spacing +8 added lines, -8 removed lines

@@ -22,13 +22,13 @@ 
    */
   public function testFilter() {
     // Tests url embed using sample flickr url.
-    $content = '<drupal-url data-embed-url="' . static::FLICKR_URL . '">This placeholder should not be rendered.</drupal-url>';
+    $content = '<drupal-url data-embed-url="'.static::FLICKR_URL.'">This placeholder should not be rendered.</drupal-url>';
     $settings = array();
     $settings['type'] = 'page';
     $settings['title'] = 'Test url embed with sample flickr url';
     $settings['body'] = array(array('value' => $content, 'format' => 'custom_format'));
     $node = $this->drupalCreateNode($settings);
-    $this->drupalGet('node/' . $node->id());
+    $this->drupalGet('node/'.$node->id());
     $this->assertRaw(static::FLICKR_OUTPUT_WYSIWYG);
     $this->assertNoText(strip_tags($content), 'Placeholder does not appear in the output when embed is successful.');
 
@@ -39,27 +39,27 @@ 
     $settings['title'] = 'Test that placeholder is retained when specified URL does not exists';
     $settings['body'] = array(array('value' => $content, 'format' => 'custom_format'));
     $node = $this->drupalCreateNode($settings);
-    $this->drupalGet('node/' . $node->id());
+    $this->drupalGet('node/'.$node->id());
     $this->assertNoText(strip_tags($content), 'Placeholder does not appear in the output when embed is unsuccessful.');
 
     // Test that tag of container element is not replaced when it's not
     // <drupal-url>.
-    $content = '<not-drupal-url data-embed-url="' . static::FLICKR_URL . '" data-url-provider="Flickr">this placeholder should not be rendered.</not-drupal-url>';
+    $content = '<not-drupal-url data-embed-url="'.static::FLICKR_URL.'" data-url-provider="Flickr">this placeholder should not be rendered.</not-drupal-url>';
     $settings = array();
     $settings['type'] = 'page';
     $settings['title'] = 'test url embed with embed-url';
     $settings['body'] = array(array('value' => $content, 'format' => 'custom_format'));
     $node = $this->drupalCreateNode($settings);
-    $this->drupalget('node/' . $node->id());
+    $this->drupalget('node/'.$node->id());
     $this->assertRaw('</not-drupal-url>');
-    $content = '<div data-embed-url="' . static::FLICKR_URL . '">this placeholder should not be rendered.</div>';
+    $content = '<div data-embed-url="'.static::FLICKR_URL.'">this placeholder should not be rendered.</div>';
     $settings = array();
     $settings['type'] = 'page';
     $settings['title'] = 'test url embed with embed-url';
     $settings['body'] = array(array('value' => $content, 'format' => 'custom_format'));
     $node = $this->drupalCreateNode($settings);
-    $this->drupalget('node/' . $node->id());
-    $this->assertRaw('<div data-embed-url="' . static::FLICKR_URL . '"');
+    $this->drupalget('node/'.$node->id());
+    $this->assertRaw('<div data-embed-url="'.static::FLICKR_URL.'"');
   }
 
 }

src/Plugin/Filter/ConvertUrlToEmbedFilter.php

Spacing +7 added lines, -7 removed lines

@@ -78,25 +78,25 @@ 
     // optional for all protocols.
     // @see \Drupal\Component\Utility\UrlHelper::stripDangerousProtocols()
     $protocols = \Drupal::getContainer()->getParameter('filter_protocols');
-    $protocols = implode(':(?://)?|', $protocols) . ':(?://)?';
+    $protocols = implode(':(?://)?|', $protocols).':(?://)?';
 
     $valid_url_path_characters = "[\p{L}\p{M}\p{N}!\*\';:=\+,\.\$\/%#\[\]\-_~@&]";
 
     // Allow URL paths to contain balanced parens
     // 1. Used in Wikipedia URLs like /Primer_(film)
     // 2. Used in IIS sessions like /S(dfd346)/
-    $valid_url_balanced_parens = '\('. $valid_url_path_characters . '+\)';
+    $valid_url_balanced_parens = '\('.$valid_url_path_characters.'+\)';
 
     // Valid end-of-path characters (so /foo. does not gobble the period).
     // 1. Allow =&# for empty URL parameters and other URL-join artifacts
-    $valid_url_ending_characters = '[\p{L}\p{M}\p{N}:_+~#=/]|(?:' . $valid_url_balanced_parens . ')';
+    $valid_url_ending_characters = '[\p{L}\p{M}\p{N}:_+~#=/]|(?:'.$valid_url_balanced_parens.')';
 
     $valid_url_query_chars = '[a-zA-Z0-9!?\*\'@\(\);:&=\+\$\/%#\[\]\-_\.,~|]';
     $valid_url_query_ending_chars = '[a-zA-Z0-9_&=#\/]';
 
     //full path
     //and allow @ in a url, but only in the middle. Catch things like http://example.com/@user/
-    $valid_url_path = '(?:(?:'.$valid_url_path_characters . '*(?:'.$valid_url_balanced_parens .$valid_url_path_characters . '*)*'. $valid_url_ending_characters . ')|(?:@' . $valid_url_path_characters . '+\/))';
+    $valid_url_path = '(?:(?:'.$valid_url_path_characters.'*(?:'.$valid_url_balanced_parens.$valid_url_path_characters.'*)*'.$valid_url_ending_characters.')|(?:@'.$valid_url_path_characters.'+\/))';
 
     // Prepare domain name pattern.
     // The ICANN seems to be on track towards accepting more diverse top level
@@ -105,7 +105,7 @@ 
     $domain = '(?:[\p{L}\p{M}\p{N}._+-]+\.)?[\p{L}\p{M}]{2,64}\b';
     $ip = '(?:[0-9]{1,3}\.){3}[0-9]{1,3}';
     $auth = '[\p{L}\p{M}\p{N}:%_+*~#?&=.,/;-]+@';
-    $trail = '('.$valid_url_path.'*)?(\\?'.$valid_url_query_chars .'*'.$valid_url_query_ending_chars.')?';
+    $trail = '('.$valid_url_path.'*)?(\\?'.$valid_url_query_chars.'*'.$valid_url_query_ending_chars.')?';
 
     // Match absolute URLs.
     $url_pattern = "(?:$auth)?(?:$domain|$ip)/?(?:$trail)?";
@@ -137,9 +137,9 @@ 
           // function contained in $task.
           $chunks[$i] = preg_replace_callback(
             $pattern,
-            function ($match) {
+            function($match) {
               if (\Drupal::service('url_embed')->getEmbed(Html::decodeEntities($match[1]))) {
-                return '<drupal-url data-embed-url="' . $match[1] . '"></drupal-url>';
+                return '<drupal-url data-embed-url="'.$match[1].'"></drupal-url>';
               }
               else {
                 return $match[1];

Braces +3 added lines, -6 removed lines

@@ -140,8 +140,7 @@ 
             function ($match) {
               if (\Drupal::service('url_embed')->getEmbed(Html::decodeEntities($match[1]))) {
                 return '<drupal-url data-embed-url="' . $match[1] . '"></drupal-url>';
-              }
-              else {
+              } else {
                 return $match[1];
               }
             },
@@ -150,8 +149,7 @@ 
         }
         // Text chunk is done, so next chunk must be a tag.
         $chunk_type = 'tag';
-      }
-      else {
+      } else {
         // Only process this tag if there are no unclosed $ignore_tags.
         if ($open_tag == '') {
           // Check whether this tag is contained in $ignore_tags.
@@ -182,8 +180,7 @@ 
   public function tips($long = FALSE) {
     if ($long) {
       return $this->t('<p>You can convert plain URLs to &lt;drupal-url&gt; HTML elements. Those elements are later converted to embeds using "Display embedded URLs" text filter.</p>');
-    }
-    else {
+    } else {
       return $this->t('You can convert plain URLs to embed elements.');
     }
   }

src/Tests/ConvertUrlToEmbedFilterTest.php

Spacing +5 added lines, -5 removed lines

@@ -80,7 +80,7 @@ 
     $settings['title'] = 'Test convert url to embed with sample Twitter url';
     $settings['body'] = [['value' => $content, 'format' => 'custom_format']];
     $node = $this->drupalCreateNode($settings);
-    $this->drupalGet('node/' . $node->id());
+    $this->drupalGet('node/'.$node->id());
     $this->assertRaw('<drupal-url data-embed-url="https://twitter.com/drupal/status/735873777683320832"></drupal-url>');
     $this->assertNoText(strip_tags($content), 'URL does not appear in the output when embed is successful.');
 
@@ -90,7 +90,7 @@ 
     $settings['title'] = 'Test convert url to embed with non valid URL';
     $settings['body'] = [['value' => $content, 'format' => 'custom_format']];
     $node = $this->drupalCreateNode($settings);
-    $this->drupalGet('node/' . $node->id());
+    $this->drupalGet('node/'.$node->id());
     $this->assertRaw($content);
 
     /** @var \Drupal\filter\FilterFormatInterface $format */
@@ -106,7 +106,7 @@ 
     $settings['title'] = 'Test convert url to embed with sample Twitter url and no prefix';
     $settings['body'] = [['value' => $content, 'format' => 'custom_format']];
     $node = $this->drupalCreateNode($settings);
-    $this->drupalGet('node/' . $node->id());
+    $this->drupalGet('node/'.$node->id());
     $this->assertRaw(strip_tags($content));
     $this->assertNoRaw('<drupal-url data-embed-url="https://twitter.com/drupal/status/735873777683320832"></drupal-url>');
 
@@ -116,7 +116,7 @@ 
     $settings['title'] = 'Test convert url to embed with sample Twitter url with the prefix';
     $settings['body'] = [['value' => $content, 'format' => 'custom_format']];
     $node = $this->drupalCreateNode($settings);
-    $this->drupalGet('node/' . $node->id());
+    $this->drupalGet('node/'.$node->id());
     $this->assertRaw('<drupal-url data-embed-url="https://twitter.com/drupal/status/735873777683320832"></drupal-url>');
     $this->assertNoText(strip_tags($content), 'URL does not appear in the output when embed is successful.');
 
@@ -126,7 +126,7 @@ 
     $settings['title'] = 'Test convert url to embed with sample Twitter url with wrong prefix';
     $settings['body'] = [['value' => $content, 'format' => 'custom_format']];
     $node = $this->drupalCreateNode($settings);
-    $this->drupalGet('node/' . $node->id());
+    $this->drupalGet('node/'.$node->id());
     $this->assertRaw(strip_tags($content));
     $this->assertNoRaw('<drupal-url data-embed-url="https://twitter.com/drupal/status/735873777683320832"></drupal-url>');
   }