Skip to content

Commit 7dae482

Browse files
taylorotwelltaylorotwell
committed
Merge branch 'develop' into staging
2 parents d667a15 + 343d132 commit 7dae482

37 files changed

+53
-92
lines changed

‎application/config/application.php

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -94,19 +94,6 @@
9494

9595
'language' => 'en',
9696

97-
/*
98-
|--------------------------------------------------------------------------
99-
| Supported Languages
100-
|--------------------------------------------------------------------------
101-
|
102-
| These languages may also be supported by your application. If a request
103-
| enters your application with a URI beginning with one of these values
104-
| the default language will automatically be set to that language.
105-
|
106-
*/
107-
108-
'languages' => array(),
109-
11097
/*
11198
|--------------------------------------------------------------------------
11299
| SSL Link Generation

‎application/views/home/index.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
<p>And the view sitting before you can be found at:</p>
3131

32-
<pre>{{ path('app') }}views/home/index.php</pre>
32+
<pre>{{ path('app') }}views/home/index.blade.php</pre>
3333

3434
<h2>Grow in knowledge.</h2>
3535

‎laravel/blade.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ public static function extend(Closure $compiler)
9595
*
9696
* @param string $view
9797
* @param string $path
98-
* @param string $compiled
9998
* @return bool
10099
*/
101100
public static function expired($view, $path)
@@ -106,7 +105,7 @@ public static function expired($view, $path)
106105
/**
107106
* Compiles the specified file containing Blade pseudo-code into valid PHP.
108107
*
109-
* @param string $path
108+
* @param string $view
110109
* @return string
111110
*/
112111
public static function compile($view)
@@ -168,6 +167,7 @@ function($matches) use (&$value)
168167
* Extract a variable value out of a Blade expression.
169168
*
170169
* @param string $value
170+
* @param string $expression
171171
* @return string
172172
*/
173173
protected static function extract($value, $expression)
@@ -403,6 +403,7 @@ protected static function compile_yields($value)
403403
/**
404404
* Rewrites Blade yield section statements into valid PHP.
405405
*
406+
* @param string $value
406407
* @return string
407408
*/
408409
protected static function compile_yield_sections($value)
@@ -468,7 +469,7 @@ public static function matcher($function)
468469
/**
469470
* Get the fully qualified path for a compiled view.
470471
*
471-
* @param string $view
472+
* @param string $path
472473
* @return string
473474
*/
474475
public static function compiled($path)

‎laravel/cache/drivers/driver.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ abstract public function put($key, $value, $minutes);
6767
* @param string $key
6868
* @param mixed $default
6969
* @param int $minutes
70+
* @param string $function
7071
* @return mixed
7172
*/
7273
public function remember($key, $default, $minutes, $function = 'put')

‎laravel/cache/drivers/memcached.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ class Memcached extends Sectionable {
2020
* Create a new Memcached cache driver instance.
2121
*
2222
* @param Memcached $memcache
23+
* @param string $key
2324
* @return void
2425
*/
2526
public function __construct(\Memcached $memcache, $key)

‎laravel/cache/drivers/sectionable.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ public function forever_in_section($section, $key, $value)
6363
* @param string $key
6464
* @param mixed $default
6565
* @param int $minutes
66+
* @param string $function
6667
* @return mixed
6768
*/
6869
public function remember_in_section($section, $key, $default, $minutes, $function = 'put')

‎laravel/cli/tasks/help.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ class Help extends Task {
88
/**
99
* List available artisan commands.
1010
*
11-
* @param array $arguments
1211
* @return void
1312
*/
1413
public function commands()

‎laravel/cli/tasks/test/runner.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ class Runner extends Task {
1010
/**
1111
* Run all of the unit tests for the application.
1212
*
13+
* @param array $bundles
1314
* @return void
1415
*/
1516
public function run($bundles = array())

‎laravel/database/eloquent/model.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -567,6 +567,7 @@ public function set_key($value)
567567
* Get a given attribute from the model.
568568
*
569569
* @param string $key
570+
* @return mixed
570571
*/
571572
public function get_attribute($key)
572573
{

‎laravel/database/eloquent/relationships/belongs_to.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,9 @@ public function eagerly_constrain($results)
7979
/**
8080
* Match eagerly loaded child models to their parent models.
8181
*
82-
* @param array $children
83-
* @param array $parents
82+
* @param string $relationship
83+
* @param array $children
84+
* @param array $parents
8485
* @return void
8586
*/
8687
public function match($relationship, &$children, $parents)

‎laravel/database/eloquent/relationships/has_many.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,9 @@ public function initialize(&$parents, $relationship)
8383
/**
8484
* Match eagerly loaded child models to their parent models.
8585
*
86-
* @param array $parents
87-
* @param array $children
86+
* @param string $relationship
87+
* @param array $parents
88+
* @param array $children
8889
* @return void
8990
*/
9091
public function match($relationship, &$parents, $children)

‎laravel/database/eloquent/relationships/has_many_and_belongs_to.php

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ public function __construct($model, $associated, $table, $foreign, $other)
6161
*
6262
* By default, the name is the models sorted and joined with underscores.
6363
*
64+
* @param Model $model
65+
* @param string $associated
6466
* @return string
6567
*/
6668
protected function joining($model, $associated)
@@ -86,7 +88,7 @@ public function results()
8688
* Insert a new record into the joining table of the association.
8789
*
8890
* @param int $id
89-
* @param array $joining
91+
* @param array $attributes
9092
* @return bool
9193
*/
9294
public function attach($id, $attributes = array())
@@ -317,8 +319,9 @@ public function eagerly_constrain($results)
317319
/**
318320
* Match eagerly loaded child models to their parent models.
319321
*
320-
* @param array $parents
321-
* @param array $children
322+
* @param string $relationship
323+
* @param array $parents
324+
* @param array $children
322325
* @return void
323326
*/
324327
public function match($relationship, &$parents, $children)
@@ -383,7 +386,7 @@ protected function hydrate_pivot(&$results)
383386
/**
384387
* Set the columns on the joining table that should be fetched.
385388
*
386-
* @param array $column
389+
* @param array $columns
387390
* @return Relationship
388391
*/
389392
public function with($columns)

‎laravel/database/eloquent/relationships/has_one.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,9 @@ public function initialize(&$parents, $relationship)
3030
/**
3131
* Match eagerly loaded child models to their parent models.
3232
*
33-
* @param array $parents
34-
* @param array $children
33+
* @param string $relationship
34+
* @param array $parents
35+
* @param array $children
3536
* @return void
3637
*/
3738
public function match($relationship, &$parents, $children)

‎laravel/database/query.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -475,6 +475,7 @@ public function group_by($column)
475475
* @param string $column
476476
* @param string $operator
477477
* @param mixed $value
478+
* @return Query
478479
*/
479480
public function having($column, $operator, $value)
480481
{

‎laravel/database/schema.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public static function create($table, $callback)
4444
* Rename a database table in the schema.
4545
*
4646
* @param string $table
47-
* @param string $name
47+
* @param string $new_name
4848
* @return void
4949
*/
5050
public static function rename($table, $new_name)

‎laravel/database/schema/grammars/grammar.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ abstract class Grammar extends \Laravel\Database\Grammar {
99
* Generate the SQL statement for creating a foreign key.
1010
*
1111
* @param Table $table
12-
* @param Command $command
12+
* @param Fluent $command
1313
* @return string
1414
*/
1515
public function foreign(Table $table, Fluent $command)
@@ -54,7 +54,7 @@ public function foreign(Table $table, Fluent $command)
5454
* Drop a constraint from the table.
5555
*
5656
* @param Table $table
57-
* @param Fluent $fluent
57+
* @param Fluent $command
5858
* @return string
5959
*/
6060
protected function drop_constraint(Table $table, Fluent $command)

‎laravel/database/schema/grammars/mysql.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ protected function drop_key(Table $table, Fluent $command)
323323
* Drop a foreign key constraint from the table.
324324
*
325325
* @param Table $table
326-
* @param Fluent $fluent
326+
* @param Fluent $command
327327
* @return string
328328
*/
329329
public function drop_foreign(Table $table, Fluent $command)

‎laravel/database/schema/grammars/postgres.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ protected function drop_key(Table $table, Fluent $command)
309309
* Drop a foreign key constraint from the table.
310310
*
311311
* @param Table $table
312-
* @param Fluent $fluent
312+
* @param Fluent $command
313313
* @return string
314314
*/
315315
public function drop_foreign(Table $table, Fluent $command)

‎laravel/database/schema/grammars/sqlserver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ protected function drop_key(Table $table, Fluent $command)
327327
* Drop a foreign key constraint from the table.
328328
*
329329
* @param Table $table
330-
* @param Fluent $fluent
330+
* @param Fluent $command
331331
* @return string
332332
*/
333333
public function drop_foreign(Table $table, Fluent $command)

‎laravel/database/schema/table.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ public function index($columns, $name = null)
113113
*
114114
* @param string|array $columns
115115
* @param string $name
116+
* @return Fluent
116117
*/
117118
public function foreign($columns, $name = null)
118119
{

‎laravel/documentation/changes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
- Speed up many to many eager loading mapping.
4040
- Tweak the Eloquent::changed() method.
41-
- Added support for locales in the URI.
41+
- Various bug fixes and improvements.
4242

4343
<a name="upgrade-3.2.3"></a>
4444
## Upgrading From 3.2.3

‎laravel/event.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ public static function flush($queue)
176176
* $responses = Event::fire(array('start', 'loading'), $parameters);
177177
* </code>
178178
*
179-
* @param string|array $event
179+
* @param string|array $events
180180
* @param array $parameters
181181
* @param bool $halt
182182
* @return array

‎laravel/form.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class Form {
2020
* Registers a custom macro.
2121
*
2222
* @param string $name
23-
* @param Closure $input
23+
* @param Closure $macro
2424
* @return void
2525
*/
2626
public static function macro($name, $macro)

‎laravel/helpers.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,7 @@ function render($view, $data = array())
543543
/**
544544
* Get the rendered contents of a partial from a loop.
545545
*
546-
* @param string $view
546+
* @param string $partial
547547
* @param array $data
548548
* @param string $iterator
549549
* @param string $empty

‎laravel/html.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class HTML {
1313
* Registers a custom macro.
1414
*
1515
* @param string $name
16-
* @param Closure $input
16+
* @param Closure $macro
1717
* @return void
1818
*/
1919
public static function macro($name, $macro)

‎laravel/ioc.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ public static function instance($name, $instance)
8585
* </code>
8686
*
8787
* @param string $type
88+
* @param array $parameters
8889
* @return mixed
8990
*/
9091
public static function resolve($type, $parameters = array())

‎laravel/laravel.php

Lines changed: 2 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -107,46 +107,6 @@
107107
return Event::first('404');
108108
});
109109

110-
/*
111-
|--------------------------------------------------------------------------
112-
| Gather The URI And Locales
113-
|--------------------------------------------------------------------------
114-
|
115-
| When routing, we'll need to grab the URI and the supported locales for
116-
| the route so we can properly set the language and route the request
117-
| to the proper end-point in the application.
118-
|
119-
*/
120-
121-
$uri = URI::current();
122-
123-
$locales = Config::get('application.languages', array());
124-
125-
$locales[] = Config::get('application.language');
126-
127-
/*
128-
|--------------------------------------------------------------------------
129-
| Set The Locale Based On Route
130-
|--------------------------------------------------------------------------
131-
|
132-
| If the URI starts with one of the supported languages, we will set
133-
| the default language to match that URI segment and shorten the
134-
| URI we'll pass to the router to not include the lang segment.
135-
|
136-
*/
137-
138-
foreach ($locales as $locale)
139-
{
140-
if (starts_with($uri, $locale))
141-
{
142-
Config::set('application.language', $locale);
143-
144-
$uri = trim(substr($uri, strlen($locale)), '/'); break;
145-
}
146-
}
147-
148-
if ($uri === '') $uri = '/';
149-
150110
/*
151111
|--------------------------------------------------------------------------
152112
| Route The Incoming Request
@@ -158,6 +118,8 @@
158118
|
159119
*/
160120

121+
$uri = URI::current();
122+
161123
Request::$route = Routing\Router::route(Request::method(), $uri);
162124

163125
$response = Request::$route->call();

‎laravel/log.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ public static function write($type, $message)
6464
* Format a log message for logging.
6565
*
6666
* @param string $type
67-
* @param
67+
* @param string $message
68+
* @return string
6869
*/
6970
protected static function format($type, $message)
7071
{

‎laravel/pluralizer.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ class Pluralizer {
2424
/**
2525
* Create a new pluralizer instance.
2626
*
27+
* @param array $config
2728
* @return void
2829
*/
2930
public function __construct($config)

‎laravel/profiling/profiler.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ public static function render($response)
3939
/**
4040
* Add a log entry to the log entries array.
4141
*
42+
* @param string $type
43+
* @param string $message
4244
* @return void
4345
*/
4446
public static function log($type, $message)

0 commit comments

Comments
 (0)