Skip to content

Commit 753197f

Browse files
xabbuhxabbuh
committed
Merge branch '2.8' into 3.3
* 2.8: fix the Composer API being used [Debug] Always decorate existing exception handlers to deal with fatal errors Enableable ArrayNodeDefinition is disabled for empty configuration Fixing a bug where the dump() function depended on bundle ordering Add nn (Norwegian Nynorsk) translation files, and improve existing file Problem in phar see mergerequest symfony#25579 [Form] Disallow transform dates beyond the year 9999 Copied NO language files to the new NB locale. [Console] Improve phpdoc on StyleInterface::ask()
2 parents 6d08d7f + 48872f3 commit 753197f

File tree

21 files changed

+626
-28
lines changed

21 files changed

+626
-28
lines changed

‎.github/build-packages.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949

5050
$packages[$package->name][$package->version] = $package;
5151

52-
$versions = file_get_contents('https://packagist.org/packages/'.$package->name.'.json');
53-
$versions = json_decode($versions)->package->versions;
52+
$versions = file_get_contents('https://packagist.org/p/'.$package->name.'.json');
53+
$versions = json_decode($versions)->packages->{$package->name};
5454

5555
if ($package->version === str_replace('-dev', '.x-dev', $versions->{'dev-master'}->extra->{'branch-alias'}->{'dev-master'})) {
5656
unset($versions->{'dev-master'});

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,11 @@ public function process(ContainerBuilder $container)
8282

8383
if ($container->getParameter('kernel.debug')) {
8484
$container->getDefinition('twig.extension.profiler')->addTag('twig.extension');
85-
$container->getDefinition('twig.extension.debug')->addTag('twig.extension');
85+
86+
// only register if the improved version from DebugBundle is *not* present
87+
if (!$container->has('twig.extension.dump')) {
88+
$container->getDefinition('twig.extension.debug')->addTag('twig.extension');
89+
}
8690
}
8791

8892
$twigLoader = $container->getDefinition('twig.loader.native_filesystem');

‎src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,9 @@ public function canBeEnabled()
283283
->beforeNormalization()
284284
->ifArray()
285285
->then(function ($v) {
286-
$v['enabled'] = isset($v['enabled']) ? $v['enabled'] : true;
286+
if (!isset($v['enabled'])) {
287+
$v['enabled'] = !empty($v);
288+
}
287289

288290
return $v;
289291
})

‎src/Symfony/Component/Config/Tests/Definition/Builder/ArrayNodeDefinitionTest.php

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,20 @@ public function testCanBeDisabled()
207207
$this->assertTrue($this->getField($enabledNode, 'defaultValue'));
208208
}
209209

210+
public function testEnableableNodeIsDisabledForEmptyConfigurationWhenNormalized()
211+
{
212+
$config = array();
213+
214+
$node = new ArrayNodeDefinition('root');
215+
$node->canBeEnabled();
216+
217+
$this->assertEquals(
218+
array('enabled' => false),
219+
$node->getNode()->normalize($config),
220+
'An enableable node is disabled by default'
221+
);
222+
}
223+
210224
public function testIgnoreExtraKeys()
211225
{
212226
$node = new ArrayNodeDefinition('root');
@@ -282,6 +296,7 @@ public function getEnableableNodeFixtures()
282296
array(array('enabled' => true, 'foo' => 'baz'), array(array('foo' => 'baz')), 'any configuration enables an enableable node'),
283297
array(array('enabled' => false, 'foo' => 'baz'), array(array('foo' => 'baz', 'enabled' => false)), 'An enableable node can be disabled'),
284298
array(array('enabled' => false, 'foo' => 'bar'), array(false), 'false disables an enableable node'),
299+
array(array('enabled' => false, 'foo' => 'bar'), array(), 'enableable node is disabled by default'),
285300
);
286301
}
287302

‎src/Symfony/Component/Config/Tests/Definition/Builder/TreeBuilderTest.php

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace Symfony\Component\Config\Tests\Definition\Builder;
1313

1414
use PHPUnit\Framework\TestCase;
15+
use Symfony\Component\Config\Definition\Processor;
1516
use Symfony\Component\Config\Tests\Fixtures\Builder\NodeBuilder as CustomNodeBuilder;
1617
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
1718

@@ -131,4 +132,22 @@ public function testDefinitionExampleGetsTransferredToNode()
131132
$this->assertInternalType('array', $tree->getExample());
132133
$this->assertEquals('example', $children['child']->getExample());
133134
}
135+
136+
public function testRootNodeThatCanBeEnabledIsDisabledByDefault()
137+
{
138+
$builder = new TreeBuilder();
139+
140+
$builder->root('test')
141+
->canBeEnabled();
142+
143+
$tree = $builder->buildTree();
144+
$children = $tree->getChildren();
145+
146+
$this->assertFalse($children['enabled']->getDefaultValue());
147+
148+
$processor = new Processor();
149+
$result = $processor->process($tree, array());
150+
151+
$this->assertEquals(array('enabled' => false), $result);
152+
}
134153
}

‎src/Symfony/Component/Console/Style/StyleInterface.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public function table(array $headers, array $rows);
9191
* @param string|null $default
9292
* @param callable|null $validator
9393
*
94-
* @return string
94+
* @return mixed
9595
*/
9696
public function ask($question, $default = null, $validator = null);
9797

@@ -101,7 +101,7 @@ public function ask($question, $default = null, $validator = null);
101101
* @param string $question
102102
* @param callable|null $validator
103103
*
104-
* @return string
104+
* @return mixed
105105
*/
106106
public function askHidden($question, $validator = null);
107107

@@ -122,7 +122,7 @@ public function confirm($question, $default = true);
122122
* @param array $choices
123123
* @param string|int|null $default
124124
*
125-
* @return string
125+
* @return mixed
126126
*/
127127
public function choice($question, array $choices, $default = null);
128128

‎src/Symfony/Component/Console/Style/SymfonyStyle.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ public function createProgressBar($max = 0)
279279
}
280280

281281
/**
282-
* @return string
282+
* @return mixed
283283
*/
284284
public function askQuestion(Question $question)
285285
{

‎src/Symfony/Component/Debug/ErrorHandler.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,14 @@ public static function register(self $handler = null, $replace = true)
134134
$handler = $prev[0];
135135
$replace = false;
136136
}
137-
if ($replace || !$prev) {
138-
$handler->setExceptionHandler(set_exception_handler(array($handler, 'handleException')));
139-
} else {
137+
if (!$replace && $prev) {
140138
restore_error_handler();
141139
}
140+
if (is_array($prev = set_exception_handler(array($handler, 'handleException'))) && $prev[0] === $handler) {
141+
restore_exception_handler();
142+
} else {
143+
$handler->setExceptionHandler($prev);
144+
}
142145

143146
$handler->throwAt(E_ALL & $handler->thrownErrors, true);
144147

‎src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -573,16 +573,20 @@ public function validateSchema(\DOMDocument $dom)
573573
$imports = '';
574574
foreach ($schemaLocations as $namespace => $location) {
575575
$parts = explode('/', $location);
576+
$locationstart = 'file:///';
576577
if (0 === stripos($location, 'phar://')) {
577578
$tmpfile = tempnam(sys_get_temp_dir(), 'sf2');
578579
if ($tmpfile) {
579580
copy($location, $tmpfile);
580581
$tmpfiles[] = $tmpfile;
581582
$parts = explode('/', str_replace('\\', '/', $tmpfile));
583+
} else {
584+
array_shift($parts);
585+
$locationstart = 'phar:///';
582586
}
583587
}
584588
$drive = '\\' === DIRECTORY_SEPARATOR ? array_shift($parts).'/' : '';
585-
$location = 'file:///'.$drive.implode('/', array_map('rawurlencode', $parts));
589+
$location = $locationstart.$drive.implode('/', array_map('rawurlencode', $parts));
586590

587591
$imports .= sprintf(' <xsd:import namespace="%s" schemaLocation="%s" />'."\n", $namespace, $location);
588592
}

‎src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,9 @@ public function reverseTransform($value)
122122

123123
if (0 != intl_get_error_code()) {
124124
throw new TransformationFailedException(intl_get_error_message());
125+
} elseif ($timestamp > 253402214400) {
126+
// This timestamp represents UTC midnight of 9999-12-31 to prevent 5+ digit years
127+
throw new TransformationFailedException('Years beyond 9999 are not supported.');
125128
}
126129

127130
try {

0 commit comments

Comments
 (0)