Skip to content

[Forwardport] Show maintenance IP-address without commas #13727

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
merged 1 commit into from
Feb 21, 2018
Merged

[Forwardport] Show maintenance IP-address without commas #13727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion setup/src/Magento/Setup/Console/Command/MaintenanceAllowIpsCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
if (!empty($addresses)) {
$this->maintenanceMode->setAddresses(implode(',', $addresses));
$output->writeln(
'<info>Set exempt IP-addresses: ' . implode(', ', $this->maintenanceMode->getAddressInfo()) .
'<info>Set exempt IP-addresses: ' . implode(' ', $this->maintenanceMode->getAddressInfo()) .
'</info>'
);
}
Expand Down
2 changes: 1 addition & 1 deletion setup/src/Magento/Setup/Console/Command/MaintenanceStatusCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
($this->maintenanceMode->isOn() ? 'active' : 'not active') . '</info>'
);
$addressInfo = $this->maintenanceMode->getAddressInfo();
$addresses = implode(', ', $addressInfo);
$addresses = implode(' ', $addressInfo);
$output->writeln('<info>List of exempt IP-addresses: ' . ($addresses ? $addresses : 'none') . '</info>');
}
}
2 changes: 1 addition & 1 deletion setup/src/Magento/Setup/Test/Unit/Console/Command/MaintenanceAllowIpsCommandTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public function executeDataProvider()
[
['ip' => ['127.0.0.1', '127.0.0.2'], '--none' => false],
[],
'Set exempt IP-addresses: 127.0.0.1, 127.0.0.2' . PHP_EOL
'Set exempt IP-addresses: 127.0.0.1 127.0.0.2' . PHP_EOL
],
[
['--none' => true],
Expand Down
4 changes: 2 additions & 2 deletions setup/src/Magento/Setup/Test/Unit/Console/Command/MaintenanceStatusCommandTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public function executeDataProvider()
[
[true, ['127.0.0.1', '127.0.0.2']],
'Status: maintenance mode is active' . PHP_EOL .
'List of exempt IP-addresses: 127.0.0.1, 127.0.0.2' . PHP_EOL
'List of exempt IP-addresses: 127.0.0.1 127.0.0.2' . PHP_EOL
],
[
[true, []],
Expand All @@ -63,7 +63,7 @@ public function executeDataProvider()
[
[false, ['127.0.0.1', '127.0.0.2']],
'Status: maintenance mode is not active' . PHP_EOL .
'List of exempt IP-addresses: 127.0.0.1, 127.0.0.2' . PHP_EOL
'List of exempt IP-addresses: 127.0.0.1 127.0.0.2' . PHP_EOL
],
];
}
Expand Down