Merge pull request #229 from homersimpsons/fix/backort-variable-name-null-ressource-check

moufmouf · web-flow · commit a20710bd2744 · 2020-09-14T12:24:36.000+02:00
ScalarBeanPropertyDescriptor: Fix variable for resource null check
diff --git a/src/Utils/ScalarBeanPropertyDescriptor.php b/src/Utils/ScalarBeanPropertyDescriptor.php
@@ -224,7 +224,7 @@ public function getGetterSetterCode(): array
         if ($normalizedType === 'resource') {
             $checkNullable = '';
             if ($isNullable) {
-                $checkNullable = sprintf('$%s !== null && ', $this->column->getName());
+                $checkNullable = sprintf('$%s !== null && ', $variableName);
             }
             $resourceTypeCheck .= <<<EOF
 if (%s!\is_resource($%s)) {

Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ public function getGetterSetterCode(): array`
`224`	`224`	`if ($normalizedType === 'resource') {`
`225`	`225`	`$checkNullable = '';`
`226`	`226`	`if ($isNullable) {`
`227`		`- $checkNullable = sprintf('$%s !== null && ', $this->column->getName());`
	`227`	`+ $checkNullable = sprintf('$%s !== null && ', $variableName);`
`228`	`228`	`}`
`229`	`229`	`$resourceTypeCheck .= <<<EOF`
`230`	`230`	`if (%s!\is_resource($%s)) {`