Add PHP 8.4 compatibility

Author: Vinai

Model/Config/XmlToArray.php

@@ -43,7 +43,7 @@ public static function getChildrenByName(\DOMElement $parent, string $name): arr
      * @param string $name
      * @return string[]
      */
-    public static function getAttributeConfig(\DOMElement $element, string $name, string $withIndexKey = null): array
+    public static function getAttributeConfig(\DOMElement $element, string $name, ?string $withIndexKey = null): array
     {
         $idx = $withIndexKey ?? $name;
         $value = $element->getAttribute($name);

Test/Integration/Model/GridExport/Type/ExportTypesTest.php

@@ -92,7 +92,7 @@ private function getExportFilePath(AbstractExportType $export): string
         return $fileSystem->getDirectoryRead($export->getExportDir())->getAbsolutePath($export->getFileName());
     }
 
-    private function createStubGrid(array $gridData, array $columns = null): HyvaGridViewModel
+    private function createStubGrid(array $gridData, ?array $columns = null): HyvaGridViewModel
     {
         $columns  = $columns ?? $this->createColumnsFromGrid($gridData);
         $stubGrid = $this->createMock(HyvaGridViewModel::class);

Test/Integration/ViewModel/HyvaGrid/CellTest.php

@@ -25,7 +25,7 @@ private function createColumnDefinition(?string $type = null, array $args = []):
         return ObjectManager::getInstance()->create(ColumnDefinitionInterface::class, $arguments);
     }
 
-    private function createCellWithValue($value, string $type = null): Cell
+    private function createCellWithValue($value, ?string $type = null): Cell
     {
         $arguments = ['value' => $value, 'columnDefinition' => $this->createColumnDefinition($type)];
         return ObjectManager::getInstance()->create(CellInterface::class, $arguments);

Test/Integration/ViewModel/HyvaGrid/NavigationTest.php

@@ -40,7 +40,7 @@ private function createArrayGridSource(array $gridData): HyvaGridSourceInterface
     private function createNavigation(
         array $gridData,
         array $navigationConfig,
-        RequestInterface $request = null
+        ?RequestInterface $request = null
     ): Navigation {
         $hyvaGridSource = $this->createArrayGridSource($gridData);
         return ObjectManager::getInstance()->create(NavigationInterface::class, filter([

Test/Unit/Model/TypeReflection/Stub/StubMethodParameterReflection.php

@@ -29,7 +29,7 @@ public function nullableType(?string $arg)
 
     }
 
-    public function optionalType(string $arg = null)
+    public function optionalType(?string $arg = null)
     {
 
     }

ViewModel/HyvaGrid/Cell.php

@@ -51,7 +51,7 @@ public function __construct(
         DataTypeToStringConverterLocatorInterface $dataTypeToStringConverter,
         LayoutInterface $layout,
         Escaper $escaper,
-        RowInterface $row = null
+        ?RowInterface $row = null
     ) {
         $this->value                            = $value;
         $this->columnDefinition                 = $columnDefinition;

ViewModel/HyvaGrid/GridFilter.php

@@ -164,15 +164,15 @@ private function buildFilterOption(array $optionConfig): FilterOptionInterface
         return $this->filterOptionFactory->create($arguments);
     }
 
-    public function getInputName(string $aspect = null): string
+    public function getInputName(?string $aspect = null): string
     {
         $key = $this->getColumnDefinition()->getKey();
         return isset($aspect)
             ? sprintf('%s[_filter][%s][%s]', $this->gridName, $key, $aspect)
             : sprintf('%s[_filter][%s]', $this->gridName, $key);
     }
 
-    public function getValue(string $aspect = null)
+    public function getValue(?string $aspect = null)
     {
         $gridQueryParams = $this->request->getParam($this->gridName);
         $value           = $gridQueryParams['_filter'][$this->getColumnDefinition()->getKey()] ?? null;

ViewModel/HyvaGrid/GridFilterInterface.php

@@ -17,13 +17,13 @@ public function isDisabled(): bool;
      */
     public function getOptions(): ?array;
 
-    public function getInputName(string $aspect = null): string;
+    public function getInputName(?string $aspect = null): string;
 
     /**
      * @param string|null $aspect
      * @return mixed
      */
-    public function getValue(string $aspect = null);
+    public function getValue(?string $aspect = null);
 
     public function getFormId(): string;