Commit 9c9b6eed authored by Taylor Otwell's avatar Taylor Otwell

Merge remote-tracking branch 'origin/master'

parents 5ddeab60 0008a232
......@@ -97,4 +97,14 @@ class File extends Driver {
if (file_exists($this->path.$key)) @unlink($this->path.$key);
}
/**
* Flush the entire cache.
*
* @return void
*/
public function flush()
{
array_map('unlink', glob($this->path.'*'));
}
}
......@@ -43,7 +43,8 @@ try
}
catch (\Exception $e)
{
echo $e->getMessage();
echo $e->getMessage().PHP_EOL;
exit(1);
}
echo PHP_EOL;
......@@ -517,7 +517,7 @@ abstract class Model {
foreach ($this->attributes as $key => $value)
{
if ( ! array_key_exists($key, $this->original) or $value != $this->original[$key])
if ( ! array_key_exists($key, $this->original) or $value !== $this->original[$key])
{
$dirty[$key] = $value;
}
......
......@@ -39,6 +39,25 @@ class Table {
*/
public $commands = array();
/**
* The registered custom macros.
*
* @var array
*/
public static $macros = array();
/**
* Registers a custom macro.
*
* @param string $name
* @param Closure $macro
* @return void
*/
public static function macro($name, $macro)
{
static::$macros[$name] = $macro;
}
/**
* Create a new schema table instance.
*
......@@ -422,4 +441,22 @@ class Table {
return $this->columns[] = new Fluent($parameters);
}
/**
* Dynamically handle calls to custom macros.
*
* @param string $method
* @param array $parameters
* @return mixed
*/
public function __call($method, $parameters)
{
if (isset(static::$macros[$method]))
{
array_unshift($parameters, $this);
return call_user_func_array(static::$macros[$method], $parameters);
}
throw new \Exception("Method [$method] does not exist.");
}
}
......@@ -47,3 +47,12 @@ Now that we have SwiftMailer registered in the container, we can resolve it usin
$mailer = IoC::resolve('mailer');
> **Note:** You may also [register controllers in the container](/docs/controllers#dependency-injection).
<a name="unregister"></a>
## Unregister an existing instance
For test purposes sometimes you need to unregister some container.
#### Unregister example mail class:
IoC::unregister('mailer');
\ No newline at end of file
......@@ -328,7 +328,7 @@ function head($array)
*/
function url($url = '', $https = null)
{
return Laravel\URL::to($url, $https);
return URL::to($url, $https);
}
/**
......@@ -340,7 +340,7 @@ function url($url = '', $https = null)
*/
function asset($url, $https = null)
{
return Laravel\URL::to_asset($url, $https);
return URL::to_asset($url, $https);
}
/**
......@@ -360,7 +360,7 @@ function asset($url, $https = null)
*/
function action($action, $parameters = array())
{
return Laravel\URL::to_action($action, $parameters);
return URL::to_action($action, $parameters);
}
/**
......@@ -380,7 +380,7 @@ function action($action, $parameters = array())
*/
function route($name, $parameters = array())
{
return Laravel\URL::to_route($name, $parameters);
return URL::to_route($name, $parameters);
}
/**
......@@ -523,7 +523,7 @@ function view($view, $data = array())
{
if (is_null($view)) return '';
return Laravel\View::make($view, $data);
return View::make($view, $data);
}
/**
......@@ -537,7 +537,7 @@ function render($view, $data = array())
{
if (is_null($view)) return '';
return Laravel\View::make($view, $data)->render();
return View::make($view, $data)->render();
}
/**
......@@ -551,7 +551,7 @@ function render($view, $data = array())
*/
function render_each($partial, array $data, $iterator, $empty = 'raw|')
{
return Laravel\View::render_each($partial, $data, $iterator, $empty);
return View::render_each($partial, $data, $iterator, $empty);
}
/**
......@@ -562,7 +562,7 @@ function render_each($partial, array $data, $iterator, $empty = 'raw|')
*/
function yield($section)
{
return Laravel\Section::yield($section);
return Section::yield($section);
}
/**
......
......@@ -31,6 +31,19 @@ class IoC {
static::$registry[$name] = compact('resolver', 'singleton');
}
/**
* Unregister an object
*
* @param string $name
*/
public static function unregister($name)
{
if (array_key_exists($name, static::$registry)) {
unset(static::$registry[$name]);
unset(static::$singletons[$name]);
}
}
/**
* Determine if an object has been registered in the container.
*
......@@ -141,6 +154,7 @@ class IoC {
* @param string $type
* @param array $parameters
* @return mixed
* @throws \Exception
*/
protected static function build($type, $parameters = array())
{
......@@ -218,6 +232,7 @@ class IoC {
*
* @param ReflectionParameter
* @return default value
* @throws \Exception
*/
protected static function resolveNonClass($parameter)
{
......
......@@ -28,6 +28,7 @@ class TestClassTwoForIoC
}
}
use \Laravel\IoC as IoC;
class IoCTest extends PHPUnit_Framework_TestCase {
......@@ -150,4 +151,17 @@ class IoCTest extends PHPUnit_Framework_TestCase {
$this->assertEquals(42, $class_two->class_one->test_variable);
}
public function testCanUnregisterRegistered()
{
$testClass = 'test';
IoC::register($testClass, function() {});
$this->assertTrue(IoC::registered($testClass));
IoC::unregister($testClass);
$this->assertFalse(IoC::registered($testClass));
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment