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.

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

Enhancement: Synchronize with ergebnis/php-library-template #411

Merged
merged 1 commit into from
Dec 13, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
/composer-require-checker.json export-ignore
/infection.json export-ignore
/Makefile export-ignore
/phive.xml export-ignore
/phpstan-baseline.neon export-ignore
/phpstan.neon export-ignore
/psalm-baseline.xml export-ignore
Expand Down
2 changes: 1 addition & 1 deletion .github/dependabot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ updates:
directory: "/"
labels:
- "dependency"
open-pull-requests-limit: 10
open-pull-requests-limit: 1
package-ecosystem: "composer"
schedule:
interval: "daily"
Expand Down
Binary file modified .phive/composer-normalize
Binary file not shown.
2 changes: 1 addition & 1 deletion .phive/phars.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<phive xmlns="https://phar.io/phive">
<phar name="composer-normalize" version="^2.9.0" installed="2.9.0" location="./.phive/composer-normalize" copy="true"/>
<phar name="composer-normalize" version="^2.11.0" installed="2.11.0" location="./.phive/composer-normalize" copy="true"/>
<phar name="composer-require-checker" version="^2.1.0" installed="2.1.0" location="./.phive/composer-require-checker" copy="true"/>
</phive>
6 changes: 0 additions & 6 deletions psalm-baseline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,6 @@
<MixedAssignment occurrences="1">
<code>$newLineString</code>
</MixedAssignment>
<RedundantCondition occurrences="1">
<code>assertInstanceOf</code>
</RedundantCondition>
</file>
<file src="test/Unit/Format/IndentTest.php">
<MixedArgument occurrences="1">
Expand All @@ -136,9 +133,6 @@
<code>\Generator&lt;array&lt;string&gt;&gt;</code>
<code>\Generator&lt;array{0: int, 1: string, 2: string}&gt;</code>
</MixedInferredReturnType>
<MoreSpecificReturnType occurrences="1">
<code>\Generator&lt;array{0: int, 1: string, 2: string}&gt;</code>
</MoreSpecificReturnType>
<UnusedVariable occurrences="3">
<code>$key</code>
<code>$key</code>
Expand Down
4 changes: 0 additions & 4 deletions psalm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@
resolveFromConfigFile="true"
strictBinaryOperands="true"
>
<issueHandlers>
<LessSpecificReturnType errorLevel="info" />
</issueHandlers>

<plugins>
<pluginClass class="Psalm\PhpUnitPlugin\Plugin" />
</plugins>
Expand Down
10 changes: 5 additions & 5 deletions test/Unit/phpunit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@
stopOnSkipped="false"
verbose="true"
>
<testsuites>
<testsuite name="Unit Tests">
<directory>.</directory>
</testsuite>
</testsuites>
<filter>
<whitelist addUncoveredFilesFromWhitelist="true" processUncoveredFilesFromWhitelist="true">
<directory suffix=".php">../../src/</directory>
</whitelist>
</filter>
<testsuites>
<testsuite name="Unit Tests">
<directory>.</directory>
</testsuite>
</testsuites>
</phpunit>