Skip to content
Open
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
10 changes: 5 additions & 5 deletions .github/workflows/daily.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,6 @@ jobs:
- name: Validate composer.json and composer.lock
run: composer validate

# —— Security ——————————————————————————————————————————————————————
- name: Symfony Security Checker
uses: symfonycorp/security-checker-action@v2

- name: Get composer cache directory
id: composer-cache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
Expand All @@ -49,7 +45,7 @@ jobs:
uses: actions/cache@v1
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ matrix.composer-dependencies }}-${{ hashFiles('**/composer.lock') }}
key: ${{ runner.os }}-composer-${{ matrix.composer-dependencies }}-${{ hashFiles('**/composer.json') }}
restore-keys: ${{ runner.os }}-composer-${{ matrix.composer-dependencies }}-

- name: Install Composer dependencies
Expand All @@ -60,6 +56,10 @@ jobs:
if: matrix.composer-dependencies == 'lowest'
run: composer update --prefer-lowest

# —— Security ——————————————————————————————————————————————————————
- name: Symfony Security Checker
uses: symfonycorp/security-checker-action@v2

# —— Style —————————————————————————————————————————————————————————
- name: PHP-CS-FIXER
uses: docker://oskarstark/php-cs-fixer-ga
Expand Down
14 changes: 9 additions & 5 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,6 @@ jobs:
- name: Validate composer.json and composer.lock
run: composer validate

# —— Security ——————————————————————————————————————————————————————
- name: Symfony Security Checker
uses: symfonycorp/security-checker-action@v2

- name: Get composer cache directory
id: composer-cache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
Expand All @@ -47,7 +43,7 @@ jobs:
uses: actions/cache@v1
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ matrix.composer-dependencies }}-${{ hashFiles('**/composer.lock') }}
key: ${{ runner.os }}-composer-${{ matrix.composer-dependencies }}-${{ hashFiles('**/composer.json') }}
restore-keys: ${{ runner.os }}-composer-${{ matrix.composer-dependencies }}-

- name: Install Composer dependencies
Expand All @@ -58,12 +54,20 @@ jobs:
if: matrix.composer-dependencies == 'lowest'
run: composer update --prefer-lowest

# —— Security ——————————————————————————————————————————————————————
- name: Symfony Security Checker
uses: symfonycorp/security-checker-action@v2

# —— Style —————————————————————————————————————————————————————————
- name: PHP-CS-FIXER
uses: docker://oskarstark/php-cs-fixer-ga
with:
args: --dry-run .

# —— PHPStan ———————————————————————————————————————————————————————
- name: PHPUnit
run: php vendor/bin/phpstan analyze

# —— PHPUnit ———————————————————————————————————————————————————————
- name: PHPUnit
run: php vendor/bin/phpunit tests
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ docker-compose.override.yml

# Composer
vendor
composer.lock

# Meili
docker/meili/data.ms
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ php-cs-fixer-dry:

phpstan: ## Run PHPStan (the configuration must be defined in phpstan.neon)
phpstan: phpstan.neon
$(DOCKER) run --rm -v $(PWD):/app phpstan/phpstan analyse /app/src
$(PHP) vendor/bin/phpstan analyse

rector-dry: ## Run Rector in --dry-run mode
rector-dry: rector.php
Expand Down
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@
"friendsofphp/php-cs-fixer": "^2.16",
"infection/infection": "0.15",
"phpstan/phpstan": "^0.12",
"phpstan/phpstan-phpunit": "^0.12.17",
"phpunit/phpunit": "^8.5",
"ramsey/uuid": "^3.8",
"rector/rector": "^0.8.40",
Expand Down
Loading