Skip to content

Commit 3b198e9

Browse files
authored
Merge pull request #2 from usemarkup/fix/sf3
fix: sf3 bc breaks
2 parents b454d49 + 6ea8f2c commit 3b198e9

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

src/BeSimple/SoapBundle/Controller/SoapWebServiceController.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
use Symfony\Component\DependencyInjection\ContainerAwareTrait;
2222
use Symfony\Component\HttpFoundation\Request;
2323
use Symfony\Component\HttpFoundation\Response;
24-
use Symfony\Component\HttpKernel\Exception\FlattenException;
24+
use Symfony\Component\Debug\Exception\FlattenException;
2525
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
2626
use Symfony\Component\HttpKernel\HttpKernelInterface;
2727
use Symfony\Component\HttpKernel\Log\DebugLoggerInterface;
@@ -68,7 +68,9 @@ public function callAction($webservice)
6868

6969
$this->serviceBinder = $webServiceContext->getServiceBinder();
7070

71-
$this->soapRequest = SoapRequest::createFromHttpRequest($this->container->get('request'));
71+
$request = $this->container->get('request_stack')->getCurrentRequest();
72+
73+
$this->soapRequest = SoapRequest::createFromHttpRequest($request);
7274
$this->soapServer = $webServiceContext
7375
->getServerBuilder()
7476
->withSoapVersion11()
@@ -99,7 +101,7 @@ public function definitionAction($webservice)
99101
)
100102
));
101103

102-
$request = $this->container->get('request');
104+
$request = $this->container->get('request_stack')->getCurrentRequest();
103105
$query = $request->query;
104106
if ($query->has('wsdl') || $query->has('WSDL')) {
105107
$request->setRequestFormat('wsdl');

src/BeSimple/SoapBundle/Handler/ExceptionHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
use BeSimple\SoapServer\Exception\ReceiverSoapFault;
1616
use Symfony\Component\HttpFoundation\Response;
17-
use Symfony\Component\HttpKernel\Exception\FlattenException;
17+
use Symfony\Component\Debug\Exception\FlattenException;
1818

1919
/**
2020
* @author Francis Besset <[email protected]>

src/BeSimple/SoapBundle/WebServiceContext.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public function getServiceDefinition()
4444
if (null === $this->serviceDefinition) {
4545
$cache = new ConfigCache(sprintf('%s/%s.definition.php', $this->options['cache_dir'], $this->options['name']), $this->options['debug']);
4646
if ($cache->isFresh()) {
47-
$this->serviceDefinition = include (string) $cache;
47+
$this->serviceDefinition = include $cache->getPath();
4848
} else {
4949
if (!$this->loader->supports($this->options['resource'], $this->options['resource_type'])) {
5050
throw new \LogicException(sprintf('Cannot load "%s" (%s)', $this->options['resource'], $this->options['resource_type']));
@@ -82,7 +82,7 @@ public function getWsdlFile($endpoint = null)
8282
$cache->write($dumper->dump());
8383
}
8484

85-
return (string) $cache;
85+
return $cache->getPath();
8686
}
8787

8888
public function getServiceBinder()

0 commit comments

Comments
 (0)