brunobmorais / php-database

src/DatalayerTrait.php

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 +14 added lines, -14 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,7 +173,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;

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

                 }

             }

         }

src/Crud.php

Spacing +2 added lines, -2 removed lines

@@ -134,7 +134,7 @@ 
      * @param string $where

      * @return bool|null

      */

-    public function updateObject(object $object, string $where){

+    public function updateObject(object $object, string $where) {

         $args = [];

         $params = [];

         foreach ($object as $chave => $valor) {

@@ -206,7 +206,7 @@ 
     /**

      * @return string|null

      */

-    public function getLogSQL():?string

+    public function getLogSQL(): ?string

     {

         return $this->logSQL;

     }

Braces +21 added lines, -14 removed lines

@@ -51,8 +51,9 @@ 
         $sql = "INSERT INTO {$this->tableName} ({$fields}) VALUES ({$numparams})";

         if ($debug) { echo $sql; echo "<pre>"; print_r($values); echo "</pre>"; return; }

         $result = $this->executeSQL($sql, $values);

-        if (empty($result))

-            return false;

+        if (empty($result)) {

+                    return false;

+        }

         return true;

     }

 

@@ -84,8 +85,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) {

@@ -97,8 +99,9 @@ 
             $query .= ')';

 

             $result = $this->executeSQL($query, $values);

-            if (empty($result))

-                return false;

+            if (empty($result)) {

+                            return false;

+            }

             return true;

         } else {

             return false;

@@ -123,8 +126,9 @@ 
         if (isset($where)) { $sql .= " WHERE $where"; }

         if ($debug) { echo $sql; echo "<pre>"; print_r($values); echo "</pre>"; return; }

         $result = $this->executeSQL($sql, $values);

-        if (empty($result))

-            return false;

+        if (empty($result)) {

+                    return false;

+        }

         return true;

     }

 

@@ -165,12 +169,14 @@ 
             }

             $query = rtrim($query, ", ");

 

-            if (!empty($where))

-                $query .= " WHERE {$where}";

+            if (!empty($where)) {

+                            $query .= " WHERE {$where}";

+            }

 

             $result = $this->executeSQL($query, $values);

-            if (empty($result))

-                return false;

+            if (empty($result)) {

+                            return false;

+            }

             return true;

         } else {

             return false;

@@ -190,8 +196,9 @@ 
         if (!empty($where)) { $sql .= " WHERE $where"; }

         if ($debug) { echo $sql; echo "<pre>"; print_r($values); echo "</pre>"; return; }

         $result = $this->executeSQL($sql, $values);

-        if (empty($result))

-            return false;

+        if (empty($result)) {

+                    return false;

+        }

         return true;

     }

 

src/ModelAbstract.php

Braces +6 added lines, -3 removed lines

@@ -22,8 +22,9 @@ 
      */
     public function __construct(array $params = null)
     {
-        if (!empty($params))
-            $this->fromMapToModel($params);
+        if (!empty($params)) {

+                    $this->fromMapToModel($params);

+        }

     }
 
     /**
@@ -82,7 +83,9 @@ 
         $data = (object) $this->toMap();
         $re_2 = new ReflectionObject($data);
         $classname = get_class($this);
-        if ($pos = strrpos($classname, '\\')) $classname = substr($classname, $pos + 1);
+        if ($pos = strrpos($classname, '\\')) {

+            $classname = substr($classname, $pos + 1);

+        }

         return $classname .' {' . implode(', ', array_map(
                 function($p_0) use ($data)
                 {

Spacing +5 added lines, -5 removed lines

@@ -53,7 +53,7 @@ 
      */
     public function toMap($objArray = null): ?array
     {
-        $data = $objArray??$this;
+        $data = $objArray ?? $this;
         if (is_array($data) || is_object($data))
         {
             $result = [];
@@ -83,12 +83,12 @@ 
         $re_2 = new ReflectionObject($data);
         $classname = get_class($this);
         if ($pos = strrpos($classname, '\\')) $classname = substr($classname, $pos + 1);
-        return $classname .' {' . implode(', ', array_map(
+        return $classname . ' {' . implode(', ', array_map(
                 function($p_0) use ($data)
                 {
                     $p_0->setAccessible(true);
-                    return $p_0->getName() .': '. $p_0->getValue($data);
-                }, $re_2->getProperties())) .'}';
+                    return $p_0->getName() . ': ' . $p_0->getValue($data);
+                }, $re_2->getProperties())) . '}';
 
     }
 
@@ -98,7 +98,7 @@ 
      */
     public function __get($attribute):string
     {
-        return $this->{$attribute}??"";
+        return $this->{$attribute} ?? "";
     }
 
     /**