Merge pull request #41 from GravityPDF/query-contract

Restore Interface Contract in DOM.php

Author: jakejackson1

src/DOM.php

@@ -65,22 +65,17 @@ abstract class DOM implements Query, IteratorAggregate, Countable
 	 *
 	 * @param mixed  $document
 	 *   A document-like object.
-	 * @param string $string
+	 * @param string|null $string
 	 *   A CSS 3 Selector
 	 * @param array  $options
 	 *   An associative array of options.
 	 *
 	 * @throws Exception
 	 * @see qp()
 	 */
-	public function __construct($document = null, $string = '', $options = [])
+	public function __construct($document = null, $string = null, $options = [])
 	{
-		// Backwards compatibility fix for PHP8+
-		if (is_null($string)) {
-			$string = '';
-		}
-
-		$string        = trim($string);
+		$string        = is_string($string) ? trim($string) : '';
 		$this->options = $options + Options::get() + $this->options;
 
 		$parser_flags = $options['parser_flags'] ?? self::DEFAULT_PARSER_FLAGS;

src/QueryPath.php

@@ -189,7 +189,7 @@ class QueryPath
 	 * @see qp()
 	 * @see htmlqp()
 	 */
-	public static function with($document = null, $selector = '', array $options = [])
+	public static function with($document = null, $selector = null, array $options = [])
 	{
 		$qpClass = $options['QueryPath_class'] ?? '\QueryPath\DOMQuery';
 
@@ -205,7 +205,7 @@ public static function with($document = null, $selector = '', array $options = [
 	 *
 	 * @see qp()
 	 */
-	public static function withXML($source = null, $selector = '', array $options = [])
+	public static function withXML($source = null, $selector = null, array $options = [])
 	{
 		$options += [
 			'use_parser' => 'xml',
@@ -223,7 +223,7 @@ public static function withXML($source = null, $selector = '', array $options =
 	 *
 	 * @see htmlqp()
 	 */
-	public static function withHTML($source = null, $selector = '', array $options = [])
+	public static function withHTML($source = null, $selector = null, array $options = [])
 	{
 		// Need a way to force an HTML parse instead of an XML parse when the
 		// doctype is XHTML, since many XHTML documents are not valid XML
@@ -273,7 +273,7 @@ public static function withHTML($source = null, $selector = '', array $options =
 	 *
 	 * @see html5qp()
 	 */
-	public static function withHTML5($source = null, $selector = '', array $options = [])
+	public static function withHTML5($source = null, $selector = null, array $options = [])
 	{
 		$qpClass = $options['QueryPath_class'] ?? '\QueryPath\DOMQuery';
 

src/qp_functions.php

@@ -155,7 +155,7 @@
  * @return mixed|DOMQuery
  *  Or possibly another QueryPath-like object if you overrode QueryPath_class.
  */
-function qp($document = null, $string = '', array $options = [])
+function qp($document = null, $string = null, array $options = [])
 {
 	return QueryPath::with($document, $string, $options);
 }
@@ -190,7 +190,7 @@ function qp($document = null, $string = '', array $options = [])
  * @return mixed|DOMQuery
  * @see     qp()
  */
-function htmlqp($document = null, $selector = '', array $options = [])
+function htmlqp($document = null, $selector = null, array $options = [])
 {
 	return QueryPath::withHTML($document, $selector, $options);
 }
@@ -219,7 +219,7 @@ function htmlqp($document = null, $selector = '', array $options = [])
  *
  * @return mixed|DOMQuery
  */
-function html5qp($document = null, $selector = '', array $options = [])
+function html5qp($document = null, $selector = null, array $options = [])
 {
 	return QueryPath::withHTML5($document, $selector, $options);
 }