From 3313fa20b0b8d95a0b8bcc11ee7b3417679e991b Mon Sep 17 00:00:00 2001 From: Christian Fasching Date: Thu, 8 Feb 2024 10:34:10 +0100 Subject: [PATCH 1/3] remove enterprise subscription tools --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index aa46df9bc..9245728cc 100644 --- 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/pimcore": "^11.0", "api-platform/core": "^3.2" }, From eb070bb1affe1cfa08e211f8579e99790baf6f43 Mon Sep 17 00:00:00 2001 From: Christian Fasching Date: Thu, 8 Feb 2024 10:36:37 +0100 Subject: [PATCH 2/3] remove enterprise subscription tools --- src/PimcoreStudioApiBundle.php | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/src/PimcoreStudioApiBundle.php b/src/PimcoreStudioApiBundle.php index bb1ca3391..dd598ce6c 100644 --- a/src/PimcoreStudioApiBundle.php +++ b/src/PimcoreStudioApiBundle.php @@ -13,16 +13,12 @@ namespace Pimcore\Bundle\StudioApiBundle; -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\BundleCollection\BundleCollection; -class PimcoreStudioApiBundle extends AbstractPimcoreBundle implements - EnterpriseBundleInterface +class PimcoreStudioApiBundle extends AbstractPimcoreBundle { - private const ENTERPRISE_BUNDLE_LICENSE_ID = 'xLicensex'; public function getPath(): string { @@ -47,13 +43,4 @@ public function getInstaller(): ?InstallerInterface return $this->container->get(Installer::class); } - public static function registerDependentBundles(BundleCollection $collection): void - { - $collection->addBundle(new PimcoreEnterpriseSubscriptionToolsBundle()); - } - - public function getBundleLicenseId(): string - { - return self::ENTERPRISE_BUNDLE_LICENSE_ID; - } } From 44e1f56d6efffd7cda899e5972749fbb9b541d9b Mon Sep 17 00:00:00 2001 From: fashxp Date: Thu, 8 Feb 2024 09:36:54 +0000 Subject: [PATCH 3/3] Apply php-cs-fixer changes --- src/PimcoreStudioApiBundle.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/PimcoreStudioApiBundle.php b/src/PimcoreStudioApiBundle.php index dd598ce6c..73062b08f 100644 --- a/src/PimcoreStudioApiBundle.php +++ b/src/PimcoreStudioApiBundle.php @@ -15,11 +15,9 @@ use Pimcore\Extension\Bundle\AbstractPimcoreBundle; use Pimcore\Extension\Bundle\Installer\InstallerInterface; -use Pimcore\HttpKernel\BundleCollection\BundleCollection; class PimcoreStudioApiBundle extends AbstractPimcoreBundle { - public function getPath(): string { return dirname(__DIR__); @@ -42,5 +40,4 @@ public function getInstaller(): ?InstallerInterface /** @var InstallerInterface|null */ return $this->container->get(Installer::class); } - }