Skip to content

Commit e6f39db

Browse files
committed
chore: fix psalm issues, update metafiles
1 parent 026a915 commit e6f39db

File tree

6 files changed

+21
-22
lines changed

6 files changed

+21
-22
lines changed

.github/workflows/coding-standards.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
on: # yamllint disable-line rule:truthy
44
pull_request:
55
branches:
6-
- master
6+
- 1.x
77
push:
88
branches:
9-
- master
9+
- 1.x
1010

1111
name: 🧹 Fix PHP coding standards
1212

.github/workflows/create-release.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
on: # yamllint disable-line rule:truthy
88
push:
99
branches:
10-
- master
10+
- 1.x
1111

1212
name: 📦 Create release
1313

@@ -16,12 +16,12 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: 🎉 Create release
19-
uses: googleapis/release-please-action@v4.1.1
19+
uses: googleapis/release-please-action@v4
2020
id: release
2121
with:
2222
token: ${{ secrets.DLOAD_RELEASE_TOKEN }}
2323
config-file: .github/.release-please-config.json
2424
manifest-file: resources/version.json
25-
target-branch: master
25+
target-branch: 1.x
2626

2727
...

.github/workflows/testing.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ name: 🧪 Unit testing
55
on: # yamllint disable-line rule:truthy
66
pull_request:
77
branches:
8-
- master
8+
- 1.x
99
push:
1010
branches:
11-
- master
11+
- 1.x
1212

1313
jobs:
1414
code-coverage:

composer.lock

+12-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

psalm-baseline.xml

-4
Original file line numberDiff line numberDiff line change
@@ -219,12 +219,8 @@
219219
<code><![CDATA[$softwareArray]]></code>
220220
</MixedArgument>
221221
<MixedAssignment>
222-
<code><![CDATA[$json]]></code>
223222
<code><![CDATA[$softwareArray]]></code>
224223
</MixedAssignment>
225-
<PossiblyFalseArgument>
226-
<code><![CDATA[\file_get_contents(Info::ROOT_DIR . '/resources/software.json')]]></code>
227-
</PossiblyFalseArgument>
228224
</file>
229225
<file src="src/Module/Repository/Collection/CompositeRepository.php">
230226
<InvalidArgument>

src/Module/Downloader/SoftwareCollection.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ public function count(): int
8787
*/
8888
private function loadDefaultRegistry(): void
8989
{
90-
$json = \json_decode(
91-
\file_get_contents(Info::ROOT_DIR . '/resources/software.json'),
90+
$json = (array) \json_decode(
91+
(string) \file_get_contents(Info::ROOT_DIR . '/resources/software.json'),
9292
true,
9393
16,
9494
JSON_THROW_ON_ERROR,

0 commit comments

Comments
 (0)