diff options
| author | Christoph Wurst <ChristophWurst@users.noreply.github.com> | 2020-11-30 12:11:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-30 12:11:03 +0100 |
| commit | 9a3cc099dbe121072deb002288eff07afeb5e6be (patch) | |
| tree | 39f3a20600f9918f39f1c29a9203ea6cb54bc6cc | |
| parent | 344eacb8d8ca21a0673ce7709f22aa6e4b162cc3 (diff) | |
| parent | fd649afb1fd38f1a2cb0d5f07b651d607864c1f8 (diff) | |
| download | nextcloud-server-9a3cc099dbe121072deb002288eff07afeb5e6be.tar.gz nextcloud-server-9a3cc099dbe121072deb002288eff07afeb5e6be.zip | |
Merge pull request #24414 from nextcloud/techdebt/remove-update-php
Remove the deprecated update.php
| -rw-r--r-- | apps/files_external/lib/Lib/Storage/AmazonS3.php | 2 | ||||
| -rw-r--r-- | core/Command/App/CheckCode.php | 18 | ||||
| -rw-r--r-- | lib/private/legacy/OC_App.php | 5 |
3 files changed, 1 insertions, 24 deletions
diff --git a/apps/files_external/lib/Lib/Storage/AmazonS3.php b/apps/files_external/lib/Lib/Storage/AmazonS3.php index 3cdff1d6f40..b96950cca90 100644 --- a/apps/files_external/lib/Lib/Storage/AmazonS3.php +++ b/apps/files_external/lib/Lib/Storage/AmazonS3.php @@ -185,7 +185,7 @@ class AmazonS3 extends \OC\Files\Storage\Common { /** * Updates old storage ids (v0.2.1 and older) that are based on key and secret to new ones based on the bucket name. - * TODO Do this in an update.php. requires iterating over all users and loading the mount.json from their home + * TODO Do this in a repair step. requires iterating over all users and loading the mount.json from their home * * @param array $params */ diff --git a/core/Command/App/CheckCode.php b/core/Command/App/CheckCode.php index 40d632a1ad3..2480e1fa45d 100644 --- a/core/Command/App/CheckCode.php +++ b/core/Command/App/CheckCode.php @@ -157,8 +157,6 @@ class CheckCode extends Command implements CompletionAwareInterface { $errors = array_merge($errors, $schemaErrors['errors']); } - $this->analyseUpdateFile($appId, $output); - if (empty($errors)) { $output->writeln('<info>App is compliant - awesome job!</info>'); return 0; @@ -169,22 +167,6 @@ class CheckCode extends Command implements CompletionAwareInterface { } /** - * @param string $appId - * @param $output - */ - private function analyseUpdateFile($appId, OutputInterface $output) { - $appPath = \OC_App::getAppPath($appId); - if ($appPath === false) { - throw new \RuntimeException("No app with given id <$appId> known."); - } - - $updatePhp = $appPath . '/appinfo/update.php'; - if (file_exists($updatePhp)) { - $output->writeln("<info>Deprecated file found: $updatePhp - please use repair steps</info>"); - } - } - - /** * @param string $optionName * @param CompletionContext $context * @return string[] diff --git a/lib/private/legacy/OC_App.php b/lib/private/legacy/OC_App.php index abc70cc1e25..0b9ae8c8c53 100644 --- a/lib/private/legacy/OC_App.php +++ b/lib/private/legacy/OC_App.php @@ -990,11 +990,6 @@ class OC_App { \OC::$server->getAppManager()->clearAppsCache(); \OC::$server->getAppManager()->getAppVersion($appId, false); - // run upgrade code - if (file_exists($appPath . '/appinfo/update.php')) { - self::loadApp($appId); - include $appPath . '/appinfo/update.php'; - } self::setupBackgroundJobs($appData['background-jobs']); //set remote/public handlers |