8000 Merge branch '4.0' into 4.1 · symfony/symfony@8c687c6 · GitHub
[go: up one dir, main page]
Skip to content

Commit 8c687c6

Browse files
fabpotfabpot
committed
Merge branch '4.0' into 4.1
* 4.0: [TwigBundle][DX] Only add the Twig WebLinkExtension if the WebLink component is enabled Add note about changed form processing when using PUT requests [SecurityBundle] Dont throw if "security.http_utils" is not found [Di] Fix undefined variable found by Php Inspections (EA Ultimate) [DI] Cleanup unused service_subscriber.locator tag [DI] Resolve env placeholder in logs The debug class loader is always loaded by Debug::enable(). [Intl] Update ICU data to 62.1
2 parents 467dce1 + b626ee9 commit 8c687c6

File tree

418 files changed

+476
-441
lines changed

Some content is hidden

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

418 files changed

+476
-441
lines changed

‎src/Symfony/Bridge/Twig/UndefinedCallableHandler.php

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Bridge\Twig;
1313

14+
use Symfony\Bundle\FullStack;
1415
use Twig\Error\SyntaxError;
1516

1617
/**
@@ -56,14 +57,21 @@ class UndefinedCallableHandler
5657
'workflow_marked_places' => 'workflow',
5758
);
5859

60+
private static $fullStackEnable = array(
61+
'form' => 'enable "framework.form"',
62+
'security-core' => 'add the "SecurityBundle"',
63+
'security-http' => 'add the "SecurityBundle"',
64+
'web-link' => 'enable "framework.web_link"',
65+
'workflow' => 'enable "framework.workflows"',
66+
);
67+
5968
public static function onUndefinedFilter($name)
6069
{
6170
if (!isset(self::$filterComponents[$name])) {
6271
return false;
6372
}
6473

65-
// Twig will append the source context to the message, so that it will end up being like "[...] Unknown filter "%s" in foo.html.twig on line 123."
66-
throw new SyntaxError(sprintf('Did you forget to run "composer require symfony/%s"? Unknown filter "%s".', self::$filterComponents[$name], $name));
74+
self::onUndefined($name, 'filter', self::$filterComponents[$name]);
6775
}
6876

6977
public static function onUndefinedFunction($name)
@@ -72,6 +80,15 @@ public static function onUndefinedFunction($name)
7280
return false;
7381
}
7482

75-
throw new SyntaxError(sprintf('Did you forget to run "composer require symfony/%s"? Unknown function "%s".', self::$functionComponents[$name], $name));
83+
self::onUndefined($name, 'function', self::$functionComponents[$name]);
84+
}
85+
86+
private static function onUndefined($name, $type, $component)
87+
{
88+
if (\class_exists(FullStack::class) && isset(self::$fullStackEnable[$component])) {
89+
throw new SyntaxError(sprintf('Did you forget to %s? Unknown %s "%s".', self::$fullStackEnable[$component], $type, $name));
90+
}
91+
92+
throw new SyntaxError(sprintf('Did you forget to run "composer require symfony/%s"? Unknown %s "%s".', $component, $type, $name));
7693
}
7794
}

‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddSessionDomainConstraintPass.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,14 @@ class AddSessionDomainConstraintPass implements CompilerPassInterface
2626
*/
2727
public function process(ContainerBuilder $container)
2828
{
29-
if (!$container->hasParameter('session.storage.options')) {
29+
if (!$container->hasParameter('session.storage.options') || !$container->has('security.http_utils')) {
3030
return;
3131
}
3232

3333
$sessionOptions = $container->getParameter('session.storage.options');
3434
$domainRegexp = empty($sessionOptions['cookie_domain']) ? '%s' : sprintf('(?:%%s|(?:.+\.)?%s)', preg_quote(trim($sessionOptions['cookie_domain'], '.')));
3535
$domainRegexp = (empty($sessionOptions['cookie_secure']) ? 'https?://' : 'https://').$domainRegexp;
3636

37-
// if the service doesn't exist, an exception must be thrown - ignoring would put security at risk
3837
$container->findDefinition('security.http_utils')->addArgument(sprintf('{^%s$}i', $domainRegexp));
3938
}
4039
}

‎src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/AddSessionDomainConstraintPassTest.php

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -96,19 +96,6 @@ public function testNoSession()
9696
$this->assertTrue($utils->createRedirectResponse($request, 'http://pirate.com/foo')->isRedirect('http://pirate.com/foo'));
9797
}
9898

99-
/**
100-
* @expectedException \Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException
101-
* @expectedExceptionMessage You have requested a non-existent service "security.http_utils".
102-
*/
103-
public function testNoHttpUtils()
104-
{
105-
$container = new ContainerBuilder();
106-
$container->setParameter('session.storage.options', array());
107-
108-
$pass = new AddSessionDomainConstraintPass();
109-
$pass->process($container);
110-
}
111-
11299
private function createContainer($sessionStorageOptions)
113100
{
114101
$container = new ContainerBuilder();

‎src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,10 @@ public function process(ContainerBuilder $container)
8282
}
8383
}
8484

85+
if ($container->has('web_link.add_link_header_listener')) {
86+
$container->getDefinition('twig.extension.weblink')->addTag('twig.extension');
87+
}
88+
8589
$twigLoader = $container->getDefinition('twig.loader.native_filesystem');
8690
if ($container->has('templating')) {
8791
$loader = $container->getDefinition('twig.loader.filesystem');

‎src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,13 @@
1111

1212
namespace Symfony\Bundle\TwigBundle\DependencyInjection;
1313

14-
use Symfony\Bridge\Twig\Extension\WebLinkExtension;
1514
use Symfony\Component\Config\FileLocator;
1615
use Symfony\Component\Config\Resource\FileExistenceResource;
1716
use Symfony\Component\Console\Application;
1817
use Symfony\Component\DependencyInjection\ContainerBuilder;
1918
use Symfony\Component\DependencyInjection\Reference;
2019
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
2120
use Symfony\Component\HttpKernel\DependencyInjection\Extension;
22-
use Symfony\Component\WebLink\HttpHeaderSerializer;
2321
use Twig\Extension\ExtensionInterface;
2422
use Twig\Extension\RuntimeExtensionInterface;
2523
use Twig\Loader\LoaderInterface;
@@ -53,13 +51,6 @@ public function load(array $configs, ContainerBuilder $container)
5351
$container->removeDefinition('twig.translation.extractor');
5452
}
5553

56-
if (class_exists(HttpHeaderSerializer::class)) {
57-
$definition = $container->register('twig.extension.weblink', WebLinkExtension::class);
58-
$definition->setPublic(false);
59-
$definition->addArgument(new Reference('request_stack'));
60-
$definition->addTag('twig.extension');
61-
}
62-
6354
foreach ($configs as $key => $config) {
6455
if (isset($config['globals'])) {
6556
foreach ($config['globals'] as $name => $value) {

‎src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,10 @@
114114

115115
<service id="twig.extension.debug" class="Twig\Extension\DebugExtension" />
116116

117+
<service id="twig.extension.weblink" class="Symfony\Bridge\Twig\Extension\WebLinkExtension">
118+
<argument type="service" id="request_stack" />
119+
</service>
120+
117121
<service id="twig.translation.extractor" class="Symfony\Bridge\Twig\Translation\TwigExtractor">
118122
<argument type="service" id="twig" />
119123
<tag name="translation.extractor" alias="twig" />

‎src/Symfony/Component/DependencyInjection/Compiler/ResolveServiceSubscribersPass.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,12 @@ protected function processValue($value, $isRoot = false)
3535
}
3636

3737
$serviceLocator = $this->serviceLocator;
38-
$this->serviceLocator = $value->hasTag('container.service_subscriber.locator') ? $value->getTag('container.service_subscriber.locator')[0]['id'] : null;
38+
$this->serviceLocator = null;
39+
40+
if ($value->hasTag('container.service_subscriber.locator')) {
41+
$this->serviceLocator = $value->getTag('container.service_subscriber.locator')[0]['id'];
42+
$value->clearTag('container.service_subscriber.locator');
43+
}
3944

4045
try {
4146
return parent::processValue($value);

‎src/Symfony/Component/DependencyInjection/ContainerBuilder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1418,7 +1418,7 @@ public function getEnvCounters()
14181418
*/
14191419
public function log(CompilerPassInterface $pass, string $message)
14201420
{
1421-
$this->getCompiler()->log($pass, $message);
1421+
$this->getCompiler()->log($pass, $this->resolveEnvPlaceholders($message));
14221422
}
14231423

14241424
/**

‎src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ private function addServiceInlinedDefinitions(string $id, Definition $definition
496496
// $b = new ServiceB();
497497
// $a = new ServiceA(ServiceB $b);
498498
// $b->setServiceA(ServiceA $a);
499-
if (isset($inlinedDefinition[$definition]) && $this->hasReference($id, array($def->getArguments(), $def->getFactory()))) {
499+
if (isset($inlinedDefinitions[$definition]) && $this->hasReference($id, array($def->getArguments(), $def->getFactory()))) {
500500
throw new ServiceCircularReferenceException($id, array($id));
501501
}
502502

‎src/Symfony/Component/Intl/Intl.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ public static function getIcuDataVersion()
235235
*/
236236
public static function getIcuStubVersion()
237237
{
238-
return '61.1';
238+
return '62.1';
239239
}
240240

241241
/**

‎src/Symfony/Component/Intl/Resources/bin/icu.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@
1717
59 = http://source.icu-project.org/repos/icu/tags/release-59-1/icu4c/source
1818
60 = http://source.icu-project.org/repos/icu/tags/release-60-2/icu4c/source
1919
61 = http://source.icu-project.org/repos/icu/tags/release-61-1/icu4c/source
20+
62 = http://source.icu-project.org/repos/icu/tags/release-62-1/icu4c/source

‎src/Symfony/Component/Intl/Resources/data/currencies/af.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.39.11",
2+
"Version": "2.1.41.97",
33
"Names": {
44
"AED": [
55
"AED",

‎src/Symfony/Component/Intl/Resources/data/currencies/am.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.39.11",
2+
"Version": "2.1.41.97",
33
"Names": {
44
"AED": [
55
"AED",

‎src/Symfony/Component/Intl/Resources/data/currencies/ar.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.39.20",
2+
"Version": "2.1.41.97",
33
"Names": {
44
"ADP": [
55
"ADP",

‎src/Symfony/Component/Intl/Resources/data/currencies/as.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.39.11",
2+
"Version": "2.1.41.97",
33
"Names": {
44
"AED": [
55
"AED",

‎src/Symfony/Component/Intl/Resources/data/currencies/az.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.39.11",
2+
"Version": "2.1.41.97",
33
"Names": {
44
"ADP": [
55
"ADP",

‎src/Symfony/Component/Intl/Resources/data/currencies/be.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.39.11",
2+
"Version": "2.1.41.97",
33
"Names": {
44
"AED": [
55
"AED",

‎src/Symfony/Component/Intl/Resources/data/currencies/bg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.39.11",
2+
"Version": "2.1.41.97",
33
"Names": {
44
"ADP": [
55
"ADP",

‎src/Symfony/Component/Intl/Resources/data/currencies/bn.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.39.11",
2+
"Version": "2.1.41.97",
33
"Names": {
44
"ADP": [
55
"ADP",

‎src/Symfony/Component/Intl/Resources/data/currencies/br.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.39.11",
2+
"Version": "2.1.41.97",
33
"Names": {
44
"ADP": [
55
"ADP",

‎src/Symfony/Component/Intl/Resources/data/currencies/bs.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.39.11",
2+
"Version": "2.1.41.97",
33
"Names": {
44
"ADP": [
55
"ADP",

‎src/Symfony/Component/Intl/Resources/data/currencies/bs_Cyrl.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.39.11",
2+
"Version": "2.1.41.97",
33
"Names": {
44
"ADP": [
55
"ADP",

‎src/Symfony/Component/Intl/Resources/data/currencies/ca.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.39.20",
2+
"Version": "2.1.41.97",
33
"Names": {
44
"ADP": [
55
"ADP",

‎src/Symfony/Component/Intl/Resources/data/currencies/ce.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.39.11",
2+
"Version": "2.1.41.97",
33
"Names": {
44
"AED": [
55
"AED",

‎src/Symfony/Component/Intl/Resources/data/currencies/cs.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.39.15",
2+
"Version": "2.1.41.97",
33
"Names": {
44
"ADP": [
55
"ADP",

‎src/Symfony/Component/Intl/Resources/data/currencies/cy.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.39.11",
2+
"Version": "2.1.41.97",
33
"Names": {
44
"AED": [
55
"AED",

‎src/Symfony/Component/Intl/Resources/data/currencies/da.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.39.20",
2+
"Version": "2.1.41.97",
33
"Names": {
44
"ADP": [
55
"ADP",

‎src/Symfony/Component/Intl/Resources/data/currencies/de.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.39.41",
2+
"Version": "2.1.41.97",
33
"Names": {
44
"ADP": [
55
"ADP",

‎src/Symfony/Component/Intl/Resources/data/currencies/dz.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.38.69",
2+
"Version": "2.1.41.97",
33
"Names": {
44
"AED": [
55
"AED",

‎src/Symfony/Component/Intl/Resources/data/currencies/ee.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.39.11",
2+
"Version": "2.1.41.97",
33
"Names": {
44
"ADP": [
55
"ADP",

‎src/Symfony/Component/Intl/Resources/data/currencies/el.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.39.20",
2+
"Version": "2.1.41.97",
33
"Names": {
44
"ADP": [
55
"ADP",

‎src/Symfony/Component/Intl/Resources/data/currencies/en.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.39.27",
2+
"Version": "2.1.41.97",
33
"Names": {
44
"ADP": [
55
"ADP",

‎src/Symfony/Component/Intl/Resources/data/currencies/es.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.39.20",
2+
"Version": "2.1.41.97",
33
"Names": {
44
"ADP": [
55
"ADP",

‎src/Symfony/Component/Intl/Resources/data/currencies/es_VE.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.38.39",
2+
"Version": "2.1.41.97",
33
"Names": {
44
"VEF": [
55
"Bs.",

‎src/Symfony/Component/Intl/Resources/data/currencies/et.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.39.11",
2+
"Version": "2.1.41.97",
33
"Names": {
44
"ADP": [
55
"ADP",

‎src/Symfony/Component/Intl/Resources/data/currencies/eu.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.39.11",
2+
"Version": "2.1.41.97",
33
"Names": {
44
"AED": [
55
"AED",

‎src/Symfony/Component/Intl/Resources/data/currencies/fa.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.39.11",
2+
"Version": "2.1.41.97",
33
"Names": {
44
"ADP": [
55
"ADP",

‎src/Symfony/Component/Intl/Resources/data/currencies/fi.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.39.20",
2+
"Version": "2.1.41.97",
33
"Names": {
44
"ADP": [
55
"ADP",

‎src/Symfony/Component/Intl/Resources/data/currencies/fo.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.39.11",
2+
"Version": "2.1.41.97",
33
"Names": {
44
"AED": [
55
"AED",

‎src/Symfony/Component/Intl/Resources/data/currencies/fr.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.39.20",
2+
"Version": "2.1.41.97",
33
"Names": {
44
"ADP": [
55
"ADP",

‎src/Symfony/Component/Intl/Resources/data/currencies/fy.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.39.11",
2+
"Version": "2.1.41.97",
33
"Names": {
44
"ADP": [
55
"ADP",

0 commit comments

Comments
 (0)
0