Merge remote-tracking branch 'ogresCE/MAGETWO-37507-Magento-Web-Installer-fails-on-HipHop-Virtual-Machine' into PR_Branch

Author: mazhalai

bin/magento

@@ -8,6 +8,10 @@
 try {
     require __DIR__ . '/../app/bootstrap.php';
     if (PHP_SAPI == 'cli') {
+        // For Cli we are using our customized error handler
+        $handler = new \Magento\Framework\App\ErrorHandler();
+        set_error_handler([$handler, 'handler']);
+
         $application = new Magento\Framework\Console\Cli('Magento CLI');
         $application->run();
     }

lib/internal/Magento/Framework/App/ErrorHandler.php

@@ -50,6 +50,14 @@ public function handler($errorNo, $errorStr, $errorFile, $errorLine)
             // there's no way to distinguish between caught system exceptions and warnings
             return false;
         }
+
+        if (strpos($errorStr, 'Automatically populating $HTTP_RAW_POST_DATA is deprecated') !== false) {
+            // this warning should be suppressed as it is a known bug in php 5.6.0 https://bugs.php.net/bug.php?id=66763
+            // and workaround suggested here (http://php.net/manual/en/ini.core.php#ini.always-populate-raw-post-data)
+            // is not compatible with HHVM
+            return false;
+        }
+
         $errorNo = $errorNo & error_reporting();
         if ($errorNo == 0) {
             return false;

setup/index.php

@@ -23,4 +23,9 @@
 HTML;
     exit(1);
 }
+
+// For Setup Wizard we are using our customized error handler
+$handler = new \Magento\Framework\App\ErrorHandler();
+set_error_handler([$handler, 'handler']);
+
 \Zend\Mvc\Application::init(require __DIR__ . '/config/application.config.php')->run();

setup/src/Magento/Setup/Controller/DatabaseCheck.php

@@ -5,22 +5,13 @@
  */
 namespace Magento\Setup\Controller;
 
-use Magento\Setup\Model\InstallerFactory;
-use Magento\Setup\Model\WebLogger;
 use Zend\Json\Json;
 use Zend\Mvc\Controller\AbstractActionController;
 use Zend\View\Model\JsonModel;
 use Magento\Setup\Validator\DbValidator;
 
 class DatabaseCheck extends AbstractActionController
 {
-    /**
-     * WebLogger to access log
-     *
-     * @var WebLogger
-     */
-    private $webLogger;
-
     /**
      * @var DbValidator
      */
@@ -30,12 +21,10 @@ class DatabaseCheck extends AbstractActionController
     /**
      * Constructor
      *
-     * @param WebLogger $webLogger
      * @param DbValidator $dbValidator
      */
-    public function __construct(WebLogger $webLogger, DbValidator $dbValidator)
+    public function __construct(DbValidator $dbValidator)
     {
-        $this->webLogger = $webLogger;
         $this->dbValidator = $dbValidator;
     }
 

setup/src/Magento/Setup/Controller/Environment.php

@@ -97,7 +97,6 @@ public function phpSettingsAction()
         $responseType = ResponseTypeInterface::RESPONSE_TYPE_SUCCESS;
 
         $settings = array_merge(
-            $this->checkRawPost(),
             $this->checkXDebugNestedLevel()
         );
 
@@ -176,40 +175,6 @@ public function filePermissionsAction()
         return new JsonModel($data);
     }
 
-    /**
-     * Checks if PHP version >= 5.6.0 and always_populate_raw_post_data is set
-     *
-     * @return array
-     */
-    private function checkRawPost()
-    {
-        $data = [];
-        $error = false;
-        $iniSetting = ini_get('always_populate_raw_post_data');
-
-        if (version_compare(PHP_VERSION, '5.6.0') >= 0 && (int)$iniSetting > -1) {
-            $error = true;
-        }
-
-        $message = sprintf(
-            'Your PHP Version is %s, but always_populate_raw_post_data = %d.
-            $HTTP_RAW_POST_DATA is deprecated from PHP 5.6 onwards and will stop the installer from running.
-            Please open your php.ini file and set always_populate_raw_post_data to -1.
-            If you need more help please call your hosting provider.
-            ',
-            PHP_VERSION,
-            ini_get('always_populate_raw_post_data')
-        );
-
-        $data['rawpost'] = [
-            'message' => $message,
-            'helpUrl' => 'http://php.net/manual/en/ini.core.php#ini.always-populate-settings-data',
-            'error' => $error
-        ];
-
-        return $data;
-    }
-
     /**
      * Checks if xdebug.max_nesting_level is set 200 or more
      * @return array
@@ -218,7 +183,7 @@ private function checkXDebugNestedLevel()
     {
         $data = [];
         $error = false;
-
+    
         $currentExtensions = $this->phpInformation->getCurrent();
         if (in_array('xdebug', $currentExtensions)) {
 

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

@@ -8,8 +8,6 @@
 
 use Zend\ServiceManager\ServiceLocatorInterface;
 use Magento\Setup\Module\ResourceFactory;
-use Magento\Framework\App\ErrorHandler;
-use Magento\Framework\App\State\CleanupFiles;
 
 class InstallerFactory
 {
@@ -35,9 +33,6 @@ public function __construct(ServiceLocatorInterface $serviceLocator, ResourceFac
     {
         $this->serviceLocator = $serviceLocator;
         $this->resourceFactory = $resourceFactory;
-        // For Setup Wizard we are using our customized error handler
-        $handler = new ErrorHandler();
-        set_error_handler([$handler, 'handler']);
     }
 
     /**

setup/src/Magento/Setup/Test/Unit/Controller/DatabaseCheckTest.php

@@ -25,9 +25,8 @@ class DatabaseCheckTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $webLogger = $this->getMock('\Magento\Setup\Model\WebLogger', [], [], '', false);
         $this->dbValidator = $this->getMock('Magento\Setup\Validator\DbValidator', [], [], '', false);
-        $this->controller = new DatabaseCheck($webLogger, $this->dbValidator);
+        $this->controller = new DatabaseCheck($this->dbValidator);
     }
 
     public function testIndexAction()

setup/view/magento/setup/readiness-check/progress.phtml

@@ -101,7 +101,7 @@
             <div class="readiness-check-content">
                 <h3 class="readiness-check-title">PHP Settings Check</h3>
                 <p>
-                    Your PHP setting is correct.
+                    Your PHP settings are correct.
                 </p>
             </div>