Update phpspec to stable version, fix failing spec of PurchaseStep

composer.json

@@ -52,7 +52,7 @@
         "symfony-cmf/content-bundle":           "1.0.*",
         "symfony-cmf/routing-bundle":           "1.1.*",
         "symfony-cmf/menu-bundle":              "1.0.*",
-        "jackalope/jackalope-doctrine-dbal": "1.0.*"
+        "jackalope/jackalope-doctrine-dbal":    "1.0.*"
     },
     "require-dev": {
         "behat/behat":                       "~2.4",
@@ -63,7 +63,7 @@
         "behat/mink-selenium2-driver":       "*",
         "doctrine/doctrine-fixtures-bundle": "2.2.*",
         "fzaninotto/faker":                  "1.2.*",
-        "phpspec/phpspec":                   "2.0.*@dev",
+        "phpspec/phpspec":                   "~2.0",
         "phpunit/phpunit":                   "~3.7"
     },
     "provide": {

src/Sylius/Bundle/AddressingBundle/composer.json

@@ -27,7 +27,7 @@
         "stof/doctrine-extensions-bundle": "1.1.*"
     },
     "require-dev": {
-        "phpspec/phpspec":   "2.0.*@dev",
+        "phpspec/phpspec":   "~2.0",
         "doctrine/orm":      "~2.2",
         "symfony/form":      "~2.3",
         "symfony/validator": "~2.3"

src/Sylius/Bundle/CartBundle/composer.json

@@ -28,7 +28,7 @@
         "sylius/resource-bundle":   "1.0.*@dev"
     },
     "require-dev": {
-        "phpspec/phpspec":   "2.0.*@dev",
+        "phpspec/phpspec":   "~2.0",
         "symfony/form":      "~2.3",
         "symfony/validator": "~2.3",
         "twig/twig":         "~1.0"

src/Sylius/Bundle/CoreBundle/composer.json

@@ -49,7 +49,7 @@
     },
     "require-dev": {
         "fzaninotto/faker": "1.2.*",
-        "phpspec/phpspec":  "2.0.*@dev",
+        "phpspec/phpspec":  "~2.0",
         "symfony/form":     "~2.3"
     },
     "suggest": {

src/Sylius/Bundle/CoreBundle/spec/Sylius/Bundle/CoreBundle/Checkout/Step/PurchaseStepSpec.php

@@ -12,14 +12,15 @@
 namespace spec\Sylius\Bundle\CoreBundle\Checkout\Step;
 
 use Doctrine\Common\Persistence\ObjectManager;
-use Sylius\Bundle\CoreBundle\Checkout\SyliusCheckoutEvents;
 use Payum\Core\PaymentInterface;
 use Payum\Core\Registry\RegistryInterface;
 use Payum\Core\Security\HttpRequestVerifierInterface;
 use Payum\Core\Security\TokenInterface;
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
+use spec\Sylius\Bundle\CoreBundle\Fixture\RequestStack;
 use Sylius\Bundle\CartBundle\Provider\CartProviderInterface;
+use Sylius\Bundle\CoreBundle\Checkout\SyliusCheckoutEvents;
 use Sylius\Bundle\CoreBundle\Model\Order;
 use Sylius\Bundle\FlowBundle\Process\Context\ProcessContextInterface;
 use Sylius\Bundle\PaymentsBundle\Model\Payment;
@@ -32,14 +33,16 @@
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\Translation\TranslatorInterface;
 
+require_once __DIR__.'/../../Fixture/RequestStack.php';
+
 class PurchaseStepSpec extends ObjectBehavior
 {
     function let(
         ContainerInterface $container,
-        ProcessContextInterface $context,
         HttpRequestVerifierInterface $httpRequestVerifier,
         TokenInterface $token,
         Request $request,
+        RequestStack $requestStack,
         CartProviderInterface $cartProvider,
         RegistryInterface $payum,
         PaymentInterface $payment,
@@ -50,6 +53,7 @@ function let(
         FlashBagInterface $flashBag,
         TranslatorInterface $translator
     ) {
+        $requestStack->getCurrentRequest()->willReturn($request);
         $session->getFlashBag()->willReturn($flashBag);
         $doctrine->getManager()->willReturn($objectManager);
         $token->getPaymentName()->willReturn('aPaymentName');
@@ -59,6 +63,7 @@ function let(
 
         $container->get('payum.security.http_request_verifier')->willReturn($httpRequestVerifier);
         $container->get('request')->willReturn($request);
+        $container->get('request_stack')->willReturn($requestStack);
         $container->get('sylius.cart_provider')->willReturn($cartProvider);
         $container->get('payum')->willReturn($payum);
         $container->get('event_dispatcher')->willReturn($eventDispatcher);
@@ -85,8 +90,7 @@ function it_extends_checkout_step()
     function it_must_dispatch_pre_and_post_payment_state_changed_if_state_changed(
         ProcessContextInterface $context,
         PaymentInterface $payment,
-        EventDispatcherInterface $eventDispatcher,
-        CartProviderInterface $cartProvider
+        EventDispatcherInterface $eventDispatcher
     ) {
         $paymentModel = new Payment();
         $paymentModel->setState(Payment::STATE_NEW);
@@ -130,8 +134,7 @@ function it_must_dispatch_pre_and_post_payment_state_changed_if_state_changed(
     function it_must_not_dispatch_pre_and_post_payment_state_changed_if_state_not_changed(
         ProcessContextInterface $context,
         PaymentInterface $payment,
-        EventDispatcherInterface $eventDispatcher,
-        CartProviderInterface $cartProvider
+        EventDispatcherInterface $eventDispatcher
     ) {
         $paymentModel = new Payment();
         $paymentModel->setState(Payment::STATE_COMPLETED);

src/Sylius/Bundle/CoreBundle/spec/Sylius/Bundle/CoreBundle/Fixture/RequestStack.php

@@ -0,0 +1,29 @@
+<?php
+
+/*
+* This file is part of the Sylius package.
+*
+* (c) Paweł Jędrzejewski
+*
+* For the full copyright and license information, please view the LICENSE
+* file that was distributed with this source code.
+*/
+
+namespace spec\Sylius\Bundle\CoreBundle\Fixture;
+
+use Symfony\Component\HttpFoundation\Request;
+
+class RequestStack
+{
+    private $request;
+
+    public function __construct(Request $request)
+    {
+        $this->request = $request;
+    }
+
+    public function getCurrentRequest()
+    {
+        return $this->request;
+    }
+}

src/Sylius/Bundle/InstallerBundle/composer.json

@@ -27,7 +27,7 @@
         "sylius/flow-bundle":       "1.0.*@dev"
     },
     "require-dev": {
-        "phpspec/phpspec":          "2.0.*@dev",
+        "phpspec/phpspec":          "~2.0",
         "symfony/form":             "~2.2",
         "symfony/validator":        "~2.2"
     },

src/Sylius/Bundle/InventoryBundle/composer.json

@@ -27,7 +27,7 @@
         "stof/doctrine-extensions-bundle": "1.1.*"
     },
     "require-dev": {
-        "phpspec/phpspec": "2.0.*@dev",
+        "phpspec/phpspec": "~2.0",
         "symfony/form":    "~2.3",
         "twig/twig":       "~1.0"
     },

src/Sylius/Bundle/MoneyBundle/composer.json

@@ -28,7 +28,7 @@
         "mathiasverraes/money":     "*@dev"
     },
     "require-dev": {
-        "phpspec/phpspec": "2.0.*@dev",
+        "phpspec/phpspec": "~2.0",
         "twig/twig":       "~1.0",
         "symfony/form":    "~2.3"
     },

src/Sylius/Bundle/OrderBundle/composer.json

@@ -28,7 +28,7 @@
         "stof/doctrine-extensions-bundle": "1.1.*"
     },
     "require-dev": {
-        "phpspec/phpspec":    "2.0.*@dev",
+        "phpspec/phpspec":    "~2.0",
         "doctrine/orm":       "~2.2",
         "symfony/form":       "~2.3",
         "symfony/validator":  "~2.3"

src/Sylius/Bundle/PaymentsBundle/composer.json

@@ -27,7 +27,7 @@
         "stof/doctrine-extensions-bundle": "1.1.*"
     },
     "require-dev": {
-        "phpspec/phpspec": "2.0.*@dev",
+        "phpspec/phpspec": "~2.0",
         "doctrine/orm":    "~2.2",
         "symfony/form":    "~2.3"
     },

src/Sylius/Bundle/ProductBundle/composer.json

@@ -27,7 +27,7 @@
         "stof/doctrine-extensions-bundle": "1.1.*"
     },
     "require-dev": {
-        "phpspec/phpspec":   "2.0.*@dev",
+        "phpspec/phpspec":   "~2.0",
         "symfony/form":      "~2.3",
         "symfony/validator": "~2.3"
     },

src/Sylius/Bundle/PromotionsBundle/composer.json

@@ -27,7 +27,7 @@
         "stof/doctrine-extensions-bundle": "1.1.*"
     },
     "require-dev": {
-        "phpspec/phpspec":   "2.0.*@dev",
+        "phpspec/phpspec":   "~2.0",
         "doctrine/orm":      "~2.2",
         "symfony/form":      "~2.3",
         "symfony/validator": "~2.3"

src/Sylius/Bundle/ResourceBundle/composer.json

@@ -32,7 +32,7 @@
         "symfony/form":                    "~2.3"
     },
     "require-dev": {
-        "phpspec/phpspec":      "2.0.*@dev",
+        "phpspec/phpspec":      "~2.0",
         "twig/twig":            "~1.11",
         "doctrine/orm":         "~2.3",
         "doctrine/mongodb-odm": "1.0.*@dev"