Slimplify functions down as per Tim's review comments

civicrm · Jun 8, 2019 · 90f6c8d · 90f6c8d
1 parent 46dddc5
commit 90f6c8d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 16 deletions.
diff --git a/CRM/Utils/System.php b/CRM/Utils/System.php
@@ -1867,8 +1867,7 @@ public static function createDefaultCrudLink($crudLinkSpec) {
    * @param \Psr\Http\Message\ResponseInterface $response
    */
   public static function sendResponse(\Psr\Http\Message\ResponseInterface $response) {
-    $config = CRM_Core_Config::singleton();
-    $config->userSystem->sendResponse($response);
+    $config = CRM_Core_Config::singleton()->userSystem->sendResponse($response);
   }
 
 }
diff --git a/CRM/Utils/System/Base.php b/CRM/Utils/System/Base.php
@@ -955,12 +955,9 @@ public function sendResponse(\Psr\Http\Message\ResponseInterface $response) {
       // PHP 5.4+
       http_response_code($response->getStatusCode());
     }
-    else {
-      // @todo should we remove this given we are no longer supporting < PHP 5.6 however keeping
-      // in for the moment for compatability with the original AssetBuilder code.
-      header('X-PHP-Response-Code: ' . $response->getStatusCode(), TRUE, $reponse->getStatusCode());
+    foreach ($response->getHeaders() as $name => $values) {
+      CRM_Utils_System::setHttpHeader($name, implode(', ', (array) $values));
     }
-    CRM_Utils_System::setHttpHeader('Content-Type', $response->getHeaderLine('Content-Type'));
     echo $response->getBody();
     CRM_Utils_System::civiExit();
   }

diff --git a/CRM/Utils/System/WordPress.php b/CRM/Utils/System/WordPress.php
@@ -871,16 +871,9 @@ public function synchronizeUsers() {
   public function sendResponse(\Psr\Http\Message\ResponseInterface $response) {
     // use WordPress function status_header to ensure 404 response is sent
     status_header($response->getStatusCode());
-    if (function_exists('http_response_code')) {
-      // PHP 5.4+
-      http_response_code($response->getStatusCode());
+    foreach ($response->getHeaders() as $name => $values) {
+      CRM_Utils_System::setHttpHeader($name, implode(', ', (array) $values));
     }
-    else {
-      // @todo should we remove this given we are no longer supporting < PHP 5.6 however keeping
-      // in for the moment for compatability with the original AssetBuilder code.
-      header('X-PHP-Response-Code: ' . $response->getStatusCode(), TRUE, $response->getStatusCode());
-    }
-    CRM_Utils_System::setHttpHeader('Content-Type', $response->getHeaderLine('Content-Type'));
     echo $response->getBody();
     CRM_Utils_System::civiExit();
   }