Removed unused test and simplified validateSort

cakephp · Jan 29, 2014 · fb68446 · fb68446
1 parent aec9564
commit fb68446
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 38 deletions.
diff --git a/src/Controller/Component/PaginatorComponent.php b/src/Controller/Component/PaginatorComponent.php
@@ -305,28 +305,26 @@ public function validateSort(Table $object, array $options) {
 			return $options;
 		}
 
-		if (is_array($options['order'])) {
+		$tableAlias = $object->alias();
-			$tableAlias = $object->alias();
+		$order = [];
-			$order = [];
 
-			foreach ($options['order'] as $key => $value) {
+		foreach ($options['order'] as $key => $value) {
-				$field = $key;
+			$field = $key;
-				$alias = $tableAlias;
+			$alias = $tableAlias;
-				if (is_numeric($key)){
+			if (is_numeric($key)){
-					$order[] = $value;
+				$order[] = $value;
-				}else{
+			}else{
-					if (strpos($key, '.') !== false) {
+				if (strpos($key, '.') !== false) {
-						list($alias, $field) = explode('.', $key);
+					list($alias, $field) = explode('.', $key);
-					}
+				}
-					$correctAlias = ($tableAlias == $alias);
+				$correctAlias = ($tableAlias == $alias);
 
-					if ($correctAlias && $object->hasField($field)) {
+				if ($correctAlias && $object->hasField($field)) {
-						$order[$tableAlias . '.' . $field] = $value;
+					$order[$tableAlias . '.' . $field] = $value;
-					}
 				}
 			}
-			$options['order'] = $order;
 		}
+		$options['order'] = $order;
 
 		return $options;
 	}

diff --git a/tests/TestCase/Controller/Component/PaginatorComponentTest.php b/tests/TestCase/Controller/Component/PaginatorComponentTest.php
@@ -508,27 +508,6 @@ public function testValidateSortWithString() {
 		$this->assertEquals($expected, $result['order']);
 	}
 
-/**
- * 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.
  *