Skip to content

Commit 9544e0b

Browse files
snapshotplsnapshotpl
authored
Test on PHP 8 (php-debugbar#456)
* Test on PHP 8 * Fix tests
1 parent 230f4ad commit 9544e0b

14 files changed

+87
-86
lines changed

‎.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ php:
55
- 7.2
66
- 7.3
77
- 7.4
8+
- nightly
89

910
# This triggers builds to run on the new TravisCI infrastructure.
1011
# See: http://docs.travis-ci.com/user/workers/container-based-infrastructure/

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"symfony/var-dumper": "^2.6|^3|^4|^5"
2323
},
2424
"require-dev": {
25-
"phpunit/phpunit": "^5"
25+
"phpunit/phpunit": "^7.5.20 || ^9.4.2"
2626
},
2727
"autoload": {
2828
"psr-4": {

‎phpunit.xml.dist

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
convertWarningsToExceptions="true"
99
processIsolation="false"
1010
stopOnFailure="false"
11-
syntaxCheck="false"
1211
verbose="true"
1312
>
1413
<testsuites>

‎tests/DebugBar/Tests/DataCollector/AggregatedCollectorTest.php

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

88
class AggregatedCollectorTest extends DebugBarTestCase
99
{
10-
public function setUp()
10+
public function setUp(): void
1111
{
1212
$this->c = new AggregatedCollector('test');
1313
}

‎tests/DebugBar/Tests/DataCollector/ConfigCollectorTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@ public function testHtmlRendering()
4242
$this->assertFalse($c->isHtmlVarDumperUsed());
4343
$data = $c->collect();
4444
$this->assertEquals(array('k'), array_keys($data));
45-
$this->assertContains('one', $data['k']);
46-
$this->assertContains('two', $data['k']);
47-
$this->assertNotContains('span', $data['k']);
45+
$this->assertStringContainsString('one', $data['k']);
46+
$this->assertStringContainsString('two', $data['k']);
47+
$this->assertStringNotContainsString('span', $data['k']);
4848

4949
$c->useHtmlVarDumper();
5050
$data = $c->collect();
5151
$this->assertEquals(array('k'), array_keys($data));
52-
$this->assertContains('one', $data['k']);
53-
$this->assertContains('two', $data['k']);
54-
$this->assertContains('span', $data['k']);
52+
$this->assertStringContainsString('one', $data['k']);
53+
$this->assertStringContainsString('two', $data['k']);
54+
$this->assertStringContainsString('span', $data['k']);
5555
}
5656
}

‎tests/DebugBar/Tests/DataCollector/MessagesCollectorTest.php

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ public function testHtmlMessages()
5757
$c->addMessage($var);
5858
$data = $c->collect();
5959
$message_text = $data['messages'][0]['message'];
60-
$this->assertContains('array', $message_text);
61-
$this->assertContains('one', $message_text);
62-
$this->assertContains('two', $message_text);
63-
$this->assertNotContains('span', $message_text);
60+
$this->assertStringContainsString('array', $message_text);
61+
$this->assertStringContainsString('one', $message_text);
62+
$this->assertStringContainsString('two', $message_text);
63+
$this->assertStringNotContainsString('span', $message_text);
6464
$this->assertNull($data['messages'][0]['message_html']);
6565

6666
$c = new MessagesCollector();
@@ -69,15 +69,14 @@ public function testHtmlMessages()
6969
$c->addMessage($var);
7070
$data = $c->collect();
7171
$message_text = $data['messages'][0]['message'];
72-
$this->assertContains('array', $message_text);
73-
$this->assertContains('one', $message_text);
74-
$this->assertContains('two', $message_text);
75-
$this->assertNotContains('span', $message_text);
72+
$this->assertStringContainsString('array', $message_text);
73+
$this->assertStringContainsString('one', $message_text);
74+
$this->assertStringContainsString('two', $message_text);
75+
$this->assertStringNotContainsString('span', $message_text);
7676
$message_html = $data['messages'][0]['message_html'];
77-
$this->assertContains('array', $message_html);
78-
$this->assertContains('one', $message_html);
79-
$this->assertContains('two', $message_html);
80-
$this->assertContains('span', $message_html);
81-
77+
$this->assertStringContainsString('array', $message_html);
78+
$this->assertStringContainsString('one', $message_html);
79+
$this->assertStringContainsString('two', $message_html);
80+
$this->assertStringContainsString('span', $message_html);
8281
}
8382
}

‎tests/DebugBar/Tests/DataCollector/Propel2CollectorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class Propel2CollectorTest extends DebugBarTestCase
1414
/* @var null|DataFormatter */
1515
protected $dataFormatter = null;
1616

17-
public function setUp()
17+
public function setUp(): void
1818
{
1919
$config = array(
2020
'slowTreshold' => 0.1,

‎tests/DebugBar/Tests/DataCollector/TimeDataCollectorTest.php

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

88
class TimeDataCollectorTest extends DebugBarTestCase
99
{
10-
public function setUp()
10+
public function setUp(): void
1111
{
1212
$this->s = microtime(true);
1313
$this->c = new TimeDataCollector($this->s);

‎tests/DebugBar/Tests/DataFormatter/DebugBarVarDumperTest.php

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,19 @@ public function testBasicFunctionality()
2020
$d->mergeDumperOptions(array('styles' => $this->testStyles));
2121
$out = $d->renderVar('magic');
2222

23-
$this->assertContains('magic', $out);
24-
$this->assertNotContains(self::STYLE_STRING, $out); // make sure there's no dump header
23+
$this->assertStringContainsString('magic', $out);
24+
$this->assertStringNotContainsString(self::STYLE_STRING, $out); // make sure there's no dump header
2525

2626
// Test that we can capture a variable without rendering into a Data-type variable
2727
$data = $d->captureVar('hello');
28-
$this->assertContains('hello', $data);
28+
$this->assertStringContainsString('hello', $data);
2929
$deserialized = unserialize($data);
3030
$this->assertInstanceOf('Symfony\Component\VarDumper\Cloner\Data', $deserialized);
3131

3232
// Test that we can render the captured variable at a later time
3333
$out = $d->renderCapturedVar($data);
34-
$this->assertContains('hello', $out);
35-
$this->assertNotContains(self::STYLE_STRING, $out); // make sure there's no dump header
34+
$this->assertStringContainsString('hello', $out);
35+
$this->assertStringNotContainsString(self::STYLE_STRING, $out); // make sure there's no dump header
3636
}
3737

3838
public function testSeeking()
@@ -47,17 +47,17 @@ public function testSeeking()
4747

4848
// seek depth of 1
4949
$out = $d->renderCapturedVar($data, array(1));
50-
$this->assertNotContains('one', $out);
51-
$this->assertContains('array', $out);
52-
$this->assertContains('two', $out);
53-
$this->assertNotContains('three', $out);
50+
$this->assertStringNotContainsString('one', $out);
51+
$this->assertStringContainsString('array', $out);
52+
$this->assertStringContainsString('two', $out);
53+
$this->assertStringNotContainsString('three', $out);
5454

5555
// seek depth of 2
5656
$out = $d->renderCapturedVar($data, array(1, 0));
57-
$this->assertNotContains('one', $out);
58-
$this->assertNotContains('array', $out);
59-
$this->assertContains('two', $out);
60-
$this->assertNotContains('three', $out);
57+
$this->assertStringNotContainsString('one', $out);
58+
$this->assertStringNotContainsString('array', $out);
59+
$this->assertStringContainsString('two', $out);
60+
$this->assertStringNotContainsString('three', $out);
6161
}
6262

6363
public function testAssetProvider()
@@ -73,7 +73,7 @@ public function testAssetProvider()
7373
$this->assertCount(1, $inlineHead);
7474

7575
$assetText = $inlineHead['html_var_dumper'];
76-
$this->assertContains(self::STYLE_STRING, $assetText);
76+
$this->assertStringContainsString(self::STYLE_STRING, $assetText);
7777
}
7878

7979
public function testBasicOptionOperations()
@@ -108,9 +108,9 @@ public function testBasicOptionOperations()
108108

109109
// Test basic get/merge/reset functionality for dumper
110110
$options = $d->getDumperOptions();
111-
$this->assertContains('styles', $options);
111+
$this->assertArrayHasKey('styles', $options);
112112
$this->assertArrayHasKey('const', $options['styles']);
113-
$this->assertContains('expanded_depth', $options);
113+
$this->assertArrayHasKey('expanded_depth', $options);
114114
$this->assertEquals(0, $options['expanded_depth']);
115115
$this->assertCount(2, $options);
116116

@@ -145,53 +145,53 @@ public function testClonerOptions()
145145
// Test that the 'casters' option can remove default casters
146146
$testData = function() {};
147147
$d->resetClonerOptions();
148-
$this->assertContains('DebugBarVarDumperTest.php', $d->renderVar($testData));
148+
$this->assertStringContainsString('DebugBarVarDumperTest.php', $d->renderVar($testData));
149149

150150
$d->resetClonerOptions(array(
151151
'casters' => array(),
152152
));
153-
$this->assertNotContains('DebugBarVarDumperTest.php', $d->renderVar($testData));
153+
$this->assertStringNotContainsString('DebugBarVarDumperTest.php', $d->renderVar($testData));
154154

155155
// Test that the 'additional_casters' option can add new casters
156156
$testData = function() {};
157157
$d->resetClonerOptions();
158-
$this->assertContains('DebugBarVarDumperTest.php', $d->renderVar($testData));
158+
$this->assertStringContainsString('DebugBarVarDumperTest.php', $d->renderVar($testData));
159159

160160
$d->resetClonerOptions(array(
161161
'casters' => array(),
162162
'additional_casters' => array('Closure' => 'Symfony\Component\VarDumper\Caster\ReflectionCaster::castClosure'),
163163
));
164-
$this->assertContains('DebugBarVarDumperTest.php', $d->renderVar($testData));
164+
$this->assertStringContainsString('DebugBarVarDumperTest.php', $d->renderVar($testData));
165165

166166
// Test 'max_items'
167167
$testData = array(array('one', 'two', 'three', 'four', 'five'));
168168
$d->resetClonerOptions();
169169
$out = $d->renderVar($testData);
170170
foreach ($testData[0] as $search) {
171-
$this->assertContains($search, $out);
171+
$this->assertStringContainsString($search, $out);
172172
}
173173

174174
$d->resetClonerOptions(array(
175175
'max_items' => 3,
176176
));
177177
$out = $d->renderVar($testData);
178-
$this->assertContains('one', $out);
179-
$this->assertContains('two', $out);
180-
$this->assertContains('three', $out);
181-
$this->assertNotContains('four', $out);
182-
$this->assertNotContains('five', $out);
178+
$this->assertStringContainsString('one', $out);
179+
$this->assertStringContainsString('two', $out);
180+
$this->assertStringContainsString('three', $out);
181+
$this->assertStringNotContainsString('four', $out);
182+
$this->assertStringNotContainsString('five', $out);
183183

184184
// Test 'max_string'
185185
$testData = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
186186
$d->resetClonerOptions();
187-
$this->assertContains($testData, $d->renderVar($testData));
187+
$this->assertStringContainsString($testData, $d->renderVar($testData));
188188

189189
$d->resetClonerOptions(array(
190190
'max_string' => 10,
191191
));
192192
$out = $d->renderVar($testData);
193-
$this->assertContains('ABCDEFGHIJ', $out);
194-
$this->assertNotContains('ABCDEFGHIJK', $out);
193+
$this->assertStringContainsString('ABCDEFGHIJ', $out);
194+
$this->assertStringNotContainsString('ABCDEFGHIJK', $out);
195195

196196
// Test 'min_depth' if we are on a Symfony version that supports it
197197
if (method_exists('Symfony\Component\VarDumper\Cloner\AbstractCloner', 'setMinDepth')) {
@@ -201,19 +201,19 @@ public function testClonerOptions()
201201
));
202202
$out = $d->renderVar($testData);
203203
foreach ($testData as $search) {
204-
$this->assertContains($search, $out);
204+
$this->assertStringContainsString($search, $out);
205205
}
206206

207207
$d->resetClonerOptions(array(
208208
'min_depth' => 0,
209209
'max_items' => 3,
210210
));
211211
$out = $d->renderVar($testData);
212-
$this->assertContains('one', $out);
213-
$this->assertContains('two', $out);
214-
$this->assertContains('three', $out);
215-
$this->assertNotContains('four', $out);
216-
$this->assertNotContains('five', $out);
212+
$this->assertStringContainsString('one', $out);
213+
$this->assertStringContainsString('two', $out);
214+
$this->assertStringContainsString('three', $out);
215+
$this->assertStringNotContainsString('four', $out);
216+
$this->assertStringNotContainsString('five', $out);
217217
}
218218
}
219219

@@ -225,29 +225,29 @@ public function testDumperOptions()
225225
// Test that the 'styles' option affects assets
226226
$d->resetDumperOptions();
227227
$assets = $d->getAssets();
228-
$this->assertNotContains(self::STYLE_STRING, $assets['inline_head']['html_var_dumper']);
228+
$this->assertStringNotContainsString(self::STYLE_STRING, $assets['inline_head']['html_var_dumper']);
229229

230230
$d->resetDumperOptions(array('styles' => $this->testStyles));
231231
$assets = $d->getAssets();
232-
$this->assertContains(self::STYLE_STRING, $assets['inline_head']['html_var_dumper']);
232+
$this->assertStringContainsString(self::STYLE_STRING, $assets['inline_head']['html_var_dumper']);
233233

234234
// The next tests require changes in Symfony 3.2:
235235
$dumpMethod = new \ReflectionMethod('Symfony\Component\VarDumper\Dumper\HtmlDumper', 'dump');
236236
if ($dumpMethod->getNumberOfParameters() >= 3) {
237237
// Test that the 'expanded_depth' option affects output
238238
$d->resetDumperOptions(array('expanded_depth' => 123321));
239239
$out = $d->renderVar(true);
240-
$this->assertContains('123321', $out);
240+
$this->assertStringContainsString('123321', $out);
241241

242242
// Test that the 'max_string' option affects output
243243
$d->resetDumperOptions(array('max_string' => 321123));
244244
$out = $d->renderVar(true);
245-
$this->assertContains('321123', $out);
245+
$this->assertStringContainsString('321123', $out);
246246

247247
// Test that the 'file_link_format' option affects output
248248
$d->resetDumperOptions(array('file_link_format' => 'fmt%ftest'));
249249
$out = $d->renderVar(function() {});
250-
$this->assertContains('DebugBarVarDumperTest.phptest', $out);
250+
$this->assertStringContainsString('DebugBarVarDumperTest.phptest', $out);
251251
}
252252
}
253253
}

‎tests/DebugBar/Tests/DebugBarTest.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace DebugBar\Tests;
44

55
use DebugBar\DebugBar;
6+
use DebugBar\DebugBarException;
67
use DebugBar\Tests\DataCollector\MockCollector;
78
use DebugBar\Tests\Storage\MockStorage;
89
use DebugBar\RandomRequestIdGenerator;
@@ -17,12 +18,12 @@ public function testAddCollector()
1718
$this->assertContains($c, $this->debugbar->getCollectors());
1819
}
1920

20-
/**
21-
* @expectedException \DebugBar\DebugBarException
22-
*/
2321
public function testAddCollectorWithSameName()
2422
{
2523
$this->debugbar->addCollector(new MockCollector());
24+
25+
$this->expectException(DebugBarException::class);
26+
2627
$this->debugbar->addCollector(new MockCollector());
2728
}
2829

‎tests/DebugBar/Tests/DebugBarTestCase.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44

55
use DebugBar\DebugBar;
66
use DebugBar\RandomRequestIdGenerator;
7+
use PHPUnit\Framework\TestCase;
78

8-
abstract class DebugBarTestCase extends \PHPUnit_Framework_TestCase
9+
abstract class DebugBarTestCase extends TestCase
910
{
10-
public function setUp()
11+
public function setUp(): void
1112
{
1213
$this->debugbar = new DebugBar();
1314
$this->debugbar->setHttpDriver($http = new MockHttpDriver());

0 commit comments

Comments
 (0)