diff --git a/htdocs/compta/cashcontrol/report.php b/htdocs/compta/cashcontrol/report.php index 5df55ab7849..f51e068352f 100644 --- a/htdocs/compta/cashcontrol/report.php +++ b/htdocs/compta/cashcontrol/report.php @@ -29,7 +29,7 @@ * \brief List of bank transactions */ -if (!defined('NOREQUIREMENU')) define('NOREQUIREMENU','1'); // If there is no need to load and show top and left menu +if (!defined('NOREQUIREMENU')) define('NOREQUIREMENU', '1'); // If there is no need to load and show top and left menu if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', '1'); // Disable browser notification require '../../main.inc.php'; diff --git a/htdocs/core/lib/geturl.lib.php b/htdocs/core/lib/geturl.lib.php index 9a4ac16e2f2..b1c0048081e 100644 --- a/htdocs/core/lib/geturl.lib.php +++ b/htdocs/core/lib/geturl.lib.php @@ -76,7 +76,7 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation = // Restrict use to some protocols only $protocols = 0; if (is_array($allowedschemes)) { - foreach($allowedschemes as $allowedscheme) { + foreach ($allowedschemes as $allowedscheme) { if ($allowedscheme == 'http') $protocols |= CURLPROTO_HTTP; if ($allowedscheme == 'https') $protocols |= CURLPROTO_HTTPS; } @@ -129,8 +129,7 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation = $info = array(); $response = ''; - do - { + do { if ($maxRedirection < 1) break; curl_setopt($ch, CURLOPT_URL, $newUrl); @@ -187,7 +186,7 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation = $http_code = 0; } } - while($http_code); + while ($http_code); $request = curl_getinfo($ch, CURLINFO_HEADER_OUT); // Reading of request must be done after sending request diff --git a/test/phpunit/RestAPIDocumentTest.php b/test/phpunit/RestAPIDocumentTest.php index 06094904bd9..8dbaafab018 100644 --- a/test/phpunit/RestAPIDocumentTest.php +++ b/test/phpunit/RestAPIDocumentTest.php @@ -171,7 +171,7 @@ class RestAPIDocumentTest extends PHPUnit\Framework\TestCase 'fileencoding'=>"" ); - $result = getURLContent($url, 'POST', $data, 1,array(), array('http', 'https'), 2); + $result = getURLContent($url, 'POST', $data, 1, array(), array('http', 'https'), 2); echo __METHOD__.' Result for sending document: '.var_export($result, true)."\n"; echo __METHOD__.' curl_error_no: '.$result['curl_error_no']."\n"; $object = json_decode($result['content'], true);