T15415 orderby interface 2

CHANGELOG-5.0.md

@@ -7,6 +7,7 @@
 ## Fixed
 - Corrected the `Phalcon\Db\Profiler\Item` calculation for seconds [#15249](https://github.com/phalcon/cphalcon/issues/15249) 
 - Corrected `Phalcon\Http\Message\ServerRequestFactory` to populate with superglobals [#15286](https://github.com/phalcon/cphalcon/issues/15286)
+- Corrected `Phalcon\Mvc\Model\Query\BuilderInterface::orderBy` to use `var` instead of `string` [#15415](https://github.com/phalcon/cphalcon/issues/15415)
 
 # [5.0.0-alpha.1](https://github.com/phalcon/cphalcon/releases/tag/v5.0.0-alpha.1) (2020-03-31)
 

phalcon/Mvc/Model/Query/BuilderInterface.zep

@@ -223,7 +223,7 @@ interface BuilderInterface
     /**
      * Sets an ORDER BY condition clause
      */
-    public function orderBy(string orderBy) -> <BuilderInterface>;
+    public function orderBy(var orderBy) -> <BuilderInterface>;
 
     /**
      * Appends a condition to the current conditions using an OR operator

tests/_data/fixtures/Traits/RecordsTrait.php

@@ -63,8 +63,6 @@ private function insertDataInvoices(
                     sprintf("Failed to insert row #%d into table '%s' using '%s' driver", $counter, $table, $driver)
                 );
             }
-
-
         }
     }
 }

tests/database/Db/Adapter/Pdo/DescribeColumnsCest.php

@@ -15,12 +15,9 @@
 
 use DatabaseTester;
 use Phalcon\Db\Column;
-use Phalcon\Storage\Exception;
-use Phalcon\Test\Fixtures\Migrations\AbstractMigration;
 use Phalcon\Test\Fixtures\Migrations\ComplexDefaultMigration;
 use Phalcon\Test\Fixtures\Migrations\DialectMigration;
 use Phalcon\Test\Fixtures\Traits\DiTrait;
-use function var_dump;
 
 class DescribeColumnsCest
 {

tests/database/Db/Adapter/Pdo/ExecInsertCest.php

@@ -23,6 +23,7 @@
 use Phalcon\Test\Fixtures\Migrations\DialectMigration;
 use Phalcon\Test\Fixtures\Traits\DiTrait;
 use PHPUnit\Framework\Assert;
+
 use function array_keys;
 use function array_values;
 use function pack;

tests/database/Mvc/Model/Query/Builder/OrderByCest.php

@@ -0,0 +1,88 @@
+<?php
+
+/**
+ * This file is part of the Phalcon Framework.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view the
+ * LICENSE.txt file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Test\Database\Mvc\Model\Query\Builder;
+
+use DatabaseTester;
+use Phalcon\Mvc\Model\Query\Builder;
+use Phalcon\Storage\Exception;
+use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Test\Fixtures\Traits\RecordsTrait;
+use Phalcon\Test\Models\Invoices;
+
+class OrderByCest
+{
+    use DiTrait;
+    use RecordsTrait;
+
+    /**
+     * Executed before each test
+     *
+     * @param DatabaseTester $I
+     *
+     * @return void
+     */
+    public function _before(DatabaseTester $I): void
+    {
+        try {
+            $this->setNewFactoryDefault();
+        } catch (Exception $e) {
+            $I->fail($e->getMessage());
+        }
+
+        $this->setDatabase($I);
+    }
+
+    /**
+     * Tests Phalcon\Mvc\Model\Query :: getSql() - Issue 14657
+     *
+     * @param DatabaseTester $I
+     *
+     * @author Phalcon Team <team@phalcon.io>
+     * @since  2021-04-20
+     * @issue  15411
+     *
+     * @group  mysql
+     * @group  pgsql
+     * @group  sqlite
+     */
+    public function mvcModelQueryBuilderOrderBy(DatabaseTester $I)
+    {
+        $I->wantToTest('Mvc\Model\Query\Builder :: orderBy()');
+
+        $builder = new Builder();
+        $phql    = $builder
+            ->columns('inv_id, inv_title')
+            ->addFrom(Invoices::class)
+            ->orderBy('inv_title')
+            ->getPhql()
+        ;
+
+        $expected = 'SELECT inv_id, inv_title '
+            . 'FROM [Phalcon\Test\Models\Invoices] '
+            . 'ORDER BY inv_title';
+        $actual   = $phql;
+        $I->assertEquals($expected, $actual);
+
+        $phql    = $builder
+            ->orderBy('inv_title DESC')
+            ->getPhql()
+        ;
+
+        $expected = 'SELECT inv_id, inv_title '
+            . 'FROM [Phalcon\Test\Models\Invoices] '
+            . 'ORDER BY inv_title DESC';
+        $actual   = $phql;
+        $I->assertEquals($expected, $actual);
+    }
+}

tests/database/Mvc/Model/Query/GetSqlCest.php

@@ -34,7 +34,8 @@ class GetSqlCest
     /**
      * Executed before each test
      *
-     * @param  DatabaseTester $I
+     * @param DatabaseTester $I
+     *
      * @return void
      */
     public function _before(DatabaseTester $I): void
@@ -53,7 +54,7 @@ public function _before(DatabaseTester $I): void
     /**
      * Tests Phalcon\Mvc\Model\Query :: getSql() - Issue 14657
      *
-     * @param  DatabaseTester $I
+     * @param DatabaseTester $I
      *
      * @author Phalcon Team <team@phalcon.io>
      * @since  2020-05-06
@@ -85,8 +86,8 @@ public function mvcModelQueryGetSql(DatabaseTester $I)
 
         $I->assertEquals(
             [
-                'sql' => $sql,
-                'bind' => [],
+                'sql'       => $sql,
+                'bind'      => [],
                 'bindTypes' => [],
             ],
             $query->getSql()

tests/unit/Logger/Logger/LogCest.php

@@ -62,7 +62,6 @@ public function loggerLog(UnitTester $I)
         ];
 
         foreach ($levels as $level => $levelName) {
-
             $fileName = $I->getNewFileName('log', 'log');
             $adapter  = new Stream($logPath . $fileName);