voku / idiorm

src/idiorm/orm/ORM.php

Doc Comments +11 added lines, -11 removed lines

@@ -1102,7 +1102,7 @@ 
    * the alias to return the column as.
    *
    * @param string $column
-   * @param mixed  $alias
+   * @param null|string  $alias
    *
    * @return ORM
    */
@@ -1119,7 +1119,7 @@ 
    * the alias to return the column as.
    *
    * @param string $expr
-   * @param mixed  $alias
+   * @param string|null  $alias
    *
    * @return ORM
    */
@@ -1407,7 +1407,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
    *
@@ -1422,7 +1422,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
    *
@@ -1449,7 +1449,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
@@ -1487,7 +1487,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
    *
@@ -1501,7 +1501,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
    *
@@ -1528,7 +1528,7 @@ 
   /**
    * Add a WHERE 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
@@ -1657,7 +1657,7 @@ 
    *
    * @param mixed $value
    *
-   * @return array
+   * @return string
    */
   protected function _get_compound_id_column_values($value)
   {
@@ -2509,7 +2509,7 @@ 
    * only adds the pieces if they are not empty.
    *
    * @param string $glue
-   * @param array  $pieces
+   * @param string[]  $pieces
    *
    * @return string
    */
@@ -2598,7 +2598,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 +2 added lines, -2 removed lines

@@ -1349,14 +1349,14 @@
    * Add an LEFT JOIN source to the query
    */
   public function left_join($table, $constraint, $table_alias = null) {
-  	return $this->_add_join_source("LEFT", $table, $constraint, $table_alias);
+    return $this->_add_join_source("LEFT", $table, $constraint, $table_alias);
   }
         
   /**
    * Add an RIGHT JOIN source to the query
    */
   public function right_join($table, $constraint, $table_alias  = null) {
-  	return $this->_add_join_source("RIGHT", $table, $constraint, $table_alias);
+    return $this->_add_join_source("RIGHT", $table, $constraint, $table_alias);
   }
 
   /**

Spacing +21 added lines, -22 removed lines

@@ -983,10 +983,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;
       }
     }
 
@@ -1069,7 +1069,7 @@ 
   protected function _add_result_column($expr, $alias = null)
   {
     if (null !== $alias) {
-      $expr .= ' AS ' . $this->_quote_identifier($alias);
+      $expr .= ' AS '.$this->_quote_identifier($alias);
     }
 
     if ($this->_using_default_result_columns) {
@@ -1355,7 +1355,7 @@ 
   /**
    * Add an RIGHT JOIN source to the query
    */
-  public function right_join($table, $constraint, $table_alias  = null) {
+  public function right_join($table, $constraint, $table_alias = null) {
   	return $this->_add_join_source("RIGHT", $table, $constraint, $table_alias);
   }
 
@@ -1809,7 +1809,7 @@ 
 
         $query[] = $this->_quote_identifier($key);
         $data[] = $subItem;
-        $query[] = $op . ' ?';
+        $query[] = $op.' ?';
       }
     }
     $query[] = '))';
@@ -2380,13 +2380,13 @@ 
     }
 
     if ($this->_distinct) {
-      $result_columns = 'DISTINCT ' . $result_columns;
+      $result_columns = 'DISTINCT '.$result_columns;
     }
 
-    $fragment .= "{$result_columns} FROM " . $this->_quote_identifier($this->_table_name);
+    $fragment .= "{$result_columns} FROM ".$this->_quote_identifier($this->_table_name);
 
     if (null !== $this->_table_alias) {
-      $fragment .= ' ' . $this->_quote_identifier($this->_table_alias);
+      $fragment .= ' '.$this->_quote_identifier($this->_table_alias);
     }
 
     return $fragment;
@@ -2429,7 +2429,7 @@ 
       return '';
     }
 
-    return 'GROUP BY ' . implode(', ', $this->_group_by);
+    return 'GROUP BY '.implode(', ', $this->_group_by);
   }
 
   /**
@@ -2454,7 +2454,7 @@ 
       $this->_values = array_merge($this->_values, $condition[static::CONDITION_VALUES]);
     }
 
-    return strtoupper($type) . ' ' . implode(' AND ', $conditions);
+    return strtoupper($type).' '.implode(' AND ', $conditions);
   }
 
   /**
@@ -2468,7 +2468,7 @@ 
 
     $db = static::get_db(self::DEFAULT_CONNECTION);
 
-    return 'ORDER BY ' . trim($db->quote(implode(', ', $this->_order_by)), "'");
+    return 'ORDER BY '.trim($db->quote(implode(', ', $this->_order_by)), "'");
   }
 
   /**
@@ -2490,7 +2490,7 @@ 
         $fragment = 'LIMIT';
       }
 
-      $this->_limit = (int)$this->_limit;
+      $this->_limit = (int) $this->_limit;
 
       $fragment .= " {$this->_limit}";
     }
@@ -2509,9 +2509,9 @@ 
         $clause = 'TO';
       }
 
-      $this->_offset = (int)$this->_offset;
+      $this->_offset = (int) $this->_offset;
 
-      return "$clause " . $this->_offset;
+      return "$clause ".$this->_offset;
     }
 
     return '';
@@ -2597,7 +2597,7 @@ 
     $quote_character = static::$_config[$this->_connection_name]['identifier_quote_character'];
 
     // double up any identifier quotes to escape them
-    return $quote_character . str_replace($quote_character, $quote_character . $quote_character, $part) . $quote_character;
+    return $quote_character.str_replace($quote_character, $quote_character.$quote_character, $part).$quote_character;
   }
 
   /**
@@ -2628,7 +2628,7 @@ 
       );
     }
     $parameter_string = implode(',', $parameters);
-    $key = $query . ':' . $parameter_string;
+    $key = $query.':'.$parameter_string;
 
     return sha1($key);
   }
@@ -3090,14 +3090,14 @@ 
     $query[] = 'INSERT INTO';
     $query[] = $this->_quote_identifier($this->_table_name);
     $field_list = array_map(array($this, '_quote_identifier'), array_keys($this->_dirty_fields));
-    $query[] = '(' . implode(', ', $field_list) . ')';
+    $query[] = '('.implode(', ', $field_list).')';
     $query[] = 'VALUES';
 
     $placeholders = $this->_create_placeholders($this->_dirty_fields);
     $query[] = "({$placeholders})";
 
     if (static::get_db($this->_connection_name)->getAttribute(\PDO::ATTR_DRIVER_NAME) == 'pgsql') {
-      $query[] = 'RETURNING ' . $this->_quote_identifier($this->_get_id_column_name());
+      $query[] = 'RETURNING '.$this->_quote_identifier($this->_get_id_column_name());
     }
 
     return implode(' ', $query);
@@ -3116,8 +3116,7 @@ 
 
     return static::_execute(
         implode(' ', $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
     );
   }
 
@@ -3213,7 +3212,7 @@ 
     if (method_exists($this, $method)) {
       return call_user_func_array(array($this, $method), $arguments);
     } else {
-      throw new IdiormMethodMissingException("Method $name() does not exist in class " . get_class($this));
+      throw new IdiormMethodMissingException("Method $name() does not exist in class ".get_class($this));
     }
   }
 

src/idiorm/orm/IdiormResultSet.php

Spacing +2 added lines, -2 removed lines

@@ -58,7 +58,7 @@ 
     $rows = array();
     $args = func_get_args();
 
-    foreach($this->_results as $key => $row) {
+    foreach ($this->_results as $key => $row) {
       if (
           is_object($row)
           &&
@@ -183,7 +183,7 @@ 
       if (method_exists($model, $method)) {
         call_user_func_array(array($model, $method), $params);
       } else {
-        throw new IdiormMethodMissingException("Method $method() does not exist in class " . get_class($this));
+        throw new IdiormMethodMissingException("Method $method() does not exist in class ".get_class($this));
       }
     }
 

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]);
   }
 
 }

demo/demo.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
   $contact->save();
 
   // Redirect to self.
-  header('Location: ' . basename(__FILE__));
+  header('Location: '.basename(__FILE__));
   exit;
 }