From 75b29ffdfed36d1713c1ae2a38619580648445e2 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 8 Mar 2011 20:47:32 +0100 Subject: [PATCH] [Translation] moved most protected methods and properties to private --- .../Translation/IdentityTranslator.php | 2 +- src/Symfony/Component/Translation/Interval.php | 2 +- .../Translation/Loader/ArrayLoader.php | 2 +- .../Translation/Loader/XliffFileLoader.php | 4 ++-- .../Component/Translation/MessageCatalogue.php | 6 +++--- .../Translation/PluralizationRules.php | 2 +- .../Component/Translation/Translator.php | 17 ++++++++--------- 7 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/Symfony/Component/Translation/IdentityTranslator.php b/src/Symfony/Component/Translation/IdentityTranslator.php index f15a501f1f..a8f72d746a 100644 --- a/src/Symfony/Component/Translation/IdentityTranslator.php +++ b/src/Symfony/Component/Translation/IdentityTranslator.php @@ -18,7 +18,7 @@ namespace Symfony\Component\Translation; */ class IdentityTranslator implements TranslatorInterface { - protected $selector; + private $selector; /** * Constructor. diff --git a/src/Symfony/Component/Translation/Interval.php b/src/Symfony/Component/Translation/Interval.php index 98a4255614..63c89c5605 100644 --- a/src/Symfony/Component/Translation/Interval.php +++ b/src/Symfony/Component/Translation/Interval.php @@ -90,7 +90,7 @@ class Interval EOF; } - static protected function convertNumber($number) + static private function convertNumber($number) { if ('-Inf' === $number) { return log(0); diff --git a/src/Symfony/Component/Translation/Loader/ArrayLoader.php b/src/Symfony/Component/Translation/Loader/ArrayLoader.php index 0ca9895f62..ed88828a02 100644 --- a/src/Symfony/Component/Translation/Loader/ArrayLoader.php +++ b/src/Symfony/Component/Translation/Loader/ArrayLoader.php @@ -46,7 +46,7 @@ class ArrayLoader implements LoaderInterface * @param array $subnode current subnode being parsed, used internally for recursive calls * @param string $path current path being parsed, used internally for recursive calls */ - protected function flatten(array &$messages, array $subnode = null, $path = null) + private function flatten(array &$messages, array $subnode = null, $path = null) { if (null === $subnode) { $subnode =& $messages; diff --git a/src/Symfony/Component/Translation/Loader/XliffFileLoader.php b/src/Symfony/Component/Translation/Loader/XliffFileLoader.php index 93b7e2c9bb..48d2fdf403 100644 --- a/src/Symfony/Component/Translation/Loader/XliffFileLoader.php +++ b/src/Symfony/Component/Translation/Loader/XliffFileLoader.php @@ -44,7 +44,7 @@ class XliffFileLoader implements LoaderInterface * @param string $file * @return SimpleXMLElement */ - protected function parseFile($file) + private function parseFile($file) { $dom = new \DOMDocument(); $current = libxml_use_internal_errors(true); @@ -74,7 +74,7 @@ class XliffFileLoader implements LoaderInterface * * @return array An array of errors */ - protected function getXmlErrors() + private function getXmlErrors() { $errors = array(); foreach (libxml_get_errors() as $error) { diff --git a/src/Symfony/Component/Translation/MessageCatalogue.php b/src/Symfony/Component/Translation/MessageCatalogue.php index 17765782b7..e2436f175b 100644 --- a/src/Symfony/Component/Translation/MessageCatalogue.php +++ b/src/Symfony/Component/Translation/MessageCatalogue.php @@ -20,9 +20,9 @@ use Symfony\Component\Config\Resource\ResourceInterface; */ class MessageCatalogue implements MessageCatalogueInterface { - protected $messages = array(); - protected $locale; - protected $resources; + private $messages = array(); + private $locale; + private $resources; /** * Constructor. diff --git a/src/Symfony/Component/Translation/PluralizationRules.php b/src/Symfony/Component/Translation/PluralizationRules.php index 2f793e13b1..fe5628c4a0 100644 --- a/src/Symfony/Component/Translation/PluralizationRules.php +++ b/src/Symfony/Component/Translation/PluralizationRules.php @@ -19,7 +19,7 @@ namespace Symfony\Component\Translation; class PluralizationRules { // @codeCoverageIgnoreStart - static protected $rules = array(); + static private $rules = array(); /** * Returns the plural position to use for the given locale and number. diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php index e2f3dda678..5f0091e258 100644 --- a/src/Symfony/Component/Translation/Translator.php +++ b/src/Symfony/Component/Translation/Translator.php @@ -20,12 +20,12 @@ use Symfony\Component\Translation\Loader\LoaderInterface; */ class Translator implements TranslatorInterface { - protected $catalogues; - protected $locale; - protected $fallbackLocale; - protected $loaders; - protected $resources; - protected $selector; + private $catalogues; + private $locale; + private $fallbackLocale; + private $loaders; + private $resources; + private $selector; /** * Constructor. @@ -131,12 +131,11 @@ class Translator implements TranslatorInterface return strtr($this->selector->choose($this->catalogues[$locale]->get($id, $domain), (int) $number, $locale), $parameters); } - protected function loadCatalogue($locale) + private function loadCatalogue($locale) { $this->catalogues[$locale] = new MessageCatalogue($locale); if (isset($this->resources[$locale])) { - foreach ($this->resources[$locale] as $resource) { if (!isset($this->loaders[$resource[0]])) { throw new \RuntimeException(sprintf('The "%s" translation loader is not registered.', $resource[0])); @@ -148,7 +147,7 @@ class Translator implements TranslatorInterface $this->optimizeCatalogue($locale); } - protected function optimizeCatalogue($locale) + private function optimizeCatalogue($locale) { if (strlen($locale) > 3) { $fallback = substr($locale, 0, -strlen(strrchr($locale, '_')));