jasny / twig-extensions

src/DateExtension.php

Doc Comments +2 added lines, -1 removed lines

@@ -183,6 +183,7 @@ 
      * Split duration into seconds, minutes, hours, days, weeks and years.
      * 
      * @param int $seconds
+     * @param integer $max
      * @return array
      */
     protected function splitDuration($seconds, $max)
@@ -228,7 +229,7 @@ 
      * 
      * @param int    $seconds    Time in seconds
      * @param array  $units      Time units (seconds, minutes, hours, days, weeks, years)
-     * @param string $separator
+     * @param string $seperator
      * @return string
      */
     public function duration($seconds, $units = ['s', 'm', 'h', 'd', 'w', 'y'], $seperator = ' ')

Indentation +2 added lines, -2 removed lines

@@ -62,13 +62,13 @@
         
         switch ($format) {
             case null:     $pattern = $this->getDefaultDatePattern($calendar); 
-                           $format = \IntlDateFormatter::SHORT; break;
+                            $format = \IntlDateFormatter::SHORT; break;
             case 'short':  $format = \IntlDateFormatter::SHORT;  break;
             case 'medium': $format = \IntlDateFormatter::MEDIUM; break;
             case 'long':   $format = \IntlDateFormatter::LONG;   break;
             case 'full':   $format = \IntlDateFormatter::FULL;   break;
             default:       $pattern = $format;
-                           $format = \IntlDateFormatter::SHORT; break;
+                            $format = \IntlDateFormatter::SHORT; break;
         }
         
         return [$format, $pattern];

Spacing +13 added lines, -13 removed lines

@@ -63,10 +63,10 @@ 
         switch ($format) {
             case null:     $pattern = $this->getDefaultDatePattern($calendar); 
                            $format = \IntlDateFormatter::SHORT; break;
-            case 'short':  $format = \IntlDateFormatter::SHORT;  break;
+            case 'short':  $format = \IntlDateFormatter::SHORT; break;
             case 'medium': $format = \IntlDateFormatter::MEDIUM; break;
-            case 'long':   $format = \IntlDateFormatter::LONG;   break;
-            case 'full':   $format = \IntlDateFormatter::FULL;   break;
+            case 'long':   $format = \IntlDateFormatter::LONG; break;
+            case 'full':   $format = \IntlDateFormatter::FULL; break;
             default:       $pattern = $format;
                            $format = \IntlDateFormatter::SHORT; break;
         }
@@ -80,7 +80,7 @@ 
      * @param int $calendar
      * @return string
      */
-    protected function getDefaultDatePattern($calendar=\IntlDateFormatter::GREGORIAN)
+    protected function getDefaultDatePattern($calendar = \IntlDateFormatter::GREGORIAN)
     {
         $pattern = \IntlDateFormatter::create(
             \Locale::getDefault(),
@@ -150,7 +150,7 @@ 
      * @param string              $calendar  'gregorian' or 'traditional'
      * @return string
      */
-    public function localTime($date, $format='short', $calendar='gregorian')
+    public function localTime($date, $format = 'short', $calendar = 'gregorian')
     {
         return $this->formatLocal($date, false, $format, $calendar);
     }
@@ -163,7 +163,7 @@ 
      * @param string              $calendar  'gregorian' or 'traditional'
      * @return string
      */
-    public function localDateTime($date, $format=null, $calendar='gregorian')
+    public function localDateTime($date, $format = null, $calendar = 'gregorian')
     {
         if (is_array($format) || !isset($format)) {
             $formatDate = null;
@@ -234,31 +234,31 @@ 
     public function duration($seconds, $units = ['s', 'm', 'h', 'd', 'w', 'y'], $seperator = ' ')
     {
         list($seconds, $minutes, $hours, $days, $weeks, $years) =
-            $this->splitDuration($seconds, count($units)-1) + array_fill(0, 6, null);
+            $this->splitDuration($seconds, count($units) - 1) + array_fill(0, 6, null);
         
         $duration = '';
         if (isset($years) && isset($units[5])) {
-            $duration .= $seperator . $years . $units[5];
+            $duration .= $seperator.$years.$units[5];
         }
         
         if (isset($weeks) && isset($units[4])) {
-            $duration .= $seperator . $weeks . $units[4];
+            $duration .= $seperator.$weeks.$units[4];
         }
         
         if (isset($days) && isset($units[3])) {
-            $duration .= $seperator . $days . $units[3];
+            $duration .= $seperator.$days.$units[3];
         }
         
         if (isset($hours) && isset($units[2])) {
-            $duration .= $seperator . $hours . $units[2];
+            $duration .= $seperator.$hours.$units[2];
         }
         
         if (isset($minutes) && isset($units[1])) {
-            $duration .= $seperator . $minutes . $units[1];
+            $duration .= $seperator.$minutes.$units[1];
         }
         
         if (isset($seconds) && isset($units[0])) {
-            $duration .= $seperator . $seconds . $units[0];
+            $duration .= $seperator.$seconds.$units[0];
         }
         
         return trim($duration, $seperator);

tests/TextExtensionTest.php

Spacing +1 added lines, -1 removed lines

@@ -160,6 +160,6 @@
      */
     public function testWithNull($filter)
     {
-        $this->assertRender('-', '{{ null|' . $filter . '("//")|default("-") }}');
+        $this->assertRender('-', '{{ null|'.$filter.'("//")|default("-") }}');
     }    
 }

tests/PcreExtensionTest.php

Spacing +1 added lines, -1 removed lines

@@ -172,6 +172,6 @@
      */
     public function testWithNull($filter)
     {
-        $this->assertRender('-', '{{ null|' . $filter . '("//")|default("-") }}');
+        $this->assertRender('-', '{{ null|'.$filter.'("//")|default("-") }}');
     }    
 }

src/TextExtension.php

Spacing +17 added lines, -17 removed lines

@@ -43,7 +43,7 @@ 
             return null;
         }
         
-        return '<p>' . preg_replace(['~\n(\s*)\n\s*~', '~(?<!</p>)\n\s*~'], ["</p>\n\$1<p>", "<br>\n"], trim($value)) .
+        return '<p>'.preg_replace(['~\n(\s*)\n\s*~', '~(?<!</p>)\n\s*~'], ["</p>\n\$1<p>", "<br>\n"], trim($value)).
             '</p>';
     }
 
@@ -80,7 +80,7 @@ 
         }
         
         $pos = stripos($value, $break);
-        return $pos === false ? $value : substr($value, 0, $pos) . $replace;
+        return $pos === false ? $value : substr($value, 0, $pos).$replace;
     }
 
     /**
@@ -97,7 +97,7 @@ 
             return null;
         }
         
-        return strlen($value) <= $length ? $value : substr($value, 0, $length - strip_tags($replace)) . $replace;
+        return strlen($value) <= $length ? $value : substr($value, 0, $length - strip_tags($replace)).$replace;
     }
     
     /**
@@ -115,12 +115,12 @@ 
             ? '~(?:(https?)://([^\s<>]+)|(?<!\w@)\b(www\.[^\s<>]+?\.[^\s<>]+))(?<![\.,:;\?!\'"\|])~i'
             : '~(?:(https?)://([^\s<>]+)|(?<!\w@)\b([^\s<>@]+?\.[^\s<>]+)(?<![\.,:]))~i';
         
-        return preg_replace_callback($regexp, function ($match) use ($protocol, &$links, $attr) {
+        return preg_replace_callback($regexp, function($match) use ($protocol, &$links, $attr) {
             if ($match[1]) $protocol = $match[1];
             $link = $match[2] ?: $match[3];
             
-            return '<' . array_push($links, '<a' . $attr . ' href="' . $protocol . '://' . $link  . '">'
-                . rtrim($link, '/') . '</a>') . '>';
+            return '<'.array_push($links, '<a'.$attr.' href="'.$protocol.'://'.$link.'">'
+                . rtrim($link, '/').'</a>').'>';
         }, $text);
     }
     
@@ -135,8 +135,8 @@ 
     {
         $regexp = '~([^\s<>]+?@[^\s<>]+?\.[^\s<>]+)(?<![\.,:;\?!\'"\|])~';
         
-        return preg_replace_callback($regexp, function ($match) use (&$links, $attr) {
-            return '<' . array_push($links, '<a' . $attr . ' href="mailto:' . $match[1]  . '">' . $match[1] . '</a>')
+        return preg_replace_callback($regexp, function($match) use (&$links, $attr) {
+            return '<'.array_push($links, '<a'.$attr.' href="mailto:'.$match[1].'">'.$match[1].'</a>')
                 . '>';
         }, $text);
     }
@@ -154,16 +154,16 @@ 
     protected function linkifyOther($protocol, $text, array &$links, $attr, $mode)
     {
         if (strpos($protocol, ':') === false) {
-            $protocol .= in_array($protocol, ['ftp', 'tftp', 'ssh', 'scp'])  ? '://' : ':';
+            $protocol .= in_array($protocol, ['ftp', 'tftp', 'ssh', 'scp']) ? '://' : ':';
         }
         
         $regexp = $mode != 'all'
-            ? '~' . preg_quote($protocol, '~') . '([^\s<>]+)(?<![\.,:;\?!\'"\|])~i'
+            ? '~'.preg_quote($protocol, '~').'([^\s<>]+)(?<![\.,:;\?!\'"\|])~i'
             : '~([^\s<>]+)(?<![\.,:])~i';
         
-        return preg_replace_callback($regexp, function ($match) use ($protocol, &$links, $attr) {
-            return '<' . array_push($links, '<a' . $attr . ' href="' . $protocol . $match[1]  . '">' . $match[1]
-                . '</a>') . '>';
+        return preg_replace_callback($regexp, function($match) use ($protocol, &$links, $attr) {
+            return '<'.array_push($links, '<a'.$attr.' href="'.$protocol.$match[1].'">'.$match[1]
+                . '</a>').'>';
         }, $text);
     }
     
@@ -185,14 +185,14 @@ 
         // Link attributes
         $attr = '';
         foreach ($attributes as $key => $val) {
-            $attr .= ' ' . $key . '="' . htmlentities($val) . '"';
+            $attr .= ' '.$key.'="'.htmlentities($val).'"';
         }
         
         $links = [];
         
         // Extract existing links and tags
-        $text = preg_replace_callback('~(<a .*?>.*?</a>|<.*?>)~i', function ($match) use (&$links) {
-            return '<' . array_push($links, $match[1]) . '>';
+        $text = preg_replace_callback('~(<a .*?>.*?</a>|<.*?>)~i', function($match) use (&$links) {
+            return '<'.array_push($links, $match[1]).'>';
         }, $value);
         
         // Extract text links for each protocol
@@ -206,7 +206,7 @@ 
         }
         
         // Insert all link
-        return preg_replace_callback('/<(\d+)>/', function ($match) use (&$links) {
+        return preg_replace_callback('/<(\d+)>/', function($match) use (&$links) {
             return $links[$match[1] - 1];
         }, $text);
     }

Braces +3 added lines, -1 removed lines

@@ -116,7 +116,9 @@
             : '~(?:(https?)://([^\s<>]+)|(?<!\w@)\b([^\s<>@]+?\.[^\s<>]+)(?<![\.,:]))~i';
         
         return preg_replace_callback($regexp, function ($match) use ($protocol, &$links, $attr) {
-            if ($match[1]) $protocol = $match[1];
+            if ($match[1]) {
+                $protocol = $match[1];
+            }
             $link = $match[2] ?: $match[3];
             
             return '<' . array_push($links, '<a' . $attr . ' href="' . $protocol . '://' . $link  . '">'