From 0748b236309152d8993064b0633ef69cdc38eabf Mon Sep 17 00:00:00 2001
From: Ghislain Loaec <gloaec@cadoles.com>
Date: Fri, 6 Apr 2018 11:21:50 +0200
Subject: [PATCH] Symfony 2 fixes

---
 .../SoapBundle/Controller/SoapWebServiceController.php        | 2 +-
 .../Resources/config/routing/webservicecontroller.xml         | 4 ++--
 src/BeSimple/SoapBundle/WebServiceContext.php                 | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/BeSimple/SoapBundle/Controller/SoapWebServiceController.php b/src/BeSimple/SoapBundle/Controller/SoapWebServiceController.php
index 29d08c3..d3a0023 100644
--- a/src/BeSimple/SoapBundle/Controller/SoapWebServiceController.php
+++ b/src/BeSimple/SoapBundle/Controller/SoapWebServiceController.php
@@ -64,7 +64,7 @@ class SoapWebServiceController extends ContainerAware
 
         $this->serviceBinder = $webServiceContext->getServiceBinder();
 
-        $this->soapRequest = SoapRequest::createFromHttpRequest($this->container->get('request'));
+        $this->soapRequest = SoapRequest::createFromHttpRequest($this->container->get('request_stack')->getCurrentRequest());
         $this->soapServer  = $webServiceContext
             ->getServerBuilder()
             ->withSoapVersion11()
diff --git a/src/BeSimple/SoapBundle/Resources/config/routing/webservicecontroller.xml b/src/BeSimple/SoapBundle/Resources/config/routing/webservicecontroller.xml
index 98e80e4..cd370b9 100644
--- a/src/BeSimple/SoapBundle/Resources/config/routing/webservicecontroller.xml
+++ b/src/BeSimple/SoapBundle/Resources/config/routing/webservicecontroller.xml
@@ -4,13 +4,13 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
 
-    <route id="_webservice_call" pattern="/{webservice}">
+    <route id="_webservice_call" path="/{webservice}">
         <default key="_controller">BeSimpleSoapBundle:SoapWebService:Call</default>
         <default key="_format">xml</default>
         <requirement key="_method">POST</requirement>
     </route>
 
-    <route id="_webservice_definition" pattern="/{webservice}">
+    <route id="_webservice_definition" path="/{webservice}">
         <default key="_controller">BeSimpleSoapBundle:SoapWebService:Definition</default>
         <default key="_format">xml</default>
         <requirement key="_method">GET</requirement>
diff --git a/src/BeSimple/SoapBundle/WebServiceContext.php b/src/BeSimple/SoapBundle/WebServiceContext.php
index dce81a7..61c7698 100644
--- a/src/BeSimple/SoapBundle/WebServiceContext.php
+++ b/src/BeSimple/SoapBundle/WebServiceContext.php
@@ -44,7 +44,7 @@ class WebServiceContext
         if (null === $this->serviceDefinition) {
             $cache = new ConfigCache(sprintf('%s/%s.definition.php', $this->options['cache_dir'], $this->options['name']), $this->options['debug']);
             if ($cache->isFresh()) {
-                $this->serviceDefinition = include (string) $cache;
+                $this->serviceDefinition = include $cache->getPath();
             } else {
                 if (!$this->loader->supports($this->options['resource'], $this->options['resource_type'])) {
                     throw new \LogicException(sprintf('Cannot load "%s" (%s)', $this->options['resource'], $this->options['resource_type']));