documentation corrections and test addition

phalcon/DataMapper/Query/AbstractQuery.zep

@@ -180,6 +180,47 @@ abstract class AbstractQuery
             this->store["WHERE"]   = [];
     }
 
+    public function resetColumns()
+    {
+        let this->store["COLUMNS"] = [];
+    }
+
+    public function resetFrom()
+    {
+        let this->store["FROM"] = [];
+    }
+
+    public function resetWhere()
+    {
+        let this->store["WHERE"] = [];
+    }
+
+    public function resetGroupBy()
+    {
+        let this->store["GROUP"] = [];
+    }
+
+    public function resetHaving()
+    {
+        let this->store["HAVING"] = [];
+    }
+
+    public function resetOrderBy()
+    {
+        let this->store["ORDER"] = [];
+    }
+
+    public function resetLimit()
+    {
+        let this->store["LIMIT"]  = 0,
+            this->store["OFFSET"] = 0;
+    }
+
+    public function resetFlags()
+    {
+        let this->store["FLAGS"] = [];
+    }
+
     /**
      * Builds the flags statement(s)
      *

phalcon/Filter/Validation/Validator/Uniqueness.zep

@@ -101,13 +101,13 @@ class Uniqueness extends AbstractCombinedFieldsValidator
     /**
      * Constructor
      *
-     * @param array options = [
-     *     'message' => '',
-     *     'template' => '',
+     * @param array $options = [
+     *     'message'    => '',
+     *     'template'   => '',
      *     'allowEmpty' => false,
-     *     'convert' => null,
-     *     'model' => null,
-     *     'except' => null
+     *     'convert'    => null,
+     *     'model'      => null,
+     *     'except'     => null
      * ]
      */
     public function __construct(array! options = [])

phalcon/Mvc/Model/Criteria.zep

@@ -158,18 +158,49 @@ class Criteria implements CriteriaInterface, InjectionAwareInterface
     }
 
     /**
-     * Sets the columns to be queried
+     * Sets the columns to be queried. The columns can be either a `string` or
+     * an `array`. The string can specify one or more columns, separated by
+     * commas, the same way that one uses the SQL select statement. You can
+     * use aliases, aggregate functions etc. If you need to reference other
+     * models you will need to reference them with their namespaces.
+     *
+     * When using an array as a parameter, you will need to specify one field
+     * per element. If a key is defined in our array, it will be used as the
+     * alias in the query
      *
      *```php
+     * <?php
+     *
+     * // String, comma separated values
+     * $criteria->columns("id, name");
+     *
+     * // Array, one column per element
      * $criteria->columns(
      *     [
      *         "id",
      *         "name",
      *     ]
      * );
+     *
+     * // Array, named keys. The name of the key acts as an alias (`AS` clause)
+     * $criteria->columns(
+     *     [
+     *         "name",
+     *         "number" => "COUNT(*)",
+     *     ]
+     * );
+     *
+     * // Different models
+     * $criteria->columns(
+     *     [
+     *         "\Phalcon\Models\Invoices.*",
+     *         "\Phalcon\Models\Customers.cst_name_first",
+     *         "\Phalcon\Models\Customers.cst_name_last",
+     *     ]
+     * );
      *```
      *
-     * @param string|array columns
+     * @param string|array $columns
      */
     public function columns(var columns) -> <CriteriaInterface>
     {

phalcon/Mvc/Model/Query/Builder.zep

@@ -447,25 +447,49 @@ class Builder implements BuilderInterface, InjectionAwareInterface
     }
 
     /**
-     * Sets the columns to be queried
+     * Sets the columns to be queried. The columns can be either a `string` or
+     * an `array`. The string can specify one or more columns, separated by
+     * commas, the same way that one uses the SQL select statement. You can
+     * use aliases, aggregate functions etc. If you need to reference other
+     * models you will need to reference them with their namespaces.
+     *
+     * When using an array as a parameter, you will need to specify one field
+     * per element. If a key is defined in our array, it will be used as the
+     * alias in the query
      *
      *```php
+     * <?php
+     *
+     * // String, comma separated values
      * $builder->columns("id, name");
      *
+     * // Array, one column per element
      * $builder->columns(
      *     [
      *         "id",
      *         "name",
      *     ]
      * );
      *
+     * // Array, named keys. The name of the key acts as an alias (`AS` clause)
      * $builder->columns(
      *     [
      *         "name",
      *         "number" => "COUNT(*)",
      *     ]
      * );
+     *
+     * // Different models
+     * $builder->columns(
+     *     [
+     *         "\Phalcon\Models\Invoices.*",
+     *         "\Phalcon\Models\Customers.cst_name_first",
+     *         "\Phalcon\Models\Customers.cst_name_last",
+     *     ]
+     * );
      *```
+     *
+     * @param string|array $columns
      */
     public function columns(var columns) -> <BuilderInterface>
     {

phalcon/Mvc/Model/Query/BuilderInterface.zep

@@ -41,9 +41,49 @@ interface BuilderInterface
     public function betweenWhere(string! expr, minimum, maximum, string! operator = BuilderInterface::OPERATOR_AND) -> <BuilderInterface>;
 
     /**
-     * Sets the columns to be queried
+     * Sets the columns to be queried. The columns can be either a `string` or
+     * an `array`. The string can specify one or more columns, separated by
+     * commas, the same way that one uses the SQL select statement. You can
+     * use aliases, aggregate functions etc. If you need to reference other
+     * models you will need to reference them with their namespaces.
      *
-     * @param string|array columns
+     * When using an array as a parameter, you will need to specify one field
+     * per element. If a key is defined in our array, it will be used as the
+     * alias in the query
+     *
+     *```php
+     * <?php
+     *
+     * // String, comma separated values
+     * $builder->columns("id, name");
+     *
+     * // Array, one column per element
+     * $builder->columns(
+     *     [
+     *         "id",
+     *         "name",
+     *     ]
+     * );
+     *
+     * // Array, named keys. The name of the key acts as an alias (`AS` clause)
+     * $builder->columns(
+     *     [
+     *         "name",
+     *         "number" => "COUNT(*)",
+     *     ]
+     * );
+     *
+     * // Different models
+     * $builder->columns(
+     *     [
+     *         "\Phalcon\Models\Invoices.*",
+     *         "\Phalcon\Models\Customers.cst_name_first",
+     *         "\Phalcon\Models\Customers.cst_name_last",
+     *     ]
+     * );
+     *```
+     *
+     * @param string|array $columns
      */
     public function columns(columns) -> <BuilderInterface>;
 

phalcon/Mvc/Model/Resultset/Complex.zep

@@ -285,7 +285,8 @@ class Complex extends Resultset implements ResultsetInterface
     }
 
     /**
-     * Serializing a resultset will dump all related rows into a big array
+     * Serializing a resultset will dump all related rows into a big array,
+     * serialize it and return the resulting string
      */
     public function serialize() -> string
     {

phalcon/Mvc/View/Engine/Volt/Compiler.zep

@@ -1144,9 +1144,59 @@ class Compiler implements InjectionAwareInterface
     }
 
     /**
-     * Compiles a "set" statement returning PHP code
-     *
-     * @param array statement
+     * Compiles a "set" statement returning PHP code. The method accepts an
+     * array produced by the Volt parser and creates the `set` statement in PHP.
+     * This method is not particularly useful in development, since it requires
+     * advanced knowledge of the Volt parser.
+     *
+     * ```php
+     * <?php
+     *
+     * use Phalcon\Mvc\View\Engine\Volt\Compiler;
+     *
+     * $compiler = new Compiler();
+     *
+     * // {% set a = ['first': 1] %}
+
+     * $source = [
+     *     "type" => 306,
+     *     "assignments" => [
+     *         [
+     *             "variable" => [
+     *                 "type" => 265,
+     *                 "value" => "a",
+     *                 "file" => "eval code",
+     *                 "line" => 1
+     *             ],
+     *             "op" => 61,
+     *             "expr" => [
+     *                 "type" => 360,
+     *                 "left" => [
+     *                     [
+     *                         "expr" => [
+     *                             "type" => 258,
+     *                             "value" => "1",
+     *                             "file" => "eval code",
+     *                             "line" => 1
+     *                         ],
+     *                         "name" => "first",
+     *                         "file" => "eval code",
+     *                         "line" => 1
+     *                     ]
+     *                 ],
+     *                 "file" => "eval code",
+     *                 "line" => 1
+     *             ],
+     *             "file" => "eval code",
+     *             "line" => 1
+     *         ]
+     *     ]
+     * ];
+     *
+     * echo $compiler->compileSet($source);
+     * // <?php $a = ['first' => 1]; ?>";
+     *
+     * @param array $statement
      *
      * @throws \Phalcon\Mvc\View\Engine\Volt\Exception
      * @return string

tests/integration/Mvc/View/Engine/Volt/Compiler/CompileSetCest.php

@@ -14,6 +14,7 @@
 namespace Phalcon\Tests\Integration\Mvc\View\Engine\Volt\Compiler;
 
 use IntegrationTester;
+use Phalcon\Mvc\View\Engine\Volt\Compiler;
 
 /**
  * Class CompileSetCest
@@ -29,6 +30,68 @@ class CompileSetCest
     public function mvcViewEngineVoltCompilerCompileSet(IntegrationTester $I)
     {
         $I->wantToTest('Mvc\View\Engine\Volt\Compiler - compileSet()');
-        $I->skipTest('Need implementation');
+
+        $volt = new Compiler();
+
+        $source = [
+            "type" => 306,
+            "assignments" => [
+                [
+                    "variable" => [
+                        "type" => 265,
+                        "value" => "a",
+                        "file" => "eval code",
+                        "line" => 1
+                    ],
+                    "op" => 61,
+                    "expr" => [
+                        "type" => 360,
+                        "left" => [
+                            [
+                                "expr" => [
+                                    "type" => 258,
+                                    "value" => "1",
+                                    "file" => "eval code",
+                                    "line" => 1
+                                ],
+                                "name" => "first",
+                                "file" => "eval code",
+                                "line" => 1
+                            ],
+                            [
+                                "expr" => [
+                                    "type" => 258,
+                                    "value" => "2",
+                                    "file" => "eval code",
+                                    "line" => 1
+                                ],
+                                "name" => "second",
+                                "file" => "eval code",
+                                "line" => 1
+                            ],
+                            [
+                                "expr" => [
+                                    "type" => 258,
+                                    "value" => "3",
+                                    "file" => "eval code",
+                                    "line" => 1
+                                ],
+                                "name" => "third",
+                                "file" => "eval code",
+                                "line" => 1
+                            ]
+                        ],
+                        "file" => "eval code",
+                        "line" => 1
+                    ],
+                    "file" => "eval code",
+                    "line" => 1
+                ]
+            ]
+        ];
+
+        $expected = "<?php \$a = ['first' => 1, 'second' => 2, 'third' => 3]; ?>";
+        $actual = $volt->compileSet($source);
+        $I->assertSame($expected, $actual);
     }
 }