Merge pull request #610 from nextcloud/enh/noid/bumps

Support NC 31, drop 24,25 and with it PHP <8.0 support
nextcloud · Jan 17, 2025 · 0c39f51 · 0c39f51
2 parents 8f350ca + 25b019c
commit 0c39f51
Show file tree

Hide file tree

Showing 33 changed files with 213 additions and 132 deletions.
diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -15,7 +15,7 @@
 	Microsoft Official Documentation: [Deploying Office Online Server](https://docs.microsoft.com/en-us/officeonlineserver/deploy-office-online-server)]]>
 	</description>
 
-	<version>2.3.2</version>
+	<version>3.0.0</version>
 	<licence>agpl</licence>
 
 	<author>Julius Härtl</author>
@@ -38,7 +38,7 @@
 	<screenshot>https://github.com/nextcloud/officeonline/raw/main/screenshot.png</screenshot>
 
 	<dependencies>
-		<nextcloud min-version="24" max-version="30"/>
+		<nextcloud min-version="26" max-version="31"/>
 	</dependencies>
 
 	<settings>

diff --git a/composer.json b/composer.json
@@ -9,7 +9,7 @@
 	"config": {
 		"sort-packages": true,
 		"platform": {
-			"php": "7.4"
+			"php": "8.0"
 		}
 	},
 	"require": {
@@ -24,7 +24,7 @@
 		"test:unit": "phpunit -c tests/phpunit.xml"
 	},
 	"require-dev": {
-		"nextcloud/ocp": "dev-stable24",
+		"nextcloud/ocp": "dev-stable26",
 		"nextcloud/coding-standard": "^1.0.0",
 		"phpunit/phpunit": "^9",
 		"roave/security-advisories": "dev-latest"

diff --git a/composer.lock b/composer.lock
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later

diff --git a/lib/Capabilities.php b/lib/Capabilities.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later

diff --git a/lib/Command/UpdateEmptyTemplates.php b/lib/Command/UpdateEmptyTemplates.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later

diff --git a/lib/Controller/DocumentController.php b/lib/Controller/DocumentController.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2014 ownCloud, Inc., Victor Dubiniuk <[email protected]>
@@ -89,7 +90,7 @@ public function __construct(
 		LoggerInterface $logger,
 		\OCA\Officeonline\TemplateManager $templateManager,
 		FederationService $federationService,
-		Helper $helper
+		Helper $helper,
 	) {
 		parent::__construct($appName, $request);
 		$this->uid = $UserId;

diff --git a/lib/Controller/FederationController.php b/lib/Controller/FederationController.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
@@ -30,7 +31,7 @@ public function __construct(
 		IRequest $request,
 		IConfig $config,
 		WopiMapper $wopiMapper,
-		IManager $shareManager
+		IManager $shareManager,
 	) {
 		parent::__construct($appName, $request);
 		$this->config = $config;

diff --git a/lib/Controller/OCSController.php b/lib/Controller/OCSController.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
@@ -55,7 +56,7 @@ public function __construct(string $appName,
 		DirectMapper $directMapper,
 		IURLGenerator $urlGenerator,
 		TemplateManager $manager,
-		FederationService $federationService
+		FederationService $federationService,
 	) {
 		parent::__construct($appName, $request);
 

diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
@@ -33,7 +34,7 @@ public function __construct($appName,
 		IL10N $l10n,
 		AppConfig $appConfig,
 		DiscoveryManager $discoveryManager,
-		LoggerInterface $logger
+		LoggerInterface $logger,
 	) {
 		parent::__construct($appName, $request);
 		$this->l10n = $l10n;

diff --git a/lib/Controller/WopiController.php b/lib/Controller/WopiController.php
@@ -129,7 +129,7 @@ public function __construct(
 		WopiLockMapper $lockMapper,
 		ITimeFactory $timeFactory,
 		WopiLockHooks $lockHooks,
-		ILockManager $lockManager
+		ILockManager $lockManager,
 	) {
 		parent::__construct($appName, $request);
 		$this->rootFolder = $rootFolder;

diff --git a/lib/Db/Direct.php b/lib/Db/Direct.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later

diff --git a/lib/Db/DirectMapper.php b/lib/Db/DirectMapper.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later

diff --git a/lib/Db/Wopi.php b/lib/Db/Wopi.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later

diff --git a/lib/Db/WopiMapper.php b/lib/Db/WopiMapper.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later

diff --git a/lib/Listener/SharingLoadAdditionalScriptsListener.php b/lib/Listener/SharingLoadAdditionalScriptsListener.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later

diff --git a/lib/Middleware/WOPIMiddleware.php b/lib/Middleware/WOPIMiddleware.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later

diff --git a/lib/PermissionManager.php b/lib/PermissionManager.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later

diff --git a/lib/Preview/MSExcel.php b/lib/Preview/MSExcel.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2018 Collabora Productivity

diff --git a/lib/Preview/MSWord.php b/lib/Preview/MSWord.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2018 Collabora Productivity

diff --git a/lib/Preview/OOXML.php b/lib/Preview/OOXML.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2018 Collabora Productivity

diff --git a/lib/Preview/Office.php b/lib/Preview/Office.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2018 Collabora Productivity

diff --git a/lib/Preview/OpenDocument.php b/lib/Preview/OpenDocument.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2018 Collabora Productivity

diff --git a/lib/Preview/Pdf.php b/lib/Preview/Pdf.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later

diff --git a/lib/Service/CapabilitiesService.php b/lib/Service/CapabilitiesService.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later

diff --git a/lib/Service/FederationService.php b/lib/Service/FederationService.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later

diff --git a/lib/Service/UserScopeService.php b/lib/Service/UserScopeService.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later

diff --git a/lib/Settings/Admin.php b/lib/Settings/Admin.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
@@ -23,7 +24,7 @@ class Admin implements ISettings {
 	public function __construct(
 		IConfig $config,
 		AppConfig $appConfig,
-		TemplateManager $manager
+		TemplateManager $manager,
 	) {
 		$this->config = $config;
 		$this->appConfig = $appConfig;

diff --git a/lib/Settings/Section.php b/lib/Settings/Section.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later

diff --git a/lib/TokenManager.php b/lib/TokenManager.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
@@ -68,7 +69,7 @@ public function __construct(
 		IL10N $trans,
 		IUserManager $userManager,
 		IGroupManager $groupManager,
-		Helper $helper
+		Helper $helper,
 	) {
 		$this->rootFolder = $rootFolder;
 		$this->shareManager = $shareManager;

diff --git a/lib/WOPI/DiscoveryManager.php b/lib/WOPI/DiscoveryManager.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later

diff --git a/lib/WOPI/Parser.php b/lib/WOPI/Parser.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later

diff --git a/tests/lib/PermissionManagerTest.php b/tests/lib/PermissionManagerTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later