Merge branch 'master' into dependabot/npm_and_yarn/multi-c22e25d29b

Author: CarlSchwan

.github/workflows/lint-php-cs.yml

@@ -0,0 +1,52 @@
+# This workflow is provided via the organization template repository
+#
+# https://github.com/nextcloud/.github
+# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
+#
+# SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: MIT
+
+name: Lint php-cs
+
+on: pull_request
+
+permissions:
+  contents: read
+
+concurrency:
+  group: lint-php-cs-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+
+    name: php-cs
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          persist-credentials: false
+
+      - name: Get php version
+        id: versions
+        uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1
+
+      - name: Set up php${{ steps.versions.outputs.php-min }}
+        uses: shivammathur/setup-php@0f7f1d08e3e32076e51cae65eb0b0c871405b16e # v2.34.1
+        with:
+          php-version: ${{ steps.versions.outputs.php-min }}
+          extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
+          coverage: none
+          ini-file: development
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Install dependencies
+        run: |
+          composer remove nextcloud/ocp --dev --no-scripts
+          composer i
+
+      - name: Lint
+        run: composer run cs:check || ( echo 'Please run `composer run cs:fix` to format your code' && exit 1 )

.php-cs-fixer.dist.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+require_once './vendor-bin/cs-fixer/vendor/autoload.php';
+
+use Nextcloud\CodingStandard\Config;
+
+$config = new Config();
+$config
+	->getFinder()
+	->ignoreVCSIgnored(true)
+	->notPath('build')
+	->notPath('tests/stubs')
+	->notPath('l10n')
+	->notPath('src')
+	->notPath('vendor')
+	->in(__DIR__);
+return $config;

CHANGELOG.md

@@ -5,6 +5,10 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## 4.7.0
+### Changed
+- Migrate to outline icons
+
 ## 4.6.0
 ### Changed
 - Updated dependencies

appinfo/info.xml

@@ -11,7 +11,7 @@
 	<description><![CDATA[Requires users to accept the terms of service before accessing data.
 This product includes GeoLite2 data created by MaxMind, available from [maxmind.com](http://www.maxmind.com)]]></description>
 
-	<version>4.6.0</version>
+	<version>4.7.0-rc.1</version>
 	<licence>agpl</licence>
 	<author>Joas Schilling</author>
 
@@ -33,7 +33,7 @@ This product includes GeoLite2 data created by MaxMind, available from [maxmind.
 	<screenshot>https://github.com/nextcloud/terms_of_service/raw/master/docs/notification-and-settings.png</screenshot>
 
 	<dependencies>
-		<nextcloud min-version="28" max-version="32" />
+		<nextcloud min-version="30" max-version="33" />
 	</dependencies>
 
 	<commands>

appinfo/routes.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later

composer.json

@@ -11,7 +11,7 @@
 		"autoloader-suffix": "TermsOfService",
 		"optimize-autoloader": true,
 		"platform": {
-			"php": "8.0.2"
+			"php": "8.1"
 		},
 		"sort-packages": true
 	},
@@ -27,7 +27,10 @@
 	"scripts": {
 		"bin": "echo 'bin not installed'",
 		"lint": "find . -name \\*.php -not -path './vendor/*' -print0 | xargs -0 -n1 php -l",
+		"cs:check": "php-cs-fixer fix --dry-run --diff",
+		"cs:fix": "php-cs-fixer fix",
 		"openapi": "generate-spec --verbose",
+		"rector": "rector && composer cs:fix",
 		"post-install-cmd": [
 			"@composer bin all install --ansi",
 			"composer dump-autoload"

js/terms_of_service-admin.js

@@ -99,7 +99,7 @@ This file is generated from multiple sources. Included packages:
 	- version: 11.0.3
 	- license: MIT
 - axios
-	- version: 1.9.0
+	- version: 1.12.2
 	- license: MIT
 - base64-js
 	- version: 1.5.1
@@ -180,5 +180,5 @@ This file is generated from multiple sources. Included packages:
 	- version: 5.94.0
 	- license: MIT
 - terms_of_service
-	- version: 4.6.0
+	- version: 4.7.0-rc.1
 	- license: AGPL-3.0-or-later