brunobmorais / php-database

src/DatalayerTrait.php

Spacing +13 added lines, -13 removed lines

@@ -74,7 +74,7 @@ 
             $this->prepare->execute($params);

             $this->setLogSQL($query, $params);

         } catch (PDOException $e) {

-            Connect::setError($e,$query);

+            Connect::setError($e, $query);

             return false;

         }

 

@@ -85,7 +85,7 @@ 
      * @param $prepare

      * @return int

      */

-    protected function count($prepare=null): ?int

+    protected function count($prepare = null): ?int

     {

         try {

             $prepare = empty($prepare) ? $this->prepare : $prepare;

@@ -103,7 +103,7 @@ 
      * @param $prepare

      * @return array|false

      */

-    protected function fetchArrayAssoc($prepare=null): ?array

+    protected function fetchArrayAssoc($prepare = null): ?array

     {

         try {

             $prepare = empty($prepare) ? $this->prepare : $prepare;

@@ -120,7 +120,7 @@ 
      * @param $prepare

      * @return array|false

      */

-    protected function fetchArrayObj($prepare=null): ?array

+    protected function fetchArrayObj($prepare = null): ?array

     {

         try {

             $prepare = empty($prepare) ? $this->prepare : $prepare;

@@ -138,7 +138,7 @@ 
      * @param String|null $class

      * @return array|false

      */

-    protected function fetchArrayClass($prepare=null, String $class=null): ?array

+    protected function fetchArrayClass($prepare = null, String $class = null): ?array

     {

         try {

             $prepare = empty($prepare) ? $this->prepare : $prepare;

@@ -156,7 +156,7 @@ 
      * @param $prepare

      * @return array|false

      */

-    protected function fetchOneAssoc($prepare=null): ?array

+    protected function fetchOneAssoc($prepare = null): ?array

     {

         try {

             $prepare = empty($prepare) ? $this->prepare : $prepare;

@@ -172,7 +172,7 @@ 
      * @param $prepare

      * @return stdClass|false

      */

-    protected function fetchOneObj($prepare=null): ?stdClass

+    protected function fetchOneObj($prepare = null): ?stdClass

     {

         try {

             $prepare = empty($prepare) ? $this->prepare : $prepare;

@@ -189,7 +189,7 @@ 
      * @param String|null $class

      * @return array|false

      */

-    protected function fetchOneClass($prepare=null, String $class=null): ?object

+    protected function fetchOneClass($prepare = null, String $class = null): ?object

     {

         try {

             $prepare = empty($prepare) ? $this->prepare : $prepare;

@@ -275,21 +275,21 @@ 
     private function setLogSQL($sql_string, array $params = null) {

         if (!empty($params)) {

             $indexed = $params == array_values($params);

-            foreach($params as $k=>$v) {

+            foreach ($params as $k=>$v) {

                 if (is_object($v)) {

                     if ($v instanceof \DateTime) $v = $v->format('Y-m-d H:i:s');

                     else continue;

                 }

-                elseif (is_string($v)) $v="'$v'";

-                elseif ($v === null) $v='NULL';

+                elseif (is_string($v)) $v = "'$v'";

+                elseif ($v === null) $v = 'NULL';

                 elseif (is_array($v)) $v = implode(',', $v);

 

                 if ($indexed) {

                     $sql_string = preg_replace('/\?/', $v, $sql_string, 1);

                 }

                 else {

-                    if ($k[0] != ':') $k = ':'.$k; //add leading colon if it was left out

-                    $sql_string = str_replace($k,$v,$sql_string);

+                    if ($k[0] != ':') $k = ':' . $k; //add leading colon if it was left out

+                    $sql_string = str_replace($k, $v, $sql_string);

                 }

             }

         }

Braces +16 added lines, -8 removed lines

@@ -277,18 +277,26 @@
             $indexed = $params == array_values($params);

             foreach($params as $k=>$v) {

                 if (is_object($v)) {

-                    if ($v instanceof \DateTime) $v = $v->format('Y-m-d H:i:s');

-                    else continue;

+                    if ($v instanceof \DateTime) {

+                        $v = $v->format('Y-m-d H:i:s');

+                    } else {

+                        continue;

+                    }

+                } elseif (is_string($v)) {

+                    $v="'$v'";

+                } elseif ($v === null) {

+                    $v='NULL';

+                } elseif (is_array($v)) {

+                    $v = implode(',', $v);

                 }

-                elseif (is_string($v)) $v="'$v'";

-                elseif ($v === null) $v='NULL';

-                elseif (is_array($v)) $v = implode(',', $v);

 

                 if ($indexed) {

                     $sql_string = preg_replace('/\?/', $v, $sql_string, 1);

-                }

-                else {

-                    if ($k[0] != ':') $k = ':'.$k; //add leading colon if it was left out

+                } else {

+                    if ($k[0] != ':') {

+                        $k = ':'.$k;

+                    }

+                    //add leading colon if it was left out

                     $sql_string = str_replace($k,$v,$sql_string);

                 }

             }