Merge branch '4.0'

fabpot · fabpot · commit 07ea1bb6f354 · 2018-05-07T10:32:19.000+02:00
* 4.0:
  fixed bad merge
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php
@@ -96,17 +96,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $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')));
             }
         }
 
diff --git a/src/Symfony/Bundle/SecurityBundle/Command/UserPasswordEncoderCommand.php b/src/Symfony/Bundle/SecurityBundle/Command/UserPasswordEncoderCommand.php
@@ -192,16 +192,7 @@ private function getUserClass(InputInterface $input, SymfonyStyle $io)
         }
 
         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)) {
