brunobmorais / php-database

src/DatalayerTrait.php

Indentation +2 added lines, -2 removed lines

@@ -310,8 +310,8 @@
     }

 

     /**

-    * RETORNAR O ULTIMO ID INSERIDO

-    */

+     * RETORNAR O ULTIMO ID INSERIDO

+     */

     private function lastId()

     {

         $this->getInstance();

Braces +19 added lines, -10 removed lines

@@ -34,8 +34,9 @@ 
      */

     private function getInstance(): ?PDO

     {

-        if (strpos($_SERVER['SERVER_NAME'], "homologacao") && !strpos($this->database, "Homologacao") )

-            $this->database .= "Homologacao";

+        if (strpos($_SERVER['SERVER_NAME'], "homologacao") && !strpos($this->database, "Homologacao") ) {

+                    $this->database .= "Homologacao";

+        }

 

         if (!isset($this->instance)) {

             $this->instance = Connect::getInstance($this->database);

@@ -340,18 +341,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);

                 }

             }

Spacing +17 added lines, -17 removed lines

@@ -34,7 +34,7 @@ 
      */

     private function getInstance(): ?PDO

     {

-        if (strpos($_SERVER['SERVER_NAME'], "homologacao") && !strpos($this->database, "Homologacao") )

+        if (strpos($_SERVER['SERVER_NAME'], "homologacao") && !strpos($this->database, "Homologacao"))

             $this->database .= "Homologacao";

 

         if (!isset($this->instance)) {

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

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

         } catch (PDOException $e) {

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

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

             return false;

         }

 

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

      * @return int

      */

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

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

     {

         try {

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

@@ -87,7 +87,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;

@@ -104,7 +104,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;

@@ -122,7 +122,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;

@@ -140,7 +140,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;

@@ -156,7 +156,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;

@@ -173,12 +173,12 @@ 
      * @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;

             $class = empty($class) ? $this->classModel : $class;

-            $dados = $prepare->fetchObject(CONFIG_DATA_LAYER["directory_models"].(!empty(CONFIG_DATA_LAYER["database_model"])?$this->database."//":""). $class);

+            $dados = $prepare->fetchObject(CONFIG_DATA_LAYER["directory_models"] . (!empty(CONFIG_DATA_LAYER["database_model"]) ? $this->database . "//" : "") . $class);

             return $dados;

         } catch (PDOException $e) {

             Connect::setError($e);

@@ -248,12 +248,12 @@ 
             $this->setLogSQL($sql, $params);

 

             if (!empty($class)) {

-                $rs = $this->fetchArrayClass($this->prepare,$class);

+                $rs = $this->fetchArrayClass($this->prepare, $class);

             } else {

                 $rs = $this->fetchArrayObj($this->prepare);

             }

         } catch (PDOException $e) {

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

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

             return false;

         }

         return $rs;

@@ -281,21 +281,21 @@ 
     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);

                 }

             }

         }

src/Crud.php

Spacing +1 added lines, -1 removed lines

@@ -97,7 +97,7 @@
     /**

      * @return string|null

      */

-    public function getLogSQL():?string

+    public function getLogSQL(): ?string

     {

         return $this->logSQL;

     }

Braces +3 added lines, -2 removed lines

@@ -62,8 +62,9 @@
             $query = "INSERT INTO $this->tableName";

             $values = [];

             $dataColumns = array_keys($params);

-            if (isset ($dataColumns[0]))

-                $query .= ' (`' . implode('`, `', $dataColumns) . '`) ';

+            if (isset ($dataColumns[0])) {

+                            $query .= ' (`' . implode('`, `', $dataColumns) . '`) ';

+            }

             $query .= ' VALUES (';

 

             foreach ($dataColumns as $index => $column) {