Merge branch '1.3'

* 1.3: Fix routing and install stripe/stripe-php Fix the 1.2 build
Sylius · Jan 22, 2019 · 89bebc6 · 89bebc6
2 parents 060d162 + e4c8580
commit 89bebc6
Show file tree

Hide file tree

Showing 6 changed files with 97 additions and 24 deletions.
diff --git a/composer.json b/composer.json
@@ -39,6 +39,7 @@
         "phpspec/phpspec": "^5.0",
         "phpunit/phpunit": "^6.5",
         "sensiolabs/security-checker": "^5.0",
+        "stripe/stripe-php": "^6.28",
         "sylius-labs/coding-standard": "^2.0",
         "symfony/browser-kit": "^3.4|^4.1",
         "symfony/debug-bundle": "^3.4|^4.1",

diff --git a/composer.lock b/composer.lock
diff --git a/config/bundles.php b/config/bundles.php
@@ -57,4 +57,5 @@
     Symfony\Bundle\WebServerBundle\WebServerBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true],
     Fidry\AliceDataFixtures\Bridge\Symfony\FidryAliceDataFixturesBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true],
     Nelmio\Alice\Bridge\Symfony\NelmioAliceBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true],
+    Sylius\Behat\Application\SyliusTestPlugin\SyliusTestPlugin::class => ['test' => true, 'test_cached' => true],
 ];
diff --git a/config/routes/test/sylius_test_plugin.yaml b/config/routes/test/sylius_test_plugin.yaml
@@ -0,0 +1,5 @@
+sylius_test_plugin_main:
+    path: /test/main
+    controller: FrameworkBundle:Template:template
+    defaults:
+        template: "@SyliusTestPlugin/main.html.twig"
diff --git a/config/routes/test_cached/sylius_test_plugin.yaml b/config/routes/test_cached/sylius_test_plugin.yaml
@@ -0,0 +1,5 @@
+sylius_test_plugin_main:
+    path: /test/main
+    controller: FrameworkBundle:Template:template
+    defaults:
+        template: "@SyliusTestPlugin/main.html.twig"
diff --git a/symfony.lock b/symfony.lock
@@ -539,6 +539,9 @@
             "ref": "6c1ceb662f8997085f739cd089bfbef67f245983"
         }
     },
+    "stripe/stripe-php": {
+        "version": "v6.28.1"
+    },
     "swiftmailer/swiftmailer": {
         "version": "v6.1.2"
     },