Re-organize image fields. (#508)

Author: fubhy

…raphQL/Fields/Images/ImageDerivative.php …/Entity/Fields/Image/ImageDerivative.phpmodules/graphql_core/src/Plugin/GraphQL/Fields/Images/ImageDerivative.php renamed to modules/graphql_core/src/Plugin/GraphQL/Fields/Entity/Fields/Image/ImageDerivative.php modules/graphql_core/src/Plugin/GraphQL/Fields/Images/ImageDerivative.php renamed to modules/graphql_core/src/Plugin/GraphQL/Fields/Entity/Fields/Image/ImageDerivative.php

@@ -1,8 +1,7 @@
 <?php
 
-namespace Drupal\graphql_core\Plugin\GraphQL\Fields\Images;
+namespace Drupal\graphql_core\Plugin\GraphQL\Fields\Entity\Fields\Image;
 
-use Drupal\Core\Cache\Cache;
 use Drupal\Core\DependencyInjection\DependencySerializationTrait;
 use Drupal\Core\Image\ImageFactory;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;

modules/graphql_core/src/Plugin/GraphQL/Fields/Entity/Fields/Image/ImageHeight.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace Drupal\graphql_core\Plugin\GraphQL\Fields\Entity\Fields\Image;
+
+use Drupal\graphql\Plugin\GraphQL\Fields\FieldPluginBase;
+use Drupal\image\Plugin\Field\FieldType\ImageItem;
+use Youshido\GraphQL\Execution\ResolveInfo;
+
+/**
+ * Retrieve the image height.
+ *
+ * @GraphQLField(
+ *   id = "image_height",
+ *   secure = true,
+ *   name = "height",
+ *   type = "Int",
+ *   provider = "image",
+ *   field_types = {"image"},
+ *   deriver = "Drupal\graphql_core\Plugin\Deriver\Fields\EntityFieldPropertyDeriver"
+ * )
+ */
+class ImageHeight extends FieldPluginBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function resolveValues($value, array $args, ResolveInfo $info) {
+    if ($value instanceof ImageItem && $value->entity->access('view')) {
+      yield (int) $value->height;
+    }
+  }
+
+}

modules/graphql_core/src/Plugin/GraphQL/Fields/Entity/Fields/Image/ImageUrl.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace Drupal\graphql_core\Plugin\GraphQL\Fields\Entity\Fields\Image;
+
+use Drupal\graphql\Plugin\GraphQL\Fields\FieldPluginBase;
+use Drupal\image\Plugin\Field\FieldType\ImageItem;
+use Youshido\GraphQL\Execution\ResolveInfo;
+
+/**
+ * Retrieve the image url.
+ *
+ * @GraphQLField(
+ *   id = "image_url",
+ *   secure = true,
+ *   name = "url",
+ *   type = "String",
+ *   field_types = {"image"},
+ *   provider = "image",
+ *   deriver = "Drupal\graphql_core\Plugin\Deriver\Fields\EntityFieldPropertyDeriver"
+ * )
+ */
+class ImageUrl extends FieldPluginBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function resolveValues($value, array $args, ResolveInfo $info) {
+    if ($value instanceof ImageItem && $value->entity->access('view')) {
+      yield file_create_url($value->entity->getFileUri());
+    }
+  }
+
+}

modules/graphql_core/src/Plugin/GraphQL/Fields/Entity/Fields/Image/ImageWidth.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace Drupal\graphql_core\Plugin\GraphQL\Fields\Entity\Fields\Image;
+
+use Drupal\graphql\Plugin\GraphQL\Fields\FieldPluginBase;
+use Drupal\image\Plugin\Field\FieldType\ImageItem;
+use Youshido\GraphQL\Execution\ResolveInfo;
+
+/**
+ * Retrieve the image width.
+ *
+ * @GraphQLField(
+ *   id = "image_width",
+ *   secure = true,
+ *   name = "width",
+ *   type = "Int",
+ *   provider = "image",
+ *   field_types = {"image"},
+ *   deriver = "Drupal\graphql_core\Plugin\Deriver\Fields\EntityFieldPropertyDeriver"
+ * )
+ */
+class ImageWidth extends FieldPluginBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function resolveValues($value, array $args, ResolveInfo $info) {
+    if ($value instanceof ImageItem && $value->entity->access('view')) {
+      yield (int) $value->width;
+    }
+  }
+
+}

modules/graphql_core/src/Plugin/GraphQL/Fields/Images/ImageResourceHeight.php

@@ -14,10 +14,8 @@
  *   secure = true,
  *   name = "height",
  *   type = "Int",
- *   provider = "image",
  *   parents = {"ImageResource"},
- *   field_types = {"image"},
- *   deriver = "Drupal\graphql_core\Plugin\Deriver\Fields\EntityFieldPropertyDeriver"
+ *   provider = "image"
  * )
  */
 class ImageResourceHeight extends FieldPluginBase {
@@ -26,13 +24,7 @@ class ImageResourceHeight extends FieldPluginBase {
    * {@inheritdoc}
    */
   protected function resolveValues($value, array $args, ResolveInfo $info) {
-    if ($value instanceof ImageItem && $value->entity->access('view')) {
-      yield (int) $value->height;
-    }
-
-    if (is_array($value) && array_key_exists('height', $value)) {
-      yield (int) $value['height'];
-    }
+    yield (int) $value['height'];
   }
 
 }

modules/graphql_core/src/Plugin/GraphQL/Fields/Images/ImageResourceUrl.php

@@ -15,9 +15,7 @@
  *   name = "url",
  *   type = "String",
  *   parents = {"ImageResource"},
- *   field_types = {"image"},
- *   provider = "image",
- *   deriver = "Drupal\graphql_core\Plugin\Deriver\Fields\EntityFieldPropertyDeriver"
+ *   provider = "image"
  * )
  */
 class ImageResourceUrl extends FieldPluginBase {
@@ -26,13 +24,7 @@ class ImageResourceUrl extends FieldPluginBase {
    * {@inheritdoc}
    */
   protected function resolveValues($value, array $args, ResolveInfo $info) {
-    if ($value instanceof ImageItem && $value->entity->access('view')) {
-      yield file_create_url($value->entity->getFileUri());
-    }
-
-    if (is_array($value) && array_key_exists('url', $value)) {
-      yield $value['url'];
-    }
+    yield $value['url'];
   }
 
 }

modules/graphql_core/src/Plugin/GraphQL/Fields/Images/ImageResourceWidth.php

@@ -14,10 +14,8 @@
  *   secure = true,
  *   name = "width",
  *   type = "Int",
- *   provider = "image",
  *   parents = {"ImageResource"},
- *   field_types = {"image"},
- *   deriver = "Drupal\graphql_core\Plugin\Deriver\Fields\EntityFieldPropertyDeriver"
+ *   provider = "image"
  * )
  */
 class ImageResourceWidth extends FieldPluginBase {
@@ -26,13 +24,7 @@ class ImageResourceWidth extends FieldPluginBase {
    * {@inheritdoc}
    */
   protected function resolveValues($value, array $args, ResolveInfo $info) {
-    if ($value instanceof ImageItem && $value->entity->access('view')) {
-      yield (int) $value->width;
-    }
-
-    if (is_array($value) && array_key_exists('width', $value)) {
-      yield (int) $value['width'];
-    }
+    yield (int) $value['width'];
   }
 
 }