Skip to content

Commit

Permalink
Merge pull request #8 from goetas-webservices/recent-updates
Browse files Browse the repository at this point in the history
Allow Symfony 4 and other updates
  • Loading branch information
goetas authored May 21, 2019
2 parents b67fd29 + 962c2f7 commit 3289ca4
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 11 deletions.
8 changes: 5 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ php:
- 5.5
- 5.6
- 7.0
- 7.2
- 7.3

matrix:
include:
Expand All @@ -17,8 +19,8 @@ matrix:

before_script:
- echo "xdebug.max_nesting_level=1000" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
- if [[ $TRAVIS_PHP_VERSION = '5.6' ]]; then PHPUNIT_FLAGS="--coverage-clover=coverage.clover"; else PHPUNIT_FLAGS=""; fi
- if [[ $TRAVIS_PHP_VERSION != '5.6' ]]; then phpenv config-rm xdebug.ini; fi
- if [[ $TRAVIS_PHP_VERSION = '7.2' ]]; then PHPUNIT_FLAGS="--coverage-clover=coverage.clover"; else PHPUNIT_FLAGS=""; fi
- if [[ $TRAVIS_PHP_VERSION != '7.2' ]]; then phpenv config-rm xdebug.ini; fi
- composer self-update
- composer update $COMPOSER_FLAGS

Expand All @@ -28,5 +30,5 @@ script:

after_script:
- wget https://scrutinizer-ci.com/ocular.phar
- if [[ $TRAVIS_PHP_VERSION = '5.6' ]] ; then php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi
- if [[ $TRAVIS_PHP_VERSION = '7.2' ]] ; then php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi

8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
"goetas-webservices/soap-reader": "^0.3.1",
"goetas-webservices/wsdl-reader": "^0.3",
"goetas-webservices/xsd2php": "^0.2.3|^0.3.0",
"symfony/dependency-injection": "^2.2|^3.0",
"symfony/config": "^2.2|^3.0",
"symfony/yaml": "^2.1|^3.0"
"symfony/dependency-injection": "^2.2|^3.0|^4.0",
"symfony/config": "^2.2|^3.0|^4.0",
"symfony/yaml": "^2.1|^3.0|^4.0"
},
"require-dev": {
"phpunit/phpunit": "^4.8|^5.0",
"jms/serializer": "^1.2",
"jms/serializer": "^1.2|^2.0|^3.0",
"goetas-webservices/xsd2php-runtime": "^0.2.2"
},
"autoload": {
Expand Down
8 changes: 4 additions & 4 deletions src/Resources/config/services.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@
</call>
</service>

<service id="goetas_webservices.wsdl2php.soap_reader" class="GoetasWebservices\XML\SOAPReader\SoapReader"/>
<service id="goetas_webservices.wsdl2php.soap_reader" class="GoetasWebservices\XML\SOAPReader\SoapReader" public="true"/>

<service id="goetas_webservices.wsdl2php.wsdl_reader" class="GoetasWebservices\XML\WSDLReader\DefinitionsReader">
<service id="goetas_webservices.wsdl2php.wsdl_reader" class="GoetasWebservices\XML\WSDLReader\DefinitionsReader" public="true">
<argument id="goetas_webservices.xsd2php.schema_reader" type="service"/>
<argument id="goetas_webservices.wsdl2php.event_dispatcher" type="service"/>
</service>

<service id="goetas_webservices.wsdl2php.converter.php" class="GoetasWebservices\WsdlToPhp\Generation\PhpSoapConverter">
<service id="goetas_webservices.wsdl2php.converter.php" class="GoetasWebservices\WsdlToPhp\Generation\PhpSoapConverter" public="true">
<argument id="goetas_webservices.xsd2php.converter.php" type="service"/>
</service>
<service id="goetas_webservices.wsdl2php.converter.jms" class="GoetasWebservices\WsdlToPhp\Generation\JmsSoapConverter">
<service id="goetas_webservices.wsdl2php.converter.jms" class="GoetasWebservices\WsdlToPhp\Generation\JmsSoapConverter" public="true">
<argument id="goetas_webservices.xsd2php.converter.jms" type="service"/>
</service>

Expand Down

0 comments on commit 3289ca4

Please sign in to comment.