Compare commits
7 Commits
Author | SHA1 | Date | |
---|---|---|---|
1fa5c8a15e | |||
813dd52d70 | |||
8a40d23a94 | |||
5d335f2ca9 | |||
9d6468d0a6 | |||
9786f291b0 | |||
750db6692b |
@ -26,7 +26,7 @@
|
|||||||
"ass/xmlsecurity": "~1.0",
|
"ass/xmlsecurity": "~1.0",
|
||||||
"symfony/framework-bundle": "~3.4|~4.0",
|
"symfony/framework-bundle": "~3.4|~4.0",
|
||||||
"symfony/twig-bundle": "~3.4|~4.0",
|
"symfony/twig-bundle": "~3.4|~4.0",
|
||||||
"zendframework/zend-mime": "2.1.*"
|
"laminas/laminas-mime": "~2.1"
|
||||||
},
|
},
|
||||||
"replace": {
|
"replace": {
|
||||||
"besimple/soap-bundle": "self.version",
|
"besimple/soap-bundle": "self.version",
|
||||||
@ -47,7 +47,7 @@
|
|||||||
},
|
},
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-master": "master-dev"
|
"dev-master": "5.2.0-dev"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -152,11 +152,12 @@ class BeSimpleSoapExtension extends Extension
|
|||||||
$definition = new ChildDefinition('besimple.soap.client');
|
$definition = new ChildDefinition('besimple.soap.client');
|
||||||
$container->setDefinition(sprintf('besimple.soap.client.%s', $client), $definition);
|
$container->setDefinition(sprintf('besimple.soap.client.%s', $client), $definition);
|
||||||
|
|
||||||
if (3 === Kernel::MAJOR_VERSION) {
|
if (Kernel::MAJOR_VERSION >= 3) {
|
||||||
$definition->setFactory(array(
|
$definition->setFactory(array(
|
||||||
new Reference(sprintf('besimple.soap.client.builder.%s', $client)),
|
new Reference(sprintf('besimple.soap.client.builder.%s', $client)),
|
||||||
'build'
|
'build'
|
||||||
));
|
));
|
||||||
|
$definition->setPublic(true);
|
||||||
} else {
|
} else {
|
||||||
$definition->setFactoryService(sprintf('besimple.soap.client.builder.%s', $client));
|
$definition->setFactoryService(sprintf('besimple.soap.client.builder.%s', $client));
|
||||||
}
|
}
|
||||||
|
@ -19,7 +19,9 @@
|
|||||||
<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" factory-service="besimple.soap.client.builder" factory-method="build" class="%besimple.soap.client.builder.class%" abstract="true" />
|
<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" />
|
<service id="besimple.soap.classmap" class="%besimple.soap.classmap.class%" abstract="true" />
|
||||||
</services>
|
</services>
|
||||||
|
@ -160,7 +160,7 @@ class AnnotationClassLoader extends Loader
|
|||||||
$loaded = $complexTypeResolver->load($phpType);
|
$loaded = $complexTypeResolver->load($phpType);
|
||||||
$complexType = new ComplexType($phpType, isset($loaded['alias']) ? $loaded['alias'] : $phpType);
|
$complexType = new ComplexType($phpType, isset($loaded['alias']) ? $loaded['alias'] : $phpType);
|
||||||
foreach ($loaded['properties'] as $name => $property) {
|
foreach ($loaded['properties'] as $name => $property) {
|
||||||
$complexType->add($name, $this->loadType($property->getValue()), $property->isNillable());
|
$complexType->add($name, $this->loadType($property->getValue()), $property->isNillable(), $property->getMinOccurs());
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->typeRepository->addComplexType($complexType);
|
$this->typeRepository->addComplexType($complexType);
|
||||||
|
@ -12,7 +12,7 @@ namespace BeSimple\SoapBundle\Soap;
|
|||||||
|
|
||||||
use BeSimple\SoapBundle\Util\Collection;
|
use BeSimple\SoapBundle\Util\Collection;
|
||||||
use Symfony\Component\HttpFoundation\Request;
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
use Zend\Mime\Message;
|
use Laminas\Mime\Message;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* SoapRequest.
|
* SoapRequest.
|
||||||
|
@ -268,7 +268,6 @@ class Dumper
|
|||||||
// 1 is the default value of minOccurs.
|
// 1 is the default value of minOccurs.
|
||||||
if (1 != $child->getMinOccurs()) {
|
if (1 != $child->getMinOccurs()) {
|
||||||
$element->setAttribute('minOccurs', $child->getMinOccurs());
|
$element->setAttribute('minOccurs', $child->getMinOccurs());
|
||||||
$element->setAttribute('maxOccurs', 'unbounded');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$all->appendChild($element);
|
$all->appendChild($element);
|
||||||
|
Reference in New Issue
Block a user