From 29ffa0d53a6f36a1655ebfa6fa5714fc2bcdc81a Mon Sep 17 00:00:00 2001 From: George Wilson Date: Tue, 13 Dec 2022 13:03:42 +0000 Subject: [PATCH 1/2] Fix doc block This method has had an array typehint in it's method since introduction in 3.5. Make the docblock match --- libraries/src/Layout/FileLayout.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/src/Layout/FileLayout.php b/libraries/src/Layout/FileLayout.php index 05629d3887ea7..291f6d24bd102 100644 --- a/libraries/src/Layout/FileLayout.php +++ b/libraries/src/Layout/FileLayout.php @@ -582,7 +582,7 @@ public function setIncludePaths($paths) /** * Set suffixes to search layouts * - * @param mixed $suffixes String with a single suffix or 'auto' | 'none' or array of suffixes + * @param array $suffixes Array of suffixes to utilise * * @return self * From 7e396fca594180f1107dc0a2d93205ce5e0de994 Mon Sep 17 00:00:00 2001 From: George Wilson Date: Tue, 13 Dec 2022 13:12:56 +0000 Subject: [PATCH 2/2] Remove parameter that doesn't exist MVCFactory only takes one parameter https://github.com/joomla/joomla-cms/blob/29ffa0d53a6f36a1655ebfa6fa5714fc2bcdc81a/libraries/src/MVC/Factory/MVCFactory.php#L62 --- installation/src/Application/CliInstallationApplication.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installation/src/Application/CliInstallationApplication.php b/installation/src/Application/CliInstallationApplication.php index 983268496d032..fc730d021b1ea 100644 --- a/installation/src/Application/CliInstallationApplication.php +++ b/installation/src/Application/CliInstallationApplication.php @@ -257,7 +257,7 @@ public function getMessageQueue() public function getMVCFactory() { if (!$this->mvcFactory) { - $this->mvcFactory = new MVCFactory('Joomla\\CMS', $this); + $this->mvcFactory = new MVCFactory('Joomla\\CMS'); } return $this->mvcFactory;