vojtasvoboda / oc-twigextensions-plugin

classes/TimeDiffTranslator.php

Spacing +2 added lines, -2 removed lines

@@ -7,11 +7,11 @@
 {
     public function trans($id, array $parameters = [], $domain = 'messages', $locale = null)
     {
-        return $this->get('vojtasvoboda.twigextensions::lang.' . $id, $parameters, $locale);
+        return $this->get('vojtasvoboda.twigextensions::lang.'.$id, $parameters, $locale);
     }
 
     public function transChoice($id, $number, array $parameters = [], $domain = 'messages', $locale = null)
     {
-        return $this->choice('vojtasvoboda.twigextensions::lang.' . $id, $number, $parameters, $locale);
+        return $this->choice('vojtasvoboda.twigextensions::lang.'.$id, $number, $parameters, $locale);
     }
 }

Unused Use Statements -1 removed lines

@@ -1,6 +1,5 @@
 <?php namespace VojtaSvoboda\TwigExtensions\Classes;
 
-use App;
 use October\Rain\Translation\Translator;
 use Symfony\Component\Translation\TranslatorInterface;
 

Plugin.php

Unused Use Statements -2 removed lines

@@ -1,7 +1,5 @@
 <?php namespace VojtaSvoboda\TwigExtensions;
 
-use App;
-use Backend;
 use Carbon\Carbon;
 use Snilius\Twig\SortByFieldExtension;
 use System\Classes\PluginBase;

Spacing +45 added lines, -45 removed lines

@@ -42,7 +42,7 @@ 
 
     public function boot()
     {
-        $this->app->singleton('time_diff_translator', function ($app) {
+        $this->app->singleton('time_diff_translator', function($app) {
             $loader = $app->make('translation.loader');
             $locale = $app->config->get('app.locale');
             $translator = $app->make(TimeDiffTranslator::class, [$loader, $locale]);
@@ -136,7 +136,7 @@ 
         $stringLoaderFunc = $stringLoader->getFunctions();
 
         return [
-            'template_from_string' => function ($template) use ($twig, $stringLoaderFunc) {
+            'template_from_string' => function($template) use ($twig, $stringLoaderFunc) {
                 $callable = $stringLoaderFunc[0]->getCallable();
                 return $callable($twig, $template);
             }
@@ -156,11 +156,11 @@ 
         $textFilters = $textExtension->getFilters();
 
         return [
-            'truncate' => function ($value, $length = 30, $preserve = false, $separator = '...') use ($twig, $textFilters) {
+            'truncate' => function($value, $length = 30, $preserve = false, $separator = '...') use ($twig, $textFilters) {
                 $callable = $textFilters[0]->getCallable();
                 return $callable($twig, $value, $length, $preserve, $separator);
             },
-            'wordwrap' => function ($value, $length = 80, $separator = "\n", $preserve = false) use ($twig, $textFilters) {
+            'wordwrap' => function($value, $length = 80, $separator = "\n", $preserve = false) use ($twig, $textFilters) {
                 $callable = $textFilters[1]->getCallable();
                 return $callable($twig, $value, $length, $separator, $preserve);
             }
@@ -180,15 +180,15 @@ 
         $intlFilters = $intlExtension->getFilters();
 
         return [
-            'localizeddate' => function ($date, $dateFormat = 'medium', $timeFormat = 'medium', $locale = null, $timezone = null, $format = null) use ($twig, $intlFilters) {
+            'localizeddate' => function($date, $dateFormat = 'medium', $timeFormat = 'medium', $locale = null, $timezone = null, $format = null) use ($twig, $intlFilters) {
                 $callable = $intlFilters[0]->getCallable();
                 return $callable($twig, $date, $dateFormat, $timeFormat, $locale, $timezone, $format);
             },
-            'localizednumber' => function ($number, $style = 'decimal', $type = 'default', $locale = null) use ($twig, $intlFilters) {
+            'localizednumber' => function($number, $style = 'decimal', $type = 'default', $locale = null) use ($twig, $intlFilters) {
                 $callable = $intlFilters[1]->getCallable();
                 return $callable($number, $style, $type, $locale);
             },
-            'localizedcurrency' => function ($number, $currency = null, $locale = null) use ($twig, $intlFilters) {
+            'localizedcurrency' => function($number, $currency = null, $locale = null) use ($twig, $intlFilters) {
                 $callable = $intlFilters[2]->getCallable();
                 return $callable($number, $currency, $locale);
             }
@@ -206,7 +206,7 @@ 
         $arrayFilters = $arrayExtension->getFilters();
 
         return [
-            'shuffle' => function ($array) use ($arrayFilters) {
+            'shuffle' => function($array) use ($arrayFilters) {
                 $callable = $arrayFilters[0]->getCallable();
                 return $callable($array);
             }
@@ -227,7 +227,7 @@ 
         $timeFilters = $timeExtension->getFilters();
 
         return [
-            'time_diff' => function ($date, $now = null) use ($twig, $timeFilters) {
+            'time_diff' => function($date, $now = null) use ($twig, $timeFilters) {
                 $callable = $timeFilters[0]->getCallable();
                 return $callable($twig, $date, $now);
             }
@@ -245,7 +245,7 @@ 
         $filters = $extension->getFilters();
 
         return [
-            'sortbyfield' => function ($array, $sort_by = null, $direction = 'asc') use ($filters) {
+            'sortbyfield' => function($array, $sort_by = null, $direction = 'asc') use ($filters) {
                 $callable = $filters[0]->getCallable();
                 return $callable($array, $sort_by, $direction);
             }
@@ -260,7 +260,7 @@ 
     private function getMailFilters()
     {
         return [
-            'mailto' => function ($string, $link = true, $protected = true, $text = null, $class = "") {
+            'mailto' => function($string, $link = true, $protected = true, $text = null, $class = "") {
                 return $this->hideEmail($string, $link, $protected, $text, $class);
             }
         ];
@@ -274,53 +274,53 @@ 
     private function getPhpFunctions()
     {
         return [
-            'strftime' => function ($time, $format = '%d.%m.%Y %H:%M:%S') {
+            'strftime' => function($time, $format = '%d.%m.%Y %H:%M:%S') {
                 $timeObj = new Carbon($time);
                 return strftime($format, $timeObj->getTimestamp());
             },
-            'uppercase' => function ($string) {
+            'uppercase' => function($string) {
                 return mb_convert_case($string, MB_CASE_UPPER, "UTF-8");
             },
-            'lowercase' => function ($string) {
+            'lowercase' => function($string) {
                 return mb_convert_case($string, MB_CASE_LOWER, "UTF-8");
             },
-            'ucfirst' => function ($string) {
+            'ucfirst' => function($string) {
                 return mb_convert_case($string, MB_CASE_TITLE, "UTF-8");
             },
-            'lcfirst' => function ($string) {
+            'lcfirst' => function($string) {
                 return lcfirst($string);
             },
-            'ltrim' => function ($string, $charlist = " \t\n\r\0\x0B") {
+            'ltrim' => function($string, $charlist = " \t\n\r\0\x0B") {
                 return ltrim($string, $charlist);
             },
-            'rtrim' => function ($string, $charlist = " \t\n\r\0\x0B") {
+            'rtrim' => function($string, $charlist = " \t\n\r\0\x0B") {
                 return rtrim($string, $charlist);
             },
-            'str_repeat' => function ($string, $multiplier = 1) {
+            'str_repeat' => function($string, $multiplier = 1) {
                 return str_repeat($string, $multiplier);
             },
-            'plural' => function ($string, $count = 2) {
+            'plural' => function($string, $count = 2) {
                 return str_plural($string, $count);
             },
-            'strpad' => function ($string, $pad_length, $pad_string = ' ') {
+            'strpad' => function($string, $pad_length, $pad_string = ' ') {
                 return str_pad($string, $pad_length, $pad_string, $pad_type = STR_PAD_BOTH);
             },
-            'leftpad' => function ($string, $pad_length, $pad_string = ' ') {
+            'leftpad' => function($string, $pad_length, $pad_string = ' ') {
                 return str_pad($string, $pad_length, $pad_string, $pad_type = STR_PAD_LEFT);
             },
-            'rightpad' => function ($string, $pad_length, $pad_string = ' ') {
+            'rightpad' => function($string, $pad_length, $pad_string = ' ') {
                 return str_pad($string, $pad_length, $pad_string, $pad_type = STR_PAD_RIGHT);
             },
-            'rtl' => function ($string) {
+            'rtl' => function($string) {
                 return strrev($string);
             },
-            'str_replace' => function ($string, $search, $replace) {
+            'str_replace' => function($string, $search, $replace) {
                 return str_replace($search, $replace, $string);
             },
-            'strip_tags' => function ($string, $allow = '') {
+            'strip_tags' => function($string, $allow = '') {
                 return strip_tags($string, $allow);
             },
-            'var_dump' => function ($expression) {
+            'var_dump' => function($expression) {
                 ob_start();
                 var_dump($expression);
                 $result = ob_get_clean();
@@ -338,7 +338,7 @@ 
     private function getConfigFunction()
     {
         return [
-            'config' => function ($key = null, $default = null) {
+            'config' => function($key = null, $default = null) {
                 return config($key, $default);
             },
         ];
@@ -352,7 +352,7 @@ 
     private function getEnvFunction()
     {
         return [
-            'env' => function ($key, $default = null) {
+            'env' => function($key, $default = null) {
                 return env($key, $default);
             },
         ];
@@ -366,7 +366,7 @@ 
     private function getSessionFunction()
     {
         return [
-            'session' => function ($key = null) {
+            'session' => function($key = null) {
                 return session($key);
             },
         ];
@@ -381,9 +381,9 @@ 
     private function getRedirectFunction()
     {
         return [
-            'redirect' => function ($url) {
+            'redirect' => function($url) {
 
-                if(empty($url)) {
+                if (empty($url)) {
                     return;
                 }
 
@@ -400,7 +400,7 @@ 
     private function getTransFunction()
     {
         return [
-            'trans' => function ($key = null, $parameters = []) {
+            'trans' => function($key = null, $parameters = []) {
                 return trans($key, $parameters);
             },
         ];
@@ -414,7 +414,7 @@ 
     private function getVarDumpFunction()
     {
         return [
-            'var_dump' => function ($expression) {
+            'var_dump' => function($expression) {
                 ob_start();
                 var_dump($expression);
                 $result = ob_get_clean();
@@ -448,32 +448,32 @@ 
 
         // if we want just unprotected link
         if (!$protected) {
-            return $link ? '<a href="mailto:' . $email . '">' . $linkText . '</a>' : $linkText;
+            return $link ? '<a href="mailto:'.$email.'">'.$linkText.'</a>' : $linkText;
         }
 
         // turn on protection
         $character_set = '+-.0123456789@ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz';
         $key = str_shuffle($character_set);
         $cipher_text = '';
-        $id = 'e' . rand(1, 999999999);
+        $id = 'e'.rand(1, 999999999);
         for ($i = 0; $i < strlen($email); $i += 1) {
             $cipher_text .= $key[strpos($character_set, $email[$i])];
         }
-        $script = 'var a="' . $key . '";var b=a.split("").sort().join("");var c="' . $cipher_text . '";var d=""; var cl="'.$class.'";';
+        $script = 'var a="'.$key.'";var b=a.split("").sort().join("");var c="'.$cipher_text.'";var d=""; var cl="'.$class.'";';
         $script .= 'for(var e=0;e<c.length;e++)d+=b.charAt(a.indexOf(c.charAt(e)));';
         $script .= 'var y = d;';
         if ($text !== null) {
             $script .= 'var y = "'.$text.'";';
         }
         if ($link) {
-            $script .= 'document.getElementById("' . $id . '").innerHTML="<a class=\""+cl+"\" href=\\"mailto:"+d+"\\">"+y+"</a>"';
+            $script .= 'document.getElementById("'.$id.'").innerHTML="<a class=\""+cl+"\" href=\\"mailto:"+d+"\\">"+y+"</a>"';
         } else {
-            $script .= 'document.getElementById("' . $id . '").innerHTML=y';
+            $script .= 'document.getElementById("'.$id.'").innerHTML=y';
         }
-        $script = "eval(\"" . str_replace(array("\\", '"'), array("\\\\", '\"'), $script) . "\")";
-        $script = '<script type="text/javascript">/*<![CDATA[*/' . $script . '/*]]>*/</script>';
+        $script = "eval(\"".str_replace(array("\\", '"'), array("\\\\", '\"'), $script)."\")";
+        $script = '<script type="text/javascript">/*<![CDATA[*/'.$script.'/*]]>*/</script>';
 
-        return '<span id="' . $id . '">[javascript protected email address]</span>' . $script;
+        return '<span id="'.$id.'">[javascript protected email address]</span>'.$script;
     }
 
     /**
@@ -488,15 +488,15 @@ 
     private function getFileRevision()
     {
         return [
-            'revision' => function ($filename, $format = null) {
+            'revision' => function($filename, $format = null) {
                 // Remove http/web address from the file name if there is one to load it locally
                 $prefix = url('/');
-                $filename_ = trim(preg_replace('/^' . preg_quote($prefix, '/') . '/', '', $filename), '/');
+                $filename_ = trim(preg_replace('/^'.preg_quote($prefix, '/').'/', '', $filename), '/');
                 if (file_exists($filename_)) {
                     $timestamp = filemtime($filename_);
                     $prepend = ($format) ? date($format, $timestamp) : $timestamp;
 
-                    return $filename . "?" . $prepend;
+                    return $filename."?".$prepend;
                 }
 
                 return $filename;

tests/PluginTest.php

Spacing +5 added lines, -5 removed lines

@@ -7,7 +7,7 @@ 
 use Twig_Environment;
 use VojtaSvoboda\TwigExtensions\Classes\TimeDiffTranslator;
 
-require_once __DIR__ . '/../vendor/autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 
 class PluginTest extends PluginTestCase
 {
@@ -17,7 +17,7 @@ 
 
         $this->app->setLocale('en');
 
-        $this->app->singleton('time_diff_translator', function ($app) {
+        $this->app->singleton('time_diff_translator', function($app) {
             $loader = $app->make('translation.loader');
             $locale = $app->config->get('app.locale');
             $translator = $app->make(TimeDiffTranslator::class, [$loader, $locale]);
@@ -114,7 +114,7 @@ 
         $twig = $this->getTwig();
 
         $now = Carbon::now()->subMinute();
-        $template = "{{ '" . $now->format('Y-m-d H:i:s') . "' | time_diff }}";
+        $template = "{{ '".$now->format('Y-m-d H:i:s')."' | time_diff }}";
 
         // this test fails at TravisCI and I don't know why
         $twigTemplate = $twig->createTemplate($template);
@@ -351,7 +351,7 @@ 
         $key = 'app.custom.key';
         $value = 'test value';
         Config::set($key, $value);
-        $template = "{{ config('" . $key . "') }}";
+        $template = "{{ config('".$key."') }}";
 
         $twigTemplate = $twig->createTemplate($template);
         $this->assertEquals($twigTemplate->render([]), $value);
@@ -364,7 +364,7 @@ 
         $key = 'env.custom.key';
         $value = 'test value';
         putenv($key.'='.$value);
-        $template = "{{ env('" . $key . "') }}";
+        $template = "{{ env('".$key."') }}";
 
         $twigTemplate = $twig->createTemplate($template);
         $this->assertEquals($twigTemplate->render([]), $value);