Move interfaces and adjust namespaces

sulu · Nov 12, 2024 · 5bf0ca6 · 5bf0ca6
1 parent d274fce
commit 5bf0ca6
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 14 deletions.
diff --git a/Content/Application/PropertyResolver/PropertyResolverProvider.php b/Content/Application/PropertyResolver/PropertyResolverProvider.php
@@ -13,6 +13,8 @@
 
 namespace Sulu\Bundle\ContentBundle\Content\Application\PropertyResolver;
 
+use Sulu\Bundle\ContentBundle\Content\Application\PropertyResolver\Resolver\PropertyResolverInterface;
+
 class PropertyResolverProvider
 {
     /**

diff --git a/Content/Application/PropertyResolver/Resolver/BlockPropertyResolver.php b/Content/Application/PropertyResolver/Resolver/BlockPropertyResolver.php
@@ -18,7 +18,6 @@
 use Sulu\Bundle\AdminBundle\Metadata\FormMetadata\FormMetadata;
 use Sulu\Bundle\ContentBundle\Content\Application\ContentResolver\Value\ContentView;
 use Sulu\Bundle\ContentBundle\Content\Application\MetadataResolver\MetadataResolver;
-use Sulu\Bundle\ContentBundle\Content\Application\PropertyResolver\PropertyResolverInterface;
 
 class BlockPropertyResolver implements PropertyResolverInterface
 {

diff --git a/Content/Application/PropertyResolver/Resolver/DefaultPropertyResolver.php b/Content/Application/PropertyResolver/Resolver/DefaultPropertyResolver.php
@@ -14,7 +14,6 @@
 namespace Sulu\Bundle\ContentBundle\Content\Application\PropertyResolver\Resolver;
 
 use Sulu\Bundle\ContentBundle\Content\Application\ContentResolver\Value\ContentView;
-use Sulu\Bundle\ContentBundle\Content\Application\PropertyResolver\PropertyResolverInterface;
 
 class DefaultPropertyResolver implements PropertyResolverInterface
 {

diff --git a/Content/Application/PropertyResolver/Resolver/LinkPropertyResolver.php b/Content/Application/PropertyResolver/Resolver/LinkPropertyResolver.php
@@ -14,8 +14,7 @@
 namespace Sulu\Bundle\ContentBundle\Content\Application\PropertyResolver\Resolver;
 
 use Sulu\Bundle\ContentBundle\Content\Application\ContentResolver\Value\ContentView;
-use Sulu\Bundle\ContentBundle\Content\Application\PropertyResolver\PropertyResolverInterface;
-use Sulu\Bundle\ContentBundle\Content\Application\ResourceLoader\LinkResourceLoader;
+use Sulu\Bundle\ContentBundle\Content\Application\ResourceLoader\Loader\LinkResourceLoader;
 use Sulu\Bundle\MarkupBundle\Markup\Link\LinkItem;
 
 class LinkPropertyResolver implements PropertyResolverInterface

diff --git a/...rtyResolver/PropertyResolverInterface.php → ...er/Resolver/PropertyResolverInterface.php b/...rtyResolver/PropertyResolverInterface.php → ...er/Resolver/PropertyResolverInterface.php
@@ -11,7 +11,7 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Sulu\Bundle\ContentBundle\Content\Application\PropertyResolver;
+namespace Sulu\Bundle\ContentBundle\Content\Application\PropertyResolver\Resolver;
 
 use Sulu\Bundle\ContentBundle\Content\Application\ContentResolver\Value\ContentView;
 

diff --git a/Content/Application/PropertyResolver/Resolver/TeaserSelectionPropertyResolver.php b/Content/Application/PropertyResolver/Resolver/TeaserSelectionPropertyResolver.php
@@ -14,8 +14,7 @@
 namespace Sulu\Bundle\ContentBundle\Content\Application\PropertyResolver\Resolver;
 
 use Sulu\Bundle\ContentBundle\Content\Application\ContentResolver\Value\ContentView;
-use Sulu\Bundle\ContentBundle\Content\Application\PropertyResolver\PropertyResolverInterface;
-use Sulu\Bundle\ContentBundle\Content\Application\ResourceLoader\TeaserResourceLoader;
+use Sulu\Bundle\ContentBundle\Content\Application\ResourceLoader\Loader\TeaserResourceLoader;
 use Sulu\Bundle\PageBundle\Teaser\Teaser;
 
 class TeaserSelectionPropertyResolver implements PropertyResolverInterface

diff --git a/...ion/ResourceLoader/LinkResourceLoader.php → ...ourceLoader/Loader/LinkResourceLoader.php b/...ion/ResourceLoader/LinkResourceLoader.php → ...ourceLoader/Loader/LinkResourceLoader.php
@@ -11,7 +11,7 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Sulu\Bundle\ContentBundle\Content\Application\ResourceLoader;
+namespace Sulu\Bundle\ContentBundle\Content\Application\ResourceLoader\Loader;
 
 use Sulu\Bundle\MarkupBundle\Markup\Link\LinkItem;
 use Sulu\Bundle\MarkupBundle\Markup\Link\LinkProviderPoolInterface;

diff --git a/...esourceLoader/ResourceLoaderInterface.php → ...Loader/Loader/ResourceLoaderInterface.php b/...esourceLoader/ResourceLoaderInterface.php → ...Loader/Loader/ResourceLoaderInterface.php
@@ -11,7 +11,7 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Sulu\Bundle\ContentBundle\Content\Application\ResourceLoader;
+namespace Sulu\Bundle\ContentBundle\Content\Application\ResourceLoader\Loader;
 
 interface ResourceLoaderInterface
 {

diff --git a/...n/ResourceLoader/TeaserResourceLoader.php → ...rceLoader/Loader/TeaserResourceLoader.php b/...n/ResourceLoader/TeaserResourceLoader.php → ...rceLoader/Loader/TeaserResourceLoader.php
@@ -11,7 +11,7 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Sulu\Bundle\ContentBundle\Content\Application\ResourceLoader;
+namespace Sulu\Bundle\ContentBundle\Content\Application\ResourceLoader\Loader;
 
 use Sulu\Bundle\PageBundle\Teaser\TeaserManagerInterface;
 

diff --git a/Content/Application/ResourceLoader/ResourceLoaderProvider.php b/Content/Application/ResourceLoader/ResourceLoaderProvider.php
@@ -13,6 +13,8 @@
 
 namespace Sulu\Bundle\ContentBundle\Content\Application\ResourceLoader;
 
+use Sulu\Bundle\ContentBundle\Content\Application\ResourceLoader\Loader\ResourceLoaderInterface;
+
 class ResourceLoaderProvider
 {
     /**

diff --git a/Resources/config/resource-loader.xml b/Resources/config/resource-loader.xml
@@ -15,14 +15,14 @@
         </service>
 
         <service id="sulu_content.link_resource_loader"
-                 class="Sulu\Bundle\ContentBundle\Content\Application\ResourceLoader\LinkResourceLoader">
+                 class="Sulu\Bundle\ContentBundle\Content\Application\ResourceLoader\Loader\LinkResourceLoader">
             <argument type="service" id="sulu_markup.link_tag.provider_pool"/>
 
             <tag name="sulu_content.resource_loader" type="link"/>
         </service>
 
         <service id="sulu_content.teaser_resource_loader"
-        class="Sulu\Bundle\ContentBundle\Content\Application\ResourceLoader\TeaserResourceLoader">
+        class="Sulu\Bundle\ContentBundle\Content\Application\ResourceLoader\Loader\TeaserResourceLoader">
             <argument type="service" id="sulu_page.teaser.manager"/>
 
             <tag name="sulu_content.resource_loader" type="teaser"/>

diff --git a/Tests/Unit/Content/Application/ResourceLoader/LinkResourceLoaderTest.php b/Tests/Unit/Content/Application/ResourceLoader/LinkResourceLoaderTest.php
@@ -16,7 +16,7 @@
 use PHPUnit\Framework\TestCase;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
-use Sulu\Bundle\ContentBundle\Content\Application\ResourceLoader\LinkResourceLoader;
+use Sulu\Bundle\ContentBundle\Content\Application\ResourceLoader\Loader\LinkResourceLoader;
 use Sulu\Bundle\MarkupBundle\Markup\Link\LinkItem;
 use Sulu\Bundle\MarkupBundle\Markup\Link\LinkProviderInterface;
 use Sulu\Bundle\MarkupBundle\Markup\Link\LinkProviderPoolInterface;

diff --git a/Tests/Unit/Content/Application/ResourceLoader/ResourceLoaderProviderTest.php b/Tests/Unit/Content/Application/ResourceLoader/ResourceLoaderProviderTest.php
@@ -15,7 +15,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\PhpUnit\ProphecyTrait;
-use Sulu\Bundle\ContentBundle\Content\Application\ResourceLoader\ResourceLoaderInterface;
+use Sulu\Bundle\ContentBundle\Content\Application\ResourceLoader\Loader\ResourceLoaderInterface;
 use Sulu\Bundle\ContentBundle\Content\Application\ResourceLoader\ResourceLoaderProvider;
 use Sulu\Bundle\MediaBundle\Infrastructure\Sulu\Content\ResourceLoader\MediaResourceLoader;