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

Commit c5c6f23

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: updated VENDORS for 2.7.4 Documentation link changed updated VENDORS for 2.7.3 allow semantic twig extension versions orm 2.2 and 2.3 are end of life Update ORM requirements to allow DBAL 2.5 again
2 parents b79913b + dfc8945 commit c5c6f23

File tree

5 files changed

+255
-116
lines changed

5 files changed

+255
-116
lines changed

app/SymfonyRequirements.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,7 @@ function_exists('posix_isatty'),
638638
}
639639

640640
$this->addRecommendation(
641-
class_exists('Locale'),
641+
extension_loaded('intl'),
642642
'intl extension should be available',
643643
'Install and enable the <strong>intl</strong> extension (used for validators).'
644644
);

app/check.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242
}
4343

4444
if ($checkPassed) {
45-
echo_block('success', 'OK', 'Your system is ready to run Symfony2 projects', true);
45+
echo_block('success', 'OK', 'Your system is ready to run Symfony2 projects');
4646
} else {
47-
echo_block('error', 'ERROR', 'Your system is not ready to run Symfony2 projects', true);
47+
echo_block('error', 'ERROR', 'Your system is not ready to run Symfony2 projects');
4848

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

@@ -80,7 +80,7 @@ function get_error_message(Requirement $requirement, $lineSize)
8080
return;
8181
}
8282

83-
$errorMessage = wordwrap($requirement->getTestMessage(), $lineSize - 3, PHP_EOL.' ').PHP_EOL;
83+
$errorMessage = wordwrap($requirement->getTestMessage(), $lineSize - 3, PHP_EOL.' ').PHP_EOL;
8484
$errorMessage .= ' > '.wordwrap($requirement->getHelpText(), $lineSize - 5, PHP_EOL.' > ').PHP_EOL;
8585

8686
return $errorMessage;
@@ -121,8 +121,8 @@ function echo_block($style, $title, $message)
121121
echo PHP_EOL.PHP_EOL;
122122

123123
echo_style($style, str_repeat(' ', $width).PHP_EOL);
124-
echo_style($style, str_pad(' ['.$title.']', $width, ' ', STR_PAD_RIGHT).PHP_EOL);
125-
echo_style($style, str_pad($message, $width, ' ', STR_PAD_RIGHT).PHP_EOL);
124+
echo_style($style, str_pad(' ['.$title.']', $width, ' ', STR_PAD_RIGHT).PHP_EOL);
125+
echo_style($style, str_pad($message, $width, ' ', STR_PAD_RIGHT).PHP_EOL);
126126
echo_style($style, str_repeat(' ', $width).PHP_EOL);
127127
}
128128

composer.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,13 @@
99
"require": {
1010
"php": ">=5.3.9",
1111
"symfony/symfony": "2.8.x-dev",
12-
"doctrine/orm": "~2.2,>=2.2.3,<2.5",
13-
"doctrine/dbal": "<2.5",
12+
"doctrine/orm": "^2.4.8",
1413
"doctrine/doctrine-bundle": "~1.4",
1514
"symfony/assetic-bundle": "~2.3",
1615
"symfony/swiftmailer-bundle": "~2.3",
1716
"symfony/monolog-bundle": "~2.4",
1817
"sensio/distribution-bundle": "~4.0",
19-
"sensio/framework-extra-bundle": "~3.0,>=3.0.2",
18+
"sensio/framework-extra-bundle": "^3.0.2",
2019
"incenteev/composer-parameter-handler": "~2.0"
2120
},
2221
"require-dev": {

0 commit comments

Comments
 (0)