Refactor SortableLink

src/ColumnSortable/ColumnSortableServiceProvider.php

@@ -30,7 +30,6 @@ public function boot()
         ], 'config');
 
         Blade::directive('sortablelink', function ($expression) {
-            //TODO: only accepts single quotes 'Email', would be nice to accept double quotes as well.
             $expression = ($expression[0] === '(') ? substr($expression, 1, -1) : $expression;
             return "<?php echo \Kyslik\ColumnSortable\SortableLink::render(array ({$expression}));?>";
         });

src/ColumnSortable/SortableLink.php

@@ -19,29 +19,18 @@ class SortableLink
      */
     public static function render(array $parameters)
     {
-        if (count($parameters) === 1) {
-            $title = self::getOneToOneSortOrNull($parameters[0]);
-            $title = (is_null($title)) ? $parameters[0] : $title[1];
-        } else {
-            $title = $parameters[1];
-        }
+        list($sort, $title) = self::parseParameters($parameters);
+        $sortOriginal = $sort;
 
-        $sort = $sortOriginal = $parameters[0];
         unset($parameters);
 
-        $formatting_function = Config::get('columnsortable.formatting_function', null);
-
-        if (!is_null($formatting_function) && function_exists($formatting_function)) {
-            $title = call_user_func($formatting_function, $title);
-        }
-
         $icon = Config::get('columnsortable.default_icon_set');
 
         if ($oneToOneSort = self::getOneToOneSortOrNull($sort)) {
             $sort = $oneToOneSort[1];
         }
 
-        foreach (Config::get('columnsortable.columns') as $key => $value) {
+        foreach (Config::get('columnsortable.columns') as $value) {
             if (in_array($sort, $value['rows'])) {
                 $icon = $value['class'];
             }
@@ -100,4 +89,25 @@ public static function getOneToOneSortOrNull($sort)
 
         return null;
     }
+
+    /**
+     * @param array $parameters
+     * @return array
+     */
+    private static function parseParameters(array $parameters)
+    {
+        if (count($parameters) === 1) {
+            $title = self::getOneToOneSortOrNull($parameters[0]);
+            $title = (is_null($title)) ? $parameters[0] : $title[1];
+        } else {
+            $title = $parameters[1];
+        }
+
+        $formatting_function = Config::get('columnsortable.formatting_function', null);
+        if (!is_null($formatting_function) && function_exists($formatting_function)) {
+            $title = call_user_func($formatting_function, $title);
+        }
+
+        return [$parameters[0], $title];
+    }
 }