Skip to content

Commit b947b74

Browse files
malarzmmalarzm
committed
Merge branch '2.4.x' into 2.5.x
2 parents a95ea45 + 5fcca6c commit b947b74

File tree

224 files changed

+3054
-3096
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

224 files changed

+3054
-3096
lines changed

‎.gitattributes‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
/.gitignore export-ignore
1212
/.gitmodules export-ignore
1313
/.scrutinizer.yml export-ignore
14-
/.travis.yml export-ignore
1514
/phpcs.xml.dist export-ignore
1615
/phpstan.neon.dist export-ignore
1716
/phpunit.xml.dist export-ignore

‎.travis.yml‎

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

‎tests/Doctrine/ODM/MongoDB/Tests/Aggregation/BuilderTest.php‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ public function testGetPipeline(): void
170170
->addStage(new TestStage($builder))
171171
->out('collectionName');
172172

173-
$this->assertEquals($expectedPipeline, $builder->getPipeline());
173+
self::assertEquals($expectedPipeline, $builder->getPipeline());
174174
}
175175

176176
public function testAggregationBuilder(): void
@@ -190,14 +190,14 @@ public function testAggregationBuilder(): void
190190
->sort('numPosts', 'desc')
191191
->execute();
192192

193-
$this->assertInstanceOf(Iterator::class, $resultCursor);
193+
self::assertInstanceOf(Iterator::class, $resultCursor);
194194

195195
$results = $resultCursor->toArray();
196-
$this->assertCount(2, $results);
197-
$this->assertInstanceOf(BlogTagAggregation::class, $results[0]);
196+
self::assertCount(2, $results);
197+
self::assertInstanceOf(BlogTagAggregation::class, $results[0]);
198198

199-
$this->assertSame('baseball', $results[0]->tag->name);
200-
$this->assertSame(3, $results[0]->numPosts);
199+
self::assertSame('baseball', $results[0]->tag->name);
200+
self::assertSame(3, $results[0]->numPosts);
201201
}
202202

203203
public function testAggregationBuilderResetHydration(): void
@@ -218,14 +218,14 @@ public function testAggregationBuilderResetHydration(): void
218218
->getAggregation()
219219
->getIterator();
220220

221-
$this->assertInstanceOf(Iterator::class, $resultCursor);
221+
self::assertInstanceOf(Iterator::class, $resultCursor);
222222

223223
$results = $resultCursor->toArray();
224-
$this->assertCount(2, $results);
225-
$this->assertIsArray($results[0]);
226-
$this->assertInstanceOf(ObjectId::class, $results[0]['_id']['$id']);
227-
$this->assertSame('Tag', $results[0]['_id']['$ref']);
228-
$this->assertSame(3, $results[0]['numPosts']);
224+
self::assertCount(2, $results);
225+
self::assertIsArray($results[0]);
226+
self::assertInstanceOf(ObjectId::class, $results[0]['_id']['$id']);
227+
self::assertSame('Tag', $results[0]['_id']['$ref']);
228+
self::assertSame(3, $results[0]['numPosts']);
229229
}
230230

231231
public function testGetAggregation(): void
@@ -245,18 +245,18 @@ public function testGetAggregation(): void
245245
->sort('numPosts', 'desc')
246246
->getAggregation();
247247

248-
$this->assertInstanceOf(Aggregation::class, $aggregation);
248+
self::assertInstanceOf(Aggregation::class, $aggregation);
249249

250250
$resultCursor = $aggregation->getIterator();
251251

252-
$this->assertInstanceOf(Iterator::class, $resultCursor);
252+
self::assertInstanceOf(Iterator::class, $resultCursor);
253253

254254
$results = $resultCursor->toArray();
255-
$this->assertCount(2, $results);
256-
$this->assertInstanceOf(BlogTagAggregation::class, $results[0]);
255+
self::assertCount(2, $results);
256+
self::assertInstanceOf(BlogTagAggregation::class, $results[0]);
257257

258-
$this->assertSame('baseball', $results[0]->tag->name);
259-
$this->assertSame(3, $results[0]->numPosts);
258+
self::assertSame('baseball', $results[0]->tag->name);
259+
self::assertSame(3, $results[0]->numPosts);
260260
}
261261

262262
public function testPipelineConvertsTypes(): void
@@ -304,7 +304,7 @@ public function testPipelineConvertsTypes(): void
304304
],
305305
];
306306

307-
$this->assertEquals($expectedPipeline, $builder->getPipeline());
307+
self::assertEquals($expectedPipeline, $builder->getPipeline());
308308
}
309309

310310
public function testFieldNameConversion(): void
@@ -334,7 +334,7 @@ public function testFieldNameConversion(): void
334334
['$replaceRoot' => ['newRoot' => '$ip']],
335335
];
336336

337-
$this->assertEquals($expectedPipeline, $builder->getPipeline());
337+
self::assertEquals($expectedPipeline, $builder->getPipeline());
338338
}
339339

340340
public function testBuilderAppliesFilterAndDiscriminatorWithMatchStage(): void
@@ -365,7 +365,7 @@ public function testBuilderAppliesFilterAndDiscriminatorWithMatchStage(): void
365365
],
366366
];
367367

368-
$this->assertEquals($expectedPipeline, $builder->getPipeline());
368+
self::assertEquals($expectedPipeline, $builder->getPipeline());
369369
}
370370

371371
public function testBuilderAppliesFilterAndDiscriminatorWithGeoNearStage(): void
@@ -396,7 +396,7 @@ public function testBuilderAppliesFilterAndDiscriminatorWithGeoNearStage(): void
396396
],
397397
];
398398

399-
$this->assertEquals($expectedPipeline, $builder->getPipeline());
399+
self::assertEquals($expectedPipeline, $builder->getPipeline());
400400
}
401401

402402
public function testBuilderWithOutStageReturnsNoData(): void
@@ -408,7 +408,7 @@ public function testBuilderWithOutStageReturnsNoData(): void
408408
->out('sampleCollection');
409409

410410
$result = $builder->execute()->toArray();
411-
$this->assertCount(0, $result);
411+
self::assertEmpty($result);
412412
}
413413

414414
public function testBuilderWithIndexStatsStageDoesNotApplyFilters(): void
@@ -417,7 +417,7 @@ public function testBuilderWithIndexStatsStageDoesNotApplyFilters(): void
417417
->createAggregationBuilder(BlogPost::class)
418418
->indexStats();
419419

420-
$this->assertSame('$indexStats', array_keys($builder->getPipeline()[0])[0]);
420+
self::assertSame('$indexStats', array_keys($builder->getPipeline()[0])[0]);
421421
}
422422

423423
public function testNonRewindableBuilder(): void
@@ -428,7 +428,7 @@ public function testNonRewindableBuilder(): void
428428
->rewindable(false);
429429

430430
$iterator = $builder->execute();
431-
$this->assertInstanceOf(UnrewindableIterator::class, $iterator);
431+
self::assertInstanceOf(UnrewindableIterator::class, $iterator);
432432
}
433433

434434
private function insertTestData(): void

‎tests/Doctrine/ODM/MongoDB/Tests/Aggregation/ExprTest.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ public function testGenericOperator(array $expected, string $operator, $args): v
2424
$expr = $this->createExpr();
2525
$args = $this->resolveArgs($args);
2626

27-
$this->assertSame($expr, $expr->$operator(...$args));
28-
$this->assertSame($expected, $expr->getExpression());
27+
self::assertSame($expr, $expr->$operator(...$args));
28+
self::assertSame($expected, $expr->getExpression());
2929
}
3030

3131
/**
@@ -38,17 +38,17 @@ public function testGenericOperatorWithField(array $expected, string $operator,
3838
$expr = $this->createExpr();
3939
$args = $this->resolveArgs($args);
4040

41-
$this->assertSame($expr, $expr->field('foo')->$operator(...$args));
42-
$this->assertSame(['foo' => $expected], $expr->getExpression());
41+
self::assertSame($expr, $expr->field('foo')->$operator(...$args));
42+
self::assertSame(['foo' => $expected], $expr->getExpression());
4343
}
4444

4545
public function testExpr(): void
4646
{
4747
$expr = $this->createExpr();
4848

4949
$newExpr = $expr->expr();
50-
$this->assertInstanceOf(Expr::class, $newExpr);
51-
$this->assertNotSame($newExpr, $expr);
50+
self::assertInstanceOf(Expr::class, $newExpr);
51+
self::assertNotSame($newExpr, $expr);
5252
}
5353

5454
public function testExpression(): void
@@ -62,8 +62,8 @@ public function testExpression(): void
6262

6363
$expr = $this->createExpr();
6464

65-
$this->assertSame($expr, $expr->field('nested')->expression($nestedExpr));
66-
$this->assertSame(
65+
self::assertSame($expr, $expr->field('nested')->expression($nestedExpr));
66+
self::assertSame(
6767
[
6868
'nested' => [
6969
'dayOfMonth' => ['$dayOfMonth' => '$dateField'],
@@ -100,7 +100,7 @@ public function testSwitch(): void
100100
->then('One element given')
101101
->default($this->createExpr()->concat('$numElements', ' elements given'));
102102

103-
$this->assertSame(
103+
self::assertSame(
104104
[
105105
'$switch' => [
106106
'branches' => [

‎tests/Doctrine/ODM/MongoDB/Tests/Aggregation/Stage/AddFieldsTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public function testAddFieldsStage(): void
1919
->field('product')
2020
->multiply('$field', 5);
2121

22-
$this->assertSame(['$addFields' => ['product' => ['$multiply' => ['$field', 5]]]], $addFieldsStage->getExpression());
22+
self::assertSame(['$addFields' => ['product' => ['$multiply' => ['$field', 5]]]], $addFieldsStage->getExpression());
2323
}
2424

2525
public function testProjectFromBuilder(): void
@@ -30,6 +30,6 @@ public function testProjectFromBuilder(): void
3030
->field('product')
3131
->multiply('$field', 5);
3232

33-
$this->assertSame([['$addFields' => ['product' => ['$multiply' => ['$field', 5]]]]], $builder->getPipeline());
33+
self::assertSame([['$addFields' => ['product' => ['$multiply' => ['$field', 5]]]]], $builder->getPipeline());
3434
}
3535
}

‎tests/Doctrine/ODM/MongoDB/Tests/Aggregation/Stage/BucketAutoTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function testBucketAutoStage(): void
2626
->field('averageValue')
2727
->avg('$value');
2828

29-
$this->assertSame([
29+
self::assertSame([
3030
'$bucketAuto' => [
3131
'groupBy' => '$someField',
3232
'buckets' => 3,
@@ -47,7 +47,7 @@ public function testBucketAutoFromBuilder(): void
4747
->field('averageValue')
4848
->avg('$value');
4949

50-
$this->assertSame([
50+
self::assertSame([
5151
[
5252
'$bucketAuto' => [
5353
'groupBy' => '$someField',
@@ -66,7 +66,7 @@ public function testBucketAutoSkipsUndefinedProperties(): void
6666
->groupBy('$someField')
6767
->buckets(3);
6868

69-
$this->assertSame([
69+
self::assertSame([
7070
'$bucketAuto' => [
7171
'groupBy' => '$someField',
7272
'buckets' => 3,
@@ -86,7 +86,7 @@ public function testFieldNameConversion(): void
8686
->field('averageValue')
8787
->avg('$value');
8888

89-
$this->assertEquals(
89+
self::assertEquals(
9090
[
9191
[
9292
'$bucketAuto' => [

‎tests/Doctrine/ODM/MongoDB/Tests/Aggregation/Stage/BucketTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function testBucketStage(): void
2626
->field('averageValue')
2727
->avg('$value');
2828

29-
$this->assertSame([
29+
self::assertSame([
3030
'$bucket' => [
3131
'groupBy' => '$someField',
3232
'boundaries' => [1, 2, 3],
@@ -47,7 +47,7 @@ public function testBucketFromBuilder(): void
4747
->field('averageValue')
4848
->avg('$value');
4949

50-
$this->assertSame([
50+
self::assertSame([
5151
[
5252
'$bucket' => [
5353
'groupBy' => '$someField',
@@ -66,7 +66,7 @@ public function testBucketSkipsUndefinedProperties(): void
6666
->groupBy('$someField')
6767
->boundaries(1, 2, 3);
6868

69-
$this->assertSame([
69+
self::assertSame([
7070
'$bucket' => [
7171
'groupBy' => '$someField',
7272
'boundaries' => [1, 2, 3],
@@ -86,7 +86,7 @@ public function testFieldNameConversion(): void
8686
->field('averageValue')
8787
->avg('$value');
8888

89-
$this->assertEquals(
89+
self::assertEquals(
9090
[
9191
[
9292
'$bucket' => [

‎tests/Doctrine/ODM/MongoDB/Tests/Aggregation/Stage/CollStatsTest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,31 +16,31 @@ public function testCollStatsStage(): void
1616
{
1717
$collStatsStage = new CollStats($this->getTestAggregationBuilder());
1818

19-
$this->assertSame(['$collStats' => []], $collStatsStage->getExpression());
19+
self::assertSame(['$collStats' => []], $collStatsStage->getExpression());
2020
}
2121

2222
public function testCollStatsStageWithLatencyStats(): void
2323
{
2424
$collStatsStage = new CollStats($this->getTestAggregationBuilder());
2525
$collStatsStage->showLatencyStats();
2626

27-
$this->assertSame(['$collStats' => ['latencyStats' => ['histograms' => false]]], $collStatsStage->getExpression());
27+
self::assertSame(['$collStats' => ['latencyStats' => ['histograms' => false]]], $collStatsStage->getExpression());
2828
}
2929

3030
public function testCollStatsStageWithLatencyStatsHistograms(): void
3131
{
3232
$collStatsStage = new CollStats($this->getTestAggregationBuilder());
3333
$collStatsStage->showLatencyStats(true);
3434

35-
$this->assertSame(['$collStats' => ['latencyStats' => ['histograms' => true]]], $collStatsStage->getExpression());
35+
self::assertSame(['$collStats' => ['latencyStats' => ['histograms' => true]]], $collStatsStage->getExpression());
3636
}
3737

3838
public function testCollStatsStageWithStorageStats(): void
3939
{
4040
$collStatsStage = new CollStats($this->getTestAggregationBuilder());
4141
$collStatsStage->showStorageStats();
4242

43-
$this->assertSame(['$collStats' => ['storageStats' => []]], $collStatsStage->getExpression());
43+
self::assertSame(['$collStats' => ['storageStats' => []]], $collStatsStage->getExpression());
4444
}
4545

4646
public function testCollStatsFromBuilder(): void
@@ -50,7 +50,7 @@ public function testCollStatsFromBuilder(): void
5050
->showLatencyStats(true)
5151
->showStorageStats();
5252

53-
$this->assertSame([
53+
self::assertSame([
5454
[
5555
'$collStats' => [
5656
'latencyStats' => ['histograms' => true],

‎tests/Doctrine/ODM/MongoDB/Tests/Aggregation/Stage/CountTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ public function testCountStage(): void
1616
{
1717
$countStage = new Count($this->getTestAggregationBuilder(), 'document_count');
1818

19-
$this->assertSame(['$count' => 'document_count'], $countStage->getExpression());
19+
self::assertSame(['$count' => 'document_count'], $countStage->getExpression());
2020
}
2121

2222
public function testCountFromBuilder(): void
2323
{
2424
$builder = $this->getTestAggregationBuilder();
2525
$builder->count('document_count');
2626

27-
$this->assertSame([['$count' => 'document_count']], $builder->getPipeline());
27+
self::assertSame([['$count' => 'document_count']], $builder->getPipeline());
2828
}
2929
}

0 commit comments

Comments
 (0)