nextcloud
/
server
mirror of https://github.com/nextcloud/server
0
0
Fork 0
Code Issues Releases Wiki Activity

remove getDefaultInstallationBundle 

- because all apps are shipped now it was returning an empty result

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
This commit is contained in:
Arthur Schiwon 2022-09-22 13:29:02 +02:00
parent a7af25e1d9
commit a133a8a9d7
No known key found for this signature in database
GPG Key ID: 7424F1874854DF23
3 changed files with 4 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/private/App/AppStore/Bundles/BundleFetcher.php
View File

@ -27,12 +27,8 @@ namespace OC\App\AppStore\Bundles;
use OCP\IL10N;
class BundleFetcher {
/** @var IL10N */
private $l10n;
private IL10N $l10n;
/**
* @param IL10N $l10n
*/
public function __construct(IL10N $l10n) {
$this->l10n = $l10n;
}
@ -40,7 +36,7 @@ class BundleFetcher {
/**
* @return Bundle[]
*/
public function getBundles() {
public function getBundles(): array {
return [
new EnterpriseBundle($this->l10n),
new HubBundle($this->l10n),
@ -50,16 +46,6 @@ class BundleFetcher {
];
}
/**
* Bundles that should be installed by default after installation
*
* @return Bundle[]
*/
public function getDefaultInstallationBundle() {
return [
];
}
/**
* Get the bundle with the specified identifier
*
@ -67,13 +53,8 @@ class BundleFetcher {
* @return Bundle
* @throws \BadMethodCallException If the bundle does not exist
*/
public function getBundleByIdentifier($identifier) {
/** @var Bundle[] $bundles */
$bundles = array_merge(
$this->getBundles(),
$this->getDefaultInstallationBundle()
);
foreach ($bundles as $bundle) {
public function getBundleByIdentifier(string $identifier): Bundle {
foreach ($this->getBundles() as $bundle) {
if ($bundle->getIdentifier() === $identifier) {
return $bundle;
}

8
lib/private/Setup.php
View File

@ -403,14 +403,6 @@ class Setup {
// Install shipped apps and specified app bundles
Installer::installShippedApps();
$bundleFetcher = new BundleFetcher(\OC::$server->getL10N('lib'));
$defaultInstallationBundles = $bundleFetcher->getDefaultInstallationBundle();
foreach ($defaultInstallationBundles as $bundle) {
try {
$this->installer->installAppBundle($bundle);
} catch (Exception $e) {
}
}
// create empty file in data dir, so we can later find
// out that this is indeed an ownCloud data directory

5
tests/lib/App/AppStore/Bundles/BundleFetcherTest.php
View File

@ -57,11 +57,6 @@ class BundleFetcherTest extends TestCase {
$this->assertEquals($expected, $this->bundleFetcher->getBundles());
}
public function testGetDefaultInstallationBundle() {
$expected = [];
$this->assertEquals($expected, $this->bundleFetcher->getDefaultInstallationBundle());
}
public function testGetBundleByIdentifier() {
$this->assertEquals(new EnterpriseBundle($this->l10n), $this->bundleFetcher->getBundleByIdentifier('EnterpriseBundle'));
$this->assertEquals(new GroupwareBundle($this->l10n), $this->bundleFetcher->getBundleByIdentifier('GroupwareBundle'));