|
@@ -8,6 +8,13 @@
|
|
*/
|
|
*/
|
|
class View_Composer {
|
|
class View_Composer {
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * The application instance.
|
|
|
|
+ *
|
|
|
|
+ * @var Application
|
|
|
|
+ */
|
|
|
|
+ protected $application;
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* The view composers.
|
|
* The view composers.
|
|
*
|
|
*
|
|
@@ -21,8 +28,9 @@ class View_Composer {
|
|
* @param array $composers
|
|
* @param array $composers
|
|
* @return void
|
|
* @return void
|
|
*/
|
|
*/
|
|
- public function __construct($composers)
|
|
|
|
|
|
+ public function __construct(Application $application, $composers)
|
|
{
|
|
{
|
|
|
|
+ $this->application = $application;
|
|
$this->composers = $composers;
|
|
$this->composers = $composers;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -52,7 +60,7 @@ class View_Composer {
|
|
{
|
|
{
|
|
foreach ((array) $this->composers[$view->view] as $key => $value)
|
|
foreach ((array) $this->composers[$view->view] as $key => $value)
|
|
{
|
|
{
|
|
- if ($value instanceof \Closure) return call_user_func($value, $view);
|
|
|
|
|
|
+ if ($value instanceof \Closure) return call_user_func($value, $this->application, $view);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -67,30 +75,30 @@ class View_Composer {
|
|
class View_Factory {
|
|
class View_Factory {
|
|
|
|
|
|
/**
|
|
/**
|
|
- * The directory containing the views.
|
|
|
|
|
|
+ * The view composer instance.
|
|
*
|
|
*
|
|
- * @var string
|
|
|
|
|
|
+ * @var View_Composer
|
|
*/
|
|
*/
|
|
- protected $path;
|
|
|
|
|
|
+ protected $composer;
|
|
|
|
|
|
/**
|
|
/**
|
|
- * The view composer instance.
|
|
|
|
|
|
+ * The directory containing the views.
|
|
*
|
|
*
|
|
- * @var View_Composer
|
|
|
|
|
|
+ * @var string
|
|
*/
|
|
*/
|
|
- protected $composer;
|
|
|
|
|
|
+ protected $path;
|
|
|
|
|
|
/**
|
|
/**
|
|
* Create a new view factory instance.
|
|
* Create a new view factory instance.
|
|
*
|
|
*
|
|
- * @param array $composers
|
|
|
|
- * @param string $path
|
|
|
|
|
|
+ * @param View_Composer $composer
|
|
|
|
+ * @param string $path
|
|
* @return void
|
|
* @return void
|
|
*/
|
|
*/
|
|
- public function __construct($path, View_Composer $composer)
|
|
|
|
|
|
+ public function __construct(View_Composer $composer, $path)
|
|
{
|
|
{
|
|
- $this->path = $path;
|
|
|
|
$this->composer = $composer;
|
|
$this->composer = $composer;
|
|
|
|
+ $this->path = $path;
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|