Ldap/Query: Remove __toString()

This is needed because of exception handling. Exceptions can now bubble
up for default handling. Method render() was renamed to create() because
the method create a query. Adjust the test for method create().

refs #5536
This commit is contained in:
Marius Hein 2014-09-02 10:17:01 +02:00
parent baf768040f
commit ee6145a173
3 changed files with 5 additions and 15 deletions

View File

@ -307,7 +307,7 @@ class Connection
$results = @ldap_search( $results = @ldap_search(
$this->ds, $this->ds,
$base, $base,
(string) $query, $query->create(),
$fields, $fields,
0, // Attributes and values 0, // Attributes and values
0 // No limit - at least where possible 0 // No limit - at least where possible
@ -619,7 +619,7 @@ class Connection
$result = @ldap_read( $result = @ldap_read(
$ds, $ds,
'', '',
(string) $query, $query->create(),
$query->listFields() $query->listFields()
); );

View File

@ -300,17 +300,7 @@ class Query
* *
* @string * @string
*/ */
public function __toString() public function create()
{
return $this->render();
}
/**
* Returns the LDAP filter that will be applied
*
* @string
*/
protected function render()
{ {
$parts = array(); $parts = array();
if (! isset($this->filters['objectClass']) || $this->filters['objectClass'] === null) { if (! isset($this->filters['objectClass']) || $this->filters['objectClass'] === null) {

View File

@ -109,10 +109,10 @@ class QueryTest extends BaseTestCase
$this->assertEquals('testIntColumn', $cols[0][0]); $this->assertEquals('testIntColumn', $cols[0][0]);
} }
public function test__toString() public function testCreateQuery()
{ {
$select = $this->prepareSelect(); $select = $this->prepareSelect();
$res = '(&(objectClass=dummyClass)(testIntColumn=1)(testStringColumn=test)(testWildcard=abc*))'; $res = '(&(objectClass=dummyClass)(testIntColumn=1)(testStringColumn=test)(testWildcard=abc*))';
$this->assertEquals($res, (string) $select); $this->assertEquals($res, $select->create());
} }
} }