Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juliusknorr merged 1 commit into from
Jul 3, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cypress-custom.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/npm-audit-fix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-nextcloud-ocp-matrix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
fail-fast: false
matrix:
branches: ['master']
target: ['stable26']
target: ['stable27']

name: update-nextcloud-ocp-${{ matrix.branches }}

Expand Down
2 changes: 1 addition & 1 deletion appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions cypress/e2e/tables-import.cy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 0 additions & 2 deletions lib/Controller/RowOCSController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')]
Expand Down
5 changes: 2 additions & 3 deletions lib/Middleware/PermissionMiddleware.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand Down