hugo
/
composer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove code blocks for php <7.2 compatibility (#10417)

Browse Source
main
Niels Vanpachtenbeke 2 years ago committed by GitHub
parent e6cfc924f2
commit 1c928466a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 18 additions and 110 deletions
Show Stats Download Patch File Download Diff File

10
src/Composer/Autoload/ClassMapGenerator.php
Unescape Escape View File

@ -241,7 +241,7 @@ class ClassMapGenerator
}
// return early if there is no chance of matching anything in this file
Preg::matchAll('{\b(?:class|interface'.$extraTypes.')\s}i', $contents, $matches);
Preg::matchAll('{\b(?:class|interface|trait'.$extraTypes.')\s}i', $contents, $matches);
if (!$matches) {
return array();
}
@ -252,7 +252,7 @@ class ClassMapGenerator
Preg::matchAll('{
(?:
\b(?<![\$:>])(?P<type>class|interface'.$extraTypes.') \s++ (?P<name>[a-zA-Z_\x7f-\xff:][a-zA-Z0-9_\x7f-\xff:\-]*+)
\b(?<![\$:>])(?P<type>class|interface|trait'.$extraTypes.') \s++ (?P<name>[a-zA-Z_\x7f-\xff:][a-zA-Z0-9_\x7f-\xff:\-]*+)
| \b(?<![\$:>])(?P<ns>namespace) (?P<nsname>\s++[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+(?:\s*+\\\\\s*+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+)*+)? \s*+ [\{;]
)
}ix', $contents, $matches);
@ -292,12 +292,14 @@ class ClassMapGenerator
private static function getExtraTypes()
{
static $extraTypes = null;
if (null === $extraTypes) {
$extraTypes = PHP_VERSION_ID < 50400 ? '' : '|trait';
$extraTypes = '';
if (PHP_VERSION_ID >= 80100 || (defined('HHVM_VERSION') && version_compare(HHVM_VERSION, '3.3', '>='))) {
$extraTypes .= '|enum';
}
PhpFileCleaner::setTypeConfig(array_merge(array('class', 'interface'), array_filter(explode('|', $extraTypes))));
PhpFileCleaner::setTypeConfig(array_merge(['class', 'interface', 'trait'], array_filter(explode('|', $extraTypes))));
}
return $extraTypes;

6
src/Composer/Cache.php
Unescape Escape View File

@ -248,11 +248,7 @@ class Cache
return false;
}
if (PHP_VERSION_ID > 70000) {
return !random_int(0, 50);
}
return !mt_rand(0, 50);
return !random_int(0, 50);
}
/**

13
src/Composer/Command/DiagnoseCommand.php
Unescape Escape View File

@ -553,14 +553,10 @@ EOT
$errors['ioncube'] = ioncube_loader_version();
}
if (PHP_VERSION_ID < 50302) {
if (PHP_VERSION_ID < 70205) {
$errors['php'] = PHP_VERSION;
}
if (!isset($errors['php']) && PHP_VERSION_ID < 50304) {
$warnings['php'] = PHP_VERSION;
}
if (!extension_loaded('openssl')) {
$errors['openssl'] = true;
}
@ -634,7 +630,7 @@ EOT
break;
case 'php':
$text = PHP_EOL."Your PHP ({$current}) is too old, you must upgrade to PHP 5.3.2 or higher.";
$text = PHP_EOL."Your PHP ({$current}) is too old, you must upgrade to PHP 7.2.5 or higher.";
break;
case 'allow_url_fopen':
@ -692,11 +688,6 @@ EOT
$text .= " Recompile it without this flag if possible";
break;
case 'php':
$text = "Your PHP ({$current}) is quite old, upgrading to PHP 5.3.4 or higher is recommended.".PHP_EOL;
$text .= " Composer works with 5.3.2+ for most people, but there might be edge case issues.";
break;
case 'openssl_version':
// Attempt to parse version number out, fallback to whole string value.
$opensslVersion = strstr(trim(strstr(OPENSSL_VERSION_TEXT, ' ')), ' ', true);

5
src/Composer/Command/InitCommand.php
Unescape Escape View File

@ -812,11 +812,6 @@ EOT
return true;
}
// php <5.3.3 has a very broken email validator, so bypass checks
if (PHP_VERSION_ID < 50303) {
return true;
}
return false !== filter_var($email, FILTER_VALIDATE_EMAIL);
}

4
src/Composer/Console/Application.php
Unescape Escape View File

@ -252,8 +252,8 @@ class Application extends BaseApplication
function_exists('php_uname') ? php_uname('s') . ' / ' . php_uname('r') : 'Unknown OS'
), true, IOInterface::DEBUG);
if (PHP_VERSION_ID < 50302) {
$io->writeError('<warning>Composer only officially supports PHP 5.3.2 and above, you will most likely encounter problems with your PHP '.PHP_VERSION.', upgrading is strongly recommended.</warning>');
if (PHP_VERSION_ID < 70205) {
$io->writeError('<warning>Composer supports PHP 7.2.5 and above, you will most likely encounter problems with your PHP '.PHP_VERSION.'. Upgrading is strongly recommended but you can use Composer 2.2.x LTS as a fallback.</warning>');
}
if (XdebugHandler::isXdebugActive() && !Platform::getEnv('COMPOSER_DISABLE_XDEBUG_WARN')) {

3
src/Composer/Factory.php
Unescape Escape View File

@ -685,9 +685,6 @@ class Factory
if (false !== strpos($e->getMessage(), 'cafile')) {
$io->write('<error>Unable to locate a valid CA certificate file. You must set a valid \'cafile\' option.</error>');
$io->write('<error>A valid CA certificate file is required for SSL/TLS protection.</error>');
if (PHP_VERSION_ID < 50600) {
$io->write('<error>It is recommended you upgrade to PHP 5.6+ which can detect your system CA file automatically.</error>');
}
$io->write('<error>You can disable this error, at your own risk, by setting the \'disable-tls\' option to true.</error>');
}
throw $e;

27
src/Composer/Json/JsonFile.php
Unescape Escape View File

@ -238,35 +238,12 @@ class JsonFile
*/
public static function encode($data, $options = 448)
{
if (PHP_VERSION_ID >= 50400) {
$json = json_encode($data, $options);
if (false === $json) {
self::throwEncodeError(json_last_error());
}
// compact brackets to follow recent php versions
if (PHP_VERSION_ID < 50428 || (PHP_VERSION_ID >= 50500 && PHP_VERSION_ID < 50512) || (defined('JSON_C_VERSION') && version_compare(phpversion('json'), '1.3.6', '<'))) {
$json = Preg::replace('/\[\s+\]/', '[]', $json);
$json = Preg::replace('/\{\s+\}/', '{}', $json);
}
return $json;
}
$json = json_encode($data);
$json = json_encode($data, $options);
if (false === $json) {
self::throwEncodeError(json_last_error());
}
$prettyPrint = (bool) ($options & self::JSON_PRETTY_PRINT);
$unescapeUnicode = (bool) ($options & self::JSON_UNESCAPED_UNICODE);
$unescapeSlashes = (bool) ($options & self::JSON_UNESCAPED_SLASHES);
if (!$prettyPrint && !$unescapeUnicode && !$unescapeSlashes) {
return $json;
}
return JsonFormatter::format($json, $unescapeUnicode, $unescapeSlashes);
return $json;
}
/**

2
src/Composer/Json/JsonFormatter.php
Unescape Escape View File

@ -21,6 +21,8 @@ use Composer\Pcre\Preg;
*
* @author Konstantin Kudryashiv <ever.zet@gmail.com>
* @author Jordi Boggiano <j.boggiano@seld.be>
*
* @abandoned Use json_encode or JsonFile::encode() with modern JSON_* flags to configure formatting - this class will be removed in 3.0
*/
class JsonFormatter
{

3
src/Composer/Package/Archiver/ZipArchiver.php
Unescape Escape View File

@ -51,10 +51,9 @@ class ZipArchiver implements ArchiverInterface
}
/**
* ZipArchive::setExternalAttributesName is available from >= PHP 5.6
* setExternalAttributesName() is only available with libzip 0.11.2 or above
*/
if (PHP_VERSION_ID >= 50600 && method_exists($zip, 'setExternalAttributesName')) {
if (method_exists($zip, 'setExternalAttributesName')) {
$perms = fileperms($filepath);
/**

4
src/Composer/Util/Git.php
Unescape Escape View File

@ -397,10 +397,6 @@ class Git
*/
public static function cleanEnv()
{
if (PHP_VERSION_ID < 50400 && ini_get('safe_mode') && false === strpos(ini_get('safe_mode_allowed_env_vars'), 'GIT_ASKPASS')) {
throw new \RuntimeException('safe_mode is enabled and safe_mode_allowed_env_vars does not contain GIT_ASKPASS, can not set env var. You can disable safe_mode with "-dsafe_mode=0" when running composer');
}
// added in git 1.7.1, prevents prompting the user for username/password
if (Platform::getEnv('GIT_ASKPASS') !== 'echo') {
Platform::putEnv('GIT_ASKPASS', 'echo');

30
src/Composer/Util/RemoteFilesystem.php
Unescape Escape View File

@ -332,18 +332,6 @@ class RemoteFilesystem
throw $e;
}
if (PHP_VERSION_ID < 50600 && !empty($options['ssl']['peer_fingerprint'])) {
// Emulate fingerprint validation on PHP < 5.6
$params = stream_context_get_params($ctx);
$expectedPeerFingerprint = $options['ssl']['peer_fingerprint'];
$peerFingerprint = TlsHelper::getCertificateFingerprint($params['options']['ssl']['peer_certificate']);
// Constant time compare??!
if ($expectedPeerFingerprint !== $peerFingerprint) {
throw new TransportException('Peer fingerprint did not match');
}
}
} catch (\Exception $e) {
if ($e instanceof TransportException && !empty($http_response_header[0])) {
$e->setHeaders($http_response_header);
@ -668,17 +656,6 @@ class RemoteFilesystem
if ($this->disableTls === false && PHP_VERSION_ID < 50600 && !stream_is_local($this->fileUrl)) {
$host = parse_url($this->fileUrl, PHP_URL_HOST);
if (PHP_VERSION_ID < 50304) {
// PHP < 5.3.4 does not support follow_location, for those people
// do some really nasty hard coded transformations. These will
// still breakdown if the site redirects to a domain we don't
// expect.
if ($host === 'github.com' || $host === 'api.github.com') {
$host = '*.github.com';
}
}
$tlsOptions['ssl']['CN_match'] = $host;
$tlsOptions['ssl']['SNI_server_name'] = $host;
@ -878,12 +855,7 @@ class RemoteFilesystem
$decode = $contentEncoding && 'gzip' === strtolower($contentEncoding);
if ($decode) {
if (PHP_VERSION_ID >= 50400) {
$result = zlib_decode($result);
} else {
// work around issue with gzuncompress & co that do not work with all gzip checksums
$result = file_get_contents('compress.zlib://data:application/octet-stream;base64,'.base64_encode($result));
}
$result = zlib_decode($result);
if ($result === false) {
throw new TransportException('Failed to decode zlib stream');

4
src/Composer/Util/StreamContextFactory.php
Unescape Escape View File

@ -225,9 +225,7 @@ final class StreamContextFactory
/**
* Disable TLS compression to prevent CRIME attacks where supported.
*/
if (PHP_VERSION_ID >= 50413) {
$defaults['ssl']['disable_compression'] = true;
}
$defaults['ssl']['disable_compression'] = true;
return $defaults;
}

4
tests/Composer/Test/Autoload/ClassMapGeneratorTest.php
Unescape Escape View File

@ -40,10 +40,6 @@ class ClassMapGeneratorTest extends TestCase
*/
public function getTestCreateMapTests()
{
if (PHP_VERSION_ID == 50303) {
$this->markTestSkipped('Test segfaults on travis 5.3.3 due to ClassMap\LongString');
}
$classmap = array(
'Foo\\Bar\\A' => realpath(__DIR__) . '/Fixtures/classmap/sameNsMultipleClasses.php',
'Foo\\Bar\\B' => realpath(__DIR__) . '/Fixtures/classmap/sameNsMultipleClasses.php',

6
tests/Composer/Test/Json/JsonFileTest.php
Unescape Escape View File

@ -298,9 +298,6 @@ class JsonFileTest extends TestCase
public function testUnicode()
{
if (!function_exists('mb_convert_encoding') && PHP_VERSION_ID < 50400) {
$this->markTestSkipped('Test requires the mbstring extension');
}
$data = array("Žluťoučký \" kůň" => "úpěl ďábelské ódy za €");
$json = '{
@ -312,9 +309,6 @@ class JsonFileTest extends TestCase
public function testOnlyUnicode()
{
if (!function_exists('mb_convert_encoding') && PHP_VERSION_ID < 50400) {
$this->markTestSkipped('Test requires the mbstring extension');
}
$data = "\\/ƌ";

3
tests/Composer/Test/Platform/HhvmDetectorTest.php
Unescape Escape View File

@ -45,9 +45,6 @@ class HhvmDetectorTest extends TestCase
if (defined('HHVM_VERSION_ID')) {
self::markTestSkipped('Running with HHVM');
}
if (PHP_VERSION_ID < 50400) {
self::markTestSkipped('Test only works on PHP 5.4+');
}
if (Platform::isWindows()) {
self::markTestSkipped('Test does not run on Windows');
}

4
tests/Composer/Test/Util/RemoteFilesystemTest.php
Unescape Escape View File

@ -252,10 +252,6 @@ class RemoteFilesystemTest extends TestCase
$this->assertTrue($res['ssl']['verify_peer']);
$this->assertTrue($res['ssl']['SNI_enabled']);
$this->assertEquals(7, $res['ssl']['verify_depth']);
if (PHP_VERSION_ID < 50600) {
$this->assertEquals('www.example.org', $res['ssl']['CN_match']);
$this->assertEquals('www.example.org', $res['ssl']['SNI_server_name']);
}
$this->assertEquals('/some/path/file.crt', $res['ssl']['cafile']);
if (version_compare(PHP_VERSION, '5.4.13') >= 0) {
$this->assertTrue($res['ssl']['disable_compression']);

Write Preview
Loading…
Cancel
Save