Passed
Push — master ( 800486...f6d51e )
by Darío
02:49
created
src/Db/Entity.php 1 patch
Braces   +5 added lines, -4 removed lines patch added patch discarded remove patch
@@ -107,11 +107,12 @@
 block discarded – undo
107 107
             {
108 108
                 $this->$prop = $value;
109 109
 
110
-                if (!in_array($prop, $this->changedFields))
111
-                    $this->changedFields[] = $prop;
110
+                if (!in_array($prop, $this->changedFields)) {
111
+                                    $this->changedFields[] = $prop;
112
+                }
113
+            } else {
114
+                            throw new \LogicException("The property '$prop' does not exists in the class ' " . get_class($this) . " '");
112 115
             }
113
-            else
114
-                throw new \LogicException("The property '$prop' does not exists in the class ' " . get_class($this) . " '");
115 116
         }
116 117
     }
117 118
 
Please login to merge, or discard this patch.
src/Db/TableGateway/TableGateway.php 1 patch
Braces   +48 added lines, -47 removed lines patch added patch discarded remove patch
@@ -73,11 +73,11 @@  discard block
 block discarded – undo
73 73
             {
74 74
                 $k++;
75 75
 
76
-                if (is_null($value))
77
-                    $parsed_where[] = "$key IS NULL";
78
-                elseif ($value instanceof SQLFunction)
79
-                    $parsed_where[] = "$key = " . $value->getStatement();
80
-                elseif (is_array($value))
76
+                if (is_null($value)) {
77
+                                    $parsed_where[] = "$key IS NULL";
78
+                } elseif ($value instanceof SQLFunction) {
79
+                                    $parsed_where[] = "$key = " . $value->getStatement();
80
+                } elseif (is_array($value))
81 81
                 {
82 82
                     $parsed_in = [];
83 83
 
@@ -100,8 +100,7 @@  discard block
 block discarded – undo
100 100
                     }
101 101
 
102 102
                     $parsed_where[] = "$key IN (" . implode(", ", $parsed_in) . ")";
103
-                }
104
-                else
103
+                } else
105 104
                 {
106 105
                     switch ($driver)
107 106
                     {
@@ -119,18 +118,19 @@  discard block
 block discarded – undo
119 118
             }
120 119
 
121 120
             $where = "WHERE \r\n\t" . implode(" AND\r\n\t", $parsed_where);
121
+        } else {
122
+                    $where = "";
122 123
         }
123
-        else
124
-            $where = "";
125 124
 
126 125
         $table = $this->entity->getTableName();
127 126
 
128 127
         $sql = "SELECT * \r\nFROM {$table}\r\n$where";
129 128
 
130
-        if (count($bind_values))
131
-            $this->getDriver()->getDb()->execute($sql, $bind_values)
129
+        if (count($bind_values)) {
130
+                    $this->getDriver()->getDb()->execute($sql, $bind_values)
132 131
         else
133 132
             $this->getDriver()->getDb()->execute($sql);
133
+        }
134 134
 
135 135
         return $this->getDriver()->getDb()->getArrayResult();
136 136
     }
@@ -147,8 +147,9 @@  discard block
 block discarded – undo
147 147
      */
148 148
     public function insert(Array $data)
149 149
     {
150
-        if (!count($data))
151
-            throw new \LogicException("Missing values for INSERT statement!");
150
+        if (!count($data)) {
151
+                    throw new \LogicException("Missing values for INSERT statement!");
152
+        }
152 153
 
153 154
         $bind_values = [];
154 155
 
@@ -171,11 +172,11 @@  discard block
 block discarded – undo
171 172
                 continue;
172 173
             }
173 174
 
174
-            if (is_null($value))
175
-                $value = "NULL";
176
-            elseif ($value instanceof SQLFunction)
177
-                $value = $value->getStatement();
178
-            else {
175
+            if (is_null($value)) {
176
+                            $value = "NULL";
177
+            } elseif ($value instanceof SQLFunction) {
178
+                            $value = $value->getStatement();
179
+            } else {
179 180
 
180 181
                 switch ($driver)
181 182
                 {
@@ -225,11 +226,13 @@  discard block
 block discarded – undo
225 226
     {
226 227
         $parsed_set = [];
227 228
 
228
-        if (!count($set))
229
-            throw new \LogicException("You cannot update rows without SET clause");
229
+        if (!count($set)) {
230
+                    throw new \LogicException("You cannot update rows without SET clause");
231
+        }
230 232
 
231
-        if (!count($where))
232
-            throw new SecurityException("You cannot update rows without WHERE clause!");
233
+        if (!count($where)) {
234
+                    throw new SecurityException("You cannot update rows without WHERE clause!");
235
+        }
233 236
 
234 237
         $bind_values = [];
235 238
 
@@ -241,11 +244,11 @@  discard block
 block discarded – undo
241 244
         {
242 245
             $k++;
243 246
 
244
-            if (is_null($value))
245
-                $parsed_set[] = "$key = NULL";
246
-            elseif ($value instanceof SQLFunction)
247
-                $parsed_set[] = "$key = " . $value->getStatement();
248
-            elseif (is_array($value))
247
+            if (is_null($value)) {
248
+                            $parsed_set[] = "$key = NULL";
249
+            } elseif ($value instanceof SQLFunction) {
250
+                            $parsed_set[] = "$key = " . $value->getStatement();
251
+            } elseif (is_array($value))
249 252
             {
250 253
                 $parsed_in = [];
251 254
 
@@ -256,8 +259,9 @@  discard block
 block discarded – undo
256 259
                         case 'Oci8':
257 260
 
258 261
                             # [POSSIBLE BUG] - To Future revision (What about non-string values ?)
259
-                            if (is_string($in_value))
260
-                                $parsed_in[] = ":$k";
262
+                            if (is_string($in_value)) {
263
+                                                            $parsed_in[] = ":$k";
264
+                            }
261 265
 
262 266
                             $bind_values[":$k"] = $in_value;
263 267
                             break;
@@ -272,8 +276,7 @@  discard block
 block discarded – undo
272 276
                 }
273 277
 
274 278
                 $parsed_set[] = "$key IN (" . implode(", ", $parsed_in) . ")";
275
-            }
276
-            else
279
+            } else
277 280
             {
278 281
                 switch ($driver)
279 282
                 {
@@ -298,11 +301,11 @@  discard block
 block discarded – undo
298 301
         {
299 302
             $k++;
300 303
 
301
-            if (is_null($value))
302
-                $parsed_where[] = "$key IS NULL";
303
-            elseif ($value instanceof SQLFunction)
304
-                $parsed_where[] = "$key = " . $value->getStatement();
305
-            elseif (is_array($value))
304
+            if (is_null($value)) {
305
+                            $parsed_where[] = "$key IS NULL";
306
+            } elseif ($value instanceof SQLFunction) {
307
+                            $parsed_where[] = "$key = " . $value->getStatement();
308
+            } elseif (is_array($value))
306 309
             {
307 310
                 $parsed_in = [];
308 311
 
@@ -325,8 +328,7 @@  discard block
 block discarded – undo
325 328
                 }
326 329
 
327 330
                 $parsed_where[] = "$key IN (" . implode(", ", $parsed_in) . ")";
328
-            }
329
-            else
331
+            } else
330 332
             {
331 333
                 switch ($driver)
332 334
                 {
@@ -378,11 +380,11 @@  discard block
 block discarded – undo
378 380
             {
379 381
                 $k++;
380 382
 
381
-                if (is_null($value))
382
-                    $parsed_where[] = "$key IS NULL";
383
-                elseif ($value instanceof SQLFunction)
384
-                    $parsed_where[] = "$key = " . $value->getStatement();
385
-                elseif (is_array($value))
383
+                if (is_null($value)) {
384
+                                    $parsed_where[] = "$key IS NULL";
385
+                } elseif ($value instanceof SQLFunction) {
386
+                                    $parsed_where[] = "$key = " . $value->getStatement();
387
+                } elseif (is_array($value))
386 388
                 {
387 389
                     $parsed_in = [];
388 390
 
@@ -405,8 +407,7 @@  discard block
 block discarded – undo
405 407
                     }
406 408
 
407 409
                     $parsed_where[] = "$key IN (" . implode(", ", $parsed_in) . ")";
408
-                }
409
-                else
410
+                } else
410 411
                 {
411 412
                     switch ($driver)
412 413
                     {
@@ -424,9 +425,9 @@  discard block
 block discarded – undo
424 425
             }
425 426
 
426 427
             $where = "\r\nWHERE \r\n\t" . implode(" AND\r\n\t", $parsed_where);
428
+        } else {
429
+                    throw new SecurityException("You cannot delete rows without WHERE clause!. Use TRUNCATE statement instead.");
427 430
         }
428
-        else
429
-            throw new SecurityException("You cannot delete rows without WHERE clause!. Use TRUNCATE statement instead.");
430 431
 
431 432
         $table = $this->entity->getTableName();
432 433
 
Please login to merge, or discard this patch.
src/Db/Driver/Oracle.php 2 patches
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -59,10 +59,10 @@  discard block
 block discarded – undo
59 59
             ? $this->dbname
60 60
             :
61 61
                 (!is_null($this->dbport) && !empty($this->dbport))
62
-                    ? $this->dbhost .":". $this->dbport ."/". $this->dbname
63
-                    : $this->dbhost ."/". $this->dbname;
62
+                    ? $this->dbhost . ":" . $this->dbport . "/" . $this->dbname
63
+                    : $this->dbhost . "/" . $this->dbname;
64 64
 
65
-        $conn = @oci_connect($this->dbuser,  $this->dbpass, $connection_string, $this->dbchar);
65
+        $conn = @oci_connect($this->dbuser, $this->dbpass, $connection_string, $this->dbchar);
66 66
 
67 67
         if ($conn === false)
68 68
         {
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
         $prev_error_handler = set_error_handler(['\Drone\Error\ErrorHandler', 'errorControlOperator'], E_ALL);
132 132
 
133 133
         // may be throw a Fatal error (Ex: Maximum execution time)
134
-        $r = ($this->transac_mode) ? oci_execute($stid, OCI_NO_AUTO_COMMIT) : oci_execute($stid,  OCI_COMMIT_ON_SUCCESS);
134
+        $r = ($this->transac_mode) ? oci_execute($stid, OCI_NO_AUTO_COMMIT) : oci_execute($stid, OCI_COMMIT_ON_SUCCESS);
135 135
 
136 136
         set_error_handler($prev_error_handler);
137 137
 
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
         $this->numFields = oci_num_fields($stid);
153 153
 
154 154
         if ($this->transac_mode)
155
-            $this->transac_result = is_null($this->transac_result) ? $stid: $this->transac_result && $stid;
155
+            $this->transac_result = is_null($this->transac_result) ? $stid : $this->transac_result && $stid;
156 156
 
157 157
         $this->result = $stid;
158 158
 
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
197 197
 
198 198
         if ($this->result)
199 199
         {
200
-            while ( ($row = @oci_fetch_array($this->result, OCI_BOTH + OCI_RETURN_NULLS)) !== false )
200
+            while (($row = @oci_fetch_array($this->result, OCI_BOTH + OCI_RETURN_NULLS)) !== false)
201 201
             {
202 202
                 $data[] = $row;
203 203
             }
Please login to merge, or discard this patch.
Braces   +25 added lines, -19 removed lines patch added patch discarded remove patch
@@ -31,15 +31,17 @@  discard block
 block discarded – undo
31 31
      */
32 32
     public function __construct($options)
33 33
     {
34
-        if (!array_key_exists("dbchar", $options))
35
-            $options["dbchar"] = "AL32UTF8";
34
+        if (!array_key_exists("dbchar", $options)) {
35
+                    $options["dbchar"] = "AL32UTF8";
36
+        }
36 37
 
37 38
         parent::__construct($options);
38 39
 
39 40
         $auto_connect = array_key_exists('auto_connect', $options) ? $options["auto_connect"] : true;
40 41
 
41
-        if ($auto_connect)
42
-            $this->connect();
42
+        if ($auto_connect) {
43
+                    $this->connect();
44
+        }
43 45
     }
44 46
 
45 47
     /**
@@ -52,8 +54,9 @@  discard block
 block discarded – undo
52 54
      */
53 55
     public function connect()
54 56
     {
55
-        if (!extension_loaded('oci8'))
56
-            throw new \RuntimeException("The Oci8 extension is not loaded");
57
+        if (!extension_loaded('oci8')) {
58
+                    throw new \RuntimeException("The Oci8 extension is not loaded");
59
+        }
57 60
 
58 61
         $connection_string = (is_null($this->dbhost) || empty($this->dbhost))
59 62
             ? $this->dbname
@@ -106,14 +109,15 @@  discard block
 block discarded – undo
106 109
                 ];
107 110
 
108 111
                 $this->error($error["message"]);
112
+            } else {
113
+                            $this->error($error["code"], $error["message"]);
109 114
             }
110
-            else
111
-                $this->error($error["code"], $error["message"]);
112 115
 
113
-            if (array_key_exists("code", $error))
114
-                throw new Exception\InvalidQueryException($error["message"], $error["code"]);
115
-            else
116
-                throw new Exception\InvalidQueryException($error["message"]);
116
+            if (array_key_exists("code", $error)) {
117
+                            throw new Exception\InvalidQueryException($error["message"], $error["code"]);
118
+            } else {
119
+                            throw new Exception\InvalidQueryException($error["message"]);
120
+            }
117 121
         }
118 122
 
119 123
         # Bound variables
@@ -151,8 +155,9 @@  discard block
 block discarded – undo
151 155
         $this->numRows = count($rows);
152 156
         $this->numFields = oci_num_fields($stid);
153 157
 
154
-        if ($this->transac_mode)
155
-            $this->transac_result = is_null($this->transac_result) ? $stid: $this->transac_result && $stid;
158
+        if ($this->transac_mode) {
159
+                    $this->transac_result = is_null($this->transac_result) ? $stid: $this->transac_result && $stid;
160
+        }
156 161
 
157 162
         $this->result = $stid;
158 163
 
@@ -201,9 +206,8 @@  discard block
 block discarded – undo
201 206
             {
202 207
                 $data[] = $row;
203 208
             }
204
-        }
205
-        else
206
-            /*
209
+        } else {
210
+                    /*
207 211
              * "This kind of exception should lead directly to a fix in your code"
208 212
              * So much production tests tell us this error is throwed because developers
209 213
              * execute toArray() before execute().
@@ -211,6 +215,7 @@  discard block
 block discarded – undo
211 215
              * Ref: http://php.net/manual/en/class.logicexception.php
212 216
              */
213 217
             throw new \LogicException('There are not data in the buffer!');
218
+        }
214 219
 
215 220
         $this->arrayResult = $data;
216 221
 
@@ -224,7 +229,8 @@  discard block
 block discarded – undo
224 229
      */
225 230
     public function __destruct()
226 231
     {
227
-        if ($this->dbconn)
228
-            oci_close($this->dbconn);
232
+        if ($this->dbconn) {
233
+                    oci_close($this->dbconn);
234
+        }
229 235
     }
230 236
 }
231 237
\ No newline at end of file
Please login to merge, or discard this patch.