Skip to content

Commit

Permalink
Merge pull request #7094 in SW/shopware from sw-22698/5.5/fix-typehin…
Browse files Browse the repository at this point in the history
…ts to 5.5

* commit '953dc3497eed5854d8717d0d763dbb0456112a3c':
  SW-22698 - Fix wrong type
  • Loading branch information
soebbing committed Oct 30, 2018
2 parents 2716771 + 953dc34 commit 81357fa
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions engine/Shopware/Components/Api/Resource/CustomerStream.php
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ public function getOne($id = null, $offset = 0, $limit = null, $conditions, $sor
$criteria->addCondition($condition);
}
$decodedSortings = json_decode($sortings, true);
if (!empty($sortings)) {
if (!empty($decodedSortings)) {
/** @var SortingInterface[] $unserializedSortings */
$unserializedSortings = $this->reflectionHelper->unserialize($decodedSortings, '');

Expand Down Expand Up @@ -412,12 +412,12 @@ public function updateFrozenState($streamId, \DateTime $freezeUp = null, $condit
}

/**
* @param int $streamId
* @param array $conditions
* @param int $streamId
* @param array|null $conditions
*
* @return array
*/
private function getConditions($streamId, array $conditions = [])
private function getConditions($streamId, $conditions = [])
{
if (!empty($conditions)) {
return $this->reflectionHelper->unserialize(
Expand Down

0 comments on commit 81357fa

Please sign in to comment.