Merge branch '4.4' into 5.2

chalasr · chalasr · commit 0f4d6afad5db · 2021-02-15T19:55:04.000+01:00
* 4.4:
  Fix PHP 8.1 null values
  [Console] Fix PHP 8.1 null error for preg_match flag
  Fix: Article
  Definition::removeMethodCall should remove all matching calls
  mark the LazyIterator class as internal
  fix extracting mixed type-hinted property types
  keep valid submitted choices when additional choices are submitted
diff --git a/Adapter/ExtLdap/Query.php b/Adapter/ExtLdap/Query.php
@@ -150,7 +150,7 @@ public function execute()
     }
 
     /**
-     * Returns a LDAP search resource. If this query resulted in multiple searches, only the first
+     * Returns an LDAP search resource. If this query resulted in multiple searches, only the first
      * page will be returned.
      *
      * @return resource

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ public function execute()`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`/**`
`153`		`- * Returns a LDAP search resource. If this query resulted in multiple searches, only the first`
	`153`	`+ * Returns an LDAP search resource. If this query resulted in multiple searches, only the first`
`154`	`154`	`* page will be returned.`
`155`	`155`	`*`
`156`	`156`	`* @return resource`