fixed few return types

fixed dynamic properties in unit test
fixed stuff according to coding standard
changed few lambda function to static wherever possible

Author: tobias-trozowski

src/HalResource.php

@@ -378,7 +378,7 @@ private function isResourceCollection($value, string $name, string $context) : b
             return false;
         }
 
-        if (! array_reduce($value, function ($isResource, $item) {
+        if (! array_reduce($value, static function ($isResource, $item) {
             return $isResource && $item instanceof self;
         }, true)) {
             return false;
@@ -449,7 +449,7 @@ private function serializeLinks()
     private function serializeEmbeddedResources()
     {
         $embedded = [];
-        array_walk($this->embedded, function ($resource, $name) use (&$embedded) {
+        array_walk($this->embedded, static function ($resource, $name) use (&$embedded) {
             $embedded[$name] = $resource instanceof self
                 ? $resource->toArray()
                 : array_map(static function ($item) {

src/ResourceGenerator/ExtractCollectionTrait.php

@@ -88,9 +88,11 @@ private function extractPaginator(
         return $this->createPaginatedCollectionResource(
             $pageCount,
             $data,
-            function (int $page) use ($collection) {
+            // @codingStandardsIgnoreStart
+            static function (int $page) use ($collection) {
                 $collection->setCurrentPageNumber($page);
             },
+            // @codingStandardsIgnoreEnd
             $collection,
             $metadata,
             $resourceGenerator,

test/HalResponseFactoryFactoryTest.php

@@ -33,7 +33,7 @@ public function testReturnsHalResponseFactoryInstance() : void
         $jsonRenderer = $this->prophesize(Renderer\JsonRenderer::class)->reveal();
         $xmlRenderer = $this->prophesize(Renderer\XmlRenderer::class)->reveal();
         $response = $this->prophesize(ResponseInterface::class)->reveal();
-        $responseFactory = function () use ($response) {
+        $responseFactory = static function () use ($response) {
             return $response;
         };
 
@@ -55,7 +55,7 @@ public function testReturnsHalResponseFactoryInstance() : void
     public function testReturnsHalResponseFactoryInstanceWithoutConfiguredDependencies() : void
     {
         $response = $this->prophesize(ResponseInterface::class)->reveal();
-        $responseFactory = function () use ($response) {
+        $responseFactory = static function () use ($response) {
             return $response;
         };
         $container = $this->prophesize(ContainerInterface::class);
@@ -75,7 +75,7 @@ public function testReturnsHalResponseFactoryInstanceWhenResponseInterfaceReturn
         $jsonRenderer = $this->prophesize(Renderer\JsonRenderer::class)->reveal();
         $xmlRenderer = $this->prophesize(Renderer\XmlRenderer::class)->reveal();
         $response = $this->prophesize(ResponseInterface::class)->reveal();
-        $responseFactory = function () use ($response) {
+        $responseFactory = static function () use ($response) {
             return $response;
         };
         $stream = new class()

test/ResourceGenerator/DoctrinePaginatorTest.php

@@ -9,10 +9,10 @@
 
 use ArrayIterator;
 use Doctrine\ORM\AbstractQuery;
-use Doctrine\ORM\QueryBuilder;
 use Doctrine\ORM\Tools\Pagination\Paginator;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\Prophecy\ObjectProphecy;
 use Psr\Http\Message\ServerRequestInterface;
 use Zend\Expressive\Hal\HalResource;
 use Zend\Expressive\Hal\Link;
@@ -24,6 +24,24 @@
 
 class DoctrinePaginatorTest extends TestCase
 {
+    /** @var ObjectProphecy&RouteBasedCollectionMetadata */
+    private $metadata;
+
+    /** @var ObjectProphecy&LinkGenerator */
+    private $linkGenerator;
+
+    /** @var ObjectProphecy&ResourceGenerator */
+    private $generator;
+
+    /** @var ObjectProphecy&ServerRequestInterface */
+    private $request;
+
+    /** @var ObjectProphecy&Paginator */
+    private $paginator;
+
+    /** @var RouteBasedCollectionStrategy */
+    private $strategy;
+
     public function setUp()
     {
         $this->metadata      = $this->prophesize(RouteBasedCollectionMetadata::class);
@@ -35,15 +53,15 @@ public function setUp()
         $this->strategy      = new RouteBasedCollectionStrategy();
     }
 
-    public function mockQuery()
+    public function mockQuery(): \PHPUnit\Framework\MockObject\MockObject
     {
         return $this->getMockBuilder(AbstractQuery::class)
             ->disableOriginalConstructor()
             ->setMethods(['getMaxResults', 'setFirstResult'])
             ->getMockForAbstractClass();
     }
 
-    public function mockLinkGeneration(string $relation, string $route, array $routeParams, array $queryStringArgs)
+    public function mockLinkGeneration(string $relation, string $route, array $routeParams, array $queryStringArgs): void
     {
         $link = $this->prophesize(Link::class)->reveal();
         $this->linkGenerator
@@ -67,7 +85,7 @@ public function invalidPageCombinations() : iterable
     /**
      * @dataProvider invalidPageCombinations
      */
-    public function testThrowsOutOfBoundsExceptionForInvalidPage(int $page, int $numPages)
+    public function testThrowsOutOfBoundsExceptionForInvalidPage(int $page, int $numPages): void
     {
         $query = $this->mockQuery();
         $query->expects($this->once())
@@ -90,7 +108,7 @@ public function testThrowsOutOfBoundsExceptionForInvalidPage(int $page, int $num
         );
     }
 
-    public function testDoesNotCreateLinksForUnknownPaginationParamType()
+    public function testDoesNotCreateLinksForUnknownPaginationParamType(): void
     {
         $query = $this->mockQuery();
         $query->expects($this->once())
@@ -113,7 +131,7 @@ public function testDoesNotCreateLinksForUnknownPaginationParamType()
             ->shouldBeCalledTimes(1);
         $this->request->getAttribute(Argument::any(), Argument::any())->shouldNotBeCalled();
 
-        $values = array_map(function ($value) {
+        $values = array_map(static function ($value) {
             return (object) ['value' => $value];
         }, range(46, 60));
         $this->paginator->getIterator()->willReturn(new ArrayIterator($values));
@@ -147,7 +165,7 @@ public function testDoesNotCreateLinksForUnknownPaginationParamType()
         $this->assertInstanceOf(HalResource::class, $resource);
     }
 
-    public function testCreatesLinksForQueryBasedPagination()
+    public function testCreatesLinksForQueryBasedPagination(): void
     {
         $query = $this->mockQuery();
         $query->expects($this->once())
@@ -173,7 +191,7 @@ public function testCreatesLinksForQueryBasedPagination()
             ->shouldBeCalledTimes(1);
         $this->request->getAttribute(Argument::any(), Argument::any())->shouldNotBeCalled();
 
-        $values = array_map(function ($value) {
+        $values = array_map(static function ($value) {
             return (object) ['value' => $value];
         }, range(46, 60));
         $this->paginator->getIterator()->willReturn(new ArrayIterator($values));
@@ -216,7 +234,7 @@ public function testCreatesLinksForQueryBasedPagination()
         $this->assertInstanceOf(HalResource::class, $resource);
     }
 
-    public function testCreatesLinksForRouteBasedPagination()
+    public function testCreatesLinksForRouteBasedPagination(): void
     {
         $query = $this->mockQuery();
         $query->expects($this->once())
@@ -242,7 +260,7 @@ public function testCreatesLinksForRouteBasedPagination()
             ->willReturn(3)
             ->shouldBeCalledTimes(1);
 
-        $values = array_map(function ($value) {
+        $values = array_map(static function ($value) {
             return (object) ['value' => $value];
         }, range(46, 60));
         $this->paginator->getIterator()->willReturn(new ArrayIterator($values));