maikgreubel / caribu-orm

src/Type/AbstractType.php

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
             $count = 0;
             while ($result = $stmt->fetch()) {
                 $name = $result['column_name'];
-                $count ++;
+                $count++;
             }
             $stmt->closeCursor();
             

src/Type/Postgres.php

Spacing +3 added lines, -3 removed lines

@@ -40,7 +40,7 @@ 
      */
     public function getPrimaryKeyColumn(string $table, \Nkey\Caribu\Orm\Orm $orm): string
     {
-        $query = "select ccu.column_name as column_name from information_schema.constraint_column_usage ccu " . "inner join information_schema.table_constraints tc on ccu.constraint_name = tc.constraint_name " . "where tc.table_catalog = '{schema}' AND tc.table_name = '{table}'";
+        $query = "select ccu.column_name as column_name from information_schema.constraint_column_usage ccu "."inner join information_schema.table_constraints tc on ccu.constraint_name = tc.constraint_name "."where tc.table_catalog = '{schema}' AND tc.table_name = '{table}'";
         
         return $this->getPrimaryColumnViaSql($orm, $table, $query);
     }
@@ -89,7 +89,7 @@ 
      */
     protected function getTypeQuery(): string
     {
-        $query = "select data_type from information_schema.columns where table_catalog = '{schema}' " . "and table_name = '{table}' and column_name = '{column}'";
+        $query = "select data_type from information_schema.columns where table_catalog = '{schema}' "."and table_name = '{table}' and column_name = '{column}'";
         
         return $query;
     }
@@ -139,7 +139,7 @@ 
     {
         $sequenceName = null;
         
-        $query = "select column_default from information_schema.columns where table_catalog = '{schema}' " . "AND table_name = '{table}' and column_name = '{column}'";
+        $query = "select column_default from information_schema.columns where table_catalog = '{schema}' "."AND table_name = '{table}' and column_name = '{column}'";
         
         $sql = $this->interp($query, array(
             'schema' => $orm->getSchema(),

src/Type/MySQL.php

Spacing +2 added lines, -2 removed lines

@@ -38,7 +38,7 @@ 
      */
     public function getPrimaryKeyColumn(string $table, \Nkey\Caribu\Orm\Orm $orm): string
     {
-        $query = "SELECT `COLUMN_NAME` as column_name FROM `information_schema`.`columns` " . //
+        $query = "SELECT `COLUMN_NAME` as column_name FROM `information_schema`.`columns` ".//
 "WHERE `TABLE_NAME` = '{table}' AND `TABLE_SCHEMA` = '{schema}' AND `COLUMN_KEY` = 'PRI'";
         
         return $this->getPrimaryColumnViaSql($orm, $table, $query);
@@ -96,7 +96,7 @@ 
      */
     protected function getTypeQuery(): string
     {
-        $query = "SELECT `DATA_TYPE` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = '{schema}' " . "AND `TABLE_NAME` = '{table}' AND `COLUMN_NAME` = '{column}'";
+        $query = "SELECT `DATA_TYPE` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = '{schema}' "."AND `TABLE_NAME` = '{table}' AND `COLUMN_NAME` = '{column}'";
         
         return $query;
     }

src/Type/Sqlite.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
      */
     public function getDefaultPort(): int
     {
-        return - 1;
+        return -1;
     }
 
     /**

src/Orm/OrmAnnotation.php

Spacing +5 added lines, -5 removed lines

@@ -151,7 +151,7 @@ 
         
         $type = self::getAnnotatedPropertyType($toClass, $property->getName(), $namespace);
         
-        if (null === $type || self::isPrimitive($type) || ! class_exists($type)) {
+        if (null === $type || self::isPrimitive($type) || !class_exists($type)) {
             return array(
                 $type,
                 $value
@@ -243,7 +243,7 @@ 
             foreach ($rfClass->getProperties() as $property) {
                 $docComment = $property->getDocComment();
                 
-                if (! self::isIdAnnotated($docComment)) {
+                if (!self::isIdAnnotated($docComment)) {
                     continue;
                 }
                 
@@ -255,7 +255,7 @@ 
                 
                 $primaryKey = $rfMethod->invoke($object);
                 
-                if (! $onlyValue) {
+                if (!$onlyValue) {
                     $primaryKey = array(
                         $columnName => $primaryKey
                     );
@@ -283,7 +283,7 @@ 
     private static function getAnnotatedType(string $comment, string $namespace = null): string
     {
         $matches = array();
-        if (! preg_match('/@var ([\w\\\\]+)/', $comment, $matches)) {
+        if (!preg_match('/@var ([\w\\\\]+)/', $comment, $matches)) {
             return "";
         }
         
@@ -295,7 +295,7 @@ 
         
         $type = self::fullQualifiedName($namespace, $type);
         
-        if (! class_exists($type)) {
+        if (!class_exists($type)) {
             throw new OrmException("Annotated type {type} could not be found nor loaded", array(
                 'type' => $matches[1]
             ));

src/Orm/OrmEntityAnalyzer.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
         try {
             $rfMethod = new \ReflectionMethod($class, $method);
             $primaryKey = $rfMethod->invoke($object);
-            if (! $onlyValue) {
+            if (!$onlyValue) {
                 $primaryKey = array(
                     $pkCol => $primaryKey
                 );

src/Orm/OrmPersister.php

Spacing +3 added lines, -3 removed lines

@@ -121,15 +121,15 @@
     private static function persistProperty(\ReflectionProperty $property, string $class, \Nkey\Caribu\Model\AbstractModel $object, string $namespace, bool $persist)
     {
         try {
-            if (null !== ($type = self::getAnnotatedType($property->getDocComment(), $namespace)) && ! self::isPrimitive($type)) {
-                if (! $persist && self::isCascadeAnnotated($property->getDocComment())) {
+            if (null !== ($type = self::getAnnotatedType($property->getDocComment(), $namespace)) && !self::isPrimitive($type)) {
+                if (!$persist && self::isCascadeAnnotated($property->getDocComment())) {
                     $persist = true;
                 }
                 
                 $rfMethod = new \ReflectionMethod($class, sprintf("get%s", ucfirst($property->getName())));
                 $entity = $rfMethod->invoke($object);
                 if ($entity instanceof \Nkey\Caribu\Model\AbstractModel) {
-                    if (! $persist && count($pk = self::getAnnotatedPrimaryKey($type, $entity, false))) {
+                    if (!$persist && count($pk = self::getAnnotatedPrimaryKey($type, $entity, false))) {
                         list ($pkCol) = $pk;
                         if (is_empty($pk[$pkCol])) {
                             $persist = true;

src/Orm/OrmDataTypeConverter.php

Spacing +5 added lines, -5 removed lines

@@ -38,15 +38,15 @@ 
             try {
                 $date = \DateTime::createFromFormat("Y-m-d", $value);
                 
-                if (! $date) {
+                if (!$date) {
                     $date = \DateTime::createFromFormat("Y-m-d H:i:s", $value);
                 }
                 
-                if (! $date) {
+                if (!$date) {
                     $date = \DateTime::createFromFormat(\DateTime::W3C, $value);
                 }
                 
-                if (! $date) {
+                if (!$date) {
                     $date = \DateTime::createFromFormat(\DateTime::ISO8601, $value);
                 }
             } catch (\Exception $exception) {
@@ -70,7 +70,7 @@ 
      */
     private static function convertType(string $type, $value)
     {
-        if (! $type) {
+        if (!$type) {
             return $value;
         }
         
@@ -98,7 +98,7 @@ 
                 return strval($value);
             
             default:
-                if (! self::isInternalClass($type)) {
+                if (!self::isInternalClass($type)) {
                     return $value;
                 }
         }

src/Orm/OrmStatement.php

Spacing +5 added lines, -5 removed lines

@@ -45,7 +45,7 @@ 
         
         $limits = self::parseLimits($limit, $startFrom);
         
-        if ($orderBy && ! stristr($orderBy, 'ORDER BY ')) {
+        if ($orderBy && !stristr($orderBy, 'ORDER BY ')) {
             $orderBy = sprintf("ORDER BY %s%s%s", $escapeSign, $orderBy, $escapeSign);
         }
         
@@ -137,7 +137,7 @@ 
             } elseif (strtoupper(substr($criteria[$criterion], 0, 7)) == 'BETWEEN') {
                 $start = $end = null;
                 sscanf(strtoupper($criteria[$criterion]), "BETWEEN %s AND %s", $start, $end);
-                if (! $start || ! $end) {
+                if (!$start || !$end) {
                     throw new OrmException("Invalid range for between");
                 }
                 $wheres[] = sprintf("%s BETWEEN %s AND %s", self::escapeCriterion($criterion, $escapeSign), $start, $end);
@@ -166,7 +166,7 @@ 
                 if ($conditions) {
                     $and = substr($where, 0, 3) == 'OR ' ? " " : " AND ";
                 }
-                $conditions .= $and . $where;
+                $conditions .= $and.$where;
             }
             $wheres = sprintf("WHERE %s", $conditions);
         } else {
@@ -260,7 +260,7 @@ 
     {
         $class = new \ReflectionClass($className);
         $simpleCriterion = self::getSimpleCriterionName($criterion);
-        if (! $class->hasProperty($simpleCriterion)) {
+        if (!$class->hasProperty($simpleCriterion)) {
             return $criterion;
         }
         
@@ -323,7 +323,7 @@ 
             $propertyClass = "";
             // search the type of property value
             if (null !== ($type = self::getAnnotatedType($rfProperty->getDocComment(), $rf->getNamespaceName()))) {
-                if (! self::isPrimitive($type) && class_exists($type)) {
+                if (!self::isPrimitive($type) && class_exists($type)) {
                     $propertyClass = $type;
                 }
             }