8000 Revert "bug #33618 fix tests depending on other components' tests (xa… · symfony/symfony@5aa4328 · GitHub
[go: up one dir, main page]
Skip to content

Commit 5aa4328

Browse files
xabbuhxabbuh
committed
Revert "bug #33618 fix tests depending on other components' tests (xabbuh)"
This reverts commit 47fb090, reversing changes made to 6fad4f1.
1 parent c792908 commit 5aa4328

File tree

15 files changed

+605
-655
lines changed

15 files changed

+605
-655
lines changed

‎src/Symfony/Bridge/Doctrine/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"doctrine/annotations": "~1.7",
2626
"symfony/stopwatch": "~2.8|~3.0|~4.0",
2727
"symfony/dependency-injection": "~3.4|~4.0",
28-
"symfony/form": "^3.4.32|^4.3.5",
28+
"symfony/form": "^3.3.10|~4.0",
2929
"symfony/http-kernel": "~2.8|~3.0|~4.0",
3030
"symfony/property-access": "~2.8|~3.0|~4.0",
3131
"symfony/property-info": "~2.8|3.0|~4.0",

‎src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerResolverTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
use Symfony\Component\DependencyInjection\ContainerAwareInterface;
2121
use Symfony\Component\DependencyInjection\ContainerInterface;
2222
use Symfony\Component\HttpFoundation\Request;
23-
use Symfony\Component\HttpKernel\Test\Controller\ContainerControllerResolverTestCase;
23+
use Symfony\Component\HttpKernel\Tests\Controller\ContainerControllerResolverTest;
2424

25-
class ControllerResolverTest extends ContainerControllerResolverTestCase
25+
class ControllerResolverTest extends ContainerControllerResolverTest
2626
{
2727
public function testGetControllerOnContainerAware()
2828
{

‎src/Symfony/Bundle/FrameworkBundle/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"symfony/debug": "~2.8|~3.0|~4.0",
2626
"symfony/event-dispatcher": "~3.4|~4.0",
2727
"symfony/http-foundation": "^3.4.13|~4.3",
28-
"symfony/http-kernel": "^3.4.32|^4.3.5",
28+
"symfony/http-kernel": "^3.4.31|^4.3.4",
2929
"symfony/polyfill-mbstring": "~1.0",
3030
"symfony/filesystem": "~2.8|~3.0|~4.0",
3131
"symfony/finder": "~2.8|~3.0|~4.0",

‎src/Symfony/Component/Form/Test/FormPerformanceTestCase.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
namespace Symfony\Component\Form\Test;
1313

14+
use Symfony\Component\Form\Tests\Ve 8000 rsionAwareTest;
15+
1416
/**
1517
* Base class for performance tests.
1618
*

‎src/Symfony/Component/Form/Tests/AbstractLayoutTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
use Symfony\Component\Form\FormError;
1616
use Symfony\Component\Form\FormView;
1717
use Symfony\Component\Form\Test\FormIntegrationTestCase;
18-
use Symfony\Component\Form\Test\VersionAwareTest;
1918

2019
abstract class AbstractLayoutTest extends FormIntegrationTestCase
2120
{

‎src/Symfony/Component/Form/Tests/Extension/Core/Type/BaseTypeTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace Symfony\Component\Form\Tests\Extension\Core\Type;
1313

1414
use Symfony\Component\Form\Test\TypeTestCase;
15-
use Symfony\Component\Form\Test\VersionAwareTest;
15+
use Symfony\Component\Form\Tests\VersionAwareTest;
1616

1717
/**
1818
* @author Bernhard Schussek <bschussek@gmail.com>

‎src/Symfony/Component/Form/Test/VersionAwareTest.php renamed to ‎src/Symfony/Component/Form/Tests/VersionAwareTest.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,8 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Symfony\Component\Form\Test;
12+
namespace Symfony\Component\Form\Tests;
1313

14-
/**
15-
* @internal
16-
*/
1714
trait VersionAwareTest
1815
{
1916
protected static $supportedFeatureSetVersion = 304;

‎src/Symfony/Component/HttpKernel/Test/Controller/ContainerControllerResolverTestCase.php

Lines changed: 0 additions & 301 deletions
This file was deleted.

0 commit comments

Comments
 (0)
0