removed application and resolver classes. added phpunit tests.

application/composers.php

@@ -39,7 +39,7 @@ return array(
 	|
 	*/
 
-	'home.index' => array('name' => 'home', function($laravel, $view)
+	'home.index' => array('name' => 'home', function($view)
 	{
 		//
 	}),

application/config/aliases.php

@@ -18,6 +18,7 @@ return array(
 	|
 	*/
 
+	'Arr'        => 'Laravel\\Arr',
 	'Asset'      => 'Laravel\\Asset',
 	'Auth'       => 'Laravel\\Security\\Authenticator_Facade',
 	'Benchmark'  => 'Laravel\\Benchmark',

laravel/application.php

-<?php namespace Laravel;
-
-class Application extends Resolver {
-
-	/**
-	 * The IoC container instance for the application.
-	 *
-	 * @var Container
-	 */
-	public $container;
-
-}
\ No newline at end of file

laravel/bootstrap.php

@@ -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'));
-
+spl_autoload_register(array($container->loader, 'load'));
\ No newline at end of file
-// --------------------------------------------------------------
-// Register the application in the container.
-// --------------------------------------------------------------
-IoC::container()->instance('laravel.application', $application);
\ No newline at end of file

laravel/config/container.php

@@ -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);
 	}),
 
 	/*

laravel/container.php

@@ -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].");
+	}
+
 }
\ No newline at end of file

laravel/controller.php

 <?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');
 	}
 
 }
\ No newline at end of file

laravel/laravel.php

@@ -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'));
 }
 
 // --------------------------------------------------------------

laravel/loader.php

@@ -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.

laravel/resolver.php

-<?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].");
-	}
-
-}
\ No newline at end of file

laravel/view.php

@@ -14,13 +14,6 @@ class View_Facade extends Facade {
  */
 class View_Composer {
 
-	/**
-	 * The application instance.
-	 *
-	 * @var Application
-	 */
-	protected $application;
-
 	/**
 	 * The view composers.
 	 *
@@ -34,9 +27,8 @@ class View_Composer {
 	 * @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);
 			}
 		}
 	}

phpunit.xml

+<phpunit colors="true" backupGlobals="false" bootstrap="tests/bootstrap.php">
+	<testsuites>
+		<testsuite name="Laravel Framework Tests">
+			<directory>tests</directory>
+		</testsuite>
+	</testsuites>
+</phpunit>
\ No newline at end of file

tests/ArrTest.php

+<?php
+
+class ArrTest extends PHPUnit_Framework_TestCase {
+
+	/**
+	 * @dataProvider getArray
+	 */
+	public function testGetMethodReturnsItemsFromArray($array)
+	{
+		$this->assertEquals(Arr::get($array, 'email'), $array['email']);
+		$this->assertEquals(Arr::get($array, 'names.uncle'), $array['names']['uncle']);
+	}
+
+	/**
+	 * @dataProvider getArray
+	 */
+	public function testGetMethodReturnsDefaultWhenItemDoesntExist($array)
+	{
+		$this->assertNull(Arr::get($array, 'names.aunt'));
+		$this->assertEquals(Arr::get($array, 'names.aunt', 'Tammy'), 'Tammy');
+		$this->assertEquals(Arr::get($array, 'names.aunt', function() {return 'Tammy';}), 'Tammy');
+	}
+
+	/**
+	 * @dataProvider getArray
+	 */
+	public function testSetMethodSetsItemsInArray($array)
+	{
+		Arr::set($array, 'name', 'Taylor');
+		Arr::set($array, 'names.aunt', 'Tammy');
+		Arr::set($array, 'names.friends.best', 'Abigail');
+
+		$this->assertEquals($array['name'], 'Taylor');
+		$this->assertEquals($array['names']['aunt'], 'Tammy');
+		$this->assertEquals($array['names']['friends']['best'], 'Abigail');
+
+	}
+
+	public function getArray()
+	{
+		return array(array(
+			array(
+				'email' => 'taylorotwell@gmail.com',
+				'names' => array(
+					'uncle' => 'Mike',
+				),
+			)
+		));
+	}
+
+}
\ No newline at end of file

tests/bootstrap.php

+<?php
+/**
+ * Laravel - A clean and classy framework for PHP web development.
+ *
+ * @package  Laravel
+ * @version  2.0.0
+ * @author   Taylor Otwell <taylorotwell@gmail.com>
+ * @link     http://laravel.com
+ */
+
+/*
+|--------------------------------------------------------------------------
+| Installation Paths
+|--------------------------------------------------------------------------
+|
+| Here you may specify the location of the various Laravel framework
+| directories for your installation. 
+|
+| Of course, these are already set to the proper default values, so you do
+| not need to change them if you have not modified the directory structure.
+|
+*/
+
+$application = 'application';
+
+$laravel     = 'laravel';
+
+$packages    = 'packages';
+
+$storage     = 'storage';
+
+$public      = 'public';
+
+require realpath($laravel).'/bootstrap.php';
\ No newline at end of file