Add sulu/sulu fork

sulu · Oct 14, 2024 · 320d270 · 320d270
1 parent 53abf16
commit 320d270
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 101 deletions.
diff --git a/Content/Application/PropertyResolver/MediaSelectionPropertyResolver.php b/Content/Application/PropertyResolver/MediaSelectionPropertyResolver.php
diff --git a/Content/Application/ResourceLoader/MediaResourceLoader.php b/Content/Application/ResourceLoader/MediaResourceLoader.php
diff --git a/Resources/config/resolvers.xml b/Resources/config/resolvers.xml
@@ -59,18 +59,11 @@
             />
         </service>
 
-        <!-- TODO move to media bundle -->
-        <service id="sulu_content.property_resolver.media_selection"
-                 class="Sulu\Bundle\ContentBundle\Content\Application\PropertyResolver\MediaSelectionPropertyResolver">
-            <tag name="sulu_content.property_resolver"/>
-        </service>
-
         <service id="sulu_content.property_resolver.default"
                  class="Sulu\Bundle\ContentBundle\Content\Application\PropertyResolver\Resolver\DefaultPropertyResolver">
             <tag name="sulu_content.property_resolver"/>
         </service>
 
-        <!-- TODO move to admin bundle -->
         <service id="sulu_content.property_resolver.block"
                  class="Sulu\Bundle\ContentBundle\Content\Application\PropertyResolver\Resolver\BlockPropertyResolver">
             <call method="setMetadataResolver">

diff --git a/Resources/config/resource-loader.xml b/Resources/config/resource-loader.xml
@@ -13,13 +13,5 @@
                 index-by="type"
             />
         </service>
-
-        <!-- TODO move to media bundle -->
-        <service id="sulu_content.media_resource_loader"
-        class="Sulu\Bundle\ContentBundle\Content\Application\ResourceLoader\MediaResourceLoader">
-            <argument type="service" id="sulu_media.media_manager"/>
-
-            <tag name="sulu_content.resource_loader" type="media"/>
-        </service>
     </services>
 </container>
diff --git a/Tests/Unit/Content/Application/ResourceLoader/ResourceLoaderProviderTest.php b/Tests/Unit/Content/Application/ResourceLoader/ResourceLoaderProviderTest.php
@@ -15,16 +15,20 @@
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\PhpUnit\ProphecyTrait;
-use Sulu\Bundle\ContentBundle\Content\Application\ResourceLoader\MediaResourceLoader;
 use Sulu\Bundle\ContentBundle\Content\Application\ResourceLoader\ResourceLoaderInterface;
 use Sulu\Bundle\ContentBundle\Content\Application\ResourceLoader\ResourceLoaderProvider;
+use Sulu\Bundle\MediaBundle\Infrastructure\Sulu\Content\ResourceLoader\MediaResourceLoader;
 
 class ResourceLoaderProviderTest extends TestCase
 {
     use ProphecyTrait;
 
     public function testGetResourceLoader(): void
     {
+        if (!\class_exists(MediaResourceLoader::class)) {
+            $this->markTestSkipped('This test is skipped because the class "MediaResourceLoader" does not exist.');
+        }
+
         $mediaResourceLoader = $this->prophesize(MediaResourceLoader::class);
         $categoryResourceLoader = $this->prophesize(ResourceLoaderInterface::class);
         $resourceLoaderProvider = new ResourceLoaderProvider(

diff --git a/composer.json b/composer.json
@@ -10,6 +10,12 @@
     ],
     "homepage": "https://github.com/sulu/SuluContentBundle",
     "license": "MIT",
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/Prokyonn/sulu.git"
+        }
+    ],
     "require": {
         "php": "^8.0",
         "doctrine/inflector": "^1.4.1 || ^2.0.1",
@@ -20,7 +26,7 @@
         "friendsofsymfony/rest-bundle": "^2.6 || ^3.0",
         "massive/search-bundle": "^2.4",
         "ramsey/uuid": "^3.8 || ^4.0",
-        "sulu/sulu": "^2.5.6 || ^2.6@dev",
+        "sulu/sulu": "dev-feature/content-resolver as 2.6",
         "symfony/config": "^5.4 || ^6.0 || ^7.0",
         "symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0",
         "symfony/event-dispatcher": "^5.4 || ^6.0 || ^7.0",