Merge branch '6.4' into 7.0

nicolas-grekas · nicolas-grekas · commit c15060d91d19 · 2023-07-27T09:02:19.000+02:00
* 6.4:
  More short closures + isset instead of null checks + etc.
diff --git a/Adapter/ExtLdap/Query.php b/Adapter/ExtLdap/Query.php
@@ -43,7 +43,6 @@ public function __wakeup(): void
     public function __destruct()
     {
         $con = $this->connection->getResource();
-        $this->connection = null;
 
         if (!isset($this->results)) {
             return;
@@ -57,7 +56,6 @@ public function __destruct()
                 throw new LdapException('Could not free results: '.ldap_error($con));
             }
         }
-        unset($this->results);
     }
 
     public function execute(): CollectionInterface

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,6 @@ public function __wakeup(): void`
`43`	`43`	`public function __destruct()`
`44`	`44`	`{`
`45`	`45`	`$con = $this->connection->getResource();`
`46`		`- $this->connection = null;`
`47`	`46`
`48`	`47`	`if (!isset($this->results)) {`
`49`	`48`	`return;`
`@@ -57,7 +56,6 @@ public function __destruct()`
`57`	`56`	`throw new LdapException('Could not free results: '.ldap_error($con));`
`58`	`57`	`}`
`59`	`58`	`}`
`60`		`- unset($this->results);`
`61`	`59`	`}`
`62`	`60`
`63`	`61`	`public function execute(): CollectionInterface`