10BC0 Merge branch '2.4' · symfony/symfony@8850456 · GitHub
[go: up one dir, main page]
Skip to content

Commit 8850456

Browse files
fabpotfabpot
committed
Merge branch '2.4'
* 2.4: [Security] fixed pre/post authentication checks fixed missing use statements Updated lithuanian validator translation: changed vartotojas to naudotojas as it is more proper term. Fixed CSS [Intl] Added round support for ROUND_CEILING, ROUND_FLOOR, ROUND_DOWN, ROUND_UP [HttpFoundation] Throw proper exception when invalid data is passed to JsonResponse class addressed == -> === suggestion Fixed #9020 - Added support for collections in service#parameters fixes PSR-0 issues in tests adjusted behavior to always copy override on url files Skips test that need full lib-intl.
2 parents 702e2a4 + 35774da commit 8850456

File tree

62 files changed

+333
-150
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+333
-150
lines changed

‎src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPassTest.php‎

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

12-
namespace Symfony\Bridge\Doctrine\Tests\DependencyInjection\Compiler;
12+
namespace Symfony\Bridge\Doctrine\Tests\DependencyInjection\CompilerPass;
1313

1414
use Symfony\Bridge\Doctrine\DependencyInjection\CompilerPass\RegisterEventListenersAndSubscribersPass;
1515
use Symfony\Component\DependencyInjection\ContainerBuilder;

‎src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/ContainerBuilderTest.php‎

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

12-
namespace Symfony\Bridge\ProxyManager\LazyProxy\Tests;
12+
namespace Symfony\Bridge\ProxyManager\Tests\LazyProxy;
1313

1414
require_once __DIR__ . '/Fixtures/includes/foo.php';
1515

‎src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Dumper/PhpDumperTest.php‎

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

12-
namespace Symfony\Bridge\ProxyManager\LazyProxy\Tests\Dumper;
12+
namespace Symfony\Bridge\ProxyManager\Tests\LazyProxy\Dumper;
1313

1414
use Symfony\Bridge\ProxyManager\LazyProxy\PhpDumper\ProxyDumper;
1515
use Symfony\Component\DependencyInjection\ContainerBuilder;

‎src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Instantiator/RuntimeInstantiatorTest.php‎

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

12-
namespace Symfony\Bridge\ProxyManager\LazyProxy\Tests\Instantiator;
12+
namespace Symfony\Bridge\ProxyManager\Tests\LazyProxy\Instantiator;
1313

1414
use ProxyManager\Proxy\LazyLoadingInterface;
1515
use Symfony\Bridge\ProxyManager\LazyProxy\Instantiator\RuntimeInstantiator;

‎src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php‎

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

12-
namespace Symfony\Bridge\ProxyManager\LazyProxy\Tests\Instantiator;
12+
namespace Symfony\Bridge\ProxyManager\Tests\LazyProxy\PhpDumper;
1313

1414
use Symfony\Bridge\ProxyManager\LazyProxy\PhpDumper\ProxyDumper;
1515
use Symfony\Component\DependencyInjection\Definition;
@@ -56,8 +56,8 @@ public function testGetProxyCode()
5656
$code = $this->dumper->getProxyCode($definition);
5757

5858
$this->assertStringMatchesFormat(
59-
'%Aclass SymfonyBridgeProxyManagerLazyProxyTestsInstantiatorProxyDumperTest%aextends%w'
60-
. '\Symfony\Bridge\ProxyManager\LazyProxy\Tests\Instantiator%a',
59+
'%Aclass SymfonyBridgeProxyManagerTestsLazyProxyPhpDumperProxyDumperTest%aextends%w'
60+
. '\Symfony\Bridge\ProxyManager\Tests\LazyProxy\PhpDumper\ProxyDumperTest%a',
6161
$code
6262
);
6363
}
@@ -72,7 +72,7 @@ public function testGetProxyFactoryCode()
7272

7373
$this->assertStringMatchesFormat(
7474
'%wif ($lazyLoad) {%w$container = $this;%wreturn $this->services[\'foo\'] = new '
75-
. 'SymfonyBridgeProxyManagerLazyProxyTestsInstantiatorProxyDumperTest_%s(%wfunction '
75+
. 'SymfonyBridgeProxyManagerTestsLazyProxyPhpDumperProxyDumperTest_%s(%wfunction '
7676
. '(&$wrappedInstance, \ProxyManager\Proxy\LazyLoadingInterface $proxy) use ($container) {'
7777
. '%w$wrappedInstance = $container->getFooService(false);%w$proxy->setProxyInitializer(null);'
7878
. '%wreturn true;%w}%w);%w}%w',

‎src/Symfony/Bridge/Twig/Tests/TokenParser/FormThemeTokenParserTest.php‎

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

12-
namespace Symfony\Bridge\Twig\Tests\Node;
12+
namespace Symfony\Bridge\Twig\Tests\TokenParser;
1313

1414
use Symfony\Bridge\Twig\TokenParser\FormThemeTokenParser;
1515
use Symfony\Bridge\Twig\Node\FormThemeNode;

‎src/Symfony/Bundle/FrameworkBundle/Resources/public/css/body.css‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,7 @@ http://developer.yahoo.com/yui/license.html
55
version: 3.1.2
66
build: 56
77
*/
8-
.sf-reset html{color:#000;background:#FFF;}.sf-reset body,.sf-reset div,.sf-reset dl,.sf-reset dt,.sf-reset dd,.sf-reset ul,.sf-reset ol,.sf-reset li,.sf-reset h1,.sf-reset h2,.sf-reset h3,.sf-reset h4,.sf-reset h5,.sf-reset h6,.sf-reset pre,.sf-reset code,.sf-reset form,.sf-reset fieldset,.sf-reset legend,.sf-reset input,.sf-reset textarea,.sf-reset p,.sf-reset blockquote,.sf-reset th,.sf-reset td{margin:0;padding:0;}.sf-reset table{border-collapse:collapse;border-spacing:0;}.sf-reset fieldset,.sf-reset img{border:0;}.sf-reset address,.sf-reset caption,.sf-reset cite,.sf-reset code,.sf-reset dfn,.sf-reset em,.sf-reset strong,.sf-reset th,.sf-reset var{font-style:normal;font-weight:normal;}.sf-reset li{list-style:none;}.sf-reset caption,.sf-reset th{text-align:left;}.sf-reset h1,.sf-reset h2,.sf-reset h3,.sf-reset h4,.sf-reset h5,.sf-reset h6{font-size:100%;font-weight:normal;}.sf-reset q:before,.sf-reset q:after{content:'';}.sf-reset abbr,.sf-reset acronym{border:0;font-variant:normal;}.sf-reset sup{vertical-align:text-top;}.sf-reset sub{vertical-align:text-bottom;}.sf-reset input,.sf-reset textarea,.sf-reset select{font-family:inherit;font-size:inherit;font-weight:inherit;}.sf-reset input,.sf-reset textarea,.sf-reset select{*font-size:100%;}.sf-reset legend{color:#000;}
9-
.sf-reset html,
10-
.sf-reset body {
11-
width: 100%;
12-
min-height: 100%;
13-
_height: 100%;
14-
margin: 0;
15-
padding: 0;
16-
}
17-
.sf-reset body {
18-
font: 1em "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
19-
text-align: left;
20-
background-color: #efefef;
21-
}
8+
.sf-reset div,.sf-reset dl,.sf-reset dt,.sf-reset dd,.sf-reset ul,.sf-reset ol,.sf-reset li,.sf-reset h1,.sf-reset h2,.sf-reset h3,.sf-reset h4,.sf-reset h5,.sf-reset h6,.sf-reset pre,.sf-reset code,.sf-reset form,.sf-reset fieldset,.sf-reset legend,.sf-reset input,.sf-reset textarea,.sf-reset p,.sf-reset blockquote,.sf-reset th,.sf-reset td{margin:0;padding:0;}.sf-reset table{border-collapse:collapse;border-spacing:0;}.sf-reset fieldset,.sf-reset img{border:0;}.sf-reset address,.sf-reset caption,.sf-reset cite,.sf-reset code,.sf-reset dfn,.sf-reset em,.sf-reset strong,.sf-reset th,.sf-reset var{font-style:normal;font-weight:normal;}.sf-reset li{list-style:none;}.sf-reset caption,.sf-reset th{text-align:left;}.sf-reset h1,.sf-reset h2,.sf-reset h3,.sf-reset h4,.sf-reset h5,.sf-reset h6{font-size:100%;font-weight:normal;}.sf-reset q:before,.sf-reset q:after{content:'';}.sf-reset abbr,.sf-reset acronym{border:0;font-variant:normal;}.sf-reset sup{vertical-align:text-top;}.sf-reset sub{vertical-align:text-bottom;}.sf-reset input,.sf-reset textarea,.sf-reset select{font-family:inherit;font-size:inherit;font-weight:inherit;}.sf-reset input,.sf-reset textarea,.sf-reset select{font-size:100%;}.sf-reset legend{color:#000;}
229
.sf-reset abbr {
2310
border-bottom: 1px dotted #000;
2411
cursor: help;

‎src/Symfony/Bundle/FrameworkBundle/Templating/TemplateFilenameParser.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace Symfony\Bundle\FrameworkBundle\Templating;
1313

1414
use Symfony\Component\Templating\TemplateNameParserInterface;
15+
use Symfony\Component\Templating\TemplateReferenceInterface;
1516

1617
/**
1718
* TemplateFilenameParser converts template filenames to

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fragments/ContainerAwareHIncludeFragmentRendererTest.php‎ renamed to ‎src/Symfony/Bundle/FrameworkBundle/Tests/Fragment/ContainerAwareHIncludeFragmentRendererTest.php‎

File renamed without changes.

‎src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
use Symfony\Component\Routing\Route;
1616
use Symfony\Component\Routing\RouteCollection;
1717

18-
class RoutingTest extends \PHPUnit_Framework_TestCase
18+
class RouterTest extends \PHPUnit_Framework_TestCase
1919
{
2020
public function testGenerateWithServiceParam()
2121
{

0 commit comments

Comments
 (0)
0