Skip to content
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
1 change: 0 additions & 1 deletion src/Illuminate/Bus/BusServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

namespace Illuminate\Bus;

use Illuminate\Bus\BatchFactory;
use Illuminate\Contracts\Bus\Dispatcher as DispatcherContract;
use Illuminate\Contracts\Bus\QueueingDispatcher as QueueingDispatcherContract;
use Illuminate\Contracts\Queue\Factory as QueueFactoryContract;
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Bus/DatabaseBatchRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public function find(string $batchId)
->first();

if (! $batch) {
return null;
return;
}

return $this->factory->make(
Expand Down
5 changes: 0 additions & 5 deletions src/Illuminate/Support/Testing/Fakes/BatchRepositoryFake.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ class BatchRepositoryFake implements BatchRepository
*/
public function find(string $batchId)
{
return;
}

/**
Expand Down Expand Up @@ -54,7 +53,6 @@ public function store(PendingBatch $batch)
*/
public function incrementTotalJobs(string $batchId, int $amount)
{
return;
}

/**
Expand Down Expand Up @@ -87,7 +85,6 @@ public function incrementFailedJobs(string $batchId)
*/
public function markAsFinished(string $batchId)
{
return;
}

/**
Expand All @@ -98,7 +95,6 @@ public function markAsFinished(string $batchId)
*/
public function cancel(string $batchId)
{
return;
}

/**
Expand All @@ -109,7 +105,6 @@ public function cancel(string $batchId)
*/
public function delete(string $batchId)
{
return;
}

/**
Expand Down
6 changes: 1 addition & 5 deletions src/Illuminate/Support/Testing/Fakes/BusFake.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,11 @@

namespace Illuminate\Support\Testing\Fakes;

use Carbon\CarbonImmutable;
use Closure;
use Illuminate\Bus\PendingBatch;
use Illuminate\Collections\Arr;
use Illuminate\Collections\Collection;
use Illuminate\Contracts\Bus\QueueingDispatcher;
use Illuminate\Support\Facades\Facade;
use Illuminate\Support\Str;
use Illuminate\Support\Traits\ReflectsClosures;
use PHPUnit\Framework\Assert as PHPUnit;

Expand Down Expand Up @@ -197,7 +194,7 @@ public function assertBatched(callable $callback)
{
PHPUnit::assertTrue(
$this->batched($callback)->count() > 0,
"The expected batch was not dispatched."
'The expected batch was not dispatched.'
);
}

Expand Down Expand Up @@ -371,7 +368,6 @@ public function dispatchAfterResponse($command)
*/
public function findBatch(string $batchId)
{
return;
}

/**
Expand Down
1 change: 0 additions & 1 deletion tests/Bus/BusBatchableTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ public function test_batch_may_be_retrieved()
$repository->shouldReceive('find')->once()->with('test-batch-id')->andReturn('test-batch');
$container->instance(BatchRepository::class, $repository);


$this->assertEquals('test-batch', $class->batch());

Container::setInstance(null);
Expand Down
2 changes: 1 addition & 1 deletion tests/Bus/BusPendingBatchTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

namespace Illuminate\Tests\Bus;

use Illuminate\Bus\BatchRepository;
use Illuminate\Bus\Batchable;
use Illuminate\Bus\BatchRepository;
use Illuminate\Bus\PendingBatch;
use Illuminate\Collections\Collection;
use Illuminate\Container\Container;
Expand Down