nextcloud · provokateurin · Sep 14, 2024 · Sep 14, 2024 · Sep 15, 2024
diff --git a/build/fix-strict-types.php b/build/fix-strict-types.php
@@ -0,0 +1,56 @@
+#!/usr/bin/env php
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+include __DIR__ . '/../build/integration/vendor/autoload.php';
+
+use PhpParser\Node\DeclareItem;
+use PhpParser\Node\Stmt\Declare_;
+use PhpParser\NodeTraverser;
+use PhpParser\NodeVisitor\CloningVisitor;
+use PhpParser\NodeVisitor\NameResolver;
+use PhpParser\ParserFactory;
+use PhpParser\PrettyPrinter;
+
+$parser = (new ParserFactory())->createForHostVersion();
+
+$nodeTraverser = new NodeTraverser();
+$nodeTraverser->addVisitor(new CloningVisitor());
+$nodeTraverser->addVisitor(new NameResolver());
+
+$prettyPrinter = new PrettyPrinter\Standard();
+
+$iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator('lib'));
+
+/** @var SplFileInfo $info */
+foreach ($iterator as $info) {
+	if ($info->getType() !== 'file' || $info->getExtension() !== 'php') {
+		continue;
+	}
+
+	error_log($info->getRealPath());
+
+	$code = file_get_contents($info->getRealPath());
+	$oldStmts = $parser->parse($code);
+	$oldTokens = $parser->getTokens();
+	$newStmts = $nodeTraverser->traverse($oldStmts);
+
+	$hasStrictTypes = false;
+	foreach ($newStmts as $stmt) {
+		if ($stmt instanceof Declare_) {
+			$hasStrictTypes = true;
+			break;
+		}
+	}
+
+	if (!$hasStrictTypes) {
+		array_unshift($newStmts, new Declare_([new DeclareItem('strict_types', new PhpParser\Node\Scalar\Int_(1))]));
+		file_put_contents($info->getRealPath(), $prettyPrinter->printFormatPreserving($newStmts, $oldStmts, $oldTokens));
+	}
+}
diff --git a/lib/composer/autoload.php b/lib/composer/autoload.php
@@ -1,5 +1,6 @@
 <?php
 
+declare (strict_types=1);
 // autoload.php @generated by Composer
 
 if (PHP_VERSION_ID < 50600) {

diff --git a/lib/composer/composer/ClassLoader.php b/lib/composer/composer/ClassLoader.php
@@ -1,5 +1,6 @@
 <?php
 
+declare (strict_types=1);
 /*
  * This file is part of Composer.
  *
@@ -9,7 +10,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 namespace Composer\Autoload;
 
 /**
@@ -576,4 +576,4 @@ private static function initializeIncludeClosure()
             include $file;
         }, null, null);
     }
-}
+}
diff --git a/lib/composer/composer/InstalledVersions.php b/lib/composer/composer/InstalledVersions.php
@@ -1,5 +1,6 @@
 <?php
 
+declare (strict_types=1);
 /*
  * This file is part of Composer.
  *
@@ -9,7 +10,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 namespace Composer;
 
 use Composer\Autoload\ClassLoader;
@@ -356,4 +356,4 @@ private static function getInstalled()
 
         return $installed;
     }
-}
+}
diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php
@@ -1,5 +1,6 @@
 <?php
 
+declare (strict_types=1);
 // autoload_classmap.php @generated by Composer
 
 $vendorDir = dirname(__DIR__);

diff --git a/lib/composer/composer/autoload_files.php b/lib/composer/composer/autoload_files.php
@@ -1,5 +1,6 @@
 <?php
 
+declare (strict_types=1);
 // autoload_files.php @generated by Composer
 
 $vendorDir = dirname(__DIR__);

diff --git a/lib/composer/composer/autoload_namespaces.php b/lib/composer/composer/autoload_namespaces.php
@@ -1,5 +1,6 @@
 <?php
 
+declare (strict_types=1);
 // autoload_namespaces.php @generated by Composer
 
 $vendorDir = dirname(__DIR__);

diff --git a/lib/composer/composer/autoload_psr4.php b/lib/composer/composer/autoload_psr4.php
@@ -1,5 +1,6 @@
 <?php
 
+declare (strict_types=1);
 // autoload_psr4.php @generated by Composer
 
 $vendorDir = dirname(__DIR__);

diff --git a/lib/composer/composer/autoload_real.php b/lib/composer/composer/autoload_real.php
@@ -1,7 +1,7 @@
 <?php
 
+declare (strict_types=1);
 // autoload_real.php @generated by Composer
-
 class ComposerAutoloaderInit749170dad3f5e7f9ca158f5a9f04f6a2
 {
     private static $loader;
@@ -47,4 +47,4 @@ public static function getLoader()
 
         return $loader;
     }
-}
+}
diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php
@@ -1,7 +1,7 @@
 <?php
 
+declare (strict_types=1);
 // autoload_static.php @generated by Composer
-
 namespace Composer\Autoload;
 
 class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
@@ -2058,4 +2058,4 @@ public static function getInitializer(ClassLoader $loader)
 
         }, null, ClassLoader::class);
     }
-}
+}
diff --git a/lib/composer/composer/installed.php b/lib/composer/composer/installed.php
@@ -1,4 +1,7 @@
-<?php return array(
+<?php
+
+declare (strict_types=1);
+return array(
     'root' => array(
         'name' => '__root__',
         'pretty_version' => 'dev-master',
@@ -20,4 +23,4 @@
             'dev_requirement' => false,
         ),
     ),
-);
+);
diff --git a/lib/composer/composer/platform_check.php b/lib/composer/composer/platform_check.php
@@ -1,5 +1,6 @@
 <?php
 
+declare (strict_types=1);
 // platform_check.php @generated by Composer
 
 $issues = array();

diff --git a/lib/private/Accounts/AccountManager.php b/lib/private/Accounts/AccountManager.php
@@ -1,11 +1,11 @@
 <?php
 
+declare (strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 namespace OC\Accounts;
 
 use Exception;

diff --git a/lib/private/Accounts/Hooks.php b/lib/private/Accounts/Hooks.php
@@ -1,4 +1,6 @@
 <?php
+
+declare (strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later

diff --git a/lib/private/Activity/EventMerger.php b/lib/private/Activity/EventMerger.php
@@ -1,4 +1,6 @@
 <?php
+
+declare (strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later

diff --git a/lib/private/Activity/Manager.php b/lib/private/Activity/Manager.php
@@ -1,4 +1,6 @@
 <?php
+
+declare (strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.

diff --git a/lib/private/AllConfig.php b/lib/private/AllConfig.php
@@ -1,4 +1,6 @@
 <?php
+
+declare (strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.

diff --git a/lib/private/App/AppManager.php b/lib/private/App/AppManager.php
@@ -1,4 +1,6 @@
 <?php
+
+declare (strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.

diff --git a/lib/private/App/AppStore/Bundles/Bundle.php b/lib/private/App/AppStore/Bundles/Bundle.php
@@ -1,4 +1,6 @@
 <?php
+
+declare (strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later

diff --git a/lib/private/App/AppStore/Bundles/BundleFetcher.php b/lib/private/App/AppStore/Bundles/BundleFetcher.php
@@ -1,4 +1,6 @@
 <?php
+
+declare (strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later

diff --git a/lib/private/App/AppStore/Bundles/EducationBundle.php b/lib/private/App/AppStore/Bundles/EducationBundle.php
@@ -1,4 +1,6 @@
 <?php
+
+declare (strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later

diff --git a/lib/private/App/AppStore/Bundles/EnterpriseBundle.php b/lib/private/App/AppStore/Bundles/EnterpriseBundle.php
@@ -1,4 +1,6 @@
 <?php
+
+declare (strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later

diff --git a/lib/private/App/AppStore/Bundles/GroupwareBundle.php b/lib/private/App/AppStore/Bundles/GroupwareBundle.php
@@ -1,4 +1,6 @@
 <?php
+
+declare (strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later

diff --git a/lib/private/App/AppStore/Bundles/PublicSectorBundle.php b/lib/private/App/AppStore/Bundles/PublicSectorBundle.php
@@ -1,4 +1,6 @@
 <?php
+
+declare (strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later

diff --git a/lib/private/App/AppStore/Bundles/SocialSharingBundle.php b/lib/private/App/AppStore/Bundles/SocialSharingBundle.php
@@ -1,4 +1,6 @@
 <?php
+
+declare (strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later

diff --git a/lib/private/App/AppStore/Fetcher/AppDiscoverFetcher.php b/lib/private/App/AppStore/Fetcher/AppDiscoverFetcher.php
@@ -1,9 +1,10 @@
 <?php
+
+declare (strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-
 namespace OC\App\AppStore\Fetcher;
 
 use DateTimeImmutable;

diff --git a/lib/private/App/AppStore/Fetcher/AppFetcher.php b/lib/private/App/AppStore/Fetcher/AppFetcher.php
@@ -1,4 +1,6 @@
 <?php
+
+declare (strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later

diff --git a/lib/private/App/AppStore/Fetcher/CategoryFetcher.php b/lib/private/App/AppStore/Fetcher/CategoryFetcher.php
@@ -1,4 +1,6 @@
 <?php
+
+declare (strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later

diff --git a/lib/private/App/AppStore/Fetcher/Fetcher.php b/lib/private/App/AppStore/Fetcher/Fetcher.php
@@ -1,4 +1,6 @@
 <?php
+
+declare (strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later

diff --git a/lib/private/App/AppStore/Version/Version.php b/lib/private/App/AppStore/Version/Version.php
@@ -1,4 +1,6 @@
 <?php
+
+declare (strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later

diff --git a/lib/private/App/AppStore/Version/VersionParser.php b/lib/private/App/AppStore/Version/VersionParser.php
@@ -1,4 +1,6 @@
 <?php
+
+declare (strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later

diff --git a/lib/private/App/DependencyAnalyzer.php b/lib/private/App/DependencyAnalyzer.php
@@ -1,4 +1,6 @@
 <?php
+
+declare (strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.

diff --git a/lib/private/App/InfoParser.php b/lib/private/App/InfoParser.php
@@ -1,4 +1,6 @@
 <?php
+
+declare (strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -35,7 +37,7 @@
 		}

 		libxml_use_internal_errors(true);
 		$xml = simplexml_load_string(file_get_contents($file));

 		if ($xml === false) {
 			libxml_clear_errors();

diff --git a/lib/private/App/Platform.php b/lib/private/App/Platform.php
@@ -1,4 +1,6 @@
 <?php
+
+declare (strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.

diff --git a/lib/private/App/PlatformRepository.php b/lib/private/App/PlatformRepository.php
@@ -1,4 +1,6 @@
 <?php
+
+declare (strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.

diff --git a/lib/private/AppFramework/DependencyInjection/DIContainer.php b/lib/private/AppFramework/DependencyInjection/DIContainer.php
@@ -1,4 +1,6 @@
 <?php
+
+declare (strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.

diff --git a/lib/private/AppFramework/Http.php b/lib/private/AppFramework/Http.php
@@ -1,5 +1,6 @@
 <?php
 
+declare (strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.

diff --git a/lib/private/AppFramework/Http/Output.php b/lib/private/AppFramework/Http/Output.php
@@ -1,5 +1,6 @@
 <?php
 
+declare (strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.

diff --git a/lib/private/AppFramework/Middleware/OCSMiddleware.php b/lib/private/AppFramework/Middleware/OCSMiddleware.php
@@ -1,4 +1,6 @@
 <?php
+
+declare (strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later

diff --git a/lib/private/AppFramework/Middleware/PublicShare/Exceptions/NeedAuthenticationException.php b/lib/private/AppFramework/Middleware/PublicShare/Exceptions/NeedAuthenticationException.php
@@ -1,4 +1,6 @@
 <?php
+
+declare (strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later