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

Enhancement: Synchronize with ergebnis/php-cs-fixer-config-template #191

Merged
merged 1 commit into from
Sep 27, 2020
Merged

Enhancement: Synchronize with ergebnis/php-cs-fixer-config-template #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/CODEOWNERS
View file
Open in desktop
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @ergebnis-bot @localheinz
6 changes: 3 additions & 3 deletions .github/actions/composer/composer/install/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ dependencies="${COMPOSER_INSTALL_DEPENDENCIES}"
if [[ ${dependencies} == "lowest" ]]; then
composer update --no-interaction --no-progress --no-suggest --prefer-lowest

exit 0
exit $?
fi

if [[ ${dependencies} == "locked" ]]; then
composer install --no-interaction --no-progress --no-suggest

exit 0
exit $?
fi

if [[ ${dependencies} == "highest" ]]; then
composer update --no-interaction --no-progress --no-suggest

exit 0
exit $?
fi

echo "::error::The value for the \"dependencies\" input needs to be one of \"lowest\", \"locked\"', \"highest\"' - got \"${dependencies}\" instead."
Expand Down
0 .github/dependabot.yml → .github/dependabot.yaml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion .github/workflows/integrate.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
uses: "actions/cache@v2.1.1"
with:
path: ".build/php-cs-fixer"
key: "php-${{ matrix.php-version }}-php-cs-fixer-${{ hashFiles('composer.lock') }}"
key: "php-${{ matrix.php-version }}-php-cs-fixer-${{ github.sha }}"
restore-keys: "php-${{ matrix.php-version }}-php-cs-fixer-"

- name: "Run friendsofphp/php-cs-fixer"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/renew.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
uses: "actions/cache@v2.1.1"
with:
path: ".build/php-cs-fixer"
key: "php-${{ matrix.php-version }}-php-cs-fixer-${{ hashFiles('composer.lock') }}"
key: "php-${{ matrix.php-version }}-php-cs-fixer-${{ github.sha }}"
restore-keys: "php-${{ matrix.php-version }}-php-cs-fixer-"

- name: "Run friendsofphp/php-cs-fixer"
Expand Down
8 changes: 4 additions & 4 deletions psalm-baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<files psalm-version="3.14.1@9822043ca46d6682b76097bfa97d7c450eef9e90">
<files psalm-version="3.16@d03e5ef057d6adc656c0ff7e166c50b73b4f48f3">
<file src="test/Unit/FactoryTest.php">
<MixedInferredReturnType occurrences="1">
<code>\Generator</code>
Expand All @@ -12,17 +12,17 @@
</InternalClass>
<InternalMethod occurrences="4">
<code>FixerFactory::create()</code>
<code>registerBuiltInFixers</code>
<code>getFixers</code>
<code>RuleSet::create($rules)</code>
<code>getFixers</code>
<code>registerBuiltInFixers</code>
</InternalMethod>
<MixedArgument occurrences="1">
<code>RuleSet::create($rules)-&gt;getRules()</code>
</MixedArgument>
<MixedInferredReturnType occurrences="3">
<code>string[]</code>
<code>\Generator</code>
<code>\Generator</code>
<code>string[]</code>
</MixedInferredReturnType>
<MixedMethodCall occurrences="1">
<code>getRules</code>
Expand Down