Skip to content

Commit 341fe5e

Browse files
lstrojnylstrojny
committed
Fix coding standard warnings
1 parent 623f10e commit 341fe5e

File tree

8 files changed

+25
-3
lines changed

8 files changed

+25
-3
lines changed

‎src/Matcher/ExtractorFactory.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ public function __construct($basePath = '')
1717
public function createPathExtractor()
1818
{
1919
$basePath = $this->basePath;
20+
2021
return static function (Request $request) use ($basePath) {
2122
return substr_replace($request->getRequestUri(), '', 0, strlen($basePath));
2223
};

‎src/MockBuilder.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ public function flushExpectations()
7373
{
7474
$expectations = $this->expectations;
7575
$this->expectations = [];
76+
7677
return $expectations;
7778
}
7879
}

‎src/PHPUnit/HttpMockFacadeMap.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ public function offsetUnset($offset)
4343
public function __clone()
4444
{
4545
$this->facadeMap = array_map(
46-
static function (HttpMockFacade $facade) { return clone $facade; },
46+
static function (HttpMockFacade $facade) {
47+
return clone $facade;
48+
},
4749
$this->facadeMap
4850
);
4951
}

‎src/PHPUnit/HttpMockTrait.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ protected static function setUpHttpMockBeforeClass($port = null, $host = null, $
2525
$host = $host ?: static::getHttpMockDefaultHost();
2626

2727
$facade = new HttpMockFacade($port, $host, $basePath);
28+
2829
if ($name === null) {
2930
static::$staticHttp = $facade;
3031
} elseif (static::$staticHttp instanceof HttpMockFacadeMap) {

‎src/RequestCollectionFacade.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ private function configureRequest(RequestInterface $request, array $server, arra
120120
}
121121

122122
$params = [];
123+
123124
if (isset($server['HTTP_USER_AGENT'])) {
124125
$params['userAgent'] = $server['HTTP_USER_AGENT'];
125126
}
@@ -152,6 +153,7 @@ private function deleteRecordedRequest($path)
152153
private function parseResponse(Response $response, $path)
153154
{
154155
$statusCode = $response->getStatusCode();
156+
155157
if ($statusCode !== 200) {
156158
throw new UnexpectedValueException(
157159
sprintf('Expected status code 200 from "%s", got %d', $path, $statusCode)

‎src/RequestStorage.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,11 @@ public function store(Request $request, $name, $data)
2323
public function read(Request $request, $name)
2424
{
2525
$fileName = $this->getFileName($request, $name);
26+
2627
if (!file_exists($fileName)) {
2728
return [];
2829
}
30+
2931
return Util::deserialize(file_get_contents($fileName));
3032
}
3133

‎src/Server.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ public function setUp(array $expectations)
8787
'response' => serialize($expectation->getResponse()),
8888
]
8989
)->send();
90+
9091
if ($response->getStatusCode() !== 201) {
9192
throw new RuntimeException('Could not set up expectations');
9293
}

‎src/app.php‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<?php // @codingStandardsIgnoreStart
2-
// @codingStandardsIgnoreEnd
1+
<?php // @codingStandardsIgnoreLine
32
namespace InterNations\Component\HttpMock;
43

54
use Exception;
@@ -14,14 +13,17 @@
1413
__DIR__ . '/../vendor/autoload.php',
1514
__DIR__ . '/../../../autoload.php',
1615
];
16+
1717
$autoloaderFound = false;
18+
1819
foreach ($autoloadFiles as $autoloadFile) {
1920
if (file_exists($autoloadFile)) {
2021
require_once $autoloadFile;
2122
$autoloaderFound = true;
2223
break;
2324
}
2425
}
26+
2527
if (!$autoloaderFound) {
2628
throw new RuntimeException(
2729
sprintf('Could not locate autoloader file. Tried "%s"', implode($autoloadFiles, '", "'))
@@ -46,11 +48,13 @@ static function (Request $request) use ($app) {
4648
static function (Request $request) use ($app) {
4749

4850
$matcher = [];
51+
4952
if ($request->request->has('matcher')) {
5053
$matcher = Util::silentDeserialize($request->request->get('matcher'));
5154
$validator = static function ($closure) {
5255
return is_callable($closure);
5356
};
57+
5458
if (!is_array($matcher) || count(array_filter($matcher, $validator)) !== count($matcher)) {
5559
return new Response(
5660
'POST data key "matcher" must be a serialized list of closures',
@@ -64,6 +68,7 @@ static function (Request $request) use ($app) {
6468
}
6569

6670
$response = Util::silentDeserialize($request->request->get('response'));
71+
6772
if (!$response instanceof Response) {
6873
return new Response(
6974
'POST data key "response" must be a serialized Symfony response',
@@ -72,8 +77,10 @@ static function (Request $request) use ($app) {
7277
}
7378

7479
$limiter = null;
80+
7581
if ($request->request->has('limiter')) {
7682
$limiter = Util::silentDeserialize($request->request->get('limiter'));
83+
7784
if (!is_callable($limiter)) {
7885
return new Response(
7986
'POST data key "limiter" must be a serialized closure',
@@ -115,6 +122,7 @@ static function (Exception $e) use ($app) {
115122
$notFoundResponse = new Response('No matching expectation found', Response::HTTP_NOT_FOUND);
116123

117124
$expectations = $app['storage']->read($request, 'expectations');
125+
118126
foreach ($expectations as $pos => $expectation) {
119127
foreach ($expectation['matcher'] as $matcher) {
120128
if (!$matcher($request)) {
@@ -137,6 +145,7 @@ static function (Exception $e) use ($app) {
137145
}
138146

139147
$code = ($e instanceof HttpException) ? $e->getStatusCode() : Response::HTTP_INTERNAL_SERVER_ERROR;
148+
140149
return new Response('Server error: ' . $e->getMessage(), $code);
141150
}
142151
);
@@ -152,6 +161,7 @@ static function (Request $request) use ($app) {
152161
'/_request/{index}',
153162
static function (Request $request, $index) use ($app) {
154163
$requestData = $app['storage']->read($request, 'requests');
164+
155165
if (!isset($requestData[$index])) {
156166
return new Response('Index ' . $index . ' not found', Response::HTTP_NOT_FOUND);
157167
}
@@ -167,6 +177,7 @@ static function (Request $request, $action) use ($app) {
167177
$fn = 'array_' . ($action === 'last' ? 'pop' : 'shift');
168178
$requestString = $fn($requestData);
169179
$app['storage']->store($request, 'requests', $requestData);
180+
170181
if (!$requestString) {
171182
return new Response($action . ' not possible', Response::HTTP_NOT_FOUND);
172183
}
@@ -181,6 +192,7 @@ static function (Request $request, $action) use ($app) {
181192
$requestData = $app['storage']->read($request, 'requests');
182193
$fn = 'array_' . ($action === 'last' ? 'pop' : 'shift');
183194
$requestString = $fn($requestData);
195+
184196
if (!$requestString) {
185197
return new Response($action . ' not available', Response::HTTP_NOT_FOUND);
186198
}

0 commit comments

Comments
 (0)