From 8360be42037712195e8ea2e0226a2c4a38589b64 Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Tue, 11 Jul 2023 11:48:52 -0500 Subject: [PATCH] qa: create baseline Resolved errors that could reasonably resolved without major refactoring; pushed remainer to basline. Signed-off-by: Matthew Weier O'Phinney --- psalm-baseline.xml | 175 ++++++++++++++------- psalm.xml.dist | 2 +- src/Resource.php | 6 +- test/ChildResourcesIntegrationTest.php | 5 +- test/CollectionIntegrationTest.php | 24 +-- test/Factory/RestControllerFactoryTest.php | 6 +- test/ResourceTest.php | 2 +- 7 files changed, 141 insertions(+), 79 deletions(-) diff --git a/psalm-baseline.xml b/psalm-baseline.xml index cd35c44..be4547c 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -1,10 +1,6 @@ - + - - $event instanceof ResourceEvent - $event instanceof ResourceEvent - $data $data @@ -17,16 +13,18 @@ $id $id - - $queryParams - + + $event->getName() + $event->getIdentity() $event->getInputFilter() - + + $this->identity $this->identity $this->inputFilter + $this->inputFilter @@ -39,6 +37,9 @@ $config + + $container + @@ -47,7 +48,7 @@ setControllerOptions - + $config $config[$requestedName]['listener'] $config[$requestedName]['listener'] @@ -73,6 +74,7 @@ $value $value $value + $value $config['api-tools-rest'] @@ -88,8 +90,7 @@ $config['resource_identifiers'] - - $collection + $config $config $config @@ -101,9 +102,7 @@ $key $options $query - $request - $resource - $resource + $value $value @@ -132,9 +131,12 @@ hasRoute setRouteOptions - + getArrayCopy getInputs + getRequest + getResource + getResource getRouteOptions hasRoute setRouteOptions @@ -170,6 +172,9 @@ $this->config[$controller] $value + + $options + $controller @@ -235,9 +240,14 @@ getEventManager getServiceManager + + getEventManager + getServiceManager + - + + ! $this->events ! is_array($data) $this->events is_array($data) @@ -313,10 +323,6 @@ self - - ResourceEvent - ResourceEvent - $matches RouteMatch|V2RouteMatch @@ -327,7 +333,11 @@ $e->getRequest() - + + ! $event + ! $event + ! $request + ! $this->getResource() ! is_array($params) $event $event @@ -337,8 +347,7 @@ $routeMatch - - Response|ApiProblem|ApiProblemResponse|HalEntity + null|array|Traversable @@ -511,7 +520,8 @@ - + + testDispatchShouldPassEmptyArrayToFetchAllMethodIfNoQueryParamsArePresent testDispatchShouldPassWhitelistedQueryParamsToFetchAllMethod testResourceMethodsAreInvokedWhenEventsAreTriggered @@ -527,7 +537,8 @@ $eventArgs['id'] $eventArgs['id'] - + + $this->listener->testCase->paramsPassedToListener $this->listener->testCase->paramsPassedToListener @@ -536,12 +547,22 @@ $this->getRouteMatchClass() $this->getRouteMatchClass() - + add add add + assertObjectHasAttribute + assertObjectHasAttribute + assertObjectHasAttribute + assertObjectHasAttribute + assertObjectHasAttribute + assertObjectHasAttribute + assertObjectHasAttribute + assertObjectHasAttribute - + + ! $this->helpers + ! $this->router $this->helpers $this->router @@ -580,11 +601,6 @@ $params $test - - setRouteMatch - setRouteMatch - setRouter - $child->_links $child->_links->self @@ -598,8 +614,11 @@ $this->router - + getRouteParams + setRouteMatch + setRouteMatch + setRouter getParam @@ -619,6 +638,11 @@ $this->router TreeRouteStack|V2TreeRouteStack + + setRouteMatch + setRouteMatch + setRouter + $e $e @@ -628,12 +652,10 @@ $uri - + $viewModelSelector - - $container - $container + $e $first $second @@ -697,8 +719,7 @@ $request $shared - - get + get get get @@ -724,28 +745,35 @@ addHeaderLine addHeaderLine - + + $this->helpers + $this->request + $this->request + $this->request + $this->request + $this->request + $this->request + $this->response + + + attach get + render + render addHeaderLine addHeaderLine - - $this->helpers - $this->listeners - $this->request - $this->response - $this->router - $router V2RouteMatch - + $router RouteMatch|V2RouteMatch - TreeRouteStack|V2TreeRouteStack + null|TreeRouteStack|V2TreeRouteStack + private $router = null; getResource @@ -953,6 +981,10 @@ + + assertObjectHasAttribute + assertObjectHasAttribute + $e $e @@ -1112,7 +1144,8 @@ assertSame assertSame - + + $test->collection new stdClass() @@ -1297,7 +1330,7 @@ testValidMethodReturningHalOrApiValueCastsReturnToContentNegotiationViewModel testValidMethodReturningHalOrApiValueIsCastToViewModel - + $httpMethods $httpMethods $httpMethods @@ -1307,7 +1340,6 @@ $test $test $test - $test->collection $event @@ -1395,7 +1427,8 @@ PhpEnvironmentResponse - + + $route $router $this->createRouteMatch([]) $this->router @@ -1431,7 +1464,36 @@ new HalEntity($data, 'foo', 'resource') new HalEntity($data, 'foo', 'resource') - + + assertSame + assertSame + assertSame + assertSame + assertSame + assertSame + assertSame + assertTrue + assertTrue + assertTrue + assertTrue + assertTrue + assertTrue + assertTrue + assertTrue + assertTrue + assertTrue + assertTrue + assertTrue + assertTrue + assertTrue + assertTrue + assertTrue + assertTrue + assertTrue + assertTrue + assertTrue + assertTrue + assertTrue assertTrue @@ -1580,7 +1642,7 @@ replaceList update - + $data $data $data @@ -1591,6 +1653,7 @@ $id $id $id + $params TestResourceListener diff --git a/psalm.xml.dist b/psalm.xml.dist index b0bd5ec..e95d2b7 100644 --- a/psalm.xml.dist +++ b/psalm.xml.dist @@ -1,6 +1,6 @@ addIdentifiers([ + $eventManager->addIdentifiers([ static::class, self::class, ResourceInterface::class, ]); - $this->events = $events; + $this->events = $eventManager; return $this; } diff --git a/test/ChildResourcesIntegrationTest.php b/test/ChildResourcesIntegrationTest.php index c6b3434..a62a501 100644 --- a/test/ChildResourcesIntegrationTest.php +++ b/test/ChildResourcesIntegrationTest.php @@ -29,7 +29,6 @@ use Prophecy\PhpUnit\ProphecyTrait; use Psr\Container\ContainerInterface; use ReflectionObject; -use stdClass; use function call_user_func_array; use function json_decode; @@ -41,10 +40,10 @@ class ChildResourcesIntegrationTest extends TestCase use RouteMatchFactoryTrait; use TreeRouteStackFactoryTrait; - /** @var stdClass */ + /** @var object */ private $parent; - /** @var stdClass */ + /** @var object */ private $child; /** @var array */ diff --git a/test/CollectionIntegrationTest.php b/test/CollectionIntegrationTest.php index 0b99c78..faff964 100644 --- a/test/CollectionIntegrationTest.php +++ b/test/CollectionIntegrationTest.php @@ -54,26 +54,26 @@ class CollectionIntegrationTest extends TestCase /** @var HalHelper */ private $linksHelper; - /** @var HelperPluginManager */ - private $helpers; + /** @var null|HelperPluginManager */ + private $helpers = null; - /** @var HalJsonRenderer */ - private $renderer; + /** @var null|HalJsonRenderer */ + private $renderer = null; - /** @var TreeRouteStack|V2TreeRouteStack */ - private $router; + /** @var null|TreeRouteStack|V2TreeRouteStack */ + private $router = null; - /** @var Request */ - private $request; + /** @var null|Request */ + private $request = null; - /** @var Response */ - private $response; + /** @var null|Response */ + private $response = null; /** @var RouteMatch|V2RouteMatch */ private $matches; - /** @var TestAsset\CollectionIntegrationListener */ - private $listeners; + /** @var null|TestAsset\CollectionIntegrationListener */ + private $listeners = null; /** @var RestController */ private $controller; diff --git a/test/Factory/RestControllerFactoryTest.php b/test/Factory/RestControllerFactoryTest.php index fd0d001..4b81de2 100644 --- a/test/Factory/RestControllerFactoryTest.php +++ b/test/Factory/RestControllerFactoryTest.php @@ -114,7 +114,7 @@ public function testDefaultResourceEventManagerIdentifiersAreAsExpected() ]; $identifiers = $events->getIdentifiers(); - $this->assertEquals(array_values($expected), array_values($identifiers)); + $this->assertEquals($expected, array_values($identifiers)); } public function testResourceEventManagerIdentifiersAreAsSpecifiedString() @@ -136,7 +136,7 @@ public function testResourceEventManagerIdentifiersAreAsSpecifiedString() ]; $identifiers = $events->getIdentifiers(); - $this->assertEquals(array_values($expected), array_values($identifiers)); + $this->assertEquals($expected, array_values($identifiers)); } public function testResourceEventManagerIdentifiersAreAsSpecifiedArray() @@ -162,6 +162,6 @@ public function testResourceEventManagerIdentifiersAreAsSpecifiedArray() ]; $identifiers = $events->getIdentifiers(); - $this->assertEquals(array_values($expected), array_values($identifiers)); + $this->assertEquals($expected, array_values($identifiers)); } } diff --git a/test/ResourceTest.php b/test/ResourceTest.php index d3d3253..d5499db 100644 --- a/test/ResourceTest.php +++ b/test/ResourceTest.php @@ -44,7 +44,7 @@ public function testEventManagerIdentifiersAreAsExpected() ResourceInterface::class, ]; $identifiers = $this->events->getIdentifiers(); - $this->assertEquals(array_values($expected), array_values($identifiers)); + $this->assertEquals($expected, array_values($identifiers)); } public function badData(): array