Merge branch '3.4' into 4.4

nicolas-grekas · nicolas-grekas · commit f7a2d40e6da5 · 2020-05-08T11:58:40.000+02:00
* 3.4:
  [FrameworkBundle] display actual target for error in AssetsInstallCommand
  Remove patches for Doctrine bugs and deprecations
  [DI][EventDispatcher] added contract for implementation
diff --git a/Command/AssetsInstallCommand.php b/Command/AssetsInstallCommand.php
@@ -109,7 +109,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $targetArg = $kernel->getProjectDir().'/'.$targetArg;
 
             if (!is_dir($targetArg)) {
-                throw new InvalidArgumentException(sprintf('The target directory "%s" does not exist.', $input->getArgument('target')));
+                throw new InvalidArgumentException(sprintf('The target directory "%s" does not exist.', $targetArg));
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int`
`109`	`109`	`$targetArg = $kernel->getProjectDir().'/'.$targetArg;`
`110`	`110`
`111`	`111`	`if (!is_dir($targetArg)) {`
`112`		`- throw new InvalidArgumentException(sprintf('The target directory "%s" does not exist.', $input->getArgument('target')));`
	`112`	`+ throw new InvalidArgumentException(sprintf('The target directory "%s" does not exist.', $targetArg));`
`113`	`113`	`}`
`114`	`114`	`}`
`115`	`115`