[TASK] Move ContentTypeBuilder to Builder scope

monosize · Aug 4, 2023 · 62c3a76 · 62c3a76
1 parent 77f59e5
commit 62c3a76
Show file tree

Hide file tree

Showing 10 changed files with 427 additions and 16 deletions.
diff --git a/Classes/Builder/ContentTypeBuilder.php b/Classes/Builder/ContentTypeBuilder.php
diff --git a/Classes/Builder/ViewBuilder.php b/Classes/Builder/ViewBuilder.php
@@ -12,7 +12,6 @@
 use FluidTYPO3\Flux\Integration\PreviewView;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Fluid\View\TemplateView;
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\View\ViewInterface;
 
 class ViewBuilder

diff --git a/Classes/Integration/Configuration/SpooledConfigurationApplicator.php b/Classes/Integration/Configuration/SpooledConfigurationApplicator.php
@@ -8,11 +8,11 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Flux\Builder\ContentTypeBuilder;
 use FluidTYPO3\Flux\Builder\RequestBuilder;
 use FluidTYPO3\Flux\Content\ContentTypeManager;
 use FluidTYPO3\Flux\Core;
 use FluidTYPO3\Flux\Form;
-use FluidTYPO3\Flux\Integration\ContentTypeBuilder;
 use FluidTYPO3\Flux\Provider\Provider;
 use FluidTYPO3\Flux\Provider\ProviderInterface;
 use FluidTYPO3\Flux\Utility\ExtensionNamingUtility;

diff --git a/Classes/Integration/Event/ModifyPageLayoutContentEventListener.php b/Classes/Integration/Event/ModifyPageLayoutContentEventListener.php
@@ -8,13 +8,10 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
-use FluidTYPO3\Flux\Integration\PreviewRenderer;
 use FluidTYPO3\Flux\Integration\PreviewView;
 use FluidTYPO3\Flux\Provider\PageProvider;
 use TYPO3\CMS\Backend\Controller\Event\ModifyPageLayoutContentEvent;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
-use TYPO3\CMS\Backend\View\Event\PageContentPreviewRenderingEvent;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 class ModifyPageLayoutContentEventListener
 {

diff --git a/Classes/Integration/FormEngine/ProviderProcessor.php b/Classes/Integration/FormEngine/ProviderProcessor.php
@@ -5,7 +5,6 @@
 use FluidTYPO3\Flux\Provider\Interfaces\DataStructureProviderInterface;
 use FluidTYPO3\Flux\Provider\ProviderResolver;
 use TYPO3\CMS\Backend\Form\FormDataProviderInterface;
-use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Exception\SiteNotFoundException;
 use TYPO3\CMS\Core\Site\SiteFinder;
 use TYPO3\CMS\Core\Utility\GeneralUtility;

diff --git a/Configuration/Services.yaml b/Configuration/Services.yaml
@@ -27,6 +27,8 @@ services:
     public: true
   FluidTYPO3\Flux\Integration\FormEngine\ProviderProcessor:
     public: true
+  FluidTYPO3\Flux\Builder\ContentTypeBuilder:
+    public: true
   FluidTYPO3\Flux\Builder\RenderingContextBuilder:
     public: true
   FluidTYPO3\Flux\Builder\ViewBuilder:

diff --git a/...it/Integration/ContentTypeBuilderTest.php → ...s/Unit/Builder/ContentTypeBuilderTest.php b/...it/Integration/ContentTypeBuilderTest.php → ...s/Unit/Builder/ContentTypeBuilderTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace FluidTYPO3\Flux\Tests\Unit\Integration;
+namespace FluidTYPO3\Flux\Tests\Unit\Builder;
 
 /*
  * This file is part of the FluidTYPO3/Flux project under GPLv2 or later.
@@ -8,8 +8,8 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Flux\Builder\ContentTypeBuilder;
 use FluidTYPO3\Flux\Form;
-use FluidTYPO3\Flux\Integration\ContentTypeBuilder;
 use FluidTYPO3\Flux\Provider\Provider;
 use FluidTYPO3\Flux\Provider\ProviderInterface;
 use FluidTYPO3\Flux\Tests\Fixtures\Classes\AccessibleExtensionManagementUtility;

diff --git a/Tests/Unit/Controller/PageControllerTest.php b/Tests/Unit/Controller/PageControllerTest.php
@@ -8,14 +8,8 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
-use FluidTYPO3\Flux\Builder\RenderingContextBuilder;
-use FluidTYPO3\Flux\Builder\RequestBuilder;
 use FluidTYPO3\Flux\Controller\PageController;
-use FluidTYPO3\Flux\Service\FluxService;
-use FluidTYPO3\Flux\Service\PageService;
-use FluidTYPO3\Flux\Tests\Fixtures\Classes\DummyPageController;
 use FluidTYPO3\Flux\Tests\Unit\AbstractTestCase;
-use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * Class PageControllerTest

diff --git a/Tests/Unit/Integration/Configuration/SpooledConfigurationApplicatorTest.php b/Tests/Unit/Integration/Configuration/SpooledConfigurationApplicatorTest.php
@@ -8,6 +8,7 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Flux\Builder\ContentTypeBuilder;
 use FluidTYPO3\Flux\Builder\RequestBuilder;
 use FluidTYPO3\Flux\Builder\ViewBuilder;
 use FluidTYPO3\Flux\Content\ContentTypeManager;
@@ -16,7 +17,6 @@
 use FluidTYPO3\Flux\Form;
 use FluidTYPO3\Flux\Integration\Configuration\ConfigurationContext;
 use FluidTYPO3\Flux\Integration\Configuration\SpooledConfigurationApplicator;
-use FluidTYPO3\Flux\Integration\ContentTypeBuilder;
 use FluidTYPO3\Flux\Provider\ProviderInterface;
 use FluidTYPO3\Flux\Tests\Fixtures\Classes\DummyConfigurationProvider;
 use FluidTYPO3\Flux\Tests\Unit\AbstractTestCase;

diff --git a/Tests/Unit/Integration/FormEngine/ProviderProcessorTest.php b/Tests/Unit/Integration/FormEngine/ProviderProcessorTest.php
@@ -16,7 +16,6 @@
 use TYPO3\CMS\Core\Exception\SiteNotFoundException;
 use TYPO3\CMS\Core\Site\Entity\Site;
 use TYPO3\CMS\Core\Site\SiteFinder;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 class ProviderProcessorTest extends AbstractTestCase
 {