Inspection of "Updated README" - byjg/anydataset - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Branch — master (a2888f)

by Joao

created 2016-06-08 02:40 UTC

Status

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -56,7 +56,7 @@
 block discarded – undo
             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);

Please login to merge, or discard this patch.

src/Database/DBPgsqlFunctions.php 2 patches

Switch Indentation +53 added lines, -53 removed lines patch added patch discarded remove patch

		@@ -76,59 +76,59 @@
		block discarded – undo
76	76	for ($i = 0; $i < $len; $i++) {
77	77	$ch = $fmt[$i];
78	78	switch ($ch) {
79		- case 'Y':
80		- case 'y':
81		- $s .= 'YYYY';
82		- break;
83		- case 'Q':
84		- case 'q':
85		- $s .= 'Q';
86		- break;
87		-
88		- case 'M':
89		- $s .= 'Mon';
90		- break;
91		-
92		- case 'm':
93		- $s .= 'MM';
94		- break;
95		- case 'D':
96		- case 'd':
97		- $s .= 'DD';
98		- break;
99		-
100		- case 'H':
101		- $s.= 'HH24';
102		- break;
103		-
104		- case 'h':
105		- $s .= 'HH';
106		- break;
107		-
108		- case 'i':
109		- $s .= 'MI';
110		- break;
111		-
112		- case 's':
113		- $s .= 'SS';
114		- break;
115		-
116		- case 'a':
117		- case 'A':
118		- $s .= 'AM';
119		- break;
120		-
121		- default:
122		- // handle escape characters...
123		- if ($ch == '\\') {
124		- $i++;
125		- $ch = substr($fmt, $i, 1);
126		- }
127		- if (strpos('-/.:;, ', $ch) !== false) {
128		- $s .= $ch;
129		- } else {
130		- $s .= '"' . $ch . '"';
131		- }
	79	+ case 'Y':
	80	+ case 'y':
	81	+ $s .= 'YYYY';
	82	+ break;
	83	+ case 'Q':
	84	+ case 'q':
	85	+ $s .= 'Q';
	86	+ break;
	87	+
	88	+ case 'M':
	89	+ $s .= 'Mon';
	90	+ break;
	91	+
	92	+ case 'm':
	93	+ $s .= 'MM';
	94	+ break;
	95	+ case 'D':
	96	+ case 'd':
	97	+ $s .= 'DD';
	98	+ break;
	99	+
	100	+ case 'H':
	101	+ $s.= 'HH24';
	102	+ break;
	103	+
	104	+ case 'h':
	105	+ $s .= 'HH';
	106	+ break;
	107	+
	108	+ case 'i':
	109	+ $s .= 'MI';
	110	+ break;
	111	+
	112	+ case 's':
	113	+ $s .= 'SS';
	114	+ break;
	115	+
	116	+ case 'a':
	117	+ case 'A':
	118	+ $s .= 'AM';
	119	+ break;
	120	+
	121	+ default:
	122	+ // handle escape characters...
	123	+ if ($ch == '\\') {
	124	+ $i++;
	125	+ $ch = substr($fmt, $i, 1);
	126	+ }
	127	+ if (strpos('-/.:;, ', $ch) !== false) {
	128	+ $s .= $ch;
	129	+ } else {
	130	+ $s .= '"' . $ch . '"';
	131	+ }
132	132	}
133	133	}
134	134	return $s . "')";

Please login to merge, or discard this patch.

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -20,7 +20,7 @@  discard block
 block discarded – undo
     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 @@  discard block
 block discarded – undo
     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 @@  discard block
 block discarded – undo
                     break;
 
                 case 'H':
-                    $s.= 'HH24';
+                    $s .= 'HH24';
                     break;
 
                 case 'h':
@@ -122,11 +122,11 @@  discard block
 block discarded – undo
                     if (strpos('-/.:;, ', $ch) !== false) {
                         $s .= $ch;
                     } else {
-                        $s .= '"' . $ch . '"';
+                        $s .= '"'.$ch.'"';
                     }
             }
         }
-        return $s . "')";
+        return $s."')";
     }
 
     /**

Please login to merge, or discard this patch.

src/Database/DBMysqlFunctions.php 2 patches

Switch Indentation +53 added lines, -53 removed lines patch added patch discarded remove patch

		@@ -82,59 +82,59 @@
		block discarded – undo
82	82	for ($i = 0; $i < $len; $i++) {
83	83	$ch = $fmt[$i];
84	84	switch ($ch) {
85		- case 'Y':
86		- case 'y':
87		- $s .= '%Y';
88		- break;
89		- case 'Q':
90		- case 'q':
91		- $s .= "'),Quarter($col)";
92		-
93		- if ($len > $i + 1) $s .= ",DATE_FORMAT($col,'";
94		- else $s .= ",('";
95		- $concat = true;
96		- break;
97		- case 'M':
98		- $s .= '%b';
99		- break;
100		-
101		- case 'm':
102		- $s .= '%m';
103		- break;
104		- case 'D':
105		- case 'd':
106		- $s .= '%d';
107		- break;
108		-
109		- case 'H':
110		- $s .= '%H';
111		- break;
112		-
113		- case 'h':
114		- $s .= '%I';
115		- break;
116		-
117		- case 'i':
118		- $s .= '%i';
119		- break;
120		-
121		- case 's':
122		- $s .= '%s';
123		- break;
124		-
125		- case 'a':
126		- case 'A':
127		- $s .= '%p';
128		- break;
129		-
130		- default:
131		-
132		- if ($ch == '\\') {
133		- $i++;
134		- $ch = substr($fmt, $i, 1);
135		- }
136		- $s .= $ch;
137		- break;
	85	+ case 'Y':
	86	+ case 'y':
	87	+ $s .= '%Y';
	88	+ break;
	89	+ case 'Q':
	90	+ case 'q':
	91	+ $s .= "'),Quarter($col)";
	92	+
	93	+ if ($len > $i + 1) $s .= ",DATE_FORMAT($col,'";
	94	+ else $s .= ",('";
	95	+ $concat = true;
	96	+ break;
	97	+ case 'M':
	98	+ $s .= '%b';
	99	+ break;
	100	+
	101	+ case 'm':
	102	+ $s .= '%m';
	103	+ break;
	104	+ case 'D':
	105	+ case 'd':
	106	+ $s .= '%d';
	107	+ break;
	108	+
	109	+ case 'H':
	110	+ $s .= '%H';
	111	+ break;
	112	+
	113	+ case 'h':
	114	+ $s .= '%I';
	115	+ break;
	116	+
	117	+ case 'i':
	118	+ $s .= '%i';
	119	+ break;
	120	+
	121	+ case 's':
	122	+ $s .= '%s';
	123	+ break;
	124	+
	125	+ case 'a':
	126	+ case 'A':
	127	+ $s .= '%p';
	128	+ break;
	129	+
	130	+ default:
	131	+
	132	+ if ($ch == '\\') {
	133	+ $i++;
	134	+ $ch = substr($fmt, $i, 1);
	135	+ }
	136	+ $s .= $ch;
	137	+ break;
138	138	}
139	139	}
140	140	$s.="')";

Please login to merge, or discard this patch.

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -9,7 +9,7 @@  discard block
 block discarded – undo
 
     function concat($s1, $s2 = null)
     {
-        return "concat(" . implode(func_get_args(), ', ') . ")";
+        return "concat(".implode(func_get_args(), ', ').")";
     }
 
     /**
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
     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 @@  discard block
 block discarded – undo
     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 @@  discard block
 block discarded – undo
                     break;
             }
         }
-        $s.="')";
+        $s .= "')";
         if ($concat) $s = "CONCAT($s)";
         return $s;
     }

Please login to merge, or discard this patch.

src/Repository/JsonDataset.php 2 patches

Switch Indentation +21 added lines, -21 removed lines patch added patch discarded remove patch

@@ -23,27 +23,27 @@
 block discarded – undo
         $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) {

Please login to merge, or discard this patch.

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

src/Repository/IteratorFilter.php 2 patches

Switch Indentation +98 added lines, -98 removed lines patch added patch discarded remove patch

@@ -141,38 +141,38 @@  discard block
 block discarded – undo
 
         $result = "";
         switch ($relation) {
-            case Relation::EQUAL: {
-                    $result = $field . "=" . $value;
-                    break;
-                }
-            case Relation::GREATER_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::LESS_OR_EQUAL_THAN: {
-                    $result = $field . "<=" . $value;
-                    break;
-                }
-            case Relation::NOT_EQUAL: {
-                    $result = $field . "!=" . $value;
-                    break;
-                }
-            case Relation::STARTS_WITH: {
-                    $result = " starts-with($field, $value) ";
-                    break;
-                }
-            case Relation::CONTAINS: {
-                    $result = " contains($field, $value) ";
-                    break;
-                }
+        case Relation::EQUAL: {
+                $result = $field . "=" . $value;
+                break;
+            }
+        case Relation::GREATER_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::LESS_OR_EQUAL_THAN: {
+                $result = $field . "<=" . $value;
+                break;
+            }
+        case Relation::NOT_EQUAL: {
+                $result = $field . "!=" . $value;
+                break;
+            }
+        case Relation::STARTS_WITH: {
+                $result = " starts-with($field, $value) ";
+                break;
+            }
+        case Relation::CONTAINS: {
+                $result = " contains($field, $value) ";
+                break;
+            }
         }
         return $result;
     }
@@ -200,40 +200,40 @@  discard block
 block discarded – undo
         $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;
@@ -268,38 +268,38 @@  discard block
 block discarded – undo
 
             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;
+                    }
                 }
             }
         }

Please login to merge, or discard this patch.

Spacing +20 added lines, -20 removed lines patch added patch discarded remove patch

@@ -37,7 +37,7 @@  discard block
 block discarded – undo
         if ($xpathFilter == "") {
             return "/anydataset/row";
         } else {
-            return "/anydataset/row[" . $xpathFilter . "]";
+            return "/anydataset/row[".$xpathFilter."]";
         }
     }
 
@@ -136,33 +136,33 @@  discard block
 block discarded – undo
     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: {
@@ -191,47 +191,47 @@  discard block
 block discarded – undo
         $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;
                 }
         }

Please login to merge, or discard this patch.

src/ConnectionManagement.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -181,14 +181,14 @@
 block discarded – undo
         $pat = "/$patDriver($patCredentials$patHost$patDatabase|$patFile)$patExtra/i";
         $parts = array();
         if (!preg_match($pat, $this->getDbConnectionString(), $parts)) {
-            throw new InvalidArgumentException("Connection string " . $this->getDbConnectionString() . " is invalid! Please fix it.");
+            throw new InvalidArgumentException("Connection string ".$this->getDbConnectionString()." is invalid! Please fix it.");
         }
 
         // Set the Driver
         $this->setDriver($parts ['driver']);
 
         if (!isset($parts['path']) && !isset($parts['host'])) {
-            throw new InvalidArgumentException("Connection string " . $this->getDbConnectionString() . " is invalid! Please fix it.");
+            throw new InvalidArgumentException("Connection string ".$this->getDbConnectionString()." is invalid! Please fix it.");
         }
 
 

Please login to merge, or discard this patch.

src/Database/PdoObdc.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -10,7 +10,7 @@
 block discarded – undo
 
     public function __construct(ConnectionManagement $connMngt)
     {
-        $strcnn = $connMngt->getDriver() . ":" . $connMngt->getServer();
+        $strcnn = $connMngt->getDriver().":".$connMngt->getServer();
 
         parent::__construct($connMngt, $strcnn, [], []);
     }

Please login to merge, or discard this patch.

src/Database/SQLBind.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -47,7 +47,7 @@
 block discarded – undo
             $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]);
             }

Please login to merge, or discard this patch.

src/Database/PdoOci.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -12,7 +12,7 @@
 block discarded – undo
 
     public function __construct(ConnectionManagement $connMngt)
     {
-        $strcnn = $connMngt->getDriver() . ":dbname=" . DBOci8Driver::getTnsString($connMngt);
+        $strcnn = $connMngt->getDriver().":dbname=".DBOci8Driver::getTnsString($connMngt);
 
         $postOptions = [
             PDO::ATTR_EMULATE_PREPARES => true

Please login to merge, or discard this patch.

		@@ -47,7 +47,7 @@
		block discarded – undo
47	47	}
48	48
49	49	if ($lastError != JSON_ERROR_NONE) {
50		- throw new DatasetException("Invalid JSON string: " . $lastErrorDesc);
	50	+ throw new DatasetException("Invalid JSON string: ".$lastErrorDesc);
51	51	}
52	52	}
53	53

		@@ -37,7 +37,7 @@ discard block
		block discarded – undo
37	37	if ($xpathFilter == "") {
38	38	return "/anydataset/row";
39	39	} else {
40		- return "/anydataset/row[" . $xpathFilter . "]";
	40	+ return "/anydataset/row[".$xpathFilter."]";
41	41	}
42	42	}
43	43
		@@ -136,33 +136,33 @@ discard block
		block discarded – undo
136	136	private function getStrXpathRelation($name, $relation, $value)
137	137	{
138	138	$str = is_numeric($value) ? "" : "'";
139		- $field = "field[@name='" . $name . "'] ";
	139	+ $field = "field[@name='".$name."'] ";
140	140	$value = " $str$value$str ";
141	141
142	142	$result = "";
143	143	switch ($relation) {
144	144	case Relation::EQUAL: {
145		- $result = $field . "=" . $value;
	145	+ $result = $field."=".$value;
146	146	break;
147	147	}
148	148	case Relation::GREATER_THAN: {
149		- $result = $field . ">" . $value;
	149	+ $result = $field.">".$value;
150	150	break;
151	151	}
152	152	case Relation::LESS_THAN: {
153		- $result = $field . "<" . $value;
	153	+ $result = $field."<".$value;
154	154	break;
155	155	}
156	156	case Relation::GREATER_OR_EQUAL_THAN: {
157		- $result = $field . ">=" . $value;
	157	+ $result = $field.">=".$value;
158	158	break;
159	159	}
160	160	case Relation::LESS_OR_EQUAL_THAN: {
161		- $result = $field . "<=" . $value;
	161	+ $result = $field."<=".$value;
162	162	break;
163	163	}
164	164	case Relation::NOT_EQUAL: {
165		- $result = $field . "!=" . $value;
	165	+ $result = $field."!=".$value;
166	166	break;
167	167	}
168	168	case Relation::STARTS_WITH: {
		@@ -191,47 +191,47 @@ discard block
		block discarded – undo
191	191	$paramName = $name;
192	192	$i = 0;
193	193	while (array_key_exists($paramName, $param)) {
194		- $paramName = $name . ($i++);
	194	+ $paramName = $name.($i++);
195	195	}
196	196
197	197	$param[$paramName] = $value;
198	198
199	199	$result = "";
200	200	$field = " $name ";
201		- $valueparam = " [[" . $paramName . "]] ";
	201	+ $valueparam = " [[".$paramName."]] ";
202	202	switch ($relation) {
203	203	case Relation::EQUAL: {
204		- $result = $field . "=" . $valueparam;
	204	+ $result = $field."=".$valueparam;
205	205	break;
206	206	}
207	207	case Relation::GREATER_THAN: {
208		- $result = $field . ">" . $valueparam;
	208	+ $result = $field.">".$valueparam;
209	209	break;
210	210	}
211	211	case Relation::LESS_THAN: {
212		- $result = $field . "<" . $valueparam;
	212	+ $result = $field."<".$valueparam;
213	213	break;
214	214	}
215	215	case Relation::GREATER_OR_EQUAL_THAN: {
216		- $result = $field . ">=" . $valueparam;
	216	+ $result = $field.">=".$valueparam;
217	217	break;
218	218	}
219	219	case Relation::LESS_OR_EQUAL_THAN: {
220		- $result = $field . "<=" . $valueparam;
	220	+ $result = $field."<=".$valueparam;
221	221	break;
222	222	}
223	223	case Relation::NOT_EQUAL: {
224		- $result = $field . "!=" . $valueparam;
	224	+ $result = $field."!=".$valueparam;
225	225	break;
226	226	}
227	227	case Relation::STARTS_WITH: {
228		- $param[$paramName] = $value . "%";
229		- $result = $field . " like " . $valueparam;
	228	+ $param[$paramName] = $value."%";
	229	+ $result = $field." like ".$valueparam;
230	230	break;
231	231	}
232	232	case Relation::CONTAINS: {
233		- $param[$paramName] = "%" . $value . "%";
234		- $result = $field . " like " . $valueparam;
	233	+ $param[$paramName] = "%".$value."%";
	234	+ $result = $field." like ".$valueparam;
235	235	break;
236	236	}
237	237	}

		@@ -181,14 +181,14 @@
		block discarded – undo
181	181	$pat = "/$patDriver($patCredentials$patHost$patDatabase\|$patFile)$patExtra/i";
182	182	$parts = array();
183	183	if (!preg_match($pat, $this->getDbConnectionString(), $parts)) {
184		- throw new InvalidArgumentException("Connection string " . $this->getDbConnectionString() . " is invalid! Please fix it.");
	184	+ throw new InvalidArgumentException("Connection string ".$this->getDbConnectionString()." is invalid! Please fix it.");
185	185	}
186	186
187	187	// Set the Driver
188	188	$this->setDriver($parts ['driver']);
189	189
190	190	if (!isset($parts['path']) && !isset($parts['host'])) {
191		- throw new InvalidArgumentException("Connection string " . $this->getDbConnectionString() . " is invalid! Please fix it.");
	191	+ throw new InvalidArgumentException("Connection string ".$this->getDbConnectionString()." is invalid! Please fix it.");
192	192	}
193	193
194	194

		@@ -56,7 +56,7 @@
		block discarded – undo
56	56	sqlrcur_prepareQuery($cur, $sql);
57	57	$bindCount = 1;
58	58	foreach ($array as $key => $value) {
59		- $field = strval($bindCount ++);
	59	+ $field = strval($bindCount++);
60	60	sqlrcur_inputBind($cur, $field, $value);
61	61	}
62	62	$success = sqlrcur_executeQuery($cur);

		@@ -20,7 +20,7 @@ discard block
		block discarded – undo
20	20	function limit($sql, $start, $qty)
21	21	{
22	22	if (strpos($sql, ' LIMIT ') === false) {
23		- return $sql . " LIMIT $qty OFFSET $start ";
	23	+ return $sql." LIMIT $qty OFFSET $start ";
24	24	}
25	25
26	26	return $sql;
		@@ -65,7 +65,7 @@ discard block
		block discarded – undo
65	65	function sqlDate($fmt, $col = false)
66	66	{
67	67	if (!$col) $col = 'current_timestamp';
68		- $s = 'TO_CHAR(' . $col . ",'";
	68	+ $s = 'TO_CHAR('.$col.",'";
69	69
70	70	$len = strlen($fmt);
71	71	for ($i = 0; $i < $len; $i++) {
		@@ -93,7 +93,7 @@ discard block
		block discarded – undo
93	93	break;
94	94
95	95	case 'H':
96		- $s.= 'HH24';
	96	+ $s .= 'HH24';
97	97	break;
98	98
99	99	case 'h':
		@@ -122,11 +122,11 @@ discard block
		block discarded – undo
122	122	if (strpos('-/.:;, ', $ch) !== false) {
123	123	$s .= $ch;
124	124	} else {
125		- $s .= '"' . $ch . '"';
	125	+ $s .= '"'.$ch.'"';
126	126	}
127	127	}
128	128	}
129		- return $s . "')";
	129	+ return $s."')";
130	130	}
131	131
132	132	/**

		@@ -9,7 +9,7 @@ discard block
		block discarded – undo
9	9
10	10	function concat($s1, $s2 = null)
11	11	{
12		- return "concat(" . implode(func_get_args(), ', ') . ")";
	12	+ return "concat(".implode(func_get_args(), ', ').")";
13	13	}
14	14
15	15	/**
		@@ -22,7 +22,7 @@ discard block
		block discarded – undo
22	22	function limit($sql, $start, $qty)
23	23	{
24	24	if (strpos($sql, ' LIMIT ') === false) {
25		- return $sql . " LIMIT $start, $qty ";
	25	+ return $sql." LIMIT $start, $qty ";
26	26	}
27	27
28	28	return $sql;
		@@ -67,7 +67,7 @@ discard block
		block discarded – undo
67	67	function sqlDate($fmt, $col = false)
68	68	{
69	69	if (!$col) $col = 'now()';
70		- $s = 'DATE_FORMAT(' . $col . ",'";
	70	+ $s = 'DATE_FORMAT('.$col.",'";
71	71	$concat = false;
72	72	$len = strlen($fmt);
73	73	for ($i = 0; $i < $len; $i++) {
		@@ -128,7 +128,7 @@ discard block
		block discarded – undo
128	128	break;
129	129	}
130	130	}
131		- $s.="')";
	131	+ $s .= "')";
132	132	if ($concat) $s = "CONCAT($s)";
133	133	return $s;
134	134	}

		@@ -23,27 +23,27 @@
		block discarded – undo
23	23	$lastError = json_last_error();
24	24	$lastErrorDesc = "";
25	25	switch ($lastError) {
26		- case JSON_ERROR_NONE:
27		- $lastErrorDesc = 'No errors';
28		- break;
29		- case JSON_ERROR_DEPTH:
30		- $lastErrorDesc = 'Maximum stack depth exceeded';
31		- break;
32		- case JSON_ERROR_STATE_MISMATCH:
33		- $lastErrorDesc = 'Underflow or the modes mismatch';
34		- break;
35		- case JSON_ERROR_CTRL_CHAR:
36		- $lastErrorDesc = 'Unexpected control character found';
37		- break;
38		- case JSON_ERROR_SYNTAX:
39		- $lastErrorDesc = 'Syntax error, malformed JSON';
40		- break;
41		- case JSON_ERROR_UTF8:
42		- $lastErrorDesc = 'Malformed UTF-8 characters, possibly incorrectly encoded';
43		- break;
44		- default:
45		- $lastErrorDesc = 'Unknown error';
46		- break;
	26	+ case JSON_ERROR_NONE:
	27	+ $lastErrorDesc = 'No errors';
	28	+ break;
	29	+ case JSON_ERROR_DEPTH:
	30	+ $lastErrorDesc = 'Maximum stack depth exceeded';
	31	+ break;
	32	+ case JSON_ERROR_STATE_MISMATCH:
	33	+ $lastErrorDesc = 'Underflow or the modes mismatch';
	34	+ break;
	35	+ case JSON_ERROR_CTRL_CHAR:
	36	+ $lastErrorDesc = 'Unexpected control character found';
	37	+ break;
	38	+ case JSON_ERROR_SYNTAX:
	39	+ $lastErrorDesc = 'Syntax error, malformed JSON';
	40	+ break;
	41	+ case JSON_ERROR_UTF8:
	42	+ $lastErrorDesc = 'Malformed UTF-8 characters, possibly incorrectly encoded';
	43	+ break;
	44	+ default:
	45	+ $lastErrorDesc = 'Unknown error';
	46	+ break;
47	47	}
48	48
49	49	if ($lastError != JSON_ERROR_NONE) {

		@@ -141,38 +141,38 @@ discard block
		block discarded – undo
141	141
142	142	$result = "";
143	143	switch ($relation) {
144		- case Relation::EQUAL: {
145		- $result = $field . "=" . $value;
146		- break;
147		- }
148		- case Relation::GREATER_THAN: {
149		- $result = $field . ">" . $value;
150		- break;
151		- }
152		- case Relation::LESS_THAN: {
153		- $result = $field . "<" . $value;
154		- break;
155		- }
156		- case Relation::GREATER_OR_EQUAL_THAN: {
157		- $result = $field . ">=" . $value;
158		- break;
159		- }
160		- case Relation::LESS_OR_EQUAL_THAN: {
161		- $result = $field . "<=" . $value;
162		- break;
163		- }
164		- case Relation::NOT_EQUAL: {
165		- $result = $field . "!=" . $value;
166		- break;
167		- }
168		- case Relation::STARTS_WITH: {
169		- $result = " starts-with($field, $value) ";
170		- break;
171		- }
172		- case Relation::CONTAINS: {
173		- $result = " contains($field, $value) ";
174		- break;
175		- }
	144	+ case Relation::EQUAL: {
	145	+ $result = $field . "=" . $value;
	146	+ break;
	147	+ }
	148	+ case Relation::GREATER_THAN: {
	149	+ $result = $field . ">" . $value;
	150	+ break;
	151	+ }
	152	+ case Relation::LESS_THAN: {
	153	+ $result = $field . "<" . $value;
	154	+ break;
	155	+ }
	156	+ case Relation::GREATER_OR_EQUAL_THAN: {
	157	+ $result = $field . ">=" . $value;
	158	+ break;
	159	+ }
	160	+ case Relation::LESS_OR_EQUAL_THAN: {
	161	+ $result = $field . "<=" . $value;
	162	+ break;
	163	+ }
	164	+ case Relation::NOT_EQUAL: {
	165	+ $result = $field . "!=" . $value;
	166	+ break;
	167	+ }
	168	+ case Relation::STARTS_WITH: {
	169	+ $result = " starts-with($field, $value) ";
	170	+ break;
	171	+ }
	172	+ case Relation::CONTAINS: {
	173	+ $result = " contains($field, $value) ";
	174	+ break;
	175	+ }
176	176	}
177	177	return $result;
178	178	}
		@@ -200,40 +200,40 @@ discard block
		block discarded – undo
200	200	$field = " $name ";
201	201	$valueparam = " [[" . $paramName . "]] ";
202	202	switch ($relation) {
203		- case Relation::EQUAL: {
204		- $result = $field . "=" . $valueparam;
205		- break;
206		- }
207		- case Relation::GREATER_THAN: {
208		- $result = $field . ">" . $valueparam;
209		- break;
210		- }
211		- case Relation::LESS_THAN: {
212		- $result = $field . "<" . $valueparam;
213		- break;
214		- }
215		- case Relation::GREATER_OR_EQUAL_THAN: {
216		- $result = $field . ">=" . $valueparam;
217		- break;
218		- }
219		- case Relation::LESS_OR_EQUAL_THAN: {
220		- $result = $field . "<=" . $valueparam;
221		- break;
222		- }
223		- case Relation::NOT_EQUAL: {
224		- $result = $field . "!=" . $valueparam;
225		- break;
226		- }
227		- case Relation::STARTS_WITH: {
228		- $param[$paramName] = $value . "%";
229		- $result = $field . " like " . $valueparam;
230		- break;
231		- }
232		- case Relation::CONTAINS: {
233		- $param[$paramName] = "%" . $value . "%";
234		- $result = $field . " like " . $valueparam;
235		- break;
236		- }
	203	+ case Relation::EQUAL: {
	204	+ $result = $field . "=" . $valueparam;
	205	+ break;
	206	+ }
	207	+ case Relation::GREATER_THAN: {
	208	+ $result = $field . ">" . $valueparam;
	209	+ break;
	210	+ }
	211	+ case Relation::LESS_THAN: {
	212	+ $result = $field . "<" . $valueparam;
	213	+ break;
	214	+ }
	215	+ case Relation::GREATER_OR_EQUAL_THAN: {
	216	+ $result = $field . ">=" . $valueparam;
	217	+ break;
	218	+ }
	219	+ case Relation::LESS_OR_EQUAL_THAN: {
	220	+ $result = $field . "<=" . $valueparam;
	221	+ break;
	222	+ }
	223	+ case Relation::NOT_EQUAL: {
	224	+ $result = $field . "!=" . $valueparam;
	225	+ break;
	226	+ }
	227	+ case Relation::STARTS_WITH: {
	228	+ $param[$paramName] = $value . "%";
	229	+ $result = $field . " like " . $valueparam;
	230	+ break;
	231	+ }
	232	+ case Relation::CONTAINS: {
	233	+ $param[$paramName] = "%" . $value . "%";
	234	+ $result = $field . " like " . $valueparam;
	235	+ break;
	236	+ }
237	237	}
238	238
239	239	return $result;
		@@ -268,38 +268,38 @@ discard block
		block discarded – undo
268	268
269	269	foreach ($field as $valueparam) {
270	270	switch ($relation) {
271		- case Relation::EQUAL: {
272		- $result[$pos] &= ($valueparam == $value);
273		- break;
274		- }
275		- case Relation::GREATER_THAN: {
276		- $result[$pos] &= ($valueparam > $value);
277		- break;
278		- }
279		- case Relation::LESS_THAN: {
280		- $result[$pos] &= ($valueparam < $value);
281		- break;
282		- }
283		- case Relation::GREATER_OR_EQUAL_THAN: {
284		- $result[$pos] &= ($valueparam >= $value);
285		- break;
286		- }
287		- case Relation::LESS_OR_EQUAL_THAN: {
288		- $result[$pos] &= ($valueparam <= $value);
289		- break;
290		- }
291		- case Relation::NOT_EQUAL: {
292		- $result[$pos] &= ($valueparam != $value);
293		- break;
294		- }
295		- case Relation::STARTS_WITH: {
296		- $result[$pos] &= (strpos($valueparam, $value) === 0);
297		- break;
298		- }
299		- case Relation::CONTAINS: {
300		- $result[$pos] &= (strpos($valueparam, $value) !== false);
301		- break;
302		- }
	271	+ case Relation::EQUAL: {
	272	+ $result[$pos] &= ($valueparam == $value);
	273	+ break;
	274	+ }
	275	+ case Relation::GREATER_THAN: {
	276	+ $result[$pos] &= ($valueparam > $value);
	277	+ break;
	278	+ }
	279	+ case Relation::LESS_THAN: {
	280	+ $result[$pos] &= ($valueparam < $value);
	281	+ break;
	282	+ }
	283	+ case Relation::GREATER_OR_EQUAL_THAN: {
	284	+ $result[$pos] &= ($valueparam >= $value);
	285	+ break;
	286	+ }
	287	+ case Relation::LESS_OR_EQUAL_THAN: {
	288	+ $result[$pos] &= ($valueparam <= $value);
	289	+ break;
	290	+ }
	291	+ case Relation::NOT_EQUAL: {
	292	+ $result[$pos] &= ($valueparam != $value);
	293	+ break;
	294	+ }
	295	+ case Relation::STARTS_WITH: {
	296	+ $result[$pos] &= (strpos($valueparam, $value) === 0);
	297	+ break;
	298	+ }
	299	+ case Relation::CONTAINS: {
	300	+ $result[$pos] &= (strpos($valueparam, $value) !== false);
	301	+ break;
	302	+ }
303	303	}
304	304	}
305	305	}

		@@ -10,7 +10,7 @@
		block discarded – undo
10	10
11	11	public function __construct(ConnectionManagement $connMngt)
12	12	{
13		- $strcnn = $connMngt->getDriver() . ":" . $connMngt->getServer();
	13	+ $strcnn = $connMngt->getDriver().":".$connMngt->getServer();
14	14
15	15	parent::__construct($connMngt, $strcnn, [], []);
16	16	}

		@@ -47,7 +47,7 @@
		block discarded – undo
47	47	$arg = str_replace("_", SQLBind::keyAdj($key), $paramSubstName);
48	48
49	49	$count = 0;
50		- $sql = preg_replace("/(\[\[$key\]\]\|:" . $key . "[\s\W]\|:$key\$)/", $arg . ' ', $sql, -1, $count);
	50	+ $sql = preg_replace("/(\[\[$key\]\]\|:".$key."[\s\W]\|:$key\$)/", $arg.' ', $sql, -1, $count);
51	51	if ($count === 0) {
52	52	unset($params[$key]);
53	53	}

		@@ -12,7 +12,7 @@
		block discarded – undo
12	12
13	13	public function __construct(ConnectionManagement $connMngt)
14	14	{
15		- $strcnn = $connMngt->getDriver() . ":dbname=" . DBOci8Driver::getTnsString($connMngt);
	15	+ $strcnn = $connMngt->getDriver().":dbname=".DBOci8Driver::getTnsString($connMngt);
16	16
17	17	$postOptions = [
18	18	PDO::ATTR_EMULATE_PREPARES => true

byjg / anydataset

Branch — master (a2888f)

Status

Category

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Switch Indentation +53 added lines, -53 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

Switch Indentation +53 added lines, -53 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Switch Indentation +21 added lines, -21 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Switch Indentation +98 added lines, -98 removed lines patch added patch discarded remove patch

Spacing +20 added lines, -20 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch