From 55832427c269d3124ffca8aea009a7696a8d65b6 Mon Sep 17 00:00:00 2001 From: Allon Moritz Date: Fri, 7 Jan 2022 09:28:09 +0100 Subject: [PATCH 1/7] Function to unregister a provider in media manager --- .../src/Provider/ProviderManager.php | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/administrator/components/com_media/src/Provider/ProviderManager.php b/administrator/components/com_media/src/Provider/ProviderManager.php index 2f7563e5ee92b..44c258c0fcf46 100644 --- a/administrator/components/com_media/src/Provider/ProviderManager.php +++ b/administrator/components/com_media/src/Provider/ProviderManager.php @@ -55,6 +55,32 @@ public function registerProvider(ProviderInterface $provider) $this->providers[$provider->getID()] = $provider; } + /** + * Unregister a provider from the ProviderManager. When null then all providers + * are cleared. + * + * @param ProviderInterface $provider The provider to be unregistered + * + * @return void + * + * @since __DEPLOY_VERSION__ + */ + public function unregisterProvider(ProviderInterface $provider = null) + { + if ($provider === null) + { + $this->providers = []; + return; + } + + if (!array_key_exists($provider->getID(), $this->providers)) + { + return; + } + + unset($this->providers[$provider->getID()]); + } + /** * Returns the provider for a particular ID * From 7825dd2a1ebd18390761ac1fdc6bb5514beba580 Mon Sep 17 00:00:00 2001 From: Allon Moritz Date: Fri, 7 Jan 2022 09:35:43 +0100 Subject: [PATCH 2/7] Update administrator/components/com_media/src/Provider/ProviderManager.php Co-authored-by: Brian Teeman --- .../src/Provider/ProviderManager.php | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/administrator/components/com_media/src/Provider/ProviderManager.php b/administrator/components/com_media/src/Provider/ProviderManager.php index 44c258c0fcf46..38cf908a3dfce 100644 --- a/administrator/components/com_media/src/Provider/ProviderManager.php +++ b/administrator/components/com_media/src/Provider/ProviderManager.php @@ -56,17 +56,17 @@ public function registerProvider(ProviderInterface $provider) } /** - * Unregister a provider from the ProviderManager. When null then all providers - * are cleared. - * - * @param ProviderInterface $provider The provider to be unregistered - * - * @return void - * - * @since __DEPLOY_VERSION__ - */ - public function unregisterProvider(ProviderInterface $provider = null) - { + * Unregister a provider from the ProviderManager. When null then all providers + * are cleared. + * + * @param ProviderInterface $provider The provider to be unregistered + * + * @return void + * + * @since __DEPLOY_VERSION__ + */ + public function unregisterProvider(ProviderInterface $provider = null) + { if ($provider === null) { $this->providers = []; From c9c75d99f9a80d35a94f589fef50de0895fa15c5 Mon Sep 17 00:00:00 2001 From: Allon Moritz Date: Fri, 7 Jan 2022 09:35:49 +0100 Subject: [PATCH 3/7] Update administrator/components/com_media/src/Provider/ProviderManager.php Co-authored-by: Brian Teeman --- .../components/com_media/src/Provider/ProviderManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/components/com_media/src/Provider/ProviderManager.php b/administrator/components/com_media/src/Provider/ProviderManager.php index 38cf908a3dfce..7735b6da95035 100644 --- a/administrator/components/com_media/src/Provider/ProviderManager.php +++ b/administrator/components/com_media/src/Provider/ProviderManager.php @@ -79,7 +79,7 @@ public function unregisterProvider(ProviderInterface $provider = null) } unset($this->providers[$provider->getID()]); - } + } /** * Returns the provider for a particular ID From b40a8e74aaffe77d161a34e40220d875a017a9f2 Mon Sep 17 00:00:00 2001 From: Allon Moritz Date: Fri, 7 Jan 2022 09:37:36 +0100 Subject: [PATCH 4/7] revert --- .../com_media/src/Provider/ProviderManager.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/administrator/components/com_media/src/Provider/ProviderManager.php b/administrator/components/com_media/src/Provider/ProviderManager.php index 7735b6da95035..02e2be63cfc52 100644 --- a/administrator/components/com_media/src/Provider/ProviderManager.php +++ b/administrator/components/com_media/src/Provider/ProviderManager.php @@ -56,15 +56,15 @@ public function registerProvider(ProviderInterface $provider) } /** - * Unregister a provider from the ProviderManager. When null then all providers - * are cleared. - * - * @param ProviderInterface $provider The provider to be unregistered - * - * @return void - * - * @since __DEPLOY_VERSION__ - */ + * Unregister a provider from the ProviderManager. When null then all providers + * are cleared. + * + * @param ProviderInterface $provider The provider to be unregistered + * + * @return void + * + * @since __DEPLOY_VERSION__ + */ public function unregisterProvider(ProviderInterface $provider = null) { if ($provider === null) From 4a081fb6b67160b22d0ab83d3b4ace492244d4e7 Mon Sep 17 00:00:00 2001 From: Allon Moritz Date: Fri, 7 Jan 2022 18:26:13 +0100 Subject: [PATCH 5/7] Update administrator/components/com_media/src/Provider/ProviderManager.php Co-authored-by: Phil E. Taylor --- .../components/com_media/src/Provider/ProviderManager.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/administrator/components/com_media/src/Provider/ProviderManager.php b/administrator/components/com_media/src/Provider/ProviderManager.php index 02e2be63cfc52..73bea7ed166c6 100644 --- a/administrator/components/com_media/src/Provider/ProviderManager.php +++ b/administrator/components/com_media/src/Provider/ProviderManager.php @@ -56,8 +56,8 @@ public function registerProvider(ProviderInterface $provider) } /** - * Unregister a provider from the ProviderManager. When null then all providers - * are cleared. + * Unregister a provider from the ProviderManager. + * When no provider, or null is passed in, then all providers are cleared. * * @param ProviderInterface $provider The provider to be unregistered * From 3287db94dbfae62fa29c4eadea5d3dfb1a80a506 Mon Sep 17 00:00:00 2001 From: Allon Moritz Date: Fri, 7 Jan 2022 18:26:19 +0100 Subject: [PATCH 6/7] Update administrator/components/com_media/src/Provider/ProviderManager.php Co-authored-by: Phil E. Taylor --- .../components/com_media/src/Provider/ProviderManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/components/com_media/src/Provider/ProviderManager.php b/administrator/components/com_media/src/Provider/ProviderManager.php index 73bea7ed166c6..4cd2b770202ed 100644 --- a/administrator/components/com_media/src/Provider/ProviderManager.php +++ b/administrator/components/com_media/src/Provider/ProviderManager.php @@ -65,7 +65,7 @@ public function registerProvider(ProviderInterface $provider) * * @since __DEPLOY_VERSION__ */ - public function unregisterProvider(ProviderInterface $provider = null) + public function unregisterProvider(ProviderInterface $provider = null): void { if ($provider === null) { From 248c172f399e8048e3dea2d9723476dc8d65d161 Mon Sep 17 00:00:00 2001 From: Allon Moritz Date: Fri, 7 Jan 2022 18:26:25 +0100 Subject: [PATCH 7/7] Update administrator/components/com_media/src/Provider/ProviderManager.php Co-authored-by: Phil E. Taylor --- .../components/com_media/src/Provider/ProviderManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/components/com_media/src/Provider/ProviderManager.php b/administrator/components/com_media/src/Provider/ProviderManager.php index 4cd2b770202ed..db9a14cb143f1 100644 --- a/administrator/components/com_media/src/Provider/ProviderManager.php +++ b/administrator/components/com_media/src/Provider/ProviderManager.php @@ -59,7 +59,7 @@ public function registerProvider(ProviderInterface $provider) * Unregister a provider from the ProviderManager. * When no provider, or null is passed in, then all providers are cleared. * - * @param ProviderInterface $provider The provider to be unregistered + * @param ProviderInterface|null $provider The provider to be unregistered * * @return void *