Removed unused test and simplified validateSort

src/Controller/Component/PaginatorComponent.php

@@ -305,28 +305,26 @@ class PaginatorComponent extends Component {
 			return $options;
 		}
 
-		if (is_array($options['order'])) {
-			$tableAlias = $object->alias();
-			$order = [];
+		$tableAlias = $object->alias();
+		$order = [];
 
-			foreach ($options['order'] as $key => $value) {
-				$field = $key;
-				$alias = $tableAlias;
-				if (is_numeric($key)){
-					$order[] = $value;
-				}else{
-					if (strpos($key, '.') !== false) {
-						list($alias, $field) = explode('.', $key);
-					}
-					$correctAlias = ($tableAlias == $alias);
+		foreach ($options['order'] as $key => $value) {
+			$field = $key;
+			$alias = $tableAlias;
+			if (is_numeric($key)){
+				$order[] = $value;
+			}else{
+				if (strpos($key, '.') !== false) {
+					list($alias, $field) = explode('.', $key);
+				}
+				$correctAlias = ($tableAlias == $alias);
 
-					if ($correctAlias && $object->hasField($field)) {
-						$order[$tableAlias . '.' . $field] = $value;
-					}
+				if ($correctAlias && $object->hasField($field)) {
+					$order[$tableAlias . '.' . $field] = $value;
 				}
 			}
-			$options['order'] = $order;
 		}
+		$options['order'] = $order;
 
 		return $options;
 	}

tests/TestCase/Controller/Component/PaginatorComponentTest.php

@@ -509,27 +509,6 @@ class PaginatorComponentTest extends TestCase {
 	}
 
 /**
- * test that numeric array order are used by paginator
- *
- * @return void
- */
-	public function testValidateSortWithNumericArray() {
-		$model = $this->getMock('Cake\ORM\Table');
-		$model->expects($this->any())
-			->method('alias')
-			->will($this->returnValue('model'));
-		$model->expects($this->any())->method('hasField')->will($this->returnValue(true));
-
-		$options = array(
-			'order' => array('model.author_id DESC')
-		);
-		$result = $this->Paginator->validateSort($model, $options);
-		$expected = array('model.author_id DESC');
-
-		$this->assertEquals($expected, $result['order']);
-	}
-
-/**
  * Test that no sort doesn't trigger an error.
  *
  * @return void