Skip to content
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

Jump to bottom

Add support for Nextcloud 25 and fix static analysis #172

Merged
merged 2 commits into from
May 10, 2022
Merged

Add support for Nextcloud 25 and fix static analysis #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79726eb
Add support for Nextcloud 25 and fix static analysis
st3iny May 9, 2022
2b2ba6e
Bump christophwurst/nextcloud-http-client from 0.1.0 to 0.2.0
st3iny May 9, 2022
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
10 changes: 5 additions & 5 deletions .github/workflows/static-analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
ocp-version: [ v21.0.0', 'dev-stable22', 'dev-stable23', 'dev-stable24', 'dev-master' ]
ocp-version: [ 'dev-stable21 as 21', 'dev-stable22 as 22', 'dev-stable23 as 23', 'dev-stable24 as 24', 'dev-master as 25' ]
name: Nextcloud ${{ matrix.ocp-version }}
steps:
- name: Checkout
Expand All @@ -20,10 +20,10 @@ jobs:
- name: Install dependencies
run: composer i
- name: Install OCP package
if: ${{ matrix.ocp-version == 'stable20' }}
run: composer require --dev christophwurst/nextcloud:${{ matrix.ocp-version }}
if: ${{ contains(matrix.ocp-version, 'dev-stable21') || contains(matrix.ocp-version, 'dev-stable22') || contains(matrix.ocp-version, 'dev-stable23') }}
run: composer require --dev christophwurst/nextcloud:"${{ matrix.ocp-version }}"
- name: Install OCP package
if: ${{ matrix.ocp-version == 'dev-master' }}
run: composer require --dev christophwurst/nextcloud:${{ matrix.ocp-version }} --ignore-platform-req=php
if: ${{ contains(matrix.ocp-version, 'dev-stable24') || contains(matrix.ocp-version, 'dev-master') }}
run: composer require --dev christophwurst/nextcloud:"${{ matrix.ocp-version }}" --ignore-platform-req=php
- name: Run coding standards check
run: composer run psalm
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 @@ -21,7 +21,7 @@
<database>mysql</database>
<database>pgsql</database>
<lib>gmp</lib>
<nextcloud min-version="21" max-version="24" />
<nextcloud min-version="21" max-version="25" />
</dependencies>

<two-factor-providers>
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"php": ">=7.3.0",
"ext-json": "*",
"bamarni/composer-bin-plugin": "^1.5",
"christophwurst/nextcloud-http-client": "^0.1.0",
"christophwurst/nextcloud-http-client": "^0.2.0",
"web-auth/webauthn-lib": "^3.3"
},
"require-dev": {
Expand Down
18 changes: 9 additions & 9 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

39 changes: 38 additions & 1 deletion tests/psalm-baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,62 @@
<?xml version="1.0" encoding="UTF-8"?>
<files psalm-version="4.x-dev@">
<file src="lib/AppInfo/Application.php">
<InvalidArgument occurrences="4">
<InvalidArgument occurrences="6">
<code>registerEventListener</code>
<code>registerEventListener</code>
<code>registerEventListener</code>
<code>StateChangeActivity::class</code>
<code>StateChangeActivity::class</code>
<code>StateChangeRegistryUpdater::class</code>
</InvalidArgument>
<MissingDependency occurrences="3">
<code>DisabledByAdmin</code>
<code>StateChanged</code>
<code>StateChanged</code>
</MissingDependency>
</file>
<file src="lib/Command/MigrateU2F.php">
<UndefinedClass occurrences="1">
<code>Command</code>
</UndefinedClass>
</file>
<file src="lib/Event/DisabledByAdmin.php">
<MissingDependency occurrences="1">
<code>StateChanged</code>
</MissingDependency>
</file>
<file src="lib/Event/StateChanged.php">
<MissingDependency occurrences="1">
<code>Event</code>
</MissingDependency>
</file>
<file src="lib/Listener/StateChangeActivity.php">
<MissingDependency occurrences="2">
<code>StateChangeActivity</code>
<code>StateChanged</code>
</MissingDependency>
</file>
<file src="lib/Listener/StateChangeRegistryUpdater.php">
<MissingDependency occurrences="2">
<code>StateChangeRegistryUpdater</code>
<code>StateChanged</code>
</MissingDependency>
</file>
<file src="lib/Provider/WebAuthnProvider.php">
<MissingDependency occurrences="2">
<code>Template</code>
<code>Template</code>
</MissingDependency>
</file>
<file src="lib/Service/WebAuthnManager.php">
<MissingDependency occurrences="6">
<code>DisabledByAdmin</code>
<code>StateChanged</code>
<code>StateChanged</code>
<code>StateChanged</code>
<code>StateChanged</code>
<code>StateChanged</code>
</MissingDependency>
<UndefinedClass occurrences="2">
<code>ServerRequest</code>
<code>ServerRequest</code>
Expand Down