Skip to content

Commit 91f9a27

Browse files
Merge branch '2.3' into 2.5
* 2.3: [2.3] Remove useless tests skips [2.3] Cleanup deprecations Conflicts: src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypePerformanceTest.php src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Bundle/TwigBundle/composer.json src/Symfony/Component/Debug/Tests/MockExceptionHandler.php src/Symfony/Component/Debug/composer.json src/Symfony/Component/Form/Tests/ResolvedFormTypeTest.php src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php src/Symfony/Component/HttpKernel/Tests/DataCollector/LoggerDataCollectorTest.php src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php src/Symfony/Component/HttpKernel/Tests/EventListener/RouterListenerTest.php src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php src/Symfony/Component/HttpKernel/composer.json src/Symfony/Component/Routing/Tests/Annotation/RouteTest.php src/Symfony/Component/Security/Tests/Core/Validator/Constraints/UserPasswordValidatorTest.php src/Symfony/Component/Security/composer.json
2 parents e53888d + 238b927 commit 91f9a27

File tree

3 files changed

+16
-1
lines changed

3 files changed

+16
-1
lines changed

Tests/bootstrap.php

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <[email protected]>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
$loader = require __DIR__.'/../vendor/autoload.php';
13+
14+
Doctrine\Common\Annotations\AnnotationRegistry::registerLoader(function ($class) {return class_exists($class);});

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"symfony/translation": "~2.0,>=2.0.5"
2121
},
2222
"require-dev": {
23+
"doctrine/common": "~2.3",
2324
"symfony/http-foundation": "~2.1",
2425
"symfony/intl": "~2.3",
2526
"symfony/yaml": "~2.0,>=2.0.5",

phpunit.xml.dist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
55
backupGlobals="false"
66
colors="true"
7-
bootstrap="vendor/autoload.php"
7+
bootstrap="Tests/bootstrap.php"
88
>
99
<php>
1010
<!-- Silence E_USER_DEPRECATED (-16385 == -1 & ~E_USER_DEPRECATED) -->

0 commit comments

Comments
 (0)