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

Commit 6f4ec30

Browse files
committed
Merge branch '2.3' into 2.7
* 2.3: Documentation link changed 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 a9f7ed4 + e825714 commit 6f4ec30

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

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.7.*",
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": {

web/app_dev.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
use Symfony\Component\Debug\Debug;
55

66
// If you don't want to setup permissions the proper way, just uncomment the following PHP line
7-
// read http://symfony.com/doc/current/book/installation.html#configuration-and-setup for more information
7+
// read http://symfony.com/doc/current/book/installation.html#checking-symfony-application-configuration-and-setup
8+
// for more information
89
//umask(0000);
910

1011
// This check prevents access to debug front controllers that are deployed by accident to production servers.

0 commit comments

Comments
 (0)