Merge branch '2.3' into 2.6

* 2.3:
  renamed some confusing tests
  [2.3] Fix @link annotations
  Fix javascript
  [2.3][Translation] test refresh cache when resources File change.
  [Translator] Cache does not take fallback locales into consideration

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
	src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php

Author: fabpot

Tests/Translation/TranslatorTest.php

@@ -12,6 +12,7 @@
 namespace Symfony\Bundle\FrameworkBundle\Tests\Translation;
 
 use Symfony\Bundle\FrameworkBundle\Translation\Translator;
+use Symfony\Component\Translation\Loader\ArrayLoader;
 use Symfony\Component\Translation\MessageCatalogue;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Translation\MessageSelector;
@@ -77,6 +78,8 @@ public function testTransWithCaching()
 
         // do it another time as the cache is primed now
         $loader = $this->getMock('Symfony\Component\Translation\Loader\LoaderInterface');
+        $loader->expects($this->never())->method('load');
+
         $translator = $this->getTranslator($loader, array('cache_dir' => $this->tmpDir));
         $translator->setLocale('fr');
         $translator->setFallbackLocales(array('en', 'es', 'pt-PT', 'pt_BR', 'fr.UTF-8', 'sr@latin'));
@@ -90,6 +93,27 @@ public function testTransWithCaching()
         $this->assertEquals('other choice 1 (PT-BR)', $translator->transChoice('other choice', 1));
         $this->assertEquals('foobarbaz (fr.UTF-8)', $translator->trans('foobarbaz'));
         $this->assertEquals('foobarbax (sr@latin)', $translator->trans('foobarbax'));
+
+        // refresh cache again when resource file resources file change
+        $resource = $this->getMock('Symfony\Component\Config\Resource\ResourceInterface');
+        $resource
+            ->expects($this->at(0))
+            ->method('isFresh')
+            ->will($this->returnValue(false))
+        ;
+        $catalogue = $this->getCatalogue('fr', array('foo' => 'foo fresh'));
+        $catalogue->addResource($resource);
+
+        $loader = $this->getMock('Symfony\Component\Translation\Loader\LoaderInterface');
+        $loader
+            ->expects($this->at(0))
+            ->method('load')
+            ->will($this->returnValue($catalogue))
+        ;
+
+        $translator = $this->getTranslator($loader, array('cache_dir' => $this->tmpDir));
+        $translator->setLocale('fr');
+        $this->assertEquals('foo fresh', $translator->trans('foo'));
     }
 
     public function testTransWithCachingWithInvalidLocale()
@@ -184,12 +208,7 @@ protected function getContainer($loader)
 
     public function getTranslator($loader, $options = array(), $translatorClass = '\Symfony\Bundle\FrameworkBundle\Translation\Translator')
     {
-        $translator = new $translatorClass(
-            $this->getContainer($loader),
-            new MessageSelector(),
-            array('loader' => array('loader')),
-            $options
-        );
+        $translator = $this->createTranslator($loader, $options, $translatorClass);
 
         $translator->addResource('loader', 'foo', 'fr');
         $translator->addResource('loader', 'foo', 'en');
@@ -201,6 +220,18 @@ public function getTranslator($loader, $options = array(), $translatorClass = '\
 
         return $translator;
     }
+
+    private function createTranslator($loader, $options, $translatorClass = '\Symfony\Bundle\FrameworkBundle\Translation\Translator')
+    {
+        $translator = new $translatorClass(
+            $this->getContainer($loader),
+            new MessageSelector(),
+            array('loader' => array('loader')),
+            $options
+        );
+
+        return $translator;
+    }
 }
 
 class TranslatorWithInvalidLocale extends Translator