Skip to content

Commit 81357fa

Browse files
committed
Merge pull request #7094 in SW/shopware from sw-22698/5.5/fix-typehints to 5.5
* commit '953dc3497eed5854d8717d0d763dbb0456112a3c': SW-22698 - Fix wrong type
2 parents 2716771 + 953dc34 commit 81357fa

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

engine/Shopware/Components/Api/Resource/CustomerStream.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ public function getOne($id = null, $offset = 0, $limit = null, $conditions, $sor
135135
$criteria->addCondition($condition);
136136
}
137137
$decodedSortings = json_decode($sortings, true);
138-
if (!empty($sortings)) {
138+
if (!empty($decodedSortings)) {
139139
/** @var SortingInterface[] $unserializedSortings */
140140
$unserializedSortings = $this->reflectionHelper->unserialize($decodedSortings, '');
141141

@@ -412,12 +412,12 @@ public function updateFrozenState($streamId, \DateTime $freezeUp = null, $condit
412412
}
413413

414414
/**
415-
* @param int $streamId
416-
* @param array $conditions
415+
* @param int $streamId
416+
* @param array|null $conditions
417417
*
418418
* @return array
419419
*/
420-
private function getConditions($streamId, array $conditions = [])
420+
private function getConditions($streamId, $conditions = [])
421421
{
422422
if (!empty($conditions)) {
423423
return $this->reflectionHelper->unserialize(

0 commit comments

Comments
 (0)