diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed bad merge

Browse Source
This commit is contained in:
Fabien Potencier 2018-05-07 10:32:11 +02:00
parent 956c2f8091
commit cb06e2a6fb
2 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php
View File

@ -95,17 +95,7 @@ EOT
$targetArg = $kernel->getContainer()->getParameter('kernel.project_dir').'/'.$targetArg;
if (!is_dir($targetArg)) {
<<<<<<< HEAD
throw new \InvalidArgumentException(sprintf('The target directory "%s" does not exist.', $input->getArgument('target')));
=======
// deprecated, logic to be removed in 4.0
// this allows the commands to work out of the box with web/ and public/
if (is_dir(dirname($targetArg).'/web')) {
$targetArg = dirname($targetArg).'/web';
} else {
throw new InvalidArgumentException(sprintf('The target directory "%s" does not exist.', $input->getArgument('target')));
}
>>>>>>> 3.4
throw new InvalidArgumentException(sprintf('The target directory "%s" does not exist.', $input->getArgument('target')));
}
}

9
src/Symfony/Bundle/SecurityBundle/Command/UserPasswordEncoderCommand.php
View File

@ -192,16 +192,7 @@ EOF
}
if (empty($this->userClasses)) {
<<<<<<< HEAD
throw new \RuntimeException('There are no configured encoders for the "security" extension.');
=======
if (null === $this->encoderFactory) {
// BC to be removed and simply keep the exception whenever there is no configured user classes in 4.0
return User::class;
}
throw new RuntimeException('There are no configured encoders for the "security" extension.');
>>>>>>> 3.4
}
if (!$input->isInteractive() || 1 === count($this->userClasses)) {