Skip to content

Commit

Permalink
Merge pull request #383 from ergebnis/feature/synchronize
Browse files Browse the repository at this point in the history
Enhancement: Synchronize with ergebnis/php-library-template
  • Loading branch information
ergebnis-bot authored Oct 31, 2020
2 parents 6c44893 + 58dabb8 commit fa9eaae
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .github/actions/composer/composer/install/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@
dependencies="${COMPOSER_INSTALL_DEPENDENCIES}"

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

exit $?
fi

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

exit $?
fi

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

exit $?
fi
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/integrate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
uses: "actions/[email protected]"

- name: "Lint YAML files"
uses: "ibiqlik/action-yamllint@v2"
uses: "ibiqlik/action-yamllint@v2.0.0"
with:
config_file: ".yamllint.yaml"
file_or_dir: "."
Expand Down Expand Up @@ -193,7 +193,6 @@ jobs:
runs-on: "ubuntu-latest"

strategy:
fail-fast: false
matrix:
php-version:
- "7.2"
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ tests: vendor ## Runs auto-review, unit, and integration tests with phpunit/phpu

vendor: composer.json composer.lock
composer validate --strict
composer install --no-interaction --no-progress --no-suggest
composer install --no-interaction --no-progress
5 changes: 5 additions & 0 deletions phpstan.neon
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,21 @@ includes:

parameters:
checkMissingIterableValueType: false

ergebnis:
classesAllowedToBeExtended:
- Ergebnis\Json\Normalizer\Test\Unit\AbstractNormalizerTestCase
- Ergebnis\Json\Normalizer\Test\Unit\Exception\AbstractExceptionTestCase
- Ergebnis\Json\Normalizer\Test\Unit\Vendor\Composer\AbstractComposerTestCase
- InvalidArgumentException
- RuntimeException

inferPrivatePropertyTypeFromConstructor: true

level: max

paths:
- src/
- test/

tmpDir: .build/phpstan/

0 comments on commit fa9eaae

Please sign in to comment.