summaryrefslogtreecommitdiffstats
path: root/Http/Tests/EntryPoint/RetryAuthenticationEntryPointTest.php
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2014-09-22 10:51:05 +0200
committerFabien Potencier <fabien.potencier@gmail.com>2014-09-22 10:51:05 +0200
commit78ebbab243651e31b940cb1330b06361dbd3c37b (patch)
tree04369a088ecc49592c4702ab86fc937f80b19e1b /Http/Tests/EntryPoint/RetryAuthenticationEntryPointTest.php
parent9aefee358bddb7baf5ae57607f4af2e721397f58 (diff)
parent2d2a3fa99c5d006c67dcaed702ac9a306ebe9c41 (diff)
downloadsymfony-security-78ebbab243651e31b940cb1330b06361dbd3c37b.zip
symfony-security-78ebbab243651e31b940cb1330b06361dbd3c37b.tar.gz
symfony-security-78ebbab243651e31b940cb1330b06361dbd3c37b.tar.bz2
Merge branch '2.3' into 2.4
* 2.3: fixed CS [Process] fixed some volatile tests [HttpKernel] fixed a volatile test [HttpFoundation] fixed some volatile tests Use getPathname() instead of string casting to get BinaryFileReponse file path Conflicts: src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php src/Symfony/Bundle/FrameworkBundle/EventListener/SessionListener.php src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php src/Symfony/Component/ClassLoader/Tests/ApcUniversalClassLoaderTest.php src/Symfony/Component/Config/Definition/ReferenceDumper.php src/Symfony/Component/Config/Tests/Definition/Dumper/YamlReferenceDumperTest.php src/Symfony/Component/Console/Application.php src/Symfony/Component/Console/Tests/ApplicationTest.php src/Symfony/Component/Filesystem/Exception/IOException.php src/Symfony/Component/Form/Extension/Templating/TemplatingExtension.php src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php src/Symfony/Component/HttpKernel/Tests/Bundle/BundleTest.php src/Symfony/Component/HttpKernel/Tests/Fragment/RoutableFragmentRendererTest.php src/Symfony/Component/HttpKernel/Tests/Profiler/Mock/RedisMock.php src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php src/Symfony/Component/PropertyAccess/PropertyAccessor.php src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php src/Symfony/Component/Routing/Tests/Annotation/RouteTest.php src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php src/Symfony/Component/Serializer/Encoder/XmlEncoder.php src/Symfony/Component/Validator/Constraints/CollectionValidator.php src/Symfony/Component/Validator/Tests/ExecutionContextTest.php
Diffstat (limited to 'Http/Tests/EntryPoint/RetryAuthenticationEntryPointTest.php')
-rw-r--r--Http/Tests/EntryPoint/RetryAuthenticationEntryPointTest.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/Http/Tests/EntryPoint/RetryAuthenticationEntryPointTest.php b/Http/Tests/EntryPoint/RetryAuthenticationEntryPointTest.php
index f4e5425..ff5fbc2 100644
--- a/Http/Tests/EntryPoint/RetryAuthenticationEntryPointTest.php
+++ b/Http/Tests/EntryPoint/RetryAuthenticationEntryPointTest.php
@@ -39,26 +39,26 @@ class RetryAuthenticationEntryPointTest extends \PHPUnit_Framework_TestCase
80,
443,
Request::create('http://localhost/foo/bar?baz=bat'),
- 'https://localhost/foo/bar?baz=bat'
+ 'https://localhost/foo/bar?baz=bat',
),
array(
80,
443,
Request::create('https://localhost/foo/bar?baz=bat'),
- 'http://localhost/foo/bar?baz=bat'
+ 'http://localhost/foo/bar?baz=bat',
),
array(
80,
123,
Request::create('http://localhost/foo/bar?baz=bat'),
- 'https://localhost:123/foo/bar?baz=bat'
+ 'https://localhost:123/foo/bar?baz=bat',
),
array(
8080,
443,
Request::create('https://localhost/foo/bar?baz=bat'),
- 'http://localhost:8080/foo/bar?baz=bat'
- )
+ 'http://localhost:8080/foo/bar?baz=bat',
+ ),
);
}
}