Merge pull request #580 from nextcloud/chore/align-dependencies-nc24

chore: Align dependencies (and PHP version) with current lowest supported Nextcloud version
nextcloud · Aug 21, 2024 · e13398a · e13398a
2 parents 8cc9ccf + 16516bb
commit e13398a
Show file tree

Hide file tree

Showing 17 changed files with 1,554 additions and 3,145 deletions.
diff --git a/composer.json b/composer.json
@@ -9,7 +9,7 @@
 	"config": {
 		"sort-packages": true,
 		"platform": {
-			"php": "7.3"
+			"php": "7.4"
 		}
 	},
 	"require": {
@@ -24,7 +24,7 @@
 		"test:unit": "phpunit -c tests/phpunit.xml"
 	},
 	"require-dev": {
-		"christophwurst/nextcloud": "dev-stable22",
+		"nextcloud/ocp": "dev-stable24",
 		"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/AppConfig.php b/lib/AppConfig.php
@@ -28,8 +28,8 @@
 
 namespace OCA\Officeonline;
 
-use OCA\Officeonline\AppInfo\Application;
 use \OCP\IConfig;
+use OCA\Officeonline\AppInfo\Application;
 
 class AppConfig {
 	private $defaults = [

diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
@@ -30,8 +30,8 @@
 use OCA\Files_Sharing\Event\BeforeTemplateRenderedEvent;
 use OCA\Officeonline\Capabilities;
 use OCA\Officeonline\Hooks\WopiLockHooks;
-use OCA\Officeonline\Listener\SharingLoadAdditionalScriptsListener;
 use OCA\Officeonline\Listener\LoadViewerListener;
+use OCA\Officeonline\Listener\SharingLoadAdditionalScriptsListener;
 use OCA\Officeonline\Middleware\WOPIMiddleware;
 use OCA\Officeonline\PermissionManager;
 use OCA\Officeonline\Preview\MSExcel;
@@ -47,10 +47,10 @@
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
 use OCP\Files\Template\ITemplateManager;
 use OCP\Files\Template\TemplateFileCreator;
+use OCP\IConfig;
+use OCP\IL10N;
 use OCP\IPreview;
 use Psr\Log\LoggerInterface;
-use OCP\IL10N;
-use OCP\IConfig;
 
 class Application extends App implements IBootstrap {
 	public const APP_ID = 'officeonline';

diff --git a/lib/Controller/DocumentController.php b/lib/Controller/DocumentController.php
@@ -11,9 +11,18 @@
 
 namespace OCA\Officeonline\Controller;
 
+use \OCA\Officeonline\AppConfig;
+use \OCA\Officeonline\Helper;
+use \OCP\AppFramework\Controller;
+use \OCP\AppFramework\Http\ContentSecurityPolicy;
+use \OCP\AppFramework\Http\TemplateResponse;
+use \OCP\IConfig;
+use \OCP\IL10N;
+use \OCP\ILogger;
+use \OCP\IRequest;
+use OC\Files\Type\TemplateManager;
 use OCA\Officeonline\Service\FederationService;
 use OCA\Officeonline\TokenManager;
-use \OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\AppFramework\Http\RedirectResponse;
@@ -25,18 +34,9 @@
 use OCP\Files\Node;
 use OCP\Files\NotFoundException;
 use OCP\Files\NotPermittedException;
-use \OCP\IRequest;
-use \OCP\IConfig;
-use \OCP\IL10N;
-use \OCP\ILogger;
-use \OCP\AppFramework\Http\ContentSecurityPolicy;
-use \OCP\AppFramework\Http\TemplateResponse;
-use \OCA\Officeonline\AppConfig;
-use \OCA\Officeonline\Helper;
 use OCP\ISession;
 use OCP\Share\Exceptions\ShareNotFound;
 use OCP\Share\IManager;
-use OC\Files\Type\TemplateManager;
 
 class DocumentController extends Controller {
 	/** @var string */
@@ -485,8 +485,8 @@ public function remote($shareToken, $remoteServer, $remoteServerToken, $filePath
 	 * @throws GenericFileException
 	 */
 	public function create($mimetype,
-						   $filename,
-						   $dir = '/') {
+		$filename,
+		$dir = '/') {
 		$root = $this->rootFolder->getUserFolder($this->uid);
 		try {
 			/** @var Folder $folder */

diff --git a/lib/Controller/FederationController.php b/lib/Controller/FederationController.php
@@ -22,10 +22,10 @@
  */
 namespace OCA\Officeonline\Controller;
 
-use OCP\AppFramework\Db\DoesNotExistException;
-use OCP\AppFramework\Http;
 use \OCP\AppFramework\OCSController;
 use OCA\Officeonline\Db\WopiMapper;
+use OCP\AppFramework\Db\DoesNotExistException;
+use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\IConfig;
 use OCP\IRequest;

diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php
@@ -11,16 +11,16 @@
 
 namespace OCA\Officeonline\Controller;
 
+use \OCP\AppFramework\Controller;
+use \OCP\IL10N;
+use \OCP\IRequest;
 use Exception;
+use OCA\Officeonline\AppConfig;
 use OCA\Officeonline\WOPI\DiscoveryManager;
-use \OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\ILogger;
-use \OCP\IRequest;
-use \OCP\IL10N;
-use OCA\Officeonline\AppConfig;
 
 class SettingsController extends Controller {
 
@@ -80,12 +80,12 @@ public function getSettings(): JSONResponse {
 	}
 
 	public function setSettings($wopi_url,
-								$disable_certificate_verification,
-								$edit_groups,
-								$use_groups,
-								$doc_format,
-								$external_apps,
-								$canonical_webroot): JSONResponse {
+		$disable_certificate_verification,
+		$edit_groups,
+		$use_groups,
+		$doc_format,
+		$external_apps,
+		$canonical_webroot): JSONResponse {
 		$message = $this->l10n->t('Saved');
 
 		if ($wopi_url !== null) {

diff --git a/lib/Controller/TemplatesController.php b/lib/Controller/TemplatesController.php
@@ -25,6 +25,7 @@
 
 namespace OCA\Officeonline\Controller;
 
+use OC\Files\Filesystem;
 use OCA\Officeonline\TemplateManager;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
@@ -38,7 +39,6 @@
 use OCP\IL10N;
 use OCP\IPreview;
 use OCP\IRequest;
-use OC\Files\Filesystem;
 
 class TemplatesController extends Controller {
 	/** @var IL10N */
@@ -63,10 +63,10 @@ class TemplatesController extends Controller {
 	 * @param IPreview $preview
 	 */
 	public function __construct($appName,
-								IRequest $request,
-								IL10N $l10n,
-								TemplateManager $manager,
-								IPreview $preview) {
+		IRequest $request,
+		IL10N $l10n,
+		TemplateManager $manager,
+		IPreview $preview) {
 		parent::__construct($appName, $request);
 
 		$this->appName = $appName;

diff --git a/lib/Controller/WopiController.php b/lib/Controller/WopiController.php
@@ -22,33 +22,34 @@
 namespace OCA\Officeonline\Controller;
 
 use Exception;
-use OCP\Files\Lock\LockContext;
-use OCP\Files\Lock\ILock;
+use OC\Files\View;
+use OCA\Officeonline\AppConfig;
 use OCA\Officeonline\AppInfo\Application;
 
-use OC\Files\View;
 use OCA\Officeonline\Db\Wopi;
-use OCA\Officeonline\AppConfig;
 use OCA\Officeonline\Db\WopiLock;
 use OCA\Officeonline\Db\WopiLockMapper;
 use OCA\Officeonline\Db\WopiMapper;
+use OCA\Officeonline\Helper;
 use OCA\Officeonline\Hooks\WopiLockHooks;
 use OCA\Officeonline\Service\UserScopeService;
 use OCA\Officeonline\TemplateManager;
 use OCA\Officeonline\TokenManager;
-use OCA\Officeonline\Helper;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\Http\JSONResponse;
+use OCP\AppFramework\Http\StreamResponse;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\Files\File;
 use OCP\Files\Folder;
 use OCP\Files\GenericFileException;
 use OCP\Files\InvalidPathException;
 use OCP\Files\IRootFolder;
+use OCP\Files\Lock\ILock;
 use OCP\Files\Lock\ILockManager;
+use OCP\Files\Lock\LockContext;
 use OCP\Files\Lock\NoLockProviderException;
 use OCP\Files\Lock\OwnerLockedException;
 use OCP\Files\Node;
@@ -58,7 +59,6 @@
 use OCP\ILogger;
 use OCP\IRequest;
 use OCP\IURLGenerator;
-use OCP\AppFramework\Http\StreamResponse;
 use OCP\IUserManager;
 use OCP\Lock\LockedException;
 use OCP\PreConditionNotMetException;
@@ -288,7 +288,7 @@ private function setFederationFileInfo($wopi, $response) {
 	 * @throws NotPermittedException
 	 */
 	public function getFile($fileId,
-							$access_token) {
+		$access_token) {
 		[$fileId, , $version] = Helper::parseFileId($fileId);
 
 		$wopi = $this->wopiMapper->getWopiForToken($access_token);
@@ -538,7 +538,7 @@ private function getLock(Wopi $wopi): JSONResponse {
 	 * @return JSONResponse
 	 */
 	public function putFile($fileId,
-							$access_token) {
+		$access_token) {
 		[$fileId, ,] = Helper::parseFileId($fileId);
 		$isPutRelative = ($this->request->getHeader('X-WOPI-Override') === 'PUT_RELATIVE');
 		$isRenameFile = ($this->request->getHeader('X-WOPI-Override') === 'RENAME_FILE');

diff --git a/lib/Db/DirectMapper.php b/lib/Db/DirectMapper.php
@@ -41,8 +41,8 @@ class DirectMapper extends QBMapper {
 	protected $timeFactory;
 
 	public function __construct(IDBConnection $db,
-								ISecureRandom $random,
-								ITimeFactory $timeFactory) {
+		ISecureRandom $random,
+		ITimeFactory $timeFactory) {
 		parent::__construct($db, 'officeonline_direct', Direct::class);
 
 		$this->random = $random;

diff --git a/lib/Db/WopiMapper.php b/lib/Db/WopiMapper.php
@@ -43,9 +43,9 @@ class WopiMapper extends QBMapper {
 	private $timeFactory;
 
 	public function __construct(IDBConnection $db,
-								ISecureRandom $random,
-								ILogger $logger,
-								ITimeFactory $timeFactory) {
+		ISecureRandom $random,
+		ILogger $logger,
+		ITimeFactory $timeFactory) {
 		parent::__construct($db, 'officeonline_wopi', Wopi::class);
 
 		$this->random = $random;

diff --git a/lib/Hooks/WopiLockHooks.php b/lib/Hooks/WopiLockHooks.php
@@ -2,9 +2,9 @@
 
 namespace OCA\Officeonline\Hooks;
 
+use OCA\Officeonline\Db\WopiLockMapper;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\Files\File;
-use OCA\Officeonline\Db\WopiLockMapper;
 use OCP\Files\InvalidPathException;
 use OCP\Files\IRootFolder;
 use OCP\Files\Node;

diff --git a/lib/Migration/Version1000Date20200826201000.php b/lib/Migration/Version1000Date20200826201000.php
@@ -6,8 +6,8 @@
 
 use Closure;
 use OCP\DB\ISchemaWrapper;
-use OCP\Migration\SimpleMigrationStep;
 use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
 
 class Version1000Date20200826201000 extends SimpleMigrationStep {
 	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {

diff --git a/lib/PermissionManager.php b/lib/PermissionManager.php
@@ -34,7 +34,7 @@ class PermissionManager {
 	private $groupManager;
 
 	public function __construct(IConfig $config,
-								IGroupManager $groupManager) {
+		IGroupManager $groupManager) {
 		$this->config = $config;
 		$this->groupManager = $groupManager;
 	}

diff --git a/lib/TemplateManager.php b/lib/TemplateManager.php
@@ -25,6 +25,7 @@
 
 namespace OCA\Officeonline;
 
+use OC\Files\AppData\Factory;
 use OCP\Files\File;
 use OCP\Files\Folder;
 use OCP\Files\IAppData;
@@ -34,7 +35,6 @@
 use OCP\IConfig;
 use OCP\IL10N;
 use OCP\IURLGenerator;
-use OC\Files\AppData\Factory;
 
 class TemplateManager {
 
@@ -117,12 +117,12 @@ class TemplateManager {
 	 * @throws \OCP\Files\NotPermittedException
 	 */
 	public function __construct($appName,
-								$userId,
-								IConfig $config,
-								IAppData $appData,
-								IURLGenerator $urlGenerator,
-								IRootFolder $rootFolder,
-								IL10N $l) {
+		$userId,
+		IConfig $config,
+		IAppData $appData,
+		IURLGenerator $urlGenerator,
+		IRootFolder $rootFolder,
+		IL10N $l) {
 		$this->appName = $appName;
 		$this->userId = $userId;
 		$this->config = $config;

diff --git a/lib/TokenManager.php b/lib/TokenManager.php
@@ -21,18 +21,18 @@
 
 namespace OCA\Officeonline;
 
-use OCA\Officeonline\Db\WopiMapper;
 use OCA\Officeonline\Db\Wopi;
+use OCA\Officeonline\Db\WopiMapper;
 use OCA\Officeonline\Service\CapabilitiesService;
 use OCA\Officeonline\WOPI\Parser;
 use OCP\Files\File;
 use OCP\Files\IRootFolder;
 use OCP\Files\Node;
 use OCP\IGroupManager;
+use OCP\IL10N;
 use OCP\IURLGenerator;
 use OCP\IUserManager;
 use OCP\Share\IManager;
-use OCP\IL10N;
 use OCP\Util;
 
 class TokenManager {

diff --git a/lib/WOPI/DiscoveryManager.php b/lib/WOPI/DiscoveryManager.php
@@ -49,10 +49,10 @@ class DiscoveryManager {
 	 * @param ITimeFactory $timeFactory
 	 */
 	public function __construct(IClientService $clientService,
-								IAppData $appData,
-								IConfig $config,
-								IL10N $l10n,
-								ITimeFactory $timeFactory) {
+		IAppData $appData,
+		IConfig $config,
+		IL10N $l10n,
+		ITimeFactory $timeFactory) {
 		$this->clientService = $clientService;
 		try {
 			$this->appData = $appData->getFolder('officeonline');