Skip to content

Commit fc814a4

Browse files
committed
Merge remote-tracking branch 'origin/MAGETWO-50845-file-permissions' into PR_Branch
2 parents 955f5e9 + 8003f3e commit fc814a4

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

setup/src/Magento/Setup/Model/ConfigModel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ private function checkInstallationFilePermissions()
162162
{
163163
$results = $this->filePermissions->getMissingWritablePathsForInstallation();
164164
if ($results) {
165-
$errorMsg = "Missing write permissions to the following paths: '" . implode("', '", $results) . "'";
165+
$errorMsg = "Missing write permissions to the following paths:" . PHP_EOL . implode(PHP_EOL, $results);
166166
throw new \Exception($errorMsg);
167167
}
168168
}

setup/src/Magento/Setup/Model/Installer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ public function checkInstallationFilePermissions()
452452
{
453453
$results = $this->filePermissions->getMissingWritablePathsForInstallation();
454454
if ($results) {
455-
$errorMsg = "Missing write permissions to the following paths: '" . implode("' '", $results) . "'";
455+
$errorMsg = "Missing write permissions to the following paths:" . PHP_EOL . implode(PHP_EOL, $results);
456456
throw new \Exception($errorMsg);
457457
}
458458
}

setup/src/Magento/Setup/Test/Unit/Model/ConfigModelTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ public function testProcessException()
177177

178178
/**
179179
* @expectedException \Exception
180-
* @expectedExceptionMessage Missing write permissions to the following paths: '/a/ro/dir', '/media'
180+
* @expectedExceptionMessage Missing write permissions to the following paths:
181181
*/
182182
public function testWritePermissionErrors()
183183
{

setup/src/Magento/Setup/Test/Unit/Model/InstallerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ public function testCheckInstallationFilePermissions()
324324

325325
/**
326326
* @expectedException \Exception
327-
* @expectedExceptionMessage Missing write permissions to the following paths: 'foo' 'bar'
327+
* @expectedExceptionMessage Missing write permissions to the following paths:
328328
*/
329329
public function testCheckInstallationFilePermissionsError()
330330
{

0 commit comments

Comments
 (0)