Merge pull request #78 from weierophinney/feature/fix-lockfile

weierophinney · web-flow · commit 98513d4fc1c2 · 2022-01-13T14:45:08.000-06:00
Ensure lockfile is created using PHP 7.3
diff --git a/composer.json b/composer.json
@@ -18,7 +18,11 @@
         "forum": "https://discourse.laminas.dev"
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true,
+            "composer/package-versions-deprecated": true
+        }
     },
     "extra": {
         "laminas": {
diff --git a/composer.lock b/composer.lock
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
diff --git a/src/Controller/AbstractConfigController.php b/src/Controller/AbstractConfigController.php
@@ -25,6 +25,7 @@ abstract public function getConfig();
     /** @return array|ApiProblemResponse */
     public function processAction()
     {
+        /** @var Request $request */
         $request     = $this->getRequest();
         $headers     = $request->getHeaders();
         $accept      = $this->getHeaderType($headers, 'accept');
diff --git a/src/Controller/AbstractPluginManagerController.php b/src/Controller/AbstractPluginManagerController.php
@@ -6,6 +6,7 @@
 
 use Laminas\ApiTools\ApiProblem\ApiProblem;
 use Laminas\ApiTools\ApiProblem\ApiProblemResponse;
+use Laminas\Http\Request;
 use Laminas\Mvc\Controller\AbstractActionController;
 use Laminas\View\Model\JsonModel;
 
@@ -24,6 +25,7 @@ abstract class AbstractPluginManagerController extends AbstractActionController
      */
     public function handleRequest()
     {
+        /** @var Request $request */
         $request = $this->getRequest();
 
         if ($request->getMethod() !== $request::METHOD_GET) {
diff --git a/src/Controller/AuthenticationTypeController.php b/src/Controller/AuthenticationTypeController.php
@@ -8,6 +8,7 @@
 use Laminas\ApiTools\ApiProblem\ApiProblemResponse;
 use Laminas\ApiTools\ContentNegotiation\ViewModel;
 use Laminas\ApiTools\MvcAuth\Authentication\DefaultAuthenticationListener as AuthListener;
+use Laminas\Http\Request;
 
 class AuthenticationTypeController extends AbstractAuthenticationController
 {
@@ -27,6 +28,7 @@ public function __construct(AuthListener $authListener)
      */
     public function authTypeAction()
     {
+        /** @var Request $request */
         $request = $this->getRequest();
         $version = $this->getVersion($request);
 
diff --git a/src/Controller/AuthorizationController.php b/src/Controller/AuthorizationController.php
@@ -11,9 +11,10 @@
 use Laminas\ApiTools\ContentNegotiation\ViewModel;
 use Laminas\ApiTools\Hal\Entity;
 use Laminas\ApiTools\Hal\Link\Link;
+use Laminas\Http\Request;
 use Laminas\Mvc\Controller\AbstractActionController;
 use Laminas\Mvc\MvcEvent;
-use Laminas\Stdlib\RequestInterface as Request;
+use Laminas\Stdlib\RequestInterface;
 use RuntimeException;
 
 use function sprintf;
@@ -37,6 +38,7 @@ public function __construct(AuthorizationModelFactory $factory)
     /** @return ViewModel|ApiProblemResponse */
     public function authorizationAction()
     {
+        /** @var Request $request */
         $request = $this->getRequest();
         $version = $request->getQuery('version', 1);
         $model   = $this->getModel();
@@ -130,7 +132,7 @@ public function getModuleName()
      *
      * @return $this
      */
-    public function setRequest(Request $request)
+    public function setRequest(RequestInterface $request)
     {
         $this->request = $request;
         return $this;
diff --git a/src/Controller/InputFilterController.php b/src/Controller/InputFilterController.php
@@ -39,11 +39,13 @@ public function indexAction()
         $event           = $this->getEvent();
         $routeMatch      = $event->getRouteMatch();
         $route           = $this->deriveRouteName($routeMatch->getMatchedRouteName());
-        $request         = $this->getRequest();
         $module          = $this->params()->fromRoute('name', false);
         $controller      = $this->params()->fromRoute('controller_service_name', false);
         $inputFilterName = $this->params()->fromRoute('input_filter_name', false);
 
+        /** @var Request $request */
+        $request = $this->getRequest();
+
         if (! $module || ! $this->model->moduleExists($module)) {
             return new ApiProblemResponse(
                 new ApiProblem(404, 'The module specified does not exist')
diff --git a/src/Controller/ModuleCreationController.php b/src/Controller/ModuleCreationController.php
@@ -27,6 +27,7 @@ public function __construct(ModuleModel $moduleModel)
     /** @return ApiProblemResponse|ViewModel */
     public function apiEnableAction()
     {
+        /** @var Request $request */
         $request = $this->getRequest();
 
         switch ($request->getMethod()) {
diff --git a/src/Controller/PackageController.php b/src/Controller/PackageController.php
@@ -63,6 +63,7 @@ public function __construct($zfdeployPath = null)
      */
     public function indexAction()
     {
+        /** @var Request $request */
         $request = $this->getRequest();
 
         switch ($request->getMethod()) {
diff --git a/src/Controller/SourceController.php b/src/Controller/SourceController.php
@@ -42,6 +42,7 @@ public function __construct(ModuleModel $moduleModel)
      */
     public function sourceAction()
     {
+        /** @var Request $request */
         $request = $this->getRequest();
 
         switch ($request->getMethod()) {
diff --git a/src/InputFilter/AuthorizationInputFilter.php b/src/InputFilter/AuthorizationInputFilter.php
@@ -6,6 +6,7 @@
 
 use Laminas\InputFilter\InputFilter;
 
+use function array_keys;
 use function in_array;
 use function is_array;
 use function strpos;
@@ -40,8 +41,8 @@ public function isValid($context = null)
                 continue;
             }
 
-            foreach ($httpMethods as $httpMethod => $isRequired) {
-                if (! in_array($httpMethod, ['GET', 'POST', 'PUT', 'PATCH', 'DELETE'])) {
+            foreach (array_keys($httpMethods) as $httpMethod) {
+                if (! in_array($httpMethod, ['GET', 'POST', 'PUT', 'PATCH', 'DELETE'], true)) {
                     $this->messages[$className][] = 'Invalid HTTP method (' . $httpMethod . ') provided.';
                     $isValid                      = false;
                 }
diff --git a/src/Listener/InjectModuleResourceLinksListener.php b/src/Listener/InjectModuleResourceLinksListener.php
@@ -29,10 +29,10 @@
 
 class InjectModuleResourceLinksListener
 {
-    /** @var RouteMatch|V2RouteMatch */
+    /** @var null|RouteMatch|V2RouteMatch */
     private $routeMatch;
 
-    /** @var callable */
+    /** @var null|callable */
     private $urlHelper;
 
     /** @var ContainerInterface */
diff --git a/src/Model/AbstractAutodiscoveryModel.php b/src/Model/AbstractAutodiscoveryModel.php
@@ -23,7 +23,7 @@
  */
 abstract class AbstractAutodiscoveryModel
 {
-    /** @var ServiceLocatorInterface */
+    /** @var null|ServiceLocatorInterface */
     protected $serviceLocator;
 
     /** @var array */
diff --git a/src/Model/AuthenticationModel.php b/src/Model/AuthenticationModel.php
@@ -680,8 +680,6 @@ protected function createPdoDSN(string $dsn, ?string $username, ?string $passwor
 
     /**
      * Add a new authentication adapter in local config
-     *
-     * @return true
      */
     protected function saveAuthenticationAdapter(array $adapter): bool
     {
diff --git a/src/Model/DbAutodiscoveryModel.php b/src/Model/DbAutodiscoveryModel.php
@@ -11,7 +11,6 @@
 use Laminas\Db\Metadata\Object\ColumnObject;
 use Laminas\Db\Metadata\Object\ConstraintObject;
 
-use function array_values;
 use function in_array;
 use function strpos;
 use function strtolower;
@@ -113,7 +112,7 @@ public function fetchColumns($module, $version, $adapterName)
 
                 if (in_array(strtolower($column->getDataType()), ['varchar', 'text'])) {
                     $item['length'] = $column->getCharacterMaximumLength();
-                    if (in_array('Primary key', array_values($item['constraints']))) {
+                    if (in_array('Primary key', $item['constraints'])) {
                         unset($item['filters']);
                         unset($item['validators']);
                         $tableData['columns'][] = $item;
@@ -133,7 +132,7 @@ public function fetchColumns($module, $version, $adapterName)
                     ])
                 ) {
                     $item['length'] = $column->getNumericPrecision();
-                    if (in_array('Primary key', array_values($item['constraints']))) {
+                    if (in_array('Primary key', $item['constraints'])) {
                         unset($item['filters']);
                         unset($item['validators']);
                         $tableData['columns'][] = $item;
diff --git a/test/Model/AuthorizationModelFactoryFactoryTest.php b/test/Model/AuthorizationModelFactoryFactoryTest.php
@@ -28,7 +28,7 @@ public function setUp(): void
         $this->container = $this->prophesize(ContainerInterface::class);
     }
 
-    /** @psalm-return array<string, array{0: array<string, bool>}> */
+    /** @psalm-return array<string, array{0: array<class-string, bool>}> */
     public function missingDependencies(): array
     {
         return [
diff --git a/test/Model/ModuleVersioningModelFactoryFactoryTest.php b/test/Model/ModuleVersioningModelFactoryFactoryTest.php
@@ -24,7 +24,7 @@ public function setUp(): void
         $this->container = $this->prophesize(ContainerInterface::class);
     }
 
-    /** @psalm-return array<string, array{0: array<string, bool>}> */
+    /** @psalm-return array<string, array{0: array<class-string, bool>}> */
     public function missingDependencies(): array
     {
         return [
diff --git a/test/Model/RestServiceModelFactoryFactoryTest.php b/test/Model/RestServiceModelFactoryFactoryTest.php
@@ -39,11 +39,7 @@ public function setUp(): void
         $this->container = $this->prophesize(ContainerInterface::class);
     }
 
-    /**
-     * @psalm-return array<string, array{
-     *     0: array<string, bool>
-     * }>
-     */
+    /** @psalm-return array<string, array{0: array<non-empty-string, bool>}> */
     public function missingDependencies(): array
     {
         return [
diff --git a/test/Model/RpcServiceModelFactoryFactoryTest.php b/test/Model/RpcServiceModelFactoryFactoryTest.php
@@ -29,7 +29,7 @@ public function setUp(): void
         $this->container = $this->prophesize(ContainerInterface::class);
     }
 
-    /** @psalm-return array<string, array{0: array<string, bool>}> */
+    /** @psalm-return array<string, array{0: array<non-empty-string, bool>}> */
     public function missingDependencies(): array
     {
         return [
diff --git a/test/Model/VersioningModelFactoryFactoryTest.php b/test/Model/VersioningModelFactoryFactoryTest.php
@@ -24,7 +24,7 @@ public function setUp(): void
         $this->container = $this->prophesize(ContainerInterface::class);
     }
 
-    /** @psalm-return array<string, array{0: array<string, bool>}> */
+    /** @psalm-return array<string, array{0: array<class-string, bool>}> */
     public function missingDependencies(): array
     {
         return [

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ abstract public function getConfig();`
`25`	`25`	`/** @return array\|ApiProblemResponse */`
`26`	`26`	`public function processAction()`
`27`	`27`	`{`
	`28`	`+ /** @var Request $request */`
`28`	`29`	`$request = $this->getRequest();`
`29`	`30`	`$headers = $request->getHeaders();`
`30`	`31`	`$accept = $this->getHeaderType($headers, 'accept');`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`use Laminas\ApiTools\ApiProblem\ApiProblemResponse;`
`9`	`9`	`use Laminas\ApiTools\ContentNegotiation\ViewModel;`
`10`	`10`	`use Laminas\ApiTools\MvcAuth\Authentication\DefaultAuthenticationListener as AuthListener;`
	`11`	`+use Laminas\Http\Request;`
`11`	`12`
`12`	`13`	`class AuthenticationTypeController extends AbstractAuthenticationController`
`13`	`14`	`{`
`@@ -27,6 +28,7 @@ public function __construct(AuthListener $authListener)`
`27`	`28`	`*/`
`28`	`29`	`public function authTypeAction()`
`29`	`30`	`{`
	`31`	`+ /** @var Request $request */`
`30`	`32`	`$request = $this->getRequest();`
`31`	`33`	`$version = $this->getVersion($request);`
`32`	`34`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ public function __construct(ModuleModel $moduleModel)`
`27`	`27`	`/** @return ApiProblemResponse\|ViewModel */`
`28`	`28`	`public function apiEnableAction()`
`29`	`29`	`{`
	`30`	`+ /** @var Request $request */`
`30`	`31`	`$request = $this->getRequest();`
`31`	`32`
`32`	`33`	`switch ($request->getMethod()) {`
Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,7 @@ public function __construct($zfdeployPath = null)`
`63`	`63`	`*/`
`64`	`64`	`public function indexAction()`
`65`	`65`	`{`
	`66`	`+ /** @var Request $request */`
`66`	`67`	`$request = $this->getRequest();`
`67`	`68`
`68`	`69`	`switch ($request->getMethod()) {`