Skip to content

Commit 13264f9

Browse files
author
Oleksii Korshenko
committed
Merge remote-tracking branch 'origin/bugfix' into magento2
2 parents 7a9a105 + cafcf83 commit 13264f9

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,15 @@ public function getInstallationCurrentWritableDirectories()
125125
*/
126126
private function checkRecursiveDirectories($directory)
127127
{
128+
$skipDirs = ['..', '.'];
128129
$directoryIterator = new \RecursiveIteratorIterator(
129130
new \RecursiveDirectoryIterator($directory),
130131
\RecursiveIteratorIterator::LEAVES_ONLY | \RecursiveIteratorIterator::CATCH_GET_CHILD
131132
);
132133
foreach ($directoryIterator as $subDirectory) {
134+
if (in_array($subDirectory->getFilename(), $skipDirs)) {
135+
continue;
136+
}
133137
if ($subDirectory->isDir() && !$subDirectory->isWritable()) {
134138
return false;
135139
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,8 @@ private function checkXDebugNestedLevel()
191191
*/
192192
private function checkPopulateRawPostSetting()
193193
{
194-
// HHVM does not support 'always_populate_raw_post_data' to be set to -1
195-
if (defined('HHVM_VERSION')) {
194+
// HHVM and PHP 7does not support 'always_populate_raw_post_data' to be set to -1
195+
if (version_compare(PHP_VERSION, '7.0.0-beta') >= 0 || defined('HHVM_VERSION')) {
196196
return [];
197197
}
198198

0 commit comments

Comments
 (0)