From 0a8396d11675789d9ad899a23482aadaf859210f Mon Sep 17 00:00:00 2001 From: Allon Moritz Date: Tue, 4 Jan 2022 15:01:00 +0100 Subject: [PATCH 1/5] Gettting the router should not be static --- libraries/src/Application/AdministratorApplication.php | 2 +- libraries/src/Application/CMSApplication.php | 4 ++-- libraries/src/Application/CMSWebApplicationInterface.php | 2 +- libraries/src/Application/SiteApplication.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/src/Application/AdministratorApplication.php b/libraries/src/Application/AdministratorApplication.php index 082b354d8bd51..78d83ebbc8da1 100644 --- a/libraries/src/Application/AdministratorApplication.php +++ b/libraries/src/Application/AdministratorApplication.php @@ -199,7 +199,7 @@ protected function doExecute() * * @since 3.2 */ - public static function getRouter($name = 'administrator', array $options = array()) + public function getRouter($name = 'administrator', array $options = array()) { return parent::getRouter($name, $options); } diff --git a/libraries/src/Application/CMSApplication.php b/libraries/src/Application/CMSApplication.php index 331ac25d97e1a..141f31b3d75d7 100644 --- a/libraries/src/Application/CMSApplication.php +++ b/libraries/src/Application/CMSApplication.php @@ -597,7 +597,7 @@ public function getPathway() * * @since 3.2 */ - public static function getRouter($name = null, array $options = array()) + public function getRouter($name = null, array $options = array()) { $app = Factory::getApplication(); @@ -1062,7 +1062,7 @@ protected function route() // Get the full request URI. $uri = clone Uri::getInstance(); - $router = static::getRouter(); + $router = $this->getRouter(); $result = $router->parse($uri, true); $active = $this->getMenu()->getActive(); diff --git a/libraries/src/Application/CMSWebApplicationInterface.php b/libraries/src/Application/CMSWebApplicationInterface.php index 4b1a4a4d2a3dd..dfbd1c4cf8abe 100644 --- a/libraries/src/Application/CMSWebApplicationInterface.php +++ b/libraries/src/Application/CMSWebApplicationInterface.php @@ -53,7 +53,7 @@ public function getMenu($name = null, $options = array()); * * @since 4.0.0 */ - public static function getRouter($name = null, array $options = array()); + public function getRouter($name = null, array $options = array()); /** * Gets a user state. diff --git a/libraries/src/Application/SiteApplication.php b/libraries/src/Application/SiteApplication.php index dfbba49904a51..ce155e2dcdbda 100644 --- a/libraries/src/Application/SiteApplication.php +++ b/libraries/src/Application/SiteApplication.php @@ -378,7 +378,7 @@ public function getPathway($name = 'site', $options = array()) * * @since 3.2 */ - public static function getRouter($name = 'site', array $options = array()) + public function getRouter($name = 'site', array $options = array()) { return parent::getRouter($name, $options); } From 6627071324cabd4306bf016414f4dd337d5483ac Mon Sep 17 00:00:00 2001 From: Allon Moritz Date: Mon, 10 Jan 2022 08:33:49 +0100 Subject: [PATCH 2/5] Update libraries/src/Application/SiteApplication.php Co-authored-by: Phil E. Taylor --- libraries/src/Application/SiteApplication.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/src/Application/SiteApplication.php b/libraries/src/Application/SiteApplication.php index ce155e2dcdbda..c856523a93c1e 100644 --- a/libraries/src/Application/SiteApplication.php +++ b/libraries/src/Application/SiteApplication.php @@ -378,7 +378,7 @@ public function getPathway($name = 'site', $options = array()) * * @since 3.2 */ - public function getRouter($name = 'site', array $options = array()) + public function getRouter($name = 'site', array $options = []) { return parent::getRouter($name, $options); } From 91dfc03d1859bf9ac267a5abc848608ccf82fb2c Mon Sep 17 00:00:00 2001 From: Allon Moritz Date: Mon, 10 Jan 2022 08:33:54 +0100 Subject: [PATCH 3/5] Update libraries/src/Application/AdministratorApplication.php Co-authored-by: Phil E. Taylor --- libraries/src/Application/AdministratorApplication.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/src/Application/AdministratorApplication.php b/libraries/src/Application/AdministratorApplication.php index 78d83ebbc8da1..96a0ba7c6e9ca 100644 --- a/libraries/src/Application/AdministratorApplication.php +++ b/libraries/src/Application/AdministratorApplication.php @@ -199,7 +199,7 @@ protected function doExecute() * * @since 3.2 */ - public function getRouter($name = 'administrator', array $options = array()) + public function getRouter($name = 'administrator', array $options = []) { return parent::getRouter($name, $options); } From 42730d39990a3dbe125ed265dc0b267d19a96ee8 Mon Sep 17 00:00:00 2001 From: Allon Moritz Date: Mon, 10 Jan 2022 08:33:59 +0100 Subject: [PATCH 4/5] Update libraries/src/Application/CMSApplication.php Co-authored-by: Phil E. Taylor --- libraries/src/Application/CMSApplication.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/src/Application/CMSApplication.php b/libraries/src/Application/CMSApplication.php index 141f31b3d75d7..3c2ff6fd7cd39 100644 --- a/libraries/src/Application/CMSApplication.php +++ b/libraries/src/Application/CMSApplication.php @@ -597,7 +597,7 @@ public function getPathway() * * @since 3.2 */ - public function getRouter($name = null, array $options = array()) + public function getRouter($name = null, array $options = []) { $app = Factory::getApplication(); From c91c52ba8f402af5dffd044eb7f1a9d0cec6c65e Mon Sep 17 00:00:00 2001 From: Allon Moritz Date: Mon, 10 Jan 2022 08:34:30 +0100 Subject: [PATCH 5/5] Update libraries/src/Application/CMSWebApplicationInterface.php Co-authored-by: Phil E. Taylor --- libraries/src/Application/CMSWebApplicationInterface.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/src/Application/CMSWebApplicationInterface.php b/libraries/src/Application/CMSWebApplicationInterface.php index dfbd1c4cf8abe..bc3a752269aca 100644 --- a/libraries/src/Application/CMSWebApplicationInterface.php +++ b/libraries/src/Application/CMSWebApplicationInterface.php @@ -53,7 +53,7 @@ public function getMenu($name = null, $options = array()); * * @since 4.0.0 */ - public function getRouter($name = null, array $options = array()); + public function getRouter($name = null, array $options = []); /** * Gets a user state.