Skip to content
This repository has been archived by the owner on Jan 4, 2022. It is now read-only.

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

Merged
merged 1 commit into from
Nov 3, 2020
Merged

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

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitattributes
View file
Open in desktop
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
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 @@ -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
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 @@ -33,7 +33,7 @@ jobs:
uses: "actions/checkout@v2.3.3"

- 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
0 phive.xml → .phive/phars.xml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
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
8 changes: 7 additions & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"fzaninotto/faker": "^1.9.0"
},
"require-dev": {
"ergebnis/composer-normalize": "^2.9.0",
"ergebnis/composer-normalize": "^2.10.0",
"ergebnis/license": "^1.1.0",
"ergebnis/php-cs-fixer-config": "^2.5.2",
"ergebnis/phpstan-rules": "~0.15.3",
Expand All @@ -43,6 +43,12 @@
"preferred-install": "dist",
"sort-packages": true
},
"extra": {
"composer-normalize": {
"indent-size": 2,
"indent-style": "space"
}
},
"autoload": {
"psr-4": {
"Ergebnis\\Test\\Util\\": "src/"
Expand Down
Loading