From 1ccf59ac7f31751c93e58557af55cd405037f7fa Mon Sep 17 00:00:00 2001 From: Thomas Lange Date: Sun, 24 Oct 2021 17:38:14 +0200 Subject: Rename several properties and method parameters * Rename "ID" property of the Item class to "id" * Rename "customID" constructor parameter to "id" * Rename "resourceURL" property of the Resource class to "url" * Rename "resourceURL" constructor parameter to "url" --- include/classes/BigPipe/Item.php | 4 ++-- include/classes/BigPipe/Pagelet.php | 4 ++-- include/classes/BigPipe/Resource.php | 12 ++++++------ include/classes/BigPipe/Resource/Javascript.php | 4 ++-- include/classes/BigPipe/Resource/Stylesheet.php | 4 ++-- include/classes/Debugging/Pagelet.php | 2 +- include/classes/Debugging/Resource/Javascript.php | 2 +- include/classes/Debugging/Resource/Stylesheet.php | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/include/classes/BigPipe/Item.php b/include/classes/BigPipe/Item.php index 126cd5c..a7a40af 100644 --- a/include/classes/BigPipe/Item.php +++ b/include/classes/BigPipe/Item.php @@ -11,7 +11,7 @@ namespace BigPipe; abstract class Item { - protected $ID = ''; + protected $id = ''; protected $phaseDoneJS = []; #=============================================================================== @@ -23,7 +23,7 @@ abstract class Item { # Return the unique ID #=============================================================================== public function getID(): string { - return $this->ID; + return $this->id; } #=============================================================================== diff --git a/include/classes/BigPipe/Pagelet.php b/include/classes/BigPipe/Pagelet.php index 985be54..daca9df 100644 --- a/include/classes/BigPipe/Pagelet.php +++ b/include/classes/BigPipe/Pagelet.php @@ -35,8 +35,8 @@ class Pagelet extends Item { const PHASE_LOADJS = 3; # After all the JS resources have been loaded const PHASE_DONE = 4; # After the static JS code has been executed - public function __construct(string $customID = NULL, int $priority = self::PRIORITY_NORMAL) { - $this->ID = $customID ?? spl_object_hash($this); + public function __construct(string $id = NULL, int $priority = self::PRIORITY_NORMAL) { + $this->id = $id ?? spl_object_hash($this); $this->priority = $priority; $this->resources = array_pad($this->resources, 2, []); diff --git a/include/classes/BigPipe/Resource.php b/include/classes/BigPipe/Resource.php index d5ff21f..92b61ef 100644 --- a/include/classes/BigPipe/Resource.php +++ b/include/classes/BigPipe/Resource.php @@ -9,8 +9,8 @@ namespace BigPipe; abstract class Resource extends Item { - private $type = ''; - private $resourceURL = ''; + private $url = ''; + private $type = ''; #=============================================================================== # Render resource HTML for disabled pipeline @@ -33,10 +33,10 @@ abstract class Resource extends Item { #=============================================================================== # Build resource #=============================================================================== - public function __construct(string $customID, int $type, string $resourceURL) { - $this->ID = $customID ?? spl_object_hash($this); + public function __construct(string $id, int $type, string $url) { + $this->id = $id ?? spl_object_hash($this); $this->type = $type; - $this->resourceURL = $resourceURL; + $this->url = $url; $this->phaseDoneJS = array_pad($this->phaseDoneJS, 3, []); } @@ -52,7 +52,7 @@ abstract class Resource extends Item { # Return the resource URL #=============================================================================== public function getURL(): string { - return $this->resourceURL; + return $this->url; } #=============================================================================== diff --git a/include/classes/BigPipe/Resource/Javascript.php b/include/classes/BigPipe/Resource/Javascript.php index 099432d..b549075 100644 --- a/include/classes/BigPipe/Resource/Javascript.php +++ b/include/classes/BigPipe/Resource/Javascript.php @@ -13,8 +13,8 @@ class Javascript extends \BigPipe\Resource { #=============================================================================== # Build resource #=============================================================================== - public function __construct(string $customID, string $resourceURL) { - parent::__construct($customID, parent::TYPE_JAVASCRIPT, $resourceURL); + public function __construct(string $id, string $url) { + parent::__construct($id, parent::TYPE_JAVASCRIPT, $url); } #=============================================================================== diff --git a/include/classes/BigPipe/Resource/Stylesheet.php b/include/classes/BigPipe/Resource/Stylesheet.php index daa7561..a5998df 100644 --- a/include/classes/BigPipe/Resource/Stylesheet.php +++ b/include/classes/BigPipe/Resource/Stylesheet.php @@ -13,8 +13,8 @@ class Stylesheet extends \BigPipe\Resource { #=============================================================================== # Build resource #=============================================================================== - public function __construct(string $customID, string $resourceURL) { - parent::__construct($customID, parent::TYPE_STYLESHEET, $resourceURL); + public function __construct(string $id, string $url) { + parent::__construct($id, parent::TYPE_STYLESHEET, $url); } #=============================================================================== diff --git a/include/classes/Debugging/Pagelet.php b/include/classes/Debugging/Pagelet.php index 41eeb8f..9bae56e 100644 --- a/include/classes/Debugging/Pagelet.php +++ b/include/classes/Debugging/Pagelet.php @@ -2,7 +2,7 @@ namespace Debugging; class Pagelet extends \BigPipe\Pagelet { - public function __construct(string $customID = NULL, int $priority = self::PRIORITY_NORMAL) { + public function __construct(string $id = NULL, int $priority = self::PRIORITY_NORMAL) { parent::__construct(...func_get_args()); foreach(['INIT', 'LOADCSS', 'HTML', 'LOADJS', 'DONE'] as $phase) { diff --git a/include/classes/Debugging/Resource/Javascript.php b/include/classes/Debugging/Resource/Javascript.php index a0f988f..a2d7d75 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(string $customID, string $resourceURL) { + public function __construct(string $id, string $url) { 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 028752f..1acaa4b 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(string $customID, string $resourceURL) { + public function __construct(string $id, string $url) { parent::__construct(...func_get_args()); foreach(['INIT', 'LOAD', 'DONE'] as $phase) { -- cgit v1.2.3