Skip to content
Browse files

Merge branch '2.3' into 2.4

* 2.3:
  removed unneeded use statements
  Prepend Child Bundle paths before the parent
  [Routing] add unit tests for Symfony\Component\Routing\RequestContext class

Conflicts:
	src/Symfony/Component/Form/Extension/Csrf/CsrfExtension.php
	src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php
	src/Symfony/Component/Validator/ConstraintValidatorFactory.php
  • Loading branch information...
2 parents f4485df + 143131e commit 6904345cf2b3bbab1f6d6e4ce1724cb99df9f00a @fabpot fabpot committed Jan 1, 2014
Showing with 0 additions and 3 deletions.
  1. +0 −1 Tests/FinderTest.php
  2. +0 −2 Tests/Iterator/FilecontentFilterIteratorTest.php
View
1 Tests/FinderTest.php
@@ -13,7 +13,6 @@
use Symfony\Component\Finder\Finder;
use Symfony\Component\Finder\Adapter;
-use Symfony\Component\Finder\Tests\FakeAdapter;
class FinderTest extends Iterator\RealIteratorTestCase
{
View
2 Tests/Iterator/FilecontentFilterIteratorTest.php
@@ -12,8 +12,6 @@
namespace Symfony\Component\Finder\Tests\Iterator;
use Symfony\Component\Finder\Iterator\FilecontentFilterIterator;
-use Symfony\Component\Finder\Tests\Iterator\MockSplFileInfo;
-use Symfony\Component\Finder\Tests\Iterator\MockFileListIterator;
class FilecontentFilterIteratorTest extends IteratorTestCase
{

0 comments on commit 6904345

Please sign in to comment.
Something went wrong with that request. Please try again.