[REMOVAL] Remove deprecated ContentProvider

monosize · Aug 1, 2023 · b37aafb · b37aafb
1 parent 1bea327
commit b37aafb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 28 deletions.
diff --git a/Classes/Provider/ContentProvider.php b/Classes/Provider/ContentProvider.php
diff --git a/Configuration/Services.yaml b/Configuration/Services.yaml
@@ -32,9 +32,6 @@ services:
   FluidTYPO3\Flux\Provider\Provider:
     shared: false
     public: true
-  FluidTYPO3\Flux\Provider\ContentProvider:
-    shared: false
-    public: true
   FluidTYPO3\Flux\Provider\PageProvider:
     shared: false
     public: true

diff --git a/Tests/Unit/Provider/ProviderResolverTest.php b/Tests/Unit/Provider/ProviderResolverTest.php
@@ -8,7 +8,6 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
-use FluidTYPO3\Flux\Provider\ContentProvider;
 use FluidTYPO3\Flux\Provider\Interfaces\RecordProviderInterface;
 use FluidTYPO3\Flux\Provider\PageProvider;
 use FluidTYPO3\Flux\Provider\Provider;
@@ -33,7 +32,7 @@ public function testResolveConfigurationProvidersFiltersProviders(): void
         $subject->method('loadTypoScriptConfigurationProviderInstances')->willReturn([]);
         $subject->method('validateAndInstantiateProviders')->willReturnArgument(0);
 
-        $provider1 = $this->getMockBuilder(ContentProvider::class)->disableOriginalConstructor()->getMock();
+        $provider1 = $this->getMockBuilder(DummyConfigurationProvider::class)->disableOriginalConstructor()->getMock();
         $provider2 = $this->getMockBuilder(PageProvider::class)->disableOriginalConstructor()->getMock();
         $provider3 = $this->getMockBuilder(DummyBasicProvider::class)->disableOriginalConstructor()->getMock();
 
@@ -61,9 +60,9 @@ public function loadTypoScriptProvidersReturnsEmptyArrayEarlyIfSetupNotFound()
             ->disableOriginalConstructor()
             ->getMock();
         $configurationService->expects($this->once())->method('getTypoScriptByPath')->will($this->returnValue([]));
-        GeneralUtility::setSingletonInstance(FluxService::class, $configurationService);
 
-        $instance = new ProviderResolver();
+        $instance = $this->getMockBuilder(ProviderResolver::class)->onlyMethods(['getFluxService'])->getMock();
+        $instance->method('getFluxService')->willReturn($configurationService);
 
         $providers = $instance->loadTypoScriptConfigurationProviderInstances();
         $this->assertIsArray($providers);
@@ -89,10 +88,9 @@ public function loadTypoScriptProvidersSupportsCustomClassName()
             ->method('getTypoScriptByPath')
             ->willReturn($mockedTypoScript);
 
-        GeneralUtility::setSingletonInstance(FluxService::class, $configurationService);
-
         /** @var \FluidTYPO3\Flux\Provider\ProviderResolver $instance */
-        $instance = new ProviderResolver();
+        $instance = $this->getMockBuilder(ProviderResolver::class)->onlyMethods(['getFluxService'])->getMock();
+        $instance->method('getFluxService')->willReturn($configurationService);
 
         $dummyProvider = $this->getMockBuilder(DummyConfigurationProvider::class)->disableOriginalConstructor()->getMock();
         GeneralUtility::addInstance(DummyConfigurationProvider::class, $dummyProvider);