Merge pull request #204 from FriendsOfSymfony/remove-symfony-fix

Revert our workaround because Symfony is fixed
FriendsOfSymfony · Feb 20, 2015 · 89c09ec · 89c09ec
2 parents 8cb0cc2 + 6668312
commit 89c09ec
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/Tests/Functional/Fixtures/app/config/config.yml b/Tests/Functional/Fixtures/app/config/config.yml
@@ -5,10 +5,6 @@ framework:
   test: ~
   session:
     storage_id:  session.test_storage
-  # We need to specify templating because of a bug in Symfony: 
-  # see https://github.com/symfony/symfony/issues/13710
-  templating: 
-    engines: ['php']
 
 fos_http_cache:
   cache_control:

diff --git a/Tests/Unit/UserContext/RoleProviderTest.php b/Tests/Unit/UserContext/RoleProviderTest.php
@@ -67,6 +67,6 @@ private function getTokenStorageMock()
         }
 
         // Symfony < 2.6 compatibility
-        return \Mockery::mock('\Symfony\Component\Security\Core\SecurityContext');
+        return \Mockery::mock('\Symfony\Component\Security\Core\SecurityContextInterface');
     }
 }