Merge branch '2.0'

orchestral · Jul 19, 2013 · 1c7ff48 · 1c7ff48
2 parents e5b0ab6 + 280e8a6
commit 1c7ff48
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 25 deletions.
diff --git a/src/Orchestra/Facile/Environment.php b/src/Orchestra/Facile/Environment.php
@@ -15,7 +15,6 @@ class Environment {
 	/**
 	 * Construct a new Facile service.
 	 *
-	 * @access public
 	 * @return void
 	 */
 	public function __construct() 
@@ -49,7 +48,6 @@ public function __construct()
 	 * 			->format('html');
 	 * </code>
 	 *
-	 * @access public			
 	 * @param  string   $name   Name of template
 	 * @param  array    $data
 	 * @param  string   $format
@@ -75,7 +73,6 @@ public function make($name, $data = array(), $format = null)
 	 * 			->format('html');
 	 * </code>
 	 * 
-	 * @access public
 	 * @param  string   $view
 	 * @param  array    $data
 	 * @return \Orchestra\Facile\Response
@@ -103,7 +100,6 @@ public function view($view, $data = array())
 	 * 			->format('html');
 	 * </code>
 	 *
-	 * @access public
 	 * @param  mixed    $data
 	 * @return \Orchestra\Facile\Response
 	 */
@@ -117,7 +113,6 @@ public function with($data)
 	/**
 	 * Register a template.
 	 *
-	 * @access public
 	 * @param  string                               $name
 	 * @param  \Orchestra\Facile\Template\Driver    $callback
 	 * @return void
@@ -141,7 +136,6 @@ public function template($name, $template)
 	/**
 	 * Get the template.
 	 *
-	 * @access public
 	 * @param  string   $name
 	 * @return \Orchestra\Facile\Template\Driver
 	 * @throws \InvalidArgumentException    If template is not defined.

diff --git a/src/Orchestra/Facile/FacileServiceProvider.php b/src/Orchestra/Facile/FacileServiceProvider.php
@@ -25,7 +25,6 @@ public function register()
 	/**
 	 * Register Facile environment.
 	 *
-	 * @access protected
 	 * @return void
 	 */
 	protected function registerEnvironment()
@@ -39,7 +38,6 @@ protected function registerEnvironment()
 	/**
 	 * Register Facile environment.
 	 *
-	 * @access protected
 	 * @return void
 	 */
 	protected function registerTemplate()
@@ -56,4 +54,4 @@ public function provides()
 	{
 		return array('orchestra.facile');
 	}
-}
+}
diff --git a/src/Orchestra/Facile/Response.php b/src/Orchestra/Facile/Response.php
@@ -40,7 +40,6 @@ class Response implements RenderableInterface {
 	/**
 	 * Construct a new Response instance.
 	 *
-	 * @access public					
 	 * @param  \Orchestar\Facile\Environment        $env
 	 * @param  \Orchestra\Facile\Template\Driver    $template
 	 * @param  array                                $data
@@ -59,7 +58,6 @@ public function __construct(Environment $env, Template\Driver $template, $data =
 	/**
 	 * Nest a view to Facile.
 	 *
-	 * @access public
 	 * @param  string   $view
 	 * @return self
 	 */
@@ -73,7 +71,6 @@ public function view($view)
 	/**
 	 * Nest a data or dataset to Facile.
 	 *
-	 * @access public
 	 * @param  mixed    $key
 	 * @param  mixed    $value
 	 * @return self
@@ -90,7 +87,6 @@ public function with($key, $value = null)
 	/**
 	 * Set HTTP status to Facile.
 	 *
-	 * @access public	
 	 * @param  integer  $status
 	 * @return self
 	 */
@@ -105,7 +101,6 @@ public function status($status = 200)
 	/**
 	 * Set a template for Facile.
 	 *
-	 * @access public
 	 * @param  mixed    $name
 	 * @return self
 	 */
@@ -126,7 +121,6 @@ public function template($name)
 	/**
 	 * Get expected facile format.
 	 *
-	 * @access public
 	 * @param  string   $format
 	 * @return self
 	 */
@@ -147,7 +141,6 @@ public function format($format = null)
 	/**
 	 * Set Output Format.
 	 *
-	 * @access public
 	 * @param  string   $format
 	 * @return self
 	 */
@@ -161,7 +154,6 @@ public function setFormat($format)
 	/**
 	 * Get Output Format.
 	 *
-	 * @access public
 	 * @return string
 	 */
 	public function getFormat()
@@ -176,6 +168,9 @@ public function getFormat()
 
 	/**
 	 * Magic method to __get.
+	 * 
+	 * @param  string   $key
+	 * @return mixed
 	 */
 	public function __get($key)
 	{
@@ -190,7 +185,6 @@ public function __get($key)
 	/**
 	 * Render facile by selected format.
 	 *
-	 * @access public
 	 * @return mixed
 	 */
 	public function __toString()
@@ -208,7 +202,6 @@ public function __toString()
 	/**
 	 * Render facile by selected format.
 	 *
-	 * @access public
 	 * @return mixed
 	 */
 	public function render()

diff --git a/src/Orchestra/Facile/Template/Base.php b/src/Orchestra/Facile/Template/Base.php
@@ -23,7 +23,6 @@ class Base extends Driver {
 	/**
 	 * Compose HTML.
 	 *
-	 * @access public
 	 * @param  mixed    $view
 	 * @param  array    $data
 	 * @param  integer  $status
@@ -44,7 +43,6 @@ public function composeHtml($view = null, $data = array(), $status = 200)
 	/**
 	 * Compose JSON.
 	 *
-	 * @access public
 	 * @param  mixed    $view
 	 * @param  array    $data
 	 * @param  integer  $status

diff --git a/src/Orchestra/Facile/Template/Driver.php b/src/Orchestra/Facile/Template/Driver.php
@@ -28,7 +28,6 @@ abstract class Driver {
 	/**
 	 * Detect current format.
 	 *
-	 * @access public
 	 * @return string
 	 */
 	public function format()
@@ -39,7 +38,6 @@ public function format()
 	/**
 	 * Compose requested format.
 	 *
-	 * @access public
 	 * @param  string   $format
 	 * @param  array    $compose
 	 * @return mixed
@@ -67,7 +65,6 @@ public function compose($format, $compose = array())
 	/**
 	 * Compose an error template.
 	 *
-	 * @access public 	
 	 * @param  mixed    $view
 	 * @param  array    $data
 	 * @param  integer 	$status
@@ -85,7 +82,6 @@ public function composeError($view, $data = array(), $status = 404)
 	/**
 	 * Transform given data.
 	 *
-	 * @access public
 	 * @param  array    $data
 	 * @return array
 	 */