Merge branch '1.x' into 0x-First-Prototype

# Conflicts: # composer.json # src/PimcoreStudioApiBundle.php
pimcore · Feb 8, 2024 · 72a4795 · 72a4795
2 parents e7dd5bb + 5d29b40
commit 72a4795
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 13 deletions.
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "pimcore/studio-api-bundle",
-  "license": "Pimcore Enterprise License (PEL)",
+  "license": "proprietary",
   "type": "pimcore-bundle",
   "description": "Pimcore Studio Api Bundle",
   "config": {
@@ -18,7 +18,6 @@
   "minimum-stability": "dev",
   "require": {
     "php": "~8.1.0 || ~8.2.0",
-    "pimcore/enterprise-subscription-tools": "^1.3",
     "pimcore/static-resolver-bundle": "^1.3",
     "pimcore/generic-data-index-bundle": "1.x-dev",
     "pimcore/pimcore": "^11.0",

diff --git a/src/PimcoreStudioApiBundle.php b/src/PimcoreStudioApiBundle.php
@@ -14,19 +14,14 @@
 namespace Pimcore\Bundle\StudioApiBundle;
 
 use ApiPlatform\Symfony\Bundle\ApiPlatformBundle;
-use Pimcore\Bundle\EnterpriseSubscriptionToolsBundle\Bundle\EnterpriseBundleInterface;
-use Pimcore\Bundle\EnterpriseSubscriptionToolsBundle\PimcoreEnterpriseSubscriptionToolsBundle;
 use Pimcore\Extension\Bundle\AbstractPimcoreBundle;
 use Pimcore\Extension\Bundle\Installer\InstallerInterface;
 use Pimcore\HttpKernel\Bundle\DependentBundleInterface;
 use Pimcore\HttpKernel\BundleCollection\BundleCollection;
 
 class PimcoreStudioApiBundle extends AbstractPimcoreBundle implements
-    EnterpriseBundleInterface,
     DependentBundleInterface
 {
-    private const ENTERPRISE_BUNDLE_LICENSE_ID = 'xLicensex';
-
     public function getPath(): string
     {
         return dirname(__DIR__);
@@ -52,12 +47,6 @@ public function getInstaller(): ?InstallerInterface
 
     public static function registerDependentBundles(BundleCollection $collection): void
     {
-        $collection->addBundle(new PimcoreEnterpriseSubscriptionToolsBundle());
         $collection->addBundle(new ApiPlatformBundle());
     }
-
-    public function getBundleLicenseId(): string
-    {
-        return self::ENTERPRISE_BUNDLE_LICENSE_ID;
-    }
 }