From 86d85fe22d6549cd8f5f0c35fa022c977f19725c Mon Sep 17 00:00:00 2001 From: alexz707 Date: Fri, 26 Jan 2024 07:58:26 +0000 Subject: [PATCH 1/2] Apply php-cs-fixer changes --- src/DependencyInjection/Configuration.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php index e42451cee..86dee49de 100644 --- a/src/DependencyInjection/Configuration.php +++ b/src/DependencyInjection/Configuration.php @@ -4,14 +4,11 @@ /** * Pimcore * - * This source file is available under two different licenses: - * - GNU General Public License version 3 (GPLv3) + * This source file is available under following license: * - Pimcore Commercial License (PCL) - * Full copyright and license information is available in - * LICENSE.md which is distributed with this source code. * * @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.org) - * @license http://www.pimcore.org/license GPLv3 and PCL + * @license http://www.pimcore.org/license PCL */ namespace Pimcore\Bundle\StudioApiBundle\DependencyInjection; From 5d29b4091dad7869bfe18d7553fb994b782416f6 Mon Sep 17 00:00:00 2001 From: Christian Fasching Date: Thu, 8 Feb 2024 10:43:03 +0100 Subject: [PATCH 2/2] remove enterprise subscription tools (#3) * remove enterprise subscription tools * remove enterprise subscription tools * Apply php-cs-fixer changes --- composer.json | 3 +-- src/PimcoreStudioApiBundle.php | 18 +----------------- 2 files changed, 2 insertions(+), 19 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" }, diff --git a/src/PimcoreStudioApiBundle.php b/src/PimcoreStudioApiBundle.php index bb1ca3391..73062b08f 100644 --- a/src/PimcoreStudioApiBundle.php +++ b/src/PimcoreStudioApiBundle.php @@ -13,17 +13,11 @@ 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 { return dirname(__DIR__); @@ -46,14 +40,4 @@ public function getInstaller(): ?InstallerInterface /** @var InstallerInterface|null */ 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; - } }