Merge branch '2.8'

Conflicts:
	composer.json
	src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.xml
	src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
	src/Symfony/Bundle/FrameworkBundle/Resources/config/security_csrf.xml
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Component/DependencyInjection/ContainerBuilder.php
	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/Translation/PluralizationRules.php
	src/Symfony/Component/VarDumper/Exception/ThrowingCasterException.php

1 files changed, 63 insertions, 0 deletions

diff --git a/Tests/TranslationSyncStatusTest.php b/Tests/TranslationSyncStatusTest.php
new file mode 100644
index 0000000..4b72d41
--- /dev/null
+++ b/Tests/TranslationSyncStatusTest.php
@@ -0,0 +1,63 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Security\Tests;
+
+use Symfony\Component\Finder\Finder;
+
+class TranslationSyncStatusTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider getTranslationDirectoriesData
+     */
+    public function testTranslationFileIsNotMissingInCore($dir1, $dir2)
+    {
+        $finder = new Finder();
+        $files = $finder->in($dir1)->files();
+
+        foreach ($files as $file) {
+            $this->assertFileExists($dir2.'/'.$file->getFilename(), 'Missing file '.$file->getFilename().' in directory '.$dir2);
+        }
+    }
+
+    public function getTranslationDirectoriesData()
+    {
+        $legacyTranslationsDir = $this->getLegacyTranslationsDirectory();
+        $coreTranslationsDir = $this->getCoreTranslationsDirectory();
+
+        return array(
+            'file-not-missing-in-core' => array($legacyTranslationsDir, $coreTranslationsDir),
+            'file-not-added-in-core' => array($coreTranslationsDir, $legacyTranslationsDir),
+        );
+    }
+
+    public function testFileContentsAreEqual()
+    {
+        $finder = new Finder();
+        $files = $finder->in($this->getLegacyTranslationsDirectory())->files();
+
+        foreach ($files as $file) {
+            $coreFile = $this->getCoreTranslationsDirectory().'/'.$file->getFilename();
+
+            $this->assertFileEquals($file->getRealPath(), $coreFile, $file.' and '.$coreFile.' have equal content.');
+        }
+    }
+
+    private function getLegacyTranslationsDirectory()
+    {
+        return __DIR__.'/../Resources/translations';
+    }
+
+    private function getCoreTranslationsDirectory()
+    {
+        return __DIR__.'/../Core/Resources/translations';
+    }
+}