[BUGFIX] Remove side effects from ErrorController tests

Resolves: #83921 Releases: master Change-Id: Icaa53e211ed2ca6ea9824a930960c2d9cee688ef Reviewed-on: https://review.typo3.org/55737 Tested-by: TYPO3com <no-reply@typo3.com> Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch> Tested-by: Christian Kuhn <lolli@schwarzbu.ch> Reviewed-by: Benni Mack <benni@typo3.org> Tested-by: Benni Mack <benni@typo3.org>
TYPO3 · Feb 15, 2018 · ff7c2aa · ff7c2aa
1 parent da4db43
commit ff7c2aa
Show file tree

Hide file tree

Showing 3 changed files with 189 additions and 84 deletions.
diff --git a/typo3/sysext/core/Classes/Utility/GeneralUtility.php b/typo3/sysext/core/Classes/Utility/GeneralUtility.php
@@ -1808,7 +1808,7 @@ public static function getUrl($url, $includeHeader = 0, $requestHeaders = null,
                 $response = $requestFactory->request($url, 'GET', $configuration);
             } catch (RequestException $exception) {
                 if (isset($report)) {
-                    $report['error'] = $exception->getCode();
+                    $report['error'] = $exception->getCode() ?: 1518707554;
                     $report['message'] = $exception->getMessage();
                     $report['exception'] = $exception;
                 }
@@ -1823,7 +1823,7 @@ public static function getUrl($url, $includeHeader = 0, $requestHeaders = null,
                 $parsedURL = parse_url($url);
                 $method = $includeHeader === 2 ? 'HEAD' : 'GET';
                 $content = $method . ' ' . ($parsedURL['path'] ?? '/')
-                    . ($parsedURL['query'] ? '?' . $parsedURL['query'] : '') . ' HTTP/1.0' . CRLF
+                    . (!empty($parsedURL['query']) ? '?' . $parsedURL['query'] : '') . ' HTTP/1.0' . CRLF
                     . 'Host: ' . $parsedURL['host'] . CRLF
                     . 'Connection: close' . CRLF;
                 if (is_array($requestHeaders)) {