[LDAP] Fix resource type checks & docblocks on PHP 8.1

chalasr · chalasr · commit 2c0f7e04e08a · 2021-09-26T17:26:38.000+02:00
diff --git a/src/Symfony/Component/Ldap/Adapter/ExtLdap/Connection.php b/src/Symfony/Component/Ldap/Adapter/ExtLdap/Connection.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Ldap\Adapter\ExtLdap;
 
+use LDAP\Connection as LDAPConnection;
 use Symfony\Component\Ldap\Adapter\AbstractConnection;
 use Symfony\Component\Ldap\Exception\AlreadyExistsException;
 use Symfony\Component\Ldap\Exception\ConnectionException;
@@ -32,7 +33,7 @@ class Connection extends AbstractConnection
     /** @var bool */
     private $bound = false;
 
-    /** @var resource */
+    /** @var resource|LDAPConnection */
     private $connection;
 
     /**
@@ -89,9 +90,7 @@ public function bind($dn = null, $password = null)
     }
 
     /**
-     * Returns a link resource.
-     *
-     * @return resource
+     * @return resource|LDAPConnection
      *
      * @internal
      */
@@ -165,7 +164,7 @@ private function connect()
 
     private function disconnect()
     {
-        if ($this->connection && \is_resource($this->connection)) {
+        if ($this->connection) {
             ldap_unbind($this->connection);
         }
 
diff --git a/src/Symfony/Component/Ldap/Adapter/ExtLdap/Query.php b/src/Symfony/Component/Ldap/Adapter/ExtLdap/Query.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Ldap\Adapter\ExtLdap;
 
+use LDAP\Connection as LDAPConnection;
+use LDAP\Result;
 use Symfony\Component\Ldap\Adapter\AbstractQuery;
 use Symfony\Component\Ldap\Exception\LdapException;
 use Symfony\Component\Ldap\Exception\NotBoundException;
@@ -27,7 +29,7 @@ class Query extends AbstractQuery
     /** @var Connection */
     protected $connection;
 
-    /** @var resource[] */
+    /** @var resource[]|Result[] */
     private $results;
 
     /** @var array */
@@ -156,7 +158,7 @@ public function execute()
      * Returns an LDAP search resource. If this query resulted in multiple searches, only the first
      * page will be returned.
      *
-     * @return resource
+     * @return resource|Result
      *
      * @internal
      */
@@ -172,7 +174,7 @@ public function getResource($idx = 0)
     /**
      * Returns all LDAP search resources.
      *
-     * @return resource[]
+     * @return resource[]|Result[]
      *
      * @internal
      */
@@ -215,7 +217,7 @@ private function resetPagination()
     /**
      * Sets LDAP pagination controls.
      *
-     * @param resource $con
+     * @param resource|LDAPConnection $con
      */
     private function controlPagedResult($con, int $pageSize, bool $critical, string $cookie): bool
     {
@@ -239,8 +241,8 @@ private function controlPagedResult($con, int $pageSize, bool $critical, string
     /**
      * Retrieve LDAP pagination cookie.
      *
-     * @param resource $con
-     * @param resource $result
+     * @param resource|LDAPConnection $con
+     * @param resource|Result         $result
      */
     private function controlPagedResultResponse($con, $result, string $cookie = ''): string
     {
@@ -257,9 +259,9 @@ private function controlPagedResultResponse($con, $result, string $cookie = ''):
     /**
      * Calls actual LDAP search function with the prepared options and parameters.
      *
-     * @param resource $con
+     * @param resource|LDAPConnection $con
      *
-     * @return resource
+     * @return resource|Result
      */
     private function callSearchFunction($con, string $func, int $sizeLimit)
     {

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Ldap\Adapter\ExtLdap;`
`13`	`13`
	`14`	`+use LDAP\Connection as LDAPConnection;`
	`15`	`+use LDAP\Result;`
`14`	`16`	`use Symfony\Component\Ldap\Adapter\AbstractQuery;`
`15`	`17`	`use Symfony\Component\Ldap\Exception\LdapException;`
`16`	`18`	`use Symfony\Component\Ldap\Exception\NotBoundException;`
`@@ -27,7 +29,7 @@ class Query extends AbstractQuery`
`27`	`29`	`/** @var Connection */`
`28`	`30`	`protected $connection;`
`29`	`31`
`30`		`- /** @var resource[] */`
	`32`	`+ /** @var resource[]\|Result[] */`
`31`	`33`	`private $results;`
`32`	`34`
`33`	`35`	`/** @var array */`
`@@ -156,7 +158,7 @@ public function execute()`
`156`	`158`	`* Returns an LDAP search resource. If this query resulted in multiple searches, only the first`
`157`	`159`	`* page will be returned.`
`158`	`160`	`*`
`159`		`- * @return resource`
	`161`	`+ * @return resource\|Result`
`160`	`162`	`*`
`161`	`163`	`* @internal`
`162`	`164`	`*/`
`@@ -172,7 +174,7 @@ public function getResource($idx = 0)`
`172`	`174`	`/**`
`173`	`175`	`* Returns all LDAP search resources.`
`174`	`176`	`*`
`175`		`- * @return resource[]`
	`177`	`+ * @return resource[]\|Result[]`
`176`	`178`	`*`
`177`	`179`	`* @internal`
`178`	`180`	`*/`
`@@ -215,7 +217,7 @@ private function resetPagination()`
`215`	`217`	`/**`
`216`	`218`	`* Sets LDAP pagination controls.`
`217`	`219`	`*`
`218`		`- * @param resource $con`
	`220`	`+ * @param resource\|LDAPConnection $con`
`219`	`221`	`*/`
`220`	`222`	`private function controlPagedResult($con, int $pageSize, bool $critical, string $cookie): bool`
`221`	`223`	`{`
`@@ -239,8 +241,8 @@ private function controlPagedResult($con, int $pageSize, bool $critical, string`
`239`	`241`	`/**`
`240`	`242`	`* Retrieve LDAP pagination cookie.`
`241`	`243`	`*`
`242`		`- * @param resource $con`
`243`		`- * @param resource $result`
	`244`	`+ * @param resource\|LDAPConnection $con`
	`245`	`+ * @param resource\|Result $result`
`244`	`246`	`*/`
`245`	`247`	`private function controlPagedResultResponse($con, $result, string $cookie = ''): string`
`246`	`248`	`{`
`@@ -257,9 +259,9 @@ private function controlPagedResultResponse($con, $result, string $cookie = ''):`
`257`	`259`	`/**`
`258`	`260`	`* Calls actual LDAP search function with the prepared options and parameters.`
`259`	`261`	`*`
`260`		`- * @param resource $con`
	`262`	`+ * @param resource\|LDAPConnection $con`
`261`	`263`	`*`
`262`		`- * @return resource`
	`264`	`+ * @return resource\|Result`
`263`	`265`	`*/`
`264`	`266`	`private function callSearchFunction($con, string $func, int $sizeLimit)`
`265`	`267`	`{`