Fix tests on symfony 3.2

lexik · Dec 2, 2016 · 7e21ffe · 7e21ffe
1 parent 8798a76
commit 7e21ffe
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 3 deletions.
diff --git a/Tests/Functional/Bundle/Bundle.php b/Tests/Functional/Bundle/Bundle.php
@@ -2,8 +2,13 @@
 
 namespace Lexik\Bundle\JWTAuthenticationBundle\Tests\Functional\Bundle;
 
+use Lexik\Bundle\JWTAuthenticationBundle\Tests\Functional\Bundle\DependencyInjection\BundleExtension;
 use Symfony\Component\HttpKernel\Bundle\Bundle as BaseBundle;
 
 class Bundle extends BaseBundle
 {
+    public function getContainerExtension()
+    {
+        return new BundleExtension();
+    }
 }
diff --git a/Tests/Functional/Bundle/DependencyInjection/BundleExtension.php b/Tests/Functional/Bundle/DependencyInjection/BundleExtension.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Lexik\Bundle\JWTAuthenticationBundle\Tests\Functional\Bundle\DependencyInjection;
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
+use Symfony\Component\HttpKernel\Kernel;
+
+class BundleExtension extends Extension implements PrependExtensionInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function prepend(ContainerBuilder $container)
+    {
+        // Annotation must be disabled since this bundle doesn't use Doctrine
+        // The framework allows enabling/disabling them only since symfony 3.2 where
+        // doctrine/annotations has been removed from required dependencies
+        $annotationsEnabled = (int) Kernel::MAJOR_VERSION >= 3 && (int) Kernel::MINOR_VERSION >= 2;
+
+        if (!$annotationsEnabled) {
+            return;
+        }
+
+        $container->prependExtensionConfig('framework', ['annotations' => ['enabled' => false]]);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function load(array $configs, ContainerBuilder $container)
+    {
+    }
+}
diff --git a/Tests/Security/Authentication/Provider/JWTProviderTest.php b/Tests/Security/Authentication/Provider/JWTProviderTest.php
@@ -42,7 +42,7 @@ public function testSupports()
     /**
      * test authenticate method with an invalid token.
      *
-     * @expectedException        Symfony\Component\Security\Core\Exception\AuthenticationException
+     * @expectedException        \Symfony\Component\Security\Core\Exception\AuthenticationException
      * @expectedExceptionMessage Invalid JWT Token
      */
     public function testAuthenticateWithInvalidJWT()
@@ -66,7 +66,7 @@ public function testAuthenticateWithInvalidJWT()
     /**
      * test authenticate method.
      *
-     * @expectedException Symfony\Component\Security\Core\Exception\AuthenticationException
+     * @expectedException \Symfony\Component\Security\Core\Exception\AuthenticationException
      * @expectedExceptionMessage Invalid JWT Token
      */
     public function testAuthenticateWithoutUsername()
@@ -90,7 +90,7 @@ public function testAuthenticateWithoutUsername()
     /**
      * test authenticate method.
      *
-     * @expectedException Symfony\Component\Security\Core\Exception\UsernameNotFoundException
+     * @expectedException \Symfony\Component\Security\Core\Exception\UsernameNotFoundException
      */
     public function testAuthenticateWithNotExistingUser()
     {