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

Commit 3eb948b

Browse files
tobias-trozowskitobias-trozowski
committed
Revert "fixed few return types fixed dynamic properties in unit test fixed stuff according to coding standard changed few lambda function to static wherever possible"
This reverts commit 4d2e7aa
1 parent 4d2e7aa commit 3eb948b

File tree

4 files changed

+22
-45
lines changed

4 files changed

+22
-45
lines changed

‎src/HalResource.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public function __construct(array $data = [], array $links = [], array $embedded
8383
$this->embedded[$name] = $resource;
8484
});
8585

86-
if (array_reduce($links, static function ($containsNonLinkItem, $link) {
86+
if (array_reduce($links, function ($containsNonLinkItem, $link) {
8787
return $containsNonLinkItem || ! $link instanceof LinkInterface;
8888
}, false)) {
8989
throw new InvalidArgumentException('Non-Link item provided in $links array');
@@ -378,7 +378,7 @@ private function isResourceCollection($value, string $name, string $context) : b
378378
return false;
379379
}
380380

381-
if (! array_reduce($value, static function ($isResource, $item) {
381+
if (! array_reduce($value, function ($isResource, $item) {
382382
return $isResource && $item instanceof self;
383383
}, true)) {
384384
return false;
@@ -392,7 +392,7 @@ private function isResourceCollection($value, string $name, string $context) : b
392392

393393
private function serializeLinks()
394394
{
395-
$relations = array_reduce($this->links, static function (array $byRelation, LinkInterface $link) {
395+
$relations = array_reduce($this->links, function (array $byRelation, LinkInterface $link) {
396396
$representation = array_merge($link->getAttributes(), [
397397
'href' => $link->getHref(),
398398
]);
@@ -401,7 +401,7 @@ private function serializeLinks()
401401
}
402402

403403
$linkRels = $link->getRels();
404-
array_walk($linkRels, static function ($rel) use (&$byRelation, $representation) {
404+
array_walk($linkRels, function ($rel) use (&$byRelation, $representation) {
405405
$forceCollection = array_key_exists(Link::AS_COLLECTION, $representation)
406406
? (bool) $representation[Link::AS_COLLECTION]
407407
: false;
@@ -431,7 +431,7 @@ private function serializeLinks()
431431
return $byRelation;
432432
}, []);
433433

434-
array_walk($relations, static function ($links, $key) use (&$relations) {
434+
array_walk($relations, function ($links, $key) use (&$relations) {
435435
if (isset($relations[$key][Link::AS_COLLECTION])) {
436436
// If forcing a collection, do nothing to the links, but DO
437437
// remove the marker indicating a collection should be
@@ -449,10 +449,10 @@ private function serializeLinks()
449449
private function serializeEmbeddedResources()
450450
{
451451
$embedded = [];
452-
array_walk($this->embedded, static function ($resource, $name) use (&$embedded) {
452+
array_walk($this->embedded, function ($resource, $name) use (&$embedded) {
453453
$embedded[$name] = $resource instanceof self
454454
? $resource->toArray()
455-
: array_map(static function ($item) {
455+
: array_map(function ($item) {
456456
return $item->toArray();
457457
}, $resource);
458458
});

‎src/ResourceGenerator/ExtractCollectionTrait.php

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ private function extractCollection(
7171
* @param AbstractCollectionMetadata $metadata
7272
* @param ResourceGenerator $resourceGenerator
7373
* @param ServerRequestInterface $request
74-
* @param int $depth
7574
* @return HalResource
7675
* @throws Exception\OutOfBoundsException if requested page if outside the available pages
7776
*/
@@ -88,11 +87,9 @@ private function extractPaginator(
8887
return $this->createPaginatedCollectionResource(
8988
$pageCount,
9089
$data,
91-
// @codingStandardsIgnoreStart
92-
static function (int $page) use ($collection) {
90+
function (int $page) use ($collection) {
9391
$collection->setCurrentPageNumber($page);
9492
},
95-
// @codingStandardsIgnoreEnd
9693
$collection,
9794
$metadata,
9895
$resourceGenerator,
@@ -125,11 +122,9 @@ private function extractDoctrinePaginator(
125122
return $this->createPaginatedCollectionResource(
126123
$pageCount,
127124
$data,
128-
// @codingStandardsIgnoreStart
129-
static function (int $page) use ($query, $perPage) {
125+
function (int $page) use ($query, $perPage) {
130126
$query->setFirstResult($perPage * ($page - 1));
131127
},
132-
// @codingStandardsIgnoreEnd
133128
$collection,
134129
$metadata,
135130
$resourceGenerator,

‎test/HalResponseFactoryFactoryTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function testReturnsHalResponseFactoryInstance() : void
3333
$jsonRenderer = $this->prophesize(Renderer\JsonRenderer::class)->reveal();
3434
$xmlRenderer = $this->prophesize(Renderer\XmlRenderer::class)->reveal();
3535
$response = $this->prophesize(ResponseInterface::class)->reveal();
36-
$responseFactory = static function () use ($response) {
36+
$responseFactory = function () use ($response) {
3737
return $response;
3838
};
3939

@@ -55,7 +55,7 @@ public function testReturnsHalResponseFactoryInstance() : void
5555
public function testReturnsHalResponseFactoryInstanceWithoutConfiguredDependencies() : void
5656
{
5757
$response = $this->prophesize(ResponseInterface::class)->reveal();
58-
$responseFactory = static function () use ($response) {
58+
$responseFactory = function () use ($response) {
5959
return $response;
6060
};
6161
$container = $this->prophesize(ContainerInterface::class);
@@ -75,7 +75,7 @@ public function testReturnsHalResponseFactoryInstanceWhenResponseInterfaceReturn
7575
$jsonRenderer = $this->prophesize(Renderer\JsonRenderer::class)->reveal();
7676
$xmlRenderer = $this->prophesize(Renderer\XmlRenderer::class)->reveal();
7777
$response = $this->prophesize(ResponseInterface::class)->reveal();
78-
$responseFactory = static function () use ($response) {
78+
$responseFactory = function () use ($response) {
7979
return $response;
8080
};
8181
$stream = new class()

‎test/ResourceGenerator/DoctrinePaginatorTest.php

Lines changed: 10 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99

1010
use ArrayIterator;
1111
use Doctrine\ORM\AbstractQuery;
12+
use Doctrine\ORM\QueryBuilder;
1213
use Doctrine\ORM\Tools\Pagination\Paginator;
1314
use PHPUnit\Framework\TestCase;
1415
use Prophecy\Argument;
15-
use Prophecy\Prophecy\ObjectProphecy;
1616
use Psr\Http\Message\ServerRequestInterface;
1717
use Zend\Expressive\Hal\HalResource;
1818
use Zend\Expressive\Hal\Link;
@@ -24,24 +24,6 @@
2424

2525
class DoctrinePaginatorTest extends TestCase
2626
{
27-
/** @var ObjectProphecy&RouteBasedCollectionMetadata */
28-
private $metadata;
29-
30-
/** @var ObjectProphecy&LinkGenerator */
31-
private $linkGenerator;
32-
33-
/** @var ObjectProphecy&ResourceGenerator */
34-
private $generator;
35-
36-
/** @var ObjectProphecy&ServerRequestInterface */
37-
private $request;
38-
39-
/** @var ObjectProphecy&Paginator */
40-
private $paginator;
41-
42-
/** @var RouteBasedCollectionStrategy */
43-
private $strategy;
44-
4527
public function setUp()
4628
{
4729
$this->metadata = $this->prophesize(RouteBasedCollectionMetadata::class);
@@ -53,15 +35,15 @@ public function setUp()
5335
$this->strategy = new RouteBasedCollectionStrategy();
5436
}
5537

56-
public function mockQuery(): \PHPUnit\Framework\MockObject\MockObject
38+
public function mockQuery()
5739
{
5840
return $this->getMockBuilder(AbstractQuery::class)
5941
->disableOriginalConstructor()
6042
->setMethods(['getMaxResults', 'setFirstResult'])
6143
->getMockForAbstractClass();
6244
}
6345

64-
public function mockLinkGeneration(string $relation, string $route, array $routeParams, array $queryStringArgs): void
46+
public function mockLinkGeneration(string $relation, string $route, array $routeParams, array $queryStringArgs)
6547
{
6648
$link = $this->prophesize(Link::class)->reveal();
6749
$this->linkGenerator
@@ -85,7 +67,7 @@ public function invalidPageCombinations() : iterable
8567
/**
8668
* @dataProvider invalidPageCombinations
8769
*/
88-
public function testThrowsOutOfBoundsExceptionForInvalidPage(int $page, int $numPages): void
70+
public function testThrowsOutOfBoundsExceptionForInvalidPage(int $page, int $numPages)
8971
{
9072
$query = $this->mockQuery();
9173
$query->expects($this->once())
@@ -108,7 +90,7 @@ public function testThrowsOutOfBoundsExceptionForInvalidPage(int $page, int $num
10890
);
10991
}
11092

111-
public function testDoesNotCreateLinksForUnknownPaginationParamType(): void
93+
public function testDoesNotCreateLinksForUnknownPaginationParamType()
11294
{
11395
$query = $this->mockQuery();
11496
$query->expects($this->once())
@@ -131,7 +113,7 @@ public function testDoesNotCreateLinksForUnknownPaginationParamType(): void
131113
->shouldBeCalledTimes(1);
132114
$this->request->getAttribute(Argument::any(), Argument::any())->shouldNotBeCalled();
133115

134-
$values = array_map(static function ($value) {
116+
$values = array_map(function ($value) {
135117
return (object) ['value' => $value];
136118
}, range(46, 60));
137119
$this->paginator->getIterator()->willReturn(new ArrayIterator($values));
@@ -165,7 +147,7 @@ public function testDoesNotCreateLinksForUnknownPaginationParamType(): void
165147
$this->assertInstanceOf(HalResource::class, $resource);
166148
}
167149

168-
public function testCreatesLinksForQueryBasedPagination(): void
150+
public function testCreatesLinksForQueryBasedPagination()
169151
{
170152
$query = $this->mockQuery();
171153
$query->expects($this->once())
@@ -191,7 +173,7 @@ public function testCreatesLinksForQueryBasedPagination(): void
191173
->shouldBeCalledTimes(1);
192174
$this->request->getAttribute(Argument::any(), Argument::any())->shouldNotBeCalled();
193175

194-
$values = array_map(static function ($value) {
176+
$values = array_map(function ($value) {
195177
return (object) ['value' => $value];
196178
}, range(46, 60));
197179
$this->paginator->getIterator()->willReturn(new ArrayIterator($values));
@@ -234,7 +216,7 @@ public function testCreatesLinksForQueryBasedPagination(): void
234216
$this->assertInstanceOf(HalResource::class, $resource);
235217
}
236218

237-
public function testCreatesLinksForRouteBasedPagination(): void
219+
public function testCreatesLinksForRouteBasedPagination()
238220
{
239221
$query = $this->mockQuery();
240222
$query->expects($this->once())
@@ -260,7 +242,7 @@ public function testCreatesLinksForRouteBasedPagination(): void
260242
->willReturn(3)
261243
->shouldBeCalledTimes(1);
262244

263-
$values = array_map(static function ($value) {
245+
$values = array_map(function ($value) {
264246
return (object) ['value' => $value];
265247
}, range(46, 60));
266248
$this->paginator->getIterator()->willReturn(new ArrayIterator($values));

0 commit comments

Comments
 (0)