@@ -1252,7 +1252,7 @@ discard block |
||
| 1252 | 1252 | 'DHE-DSS-AES256-SHA', |
| 1253 | 1253 | 'DHE-RSA-AES256-SHA', |
| 1254 | 1254 | 'AES128-GCM-SHA256', |
| 1255 | - 'AES256-GCM-SHA384', |
|
| 1255 | + 'AES256-GCM-SHA384', |
|
| 1256 | 1256 | 'ECDHE-RSA-RC4-SHA', |
| 1257 | 1257 | 'ECDHE-ECDSA-RC4-SHA', |
| 1258 | 1258 | 'AES128', |
@@ -1393,37 +1393,37 @@ discard block |
||
| 1393 | 1393 | } |
| 1394 | 1394 | |
| 1395 | 1395 | /** |
| 1396 | - * This method was adapted from Sslurp. |
|
| 1397 | - * https://github.com/EvanDotPro/Sslurp |
|
| 1398 | - * |
|
| 1399 | - * (c) Evan Coury <[email protected]> |
|
| 1400 | - * |
|
| 1401 | - * For the full copyright and license information, please see below: |
|
| 1402 | - * |
|
| 1403 | - * Copyright (c) 2013, Evan Coury |
|
| 1404 | - * All rights reserved. |
|
| 1405 | - * |
|
| 1406 | - * Redistribution and use in source and binary forms, with or without modification, |
|
| 1407 | - * are permitted provided that the following conditions are met: |
|
| 1408 | - * |
|
| 1409 | - * * Redistributions of source code must retain the above copyright notice, |
|
| 1410 | - * this list of conditions and the following disclaimer. |
|
| 1411 | - * |
|
| 1412 | - * * Redistributions in binary form must reproduce the above copyright notice, |
|
| 1413 | - * this list of conditions and the following disclaimer in the documentation |
|
| 1414 | - * and/or other materials provided with the distribution. |
|
| 1415 | - * |
|
| 1416 | - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND |
|
| 1417 | - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
|
| 1418 | - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
|
| 1419 | - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR |
|
| 1420 | - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
|
| 1421 | - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
|
| 1422 | - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON |
|
| 1423 | - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
|
| 1424 | - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
|
| 1425 | - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
|
| 1426 | - */ |
|
| 1396 | + * This method was adapted from Sslurp. |
|
| 1397 | + * https://github.com/EvanDotPro/Sslurp |
|
| 1398 | + * |
|
| 1399 | + * (c) Evan Coury <[email protected]> |
|
| 1400 | + * |
|
| 1401 | + * For the full copyright and license information, please see below: |
|
| 1402 | + * |
|
| 1403 | + * Copyright (c) 2013, Evan Coury |
|
| 1404 | + * All rights reserved. |
|
| 1405 | + * |
|
| 1406 | + * Redistribution and use in source and binary forms, with or without modification, |
|
| 1407 | + * are permitted provided that the following conditions are met: |
|
| 1408 | + * |
|
| 1409 | + * * Redistributions of source code must retain the above copyright notice, |
|
| 1410 | + * this list of conditions and the following disclaimer. |
|
| 1411 | + * |
|
| 1412 | + * * Redistributions in binary form must reproduce the above copyright notice, |
|
| 1413 | + * this list of conditions and the following disclaimer in the documentation |
|
| 1414 | + * and/or other materials provided with the distribution. |
|
| 1415 | + * |
|
| 1416 | + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND |
|
| 1417 | + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
|
| 1418 | + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
|
| 1419 | + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR |
|
| 1420 | + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
|
| 1421 | + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
|
| 1422 | + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON |
|
| 1423 | + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
|
| 1424 | + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
|
| 1425 | + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
|
| 1426 | + */ |
|
| 1427 | 1427 | public static function getSystemCaRootBundlePath() |
| 1428 | 1428 | { |
| 1429 | 1429 | static $caPath = null; |
@@ -220,7 +220,7 @@ discard block |
||
| 220 | 220 | $warnings = array(); |
| 221 | 221 | |
| 222 | 222 | if ($iniPath = php_ini_loaded_file()) { |
| 223 | - $iniMessage = PHP_EOL.'The php.ini used by your command-line PHP is: ' . $iniPath; |
|
| 223 | + $iniMessage = PHP_EOL.'The php.ini used by your command-line PHP is: '.$iniPath; |
|
| 224 | 224 | } else { |
| 225 | 225 | $iniMessage = PHP_EOL.'A php.ini file does not exist. You will have to create one.'; |
| 226 | 226 | } |
@@ -594,7 +594,7 @@ discard block |
||
| 594 | 594 | |
| 595 | 595 | if ($result && $channel !== 'stable' && !$version && defined('PHP_BINARY')) { |
| 596 | 596 | $null = (defined('PHP_WINDOWS_VERSION_MAJOR') ? 'NUL' : '/dev/null'); |
| 597 | - @exec(escapeshellarg(PHP_BINARY) .' '.escapeshellarg($this->target).' self-update --'.$channel.' --set-channel-only -q > '.$null.' 2> '.$null, $output); |
|
| 597 | + @exec(escapeshellarg(PHP_BINARY).' '.escapeshellarg($this->target).' self-update --'.$channel.' --set-channel-only -q > '.$null.' 2> '.$null, $output); |
|
| 598 | 598 | } |
| 599 | 599 | } catch (Exception $e) { |
| 600 | 600 | $result = false; |
@@ -1173,7 +1173,7 @@ discard block |
||
| 1173 | 1173 | if ($this->disableTls === false) { |
| 1174 | 1174 | if (!empty($cafile) && !is_dir($cafile)) { |
| 1175 | 1175 | if (!is_readable($cafile) || !validateCaFile(file_get_contents($cafile))) { |
| 1176 | - throw new RuntimeException('The configured cafile (' .$cafile. ') was not valid or could not be read.'); |
|
| 1176 | + throw new RuntimeException('The configured cafile ('.$cafile.') was not valid or could not be read.'); |
|
| 1177 | 1177 | } |
| 1178 | 1178 | } |
| 1179 | 1179 | $options = $this->getTlsStreamContextDefaults($cafile); |
@@ -1328,11 +1328,11 @@ discard block |
||
| 1328 | 1328 | } |
| 1329 | 1329 | |
| 1330 | 1330 | if (!empty($proxy)) { |
| 1331 | - $proxyURL = isset($proxy['scheme']) ? $proxy['scheme'] . '://' : ''; |
|
| 1331 | + $proxyURL = isset($proxy['scheme']) ? $proxy['scheme'].'://' : ''; |
|
| 1332 | 1332 | $proxyURL .= isset($proxy['host']) ? $proxy['host'] : ''; |
| 1333 | 1333 | |
| 1334 | 1334 | if (isset($proxy['port'])) { |
| 1335 | - $proxyURL .= ":" . $proxy['port']; |
|
| 1335 | + $proxyURL .= ":".$proxy['port']; |
|
| 1336 | 1336 | } elseif ('http://' == substr($proxyURL, 0, 7)) { |
| 1337 | 1337 | $proxyURL .= ":80"; |
| 1338 | 1338 | } elseif ('https://' == substr($proxyURL, 0, 8)) { |
@@ -1370,7 +1370,7 @@ discard block |
||
| 1370 | 1370 | if (isset($proxy['user'])) { |
| 1371 | 1371 | $auth = urldecode($proxy['user']); |
| 1372 | 1372 | if (isset($proxy['pass'])) { |
| 1373 | - $auth .= ':' . urldecode($proxy['pass']); |
|
| 1373 | + $auth .= ':'.urldecode($proxy['pass']); |
|
| 1374 | 1374 | } |
| 1375 | 1375 | $auth = base64_encode($auth); |
| 1376 | 1376 | |