Merge branch '2.0'

src/Orchestra/View/Decorator.php

@@ -14,8 +14,9 @@ class Decorator {
 	/**
 	 * Registers a custom macro.
 	 *
+	 * @access public
 	 * @param  string   $name
-	 * @param  Closure  $macro
+	 * @param  \Closure $macro
 	 * @return void
 	 */
 	public function macro($name, $macro)
@@ -30,6 +31,7 @@ public function macro($name, $macro)
 	 * @param  string   $name
 	 * @param  array    $data
 	 * @return mixed
+	 * @throws \BadMethodCallException
 	 */
 	public function render($name, $data = null)
 	{

src/Orchestra/View/FileViewFinder.php

@@ -12,7 +12,8 @@ class FileViewFinder extends \Illuminate\View\FileViewFinder {
 	/**
 	 * Get the fully qualified location of the view.
 	 *
-	 * @param  string  $name
+	 * @access public
+	 * @param  string   $name
 	 * @return string
 	 */
 	public function find($name)
@@ -28,7 +29,8 @@ public function find($name)
 	/**
 	 * Get the path to a template with a named path.
 	 *
-	 * @param  string  $name
+	 * @access protected
+	 * @param  string   $name
 	 * @return string
 	 */
 	protected function findNamedPathView($name)
@@ -47,6 +49,7 @@ protected function findNamedPathView($name)
 	/**
 	 * Set the active view paths.
 	 *
+	 * @access public
 	 * @return array
 	 */
 	public function setPaths($paths)

src/Orchestra/View/Theme/Container.php

@@ -5,7 +5,7 @@ class Container {
 	/**
 	 * Application instance.
 	 *
-	 * @var Illuminate\Foundation\Application
+	 * @var \Illuminate\Foundation\Application
 	 */
 	protected $app = null;
 
@@ -31,26 +31,25 @@ class Container {
 	protected $path = null;
 
 	/**
-	 * URL path of Theme
+	 * URL path of theme.
 	 *
 	 * @var string
 	 */
 	protected $absoluteUrl = null;
 
 	/**
-	 * Relative URL path of Theme
+	 * Relative URL path of theme.
 	 *
 	 * @var string
 	 */
 	protected $relativeUrl = null;
 
 	/**
-	 * Start Theme Engine, this should be called from Orchestra\Core::start()
+	 * Start theme engine, this should be called from application booted 
 	 * or whenever we need to overwrite current active theme per request.
 	 *
-	 * @static
 	 * @access public
-	 * @param  Illuminate\Foundation\Application    $app
+	 * @param  \Illuminate\Foundation\Application   $app
 	 * @param  string                               $name
 	 * @return void
 	 */
@@ -115,7 +114,7 @@ public function boot()
 		// There might be situation where Orchestra Platform was unable 
 		// to get theme information, we should only assume there a valid
 		// theme when manifest is actually an instance of 
-		// Orchestra\View\Theme\Manifest
+		// Orchestra\View\Theme\Manifest.
 		if ( ! $manifest instanceof Manifest) return null;
 
 		// Loop and include all file which was mark as autoloaded.
@@ -153,7 +152,7 @@ public function to($url = '')
 	}
 
 	/**
-	 * Relative URL helper for Theme
+	 * Relative URL helper for theme.
 	 *
 	 * @access public
 	 * @param  string   $url

src/Orchestra/View/Theme/Manifest.php

@@ -8,7 +8,7 @@ class Manifest {
 	/**
 	 * Application instance.
 	 *
-	 * @var Illuminate\Filesystem\Filesystem
+	 * @var \Illuminate\Filesystem\Filesystem
 	 */
 	protected $files = null;
 
@@ -23,8 +23,10 @@ class Manifest {
 	 * Load the theme.
 	 *
 	 * @access public
-	 * @param  string   $path
+	 * @param  \Illuminate\Filesystem\Filesystem    $files
+	 * @param  string                               $path
 	 * @return void
+	 * @throws \RuntimeException
 	 */
 	public function __construct(Filesystem $files, $path)
 	{
@@ -36,7 +38,7 @@ public function __construct(Filesystem $files, $path)
 
 			if (is_null($this->items))
 			{
-				// json_decode couldn't parse, throw an exception
+				// json_decode couldn't parse, throw an exception.
 				throw new RuntimeException(
 					"Theme [{$path}]: cannot decode theme.json file"
 				);

src/Orchestra/View/Theme/ThemeManager.php

@@ -7,6 +7,7 @@ class ThemeManager extends Manager {
 	/**
 	 * Create an instance of the orchestra theme driver.
 	 *
+	 * @access protected
 	 * @return \Orchestra\View\Theme\Container
 	 */
 	protected function createOrchestraDriver()
@@ -17,6 +18,7 @@ protected function createOrchestraDriver()
 	/**
 	 * Get the default authentication driver name.
 	 *
+	 * @access protected
 	 * @return string
 	 */
 	protected function getDefaultDriver()