Required parameters after optional parameters in function/method sign…

…atures
pimcore · Apr 28, 2021 · e5a54cc · e5a54cc
1 parent dcde4af
commit e5a54cc
Show file tree

Hide file tree

Showing 21 changed files with 42 additions and 42 deletions.
diff --git a/src/Event/GraphQL/Model/ListingEvent.php b/src/Event/GraphQL/Model/ListingEvent.php
@@ -111,7 +111,7 @@ public function setResolveInfo(ResolveInfo $resolveInfo): void
      * @param array $context
      * @param ResolveInfo $resolveInfo
      */
-    public function __construct(AbstractListing $listing, $args, $context, ResolveInfo $resolveInfo = null)
+    public function __construct(AbstractListing $listing, $args, $context = [], ResolveInfo $resolveInfo = null)
     {
         $this->listing = $listing;
         $this->args = $args;

diff --git a/src/GraphQL/ClassificationstoreFeatureType/BooleanSelectType.php b/src/GraphQL/ClassificationstoreFeatureType/BooleanSelectType.php
@@ -35,7 +35,7 @@ public static function getInstance()
             $fields = Helper::getCommonFields();
             $fields['checked'] = [
                 'type' => Type::boolean(),
-                'resolve' => static function ($value = null, $args = [], $context, ResolveInfo $resolveInfo = null) {
+                'resolve' => static function ($value = null, $args = [], $context = [], ResolveInfo $resolveInfo = null) {
                     if ($value instanceof FeatureDescriptor) {
                         return $value->getValue();
                     }

diff --git a/src/GraphQL/ClassificationstoreFeatureType/CheckboxType.php b/src/GraphQL/ClassificationstoreFeatureType/CheckboxType.php
@@ -35,7 +35,7 @@ public static function getInstance()
             $fields = Helper::getCommonFields();
             $fields['checked'] = [
                 'type' => Type::boolean(),
-                'resolve' => static function ($value = null, $args = [], $context, ResolveInfo $resolveInfo = null) {
+                'resolve' => static function ($value = null, $args = [], $context = [], ResolveInfo $resolveInfo = null) {
                     if ($value instanceof FeatureDescriptor) {
                         return $value->getValue();
                     }

diff --git a/src/GraphQL/ClassificationstoreFeatureType/DateType.php b/src/GraphQL/ClassificationstoreFeatureType/DateType.php
@@ -43,7 +43,7 @@ public static function getInstance()
                         'description' => 'see Carbon::format'
                     ]
                 ],
-                'resolve' => static function ($value = null, $args = [], $context, ResolveInfo $resolveInfo = null) {
+                'resolve' => static function ($value = null, $args = [], $context = [], ResolveInfo $resolveInfo = null) {
                     if ($value instanceof FeatureDescriptor) {
                         $dateValue = $value->getValue();
                         if ($dateValue instanceof Carbon) {

diff --git a/src/GraphQL/ClassificationstoreFeatureType/Helper.php b/src/GraphQL/ClassificationstoreFeatureType/Helper.php
@@ -32,15 +32,15 @@ public static function getCommonFields()
         $fields = [
             'id' => [
                 'type' => Type::int(),
-                'resolve' => static function ($value = null, $args = [], $context, ResolveInfo $resolveInfo = null) {
+                'resolve' => static function ($value = null, $args = [], $context = [], ResolveInfo $resolveInfo = null) {
                     if ($value instanceof FeatureDescriptor) {
                         return $value->getId();
                     }
                 }
             ],
             'name' => [
                 'type' => Type::string(),
-                'resolve' => static function ($value = null, $args = [], $context, ResolveInfo $resolveInfo = null) {
+                'resolve' => static function ($value = null, $args = [], $context = [], ResolveInfo $resolveInfo = null) {
                     if ($value instanceof FeatureDescriptor) {
                         $keyConfig = KeyConfig::getById($value->getId());
                         if ($keyConfig) {
@@ -51,7 +51,7 @@ public static function getCommonFields()
             ],
             'description' => [
                 'type' => Type::string(),
-                'resolve' => static function ($value = null, $args = [], $context, ResolveInfo $resolveInfo = null) {
+                'resolve' => static function ($value = null, $args = [], $context = [], ResolveInfo $resolveInfo = null) {
                     if ($value instanceof FeatureDescriptor) {
                         $keyConfig = KeyConfig::getById($value->getId());
                         if ($keyConfig) {
@@ -62,7 +62,7 @@ public static function getCommonFields()
             ],
             'type' => [
                 'type' => Type::string(),
-                'resolve' => static function ($value = null, $args = [], $context, ResolveInfo $resolveInfo = null) {
+                'resolve' => static function ($value = null, $args = [], $context = [], ResolveInfo $resolveInfo = null) {
                     if ($value instanceof FeatureDescriptor) {
                         return $value->getType();
                     }

diff --git a/src/GraphQL/ClassificationstoreFeatureType/MultiselectType.php b/src/GraphQL/ClassificationstoreFeatureType/MultiselectType.php
@@ -39,7 +39,7 @@ public static function getInstance(Service $service, string $name, $fieldname =
             $fields = Helper::getCommonFields();
             $fields[$fieldname] = [
                 'type' => Type::listOf(Type::string()),
-                'resolve' => static function ($value = null, $args = [], $context, ResolveInfo $resolveInfo = null) {
+                'resolve' => static function ($value = null, $args = [], $context = [], ResolveInfo $resolveInfo = null) {
                     if ($value instanceof FeatureDescriptor) {
                         return $value->getValue();
                     }

diff --git a/src/GraphQL/ClassificationstoreFeatureType/QuantityValueType.php b/src/GraphQL/ClassificationstoreFeatureType/QuantityValueType.php
@@ -42,7 +42,7 @@ public static function getInstance(Service $service, string $name, string $inner
             $fields = Helper::getCommonFields();
             $fields[$fieldname] = [
                 'type' => $innerType,
-                'resolve' => static function ($value = null, $args = [], $context, ResolveInfo $resolveInfo = null) {
+                'resolve' => static function ($value = null, $args = [], $context = [], ResolveInfo $resolveInfo = null) {
                     if ($value instanceof FeatureDescriptor) {
                         return $value->getValue();
                     }

diff --git a/src/GraphQL/ClassificationstoreFeatureType/StringType.php b/src/GraphQL/ClassificationstoreFeatureType/StringType.php
@@ -35,7 +35,7 @@ public static function getInstance(string $name, string $valueField)
             $fields = Helper::getCommonFields();
             $fields[$valueField] = [
                 'type' => Type::string(),
-                'resolve' => static function ($value = null, $args = [], $context, ResolveInfo $resolveInfo = null) {
+                'resolve' => static function ($value = null, $args = [], $context = [], ResolveInfo $resolveInfo = null) {
                     if ($value instanceof FeatureDescriptor) {
                         return $value->getValue();
                     }

diff --git a/src/GraphQL/ClassificationstoreType/Group.php b/src/GraphQL/ClassificationstoreType/Group.php
@@ -60,7 +60,7 @@ public function build(&$config)
             'description' => Type::string(),
             'features' => [
                 'type' => Type::listOf($this->featureType),
-                'resolve' => function ($value, $args, $context, ResolveInfo $resolveInfo = null) {
+                'resolve' => function ($value, $args, $context = [], ResolveInfo $resolveInfo = null) {
                     /** @var Classificationstore $csValue */
                     $csValue = $value["_csValue"];
                     $groupId = $value["id"];

diff --git a/src/GraphQL/DataObjectQueryFieldConfigGenerator/AbstractTable.php b/src/GraphQL/DataObjectQueryFieldConfigGenerator/AbstractTable.php
@@ -27,7 +27,7 @@ public function getGraphQlFieldConfig($attribute, Data $fieldDefinition, $class
         return $this->enrichConfig($fieldDefinition, $class, $attribute, [
             'name' => $fieldDefinition->getName(),
             'type' => $this->getFieldType($fieldDefinition, $class, $container),
-            'resolve' => function ($value, $args, $context, ResolveInfo $resolveInfo = null) use ($fieldDefinition, $attribute) {
+            'resolve' => function ($value, $args, $context = [], ResolveInfo $resolveInfo = null) use ($fieldDefinition, $attribute) {
                 $result = Service::resolveValue($value, $fieldDefinition, $attribute, $args);
 
                 // The table has no specific definition of columns, so we cannot have a ObjectType in schema for it.

diff --git a/src/GraphQL/DataObjectQueryFieldConfigGenerator/Classificationstore.php b/src/GraphQL/DataObjectQueryFieldConfigGenerator/Classificationstore.php
@@ -38,7 +38,7 @@ public function getGraphQlFieldConfig($attribute, Data $fieldDefinition, $class
             'type' => $this->getFieldType($fieldDefinition, $class, $container),
             'args' => ['language' => ['type' => Type::string()]],
             'description' => "returns a list of group containers",
-            'resolve' => function ($value, $args, $context, ResolveInfo $resolveInfo = null) {
+            'resolve' => function ($value, $args, $context = [], ResolveInfo $resolveInfo = null) {
                     $fieldName = $resolveInfo->fieldName;
                     $language = isset($args["language"]) ? $args["language"] : null;
                     /** @var  $csField \Pimcore\Model\DataObject\Classificationstore*/

diff --git a/src/GraphQL/FieldHelper/AbstractFieldHelper.php b/src/GraphQL/FieldHelper/AbstractFieldHelper.php
@@ -121,7 +121,7 @@ public function getArguments(FieldNode $ast)
      *
      * @return array
      */
-    public function extractData(&$data, $container, $args, $context, ResolveInfo $resolveInfo = null)
+    public function extractData(&$data, $container, $args, $context = [], ResolveInfo $resolveInfo = null)
     {
         if ($container instanceof ElementInterface) {
             // we have to at least add the ID and pass it around even if not requested because we need it internally

diff --git a/src/GraphQL/Resolver/AssetListing.php b/src/GraphQL/Resolver/AssetListing.php
@@ -57,7 +57,7 @@ public function __construct(Service $graphQlService, EventDispatcherInterface $e
      * @param ResolveInfo|null $resolveInfo
      * @return mixed
      */
-    public function resolveEdges($value = null, $args = [], $context, ResolveInfo $resolveInfo = null)
+    public function resolveEdges($value = null, $args = [], $context = [], ResolveInfo $resolveInfo = null)
     {
         return $value['edges'];
     }
@@ -69,7 +69,7 @@ public function resolveEdges($value = null, $args = [], $context, ResolveInfo $r
      * @param ResolveInfo|null $resolveInfo
      * @return mixed
      */
-    public function resolveEdge($value = null, $args = [], $context, ResolveInfo $resolveInfo = null)
+    public function resolveEdge($value = null, $args = [], $context = [], ResolveInfo $resolveInfo = null)
     {
         $element = $value['node'];
 
@@ -88,7 +88,7 @@ public function resolveEdge($value = null, $args = [], $context, ResolveInfo $re
      * @return array
      * @throws \Exception
      */
-    public function resolveListing($value = null, $args = [], $context, ResolveInfo $resolveInfo = null)
+    public function resolveListing($value = null, $args = [], $context = [], ResolveInfo $resolveInfo = null)
     {
         if ($args && isset($args['defaultLanguage'])) {
             $this->getGraphQlService()->getLocaleService()->setLocale($args['defaultLanguage']);
@@ -210,7 +210,7 @@ static function ($fullpath) use ($db) {
      * @param ResolveInfo|null $resolveInfo
      * @return mixed
      */
-    public function resolveListingTotalCount($value = null, $args = [], $context, ResolveInfo $resolveInfo = null)
+    public function resolveListingTotalCount($value = null, $args = [], $context = [], ResolveInfo $resolveInfo = null)
     {
         return $value['totalCount'];
     }

diff --git a/src/GraphQL/Resolver/Base.php b/src/GraphQL/Resolver/Base.php
@@ -50,7 +50,7 @@ public function __construct($typeName, $attributes, $class, $container)
     }
 
 
-    public function resolve($value = null, $args = [], $context, ResolveInfo $resolveInfo = null)
+    public function resolve($value = null, $args = [], $context = [], ResolveInfo $resolveInfo = null)
     {
         /** @var \Pimcore\Bundle\DataHubBundle\GraphQL\Query\Operator\AbstractOperator $operatorImpl */
         $operatorImpl = $this->getGraphQlService()->buildQueryOperator($this->typeName, $this->attributes);

diff --git a/src/GraphQL/Resolver/Geobounds.php b/src/GraphQL/Resolver/Geobounds.php
@@ -31,7 +31,7 @@ class Geobounds
      * @return \Pimcore\Model\DataObject\Data\GeoCoordinates
      * @throws \Exception
      */
-    public function resolveNorthEast($value = null, $args = [], $context, ResolveInfo $resolveInfo = null)
+    public function resolveNorthEast($value = null, $args = [], $context = [], ResolveInfo $resolveInfo = null)
     {
         if ($value instanceof \Pimcore\Model\DataObject\Data\Geobounds) {
             return $value->getNorthEast();
@@ -48,7 +48,7 @@ public function resolveNorthEast($value = null, $args = [], $context, ResolveInf
      * @return \Pimcore\Model\DataObject\Data\GeoCoordinates
      * @throws \Exception
      */
-    public function resolveSouthWest($value = null, $args = [], $context, ResolveInfo $resolveInfo = null)
+    public function resolveSouthWest($value = null, $args = [], $context = [], ResolveInfo $resolveInfo = null)
     {
         if ($value instanceof \Pimcore\Model\DataObject\Data\Geobounds) {
             return $value->getSouthWest();

diff --git a/src/GraphQL/Resolver/Geopoint.php b/src/GraphQL/Resolver/Geopoint.php
@@ -31,7 +31,7 @@ class Geopoint
      * @return array
      * @throws \Exception
      */
-    public function resolveLongitude($value = null, $args = [], $context, ResolveInfo $resolveInfo = null)
+    public function resolveLongitude($value = null, $args = [], $context = [], ResolveInfo $resolveInfo = null)
     {
         // cannot be changed to GeoCoordinates due to BC reasons
         if ($value instanceof \Pimcore\Model\DataObject\Data\Geopoint) {
@@ -49,7 +49,7 @@ public function resolveLongitude($value = null, $args = [], $context, ResolveInf
      * @return array
      * @throws \Exception
      */
-    public function resolveLatitude($value = null, $args = [], $context, ResolveInfo $resolveInfo = null)
+    public function resolveLatitude($value = null, $args = [], $context = [], ResolveInfo $resolveInfo = null)
     {
         // cannot be changed to GeoCoordinates due to BC reasons
         if ($value instanceof \Pimcore\Model\DataObject\Data\Geopoint) {

diff --git a/src/GraphQL/Resolver/Link.php b/src/GraphQL/Resolver/Link.php
@@ -32,7 +32,7 @@ class Link
      * @return array
      * @throws \Exception
      */
-    public function resolveText($value = null, $args = [], $context, ResolveInfo $resolveInfo = null)
+    public function resolveText($value = null, $args = [], $context = [], ResolveInfo $resolveInfo = null)
     {
         if ($value instanceof \Pimcore\Model\DataObject\Data\Link) {
             return $value->getText();
@@ -49,7 +49,7 @@ public function resolveText($value = null, $args = [], $context, ResolveInfo $re
      * @return array
      * @throws \Exception
      */
-    public function resolvePath($value = null, $args = [], $context, ResolveInfo $resolveInfo = null)
+    public function resolvePath($value = null, $args = [], $context = [], ResolveInfo $resolveInfo = null)
     {
         if ($value instanceof \Pimcore\Model\DataObject\Data\Link) {
             return $value->getPath();

diff --git a/src/GraphQL/Resolver/Merge.php b/src/GraphQL/Resolver/Merge.php
@@ -55,7 +55,7 @@ public function __construct($typeName = null, $attributes = null, $class = null,
      * @return array
      * @throws \Exception
      */
-    public function resolve($value = null, $args = [], $context, ResolveInfo $resolveInfo = null)
+    public function resolve($value = null, $args = [], $context = [], ResolveInfo $resolveInfo = null)
     {
         /** @var $operatorImpl \Pimcore\Bundle\DataHubBundle\GraphQL\Query\Operator\AbstractOperator */
         $operatorImpl = $this->getGraphQlService()->buildQueryOperator($this->typeName, $this->attributes);

diff --git a/src/GraphQL/Resolver/MultihrefMetadata.php b/src/GraphQL/Resolver/MultihrefMetadata.php
@@ -59,7 +59,7 @@ public function __construct($fieldDefinition = null, $class = null, $fieldHelper
      * @return array
      * @throws \Exception
      */
-    public function resolveElement($value = null, $args = [], $context, ResolveInfo $resolveInfo = null)
+    public function resolveElement($value = null, $args = [], $context = [], ResolveInfo $resolveInfo = null)
     {
         $element = null;
 
@@ -95,7 +95,7 @@ public function resolveElement($value = null, $args = [], $context, ResolveInfo
      * @return array
      * @throws \Exception
      */
-    public function resolveMetadata($value = null, $args = [], $context, ResolveInfo $resolveInfo = null)
+    public function resolveMetadata($value = null, $args = [], $context = [], ResolveInfo $resolveInfo = null)
     {
         if ($value && $value['element']) {
 

diff --git a/src/GraphQL/Resolver/ObjectMetadata.php b/src/GraphQL/Resolver/ObjectMetadata.php
@@ -58,7 +58,7 @@ public function __construct($fieldDefinition = null, $class = null, $fieldHelper
      * @return array
      * @throws \Exception
      */
-    public function resolveElement($value = null, $args = [], $context, ResolveInfo $resolveInfo = null)
+    public function resolveElement($value = null, $args = [], $context = [], ResolveInfo $resolveInfo = null)
     {
         $element = null;
 
@@ -92,7 +92,7 @@ public function resolveElement($value = null, $args = [], $context, ResolveInfo
      * @return array
      * @throws \Exception
      */
-    public function resolveMetadata($value = null, $args = [], $context, ResolveInfo $resolveInfo = null)
+    public function resolveMetadata($value = null, $args = [], $context = [], ResolveInfo $resolveInfo = null)
     {
         if ($value && $value['element']) {