From 9c0db1ea51c624085ce25990c000f07dd4c0111b Mon Sep 17 00:00:00 2001
From: Guilhem Niot <guilhem.niot@gmail.com>
Date: Wed, 14 Jun 2017 13:47:53 +0200
Subject: [PATCH] Fix symfony 4 support

---
 Tests/Functional/Entity/Article.php |  2 +-
 Tests/Functional/FunctionalTest.php |  1 -
 Tests/Functional/SwaggerUiTest.php  |  2 --
 Tests/Functional/TestKernel.php     |  3 +++
 Tests/Functional/WebTestCase.php    | 27 +++++++++++++++++++++++++++
 composer.json                       |  3 ++-
 phpunit.xml.dist                    |  4 ----
 7 files changed, 33 insertions(+), 9 deletions(-)
 create mode 100644 Tests/Functional/WebTestCase.php

diff --git a/Tests/Functional/Entity/Article.php b/Tests/Functional/Entity/Article.php
index 5d295e4..922e546 100644
--- a/Tests/Functional/Entity/Article.php
+++ b/Tests/Functional/Entity/Article.php
@@ -19,7 +19,7 @@ use Symfony\Component\Serializer\Annotation\Groups;
 class Article
 {
     /**
-     * @Groups("light")
+     * @Groups({"light"})
      */
     public function setAuthor(User $author)
     {
diff --git a/Tests/Functional/FunctionalTest.php b/Tests/Functional/FunctionalTest.php
index f9039c0..dc87b22 100644
--- a/Tests/Functional/FunctionalTest.php
+++ b/Tests/Functional/FunctionalTest.php
@@ -14,7 +14,6 @@ namespace Nelmio\ApiDocBundle\Tests\Functional;
 use EXSyst\Component\Swagger\Operation;
 use EXSyst\Component\Swagger\Schema;
 use EXSyst\Component\Swagger\Tag;
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 class FunctionalTest extends WebTestCase
 {
diff --git a/Tests/Functional/SwaggerUiTest.php b/Tests/Functional/SwaggerUiTest.php
index 0b17ae8..189f033 100644
--- a/Tests/Functional/SwaggerUiTest.php
+++ b/Tests/Functional/SwaggerUiTest.php
@@ -11,8 +11,6 @@
 
 namespace Nelmio\ApiDocBundle\Tests\Functional;
 
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-
 class SwaggerUiTest extends WebTestCase
 {
     public function testSwaggerUi()
diff --git a/Tests/Functional/TestKernel.php b/Tests/Functional/TestKernel.php
index f1bc297..a1ec318 100644
--- a/Tests/Functional/TestKernel.php
+++ b/Tests/Functional/TestKernel.php
@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+namespace Nelmio\ApiDocBundle\Tests\Functional;
+
 use ApiPlatform\Core\Bridge\Symfony\Bundle\ApiPlatformBundle;
 use Nelmio\ApiDocBundle\NelmioApiDocBundle;
 use Nelmio\ApiDocBundle\Tests\Functional\TestBundle;
@@ -62,6 +64,7 @@ class TestKernel extends Kernel
             'templating' => [
                 'engines' => ['twig'],
             ],
+            'serializer' => ['enable_annotations' => true],
         ]);
 
         // Filter routes
diff --git a/Tests/Functional/WebTestCase.php b/Tests/Functional/WebTestCase.php
new file mode 100644
index 0000000..af25700
--- /dev/null
+++ b/Tests/Functional/WebTestCase.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the NelmioApiDocBundle package.
+ *
+ * (c) Nelmio
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Nelmio\ApiDocBundle\Tests\Functional;
+
+
+use Nelmio\ApiDocBundle\Tests\Functional\TestKernel;
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase as BaseWebTestCase;
+
+class WebTestCase extends BaseWebTestCase
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected static function getKernelClass()
+    {
+        return TestKernel::class;
+    }
+}
diff --git a/composer.json b/composer.json
index 01ead18..be052ab 100644
--- a/composer.json
+++ b/composer.json
@@ -16,12 +16,13 @@
     ],
     "require": {
         "php": "~7.0|~7.1",
-        "symfony/framework-bundle": "^3.1|^4.0",
+        "symfony/framework-bundle": "^3.2.5|^4.0",
         "symfony/property-info": "^3.1|^4.0",
         "exsyst/swagger": "~0.2.3",
         "zircote/swagger-php": "^2.0.9"
     },
     "require-dev": {
+        "symfony/templating": "^2.8|^3.0|^4.0",
         "symfony/twig-bundle": "^3.0|^4.0",
         "symfony/asset": "^2.8|^3.0|^4.0",
         "symfony/console": "^2.8|^3.0|^4.0",
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index ea706f6..18979b1 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -17,10 +17,6 @@
         </testsuite>
     </testsuites>
 
-    <php>
-        <server name="KERNEL_DIR" value="Tests/Functional/" />
-    </php>
-
     <filter>
         <whitelist>
             <directory>.</directory>