jasny / twig-extensions

src/Jasny/Twig/DateExtension.php

Doc Comments +4 added lines, -3 removed lines

@@ -81,7 +81,7 @@ 
     /**
      * Format the date value as a string based on the current locale
      * 
-     * @param DateTime|int|string $date
+     * @param \DateTime $date
      * @param string              $format    null, 'short', 'medium', 'long', 'full' or pattern
      * @param string              $calendar  'gregorian' or 'traditional'
      * @return string
@@ -104,7 +104,7 @@ 
     /**
      * Format the time value as a string based on the current locale
      * 
-     * @param DateTime|int|string $date
+     * @param \DateTime $date
      * @param string              $format    'short', 'medium', 'long', 'full' or pattern
      * @param string              $calendar  'gregorian' or 'traditional'
      * @return string
@@ -161,6 +161,7 @@ 
      * Split duration into seconds, minutes, hours, days, weeks and years.
      * 
      * @param int $seconds
+     * @param integer $max
      * @return array
      */
     protected function splitDuration($seconds, $max)
@@ -196,7 +197,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=array('s', 'm', 'h', 'd', 'w', 'y'), $seperator=' ')

Indentation +6 added lines, -6 removed lines

@@ -91,8 +91,8 @@ 
         if (!isset($date)) return null;
         
         if ($date instanceof \DateTime);
-         elseif (is_int($date)) $date = \DateTime::createFromFormat('U', $date);
-         else $date = new \DateTime((string)$date);
+            elseif (is_int($date)) $date = \DateTime::createFromFormat('U', $date);
+            else $date = new \DateTime((string)$date);
         
         $calendar = $calendar == 'traditional' ? \IntlDateFormatter::TRADITIONAL : \IntlDateFormatter::GREGORIAN;
         list($format, $pattern) = $this->getFormat($format, $calendar);
@@ -114,8 +114,8 @@ 
         if (!isset($date)) return null;
         
         if ($date instanceof \DateTime);
-         elseif (is_int($date)) $date = \DateTime::createFromFormat('U', $date);
-         else $date = new \DateTime((string)$date);
+            elseif (is_int($date)) $date = \DateTime::createFromFormat('U', $date);
+            else $date = new \DateTime((string)$date);
         
         $calendar = $calendar == 'traditional' ? \IntlDateFormatter::TRADITIONAL : \IntlDateFormatter::GREGORIAN;
         list($format, $pattern) = $this->getFormat($format, $calendar);
@@ -137,8 +137,8 @@ 
         if (!isset($date)) return null;
         
         if ($date instanceof \DateTime);
-         elseif (is_int($date)) $date = \DateTime::createFromFormat('U', $date);
-         else $date = new \DateTime((string)$date);
+            elseif (is_int($date)) $date = \DateTime::createFromFormat('U', $date);
+            else $date = new \DateTime((string)$date);
 
         $calendar = $calendar == 'traditional' ? \IntlDateFormatter::TRADITIONAL : \IntlDateFormatter::GREGORIAN;
          

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];

Braces +63 added lines, -22 removed lines

@@ -14,7 +14,9 @@ 
      */
     public function __construct()
     {
-        if (!extension_loaded('intl')) throw new \Exception("Jasny's Date Twig extension requires PHP extension 'intl' (see http://www.php.net/intl).");
+        if (!extension_loaded('intl')) {
+            throw new \Exception("Jasny's Date Twig extension requires PHP extension 'intl' (see http://www.php.net/intl).");
+        }
     }
 
     
@@ -88,11 +90,16 @@ 
      */
     public function localDate($date, $format=null, $calendar='gregorian')
     {
-        if (!isset($date)) return null;
+        if (!isset($date)) {
+            return null;
+        }
         
         if ($date instanceof \DateTime);
-         elseif (is_int($date)) $date = \DateTime::createFromFormat('U', $date);
-         else $date = new \DateTime((string)$date);
+         elseif (is_int($date)) {
+             $date = \DateTime::createFromFormat('U', $date);
+         } else {
+             $date = new \DateTime((string)$date);
+         }
         
         $calendar = $calendar == 'traditional' ? \IntlDateFormatter::TRADITIONAL : \IntlDateFormatter::GREGORIAN;
         list($format, $pattern) = $this->getFormat($format, $calendar);
@@ -111,11 +118,16 @@ 
      */
     public function localTime($date, $format='short', $calendar='gregorian')
     {
-        if (!isset($date)) return null;
+        if (!isset($date)) {
+            return null;
+        }
         
         if ($date instanceof \DateTime);
-         elseif (is_int($date)) $date = \DateTime::createFromFormat('U', $date);
-         else $date = new \DateTime((string)$date);
+         elseif (is_int($date)) {
+             $date = \DateTime::createFromFormat('U', $date);
+         } else {
+             $date = new \DateTime((string)$date);
+         }
         
         $calendar = $calendar == 'traditional' ? \IntlDateFormatter::TRADITIONAL : \IntlDateFormatter::GREGORIAN;
         list($format, $pattern) = $this->getFormat($format, $calendar);
@@ -134,11 +146,16 @@ 
      */
     public function localDateTime($date, $format=null, $calendar='gregorian')
     {
-        if (!isset($date)) return null;
+        if (!isset($date)) {
+            return null;
+        }
         
         if ($date instanceof \DateTime);
-         elseif (is_int($date)) $date = \DateTime::createFromFormat('U', $date);
-         else $date = new \DateTime((string)$date);
+         elseif (is_int($date)) {
+             $date = \DateTime::createFromFormat('U', $date);
+         } else {
+             $date = new \DateTime((string)$date);
+         }
 
         $calendar = $calendar == 'traditional' ? \IntlDateFormatter::TRADITIONAL : \IntlDateFormatter::GREGORIAN;
          
@@ -165,23 +182,33 @@ 
      */
     protected function splitDuration($seconds, $max)
     {
-        if ($max < 1 || $seconds < 60) return array($seconds);
+        if ($max < 1 || $seconds < 60) {
+            return array($seconds);
+        }
         
         $minutes = floor($seconds / 60);
         $seconds = $seconds % 60;
-        if ($max < 2 || $minutes < 60) return array($seconds, $minutes);
+        if ($max < 2 || $minutes < 60) {
+            return array($seconds, $minutes);
+        }
         
         $hours = floor($minutes / 60);
         $minutes = $minutes % 60;
-        if ($max < 3 || $hours < 24) return array($seconds, $minutes, $hours);
+        if ($max < 3 || $hours < 24) {
+            return array($seconds, $minutes, $hours);
+        }
         
         $days = floor($hours / 24);
         $hours = $hours % 24;
-        if ($max < 4 || $days < 7) return array($seconds, $minutes, $hours, $days); 
+        if ($max < 4 || $days < 7) {
+            return array($seconds, $minutes, $hours, $days);
+        }
         
         $weeks = floor($days / 7);
         $days = $days % 7;
-        if ($max < 5 || $weeks < 52) return array($seconds, $minutes, $hours, $days, $weeks);
+        if ($max < 5 || $weeks < 52) {
+            return array($seconds, $minutes, $hours, $days, $weeks);
+        }
         
         $years = floor($weeks / 52);
         $weeks = $weeks % 52;
@@ -205,12 +232,24 @@ 
             $this->splitDuration($seconds, count($units)-1) + array_fill(0, 6, null);
         
         $duration = '';
-        if (isset($years) && isset($units[5]))   $duration .= $seperator . $years . $units[5];
-        if (isset($weeks) && isset($units[4]))   $duration .= $seperator . $weeks . $units[4];
-        if (isset($days) && isset($units[3]))    $duration .= $seperator . $days . $units[3];
-        if (isset($hours) && isset($units[2]))   $duration .= $seperator . $hours . $units[2];
-        if (isset($minutes) && isset($units[1])) $duration .= $seperator . $minutes . $units[1];
-        if (isset($seconds) && isset($units[0])) $duration .= $seperator . $seconds . $units[0];
+        if (isset($years) && isset($units[5])) {
+            $duration .= $seperator . $years . $units[5];
+        }
+        if (isset($weeks) && isset($units[4])) {
+            $duration .= $seperator . $weeks . $units[4];
+        }
+        if (isset($days) && isset($units[3])) {
+            $duration .= $seperator . $days . $units[3];
+        }
+        if (isset($hours) && isset($units[2])) {
+            $duration .= $seperator . $hours . $units[2];
+        }
+        if (isset($minutes) && isset($units[1])) {
+            $duration .= $seperator . $minutes . $units[1];
+        }
+        if (isset($seconds) && isset($units[0])) {
+            $duration .= $seperator . $seconds . $units[0];
+        }
         
         return trim($duration, $seperator);
     }
@@ -223,7 +262,9 @@ 
      */
     public function age($date)
     {
-        if (!$date instanceof \DateTime) $date = new \DateTime($date);
+        if (!$date instanceof \DateTime) {
+            $date = new \DateTime($date);
+        }
         return $date->diff(new \DateTime())->format('%y');
     }
 }

src/Jasny/Twig/PcreExtension.php

Doc Comments +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
      * 
      * @param string $value
      * @param string $pattern
-     * @return boolean
+     * @return null|integer
      */
     public function match($value, $pattern)
     {

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

Braces +39 added lines, -13 removed lines

@@ -14,7 +14,9 @@ 
      */
     public function __construct()
     {
-        if (!extension_loaded('pcre')) throw new \Exception("The Twig PCRE extension requires PHP extension 'pcre' (see http://www.php.net/pcre).");
+        if (!extension_loaded('pcre')) {
+            throw new \Exception("The Twig PCRE extension requires PHP extension 'pcre' (see http://www.php.net/pcre).");
+        }
     }
 
 
@@ -43,7 +45,9 @@ 
      */
     protected function assertNoEval($pattern)
     {
-        if (preg_match('/(.).*\1(.+)$/', trim($pattern), $match) && strpos($match[1], 'e') !== false) throw new \Exception("Using the eval modifier for regular expressions is not allowed");
+        if (preg_match('/(.).*\1(.+)$/', trim($pattern), $match) && strpos($match[1], 'e') !== false) {
+            throw new \Exception("Using the eval modifier for regular expressions is not allowed");
+        }
     }
     
 
@@ -56,7 +60,9 @@ 
      */
     public function quote($value, $delimiter = '/')
     {
-        if (!isset($value)) return null;
+        if (!isset($value)) {
+            return null;
+        }
         return preg_quote($value, $delimiter);
     }
 
@@ -71,7 +77,9 @@ 
     {
         $this->assertNoEval($pattern);
         
-        if (!isset($value)) return null;
+        if (!isset($value)) {
+            return null;
+        }
         return preg_match($pattern, $value);
     }
 
@@ -86,8 +94,12 @@ 
     {
         $this->assertNoEval($pattern);
         
-        if (!isset($value)) return null;
-        if (!preg_match($pattern, $value, $matches)) return null;
+        if (!isset($value)) {
+            return null;
+        }
+        if (!preg_match($pattern, $value, $matches)) {
+            return null;
+        }
         return isset($matches[$group]) ? $matches[$group] : null;
     }
 
@@ -102,8 +114,12 @@ 
     {
         $this->assertNoEval($pattern);
         
-        if (!isset($value)) return null;
-        if (!preg_match_all($pattern, $value, $matches, PREG_PATTERN_ORDER)) return array();
+        if (!isset($value)) {
+            return null;
+        }
+        if (!preg_match_all($pattern, $value, $matches, PREG_PATTERN_ORDER)) {
+            return array();
+        }
         return isset($matches[$group]) ? $matches[$group] : array();
     }
 
@@ -119,9 +135,13 @@ 
     {
         $this->assertNoEval($pattern);
         
-        if (!isset($values)) return null;
+        if (!isset($values)) {
+            return null;
+        }
         
-        if (is_string($flags)) $flags = $flags == 'invert' ? PREG_GREP_INVERT : 0;
+        if (is_string($flags)) {
+            $flags = $flags == 'invert' ? PREG_GREP_INVERT : 0;
+        }
         return preg_grep($pattern, $values, $flags);
     }
 
@@ -138,7 +158,9 @@ 
     {
         $this->assertNoEval($pattern);
         
-        if (!isset($value)) return null;
+        if (!isset($value)) {
+            return null;
+        }
         return preg_replace($pattern, $replacement, $value, $limit);
     }
 
@@ -155,7 +177,9 @@ 
     {
         $this->assertNoEval($pattern);
         
-        if (!isset($value)) return null;
+        if (!isset($value)) {
+            return null;
+        }
         return preg_filter($pattern, $replacement, $value, $limit);
     }
 
@@ -170,7 +194,9 @@ 
     {
         $this->assertNoEval($pattern);
         
-        if (!isset($value)) return null;
+        if (!isset($value)) {
+            return null;
+        }
         return preg_split($pattern, $value);
     }
     

src/Jasny/Twig/ArrayExtension.php

Indentation +6 added lines, -6 removed lines

@@ -43,8 +43,8 @@ 
      */
     public function sum($array)
     {
-       if (!isset($array)) return null;
-       return array_sum((array)$array);
+        if (!isset($array)) return null;
+        return array_sum((array)$array);
     }
     
     /**
@@ -55,8 +55,8 @@ 
      */
     public function product($array)
     {
-       if (!isset($array)) return null;
-       return array_product((array)$array);
+        if (!isset($array)) return null;
+        return array_product((array)$array);
     }
     
     /**
@@ -67,8 +67,8 @@ 
      */
     public function values($array)
     {
-       if (!isset($array)) return null;
-       return array_values((array)$array);
+        if (!isset($array)) return null;
+        return array_values((array)$array);
     }
     
     

Braces +18 added lines, -6 removed lines

@@ -43,7 +43,9 @@ 
      */
     public function sum($array)
     {
-       if (!isset($array)) return null;
+       if (!isset($array)) {
+           return null;
+       }
        return array_sum((array)$array);
     }
     
@@ -55,7 +57,9 @@ 
      */
     public function product($array)
     {
-       if (!isset($array)) return null;
+       if (!isset($array)) {
+           return null;
+       }
        return array_product((array)$array);
     }
     
@@ -67,7 +71,9 @@ 
      */
     public function values($array)
     {
-       if (!isset($array)) return null;
+       if (!isset($array)) {
+           return null;
+       }
        return array_values((array)$array);
     }
     
@@ -91,13 +97,19 @@ 
      */
     public function HTMLAttributes($array)
     {
-        if (!isset($array)) return null;
+        if (!isset($array)) {
+            return null;
+        }
        
         $str = "";
         foreach ($array as $key=>$value) {
-            if (!isset($value) || $value === false) continue;
+            if (!isset($value) || $value === false) {
+                continue;
+            }
             
-            if ($value === true) $value = $key;
+            if ($value === true) {
+                $value = $key;
+            }
             $str .= ' ' . $key . '="' . addcslashes($value, '"') . '"';
         }
         return trim($str);

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);
     }
 
     /**

Braces +22 added lines, -7 removed lines

@@ -31,7 +31,9 @@ 
      */
     public function paragraph($value)
     {
-        if (!isset($value)) return null;
+        if (!isset($value)) {
+            return null;
+        }
         return '<p>' . preg_replace(array('~\n(\s*)\n\s*~', '~(?<!</p>)\n\s*~'), array("</p>\n\$1<p>", "<br>\n"), trim($value)) . '</p>';
     }
 
@@ -44,7 +46,9 @@ 
      */
     public function line($value, $line=1)
     {
-        if (!isset($value)) return null;
+        if (!isset($value)) {
+            return null;
+        }
         
         $lines = explode("\n", $value);
         return isset($lines[$line-1]) ? $lines[$line-1] : null;
@@ -60,7 +64,9 @@ 
      */
     public function less($value, $replace = '...', $break = '<!-- pagebreak -->')
     {
-        if (!isset($value)) return null;
+        if (!isset($value)) {
+            return null;
+        }
         
         $pos = stripos($value, $break);
         return $pos === false ? $value : substr($value, 0, $pos) . $replace;
@@ -76,7 +82,9 @@ 
      */
     public function truncate($value, $length, $replace = '...')
     {
-        if (!isset($value)) return null;
+        if (!isset($value)) {
+            return null;
+        }
         return strlen($value) <= $length ? $value : substr($value, 0, $length - strip_tags($replace)) . $replace;
     }
     
@@ -91,7 +99,9 @@ 
      */
     public function linkify($value, $protocols = array('http', 'mail'), array $attributes = array(), $mode = 'normal')
     {
-        if (!isset($value)) return null;
+        if (!isset($value)) {
+            return null;
+        }
         
         // Link attributes
         $attr = '';
@@ -108,12 +118,17 @@ 
         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 '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'))  ? '://' : ':';
+                    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;
             }
         }