symfony
diff --git a/‎UPGRADE-3.0.md
Copy file name to clipboardExpand all lines: UPGRADE-3.0.md
+35Lines changed: 35 additions & 0 deletions b/‎UPGRADE-3.0.md
Copy file name to clipboardExpand all lines: UPGRADE-3.0.md
+35Lines changed: 35 additions & 0 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
+5-4Lines changed: 5 additions & 4 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
+5-4Lines changed: 5 additions & 4 deletions
diff --git a/‎src/Symfony/Component/Translation/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/CHANGELOG.md
+5Lines changed: 5 additions & 0 deletions b/‎src/Symfony/Component/Translation/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/CHANGELOG.md
+5Lines changed: 5 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Translation/Translator.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/Translator.php
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Translation/Translator.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/Translator.php
+1-1Lines changed: 1 addition & 1 deletion
@@ -604,6 +604,41 @@ UPGRADE FROM 2.x to 3.0
  * The `Translator::setFallbackLocale()` method has been removed in favor of
    `Translator::setFallbackLocales()`.
 
+ * The visibility of the `locale` property has been changed from protected to private. Rely on `getLocale` and `setLocale`
+   instead.
+
+   Before:
+
+   ```php
+    class CustomTranslator extends Translator
+    {
+        public function fooMethod()
+        {
+           // get locale
+           $locale = $this->locale;
+
+           // update locale
+           $this->locale = $locale;
+        }
+    }
+   ```
+
+   After:
+
+   ```php
+    class CustomTranslator extends Translator
+    {
+        public function fooMethod()
+        {
+           // get locale
+           $locale = $this->getLocale();
+
+           // update locale
+           $this->setLocale($locale);
+       }
+    }
+   ```
+
 ### Twig Bridge
 
  * The `twig:lint` command has been deprecated since Symfony 2.7 and will be
 
@@ -94,13 +94,14 @@ public function testTransWithCaching()
         $this->assertEquals('foobarbax (sr@latin)', $translator->trans('foobarbax'));
     }
 
+    /**
+     * @expectedException \InvalidArgumentException
+     */
     public function testTransWithCachingWithInvalidLocale()
     {
         $loader = $this->getMock('Symfony\Component\Translation\Loader\LoaderInterface');
         $translator = $this->getTranslator($loader, array('cache_dir' => $this->tmpDir), 'loader', '\Symfony\Bundle\FrameworkBundle\Tests\Translation\TranslatorWithInvalidLocale');
-        $translator->setLocale('invalid locale');
 
-        $this->setExpectedException('\InvalidArgumentException');
         $translator->trans('foo');
     }
 
@@ -302,8 +303,8 @@ class TranslatorWithInvalidLocale extends Translator
     /**
      * {@inheritdoc}
      */
-    public function setLocale($locale)
+    public function getLocale()
     {
-        $this->locale = $locale;
+        return 'invalid locale';
     }
 }
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+3.0.0
+-----
+
+ * Changed the visibility of the locale property in `Translator` from protected to private.
+
 2.8.0
 -----
 
 
@@ -34,7 +34,7 @@ class Translator implements TranslatorInterface, TranslatorBagInterface
     /**
      * @var string
      */
-    protected $locale;
+    private $locale;
 
     /**
      * @var array
Original file line number	Diff line number	Diff line change
`@@ -94,13 +94,14 @@ public function testTransWithCaching()`
`94`	`94`	`$this->assertEquals('foobarbax (sr@latin)', $translator->trans('foobarbax'));`
`95`	`95`	`}`
`96`	`96`
	`97`	`+ /**`
	`98`	`+ * @expectedException \InvalidArgumentException`
	`99`	`+ */`
`97`	`100`	`public function testTransWithCachingWithInvalidLocale()`
`98`	`101`	`{`
`99`	`102`	`$loader = $this->getMock('Symfony\Component\Translation\Loader\LoaderInterface');`
`100`	`103`	`$translator = $this->getTranslator($loader, array('cache_dir' => $this->tmpDir), 'loader', '\Symfony\Bundle\FrameworkBundle\Tests\Translation\TranslatorWithInvalidLocale');`
`101`		`- $translator->setLocale('invalid locale');`
`102`	`104`
`103`		`- $this->setExpectedException('\InvalidArgumentException');`
`104`	`105`	`$translator->trans('foo');`
`105`	`106`	`}`
`106`	`107`
`@@ -302,8 +303,8 @@ class TranslatorWithInvalidLocale extends Translator`
`302`	`303`	`/**`
`303`	`304`	`* {@inheritdoc}`
`304`	`305`	`*/`
`305`		`- public function setLocale($locale)`
	`306`	`+ public function getLocale()`
`306`	`307`	`{`
`307`		`- $this->locale = $locale;`
	`308`	`+ return 'invalid locale';`
`308`	`309`	`}`
`309`	`310`	`}`