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

Commit 65c4cb7

Browse files
committed
Merge branch '3.0'
2 parents 05bca69 + 9f29d9a commit 65c4cb7

File tree

4 files changed

+20
-20
lines changed

4 files changed

+20
-20
lines changed

bin/symfony_requirements

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $lineSize = 70;
77
$symfonyRequirements = new SymfonyRequirements();
88
$iniPath = $symfonyRequirements->getPhpIniConfigPath();
99

10-
echo_title('Symfony2 Requirements Checker');
10+
echo_title('Symfony Requirements Checker');
1111

1212
echo '> PHP is using the following php.ini file:'.PHP_EOL;
1313
if ($iniPath) {
@@ -43,9 +43,9 @@ foreach ($symfonyRequirements->getRecommendations() as $req) {
4343
}
4444

4545
if ($checkPassed) {
46-
echo_block('success', 'OK', 'Your system is ready to run Symfony2 projects');
46+
echo_block('success', 'OK', 'Your system is ready to run Symfony projects');
4747
} else {
48-
echo_block('error', 'ERROR', 'Your system is not ready to run Symfony2 projects');
48+
echo_block('error', 'ERROR', 'Your system is not ready to run Symfony projects');
4949

5050
echo_title('Fix the following mandatory requirements', 'red');
5151

phpunit.xml.dist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3-
<!-- http://phpunit.de/manual/4.1/en/appendixes.configuration.html -->
3+
<!-- https://phpunit.de/manual/current/en/appendixes.configuration.html -->
44
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
5+
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.8/phpunit.xsd"
66
backupGlobals="false"
77
colors="true"
88
bootstrap="app/autoload.php"

var/SymfonyRequirements.php

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -425,11 +425,13 @@ public function __construct()
425425
'Change the permissions of either "<strong>app/logs/</strong>" or "<strong>var/logs/</strong>" directory so that the web server can write into it.'
426426
);
427427

428-
$this->addPhpIniRequirement(
429-
'date.timezone', true, false,
430-
'date.timezone setting must be set',
431-
'Set the "<strong>date.timezone</strong>" setting in php.ini<a href="#phpini">*</a> (like Europe/Paris).'
432-
);
428+
if (version_compare($installedPhpVersion, '7.0.0', '<')) {
429+
$this->addPhpIniRequirement(
430+
'date.timezone', true, false,
431+
'date.timezone setting must be set',
432+
'Set the "<strong>date.timezone</strong>" setting in php.ini<a href="#phpini">*</a> (like Europe/Paris).'
433+
);
434+
}
433435

434436
if (version_compare($installedPhpVersion, self::REQUIRED_PHP_VERSION, '>=')) {
435437
$timezones = array();
@@ -677,6 +679,14 @@ function_exists('posix_isatty'),
677679
'Upgrade your <strong>intl</strong> extension with a newer ICU version (4+).'
678680
);
679681

682+
if (class_exists('Symfony\Component\Intl\Intl')) {
683+
$this->addRecommendation(
684+
\Symfony\Component\Intl\Intl::getIcuDataVersion() === \Symfony\Component\Intl\Intl::getIcuVersion(),
685+
sprintf('intl ICU version installed on your system (%s) should match the ICU data bundled with Symfony (%s)', \Symfony\Component\Intl\Intl::getIcuVersion(), \Symfony\Component\Intl\Intl::getIcuDataVersion()),
686+
'In most cases you should be fine, but please verify there is no inconsistencies between data provided by Symfony and the intl extension. See https://github.com/symfony/symfony/issues/15007 for an example of inconsistencies you might run into.'
687+
);
688+
}
689+
680690
$this->addPhpIniRecommendation(
681691
'intl.error_level',
682692
create_function('$cfgValue', 'return (int) $cfgValue === 0;'),

web/app.php

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,6 @@
88
$loader = require __DIR__.'/../app/autoload.php';
99
include_once __DIR__.'/../var/bootstrap.php.cache';
1010

11-
// Enable APC for autoloading to improve performance.
12-
// You should change the ApcClassLoader first argument to a unique prefix
13-
// in order to prevent cache key conflicts with other applications
14-
// also using APC.
15-
/*
16-
$apcLoader = new Symfony\Component\ClassLoader\ApcClassLoader(sha1(__FILE__), $loader);
17-
$loader->unregister();
18-
$apcLoader->register(true);
19-
*/
20-
2111
$kernel = new AppKernel('prod', false);
2212
$kernel->loadClassCache();
2313
//$kernel = new AppCache($kernel);

0 commit comments

Comments
 (0)