Skip to content

Commit 88eed24

Browse files
author
AVINASH GUSAIN
committed
Upgrade to 4.5.2
1 parent 16200cf commit 88eed24

File tree

310 files changed

+11582
-4581
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

310 files changed

+11582
-4581
lines changed

.editorconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ insert_final_newline = true
1313
[Makefile]
1414
indent_style = tab
1515

16+
[renovate.json]
17+
indent_style = tab
18+
1619
[*.yml]
1720
indent_style = space
1821
indent_size = 2

.github/workflows/appstore-build-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
run: npm i -g npm@"${{ steps.versions.outputs.npmVersion }}"
6767

6868
- name: Set up php ${{ env.PHP_VERSION }}
69-
uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2
69+
uses: shivammathur/setup-php@4bd44f22a98a19e0950cbad5f31095157cc9621b # v2
7070
with:
7171
php-version: ${{ env.PHP_VERSION }}
7272
coverage: none

.github/workflows/lint-php-cs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
2626

2727
- name: Set up php
28-
uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2
28+
uses: shivammathur/setup-php@4bd44f22a98a19e0950cbad5f31095157cc9621b # v2
2929
with:
3030
php-version: 8.1
3131
coverage: none

.github/workflows/lint-php.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
3535

3636
- name: Set up php ${{ matrix.php-versions }}
37-
uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2
37+
uses: shivammathur/setup-php@4bd44f22a98a19e0950cbad5f31095157cc9621b # v2
3838
with:
3939
php-version: ${{ matrix.php-versions }}
4040
coverage: none

.github/workflows/npm-test.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616
name: node${{ matrix.node-version }}
1717

1818
steps:
19-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
2020

2121
- name: Set up node ${{ matrix.node-version }}
22-
uses: actions/setup-node@v3
22+
uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3
2323
with:
2424
node-version: ${{ matrix.node-version }}
2525

@@ -33,8 +33,9 @@ jobs:
3333
run: npm run test:coverage
3434

3535
- name: Upload coverage to Codecov
36-
uses: codecov/codecov-action@v3
36+
uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3
3737
with:
38+
token: ${{ secrets.CODECOV_TOKEN }}
3839
file: ./coverage/coverage-final.json
3940
flags: javascript
4041
fail_ci_if_error: true

.github/workflows/package.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ jobs:
77
name: Build release tarball
88
steps:
99
- name: Checkout
10-
uses: actions/checkout@v3
10+
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
1111
- name: Set up Node
12-
uses: actions/setup-node@v2
12+
uses: actions/setup-node@7c12f8017d5436eb855f1ed4399f037a36fbd9e8 # v2
1313
with:
1414
node-version: 15
1515
- name: Set up php$
16-
uses: shivammathur/setup-php@cb8f453143149404c7fd670b5f37c91d395b3054
16+
uses: shivammathur/setup-php@9c77701ae57b0c47f6732beebfbdec76e4e5c90a
1717
with:
1818
php-version: 8.0
1919
tools: composer
@@ -25,7 +25,7 @@ jobs:
2525
sudo dpkg -i krankerl_0.14.0_amd64.deb
2626
- name: Package app
2727
run: krankerl package
28-
- uses: actions/upload-artifact@v3
28+
- uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3
2929
with:
3030
path: build/artifacts/calendar.tar.gz
3131
if-no-files-found: error

.github/workflows/php-test.yml

Lines changed: 53 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
strategy:
88
matrix:
99
php-versions: ['8.0', '8.1', '8.2']
10-
nextcloud-versions: ['stable27', 'stable26']
10+
nextcloud-versions: ['master', 'stable27', 'stable26']
1111
include:
1212
- php-versions: '7.4'
1313
nextcloud-versions: 'stable25'
@@ -19,7 +19,7 @@ jobs:
1919
XDEBUG_MODE: coverage
2020
steps:
2121
- name: Set up php${{ matrix.php-versions }}
22-
uses: shivammathur/setup-php@cb8f453143149404c7fd670b5f37c91d395b3054
22+
uses: shivammathur/setup-php@9c77701ae57b0c47f6732beebfbdec76e4e5c90a
2323
with:
2424
php-version: ${{ matrix.php-versions }}
2525
extensions: ctype, curl, dom, gd, gmp, iconv, intl, json, mbstring, openssl, pdo_sqlite, posix, sqlite, xml, zip
@@ -32,7 +32,7 @@ jobs:
3232
- name: Install Nextcloud
3333
run: php -f nextcloud/occ maintenance:install --database-name oc_autotest --database-user oc_autotest --admin-user admin --admin-pass admin --database sqlite --database-pass=''
3434
- name: Checkout the app
35-
uses: actions/checkout@v3
35+
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
3636
with:
3737
path: nextcloud/apps/calendar
3838
- name: Install dependencies
@@ -43,17 +43,63 @@ jobs:
4343
run: composer run test
4444
- name: Upload coverage to Codecov
4545
if: ${{ matrix.nextcloud-versions == 'master' }}
46-
uses: codecov/codecov-action@v3
46+
uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3
4747
with:
48+
token: ${{ secrets.CODECOV_TOKEN }}
4849
file: nextcloud/apps/calendar/clover.unit.xml
4950
flags: php
5051
fail_ci_if_error: true
5152
verbose: true
5253

54+
integration-tests:
55+
runs-on: ubuntu-latest
56+
strategy:
57+
matrix:
58+
php-versions: [ '8.0', '8.1', '8.2' ]
59+
nextcloud-versions: [ 'master']
60+
include:
61+
- php-versions: '7.4'
62+
nextcloud-versions: 'stable25'
63+
- php-versions: '8.1'
64+
nextcloud-versions: 'stable26'
65+
- php-versions: '8.1'
66+
nextcloud-versions: 'stable27'
67+
name: php${{ matrix.php-versions }} on ${{ matrix.nextcloud-versions }} integration tests
68+
env:
69+
CI: true
70+
XDEBUG_MODE: coverage
71+
steps:
72+
- name: Set up php${{ matrix.php-versions }}
73+
uses: shivammathur/setup-php@9c77701ae57b0c47f6732beebfbdec76e4e5c90a
74+
with:
75+
php-version: ${{ matrix.php-versions }}
76+
extensions: ctype, curl, dom, gd, gmp, iconv, intl, json, mbstring, openssl, pdo_sqlite, posix, sqlite, xml, zip
77+
coverage: xdebug
78+
- name: Checkout Nextcloud
79+
run: git clone https://github.com/nextcloud/server.git --recursive --depth 1 -b ${{ matrix.nextcloud-versions }} nextcloud
80+
- name: Patch version check for nightly PHP
81+
if: ${{ matrix.php-versions == '8.2' }}
82+
run: echo "<?php" > nextcloud/lib/versioncheck.php
83+
- name: Install Nextcloud
84+
run: php -f nextcloud/occ maintenance:install --database-name oc_autotest --database-user oc_autotest --admin-user admin --admin-pass admin --database sqlite --database-pass=''
85+
- name: Checkout the app
86+
uses: actions/checkout@v3
87+
with:
88+
path: nextcloud/apps/calendar
89+
- name: Install dependencies
90+
working-directory: nextcloud/apps/calendar
91+
run: composer install
92+
- name: Install Calendar
93+
run: php -f nextcloud/occ app:enable calendar
94+
- name: Run tests
95+
working-directory: nextcloud/apps/calendar
96+
run: composer run test:integration
97+
5398
summary:
5499
runs-on: ubuntu-latest
55100
needs:
56101
- unit-tests
102+
- integration-tests
57103

58104
if: always()
59105

@@ -62,3 +108,6 @@ jobs:
62108
steps:
63109
- name: Unit test status
64110
run: if ${{ needs.unit-tests.result != 'success' && needs.unit-tests.result != 'skipped' }}; then exit 1; fi
111+
- name: Integration test status
112+
run: if ${{ needs.integration-tests.result != 'success' && needs.integration-tests.result != 'skipped' }}; then exit 1; fi
113+

.github/workflows/pr-feedback.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: 'Ask for feedback on PRs'
2+
on:
3+
schedule:
4+
- cron: '30 1 * * *'
5+
6+
jobs:
7+
pr-feedback:
8+
runs-on: ubuntu-22.04
9+
steps:
10+
- name: The get-github-handles-from-website action
11+
uses: marcelklehr/get-github-handles-from-website-action@a739600f6b91da4957f51db0792697afbb2f143c # v1.0.0
12+
id: scrape
13+
with:
14+
website: 'https://nextcloud.com/team/'
15+
- uses: marcelklehr/pr-feedback-action@601109aa729eb4c8d6d0ece7567b9d4901db4aef
16+
with:
17+
feedback-message: |
18+
Hello there,
19+
Thank you so much for taking the time and effort to create a pull request to our Nextcloud project.
20+
21+
We hope that the review process is going smooth and is helpful for you. We want to ensure your pull request is reviewed to your satisfaction. If you have a moment, our community management team would very much appreciate your feedback on your experience with this PR review process.
22+
23+
Your feedback is valuable to us as we continuously strive to improve our community developer experience. Please take a moment to complete our short survey by clicking on the following link: https://cloud.nextcloud.com/apps/forms/s/i9Ago4EQRZ7TWxjfmeEpPkf6
24+
25+
Thank you for contributing to Nextcloud and we hope to hear from you soon!
26+
days-before-feedback: 14
27+
start-date: "2023-07-10"
28+
exempt-authors: "${{ steps.scrape.outputs.users }},nextcloud-command"
29+
exempt-bots: true

.github/workflows/psalm-matrix.yml

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
# This workflow is provided via the organization template repository
2+
#
3+
# https://github.com/nextcloud/.github
4+
# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
5+
6+
name: Static analysis
7+
8+
on:
9+
pull_request:
10+
push:
11+
branches:
12+
- master
13+
- main
14+
- stable*
15+
16+
concurrency:
17+
group: psalm-${{ github.head_ref || github.run_id }}
18+
cancel-in-progress: true
19+
20+
jobs:
21+
static-analysis:
22+
runs-on: ubuntu-latest
23+
strategy:
24+
# do not stop on another job's failure
25+
fail-fast: false
26+
matrix:
27+
ocp-version: [ 'dev-master', 'dev-stable27', 'dev-stable26', 'dev-stable25' ]
28+
29+
name: Nextcloud ${{ matrix.ocp-version }}
30+
steps:
31+
- name: Checkout
32+
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
33+
34+
- name: Set up php
35+
uses: shivammathur/setup-php@4bd44f22a98a19e0950cbad5f31095157cc9621b # v2
36+
with:
37+
php-version: 8.0
38+
coverage: none
39+
ini-file: development
40+
env:
41+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
42+
43+
- name: Install dependencies
44+
run: composer i
45+
46+
- name: Install dependencies
47+
run: composer require --dev nextcloud/ocp:${{ matrix.ocp-version }} --ignore-platform-reqs --with-dependencies
48+
49+
- name: Run coding standards check
50+
run: composer run psalm
51+
52+
summary:
53+
runs-on: ubuntu-latest
54+
needs: static-analysis
55+
56+
if: always()
57+
58+
name: static-psalm-analysis-summary
59+
60+
steps:
61+
- name: Summary status
62+
run: if ${{ needs.static-analysis.result != 'success' }}; then exit 1; fi

.nextcloudignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ package.json
2525
package-lock.json
2626
phpunit.unit.xml
2727
README.md
28+
/psalm.xml
2829
screenshots
2930
src
3031
stylelint.config.js

0 commit comments

Comments
 (0)