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
11 changes: 7 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,13 @@ jobs:

-
name: Install PHP dependencies
run: composer install --no-interaction --no-plugins
run: composer install --no-interaction
env:
SYMFONY_REQUIRE: ${{ matrix.symfony }}

-
name: Clean Symfony Flex recipes application
run: git checkout . && git clean -fd

-
name: Get Yarn cache directory
Expand Down Expand Up @@ -145,7 +149,6 @@ jobs:
name: Prepare test application assets
run: |
(cd tests/Application && bin/console assets:install public -vvv)
(cd tests/Application && bin/console sylius:install:assets -vvv)
(cd tests/Application && yarn build:prod)

-
Expand All @@ -166,7 +169,7 @@ jobs:

-
name: Run PHPStan
run: vendor/bin/phpstan analyse
run: vendor/bin/phpstan analyse -c phpstan.neon -l max src/

-
name: Run Psalm
Expand All @@ -182,7 +185,7 @@ jobs:

-
name: Run Behat
run: vendor/bin/behat --colors --strict -vvv --no-interaction || vendor/bin/behat --colors --strict -vvv --no-interaction --rerun
run: vendor/bin/behat --colors --strict -vvv --no-interaction -f progress || vendor/bin/behat --colors --strict -vvv --no-interaction -f progress --rerun

-
name: Upload Behat logs
Expand Down
5 changes: 4 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"friends-of-behat/symfony-extension": "^2.6",
"friends-of-behat/variadic-extension": "^1.6",
"league/csv": "^9.8",
"matthiasnoback/symfony-dependency-injection-test": "^4.3",
"matthiasnoback/symfony-dependency-injection-test": "^5.1",
"mikey179/vfsstream": "^1.6",
"nyholm/psr7": "^1.8",
"phpspec/phpspec": "^7.5",
Expand Down Expand Up @@ -66,6 +66,9 @@
"extra": {
"branch-alias": {
"dev-master": "2.0-dev"
},
"symfony": {
"require": "^6.4"
}
},
"autoload": {
Expand Down
1 change: 1 addition & 0 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<testsuites>
<testsuite name="WebgriffeSyliusAkeneoPlugin Test Suite">
<directory>tests</directory>
<exclude>tests/PIM</exclude>
</testsuite>
</testsuites>

Expand Down
1 change: 1 addition & 0 deletions tests/Application/config/packages/_sylius.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ imports:
- { resource: "@SyliusShopBundle/Resources/config/app/config.yml" }
- { resource: "@SyliusApiBundle/Resources/config/app/config.yaml" }

- { resource: '@WebgriffeSyliusAkeneoPlugin/config/config.yaml' }
- { resource: '../fixtures/*.yaml' }

parameters:
Expand Down
2 changes: 2 additions & 0 deletions tests/Application/config/packages/framework.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ framework:
csrf_protection: true
session:
handler_id: ~
annotations:
enabled: false
2 changes: 0 additions & 2 deletions tests/Application/config/packages/security.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,6 @@ security:
access_control:
- { path: "%sylius.security.admin_regex%/forgotten-password", role: PUBLIC_ACCESS }

- { path: "%sylius.security.admin_regex%/forgotten-password", role: PUBLIC_ACCESS }

- { path: "%sylius.security.admin_regex%/login", role: PUBLIC_ACCESS }
- { path: "%sylius.security.shop_regex%/login", role: PUBLIC_ACCESS }

Expand Down
2 changes: 1 addition & 1 deletion tests/Application/config/routes/sylius_shop.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ sylius_shop_request_password_reset_token_redirect:
controller: Symfony\Bundle\FrameworkBundle\Controller\RedirectController::redirectAction
defaults:
route: sylius_shop_request_password_reset_token
permanent: false
permanent: false
3 changes: 0 additions & 3 deletions tests/Application/config/services_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,3 @@ services:

webgriffe_sylius_akeneo.date_time_builder:
class: 'Tests\Webgriffe\SyliusAkeneoPlugin\TestDouble\DateTimeBuilder'

Sylius\Component\Core\Generator\ImagePathGeneratorInterface:
class: 'Sylius\Component\Core\Generator\UploadedImagePathGenerator'
Loading