Skip to content

Commit 0422f10

Browse files
feat: php8 (#1230)
1 parent ab4c1f9 commit 0422f10

8 files changed

Lines changed: 95 additions & 45 deletions

File tree

.drone.star

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ MINIO_MC = "minio/mc:RELEASE.2020-12-18T10-53-53Z"
44
OC_CI_ALPINE = "owncloudci/alpine:latest"
55
OC_CI_BAZEL_BUILDIFIER = "owncloudci/bazel-buildifier"
66
OC_CI_CEPH = "owncloudci/ceph:tag-build-master-jewel-ubuntu-16.04"
7-
OC_CI_CORE = "owncloudci/core"
7+
OC_CI_CORE = "owncloudci/core:php83"
88
OC_CI_DRONE_SKIP_PIPELINE = "owncloudci/drone-skip-pipeline"
99
OC_CI_NODEJS = "owncloudci/nodejs:%s"
1010
OC_CI_ORACLE_XE = "owncloudci/oracle-xe:latest"
@@ -21,7 +21,7 @@ SELENIUM_STANDALONE_CHROME_DEBUG = "selenium/standalone-chrome-debug:3.141.59-ox
2121
SELENIUM_STANDALONE_FIREFOX_DEBUG = "selenium/standalone-firefox-debug:3.8.1"
2222
SONARSOURCE_SONAR_SCANNER_CLI = "sonarsource/sonar-scanner-cli"
2323

24-
DEFAULT_PHP_VERSION = "7.4"
24+
DEFAULT_PHP_VERSION = "8.3"
2525
DEFAULT_NODEJS_VERSION = "14"
2626

2727
# minio mc environment variables
@@ -53,18 +53,12 @@ config = {
5353
"branches": [
5454
"master",
5555
],
56-
"codestyle": True,
56+
"codestyle": False,
5757
"validateDailyTarball": True,
58-
"phpstan": True,
59-
"phan": {
60-
"multipleVersions": {
61-
"phpVersions": [
62-
DEFAULT_PHP_VERSION,
63-
],
64-
},
65-
},
66-
"javascript": True,
67-
"phpunit": True,
58+
"phpstan": False,
59+
"phan": False,
60+
"javascript": False,
61+
"phpunit": False,
6862
"acceptance": {
6963
"webUI": {
7064
"suites": {

.github/workflows/main.yml

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
8+
types:
9+
- opened
10+
- synchronize
11+
- reopened
12+
13+
permissions:
14+
contents: read
15+
16+
concurrency:
17+
group: lint-${{ github.ref }}
18+
cancel-in-progress: true
19+
20+
env:
21+
APP_NAME: activity
22+
PHP_VERSIONS: '["8.3"]'
23+
24+
jobs:
25+
get-vars:
26+
runs-on: ubuntu-latest
27+
outputs:
28+
app-name: ${{ env.APP_NAME }}
29+
php-versions: ${{ env.PHP_VERSIONS }}
30+
steps:
31+
- name: Set variables
32+
run: |
33+
echo "App name $APP_NAME"
34+
echo "PHP versions string: $PHP_VERSIONS"
35+
36+
semantic-git-messages:
37+
name: Commits
38+
uses: owncloud/reusable-workflows/.github/workflows/semantic-git-message.yml@main
39+
40+
php-code-style:
41+
name: PHP Code Style
42+
needs:
43+
- get-vars
44+
uses: owncloud/reusable-workflows/.github/workflows/php-codestyle.yml@main
45+
with:
46+
app-name: ${{ needs.get-vars.outputs.app-name }}
47+
php-versions: ${{ needs.get-vars.outputs.php-versions }}
48+
49+
php-unit:
50+
name: PHP Unit
51+
needs:
52+
- get-vars
53+
uses: owncloud/reusable-workflows/.github/workflows/php-unit.yml@main
54+
with:
55+
app-name: ${{ needs.get-vars.outputs.app-name }}
56+
php-versions: ${{ needs.get-vars.outputs.php-versions }}
57+
58+
59+
js-unit:
60+
name: JS Unit
61+
needs:
62+
- get-vars
63+
uses: owncloud/reusable-workflows/.github/workflows/js-unit.yml@main
64+
with:
65+
app-name: ${{ needs.get-vars.outputs.app-name }}
66+
php-version: '8.3'

.scrutinizer.yml

Lines changed: 0 additions & 14 deletions
This file was deleted.

appinfo/info.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ Never again miss an important event related to content in ownCloud and always be
3030
<screenshot>https://raw.githubusercontent.com/owncloud/screenshots/68550c2b7c53e6309132ca1c7b177adca976db0b/activity/activity.png</screenshot>
3131
<category>tools</category>
3232
<dependencies>
33-
<owncloud min-version="10.15" max-version="11" />
33+
<owncloud min-version="11" max-version="11" />
34+
<php min-version="8.3" />
3435
</dependencies>
3536
<background-jobs>
3637
<job>OCA\Activity\BackgroundJob\EmailNotification</job>

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22
"name": "owncloud/activity",
33
"config" : {
44
"platform": {
5-
"php": "7.3"
5+
"php": "8.3"
66
},
77
"allow-plugins": {
88
"bamarni/composer-bin-plugin": true
99
}
1010
},
1111
"require": {
12+
"php": ">=8.3"
1213
},
1314
"require-dev": {
1415
"bamarni/composer-bin-plugin": "^1.8"

composer.lock

Lines changed: 16 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/BackgroundJob/EmailNotification.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class EmailNotification extends TimedJob {
6161
* @param bool|null $isCLI
6262
*/
6363
public function __construct(
64-
?MailQueueHandler $mailQueueHandler = null,
64+
?MailQueueHandler $mailQueueHandler,
6565
IUserManager $userManager,
6666
?IConfig $config = null,
6767
?ILogger $logger = null,
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"require": {
3-
"owncloud/coding-standard": "^5.1"
3+
"owncloud/coding-standard": "^5.3"
44
}
55
}

0 commit comments

Comments
 (0)