From 8f49e00e1d31866acc06fd5ca6eac76bd0340730 Mon Sep 17 00:00:00 2001
From: Nekrasov Ilya <nekrasov.ilya90@gmail.com>
Date: Sun, 22 Mar 2015 02:12:47 +0300
Subject: [PATCH] AppNamespaceDetectorTrait refactoring

---
 .../Console/AppNamespaceDetectorTrait.php       | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/Illuminate/Console/AppNamespaceDetectorTrait.php b/src/Illuminate/Console/AppNamespaceDetectorTrait.php
index 1938c7b9633a..1de4c3f9a7ce 100644
--- a/src/Illuminate/Console/AppNamespaceDetectorTrait.php
+++ b/src/Illuminate/Console/AppNamespaceDetectorTrait.php
@@ -1,11 +1,9 @@
 <?php namespace Illuminate\Console;
 
-use RuntimeException;
-
 trait AppNamespaceDetectorTrait {
 
 	/**
-	 * Get the application namespace from the Composer file.
+	 * Get the application namespace from the Kernel object.
 	 *
 	 * @return string
 	 *
@@ -13,17 +11,10 @@ trait AppNamespaceDetectorTrait {
 	 */
 	protected function getAppNamespace()
 	{
-		$composer = json_decode(file_get_contents(base_path().'/composer.json'), true);
-
-		foreach ((array) data_get($composer, 'autoload.psr-4') as $namespace => $path)
-		{
-			foreach ((array) $path as $pathChoice)
-			{
-				if (realpath(app_path()) == realpath(base_path().'/'.$pathChoice)) return $namespace;
-			}
-		}
+		$kernelContract = app()->runningInConsole() ? 'Illuminate\Contracts\Console\Kernel' : 'Illuminate\Contracts\Http\Kernel';
+		$kernelFullClassName = get_class(app($kernelContract));	
 
-		throw new RuntimeException("Unable to detect application namespace.");
+		return strtok($kernelFullClassName, '\\').'\\';
 	}
 
 }