Skip to content

Commit 3baa43b

Browse files
fabpotfabpot
committed
Merge branch '2.4'
* 2.4: (52 commits) Fix #8205 : Deprecate file mode update when calling dumpFile Fix #10437: Catch exceptions when reloading a no-cache request Fix libxml_use_internal_errors and libxml_disable_entity_loader usage removed ini check to make uploadedfile work on gae Update OptionsResolver.php fixed comment in forms.xml file Clean KernelInterface docblocks Cast the group name as a string Fixed doc of InitAclCommand [Form] Fix "Array was modified outside object" in ResizeFormListener. Fix IBAN validator [Process] Remove unreachable code + avoid skipping tests in sigchild environment Fixed bug that incorrectly causes the "required" attribute to be omitted from select even though it contains the "multiple" attribute Added travis_retry to .travis.yml [Process] fix some typos and refactor some code [Process] Fix unit tests in sigchild disabled environment [Process] Trow exceptions in case a Process method is supposed to be called after termination fixed typo [Process] fixed fatal errors in getOutput and getErrorOutput when process was not started [Process] Fix escaping on Windows ... Conflicts: src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php src/Symfony/Component/Process/Process.php src/Symfony/Component/Process/ProcessPipes.php src/Symfony/Component/Process/Tests/AbstractProcessTest.php
2 parents 9e13cc0 + ab42e9c commit 3baa43b

File tree

60 files changed

+748
-241
lines changed

Some content is hidden

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

60 files changed

+748
-241
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ matrix:
1515
services: mongodb
1616

1717
before_script:
18-
- sudo apt-get install parallel
18+
- travis_retry sudo apt-get install parallel
1919
- sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then echo "" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini; fi;'
2020
- sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then echo "extension = mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
2121
- sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ] && [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2013 Fabien Potencier
1+
Copyright (c) 2004-2014 Fabien Potencier
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

‎src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767

6868
{% block choice_widget_collapsed %}
6969
{% spaceless %}
70-
{% if required and empty_value is none and not empty_value_in_choices %}
70+
{% if required and empty_value is none and not empty_value_in_choices and not multiple %}
7171
{% set required = false %}
7272
{% endif %}
7373
<select {{ block('widget_attributes') }}{% if multiple %} multiple="multiple"{% endif %}>

‎src/Symfony/Bridge/Twig/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"symfony/yaml": "For using the YamlExtension",
4242
"symfony/security": "For using the SecurityExtension",
4343
"symfony/stopwatch": "For using the StopwatchExtension",
44-
"symfony/expression": "For using the ExpressionExtension"
44+
"symfony/expression-language": "For using the ExpressionExtension"
4545
},
4646
"autoload": {
4747
"psr-0": { "Symfony\\Bridge\\Twig\\": "" }

‎src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,9 @@ protected function configure()
6767
6868
<info>%command.full_name% --router=app/config/router.php</info>
6969
70+
Specifing a router script is required when the used environment is not "dev" or
71+
"prod".
72+
7073
See also: http://www.php.net/manual/en/features.commandline.webserver.php
7174
7275
EOF
@@ -85,7 +88,13 @@ protected function execute(InputInterface $input, OutputInterface $output)
8588
$output->writeln('<error>Running PHP built-in server in production environment is NOT recommended!</error>');
8689
}
8790

88-
$output->writeln(sprintf("Server running on <info>%s</info>\n", $input->getArgument('address')));
91+
$output->writeln(sprintf("Server running on <info>http://%s</info>\n", $input->getArgument('address')));
92+
93+
$router = $input->getOption('router') ?: $this
94+
->getContainer()
95+
->get('kernel')
96+
->locateResource(sprintf('@FrameworkBundle/Resources/config/router_%s.php', $env))
97+
;
8998

9099
if (defined('HHVM_VERSION')) {
91100
$builder = $this->createHhvmProcessBuilder($input, $output, $env);

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CompilerDebugDumpPass.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ class CompilerDebugDumpPass implements CompilerPassInterface
2020
{
2121
public function process(ContainerBuilder $container)
2222
{
23+
$filename = self::getCompilerLogFilename($container);
24+
2325
$filesystem = new Filesystem();
24-
$filesystem->dumpFile(
25-
self::getCompilerLogFilename($container),
26-
implode("\n", $container->getCompiler()->getLog()),
27-
0666 & ~umask()
28-
);
26+
$filesystem->dumpFile($filename, implode("\n", $container->getCompiler()->getLog()), null);
27+
// discard chmod failure (some filesystem may not support it)
28+
@chmod($filename, 0666 & ~umask());
2929
}
3030

3131
public static function getCompilerLogFilename(ContainerInterface $container)

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ContainerBuilderDebugDumpPass.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,10 @@ class ContainerBuilderDebugDumpPass implements CompilerPassInterface
2828
public function process(ContainerBuilder $container)
2929
{
3030
$dumper = new XmlDumper($container);
31+
$filename = $container->getParameter('debug.container.dump');
3132
$filesystem = new Filesystem();
32-
$filesystem->dumpFile(
33-
$container->getParameter('debug.container.dump'),
34-
$dumper->dump(),
35-
0666 & ~umask()
36-
);
33+
$filesystem->dumpFile($filename, $dumper->dump(), null);
34+
// discard chmod failure (some filesystem may not support it)
35+
@chmod($filename, 0666 & ~umask());
3736
}
3837
}

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
We don't need to be able to add more extensions.
2525
* more types can be registered with the form.type tag
2626
* more type extensions can be registered with the form.type_extension tag
27-
* more type_guessers can be registered with the form.type.type_guesser tag
27+
* more type_guessers can be registered with the form.type_guesser tag
2828
-->
2929
<argument type="service" id="form.extension" />
3030
</argument>

‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_collapsed.html.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
<select
2+
<?php if ($required && $empty_value === null && $empty_value_in_choices === false && $multiple === false):
3+
$required = false;
4+
endif; ?>
25
<?php echo $view['form']->block($form, 'widget_attributes', array(
3-
'required' => $required && (null !== $empty_value || $empty_value_in_choices)
6+
'required' => $required
47
)) ?>
58
<?php if ($multiple): ?> multiple="multiple"<?php endif ?>
69
>

‎src/Symfony/Bundle/SecurityBundle/Command/InitAclCommand.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
class InitAclCommand extends ContainerAwareCommand
2525
{
2626
/**
27-
* @see Command
27+
* {@inheritdoc}
2828
*/
2929
protected function configure()
3030
{
@@ -47,7 +47,7 @@ protected function configure()
4747
}
4848

4949
/**
50-
* @see Command::execute()
50+
* {@inheritdoc}
5151
*/
5252
protected function execute(InputInterface $input, OutputInterface $output)
5353
{

0 commit comments

Comments
 (0)