jasny / twig-extensions

src/Jasny/Twig/PcreExtension.php

Spacing +5 added lines, -5 removed lines

@@ -82,7 +82,7 @@ 
      * @param string $pattern
      * @return string
      */
-    public function get($value, $pattern, $group=0)
+    public function get($value, $pattern, $group = 0)
     {
         $this->assertNoEval($pattern);
         
@@ -98,7 +98,7 @@ 
      * @param string $pattern
      * @return array
      */
-    public function getAll($value, $pattern, $group=0)
+    public function getAll($value, $pattern, $group = 0)
     {
         $this->assertNoEval($pattern);
         
@@ -115,7 +115,7 @@ 
      * @param strign $flags    Optional 'invert' to return entries that do not match the given pattern.
      * @return array
      */
-    public function grep($values, $pattern, $flags='')
+    public function grep($values, $pattern, $flags = '')
     {
         $this->assertNoEval($pattern);
         
@@ -134,7 +134,7 @@ 
      * @param int    $limit
      * @return string
      */
-    public function replace($value, $pattern, $replacement='', $limit=-1)
+    public function replace($value, $pattern, $replacement = '', $limit = -1)
     {
         $this->assertNoEval($pattern);
         
@@ -151,7 +151,7 @@ 
      * @param int    $limit
      * @return string
      */
-    public function filter($value, $pattern, $replacement='', $limit=-1)
+    public function filter($value, $pattern, $replacement = '', $limit = -1)
     {
         $this->assertNoEval($pattern);
         

src/Jasny/Twig/TextExtension.php

Spacing +9 added lines, -9 removed lines

@@ -42,12 +42,12 @@ 
      * @param int    $line   Line number (starts at 1)
      * @return string
      */
-    public function line($value, $line=1)
+    public function line($value, $line = 1)
     {
         if (!isset($value)) return null;
         
         $lines = explode("\n", $value);
-        return isset($lines[$line-1]) ? $lines[$line-1] : null;
+        return isset($lines[$line - 1]) ? $lines[$line - 1] : null;
     }
     
     /**
@@ -102,24 +102,24 @@ 
         $links = array();
         
         // Extract existing links and tags
-        $value = preg_replace_callback('~(<a .*?>.*?</a>|<.*?>)~i', function ($match) use (&$links) { return '<' . array_push($links, $match[1]) . '>'; }, $value);
+        $value = preg_replace_callback('~(<a .*?>.*?</a>|<.*?>)~i', function($match) use (&$links) { return '<' . array_push($links, $match[1]) . '>'; }, $value);
         
         // Extract text links for each protocol
         foreach ((array)$protocols as $protocol) {
             switch ($protocol) {
                 case 'http':
-                case 'https':   $value = preg_replace_callback($mode != 'all' ? '~(?:(https?)://([^\s<>]+)|(www\.[^\s<>]+?\.[^\s<>]+))(?<![\.,:;\?!\'"\|])~i' : '~(?:(https?)://([^\s<>]+)|([^\s<>]+?\.[^\s<>]+)(?<![\.,:]))~i', 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>') . '>'; }, $value); break;
-                case 'mail':    $value = preg_replace_callback('~([^\s<>]+?@[^\s<>]+?\.[^\s<>]+)(?<![\.,:;\?!\'"\|])~', function ($match) use (&$links, $attr) { return '<' . array_push($links, '<a' . $attr . ' href="mailto:' . $match[1]  . '">' . $match[1] . '</a>') . '>'; }, $value); break;
-                case 'twitter': $value = preg_replace_callback('~(?<!\w)[@#](\w++)~', function ($match) use (&$links, $attr) { return '<' . array_push($links, '<a' . $attr . ' href="https://twitter.com/' . ($match[0][0] == '@' ? '' : 'search/%23') . $match[1]  . '">' . $match[0] . '</a>') . '>'; }, $value); break;
+                case 'https':   $value = preg_replace_callback($mode != 'all' ? '~(?:(https?)://([^\s<>]+)|(www\.[^\s<>]+?\.[^\s<>]+))(?<![\.,:;\?!\'"\|])~i' : '~(?:(https?)://([^\s<>]+)|([^\s<>]+?\.[^\s<>]+)(?<![\.,:]))~i', 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>') . '>'; }, $value); break;
+                case 'mail':    $value = preg_replace_callback('~([^\s<>]+?@[^\s<>]+?\.[^\s<>]+)(?<![\.,:;\?!\'"\|])~', function($match) use (&$links, $attr) { return '<' . array_push($links, '<a' . $attr . ' href="mailto:' . $match[1] . '">' . $match[1] . '</a>') . '>'; }, $value); break;
+                case 'twitter': $value = preg_replace_callback('~(?<!\w)[@#](\w++)~', function($match) use (&$links, $attr) { return '<' . array_push($links, '<a' . $attr . ' href="https://twitter.com/' . ($match[0][0] == '@' ? '' : 'search/%23') . $match[1] . '">' . $match[0] . '</a>') . '>'; }, $value); break;
                 
                 default:
-                    if (strpos($protocol, ':') === false) $protocol .= in_array($protocol, array('ftp', 'tftp', 'ssh', 'scp'))  ? '://' : ':';
-                    $value = preg_replace_callback($mode != 'all' ? '~' . preg_quote($protocol, '~') . '([^\s<>]+?)(?<![\.,:;\?!\'"\|])~i' : '~([^\s<>]+)(?<![\.,:])~i', function ($match) use ($protocol, &$links, $attr) { return '<' . array_push($links, '<a' . $attr . ' href="' . $protocol . $match[1]  . '">' . $match[1] . '</a>') . '>'; }, $value); break;
+                    if (strpos($protocol, ':') === false) $protocol .= in_array($protocol, array('ftp', 'tftp', 'ssh', 'scp')) ? '://' : ':';
+                    $value = preg_replace_callback($mode != 'all' ? '~' . preg_quote($protocol, '~') . '([^\s<>]+?)(?<![\.,:;\?!\'"\|])~i' : '~([^\s<>]+)(?<![\.,:])~i', function($match) use ($protocol, &$links, $attr) { return '<' . array_push($links, '<a' . $attr . ' href="' . $protocol . $match[1] . '">' . $match[1] . '</a>') . '>'; }, $value); break;
             }
         }
         
         // Insert all link
-        return preg_replace_callback('/<(\d+)>/', function ($match) use (&$links) { return $links[$match[1] - 1]; }, $value);
+        return preg_replace_callback('/<(\d+)>/', function($match) use (&$links) { return $links[$match[1] - 1]; }, $value);
     }
 
     /**

src/Jasny/Twig/DateExtension.php

Spacing +10 added lines, -10 removed lines

@@ -51,16 +51,16 @@ 
      * @param int    $calendar
      * @return array(format, pattern)
      */
-    protected function getFormat($format, $calendar=\IntlDateFormatter::GREGORIAN)
+    protected function getFormat($format, $calendar = \IntlDateFormatter::GREGORIAN)
     {
         $pattern = null;
         
         switch ($format) {
             case null:     $format = \IntlDateFormatter::SHORT; $pattern = $this->getDefaultDatePattern($calendar); 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;
         }
         
@@ -73,7 +73,7 @@ 
      * @param int $calendar
      * @return string
      */
-    protected function getDefaultDatePattern($calendar=\IntlDateFormatter::GREGORIAN)
+    protected function getDefaultDatePattern($calendar = \IntlDateFormatter::GREGORIAN)
     {
         return preg_replace('/\byy?\b/', 'yyyy', \IntlDateFormatter::create(\Locale::getDefault(), \IntlDateFormatter::SHORT, \IntlDateFormatter::NONE, null, $calendar)->getPattern());
     }
@@ -86,7 +86,7 @@ 
      * @param string              $calendar  'gregorian' or 'traditional'
      * @return string
      */
-    public function localDate($date, $format=null, $calendar='gregorian')
+    public function localDate($date, $format = null, $calendar = 'gregorian')
     {
         if (!isset($date)) return null;
         
@@ -109,7 +109,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')
     {
         if (!isset($date)) return null;
         
@@ -132,7 +132,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 (!isset($date)) return null;
         
@@ -199,10 +199,10 @@ 
      * @param string $separator
      * @return string
      */
-    public function duration($seconds, $units=array('s', 'm', 'h', 'd', 'w', 'y'), $seperator=' ')
+    public function duration($seconds, $units = array('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];