Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Self-validate topic subscription collection
  • Loading branch information
jeromegamez committed Aug 7, 2019
1 parent 8e765be commit 3159131
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 30 deletions.
8 changes: 5 additions & 3 deletions src/Firebase/Messaging/AppInstance.php
Expand Up @@ -36,14 +36,16 @@ public static function fromRawData(RegistrationToken $registrationToken, array $
$info->registrationToken = $registrationToken;
$info->rawData = $rawData;

$subscriptions = [];

foreach ($rawData['rel']['topics'] ?? [] as $topicName => $subscriptionInfo) {
$topic = Topic::fromValue($topicName);
$addedAt = DT::toUTCDateTimeImmutable($subscriptionInfo['addDate'] ?? null);
$subscription = new TopicSubscription($topic, $registrationToken, $addedAt);

$info->topicSubscriptions->add($subscription);
$subscriptions[] = new TopicSubscription($topic, $registrationToken, $addedAt);
}

$info->topicSubscriptions = new TopicSubscriptions(...$subscriptions);

return $info;
}

Expand Down
36 changes: 9 additions & 27 deletions src/Firebase/Messaging/TopicSubscriptions.php
Expand Up @@ -4,51 +4,33 @@

namespace Kreait\Firebase\Messaging;

use ArrayIterator;
use Countable;
use Generator;
use IteratorAggregate;

final class TopicSubscriptions implements Countable, IteratorAggregate
{
/** @var TopicSubscription[] */
private $subscriptions = [];
private $subscriptions;

/**
* @param TopicSubscription[] $subscriptions
*/
public function __construct(array $subscriptions = [])
{
foreach ($subscriptions as $subscription) {
if ($subscription instanceof TopicSubscription) {
$this->add($subscription);
}
}
}

public function add(TopicSubscription $subscription)
public function __construct(TopicSubscription ...$subscriptions)
{
$this->subscriptions[$subscription->topic()->value()] = $subscription;
$this->subscriptions = $subscriptions;
}

public function filter(callable $filter): self
{
return new self(\array_filter($this->subscriptions, $filter));
}

/**
* @return TopicSubscription[]
*/
public function toArray(): array
{
return $this->subscriptions;
return new self(...\array_filter($this->subscriptions, $filter));
}

/**
* @return ArrayIterator|TopicSubscription[]
* @codeCoverageIgnore
*
* @return Generator|TopicSubscription[]
*/
public function getIterator()
{
return new ArrayIterator($this->subscriptions);
yield from $this->subscriptions;
}

public function count()
Expand Down

0 comments on commit 3159131

Please sign in to comment.