spiral / components

source/Spiral/Database/Builders/Traits/JoinsTrait.php

Doc Comments +4 added lines, -3 removed lines

@@ -81,7 +81,7 @@ 
      * Register new JOIN with specified type with set of on conditions (linking one table to
      * another, no parametric on conditions allowed here).
      *
-     * @param string|QueryBuilder $type  Join type. Allowed values, LEFT, RIGHT, INNER and etc.
+     * @param string $type  Join type. Allowed values, LEFT, RIGHT, INNER and etc.
      * @param string              $outer Joined table name (without prefix), may include AS
      *                                   statement.
      * @param string              $alias Joined table or query alias.
@@ -110,7 +110,7 @@ 
      * @link http://www.w3schools.com/sql/sql_join_inner.asp
      * @see  join()
      *
-     * @param string|QueryBuilder $outer Joined table name (without prefix), may include AS
+     * @param string $outer Joined table name (without prefix), may include AS
      *                                   statement.
      * @param string              $alias Joined table or query alias.
      *
@@ -220,6 +220,7 @@ 
      * together, no parametric values allowed.
      *
      * @param mixed ...$args [(column, outer column), (column, operator, outer column)]
+     * @param null|string $args
      *
      * @return $this
      *
@@ -361,7 +362,7 @@ 
      * @param string                 $joiner     Boolean joiner (AND | OR).
      * @param array                  $parameters Set of parameters collected from where functions.
      * @param array                  $tokens     Array to aggregate compiled tokens. Reference.
-     * @param \Closure|null|callable $wrapper    Callback or closure used to wrap/collect every
+     * @param callable $wrapper    Callback or closure used to wrap/collect every
      *                                           potential parameter.
      *
      * @throws BuilderException

source/Spiral/ORM/Entities/Loaders/ManyToManyLoader.php

Spacing +6 added lines, -6 removed lines

@@ -83,14 +83,14 @@ 
         if ($this->isJoined()) {
             $query->join(
                 $this->getMethod() == self::JOIN ? 'INNER' : 'LEFT',
-                $this->pivotTable() . ' AS ' . $this->pivotAlias())
+                $this->pivotTable().' AS '.$this->pivotAlias())
                 ->on(
                     $this->pivotKey(Record::THOUGHT_INNER_KEY),
                     $this->parentKey(Record::INNER_KEY)
                 );
         } else {
             $query->innerJoin(
-                $this->pivotTable() . ' AS ' . $this->pivotAlias())
+                $this->pivotTable().' AS '.$this->pivotAlias())
                 ->on(
                     $this->pivotKey(Record::THOUGHT_OUTER_KEY),
                     $this->localKey(Record::OUTER_KEY)
@@ -128,7 +128,7 @@ 
             //Actual data is always INNER join
             $query->join(
                 $this->getMethod() == self::JOIN ? 'INNER' : 'LEFT',
-                $this->getTable() . ' AS ' . $this->getAlias()
+                $this->getTable().' AS '.$this->getAlias()
             )->on(
                 $this->localKey(Record::OUTER_KEY),
                 $this->pivotKey(Record::THOUGHT_OUTER_KEY)
@@ -168,7 +168,7 @@ 
 
             if ($minify) {
                 //Let's use column number instead of full name
-                $column = 'p_c' . count($columns);
+                $column = 'p_c'.count($columns);
             }
 
             $columns[] = "{$alias}.{$name} AS {$prefix}{$column}";
@@ -217,7 +217,7 @@ 
             return $this->options['pivotAlias'];
         }
 
-        return $this->getAlias() . '_pivot';
+        return $this->getAlias().'_pivot';
     }
 
     /**
@@ -243,7 +243,7 @@ 
             return null;
         }
 
-        return $this->pivotAlias() . '.' . $this->schema[$key];
+        return $this->pivotAlias().'.'.$this->schema[$key];
     }
 
     /**

source/Spiral/ORM/Entities/Loaders/RelationLoader.php

Spacing +4 added lines, -4 removed lines

@@ -234,7 +234,7 @@ 
             return null;
         }
 
-        return $this->getAlias() . '.' . $this->schema[$key];
+        return $this->getAlias().'.'.$this->schema[$key];
     }
 
     /**
@@ -246,7 +246,7 @@ 
      */
     protected function parentKey($key): string
     {
-        return $this->parent->getAlias() . '.' . $this->schema[$key];
+        return $this->parent->getAlias().'.'.$this->schema[$key];
     }
 
     /**
@@ -260,10 +260,10 @@ 
         if (empty($this->options['alias'])) {
             if ($this->isLoaded() && $this->isJoined()) {
                 //Let's create unique alias, we are able to do that for relations just loaded
-                $this->options['alias'] = 'd' . decoct(++self::$countLevels);
+                $this->options['alias'] = 'd'.decoct(++self::$countLevels);
             } else {
                 //Let's use parent alias to continue chain
-                $this->options['alias'] = $parent->getAlias() . '_' . $this->relation;
+                $this->options['alias'] = $parent->getAlias().'_'.$this->relation;
             }
         }
     }

source/Spiral/Database/Entities/Quoter.php

Spacing +5 added lines, -5 removed lines

@@ -113,7 +113,7 @@ 
      */
     protected function expression(string $identifier): string
     {
-        return preg_replace_callback('/([a-z][0-9_a-z\.]*\(?)/i', function ($match) {
+        return preg_replace_callback('/([a-z][0-9_a-z\.]*\(?)/i', function($match) {
             $identifier = $match[1];
 
             //Function name
@@ -136,7 +136,7 @@ 
      */
     protected function aliasing(string $identifier, string $alias, bool $isTable): string
     {
-        $quoted = $this->quote($identifier, $isTable) . ' AS ' . $this->driver->identifier($alias);
+        $quoted = $this->quote($identifier, $isTable).' AS '.$this->driver->identifier($alias);
 
         if ($isTable && strpos($identifier, '.') === false) {
             //We have to apply operation post factum to prevent self aliasing (name AS name)
@@ -173,12 +173,12 @@ 
     protected function unpaired(string $identifier, bool $isTable): string
     {
         if ($isTable && !isset($this->aliases[$identifier])) {
-            if (!isset($this->aliases[$this->prefix . $identifier])) {
+            if (!isset($this->aliases[$this->prefix.$identifier])) {
                 //Generating our alias
-                $this->registerAlias($this->prefix . $identifier, $identifier);
+                $this->registerAlias($this->prefix.$identifier, $identifier);
             }
 
-            $identifier = $this->prefix . $identifier;
+            $identifier = $this->prefix.$identifier;
         }
 
         return $this->driver->identifier($identifier);

source/Spiral/Database/Entities/QueryCompiler.php

Spacing +4 added lines, -4 removed lines

@@ -324,7 +324,7 @@ 
 
             if (!empty($join['alias'])) {
                 $this->quoter->registerAlias($join['alias'], (string)$join['outer']);
-                $statement .= " AS " . $this->quote($join['alias']);
+                $statement .= " AS ".$this->quote($join['alias']);
             }
 
             $statement .= $this->optional("\n    ON", $this->compileWhere($join['on']));
@@ -378,7 +378,7 @@ 
                 throw new CompilerException("Invalid sorting direction, only ASC and DESC are allowed");
             }
 
-            $result[] = $this->quote($order[0]) . ' ' . $direction;
+            $result[] = $this->quote($order[0]).' '.$direction;
         }
 
         return implode(', ', $result);
@@ -544,7 +544,7 @@ 
             $prefix .= ' ';
         }
 
-        return $prefix . $expression . $postfix;
+        return $prefix.$expression.$postfix;
     }
 
     /**
@@ -603,7 +603,7 @@ 
     {
         if ($context instanceof QueryBuilder) {
             //Nested queries has to be wrapped with braces
-            return '(' . $context->sqlStatement($this) . ')';
+            return '('.$context->sqlStatement($this).')';
         }
 
         if ($context instanceof ExpressionInterface) {