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

tests/Jasny/Twig/DateExtensionTest.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 namespace Jasny\Twig;
 
 
-class DateExtensionTest extends \PHPUnit_Framework_TestCase  {
+class DateExtensionTest extends \PHPUnit_Framework_TestCase {
 
     public static function setUpBeforeClass() {
         parent::setUpBeforeClass();

tests/Jasny/Twig/TextExtensionTest.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 namespace Jasny\Twig;
 
 
-class TextExtensionTest extends \PHPUnit_Framework_TestCase  {
+class TextExtensionTest extends \PHPUnit_Framework_TestCase {
 
     private function buildEnv($template) {
         $loader = new \Twig_Loader_Array(array(

tests/Jasny/Twig/ArrayExtensionTest.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 namespace Jasny\Twig;
 
 
-class ArrayExtensionTest extends \PHPUnit_Framework_TestCase  {
+class ArrayExtensionTest extends \PHPUnit_Framework_TestCase {
 
     private function buildEnv($template) {
         $loader = new \Twig_Loader_Array(array(

tests/Jasny/Twig/PcreExtensionTest.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 namespace Jasny\Twig;
 
 
-class PcreExtensionTest extends \PHPUnit_Framework_TestCase  {
+class PcreExtensionTest extends \PHPUnit_Framework_TestCase {
 
     private function buildEnv($template) {
         $loader = new \Twig_Loader_Array(array(

src/Jasny/Twig/DateExtension.php

Spacing +17 added lines, -17 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, \IntlTimeZone::getGMT(), $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;
         
@@ -147,7 +147,7 @@ 
             $format_time = 'short';
             
             extract((array)$format, EXTR_PREFIX_ALL, 'format');
-            return $this->localDate($date, $format_date, $calendar) . ' ' . $this->localTime($date, $format_time, $calendar);
+            return $this->localDate($date, $format_date, $calendar).' '.$this->localTime($date, $format_time, $calendar);
         }
         
         list($format, $pattern) = $this->getFormat($format, $calendar);
@@ -199,18 +199,18 @@ 
      * @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];
-        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);
     }

src/Jasny/Twig/TextExtension.php

Spacing +13 added lines, -13 removed lines

@@ -32,7 +32,7 @@ 
     public function paragraph($value)
     {
         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>';
+        return '<p>'.preg_replace(array('~\n(\s*)\n\s*~', '~(?<!</p>)\n\s*~'), array("</p>\n\$1<p>", "<br>\n"), trim($value)).'</p>';
     }
 
     /**
@@ -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;
     }
     
     /**
@@ -63,7 +63,7 @@ 
         if (!isset($value)) return null;
         
         $pos = stripos($value, $break);
-        return $pos === false ? $value : substr($value, 0, $pos) . $replace;
+        return $pos === false ? $value : substr($value, 0, $pos).$replace;
     }
 
     /**
@@ -77,7 +77,7 @@ 
     public function truncate($value, $length, $replace = '...')
     {
         if (!isset($value)) 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;
     }
     
     /**
@@ -96,30 +96,30 @@ 
         // Link attributes
         $attr = '';
         foreach ($attributes as $key => $val) {
-            $attr .= ' ' . $key . '="' . htmlentities($val) . '"';
+            $attr .= ' '.$key.'="'.htmlentities($val).'"';
         }
         
         $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/ArrayExtension.php

Spacing +1 added lines, -1 removed lines

@@ -98,7 +98,7 @@
             if (!isset($value) || $value === false) continue;
             
             if ($value === true) $value = $key;
-            $str .= ' ' . $key . '="' . addcslashes($value, '"') . '"';
+            $str .= ' '.$key.'="'.addcslashes($value, '"').'"';
         }
         return trim($str);
     }