Skip to content

Commit 07d2a03

Browse files
vasekbochvasekboch
committed
Update symfony requirement files
1 parent e158e81 commit 07d2a03

File tree

3 files changed

+71
-28
lines changed

3 files changed

+71
-28
lines changed

‎bin/symfony_requirements

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ echo '> Checking Symfony requirements:'.PHP_EOL.' ';
2222

2323
$messages = array();
2424
foreach ($symfonyRequirements->getRequirements() as $req) {
25-
/** @var $req Requirement */
2625
if ($helpText = get_error_message($req, $lineSize)) {
2726
echo_style('red', 'E');
2827
$messages['error'][] = $helpText;
@@ -121,10 +120,14 @@ function echo_block($style, $title, $message)
121120

122121
echo PHP_EOL.PHP_EOL;
123122

124-
echo_style($style, str_repeat(' ', $width).PHP_EOL);
125-
echo_style($style, str_pad(' ['.$title.']', $width, ' ', STR_PAD_RIGHT).PHP_EOL);
126-
echo_style($style, str_pad($message, $width, ' ', STR_PAD_RIGHT).PHP_EOL);
127-
echo_style($style, str_repeat(' ', $width).PHP_EOL);
123+
echo_style($style, str_repeat(' ', $width));
124+
echo PHP_EOL;
125+
echo_style($style, str_pad(' ['.$title.']', $width, ' ', STR_PAD_RIGHT));
126+
echo PHP_EOL;
127+
echo_style($style, $message);
128+
echo PHP_EOL;
129+
echo_style($style, str_repeat(' ', $width));
130+
echo PHP_EOL;
128131
}
129132

130133
function has_color_support()

‎var/SymfonyRequirements.php

Lines changed: 56 additions & 18 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) {
@@ -689,7 +703,7 @@ function_exists('posix_isatty'),
689703
$this->addRecommendation(
690704
\Symfony\Component\Intl\Intl::getIcuDataVersion() === \Symfony\Component\Intl\Intl::getIcuVersion(),
691705
sprintf('intl ICU version installed on your system (%s) does not match the ICU data bundled with Symfony (%s)', \Symfony\Component\Intl\Intl::getIcuVersion(), \Symfony\Component\Intl\Intl::getIcuDataVersion()),
692-
'To avoid internationalization data incosistencies upgrade the symfony/intl component.'
706+
'To avoid internationalization data inconsistencies upgrade the symfony/intl component.'
693707
);
694708
}
695709
}
@@ -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
}

‎web/config.php

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828

2929
$majorProblems = $symfonyRequirements->getFailedRequirements();
3030
$minorProblems = $symfonyRequirements->getFailedRecommendations();
31+
$hasMajorProblems = (bool) count($majorProblems);
32+
$hasMinorProblems = (bool) count($minorProblems);
3133

3234
?>
3335
<!DOCTYPE html>
@@ -158,7 +160,7 @@
158160
ready to run Symfony applications.
159161
</p>
160162

161-
<?php if (count($majorProblems)): ?>
163+
<?php if ($hasMajorProblems): ?>
162164
<h2 class="ko">Major problems</h2>
163165
<p>Major problems have been detected and <strong>must</strong> be fixed before continuing:</p>
164166
<ol>
@@ -170,10 +172,10 @@
170172
</ol>
171173
<?php endif; ?>
172174

173-
<?php if (count($minorProblems)): ?>
175+
<?php if ($hasMinorProblems): ?>
174176
<h2>Recommendations</h2>
175177
<p>
176-
<?php if (count($majorProblems)): ?>Additionally, to<?php else: ?>To<?php endif; ?> enhance your Symfony experience,
178+
<?php if ($hasMajorProblems): ?>Additionally, to<?php else: ?>To<?php endif; ?> enhance your Symfony experience,
177179
it’s recommended that you fix the following:
178180
</p>
179181
<ol>
@@ -195,12 +197,12 @@
195197
</p>
196198
<?php endif; ?>
197199

198-
<?php if (!count($majorProblems) && !count($minorProblems)): ?>
200+
<?php if (!$hasMajorProblems && !$hasMinorProblems): ?>
199201
<p class="ok">All checks passed successfully. Your system is ready to run Symfony applications.</p>
200202
<?php endif; ?>
201203

202204
<ul class="symfony-install-continue">
203-
<?php if (count($majorProblems) || count($minorProblems)): ?>
205+
<?php if ($hasMajorProblems || $hasMinorProblems): ?>
204206
<li><a href="config.php">Re-check configuration</a></li>
205207
<?php endif; ?>
206208
</ul>

0 commit comments

Comments
 (0)