From 15d60ec2ec076aea114cd23526b55ba12b5bca55 Mon Sep 17 00:00:00 2001 From: awelara Date: Tue, 4 Jul 2017 21:04:46 +0300 Subject: [PATCH 1/7] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d9eecb2..5bdd387 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "besimple/soap-bundle", + "name": "awelara/besimple-soap-bundle", "type": "symfony-bundle", "description": "Build and consume SOAP and WSDL based web services with Symfony2", "keywords": [ "soap", "soap-bundle" ], From 54a66e4357a9698a8201f15567fed977bc4a36a1 Mon Sep 17 00:00:00 2001 From: awelara Date: Tue, 4 Jul 2017 21:12:11 +0300 Subject: [PATCH 2/7] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 5bdd387..a99755f 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "besimple/soap-wsdl": "0.3.*", "ass/xmlsecurity": "~1.0", "symfony/framework-bundle": "~2.6", - "symfony/twig-bundle": "~2.6", + "symfony/twig-bundle": "*", "zendframework/zend-mime": "2.1.*" }, "suggest": { From 16ffcf6acb91238f6d8287872cb64a858bd6a809 Mon Sep 17 00:00:00 2001 From: awelara Date: Wed, 5 Jul 2017 12:44:10 +0300 Subject: [PATCH 3/7] Symfony3 support --- Controller/SoapWebServiceController.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Controller/SoapWebServiceController.php b/Controller/SoapWebServiceController.php index 29d08c3..c986cf5 100644 --- a/Controller/SoapWebServiceController.php +++ b/Controller/SoapWebServiceController.php @@ -16,7 +16,8 @@ use BeSimple\SoapBundle\Soap\SoapRequest; use BeSimple\SoapBundle\Soap\SoapResponse; use BeSimple\SoapServer\SoapServerBuilder; -use Symfony\Component\DependencyInjection\ContainerAware; +use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Component\DependencyInjection\ContainerAwareTrait; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\FlattenException; @@ -28,8 +29,9 @@ * @author Christian Kerl * @author Francis Besset */ -class SoapWebServiceController extends ContainerAware +class SoapWebServiceController extends Controller { + use ContainerAwareTrait; /** * @var \SoapServer */ @@ -64,7 +66,7 @@ public function callAction($webservice) $this->serviceBinder = $webServiceContext->getServiceBinder(); - $this->soapRequest = SoapRequest::createFromHttpRequest($this->container->get('request')); + $this->soapRequest = SoapRequest::createFromHttpRequest($this->container->get('request_stack')->pop()); $this->soapServer = $webServiceContext ->getServerBuilder() ->withSoapVersion11() @@ -95,7 +97,7 @@ public function definitionAction($webservice) ) )); - $request = $this->container->get('request'); + $request = $this->container->get('request_stack')->pop(); $query = $request->query; if ($query->has('wsdl') || $query->has('WSDL')) { $request->setRequestFormat('wsdl'); From a01fa9ace02ceeb0ff5f764f983288bb4f81ddc6 Mon Sep 17 00:00:00 2001 From: awelara Date: Wed, 5 Jul 2017 12:45:31 +0300 Subject: [PATCH 4/7] Symfony3 sypport --- WebServiceContext.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WebServiceContext.php b/WebServiceContext.php index dce81a7..81d5957 100644 --- a/WebServiceContext.php +++ b/WebServiceContext.php @@ -44,7 +44,7 @@ public function getServiceDefinition() 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 (string) $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'])); @@ -82,7 +82,7 @@ public function getWsdlFile($endpoint = null) $cache->write($dumper->dump()); } - return (string) $cache; + return (string) $cache->getPath(); } public function getServiceBinder() From 1d9c3d8d8fc22831e900e97edfd1ddc5d4a92d49 Mon Sep 17 00:00:00 2001 From: awelara Date: Wed, 5 Jul 2017 17:28:33 +0300 Subject: [PATCH 5/7] Symfony3 support --- Controller/SoapWebServiceController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Controller/SoapWebServiceController.php b/Controller/SoapWebServiceController.php index c986cf5..afdf9f0 100644 --- a/Controller/SoapWebServiceController.php +++ b/Controller/SoapWebServiceController.php @@ -24,6 +24,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\HttpKernelInterface; use Symfony\Component\HttpKernel\Log\DebugLoggerInterface; +use Symfony\Component\Routing\Generator\UrlGeneratorInterface; /** * @author Christian Kerl @@ -93,7 +94,7 @@ public function definitionAction($webservice) $this->container->get('router')->generate( '_webservice_call', array('webservice' => $webservice), - true + UrlGeneratorInterface::ABSOLUTE_URL ) )); From ed470d75bac383cdb3472b65c0d0a51fe006200b Mon Sep 17 00:00:00 2001 From: awelara Date: Wed, 5 Jul 2017 17:32:42 +0300 Subject: [PATCH 6/7] Update composer.json --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index a99755f..3faa34c 100644 --- a/composer.json +++ b/composer.json @@ -22,16 +22,16 @@ "require": { "php": ">=5.3.0", "ext-soap": "*", - "besimple/soap-common": "0.3.*", - "besimple/soap-wsdl": "0.3.*", + "besimple/soap-common": "0.2.*", + "besimple/soap-wsdl": "0.2.*", "ass/xmlsecurity": "~1.0", "symfony/framework-bundle": "~2.6", "symfony/twig-bundle": "*", "zendframework/zend-mime": "2.1.*" }, "suggest": { - "besimple/soap-client": "0.3.*", - "besimple/soap-server": "0.3.*" + "besimple/soap-client": "0.2.*", + "besimple/soap-server": "0.2.*" }, "autoload": { "psr-0": { "BeSimple\\SoapBundle": "" } From 9323e2d89d96e784b2c5f475399f958631d1456c Mon Sep 17 00:00:00 2001 From: awelara Date: Tue, 24 Dec 2019 22:03:43 +0200 Subject: [PATCH 7/7] add support symfony 4 --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 3faa34c..eeb5f73 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "awelara/besimple-soap-bundle", "type": "symfony-bundle", - "description": "Build and consume SOAP and WSDL based web services with Symfony2", + "description": "Build and consume SOAP and WSDL based web services with Symfony4", "keywords": [ "soap", "soap-bundle" ], "homepage": "https://github.com/BeSimple/BeSimpleSoapBundle", "license": "MIT", @@ -20,13 +20,13 @@ } ], "require": { - "php": ">=5.3.0", + "php": ">=7.0", "ext-soap": "*", "besimple/soap-common": "0.2.*", "besimple/soap-wsdl": "0.2.*", "ass/xmlsecurity": "~1.0", - "symfony/framework-bundle": "~2.6", "symfony/twig-bundle": "*", + "symfony/framework-bundle": "^4.1", "zendframework/zend-mime": "2.1.*" }, "suggest": { @@ -39,7 +39,7 @@ "target-dir": "BeSimple/SoapBundle", "extra": { "branch-alias": { - "dev-master": "0.3-dev" + "dev-master": "0.4-dev" } } }