ENGCOM-5474: Fix for PHP_CodeSniffer error after app:config:dump #23787

magento-engcom-team · magento-engcom-team · commit c644c2eba243 · 2019-07-21T09:20:23.000-05:00
- Merge Pull Request #23787 from dng-dev/magento2:patch-2 - Merged commits: 1. e164c89 2. 180568a
diff --git a/lib/internal/Magento/Framework/App/DeploymentConfig/Writer/PhpFormatter.php b/lib/internal/Magento/Framework/App/DeploymentConfig/Writer/PhpFormatter.php
@@ -80,7 +80,9 @@ private function formatData($data, $comments = [], $prefix = '    ')
      */
     private function varExportShort($var, int $depth = 0)
     {
-        if (!is_array($var)) {
+        if (null === $var) {
+            return 'null';
+        } elseif (!is_array($var)) {
             return var_export($var, true);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,9 @@ private function formatData($data, $comments = [], $prefix = ' ')`
`80`	`80`	`*/`
`81`	`81`	`private function varExportShort($var, int $depth = 0)`
`82`	`82`	`{`
`83`		`- if (!is_array($var)) {`
	`83`	`+ if (null === $var) {`
	`84`	`+ return 'null';`
	`85`	`+ } elseif (!is_array($var)) {`
`84`	`86`	`return var_export($var, true);`
`85`	`87`	`}`
`86`	`88`