revert

ronfroy · web-flow · commit 21fb39928ecb · 2018-09-17T20:14:16.000+02:00
diff --git a/src/Symfony/Component/Ldap/Adapter/ExtLdap/Query.php b/src/Symfony/Component/Ldap/Adapter/ExtLdap/Query.php
@@ -37,8 +37,7 @@ public function __destruct()
     {
         $con = $this->connection->getResource();
         $this->connection = null;
-
-        if (\in_array($this->search, array(null, false), true)) {
+        if (null === $this->search || false === $this->search) {
             return;
         }
 
@@ -69,7 +68,7 @@ public function execute()
                 QueryInterface::SCOPE_SUB => 'ldap_search',
             );
 
-            if (!\array_key_exists($this->options['scope'], $funcMap)) {
+            if (!isset($funcMap[$this->options['scope']])) {
                 throw new LdapException(sprintf('Could not search in scope "%s".', $this->options['scope']));
             }
 

Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,7 @@ public function __destruct()`
`37`	`37`	`{`
`38`	`38`	`$con = $this->connection->getResource();`
`39`	`39`	`$this->connection = null;`
`40`		`-`
`41`		`- if (\in_array($this->search, array(null, false), true)) {`
	`40`	`+ if (null === $this->search \|\| false === $this->search) {`
`42`	`41`	`return;`
`43`	`42`	`}`
`44`	`43`
`@@ -69,7 +68,7 @@ public function execute()`
`69`	`68`	`QueryInterface::SCOPE_SUB => 'ldap_search',`
`70`	`69`	`);`
`71`	`70`
`72`		`- if (!\array_key_exists($this->options['scope'], $funcMap)) {`
	`71`	`+ if (!isset($funcMap[$this->options['scope']])) {`
`73`	`72`	`throw new LdapException(sprintf('Could not search in scope "%s".', $this->options['scope']));`
`74`	`73`	`}`
`75`	`74`