Thanks to visit codestin.com
Credit goes to github.com

Skip to content
This repository was archived by the owner on Jan 8, 2020. It is now read-only.

FIX #5767 Zend\Db\Sql\Select: getRawState('order') is inconsistent #5768

Merged
Maks3w merged 1 commit into from
Feb 22, 2014
Merged

FIX #5767 Zend\Db\Sql\Select: getRawState('order') is inconsistent #5768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions library/Zend/Db/Sql/Select.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ class Select extends AbstractSql implements SqlInterface, PreparableSqlInterface
protected $where = null;

/**
* @var null|string
* @var array
*/
protected $order = array();

Expand Down Expand Up @@ -499,7 +499,7 @@ public function reset($part)
$this->offset = null;
break;
case self::ORDER:
$this->order = null;
$this->order = array();
break;
case self::COMBINE:
$this->combine = array();
Expand Down
2 changes: 1 addition & 1 deletion tests/ZendTest/Db/Sql/SelectTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,7 @@ public function testReset()
$select->order('foo asc');
$this->assertEquals(array('foo asc'), $select->getRawState(Select::ORDER));
$select->reset(Select::ORDER);
$this->assertNull($select->getRawState(Select::ORDER));
$this->assertEmpty($select->getRawState(Select::ORDER));
}

/**
Expand Down