Commit 7dae4827 authored by Taylor Otwell's avatar Taylor Otwell

Merge branch 'develop' into staging

parents d667a15e 343d1327
......@@ -94,19 +94,6 @@ return array(
'language' => 'en',
/*
|--------------------------------------------------------------------------
| Supported Languages
|--------------------------------------------------------------------------
|
| These languages may also be supported by your application. If a request
| enters your application with a URI beginning with one of these values
| the default language will automatically be set to that language.
|
*/
'languages' => array(),
/*
|--------------------------------------------------------------------------
| SSL Link Generation
......
......@@ -29,7 +29,7 @@
<p>And the view sitting before you can be found at:</p>
<pre>{{ path('app') }}views/home/index.php</pre>
<pre>{{ path('app') }}views/home/index.blade.php</pre>
<h2>Grow in knowledge.</h2>
......
......@@ -95,7 +95,6 @@ class Blade {
*
* @param string $view
* @param string $path
* @param string $compiled
* @return bool
*/
public static function expired($view, $path)
......@@ -106,7 +105,7 @@ class Blade {
/**
* Compiles the specified file containing Blade pseudo-code into valid PHP.
*
* @param string $path
* @param string $view
* @return string
*/
public static function compile($view)
......@@ -168,6 +167,7 @@ class Blade {
* Extract a variable value out of a Blade expression.
*
* @param string $value
* @param string $expression
* @return string
*/
protected static function extract($value, $expression)
......@@ -403,6 +403,7 @@ class Blade {
/**
* Rewrites Blade yield section statements into valid PHP.
*
* @param string $value
* @return string
*/
protected static function compile_yield_sections($value)
......@@ -468,7 +469,7 @@ class Blade {
/**
* Get the fully qualified path for a compiled view.
*
* @param string $view
* @param string $path
* @return string
*/
public static function compiled($path)
......
......@@ -67,6 +67,7 @@ abstract class Driver {
* @param string $key
* @param mixed $default
* @param int $minutes
* @param string $function
* @return mixed
*/
public function remember($key, $default, $minutes, $function = 'put')
......
......@@ -20,6 +20,7 @@ class Memcached extends Sectionable {
* Create a new Memcached cache driver instance.
*
* @param Memcached $memcache
* @param string $key
* @return void
*/
public function __construct(\Memcached $memcache, $key)
......
......@@ -63,6 +63,7 @@ abstract class Sectionable extends Driver {
* @param string $key
* @param mixed $default
* @param int $minutes
* @param string $function
* @return mixed
*/
public function remember_in_section($section, $key, $default, $minutes, $function = 'put')
......
......@@ -8,7 +8,6 @@ class Help extends Task {
/**
* List available artisan commands.
*
* @param array $arguments
* @return void
*/
public function commands()
......
......@@ -10,6 +10,7 @@ class Runner extends Task {
/**
* Run all of the unit tests for the application.
*
* @param array $bundles
* @return void
*/
public function run($bundles = array())
......
......@@ -567,6 +567,7 @@ abstract class Model {
* Get a given attribute from the model.
*
* @param string $key
* @return mixed
*/
public function get_attribute($key)
{
......
......@@ -79,8 +79,9 @@ class Belongs_To extends Relationship {
/**
* Match eagerly loaded child models to their parent models.
*
* @param array $children
* @param array $parents
* @param string $relationship
* @param array $children
* @param array $parents
* @return void
*/
public function match($relationship, &$children, $parents)
......
......@@ -83,8 +83,9 @@ class Has_Many extends Has_One_Or_Many {
/**
* Match eagerly loaded child models to their parent models.
*
* @param array $parents
* @param array $children
* @param string $relationship
* @param array $parents
* @param array $children
* @return void
*/
public function match($relationship, &$parents, $children)
......
......@@ -61,6 +61,8 @@ class Has_Many_And_Belongs_To extends Relationship {
*
* By default, the name is the models sorted and joined with underscores.
*
* @param Model $model
* @param string $associated
* @return string
*/
protected function joining($model, $associated)
......@@ -86,7 +88,7 @@ class Has_Many_And_Belongs_To extends Relationship {
* Insert a new record into the joining table of the association.
*
* @param int $id
* @param array $joining
* @param array $attributes
* @return bool
*/
public function attach($id, $attributes = array())
......@@ -317,8 +319,9 @@ class Has_Many_And_Belongs_To extends Relationship {
/**
* Match eagerly loaded child models to their parent models.
*
* @param array $parents
* @param array $children
* @param string $relationship
* @param array $parents
* @param array $children
* @return void
*/
public function match($relationship, &$parents, $children)
......@@ -383,7 +386,7 @@ class Has_Many_And_Belongs_To extends Relationship {
/**
* Set the columns on the joining table that should be fetched.
*
* @param array $column
* @param array $columns
* @return Relationship
*/
public function with($columns)
......
......@@ -30,8 +30,9 @@ class Has_One extends Has_One_Or_Many {
/**
* Match eagerly loaded child models to their parent models.
*
* @param array $parents
* @param array $children
* @param string $relationship
* @param array $parents
* @param array $children
* @return void
*/
public function match($relationship, &$parents, $children)
......
......@@ -475,6 +475,7 @@ class Query {
* @param string $column
* @param string $operator
* @param mixed $value
* @return Query
*/
public function having($column, $operator, $value)
{
......
......@@ -44,7 +44,7 @@ class Schema {
* Rename a database table in the schema.
*
* @param string $table
* @param string $name
* @param string $new_name
* @return void
*/
public static function rename($table, $new_name)
......
......@@ -9,7 +9,7 @@ abstract class Grammar extends \Laravel\Database\Grammar {
* Generate the SQL statement for creating a foreign key.
*
* @param Table $table
* @param Command $command
* @param Fluent $command
* @return string
*/
public function foreign(Table $table, Fluent $command)
......@@ -54,7 +54,7 @@ abstract class Grammar extends \Laravel\Database\Grammar {
* Drop a constraint from the table.
*
* @param Table $table
* @param Fluent $fluent
* @param Fluent $command
* @return string
*/
protected function drop_constraint(Table $table, Fluent $command)
......
......@@ -323,7 +323,7 @@ class MySQL extends Grammar {
* Drop a foreign key constraint from the table.
*
* @param Table $table
* @param Fluent $fluent
* @param Fluent $command
* @return string
*/
public function drop_foreign(Table $table, Fluent $command)
......
......@@ -309,7 +309,7 @@ class Postgres extends Grammar {
* Drop a foreign key constraint from the table.
*
* @param Table $table
* @param Fluent $fluent
* @param Fluent $command
* @return string
*/
public function drop_foreign(Table $table, Fluent $command)
......
......@@ -327,7 +327,7 @@ class SQLServer extends Grammar {
* Drop a foreign key constraint from the table.
*
* @param Table $table
* @param Fluent $fluent
* @param Fluent $command
* @return string
*/
public function drop_foreign(Table $table, Fluent $command)
......
......@@ -113,6 +113,7 @@ class Table {
*
* @param string|array $columns
* @param string $name
* @return Fluent
*/
public function foreign($columns, $name = null)
{
......
......@@ -38,7 +38,7 @@
- Speed up many to many eager loading mapping.
- Tweak the Eloquent::changed() method.
- Added support for locales in the URI.
- Various bug fixes and improvements.
<a name="upgrade-3.2.3"></a>
## Upgrading From 3.2.3
......
......@@ -176,7 +176,7 @@ class Event {
* $responses = Event::fire(array('start', 'loading'), $parameters);
* </code>
*
* @param string|array $event
* @param string|array $events
* @param array $parameters
* @param bool $halt
* @return array
......
......@@ -20,7 +20,7 @@ class Form {
* Registers a custom macro.
*
* @param string $name
* @param Closure $input
* @param Closure $macro
* @return void
*/
public static function macro($name, $macro)
......
......@@ -543,7 +543,7 @@ function render($view, $data = array())
/**
* Get the rendered contents of a partial from a loop.
*
* @param string $view
* @param string $partial
* @param array $data
* @param string $iterator
* @param string $empty
......
......@@ -13,7 +13,7 @@ class HTML {
* Registers a custom macro.
*
* @param string $name
* @param Closure $input
* @param Closure $macro
* @return void
*/
public static function macro($name, $macro)
......
......@@ -85,6 +85,7 @@ class IoC {
* </code>
*
* @param string $type
* @param array $parameters
* @return mixed
*/
public static function resolve($type, $parameters = array())
......
......@@ -107,46 +107,6 @@ Routing\Router::register('*', '(:all)', function()
return Event::first('404');
});
/*
|--------------------------------------------------------------------------
| Gather The URI And Locales
|--------------------------------------------------------------------------
|
| When routing, we'll need to grab the URI and the supported locales for
| the route so we can properly set the language and route the request
| to the proper end-point in the application.
|
*/
$uri = URI::current();
$locales = Config::get('application.languages', array());
$locales[] = Config::get('application.language');
/*
|--------------------------------------------------------------------------
| Set The Locale Based On Route
|--------------------------------------------------------------------------
|
| If the URI starts with one of the supported languages, we will set
| the default language to match that URI segment and shorten the
| URI we'll pass to the router to not include the lang segment.
|
*/
foreach ($locales as $locale)
{
if (starts_with($uri, $locale))
{
Config::set('application.language', $locale);
$uri = trim(substr($uri, strlen($locale)), '/'); break;
}
}
if ($uri === '') $uri = '/';
/*
|--------------------------------------------------------------------------
| Route The Incoming Request
......@@ -158,6 +118,8 @@ if ($uri === '') $uri = '/';
|
*/
$uri = URI::current();
Request::$route = Routing\Router::route(Request::method(), $uri);
$response = Request::$route->call();
......
......@@ -64,7 +64,8 @@ class Log {
* Format a log message for logging.
*
* @param string $type
* @param
* @param string $message
* @return string
*/
protected static function format($type, $message)
{
......
......@@ -24,6 +24,7 @@ class Pluralizer {
/**
* Create a new pluralizer instance.
*
* @param array $config
* @return void
*/
public function __construct($config)
......
......@@ -39,6 +39,8 @@ class Profiler {
/**
* Add a log entry to the log entries array.
*
* @param string $type
* @param string $message
* @return void
*/
public static function log($type, $message)
......
......@@ -6,7 +6,7 @@ class Redirect extends Response {
* Create a redirect response to application root.
*
* @param int $status
* @param bool $secure
* @param bool $https
* @return Redirect
*/
public static function home($status = 302, $https = null)
......
......@@ -119,6 +119,7 @@ class Request {
/**
* Determine if the request accepts a given content type.
*
* @param string $type
* @return bool
*/
public static function accepts($type)
......
......@@ -292,7 +292,7 @@ class Router {
/**
* Register a controller with the router.
*
* @param string|array $controller
* @param string|array $controllers
* @param string|array $defaults
* @param bool $https
* @return void
......
......@@ -10,7 +10,7 @@ class Database extends Driver implements Sweeper {
*
* @var Connection
*/
private $connection;
protected $connection;
/**
* Create a new database session driver.
......
......@@ -107,14 +107,6 @@ class URL {
$root = static::base().'/'.Config::get('application.index');
// If multiple languages are being supported via URIs, we will append current
// language to the URI so all redirects and URLs generated include the
// current language so it is not lost on further requests.
if (count(Config::get('application.languages')) > 0)
{
$root .= '/'.Config::get('application.language');
}
// Since SSL is not often used while developing the application, we allow the
// developer to disable SSL on all framework generated links to make it more
// convenient to work with the site while developing locally.
......
......@@ -637,6 +637,7 @@ class Validator {
*
* @param string $attribute
* @param mixed $value
* @param array $parameters
* @return bool
*/
protected function validate_match($attribute, $value, $parameters)
......
......@@ -255,7 +255,7 @@ class View implements ArrayAccess {
* });
* </code>
*
* @param string|array $view
* @param string|array $views
* @param Closure $composer
* @return void
*/
......
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