Fix tests (#1571)

Author: dunglas

features/integration/nelmio_api_doc.feature

@@ -1,4 +1,3 @@
-# Skip while NelmioApiDoc 2 isn't compatible with Symfony 3.4
 Feature: NelmioApiDoc integration
   In order to use NelmioApiDocBundle
   As an API software developer

phpunit.xml.dist

@@ -12,6 +12,7 @@
         <ini name="memory_limit" value="-1" />
         <server name="KERNEL_DIR" value="tests/Fixtures/app/" />
         <server name="KERNEL_CLASS" value="AppKernel" />
+        <server name="LEGACY" value="0" />
     </php>
 
     <testsuites>

src/Bridge/Doctrine/Orm/AbstractPaginator.php

@@ -46,6 +46,10 @@ public function __construct(DoctrinePaginator $paginator)
      */
     public function getCurrentPage(): float
     {
+        if (0 >= $this->maxResults) {
+            return 1.;
+        }
+
         return floor($this->firstResult / $this->maxResults) + 1.;
     }
 

tests/Fixtures/app/AppKernel.php

@@ -40,22 +40,31 @@ class AppKernel extends Kernel
 
     public function registerBundles(): array
     {
-        return [
+        $bundles = [
             new FrameworkBundle(),
             new TwigBundle(),
             new DoctrineBundle(),
             new SensioFrameworkExtraBundle(),
             new ApiPlatformBundle(),
             new SecurityBundle(),
             new FOSUserBundle(),
-            new NelmioApiDocBundle(),
             new TestBundle(),
         ];
+
+        if ($_SERVER['LEGACY'] ?? true) {
+            $bundles[] = new NelmioApiDocBundle();
+        }
+
+        return $bundles;
     }
 
     protected function configureRoutes(RouteCollectionBuilder $routes)
     {
         $routes->import('config/routing.yml');
+
+        if ($_SERVER['LEGACY'] ?? true) {
+            $routes->import('@NelmioApiDocBundle/Resources/config/routing.yml', '/nelmioapidoc');
+        }
     }
 
     protected function configureContainer(ContainerBuilder $c, LoaderInterface $loader)
@@ -110,7 +119,22 @@ protected function configureContainer(ContainerBuilder $c, LoaderInterface $load
         if (method_exists(ContextListener::class, 'setLogoutOnUserChange')) {
             $securityConfig['firewalls']['default']['logout_on_user_change'] = true;
         }
-
         $c->loadFromExtension('security', $securityConfig);
+
+        if ($_SERVER['LEGACY'] ?? true) {
+            $c->loadFromExtension('nelmio_api_doc', [
+                'sandbox' => [
+                    'accept_type' => 'application/json',
+                    'body_format' => [
+                        'formats' => ['json'],
+                        'default_format' => 'json',
+                    ],
+                    'request_format' => [
+                        'formats' => ['json' => 'application/json'],
+                    ],
+                ],
+            ]);
+            $c->loadFromExtension('api_platform', ['enable_nelmio_api_doc' => true]);
+        }
     }
 }

tests/Fixtures/app/config/config_test.yml

@@ -47,7 +47,6 @@ api_platform:
             client_items_per_page:     true
             client_partial:            true
             items_per_page:            3
-    enable_nelmio_api_doc: true
     exception_to_status:
         Symfony\Component\Serializer\Exception\ExceptionInterface: 400
         ApiPlatform\Core\Exception\InvalidArgumentException: 400
@@ -71,16 +70,6 @@ fos_user:
         address:      '[email protected]'
         sender_name:  'Kévin Dunglas'
 
-nelmio_api_doc:
-    sandbox:
-        accept_type:        'application/json'
-        body_format:
-            formats:        [ 'json' ]
-            default_format: 'json'
-        request_format:
-            formats:
-                json:       'application/json'
-
 parameters:
     container.autowiring.strict_mode: true
     container.dumper.inline_class_loader: true

tests/Fixtures/app/config/routing.yml

@@ -2,10 +2,6 @@ api:
     resource: '.'
     type:     'api_platform'
 
-NelmioApiDocBundle:
-    resource: '@NelmioApiDocBundle/Resources/config/routing.yml'
-    prefix:   '/nelmioapidoc'
-
 relation_embedded.custom_get:
     path:  '/relation_embedders/{id}/custom'
     methods:  ['GET', 'HEAD']