diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-03-13 19:00:11 +0100 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-03-13 19:00:11 +0100 |
| commit | 4ba88d7477d5158c294d160c5660e8219a3485c0 (patch) | |
| tree | 193cc9872ac7cfa47a52733d2ad996abf0823ba8 /Core | |
| parent | 3d22c5807ff626906306c114368779863de63ab6 (diff) | |
| parent | f33c6a81bab53e7139bb32eaffdc504221fbc6ed (diff) | |
| download | symfony-security-4ba88d7477d5158c294d160c5660e8219a3485c0.zip symfony-security-4ba88d7477d5158c294d160c5660e8219a3485c0.tar.gz symfony-security-4ba88d7477d5158c294d160c5660e8219a3485c0.tar.bz2 | |
Merge branch 'legacy27' into legacy-master
* legacy27:
[2.7] add @group legacy
[2.6] add @group legacy
[2.3] add @group legacy
Conflicts:
src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/LegacyUniqueEntityValidatorLegacyApiTest.php
src/Symfony/Bridge/Twig/Tests/Extension/AssetExtensionTest.php
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/LegacyTemplatingAssetHelperPassTest.php
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/AssetsHelper.php
src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
src/Symfony/Bundle/TwigBundle/Tests/TokenParser/LegacyRenderTokenParserTest.php
src/Symfony/Component/ClassLoader/Tests/ApcClassLoaderTest.php
src/Symfony/Component/ClassLoader/Tests/LegacyUniversalClassLoaderTest.php
src/Symfony/Component/Console/Tests/Command/CommandTest.php
src/Symfony/Component/Console/Tests/Helper/LegacyDialogHelperTest.php
src/Symfony/Component/Console/Tests/Helper/LegacyProgressHelperTest.php
src/Symfony/Component/Console/Tests/Helper/LegacyTableHelperTest.php
src/Symfony/Component/EventDispatcher/Tests/AbstractEventDispatcherTest.php
src/Symfony/Component/EventDispatcher/Tests/EventTest.php
src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
src/Symfony/Component/Form/Tests/Extension/HttpFoundation/EventListener/LegacyBindRequestListenerTest.php
src/Symfony/Component/HttpFoundation/Tests/Session/Flash/FlashBagTest.php
src/Symfony/Component/HttpKernel/Tests/KernelTest.php
src/Symfony/Component/OptionsResolver/Tests/LegacyOptionsResolverTest.php
src/Symfony/Component/OptionsResolver/Tests/LegacyOptionsTest.php
src/Symfony/Component/Routing/Tests/Annotation/RouteTest.php
src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php
src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php
src/Symfony/Component/Routing/Tests/Loader/YamlFileLoaderTest.php
src/Symfony/Component/Routing/Tests/Matcher/Dumper/LegacyApacheMatcherDumperTest.php
src/Symfony/Component/Routing/Tests/Matcher/LegacyApacheUrlMatcherTest.php
src/Symfony/Component/Routing/Tests/RouteTest.php
src/Symfony/Component/Templating/Tests/Helper/LegacyAssetsHelperTest.php
src/Symfony/Component/Templating/Tests/Helper/LegacyCoreAssetsHelperTest.php
src/Symfony/Component/Yaml/Tests/YamlTest.php
Diffstat (limited to 'Core')
| -rw-r--r-- | Core/Tests/LegacySecurityContextTest.php | 3 | ||||
| -rw-r--r-- | Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorTest.php | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/Core/Tests/LegacySecurityContextTest.php b/Core/Tests/LegacySecurityContextTest.php index 83abac1..f1f7861 100644 --- a/Core/Tests/LegacySecurityContextTest.php +++ b/Core/Tests/LegacySecurityContextTest.php @@ -15,6 +15,9 @@ use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage; use Symfony\Component\Security\Core\Authorization\AuthorizationChecker; use Symfony\Component\Security\Core\SecurityContext; +/** + * @group legacy + */ class LegacySecurityContextTest extends \PHPUnit_Framework_TestCase { private $tokenStorage; diff --git a/Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorTest.php b/Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorTest.php index 5cfe444..54258e3 100644 --- a/Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorTest.php +++ b/Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorTest.php @@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation; /** * @since 2.5.4 * @author Bernhard Schussek <bschussek@gmail.com> + * @group legacy */ class LegacyUserPasswordValidatorApiTest extends UserPasswordValidatorTest { |