webdivane / table

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/TableTest.php

Spacing +12 added lines, -12 removed lines

@@ -30,7 +30,7 @@ 
      * @covers Table::prepare
      * @covers Table::confirmValue
      */
-    public function testprepare(){
+    public function testprepare() {
         $_SERVER['REQUEST_URI'] = 'test.json';
 
         //Table::prepare(true);
@@ -52,7 +52,7 @@ 
      * @covers Table::error
      * @covers Table::config
      */
-    public function testcreate(){
+    public function testcreate() {
         $_SERVER['REQUEST_URI'] = 'test/users';
 
         Table::prepare();
@@ -66,14 +66,14 @@ 
         Table::create($items, $orderBy, 'a');
         $this->assertSame(Table::confirmValue('t.items', $items), true);
         $this->assertSame(Table::confirmValue('t.order.col', $orderBy), true);
-        $err = Table::confirmValue('errors.0','Invalid orderDir (Asc/Desc): a');
-        $this->assertSame($err,true);
+        $err = Table::confirmValue('errors.0', 'Invalid orderDir (Asc/Desc): a');
+        $this->assertSame($err, true);
         
         Table::create($items, $orderBy, 'asc', 2);
         $this->assertSame(Table::confirmValue('t.items', $items), true);
         $this->assertSame(Table::confirmValue('t.order.col', $orderBy), true);
         $this->assertSame(Table::confirmValue('t.order.dir', 'asc'), true);
-        $err1 = Table::confirmValue('errors.∞','Invalid paging (<10): 2');
+        $err1 = Table::confirmValue('errors.∞', 'Invalid paging (<10): 2');
         $this->assertSame($err1, true);
     }
     
@@ -130,17 +130,17 @@ 
     }
 
 
-    static function prepare($classMethod, $setOrCheck = false){
-        self::$pageExtension = pathinfo($_SERVER['REQUEST_URI'], PATHINFO_EXTENSION)?:null;
+    static function prepare($classMethod, $setOrCheck = false) {
+        self::$pageExtension = pathinfo($_SERVER['REQUEST_URI'], PATHINFO_EXTENSION) ?: null;
         $continuePreparation = $setOrCheck === false;
-        if($setOrCheck === true){
-            if(!in_array($classMethod, self::$preparePassed) && empty(self::$pageExtension)){
-                die("ERROR (in a ".__CLASS__." call): Please call the ".$classMethod."(); method before the page headers sent."); 
+        if ($setOrCheck === true) {
+            if (!in_array($classMethod, self::$preparePassed) && empty(self::$pageExtension)) {
+                die("ERROR (in a " . __CLASS__ . " call): Please call the " . $classMethod . "(); method before the page headers sent."); 
             }
-        } else if(!empty($setOrCheck)) {
+        } else if (!empty($setOrCheck)) {
             self::$pageExtension = $setOrCheck;
         } 
-        if(!in_array($classMethod, self::$preparePassed)){
+        if (!in_array($classMethod, self::$preparePassed)) {
             self::$preparePassed[] = $classMethod;
         }
         return $continuePreparation;

Braces +6 added lines, -3 removed lines

@@ -30,7 +30,8 @@ 
      * @covers Table::prepare
      * @covers Table::confirmValue
      */
-    public function testprepare(){
+    public function testprepare()
+    {
         $_SERVER['REQUEST_URI'] = 'test.json';
 
         //Table::prepare(true);
@@ -52,7 +53,8 @@ 
      * @covers Table::error
      * @covers Table::config
      */
-    public function testcreate(){
+    public function testcreate()
+    {
         $_SERVER['REQUEST_URI'] = 'test/users';
 
         Table::prepare();
@@ -130,7 +132,8 @@ 
     }
 
 
-    static function prepare($classMethod, $setOrCheck = false){
+    static function prepare($classMethod, $setOrCheck = false)
+    {
         self::$pageExtension = pathinfo($_SERVER['REQUEST_URI'], PATHINFO_EXTENSION)?:null;
         $continuePreparation = $setOrCheck === false;
         if($setOrCheck === true){

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'; 
     }

TraitHelper.php

Spacing +9 added lines, -10 removed lines

@@ -17,8 +17,8 @@ 
 
     public static function assets($path = "/public/table")
     {
-        return "<script src=\"{$path}/table_helper.js\" defer></script>\n\t".
-            "<script src=\"{$path}/table.js\" defer></script>\n\t".
+        return "<script src=\"{$path}/table_helper.js\" defer></script>\n\t" .
+            "<script src=\"{$path}/table.js\" defer></script>\n\t" .
             "<link href=\"{$path}/table.css\" rel=\"stylesheet\">\n";
     }
 
@@ -32,7 +32,7 @@ 
             if ($value === true || (empty($value) && $value != 0)) {
                 $list[] = $key;
             } else {
-                $list[] = $key.'="'.$value.'"';
+                $list[] = $key . '="' . $value . '"';
             }
         }
         return rtrim(implode(' ', $list));
@@ -59,7 +59,7 @@ 
             self::$cols = [];
             self::$t['rows'] = null;
         } else {
-            echo 'Existing table-id used in table::create(): '.$items;
+            echo 'Existing table-id used in table::create(): ' . $items;
         }
     }
     
@@ -71,23 +71,22 @@ 
         try {
             $p = explode('.', $property);
             $name = array_shift($p);
-            if(property_exists(__CLASS__, $name)){
-                switch(sizeof($p)){
+            if (property_exists(__CLASS__, $name)) {
+                switch (sizeof($p)) {
                     case 3: return static::$$name[$p[0]][$p[1]][$p[2]] === $value;
                     case 2: return static::$$name[$p[0]][$p[1]] === $value;
                     case 1: return $p[0] === '∞' ? //request is to the last one
-                        static::$$name[(sizeof(static::$$name)-1)] === $value : 
-                        static::$$name[$p[0]] === $value;
+                        static::$$name[(sizeof(static::$$name) - 1)] === $value : static::$$name[$p[0]] === $value;
                     case 0: return static::$$name === $value;
                     default: 
                         $oops = implode($p);
                         throw new Exception('Missing value (' . $oops . ').');
                 }
             } else {
-                throw new Exception('Undefined property ('.$name.').');
+                throw new Exception('Undefined property (' . $name . ').');
             }
         } catch (Exception $e) {
-            echo 'Caught exception: ',  $e->getMessage(), "\n";
+            echo 'Caught exception: ', $e->getMessage(), "\n";
         }
         return false;
     }