Skip to content
This repository was archived by the owner on Sep 10, 2020. It is now read-only.

Commit 486123b

Browse files
author
Paramtamtam
committed
Tests fixed, changelog updated
1 parent 4a67ad8 commit 486123b

4 files changed

Lines changed: 17 additions & 6 deletions

File tree

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,17 @@ The format is based on [Keep a Changelog][keepachangelog] and this project adher
1919
- Some asserts now accepts "message" parameter
2020
- Minimal PHP version now is `7.1.3`
2121
- Minimal PHPUnit version now is `^7.5`
22+
- Minimal Laravel version now is `5.6.x`
2223
- Maximal Laravel version now is `5.8.x`
2324
- Composer scripts
2425

2526
### Removed
2627

2728
- `AvtoDev\DevTools\Laravel\VarDumper\*` (replaced with `avto-dev/stacked-dumper-laravel`)
29+
- `assertIsNumeric`
30+
- `assertIsInteger`
31+
- `assertIsArray`
32+
- `assertIsString`
2833

2934
### Deprecated
3035

composer.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,9 @@
2323
"ext-pdo_sqlite": "*",
2424
"ext-sqlite3": "*",
2525
"jeremeamia/superclosure": "^2.4",
26-
"nikic/php-parser": "^2.0 || ^3.0 || ^4.0",
27-
"laravel/laravel": ">=5.5.0 <5.9.0",
28-
"phpstan/phpstan": "~0.9 || ^0.10",
29-
"mockery/mockery": "~1.0"
26+
"laravel/laravel": ">=5.6.0 <5.9.0",
27+
"phpstan/phpstan": "^0.11.3",
28+
"mockery/mockery": "^1.0"
3029
},
3130
"autoload": {
3231
"psr-4": {

src/Tests/PHPUnit/Traits/AdditionalAssertionsTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ public function assertClassUsesTraits($class, $expected_traits, string $message
240240
$results += $trait_uses_recursive($class_iterate);
241241
}
242242

243-
return \array_values(\array_unique($results));
243+
return \array_values(\array_unique((array) $results));
244244
};
245245

246246
$uses = $class_uses_recursive($class);

src/Tests/PHPUnit/Traits/LaravelEventsAssertionsTrait.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,13 @@
66

77
use ReflectionFunction;
88
use ReflectionException;
9+
use Illuminate\Events\Dispatcher;
910
use PHPUnit\Framework\ExpectationFailedException;
1011
use SebastianBergmann\RecursionContext\InvalidArgumentException;
1112

13+
/**
14+
* @mixin \Illuminate\Foundation\Testing\TestCase
15+
*/
1216
trait LaravelEventsAssertionsTrait
1317
{
1418
/**
@@ -27,7 +31,10 @@ public function getEventListenersClasses($event_abstract): array
2731
{
2832
$result = [];
2933

30-
foreach (\Illuminate\Support\Facades\Event::getListeners($event_abstract) as $listener_closure) {
34+
/** @var Dispatcher $events */
35+
$events = $this->app->make(Dispatcher::class);
36+
37+
foreach ($events->getListeners($event_abstract) as $listener_closure) {
3138
$reflection = new ReflectionFunction($listener_closure);
3239
$uses = $reflection->getStaticVariables();
3340

0 commit comments

Comments
 (0)