Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating from base repo #4

Merged
merged 6 commits into from
Sep 6, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/Illuminate/Auth/Access/Gate.php
Original file line number Diff line number Diff line change
Expand Up @@ -532,4 +532,14 @@ public function abilities()
{
return $this->abilities;
}

/**
* Get all of the defined policies.
*
* @return array
*/
public function policies()
{
return $this->policies;
}
}
2 changes: 1 addition & 1 deletion src/Illuminate/Database/Schema/Grammars/MySqlGrammar.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public function compileTableExists()
*/
public function compileColumnListing()
{
return 'select column_name from information_schema.columns where table_schema = ? and table_name = ?';
return 'select column_name as `column_name` from information_schema.columns where table_schema = ? and table_name = ?';
}

/**
Expand Down
9 changes: 0 additions & 9 deletions src/Illuminate/Foundation/Console/stubs/listener-duck.stub
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,6 @@ use Illuminate\Contracts\Queue\ShouldQueue;

class DummyClass
{
/**
* The events handled by the listener.
*
* @var array
*/
public static $listensFor = [
//
];

/**
* Create the event listener.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,7 @@ use Illuminate\Contracts\Queue\ShouldQueue;
class DummyClass implements ShouldQueue
{
use InteractsWithQueue;

/**
* The events handled by the listener.
*
* @var array
*/
public static $listensFor = [
//
];


/**
* Create the event listener.
*
Expand Down
4 changes: 3 additions & 1 deletion src/Illuminate/Foundation/Exceptions/Handler.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace Illuminate\Foundation\Exceptions;

use Exception;
use Throwable;
use Whoops\Run as Whoops;
use Illuminate\Support\Arr;
use Psr\Log\LoggerInterface;
Expand Down Expand Up @@ -151,7 +152,7 @@ protected function context()
'userId' => Auth::id(),
'email' => Auth::user() ? Auth::user()->email : null,
]);
} catch (Exception $e) {
} catch (Throwable $e) {
return [];
}
}
Expand Down Expand Up @@ -445,6 +446,7 @@ protected function convertExceptionToArray(Exception $e)
{
return config('app.debug') ? [
'message' => $e->getMessage(),
'exception' => get_class($e),
'file' => $e->getFile(),
'line' => $e->getLine(),
'trace' => $e->getTrace(),
Expand Down
4 changes: 3 additions & 1 deletion src/Illuminate/Validation/Validator.php
Original file line number Diff line number Diff line change
Expand Up @@ -942,11 +942,13 @@ public function addReplacer($rule, $replacer)
* Set the custom messages for the validator.
*
* @param array $messages
* @return void
* @return $this
*/
public function setCustomMessages(array $messages)
{
$this->customMessages = array_merge($this->customMessages, $messages);

return $this;
}

/**
Expand Down