Skip to content

Commit 6cd182e

Browse files
moufmoufmoufmouf
authored
Merge pull request #141 from thecodingmachine/dependabot/composer/phpunit/phpunit-tw-7.4.4or-tw-8.0.0
Update phpunit/phpunit requirement from ^7.4.4 to ^7.4.4 || ^8.0.0
2 parents 688d81e + 1f0ad2b commit 6cd182e

24 files changed

+305
-309
lines changed

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ vendor/*
1212
/template/
1313
/.travis/
1414
/vendor-bin/require-checker/vendor/
15-
/vendor-bin/couscous/vendor/
15+
/vendor-bin/couscous/vendor/
16+
.phpunit.result.cache

‎composer.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,15 @@
4141
"ext-filter": "*"
4242
},
4343
"require-dev" : {
44-
"phpunit/phpunit": "^7.4.4",
44+
"phpunit/phpunit": "^7.4.4 || ^8.0.0",
4545
"satooshi/php-coveralls": "^1.0.1",
4646
"wa72/simplelogger" : "^1.0",
4747
"friendsofphp/php-cs-fixer": "^2.5",
4848
"symfony/process": "^3 || ^4",
4949
"thecodingmachine/tdbm-fluid-schema-builder": "^1.0.0",
5050
"phpstan/phpstan": "^0.11.5",
5151
"thecodingmachine/phpstan-strict-rules": "^0.11.0",
52-
"bamarni/composer-bin-plugin": "^1.2",
53-
"nette/bootstrap": "^2.4.6"
52+
"bamarni/composer-bin-plugin": "^1.2"
5453
},
5554
"conflict": {
5655
"mouf/database.tdbm": "~5.0.0"

‎tests/AlterableResultIteratorTest.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
class AlterableResultIteratorTest extends TestCase
1010
{
11-
public function testUnalteredResultSet()
11+
public function testUnalteredResultSet(): void
1212
{
1313
$a = (object) ['a' => 'a'];
1414
$b = (object) ['b' => 'c'];
@@ -26,7 +26,7 @@ public function testUnalteredResultSet()
2626
$this->assertEquals($a, $alterableResultIterator->first());
2727
}
2828

29-
public function testEmptyResultSet()
29+
public function testEmptyResultSet(): void
3030
{
3131
$alterableResultIterator = new AlterableResultIterator();
3232

@@ -36,7 +36,7 @@ public function testEmptyResultSet()
3636
$this->assertNull($alterableResultIterator->first());
3737
}
3838

39-
public function testAlterEmptyResultSet()
39+
public function testAlterEmptyResultSet(): void
4040
{
4141
$alterableResultIterator = new AlterableResultIterator();
4242

@@ -52,7 +52,7 @@ public function testAlterEmptyResultSet()
5252
$this->assertEquals([$a], $alterableResultIterator->toArray());
5353
}
5454

55-
public function testAlterFilledResultSet()
55+
public function testAlterFilledResultSet(): void
5656
{
5757
$a = (object) ['a' => 'a'];
5858
$b = (object) ['b' => 'c'];
@@ -69,7 +69,7 @@ public function testAlterFilledResultSet()
6969
$this->assertEquals([$c], iterator_to_array($alterableResultIterator->take(1, 1)));
7070
}
7171

72-
public function testAddAfterToArray()
72+
public function testAddAfterToArray(): void
7373
{
7474
$a = (object) ['a' => 'a'];
7575
$b = (object) ['b' => 'c'];
@@ -87,7 +87,7 @@ public function testAddAfterToArray()
8787
$this->assertEquals([$a, $c], $alterableResultIterator->toArray());
8888
}
8989

90-
public function testGetIterator()
90+
public function testGetIterator(): void
9191
{
9292
$a = (object) ['a' => 'a'];
9393
$b = (object) ['b' => 'c'];
@@ -106,21 +106,21 @@ public function testGetIterator()
106106
$this->assertInstanceOf(\ArrayIterator::class, $alterableResultIterator->getIterator());
107107
}
108108

109-
public function testSetException()
109+
public function testSetException(): void
110110
{
111111
$alterableResultIterator = new AlterableResultIterator();
112112
$this->expectException(TDBMInvalidOperationException::class);
113113
$alterableResultIterator[0] = 'foo';
114114
}
115115

116-
public function testUnsetException()
116+
public function testUnsetException(): void
117117
{
118118
$alterableResultIterator = new AlterableResultIterator();
119119
$this->expectException(TDBMInvalidOperationException::class);
120120
unset($alterableResultIterator[0]);
121121
}
122122

123-
public function testMap()
123+
public function testMap(): void
124124
{
125125
$a = (object) ['foo' => 'bar'];
126126

@@ -135,7 +135,7 @@ public function testMap()
135135
$this->assertEquals(['bar'], iterator_to_array($map));
136136
}
137137

138-
public function testSetIterator()
138+
public function testSetIterator(): void
139139
{
140140
$alterableResultIterator = new AlterableResultIterator();
141141

‎tests/Commands/AlteredConfigurationTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
class AlteredConfigurationTest extends TestCase
1616
{
17-
public function testAlteredConfiguration()
17+
public function testAlteredConfiguration(): void
1818
{
1919
$connection = $this->getMockBuilder(Connection::class)->disableOriginalConstructor()->getMock();
2020
$namingStrategy = $this->getMockBuilder(NamingStrategyInterface::class)->disableOriginalConstructor()->getMock();

‎tests/Commands/GenerateCommandTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public static function getInputDefinition()
1919
]);
2020
}
2121

22-
public function testCall()
22+
public function testCall(): void
2323
{
2424
$input = new ArrayInput([
2525
], self::getInputDefinition());

‎tests/MapIteratorTest.php

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,27 +25,23 @@
2525

2626
class MapIteratorTest extends TestCase
2727
{
28-
/**
29-
* @expectedException \TheCodingMachine\TDBM\TDBMException
30-
*/
31-
public function testConstructorException1()
28+
public function testConstructorException1(): void
3229
{
30+
$this->expectException('TheCodingMachine\TDBM\TDBMException');
3331
$mapIterator = new MapIterator(new \DateTime(), function ($item) {
3432
return $item;
3533
});
3634
}
3735

38-
/**
39-
* @expectedException \TheCodingMachine\TDBM\TDBMException
40-
*/
41-
public function testConstructorException2()
36+
public function testConstructorException2(): void
4237
{
38+
$this->expectException('TheCodingMachine\TDBM\TDBMException');
4339
$mapIterator = new MapIterator(array(1, 2, 3), function () {
4440
return $item;
4541
});
4642
}
4743

48-
public function testJsonSerialize()
44+
public function testJsonSerialize(): void
4945
{
5046
$value = array(1, 2, 3);
5147
$mapIterator = new MapIterator($value, function ($item) {

‎tests/OrderByAnalyzerTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
class OrderByAnalyzerTest extends TestCase
1111
{
12-
public function testAnalyzeOrderBy()
12+
public function testAnalyzeOrderBy(): void
1313
{
1414
$analyzer = new OrderByAnalyzer(new VoidCache(), '');
1515
$results = $analyzer->analyzeOrderBy('`a`, b desc, rand() DESC, masc, mytable.mycol');
@@ -46,7 +46,7 @@ public function testAnalyzeOrderBy()
4646
], $results[4]);
4747
}
4848

49-
public function testExprWithAsc()
49+
public function testExprWithAsc(): void
5050
{
5151
$analyzer = new OrderByAnalyzer(new VoidCache(), '');
5252
$results = $analyzer->analyzeOrderBy('foodesc + barasc');
@@ -59,7 +59,7 @@ public function testExprWithAsc()
5959
], $results[0]);
6060
}
6161

62-
public function testCache()
62+
public function testCache(): void
6363
{
6464
$analyzer = new OrderByAnalyzer(new ArrayCache(), '');
6565
$results = $analyzer->analyzeOrderBy('foo');

‎tests/StandardObjectStorageTest.php

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

77
class StandardObjectStorageTest extends TestCase
88
{
9-
public function testObjectStorage()
9+
public function testObjectStorage(): void
1010
{
1111
$objectStorage = new StandardObjectStorage();
1212
$this->assertNull($objectStorage->get('foo', 42));

‎tests/TDBMAbstractServiceTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ abstract class TDBMAbstractServiceTest extends TestCase
7171
*/
7272
private $cache;
7373

74-
public static function setUpBeforeClass()
74+
public static function setUpBeforeClass(): void
7575
{
7676
self::resetConnection();
7777

@@ -189,7 +189,7 @@ protected function onlyMySql()
189189
}
190190
}
191191

192-
protected function setUp()
192+
protected function setUp(): void
193193
{
194194
$this->tdbmService = new TDBMService($this->getConfiguration());
195195
}

0 commit comments

Comments
 (0)