Kill repair step for cypress tests

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>

diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php
index 52dab1ddf3f746aa46c59c2f3c8eaa280da24968..2c2b8889e2668d7ed539661e58f73a7794d5db5f 100644 (file)
--- a/lib/composer/composer/autoload_classmap.php
+++ b/lib/composer/composer/autoload_classmap.php
@@ -1080,7 +1080,6 @@ return array(
     'OC\\Repair\\NC16\\AddClenupLoginFlowV2BackgroundJob' => $baseDir . '/lib/private/Repair/NC16/AddClenupLoginFlowV2BackgroundJob.php',
     'OC\\Repair\\NC16\\CleanupCardDAVPhotoCache' => $baseDir . '/lib/private/Repair/NC16/CleanupCardDAVPhotoCache.php',
     'OC\\Repair\\NC16\\ClearCollectionsAccessCache' => $baseDir . '/lib/private/Repair/NC16/ClearCollectionsAccessCache.php',
-    'OC\\Repair\\NC16\\RemoveCypressFiles' => $baseDir . '/lib/private/Repair/NC16/RemoveCypressFiles.php',
     'OC\\Repair\\NC17\\SetEnterpriseLogo' => $baseDir . '/lib/private/Repair/NC17/SetEnterpriseLogo.php',
     'OC\\Repair\\NC17\\SwitchUpdateChannel' => $baseDir . '/lib/private/Repair/NC17/SwitchUpdateChannel.php',
     'OC\\Repair\\OldGroupMembershipShares' => $baseDir . '/lib/private/Repair/OldGroupMembershipShares.php',

diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php
index b4d564af319b7a010ab9a0f1c17fd75442baca5b..6bd401b4d772125359ce3a255a55be3fc1437e31 100644 (file)
--- a/lib/composer/composer/autoload_static.php
+++ b/lib/composer/composer/autoload_static.php
@@ -1114,7 +1114,6 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
         'OC\\Repair\\NC16\\AddClenupLoginFlowV2BackgroundJob' => __DIR__ . '/../../..' . '/lib/private/Repair/NC16/AddClenupLoginFlowV2BackgroundJob.php',
         'OC\\Repair\\NC16\\CleanupCardDAVPhotoCache' => __DIR__ . '/../../..' . '/lib/private/Repair/NC16/CleanupCardDAVPhotoCache.php',
         'OC\\Repair\\NC16\\ClearCollectionsAccessCache' => __DIR__ . '/../../..' . '/lib/private/Repair/NC16/ClearCollectionsAccessCache.php',
-        'OC\\Repair\\NC16\\RemoveCypressFiles' => __DIR__ . '/../../..' . '/lib/private/Repair/NC16/RemoveCypressFiles.php',
         'OC\\Repair\\NC17\\SetEnterpriseLogo' => __DIR__ . '/../../..' . '/lib/private/Repair/NC17/SetEnterpriseLogo.php',
         'OC\\Repair\\NC17\\SwitchUpdateChannel' => __DIR__ . '/../../..' . '/lib/private/Repair/NC17/SwitchUpdateChannel.php',
         'OC\\Repair\\OldGroupMembershipShares' => __DIR__ . '/../../..' . '/lib/private/Repair/OldGroupMembershipShares.php',

diff --git a/lib/private/Repair.php b/lib/private/Repair.php
index 70a15cb0442440dacf9f1c7a9739d6621ff51db3..2b6080ca985a1bdf111858d29bd56e032ed771ed 100644 (file)
--- a/lib/private/Repair.php
+++ b/lib/private/Repair.php
@@ -43,7 +43,6 @@ use OC\Repair\NC14\AddPreviewBackgroundCleanupJob;
 use OC\Repair\NC16\AddClenupLoginFlowV2BackgroundJob;
 use OC\Repair\NC16\CleanupCardDAVPhotoCache;
 use OC\Repair\NC16\ClearCollectionsAccessCache;
-use OC\Repair\NC16\RemoveCypressFiles;
 use OC\Repair\NC17\SetEnterpriseLogo;
 use OC\Repair\NC17\SwitchUpdateChannel;
 use OC\Repair\OldGroupMembershipShares;
@@ -153,7 +152,6 @@ class Repair implements IOutput {
                        new AddClenupLoginFlowV2BackgroundJob(\OC::$server->getJobList()),
                        new RemoveLinkShares(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig(), \OC::$server->getGroupManager(), \OC::$server->getNotificationManager(), \OC::$server->query(ITimeFactory::class)),
                        new ClearCollectionsAccessCache(\OC::$server->getConfig(), \OC::$server->query(IManager::class)),
-                       \OC::$server->query(RemoveCypressFiles::class),
                        \OC::$server->query(SwitchUpdateChannel::class),
                        \OC::$server->query(SetEnterpriseLogo::class),
                ];

diff --git a/lib/private/Repair/NC16/RemoveCypressFiles.php b/lib/private/Repair/NC16/RemoveCypressFiles.php
deleted file mode 100644 (file)
index 400d822..0000000
--- a/lib/private/Repair/NC16/RemoveCypressFiles.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-declare(strict_types=1);
-/**
- * @copyright Copyright (c) 2019, Morris Jobke <hey@morrisjobke.de>
- *
- * @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 <http://www.gnu.org/licenses/>.
- *
- */
-
-namespace OC\Repair\NC16;
-
-use OC\IntegrityCheck\Checker;
-use OCP\Migration\IOutput;
-use OCP\Migration\IRepairStep;
-
-/**
- * Class CleanupCypressFiles
- *
- * This repair step removes "cypress" files and folder created by viewer app in 16.0.1
- *
- * See https://github.com/nextcloud/server/issues/16229 for more details.
- *
- * @deprecated - can be removed in 18 because this is the first version where no migration from 16 can happen
- */
-class RemoveCypressFiles implements IRepairStep {
-
-       /** @var Checker $checker */
-       private $checker;
-
-       private $pathToViewerApp = __DIR__ . '/../../../../apps/viewer';
-
-       public function getName(): string {
-               return 'Cleanup cypress files from viewer app';
-       }
-
-       public function __construct(Checker $checker) {
-               $this->checker = $checker;
-       }
-
-       public function run(IOutput $output): void {
-               if (\OC_Util::getChannel() === 'git') {
-                       return;
-               }
-               
-               $file = $this->pathToViewerApp . '/cypress.json';
-               if (file_exists($file)) {
-                       unlink($file);
-               }
-
-               $dir = $this->pathToViewerApp . '/cypress';
-               if (is_dir($dir)) {
-                       $files = new \RecursiveIteratorIterator(
-                               new \RecursiveDirectoryIterator($dir, \RecursiveDirectoryIterator::SKIP_DOTS),
-                               \RecursiveIteratorIterator::CHILD_FIRST
-                       );
-
-                       foreach ($files as $fileInfo) {
-                               /** @var \SplFileInfo $fileInfo */
-                               if ($fileInfo->isLink()) {
-                                       unlink($fileInfo->getPathname());
-                               } else if ($fileInfo->isDir()) {
-                                       rmdir($fileInfo->getRealPath());
-                               } else {
-                                       unlink($fileInfo->getRealPath());
-                               }
-                       }
-                       rmdir($dir);
-               }
-
-               // re-run the instance verification
-               $this->checker->runInstanceVerification();
-       }
-}