Skip to content

Commit 6a05d69

Browse files
committed
Remove class MongoFailedJobProvider
1 parent 533d1b7 commit 6a05d69

File tree

8 files changed

+10
-27
lines changed

8 files changed

+10
-27
lines changed

src/Collection.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
use Exception;
88
use MongoDB\BSON\ObjectID;
9-
use MongoDB\BSON\UTCDateTime;
109
use MongoDB\Collection as MongoCollection;
1110

1211
use function array_walk_recursive;

src/MongoDBQueueServiceProvider.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,8 @@
77
use Illuminate\Queue\Failed\DatabaseFailedJobProvider;
88
use Illuminate\Queue\Failed\NullFailedJobProvider;
99
use Illuminate\Queue\QueueServiceProvider;
10-
use MongoDB\Laravel\Queue\Failed\MongoFailedJobProvider;
1110

1211
use function array_key_exists;
13-
use function trigger_error;
14-
15-
use const E_USER_DEPRECATED;
1612

1713
class MongoDBQueueServiceProvider extends QueueServiceProvider
1814
{
@@ -56,7 +52,6 @@ protected function registerFailedJobServices()
5652
protected function mongoFailedJobProvider(array $config): DatabaseFailedJobProvider
5753
{
5854
if (! isset($config['collection']) && isset($config['table'])) {
59-
trigger_error('Since mongodb/laravel-mongodb 4.4: Using "table" option for the queue is deprecated. Use "collection" instead.', E_USER_DEPRECATED);
6055
$config['collection'] = $config['table'];
6156
}
6257

src/Query/Builder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,7 @@ public function aggregate($function = null, $columns = ['*'])
595595
if (isset($results[0])) {
596596
$result = (array) $results[0];
597597

598-
return $this->aliasIdForResult($result['aggregate']);
598+
return $result['aggregate'];
599599
}
600600
}
601601

src/Queue/Failed/MongoFailedJobProvider.php

Lines changed: 0 additions & 12 deletions
This file was deleted.

tests/Query/AggregationBuilderTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
use MongoDB\Laravel\Query\AggregationBuilder;
2121
use MongoDB\Laravel\Tests\Models\User;
2222
use MongoDB\Laravel\Tests\TestCase;
23+
use stdClass;
2324

2425
class AggregationBuilderTest extends TestCase
2526
{
@@ -84,7 +85,7 @@ public function testCreateAggregationBuilder(): void
8485

8586
// Execute the pipeline and return the first result
8687
$result = $pipeline->first();
87-
$this->assertInstanceOf(\stdClass::class, $result);
88+
$this->assertInstanceOf(stdClass::class, $result);
8889
$this->assertInstanceOf(ObjectId::class, $result->_id);
8990
$this->assertSame('John Doe', $result->name);
9091
}

tests/QueryBuilderTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
use function md5;
3333
use function sort;
3434
use function strlen;
35-
use function strtotime;
3635

3736
class QueryBuilderTest extends TestCase
3837
{

tests/Queue/Failed/MongoFailedJobProviderTest.php renamed to tests/Queue/Failed/DatabaseFailedJobProviderTest.php

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,22 @@
22

33
namespace MongoDB\Laravel\Tests\Queue\Failed;
44

5+
use Illuminate\Queue\Failed\DatabaseFailedJobProvider;
56
use Illuminate\Support\Facades\Date;
67
use Illuminate\Support\Facades\DB;
78
use MongoDB\BSON\ObjectId;
89
use MongoDB\BSON\UTCDateTime;
9-
use MongoDB\Laravel\Queue\Failed\MongoFailedJobProvider;
1010
use MongoDB\Laravel\Tests\TestCase;
1111
use OutOfBoundsException;
1212

1313
use function array_map;
1414
use function range;
1515
use function sprintf;
1616

17-
class MongoFailedJobProviderTest extends TestCase
17+
/**
18+
* Test the Laravel class with MongoDB's Query Builder
19+
*/
20+
class DatabaseFailedJobProviderTest extends TestCase
1821
{
1922
public function setUp(): void
2023
{
@@ -142,8 +145,8 @@ public function testPrune(): void
142145
$this->assertEquals(3, $provider->count());
143146
}
144147

145-
private function getProvider(): MongoFailedJobProvider
148+
private function getProvider(): DatabaseFailedJobProvider
146149
{
147-
return new MongoFailedJobProvider(DB::getFacadeRoot(), '', 'failed_jobs');
150+
return new DatabaseFailedJobProvider(DB::getFacadeRoot(), '', 'failed_jobs');
148151
}
149152
}

tests/QueueTest.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
use Illuminate\Support\Facades\Queue;
1111
use Illuminate\Support\Str;
1212
use Mockery;
13-
use MongoDB\BSON\UTCDateTime;
14-
use MongoDB\Laravel\Queue\Failed\MongoFailedJobProvider;
1513
use MongoDB\Laravel\Queue\MongoJob;
1614
use MongoDB\Laravel\Queue\MongoQueue;
1715

0 commit comments

Comments
 (0)