From 3018626a2bb947d137b911f07ce0084aaa675fb1 Mon Sep 17 00:00:00 2001
From: Ankur Kaneria <akaneria@ebay.com>
Date: Mon, 5 Oct 2015 11:55:15 -0500
Subject: [PATCH] MAGETWO-40303: Merchant isn't notified if something went
wrong while installing Magento via Web Setup
- code updates based on review comments
---
setup/pub/magento/setup/readiness-check.js | 16 +++++-----------
.../Magento/Setup/Model/PhpReadinessCheck.php | 2 +-
2 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/setup/pub/magento/setup/readiness-check.js b/setup/pub/magento/setup/readiness-check.js
index 58f2c69e6c3..3abe557a22d 100644
--- a/setup/pub/magento/setup/readiness-check.js
+++ b/setup/pub/magento/setup/readiness-check.js
@@ -287,21 +287,15 @@ angular.module('readiness-check', [])
$scope.query = function(item) {
if (item.params) {
if (item.useGet === true) {
- item.url = item.url + '?type=' + item.params;
-
// The http request type has been changed from POST to GET for a reason. The POST request
// results in PHP throwing a warning regards to 'always_populate_raw_post_data'
// being incorrectly set to a value different than -1. This warning is throw during the initial
// boot up sequence when POST request is received before the control gets transferred over to
- // the magento customer error handler, hence not catachable. To avoid that warning, the HTTP
- // request type is being changed from POST to GET for select queries.
- return $http.get(item.url)
- .success(function (data) {
- item.process(data)
- })
- .error(function (data, status) {
- item.fail();
- });
+ // the Magento customer error handler, hence not catchable. To avoid that warning, the HTTP
+ // request type is being changed from POST to GET for select queries. Those queries are:
+ // (1) PHP Version Check (2) PHP Settings Check and (3) PHP Extensions Check.
+
+ item.url = item.url + '?type=' + item.params;
} else {
return $http.post(item.url, item.params)
.success(function (data) {
diff --git a/setup/src/Magento/Setup/Model/PhpReadinessCheck.php b/setup/src/Magento/Setup/Model/PhpReadinessCheck.php
index f05f1a97866..b6bed9a9d1c 100644
--- a/setup/src/Magento/Setup/Model/PhpReadinessCheck.php
+++ b/setup/src/Magento/Setup/Model/PhpReadinessCheck.php
@@ -218,7 +218,7 @@ class PhpReadinessCheck
'message' => $message,
'helpUrl' => 'http://php.net/manual/en/ini.core.php#ini.always-populate-settings-data',
'error' => $error
- ];
+ ];
return $data;
}
--
GitLab