webdivane / table

TraitQuery.php

Braces +1 added lines, -2 removed lines

@@ -17,8 +17,7 @@
         array $order = [],
         $limit = 0,
         $useHaving = false
-    )
-    {
+    ) {
         //Condition: '' | ' (HAVING|WHERE|AND) ' . $cond
         self::queryConditions($query, $cond, $useHaving);
 

Spacing +5 added lines, -5 removed lines

@@ -36,17 +36,17 @@ 
         if (!empty($cond)) {
             $clause = !$useHaving ? 'WHERE' : 'HAVING';
             $clue = !strpos($query, $clause) ? $clause : 'AND';
-            $query .= (' '.$clue.' '.$cond);
+            $query .= (' ' . $clue . ' ' . $cond);
         }
     }
 
     private static function queryOrder(&$query, $order)
     {
         if (!empty($order)) {
-            $arr = array_map(function (&$value, $key) {
-                return $key.' '.strtoupper($value);
+            $arr = array_map(function(&$value, $key) {
+                return $key . ' ' . strtoupper($value);
             }, $order, array_keys($order));
-            $query .= (' ORDER BY '.implode(', ', $arr));
+            $query .= (' ORDER BY ' . implode(', ', $arr));
         }
     }
 
@@ -54,7 +54,7 @@ 
     {
         if (!empty($limit)) {
             $value = (is_array($limit) ? implode(', ', $limit) : $limit);
-            $query .= (' LIMIT '.$value);
+            $query .= (' LIMIT ' . $value);
         }
     }
 }

Tfoot.php

Spacing +12 added lines, -14 removed lines

@@ -17,8 +17,8 @@ 
             $vars = [];
             self::showingMessageVars($vars);
             if (self::$exportActive === true) {
-                $url = strtok(self::$t['slug'], '?&').'.json?table='.
-                    self::$t['items'].'&export=';
+                $url = strtok(self::$t['slug'], '?&') . '.json?table=' .
+                    self::$t['items'] . '&export=';
                 $vars['export']['url'] = $url;
                 $vars['export']['types'] = self::config('SAVES');
             }
@@ -37,15 +37,14 @@ 
             //Skips total count query
             self::$t['rows'] = count(self::$data);
         } else {
-            $query = 'SELECT COUNT(*) FROM ('.self::$t['qAll'].') AS dt';
+            $query = 'SELECT COUNT(*) FROM (' . self::$t['qAll'] . ') AS dt';
             self::$t['rows'] = self::select($query);
         }
-        self::$t['pages'] = ceil(self::$t['rows'] / self::$t['paging']);
+        self::$t['pages'] = ceil(self::$t['rows']/self::$t['paging']);
 
-        $vars['from'] = ($pageNo - 1) * self::$t['paging'] + 1;
-        $vars['upto'] = ($pageNo * self::$t['paging'] < self::$t['rows']) ?
-            $pageNo * self::$t['paging'] :
-            self::$t['rows'];
+        $vars['from'] = ($pageNo - 1)*self::$t['paging'] + 1;
+        $vars['upto'] = ($pageNo*self::$t['paging'] < self::$t['rows']) ?
+            $pageNo*self::$t['paging'] : self::$t['rows'];
 
         $vars["total"] = self::$t['rows'];
         $vars["items"] = self::$t['items'];
@@ -56,11 +55,11 @@ 
         $trs = '';
         if (self::$t['rows'] > 0) {
             $ftr = self::jsonTfoot()[0][0];
-            $trs .= '<tr><td'.self::attributes($ftr[1]).'>'
-                .$ftr[0].'</td></tr>';
+            $trs .= '<tr><td' . self::attributes($ftr[1]) . '>'
+                .$ftr[0] . '</td></tr>';
         } elseif (count(self::$errors) > 0) {
-            $trs .= '<tr><td colspan="'.count(self::$cols).'">'.
-                self::error().'</td></tr>';
+            $trs .= '<tr><td colspan="' . count(self::$cols) . '">' .
+                self::error() . '</td></tr>';
         }
         return $trs;
     }
@@ -72,8 +71,7 @@ 
             $res = $select($expression, $bindings);
             //if result is single cell value ($res[0]->value), return the value
             return (count($res) === 1 && count((array) $res[0]) === 1) ?
-                reset($res[0]) :
-                $res;
+                reset($res[0]) : $res;
         } else {
             throw new Exception('ERROR: table::$select is not a closure. ');
         }

Thead.php

Spacing +12 added lines, -16 removed lines

@@ -31,8 +31,7 @@ 
 
     protected static function filterValues(&$filter, &$opts = [])
     {
-        $filter = filter_input(INPUT_GET, 'filter', FILTER_SANITIZE_STRING) ?:
-            null;
+        $filter = filter_input(INPUT_GET, 'filter', FILTER_SANITIZE_STRING) ?: null;
 
         $filterBy = filter_input(INPUT_GET, 'filter-by', FILTER_VALIDATE_INT);
         foreach (self::$cols as $key => $value) {
@@ -47,15 +46,14 @@ 
     private static function tagAttributes($tag, $items)
     {
         $attr = $tag === 'div' ?
-            ['id' => $items.'-list', 'class' => 'table'] :
-            ['id' => $items.'-table', 'data-table' => 'js',
+            ['id' => $items . '-list', 'class' => 'table'] : ['id' => $items . '-table', 'data-table' => 'js',
             'data-sort-a' => self::config('UTF8_ASC_SYMBOL'),
             'data-sort-d' => self::config('UTF8_DESC_SYMBOL')];
         if (array_key_exists($tag, self::$attributes)) {
             $attr += self::$attributes[$tag];
         }
         if (isset(self::$attributes[$tag]['class'])) {
-            $attr['class'] .= ' '.self::$attributes[$tag]['class'];
+            $attr['class'] .= ' ' . self::$attributes[$tag]['class'];
         }
         return self::attributes($attr);
     }
@@ -83,10 +81,9 @@ 
     private static function thAttributes($col, $arg, &$sort, &$del)
     {
         if (isset($arg['width'])) { // Width attribute -> style
-            $width = 'width:'.$arg['width'].';';
+            $width = 'width:' . $arg['width'] . ';';
             $arg['style'] = isset($arg['style']) ?
-                $width.$arg['style'] :
-                $width;
+                $width . $arg['style'] : $width;
         }
 
         if (($del = isset($arg['type']) && $arg['type'] == 'delete')) {
@@ -100,23 +97,22 @@ 
 
     private static function thTag($index, $attr, $sort, $del, $lbl)
     {
-        $tag = '<th'.self::attributes($attr).'>';
+        $tag = '<th' . self::attributes($attr) . '>';
         if ($sort) {
-            $tag .= '<a onclick="table.Sort('.$index.',this);">';
+            $tag .= '<a onclick="table.Sort(' . $index . ',this);">';
         }
         if (!$del) {
             if ($sort == self::$t['order']['col']) {
                 $span = self::$t['order']['dir'] === 'desc' ?
-                    self::config('UTF8_DESC_SYMBOL') :
-                    self::config('UTF8_ASC_SYMBOL');
+                    self::config('UTF8_DESC_SYMBOL') : self::config('UTF8_ASC_SYMBOL');
             } else {
                 $span = "";
             }
-            $tag .= '<span>'.$span.'</span>'.$lbl;
+            $tag .= '<span>' . $span . '</span>' . $lbl;
         } else {
-            $tag .= '<input id="'.self::$t['items'].'CheckDeleteAll"'.
-                ' onclick=\"checkAllDeleteCheckboxes(this,'.
-                ' \''.self::$t['items'].'\')" type="checkbox"/>';
+            $tag .= '<input id="' . self::$t['items'] . 'CheckDeleteAll"' .
+                ' onclick=\"checkAllDeleteCheckboxes(this,' .
+                ' \'' . self::$t['items'] . '\')" type="checkbox"/>';
         }
         if ($sort) {
             $tag .= '</a>';

Tbody.php

Spacing +10 added lines, -13 removed lines

@@ -31,10 +31,10 @@ 
             if (isset($r[0][1], $r[0][1]['class']) &&
                 $r[0][1]['class'] === 'no-results'
             ) {
-                $trs .= '<tr><td'.self::attributes($r[0][1]).'>'
-                    .$r[0][0].'</td></tr>';
+                $trs .= '<tr><td' . self::attributes($r[0][1]) . '>'
+                    .$r[0][0] . '</td></tr>';
             } else {
-                $trs .= '<tr><td>'.implode('</td><td>', $r)
+                $trs .= '<tr><td>' . implode('</td><td>', $r)
                     .'</td></tr>';
             }
         }
@@ -48,16 +48,14 @@ 
         $rows = [$header];
 
         $data = self::$exportDataAsDisplayed ?
-            self::$data :
-            self::select(self::$t['q']);
+            self::$data : self::select(self::$t['q']);
 
         if (count($data) > 0) {
             foreach ($data as $row) {
                 $cells = [];
                 foreach ($columns as $column) {
                     $cells[] = is_array($row[$column]) ?
-                        $row[$column][0] :
-                        $row[$column];
+                        $row[$column][0] : $row[$column];
                 }
                 $rows[] = $cells;
             }
@@ -85,18 +83,17 @@ 
         switch (self::$export) {
             case 'Excel':
             case 'CSV':
-                $escape = function ($value) {
+                $escape = function($value) {
                     return str_replace("\t", "&#9;", $value);
                 };
                 header('Content-Type:application/csv');
-                header('Content-Disposition:attachment; filename='.
-                    $filename.'.csv');
+                header('Content-Disposition:attachment; filename=' .
+                    $filename . '.csv');
 
                 if (($output = fopen('php://output', 'w'))) {
                     foreach ($eData as $v) {
                         self::$export === 'CSV' ?
-                                fputcsv($output, $v) :
-                                fputs($output, implode("\t", array_map($escape, $v))."\r\n");
+                                fputcsv($output, $v) : fputs($output, implode("\t", array_map($escape, $v)) . "\r\n");
                     }
                     fclose($output);
                 }
@@ -110,7 +107,7 @@ 
         $fnReplace[':app'] = self::config('APP');
         $fnReplace[':items'] = self::$t['items'];
         $format = str_replace(':', '.', '%d.%m.%Y  %H:%i:%s');
-        $timeQuery = 'SELECT DATE_FORMAT(Now(), "'.$format.'") AS `now`;';
+        $timeQuery = 'SELECT DATE_FORMAT(Now(), "' . $format . '") AS `now`;';
         $fnReplace[':datetime'] = self::select($timeQuery);
         return strtr((string) self::config('EXPORT_FILE_NAME'), $fnReplace);
     }

TraitRequest.php

Spacing +8 added lines, -11 removed lines

@@ -29,11 +29,11 @@ 
             } else {
                 $filterBy = self::$cols[$filterBy][1];
             }
-            $filterBy = 'CONCAT(" ",'.$filterBy.', " ")';
+            $filterBy = 'CONCAT(" ",' . $filterBy . ', " ")';
             if (self::config('FILTER_CASE_SENSITIVE') !== true) {
-                $filterBy .= ' COLLATE '.self::config('DB_COLLATION_CI');
+                $filterBy .= ' COLLATE ' . self::config('DB_COLLATION_CI');
             }
-            $filter = $filterBy.' LIKE '.'"%'.$filter.'%"';
+            $filter = $filterBy . ' LIKE ' . '"%' . $filter . '%"';
         }
         return $filter;
     }
@@ -45,17 +45,16 @@ 
             if (isset($v[2]['sort']) && $v[2]['sort'] === false) {
                 continue;
             }
-            $all[] = 'IFNULL('.$v[1].', "")';
+            $all[] = 'IFNULL(' . $v[1] . ', "")';
         }
-        return 'CONCAT('.implode(',', $all).')';
+        return 'CONCAT(' . implode(',', $all) . ')';
     }
 
     private static function orderCol()
     {
         if (($col = filter_input(INPUT_GET, 'col', FILTER_VALIDATE_INT))) {
             return isset(self::$cols[$col][2]['sort']) ?
-                self::$cols[$col][2]['sort'] :
-                self::$cols[$col][1];
+                self::$cols[$col][2]['sort'] : self::$cols[$col][1];
         }
         return self::$t['order']['col'];
     }
@@ -64,8 +63,7 @@ 
     {
         $reset = filter_has_var(INPUT_GET, 'col') ? 'asc' : null;
         return in_array(filter_input(INPUT_GET, 'ord'), ['asc', 'desc']) ?
-            filter_input(INPUT_GET, 'ord') :
-            ($reset ?: self::$t['order']['dir']);
+            filter_input(INPUT_GET, 'ord') : ($reset ?: self::$t['order']['dir']);
     }
 
     private static function setExport()
@@ -77,7 +75,6 @@ 
     private static function page()
     {
         return filter_has_var(INPUT_GET, 'pg') && self::$export == false ?
-            (int) filter_input(INPUT_GET, 'pg', FILTER_SANITIZE_NUMBER_INT) :
-            self::$t['page'];
+            (int) filter_input(INPUT_GET, 'pg', FILTER_SANITIZE_NUMBER_INT) : self::$t['page'];
     }
 }

TraitPaging.php

Spacing +11 added lines, -13 removed lines

@@ -15,13 +15,12 @@ 
 
             $limit = 10;
 
-            $vars['start'] = $vars['page'] > ($limit / 2) ?
-                ($vars['page'] - $limit / 2) :
-                1;
+            $vars['start'] = $vars['page'] > ($limit/2) ?
+                ($vars['page'] - $limit/2) : 1;
 
-            if ($vars['page'] > ($vars['pages'] - ($limit / 2))) {
+            if ($vars['page'] > ($vars['pages'] - ($limit/2))) {
                 $vars['final'] = $vars['pages'];
-            } elseif ($vars['page'] > ($limit / 2)) {
+            } elseif ($vars['page'] > ($limit/2)) {
                 $vars['final'] = $vars['start'] + $limit;
             } else {
                 $vars['final'] = $limit;
@@ -43,15 +42,14 @@ 
         }
 
         $jump = self::jump($multiplier, $direction);
-        $add = '<li class="jump"><a>'.$jump.'</a></li>';
+        $add = '<li class="jump"><a>' . $jump . '</a></li>';
 
         $jumpExists = $direction === '-' ?
-            (self::$t['page'] - $multiplier) > 0 :
-            (self::$t['page'] + $multiplier) <= self::$t['pages'];
+            (self::$t['page'] - $multiplier) > 0 : (self::$t['page'] + $multiplier) <= self::$t['pages'];
 
         if ($jumpExists) {
-            $html = $direction === '-' ? $add.$html : $html.$add;
-            return self::jumps($html, ($multiplier * 10));
+            $html = $direction === '-' ? $add . $html : $html . $add;
+            return self::jumps($html, ($multiplier*10));
         }
 
         return $html;
@@ -60,11 +58,11 @@ 
     private static function jump($multiplier, $direction)
     {
         if ($multiplier >= 1000000) {
-            return ($direction.($multiplier / 1000000)."M");
+            return ($direction . ($multiplier/1000000) . "M");
         } elseif ($multiplier >= 1000) {
-            return ($direction.($multiplier / 1000)."K");
+            return ($direction . ($multiplier/1000) . "K");
         } else {
-            return ($direction.$multiplier);
+            return ($direction . $multiplier);
         }
     }
 }

TraitConfig.php

Spacing +3 added lines, -3 removed lines

@@ -37,7 +37,7 @@ 
                     throw new Exception("Invalid value type.");
             }
         } catch (Exception $e) {
-            self::error('ERROR: '.$e->getMessage());
+            self::error('ERROR: ' . $e->getMessage());
         }
     }
 
@@ -47,14 +47,14 @@ 
             self::$errors[] = $message;
         } else {
             return empty(self::$errors) ? null :
-                '<p class="tbl-err">'.implode('</br>', self::$errors).'</p>';
+                '<p class="tbl-err">' . implode('</br>', self::$errors) . '</p>';
         }
     }
 
     private static function valid($key, $val = null)
     {
         if (!array_key_exists($key, self::$config)) {
-            throw new Exception('Request to undefined value: '.$key);
+            throw new Exception('Request to undefined value: ' . $key);
         }
 
         if ($val !== null) {

Table.php

Spacing +6 added lines, -7 removed lines

@@ -37,8 +37,7 @@ 
     public static function prepare($setOrCheck = false)
     {
         //@see  http://php.net/manual/es/function.filter-input.php#77307
-        $uri = filter_input(INPUT_SERVER, 'REQUEST_URI', FILTER_SANITIZE_URL) ?:
-            filter_var($_SERVER['REQUEST_URI'], FILTER_SANITIZE_URL);
+        $uri = filter_input(INPUT_SERVER, 'REQUEST_URI', FILTER_SANITIZE_URL) ?: filter_var($_SERVER['REQUEST_URI'], FILTER_SANITIZE_URL);
 
         $extension = pathinfo(strtok($uri, '?'), PATHINFO_EXTENSION);
 
@@ -70,9 +69,9 @@ 
         self::$t['order']['col'] = $orderBy;
         $dir = strtolower($orderDir);
         self::$t['order']['dir'] = in_array($dir, ['asc', 'desc']) ?
-            $dir : self::error('Invalid orderDir (Asc/Desc): '.$orderDir);
+            $dir : self::error('Invalid orderDir (Asc/Desc): ' . $orderDir);
         self::$t['paging'] = ($num = abs($paging)) >= 10 ?
-            $num : self::error('Invalid paging (<10): '.$paging);
+            $num : self::error('Invalid paging (<10): ' . $paging);
     }
 
     /**
@@ -89,7 +88,7 @@ 
         self::$t = self::request(self::$export);
 
         $order = [self::$t['order']['col'] => self::$t['order']['dir']];
-        $offset = (self::$t['page'] - 1) * self::$t['paging'];
+        $offset = (self::$t['page'] - 1)*self::$t['paging'];
         $limit = [$offset, self::$t['paging']];
         self::$t['q'] = self::query($query, self::$t['filter'], $order, $limit, true);
 
@@ -102,7 +101,7 @@ 
         try {
             self::$data = self::select($q);
         } catch (Exception $e) {
-            self::error('ERROR: '.$q.'<br />'.$e->getMessage());
+            self::error('ERROR: ' . $q . '<br />' . $e->getMessage());
         }
     }
 
@@ -114,7 +113,7 @@ 
             echo parent::load();
         } else {
             $tableId = filter_input(INPUT_GET, 'table-id') ?: null;
-            if ($tableId === self::$t['items'].'-table') {
+            if ($tableId === self::$t['items'] . '-table') {
                 ob_get_clean();
                 ob_start('ob_gzhandler');
                 if (!self::$export) {

tests/bootstrap.php

Spacing +3 added lines, -3 removed lines

@@ -1,9 +1,9 @@
 <?php
-require_once __DIR__.'/../vendor/autoload.php';
+require_once __DIR__ . '/../vendor/autoload.php';
 
 spl_autoload_register(function($class) { 
-    if($class !== 'PHPUnit_Framework_TestSuite.php') {
-        include dirname(__DIR__).'/'.$class.'.php'; 
+    if ($class !== 'PHPUnit_Framework_TestSuite.php') {
+        include dirname(__DIR__) . '/' . $class . '.php'; 
     }
 });
 

Braces +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 require_once __DIR__.'/../vendor/autoload.php';
 
-spl_autoload_register(function($class) { 
+spl_autoload_register(function($class) {
     if($class !== 'PHPUnit_Framework_TestSuite.php') {
         include dirname(__DIR__).'/'.$class.'.php'; 
     }