Skip to content

Commit

Permalink
Merge branch '5.6' of github.com:laravel/framework into 5.6
Browse files Browse the repository at this point in the history
  • Loading branch information
taylorotwell committed Jan 5, 2018
2 parents 3db826e + 6b190c3 commit 99e9f78
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/Illuminate/Database/Query/Grammars/Grammar.php
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ protected function whereRowValues(Builder $query, $where)
{
$values = $this->parameterize($where['values']);

return '('.join(', ', $where['columns']).') '.$where['operator'].' ('.$values.')';
return '('.implode(', ', $where['columns']).') '.$where['operator'].' ('.$values.')';
}

/**
Expand Down
4 changes: 2 additions & 2 deletions tests/Log/LogWriterTest.php → tests/Log/LogLoggerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
use Illuminate\Log\Logger;
use PHPUnit\Framework\TestCase;

class LogWriterTest extends TestCase
class LogLoggerTest extends TestCase
{
public function tearDown()
{
Expand All @@ -21,7 +21,7 @@ public function testMethodsPassErrorAdditionsToMonolog()
$writer->error('foo');
}

public function testWriterFiresEventsDispatcher()
public function testLoggerFiresEventsDispatcher()
{
$writer = new Logger($monolog = m::mock('Monolog\Logger'), $events = new \Illuminate\Events\Dispatcher);
$monolog->shouldReceive('error')->once()->with('foo', []);
Expand Down
2 changes: 1 addition & 1 deletion tests/Notifications/NotificationMailMessageTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
use PHPUnit\Framework\TestCase;
use Illuminate\Notifications\Messages\MailMessage;

class NotificationsMailMessageTest extends TestCase
class NotificationMailMessageTest extends TestCase
{
public function setUp()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Illuminate\Tests\View\Blade;

class BladeStopTest extends AbstractBladeTestCase
class BladeStopSectionTest extends AbstractBladeTestCase
{
public function testStopSectionsAreCompiled()
{
Expand Down
2 changes: 1 addition & 1 deletion tests/View/ViewFileViewFinderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
use Mockery as m;
use PHPUnit\Framework\TestCase;

class ViewFinderTest extends TestCase
class ViewFileViewFinderTest extends TestCase
{
public function tearDown()
{
Expand Down

0 comments on commit 99e9f78

Please sign in to comment.