Merge branch 'developer'

.travis.yml

@@ -5,6 +5,7 @@ php:
  - 5.4
  - 5.5
  - 5.6
+ - 7.0
  - hhvm
  - nightly
 

src/Query/Sql/Select.php

@@ -239,6 +239,10 @@ public function orderBy($columns, $direction = 'asc')
         {
             $columns = $this->stringArgumentToArray($columns);
         }
+        elseif ($columns instanceof Expression)
+        {
+            $this->orders[] = array($columns, $direction); return $this;
+        }
 
         foreach ($columns as $key => $column) 
         {

src/Translator/Mysql.php

@@ -615,6 +615,17 @@ protected function translateOrderBy()
 
         foreach ($this->attr('orders') as $column => $direction) 
         {
+            // in case a raw value is given we had to 
+            // put the column / raw value an direction inside another
+            // array because we cannot make objects to array keys.
+            if (is_array($direction))
+            {
+                // This only works in php 7 the php 5 fix is below 
+                //list($column, $direction) = $direction;
+                $column = $direction[0];
+                $direction = $direction[1];
+            }
+
             $build .= $this->escape($column) . ' ' . $direction . ', ';
         }
 

tests/Query/Sql/Select.php

@@ -119,6 +119,17 @@ public function testOrderBy()
 		$this->assertAttributes($this->createQuery()->orderBy(array('firstname' => 'asc', 'lastname' => 'desc')), array('orders' => array('firstname' => 'asc', 'lastname' => 'desc')));
 	}
 
+	/**
+	 * Select::orderBy
+	 */
+	public function testOrderByRaw()
+	{
+		$raw = new Expression('language <> de');
+
+		// simple 
+		$this->assertAttributes($this->createQuery()->orderBy($raw), array('orders' => array(array($raw, 'asc'))));
+	}
+
 	/**
 	 * Select::groupBy
 	 */

tests/Translator/Mysql.php

@@ -362,6 +362,12 @@ public function testSelectOrderBy()
 		{
 			return $q->table('phpunit')->select()->orderBy(array('u.firstname' => 'asc', 'u.lastname' => 'desc'));
 		});
+
+		// raw sorting
+		$this->assertQueryTranslation('select * from `phpunit` order by firstname <> nick asc', array(), function($q) 
+		{
+			return $q->table('phpunit')->select()->orderBy(new Expression("firstname <> nick"));
+		});
 	}
 
 	/**