drop symfony <2.8 support, and add symfony 3

Author: Douglas Greenshields

.travis.yml

@@ -1,14 +1,16 @@
 language: php
 
 php:
-  - 5.3
-  - 5.4
-  - 5.5
   - 5.6
+  - 7.0
+  - 7.1
+  - nightly
 
 env:
-  - SYMFONY_VERSION=2.6.*
-  - SYMFONY_VERSION="dev-master symfony/debug:~2.7@dev symfony/http-kernel:~2.7@dev"
+  - SYMFONY_VERSION=2.8.*
+  - SYMFONY_VERSION=3.0.*
+  - SYMFONY_VERSION=3.3.*
+  - SYMFONY_VERSION=dev-master
 
 before_script:
   - composer self-update
@@ -19,7 +21,3 @@ before_script:
 
 script:
   - phpunit --coverage-text
-
-matrix:
-  allow_failures:
-    - env: SYMFONY_VERSION="dev-master symfony/debug:~2.7@dev symfony/http-kernel:~2.7@dev"

composer.json

@@ -24,8 +24,8 @@
         "ext-soap": "*",
         "ext-curl": "*",
         "ass/xmlsecurity": "~1.0",
-        "symfony/framework-bundle": "~2.6",
-        "symfony/twig-bundle": "~2.6",
+        "symfony/framework-bundle": "^2.8|^3",
+        "symfony/twig-bundle": "^2.8|^3",
         "zendframework/zend-mime": "2.2.*"
     },
     "replace": {
@@ -37,9 +37,9 @@
     },
     "require-dev": {
         "ext-mcrypt": "*",
-        "mikey179/vfsStream": "~1.0",
-        "symfony/filesystem": "~2.3",
-        "symfony/process": "~2.3"
+        "mikey179/vfsStream": "^1.6.5",
+        "symfony/filesystem": "^2.8|^3",
+        "symfony/process": "^2.8|^3"
     },
     "autoload": {
         "psr-0": { "BeSimple\\": "src/" }

src/BeSimple/SoapBundle/Controller/SoapWebServiceController.php

@@ -17,6 +17,7 @@
 use BeSimple\SoapBundle\Soap\SoapResponse;
 use BeSimple\SoapServer\SoapServerBuilder;
 use Symfony\Component\DependencyInjection\ContainerAware;
+use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\FlattenException;
@@ -28,8 +29,10 @@
  * @author Christian Kerl <[email protected]>
  * @author Francis Besset <[email protected]>
  */
-class SoapWebServiceController extends ContainerAware
+class SoapWebServiceController
 {
+    use ContainerAwareTrait;
+
     /**
      * @var \SoapServer
      */

src/BeSimple/SoapBundle/DependencyInjection/BeSimpleSoapExtension.php

@@ -16,7 +16,9 @@
 
 use Symfony\Component\Config\Definition\Processor;
 use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\DefinitionDecorator;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
@@ -83,7 +85,9 @@ private function registerClientConfiguration(array $config, ContainerBuilder $co
         $loader->load('client.xml');
 
         foreach ($config as $client => $options) {
-            $definition = new DefinitionDecorator('besimple.soap.client.builder');
+            $childDefinitionClass = $this->getChildDefinitionClass();
+            /** @var ChildDefinition $definition */
+            $definition = new $childDefinitionClass('besimple.soap.client.builder');
             $container->setDefinition(sprintf('besimple.soap.client.builder.%s', $client), $definition);
 
             $definition->replaceArgument(0, $options['wsdl']);
@@ -130,7 +134,9 @@ private function registerClientConfiguration(array $config, ContainerBuilder $co
 
     private function createClientClassmap($client, array $classmap, ContainerBuilder $container)
     {
-        $definition = new DefinitionDecorator('besimple.soap.classmap');
+        $childDefinitionClass = $this->getChildDefinitionClass();
+        /** @var Definition $definition */
+        $definition = new $childDefinitionClass('besimple.soap.classmap');
         $container->setDefinition(sprintf('besimple.soap.classmap.%s', $client), $definition);
 
         if (!empty($classmap)) {
@@ -144,13 +150,12 @@ private function createClientClassmap($client, array $classmap, ContainerBuilder
 
     private function createClient($client, ContainerBuilder $container)
     {
-        $definition = new DefinitionDecorator('besimple.soap.client');
+        $childDefinitionClass = $this->getChildDefinitionClass();
+        /** @var Definition $definition */
+        $definition = new $childDefinitionClass('besimple.soap.client');
         $container->setDefinition(sprintf('besimple.soap.client.%s', $client), $definition);
 
-        $definition->setFactory(array(
-            new Reference(sprintf('besimple.soap.client.builder.%s', $client)),
-            'build'
-        ));
+        $definition->setFactory([new Reference(sprintf('besimple.soap.client.builder.%s', $client)), 'build']);
     }
 
     private function createWebServiceContext(array $config, ContainerBuilder $container)
@@ -159,7 +164,9 @@ private function createWebServiceContext(array $config, ContainerBuilder $contai
         unset($config['binding']);
 
         $contextId  = 'besimple.soap.context.'.$config['name'];
-        $definition = new DefinitionDecorator('besimple.soap.context.'.$bindingSuffix);
+        $childDefinitionClass = $this->getChildDefinitionClass();
+        /** @var Definition $definition */
+        $definition = new $childDefinitionClass('besimple.soap.context.'.$bindingSuffix);
         $container->setDefinition($contextId, $definition);
 
         if (isset($config['cache_type'])) {
@@ -189,4 +196,9 @@ private function getCacheType($type)
                 return Cache::TYPE_DISK_MEMORY;
         }
     }
+
+    private function getChildDefinitionClass()
+    {
+        return (class_exists(ChildDefinition::class)) ? ChildDefinition::class : DefinitionDecorator::class;
+    }
 }

src/BeSimple/SoapBundle/Resources/config/routing/webservicecontroller.xml

@@ -4,15 +4,13 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
 
-    <route id="_webservice_call" pattern="/{webservice}">
+    <route id="_webservice_call" path="/{webservice}" methods="POST">
         <default key="_controller">BeSimpleSoapBundle:SoapWebService:Call</default>
         <default key="_format">xml</default>
-        <requirement key="_method">POST</requirement>
     </route>
 
-    <route id="_webservice_definition" pattern="/{webservice}">
+    <route id="_webservice_definition" path="/{webservice}" methods="GET">
         <default key="_controller">BeSimpleSoapBundle:SoapWebService:Definition</default>
         <default key="_format">xml</default>
-        <requirement key="_method">GET</requirement>
     </route>
 </routes>