[Intl] Renamed NoSuchEntryException to MissingResourceException

symfony · webmozart · Oct 2, 2013 · Oct 2, 2013 · Oct 2, 2013 · Oct 2, 2013
commit 42f123821c742949223a7a02c3f3d1f0dd8731b1
diff --git a/UPGRADE-2.4.md b/UPGRADE-2.4.md
@@ -17,7 +17,7 @@ Intl

 * The methods in the various resource bundles of the `Intl` class used to
   return `null` when invalid arguments were given. These methods throw a
-   `NoSuchEntryException` now.
+   `MissingResourceException` now.

   Before:

@@ -39,7 +39,7 @@ Intl

   ```
   use Symfony\Component\Intl\Intl;
-   use Symfony\Component\Intl\Exception\NoSuchEntryException;
+   use Symfony\Component\Intl\Exception\MissingResourceException;
   use Symfony\Component\Intl\Exception\NoSuchLocaleException;

   try {
@@ -48,7 +48,7 @@ Intl

       // invalid locale
       $language = Intl::getLanguageBundle()->getLanguageName('de', null, 'foo');
-   } catch (NoSuchEntryException $e) {
+   } catch (MissingResourceException $e) {
       if ($e->getPrevious() instanceof NoSuchLocaleException) {
           // locale was invalid...
       } else {

diff --git a/src/Symfony/Component/Intl/CHANGELOG.md b/src/Symfony/Component/Intl/CHANGELOG.md
@@ -4,7 +4,7 @@ CHANGELOG
 2.4.0
 -----

- * [BC BREAK] the various Intl methods now throw a `NoSuchEntryException`
+ * [BC BREAK] the various Intl methods now throw a `MissingResourceException`
   whenever a non-existing locale, language, currency, etc. is accessed
 * the available locales of each resource bundle are now stored in a generic
   "misc.res" file in order to improve reading performance

diff --git a/src/Symfony/Component/Intl/Currency.php b/src/Symfony/Component/Intl/Currency.php
@@ -65,8 +65,7 @@ public static function getCurrencies()
     *
     * @return string The currency symbol for the specified locale
     *
-     * @throws Exception\InvalidArgumentException If the currency or the locale
-     *                                            is invalid
+     * @throws InvalidArgumentException If the currency or the locale is invalid
     *
     * @api
     */
@@ -84,11 +83,7 @@ public static function getSymbol($currency, $displayLocale = null)
            $displayLocale = \Locale::getDefault();
        }

-        try {
-            return self::getDataProvider()->getSymbol($currency, $displayLocale);
-        } catch (NoSuchEntryException $e) {
-            return $currency;
-        }
+        return self::getDataProvider()->getSymbol($currency, $displayLocale);
    }

    /**
@@ -106,8 +101,7 @@ public static function getSymbol($currency, $displayLocale = null)
     *
     * @return string The name of the currency
     *
-     * @throws Exception\InvalidArgumentException If the currency or the locale
-     *                                            is invalid
+     * @throws InvalidArgumentException If the currency or the locale is invalid
     *
     * @api
     */
@@ -125,11 +119,7 @@ public static function getName($currency, $displayLocale = null)
            $displayLocale = \Locale::getDefault();
        }

-        try {
-            return self::getDataProvider()->getName($currency, $displayLocale);
-        } catch (NoSuchEntryException $e) {
-            return $currency;
-        }
+        return self::getDataProvider()->getName($currency, $displayLocale);
    }

    /**
@@ -145,7 +135,7 @@ public static function getName($currency, $displayLocale = null)
     *
     * @return string[] An array of currency names indexed by currency codes
     *
-     * @throws Exception\InvalidArgumentException If the locale is invalid
+     * @throws InvalidArgumentException If the locale is invalid
     *
     * @api
     */
@@ -172,7 +162,7 @@ public static function getNames($displayLocale = null)
     *
     * @return integer The number of digits after the comma
     *
-     * @throws Exception\InvalidArgumentException If the currency is invalid
+     * @throws InvalidArgumentException If the currency is invalid
     *
     * @api
     */
@@ -196,7 +186,7 @@ public static function getFractionDigits($currency)
     *
     * @return integer The rounding increment
     *
-     * @throws Exception\InvalidArgumentException If the currency is invalid
+     * @throws InvalidArgumentException If the currency is invalid
     *
     * @api
     */
@@ -219,7 +209,7 @@ public static function getRoundingIncrement($currency)
     *
     * @return integer The numeric code
     *
-     * @throws Exception\InvalidArgumentException If the currency is invalid
+     * @throws InvalidArgumentException If the currency is invalid
     *
     * @api
     */

diff --git a/...t/Intl/Exception/NoSuchEntryException.php → ...tl/Exception/MissingResourceException.php b/...t/Intl/Exception/NoSuchEntryException.php → ...tl/Exception/MissingResourceException.php
@@ -16,6 +16,6 @@
 *
 * @author Bernhard Schussek <bschussek@gmail.com>
 */
-class NoSuchEntryException extends RuntimeException
+class MissingResourceException extends RuntimeException
 {
 }
diff --git a/src/Symfony/Component/Intl/Language.php b/src/Symfony/Component/Intl/Language.php
@@ -13,7 +13,6 @@

 use Symfony\Component\Icu\LanguageDataProvider;
 use Symfony\Component\Intl\Exception\InvalidArgumentException;
-use Symfony\Component\Intl\Exception\NoSuchEntryException;

 /**
 * Provides access to language-related data.
@@ -193,11 +192,7 @@ public static function getName($language, $displayLocale = null)
            $displayLocale = \Locale::getDefault();
        }

-        try {
-            return self::getDataProvider()->getName($language, $displayLocale);
-        } catch (NoSuchEntryException $e) {
-            return $language;
-        }
+        return self::getDataProvider()->getName($language, $displayLocale);
    }

    /**
@@ -238,7 +233,9 @@ public static function getNames($displayLocale = null)
     *
     * @return string The ISO 639-2 three-letter code of the language
     *
-     * @throws InvalidArgumentException If the language is invalid
+     * @throws Exception\InvalidArgumentException If the language is invalid
+     * @throws Exception\MissingResourceException If the language has no
+     *                                            corresponding three-letter code
     *
     * @api
     */
@@ -248,7 +245,7 @@ public static function getAlpha3Code($language)
            throw new InvalidArgumentException('The language "' . $language . '" does not exist.');
        }

-        return self::getDataProvider->getAlpha3Code($language);
+        return self::getDataProvider()->getAlpha3Code($language);
    }

    /**

diff --git a/src/Symfony/Component/Intl/Locale.php b/src/Symfony/Component/Intl/Locale.php
@@ -13,7 +13,6 @@

 use Symfony\Component\Icu\LocaleDataProvider;
 use Symfony\Component\Intl\Exception\InvalidArgumentException;
-use Symfony\Component\Intl\Exception\NoSuchEntryException;

 /**
 * Provides access to locale-related data.

diff --git a/src/Symfony/Component/Intl/ResourceBundle/LanguageBundle.php b/src/Symfony/Component/Intl/ResourceBundle/LanguageBundle.php
@@ -12,7 +12,7 @@
 namespace Symfony\Component\Intl\ResourceBundle;

 use Symfony\Component\Icu\LanguageDataProvider;
-use Symfony\Component\Intl\Exception\NoSuchEntryException;
+use Symfony\Component\Intl\Exception\MissingResourceException;
 use Symfony\Component\Intl\Locale;
 use Symfony\Component\Intl\ResourceBundle\Reader\BundleEntryReaderInterface;

@@ -67,7 +67,7 @@ public function getLanguageName($lang, $region = null, $locale = null)
        if (null !== $region) {
            try {
                return $this->languageDataProvider->getName($lang.'_'.$region, $locale);
-            } catch (NoSuchEntryException $e) {
+            } catch (MissingResourceException $e) {
            }
        }


diff --git a/src/Symfony/Component/Intl/ResourceBundle/Reader/BundleEntryReader.php b/src/Symfony/Component/Intl/ResourceBundle/Reader/BundleEntryReader.php
@@ -12,7 +12,7 @@
 namespace Symfony\Component\Intl\ResourceBundle\Reader;

 use Symfony\Component\Intl\Intl;
-use Symfony\Component\Intl\Exception\NoSuchEntryException;
+use Symfony\Component\Intl\Exception\MissingResourceException;
 use Symfony\Component\Intl\Exception\ResourceBundleNotFoundException;
 use Symfony\Component\Intl\Exception\OutOfBoundsException;
 use Symfony\Component\Intl\ResourceBundle\Util\RecursiveArrayAccess;
@@ -177,6 +177,6 @@ public function readEntry($path, $locale, array $indices, $fallback = true)
            );
        }

-        throw new NoSuchEntryException($errorMessage, 0, $exception);
+        throw new MissingResourceException($errorMessage, 0, $exception);
    }
 }
diff --git a/src/Symfony/Component/Intl/ResourceBundle/Reader/BundleEntryReaderInterface.php b/src/Symfony/Component/Intl/ResourceBundle/Reader/BundleEntryReaderInterface.php
@@ -44,8 +44,9 @@ interface BundleEntryReaderInterface extends BundleReaderInterface
     *                           in the requested locale.
     *
     * @return mixed Returns an array or {@link \ArrayAccess} instance for
-     *               complex data, a scalar value for simple data and NULL
-     *               if the given path could not be accessed.
+     *               complex data and a scalar value for simple data.
+     *
+     * @throws \Symfony\Component\Intl\Exception\MissingResourceException If the indices cannot be accessed
     */
    public function readEntry($path, $locale, array $indices, $fallback = true);
 }
diff --git a/...Symfony/Component/Intl/ResourceBundle/Transformer/Rule/LocaleBundleTransformationRule.php b/...Symfony/Component/Intl/ResourceBundle/Transformer/Rule/LocaleBundleTransformationRule.php
@@ -11,7 +11,7 @@

 namespace Symfony\Component\Intl\ResourceBundle\Transformer\Rule;

-use Symfony\Component\Intl\Exception\NoSuchEntryException;
+use Symfony\Component\Intl\Exception\MissingResourceException;
 use Symfony\Component\Intl\Exception\ResourceBundleNotFoundException;
 use Symfony\Component\Intl\Intl;
 use Symfony\Component\Intl\ResourceBundle\LanguageBundleInterface;
@@ -148,7 +148,7 @@ private function generateTextFiles(TextBundleWriter $writer, $targetDirectory, a
                    if (null !== ($name = $this->generateLocaleName($locale, $displayLocale))) {
                        $localeNames[$displayLocale][$locale] = $name;
                    }
-                } catch (NoSuchEntryException $e) {
+                } catch (MissingResourceException $e) {
                } catch (ResourceBundleNotFoundException $e) {
                }
            }

diff --git a/src/Symfony/Component/Intl/Test/LanguageBundleConsistencyTestCase.php b/src/Symfony/Component/Intl/Test/LanguageBundleConsistencyTestCase.php
@@ -11,7 +11,7 @@

 namespace Symfony\Component\Intl\Test;

-use Symfony\Component\Intl\Exception\NoSuchEntryException;
+use Symfony\Component\Intl\Exception\MissingResourceException;
 use Symfony\Component\Intl\Intl;

 /**
@@ -84,7 +84,7 @@ public function testGetLanguageNames()
            try {
                Intl::getLanguageBundle()->getLanguageNames($displayLocale);
                $translatedLocales[] = $displayLocale;
-            } catch (NoSuchEntryException $e) {
+            } catch (MissingResourceException $e) {
            }
        }

@@ -115,7 +115,7 @@ public function testGetLanguageName($language)
            try {
                Intl::getLanguageBundle()->getLanguageName($language ?: $displayLocale, null, $displayLocale);
                $translatedLocales[] = $displayLocale;
-            } catch (NoSuchEntryException $e) {
+            } catch (MissingResourceException $e) {
            }
        }

@@ -135,7 +135,7 @@ public function testGetScriptNames()
            try {
                Intl::getLanguageBundle()->getScriptNames($displayLocale);
                $translatedLocales[] = $displayLocale;
-            } catch (NoSuchEntryException $e) {
+            } catch (MissingResourceException $e) {
            }
        }

@@ -166,7 +166,7 @@ public function testGetScriptName($script)
            try {
                Intl::getLanguageBundle()->getScriptName($script, null, $displayLocale);
                $translatedLocales[] = $displayLocale;
-            } catch (NoSuchEntryException $e) {
+            } catch (MissingResourceException $e) {
            }
        }


diff --git a/src/Symfony/Component/Intl/Test/RegionBundleConsistencyTestCase.php b/src/Symfony/Component/Intl/Test/RegionBundleConsistencyTestCase.php
@@ -11,7 +11,7 @@

 namespace Symfony\Component\Intl\Test;

-use Symfony\Component\Intl\Exception\NoSuchEntryException;
+use Symfony\Component\Intl\Exception\MissingResourceException;
 use Symfony\Component\Intl\Intl;
 use Symfony\Component\Intl\Test\ConsistencyTestCase;

@@ -81,7 +81,7 @@ public function testGetCountryNames()
            try {
                Intl::getRegionBundle()->getCountryNames($displayLocale);
                $translatedLocales[] = $displayLocale;
-            } catch (NoSuchEntryException $e) {
+            } catch (MissingResourceException $e) {
            }
        }

@@ -112,7 +112,7 @@ public function testGetCountryName($country)
            try {
                Intl::getRegionBundle()->getCountryName($country, $displayLocale);
                $translatedLocales[] = $displayLocale;
-            } catch (NoSuchEntryException $e) {
+            } catch (MissingResourceException $e) {
            }
        }


diff --git a/src/Symfony/Component/Intl/Tests/DataProvider/AbstractLanguageDataProviderTest.php b/src/Symfony/Component/Intl/Tests/DataProvider/AbstractLanguageDataProviderTest.php
@@ -98,7 +98,7 @@ function ($value) { return array($value); },

    /**
     * @dataProvider provideLanguagesWithoutAlpha3Equivalent
-     * @expectedException \Symfony\Component\Intl\Exception\NoSuchEntryException
+     * @expectedException \Symfony\Component\Intl\Exception\MissingResourceException
     */
    public function testGetAlpha3CodeFailsIfNoAlpha3Equivalent($currency)
    {

diff --git a/src/Symfony/Component/Intl/Tests/ResourceBundle/LanguageBundleTest.php b/src/Symfony/Component/Intl/Tests/ResourceBundle/LanguageBundleTest.php
@@ -11,7 +11,7 @@

 namespace Symfony\Component\Intl\Tests\ResourceBundle;

-use Symfony\Component\Intl\Exception\NoSuchEntryException;
+use Symfony\Component\Intl\Exception\MissingResourceException;
 use Symfony\Component\Intl\ResourceBundle\LanguageBundle;

 /**
@@ -62,7 +62,7 @@ public function testGetLanguageNameWithUntranslatedRegion()
        $this->reader->expects($this->at(0))
            ->method('readEntry')
            ->with(self::RES_DIR, 'en', array('Languages', 'en_US'))
-            ->will($this->throwException(new NoSuchEntryException()));
+            ->will($this->throwException(new MissingResourceException()));

        $this->reader->expects($this->at(1))
            ->method('readEntry')

diff --git a/src/Symfony/Component/Intl/Tests/ResourceBundle/Reader/BundleEntryReaderTest.php b/src/Symfony/Component/Intl/Tests/ResourceBundle/Reader/BundleEntryReaderTest.php
@@ -102,7 +102,7 @@ public function testReadExistingEntry()
    }

    /**
-     * @expectedException \Symfony\Component\Intl\Exception\NoSuchEntryException
+     * @expectedException \Symfony\Component\Intl\Exception\MissingResourceException
     */
    public function testReadNonExistingEntry()
    {
@@ -130,7 +130,7 @@ public function testFallbackIfEntryDoesNotExist()
    }

    /**
-     * @expectedException \Symfony\Component\Intl\Exception\NoSuchEntryException
+     * @expectedException \Symfony\Component\Intl\Exception\MissingResourceException
     */
    public function testDontFallbackIfEntryDoesNotExistAndFallbackDisabled()
    {
@@ -158,7 +158,7 @@ public function testFallbackIfLocaleDoesNotExist()
    }

    /**
-     * @expectedException \Symfony\Component\Intl\Exception\NoSuchEntryException
+     * @expectedException \Symfony\Component\Intl\Exception\MissingResourceException
     */
    public function testDontFallbackIfLocaleDoesNotExistAndFallbackDisabled()
    {
@@ -290,7 +290,7 @@ public function testMergeExistingEntryWithNonExistingFallbackEntry($childData, $
    }

    /**
-     * @expectedException \Symfony\Component\Intl\Exception\NoSuchEntryException
+     * @expectedException \Symfony\Component\Intl\Exception\MissingResourceException
     */
    public function testFailIfEntryFoundNeitherInParentNorChild()
    {