Skip to content

Fix for PHP_CodeSniffer error after app:config:dump #23787

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
magento-engcom-team merged 3 commits into from
Jul 27, 2019
Merged

Fix for PHP_CodeSniffer error after app:config:dump #23787

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e164c89
Fix for PHP_CodeSniffer error after app:config:dump
dng-dev Jul 19, 2019
180568a
Updated code Formatting
dng-dev Jul 19, 2019
d60a29b
magento/magento2#23787: Static tests fix.
engcom-Foxtrot Jul 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions lib/internal/Magento/Framework/App/DeploymentConfig/Writer/PhpFormatter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,11 @@ class PhpFormatter implements FormatterInterface

/**
* Format deployment configuration.
*
* If $comments is present, each item will be added
* as comment to the corresponding section
*
* {@inheritdoc}
* @inheritdoc
*/
public function format($data, array $comments = [])
{
Expand Down Expand Up @@ -71,6 +72,8 @@ private function formatData($data, $comments = [], $prefix = ' ')
}

/**
* Format generated config files using the short array syntax.
*
* If variable to export is an array, format with the php >= 5.4 short array syntax. Otherwise use
* default var_export functionality.
*
Expand All @@ -80,7 +83,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);
}

Expand Down