Skip to content

Commit d7a1fd2

Browse files
SlamdunkSlamdunk
committed
Updated dependencies
1 parent 5a18fd8 commit d7a1fd2

File tree

5 files changed

+56
-49
lines changed

5 files changed

+56
-49
lines changed

‎.travis.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ matrix:
66
fast_finish: true
77
include:
88
- php: 7.3
9-
env: CS_CHECK=1 CODE_COVERAGE=1
10-
- php: 7.4snapshot
9+
env: CS_CHECK=1
10+
- php: 7.4
11+
env: CODE_COVERAGE=1
1112

1213
cache:
1314
directories:

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"php": "^7.3"
2121
},
2222
"require-dev": {
23-
"phpunit/phpunit": "^8.3",
23+
"phpunit/phpunit": "^8.5",
2424
"roave/security-advisories": "dev-master",
2525
"slam/php-cs-fixer-extensions": "^1.19"
2626
}

‎lib/r.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
{
77
use Slam\Debug\R as DebugR;
88

9-
function r($var, bool $exit = true, int $level = 0, bool $fullstack = false, string $stripFromFullstack = null): void
9+
function r($var, bool $exit = true, int $level = 0, bool $fullstack = false, ?string $stripFromFullstack = null): void
1010
{
1111
DebugR::$db = \debug_backtrace();
1212
DebugR::debug($var, $exit, $level, $fullstack, $stripFromFullstack);
1313
}
1414

15-
function rq(string $query, array $params, bool $exit = true, int $level = 0, bool $fullstack = false, string $stripFromFullstack = null): void
15+
function rq(string $query, array $params, bool $exit = true, int $level = 0, bool $fullstack = false, ?string $stripFromFullstack = null): void
1616
{
1717
\uksort($params, function (string $key1, string $key2) {
1818
return \strlen($key2) <=> \strlen($key1);
@@ -44,7 +44,7 @@ private function __construct()
4444
{
4545
}
4646

47-
public static function debug($var, bool $exit = true, int $level = 0, bool $fullstack = false, string $stripFromFullstack = null): void
47+
public static function debug($var, bool $exit = true, int $level = 0, bool $fullstack = false, ?string $stripFromFullstack = null): void
4848
{
4949
if (null === $var || \is_scalar($var)) {
5050
\ob_start();
@@ -67,7 +67,7 @@ public static function debug($var, bool $exit = true, int $level = 0, bool $full
6767
}
6868
}
6969

70-
private static function formatDb(bool $fullstack, string $stripFromFullstack = null): string
70+
private static function formatDb(bool $fullstack, ?string $stripFromFullstack = null): string
7171
{
7272
$output = '';
7373

‎tests/Doctrine/DebugTest.php‎

Lines changed: 29 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,25 @@
44

55
namespace SlamTest\Debug\Doctrine;
66

7+
use ArrayIterator;
8+
use ArrayObject;
9+
use DateTime;
10+
use DateTimeImmutable;
11+
use DateTimeZone;
712
use PHPUnit\Framework\TestCase;
813
use Slam\Debug\Doctrine\Debug;
14+
use stdClass;
915

1016
final class DebugTest extends TestCase
1117
{
1218
public function testExportObject(): void
1319
{
14-
$obj = new \stdClass();
20+
$obj = new stdClass();
1521
$obj->foo = 'bar';
1622
$obj->bar = 1234;
1723

1824
$var = Debug::export($obj, 2);
19-
static::assertEquals('stdClass', $var->__CLASS__);
25+
self::assertEquals('stdClass', $var->__CLASS__);
2026
}
2127

2228
public function testExportObjectWithReference(): void
@@ -28,8 +34,8 @@ public function testExportObjectWithReference(): void
2834
$var = Debug::export($baz, 2);
2935
$baz->foo = 'tab';
3036

31-
static::assertEquals('bar', $var->foo);
32-
static::assertEquals('tab', $bar['foo']);
37+
self::assertEquals('bar', $var->foo);
38+
self::assertEquals('tab', $bar['foo']);
3339
}
3440

3541
public function testExportArray(): void
@@ -38,47 +44,47 @@ public function testExportArray(): void
3844
$var = Debug::export($array, 2);
3945
$expected = $array;
4046
$expected['b']['d'] = 'Array(2)';
41-
static::assertEquals($expected, $var);
47+
self::assertEquals($expected, $var);
4248
}
4349

4450
public function testExportDateTime(): void
4551
{
46-
$obj = new \DateTime('2010-10-10 10:10:10', new \DateTimeZone('UTC'));
52+
$obj = new DateTime('2010-10-10 10:10:10', new DateTimeZone('UTC'));
4753

4854
$var = Debug::export($obj, 2);
49-
static::assertEquals('DateTime', $var->__CLASS__);
50-
static::assertEquals('2010-10-10T10:10:10+00:00', $var->date);
55+
self::assertEquals('DateTime', $var->__CLASS__);
56+
self::assertEquals('2010-10-10T10:10:10+00:00', $var->date);
5157
}
5258

5359
public function testExportDateTimeImmutable(): void
5460
{
55-
$obj = new \DateTimeImmutable('2010-10-10 10:10:10', new \DateTimeZone('UTC'));
61+
$obj = new DateTimeImmutable('2010-10-10 10:10:10', new DateTimeZone('UTC'));
5662

5763
$var = Debug::export($obj, 2);
58-
static::assertEquals('DateTimeImmutable', $var->__CLASS__);
59-
static::assertEquals('2010-10-10T10:10:10+00:00', $var->date);
64+
self::assertEquals('DateTimeImmutable', $var->__CLASS__);
65+
self::assertEquals('2010-10-10T10:10:10+00:00', $var->date);
6066
}
6167

6268
public function testExportDateTimeZone(): void
6369
{
64-
$obj = new \DateTimeImmutable('2010-10-10 12:34:56', new \DateTimeZone('Europe/Rome'));
70+
$obj = new DateTimeImmutable('2010-10-10 12:34:56', new DateTimeZone('Europe/Rome'));
6571

6672
$var = Debug::export($obj, 2);
67-
static::assertEquals('DateTimeImmutable', $var->__CLASS__);
68-
static::assertEquals('2010-10-10T12:34:56+02:00', $var->date);
73+
self::assertEquals('DateTimeImmutable', $var->__CLASS__);
74+
self::assertEquals('2010-10-10T12:34:56+02:00', $var->date);
6975
}
7076

7177
public function testExportArrayTraversable(): void
7278
{
73-
$obj = new \ArrayObject(['foobar']);
79+
$obj = new ArrayObject(['foobar']);
7480

7581
$var = Debug::export($obj, 2);
76-
static::assertContains('foobar', $var->__STORAGE__);
82+
self::assertContains('foobar', $var->__STORAGE__);
7783

78-
$it = new \ArrayIterator(['foobar']);
84+
$it = new ArrayIterator(['foobar']);
7985

8086
$var = Debug::export($it, 5);
81-
static::assertContains('foobar', $var->__STORAGE__);
87+
self::assertContains('foobar', $var->__STORAGE__);
8288
}
8389

8490
public function testReturnsOutput(): void
@@ -90,7 +96,7 @@ public function testReturnsOutput(): void
9096

9197
\ob_end_clean();
9298

93-
static::assertSame($outputValue, $dump);
99+
self::assertSame($outputValue, $dump);
94100
}
95101

96102
public function testDisablesOutput(): void
@@ -102,8 +108,8 @@ public function testDisablesOutput(): void
102108

103109
\ob_end_clean();
104110

105-
static::assertEmpty($outputValue);
106-
static::assertNotSame($outputValue, $dump);
111+
self::assertEmpty($outputValue);
112+
self::assertNotSame($outputValue, $dump);
107113
}
108114

109115
/**
@@ -117,13 +123,13 @@ public function testExportParentAttributes(TestAsset\ParentClass $class, array $
117123
$print_r_class = \substr($print_r_class, (int) \strpos($print_r_class, '('));
118124
$print_r_expected = \substr($print_r_expected, (int) \strpos($print_r_expected, '('));
119125

120-
static::assertSame($print_r_expected, $print_r_class);
126+
self::assertSame($print_r_expected, $print_r_class);
121127

122128
$var = Debug::export($class, 3);
123129
$var = (array) $var;
124130
unset($var['__CLASS__']);
125131

126-
static::assertSame($expected, $var);
132+
self::assertSame($expected, $var);
127133
}
128134

129135
public function provideAttributesCases()

‎tests/RTest.php‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -40,52 +40,52 @@ public function testScalar(): void
4040
{
4141
r(1, false);
4242

43-
static::assertStringContainsString(__FILE__, MockStderr::$output);
44-
static::assertStringContainsString('int(1)', MockStderr::$output);
43+
self::assertStringContainsString(__FILE__, MockStderr::$output);
44+
self::assertStringContainsString('int(1)', MockStderr::$output);
4545
}
4646

4747
public function testNonScalar(): void
4848
{
4949
r([1 => 2], false);
5050

51-
static::assertStringContainsString(__FILE__, MockStderr::$output);
52-
static::assertStringContainsString("Array\n(\n [1] => 2\n)", MockStderr::$output);
51+
self::assertStringContainsString(__FILE__, MockStderr::$output);
52+
self::assertStringContainsString("Array\n(\n [1] => 2\n)", MockStderr::$output);
5353
}
5454

5555
public function testFullstackOutput(): void
5656
{
5757
r(1, false, 0, true);
5858

59-
static::assertStringContainsString(__FILE__, MockStderr::$output);
60-
static::assertStringContainsString(__FUNCTION__, MockStderr::$output);
61-
static::assertStringContainsString('TestCase', MockStderr::$output);
62-
static::assertRegExp(\sprintf('/%s:\d+\b/', \preg_quote(__FILE__, '/')), MockStderr::$output);
63-
static::assertStringContainsString('TextUI/Command', MockStderr::$output);
59+
self::assertStringContainsString(__FILE__, MockStderr::$output);
60+
self::assertStringContainsString(__FUNCTION__, MockStderr::$output);
61+
self::assertStringContainsString('TestCase', MockStderr::$output);
62+
self::assertRegExp(\sprintf('/%s:\d+\b/', \preg_quote(__FILE__, '/')), MockStderr::$output);
63+
self::assertStringContainsString('TextUI/Command', MockStderr::$output);
6464
}
6565

6666
public function testStripEntriesFromFullstack(): void
6767
{
6868
r(1, false, 0, true, 'TextUI');
6969

70-
static::assertStringContainsString(__FILE__, MockStderr::$output);
71-
static::assertStringContainsString(__FUNCTION__, MockStderr::$output);
72-
static::assertStringContainsString('TestCase', MockStderr::$output);
73-
static::assertStringNotContainsString('TextUI/Command', MockStderr::$output);
70+
self::assertStringContainsString(__FILE__, MockStderr::$output);
71+
self::assertStringContainsString(__FUNCTION__, MockStderr::$output);
72+
self::assertStringContainsString('TestCase', MockStderr::$output);
73+
self::assertStringNotContainsString('TextUI/Command', MockStderr::$output);
7474
}
7575

7676
public function testQueryDebug(): void
7777
{
7878
rq('SELECT * FROM table WHERE c1 = :p1 AND c1 = :p11 AND c1 = :p2', ['p1' => 1, 'p11' => 2, 'p2' => '"'], false, 0, true);
7979

80-
static::assertStringContainsString('SELECT * FROM table WHERE c1 = "1" AND c1 = "2" AND c1 = "\\""', MockStderr::$output);
80+
self::assertStringContainsString('SELECT * FROM table WHERE c1 = "1" AND c1 = "2" AND c1 = "\\""', MockStderr::$output);
8181
}
8282

8383
public function testDoctrine(): void
8484
{
8585
r(new stdClass(), false, 1);
8686

87-
static::assertStringContainsString(__FILE__, MockStderr::$output);
88-
static::assertStringContainsString('__CLASS__', MockStderr::$output);
87+
self::assertStringContainsString(__FILE__, MockStderr::$output);
88+
self::assertStringContainsString('__CLASS__', MockStderr::$output);
8989
}
9090

9191
public function testClearRootPath(): void
@@ -94,8 +94,8 @@ public function testClearRootPath(): void
9494

9595
r(1, false);
9696

97-
static::assertStringContainsString(\basename(__FILE__), MockStderr::$output);
98-
static::assertStringNotContainsString(__DIR__, MockStderr::$output);
97+
self::assertStringContainsString(\basename(__FILE__), MockStderr::$output);
98+
self::assertStringNotContainsString(__DIR__, MockStderr::$output);
9999
}
100100

101101
/**
@@ -105,7 +105,7 @@ public function testCallArgumentDetails($argument, string $expectedNeedle): void
105105
{
106106
r($argument, false);
107107

108-
static::assertStringContainsString($expectedNeedle, MockStderr::$output);
108+
self::assertStringContainsString($expectedNeedle, MockStderr::$output);
109109
}
110110

111111
public function provideCallArgumentDetails(): array

0 commit comments

Comments
 (0)