Skip to content

Commit 8c60166

Browse files
jasonmccrearyjasonmccreary
committed
Pint
1 parent f87707d commit 8c60166

File tree

3 files changed

+25
-26
lines changed

3 files changed

+25
-26
lines changed

‎src/AdditionalAssertionsServiceProvider.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class AdditionalAssertionsServiceProvider extends ServiceProvider
99
{
1010
public function register()
1111
{
12-
if (!\Illuminate\Testing\TestResponse::hasMacro('assertJsonTypedStructure')) {
12+
if (! \Illuminate\Testing\TestResponse::hasMacro('assertJsonTypedStructure')) {
1313
\Illuminate\Testing\TestResponse::macro('assertJsonTypedStructure', function (array $structure) {
1414
AdditionalAssertions::assertArrayStructure($structure, $this->json());
1515

@@ -18,5 +18,3 @@ public function register()
1818
}
1919
}
2020
}
21-
22-

‎src/LaravelMatchers.php‎

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

99
class LaravelMatchers
1010
{
11-
public static function isModel(Model $model = null)
11+
public static function isModel(?Model $model = null)
1212
{
1313
if (is_null($model)) {
1414
return \Mockery::type(Model::class);
@@ -19,26 +19,28 @@ public static function isModel(Model $model = null)
1919
});
2020
}
2121

22-
public static function isCollection(Collection $collection = null)
22+
public static function isCollection(?Collection $collection = null)
2323
{
2424
if (is_null($collection)) {
2525
return \Mockery::type(Collection::class);
2626
}
2727

2828
return \Mockery::on(function ($argument) use ($collection) {
2929
Assert::assertEquals($collection, $argument);
30+
3031
return true;
3132
});
3233
}
3334

34-
public static function isEloquentCollection(\Illuminate\Database\Eloquent\Collection $collection = null)
35+
public static function isEloquentCollection(?\Illuminate\Database\Eloquent\Collection $collection = null)
3536
{
3637
if (is_null($collection)) {
3738
return \Mockery::type(\Illuminate\Database\Eloquent\Collection::class);
3839
}
3940

4041
return \Mockery::on(function ($argument) use ($collection) {
4142
Assert::assertEquals($collection, $argument);
43+
4244
return true;
4345
});
4446
}

‎src/Traits/AdditionalAssertions.php‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
namespace JMac\Testing\Traits;
44

5-
use Illuminate\Database\Eloquent\Model;
65
use Illuminate\Support\Facades\Route;
76
use PHPUnit\Framework\Assert as PHPUnitAssert;
87
use Symfony\Component\HttpFoundation\Request as SymfonyRequest;
@@ -15,8 +14,8 @@ public function assertRouteUsesFormRequest(string $routeName, string $formReques
1514
return $route->getName() == $routeName;
1615
})->pluck('action.controller');
1716

18-
PHPUnitAssert::assertNotEmpty($controllerAction, 'Route "' . $routeName . '" is not defined.');
19-
PHPUnitAssert::assertCount(1, $controllerAction, 'Route "' . $routeName . '" is defined multiple times, route names should be unique.');
17+
PHPUnitAssert::assertNotEmpty($controllerAction, 'Route "'.$routeName.'" is not defined.');
18+
PHPUnitAssert::assertCount(1, $controllerAction, 'Route "'.$routeName.'" is defined multiple times, route names should be unique.');
2019

2120
$controller = $controllerAction->first();
2221
$method = '__invoke';
@@ -29,22 +28,22 @@ public function assertRouteUsesFormRequest(string $routeName, string $formReques
2928

3029
public function assertActionUsesFormRequest(string $controller, string $method, string $form_request)
3130
{
32-
PHPUnitAssert::assertTrue(is_subclass_of($form_request, 'Illuminate\\Foundation\\Http\\FormRequest'), $form_request . ' is not a type of Form Request');
31+
PHPUnitAssert::assertTrue(is_subclass_of($form_request, 'Illuminate\\Foundation\\Http\\FormRequest'), $form_request.' is not a type of Form Request');
3332

3433
try {
3534
$reflector = new \ReflectionClass($controller);
3635
$action = $reflector->getMethod($method);
3736
} catch (\ReflectionException $exception) {
38-
PHPUnitAssert::fail('Controller action could not be found: ' . $controller . '@' . $method);
37+
PHPUnitAssert::fail('Controller action could not be found: '.$controller.'@'.$method);
3938
}
4039

41-
PHPUnitAssert::assertTrue($action->isPublic(), 'Action "' . $method . '" is not public, controller actions must be public.');
40+
PHPUnitAssert::assertTrue($action->isPublic(), 'Action "'.$method.'" is not public, controller actions must be public.');
4241

4342
$actual = collect($action->getParameters())->contains(function ($parameter) use ($form_request) {
4443
return $parameter->getType() instanceof \ReflectionNamedType && $parameter->getType()->getName() === $form_request;
4544
});
4645

47-
PHPUnitAssert::assertTrue($actual, 'Action "' . $method . '" does not have validation using the "' . $form_request . '" Form Request.');
46+
PHPUnitAssert::assertTrue($actual, 'Action "'.$method.'" does not have validation using the "'.$form_request.'" Form Request.');
4847
}
4948

5049
public function assertActionUsesMiddleware($controller, $method, $middleware = null)
@@ -59,20 +58,20 @@ public function assertActionUsesMiddleware($controller, $method, $middleware = n
5958
if ($method === '__invoke') {
6059
$route = $router->getRoutes()->getByAction($controller);
6160

62-
PHPUnitAssert::assertNotNull($route, 'Unable to find route for invokable controller (' . $controller . ')');
61+
PHPUnitAssert::assertNotNull($route, 'Unable to find route for invokable controller ('.$controller.')');
6362
} else {
64-
$route = $router->getRoutes()->getByAction($controller . '@' . $method);
63+
$route = $router->getRoutes()->getByAction($controller.'@'.$method);
6564

66-
PHPUnitAssert::assertNotNull($route, 'Unable to find route for controller action (' . $controller . '@' . $method . ')');
65+
PHPUnitAssert::assertNotNull($route, 'Unable to find route for controller action ('.$controller.'@'.$method.')');
6766
}
6867

6968
$excludedMiddleware = $route->action['excluded_middleware'] ?? [];
7069
$usedMiddlewares = array_diff($route->gatherMiddleware(), $excludedMiddleware);
7170

7271
if (is_array($middleware)) {
73-
PHPUnitAssert::assertSame([], array_diff($middleware, $usedMiddlewares), 'Controller action does not use middleware (' . implode(', ', $middleware) . ')');
72+
PHPUnitAssert::assertSame([], array_diff($middleware, $usedMiddlewares), 'Controller action does not use middleware ('.implode(', ', $middleware).')');
7473
} else {
75-
PHPUnitAssert::assertTrue(in_array($middleware, $usedMiddlewares), 'Controller action does not use middleware (' . $middleware . ')');
74+
PHPUnitAssert::assertTrue(in_array($middleware, $usedMiddlewares), 'Controller action does not use middleware ('.$middleware.')');
7675
}
7776
}
7877

@@ -86,7 +85,7 @@ public function assertMiddlewareGroupUsesMiddleware(string $middlewareGroup, arr
8685

8786
$missingMiddlware = array_diff($middlewares, $middlewareGroups[$middlewareGroup]);
8887

89-
PHPUnitAssert::assertTrue(count($missingMiddlware) === 0, "Middlware Group `$middlewareGroup` does not use expected `" . implode(', ', $missingMiddlware) . "` middleware(s)");
88+
PHPUnitAssert::assertTrue(count($missingMiddlware) === 0, "Middlware Group `$middlewareGroup` does not use expected `".implode(', ', $missingMiddlware).'` middleware(s)');
9089
}
9190

9291
public function assertRouteUsesMiddleware(string $routeName, array $middlewares, bool $exact = false)
@@ -102,24 +101,24 @@ public function assertRouteUsesMiddleware(string $routeName, array $middlewares,
102101

103102
$unusedMiddlewares = array_diff($middlewares, $usedMiddlewares);
104103

105-
PHPUnitAssert::assertTrue(count($unusedMiddlewares) === 0, "Route `$routeName` does not use expected `" . implode(', ', $unusedMiddlewares) . "` middleware(s)");
104+
PHPUnitAssert::assertTrue(count($unusedMiddlewares) === 0, "Route `$routeName` does not use expected `".implode(', ', $unusedMiddlewares).'` middleware(s)');
106105

107106
if ($exact) {
108107
$extraMiddlewares = array_diff($usedMiddlewares, $middlewares);
109108

110109
$messages = [];
111110

112111
if ($extraMiddlewares) {
113-
$messages[] = "uses unexpected `" . implode(', ', $extraMiddlewares) . "` middlware(s)";
112+
$messages[] = 'uses unexpected `'.implode(', ', $extraMiddlewares).'` middlware(s)';
114113
}
115114

116115
if ($unusedMiddlewares) {
117-
$messages[] = "doesn't use expected `" . implode(', ', $unusedMiddlewares) . "` middlware(s)";
116+
$messages[] = "doesn't use expected `".implode(', ', $unusedMiddlewares).'` middlware(s)';
118117
}
119118

120-
$messages = implode(" and ", $messages);
119+
$messages = implode(' and ', $messages);
121120

122-
PHPUnitAssert::assertTrue(count($unusedMiddlewares) + count($extraMiddlewares) === 0, "Route `$routeName` " . $messages);
121+
PHPUnitAssert::assertTrue(count($unusedMiddlewares) + count($extraMiddlewares) === 0, "Route `$routeName` ".$messages);
123122
}
124123
}
125124

@@ -151,7 +150,7 @@ public function assertValidationRuleContains($rule, string $class)
151150
});
152151

153152
if (empty($matches)) {
154-
PHPUnitAssert::fail('Failed asserting rule contains ' . $class);
153+
PHPUnitAssert::fail('Failed asserting rule contains '.$class);
155154
}
156155
}
157156

@@ -186,7 +185,7 @@ public static function assertArrayStructure(array $structure, array $actual)
186185
PHPUnitAssert::assertIsArray($actual[$key]);
187186
break;
188187
default:
189-
PHPUnitAssert::fail('unexpected type: ' . $type);
188+
PHPUnitAssert::fail('unexpected type: '.$type);
190189
}
191190
}
192191
}

0 commit comments

Comments
 (0)