Merge pull request #55 from ahilles107/update_dependencies

update dependencies

app/config/config.yml

@@ -101,8 +101,8 @@ fos_rest:
             - { path: '^/', stop: true }
 
 lexik_jwt_authentication:
-    private_key_path: '%jwt_private_key_path%'
-    public_key_path:  '%jwt_public_key_path%'
+    private_key_path:       '%jwt_private_key_path%'
+    public_key_path:       '%jwt_public_key_path%'
     pass_phrase:      '%jwt_key_pass_phrase%'
     token_ttl:        '%jwt_token_ttl%'
 

composer.json

@@ -26,7 +26,7 @@
         "php": ">=7.1",
         "doctrine/doctrine-bundle": "^1.6.7",
         "doctrine/doctrine-migrations-bundle": "1.2.1",
-        "doctrine/orm": "v2.5.6",
+        "doctrine/orm": "2.6.*",
         "incenteev/composer-parameter-handler": "^2.0",
         "lexik/jwt-authentication-bundle": "^2.4",
         "nelmio/cors-bundle": "^1.5@dev",

features/api/payments/editing_payment_method.feature

@@ -21,6 +21,8 @@ Feature: Editing existing payment methods
     """
     Then the response status code should be 204
     And the response should be empty
+    Given I am authenticated as "admin"
+    Given I am want to get JSON
     Then I send a "GET" request to "/api/v1/payment-methods/off"
     And the header "Content-Type" should be equal to "application/json"
     And the JSON nodes should contain:

features/api/subscriptions/getting_single_subscription.feature

@@ -8,6 +8,7 @@ Feature: Getting a single subscription
     Given I am authenticated as "admin"
 
   Scenario: Get a single subscription
+    Given I am want to get JSON
     Given the system has a payment method "Offline" with a code "cash_on_delivery"
     When I add "Content-Type" header equal to "application/json"
     And I add "Accept" header equal to "application/json"
@@ -24,6 +25,9 @@ Feature: Getting a single subscription
       }
     }
     """
+
+    Given I am authenticated as "admin"
+    Given I am want to get JSON
     And I add "Accept" header equal to "application/json"
     When I am on "/api/v1/subscriptions/1"
     Then the response status code should be 200

features/api/subscriptions/validate_max_and_min_amount_configured_by_payment_method.feature

@@ -6,6 +6,7 @@ Feature: Prevent creating a new subscription if the gateway's config of a paymen
 
   Scenario: Validate the subscription's amount field based on the payment method's gateway configuration
     Given I am authenticated as "admin"
+    Given I am want to get JSON
     When I add "Content-Type" header equal to "application/json"
     And I add "Accept" header equal to "application/json"
     And I send a "POST" request to "/api/v1/payment-methods/new/paypal_express_checkout" with body:
@@ -34,6 +35,9 @@ Feature: Prevent creating a new subscription if the gateway's config of a paymen
     }
     """
     Then the response status code should be 201
+
+    Given I am authenticated as "admin"
+    Given I am want to get JSON
     And I add "Content-Type" header equal to "application/json"
     And I add "Accept" header equal to "application/json"
     And I send a "POST" request to "/api/v1/subscriptions/" with body:
@@ -50,6 +54,9 @@ Feature: Prevent creating a new subscription if the gateway's config of a paymen
     And the header "Content-Type" should be equal to "application/json"
     And the JSON nodes should contain:
       | errors.children.amount.errors[0] | This value should be 1 or more. |
+
+    Given I am authenticated as "admin"
+    Given I am want to get JSON
     And I add "Content-Type" header equal to "application/json"
     And I add "Accept" header equal to "application/json"
     And I send a "POST" request to "/api/v1/subscriptions/" with body:
@@ -66,6 +73,9 @@ Feature: Prevent creating a new subscription if the gateway's config of a paymen
     And the header "Content-Type" should be equal to "application/json"
     And the JSON nodes should contain:
       | errors.children.amount.errors[0] | This value should be 5 or less. |
+
+    Given I am authenticated as "admin"
+    Given I am want to get JSON
     And I add "Content-Type" header equal to "application/json"
     And I add "Accept" header equal to "application/json"
     And I send a "POST" request to "/api/v1/subscriptions/" with body:

features/api/webhooks/deleting_webhook.feature

@@ -6,6 +6,7 @@ Feature: Deleting existing webhook
 
   Scenario: Delete a single webhook by id
     Given I am authenticated as "admin"
+    Given I am want to get JSON
     When I add "Content-Type" header equal to "application/json"
     And I add "Accept" header equal to "application/json"
     And I send a "POST" request to "/api/v1/webhooks/" with body:
@@ -17,6 +18,9 @@ Feature: Deleting existing webhook
     """
     Then the response status code should be 201
     And the response should be in JSON
+
+    Given I am authenticated as "admin"
+    Given I am want to get JSON
     When I add "Content-Type" header equal to "application/json"
     And I add "Accept" header equal to "application/json"
     And I send a "DELETE" request to "/api/v1/webhooks/1"

features/api/webhooks/editing_webhook.feature

@@ -6,6 +6,7 @@ Feature: Editing existing webhook
 
   Scenario: Edit a single webhook by id
     Given I am authenticated as "admin"
+    Given I am want to get JSON
     When I add "Content-Type" header equal to "application/json"
     And I add "Accept" header equal to "application/json"
     And I send a "POST" request to "/api/v1/webhooks/" with body:
@@ -17,6 +18,9 @@ Feature: Editing existing webhook
     """
     Then the response status code should be 201
     And the response should be in JSON
+
+    Given I am authenticated as "admin"
+    Given I am want to get JSON
     When I add "Content-Type" header equal to "application/json"
     And I add "Accept" header equal to "application/json"
     And I send a "PATCH" request to "/api/v1/webhooks/1" with body:
@@ -27,6 +31,9 @@ Feature: Editing existing webhook
     """
     Then the response status code should be 204
     And the response should be empty
+
+    Given I am authenticated as "admin"
+    Given I am want to get JSON
     Then I send a "GET" request to "/api/v1/webhooks/1"
     Then the response status code should be 200
     And the response should be in JSON

features/api/webhooks/getting_single_webhook.feature

@@ -6,6 +6,7 @@ Feature: Getting a single existing webhook
 
   Scenario: Get a single webhook by id
     Given I am authenticated as "admin"
+    Given I am want to get JSON
     When I add "Content-Type" header equal to "application/json"
     And I add "Accept" header equal to "application/json"
     And I send a "POST" request to "/api/v1/webhooks/" with body:
@@ -17,6 +18,9 @@ Feature: Getting a single existing webhook
     """
     Then the response status code should be 201
     And the response should be in JSON
+
+    Given I am authenticated as "admin"
+    Given I am want to get JSON
     Then I send a "GET" request to "/api/v1/webhooks/1"
     Then the response status code should be 200
     And the response should be in JSON

features/api/webhooks/listing_webhooks.feature

@@ -6,6 +6,7 @@ Feature: Listing webhooks
 
   Scenario: List webhooks
     Given I am authenticated as "admin"
+    Given I am want to get JSON
     When I add "Content-Type" header equal to "application/json"
     And I add "Accept" header equal to "application/json"
     And I send a "POST" request to "/api/v1/webhooks/" with body:
@@ -17,6 +18,9 @@ Feature: Listing webhooks
     """
     Then the response status code should be 201
     And the response should be in JSON
+
+    Given I am authenticated as "admin"
+    Given I am want to get JSON
     And I send a "GET" request to "/api/v1/webhooks/"
     Then the response status code should be 200
     And the response should be in JSON

features/api_public/purchases/paying_offline_during_purchase.feature

@@ -74,17 +74,22 @@ Feature: Paying offline for a subscription
     }
     """
     Then the response status code should be 201
+
     Then I add "Content-Type" header equal to "application/json"
     And I add "Accept" header equal to "application/json"
     And I send a "GET" request to "/public-api/v1/subscriptions/12345abcde"
     Then the response status code should be 200
+
     And I send a "GET" request to "/public-api/v1/subscriptions/12345abcde/pay/"
     Then the response status code should be 302
-    And I am authenticated as "admin"
+
+    Given I am authenticated as "admin"
+    Given I am want to get JSON
     And I add "Content-Type" header equal to "application/json"
     And I add "Accept" header equal to "application/json"
     And I send a "PUT" request to "/api/v1/subscriptions/1/payments/1/complete"
     Then the response status code should be 204
+
     And I add "Content-Type" header equal to "application/json"
     And I add "Accept" header equal to "application/json"
     And I send a "GET" request to "/public-api/v1/subscriptions/12345abcde"

features/bootstrap/RestJwtContext.php

@@ -28,6 +28,16 @@ public function iAmAuthenticatedAs(string $username)
         $this->request->setHttpHeader('Authorization', 'Bearer '.$token);
     }
 
+    /**
+     * @param string $username
+     *
+     * @Given I am want to get JSON
+     */
+    public function iWantToGetJson()
+    {
+        $this->request->setHttpHeader('Accept', 'application/json');
+    }
+
     /**
      * @BeforeScenario
      */

src/PH/Bundle/CoreBundle/Resources/config/routing.yml

@@ -50,6 +50,7 @@ ph_api_subscription_payment_complete:
     defaults:
         _controller: sylius.controller.payment:applyStateMachineTransitionAction
         _sylius:
+            csrf_protection: false
             event: complete
             repository:
                 method: findOneBySubscriptionId