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

Commit 69dddda

Browse files
committed
Merge branch '3.1'
* 3.1: updated VENDORS for 3.1.2 updated VENDORS for 3.0.8 updated VENDORS for 2.8.8 updated VENDORS for 2.7.15 updated VENDORS for 3.1.1 updated VENDORS for 3.0.7 updated VENDORS for 2.8.7 updated VENDORS for 2.7.14 updated VENDORS for 3.1.0 moved Symfony 3.1 to stable in composer.json updated VENDORS for 3.1.0-RC1 Default system cache is APCu updated VENDORS for 3.1.0-BETA1 updated VENDORS for 3.0.6 updated VENDORS for 2.8.6 updated VENDORS for 2.7.13 updated VENDORS for 2.7.12
2 parents a6df927 + eb3f260 commit 69dddda

File tree

5 files changed

+147
-130
lines changed

5 files changed

+147
-130
lines changed

app/config/config_prod.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
imports:
22
- { resource: config.yml }
33

4-
#framework:
5-
# cache:
6-
# system: cache.adapter.apcu
7-
84
#doctrine:
95
# orm:
106
# metadata_cache_driver: apc

bin/symfony_requirements

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ echo '> PHP is using the following php.ini file:'.PHP_EOL;
1313
if ($iniPath) {
1414
echo_style('green', ' '.$iniPath);
1515
} else {
16-
echo_style('warning', ' WARNING: No configuration file (php.ini) used by PHP!');
16+
echo_style('yellow', ' WARNING: No configuration file (php.ini) used by PHP!');
1717
}
1818

1919
echo PHP_EOL.PHP_EOL;

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@
1212
},
1313
"require": {
1414
"php": ">=5.5.9",
15-
"symfony/symfony": "3.1.*@dev",
15+
"symfony/symfony": "3.1.*",
1616
"doctrine/orm": "^2.5",
1717
"doctrine/doctrine-bundle": "^1.6",
1818
"doctrine/doctrine-cache-bundle": "^1.2",
1919
"symfony/swiftmailer-bundle": "^2.3",
2020
"symfony/monolog-bundle": "^2.8",
21+
"symfony/polyfill-apcu": "^1.0",
2122
"sensio/distribution-bundle": "^5.0",
2223
"sensio/framework-extra-bundle": "^3.0.2",
2324
"incenteev/composer-parameter-handler": "^2.0"

0 commit comments

Comments
 (0)