Symfony 4 compatibility

Author: Mathieu Lechat

.travis.yml

@@ -1,22 +1,36 @@
 language: php
 
 php:
-    - 7
+    - 5.4
+    - 5.5
+    - 5.6
+    - 7.0
+    - 7.1
+    - 7.2
+    - hhvm
 
 env:
-    - SYMFONY_VERSION=2.*
-    - SYMFONY_VERSION=3.*
+    - SYMFONY_VERSION=2.* PHPUNIT_VERSION=4.*
+    - SYMFONY_VERSION=3.* PHPUNIT_VERSION=5.*
+
+matrix:
+    exclude:
+        - php: 5.4
+          env: SYMFONY_VERSION=3.* PHPUNIT_VERSION=5.*
+
+        - php: 5.5
+          env: SYMFONY_VERSION=3.* PHPUNIT_VERSION=5.*
 
 cache:
     directories:
         - $HOME/.composer/cache
 
 install:
-    - composer require --dev --no-update symfony/framework-bundle:${SYMFONY_VERSION}
+    - composer require --dev --no-update symfony/framework-bundle:${SYMFONY_VERSION} phpunit/phpunit:${PHPUNIT_VERSION}
     - composer install
 
 script:
     - vendor/bin/php-cs-fixer fix --dry-run --diff
-    - phpunit --coverage-text
+    - vendor/bin/phpunit --coverage-text
 
 sudo: false

DependencyInjection/SendinBlueApiExtension.php

@@ -5,7 +5,6 @@
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
-use Symfony\Component\DependencyInjection\DefinitionDecorator;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
@@ -43,8 +42,10 @@ public function load(array $config, ContainerBuilder $container)
             $config['default_client'] = reset($keys);
         }
 
+        $onlyClient = 1 === count($config['clients']);
+
         foreach ($config['clients'] as $name => $client) {
-            $this->loadClient($name, $config['default_client'] === $name, $client, $container);
+            $this->loadClient($name, $config['default_client'] === $name, $onlyClient, $client, $container);
         }
     }
 
@@ -83,22 +84,25 @@ public static function getEndpoints()
     /**
      * @param string           $name
      * @param bool             $default
+     * @param bool             $only
      * @param array            $client
      * @param ContainerBuilder $container
      */
-    private function loadClient($name, $default, array $client, ContainerBuilder $container)
+    private function loadClient($name, $default, $only, array $client, ContainerBuilder $container)
     {
+        $definitionClassName = $this->getDefinitionClassname();
+
         $configurationService = sprintf('sendinblue_api.%s_client.configuration', $name);
         $configuration = $container->setDefinition(
             $configurationService,
-            new DefinitionDecorator('sendinblue_api.client.configuration')
+            new $definitionClassName('sendinblue_api.client.configuration')
         );
 
         $configuration->addMethodCall('setApiKey', ['api-key', $client['key']]);
 
         $clientService = sprintf('sendinblue_api.%s_client', $name);
         $container
-            ->setDefinition($clientService, new DefinitionDecorator('sendinblue_api.client'))
+            ->setDefinition($clientService, new $definitionClassName('sendinblue_api.client'))
             ->setArguments([new Reference($configurationService)])
         ;
 
@@ -111,11 +115,23 @@ private function loadClient($name, $default, array $client, ContainerBuilder $co
             ));
 
             if ($default) {
-                $container->setAlias(
-                    sprintf('sendinblue_api.%s_endpoint', $endpoint),
-                    $endpointService
-                );
+                $container->setAlias(sprintf('sendinblue_api.%s_endpoint', $endpoint), $endpointService);
+            }
+
+            if ($only) {
+                $container->setAlias(self::$MAPPING[$endpoint], $endpointService);
             }
         }
     }
+
+    /**
+     * @return string
+     */
+    private function getDefinitionClassname()
+    {
+        return class_exists('Symfony\Component\DependencyInjection\ChildDefinition')
+            ? 'Symfony\Component\DependencyInjection\ChildDefinition'
+            : 'Symfony\Component\DependencyInjection\DefinitionDecorator'
+        ;
+    }
 }

composer.json

@@ -11,15 +11,14 @@
     }
   ],
   "require": {
+    "php": ">=5.4",
     "sendinblue/api-v3-sdk": "^2",
-    "symfony/config": "^2|^3",
-    "symfony/dependency-injection": "^2|^3",
-    "symfony/http-kernel": "^2|^3"
+    "symfony/config": "^2|^3|^4",
+    "symfony/dependency-injection": "^2|^3|^4",
+    "symfony/http-kernel": "^2|^3|^4"
   },
   "require-dev": {
-    "friendsofphp/php-cs-fixer": "^2",
-    "phpunit/phpunit": "^6",
-    "symfony/framework-bundle": "^2|^3"
+    "friendsofphp/php-cs-fixer": "^2"
   },
   "autoload": {
     "psr-4": { "SendinBlue\\Bundle\\ApiBundle\\" : "" },

phpunit.xml.dist

@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.3/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/4.8/phpunit.xsd"
          backupGlobals="false"
          colors="true"
          bootstrap="Tests/bootstrap.php"
-         failOnRisky="true"
-         failOnWarning="true"
 >
     <testsuites>
         <testsuite name="SendinBlue ApiBundle Test Suite">