Merge branch '2.7'

* 2.7:
  [PhpUnitBridge] new bridge for testing with PHPUnit
  [FrameworkBundle] Check if templating is enabled.
  [Filesystem] Improve exception message for copy method
  [FrameworkBundle] Made ServerParams a service
  [2.7] [FrameworkBundle] bugfix in configuration for assets
  [FrameworkBundle] Enable assets by default.
  [Form] OptionsResolver 3.0 is not BC anymore
  [TwigBundle] add missing asset dependency
  Add an auto_alias compiler pass

Conflicts:
	.travis.yml
	composer.json
	src/Symfony/Bridge/Doctrine/composer.json
	src/Symfony/Bridge/Monolog/composer.json
	src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
	src/Symfony/Bridge/ProxyManager/composer.json
	src/Symfony/Bridge/Swiftmailer/composer.json
	src/Symfony/Bridge/Twig/composer.json
	src/Symfony/Bundle/DebugBundle/composer.json
	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Bundle/SecurityBundle/composer.json
	src/Symfony/Bundle/TwigBundle/composer.json
	src/Symfony/Bundle/WebProfilerBundle/composer.json
	src/Symfony/Component/BrowserKit/composer.json
	src/Symfony/Component/ClassLoader/composer.json
	src/Symfony/Component/Console/composer.json
	src/Symfony/Component/Debug/composer.json
	src/Symfony/Component/DependencyInjection/composer.json
	src/Symfony/Component/DomCrawler/composer.json
	src/Symfony/Component/EventDispatcher/composer.json
	src/Symfony/Component/Form/composer.json
	src/Symfony/Component/HttpFoundation/composer.json
	src/Symfony/Component/HttpKernel/composer.json
	src/Symfony/Component/Intl/composer.json
	src/Symfony/Component/Routing/composer.json
	src/Symfony/Component/Security/Core/composer.json
	src/Symfony/Component/Security/Csrf/composer.json
	src/Symfony/Component/Security/Http/composer.json
	src/Symfony/Component/Security/composer.json
	src/Symfony/Component/Serializer/composer.json
	src/Symfony/Component/Translation/composer.json
	src/Symfony/Component/Validator/composer.json

10 files changed, 12 insertions, 17 deletions

diff --git a/Acl/composer.json b/Acl/composer.json
index 3a1e904..ecb981f 100644
--- a/Acl/composer.json
+++ b/Acl/composer.json
@@ -20,6 +20,7 @@
         "symfony/security-core": "~2.7|~3.0"
     },
     "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0",
         "doctrine/common": "~2.2",
         "doctrine/dbal": "~2.2",
         "psr/log": "~1.0"
diff --git a/Acl/phpunit.xml.dist b/Acl/phpunit.xml.dist
index 20d1b80..7552339 100644
--- a/Acl/phpunit.xml.dist
+++ b/Acl/phpunit.xml.dist
@@ -12,9 +12,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
 
     <testsuites>
diff --git a/Core/composer.json b/Core/composer.json
index 018f72a..b675d3a 100644
--- a/Core/composer.json
+++ b/Core/composer.json
@@ -19,6 +19,7 @@
         "php": ">=5.5.9"
     },
     "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0",
         "symfony/event-dispatcher": "~2.7|~3.0",
         "symfony/expression-language": "~2.7|~3.0",
         "symfony/http-foundation": "~2.7|~3.0",
diff --git a/Core/phpunit.xml.dist b/Core/phpunit.xml.dist
index 7a5f7da..8a1a291 100644
--- a/Core/phpunit.xml.dist
+++ b/Core/phpunit.xml.dist
@@ -12,9 +12,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
 
     <testsuites>
diff --git a/Csrf/composer.json b/Csrf/composer.json
index 58bef11..ee6a39c 100644
--- a/Csrf/composer.json
+++ b/Csrf/composer.json
@@ -16,10 +16,11 @@
         }
     ],
     "require": {
-        "php": ">=5.3.9",
-        "symfony/security-core": "~2.4|~3.0.0"
+        "php": ">=5.5.9",
+        "symfony/security-core": "~2.7|~3.0"
     },
     "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0",
         "symfony/http-foundation": "~2.7|~3.0"
     },
     "suggest": {
diff --git a/Csrf/phpunit.xml.dist b/Csrf/phpunit.xml.dist
index f6e9005..8f950a3 100644
--- a/Csrf/phpunit.xml.dist
+++ b/Csrf/phpunit.xml.dist
@@ -12,9 +12,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
 
     <testsuites>
diff --git a/Http/composer.json b/Http/composer.json
index a5cccca..97c4a07 100644
--- a/Http/composer.json
+++ b/Http/composer.json
@@ -23,6 +23,7 @@
         "symfony/http-kernel": "~2.7|~3.0"
     },
     "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0",
         "symfony/routing": "~2.7|~3.0",
         "symfony/security-csrf": "~2.7|~3.0",
         "psr/log": "~1.0"
diff --git a/Http/phpunit.xml.dist b/Http/phpunit.xml.dist
index 58fe58e..49b36f2 100644
--- a/Http/phpunit.xml.dist
+++ b/Http/phpunit.xml.dist
@@ -12,9 +12,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
 
     <testsuites>
diff --git a/composer.json b/composer.json
index a2ca38a..1129de4 100644
--- a/composer.json
+++ b/composer.json
@@ -28,6 +28,7 @@
         "symfony/security-http": "self.version"
     },
     "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0",
         "symfony/intl": "~2.7|~3.0",
         "symfony/routing": "~2.7|~3.0",
         "symfony/translation": "~2.7|~3.0",
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 7cbf08a..7747b37 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -7,9 +7,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
 
     <testsuites>