Cadoles
/
BeSimpleSoap
19
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Restart fomr 0.2

This commit is contained in:
Ghislain Loaec 2018-04-06 11:18:36 +02:00
parent 2b91f94b8d
commit 63111261e7
10 changed files with 63 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
composer.json
View File

@ -17,10 +17,6 @@
{ {
"name": "Andreas Schamberger", "name": "Andreas Schamberger",
"email": "mail@andreass.net" "email": "mail@andreass.net"
},
{
"name": "Ghislain Loaec",
"email": "gloaec@cadoles.com"
} }
], ],
"require": { "require": {
@ -28,8 +24,8 @@
"ext-soap": "*", "ext-soap": "*",
"ext-curl": "*", "ext-curl": "*",
"ass/xmlsecurity": "~1.0", "ass/xmlsecurity": "~1.0",
"symfony/framework-bundle": "~2.6", "symfony/framework-bundle": "~2.0|~3.0",
"symfony/twig-bundle": "~2.6", "symfony/twig-bundle": "~2.0|~3.0",
"zendframework/zend-mime": "2.1.*" "zendframework/zend-mime": "2.1.*"
}, },
"replace": { "replace": {
@ -42,7 +38,7 @@
"require-dev": { "require-dev": {
"ext-mcrypt": "*", "ext-mcrypt": "*",
"mikey179/vfsStream": "~1.0", "mikey179/vfsStream": "~1.0",
"symfony/filesystem": "~2.3", "symfony/filesystem": "~2.0",
"symfony/process": "~2.3" "symfony/process": "~2.3"
}, },
"autoload": { "autoload": {
@ -50,7 +46,7 @@
}, },
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "0.3-dev" "dev-master": "0.2-dev"
} }
} }
} }

19
src/BeSimple/SoapBundle/DependencyInjection/BeSimpleSoapExtension.php
View File

@ -21,6 +21,7 @@ use Symfony\Component\DependencyInjection\DefinitionDecorator;
use Symfony\Component\DependencyInjection\Reference; use Symfony\Component\DependencyInjection\Reference;
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader; use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
use Symfony\Component\HttpKernel\DependencyInjection\Extension; use Symfony\Component\HttpKernel\DependencyInjection\Extension;
use Symfony\Component\HttpKernel\Kernel;
/** /**
* BeSimpleSoapExtension. * BeSimpleSoapExtension.
@ -80,7 +81,11 @@ class BeSimpleSoapExtension extends Extension
private function registerClientConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader) private function registerClientConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
{ {
$loader->load('client.xml'); if (3 === Kernel::MAJOR_VERSION) {
$loader->load('client3.xml');
} else {
$loader->load('client.xml');
}
foreach ($config as $client => $options) { foreach ($config as $client => $options) {
$definition = new DefinitionDecorator('besimple.soap.client.builder'); $definition = new DefinitionDecorator('besimple.soap.client.builder');
@ -147,10 +152,14 @@ class BeSimpleSoapExtension extends Extension
$definition = new DefinitionDecorator('besimple.soap.client'); $definition = new DefinitionDecorator('besimple.soap.client');
$container->setDefinition(sprintf('besimple.soap.client.%s', $client), $definition); $container->setDefinition(sprintf('besimple.soap.client.%s', $client), $definition);
$definition->setFactory(array( if (3 === Kernel::MAJOR_VERSION) {
new Reference(sprintf('besimple.soap.client.builder.%s', $client)), $definition->setFactory(array(
'build' new Reference(sprintf('besimple.soap.client.builder.%s', $client)),
)); 'build'
));
} else {
$definition->setFactoryService(sprintf('besimple.soap.client.builder.%s', $client));
}
} }
private function createWebServiceContext(array $config, ContainerBuilder $container) private function createWebServiceContext(array $config, ContainerBuilder $container)

4
src/BeSimple/SoapBundle/Resources/config/client.xml
View File

@ -19,9 +19,7 @@
<argument type="service" id="besimple.soap.cache" /> <!-- hack to load besimple cache configuration --> <argument type="service" id="besimple.soap.cache" /> <!-- hack to load besimple cache configuration -->
</service> </service>
<service id="besimple.soap.client" class="%besimple.soap.client.builder.class%" abstract="true"> <service id="besimple.soap.client" factory-service="besimple.soap.client.builder" factory-method="build" class="%besimple.soap.client.builder.class%" abstract="true" />
<factory class="besimple.soap.client.builder" method="build" />
</service>
<service id="besimple.soap.classmap" class="%besimple.soap.classmap.class%" abstract="true" /> <service id="besimple.soap.classmap" class="%besimple.soap.classmap.class%" abstract="true" />
</services> </services>

29
src/BeSimple/SoapBundle/Resources/config/client3.xml Normal file
View File

@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<container xmlns="http://symfony.com/schema/dic/services"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
<parameters>
<parameter key="besimple.soap.client.builder.class">BeSimple\SoapBundle\Soap\SoapClientBuilder</parameter>
<parameter key="besimple.soap.classmap.class">BeSimple\SoapCommon\Classmap</parameter>
</parameters>
<services>
<service id="besimple.soap.client.builder" class="%besimple.soap.client.builder.class%" abstract="true">
<argument /> <!-- wsdl URI -->
<argument type="collection">
<argument key="debug">%kernel.debug%</argument>
</argument>
<argument type="service" id="besimple.soap.classmap" />
<argument type="service" id="besimple.soap.converter.collection" />
<argument type="service" id="besimple.soap.cache" /> <!-- hack to load besimple cache configuration -->
</service>
<service id="besimple.soap.client" class="%besimple.soap.client.builder.class%" abstract="true">
<factory service="besimple.soap.client.builder" method="build" />
</service>
<service id="besimple.soap.classmap" class="%besimple.soap.classmap.class%" abstract="true" />
</services>
</container>

14
src/BeSimple/SoapBundle/composer.json
View File

@ -22,16 +22,16 @@
"require": { "require": {
"php": ">=5.3.0", "php": ">=5.3.0",
"ext-soap": "*", "ext-soap": "*",
"besimple/soap-common": "0.3.*", "besimple/soap-common": "0.2.*",
"besimple/soap-wsdl": "0.3.*", "besimple/soap-wsdl": "0.2.*",
"ass/xmlsecurity": "~1.0", "ass/xmlsecurity": "~1.0",
"symfony/framework-bundle": "~2.6", "symfony/framework-bundle": "~2.0|~3.0",
"symfony/twig-bundle": "~2.6", "symfony/twig-bundle": "~2.0|~3.0",
"zendframework/zend-mime": "2.1.*" "zendframework/zend-mime": "2.1.*"
}, },
"suggest": { "suggest": {
"besimple/soap-client": "0.3.*", "besimple/soap-client": "0.2.*",
"besimple/soap-server": "0.3.*" "besimple/soap-server": "0.2.*"
}, },
"autoload": { "autoload": {
"psr-0": { "BeSimple\\SoapBundle": "" } "psr-0": { "BeSimple\\SoapBundle": "" }
@ -39,7 +39,7 @@
"target-dir": "BeSimple/SoapBundle", "target-dir": "BeSimple/SoapBundle",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "0.3-dev" "dev-master": "0.2-dev"
} }
} }
} }

2
src/BeSimple/SoapClient/Tests/WsdlDownloaderTest.php
View File

@ -278,7 +278,7 @@ class WsdlDownloaderTest extends AbstractWebserverTest
$content = file_get_contents(self::$fixturesPath.$file); $content = file_get_contents(self::$fixturesPath.$file);
$content = preg_replace('#'.preg_quote('%location%').'#', sprintf('localhost:%d', WEBSERVER_PORT), $content); $content = preg_replace('#'.preg_quote('%location%').'#', sprintf('localhost:%d', WEBSERVER_PORT), $content);
self::$filesystem->dumpFile(self::$fixturesPath.'build_include'.DIRECTORY_SEPARATOR.pathinfo($file, PATHINFO_BASENAME), $content); file_put_contents(self::$fixturesPath.'build_include'.DIRECTORY_SEPARATOR.pathinfo($file, PATHINFO_BASENAME), $content);
} }
} }

6
src/BeSimple/SoapClient/composer.json
View File

@ -23,12 +23,12 @@
"php": ">=5.3.0", "php": ">=5.3.0",
"ext-soap": "*", "ext-soap": "*",
"ext-curl": "*", "ext-curl": "*",
"besimple/soap-common": "0.3.*", "besimple/soap-common": "0.2.*",
"ass/xmlsecurity": "~1.0" "ass/xmlsecurity": "~1.0"
}, },
"require-dev": { "require-dev": {
"mikey179/vfsStream": "~1.0", "mikey179/vfsStream": "~1.0",
"symfony/filesystem": "~2.3", "symfony/filesystem": "~2.0",
"symfony/process": "~2.3" "symfony/process": "~2.3"
}, },
"autoload": { "autoload": {
@ -37,7 +37,7 @@
"target-dir": "BeSimple/SoapClient", "target-dir": "BeSimple/SoapClient",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "0.3-dev" "dev-master": "0.2-dev"
} }
} }
} }

2
src/BeSimple/SoapCommon/composer.json
View File

@ -34,7 +34,7 @@
"target-dir": "BeSimple/SoapCommon", "target-dir": "BeSimple/SoapCommon",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "0.3-dev" "dev-master": "0.2-dev"
} }
} }
} }

4
src/BeSimple/SoapServer/composer.json
View File

@ -22,7 +22,7 @@
"require": { "require": {
"php": ">=5.3.0", "php": ">=5.3.0",
"ext-soap": "*", "ext-soap": "*",
"besimple/soap-common": "0.3.*", "besimple/soap-common": "0.2.*",
"ass/xmlsecurity": "~1.0" "ass/xmlsecurity": "~1.0"
}, },
"autoload": { "autoload": {
@ -31,7 +31,7 @@
"target-dir": "BeSimple/SoapServer", "target-dir": "BeSimple/SoapServer",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "0.3-dev" "dev-master": "0.2-dev"
} }
} }
} }

2
src/BeSimple/SoapWsdl/composer.json
View File

@ -24,7 +24,7 @@
"target-dir": "BeSimple/SoapWsdl", "target-dir": "BeSimple/SoapWsdl",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "0.3-dev" "dev-master": "0.2-dev"
} }
} }
} }