Skip to content
This repository was archived by the owner on Nov 27, 2020. It is now read-only.

Commit 0ae1cd9

Browse files
committed
updated VENDORS for 2.8.12
1 parent 152e3e9 commit 0ae1cd9

File tree

4 files changed

+104
-55
lines changed

4 files changed

+104
-55
lines changed

app/SymfonyRequirements.php

Lines changed: 55 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,9 @@ public function __construct($cfgName, $evaluation, $approveCfgAbsence = false, $
168168
*/
169169
class RequirementCollection implements IteratorAggregate
170170
{
171+
/**
172+
* @var Requirement[]
173+
*/
171174
private $requirements = array();
172175

173176
/**
@@ -265,7 +268,7 @@ public function addCollection(RequirementCollection $collection)
265268
/**
266269
* Returns both requirements and recommendations.
267270
*
268-
* @return array Array of Requirement instances
271+
* @return Requirement[]
269272
*/
270273
public function all()
271274
{
@@ -275,7 +278,7 @@ public function all()
275278
/**
276279
* Returns all mandatory requirements.
277280
*
278-
* @return array Array of Requirement instances
281+
* @return Requirement[]
279282
*/
280283
public function getRequirements()
281284
{
@@ -292,7 +295,7 @@ public function getRequirements()
292295
/**
293296
* Returns the mandatory requirements that were not met.
294297
*
295-
* @return array Array of Requirement instances
298+
* @return Requirement[]
296299
*/
297300
public function getFailedRequirements()
298301
{
@@ -309,7 +312,7 @@ public function getFailedRequirements()
309312
/**
310313
* Returns all optional recommendations.
311314
*
312-
* @return array Array of Requirement instances
315+
* @return Requirement[]
313316
*/
314317
public function getRecommendations()
315318
{
@@ -326,7 +329,7 @@ public function getRecommendations()
326329
/**
327330
* Returns the recommendations that were not met.
328331
*
329-
* @return array Array of Requirement instances
332+
* @return Requirement[]
330333
*/
331334
public function getFailedRecommendations()
332335
{
@@ -376,7 +379,8 @@ public function getPhpIniConfigPath()
376379
*/
377380
class SymfonyRequirements extends RequirementCollection
378381
{
379-
const REQUIRED_PHP_VERSION = '5.3.3';
382+
const LEGACY_REQUIRED_PHP_VERSION = '5.3.3';
383+
const REQUIRED_PHP_VERSION = '5.5.9';
380384

381385
/**
382386
* Constructor that initializes the requirements.
@@ -386,16 +390,26 @@ public function __construct()
386390
/* mandatory requirements follow */
387391

388392
$installedPhpVersion = phpversion();
393+
$requiredPhpVersion = $this->getPhpRequiredVersion();
389394

390-
$this->addRequirement(
391-
version_compare($installedPhpVersion, self::REQUIRED_PHP_VERSION, '>='),
392-
sprintf('PHP version must be at least %s (%s installed)', self::REQUIRED_PHP_VERSION, $installedPhpVersion),
393-
sprintf('You are running PHP version "<strong>%s</strong>", but Symfony needs at least PHP "<strong>%s</strong>" to run.
394-
Before using Symfony, upgrade your PHP installation, preferably to the latest version.',
395-
$installedPhpVersion, self::REQUIRED_PHP_VERSION),
396-
sprintf('Install PHP %s or newer (installed version is %s)', self::REQUIRED_PHP_VERSION, $installedPhpVersion)
395+
$this->addRecommendation(
396+
$requiredPhpVersion,
397+
'Vendors should be installed in order to check all requirements.',
398+
'Run the <code>composer install</code> command.',
399+
'Run the "composer install" command.'
397400
);
398401

402+
if (false !== $requiredPhpVersion) {
403+
$this->addRequirement(
404+
version_compare($installedPhpVersion, $requiredPhpVersion, '>='),
405+
sprintf('PHP version must be at least %s (%s installed)', $requiredPhpVersion, $installedPhpVersion),
406+
sprintf('You are running PHP version "<strong>%s</strong>", but Symfony needs at least PHP "<strong>%s</strong>" to run.
407+
Before using Symfony, upgrade your PHP installation, preferably to the latest version.',
408+
$installedPhpVersion, $requiredPhpVersion),
409+
sprintf('Install PHP %s or newer (installed version is %s)', $requiredPhpVersion, $installedPhpVersion)
410+
);
411+
}
412+
399413
$this->addRequirement(
400414
version_compare($installedPhpVersion, '5.3.16', '!='),
401415
'PHP version must not be 5.3.16 as Symfony won\'t work properly with it',
@@ -433,7 +447,7 @@ public function __construct()
433447
);
434448
}
435449

436-
if (version_compare($installedPhpVersion, self::REQUIRED_PHP_VERSION, '>=')) {
450+
if (false !== $requiredPhpVersion && version_compare($installedPhpVersion, $requiredPhpVersion, '>=')) {
437451
$timezones = array();
438452
foreach (DateTimeZone::listAbbreviations() as $abbreviations) {
439453
foreach ($abbreviations as $abbreviation) {
@@ -725,9 +739,9 @@ function_exists('posix_isatty'),
725739

726740
if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
727741
$this->addRecommendation(
728-
$this->getRealpathCacheSize() > 1000,
729-
'realpath_cache_size should be above 1024 in php.ini',
730-
'Set "<strong>realpath_cache_size</strong>" to e.g. "<strong>1024</strong>" in php.ini<a href="#phpini">*</a> to improve performance on windows.'
742+
$this->getRealpathCacheSize() >= 5 * 1024 * 1024,
743+
'realpath_cache_size should be at least 5M in php.ini',
744+
'Setting "<strong>realpath_cache_size</strong>" to e.g. "<strong>5242880</strong>" or "<strong>5M</strong>" in php.ini<a href="#phpini">*</a> may improve performance on Windows significantly in some cases.'
731745
);
732746
}
733747

@@ -778,4 +792,28 @@ protected function getRealpathCacheSize()
778792
return (int) $size;
779793
}
780794
}
795+
796+
/**
797+
* Defines PHP required version from Symfony version.
798+
*
799+
* @return string|false The PHP required version or false if it could not be guessed
800+
*/
801+
protected function getPhpRequiredVersion()
802+
{
803+
if (!file_exists($path = __DIR__.'/../composer.lock')) {
804+
return false;
805+
}
806+
807+
$composerLock = json_decode(file_get_contents($path), true);
808+
foreach ($composerLock['packages'] as $package) {
809+
$name = $package['name'];
810+
if ('symfony/symfony' !== $name && 'symfony/http-kernel' !== $name) {
811+
continue;
812+
}
813+
814+
return (int) $package['version'][1] > 2 ? self::REQUIRED_PHP_VERSION : self::LEGACY_REQUIRED_PHP_VERSION;
815+
}
816+
817+
return false;
818+
}
781819
}

app/check.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
$messages = array();
2323
foreach ($symfonyRequirements->getRequirements() as $req) {
24-
/** @var $req Requirement */
2524
if ($helpText = get_error_message($req, $lineSize)) {
2625
echo_style('red', 'E');
2726
$messages['error'][] = $helpText;

composer.lock

Lines changed: 42 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)