From 759eaee5ed66edfaf8976be199a2d4c51e0e431d Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Thu, 22 Sep 2022 13:20:37 +0200 Subject: [PATCH] remove Core Bundle Signed-off-by: Arthur Schiwon --- .../App/AppStore/Bundles/BundleFetcher.php | 1 - .../App/AppStore/Bundles/CoreBundle.php | 42 ------------------- .../AppStore/Bundles/BundleFetcherTest.php | 6 +-- .../App/AppStore/Bundles/CoreBundleTest.php | 36 ---------------- 4 files changed, 1 insertion(+), 84 deletions(-) delete mode 100644 lib/private/App/AppStore/Bundles/CoreBundle.php delete mode 100644 tests/lib/App/AppStore/Bundles/CoreBundleTest.php diff --git a/lib/private/App/AppStore/Bundles/BundleFetcher.php b/lib/private/App/AppStore/Bundles/BundleFetcher.php index 7ffe1fa17d7..4745fef5203 100644 --- a/lib/private/App/AppStore/Bundles/BundleFetcher.php +++ b/lib/private/App/AppStore/Bundles/BundleFetcher.php @@ -57,7 +57,6 @@ class BundleFetcher { */ public function getDefaultInstallationBundle() { return [ - new CoreBundle($this->l10n), ]; } diff --git a/lib/private/App/AppStore/Bundles/CoreBundle.php b/lib/private/App/AppStore/Bundles/CoreBundle.php deleted file mode 100644 index b1b182fd1ac..00000000000 --- a/lib/private/App/AppStore/Bundles/CoreBundle.php +++ /dev/null @@ -1,42 +0,0 @@ - - * - * @author Lukas Reschke - * - * @license GNU AGPL version 3 or any later version - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - */ -namespace OC\App\AppStore\Bundles; - -class CoreBundle extends Bundle { - - /** - * {@inheritDoc} - */ - public function getName() { - return 'Core bundle'; - } - - /** - * {@inheritDoc} - */ - public function getAppIdentifiers() { - return [ - 'bruteforcesettings', - ]; - } -} diff --git a/tests/lib/App/AppStore/Bundles/BundleFetcherTest.php b/tests/lib/App/AppStore/Bundles/BundleFetcherTest.php index 55534cae699..daec97255ca 100644 --- a/tests/lib/App/AppStore/Bundles/BundleFetcherTest.php +++ b/tests/lib/App/AppStore/Bundles/BundleFetcherTest.php @@ -22,7 +22,6 @@ namespace Test\App\AppStore\Bundles; use OC\App\AppStore\Bundles\BundleFetcher; -use OC\App\AppStore\Bundles\CoreBundle; use OC\App\AppStore\Bundles\EducationBundle; use OC\App\AppStore\Bundles\EnterpriseBundle; use OC\App\AppStore\Bundles\GroupwareBundle; @@ -59,15 +58,12 @@ class BundleFetcherTest extends TestCase { } public function testGetDefaultInstallationBundle() { - $expected = [ - new CoreBundle($this->l10n), - ]; + $expected = []; $this->assertEquals($expected, $this->bundleFetcher->getDefaultInstallationBundle()); } public function testGetBundleByIdentifier() { $this->assertEquals(new EnterpriseBundle($this->l10n), $this->bundleFetcher->getBundleByIdentifier('EnterpriseBundle')); - $this->assertEquals(new CoreBundle($this->l10n), $this->bundleFetcher->getBundleByIdentifier('CoreBundle')); $this->assertEquals(new GroupwareBundle($this->l10n), $this->bundleFetcher->getBundleByIdentifier('GroupwareBundle')); } diff --git a/tests/lib/App/AppStore/Bundles/CoreBundleTest.php b/tests/lib/App/AppStore/Bundles/CoreBundleTest.php deleted file mode 100644 index 2ace537b938..00000000000 --- a/tests/lib/App/AppStore/Bundles/CoreBundleTest.php +++ /dev/null @@ -1,36 +0,0 @@ - - * - * @license GNU AGPL version 3 or any later version - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - */ - -namespace Test\App\AppStore\Bundles; - -use OC\App\AppStore\Bundles\CoreBundle; - -class CoreBundleTest extends BundleBase { - protected function setUp(): void { - parent::setUp(); - $this->bundle = new CoreBundle($this->l10n); - $this->bundleIdentifier = 'CoreBundle'; - $this->bundleName = 'Core bundle'; - $this->bundleAppIds = [ - 'bruteforcesettings', - ]; - } -} -- 2.39.5