From f51985ec5b15cdac933491142eca5d27bec244a1 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Mon, 6 Jun 2016 19:06:23 +0200
Subject: php-symfony: switch to 2.8 spec

---
 composer.json | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

(limited to 'composer.json')

diff --git a/composer.json b/composer.json
index 0b3d836..ee035f2 100644
--- a/composer.json
+++ b/composer.json
@@ -18,11 +18,17 @@
     "require": {
         "php": ">=5.3.9",
         "doctrine/common": "~2.4",
-        "paragonie/random_compat": "~1.0",
-        "symfony/polyfill-apcu": "~1.1",
-        "symfony/polyfill-mbstring": "~1.1",
         "twig/twig": "~1.23|~2.0",
-        "psr/log": "~1.0"
+        "psr/log": "~1.0",
+        "symfony/security-acl": "~2.7|~3.0.0",
+        "symfony/polyfill-apcu": "~1.1",
+        "symfony/polyfill-intl-icu": "~1.0",
+        "symfony/polyfill-mbstring": "~1.0",
+        "symfony/polyfill-php54": "~1.0",
+        "symfony/polyfill-php55": "~1.0",
+        "symfony/polyfill-php56": "~1.0",
+        "symfony/polyfill-php70": "~1.0",
+        "symfony/polyfill-util": "~1.0"
     },
     "replace": {
         "symfony/asset": "self.version",
@@ -45,17 +51,19 @@
         "symfony/http-foundation": "self.version",
         "symfony/http-kernel": "self.version",
         "symfony/intl": "self.version",
+        "symfony/ldap": "self.version",
         "symfony/locale": "self.version",
         "symfony/monolog-bridge": "self.version",
         "symfony/options-resolver": "self.version",
         "symfony/process": "self.version",
         "symfony/property-access": "self.version",
+        "symfony/property-info": "self.version",
         "symfony/proxy-manager-bridge": "self.version",
         "symfony/routing": "self.version",
         "symfony/security": "self.version",
-        "symfony/security-acl": "self.version",
         "symfony/security-core": "self.version",
         "symfony/security-csrf": "self.version",
+        "symfony/security-guard": "self.version",
         "symfony/security-http": "self.version",
         "symfony/security-bundle": "self.version",
         "symfony/serializer": "self.version",
@@ -76,9 +84,12 @@
         "doctrine/orm": "~2.4,>=2.4.5",
         "doctrine/doctrine-bundle": "~1.2",
         "monolog/monolog": "~1.11",
-        "ircmaxell/password-compat": "~1.0",
         "ocramius/proxy-manager": "~0.4|~1.0|~2.0",
-        "egulias/email-validator": "~1.2"
+        "egulias/email-validator": "~1.2",
+        "phpdocumentor/reflection": "^1.0.7"
+    },
+    "conflict": {
+        "phpdocumentor/reflection": "<1.0.7"
     },
     "autoload": {
         "psr-4": {
@@ -91,10 +102,8 @@
             "Symfony\\Component\\": "src/Symfony/Component/"
         },
         "classmap": [
-            "src/Symfony/Component/HttpFoundation/Resources/stubs",
             "src/Symfony/Component/Intl/Resources/stubs"
         ],
-        "files": [ "src/Symfony/Component/Intl/Resources/stubs/functions.php" ],
         "exclude-from-classmap": [
             "**/Tests/"
         ]
@@ -107,7 +116,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "2.7-dev"
+            "dev-master": "2.8-dev"
         }
     }
 }
-- 
cgit