Skip to content

Commit 827f538

Browse files
authored
Merge pull request #2 from techdivision/PAC-950
2 parents 9009dca + 4464825 commit 827f538

File tree

6 files changed

+20
-12
lines changed

6 files changed

+20
-12
lines changed

CHANGELOG.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
# Version 2.1.0
2+
3+
## Features
4+
5+
### PHP 8.4 Compatibility
6+
7+
* Add PHP 8.4 support
8+
19
# Version 2.0.0
210

311
### PHP 8.1 Compatibility
@@ -31,4 +39,4 @@
3139

3240
## Features
3341

34-
* PAC-541: Update composer with php Version ">=^7.3"
42+
* PAC-541: Update composer with php Version ">=^7.3"

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"prefer-stable": true,
77
"require": {
88
"php": "^8.1",
9-
"techdivision/import-serializer": "^2.0.0"
9+
"techdivision/import-serializer": "^2.1"
1010
},
1111
"require-dev": {
1212
"doctrine/dbal": "^4.0.4",
@@ -33,4 +33,4 @@
3333
]
3434
}
3535
}
36-
}
36+
}

src/AdditionalAttributeCsvSerializer.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ public function unserialize($serialized = null, $delimiter = null)
289289
* @return string The serialized array
290290
* @see \TechDivision\Import\Serializer\SerializerInterface::serialize()
291291
*/
292-
public function serialize(array $unserialized = null, $delimiter = null)
292+
public function serialize(?array $unserialized = null, $delimiter = null)
293293
{
294294
return $this->getValueCsvSerializer()->implode($unserialized, $delimiter ? $delimiter : $this->getMultipleFieldDelimiter());
295295
}
@@ -319,7 +319,7 @@ public function explode($value = null, $delimiter = null)
319319
* @return string|null The compatected value
320320
* @see \TechDivision\Import\Serializer\SerializerInterface::serialize()
321321
*/
322-
public function implode(array $value = null, $delimiter = null)
322+
public function implode(?array $value = null, $delimiter = null)
323323
{
324324
return $this->serialize($value, $delimiter);
325325
}
@@ -332,7 +332,7 @@ public function implode(array $value = null, $delimiter = null)
332332
*
333333
* @return array The array with the denormalized attribute values
334334
*/
335-
public function denormalize(string $value = null, bool $unpack = true) : array
335+
public function denormalize(?string $value = null, bool $unpack = true) : array
336336
{
337337

338338
// initialize the array for the attributes

src/CategoryCsvSerializer.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ public function explode($value = null, $delimiter = null)
167167
* @return string|null The compatected value
168168
* @see \TechDivision\Import\Serializer\SerializerInterface::serialize()
169169
*/
170-
public function implode(array $value = null, $delimiter = null)
170+
public function implode(?array $value = null, $delimiter = null)
171171
{
172172
return $this->serialize($value, $delimiter);
173173
}
@@ -195,7 +195,7 @@ public function unserialize($serialized = null, $delimiter = null)
195195
* @return string The serialized array
196196
* @see \TechDivision\Import\Serializer\SerializerInterface::serialize()
197197
*/
198-
public function serialize(array $unserialized = null, $delimiter = null)
198+
public function serialize(?array $unserialized = null, $delimiter = null)
199199
{
200200
return $this->getValueCsvSerializer()->implode($unserialized, $delimiter ? $delimiter : $this->getCategoryDelimiter());
201201
}

src/ProductCategoryCsvSerializer.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ public function explode($value = null, $delimiter = null)
167167
* @return string|null The compatected value
168168
* @see \TechDivision\Import\Serializer\SerializerInterface::serialize()
169169
*/
170-
public function implode(array $value = null, $delimiter = null)
170+
public function implode(?array $value = null, $delimiter = null)
171171
{
172172
return $this->serialize($value, $delimiter);
173173
}
@@ -195,7 +195,7 @@ public function unserialize($serialized = null, $delimiter = null)
195195
* @return string The serialized array
196196
* @see \TechDivision\Import\Serializer\SerializerInterface::serialize()
197197
*/
198-
public function serialize(array $unserialized = null, $delimiter = null)
198+
public function serialize(?array $unserialized = null, $delimiter = null)
199199
{
200200
return $this->getValueCsvSerializer()->implode($unserialized, $delimiter);
201201
}

src/ValueCsvSerializer.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ protected function getDelimiter()
6363
*
6464
* @return string The serialized array
6565
*/
66-
public function serialize(array $unserialized = null, $delimiter = null)
66+
public function serialize(?array $unserialized = null, $delimiter = null)
6767
{
6868

6969
// do nothing, if the passed value is empty or NULL
@@ -153,7 +153,7 @@ public function explode($value = null, $delimiter = null)
153153
* @return string|null The compatected value
154154
* @see \TechDivision\Import\Serializer\SerializerInterface::serialize()
155155
*/
156-
public function implode(array $value = null, $delimiter = null)
156+
public function implode(?array $value = null, $delimiter = null)
157157
{
158158

159159
// set the delimiter

0 commit comments

Comments
 (0)