Permalink
Browse files

Merge branch '2.1'

* 2.1:
  [Locale] fixed tests
  [Config] Fixed tests on Windows
  [TwigBundle] Fixed tests
  [Security] Move DigestDataTest.php inside the Security component
  Fixed DefaultValue for session.auto_start in NodeDefinition
  Fix namespace of Validator and BrowserKit Tests

Conflicts:
	src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
	src/Symfony/Bundle/TwigBundle/Tests/TwigEngineTest.php
  • Loading branch information...
2 parents 200e9db + 6623d84 commit 454cf0b6b3eb007a1b9e305e14de771b2179591c @fabpot fabpot committed Dec 6, 2012
Showing with 6 additions and 6 deletions.
  1. +1 −1 Tests/ClientTest.php
  2. +1 −1 Tests/CookieJarTest.php
  3. +1 −1 Tests/CookieTest.php
  4. +1 −1 Tests/HistoryTest.php
  5. +1 −1 Tests/RequestTest.php
  6. +1 −1 Tests/ResponseTest.php
View
2 Tests/ClientTest.php
@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
-namespace Symfony\Component\Tests\BrowserKit;
+namespace Symfony\Component\BrowserKit\Tests;
use Symfony\Component\BrowserKit\Client;
use Symfony\Component\BrowserKit\History;
View
2 Tests/CookieJarTest.php
@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
-namespace Symfony\Component\Tests\BrowserKit;
+namespace Symfony\Component\BrowserKit\Tests;
use Symfony\Component\BrowserKit\CookieJar;
use Symfony\Component\BrowserKit\Cookie;
View
2 Tests/CookieTest.php
@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
-namespace Symfony\Component\Tests\BrowserKit;
+namespace Symfony\Component\BrowserKit\Tests;
use Symfony\Component\BrowserKit\Cookie;
View
2 Tests/HistoryTest.php
@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
-namespace Symfony\Component\Tests\BrowserKit;
+namespace Symfony\Component\BrowserKit\Tests;
use Symfony\Component\BrowserKit\History;
use Symfony\Component\BrowserKit\Request;
View
2 Tests/RequestTest.php
@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
-namespace Symfony\Component\Tests\BrowserKit;
+namespace Symfony\Component\BrowserKit\Tests;
use Symfony\Component\BrowserKit\Request;
View
2 Tests/ResponseTest.php
@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
-namespace Symfony\Component\Tests\BrowserKit;
+namespace Symfony\Component\BrowserKit\Tests;
use Symfony\Component\BrowserKit\Response;

0 comments on commit 454cf0b

Please sign in to comment.