8000 Merge branch '2.3' into 2.4 · symfony/symfony@35774da · GitHub
[go: up one dir, main page]
Skip to content

Commit 35774da

Browse files
fabpotfabpot
committed
Merge branch '2.3' into 2.4
* 2.3: [Security] fixed pre/post authentication checks Updated lithuanian validator translation: changed vartotojas to naudotojas as it is more proper term. Fixed CSS [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. Conflicts: src/Symfony/Component/Security/Acl/Tests/Permission/MaskBuilderTest.php src/Symfony/Component/Security/Core/Tests/Authentication/Token/RememerMeTokenTest.php src/Symfony/Component/Security/Core/Tests/User/AccountCheckerTest.php src/Symfony/Component/Security/Core/Tests/User/InMemoryProviderTest.php src/Symfony/Component/Security/Http/Tests/Authentication/DefaultAuthenticationFailureHandlerTest.php src/Symfony/Component/Security/Http/Tests/Authentication/DefaultAuthenticationSuccessHandlerTest.php src/Symfony/Component/Security/Tests/Core/Authentication/Token/RememberMeTokenTest.php src/Symfony/Component/Security/Tests/Core/Authentication/Token/RememerMeTokenTest.php src/Symfony/Component/Security/Tests/Core/User/AccountCheckerTest.php src/Symfony/Component/Security/Tests/Core/User/InMemoryProviderTest.php src/Symfony/Component/Security/Tests/Core/User/InMemoryUserProviderTest.php src/Symfony/Component/Security/Tests/Core/User/UserCheckerTest.php
2 parents 920c681 + 323710a commit 35774da

File tree

58 files changed

+178
-130
lines changed

Some content is hidden

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

58 files changed

+178
-130
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/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
{

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/body.css.twig

Lines changed: 3 additions & 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;
@@ -58,6 +45,8 @@ build: 56
5845
padding-bottom: 10px;
5946
}
6047
.sf-reset .block {
48+
-moz-border-radius: 16px;
49+
-webkit-border-radius: 16px;
6150
border-radius: 16px;
6251
margin-bottom: 20px;
6352
background-color: #FFFFFF;

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -330,10 +330,10 @@
330330
position: static;
331331
background: #cbcbcb;
332332

333-
background-image: -moz-linear-gradient(90deg, #cbcbcb, #e8e8e8); !important;
334-
background-image: -webkit-gradient(linear, 0% 0%, 100% 0%, from(#cbcbcb), to(#e8e8e8)); !important;
335-
background-image: -o-linear-gradient(180deg, #cbcbcb, #e8e8e8); !important;
336-
background: linear-gradient(90deg, #cbcbcb, #e8e8e8); !important;
333+
background-image: -moz-linear-gradient(90deg, #cbcbcb, #e8e8e8) !important;
334+
background-image: -webkit-gradient(linear, 0% 0%, 100% 0%, from(#cbcbcb), to(#e8e8e8)) !important;
335+
background-image: -o-linear-gradient(180deg, #cbcbcb, #e8e8e8) !important;
336+
background: linear-gradient(90deg, #cbcbcb, #e8e8e8) !important;
337337
}
338338
{% endif %}
339339

‎src/Symfony/Component/Config/Tests/ConfigCacheTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Symfony\Component\Config\ConfigCache;
1515
use Symfony\Component\Config\Resource\FileResource;
1616

17-
class ConfigTest extends \PHPUnit_Framework_TestCase
17+
class ConfigCacheTest extends \PHPUnit_Framework_TestCase
1818
{
1919
private $resourceFile = null;
2020

‎src/Symfony/Component/Config/Tests/Definition/NormalizationTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Symfony\Component\Config\Definition\NodeInterface;
1515
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
1616

17-
class NormalizerTest extends \PHPUnit_Framework_TestCase
17+
class NormalizationTest extends \PHPUnit_Framework_TestCase
1818
{
1919
/**
2020
* @dataProvider getEncoderTests

‎src/Symfony/Component/Console/Tests/Formatter/OutputFormatterTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Symfony\Component\Console\Formatter\OutputFormatter;
1515
use Symfony\Component\Console\Formatter\OutputFormatterStyle;
1616

17-
class FormatterStyleTest extends \PHPUnit_Framework_TestCase
17+
class OutputFormatterTest extends \PHPUnit_Framework_TestCase
1818
{
1919
public function testEmptyTag()
2020
{

‎src/Symfony/Component/CssSelector/Tests/Parser/Handler/AbstractHandlerTest.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\Component\CssSelector\Tests\Handler;
12+
namespace Symfony\Component\CssSelector\Tests\Parser\Handler;
1313

1414
use Symfony\Component\CssSelector\Parser\Reader;
1515
use Symfony\Component\CssSelector\Parser\Token;

‎src/Symfony/Component/CssSelector/Tests/Parser/Handler/CommentHandlerTest.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\Component\CssSelector\Tests\Handler;
12+
namespace Symfony\Component\CssSelector\Tests\Parser\Handler;
1313

1414
use Symfony\Component\CssSelector\Parser\Handler\CommentHandler;
1515
use Symfony\Component\CssSelector\Parser\Reader;

‎src/Symfony/Component/CssSelector/Tests/Parser/Handler/HashHandlerTest.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\Component\CssSelector\Tests\Handler;
12+
namespace Symfony\Component\CssSelector\Tests\Parser\Handler;
1313

1414
use Symfony\Component\CssSelector\Parser\Handler\HashHandler;
1515
use Symfony\Component\CssSelector\Parser\Token;

‎src/Symfony/Component/CssSelector/Tests/Parser/Handler/IdentifierHandlerTest.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\Component\CssSelector\Tests\Handler;
12+
namespace Symfony\Component\CssSelector\Tests\Parser\Handler;
1313

1414
use Symfony\Component\CssSelector\Parser\Handler\IdentifierHandler;
1515
use Symfony\Component\CssSelector\Parser\Token;

‎src/Symfony/Component/CssSelector/Tests/Parser/Handler/NumberHandlerTest.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\Component\CssSelector\Tests\Handler;
12+
namespace Symfony\Component\CssSelector\Tests\Parser\Handler;
1313

1414
use Symfony\Component\CssSelector\Parser\Handler\NumberHandler;
1515
use Symfony\Component\CssSelector\Parser\Token;

‎src/Symfony/Component/CssSelector/Tests/Parser/Handler/StringHandlerTest.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\Component\CssSelector\Tests\Handler;
12+
namespace Symfony\Component\CssSelector\Tests\Parser\Handler;
1313

1414
use Symfony\Component\CssSelector\Parser\Handler\StringHandler;
1515
use Symfony\Component\CssSelector\Parser\Token;

‎src/Symfony/Component/CssSelector/Tests/Parser/Handler/WhitespaceHandlerTest.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\Component\CssSelector\Tests\Handler;
12+
namespace Symfony\Component\CssSelector\Tests\Parser\Handler;
1313

1414
use Symfony\Component\CssSelector\Parser\Handler\WhitespaceHandler;
1515
use Symfony\Component\CssSelector\Parser\Token;

‎src/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,12 @@
121121

122122
<xsd:complexType name="property" mixed="true">
123123
<xsd:choice minOccurs="0" maxOccurs="1">
124+
<xsd:element name="property" type="property" minOccurs="0" maxOccurs="unbounded" />
124125
<xsd:element name="service" type="service" />
125126
</xsd:choice>
126127
<xsd:attribute name="type" type="argument_type" />
127128
<xsd:attribute name="id" type="xsd:string" />
129+
<xsd:attribute name="key" type="xsd:string" />
128130
<xsd:attribute name="name" type="xsd:string" />
129131
<xsd:attribute name="on-invalid" type="xsd:string" />
130132
<xsd:attribute name="strict" type="boolean" />

‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container9.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
setFactoryClass('FooClass')->
1717
setFactoryMethod('getInstance')->
1818
setArguments(array('foo', new Reference('foo.baz'), array('%foo%' => 'foo is %foo%', 'foobar' => '%foo%'), true, new Reference('service_container')))->
19-
setProperties(array('foo' => 'bar', 'moo' => new Reference('foo.baz')))->
19+
setProperties(array('foo' => 'bar', 'moo' => new Reference('foo.baz'), 'qux' => array('%foo%' => 'foo is %foo%', 'foobar' => '%foo%')))->
2020
addMethodCall('setBar', array(new Reference('bar')))->
2121
addMethodCall('initialize')->
2222
setConfigurator('sc_configure')

‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ protected function getFooService()
123123
$instance->initialize();
124124
$instance->foo = 'bar';
125125
$instance->moo = $a;
126+
$instance->qux = array($this->getParameter('foo') => 'foo is '.$this->getParameter('foo').'', 'foobar' => $this->getParameter('foo'));
126127
sc_configure($instance);
127128

128129
return $instance;

‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ protected function getFooService()
131131
$instance->initialize();
132132
$instance->foo = 'bar';
133133
$instance->moo = $a;
134+
$instance->qux = array('bar' => 'foo is bar', 'foobar' => 'bar');
134135
sc_configure($instance);
135136

136137
return $instance;

‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services9.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@
1919
<argument type="service" id="service_container"/>
2020
<property name="foo">bar</property>
2121
<property name="moo" type="service" id="foo.baz"/>
22+
<property name="qux" type="collection">
23+
<property key="%foo%">foo is %foo%</property>
24+
<property key="foobar">%foo%</property>
25+
</property>
2226
<call method="setBar">
2327
<argument type="service" id="bar"/>
2428
</call>

‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services9.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ services:
1212
factory_class: FooClass
1313
factory_method: getInstance
1414
arguments: [foo, '@foo.baz', { '%foo%': 'foo is %foo%', foobar: '%foo%' }, true, '@service_container']
15-
properties: { foo: bar, moo: '@foo.baz' }
15+
properties: { foo: bar, moo: '@foo.baz', qux: { '%foo%': 'foo is %foo%', foobar: '%foo%' } }
1616
calls:
1717
- [setBar, ['@bar']]
1818
- [initialize, { }]

‎src/Symfony/Component/Filesystem/Filesystem.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public function copy($originFile, $targetFile, $override = false)
4343

4444
$this->mkdir(dirname($targetFile));
4545

46-
if (!$override && is_file($targetFile)) {
46+
if (!$override && is_file($targetFile) && null === parse_url($originFile, PHP_URL_HOST)) {
4747
$doCopy = filemtime($originFile) > filemtime($targetFile);
4848
} else {
4949
$doCopy = true;

‎src/Symfony/Component/Filesystem/Tests/FilesystemTest.php

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,19 @@ public function testCopyCreatesTargetDirectoryIfItDoesNotExist()
121121
$this->assertEquals('SOURCE FILE', file_get_contents($targetFilePath));
122122
}
123123

124+
public function testCopyForOriginUrlsAndExistingLocalFileDefaultsToNotCopy()
125+
{
126+
$sourceFilePath = 'http://symfony.com/images/common/logo/logo_symfony_header.png';
127+
$targetFilePath = $this->workspace.DIRECTORY_SEPARATOR.'copy_target_file';
128+
129+
file_put_contents($targetFilePath, 'TARGET FILE');
130+
131+
$this->filesystem->copy($sourceFilePath, $targetFilePath, false);
132+
133+
$this->assertFileExists($targetFilePath);
134+
$this->assertEquals(file_get_contents($sourceFilePath), file_get_contents($targetFilePath));
135+
}
136+
124137
public function testMkdirCreatesDirectoriesRecursively()
125138
{
126139
$directory = $this->workspace
@@ -290,7 +303,7 @@ public function testRemoveCleansInvalidLinks()
290303

291304
mkdir($basePath);
292305
mkdir($basePath.'dir');
293-
// create symlink to unexisting file
306+
// create symlink to nonexistent file
294307
@symlink($basePath.'file', $basePath.'link');
295308

296309
$this->filesystem->remove($basePath);

‎src/Symfony/Component/Finder/Tests/Expression/ExpressionTest.php

Lines 10000 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\Component\Finder\Tests;
12+
namespace Symfony\Component\Finder\Tests\Expression;
1313

1414
use Symfony\Component\Finder\Expression\Expression;
1515

‎src/Symfony/Component/Finder/Tests/Expression/GlobTest.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\Component\Finder\Tests;
12+
namespace Symfony\Component\Finder\Tests\Expression;
1313

1414
use Symfony\Component\Finder\Expression\Expression;
1515

‎src/Symfony/Component/Finder/Tests/Expression/RegexTest.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\Component\Finder\Tests;
12+
namespace Symfony\Component\Finder\Tests\Expression;
1313

1414
use Symfony\Component\Finder\Expression\Expression;
1515

‎src/Symfony/Component/Form/Tests/FormRendererTest.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\Component\Form\Test;
12+
namespace Symfony\Component\Form\Tests;
1313

1414
class FormRendererTest extends \PHPUnit_Framework_TestCase
1515
{

0 commit comments

Comments
 (0)
0