voku / idiorm

src/idiorm/orm/ORM.php

Doc Comments +10 added lines, -10 removed lines

@@ -1088,7 +1088,7 @@ 
    * the alias to return the column as.
    *
    * @param string $column
-   * @param mixed  $alias
+   * @param null|string  $alias
    *
    * @return ORM
    */
@@ -1105,7 +1105,7 @@ 
    * the alias to return the column as.
    *
    * @param string $expr
-   * @param mixed  $alias
+   * @param string|null  $alias
    *
    * @return ORM
    */
@@ -1394,7 +1394,7 @@ 
    * Internal method to add a HAVING condition to the query
    */
   /**
-   * @param string|array $column_name
+   * @param string $column_name
    * @param string       $separator
    * @param mixed        $value
    *
@@ -1409,7 +1409,7 @@ 
    * Internal method to add a HAVING clause with multiple values (like IN and NOT IN)
    */
   /**
-   * @param string|array $column_name
+   * @param string $column_name
    * @param string       $separator
    * @param mixed        $values
    *
@@ -1436,7 +1436,7 @@ 
   /**
    * Internal method to add a HAVING clause with no parameters(like IS NULL and IS NOT NULL)
    *
-   * @param string|array $column_name
+   * @param string $column_name
    * @param string       $operator
    *
    * @return ORM
@@ -1474,7 +1474,7 @@ 
   /**
    * Internal method to add a WHERE condition to the query
    *
-   * @param string|array $column_name
+   * @param string $column_name
    * @param string       $separator
    * @param mixed        $value
    *
@@ -1488,7 +1488,7 @@ 
   /**
    * Add a WHERE clause with multiple values (like IN and NOT IN)
    *
-   * @param string|array $column_name
+   * @param string $column_name
    * @param string       $separator
    * @param mixed        $values
    *
@@ -1643,7 +1643,7 @@ 
    *
    * @param mixed $value
    *
-   * @return array
+   * @return string
    */
   protected function _get_compound_id_column_values($value)
   {
@@ -2471,7 +2471,7 @@ 
    * only adds the pieces if they are not empty.
    *
    * @param string $glue
-   * @param array  $pieces
+   * @param string[]  $pieces
    *
    * @return string
    */
@@ -2560,7 +2560,7 @@ 
    * @param null|string $table_name
    * @param string      $connection_name
    *
-   * @return mixed|string
+   * @return string
    */
   protected static function _create_cache_key($query, $parameters, $table_name = null, $connection_name = self::DEFAULT_CONNECTION)
   {

Indentation +12 added lines, -12 removed lines

@@ -2314,15 +2314,15 @@ 
     // the results of calling each separate builder method.
     return $this->_join_if_not_empty(
         " ", array(
-               $this->_build_select_start(),
-               $this->_build_join(),
-               $this->_build_where(),
-               $this->_build_group_by(),
-               $this->_build_having(),
-               $this->_build_order_by(),
-               $this->_build_limit(),
-               $this->_build_offset(),
-           )
+                $this->_build_select_start(),
+                $this->_build_join(),
+                $this->_build_where(),
+                $this->_build_group_by(),
+                $this->_build_having(),
+                $this->_build_order_by(),
+                $this->_build_limit(),
+                $this->_build_offset(),
+            )
     );
   }
 
@@ -2547,9 +2547,9 @@ 
 
     // double up any identifier quotes to escape them
     return $quote_character .
-           str_replace(
-               $quote_character, $quote_character . $quote_character, $part
-           ) . $quote_character;
+            str_replace(
+                $quote_character, $quote_character . $quote_character, $part
+            ) . $quote_character;
   }
 
   /**

Spacing +4 added lines, -5 removed lines

@@ -970,10 +970,10 @@ 
     if ($result !== false && isset($result->$alias)) {
       if (!is_numeric($result->$alias)) {
         $return_value = $result->$alias;
-      } elseif ((int)$result->$alias == (float)$result->$alias) {
-        $return_value = (int)$result->$alias;
+      } elseif ((int) $result->$alias == (float) $result->$alias) {
+        $return_value = (int) $result->$alias;
       } else {
-        $return_value = (float)$result->$alias;
+        $return_value = (float) $result->$alias;
       }
     }
 
@@ -3052,8 +3052,7 @@ 
 
     return self::_execute(
         join(" ", $query), is_array($this->id(true)) ?
-        array_values($this->id(true)) :
-        array($this->id(true)), $this->_connection_name
+        array_values($this->id(true)) : array($this->id(true)), $this->_connection_name
     );
   }
 

src/idiorm/orm/IdiormString.php

Spacing +3 added lines, -3 removed lines

@@ -62,7 +62,7 @@ 
    */
   public function __construct($subject)
   {
-    $this->subject = (string)$subject;
+    $this->subject = (string) $subject;
   }
 
   /**
@@ -117,7 +117,7 @@ 
                 | ([^\'"\\\\]+)             # or $2: an unquoted chunk (no escapes).
                 /sx';
 
-    return (string)preg_replace_callback($re_parse, array($this, '_str_replace_outside_quotes_cb'), $this->subject);
+    return (string) preg_replace_callback($re_parse, array($this, '_str_replace_outside_quotes_cb'), $this->subject);
   }
 
   /**
@@ -139,7 +139,7 @@ 
     }
 
     // Process only unquoted chunks (in group $2).
-    return (string)preg_replace('/' . preg_quote($this->search, '/') . '/', $this->replace, $matches[2]);
+    return (string) preg_replace('/' . preg_quote($this->search, '/') . '/', $this->replace, $matches[2]);
   }
 
 }