drupal-media / url_embed

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>');
   }