Fix for phpstan error messages (#554)

* Fix for phpstan error messages * Apply php-cs-fixer changes * Removed unnecessary ignored error message patterns Co-authored-by: mcop1 <[email protected]>
pimcore · Jun 29, 2022 · 7f2fce5 · 7f2fce5
1 parent 284b728
commit 7f2fce5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -60,16 +60,6 @@ parameters:
  count: 1
  path: src/GraphQL/ClassificationstoreType/Group.php
 
- -
- message: "#^Call to an undefined method Pimcore\\\\Model\\\\AbstractModel\\:\\:getType\\(\\)\\.$#"
- count: 1
- path: src/GraphQL/DataObjectInputProcessor/Fieldcollections.php
-
- -
- message: "#^Call to an undefined method Pimcore\\\\Model\\\\AbstractModel\\:\\:setIndex\\(\\)\\.$#"
- count: 1
- path: src/GraphQL/DataObjectInputProcessor/Fieldcollections.php
-
  -
  message: "#^Expression on left side of \\?\\? is not nullable\\.$#"
  count: 2

diff --git a/src/GraphQL/DataObjectInputProcessor/Fieldcollections.php b/src/GraphQL/DataObjectInputProcessor/Fieldcollections.php
@@ -18,6 +18,7 @@
 use GraphQL\Type\Definition\ResolveInfo;
 use Pimcore\Model\DataObject\Concrete;
 use Pimcore\Model\DataObject\Fieldcollection;
+use Pimcore\Model\DataObject\Fieldcollection\Data\AbstractData;
 
 class Fieldcollections extends Base
 {
@@ -37,7 +38,7 @@ public function __construct(array $nodeDef, array $processors)
  }
 
  /**
- * @param Concrete|Fieldcollection\Data\AbstractData $object
+ * @param Concrete|AbstractData $object
  * @param mixed $newValue
  * @param array $args
  * @param array $context
@@ -83,7 +84,8 @@ public function process($object, $newValue, $args, $context, ResolveInfo $info)
  if (!$fc || $fc->getType() != $fcKey) {
  // either index does not exist or type does not match
  $modelFactory = $this->getGraphQlService()->getModelFactory();
- $className = 'Pimcore\\Model\\DataObject\\Fieldcollection\Data\\' . ucfirst($fcKey);
+ $className = 'Pimcore\\Model\\DataObject\\Fieldcollection\\Data\\' . ucfirst($fcKey);
+ /** @var AbstractData $fc */
  $fc = $modelFactory->build($className);
  }
  $fc->setIndex($index);

diff --git a/src/GraphQL/Service.php b/src/GraphQL/Service.php
@@ -842,6 +842,10 @@ public static function getValueForObject($object, $key, $brickType = null, $bric
  if ($fieldDefinition->isEmpty($value)) {
  $parent = \Pimcore\Model\DataObject\Service::hasInheritableParentObject($object);
  if (!empty($parent)) {
+ if (!($parent instanceof Concrete)) {
+ $parent = Concrete::getById($parent->getId());
+ }
+
  return self::getValueForObject($parent, $key, $brickType, $brickKey, $fieldDefinition, $context, $brickDescriptor);
  }
  }