byjg / anydataset

src/Repository/FixedTextFileIterator.php

Doc Comments +4 added lines

@@ -84,6 +84,10 @@
         }
     }
 
+    /**
+     * @param string $buffer
+     * @param FixedTextDefinition[] $fieldDefinition
+     */
     protected function processBuffer($buffer, $fieldDefinition)
     {
         $cntDef = count($fieldDefinition);

Spacing +2 added lines, -2 removed lines

@@ -92,9 +92,9 @@
             $fieldDef = $fieldDefinition[$i];
 
             $fields[$fieldDef->fieldName] = substr($buffer, $fieldDef->startPos, $fieldDef->length);
-            if (!empty($fieldDef->requiredValue) && (!preg_match("/^[" . $fieldDef->requiredValue . "]$/",
+            if (!empty($fieldDef->requiredValue) && (!preg_match("/^[".$fieldDef->requiredValue."]$/",
                     $fields[$fieldDef->fieldName]))) {
-                throw new IteratorException("Expected the value '" . $fieldDef->requiredValue . "' and I got '" . $fields[$fieldDef->fieldName] . "'");
+                throw new IteratorException("Expected the value '".$fieldDef->requiredValue."' and I got '".$fields[$fieldDef->fieldName]."'");
             } elseif (is_array($fieldDef->subTypes)) {
                 $fields[$fieldDef->fieldName] = $this->processBuffer($fields[$fieldDef->fieldName], $fieldDef->subTypes);
             }

src/Database/DBPDODriver.php

Braces +3 added lines, -1 removed lines

@@ -92,7 +92,9 @@
             foreach ($array as $key => $value) {
                 $stmt->bindValue(":" . SQLBind::keyAdj($key), $value);
             }
-        } else $stmt = $this->_db->prepare($sql);
+        } else {
+            $stmt = $this->_db->prepare($sql);
+        }
 
         return $stmt;
     }

Spacing +11 added lines, -11 removed lines

@@ -27,15 +27,15 @@ 
 
         if (is_null($strcnn)) {
             if ($this->_connectionManagement->getFilePath() != "") {
-                $strcnn = $this->_connectionManagement->getDriver() . ":" . $this->_connectionManagement->getFilePath();
+                $strcnn = $this->_connectionManagement->getDriver().":".$this->_connectionManagement->getFilePath();
             } else {
-                $strcnn = $this->_connectionManagement->getDriver() . ":dbname=" . $this->_connectionManagement->getDatabase();
+                $strcnn = $this->_connectionManagement->getDriver().":dbname=".$this->_connectionManagement->getDatabase();
                 if ($this->_connectionManagement->getExtraParam("unixsocket") != "") {
-                    $strcnn .= ";unix_socket=" . $this->_connectionManagement->getExtraParam("unixsocket");
+                    $strcnn .= ";unix_socket=".$this->_connectionManagement->getExtraParam("unixsocket");
                 } else {
-                    $strcnn .= ";host=" . $this->_connectionManagement->getServer();
+                    $strcnn .= ";host=".$this->_connectionManagement->getServer();
                     if ($this->_connectionManagement->getPort() != "") {
-                        $strcnn .= ";port=" . $this->_connectionManagement->getPort();
+                        $strcnn .= ";port=".$this->_connectionManagement->getPort();
                     }
                 }
             }
@@ -43,14 +43,14 @@ 
 
         // Create Connection
         $this->_db = new PDO($strcnn, $this->_connectionManagement->getUsername(),
-            $this->_connectionManagement->getPassword(), (array) $preOptions);
+            $this->_connectionManagement->getPassword(), (array)$preOptions);
         $this->_connectionManagement->setDriver($this->_db->getAttribute(PDO::ATTR_DRIVER_NAME));
 
         // Set Specific Attributes
         $this->_db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
         $this->_db->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER);
 
-        foreach ((array) $postOptions as $key => $value) {
+        foreach ((array)$postOptions as $key => $value) {
             $this->_db->setAttribute($key, $value);
         }
     }
@@ -61,11 +61,11 @@ 
             throw new NotAvailableException("Extension 'PDO' is not loaded");
         }
 
-        if (!extension_loaded('pdo_' . strtolower($connMngt->getDriver()))) {
-            throw new NotAvailableException("Extension 'pdo_" . strtolower($connMngt->getDriver()) . "' is not loaded");
+        if (!extension_loaded('pdo_'.strtolower($connMngt->getDriver()))) {
+            throw new NotAvailableException("Extension 'pdo_".strtolower($connMngt->getDriver())."' is not loaded");
         }
 
-        $class = '\ByJG\AnyDataset\Database\Pdo' . ucfirst($connMngt->getDriver());
+        $class = '\ByJG\AnyDataset\Database\Pdo'.ucfirst($connMngt->getDriver());
 
         if (!class_exists($class, true)) {
             return new DBPDODriver($connMngt, null, null, null);
@@ -91,7 +91,7 @@ 
             list($sql, $array) = SQLBind::parseSQL($this->_connectionManagement, $sql, $array);
             $stmt = $this->_db->prepare($sql);
             foreach ($array as $key => $value) {
-                $stmt->bindValue(":" . SQLBind::keyAdj($key), $value);
+                $stmt->bindValue(":".SQLBind::keyAdj($key), $value);
             }
         } else $stmt = $this->_db->prepare($sql);
 

src/Database/DBSQLRelayDriver.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
             sqlrcur_prepareQuery($cur, $sql);
             $bindCount = 1;
             foreach ($array as $key => $value) {
-                $field = strval($bindCount ++);
+                $field = strval($bindCount++);
                 sqlrcur_inputBind($cur, $field, $value);
             }
             $success = sqlrcur_executeQuery($cur);

src/Database/DBDblibFunctions.php

Braces +6 added lines, -2 removed lines

@@ -68,12 +68,16 @@
      */
     function sqlDate($fmt, $col = false)
     {
-        if (!$col) $col = "getdate()";
+        if (!$col) {
+            $col = "getdate()";
+        }
         $s = '';
 
         $len = strlen($fmt);
         for ($i = 0; $i < $len; $i++) {
-            if ($s) $s .= '+';
+            if ($s) {
+                $s .= '+';
+            }
             $ch = $fmt[$i];
             switch ($ch) {
                 case 'Y':

Switch Indentation +44 added lines, -44 removed lines

@@ -72,50 +72,50 @@
             if ($s) $s .= '+';
             $ch = $fmt[$i];
             switch ($ch) {
-                case 'Y':
-                case 'y':
-                    $s .= "datename(yyyy,$col)";
-                    break;
-                case 'M':
-                    $s .= "convert(char(3),$col,0)";
-                    break;
-                case 'm':
-                    $s .= "replace(str(month($col),2),' ','0')";
-                    break;
-                case 'Q':
-                case 'q':
-                    $s .= "datename(quarter,$col)";
-                    break;
-                case 'D':
-                case 'd':
-                    $s .= "replace(str(day($col),2),' ','0')";
-                    break;
-                case 'h':
-                    $s .= "substring(convert(char(14),$col,0),13,2)";
-                    break;
-
-                case 'H':
-                    $s .= "replace(str(datepart(hh,$col),2),' ','0')";
-                    break;
-
-                case 'i':
-                    $s .= "replace(str(datepart(mi,$col),2),' ','0')";
-                    break;
-                case 's':
-                    $s .= "replace(str(datepart(ss,$col),2),' ','0')";
-                    break;
-                case 'a':
-                case 'A':
-                    $s .= "substring(convert(char(19),$col,0),18,2)";
-                    break;
-
-                default:
-                    if ($ch == '\\') {
-                        $i++;
-                        $ch = substr($fmt, $i, 1);
-                    }
-                    $s .= $ch;
-                    break;
+            case 'Y':
+            case 'y':
+                $s .= "datename(yyyy,$col)";
+                break;
+            case 'M':
+                $s .= "convert(char(3),$col,0)";
+                break;
+            case 'm':
+                $s .= "replace(str(month($col),2),' ','0')";
+                break;
+            case 'Q':
+            case 'q':
+                $s .= "datename(quarter,$col)";
+                break;
+            case 'D':
+            case 'd':
+                $s .= "replace(str(day($col),2),' ','0')";
+                break;
+            case 'h':
+                $s .= "substring(convert(char(14),$col,0),13,2)";
+                break;
+
+            case 'H':
+                $s .= "replace(str(datepart(hh,$col),2),' ','0')";
+                break;
+
+            case 'i':
+                $s .= "replace(str(datepart(mi,$col),2),' ','0')";
+                break;
+            case 's':
+                $s .= "replace(str(datepart(ss,$col),2),' ','0')";
+                break;
+            case 'a':
+            case 'A':
+                $s .= "substring(convert(char(19),$col,0),18,2)";
+                break;
+
+            default:
+                if ($ch == '\\') {
+                    $i++;
+                    $ch = substr($fmt, $i, 1);
+                }
+                $s .= $ch;
+                break;
             }
         }
         return $s;

src/Database/DBPgsqlFunctions.php

Switch Indentation +53 added lines, -53 removed lines

@@ -76,59 +76,59 @@
         for ($i = 0; $i < $len; $i++) {
             $ch = $fmt[$i];
             switch ($ch) {
-                case 'Y':
-                case 'y':
-                    $s .= 'YYYY';
-                    break;
-                case 'Q':
-                case 'q':
-                    $s .= 'Q';
-                    break;
-
-                case 'M':
-                    $s .= 'Mon';
-                    break;
-
-                case 'm':
-                    $s .= 'MM';
-                    break;
-                case 'D':
-                case 'd':
-                    $s .= 'DD';
-                    break;
-
-                case 'H':
-                    $s.= 'HH24';
-                    break;
-
-                case 'h':
-                    $s .= 'HH';
-                    break;
-
-                case 'i':
-                    $s .= 'MI';
-                    break;
-
-                case 's':
-                    $s .= 'SS';
-                    break;
-
-                case 'a':
-                case 'A':
-                    $s .= 'AM';
-                    break;
-
-                default:
-                    // handle escape characters...
-                    if ($ch == '\\') {
-                        $i++;
-                        $ch = substr($fmt, $i, 1);
-                    }
-                    if (strpos('-/.:;, ', $ch) !== false) {
-                        $s .= $ch;
-                    } else {
-                        $s .= '"' . $ch . '"';
-                    }
+            case 'Y':
+            case 'y':
+                $s .= 'YYYY';
+                break;
+            case 'Q':
+            case 'q':
+                $s .= 'Q';
+                break;
+
+            case 'M':
+                $s .= 'Mon';
+                break;
+
+            case 'm':
+                $s .= 'MM';
+                break;
+            case 'D':
+            case 'd':
+                $s .= 'DD';
+                break;
+
+            case 'H':
+                $s.= 'HH24';
+                break;
+
+            case 'h':
+                $s .= 'HH';
+                break;
+
+            case 'i':
+                $s .= 'MI';
+                break;
+
+            case 's':
+                $s .= 'SS';
+                break;
+
+            case 'a':
+            case 'A':
+                $s .= 'AM';
+                break;
+
+            default:
+                // handle escape characters...
+                if ($ch == '\\') {
+                    $i++;
+                    $ch = substr($fmt, $i, 1);
+                }
+                if (strpos('-/.:;, ', $ch) !== false) {
+                    $s .= $ch;
+                } else {
+                    $s .= '"' . $ch . '"';
+                }
             }
         }
         return $s . "')";

Spacing +5 added lines, -5 removed lines

@@ -20,7 +20,7 @@ 
     function limit($sql, $start, $qty)
     {
         if (strpos($sql, ' LIMIT ') === false) {
-            return $sql . " LIMIT $qty OFFSET $start ";
+            return $sql." LIMIT $qty OFFSET $start ";
         }
 
         return $sql;
@@ -65,7 +65,7 @@ 
     function sqlDate($fmt, $col = false)
     {
         if (!$col) $col = 'current_timestamp';
-        $s = 'TO_CHAR(' . $col . ",'";
+        $s = 'TO_CHAR('.$col.",'";
 
         $len = strlen($fmt);
         for ($i = 0; $i < $len; $i++) {
@@ -93,7 +93,7 @@ 
                     break;
 
                 case 'H':
-                    $s.= 'HH24';
+                    $s .= 'HH24';
                     break;
 
                 case 'h':
@@ -122,11 +122,11 @@ 
                     if (strpos('-/.:;, ', $ch) !== false) {
                         $s .= $ch;
                     } else {
-                        $s .= '"' . $ch . '"';
+                        $s .= '"'.$ch.'"';
                     }
             }
         }
-        return $s . "')";
+        return $s."')";
     }
 
     /**

Braces +3 added lines, -1 removed lines

@@ -64,7 +64,9 @@
      */
     function sqlDate($fmt, $col = false)
     {
-        if (!$col) $col = 'current_timestamp';
+        if (!$col) {
+            $col = 'current_timestamp';
+        }
         $s = 'TO_CHAR(' . $col . ",'";
 
         $len = strlen($fmt);

src/Database/DBMysqlFunctions.php

Switch Indentation +53 added lines, -53 removed lines

@@ -82,59 +82,59 @@
         for ($i = 0; $i < $len; $i++) {
             $ch = $fmt[$i];
             switch ($ch) {
-                case 'Y':
-                case 'y':
-                    $s .= '%Y';
-                    break;
-                case 'Q':
-                case 'q':
-                    $s .= "'),Quarter($col)";
-
-                    if ($len > $i + 1) $s .= ",DATE_FORMAT($col,'";
-                    else $s .= ",('";
-                    $concat = true;
-                    break;
-                case 'M':
-                    $s .= '%b';
-                    break;
-
-                case 'm':
-                    $s .= '%m';
-                    break;
-                case 'D':
-                case 'd':
-                    $s .= '%d';
-                    break;
-
-                case 'H':
-                    $s .= '%H';
-                    break;
-
-                case 'h':
-                    $s .= '%I';
-                    break;
-
-                case 'i':
-                    $s .= '%i';
-                    break;
-
-                case 's':
-                    $s .= '%s';
-                    break;
-
-                case 'a':
-                case 'A':
-                    $s .= '%p';
-                    break;
-
-                default:
-
-                    if ($ch == '\\') {
-                        $i++;
-                        $ch = substr($fmt, $i, 1);
-                    }
-                    $s .= $ch;
-                    break;
+            case 'Y':
+            case 'y':
+                $s .= '%Y';
+                break;
+            case 'Q':
+            case 'q':
+                $s .= "'),Quarter($col)";
+
+                if ($len > $i + 1) $s .= ",DATE_FORMAT($col,'";
+                else $s .= ",('";
+                $concat = true;
+                break;
+            case 'M':
+                $s .= '%b';
+                break;
+
+            case 'm':
+                $s .= '%m';
+                break;
+            case 'D':
+            case 'd':
+                $s .= '%d';
+                break;
+
+            case 'H':
+                $s .= '%H';
+                break;
+
+            case 'h':
+                $s .= '%I';
+                break;
+
+            case 'i':
+                $s .= '%i';
+                break;
+
+            case 's':
+                $s .= '%s';
+                break;
+
+            case 'a':
+            case 'A':
+                $s .= '%p';
+                break;
+
+            default:
+
+                if ($ch == '\\') {
+                    $i++;
+                    $ch = substr($fmt, $i, 1);
+                }
+                $s .= $ch;
+                break;
             }
         }
         $s.="')";

Spacing +4 added lines, -4 removed lines

@@ -9,7 +9,7 @@ 
 
     function concat($s1, $s2 = null)
     {
-        return "concat(" . implode(func_get_args(), ', ') . ")";
+        return "concat(".implode(func_get_args(), ', ').")";
     }
 
     /**
@@ -22,7 +22,7 @@ 
     function limit($sql, $start, $qty)
     {
         if (strpos($sql, ' LIMIT ') === false) {
-            return $sql . " LIMIT $start, $qty ";
+            return $sql." LIMIT $start, $qty ";
         }
 
         return $sql;
@@ -67,7 +67,7 @@ 
     function sqlDate($fmt, $col = false)
     {
         if (!$col) $col = 'now()';
-        $s = 'DATE_FORMAT(' . $col . ",'";
+        $s = 'DATE_FORMAT('.$col.",'";
         $concat = false;
         $len = strlen($fmt);
         for ($i = 0; $i < $len; $i++) {
@@ -128,7 +128,7 @@ 
                     break;
             }
         }
-        $s.="')";
+        $s .= "')";
         if ($concat) $s = "CONCAT($s)";
         return $s;
     }

Braces +11 added lines, -4 removed lines

@@ -66,7 +66,9 @@ 
      */
     function sqlDate($fmt, $col = false)
     {
-        if (!$col) $col = 'now()';
+        if (!$col) {
+            $col = 'now()';
+        }
         $s = 'DATE_FORMAT(' . $col . ",'";
         $concat = false;
         $len = strlen($fmt);
@@ -81,8 +83,11 @@ 
                 case 'q':
                     $s .= "'),Quarter($col)";
 
-                    if ($len > $i + 1) $s .= ",DATE_FORMAT($col,'";
-                    else $s .= ",('";
+                    if ($len > $i + 1) {
+                        $s .= ",DATE_FORMAT($col,'";
+                    } else {
+                        $s .= ",('";
+                    }
                     $concat = true;
                     break;
                 case 'M':
@@ -129,7 +134,9 @@ 
             }
         }
         $s.="')";
-        if ($concat) $s = "CONCAT($s)";
+        if ($concat) {
+            $s = "CONCAT($s)";
+        }
         return $s;
     }
 

src/Repository/JsonIterator.php

Braces +6 added lines, -2 removed lines

@@ -27,7 +27,9 @@ 
         }
 
         if ($path != "") {
-            if ($path[0] == "/") $path = substr($path, 1);
+            if ($path[0] == "/") {
+                $path = substr($path, 1);
+            }
 
             $pathAr = explode("/", $path);
 
@@ -44,7 +46,9 @@ 
                 }
             }
             $this->_jsonObject = $newjsonObject;
-        } else $this->_jsonObject = $jsonObject;
+        } else {
+            $this->_jsonObject = $jsonObject;
+        }
 
         $this->_current = 0;
     }

src/Repository/JsonDataset.php

Switch Indentation +21 added lines, -21 removed lines

@@ -23,27 +23,27 @@
         $lastError = json_last_error();
         $lastErrorDesc = "";
         switch ($lastError) {
-            case JSON_ERROR_NONE:
-                $lastErrorDesc = 'No errors';
-                break;
-            case JSON_ERROR_DEPTH:
-                $lastErrorDesc = 'Maximum stack depth exceeded';
-                break;
-            case JSON_ERROR_STATE_MISMATCH:
-                $lastErrorDesc = 'Underflow or the modes mismatch';
-                break;
-            case JSON_ERROR_CTRL_CHAR:
-                $lastErrorDesc = 'Unexpected control character found';
-                break;
-            case JSON_ERROR_SYNTAX:
-                $lastErrorDesc = 'Syntax error, malformed JSON';
-                break;
-            case JSON_ERROR_UTF8:
-                $lastErrorDesc = 'Malformed UTF-8 characters, possibly incorrectly encoded';
-                break;
-            default:
-                $lastErrorDesc = 'Unknown error';
-                break;
+        case JSON_ERROR_NONE:
+            $lastErrorDesc = 'No errors';
+            break;
+        case JSON_ERROR_DEPTH:
+            $lastErrorDesc = 'Maximum stack depth exceeded';
+            break;
+        case JSON_ERROR_STATE_MISMATCH:
+            $lastErrorDesc = 'Underflow or the modes mismatch';
+            break;
+        case JSON_ERROR_CTRL_CHAR:
+            $lastErrorDesc = 'Unexpected control character found';
+            break;
+        case JSON_ERROR_SYNTAX:
+            $lastErrorDesc = 'Syntax error, malformed JSON';
+            break;
+        case JSON_ERROR_UTF8:
+            $lastErrorDesc = 'Malformed UTF-8 characters, possibly incorrectly encoded';
+            break;
+        default:
+            $lastErrorDesc = 'Unknown error';
+            break;
         }
 
         if ($lastError != JSON_ERROR_NONE) {

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
         }
 
         if ($lastError != JSON_ERROR_NONE) {
-            throw new DatasetException("Invalid JSON string: " . $lastErrorDesc);
+            throw new DatasetException("Invalid JSON string: ".$lastErrorDesc);
         }
     }
 

src/Repository/ArrayDataset.php

Braces +3 added lines, -1 removed lines

@@ -26,7 +26,9 @@
 
         $this->_array = array();
 
-        if (!$array) return;
+        if (!$array) {
+            return;
+        }
 
         if (is_array($array)) {
             foreach ($array as $key => $value) {