Merge branch '0.1'

This commit is contained in:
Francis Besset 2013-09-27 21:33:11 +02:00
commit 81ce2d7571
6 changed files with 28 additions and 13 deletions

View File

@ -5,6 +5,19 @@ php:
- 5.4
- 5.5
env:
- SYMFONY_VERSION=2.0.*
- SYMFONY_VERSION=2.1.*
- SYMFONY_VERSION=2.2.*
- SYMFONY_VERSION=2.3.*
- SYMFONY_VERSION=dev-master
before_script:
- curl -s http://getcomposer.org/installer | php
- php composer.phar install --dev --prefer-source
- composer require symfony/http-foundation:${SYMFONY_VERSION} --no-interaction --prefer-source
script:
- phpunit --coverage-text
matrix:
allow_failures:
- env: SYMFONY_VERSION=dev-master

View File

@ -24,7 +24,7 @@
"ext-soap": "*",
"ext-curl": "*",
"ass/xmlsecurity": "dev-master",
"symfony/http-foundation": ">=2.0,<2.4-dev",
"symfony/framework-bundle": "~2.0",
"zendframework/zend-mail": "2.1.*",
"zendframework/zend-mime": "2.1.*",
"zendframework/zend-soap": "2.1.*"
@ -39,8 +39,8 @@
"require-dev": {
"ext-mcrypt": "*",
"mikey179/vfsStream": "dev-master",
"symfony/filesystem": ">=2.3,<2.4-dev",
"symfony/process": ">=2.3,<2.4-dev"
"symfony/filesystem": "~2.3",
"symfony/process": "~2.3"
},
"autoload": {
"psr-0": { "BeSimple\\": "src/" }

View File

@ -52,6 +52,8 @@ class WebServiceContext
$this->typeRepository = $typeRepository;
$this->converters = $converters;
// Issue #6: keep the debug because the cache is invalid
$options['debug'] = true;
$this->options = $options;
}

View File

@ -22,16 +22,16 @@
"require": {
"php": ">=5.3.0",
"ext-soap": "*",
"besimple/soap-common": "self.version",
"besimple/soap-common": "0.1.*",
"ass/xmlsecurity": "dev-master",
"zendframework/zend-mail": "2.1.*",
"zendframework/zend-mime": "2.1.*",
"zendframework/zend-soap": "2.1.*",
"symfony/http-foundation": ">=2.0,<2.4-dev"
"symfony/framework-bundle": "~2.0"
},
"suggest": {
"besimple/soap-client": "self.version",
"besimple/soap-server": "self.version"
"besimple/soap-client": "0.1.*",
"besimple/soap-server": "0.1.*"
},
"autoload": {
"psr-0": { "BeSimple\\SoapBundle": "" }

View File

@ -23,13 +23,13 @@
"php": ">=5.3.0",
"ext-soap": "*",
"ext-curl": "*",
"besimple/soap-common": "self.version",
"besimple/soap-common": "0.1.*",
"ass/xmlsecurity": "dev-master"
},
"require-dev": {
"mikey179/vfsStream": "dev-master",
"symfony/filesystem": ">=2.3,<2.4-dev",
"symfony/process": ">=2.3,<2.4-dev"
"symfony/filesystem": "~2.3",
"symfony/process": "~2.3"
},
"autoload": {
"psr-0": { "BeSimple\\SoapClient": "" }

View File

@ -22,7 +22,7 @@
"require": {
"php": ">=5.3.0",
"ext-soap": "*",
"besimple/soap-common": "self.version"
"besimple/soap-common": "0.1.*"
},
"autoload": {
"psr-0": { "BeSimple\\SoapServer": "" }