byjg / anydataset

src/Database/SqlHelper.php

Doc Comments +3 added lines

@@ -160,6 +160,9 @@
         $this->fieldDeliRight = $right;
     }
 
+    /**
+     * @param string $sql
+     */
     public static function createSafeSQL($sql, $list)
     {
         return str_replace(array_keys($list), array_values($list), $sql);

Spacing +3 added lines, -3 removed lines

@@ -79,7 +79,7 @@ 
                     $campos .= ", ";
                     $valores .= ", ";
                 }
-                $campos .= $this->fieldDeliLeft . $fieldname . $this->fieldDeliRight;
+                $campos .= $this->fieldDeliLeft.$fieldname.$this->fieldDeliRight;
                 $valores .= $this->getValue($fieldname, $fieldvalue, $param, $decimalpoint);
             }
             $sql = "insert into $table ($campos) values ($valores)";
@@ -103,7 +103,7 @@ 
      */
     protected function getValue($name, $valores, &$param, $decimalpoint)
     {
-        $paramName = "[[" . $name . "]]";
+        $paramName = "[[".$name."]]";
         if (!is_array($valores)) {
             $valores = array(SQLFieldType::TEXT, $valores);
         }
@@ -151,7 +151,7 @@ 
         if (strlen($sql) > 4) {
             $sql .= ' and ';
         }
-        $sql = " $fieldName " . $relation . " " . $this->getValue($fieldName, $value, $param, '.');
+        $sql = " $fieldName ".$relation." ".$this->getValue($fieldName, $value, $param, '.');
     }
 
     public function setFieldDelimeters($left, $right)

src/Repository/AnyDataset.php

Doc Comments +5 added lines, -1 removed lines

@@ -310,6 +310,10 @@ 
         return;
     }
 
+    /**
+     * @param SingleRow[] $seq
+     * @param string $field
+     */
     protected function quickSortExec($seq, $field)
     {
         if (!count($seq)) {
@@ -337,7 +341,7 @@ 
 
     /**
      * @param $document
-     * @return array|string
+     * @return string
      */
     public static function fixUTF8($document)
     {

Spacing +3 added lines, -3 removed lines

@@ -105,7 +105,7 @@ 
                     if (!is_null($attr)) {
                         $sr->addField($attr->nodeValue, $field->nodeValue);
                     } else {
-                        throw new \InvalidArgumentException('Malformed anydataset file ' . basename($filepath));
+                        throw new \InvalidArgumentException('Malformed anydataset file '.basename($filepath));
                     }
                 }
                 $sr->acceptChanges();
@@ -320,7 +320,7 @@ 
         $left = $right = array();
 
         $cntSeq = count($seq);
-        for ($i = 1; $i < $cntSeq; $i ++) {
+        for ($i = 1; $i < $cntSeq; $i++) {
             if ($seq[$i]->getField($field) <= $key->getField($field)) {
                 $left[] = $seq[$i];
             } else {
@@ -330,7 +330,7 @@ 
 
         return array_merge(
             $this->quickSortExec($left, $field),
-            [ $key ],
+            [$key],
             $this->quickSortExec($right, $field)
         );
     }

src/Repository/DBDataset.php

Doc Comments +3 added lines

@@ -131,6 +131,9 @@
         return $arrayDS->getIterator();
     }
 
+    /**
+     * @param string $sql
+     */
     protected function getQueryKey($sql, $array)
     {
         $key1 = md5($sql);

Indentation -2 removed lines

@@ -23,7 +23,6 @@ 
     protected $connectionManagement;
 
     /**
-
      * @var DbDriverInterface
      */
     private $dbDriver = null;
@@ -223,7 +222,6 @@ 
     }
 
     /**
-
      * @var DbFunctionsInterface
      */
     protected $dbFunction = null;

Spacing +2 added lines, -2 removed lines

@@ -147,12 +147,12 @@
 
         // Define the query key
         if (is_array($arKey2) && count($arKey2) > 0) {
-            $key2 = ":" . md5(json_encode($arKey2));
+            $key2 = ":".md5(json_encode($arKey2));
         } else {
             $key2 = "";
         }
 
-        return  "qry:" . $key1 . $key2;
+        return  "qry:".$key1.$key2;
     }
 
     public function getScalar($sql, $array = null)

src/Repository/IteratorFilter.php

Doc Comments +2 added lines, -2 removed lines

@@ -73,7 +73,7 @@ 
 
     /**
      *
-     * @param $array
+     * @param SingleRow[] $array
      * @return SingleRow[]
      */
     public function match($array)
@@ -243,7 +243,7 @@ 
     /**
      *
      * @param SingleRow $singleRow
-     * @return string
+     * @return boolean
      */
     private function evalString(SingleRow $singleRow)
     {

Switch Indentation +90 added lines, -90 removed lines

@@ -142,37 +142,37 @@ 
 
         $result = "";
         switch ($relation) {
-            case Relation::EQUAL:
-                $result = $field . "=" . $value;
-                break;
+        case Relation::EQUAL:
+            $result = $field . "=" . $value;
+            break;
 
-            case Relation::GREATER_THAN:
-                $result = $field . ">" . $value;
-                break;
+        case Relation::GREATER_THAN:
+            $result = $field . ">" . $value;
+            break;
 
-            case Relation::LESS_THAN:
-                $result = $field . "<" . $value;
-                break;
+        case Relation::LESS_THAN:
+            $result = $field . "<" . $value;
+            break;
 
-            case Relation::GREATER_OR_EQUAL_THAN:
-                $result = $field . ">=" . $value;
-                break;
+        case Relation::GREATER_OR_EQUAL_THAN:
+            $result = $field . ">=" . $value;
+            break;
 
-            case Relation::LESS_OR_EQUAL_THAN:
-                $result = $field . "<=" . $value;
-                break;
+        case Relation::LESS_OR_EQUAL_THAN:
+            $result = $field . "<=" . $value;
+            break;
 
-            case Relation::NOT_EQUAL:
-                $result = $field . "!=" . $value;
-                break;
+        case Relation::NOT_EQUAL:
+            $result = $field . "!=" . $value;
+            break;
 
-            case Relation::STARTS_WITH:
-                $result = " starts-with($field, $value) ";
-                break;
+        case Relation::STARTS_WITH:
+            $result = " starts-with($field, $value) ";
+            break;
 
-            case Relation::CONTAINS:
-                $result = " contains($field, $value) ";
-                break;
+        case Relation::CONTAINS:
+            $result = " contains($field, $value) ";
+            break;
 
         }
         return $result;
@@ -201,40 +201,40 @@ 
         $field = " $name ";
         $valueparam = " [[" . $paramName . "]] ";
         switch ($relation) {
-            case Relation::EQUAL: {
-                    $result = $field . "=" . $valueparam;
-                    break;
-                }
-            case Relation::GREATER_THAN: {
-                    $result = $field . ">" . $valueparam;
-                    break;
-                }
-            case Relation::LESS_THAN: {
-                    $result = $field . "<" . $valueparam;
-                    break;
-                }
-            case Relation::GREATER_OR_EQUAL_THAN: {
-                    $result = $field . ">=" . $valueparam;
-                    break;
-                }
-            case Relation::LESS_OR_EQUAL_THAN: {
-                    $result = $field . "<=" . $valueparam;
-                    break;
-                }
-            case Relation::NOT_EQUAL: {
-                    $result = $field . "!=" . $valueparam;
-                    break;
-                }
-            case Relation::STARTS_WITH: {
-                    $param[$paramName] = $value . "%";
-                    $result = $field . " like " . $valueparam;
-                    break;
-                }
-            case Relation::CONTAINS: {
-                    $param[$paramName] = "%" . $value . "%";
-                    $result = $field . " like " . $valueparam;
-                    break;
-                }
+        case Relation::EQUAL: {
+                $result = $field . "=" . $valueparam;
+                break;
+            }
+        case Relation::GREATER_THAN: {
+                $result = $field . ">" . $valueparam;
+                break;
+            }
+        case Relation::LESS_THAN: {
+                $result = $field . "<" . $valueparam;
+                break;
+            }
+        case Relation::GREATER_OR_EQUAL_THAN: {
+                $result = $field . ">=" . $valueparam;
+                break;
+            }
+        case Relation::LESS_OR_EQUAL_THAN: {
+                $result = $field . "<=" . $valueparam;
+                break;
+            }
+        case Relation::NOT_EQUAL: {
+                $result = $field . "!=" . $valueparam;
+                break;
+            }
+        case Relation::STARTS_WITH: {
+                $param[$paramName] = $value . "%";
+                $result = $field . " like " . $valueparam;
+                break;
+            }
+        case Relation::CONTAINS: {
+                $param[$paramName] = "%" . $value . "%";
+                $result = $field . " like " . $valueparam;
+                break;
+            }
         }
 
         return $result;
@@ -269,38 +269,38 @@ 
 
             foreach ($field as $valueparam) {
                 switch ($relation) {
-                    case Relation::EQUAL: {
-                            $result[$pos] &= ($valueparam == $value);
-                            break;
-                        }
-                    case Relation::GREATER_THAN: {
-                            $result[$pos] &= ($valueparam > $value);
-                            break;
-                        }
-                    case Relation::LESS_THAN: {
-                            $result[$pos] &= ($valueparam < $value);
-                            break;
-                        }
-                    case Relation::GREATER_OR_EQUAL_THAN: {
-                            $result[$pos] &= ($valueparam >= $value);
-                            break;
-                        }
-                    case Relation::LESS_OR_EQUAL_THAN: {
-                            $result[$pos] &= ($valueparam <= $value);
-                            break;
-                        }
-                    case Relation::NOT_EQUAL: {
-                            $result[$pos] &= ($valueparam != $value);
-                            break;
-                        }
-                    case Relation::STARTS_WITH: {
-                            $result[$pos] &= (strpos($valueparam, $value) === 0);
-                            break;
-                        }
-                    case Relation::CONTAINS: {
-                            $result[$pos] &= (strpos($valueparam, $value) !== false);
-                            break;
-                        }
+                case Relation::EQUAL: {
+                        $result[$pos] &= ($valueparam == $value);
+                        break;
+                    }
+                case Relation::GREATER_THAN: {
+                        $result[$pos] &= ($valueparam > $value);
+                        break;
+                    }
+                case Relation::LESS_THAN: {
+                        $result[$pos] &= ($valueparam < $value);
+                        break;
+                    }
+                case Relation::GREATER_OR_EQUAL_THAN: {
+                        $result[$pos] &= ($valueparam >= $value);
+                        break;
+                    }
+                case Relation::LESS_OR_EQUAL_THAN: {
+                        $result[$pos] &= ($valueparam <= $value);
+                        break;
+                    }
+                case Relation::NOT_EQUAL: {
+                        $result[$pos] &= ($valueparam != $value);
+                        break;
+                    }
+                case Relation::STARTS_WITH: {
+                        $result[$pos] &= (strpos($valueparam, $value) === 0);
+                        break;
+                    }
+                case Relation::CONTAINS: {
+                        $result[$pos] &= (strpos($valueparam, $value) !== false);
+                        break;
+                    }
                 }
             }
         }

Spacing +20 added lines, -20 removed lines

@@ -37,7 +37,7 @@ 
         if ($xpathFilter == "") {
             return "/anydataset/row";
         } else {
-            return "/anydataset/row[" . $xpathFilter . "]";
+            return "/anydataset/row[".$xpathFilter."]";
         }
     }
 
@@ -137,33 +137,33 @@ 
     private function getStrXpathRelation($name, $relation, $value)
     {
         $str = is_numeric($value) ? "" : "'";
-        $field = "field[@name='" . $name . "'] ";
+        $field = "field[@name='".$name."'] ";
         $value = " $str$value$str ";
 
         $result = "";
         switch ($relation) {
             case Relation::EQUAL:
-                $result = $field . "=" . $value;
+                $result = $field."=".$value;
                 break;
 
             case Relation::GREATER_THAN:
-                $result = $field . ">" . $value;
+                $result = $field.">".$value;
                 break;
 
             case Relation::LESS_THAN:
-                $result = $field . "<" . $value;
+                $result = $field."<".$value;
                 break;
 
             case Relation::GREATER_OR_EQUAL_THAN:
-                $result = $field . ">=" . $value;
+                $result = $field.">=".$value;
                 break;
 
             case Relation::LESS_OR_EQUAL_THAN:
-                $result = $field . "<=" . $value;
+                $result = $field."<=".$value;
                 break;
 
             case Relation::NOT_EQUAL:
-                $result = $field . "!=" . $value;
+                $result = $field."!=".$value;
                 break;
 
             case Relation::STARTS_WITH:
@@ -192,47 +192,47 @@ 
         $paramName = $name;
         $i = 0;
         while (array_key_exists($paramName, $param)) {
-            $paramName = $name . ($i++);
+            $paramName = $name.($i++);
         }
 
         $param[$paramName] = $value;
 
         $result = "";
         $field = " $name ";
-        $valueparam = " [[" . $paramName . "]] ";
+        $valueparam = " [[".$paramName."]] ";
         switch ($relation) {
             case Relation::EQUAL: {
-                    $result = $field . "=" . $valueparam;
+                    $result = $field."=".$valueparam;
                     break;
                 }
             case Relation::GREATER_THAN: {
-                    $result = $field . ">" . $valueparam;
+                    $result = $field.">".$valueparam;
                     break;
                 }
             case Relation::LESS_THAN: {
-                    $result = $field . "<" . $valueparam;
+                    $result = $field."<".$valueparam;
                     break;
                 }
             case Relation::GREATER_OR_EQUAL_THAN: {
-                    $result = $field . ">=" . $valueparam;
+                    $result = $field.">=".$valueparam;
                     break;
                 }
             case Relation::LESS_OR_EQUAL_THAN: {
-                    $result = $field . "<=" . $valueparam;
+                    $result = $field."<=".$valueparam;
                     break;
                 }
             case Relation::NOT_EQUAL: {
-                    $result = $field . "!=" . $valueparam;
+                    $result = $field."!=".$valueparam;
                     break;
                 }
             case Relation::STARTS_WITH: {
-                    $param[$paramName] = $value . "%";
-                    $result = $field . " like " . $valueparam;
+                    $param[$paramName] = $value."%";
+                    $result = $field." like ".$valueparam;
                     break;
                 }
             case Relation::CONTAINS: {
-                    $param[$paramName] = "%" . $value . "%";
-                    $result = $field . " like " . $valueparam;
+                    $param[$paramName] = "%".$value."%";
+                    $result = $field." like ".$valueparam;
                     break;
                 }
         }

Braces +3 added lines, -1 removed lines

@@ -265,7 +265,9 @@
 
             $field = $singleRow->getField($name);
 
-            if (!is_array($field)) $field = array($field);
+            if (!is_array($field)) {
+                $field = array($field);
+            }
 
             foreach ($field as $valueparam) {
                 switch ($relation) {

src/Database/DbPdoDriver.php

Spacing +11 added lines, -11 removed lines

@@ -27,16 +27,16 @@ 
 
         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=" .
+                $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();
                     }
                 }
             }
@@ -47,7 +47,7 @@ 
             $strcnn,
             $this->connectionManagement->getUsername(),
             $this->connectionManagement->getPassword(),
-            (array) $preOptions
+            (array)$preOptions
         );
         $this->connectionManagement->setDriver($this->instance->getAttribute(PDO::ATTR_DRIVER_NAME));
 
@@ -55,7 +55,7 @@ 
         $this->instance->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
         $this->instance->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER);
 
-        foreach ((array) $postOptions as $key => $value) {
+        foreach ((array)$postOptions as $key => $value) {
             $this->instance->setAttribute($key, $value);
         }
     }
@@ -66,11 +66,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);
@@ -96,7 +96,7 @@ 
             list($sql, $array) = SqlBind::parseSQL($this->connectionManagement, $sql, $array);
             $stmt = $this->instance->prepare($sql);
             foreach ($array as $key => $value) {
-                $stmt->bindValue(":" . SqlBind::keyAdj($key), $value);
+                $stmt->bindValue(":".SqlBind::keyAdj($key), $value);
             }
         } else {
             $stmt = $this->instance->prepare($sql);

src/Database/BaseDBAccess.php

Indentation -1 removed lines

@@ -207,7 +207,6 @@
     }
 
     /**
-
      * @param IteratorInterface $iterator
      * @param string $name
      * @param array $fields

Spacing +11 added lines, -11 removed lines

@@ -58,8 +58,8 @@ 
         $start = 0;
         if ($debug) {
             $log = LogHandler::getInstance();
-            $log->debug("Class name: " . get_class($this));
-            $log->debug("SQL: " . $sql);
+            $log->debug("Class name: ".get_class($this));
+            $log->debug("SQL: ".$sql);
             if (!is_null($param)) {
                 $strForLog = "";
                 foreach ($param as $key => $value) {
@@ -82,7 +82,7 @@ 
 
         if ($debug) {
             $end = microtime(true);
-            $log->debug("Execution time: " . ($end - $start) . " seconds ");
+            $log->debug("Execution time: ".($end - $start)." seconds ");
         }
 
         return $insertedId;
@@ -103,8 +103,8 @@ 
         $start = 0;
         if ($debug) {
             $log = LogHandler::getInstance();
-            $log->debug("Class name: " . get_class($this));
-            $log->debug("SQL: " . $sql);
+            $log->debug("Class name: ".get_class($this));
+            $log->debug("SQL: ".$sql);
             if (!is_null($param)) {
                 $strForLog = "";
                 foreach ($param as $key => $value) {
@@ -120,7 +120,7 @@ 
         $iterator = $this->getDBDataset()->getIterator($sql, $param, $ttl);
         if ($debug) {
             $end = microtime(true);
-            $log->debug("Execution Time: " . ($end - $start) . " segundos ");
+            $log->debug("Execution Time: ".($end - $start)." segundos ");
         }
         return $iterator;
     }
@@ -132,8 +132,8 @@ 
         $start = 0;
         if ($debug) {
             $log = LogHandler::getInstance();
-            $log->debug("Class name: " . get_class($this));
-            $log->debug("SQL: " . $sql);
+            $log->debug("Class name: ".get_class($this));
+            $log->debug("SQL: ".$sql);
             if (!is_null($param)) {
                 $strForLog = "";
                 foreach ($param as $key => $value) {
@@ -149,7 +149,7 @@ 
         $scalar = $this->getDBDataset()->getScalar($sql, $param);
         if ($debug) {
             $end = microtime(true);
-            $log->debug("Execution Time: " . ($end - $start) . " segundos ");
+            $log->debug("Execution Time: ".($end - $start)." segundos ");
         }
         return $scalar;
     }
@@ -233,14 +233,14 @@ 
                     $fields = $singleRow->getFieldNames();
                 }
 
-                $line .= '"' . implode('","', $fields) . '"' . "\n";
+                $line .= '"'.implode('","', $fields).'"'."\n";
             }
 
             $raw = array();
             foreach ($fields as $field) {
                 $raw[] = $singleRow->getField($field);
             }
-            $line .= '"' . implode('","', array_values($raw)) . '"' . "\n";
+            $line .= '"'.implode('","', array_values($raw)).'"'."\n";
 
             if ($echoToBrowser) {
                 echo $line;

src/Database/SqlBind.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
             $arg = str_replace("_", SqlBind::keyAdj($key), $paramSubstName);
 
             $count = 0;
-            $sql = preg_replace("/(\[\[$key\]\]|:" . $key . "[\s\W]|:$key\$)/", $arg . ' ', $sql, -1, $count);
+            $sql = preg_replace("/(\[\[$key\]\]|:".$key."[\s\W]|:$key\$)/", $arg.' ', $sql, -1, $count);
             if ($count === 0) {
                 unset($params[$key]);
             }

src/Database/Expressions/DbBaseFunctions.php

Spacing +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
             if (isset($pattern[$value])) {
                 $formatted = $pattern[$value];
             } else {
-                $formatted = $delimitString . $value . $delimitString;
+                $formatted = $delimitString.$value.$delimitString;
             }
             $prepareString[$key] = $formatted;
         }

src/Database/Expressions/DbDblibFunctions.php

Indentation +1 added lines, -2 removed lines

@@ -65,8 +65,7 @@
 
     /**
      * Format date column in sql string given an input format that understands Y M D
-
-*
+     *
 *@param string $format
      * @param bool|string $column
      * @return string

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
 
         return preg_replace(
             '~(\s[Tt][Oo][Pp])\s.*?\d+\s~',
-            '$1 ' . $qty . ' ',
+            '$1 '.$qty.' ',
             $sql
         );
     }