From 55a0b347a0a3fea8b3a0e6d5829ef75aa115cffe Mon Sep 17 00:00:00 2001 From: smokeybear87 Date: Fri, 3 Aug 2012 11:50:44 +0200 Subject: [PATCH] Fixes incorrect class used in src/Symfony/Bundle/FrameworkBundle/Console/Application.php MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Issue must be related to commit 7a5f6142405c599cf0eb54e80c98e54e41ab4fdf (merged 2.0), specifically this file src/Symfony/Bundle/FrameworkBundle/Console/Application.php, lines 86-88.  Presumably to do "instanceof Bundle" correct class has to be imported at the top of the file: instead of  use Symfony\Component\HttpKernel\Bundle; this should be use Symfony\Component\HttpKernel\Bundle\Bundle; Conflicts: src/Symfony/Bundle/FrameworkBundle/Console/Application.php --- src/Symfony/Bundle/FrameworkBundle/Console/Application.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Application.php b/src/Symfony/Bundle/FrameworkBundle/Console/Application.php index 6a6735afc3..c7ed22cf7c 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Console/Application.php +++ b/src/Symfony/Bundle/FrameworkBundle/Console/Application.php @@ -17,6 +17,7 @@ use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\HttpKernel\KernelInterface; use Symfony\Component\HttpKernel\Kernel; +use Symfony\Component\HttpKernel\Bundle\Bundle; /** * Application.