From 370ea75a355765f37ef70fa228c1e10be21db59d Mon Sep 17 00:00:00 2001 From: Thomas Lange Date: Sun, 24 Oct 2021 15:11:14 +0200 Subject: Fix constructor parameters for Resource classes The first parameter for the constructor of the Resource classes should not be optional if the next parameters obviously are non-optional. The optional parameters (if any) must come after the required parameters. --- include/classes/BigPipe/Resource.php | 2 +- include/classes/BigPipe/Resource/Javascript.php | 2 +- include/classes/BigPipe/Resource/Stylesheet.php | 2 +- include/classes/Debugging/Resource/Javascript.php | 2 +- include/classes/Debugging/Resource/Stylesheet.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/classes/BigPipe/Resource.php b/include/classes/BigPipe/Resource.php index f4f3138..0eb8b83 100644 --- a/include/classes/BigPipe/Resource.php +++ b/include/classes/BigPipe/Resource.php @@ -33,7 +33,7 @@ abstract class Resource extends Item { #=============================================================================== # Build resource #=============================================================================== - public function __construct($customID = NULL, $type, $resourceURL) { + public function __construct($customID, $type, $resourceURL) { $this->ID = $customID ?? spl_object_hash($this); $this->type = $type; $this->resourceURL = $resourceURL; diff --git a/include/classes/BigPipe/Resource/Javascript.php b/include/classes/BigPipe/Resource/Javascript.php index 3ce5d0d..3bd79d3 100644 --- a/include/classes/BigPipe/Resource/Javascript.php +++ b/include/classes/BigPipe/Resource/Javascript.php @@ -13,7 +13,7 @@ class Javascript extends \BigPipe\Resource { #=============================================================================== # Build resource #=============================================================================== - public function __construct($customID = NULL, $resourceURL) { + public function __construct($customID, $resourceURL) { parent::__construct($customID, parent::TYPE_JAVASCRIPT, $resourceURL); } diff --git a/include/classes/BigPipe/Resource/Stylesheet.php b/include/classes/BigPipe/Resource/Stylesheet.php index 94561b8..90dadf3 100644 --- a/include/classes/BigPipe/Resource/Stylesheet.php +++ b/include/classes/BigPipe/Resource/Stylesheet.php @@ -13,7 +13,7 @@ class Stylesheet extends \BigPipe\Resource { #=============================================================================== # Build resource #=============================================================================== - public function __construct($customID = NULL, $resourceURL) { + public function __construct($customID, $resourceURL) { parent::__construct($customID, parent::TYPE_STYLESHEET, $resourceURL); } diff --git a/include/classes/Debugging/Resource/Javascript.php b/include/classes/Debugging/Resource/Javascript.php index 71ac8cf..4d0d47c 100644 --- a/include/classes/Debugging/Resource/Javascript.php +++ b/include/classes/Debugging/Resource/Javascript.php @@ -2,7 +2,7 @@ namespace Debugging\Resource; class Javascript extends \BigPipe\Resource\Javascript { - public function __construct($customID = NULL, $resourceURL) { + public function __construct($customID, $resourceURL) { parent::__construct(...func_get_args()); foreach(['INIT', 'LOAD', 'DONE'] as $phase) { diff --git a/include/classes/Debugging/Resource/Stylesheet.php b/include/classes/Debugging/Resource/Stylesheet.php index 4efe610..39ce8a4 100644 --- a/include/classes/Debugging/Resource/Stylesheet.php +++ b/include/classes/Debugging/Resource/Stylesheet.php @@ -2,7 +2,7 @@ namespace Debugging\Resource; class Stylesheet extends \BigPipe\Resource\Stylesheet { - public function __construct($customID = NULL, $resourceURL) { + public function __construct($customID, $resourceURL) { parent::__construct(...func_get_args()); foreach(['INIT', 'LOAD', 'DONE'] as $phase) { -- cgit v1.2.3