chore: Drop Nextcloud 26 for the next release as it is EOL

Signed-off-by: Julius Härtl <jus@bitgrid.net>
nextcloud · Jul 3, 2024 · 35f2645 · 35f2645
1 parent 0002099
commit 35f2645
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 12 deletions.
diff --git a/.github/workflows/cypress-custom.yml b/.github/workflows/cypress-custom.yml
@@ -25,7 +25,7 @@ jobs:
       matrix:
         node-version: [ 16 ]
         databases: [ 'mysql' ]
-        server-versions: [ 'stable26', 'stable27', 'stable28', 'stable29', 'master' ]
+        server-versions: [ 'stable27', 'stable28', 'stable29', 'master' ]
         include:
           - php-versions: 8.1
 

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -26,7 +26,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        server-versions: ['stable26', 'stable27', 'stable28', 'stable29', 'master']
+        server-versions: ['stable27', 'stable28', 'stable29', 'master']
         php-versions: ['8.1']
         databases: ['mysql']
         include:

diff --git a/.github/workflows/npm-audit-fix.yml b/.github/workflows/npm-audit-fix.yml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branches: ['main', 'master', 'stable29', 'stable28', 'stable27', 'stable26']
+        branches: ['main', 'master', 'stable29', 'stable28', 'stable27']
 
     name: npm-audit-fix-${{ matrix.branches }}
 

diff --git a/.github/workflows/update-nextcloud-ocp-matrix.yml b/.github/workflows/update-nextcloud-ocp-matrix.yml
@@ -18,7 +18,7 @@ jobs:
       fail-fast: false
       matrix:
         branches: ['master']
-        target: ['stable26']
+        target: ['stable27']
 
     name: update-nextcloud-ocp-${{ matrix.branches }}
 

diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -43,7 +43,7 @@ Have a good time and manage whatever you want.
 		<database>pgsql</database>
 		<database>mysql</database>
 		<database>sqlite</database>
-		<nextcloud min-version="26" max-version="30"/>
+		<nextcloud min-version="27" max-version="30"/>
 	</dependencies>
 	<repair-steps>
 		<post-migration>

diff --git a/cypress/e2e/tables-import.cy.js b/cypress/e2e/tables-import.cy.js
@@ -49,9 +49,9 @@ describe('Import csv', () => {
 
 })
 
-// only run the following tests if not testing on v26 or v27
+// only run the following tests if not testing on v27
 // the files api in use is only supported on v28+
-if (!['stable26', 'stable27'].includes(Cypress.env('ncVersion'))) {
+if (!['stable27'].includes(Cypress.env('ncVersion'))) {
 	describe('Import csv from Files file action', () => {
 
 		before(function() {

diff --git a/lib/Controller/RowOCSController.php b/lib/Controller/RowOCSController.php
@@ -47,8 +47,6 @@ public function __construct(
 	 * 403: No permissions
 	 * 404: Not found
 	 * 500: Internal error
-	 *
-	 * @NoAdminRequired (26 compatibility)
 	 */
 	#[NoAdminRequired]
 	#[RequirePermission(permission: Application::PERMISSION_CREATE, typeParam: 'nodeCollection')]

diff --git a/lib/Middleware/PermissionMiddleware.php b/lib/Middleware/PermissionMiddleware.php
@@ -10,6 +10,7 @@
 use OCA\Tables\Helper\ConversionHelper;
 use OCA\Tables\Middleware\Attribute\RequirePermission;
 use OCA\Tables\Service\PermissionsService;
+use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Middleware;
 use OCP\AppFramework\Utility\IControllerMethodReflector;
@@ -38,9 +39,7 @@ public function __construct(
 	 * @throws PermissionError
 	 * @throws InternalError
 	 */
-	public function beforeController($controller, $methodName): void {
-		// we can have type hinting in the signature only after dropping NC26 – calling parent to enforce on newer releases
-		parent::beforeController($controller, $methodName);
+	public function beforeController(Controller $controller, string $methodName) {
 		$this->assertPermission($controller, $methodName);
 		$this->assertCanManageNode();
 		$this->assertCanManageContext();