Merge branch '4.0'
* 4.0: fixed bad merge
This commit is contained in:
commit
07ea1bb6f3
@ -96,17 +96,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')));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -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)) {
|
||||
|
Reference in New Issue
Block a user