Fix runtime warnings with recent PHP releases

Author: Stefan Weil

module/VuFind/src/VuFind/Config/SearchSpecsReader.php

@@ -44,12 +44,12 @@ class SearchSpecsReader extends YamlReader
      * Constructor
      *
      * @param \VuFind\Cache\Manager $cacheManager Cache manager (optional)
-     * @param PathResolver          $pathResolver Config file path resolver
+     * @param ?PathResolver         $pathResolver Config file path resolver
      * (optional; defaults to \VuFind\Config\Locator)
      */
     public function __construct(
         \VuFind\Cache\Manager $cacheManager = null,
-        PathResolver $pathResolver = null
+        ?PathResolver $pathResolver = null
     ) {
         parent::__construct($cacheManager, $pathResolver);
         $this->cacheName = 'searchspecs';

module/VuFind/src/VuFind/Form/Form.php

@@ -141,7 +141,7 @@ public function __construct(
         YamlReader $yamlReader,
         HelperPluginManager $viewHelperManager,
         HandlerManager $handlerManager,
-        array $config = null
+        ?array $config = null
     ) {
         parent::__construct();
 

module/VuFind/src/VuFind/Search/Factory/AbstractSolrBackendFactory.php

@@ -198,7 +198,7 @@ public function __construct()
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function __invoke(ContainerInterface $sm, $name, array $options = null)
+    public function __invoke(ContainerInterface $sm, $name, ?array $options = null)
     {
         $this->setup($sm);
         $this->config = $this->getService(\VuFind\Config\PluginManager::class);

module/VuFindSearch/src/VuFindSearch/Backend/EDS/Connector.php

@@ -96,7 +96,7 @@ protected function httpRequest(
         $method,
         $queryString,
         $headers,
-        $messageBody = null,
+        ?$messageBody = null,
         $messageFormat = 'application/json; charset=utf-8',
         $cacheable = true
     ) {

module/VuFindSearch/src/VuFindSearch/Backend/Solr/Connector.php

@@ -199,7 +199,7 @@ public function resetLastUrl()
      *
      * @return string
      */
-    public function retrieve($id, ParamBag $params = null)
+    public function retrieve($id, ?ParamBag $params = null)
     {
         $params = $params ?: new ParamBag();
         $params
@@ -281,7 +281,7 @@ public function terms(ParamBag $params)
     public function write(
         DocumentInterface $document,
         $handler = 'update',
-        ParamBag $params = null
+        ?ParamBag $params = null
     ) {
         $params = $params ?: new ParamBag();
         $urlSuffix = "/{$handler}";

module/VuFindSearch/src/VuFindSearch/Feature/GetIdsInterface.php

@@ -58,6 +58,6 @@ public function getIds(
         AbstractQuery $query,
         $offset,
         $limit,
-        ParamBag $params = null
+        ?ParamBag $params = null
     );
 }

module/VuFindSearch/src/VuFindSearch/Feature/RandomInterface.php

@@ -55,6 +55,6 @@ interface RandomInterface
     public function random(
         AbstractQuery $query,
         $limit,
-        ParamBag $params = null
+        ?ParamBag $params = null
     );
 }

module/VuFindSearch/src/VuFindSearch/Feature/RetrieveBatchInterface.php

@@ -50,5 +50,5 @@ interface RetrieveBatchInterface
      *
      * @return \VuFindSearch\Response\RecordCollectionInterface
      */
-    public function retrieveBatch($ids, ParamBag $params = null);
+    public function retrieveBatch($ids, ?ParamBag $params = null);
 }

module/VuFindSearch/src/VuFindSearch/Feature/SimilarInterface.php

@@ -50,5 +50,5 @@ interface SimilarInterface
      *
      * @return \VuFindSearch\Response\RecordCollectionInterface
      */
-    public function similar($id, ParamBag $params = null);
+    public function similar($id, ?ParamBag $params = null);
 }