Skip to content

S
syncEnrollments
Commit 0c4018ec authored by Taylor Otwell's avatar Taylor Otwell
Browse files
Options

refactoring.

parent b9b97119
Show whitespace changes
Inline Side-by-side
Showing with 1007 additions and 1357 deletions
.gitignore 0 → 100644
View file @ 0c4018ec
favicon.*
\ No newline at end of file
application/config/aliases.php
View file @ 0c4018ec
...@@ -25,7 +25,7 @@ return array( ...@@ -25,7 +25,7 @@ return array(
'Cache' => 'Laravel\\Cache', 'Cache' => 'Laravel\\Cache',
'Config' => 'Laravel\\Config', 'Config' => 'Laravel\\Config',
'Controller' => 'Laravel\\Controller', 'Controller' => 'Laravel\\Controller',
'Cookie' => 'Laravel\\Cookie', 'Cookie' => 'Laravel\\Facades\\Cookie',
'Crypter' => 'Laravel\\Facades\\Crypter', 'Crypter' => 'Laravel\\Facades\\Crypter',
'DB' => 'Laravel\\Database\\Manager', 'DB' => 'Laravel\\Database\\Manager',
'Eloquent' => 'Laravel\\Database\\Eloquent\\Model', 'Eloquent' => 'Laravel\\Database\\Eloquent\\Model',
...@@ -34,20 +34,20 @@ return array( ...@@ -34,20 +34,20 @@ return array(
'Hasher' => 'Laravel\\Facades\\Hasher', 'Hasher' => 'Laravel\\Facades\\Hasher',
'HTML' => 'Laravel\\HTML', 'HTML' => 'Laravel\\HTML',
'Inflector' => 'Laravel\\Inflector', 'Inflector' => 'Laravel\\Inflector',
'Input' => 'Laravel\\Input', 'Input' => 'Laravel\\Facades\\Input',
'IoC' => 'Laravel\\IoC', 'IoC' => 'Laravel\\IoC',
'Lang' => 'Laravel\\Lang', 'Lang' => 'Laravel\\Lang',
'Loader' => 'Laravel\\Loader', 'Loader' => 'Laravel\\Loader',
'Messages' => 'Laravel\\Validation\\Messages', 'Messages' => 'Laravel\\Validation\\Messages',
'Package' => 'Laravel\\Facades\\Package', 'Package' => 'Laravel\\Facades\\Package',
'URI' => 'Laravel\\URI', 'URI' => 'Laravel\\Facades\\URI',
'URL' => 'Laravel\\URL', 'URL' => 'Laravel\\URL',
'Redirect' => 'Laravel\\Redirect', 'Redirect' => 'Laravel\\Redirect',
'Request' => 'Laravel\\Request', 'Request' => 'Laravel\\Facades\\Request',
'Response' => 'Laravel\\Response', 'Response' => 'Laravel\\Response',
'Session' => 'Laravel\\Facades\\Session', 'Session' => 'Laravel\\Facades\\Session',
'Str' => 'Laravel\\Str', 'Str' => 'Laravel\\Str',
'Validator' => 'Laravel\\Validator', 'Validator' => 'Laravel\\Validation\\Validator',
'View' => 'Laravel\\View', 'View' => 'Laravel\\View',
); );
\ No newline at end of file
application/config/error.php
View file @ 0c4018ec
...@@ -2,13 +2,42 @@ ...@@ -2,13 +2,42 @@
return array( return array(
/*
|--------------------------------------------------------------------------
| Error Detail
|--------------------------------------------------------------------------
|
| Detailed error messages contain information about the file in which
| an error occurs, a stack trace, and a snapshot of the source code
| in which the error occured.
|
| If your application is in production, consider turning off error details
| for enhanced security and user experience.
|
*/
'detail' => true,
/*
|--------------------------------------------------------------------------
| Error Logging
|--------------------------------------------------------------------------
|
| Error Logging will use the "logger" function defined below to log error
| messages, which gives you complete freedom to determine how error
| messages are logged. Enjoy the flexibility.
|
*/
'log' => false,
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Error Handler | Error Handler
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| Because of the various ways of managing error logging, you get complete | Because of the various ways of managing error logging, you get complete
| flexibility to manage error logging as you see fit. | flexibility in Laravel to manage error logging as you see fit.
| |
| This function will be called when an error occurs in your application. | This function will be called when an error occurs in your application.
| You can log the error however you like. | You can log the error however you like.
...@@ -21,11 +50,51 @@ return array( ...@@ -21,11 +50,51 @@ return array(
| |
*/ */
'handler' => function($exception) 'handler' => function($exception, $severity, $message, $config)
{
if ($config['detail'])
{
$data = compact('exception', 'severity', 'message');
$response = Response::view('error.exception', $data)->status(500);
}
else
{
$response = Response::error('500');
}
if ($config['log'])
{ {
var_dump($exception); call_user_func($config['logger'], $severity, $message);
}
$response->send();
exit(1); exit(1);
}, },
/*
|--------------------------------------------------------------------------
| Error Logger
|--------------------------------------------------------------------------
|
| Because of the various ways of managing error logging, you get complete
| flexibility to manage error logging as you see fit.
|
| This function will be called when an error occurs in your application.
| You can log the error however you like.
|
| The error "severity" passed to the method is a human-readable severity
| level such as "Parsing Error" or "Fatal Error".
|
| A simple logging system has been setup for you. By default, all errors
| will be logged to the storage/log.txt file.
|
*/
'logger' => function($severity, $message)
{
File::append(STORAGE_PATH.'log.txt', date('Y-m-d H:i:s').' '.$severity.' - '.$message.PHP_EOL);
}
); );
\ No newline at end of file
application/filters.php
View file @ 0c4018ec
...@@ -56,7 +56,7 @@ return array( ...@@ -56,7 +56,7 @@ return array(
'auth' => function() 'auth' => function()
{ {
return ( ! Auth::make()->check()) ? Redirect::to_login() : null; return ( ! Auth::check()) ? Redirect::to('login') : null;
}, },
......
application/views/error/404.php
View file @ 0c4018ec
<!DOCTYPE html> <!doctype html>
<html> <html>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>404 - Not Found</title>
<link href="http://fonts.googleapis.com/css?family=Quattrocento&amp;v1" rel="stylesheet" type="text/css" media="all" /> <title>Error 404 - Not Found</title>
<link href="http://fonts.googleapis.com/css?family=Ubuntu&amp;v1" rel="stylesheet" type="text/css" media="all" />
<link href='http://fonts.googleapis.com/css?family=Lobster+Two' rel='stylesheet' type='text/css'> <style>
@import url(http://fonts.googleapis.com/css?family=Ubuntu);
<style type="text/css">
body { body {
background-color: #eee; background:#eee;
color: #6d6d6d; color: #6d6d6d;
font-family: 'Ubuntu'; font: normal normal normal 16px/1.253 Ubuntu, sans-serif;
font-size: 16px; margin:0;
} min-width:800px;
padding:0;
a {
color: #7089b3;
font-weight: bold;
text-decoration: none;
} }
h1.laravel { #main {
font-family: 'Lobster Two', Helvetica, serif; background-clip: padding-box;
font-size: 60px; background-color: #fff;
margin: 0 0 15px -10px; border:1px solid #ccc;
padding: 0; border-radius: 5px;
text-shadow: -1px 1px 1px #fff; box-shadow: 0 0 10px #cdcdcd;
margin: 50px auto 0;
padding: 30px;
width: 700px;
} }
h2 { #main h1 {
font-family: 'Quattrocento', serif; font-family: 'Ubuntu';
font-size: 30px; font-size: 34px;
margin: 30px 0 0 0; margin: 0 0 20px 0;
padding: 0; padding: 0;
text-shadow: -1px 1px 1px #fff;
} }
p { #main h2,h3 {
margin: 10px 0 0 0; margin-top: 25px;
line-height: 25px; padding: 0 0 0 0;
}
#header {
margin: 0 auto;
margin-bottom: 15px;
margin-top: 20px;
width: 80%;
} }
#wrapper { #main h3 {
background-color: #fff; font-size: 18px;
border-radius: 10px;
margin: 0 auto;
padding: 10px;
width: 80%;
} }
#wrapper h2:first-of-type { #main p {
margin-top: 0; line-height: 25px;
margin: 10px 0;
} }
</style> </style>
</head> </head>
<body> <body>
<div id="header"> <div id="main">
<?php <?php $messages = array('We need a map.', 'I think we\'re lost.', 'We took a wrong turn.'); ?>
$messages = array("We're lost.", "This doesn't look familiar.", "We need a map.");
$message = $messages[mt_rand(0, 2)];
?>
<h1 class="laravel"><?php echo $message; ?></h1>
</div>
<div id="wrapper"> <h1><?php echo $messages[mt_rand(0, 2)]; ?></h1>
<?php
$apologies = array("This is embarrassing.", "Don't give up on us.", "We're really sorry.");
$apology = $apologies[mt_rand(0, 2)];
?>
<h2><?php echo $apology; ?></h2> <p>We're really sorry, but we couldn't find the resource you requested.</p>
<p>We couldn't find the resource you requested. Would you like go to our <a href="<?php echo Config::get('application.url'); ?>">home page</a> instead?</p> <p>Perhaps you would like to go to our <?php echo HTML::link('/', 'home page'); ?> instead?</p>
</div> </div>
</body> </body>
</html> </html>
\ No newline at end of file
application/views/error/500.php
View file @ 0c4018ec
<!DOCTYPE html> <!doctype html>
<html> <html>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>500 - Internal Server Error</title>
<link href="http://fonts.googleapis.com/css?family=Quattrocento&amp;v1" rel="stylesheet" type="text/css" media="all" /> <title>Error 500 - Internal Server Error</title>
<link href="http://fonts.googleapis.com/css?family=Ubuntu&amp;v1" rel="stylesheet" type="text/css" media="all" />
<link href='http://fonts.googleapis.com/css?family=Lobster+Two' rel='stylesheet' type='text/css'> <style>
@import url(http://fonts.googleapis.com/css?family=Ubuntu);
<style type="text/css">
body { body {
background-color: #eee; background:#eee;
color: #6d6d6d; color: #6d6d6d;
font-family: 'Ubuntu'; font: normal normal normal 14px/1.253 Ubuntu, sans-serif;
font-size: 16px; margin:0;
} min-width:800px;
padding:0;
a {
color: #7089b3;
font-weight: bold;
text-decoration: none;
} }
h1.laravel { #main {
font-family: 'Lobster Two', Helvetica, serif; background-clip: padding-box;
font-size: 60px; background-color: #fff;
margin: 0 0 15px -10px; border:1px solid #ccc;
padding: 0; border-radius: 5px;
text-shadow: -1px 1px 1px #fff; box-shadow: 0 0 10px #cdcdcd;
margin: 50px auto 0;
padding: 30px;
width: 700px;
} }
h2 { #main h1 {
font-family: 'Quattrocento', serif; font-family: 'Ubuntu';
font-size: 30px; font-size: 34px;
margin: 30px 0 0 0; margin: 0 0 20px 0;
padding: 0; padding: 0;
text-shadow: -1px 1px 1px #fff;
} }
p { #main p {
margin: 10px 0 0 0;
line-height: 25px; line-height: 25px;
} margin: 10px 0;
#header {
margin: 0 auto;
margin-bottom: 15px;
margin-top: 20px;
width: 80%;
}
#wrapper {
background-color: #fff;
border-radius: 10px;
margin: 0 auto;
padding: 10px;
width: 80%;
}
#wrapper h2:first-of-type {
margin-top: 0;
} }
</style> </style>
</head> </head>
<body> <body>
<div id="header"> <div id="main">
<?php <?php $messages = array('Something bad has happened.', 'We messed up.', 'Whoops!'); ?>
$messages = array('Whoops!', 'Oh no!', 'Ouch!');
$message = $messages[mt_rand(0, 2)];
?>
<h1 class="laravel"><?php echo $message; ?></h1>
</div>
<div id="wrapper"> <h1><?php echo $messages[mt_rand(0, 2)]; ?></h1>
<?php
$apologies = array("It's not your fault.", "Don't give up on us.", "We're really sorry.");
$apology = $apologies[mt_rand(0, 2)];
?>
<h2><?php echo $apology; ?></h2> <p>We're really sorry, but something went wrong while we were processing your request.</p>
<p>Something failed while we were handling your request. Would you like go to our <a href="<?php echo Config::get('application.url'); ?>">home page</a> instead?</p> <p>Perhaps you would like to go to our <?php echo HTML::link('/', 'home page'); ?> instead?</p>
</div> </div>
</body> </body>
</html> </html>
\ No newline at end of file
application/views/error/exception.php
View file @ 0c4018ec
<!DOCTYPE html> <!doctype html>
<html> <html>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>Laravel - <?php echo $severity; ?></title>
<link href="http://fonts.googleapis.com/css?family=Quattrocento&amp;v1" rel="stylesheet" type="text/css" media="all" /> <title>Laravel - Uncaught Exception</title>
<link href="http://fonts.googleapis.com/css?family=Ubuntu&amp;v1" rel="stylesheet" type="text/css" media="all" />
<link href='http://fonts.googleapis.com/css?family=Lobster+Two' rel='stylesheet' type='text/css'> <style>
@import url(http://fonts.googleapis.com/css?family=Ubuntu);
<style type="text/css">
body { body {
background-color: #eee; background:#eee;
color: #6d6d6d; color: #6d6d6d;
font-family: 'Ubuntu'; font: normal normal normal 14px/1.253 Ubuntu, sans-serif;
font-size: 15px; margin:0;
min-width:1000px;
padding:0;
} }
h1.laravel { #main {
font-family: 'Lobster Two', Helvetica, serif; background-clip: padding-box;
font-size: 60px; background-color: #fff;
margin: 0 0 15px -10px; border:1px solid #ccc;
padding: 0; border-radius: 5px;
text-shadow: -1px 1px 1px #fff; box-shadow: 0 0 10px #cdcdcd;
margin: 50px auto 0;
padding: 30px;
width: 900px;
} }
h2 { #main h1 {
font-family: 'Quattrocento', serif; font-family: 'Ubuntu';
font-size: 30px; font-size: 34px;
margin: 30px 0 0 0; margin: 0 0 20px 0;
padding: 0; padding: 0;
text-shadow: -1px 1px 1px #fff;
}
p {
margin: 10px 0 0 0;
line-height: 25px;
}
pre {
font-size: 12px;
} }
pre.context { #main h2,h3 {
margin: 0; padding: 0; margin-top: 25px;
padding: 0 0 0 0;
} }
pre.highlight { #main h3 {
font-weight: bold; font-size: 18px;
color: #990000;
} }
#header { #main p {
margin: 0 auto; line-height: 25px;
margin-bottom: 15px; margin: 10px 0;
margin-top: 20px;
width: 80%;
} }
#wrapper { #main pre {
background-color: #fff; font-size: 12px;
border-radius: 10px; background-color: #f0f0f0;
margin: 0 auto; border-left: 1px solid #d8d8d8;
border-top: 1px solid #d8d8d8;
border-radius: 5px;
padding: 10px; padding: 10px;
width: 80%; white-space: pre-wrap;
}
#wrapper h2:first-of-type {
margin-top: 0;
} }
</style> </style>
</head> </head>
<body> <body>
<div id="header"> <div id="main">
<h1 class="laravel"><?php echo $severity; ?></h1> <h1><?php echo $severity; ?></h1>
</div>
<div id="wrapper"> <h3>Message</h3>
<h2>Message:</h2>
<p><?php echo $message; ?></p> <pre><?php echo $message; ?></pre>
<h2>Stack Trace:</h2> <h3>Stack Trace</h3>
<pre><?php echo $trace; ?></pre> <pre><?php echo $exception->getTraceAsString(); ?></pre>
<h2>Snapshot:</h2> <h3>Snapshot</h3>
<p> <?php
<?php if (count($contexts) > 0): ?> $lines = array();
<?php foreach($contexts as $num => $context): ?> foreach (File::snapshot($exception->getFile(), $exception->getLine()) as $num => $context)
<pre class="context <?php echo ($line == $num) ? 'highlight' : ''; ?>"><?php echo htmlentities($num.': '.$context); ?></pre> {
<?php endforeach; ?> $lines[] = $num.': '.$context;
}
?>
<?php else: ?> <pre><?php echo htmlentities(implode("\n", $lines)); ?></pre>
Snapshot Unavailable.
<?php endif; ?>
</p>
</div> </div>
</body> </body>
</html> </html>
\ No newline at end of file
application/views/home/index.php
View file @ 0c4018ec
<!DOCTYPE html> <!doctype html>
<html> <html>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>Welcome To Laravel!</title>
<link href="http://fonts.googleapis.com/css?family=Quattrocento&amp;v1" rel="stylesheet" type="text/css" media="all" /> <title>Laravel - A Framework For Web Artisans</title>
<link href="http://fonts.googleapis.com/css?family=Ubuntu&amp;v1" rel="stylesheet" type="text/css" media="all" />
<link href='http://fonts.googleapis.com/css?family=Lobster+Two' rel='stylesheet' type='text/css'> <style>
@import url(http://fonts.googleapis.com/css?family=Ubuntu);
<style type="text/css">
body { body {
background-color: #eee; background:#eee;
color: #6d6d6d; color: #6d6d6d;
font-family: 'Ubuntu'; font: normal normal normal 14px/1.253 Ubuntu, sans-serif;
font-size: 15px; margin:0;
min-width:800px;
padding:0;
} }
a { #main {
color: #7089b3; background-clip: padding-box;
font-weight: bold; background-color: #fff;
text-decoration: none; border:1px solid #ccc;
border-radius: 5px;
box-shadow: 0 0 10px #cdcdcd;
margin: 50px auto 0;
padding: 30px;
width: 700px;
} }
h1.laravel { #main h1 {
font-family: 'Lobster Two', Helvetica, serif; font-family: 'Ubuntu';
font-size: 60px; font-size: 34px;
margin: 0 0 15px -10px; margin: 0 0 20px 0;
padding: 0; padding: 0;
text-shadow: -1px 1px 1px #fff;
} }
h2 { #main h2,h3 {
font-family: 'Quattrocento', serif; margin-top: 25px;
font-size: 30px; padding: 0 0 0 0;
margin: 30px 0 0 0;
padding: 0;
text-shadow: -1px 1px 1px #fff;
} }
p { #main h3 {
margin: 10px 0 0 0; font-size: 18px;
line-height: 25px;
} }
#header { #main p {
margin: 0 auto; line-height: 25px;
margin-bottom: 15px; margin: 10px 0;
margin-top: 20px;
width: 80%;
} }
.wrapper { #main pre {
background-color: #fff; background-color: #f0f0f0;
border-radius: 10px; border-left: 1px solid #d8d8d8;
margin: 0 auto; border-top: 1px solid #d8d8d8;
border-radius: 5px;
padding: 10px; padding: 10px;
width: 80%;
} }
.wrapper h2:first-of-type { #main ul {
margin-top: 0; margin: 10px 0;
padding: 0 30px;
}
#main li {
margin: 5px 0;
} }
</style> </style>
</head> </head>
<body> <body>
<div id="header"> <div id="main">
<h1 class="laravel">Laravel</h1> <h1>Welcome to Laravel</h1>
</div>
<p>
You have successfully installed the Laravel framework. Laravel is a simple framework
to help web artisans create beautiful, creative applications using elegant, expressive
syntax. You'll love using it.
</p>
<h3>Learn the terrain.</h3>
<p>
You've landed yourself on our default home page. The route that
is generating this page lives at:
</p>
<pre><code>APP_PATH/routes.php</code></pre>
<p>And the view sitting before you can be found at:</p>
<pre><code>APP_PATH/views/home/index.php</code></pre>
<h3>Create something beautiful.</h3>
<div class="wrapper"> <p>
<h2>Installation Complete!</h2> Now that you're up and running, it's time to start creating!
Here are some links to help you get started:
</p>
<p>Ready to dig in? Start building your application in the <strong>application/routes.php</strong> file.</p> <ul>
<li><a href="http://laravel.com">Official Website</a></li>
<li><a href="http://forums.laravel.com">Laravel Forums</a></li>
<li><a href="http://github.com/laravel/laravel">GitHub Repository</a></li>
</ul>
<p>Need to learn more? Peruse our <a href="http://laravel.com">wonderful documentation</a>.</p>
</div> </div>
</body> </body>
</html> </html>
\ No newline at end of file
laravel/arr.php
View file @ 0c4018ec
...@@ -7,18 +7,6 @@ class Arr { ...@@ -7,18 +7,6 @@ class Arr {
/** /**
* Get an item from an array. * Get an item from an array.
* *
* This method supports accessing arrays through JavaScript "dot" style syntax
* for conveniently digging deep into nested arrays. Like most other Laravel
* "get" methods, a default value may be provided.
*
* <code>
* // Get the value of $array['user']['name']
* $value = Arr::get($array, 'user.name');
*
* // Get a value from the array, but return a default if it doesn't exist
* $value = Arr::get($array, 'user.name', 'Taylor');
* </code>
*
* @param array $array * @param array $array
* @param string $key * @param string $key
* @param mixed $default * @param mixed $default
...@@ -44,16 +32,7 @@ class Arr { ...@@ -44,16 +32,7 @@ class Arr {
/** /**
* Set an array item to a given value. * Set an array item to a given value.
* *
* This method supports accessing arrays through JavaScript "dot" style syntax * The same "dot" syntax used by the "get" method may be used here.
* for conveniently digging deep into nested arrays.
*
* <code>
* // Set the $array['user']['name'] value in the array
* Arr::set($array, 'user.name', 'Taylor');
*
* // Set the $array['db']['driver']['name'] value in the array
* Arr::set($array, 'db.driver.name', 'SQLite');
* </code>
* *
* @param array $array * @param array $array
* @param string $key * @param string $key
...@@ -84,20 +63,6 @@ class Arr { ...@@ -84,20 +63,6 @@ class Arr {
/** /**
* Return the first element in an array which passes a given truth test. * Return the first element in an array which passes a given truth test.
* *
* The truth test is passed as a closure, and simply returns true or false.
* The array key and value will be passed to the closure on each iteration.
*
* Like the "get" method, a default value may be specified, and will be
* returned if no matching array elements are found by the method.
*
* <code>
* // Get the first string from an array with a length of 3
* $value = Arr::first($array, function($k, $v) {return strlen($v) == 3;});
*
* // Return a default value if no matching array elements are found
* $value = Arr::first($array, function($k, $v) {return;}, 'Default');
* </code>
*
* @param array $array * @param array $array
* @param Closure $callback * @param Closure $callback
* @return mixed * @return mixed
...@@ -113,15 +78,7 @@ class Arr { ...@@ -113,15 +78,7 @@ class Arr {
} }
/** /**
* Remove all values in the array that are contained within a given array of values. * Remove all array values that are contained within a given array of values.
*
* <code>
* // Remove all empty string values from an array
* $array = Arr::without($array, array(''));
*
* // Remove all array values that are "3", "2", or "1"
* $array = Arr::without($array, array(3, 2, 1));
* </code>
* *
* @param array $array * @param array $array
* @param array $without * @param array $without
......
laravel/asset.php
View file @ 0c4018ec
...@@ -12,18 +12,6 @@ class Asset { ...@@ -12,18 +12,6 @@ class Asset {
/** /**
* Get an asset container instance. * Get an asset container instance.
* *
* If no container name is specified, the default container will be returned.
* Containers provide a convenient method of grouping assets while maintaining
* expressive code and a clean API.
*
* <code>
* // Get an instance of the default asset container
* $container = Asset::container();
*
* // Get an instance of the "footer" container
* $container = Asset::container('footer');
* </code>
*
* @param string $container * @param string $container
* @return Asset_Container * @return Asset_Container
*/ */
...@@ -39,14 +27,6 @@ class Asset { ...@@ -39,14 +27,6 @@ class Asset {
/** /**
* Magic Method for calling methods on the default Asset container. * Magic Method for calling methods on the default Asset container.
*
* <code>
* // Call the "add" method on the default asset container
* Asset::add('jquery', 'js/jquery.js');
*
* // Get all of the styles from the default container
* echo Asset::styles();
* </code>
*/ */
public static function __callStatic($method, $parameters) public static function __callStatic($method, $parameters)
{ {
...@@ -90,21 +70,6 @@ class Asset_Container { ...@@ -90,21 +70,6 @@ class Asset_Container {
* asset being registered (CSS or JavaScript). If you are using a non-standard * asset being registered (CSS or JavaScript). If you are using a non-standard
* extension, you may use the style or script methods to register assets. * extension, you may use the style or script methods to register assets.
* *
* You may also specify asset dependencies. This will instruct the class to
* only link to the registered asset after its dependencies have been linked.
* For example, you may wish to make jQuery UI dependent on jQuery.
*
* <code>
* // Add an asset to the container
* Asset::container()->add('style', 'style.css');
*
* // Add an asset to the container with attributes
* Asset::container()->add('style', 'style.css', array(), array('media' => 'print'));
*
* // Add an asset to the container with dependencies
* Asset::container()->add('jquery', 'jquery.js', array('jquery-ui'));
* </code>
*
* @param string $name * @param string $name
* @param string $source * @param string $source
* @param array $dependencies * @param array $dependencies
...@@ -121,17 +86,6 @@ class Asset_Container { ...@@ -121,17 +86,6 @@ class Asset_Container {
/** /**
* Add a CSS file to the registered assets. * Add a CSS file to the registered assets.
* *
* <code>
* // Add a CSS file to the registered assets
* Asset::container()->style('common', 'common.css');
*
* // Add a CSS file with dependencies to the registered assets
* Asset::container()->style('common', 'common.css', array('reset'));
*
* // Add a CSS file with attributes to the registered assets
* Asset::container()->style('common', 'common.css', array(), array('media' => 'print'));
* </code>
*
* @param string $name * @param string $name
* @param string $source * @param string $source
* @param array $dependencies * @param array $dependencies
...@@ -153,17 +107,6 @@ class Asset_Container { ...@@ -153,17 +107,6 @@ class Asset_Container {
/** /**
* Add a JavaScript file to the registered assets. * Add a JavaScript file to the registered assets.
* *
* <code>
* // Add a CSS file to the registered assets
* Asset::container()->script('jquery', 'jquery.js');
*
* // Add a CSS file with dependencies to the registered assets
* Asset::container()->script('jquery', 'jquery.js', array('jquery-ui'));
*
* // Add a CSS file with attributes to the registered assets
* Asset::container()->script('loader', 'loader.js', array(), array('defer'));
* </code>
*
* @param string $name * @param string $name
* @param string $source * @param string $source
* @param array $dependencies * @param array $dependencies
...@@ -180,8 +123,6 @@ class Asset_Container { ...@@ -180,8 +123,6 @@ class Asset_Container {
/** /**
* Add an asset to the array of registered assets. * Add an asset to the array of registered assets.
* *
* Assets are organized in the array by type (CSS or JavaScript).
*
* @param string $type * @param string $type
* @param string $name * @param string $name
* @param string $source * @param string $source
......
laravel/benchmark.php
View file @ 0c4018ec
...@@ -12,8 +12,6 @@ class Benchmark { ...@@ -12,8 +12,6 @@ class Benchmark {
/** /**
* Start a benchmark starting time. * Start a benchmark starting time.
* *
* The elapsed time since setting a benchmark may checked via the "check" method.
*
* @param string $name * @param string $name
* @return void * @return void
*/ */
......
laravel/core.php → laravel/bootstrap/core.php
View file @ 0c4018ec
<?php namespace Laravel; <?php namespace Laravel;
// -------------------------------------------------------------- // --------------------------------------------------------------
// Define the PHP file extension. // Define the PHP file extensions.
// -------------------------------------------------------------- // --------------------------------------------------------------
define('EXT', '.php'); define('EXT', '.php');
define('BLADE_EXT', '.blade.php');
// -------------------------------------------------------------- // --------------------------------------------------------------
// Define the core framework paths. // Define the core framework paths.
...@@ -53,6 +54,11 @@ if ( ! is_null($environment)) $config[] = CONFIG_PATH.$environment.'/'; ...@@ -53,6 +54,11 @@ if ( ! is_null($environment)) $config[] = CONFIG_PATH.$environment.'/';
Config::paths($config); Config::paths($config);
// --------------------------------------------------------------
// Set a few core configuration options.
// --------------------------------------------------------------
Config::set('view.path', VIEW_PATH);
// -------------------------------------------------------------- // --------------------------------------------------------------
// Bootstrap the IoC container. // Bootstrap the IoC container.
// -------------------------------------------------------------- // --------------------------------------------------------------
......
laravel/bootstrap/errors.php 0 → 100644
View file @ 0c4018ec
<?php namespace Laravel;
/**
* Create the exception formatter closure. This function will format
* the exception message and severity for display and return the
* two formatted strings in an array.
*/
$formatter = function($e)
{
$levels = array(
0 => 'Error',
E_ERROR => 'Error',
E_WARNING => 'Warning',
E_PARSE => 'Parsing Error',
E_NOTICE => 'Notice',
E_CORE_ERROR => 'Core Error',
E_CORE_WARNING => 'Core Warning',
E_COMPILE_ERROR => 'Compile Error',
E_COMPILE_WARNING => 'Compile Warning',
E_USER_ERROR => 'User Error',
E_USER_WARNING => 'User Warning',
E_USER_NOTICE => 'User Notice',
E_STRICT => 'Runtime Notice',
);
$file = str_replace(array(APP_PATH, SYS_PATH), array('APP_PATH/', 'SYS_PATH/'), $e->getFile());
$message = rtrim($e->getMessage(), '.').' in '.$file.' on line '.$e->getLine().'.';
$severity = (array_key_exists($e->getCode(), $levels)) ? $levels[$e->getCode()] : $e->getCode();
return array($severity, $message);
};
/**
* Create the exception handler function. All of the handlers registered
* with PHP will call this handler when an error occurs, giving us a common
* spot to put error handling logic.
*/
$handler = function($e) use ($formatter)
{
list($severity, $message) = $formatter($e);
call_user_func(Config::get('error.handler'), $e, $severity, $message, Config::get('error'));
};
/**
* Register the exception, error, and shutdown error handlers.
*/
set_exception_handler(function($e) use ($handler)
{
$handler($e);
});
set_error_handler(function($number, $error, $file, $line) use ($handler)
{
$handler(new \ErrorException($error, $number, 0, $file, $line));
});
register_shutdown_function(function() use ($handler)
{
if ( ! is_null($error = error_get_last()))
{
$handler(new \ErrorException($error['message'], $error['type'], 0, $error['file'], $error['line']));
}
});
/**
* Set the error reporting and display levels.
*/
error_reporting(-1);
ini_set('display_errors', 'Off');
\ No newline at end of file
laravel/config.php
View file @ 0c4018ec
...@@ -32,14 +32,6 @@ class Config { ...@@ -32,14 +32,6 @@ class Config {
/** /**
* Determine if a configuration item or file exists. * Determine if a configuration item or file exists.
* *
* <code>
* // Determine if the "options" configuration file exists
* $options = Config::has('options');
*
* // Determine if a specific configuration item exists
* $timezone = Config::has('application.timezone');
* </code>
*
* @param string $key * @param string $key
* @return bool * @return bool
*/ */
...@@ -51,25 +43,6 @@ class Config { ...@@ -51,25 +43,6 @@ class Config {
/** /**
* Get a configuration item. * Get a configuration item.
* *
* Configuration items are stored in the application/config directory, and provide
* general configuration options for a wide range of Laravel facilities.
*
* The arrays may be accessed using JavaScript style "dot" notation to drill deep
* intot he configuration files. For example, asking for "database.connectors.sqlite"
* would return the connector closure for SQLite stored in the database configuration
* file. If no specific item is specfied, the entire configuration array is returned.
*
* Like most Laravel "get" functions, a default value may be provided, and it will
* be returned if the requested file or item doesn't exist.
*
* <code>
* // Get the "timezone" option from the application config file
* $timezone = Config::get('application.timezone');
*
* // Get an option, but return a default value if it doesn't exist
* $value = Config::get('some.option', 'Default');
* </code>
*
* @param string $key * @param string $key
* @param string $default * @param string $default
* @return array * @return array
...@@ -83,10 +56,7 @@ class Config { ...@@ -83,10 +56,7 @@ class Config {
return ($default instanceof \Closure) ? call_user_func($default) : $default; return ($default instanceof \Closure) ? call_user_func($default) : $default;
} }
if (is_null($key)) if (is_null($key)) return static::$items[$file];
{
return static::$items[$file];
}
return Arr::get(static::$items[$file], $key, $default); return Arr::get(static::$items[$file], $key, $default);
} }
...@@ -94,21 +64,6 @@ class Config { ...@@ -94,21 +64,6 @@ class Config {
/** /**
* Set a configuration item. * Set a configuration item.
* *
* Configuration items are stored in the application/config directory, and provide
* general configuration options for a wide range of Laravel facilities.
*
* Like the "get" method, this method uses JavaScript style "dot" notation to access
* and manipulate the arrays in the configuration files. Also, like the "get" method,
* if no specific item is specified, the entire configuration array will be set.
*
* <code>
* // Set the "timezone" option in the "application" array
* Config::set('application.timezone', 'America/Chicago');
*
* // Set the entire "session" configuration array
* Config::set('session', $array);
* </code>
*
* @param string $key * @param string $key
* @param mixed $value * @param mixed $value
* @return void * @return void
...@@ -119,26 +74,12 @@ class Config { ...@@ -119,26 +74,12 @@ class Config {
static::load($file); static::load($file);
if (is_null($key)) (is_null($key)) ? Arr::set(static::$items, $file, $value) : Arr::set(static::$items[$file], $key, $value);
{
Arr::set(static::$items, $file, $value);
}
else
{
Arr::set(static::$items[$file], $key, $value);
}
} }
/** /**
* Parse a configuration key and return its file and key segments. * Parse a configuration key and return its file and key segments.
* *
* Configuration keys follow a {file}.{key} convention. So, for example, the
* "session.driver" option refers to the "driver" option within the "session"
* configuration file.
*
* If no specific item is specified, such as when requested "session", null will
* be returned as the value of the key since the entire file is being requested.
*
* @param string $key * @param string $key
* @return array * @return array
*/ */
...@@ -154,13 +95,6 @@ class Config { ...@@ -154,13 +95,6 @@ class Config {
/** /**
* Load all of the configuration items from a module configuration file. * Load all of the configuration items from a module configuration file.
* *
* If the configuration file has already been loaded into the items array, there
* is no need to load it again, so "true" will be returned immediately.
*
* Configuration files cascade across directories. So, for example, if a configuration
* file is in the system directory, its options will be overriden by a matching file
* in the application directory.
*
* @param string $file * @param string $file
* @return bool * @return bool
*/ */
......
laravel/config/container.php
View file @ 0c4018ec
...@@ -14,6 +14,12 @@ return array( ...@@ -14,6 +14,12 @@ return array(
}), }),
'laravel.cookie' => array('singleton' => true, 'resolver' => function($c)
{
return new Cookie($_COOKIE);
}),
'laravel.crypter' => array('resolver' => function($c) 'laravel.crypter' => array('resolver' => function($c)
{ {
return new Security\Crypter(MCRYPT_RIJNDAEL_256, 'cbc', Config::get('application.key')); return new Security\Crypter(MCRYPT_RIJNDAEL_256, 'cbc', Config::get('application.key'));
...@@ -25,6 +31,64 @@ return array( ...@@ -25,6 +31,64 @@ return array(
return new Security\Hashing\Bcrypt(8, false); return new Security\Hashing\Bcrypt(8, false);
}), }),
'laravel.input' => array('singleton' => true, 'resolver' => function($c)
{
$input = array();
switch ($c->resolve('laravel.request')->method())
{
case 'GET':
$input = $_GET;
break;
case 'POST':
$input = $_POST;
break;
case 'PUT':
case 'DELETE':
if ($c->resolve('laravel.request')->spoofed())
{
$input = $_POST;
}
else
{
parse_str(file_get_contents('php://input'), $input);
}
}
unset($input[Request::spoofer]);
return new Input($input, $_FILES);
}),
'laravel.request' => array('singleton' => true, 'resolver' => function($c)
{
return new Request($c->resolve('laravel.uri'), $_SERVER, $_POST);
}),
'laravel.uri' => array('singleton' => true, 'resolver' => function($c)
{
return new URI($_SERVER);
}),
'laravel.view' => array('singleton' => true, 'resolver' => function($c)
{
require_once SYS_PATH.'view'.EXT;
return new View_Factory($c->resolve('laravel.composer'), VIEW_PATH);
}),
'laravel.composer' => array('singleton' => true, 'resolver' => function($c)
{
return new View_Composer(require APP_PATH.'composers'.EXT);
}),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Laravel Routing Components | Laravel Routing Components
...@@ -97,7 +161,7 @@ return array( ...@@ -97,7 +161,7 @@ return array(
'laravel.session.id' => array('singleton' => true, 'resolver' => function($c) 'laravel.session.id' => array('singleton' => true, 'resolver' => function($c)
{ {
return Cookie::get('laravel_session'); return $c->resolve('laravel.cookie')->get('laravel_session');
}), }),
...@@ -111,7 +175,7 @@ return array( ...@@ -111,7 +175,7 @@ return array(
'laravel.session.transporter' => array('resolver' => function($c) 'laravel.session.transporter' => array('resolver' => function($c)
{ {
return new Session\Transporters\Cookie; return new Session\Transporters\Cookie($c->resolve('laravel.cookie'));
}), }),
...@@ -123,7 +187,7 @@ return array( ...@@ -123,7 +187,7 @@ return array(
'laravel.session.cookie' => array('resolver' => function($c) 'laravel.session.cookie' => array('resolver' => function($c)
{ {
return new Session\Drivers\Cookie($c->resolve('laravel.crypter')); return new Session\Drivers\Cookie($c->resolve('laravel.crypter'), $c->resolve('laravel.cookie'));
}), }),
......
laravel/container.php
View file @ 0c4018ec
...@@ -12,17 +12,6 @@ class IoC { ...@@ -12,17 +12,6 @@ class IoC {
/** /**
* Get the active container instance. * Get the active container instance.
* *
* The container is set early in the request cycle and can be access here for
* use as a service locator if object injection is not practical.
*
* <code>
* // Get the active container instance
* $container = IoC::container();
*
* // Get the active container instance and call the resolve method
* $container = IoC::container()->resolve('instance');
* </code>
*
* @return Container * @return Container
*/ */
public static function container() public static function container()
...@@ -32,14 +21,6 @@ class IoC { ...@@ -32,14 +21,6 @@ class IoC {
/** /**
* Magic Method for calling methods on the active container instance. * Magic Method for calling methods on the active container instance.
*
* <code>
* // Call the "resolve" method on the active container instance
* $instance = IoC::resolve('instance');
*
* // Equivalent operation using the "container" method
* $instance = IoC::container()->resolve('instance');
* </code>
*/ */
public static function __callStatic($method, $parameters) public static function __callStatic($method, $parameters)
{ {
...@@ -78,16 +59,6 @@ class Container { ...@@ -78,16 +59,6 @@ class Container {
/** /**
* Register an object and its resolver. * Register an object and its resolver.
* *
* The resolver function is called when the registered object is requested.
*
* <code>
* // Register an object in the container
* IoC::register('something', function($container) {return new Something;});
*
* // Register an object in the container as a singleton
* IoC::register('something', function($container) {return new Something;}, true);
* </code>
*
* @param string $name * @param string $name
* @param Closure $resolver * @param Closure $resolver
* @return void * @return void
...@@ -111,13 +82,8 @@ class Container { ...@@ -111,13 +82,8 @@ class Container {
/** /**
* Register an object as a singleton. * Register an object as a singleton.
* *
* Singletons will only be instantiated the first time they are resolved. On subsequent * Singletons will only be instantiated the first time they are resolved.
* requests for the object, the original instance will be returned. * On subsequent requests for the object, the original instance will be returned.
*
* <code>
* // Register an object in the container as a singleton
* IoC::singleton('something', function($container) {return new Something;});
* </code>
* *
* @param string $name * @param string $name
* @param Closure $resolver * @param Closure $resolver
...@@ -131,13 +97,8 @@ class Container { ...@@ -131,13 +97,8 @@ class Container {
/** /**
* Register an instance as a singleton. * Register an instance as a singleton.
* *
* This method allows you to register an already existing object instance with the * This method allows you to register an already existing object instance
* container to be managed as a singleton instance. * with the container to be managed as a singleton instance.
*
* <code>
* // Register an instance with the IoC container
* IoC::instance('something', new Something);
* </code>
* *
* @param string $name * @param string $name
* @param mixed $instance * @param mixed $instance
...@@ -151,15 +112,6 @@ class Container { ...@@ -151,15 +112,6 @@ class Container {
/** /**
* Resolve an object. * Resolve an object.
* *
* The object's resolver will be called and its result will be returned. If the
* object is registered as a singleton and has already been resolved, the instance
* that has already been instantiated will be returned.
*
* <code>
* // Get the "something" object out of the IoC container
* $something = IoC::resolve('something');
* </code>
*
* @param string $name * @param string $name
* @return mixed * @return mixed
*/ */
...@@ -179,14 +131,6 @@ class Container { ...@@ -179,14 +131,6 @@ class Container {
/** /**
* Magic Method for resolving classes out of the IoC container. * Magic Method for resolving classes out of the IoC container.
*
* <code>
* // Get the "something" instance out of the IoC container
* $something = IoC::container()->something;
*
* // Equivalent method of retrieving the instance using the resolve method
* $something = IoC::container()->resolve('something');
* </code>
*/ */
public function __get($key) public function __get($key)
{ {
......
laravel/controller.php
View file @ 0c4018ec
...@@ -30,19 +30,14 @@ abstract class Controller { ...@@ -30,19 +30,14 @@ abstract class Controller {
* First, "laravel." will be prefixed to the requested item to see if there is * First, "laravel." will be prefixed to the requested item to see if there is
* a matching Laravel core class in the IoC container. If there is not, we will * a matching Laravel core class in the IoC container. If there is not, we will
* check for the item in the container using the name as-is. * check for the item in the container using the name as-is.
*
* <code>
* // Resolve the "laravel.input" instance from the IoC container
* $input = $this->input;
*
* // Resolve the "mailer" instance from the IoC container
* $mongo = $this->mailer;
* </code>
*
*/ */
public function __get($key) public function __get($key)
{ {
if (IoC::container()->registered($key)) if (IoC::container()->registered("laravel.{$key}"))
{
return IoC::container()->resolve("laravel.{$key}");
}
elseif (IoC::container()->registered($key))
{ {
return IoC::container()->resolve($key); return IoC::container()->resolve($key);
} }
......
laravel/cookie.php
View file @ 0c4018ec
...@@ -2,33 +2,43 @@ ...@@ -2,33 +2,43 @@
class Cookie { class Cookie {
/**
* The cookies for the current request.
*
* @var array
*/
protected $cookies;
/**
* Create a new cookie manager instance.
*
* @param array $cookies
* @return void
*/
public function __construct(&$cookies)
{
$this->cookies =& $cookies;
}
/** /**
* Determine if a cookie exists. * Determine if a cookie exists.
* *
* @param string $name * @param string $name
* @return bool * @return bool
*/ */
public static function has($name) public function has($name)
{ {
return ! is_null(static::get($name)); return ! is_null($this->get($name));
} }
/** /**
* Get the value of a cookie. * Get the value of a cookie.
* *
* <code>
* // Get the value of a cookie
* $value = Cookie::get('color');
*
* // Get the value of a cookie or return a default value
* $value = Cookie::get('color', 'blue');
* </code>
*
* @param string $name * @param string $name
* @param mixed $default * @param mixed $default
* @return string * @return string
*/ */
public static function get($name, $default = null) public function get($name, $default = null)
{ {
return Arr::get($_COOKIE, $name, $default); return Arr::get($_COOKIE, $name, $default);
} }
...@@ -44,9 +54,9 @@ class Cookie { ...@@ -44,9 +54,9 @@ class Cookie {
* @param bool $http_only * @param bool $http_only
* @return bool * @return bool
*/ */
public static function forever($name, $value, $path = '/', $domain = null, $secure = false, $http_only = false) public function forever($name, $value, $path = '/', $domain = null, $secure = false, $http_only = false)
{ {
return static::put($name, $value, 2628000, $path, $domain, $secure, $http_only); return $this->put($name, $value, 2628000, $path, $domain, $secure, $http_only);
} }
/** /**
...@@ -58,14 +68,6 @@ class Cookie { ...@@ -58,14 +68,6 @@ class Cookie {
* However, you simply need to pass the number of minutes for which you * However, you simply need to pass the number of minutes for which you
* wish the cookie to be valid. No funky time calculation is required. * wish the cookie to be valid. No funky time calculation is required.
* *
* <code>
* // Create a cookie that exists until the user closes their browser
* Cookie::put('color', 'blue');
*
* // Create a cookie that exists for 5 minutes
* Cookie::put('name', 'blue', 5);
* </code>
*
* @param string $name * @param string $name
* @param string $value * @param string $value
* @param int $minutes * @param int $minutes
...@@ -75,7 +77,7 @@ class Cookie { ...@@ -75,7 +77,7 @@ class Cookie {
* @param bool $http_only * @param bool $http_only
* @return bool * @return bool
*/ */
public static function put($name, $value, $minutes = 0, $path = '/', $domain = null, $secure = false, $http_only = false) public function put($name, $value, $minutes = 0, $path = '/', $domain = null, $secure = false, $http_only = false)
{ {
if (headers_sent()) return false; if (headers_sent()) return false;
...@@ -92,9 +94,9 @@ class Cookie { ...@@ -92,9 +94,9 @@ class Cookie {
* @param string $name * @param string $name
* @return bool * @return bool
*/ */
public static function forget($name) public function forget($name)
{ {
return static::put($name, null, -60); return $this->put($name, null, -60);
} }
} }
\ No newline at end of file
laravel/facades.php
View file @ 0c4018ec
...@@ -33,6 +33,10 @@ abstract class Facade { ...@@ -33,6 +33,10 @@ abstract class Facade {
} }
class Auth extends Facade { public static $resolve = 'laravel.auth'; } class Auth extends Facade { public static $resolve = 'laravel.auth'; }
class Cookie extends Facade { public static $resolve = 'laravel.cookie'; }
class Crypter extends Facade { public static $resolve = 'laravel.crypter'; } class Crypter extends Facade { public static $resolve = 'laravel.crypter'; }
class Hasher extends Facade { public static $resolve = 'laravel.hasher'; } class Hasher extends Facade { public static $resolve = 'laravel.hasher'; }
class Input extends Facade { public static $resolve = 'laravel.input'; }
class Request extends Facade { public static $resolve = 'laravel.request'; }
class Session extends Facade { public static $resolve = 'laravel.session'; } class Session extends Facade { public static $resolve = 'laravel.session'; }
class URI extends Facade { public static $resolve = 'laravel.uri'; }
\ No newline at end of file
laravel/file.php
View file @ 0c4018ec
...@@ -119,13 +119,6 @@ class File { ...@@ -119,13 +119,6 @@ class File {
/** /**
* Get a file MIME type by extension. * Get a file MIME type by extension.
* *
* If the MIME type can't be determined, "application/octet-stream" will be returned.
*
* <code>
* // Returns 'application/x-tar'
* $mime = File::mime('path/to/file.tar');
* </code>
*
* @param string $extension * @param string $extension
* @param string $default * @param string $default
* @return string * @return string
...@@ -144,14 +137,6 @@ class File { ...@@ -144,14 +137,6 @@ class File {
* *
* The Fileinfo PHP extension will be used to determine the MIME type of the file. * The Fileinfo PHP extension will be used to determine the MIME type of the file.
* *
* <code>
* // Determine if a file is a JPG image
* $image = File::is('jpg', 'path/to/image.jpg');
*
* // Determine if a file is any one of an array of types
* $image = File::is(array('jpg', 'png', 'gif'), 'path/to/image.jpg');
* </code>
*
* @param array|string $extension * @param array|string $extension
* @param string $path * @param string $path
* @return bool * @return bool
...@@ -170,4 +155,27 @@ class File { ...@@ -170,4 +155,27 @@ class File {
return false; return false;
} }
/**
* Get the lines surrounding a given line in a file.
*
* @param string $path
* @param int $line
* @param int $padding
* @return array
*/
public static function snapshot($path, $line, $padding = 5)
{
if ( ! file_exists($path)) return array();
$file = file($path, FILE_IGNORE_NEW_LINES);
array_unshift($file, '');
if (($start = $line - $padding) < 0) $start = 0;
if (($length = ($line - $start) + $padding + 1) < 0) $length = 0;
return array_slice($file, $start, $length, true);
}
} }
\ No newline at end of file
laravel/form.php
View file @ 0c4018ec
...@@ -19,17 +19,6 @@ class Form { ...@@ -19,17 +19,6 @@ class Form {
* containing the request method. PUT and DELETE are not supported by HTML forms, so the * containing the request method. PUT and DELETE are not supported by HTML forms, so the
* hidden field will allow us to "spoof" PUT and DELETE requests. * hidden field will allow us to "spoof" PUT and DELETE requests.
* *
* <code>
* // Open a POST form to the current URI
* echo Form::open();
*
* // Open a POST form to a given URI
* echo Form::open('user/profile');
*
* // Open a PUT form to a given URI and add form attributes
* echo Form::open('user/profile', 'put', array('class' => 'profile'));
* </code>
*
* @param string $action * @param string $action
* @param string $method * @param string $method
* @param array $attributes * @param array $attributes
...@@ -75,7 +64,9 @@ class Form { ...@@ -75,7 +64,9 @@ class Form {
*/ */
protected static function action($action, $https) protected static function action($action, $https)
{ {
return HTML::entities(URL::to(((is_null($action)) ? Request::uri() : $action), $https)); $uri = IoC::container()->resolve('laravel.uri')->get();
return HTML::entities(URL::to(((is_null($action)) ? $uri : $action), $https));
} }
/** /**
...@@ -158,14 +149,6 @@ class Form { ...@@ -158,14 +149,6 @@ class Form {
/** /**
* Create a HTML label element. * Create a HTML label element.
* *
* <code>
* // Create a form label
* echo Form::label('email', 'E-Mail Address');
*
* // Create a form label with attributes
* echo Form::label('email', 'E-Mail Address', array('class' => 'login'));
* </code>
*
* @param string $name * @param string $name
* @param string $value * @param string $value
* @param array $attributes * @param array $attributes
...@@ -184,17 +167,6 @@ class Form { ...@@ -184,17 +167,6 @@ class Form {
* If an ID attribute is not specified and a label has been generated matching the input * If an ID attribute is not specified and a label has been generated matching the input
* element name, the label name will be used as the element ID. * element name, the label name will be used as the element ID.
* *
* <code>
* // Create a "text" type input element
* echo Form::input('text', 'email');
*
* // Create an input element with a specified value
* echo Form::input('text', 'email', 'example@gmail.com');
*
* // Create an input element with attributes
* echo Form::input('text', 'email', 'example@gmail.com', array('class' => 'login'));
* </code>
*
* @param string $name * @param string $name
* @param mixed $value * @param mixed $value
* @param array $attributes * @param array $attributes
...@@ -327,14 +299,6 @@ class Form { ...@@ -327,14 +299,6 @@ class Form {
/** /**
* Create a HTML textarea element. * Create a HTML textarea element.
* *
* <code>
* // Create a textarea element
* echo Form::textarea('comment');
*
* // Create a textarea with specified rows and columns
* echo Form::textarea('comment', '', array('rows' => 10, 'columns' => 50));
* </code>
*
* @param string $name * @param string $name
* @param string $value * @param string $value
* @param array $attributes * @param array $attributes
...@@ -354,14 +318,6 @@ class Form { ...@@ -354,14 +318,6 @@ class Form {
/** /**
* Create a HTML select element. * Create a HTML select element.
* *
* <code>
* // Create a selection element
* echo Form::select('sizes', array('S' => 'Small', 'L' => 'Large'));
*
* // Create a selection element with a given option pre-selected
* echo Form::select('sizes', array('S' => 'Small', 'L' => 'Large'), 'L');
* </code>
*
* @param string $name * @param string $name
* @param array $options * @param array $options
* @param string $selected * @param string $selected
...@@ -387,14 +343,6 @@ class Form { ...@@ -387,14 +343,6 @@ class Form {
/** /**
* Create a HTML checkbox input element. * Create a HTML checkbox input element.
* *
* <code>
* // Create a checkbox element
* echo Form::checkbox('terms');
*
* // Create a checkbox element that is checked by default
* echo Form::checkbox('terms', 'yes', true);
* </code>
*
* @param string $name * @param string $name
* @param string $value * @param string $value
* @param bool $checked * @param bool $checked
...@@ -409,14 +357,6 @@ class Form { ...@@ -409,14 +357,6 @@ class Form {
/** /**
* Create a HTML radio button input element. * Create a HTML radio button input element.
* *
* <code>
* // Create a radio button element
* echo Form::radio('apple');
*
* // Create a radio button element that is selected by default
* echo Form::radio('microsoft', 'pc', true);
* </code>
*
* @param string $name * @param string $name
* @param string $value * @param string $value
* @param bool $checked * @param bool $checked
...@@ -450,14 +390,6 @@ class Form { ...@@ -450,14 +390,6 @@ class Form {
/** /**
* Create a HTML submit input element. * Create a HTML submit input element.
* *
* <code>
* // Create a submit input element
* echo Form::submit('Login!');
*
* // Create a submit input element with attributes
* echo Form::submit('Login!', array('class' => 'login'));
* </code>
*
* @param string $value * @param string $value
* @param array $attributes * @param array $attributes
* @return string * @return string
...@@ -482,11 +414,6 @@ class Form { ...@@ -482,11 +414,6 @@ class Form {
/** /**
* Create a HTML image input element. * Create a HTML image input element.
* *
* <code>
* // Create an image input element
* echo Form::image('img/login.jpg');
* </code>
*
* @param string $url * @param string $url
* @param array $attributes * @param array $attributes
* @return string * @return string
...@@ -501,14 +428,6 @@ class Form { ...@@ -501,14 +428,6 @@ class Form {
/** /**
* Create a HTML button element. * Create a HTML button element.
* *
* <code>
* // Create a button input element
* echo Form::button('Login!');
*
* // Create a button input element with attributes
* echo Form::button('Login!', array('class' => 'login'));
* </code>
*
* @param string $name * @param string $name
* @param string $value * @param string $value
* @param array $attributes * @param array $attributes
......
laravel/html.php
View file @ 0c4018ec
...@@ -18,14 +18,6 @@ class HTML { ...@@ -18,14 +18,6 @@ class HTML {
/** /**
* Generate a JavaScript reference. * Generate a JavaScript reference.
* *
* <code>
* // Generate a link to a JavaScript file
* echo HTML::script('js/jquery.js');
*
* // Generate a link to a JavaScript file with attributes
* echo HTML::script('js/jquery.js', array('defer'));
* </code>
*
* @param string $url * @param string $url
* @param array $attributes * @param array $attributes
* @return string * @return string
...@@ -42,14 +34,6 @@ class HTML { ...@@ -42,14 +34,6 @@ class HTML {
* *
* If no media type is selected, "all" will be used. * If no media type is selected, "all" will be used.
* *
* <code>
* // Generate a link to a CSS file
* echo HTML::style('css/common.css');
*
* // Generate a link to a CSS file with attributes
* echo HTML::style('css/common.css', array('media' => 'print'));
* </code>
*
* @param string $url * @param string $url
* @param array $attributes * @param array $attributes
* @return string * @return string
...@@ -66,14 +50,6 @@ class HTML { ...@@ -66,14 +50,6 @@ class HTML {
/** /**
* Generate a HTML span. * Generate a HTML span.
* *
* <code>
* // Generate a HTML span element
* echo HTML::span('This is inside a span element.');
*
* // Generate a HTML span element with attributes
* echo HTML::span('This is inside a span.', array('class' => 'text'));
* </code>
*
* @param string $value * @param string $value
* @param array $attributes * @param array $attributes
* @return string * @return string
...@@ -86,14 +62,6 @@ class HTML { ...@@ -86,14 +62,6 @@ class HTML {
/** /**
* Generate a HTML link. * Generate a HTML link.
* *
* <code>
* // Generate a HTML link element
* echo HTML::link('user/profile', 'User Profile');
*
* // Generate a HTML link element with attributes
* echo HTML::link('user/profile', 'User Profile', array('class' => 'profile'));
* </code>
*
* @param string $url * @param string $url
* @param string $title * @param string $title
* @param array $attributes * @param array $attributes
...@@ -154,15 +122,6 @@ class HTML { ...@@ -154,15 +122,6 @@ class HTML {
* *
* An array of parameters may be specified to fill in URI segment wildcards. * An array of parameters may be specified to fill in URI segment wildcards.
* *
* <code>
* // Generate a link to the "profile" route
* echo HTML::link_to_route('profile', 'User Profile');
*
* // Generate a link to a route that has wildcard segments
* // Example: /user/profile/(:any)
* echo HTML::link_to_route('profile', 'User Profile', array($username));
* </code>
*
* @param string $name * @param string $name
* @param string $title * @param string $title
* @param array $parameters * @param array $parameters
...@@ -193,17 +152,6 @@ class HTML { ...@@ -193,17 +152,6 @@ class HTML {
* *
* The E-Mail address will be obfuscated to protect it from spam bots. * The E-Mail address will be obfuscated to protect it from spam bots.
* *
* <code>
* // Generate a HTML mailto link
* echo HTML::mailto('example@gmail.com');
*
* // Generate a HTML mailto link with a title
* echo HTML::mailto('example@gmail.com', 'E-Mail Me!');
*
* // Generate a HTML mailto link with attributes
* echo HTML::mailto('example@gmail.com', 'E-Mail Me', array('class' => 'email'));
* </code>
*
* @param string $email * @param string $email
* @param string $title * @param string $title
* @param array $attributes * @param array $attributes
...@@ -234,17 +182,6 @@ class HTML { ...@@ -234,17 +182,6 @@ class HTML {
/** /**
* Generate an HTML image element. * Generate an HTML image element.
* *
* <code>
* // Generate a HTML image element
* echo HTML::image('img/profile.jpg');
*
* // Generate a HTML image element with Alt text
* echo HTML::image('img/profile.jpg', 'Profile Photo');
*
* // Generate a HTML image element with attributes
* echo HTML::image('img/profile.jpg', 'Profile Photo', array('class' => 'profile'));
* </code>
*
* @param string $url * @param string $url
* @param string $alt * @param string $alt
* @param array $attributes * @param array $attributes
...@@ -260,14 +197,6 @@ class HTML { ...@@ -260,14 +197,6 @@ class HTML {
/** /**
* Generate an ordered list of items. * Generate an ordered list of items.
* *
* <code>
* // Generate an ordered list of items
* echo HTML::ol(array('Small', 'Medium', 'Large'));
*
* // Generate an ordered list of items with attributes
* echo HTML::ol(array('Small', 'Medium', 'Large'), array('class' => 'sizes'));
* </code>
*
* @param array $list * @param array $list
* @param array $attributes * @param array $attributes
* @return string * @return string
...@@ -280,14 +209,6 @@ class HTML { ...@@ -280,14 +209,6 @@ class HTML {
/** /**
* Generate an un-ordered list of items. * Generate an un-ordered list of items.
* *
* <code>
* // Generate an un-ordered list of items
* echo HTML::ul(array('Small', 'Medium', 'Large'));
*
* // Generate an un-ordered list of items with attributes
* echo HTML::ul(array('Small', 'Medium', 'Large'), array('class' => 'sizes'));
* </code>
*
* @param array $list * @param array $list
* @param array $attributes * @param array $attributes
* @return string * @return string
...@@ -379,20 +300,6 @@ class HTML { ...@@ -379,20 +300,6 @@ class HTML {
* Magic Method for handling dynamic static methods. * Magic Method for handling dynamic static methods.
* *
* This method primarily handles dynamic calls to create links to named routes. * This method primarily handles dynamic calls to create links to named routes.
*
* <code>
* // Create a link to the "profile" named route
* echo HTML::link_to_profile('Profile');
*
* // Create a link to a named route with URI wildcard parameters
* echo HTML::link_to_posts('Posts', array($year, $month));
*
* // Create a HTTPS link to the "profile" named route
* echo HTML::link_to_secure_profile('Profile');
*
* // Create a HTTPS link to a named route URI wildcard parameters
* echo HTML::link_to_secure_posts('Posts', array($year, $month));
* </code>
*/ */
public static function __callStatic($method, $parameters) public static function __callStatic($method, $parameters)
{ {
......
laravel/inflector.php
View file @ 0c4018ec
...@@ -117,14 +117,6 @@ class Inflector { ...@@ -117,14 +117,6 @@ class Inflector {
/** /**
* Get the plural form of a word if the specified count is greater than one. * Get the plural form of a word if the specified count is greater than one.
* *
* <code>
* // Returns "friend"
* echo Inflector::plural_if('friend', 1);
*
* // Returns "friends"
* echo Inflector::plural_if('friend', 2);
* </code>
*
* @param string $value * @param string $value
* @param int $count * @param int $count
* @return string * @return string
......
laravel/input.php
View file @ 0c4018ec
...@@ -7,7 +7,34 @@ class Input { ...@@ -7,7 +7,34 @@ class Input {
* *
* @var array * @var array
*/ */
public static $input; protected $input;
/**
* The $_FILES array for the current request.
*
* @var array
*/
protected $files;
/**
* The key used to store old input in the session.
*
* @var string
*/
const old_input = 'laravel_old_input';
/**
* Create a new input manager instance.
*
* @param array $input
* @param array $files
* @return void
*/
public function __construct($input, $files)
{
$this->input = $input;
$this->files = $files;
}
/** /**
* Get all of the input data for the request. * Get all of the input data for the request.
...@@ -16,9 +43,9 @@ class Input { ...@@ -16,9 +43,9 @@ class Input {
* *
* @return array * @return array
*/ */
public static function all() public function all()
{ {
return array_merge(static::get(), static::file()); return array_merge($this->get(), $this->file());
} }
/** /**
...@@ -27,9 +54,9 @@ class Input { ...@@ -27,9 +54,9 @@ class Input {
* @param string $key * @param string $key
* @return bool * @return bool
*/ */
public static function has($key) public function has($key)
{ {
return ( ! is_null(static::get($key)) and trim((string) static::get($key)) !== ''); return ( ! is_null($this->get($key)) and trim((string) $this->get($key)) !== '');
} }
/** /**
...@@ -37,21 +64,13 @@ class Input { ...@@ -37,21 +64,13 @@ class Input {
* *
* This method should be used for all request methods (GET, POST, PUT, and DELETE). * This method should be used for all request methods (GET, POST, PUT, and DELETE).
* *
* <code>
* // Get an item from the input to the application
* $value = Input::get('name');
*
* // Get an item from the input and return "Fred" if the item doesn't exist
* $value = Input::get('name', 'Fred');
* </code>
*
* @param string $key * @param string $key
* @param mixed $default * @param mixed $default
* @return mixed * @return mixed
*/ */
public static function get($key = null, $default = null) public function get($key = null, $default = null)
{ {
return Arr::get(static::$input, $key, $default); return Arr::get($this->input, $key, $default);
} }
/** /**
...@@ -60,27 +79,19 @@ class Input { ...@@ -60,27 +79,19 @@ class Input {
* @param string $key * @param string $key
* @return bool * @return bool
*/ */
public static function had($key) public function had($key)
{ {
return ( ! is_null(static::old($key)) and trim((string) static::old($key)) !== ''); return ( ! is_null($this->old($key)) and trim((string) $this->old($key)) !== '');
} }
/** /**
* Get input data from the previous request. * Get input data from the previous request.
* *
* <code>
* // Get an item from the previous request's input
* $value = Input::old('name');
*
* // Get an item from the previous request's input and return "Fred" if it doesn't exist.
* $value = Input::old('name', 'Fred');
* </code>
*
* @param string $key * @param string $key
* @param mixed $default * @param mixed $default
* @return string * @return string
*/ */
public static function old($key = null, $default = null) public function old($key = null, $default = null)
{ {
if (Config::get('session.driver') == '') if (Config::get('session.driver') == '')
{ {
...@@ -89,29 +100,19 @@ class Input { ...@@ -89,29 +100,19 @@ class Input {
$driver = IoC::container()->resolve('laravel.session'); $driver = IoC::container()->resolve('laravel.session');
return Arr::get($driver->get('laravel_old_input', array()), $key, $default); return Arr::get($driver->get(Input::old_input, array()), $key, $default);
} }
/** /**
* Get an item from the uploaded file data. * Get an item from the uploaded file data.
* *
* "Dot" syntax may be used to get a specific item from the file array.
*
* <code>
* // Get the array of information regarding an uploaded file
* $file = Input::file('picture');
*
* // Get an element from the array of information regarding an uploaded file
* $size = Input::file('picture.size');
* </code>
*
* @param string $key * @param string $key
* @param mixed $default * @param mixed $default
* @return array * @return array
*/ */
public static function file($key = null, $default = null) public function file($key = null, $default = null)
{ {
return Arr::get($_FILES, $key, $default); return Arr::get($this->files, $key, $default);
} }
/** /**
...@@ -119,49 +120,13 @@ class Input { ...@@ -119,49 +120,13 @@ class Input {
* *
* This method is simply a convenient wrapper around move_uploaded_file. * This method is simply a convenient wrapper around move_uploaded_file.
* *
* <code>
* // Move the "picture" file to a permament location on disk
* Input::upload('picture', PUBLIC_PATH.'img/picture.jpg');
* </code>
*
* @param string $key * @param string $key
* @param string $path * @param string $path
* @return bool * @return bool
*/ */
public static function upload($key, $path) public function upload($key, $path)
{ {
return array_key_exists($key, $_FILES) ? File::upload($key, $path, $_FILES) : false; return array_key_exists($key, $this->files) ? File::upload($key, $path, $this->files) : false;
} }
} }
\ No newline at end of file
/**
* Set the input values for the current request.
*/
$input = array();
switch (Request::method())
{
case 'GET':
$input = $_GET;
break;
case 'POST':
$input = $_POST;
break;
case 'PUT':
case 'DELETE':
if (Request::spoofed())
{
$input = $_POST;
}
else
{
parse_str(file_get_contents('php://input'), $input);
}
}
unset($input[Request::spoofer]);
Input::$input = $input;
\ No newline at end of file
laravel/lang.php
View file @ 0c4018ec
...@@ -45,11 +45,13 @@ class Lang { ...@@ -45,11 +45,13 @@ class Lang {
* @param string $key * @param string $key
* @param array $replacements * @param array $replacements
* @param string $language * @param string $language
* @param array $paths
* @return void * @return void
*/ */
protected function __construct($key, $replacements = array(), $language = null) protected function __construct($key, $replacements = array(), $language = null, $paths = array())
{ {
$this->key = $key; $this->key = $key;
$this->paths = $paths;
$this->language = $language; $this->language = $language;
$this->replacements = $replacements; $this->replacements = $replacements;
} }
...@@ -60,29 +62,19 @@ class Lang { ...@@ -60,29 +62,19 @@ class Lang {
* @param string $key * @param string $key
* @param array $replacements * @param array $replacements
* @param string $language * @param string $language
* @param array $paths
* @return Lang * @return Lang
*/ */
public static function line($key, $replacements = array(), $language = null) public static function line($key, $replacements = array(), $language = null, $paths = array())
{ {
return new static($key, $replacements, $language); if (count($paths) == 0) $paths = array(SYS_LANG_PATH, LANG_PATH);
return new static($key, $replacements, $language, $paths);
} }
/** /**
* Get the language line. * Get the language line.
* *
* A default value may also be specified, which will be returned in the language line doesn't exist.
*
* <code>
* // Retrieve a language line in the default language
* echo Lang::line('validation.required')->get();
*
* // Retrieve a language line for a given language
* echo Lang::line('validation.required')->get('sp');
*
* // Retrieve a language line and return "Fred" if it doesn't exist
* echo Lang::line('validation.required')->get('en', 'Fred');
* </code>
*
* @param string $language * @param string $language
* @param string $default * @param string $default
* @return string * @return string
...@@ -111,10 +103,6 @@ class Lang { ...@@ -111,10 +103,6 @@ class Lang {
/** /**
* Parse a language key. * Parse a language key.
* *
* Language keys follow a {file}.{key} convention. If a specific language key is not
* specified, an exception will be thrown. Setting entire language files at run-time
* is not currently supported.
*
* @param string $key * @param string $key
* @return array * @return array
*/ */
...@@ -131,8 +119,6 @@ class Lang { ...@@ -131,8 +119,6 @@ class Lang {
/** /**
* Load a language file. * Load a language file.
* *
* If the language file has already been loaded, it will not be loaded again.
*
* @param string $file * @param string $file
* @return bool * @return bool
*/ */
...@@ -142,7 +128,7 @@ class Lang { ...@@ -142,7 +128,7 @@ class Lang {
$language = array(); $language = array();
foreach (array(SYS_LANG_PATH, LANG_PATH) as $directory) foreach ($this->paths as $directory)
{ {
if (file_exists($path = $directory.$this->language.'/'.$file.EXT)) if (file_exists($path = $directory.$this->language.'/'.$file.EXT))
{ {
...@@ -157,15 +143,6 @@ class Lang { ...@@ -157,15 +143,6 @@ class Lang {
/** /**
* Get the string content of the language line. * Get the string content of the language line.
*
* This provides a convenient mechanism for displaying language line in views without
* using the "get" method on the language instance.
*
* <code>
* // Display a language line by casting it to a string
* echo Lang::line('messages.welcome');
* </code>
*
*/ */
public function __toString() public function __toString()
{ {
......
laravel/laravel.php
View file @ 0c4018ec
...@@ -3,39 +3,12 @@ ...@@ -3,39 +3,12 @@
// -------------------------------------------------------------- // --------------------------------------------------------------
// Bootstrap the core framework components. // Bootstrap the core framework components.
// -------------------------------------------------------------- // --------------------------------------------------------------
require 'core.php'; require 'bootstrap/core.php';
// -------------------------------------------------------------- // --------------------------------------------------------------
// Get an instance of the configuration manager. // Register the framework error handlers.
// -------------------------------------------------------------- // --------------------------------------------------------------
set_exception_handler(function($e) require SYS_PATH.'bootstrap/errors'.EXT;
{
call_user_func(Config::get('error.handler'), $e);
});
set_error_handler(function($number, $error, $file, $line)
{
$exception = new \ErrorException($error, $number, 0, $file, $line);
call_user_func(Config::get('error.handler'), $exception);
});
register_shutdown_function(function()
{
if ( ! is_null($error = error_get_last()))
{
$exception = new \ErrorException($error['message'], $error['type'], 0, $error['file'], $error['line']);
call_user_func(Config::get('error.handler'), $exception);
}
});
// --------------------------------------------------------------
// Set the error reporting and display levels.
// --------------------------------------------------------------
error_reporting(-1);
ini_set('display_errors', 'Off');
// -------------------------------------------------------------- // --------------------------------------------------------------
// Set the default timezone. // Set the default timezone.
...@@ -55,7 +28,11 @@ if (Config::get('session.driver') !== '') ...@@ -55,7 +28,11 @@ if (Config::get('session.driver') !== '')
// -------------------------------------------------------------- // --------------------------------------------------------------
// Route the request and get the response from the route. // Route the request and get the response from the route.
// -------------------------------------------------------------- // --------------------------------------------------------------
$route = $container->resolve('laravel.routing.router')->route(Request::method(), Request::uri()); $request = $container->resolve('laravel.request');
list($method, $uri) = array($request->method(), $request->uri());
$route = $container->resolve('laravel.routing.router')->route($request, $method, $uri);
if ( ! is_null($route)) if ( ! is_null($route))
{ {
...@@ -76,7 +53,9 @@ $response->content = $response->render(); ...@@ -76,7 +53,9 @@ $response->content = $response->render();
// -------------------------------------------------------------- // --------------------------------------------------------------
if (isset($session)) if (isset($session))
{ {
$session->close($container->resolve('laravel.session'), Config::get('session')); $flash = array(Input::old_input => $container->resolve('laravel.input')->get());
$session->close($container->resolve('laravel.session'), Config::get('session'), $flash);
} }
// -------------------------------------------------------------- // --------------------------------------------------------------
......
laravel/loader.php
View file @ 0c4018ec
...@@ -48,11 +48,6 @@ class Loader { ...@@ -48,11 +48,6 @@ class Loader {
* *
* Note: Aliases are lazy-loaded, so the aliased class will not be included until it is needed. * Note: Aliases are lazy-loaded, so the aliased class will not be included until it is needed.
* *
* <code>
* // Register an alias for the "SwiftMailer\Transport" class
* Loader::alias('Transport', 'SwiftMailer\\Transport');
* </code>
*
* @param string $alias * @param string $alias
* @param string $class * @param string $class
* @return void * @return void
...@@ -65,13 +60,6 @@ class Loader { ...@@ -65,13 +60,6 @@ class Loader {
/** /**
* Register a path with the auto-loader. * Register a path with the auto-loader.
* *
* The registered path will be searched when auto-loading classes.
*
* <code>
* // Register a path to be searched by the auto-loader
* Loader::path('path/to/files');
* </code>
*
* @param string $path * @param string $path
* @return void * @return void
*/ */
...@@ -83,11 +71,6 @@ class Loader { ...@@ -83,11 +71,6 @@ class Loader {
/** /**
* Remove an alias from the auto-loader's alias registrations. * Remove an alias from the auto-loader's alias registrations.
* *
* <code>
* // Remove the "Transport" alias from the registered aliases
* Loader::forget_alias('Transport');
* </code>
*
* @param string $alias * @param string $alias
* @return void * @return void
*/ */
......
laravel/redirect.php
View file @ 0c4018ec
...@@ -5,14 +5,6 @@ class Redirect extends Response { ...@@ -5,14 +5,6 @@ class Redirect extends Response {
/** /**
* Create a redirect response. * Create a redirect response.
* *
* <code>
* // Create a redirect response to a given URL
* return Redirect::to('user/profile');
*
* // Create a redirect with a given status code
* return Redirect::to('user/profile', 301);
* </code>
*
* @param string $url * @param string $url
* @param int $status * @param int $status
* @param bool $https * @param bool $https
...@@ -28,11 +20,6 @@ class Redirect extends Response { ...@@ -28,11 +20,6 @@ class Redirect extends Response {
/** /**
* Create a redirect response to a HTTPS URL. * Create a redirect response to a HTTPS URL.
* *
* <code>
* // Create a redirect response to a HTTPS URL
* return Redirect::to_secure('user/profile');
* </code>
*
* @param string $url * @param string $url
* @param int $status * @param int $status
* @return Response * @return Response
...@@ -47,11 +34,6 @@ class Redirect extends Response { ...@@ -47,11 +34,6 @@ class Redirect extends Response {
* *
* This is useful for passing status messages or other temporary data to the next request. * This is useful for passing status messages or other temporary data to the next request.
* *
* <code>
* // Create a redirect and flash a messages to the session
* return Redirect::to_profile()->with('message', 'Welcome Back!');
* </code>
*
* @param string $key * @param string $key
* @param mixed $value * @param mixed $value
* @return Response * @return Response
...@@ -70,17 +52,6 @@ class Redirect extends Response { ...@@ -70,17 +52,6 @@ class Redirect extends Response {
/** /**
* Magic Method to handle creation of redirects to named routes. * Magic Method to handle creation of redirects to named routes.
*
* <code>
* // Create a redirect to the "profile" route
* return Redirect::to_profile();
*
* // Create a redirect to the "profile" route with wildcard segments
* return Redirect::to_profile(array($username));
*
* // Create a redirect to the "profile" route using HTTPS
* return Redirect::to_secure_profile();
* </code>
*/ */
public static function __callStatic($method, $parameters) public static function __callStatic($method, $parameters)
{ {
......
laravel/request.php
View file @ 0c4018ec
...@@ -7,15 +7,44 @@ class Request { ...@@ -7,15 +7,44 @@ class Request {
* *
* @var Routing\Route * @var Routing\Route
*/ */
public static $route; public $route;
/** /**
* The request data key that is used to indicate the spoofed request method. * The $_SERVER array for the current request.
*
* @var array
*/
protected $server;
/**
* The $_POST array for the current request.
*
* @var array
*/
protected $post;
/**
* The request data key that is used to indicate a spoofed request method.
* *
* @var string * @var string
*/ */
const spoofer = '__spoofer'; const spoofer = '__spoofer';
/**
* Create a new request instance.
*
* @param URI $uri
* @param array $server
* @param array $post
* @return void
*/
public function __construct(URI $uri, $server, $post)
{
$this->uri = $uri;
$this->post = $post;
$this->server = $server;
}
/** /**
* Get the URI for the current request. * Get the URI for the current request.
* *
...@@ -23,9 +52,9 @@ class Request { ...@@ -23,9 +52,9 @@ class Request {
* *
* @return string * @return string
*/ */
public static function uri() public function uri()
{ {
return URI::get(); return $this->uri->get();
} }
/** /**
...@@ -33,19 +62,11 @@ class Request { ...@@ -33,19 +62,11 @@ class Request {
* *
* The format is determined by essentially taking the "extension" of the URI. * The format is determined by essentially taking the "extension" of the URI.
* *
* <code>
* // Returns "html" for a request to "/user/profile"
* $format = Request::format();
*
* // Returns "json" for a request to "/user/profile.json"
* $format = Request::format();
* </code>
*
* @return string * @return string
*/ */
public static function format() public function format()
{ {
return (($extension = pathinfo(URI::get(), PATHINFO_EXTENSION)) !== '') ? $extension : 'html'; return (($extension = pathinfo($this->uri->get(), PATHINFO_EXTENSION)) !== '') ? $extension : 'html';
} }
/** /**
...@@ -57,9 +78,9 @@ class Request { ...@@ -57,9 +78,9 @@ class Request {
* *
* @return string * @return string
*/ */
public static function method() public function method()
{ {
return (static::spoofed()) ? $_POST[Request::spoofer] : $_SERVER['REQUEST_METHOD']; return ($this->spoofed()) ? $this->post[Request::spoofer] : $this->server['REQUEST_METHOD'];
} }
/** /**
...@@ -67,21 +88,13 @@ class Request { ...@@ -67,21 +88,13 @@ class Request {
* *
* Like most array retrieval methods, a default value may be specified. * Like most array retrieval methods, a default value may be specified.
* *
* <code>
* // Get an item from the $_SERVER array
* $value = Request::server('http_x_requested_for');
*
* // Get an item from the $_SERVER array or return a default value
* $value = Request::server('http_x_requested_for', '127.0.0.1');
* </code>
*
* @param string $key * @param string $key
* @param mixed $default * @param mixed $default
* @return string * @return string
*/ */
public static function server($key = null, $default = null) public function server($key = null, $default = null)
{ {
return Arr::get($_SERVER, strtoupper($key), $default); return Arr::get($this->server, strtoupper($key), $default);
} }
/** /**
...@@ -93,28 +106,18 @@ class Request { ...@@ -93,28 +106,18 @@ class Request {
* *
* @return bool * @return bool
*/ */
public static function spoofed() public function spoofed()
{ {
return is_array($_POST) and array_key_exists(Request::spoofer, $_POST); return is_array($this->post) and array_key_exists(Request::spoofer, $this->post);
} }
/** /**
* Get the requestor's IP address. * Get the requestor's IP address.
* *
* A default may be passed and will be returned in the event the IP can't be determined
*
* <code>
* // Get the requestor's IP address
* $ip = Request::ip();
*
* // Get the requestor's IP address or return a default value
* $ip = Request::ip('127.0.0.1');
* </code>
*
* @param mixed $default * @param mixed $default
* @return string * @return string
*/ */
public static function ip($default = '0.0.0.0') public function ip($default = '0.0.0.0')
{ {
if (isset($_SERVER['HTTP_X_FORWARDED_FOR'])) if (isset($_SERVER['HTTP_X_FORWARDED_FOR']))
{ {
...@@ -140,9 +143,9 @@ class Request { ...@@ -140,9 +143,9 @@ class Request {
* *
* @return string * @return string
*/ */
public static function protocol() public function protocol()
{ {
return (isset($_SERVER['HTTPS']) and $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http'; return (isset($this->server['HTTPS']) and $this->server['HTTPS'] !== 'off') ? 'https' : 'http';
} }
/** /**
...@@ -150,9 +153,9 @@ class Request { ...@@ -150,9 +153,9 @@ class Request {
* *
* @return bool * @return bool
*/ */
public static function secure() public function secure()
{ {
return static::protocol() == 'https'; return $this->protocol() == 'https';
} }
/** /**
...@@ -160,11 +163,11 @@ class Request { ...@@ -160,11 +163,11 @@ class Request {
* *
* @return bool * @return bool
*/ */
public static function ajax() public function ajax()
{ {
if ( ! isset($_SERVER['HTTP_X_REQUESTED_WITH'])) return false; if ( ! isset($this->server['HTTP_X_REQUESTED_WITH'])) return false;
return strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) === 'xmlhttprequest'; return strtolower($this->server['HTTP_X_REQUESTED_WITH']) === 'xmlhttprequest';
} }
/** /**
...@@ -172,6 +175,6 @@ class Request { ...@@ -172,6 +175,6 @@ class Request {
* *
* @return Route * @return Route
*/ */
public function route() { return static::$route; } public function route() { return $this->route; }
} }
\ No newline at end of file
laravel/response.php
View file @ 0c4018ec
...@@ -95,14 +95,6 @@ class Response { ...@@ -95,14 +95,6 @@ class Response {
/** /**
* Create a new response instance. * Create a new response instance.
* *
* <code>
* // Create a response instance
* return Response::make('Hello World');
*
* // Create a response instance with a given status code
* return Response::make('Hello World', 200);
* </code>
*
* @param mixed $content * @param mixed $content
* @param int $status * @param int $status
* @param array $headers * @param array $headers
...@@ -116,14 +108,6 @@ class Response { ...@@ -116,14 +108,6 @@ class Response {
/** /**
* Create a new response instance containing a view. * Create a new response instance containing a view.
* *
* <code>
* // Create a new response instance with view content
* return Response::view('home.index');
*
* // Create a new response instance with a view and bound data
* return Response::view('home.index', array('name' => 'Fred'));
* </code>
*
* @param string $view * @param string $view
* @param array $data * @param array $data
* @return Response * @return Response
...@@ -136,14 +120,6 @@ class Response { ...@@ -136,14 +120,6 @@ class Response {
/** /**
* Create a new response instance containing a named view. * Create a new response instance containing a named view.
* *
* <code>
* // Create a new response instance with a named view
* return Response::with('layout');
*
* // Create a new response instance with a named view and bound data
* return Response::with('layout', array('name' => 'Fred'));
* </code>
*
* @param string $name * @param string $name
* @param array $data * @param array $data
* @return Response * @return Response
...@@ -160,11 +136,6 @@ class Response { ...@@ -160,11 +136,6 @@ class Response {
* *
* Note: The specified error code should correspond to a view in your views/error directory. * Note: The specified error code should correspond to a view in your views/error directory.
* *
* <code>
* // Create an error response for status 500
* return Response::error('500');
* </code>
*
* @param int $code * @param int $code
* @param array $data * @param array $data
* @return Response * @return Response
...@@ -272,14 +243,6 @@ class Response { ...@@ -272,14 +243,6 @@ class Response {
/** /**
* Magic Method for handling the dynamic creation of Responses containing named views. * Magic Method for handling the dynamic creation of Responses containing named views.
*
* <code>
* // Create a Response instance with the "layout" named view
* $response = Response::with_layout();
*
* // Create a Response instance with the "layout" named view and bound data
* $response = Response::with_layout(array('name' => 'Fred'));
* </code>
*/ */
public static function __callStatic($method, $parameters) public static function __callStatic($method, $parameters)
{ {
......
laravel/routing/loader.php
View file @ 0c4018ec
...@@ -43,9 +43,6 @@ class Loader { ...@@ -43,9 +43,6 @@ class Loader {
/** /**
* Load the applicable routes for a given URI. * Load the applicable routes for a given URI.
* *
* The application route directory will be checked for nested route files and an
* array of all applicable routes will be returned based on the URI segments.
*
* @param string $uri * @param string $uri
* @return array * @return array
*/ */
...@@ -80,9 +77,6 @@ class Loader { ...@@ -80,9 +77,6 @@ class Loader {
/** /**
* Get every route defined for the application. * Get every route defined for the application.
* *
* For fast performance, if the routes have already been loaded once, they will not
* be loaded again, and the same routes will be returned on subsequent calls.
*
* @return array * @return array
*/ */
public function everything() public function everything()
......
laravel/routing/router.php
View file @ 0c4018ec
...@@ -67,13 +67,12 @@ class Router { ...@@ -67,13 +67,12 @@ class Router {
/** /**
* Search the routes for the route matching a request method and URI. * Search the routes for the route matching a request method and URI.
* *
* If no route can be found, the application controllers will be searched. * @param Request $request
*
* @param string $method * @param string $method
* @param string $uri * @param string $uri
* @return Route * @return Route
*/ */
public function route($method, $uri) public function route(Request $request, $method, $uri)
{ {
$routes = $this->loader->load($uri); $routes = $this->loader->load($uri);
...@@ -85,7 +84,7 @@ class Router { ...@@ -85,7 +84,7 @@ class Router {
// no need to spin through all of the routes. // no need to spin through all of the routes.
if (isset($routes[$destination])) if (isset($routes[$destination]))
{ {
return Request::$route = new Route($destination, $routes[$destination], array()); return $request->route = new Route($destination, $routes[$destination], array());
} }
foreach ($routes as $keys => $callback) foreach ($routes as $keys => $callback)
...@@ -101,20 +100,18 @@ class Router { ...@@ -101,20 +100,18 @@ class Router {
if (preg_match('#^'.$this->translate_wildcards($key).'$#', $destination)) if (preg_match('#^'.$this->translate_wildcards($key).'$#', $destination))
{ {
return Request::$route = new Route($keys, $callback, $this->parameters($destination, $key)); return $request->route = new Route($keys, $callback, $this->parameters($destination, $key));
} }
} }
} }
} }
return Request::$route = $this->route_to_controller($method, $uri, $destination); return $request->route = $this->route_to_controller($method, $uri, $destination);
} }
/** /**
* Attempt to find a controller for the incoming request. * Attempt to find a controller for the incoming request.
* *
* If no corresponding controller can be found, NULL will be returned.
*
* @param string $method * @param string $method
* @param string $uri * @param string $uri
* @param string $destination * @param string $destination
......
laravel/security/auth.php
View file @ 0c4018ec
...@@ -19,6 +19,13 @@ class Auth { ...@@ -19,6 +19,13 @@ class Auth {
*/ */
protected $session; protected $session;
/**
* The key used when storing the user ID in the session.
*
* @var string
*/
const user_key = 'laravel_user_id';
/** /**
* Create a new authenticator instance. * Create a new authenticator instance.
* *
...@@ -51,7 +58,7 @@ class Auth { ...@@ -51,7 +58,7 @@ class Auth {
{ {
if ( ! is_null($this->user)) return $this->user; if ( ! is_null($this->user)) return $this->user;
return $this->user = call_user_func(Config::get('auth.user'), $this->session->get('laravel_user_id')); return $this->user = call_user_func(Config::get('auth.user'), $this->session->get(Auth::user_key));
} }
/** /**
...@@ -88,7 +95,7 @@ class Auth { ...@@ -88,7 +95,7 @@ class Auth {
{ {
$this->user = $user; $this->user = $user;
$this->session->put('laravel_user_id', $user->id); $this->session->put(Auth::user_key, $user->id);
} }
/** /**
...@@ -102,7 +109,7 @@ class Auth { ...@@ -102,7 +109,7 @@ class Auth {
$this->user = null; $this->user = null;
$this->session->forget('laravel_user_id'); $this->session->forget(Auth::user_key);
} }
} }
\ No newline at end of file
laravel/session/drivers/cookie.php
View file @ 0c4018ec
<?php namespace Laravel\Session\Drivers; <?php namespace Laravel\Session\Drivers;
use Laravel\Cookie as C;
use Laravel\Security\Crypter; use Laravel\Security\Crypter;
class Cookie implements Driver { class Cookie implements Driver {
...@@ -16,15 +15,24 @@ class Cookie implements Driver { ...@@ -16,15 +15,24 @@ class Cookie implements Driver {
*/ */
private $crypter; private $crypter;
/**
* The cookie manager instance.
*
* @var Cookie
*/
private $cookies;
/** /**
* Create a new Cookie session driver instance. * Create a new Cookie session driver instance.
* *
* @param Crypter $crypter * @param Crypter $crypter
* @param Cookie $cookies
* @return void * @return void
*/ */
public function __construct(Crypter $crypter) public function __construct(Crypter $crypter, \Laravel\Cookie $cookies)
{ {
$this->crypter = $crypter; $this->crypter = $crypter;
$this->cookies = $cookies;
} }
/** /**
...@@ -37,9 +45,9 @@ class Cookie implements Driver { ...@@ -37,9 +45,9 @@ class Cookie implements Driver {
*/ */
public function load($id) public function load($id)
{ {
if (C::has('session_payload')) if ($this->cookies->has('session_payload'))
{ {
return unserialize($this->crypter->decrypt(C::get('session_payload'))); return unserialize($this->crypter->decrypt($this->cookies->get('session_payload')));
} }
} }
...@@ -56,7 +64,7 @@ class Cookie implements Driver { ...@@ -56,7 +64,7 @@ class Cookie implements Driver {
$payload = $this->crypter->encrypt(serialize($session)); $payload = $this->crypter->encrypt(serialize($session));
C::put('session_payload', $payload, $lifetime, $path, $domain); $this->cookies->put('session_payload', $payload, $lifetime, $path, $domain);
} }
/** /**
...@@ -67,7 +75,7 @@ class Cookie implements Driver { ...@@ -67,7 +75,7 @@ class Cookie implements Driver {
*/ */
public function delete($id) public function delete($id)
{ {
C::forget('session_payload'); $this->cookies->forget('session_payload');
} }
} }
\ No newline at end of file
laravel/session/manager.php
View file @ 0c4018ec
...@@ -91,10 +91,16 @@ class Manager { ...@@ -91,10 +91,16 @@ class Manager {
* *
* @param Payload $payload * @param Payload $payload
* @param array $config * @param array $config
* @param array $flash
* @return void * @return void
*/ */
public function close(Payload $payload, $config) public function close(Payload $payload, $config, $flash = array())
{ {
foreach ($flash as $key => $value)
{
$this->driver->flash($key, $value);
}
$this->driver->save($payload->age(), $config); $this->driver->save($payload->age(), $config);
$this->transporter->put($payload->session['id'], $config); $this->transporter->put($payload->session['id'], $config);
......
laravel/session/transporters/cookie.php
View file @ 0c4018ec
<?php namespace Laravel\Session\Transporters; <?php namespace Laravel\Session\Transporters;
use Laravel\Cookie as C;
class Cookie implements Transporter { class Cookie implements Transporter {
/**
* The cookie manager instance.
*
* @var Cookie
*/
protected $cookies;
/**
* Create a new cookie session transporter instance.
*
* @param Cookie $cookie
* @return void
*/
public function __construct(\Laravel\Cookie $cookies)
{
$this->cookies = $cookies;
}
/** /**
* Get the session identifier for the request. * Get the session identifier for the request.
* *
...@@ -12,7 +28,7 @@ class Cookie implements Transporter { ...@@ -12,7 +28,7 @@ class Cookie implements Transporter {
*/ */
public function get($config) public function get($config)
{ {
return C::get('laravel_session'); return $this->cookies->get('laravel_session');
} }
/** /**
...@@ -26,7 +42,7 @@ class Cookie implements Transporter { ...@@ -26,7 +42,7 @@ class Cookie implements Transporter {
{ {
$minutes = ($config['expire_on_close']) ? 0 : $config['lifetime']; $minutes = ($config['expire_on_close']) ? 0 : $config['lifetime'];
C::put('laravel_session', $id, $minutes, $config['path'], $config['domain']); $this->cookies->put('laravel_session', $id, $minutes, $config['path'], $config['domain']);
} }
} }
\ No newline at end of file
laravel/uri.php
View file @ 0c4018ec
...@@ -9,7 +9,25 @@ class URI { ...@@ -9,7 +9,25 @@ class URI {
* *
* @var string * @var string
*/ */
protected static $uri; protected $uri;
/**
* The $_SERVER array for the current request.
*
* @var array
*/
protected $server;
/**
* Create a new URI parser instance.
*
* @param array $server
* @return void
*/
public function __construct($server)
{
$this->server = $server;
}
/** /**
* Determine the request URI. * Determine the request URI.
...@@ -23,39 +41,28 @@ class URI { ...@@ -23,39 +41,28 @@ class URI {
* *
* @return string * @return string
*/ */
public static function get() public function get()
{ {
if ( ! is_null(static::$uri)) return static::$uri; if ( ! is_null($this->uri)) return $this->uri;
if (($uri = static::from_server()) === false) if (($uri = $this->from_server()) === false)
{ {
throw new \Exception('Malformed request URI. Request terminated.'); throw new \Exception('Malformed request URI. Request terminated.');
} }
return static::$uri = static::format(static::clean($uri)); return $this->uri = $this->format($this->clean($uri));
} }
/** /**
* Get a given URI segment from the URI for the current request. * Get a given URI segment from the URI for the current request.
* *
* <code>
* // Get the first segment from the request URI
* $first = Request::uri()->segment(1);
*
* // Get the second segment or return a default value if it doesn't exist
* $second = Request::uri()->segment(2, 'Taylor');
*
* // Get all of the segments for the request URI
* $segments = Request::uri()->segment();
* </code>
*
* @param int $segment * @param int $segment
* @param mixed $default * @param mixed $default
* @return string * @return string
*/ */
public static function segment($segment = null, $default = null) public function segment($segment = null, $default = null)
{ {
$segments = Arr::without(explode('/', static::get()), array('')); $segments = Arr::without(explode('/', $this->get()), array(''));
if ( ! is_null($segment)) $segment = $segment - 1; if ( ! is_null($segment)) $segment = $segment - 1;
...@@ -67,20 +74,20 @@ class URI { ...@@ -67,20 +74,20 @@ class URI {
* *
* @return string * @return string
*/ */
protected static function from_server() protected function from_server()
{ {
// If the PATH_INFO $_SERVER element is set, we will use since it contains // If the PATH_INFO $_SERVER element is set, we will use since it contains
// the request URI formatted perfectly for Laravel's routing engine. // the request URI formatted perfectly for Laravel's routing engine.
if (isset($_SERVER['PATH_INFO'])) if (isset($this->server['PATH_INFO']))
{ {
return $_SERVER['PATH_INFO']; return $this->server['PATH_INFO'];
} }
// If the REQUEST_URI is set, we need to extract the URL path since this // If the REQUEST_URI is set, we need to extract the URL path since this
// should return the URI formatted in a manner similar to PATH_INFO. // should return the URI formatted in a manner similar to PATH_INFO.
elseif (isset($_SERVER['REQUEST_URI'])) elseif (isset($this->server['REQUEST_URI']))
{ {
return parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH); return parse_url($this->server['REQUEST_URI'], PHP_URL_PATH);
} }
throw new \Exception('Unable to determine the request URI.'); throw new \Exception('Unable to determine the request URI.');
...@@ -95,7 +102,7 @@ class URI { ...@@ -95,7 +102,7 @@ class URI {
* @param string $uri * @param string $uri
* @return string * @return string
*/ */
protected static function clean($uri) protected function clean($uri)
{ {
foreach (array(parse_url(Config::get('application.url'), PHP_URL_PATH), '/index.php') as $value) foreach (array(parse_url(Config::get('application.url'), PHP_URL_PATH), '/index.php') as $value)
{ {
...@@ -113,7 +120,7 @@ class URI { ...@@ -113,7 +120,7 @@ class URI {
* @param string $uri * @param string $uri
* @return string * @return string
*/ */
protected static function format($uri) protected function format($uri)
{ {
return (($uri = trim($uri, '/')) == '') ? '/' : $uri; return (($uri = trim($uri, '/')) == '') ? '/' : $uri;
} }
......
laravel/url.php
View file @ 0c4018ec
...@@ -7,14 +7,6 @@ class URL { ...@@ -7,14 +7,6 @@ class URL {
* *
* If the given URL is already well-formed, it will be returned unchanged. * If the given URL is already well-formed, it will be returned unchanged.
* *
* <code>
* // Generate an application URL from a given URI
* echo URL::to('user/profile');
*
* // Generate an application URL with HTTPS
* echo URL::to('user/profile', true);
* </code>
*
* @param string $url * @param string $url
* @param bool $https * @param bool $https
* @return string * @return string
...@@ -33,11 +25,6 @@ class URL { ...@@ -33,11 +25,6 @@ class URL {
/** /**
* Generate an application URL with HTTPS. * Generate an application URL with HTTPS.
* *
* <code>
* // Generate an application URL with HTTPS
* echo URL::to_secure('user/profile');
* </code>
*
* @param string $url * @param string $url
* @return string * @return string
*/ */
...@@ -52,21 +39,13 @@ class URL { ...@@ -52,21 +39,13 @@ class URL {
* The index file will not be added to asset URLs. If the HTTPS option is not * The index file will not be added to asset URLs. If the HTTPS option is not
* specified, HTTPS will be used when the active request is also using HTTPS. * specified, HTTPS will be used when the active request is also using HTTPS.
* *
* <code>
* // Generate a URL to an asset
* echo URL::to_asset('img/picture.jpg');
*
* // Generate a URL to a an asset with HTTPS
* echo URL::to_asset('img/picture.jpg', true);
* </code>
*
* @param string $url * @param string $url
* @param bool $https * @param bool $https
* @return string * @return string
*/ */
public static function to_asset($url, $https = null) public static function to_asset($url, $https = null)
{ {
if (is_null($https)) $https = Request::secure(); if (is_null($https)) $https = IoC::container()->resolve('laravel.request')->secure();
return str_replace('index.php/', '', static::to($url, $https)); return str_replace('index.php/', '', static::to($url, $https));
} }
...@@ -78,16 +57,6 @@ class URL { ...@@ -78,16 +57,6 @@ class URL {
* parameter to the method. The values of this array will be used to fill the * parameter to the method. The values of this array will be used to fill the
* wildcard segments of the route URI. * wildcard segments of the route URI.
* *
* Optional parameters will be convereted to spaces if no parameter values are specified.
*
* <code>
* // Generate the URL for a given route
* echo URL::to_route('profile');
*
* // Generate the URL for a given route with wildcard segments
* echo URL::to_route('profile', array($username));
* </code>
*
* @param string $name * @param string $name
* @param array $parameters * @param array $parameters
* @param bool $https * @param bool $https
...@@ -119,14 +88,6 @@ class URL { ...@@ -119,14 +88,6 @@ class URL {
/** /**
* Generate a HTTPS URL from a route name. * Generate a HTTPS URL from a route name.
* *
* <code>
* // Generate the URL for a route with HTTPS
* echo URL::to_secure_route('profile');
*
* // Generate the URL for a route with HTTPS and wildcard segments
* echo URL::to_secure_route('profile', array($username));
* </code>
*
* @param string $name * @param string $name
* @param array $parameters * @param array $parameters
* @return string * @return string
...@@ -158,17 +119,6 @@ class URL { ...@@ -158,17 +119,6 @@ class URL {
/** /**
* Magic Method for dynamically creating URLs to named routes. * Magic Method for dynamically creating URLs to named routes.
*
* <code>
* // Generate the URL for the "profile" named route
* echo URL::to_profile();
*
* // Generate the URL for the "profile" named route with wildcard segments
* echo URL::to_profile(array($username));
*
* // Generate the URL for the "profile" named route with HTTPS
* echo URL::to_secure_profile();
* </code>
*/ */
public static function __callStatic($method, $parameters) public static function __callStatic($method, $parameters)
{ {
......
laravel/validation/messages.php
View file @ 0c4018ec
...@@ -26,11 +26,6 @@ class Messages { ...@@ -26,11 +26,6 @@ class Messages {
* *
* Duplicate messages will not be added. * Duplicate messages will not be added.
* *
* <code>
* // Add a message to the message collector
* $messages->add('email', 'The e-mail address is invalid.');
* </code>
*
* @param string $key * @param string $key
* @param string $message * @param string $message
* @return void * @return void
...@@ -57,16 +52,6 @@ class Messages { ...@@ -57,16 +52,6 @@ class Messages {
/** /**
* Get the first message for a given key. * Get the first message for a given key.
* *
* Optionally, a format may be specified for the returned message.
*
* <code>
* // Get the first message for the e-mail attribute
* echo $messages->first('email');
*
* // Get the first message for the e-mail attribute using a format
* echo $messages->first('email', '<p>:message</p>');
* </code>
*
* @param string $key * @param string $key
* @param string $format * @param string $format
* @return string * @return string
...@@ -79,16 +64,6 @@ class Messages { ...@@ -79,16 +64,6 @@ class Messages {
/** /**
* Get all of the messages for a key. * Get all of the messages for a key.
* *
* Optionally, a format may be specified for the returned messages.
*
* <code>
* // Get all of the messages for the e-mail attribute
* $messages = $messages->get('email');
*
* // Get all of the messages for the e-mail attribute using a format
* $messages = $messages->get('email', '<p>:message</p>');
* </code>
*
* @param string $key * @param string $key
* @param string $format * @param string $format
* @return array * @return array
...@@ -103,11 +78,6 @@ class Messages { ...@@ -103,11 +78,6 @@ class Messages {
/** /**
* Get all of the messages for every key. * Get all of the messages for every key.
* *
* <code>
* // Get all of the error messages using a format
* $messages = $messages->all('<p>:message</p>');
* </code>
*
* @param string $format * @param string $format
* @return array * @return array
*/ */
......
laravel/validation/validator.php
View file @ 0c4018ec
...@@ -457,7 +457,7 @@ class Validator { ...@@ -457,7 +457,7 @@ class Validator {
// the default error message for the appropriate units. // the default error message for the appropriate units.
if (in_array($rule, $this->size_rules) and ! $this->has_rule($attribute, $this->numeric_rules)) if (in_array($rule, $this->size_rules) and ! $this->has_rule($attribute, $this->numeric_rules))
{ {
return (array_key_exists($attribute, Input::files())) return (array_key_exists($attribute, IoC::container()->resolve('laravel.input')->files()))
? rtrim($message, '.').' '.Lang::line('validation.kilobytes')->get($this->language).'.' ? rtrim($message, '.').' '.Lang::line('validation.kilobytes')->get($this->language).'.'
: rtrim($message, '.').' '.Lang::line('validation.characters')->get($this->language).'.'; : rtrim($message, '.').' '.Lang::line('validation.characters')->get($this->language).'.';
} }
......
laravel/view.php
View file @ 0c4018ec
<?php namespace Laravel; <?php namespace Laravel;
class View { class View_Factory {
/** /**
* The name of the view. * The directory containing the views.
* *
* @var string * @var string
*/ */
public $view; public $path;
/**
* The view data.
*
* @var array
*/
public $data;
/** /**
* The path to the view on disk. * The view composer instance.
* *
* @var string * @var View_Composer
*/ */
protected $path; protected $composer;
/** /**
* Create a new view instance. * Create a new view factory instance.
* *
* @param string $view * @param View_Composer $composer
* @param array $data * @param string $path
* @return void * @return void
*/ */
protected function __construct($view, $data = array()) public function __construct(View_Composer $composer, $path)
{ {
$this->view = $view; $this->path = $path;
$this->data = $data; $this->composer = $composer;
$this->path = $this->path($view);
} }
/** /**
* Create a new view instance. * Create a new view instance.
* *
* The name of the view given to this method should correspond to a view
* within your application views directory. Dots or slashes may used to
* reference views within sub-directories.
*
* @param string $view * @param string $view
* @param array $data * @param array $data
* @return View * @return View
*/ */
public static function make($view, $data = array()) public function make($view, $data = array())
{ {
return new static($view, $data); return new View($this, $this->composer, $view, $data, $this->path($view));
} }
/** /**
...@@ -54,23 +50,15 @@ class View { ...@@ -54,23 +50,15 @@ class View {
* *
* View names are defined in the application composers file. * View names are defined in the application composers file.
* *
* <code>
* // Create a new named view instance
* $view = View::of('layout');
*
* // Create a new named view instance with bound data
* $view = View::of('layout', array('name' => 'Fred'));
* </code>
*
* @param string $name * @param string $name
* @param array $data * @param array $data
* @return View * @return View
*/ */
public static function of($name, $data = array()) protected function of($name, $data = array())
{ {
if ( ! is_null($view = Composer::name($name))) if ( ! is_null($view = $this->composer->name($name)))
{ {
return new static($view, $data); return $this->make($view, $data);
} }
throw new \Exception("Named view [$name] is not defined."); throw new \Exception("Named view [$name] is not defined.");
...@@ -86,11 +74,11 @@ class View { ...@@ -86,11 +74,11 @@ class View {
{ {
$view = str_replace('.', '/', $view); $view = str_replace('.', '/', $view);
if (file_exists($path = VIEW_PATH.$view.'.blade'.EXT)) if (file_exists($path = $this->path.$view.BLADE_EXT))
{ {
return $path; return $path;
} }
elseif (file_exists($path = VIEW_PATH.$view.EXT)) elseif (file_exists($path = $this->path.$view.EXT))
{ {
return $path; return $path;
} }
...@@ -98,6 +86,162 @@ class View { ...@@ -98,6 +86,162 @@ class View {
throw new \Exception('View ['.$view.'] does not exist.'); throw new \Exception('View ['.$view.'] does not exist.');
} }
/**
* Magic Method for handling the dynamic creation of named views.
*/
public function __call($method, $parameters)
{
if (strpos($method, 'of_') === 0)
{
return $this->of(substr($method, 3), Arr::get($parameters, 0, array()));
}
}
}
class View_Composer {
/**
* The view composers.
*
* @var array
*/
protected $composers;
/**
* Create a new view composer instance.
*
* @param array $composers
* @return void
*/
public function __construct($composers)
{
$this->composers = $composers;
}
/**
* Find the key for a view by name.
*
* @param string $name
* @return string
*/
public function name($name)
{
foreach ($this->composers as $key => $value)
{
if ($name === $value or (isset($value['name']) and $name === $value['name'])) { return $key; }
}
}
/**
* Call the composer for the view instance.
*
* @param View $view
* @return void
*/
public function compose(View $view)
{
if (isset($this->composers['shared'])) call_user_func($this->composers['shared'], $view);
if (isset($this->composers[$view->view]))
{
foreach ((array) $this->composers[$view->view] as $key => $value)
{
if ($value instanceof \Closure) return call_user_func($value, $view);
}
}
}
}
class View {
/**
* The name of the view.
*
* @var string
*/
public $view;
/**
* The view data.
*
* @var array
*/
public $data;
/**
* The path to the view on disk.
*
* @var string
*/
protected $path;
/**
* The view composer instance.
*
* @var View_Composer
*/
protected $composer;
/**
* The view factory instance, which is used to create sub-views.
*
* @var View_Factory
*/
protected $factory;
/**
* Create a new view instance.
*
* @param View_Factory $factory
* @param View_Composer $composer
* @param string $view
* @param array $data
* @param string $path
* @return void
*/
public function __construct(View_Factory $factory, View_Composer $composer, $view, $data, $path)
{
$this->view = $view;
$this->data = $data;
$this->path = $path;
$this->factory = $factory;
$this->composer = $composer;
}
/**
* Create a new view instance.
*
* The name of the view given to this method should correspond to a view
* within your application views directory. Dots or slashes may used to
* reference views within sub-directories.
*
* @param string $view
* @param array $data
* @return View
*/
public static function make($view, $data = array())
{
return IoC::container()->resolve('laravel.view')->make($view, $data);
}
/**
* Create a new view instance from a view name.
*
* View names are defined in the application composers file.
*
* @param string $name
* @param array $data
* @return View
*/
protected function of($name, $data = array())
{
return IoC::container()->resolve('laravel.view')->of($name, $data);
}
/** /**
* Get the evaluated string content of the view. * Get the evaluated string content of the view.
* *
...@@ -108,7 +252,7 @@ class View { ...@@ -108,7 +252,7 @@ class View {
*/ */
public function render() public function render()
{ {
Composer::compose($this); $this->composer->compose($this);
foreach ($this->data as &$data) foreach ($this->data as &$data)
{ {
...@@ -117,9 +261,9 @@ class View { ...@@ -117,9 +261,9 @@ class View {
ob_start() and extract($this->data, EXTR_SKIP); ob_start() and extract($this->data, EXTR_SKIP);
$content = ($this->bladed()) ? Blade::parse($this->path) : file_get_contents($this->path); $file = ($this->bladed()) ? $this->compile() : $this->path;
eval('?>'.$content); try { include $file; } catch (Exception $e) { ob_get_clean(); throw $e; }
return ob_get_clean(); return ob_get_clean();
} }
...@@ -135,15 +279,28 @@ class View { ...@@ -135,15 +279,28 @@ class View {
} }
/** /**
* Add a view instance to the view data. * Compile the Bladed view and return the path to the compiled view.
* *
* <code> * If view will only be re-compiled if the view has been modified since the last compiled
* // Bind a partial view to the view data * version of the view was created or no compiled view exists. Otherwise, the path will
* $view->partial('footer', 'partials/footer'); * be returned without re-compiling.
* *
* // Bind a partial view to the view data with it's own bound data * @return string
* $view->partial('footer', 'partials/footer', array('name' => 'Fred')); */
* </code> protected function compile()
{
$compiled = $this->factory->path.'compiled/'.md5($this->view);
if ((file_exists($compiled) and filemtime($this->path) > filemtime($compiled)) or ! file_exists($compiled))
{
file_put_contents($compiled, Blade::parse($this->path));
}
return $path;
}
/**
* Add a view instance to the view data.
* *
* @param string $key * @param string $key
* @param string $view * @param string $view
...@@ -152,7 +309,7 @@ class View { ...@@ -152,7 +309,7 @@ class View {
*/ */
public function partial($key, $view, $data = array()) public function partial($key, $view, $data = array())
{ {
return $this->with($key, new static($view, $data)); return $this->with($key, $this->factory->make($view, $data));
} }
/** /**
...@@ -160,11 +317,6 @@ class View { ...@@ -160,11 +317,6 @@ class View {
* *
* Bound data will be available to the view as variables. * Bound data will be available to the view as variables.
* *
* <code>
* // Bind a piece of data to a view instance
* $view->with('name', 'Fred');
* </code>
*
* @param string $key * @param string $key
* @param mixed $value * @param mixed $value
* @return View * @return View
...@@ -172,6 +324,7 @@ class View { ...@@ -172,6 +324,7 @@ class View {
public function with($key, $value) public function with($key, $value)
{ {
$this->data[$key] = $value; $this->data[$key] = $value;
return $this; return $this;
} }
...@@ -207,76 +360,4 @@ class View { ...@@ -207,76 +360,4 @@ class View {
unset($this->data[$key]); unset($this->data[$key]);
} }
/**
* Magic Method for handling the dynamic creation of named views.
*
* <code>
* // Create an instance of the "layout" named view
* $view = View::of_layout();
*
* // Create an instance of the "layout" named view with bound data
* $view = View::of_layout(array('name' => 'Fred'));
* </code>
*/
public static function __callStatic($method, $parameters)
{
if (strpos($method, 'of_') === 0)
{
return static::of(substr($method, 3), Arr::get($parameters, 0, array()));
}
}
}
/**
* The view composer class is responsible for calling the composer on a view and
* searching through the view composers for a given view name.
*/
class Composer {
/**
* The view composers.
*
* @var array
*/
public static $composers;
/**
* Find the key for a view by name.
*
* @param string $name
* @return string
*/
public static function name($name)
{
foreach (static::$composers as $key => $value)
{
if ($name === $value or (isset($value['name']) and $name === $value['name'])) { return $key; }
}
}
/**
* Call the composer for the view instance.
*
* @param View $view
* @return void
*/
public static function compose(View $view)
{
if (isset(static::$composers['shared'])) call_user_func(static::$composers['shared'], $view);
if (isset(static::$composers[$view->view]))
{
foreach ((array) static::$composers[$view->view] as $key => $value)
{
if ($value instanceof \Closure) return call_user_func($value, $view);
}
}
}
} }
\ No newline at end of file
/**
* Load the application's composers into the composers property.
*/
Composer::$composers = require APP_PATH.'composers'.EXT;
\ No newline at end of file
public/index.php
View file @ 0c4018ec
...@@ -44,5 +44,3 @@ $public = __DIR__; ...@@ -44,5 +44,3 @@ $public = __DIR__;
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
*/ */
require $laravel.'/laravel.php'; require $laravel.'/laravel.php';
echo number_format((microtime(true) - START_TIME) * 1000, 2);
\ No newline at end of file
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