Merge pull request #3431 from nextcloud/stable-6-for-26

[stable6] Backport of stable 6 for Nextcloud 26
nextcloud · Apr 30, 2024 · bce814e · bce814e
2 parents dca7583 + c68cfd8
commit bce814e
Show file tree

Hide file tree

Showing 52 changed files with 528 additions and 569 deletions.
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -24,7 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         php-versions: ['8.0']
-        server-versions: ['master']
+        server-versions: ['stable26']
 
     name: SQLite
 
@@ -56,7 +56,7 @@ jobs:
       fail-fast: false
       matrix:
         php-versions: ['8.1']
-        server-versions: ['master']
+        server-versions: ['stable26']
 
     name: MySQL
 
@@ -99,7 +99,7 @@ jobs:
       fail-fast: false
       matrix:
         php-versions: ['8.2']
-        server-versions: ['master']
+        server-versions: ['stable26']
 
     name: PostgreSQL
 

diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -1,37 +1,37 @@
-name: Static analysis
-
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-      - next
-      - stable*
-
-jobs:
-  psalm-master:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ocp-version: ['master']
-        php-versions: ['8.0', '8.1', '8.2']
-
-    name: Psalm
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Setup composer and PHP
-        uses: ./.github/actions/setup-composer
-        with:
-          php-version: ${{ matrix.php-versions }}
-          php-tools: composer, psalm
-
-      - name: Install Nextcloud API
-        run: composer require --dev nextcloud/ocp:dev-${{ matrix.ocp-version }}
-
-      - name: Install symfony/console
-        run: composer require symfony/console
-
-      - name: Run coding standards check
-        run: composer run psalm
+name: Static analysis
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - next
+      - stable*
+
+jobs:
+  psalm-master:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ocp-version: ['stable26']
+        php-versions: ['8.0', '8.1', '8.2']
+
+    name: Psalm
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup composer and PHP
+        uses: ./.github/actions/setup-composer
+        with:
+          php-version: ${{ matrix.php-versions }}
+          php-tools: composer, psalm
+
+      - name: Install Nextcloud API
+        run: composer require --dev nextcloud/ocp:dev-${{ matrix.ocp-version }}
+
+      - name: Install symfony/console
+        run: composer require symfony/console
+
+      - name: Run coding standards check
+        run: composer run psalm
diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -23,7 +23,7 @@
   <screenshot>https://raw.githubusercontent.com/nextcloud/polls/master/screenshots/edit-poll.png</screenshot>
   <dependencies>
     <php min-version="8.0"/>
-    <nextcloud min-version="28" max-version="28"/>
+    <nextcloud min-version="26" max-version="28"/>
   </dependencies>
   <activity>
     <providers>
@@ -79,4 +79,4 @@
       <order>77</order>
     </navigation>
   </navigations>
-</info>
+</info>
diff --git a/composer.json b/composer.json
@@ -19,7 +19,10 @@
 		"autoloader-suffix": "Polls",
 		"platform": {
         "php": "8.0"
-      }
+      },
+		"allow-plugins": {
+			"bamarni/composer-bin-plugin": true
+		}
     },
 	"autoload": {
 		"psr-4": {
@@ -32,11 +35,11 @@
 		}
 	},
 	"require-dev": {
+		"doctrine/dbal": "^3.6",
 		"league/factory-muffin": "^3.0",
 		"league/factory-muffin-faker": "^2.0",
 		"nextcloud/coding-standard": "^1.0",
-		"nextcloud/ocp": "dev-stable27",
-		"doctrine/dbal": "^3.6"
+		"nextcloud/ocp": "dev-stable26"
 	},
 	"scripts": {
 		"cs:check": "php-cs-fixer fix --dry-run --diff",

diff --git a/composer.lock b/composer.lock
diff --git a/lib/Controller/AdminController.php b/lib/Controller/AdminController.php
@@ -28,7 +28,6 @@
 use OCA\Polls\AppConstants;
 use OCA\Polls\Db\UserMapper;
 use OCA\Polls\Service\PollService;
-use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\Collaboration\Resources\LoadAdditionalScriptsEvent;
@@ -52,7 +51,9 @@ public function __construct(
 		parent::__construct($appName, $request);
 	}
 
-	#[NoCSRFRequired]
+	/**
+	 * @NoCSRFRequired
+	 */
 	public function index(): TemplateResponse {
 		Util::addScript(AppConstants::APP_ID, 'polls-main');
 		$this->eventDispatcher->dispatchTyped(new LoadAdditionalScriptsEvent());

diff --git a/lib/Controller/BaseApiController.php b/lib/Controller/BaseApiController.php
@@ -50,8 +50,8 @@ public function __construct(
 
 	/**
 	 * response
+	 * @NoAdminRequired
 	 */
-	#[NoAdminRequired]
 	protected function response(Closure $callback): JSONResponse {
 		try {
 			return new JSONResponse($callback(), Http::STATUS_OK);
@@ -62,8 +62,8 @@ protected function response(Closure $callback): JSONResponse {
 
 	/**
 	 * response
+	 * @NoAdminRequired
 	 */
-	#[NoAdminRequired]
 	protected function responseLong(Closure $callback): JSONResponse {
 		try {
 			return new JSONResponse($callback(), Http::STATUS_OK);
@@ -74,8 +74,8 @@ protected function responseLong(Closure $callback): JSONResponse {
 
 	/**
 	 * responseCreate
+	 * @NoAdminRequired
 	 */
-	#[NoAdminRequired]
 	protected function responseCreate(Closure $callback): JSONResponse {
 		try {
 			return new JSONResponse($callback(), Http::STATUS_CREATED);

diff --git a/lib/Controller/BaseController.php b/lib/Controller/BaseController.php
@@ -48,8 +48,8 @@ public function __construct(
 
 	/**
 	 * response
+	 * @NoAdminRequired
 	 */
-	#[NoAdminRequired]
 	protected function response(Closure $callback): JSONResponse {
 		try {
 			return new JSONResponse($callback(), Http::STATUS_OK);
@@ -60,8 +60,8 @@ protected function response(Closure $callback): JSONResponse {
 
 	/**
 	 * response
+	 * @NoAdminRequired
 	 */
-	#[NoAdminRequired]
 	protected function responseLong(Closure $callback): JSONResponse {
 		try {
 			return new JSONResponse($callback(), Http::STATUS_OK);
@@ -72,8 +72,8 @@ protected function responseLong(Closure $callback): JSONResponse {
 
 	/**
 	 * responseCreate
+	 * @NoAdminRequired
 	 */
-	#[NoAdminRequired]
 	protected function responseCreate(Closure $callback): JSONResponse {
 		try {
 			return new JSONResponse($callback(), Http::STATUS_CREATED);
@@ -84,8 +84,8 @@ protected function responseCreate(Closure $callback): JSONResponse {
 
 	/**
 	 * responseDeleteTolerant
+	 * @NoAdminRequired
 	 */
-	#[NoAdminRequired]
 	protected function responseDeleteTolerant(Closure $callback): JSONResponse {
 		try {
 			return new JSONResponse($callback(), Http::STATUS_OK);