ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed application and resolver classes. added phpunit tests.

Browse Source
This commit is contained in:
Taylor Otwell
2011-09-04 23:19:14 -05:00
parent d35e2abd77
commit cb8e8194ce
14 changed files with 146 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
laravel/application.php
View File

@@ -1,12 +0,0 @@
<?php namespace Laravel;
class Application extends Resolver {
/**
* The IoC container instance for the application.
*
* @var Container
*/
public $container;
}

19
laravel/bootstrap.php
View File

@@ -32,14 +32,6 @@ define('SYS_CONFIG_PATH', SYS_PATH.'config/');
define('SYS_LANG_PATH', SYS_PATH.'language/');
define('VIEW_PATH', APP_PATH.'views/');
// --------------------------------------------------------------
// Bootstrap the application instance.
// --------------------------------------------------------------
require SYS_PATH.'resolver'.EXT;
require SYS_PATH.'application'.EXT;
$application = new Application;
// --------------------------------------------------------------
// Load the configuration manager and its dependencies.
// --------------------------------------------------------------
@@ -65,16 +57,11 @@ if (isset($_SERVER['LARAVEL_ENV']) and file_exists($path = CONFIG_PATH.$_SERVER[
$dependencies = array_merge($dependencies, require $path);
}
$application->container = new Container($dependencies);
$container = new Container($dependencies);
IoC::$container = $application->container;
IoC::$container = $container;
// --------------------------------------------------------------
// Load the auto-loader.
// --------------------------------------------------------------
spl_autoload_register(array($application->loader, 'load'));
// --------------------------------------------------------------
// Register the application in the container.
// --------------------------------------------------------------
IoC::container()->instance('laravel.application', $application);
spl_autoload_register(array($container->loader, 'load'));

2
laravel/config/container.php
View File

@@ -202,7 +202,7 @@ return array(
'laravel.view.composer' => array('resolver' => function($container)
{
return new View_Composer($container->resolve('laravel.application'), require APP_PATH.'composers'.EXT);
return new View_Composer(require APP_PATH.'composers'.EXT);
}),
/*

17
laravel/container.php
View File

@@ -141,4 +141,21 @@ class Container {
return $object;
}
/**
* Magic Method for resolving classes out of the IoC container.
*/
public function __get($key)
{
if ($this->registered('laravel.'.$key))
{
return $this->resolve('laravel.'.$key);
}
elseif ($this->registered($key))
{
return $this->resolve($key);
}
throw new \Exception("Attempting to resolve undefined class [$key].");
}
}

11
laravel/controller.php
View File

@@ -1,6 +1,13 @@
<?php namespace Laravel;
abstract class Controller extends Resolver {
abstract class Controller {
/**
* The IoC container instance.
*
* @var Container
*/
public $container;
/**
* A stub method that will be called before every request to the controller.
@@ -21,7 +28,7 @@ abstract class Controller extends Resolver {
*/
public function __call($method, $parameters)
{
return $this->response->error('404');
return $this->container->resolve('laravel.response')->error('404');
}
}

34
laravel/laravel.php
View File

@@ -15,51 +15,51 @@ ini_set('display_errors', 'Off');
// --------------------------------------------------------------
// Register the error / exception handlers.
// --------------------------------------------------------------
set_exception_handler(function($e) use ($application)
set_exception_handler(function($e) use ($container)
{
call_user_func($application->config->get('error.handler'), $e);
call_user_func($container->config->get('error.handler'), $e);
});
set_error_handler(function($number, $error, $file, $line) use ($application)
set_error_handler(function($number, $error, $file, $line) use ($container)
{
$exception = new \ErrorException($error, $number, 0, $file, $line);
call_user_func($application->config->get('error.handler'), $exception);
call_user_func($container->config->get('error.handler'), $exception);
});
register_shutdown_function(function() use ($application)
register_shutdown_function(function() use ($container)
{
if ( ! is_null($error = error_get_last()))
{
$exception = new \ErrorException($error['message'], $error['type'], 0, $error['file'], $error['line']);
call_user_func($application->config->get('error.handler'), $exception);
call_user_func($container->config->get('error.handler'), $exception);
}
});
// --------------------------------------------------------------
// Set the default timezone.
// --------------------------------------------------------------
date_default_timezone_set($application->config->get('application.timezone'));
date_default_timezone_set($container->config->get('application.timezone'));
// --------------------------------------------------------------
// Load the session and session manager.
// --------------------------------------------------------------
if ($application->config->get('session.driver') !== '')
if ($container->config->get('session.driver') !== '')
{
$cookie = $application->input->cookies->get('laravel_session');
$cookie = $container->input->cookies->get('laravel_session');
$application->session->start($cookie, $application->config->get('session.lifetime'));
$container->session->start($cookie, $container->config->get('session.lifetime'));
}
// --------------------------------------------------------------
// Load the packages that are in the auto-loaded packages array.
// --------------------------------------------------------------
$packages = $application->config->get('application.packages');
$packages = $container->config->get('application.packages');
if (count($packages) > 0)
{
$application->package->load($packages);
$container->package->load($packages);
}
unset($packages);
@@ -67,17 +67,17 @@ unset($packages);
// --------------------------------------------------------------
// Route the request and get the response from the route.
// --------------------------------------------------------------
$route = $application->container->resolve('laravel.routing.router')->route();
$route = $container->resolve('laravel.routing.router')->route();
if ( ! is_null($route))
{
$route->filters = require APP_PATH.'filters'.EXT;
$response = $application->container->resolve('laravel.routing.caller')->call($route);
$response = $container->resolve('laravel.routing.caller')->call($route);
}
else
{
$response = $application->response->error('404');
$response = $container->response->error('404');
}
// --------------------------------------------------------------
@@ -88,9 +88,9 @@ $response->content = $response->render();
// --------------------------------------------------------------
// Close the session.
// --------------------------------------------------------------
if ($application->config->get('session.driver') !== '')
if ($container->config->get('session.driver') !== '')
{
$application->session->close($application->input, $application->config->get('session'));
$container->session->close($container->input, $container->config->get('session'));
}
// --------------------------------------------------------------

4
laravel/loader.php
View File

@@ -13,14 +13,14 @@ class Loader {
*
* @var array
*/
private $paths;
protected $paths;
/**
* All of the class aliases.
*
* @var array
*/
private $aliases;
protected $aliases;
/**
* Bootstrap the auto-loader.

26
laravel/resolver.php
View File

@@ -1,26 +0,0 @@
<?php namespace Laravel;
abstract class Resolver {
/**
* Magic Method for resolving classes out of the IoC container.
*
* This allows the derived class to provide access to all of the Laravel libraries
* registered in the container. Currently, this class is derived by the Application
* and Controller classes.
*/
public function __get($key)
{
if (IoC::container()->registered('laravel.'.$key))
{
return IoC::container()->resolve('laravel.'.$key);
}
elseif (IoC::container()->registered($key))
{
return IoC::container()->resolve($key);
}
throw new \Exception("Attempting to access undefined property [$key].");
}
}

14
laravel/view.php
View File

@@ -14,13 +14,6 @@ class View_Facade extends Facade {
*/
class View_Composer {
/**
* The application instance.
*
* @var Application
*/
protected $application;
/**
* The view composers.
*
@@ -31,12 +24,11 @@ class View_Composer {
/**
* Create a new view composer instance.
*
* @param array $composers
* @param array $composers
* @return void
*/
public function __construct(Application $application, $composers)
public function __construct($composers)
{
$this->application = $application;
$this->composers = $composers;
}
@@ -66,7 +58,7 @@ class View_Composer {
{
foreach ((array) $this->composers[$view->view] as $key => $value)
{
if ($value instanceof \Closure) return call_user_func($value, $this->application, $view);
if ($value instanceof \Closure) return call_user_func($value, $view);
}
}
}