summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevlin Junker <devlin.junker@gmail.com>2023-08-08 16:09:08 -0700
committerBenjamin Brahmer <info@b-brahmer.de>2023-08-09 11:08:04 +0200
commit9a047cbbcdfb17ebf9b46aee8eeb17ae7f17a160 (patch)
tree2a64cd3e8c1e4eb89c6fe8af08330bae89afc482
parentb9a5887897dd82be9e22fed7e00eeb022c016516 (diff)
minimum nextcloud version supported is 27
Signed-off-by: Devlin Junker <devlin.junker@gmail.com>
-rw-r--r--.github/workflows/api-integration-tests.yml10
-rw-r--r--.github/workflows/api-php-static-code-check.yml4
-rw-r--r--.github/workflows/api-php-tests.yml8
-rw-r--r--appinfo/info.xml2
-rw-r--r--composer.json2
-rw-r--r--tests/Unit/Service/FolderServiceTest.php13
6 files changed, 4 insertions, 35 deletions
diff --git a/.github/workflows/api-integration-tests.yml b/.github/workflows/api-integration-tests.yml
index 16ea84198..f7619ff18 100644
--- a/.github/workflows/api-integration-tests.yml
+++ b/.github/workflows/api-integration-tests.yml
@@ -29,7 +29,7 @@ jobs:
strategy:
matrix:
php-versions: ['8.0', '8.1']
- nextcloud: ['stable25', 'stable26', 'stable27']
+ nextcloud: ['stable27']
database: ['sqlite', 'pgsql', 'mysql']
experimental: [false]
include:
@@ -41,14 +41,6 @@ jobs:
nextcloud: pre-release
database: sqlite
experimental: true
- - php-versions: 7.4
- nextcloud: stable25
- database: sqlite
- experimental: false
- - php-versions: 8.2
- nextcloud: stable26
- database: sqlite
- experimental: false
steps:
- name: Checkout
uses: actions/checkout@v3
diff --git a/.github/workflows/api-php-static-code-check.yml b/.github/workflows/api-php-static-code-check.yml
index 4afd9eaf1..37035c244 100644
--- a/.github/workflows/api-php-static-code-check.yml
+++ b/.github/workflows/api-php-static-code-check.yml
@@ -15,10 +15,6 @@ jobs:
nextcloud: pre-release
database: sqlite
experimental: true
- - php-versions: 7.4
- nextcloud: stable25
- database: sqlite
- experimental: false
name: "phpstan: Nextcloud ${{ matrix.nextcloud }} with ${{ matrix.php-versions }}"
steps:
- name: Checkout
diff --git a/.github/workflows/api-php-tests.yml b/.github/workflows/api-php-tests.yml
index dae893f22..1b309daf8 100644
--- a/.github/workflows/api-php-tests.yml
+++ b/.github/workflows/api-php-tests.yml
@@ -10,16 +10,10 @@ jobs:
strategy:
matrix:
php-versions: ['8.1']
- nextcloud: ['stable26', 'stable27']
+ nextcloud: ['stable27']
database: ['sqlite']
experimental: [false]
codecoverage: [false]
- include:
- - php-versions: 8.0
- nextcloud: stable25
- database: sqlite
- experimental: false
- codecoverage: true
steps:
- name: Checkout
uses: actions/checkout@v3
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 1b06a84ad..884a7b041 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -55,7 +55,7 @@ Report a [feed issue](https://github.com/nextcloud/news/discussions/new)
<lib>json</lib>
<owncloud max-version="0" min-version="0"/>
- <nextcloud min-version="25" max-version="27"/>
+ <nextcloud min-version="27" max-version="27"/>
</dependencies>
<background-jobs>
diff --git a/composer.json b/composer.json
index 42055a515..fb17d5192 100644
--- a/composer.json
+++ b/composer.json
@@ -40,7 +40,7 @@
"source": "https://github.com/nextcloud/news/"
},
"require": {
- "php": "^7.4 || ~8.0",
+ "php": "~8.0",
"ezyang/htmlpurifier": "^4.16.0",
"pear/net_url2": "^2.2.2",
"riimu/kit-pathjoin": "^1.2.0",
diff --git a/tests/Unit/Service/FolderServiceTest.php b/tests/Unit/Service/FolderServiceTest.php
index e043e11ec..a80afeb13 100644
--- a/tests/Unit/Service/FolderServiceTest.php
+++ b/tests/Unit/Service/FolderServiceTest.php
@@ -69,19 +69,6 @@ class FolderServiceTest extends TestCase
$timeFactoryBuilder = $this->getMockBuilder(TimeFactory::class)
->disableOriginalConstructor();
- // HACK: due to differences in NC26 and NC 27
- if (!method_exists(TimeFactory::class, 'now')) {
- $timeFactoryBuilder->addMethods(['now'])
- ->onlyMethods(['getTime']);
- } else if(!method_exists(TimeFactory::class, 'getTime')) {
- $timeFactoryBuilder->addMethods(['getTime']);
- }
-
- $timeFactory = $timeFactoryBuilder->getMock();
- $timeFactory->expects($this->any())
- ->method('getTime')
- ->will($this->returnValue($this->time));
-
$mockDateTime = $this->getMockBuilder(\DateTimeImmutable::class)
->disableOriginalConstructor()
->getMock();