@@ -84,6 +84,10 @@ |
||
84 | 84 | } |
85 | 85 | } |
86 | 86 | |
87 | + /** |
|
88 | + * @param string $buffer |
|
89 | + * @param FixedTextDefinition[] $fieldDefinition |
|
90 | + */ |
|
87 | 91 | protected function processBuffer($buffer, $fieldDefinition) |
88 | 92 | { |
89 | 93 | $cntDef = count($fieldDefinition); |
@@ -92,9 +92,9 @@ |
||
92 | 92 | $fieldDef = $fieldDefinition[$i]; |
93 | 93 | |
94 | 94 | $fields[$fieldDef->fieldName] = substr($buffer, $fieldDef->startPos, $fieldDef->length); |
95 | - if (!empty($fieldDef->requiredValue) && (!preg_match("/^[" . $fieldDef->requiredValue . "]$/", |
|
95 | + if (!empty($fieldDef->requiredValue) && (!preg_match("/^[".$fieldDef->requiredValue."]$/", |
|
96 | 96 | $fields[$fieldDef->fieldName]))) { |
97 | - throw new IteratorException("Expected the value '" . $fieldDef->requiredValue . "' and I got '" . $fields[$fieldDef->fieldName] . "'"); |
|
97 | + throw new IteratorException("Expected the value '".$fieldDef->requiredValue."' and I got '".$fields[$fieldDef->fieldName]."'"); |
|
98 | 98 | } elseif (is_array($fieldDef->subTypes)) { |
99 | 99 | $fields[$fieldDef->fieldName] = $this->processBuffer($fields[$fieldDef->fieldName], $fieldDef->subTypes); |
100 | 100 | } |
@@ -92,7 +92,9 @@ |
||
92 | 92 | foreach ($array as $key => $value) { |
93 | 93 | $stmt->bindValue(":" . SQLBind::keyAdj($key), $value); |
94 | 94 | } |
95 | - } else $stmt = $this->_db->prepare($sql); |
|
95 | + } else { |
|
96 | + $stmt = $this->_db->prepare($sql); |
|
97 | + } |
|
96 | 98 | |
97 | 99 | return $stmt; |
98 | 100 | } |
@@ -27,15 +27,15 @@ discard block |
||
27 | 27 | |
28 | 28 | if (is_null($strcnn)) { |
29 | 29 | if ($this->_connectionManagement->getFilePath() != "") { |
30 | - $strcnn = $this->_connectionManagement->getDriver() . ":" . $this->_connectionManagement->getFilePath(); |
|
30 | + $strcnn = $this->_connectionManagement->getDriver().":".$this->_connectionManagement->getFilePath(); |
|
31 | 31 | } else { |
32 | - $strcnn = $this->_connectionManagement->getDriver() . ":dbname=" . $this->_connectionManagement->getDatabase(); |
|
32 | + $strcnn = $this->_connectionManagement->getDriver().":dbname=".$this->_connectionManagement->getDatabase(); |
|
33 | 33 | if ($this->_connectionManagement->getExtraParam("unixsocket") != "") { |
34 | - $strcnn .= ";unix_socket=" . $this->_connectionManagement->getExtraParam("unixsocket"); |
|
34 | + $strcnn .= ";unix_socket=".$this->_connectionManagement->getExtraParam("unixsocket"); |
|
35 | 35 | } else { |
36 | - $strcnn .= ";host=" . $this->_connectionManagement->getServer(); |
|
36 | + $strcnn .= ";host=".$this->_connectionManagement->getServer(); |
|
37 | 37 | if ($this->_connectionManagement->getPort() != "") { |
38 | - $strcnn .= ";port=" . $this->_connectionManagement->getPort(); |
|
38 | + $strcnn .= ";port=".$this->_connectionManagement->getPort(); |
|
39 | 39 | } |
40 | 40 | } |
41 | 41 | } |
@@ -43,14 +43,14 @@ discard block |
||
43 | 43 | |
44 | 44 | // Create Connection |
45 | 45 | $this->_db = new PDO($strcnn, $this->_connectionManagement->getUsername(), |
46 | - $this->_connectionManagement->getPassword(), (array) $preOptions); |
|
46 | + $this->_connectionManagement->getPassword(), (array)$preOptions); |
|
47 | 47 | $this->_connectionManagement->setDriver($this->_db->getAttribute(PDO::ATTR_DRIVER_NAME)); |
48 | 48 | |
49 | 49 | // Set Specific Attributes |
50 | 50 | $this->_db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); |
51 | 51 | $this->_db->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER); |
52 | 52 | |
53 | - foreach ((array) $postOptions as $key => $value) { |
|
53 | + foreach ((array)$postOptions as $key => $value) { |
|
54 | 54 | $this->_db->setAttribute($key, $value); |
55 | 55 | } |
56 | 56 | } |
@@ -61,11 +61,11 @@ discard block |
||
61 | 61 | throw new NotAvailableException("Extension 'PDO' is not loaded"); |
62 | 62 | } |
63 | 63 | |
64 | - if (!extension_loaded('pdo_' . strtolower($connMngt->getDriver()))) { |
|
65 | - throw new NotAvailableException("Extension 'pdo_" . strtolower($connMngt->getDriver()) . "' is not loaded"); |
|
64 | + if (!extension_loaded('pdo_'.strtolower($connMngt->getDriver()))) { |
|
65 | + throw new NotAvailableException("Extension 'pdo_".strtolower($connMngt->getDriver())."' is not loaded"); |
|
66 | 66 | } |
67 | 67 | |
68 | - $class = '\ByJG\AnyDataset\Database\Pdo' . ucfirst($connMngt->getDriver()); |
|
68 | + $class = '\ByJG\AnyDataset\Database\Pdo'.ucfirst($connMngt->getDriver()); |
|
69 | 69 | |
70 | 70 | if (!class_exists($class, true)) { |
71 | 71 | return new DBPDODriver($connMngt, null, null, null); |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | list($sql, $array) = SQLBind::parseSQL($this->_connectionManagement, $sql, $array); |
92 | 92 | $stmt = $this->_db->prepare($sql); |
93 | 93 | foreach ($array as $key => $value) { |
94 | - $stmt->bindValue(":" . SQLBind::keyAdj($key), $value); |
|
94 | + $stmt->bindValue(":".SQLBind::keyAdj($key), $value); |
|
95 | 95 | } |
96 | 96 | } else $stmt = $this->_db->prepare($sql); |
97 | 97 |
@@ -56,7 +56,7 @@ |
||
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); |
@@ -68,12 +68,16 @@ |
||
68 | 68 | */ |
69 | 69 | function sqlDate($fmt, $col = false) |
70 | 70 | { |
71 | - if (!$col) $col = "getdate()"; |
|
71 | + if (!$col) { |
|
72 | + $col = "getdate()"; |
|
73 | + } |
|
72 | 74 | $s = ''; |
73 | 75 | |
74 | 76 | $len = strlen($fmt); |
75 | 77 | for ($i = 0; $i < $len; $i++) { |
76 | - if ($s) $s .= '+'; |
|
78 | + if ($s) { |
|
79 | + $s .= '+'; |
|
80 | + } |
|
77 | 81 | $ch = $fmt[$i]; |
78 | 82 | switch ($ch) { |
79 | 83 | case 'Y': |
@@ -72,50 +72,50 @@ |
||
72 | 72 | if ($s) $s .= '+'; |
73 | 73 | $ch = $fmt[$i]; |
74 | 74 | switch ($ch) { |
75 | - case 'Y': |
|
76 | - case 'y': |
|
77 | - $s .= "datename(yyyy,$col)"; |
|
78 | - break; |
|
79 | - case 'M': |
|
80 | - $s .= "convert(char(3),$col,0)"; |
|
81 | - break; |
|
82 | - case 'm': |
|
83 | - $s .= "replace(str(month($col),2),' ','0')"; |
|
84 | - break; |
|
85 | - case 'Q': |
|
86 | - case 'q': |
|
87 | - $s .= "datename(quarter,$col)"; |
|
88 | - break; |
|
89 | - case 'D': |
|
90 | - case 'd': |
|
91 | - $s .= "replace(str(day($col),2),' ','0')"; |
|
92 | - break; |
|
93 | - case 'h': |
|
94 | - $s .= "substring(convert(char(14),$col,0),13,2)"; |
|
95 | - break; |
|
96 | - |
|
97 | - case 'H': |
|
98 | - $s .= "replace(str(datepart(hh,$col),2),' ','0')"; |
|
99 | - break; |
|
100 | - |
|
101 | - case 'i': |
|
102 | - $s .= "replace(str(datepart(mi,$col),2),' ','0')"; |
|
103 | - break; |
|
104 | - case 's': |
|
105 | - $s .= "replace(str(datepart(ss,$col),2),' ','0')"; |
|
106 | - break; |
|
107 | - case 'a': |
|
108 | - case 'A': |
|
109 | - $s .= "substring(convert(char(19),$col,0),18,2)"; |
|
110 | - break; |
|
111 | - |
|
112 | - default: |
|
113 | - if ($ch == '\\') { |
|
114 | - $i++; |
|
115 | - $ch = substr($fmt, $i, 1); |
|
116 | - } |
|
117 | - $s .= $ch; |
|
118 | - break; |
|
75 | + case 'Y': |
|
76 | + case 'y': |
|
77 | + $s .= "datename(yyyy,$col)"; |
|
78 | + break; |
|
79 | + case 'M': |
|
80 | + $s .= "convert(char(3),$col,0)"; |
|
81 | + break; |
|
82 | + case 'm': |
|
83 | + $s .= "replace(str(month($col),2),' ','0')"; |
|
84 | + break; |
|
85 | + case 'Q': |
|
86 | + case 'q': |
|
87 | + $s .= "datename(quarter,$col)"; |
|
88 | + break; |
|
89 | + case 'D': |
|
90 | + case 'd': |
|
91 | + $s .= "replace(str(day($col),2),' ','0')"; |
|
92 | + break; |
|
93 | + case 'h': |
|
94 | + $s .= "substring(convert(char(14),$col,0),13,2)"; |
|
95 | + break; |
|
96 | + |
|
97 | + case 'H': |
|
98 | + $s .= "replace(str(datepart(hh,$col),2),' ','0')"; |
|
99 | + break; |
|
100 | + |
|
101 | + case 'i': |
|
102 | + $s .= "replace(str(datepart(mi,$col),2),' ','0')"; |
|
103 | + break; |
|
104 | + case 's': |
|
105 | + $s .= "replace(str(datepart(ss,$col),2),' ','0')"; |
|
106 | + break; |
|
107 | + case 'a': |
|
108 | + case 'A': |
|
109 | + $s .= "substring(convert(char(19),$col,0),18,2)"; |
|
110 | + break; |
|
111 | + |
|
112 | + default: |
|
113 | + if ($ch == '\\') { |
|
114 | + $i++; |
|
115 | + $ch = substr($fmt, $i, 1); |
|
116 | + } |
|
117 | + $s .= $ch; |
|
118 | + break; |
|
119 | 119 | } |
120 | 120 | } |
121 | 121 | return $s; |
@@ -76,59 +76,59 @@ |
||
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 . "')"; |
@@ -20,7 +20,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 | /** |
@@ -64,7 +64,9 @@ |
||
64 | 64 | */ |
65 | 65 | function sqlDate($fmt, $col = false) |
66 | 66 | { |
67 | - if (!$col) $col = 'current_timestamp'; |
|
67 | + if (!$col) { |
|
68 | + $col = 'current_timestamp'; |
|
69 | + } |
|
68 | 70 | $s = 'TO_CHAR(' . $col . ",'"; |
69 | 71 | |
70 | 72 | $len = strlen($fmt); |
@@ -82,59 +82,59 @@ |
||
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.="')"; |
@@ -9,7 +9,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
128 | 128 | break; |
129 | 129 | } |
130 | 130 | } |
131 | - $s.="')"; |
|
131 | + $s .= "')"; |
|
132 | 132 | if ($concat) $s = "CONCAT($s)"; |
133 | 133 | return $s; |
134 | 134 | } |
@@ -66,7 +66,9 @@ discard block |
||
66 | 66 | */ |
67 | 67 | function sqlDate($fmt, $col = false) |
68 | 68 | { |
69 | - if (!$col) $col = 'now()'; |
|
69 | + if (!$col) { |
|
70 | + $col = 'now()'; |
|
71 | + } |
|
70 | 72 | $s = 'DATE_FORMAT(' . $col . ",'"; |
71 | 73 | $concat = false; |
72 | 74 | $len = strlen($fmt); |
@@ -81,8 +83,11 @@ discard block |
||
81 | 83 | case 'q': |
82 | 84 | $s .= "'),Quarter($col)"; |
83 | 85 | |
84 | - if ($len > $i + 1) $s .= ",DATE_FORMAT($col,'"; |
|
85 | - else $s .= ",('"; |
|
86 | + if ($len > $i + 1) { |
|
87 | + $s .= ",DATE_FORMAT($col,'"; |
|
88 | + } else { |
|
89 | + $s .= ",('"; |
|
90 | + } |
|
86 | 91 | $concat = true; |
87 | 92 | break; |
88 | 93 | case 'M': |
@@ -129,7 +134,9 @@ discard block |
||
129 | 134 | } |
130 | 135 | } |
131 | 136 | $s.="')"; |
132 | - if ($concat) $s = "CONCAT($s)"; |
|
137 | + if ($concat) { |
|
138 | + $s = "CONCAT($s)"; |
|
139 | + } |
|
133 | 140 | return $s; |
134 | 141 | } |
135 | 142 |
@@ -27,7 +27,9 @@ discard block |
||
27 | 27 | } |
28 | 28 | |
29 | 29 | if ($path != "") { |
30 | - if ($path[0] == "/") $path = substr($path, 1); |
|
30 | + if ($path[0] == "/") { |
|
31 | + $path = substr($path, 1); |
|
32 | + } |
|
31 | 33 | |
32 | 34 | $pathAr = explode("/", $path); |
33 | 35 | |
@@ -44,7 +46,9 @@ discard block |
||
44 | 46 | } |
45 | 47 | } |
46 | 48 | $this->_jsonObject = $newjsonObject; |
47 | - } else $this->_jsonObject = $jsonObject; |
|
49 | + } else { |
|
50 | + $this->_jsonObject = $jsonObject; |
|
51 | + } |
|
48 | 52 | |
49 | 53 | $this->_current = 0; |
50 | 54 | } |
@@ -23,27 +23,27 @@ |
||
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) { |
@@ -47,7 +47,7 @@ |
||
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 |
@@ -26,7 +26,9 @@ |
||
26 | 26 | |
27 | 27 | $this->_array = array(); |
28 | 28 | |
29 | - if (!$array) return; |
|
29 | + if (!$array) { |
|
30 | + return; |
|
31 | + } |
|
30 | 32 | |
31 | 33 | if (is_array($array)) { |
32 | 34 | foreach ($array as $key => $value) { |