Fix tests and refactor to CloudEventInterface

Signed-off-by: Hendrik Heil <[email protected]>

Author: hendrikheil

daprdocs/content/en/php-sdk-docs/php-pubsub/_index.md

@@ -21,29 +21,25 @@ For more information about publish/subscribe, check out [the howto]({{< ref howt
 
 ## Data content type
 
-The PHP SDK allows setting the data content type either when constructing a custom cloud event, or when publishing raw
-data.
+The PHP SDK allows setting the data content type either when constructing a custom cloud event, or when publishing raw data.
 
 {{< tabs CloudEvent "Raw" >}}
 
-{{% codetab %}}
+To create a custom CloudEvent please take a look at the official documentation of [`cloudevents/sdk-php`](https://github.com/cloudevents/sdk-php/blob/602cd26557e5522060531b3103450b34b678be1c/README.md).
 
-```php
-<?php
-$event = new \Dapr\PubSub\CloudEvent();
-$event->data = $xml;
-$event->data_content_type = 'application/xml';
-```
+To publish a CloudEvent:
 
-{{% /codetab %}}
 {{% codetab %}}
 
 ```php
 <?php
 /**
  * @var \Dapr\Client\DaprClient $daprClient 
+ * @var \Dapr\PubSub\Topic $daprTopic
+ * @var \CloudEvents\V1\CloudEventInterface $cloudEvent
  */
-$daprClient->publishEvent(pubsubName: 'pubsub', topicName: 'my-topic', data: $raw_data, contentType: 'application/octet-stream');
+$daprTopic = new Topic(pubsub: 'pubsub', topic: 'my-topic', $daprClient);
+$daprTopic->publish($cloudEvent);
 ```
 
 {{% alert title="Binary data" color="warning" %}}

src/lib/PubSub/Topic.php

@@ -7,7 +7,7 @@
 use Dapr\exceptions\DaprException;
 use JetBrains\PhpStorm\Deprecated;
 use Psr\Log\LoggerInterface;
-use CloudEvents\V1\CloudEvent as NewCloudEvent;
+use CloudEvents\V1\CloudEventInterface;
 use CloudEvents\Serializers\JsonSerializer;
 
 /**
@@ -27,7 +27,7 @@ public function __construct(
     /**
      * Publish an event to the topic
      *
-     * @param CloudEvent|mixed $event The event to publish
+     * @param CloudEventInterface|CloudEvent|mixed $event The event to publish
      * @param array|null $metadata Additional metadata to pass to the component
      * @param string $content_type The header to include in the publish request. Ignored when $event is a CloudEvent
      *
@@ -40,16 +40,17 @@ public function publish(mixed $event, ?array $metadata = null, string $content_t
         } elseif ($this->client instanceof NewClient) {
             $this->client->logger->debug('Sending {event} to {topic}', ['event' => $event, 'topic' => $this->topic]);
         }
-        if ($event instanceof CloudEvent || $event instanceof NewCloudEvent) {
+        if ($event instanceof CloudEvent || $event instanceof CloudEventInterface) {
             $content_type = 'application/cloudevents+json';
             $this->client->extra_headers = [
                 'Content-Type: application/cloudevents+json',
             ];
 
-            $event = match(get_class($event)) {
-                'Dapr\PubSub\CloudEvent' => $event->to_array(),
-                'CloudEvents\V1\CloudEvent' => json_decode(JsonSerializer::create()->serializeStructured($event), true),
-            };
+            if ($event instanceof CloudEvent) {
+                $event = $event->to_array();
+            } elseif ($event instanceof CloudEventInterface) {
+                $event = json_decode(JsonSerializer::create()->serializeStructured($event), true);
+            }
         }
 
         if ($this->client instanceof DaprClient) {

tests/PublishTest.php

@@ -137,13 +137,13 @@ public function testNewCloudEventPublish()
             200,
             null,
             [
+                'specversion' => '1.0',
                 'id' => 'id',
                 'source' => 'source',
-                'specversion' => '1.0',
                 'type' => 'type',
                 'datacontenttype' => 'application/json',
                 'subject' => 'subject',
-                'time' => '2020-12-12T20:47:00+00:00Z',
+                'time' => '2020-12-12T20:47:00Z',
                 'data' => [
                     'my' => 'event',
                 ],
@@ -157,7 +157,7 @@ public function testNewCloudEventPublish()
         $this->assertRequestQueryString('', $request);
         $this->assertRequestHasHeaders(['Content-Type' => 'application/cloudevents+json'], $request);
         $this->assertRequestBody(
-            '{"id":"id","source":"source","specversion":"1.0","type":"type","datacontenttype":"application\/json","subject":"subject","time":"2020-12-12T20:47:00+00:00Z","data":{"my":"event"}}',
+            '{"specversion":"1.0","id":"id","source":"source","type":"type","datacontenttype":"application\/json","subject":"subject","time":"2020-12-12T20:47:00Z","data":{"my":"event"}}',
             $request
         );
     }