[Studio] form bundle updates

Author: dpfaffenbauer

src/CoreShop/Bundle/CoreBundle/CoreShopCoreBundle.php

@@ -20,13 +20,11 @@
 use CoreShop\Bundle\AddressBundle\CoreShopAddressBundle;
 use CoreShop\Bundle\ClassDefinitionPatchBundle\CoreShopClassDefinitionPatchBundle;
 use CoreShop\Bundle\ConfigurationBundle\CoreShopConfigurationBundle;
-use CoreShop\Bundle\StudioFormBundle\CoreShopStudioFormBundle;
 use CoreShop\Bundle\CoreBundle\DependencyInjection\Compiler\RegisterIndexProductExtensionPass;
 use CoreShop\Bundle\CoreBundle\DependencyInjection\Compiler\RegisterPortletsPass;
 use CoreShop\Bundle\CoreBundle\DependencyInjection\Compiler\RegisterReportsPass;
 use CoreShop\Bundle\ProductQuantityPriceRulesBundle\DependencyInjection\Compiler\ProductQuantityPriceRulesActionPass;
 use CoreShop\Bundle\ProductQuantityPriceRulesBundle\DependencyInjection\Compiler\ProductQuantityPriceRulesConditionPass;
-use CoreShop\Bundle\StudioFormBundle\DependencyInjection\Compiler\RegisterFormTypesFromTagsPass;
 use CoreShop\Bundle\CurrencyBundle\CoreShopCurrencyBundle;
 use CoreShop\Bundle\CustomerBundle\CoreShopCustomerBundle;
 use CoreShop\Bundle\IndexBundle\CoreShopIndexBundle;
@@ -52,7 +50,9 @@
 use Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle;
 use Pimcore\Bundle\CustomReportsBundle\PimcoreCustomReportsBundle;
 use Pimcore\HttpKernel\BundleCollection\BundleCollection;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpKernel\Bundle\BundleInterface;
 
 final class CoreShopCoreBundle extends AbstractResourceBundle
 {
@@ -70,8 +70,12 @@ public function build(ContainerBuilder $container): void
         $container->addCompilerPass(new RegisterIndexProductExtensionPass());
         $container->addCompilerPass(new RegisterReportsPass());
         $container->addCompilerPass(new RegisterPortletsPass());
-        $container->addCompilerPass(new RegisterFormTypesFromTagsPass(ProductQuantityPriceRulesConditionPass::PRODUCT_QUANTITY_PRICE_RULE_CONDITION_TAG));
-        $container->addCompilerPass(new RegisterFormTypesFromTagsPass(ProductQuantityPriceRulesActionPass::PRODUCT_QUANTITY_PRICE_RULE_ACTION_TAG));
+
+        $registerFormTypesFromTagsPassClass = self::getRegisterFormTypesFromTagsPassClass();
+        if (null !== $registerFormTypesFromTagsPassClass) {
+            $container->addCompilerPass(new $registerFormTypesFromTagsPassClass(ProductQuantityPriceRulesConditionPass::PRODUCT_QUANTITY_PRICE_RULE_CONDITION_TAG));
+            $container->addCompilerPass(new $registerFormTypesFromTagsPassClass(ProductQuantityPriceRulesActionPass::PRODUCT_QUANTITY_PRICE_RULE_ACTION_TAG));
+        }
     }
 
     public static function registerDependentBundles(BundleCollection $collection): void
@@ -102,7 +106,14 @@ public static function registerDependentBundles(BundleCollection $collection): v
         $collection->addBundle(new CoreShopProductQuantityPriceRulesBundle(), 1600);
         $collection->addBundle(new CoreShopWishlistBundle(), 1500);
         $collection->addBundle(new CoreShopClassDefinitionPatchBundle(), 1400);
-        $collection->addBundle(new CoreShopStudioFormBundle(), 3900);
+
+        if (self::isStudioUiBundleAvailable()) {
+            $studioFormBundleClass = self::getStudioFormBundleClass();
+            if (null !== $studioFormBundleClass) {
+                $collection->addBundle(new $studioFormBundleClass(), 3900);
+            }
+        }
+
         $collection->addBundle(new PimcoreCustomReportsBundle(), 20000);
     }
 
@@ -155,4 +166,41 @@ public function getEditmodeCssPaths(): array
     {
         return [];
     }
+
+    private static function isStudioUiBundleAvailable(): bool
+    {
+        $studioUiBundleClass = sprintf('Pimcore\\Bundle\\%s\\PimcoreStudioUiBundle', 'StudioUiBundle');
+
+        return class_exists($studioUiBundleClass) && is_subclass_of($studioUiBundleClass, BundleInterface::class);
+    }
+
+    /**
+     * @return class-string<BundleInterface>|null
+     */
+    private static function getStudioFormBundleClass(): ?string
+    {
+        $studioFormBundleClass = sprintf('CoreShop\\Bundle\\%s\\CoreShopStudioFormBundle', 'StudioFormBundle');
+        if (!class_exists($studioFormBundleClass) || !is_subclass_of($studioFormBundleClass, BundleInterface::class)) {
+            return null;
+        }
+
+        return $studioFormBundleClass;
+    }
+
+    /**
+     * @return class-string<CompilerPassInterface>|null
+     */
+    private static function getRegisterFormTypesFromTagsPassClass(): ?string
+    {
+        $registerFormTypesFromTagsPassClass = sprintf(
+            'CoreShop\\Bundle\\%s\\DependencyInjection\\Compiler\\RegisterFormTypesFromTagsPass',
+            'StudioFormBundle',
+        );
+
+        if (!class_exists($registerFormTypesFromTagsPassClass) || !is_subclass_of($registerFormTypesFromTagsPassClass, CompilerPassInterface::class)) {
+            return null;
+        }
+
+        return $registerFormTypesFromTagsPassClass;
+    }
 }

src/CoreShop/Bundle/StudioFormBundle/composer.json

@@ -1,7 +1,7 @@
 {
     "name": "coreshop/studio-form-bundle",
     "type": "pimcore-bundle",
-    "description": "CoreShop StudioFormBundle - Reusable Form Schema System for Pimcore Studio",
+    "description": "CoreShop - Studio Form Bundle",
     "keywords": [
         "coreshop",
         "pimcore",
@@ -13,8 +13,16 @@
     "license": "proprietary",
     "authors": [
         {
-            "name": "CoreShop GmbH",
-            "email": "info@coreshop.com"
+            "name": "CoreShop Team",
+            "email": "info@coreshop.com",
+            "homepage": "https://www.coreshop.com/",
+            "role": "Developer"
+        },
+        {
+            "name": "Dominik Pfaffenbauer",
+            "email": "dominik@pfaffenbauer.at",
+            "homepage": "https://www.pfaffenbauer.at/",
+            "role": "Developer"
         }
     ],
     "require": {
@@ -23,7 +31,8 @@
         "symfony/http-kernel": "^6.3 || ^7.0",
         "symfony/framework-bundle": "^6.3 || ^7.0",
         "symfony/serializer": "^6.3 || ^7.0",
-        "pimcore/pimcore": "^12.0"
+        "pimcore/pimcore": "^12.0",
+        "pimcore/studio-ui-bundle": "^0.6.30"
     },
     "require-dev": {
         "phpstan/phpstan": "^2.0",
@@ -35,9 +44,21 @@
             "CoreShop\\Bundle\\StudioFormBundle\\": ""
         }
     },
+    "repositories": [
+        {
+            "type": "path",
+            "url": "../../*/*"
+        }
+    ],
+    "minimum-stability": "dev",
+    "prefer-stable": true,
     "extra": {
         "branch-alias": {
+            "dev-main": "5.0-dev",
             "dev-master": "5.0-dev"
         }
+    },
+    "config": {
+        "sort-packages": true
     }
 }