From adb1d9bd89341aacac1c82854675e07367f0e2a8 Mon Sep 17 00:00:00 2001 From: Francis Besset Date: Mon, 26 Aug 2013 14:40:00 +0200 Subject: [PATCH 1/5] [SoapBundle] Keep debug in WebServiceContext Issue #6 The generated cache is incorrect (maybe because service are cached). To fix the problem quickly, the debug mode is enabled. --- src/BeSimple/SoapBundle/WebServiceContext.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/BeSimple/SoapBundle/WebServiceContext.php b/src/BeSimple/SoapBundle/WebServiceContext.php index d18bb04..6e3249a 100644 --- a/src/BeSimple/SoapBundle/WebServiceContext.php +++ b/src/BeSimple/SoapBundle/WebServiceContext.php @@ -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; } From 8f6dab88165501dd17e8fdc0a7b0bba54d118bd2 Mon Sep 17 00:00:00 2001 From: Lukas Kahwe Smith Date: Wed, 18 Sep 2013 14:58:45 +0200 Subject: [PATCH 2/5] test different Symfony2 versions --- .travis.yml | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7604e9c..95cdf0e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,23 @@ language: php php: - - 5.3 - - 5.4 - - 5.5 + - 5.3 + - 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/symfony:${SYMFONY_VERSION} --no-interaction --prefer-source + +script: + - phpunit --coverage-text + +matrix: + allow_failures: + - env: SYMFONY_VERSION=dev-master From 1bbf41fd78bc30583c856cf4a4cc64eb9ac30935 Mon Sep 17 00:00:00 2001 From: Lukas Kahwe Smith Date: Wed, 18 Sep 2013 14:59:09 +0200 Subject: [PATCH 3/5] allow Symfony2.4+ versions and do not use self.version inside require --- .travis.yml | 24 ++++++++++++------------ composer.json | 6 +++--- src/BeSimple/SoapBundle/composer.json | 8 ++++---- src/BeSimple/SoapClient/composer.json | 6 +++--- src/BeSimple/SoapServer/composer.json | 2 +- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.travis.yml b/.travis.yml index 95cdf0e..ae6788a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,23 +1,23 @@ language: php php: - - 5.3 - - 5.4 - - 5.5 + - 5.3 + - 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 + - SYMFONY_VERSION=2.0.* + - SYMFONY_VERSION=2.1.* + - SYMFONY_VERSION=2.2.* + - SYMFONY_VERSION=2.3.* + - SYMFONY_VERSION=dev-master before_script: - - composer require symfony/symfony:${SYMFONY_VERSION} --no-interaction --prefer-source + - composer require symfony/http-foundation:${SYMFONY_VERSION} --no-interaction --prefer-source script: - - phpunit --coverage-text + - phpunit --coverage-text matrix: - allow_failures: - - env: SYMFONY_VERSION=dev-master + allow_failures: + - env: SYMFONY_VERSION=dev-master diff --git a/composer.json b/composer.json index 546d544..e661d65 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "ext-soap": "*", "ext-curl": "*", "ass/xmlsecurity": "dev-master", - "symfony/http-foundation": ">=2.0,<2.4-dev", + "symfony/http-foundation": "~2.0", "zendframework/zend-mail": "2.1.*", "zendframework/zend-mime": "2.1.*", "zendframework/zend-soap": "2.1.*" @@ -38,8 +38,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/" } diff --git a/src/BeSimple/SoapBundle/composer.json b/src/BeSimple/SoapBundle/composer.json index 3f973dd..be7fe15 100644 --- a/src/BeSimple/SoapBundle/composer.json +++ b/src/BeSimple/SoapBundle/composer.json @@ -22,16 +22,16 @@ "require": { "php": ">=5.3.0", "ext-soap": "*", - "besimple/soap-common": "self.version", + "besimple/soap-common": "0.2.*", "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.2.*", + "besimple/soap-server": "0.2.*" }, "autoload": { "psr-0": { "BeSimple\\SoapBundle": "" } diff --git a/src/BeSimple/SoapClient/composer.json b/src/BeSimple/SoapClient/composer.json index 3df0b70..b483752 100644 --- a/src/BeSimple/SoapClient/composer.json +++ b/src/BeSimple/SoapClient/composer.json @@ -23,13 +23,13 @@ "php": ">=5.3.0", "ext-soap": "*", "ext-curl": "*", - "besimple/soap-common": "self.version", + "besimple/soap-common": "0.2.*", "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": "" } diff --git a/src/BeSimple/SoapServer/composer.json b/src/BeSimple/SoapServer/composer.json index 0d64ea1..f71523d 100644 --- a/src/BeSimple/SoapServer/composer.json +++ b/src/BeSimple/SoapServer/composer.json @@ -22,7 +22,7 @@ "require": { "php": ">=5.3.0", "ext-soap": "*", - "besimple/soap-common": "self.version" + "besimple/soap-common": "0.2.*" }, "autoload": { "psr-0": { "BeSimple\\SoapServer": "" } From 4391b94dbbac82c7a3bb384b54c786cd290d594b Mon Sep 17 00:00:00 2001 From: Francis Besset Date: Fri, 27 Sep 2013 21:30:33 +0200 Subject: [PATCH 4/5] Fixed besimple/soap-* version --- src/BeSimple/SoapBundle/composer.json | 6 +++--- src/BeSimple/SoapClient/composer.json | 2 +- src/BeSimple/SoapServer/composer.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/BeSimple/SoapBundle/composer.json b/src/BeSimple/SoapBundle/composer.json index be7fe15..869ae6c 100644 --- a/src/BeSimple/SoapBundle/composer.json +++ b/src/BeSimple/SoapBundle/composer.json @@ -22,7 +22,7 @@ "require": { "php": ">=5.3.0", "ext-soap": "*", - "besimple/soap-common": "0.2.*", + "besimple/soap-common": "0.1.*", "ass/xmlsecurity": "dev-master", "zendframework/zend-mail": "2.1.*", "zendframework/zend-mime": "2.1.*", @@ -30,8 +30,8 @@ "symfony/framework-bundle": "~2.0" }, "suggest": { - "besimple/soap-client": "0.2.*", - "besimple/soap-server": "0.2.*" + "besimple/soap-client": "0.1.*", + "besimple/soap-server": "0.1.*" }, "autoload": { "psr-0": { "BeSimple\\SoapBundle": "" } diff --git a/src/BeSimple/SoapClient/composer.json b/src/BeSimple/SoapClient/composer.json index b483752..7da60cf 100644 --- a/src/BeSimple/SoapClient/composer.json +++ b/src/BeSimple/SoapClient/composer.json @@ -23,7 +23,7 @@ "php": ">=5.3.0", "ext-soap": "*", "ext-curl": "*", - "besimple/soap-common": "0.2.*", + "besimple/soap-common": "0.1.*", "ass/xmlsecurity": "dev-master" }, "require-dev": { diff --git a/src/BeSimple/SoapServer/composer.json b/src/BeSimple/SoapServer/composer.json index f71523d..202008b 100644 --- a/src/BeSimple/SoapServer/composer.json +++ b/src/BeSimple/SoapServer/composer.json @@ -22,7 +22,7 @@ "require": { "php": ">=5.3.0", "ext-soap": "*", - "besimple/soap-common": "0.2.*" + "besimple/soap-common": "0.1.*" }, "autoload": { "psr-0": { "BeSimple\\SoapServer": "" } From b83c1d5b1ff40b9e11cf8167a84c3b52683d5fc9 Mon Sep 17 00:00:00 2001 From: Francis Besset Date: Fri, 27 Sep 2013 21:31:38 +0200 Subject: [PATCH 5/5] Used `symfony/framework-bundle` instead of `symfony/http-foundation` --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index e661d65..3412887 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "ext-soap": "*", "ext-curl": "*", "ass/xmlsecurity": "dev-master", - "symfony/http-foundation": "~2.0", + "symfony/framework-bundle": "~2.0", "zendframework/zend-mail": "2.1.*", "zendframework/zend-mime": "2.1.*", "zendframework/zend-soap": "2.1.*"