Merge branch 'alpha'

CHANGELOG.md

@@ -1,5 +1,10 @@
 # oEmbed Changelog
 
+## 1.3.3 - 2020-06-29
+
+### Updated
+- Fix to GraphQL bug caused by PHP NULL coalescing operator from issue ([#46](https://github.com/wrav/oembed/issues/46)).
+
 ## 1.3.2 - 2020-06-05
 
 ### Updated

composer.json

@@ -2,7 +2,7 @@
     "name": "wrav/oembed",
     "description": "A simple plugin to extract media information from websites, like youtube videos, twitter statuses or blog articles.",
     "type": "craft-plugin",
-    "version": "1.3.2",
+    "version": "1.3.3",
     "keywords": [
         "craft",
         "cms",
@@ -31,7 +31,7 @@
     ],
     "require": {
         "craftcms/cms": "^3.0.0-beta.23",
-        "embed/embed": "^3.3"
+        "embed/embed": "^3.0"
     },
     "repositories": [
         {

src/gql/OembedFieldResolver.php

@@ -23,6 +23,6 @@ protected function resolve($source, $arguments, $context, ResolveInfo $resolveIn
     {
         $fieldName = $resolveInfo->fieldName;
 
-        return $source->$fieldName ?? null;
+        return $source->$fieldName;
     }
 }

src/gql/OembedFieldTypeGenerator.php

@@ -11,12 +11,12 @@
 namespace wrav\oembed\gql;
 
 use craft\gql\base\GeneratorInterface;
-use craft\gql\base\SingleGeneratorInterface;
 use craft\gql\GqlEntityRegistry;
 use craft\gql\TypeLoader;
 use GraphQL\Type\Definition\Type;
+use wrav\oembed\fields\OembedField;
 
-class OembedFieldTypeGenerator implements GeneratorInterface, SingleGeneratorInterface
+class OembedFieldTypeGenerator implements GeneratorInterface
 {
     /**
      * @inheritdoc
@@ -31,7 +31,6 @@ public static function generateTypes($context = null): array
             'description' => Type::string(),
             'url' => Type::string(),
             'type' => Type::string(),
-            'images' => Type::string(),
             'image' => Type::string(),
             'imageWidth' => Type::string(),
             'imageHeight' => Type::string(),
@@ -61,43 +60,6 @@ public static function generateTypes($context = null): array
         return [$property];
     }
 
-
-
-    /**
-     * @inheritdoc
-     */
-    public static function generateType($context = null): ObjectType
-    {
-        /** @var OembedField $context */
-        $typeName = self::getName($context);
-
-        $properties = [
-            'title' => Type::string(),
-            'description' => Type::string(),
-            'url' => Type::string(),
-            'type' => Type::string(),
-            'images' => Type::string(),
-            'image' => Type::string(),
-            'imageWidth' => Type::string(),
-            'imageHeight' => Type::string(),
-            'code' => Type::string(),
-            'width' => Type::string(),
-            'height' => Type::string(),
-            'aspectRatio' => Type::string(),
-            'authorName' => Type::string(),
-            'authorUrl' => Type::string(),
-            'providerName' => Type::string(),
-            'providerUrl' => Type::string(),
-        ];
-
-        return GqlEntityRegistry::getEntity($typeName) ?: GqlEntityRegistry::createEntity($typeName, new Element([
-            'name' => $typeName,
-            'fields' => function() use ($properties) {
-                return $properties;
-            }
-        ]));
-    }
-
     /**
      * @inheritdoc
      */
@@ -106,4 +68,5 @@ public static function getName($context = null): string
         /** @var OembedField $context */
         return $context->handle . '_OembedField';
     }
+
 }

src/models/OembedModel.php

@@ -56,7 +56,7 @@ public function __toString()
     public function __get($name)
     {
         if (property_exists($this , $name)) {
-            return $this->$name;
+            return $this->$name ?? null;
         }
 
         if ($this->oembed === null) {
@@ -69,7 +69,7 @@ public function __get($name)
             $this->oembed = $oembed;
         }
 
-        return $this->oembed->$name;
+        return $this->oembed->$name ?? null;
     }