Skip to content

Commit

Permalink
bug #321 Fix the build vol.2 (pamil, Zales0123)
Browse files Browse the repository at this point in the history
This PR was merged into the 1.2 branch.

Discussion
----------

Replaces #320

I've installed again `stripe/stripe-php` which was removed in #311... but the build was failing, I don't know why 🐰 

Commits
-------

6af2eb0 Fix the 1.2 build
629f949 Fix routing and install stripe/stripe-php
  • Loading branch information
pamil authored Jan 22, 2019
2 parents 0fc291f + 629f949 commit 4989643
Show file tree
Hide file tree
Showing 7 changed files with 104 additions and 17 deletions.
8 changes: 8 additions & 0 deletions app/TestAppKernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,14 @@

class TestAppKernel extends AppKernel
{
public function registerBundles(): array
{
return array_merge(
parent::registerBundles(),
[new \Sylius\Behat\Application\SyliusTestPlugin\SyliusTestPlugin()]
);
}

protected function getContainerBaseClass(): string
{
return MockerContainer::class;
Expand Down
1 change: 1 addition & 0 deletions app/config/config_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ parameters:

framework:
test: ~
router: { resource: '%kernel.project_dir%/app/config/routing_test.yml' }
session:
storage_id: session.storage.mock_file

Expand Down
3 changes: 3 additions & 0 deletions app/config/config_test_cached.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
imports:
- { resource: config_test.yml }

framework:
router: { resource: '%kernel.project_dir%/app/config/routing_test_cached.yml' }

doctrine:
orm:
entity_managers:
Expand Down
11 changes: 11 additions & 0 deletions app/config/routing_test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# This file is part of the Sylius package.
# (c) Paweł Jędrzejewski

_main:
resource: routing.yml

sylius_test_plugin_main:
path: /test/main
controller: FrameworkBundle:Template:template
defaults:
template: "@SyliusTestPlugin/main.html.twig"
5 changes: 5 additions & 0 deletions app/config/routing_test_cached.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# This file is part of the Sylius package.
# (c) Paweł Jędrzejewski

_test:
resource: routing_test.yml
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,11 @@
"friends-of-behat/suite-settings-extension": "^1.0",
"friends-of-behat/symfony-extension": "^1.2.1",
"friends-of-behat/variadic-extension": "^1.1",
"lchrusciel/api-test-case": "^3.0",
"lakion/mink-debug-extension": "^1.2.3",
"lchrusciel/api-test-case": "^3.0",
"phpspec/phpspec": "^4.0",
"phpunit/phpunit": "^6.5",
"stripe/stripe-php": "^6.28",
"sylius-labs/coding-standard": "^2.0"
},
"prefer-stable": true,
Expand Down
90 changes: 74 additions & 16 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 4989643

Please sign in to comment.