Skip to content

Commit c858c17

Browse files
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 2cdfebc + 1e08977 commit c858c17

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

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)