Merge branch '4.1'

nicolas-grekas · nicolas-grekas · commit 2021b2458da9 · 2018-07-26T11:13:01.000+02:00
* 4.1:
  Alpha-ordering for "use" statements
diff --git a/Collator/Collator.php b/Collator/Collator.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\Intl\Collator;
 
-use Symfony\Component\Intl\Exception\MethodNotImplementedException;
 use Symfony\Component\Intl\Exception\MethodArgumentValueNotImplementedException;
+use Symfony\Component\Intl\Exception\MethodNotImplementedException;
 use Symfony\Component\Intl\Globals\IntlGlobals;
 use Symfony\Component\Intl\Locale\Locale;
 
diff --git a/Data/Bundle/Reader/BundleEntryReader.php b/Data/Bundle/Reader/BundleEntryReader.php
@@ -11,11 +11,11 @@
 
 namespace Symfony\Component\Intl\Data\Bundle\Reader;
 
+use Symfony\Component\Intl\Data\Util\RecursiveArrayAccess;
 use Symfony\Component\Intl\Exception\MissingResourceException;
 use Symfony\Component\Intl\Exception\OutOfBoundsException;
 use Symfony\Component\Intl\Exception\ResourceBundleNotFoundException;
 use Symfony\Component\Intl\Locale;
-use Symfony\Component\Intl\Data\Util\RecursiveArrayAccess;
 
 /**
  * Default implementation of {@link BundleEntryReaderInterface}.
diff --git a/Data/Bundle/Reader/IntlBundleReader.php b/Data/Bundle/Reader/IntlBundleReader.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\Intl\Data\Bundle\Reader;
 
-use Symfony\Component\Intl\Exception\ResourceBundleNotFoundException;
 use Symfony\Component\Intl\Data\Util\ArrayAccessibleResourceBundle;
+use Symfony\Component\Intl\Exception\ResourceBundleNotFoundException;
 
 /**
  * Reads binary .res resource bundles.
diff --git a/Data/Generator/AbstractDataGenerator.php b/Data/Generator/AbstractDataGenerator.php
@@ -12,10 +12,10 @@
 namespace Symfony\Component\Intl\Data\Generator;
 
 use Symfony\Component\Filesystem\Filesystem;
-use Symfony\Component\Intl\Data\Bundle\Reader\BundleReaderInterface;
-use Symfony\Component\Intl\Data\Util\LocaleScanner;
 use Symfony\Component\Intl\Data\Bundle\Compiler\GenrbCompiler;
+use Symfony\Component\Intl\Data\Bundle\Reader\BundleReaderInterface;
 use Symfony\Component\Intl\Data\Bundle\Reader\IntlBundleReader;
+use Symfony\Component\Intl\Data\Util\LocaleScanner;
 
 /**
  * The rule for compiling the currency bundle.
diff --git a/Data/Generator/CurrencyDataGenerator.php b/Data/Generator/CurrencyDataGenerator.php
@@ -11,9 +11,9 @@
 
 namespace Symfony\Component\Intl\Data\Generator;
 
+use Symfony\Component\Intl\Data\Bundle\Compiler\GenrbCompiler;
 use Symfony\Component\Intl\Data\Bundle\Reader\BundleReaderInterface;
 use Symfony\Component\Intl\Data\Util\ArrayAccessibleResourceBundle;
-use Symfony\Component\Intl\Data\Bundle\Compiler\GenrbCompiler;
 use Symfony\Component\Intl\Data\Util\LocaleScanner;
 
 /**
diff --git a/Data/Generator/LanguageDataGenerator.php b/Data/Generator/LanguageDataGenerator.php
@@ -11,11 +11,11 @@
 
 namespace Symfony\Component\Intl\Data\Generator;
 
+use Symfony\Component\Intl\Data\Bundle\Compiler\GenrbCompiler;
 use Symfony\Component\Intl\Data\Bundle\Reader\BundleReaderInterface;
 use Symfony\Component\Intl\Data\Util\ArrayAccessibleResourceBundle;
 use Symfony\Component\Intl\Data\Util\LocaleScanner;
 use Symfony\Component\Intl\Exception\RuntimeException;
-use Symfony\Component\Intl\Data\Bundle\Compiler\GenrbCompiler;
 
 /**
  * The rule for compiling the language bundle.
diff --git a/Data/Generator/RegionDataGenerator.php b/Data/Generator/RegionDataGenerator.php
@@ -11,9 +11,9 @@
 
 namespace Symfony\Component\Intl\Data\Generator;
 
+use Symfony\Component\Intl\Data\Bundle\Compiler\GenrbCompiler;
 use Symfony\Component\Intl\Data\Bundle\Reader\BundleReaderInterface;
 use Symfony\Component\Intl\Data\Util\ArrayAccessibleResourceBundle;
-use Symfony\Component\Intl\Data\Bundle\Compiler\GenrbCompiler;
 use Symfony\Component\Intl\Data\Util\LocaleScanner;
 
 /**
diff --git a/Data/Generator/ScriptDataGenerator.php b/Data/Generator/ScriptDataGenerator.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\Intl\Data\Generator;
 
-use Symfony\Component\Intl\Data\Bundle\Reader\BundleReaderInterface;
 use Symfony\Component\Intl\Data\Bundle\Compiler\GenrbCompiler;
+use Symfony\Component\Intl\Data\Bundle\Reader\BundleReaderInterface;
 use Symfony\Component\Intl\Data\Util\LocaleScanner;
 
 /**
diff --git a/Data/Provider/CurrencyDataProvider.php b/Data/Provider/CurrencyDataProvider.php
@@ -11,9 +11,9 @@
 
 namespace Symfony\Component\Intl\Data\Provider;
 
+use Symfony\Component\Intl\Data\Bundle\Reader\BundleEntryReaderInterface;
 use Symfony\Component\Intl\Exception\MissingResourceException;
 use Symfony\Component\Intl\Locale;
-use Symfony\Component\Intl\Data\Bundle\Reader\BundleEntryReaderInterface;
 
 /**
  * Data provider for currency-related data.
diff --git a/Data/Provider/LanguageDataProvider.php b/Data/Provider/LanguageDataProvider.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\Intl\Data\Provider;
 
-use Symfony\Component\Intl\Locale;
 use Symfony\Component\Intl\Data\Bundle\Reader\BundleEntryReaderInterface;
+use Symfony\Component\Intl\Locale;
 
 /**
  * Data provider for language-related ICU data.
diff --git a/DateFormatter/IntlDateFormatter.php b/DateFormatter/IntlDateFormatter.php
@@ -11,11 +11,11 @@
 
 namespace Symfony\Component\Intl\DateFormatter;
 
-use Symfony\Component\Intl\Globals\IntlGlobals;
 use Symfony\Component\Intl\DateFormatter\DateFormat\FullTransformer;
-use Symfony\Component\Intl\Exception\MethodNotImplementedException;
 use Symfony\Component\Intl\Exception\MethodArgumentNotImplementedException;
 use Symfony\Component\Intl\Exception\MethodArgumentValueNotImplementedException;
+use Symfony\Component\Intl\Exception\MethodNotImplementedException;
+use Symfony\Component\Intl\Globals\IntlGlobals;
 use Symfony\Component\Intl\Locale\Locale;
 
 /**
diff --git a/Intl.php b/Intl.php
@@ -11,10 +11,10 @@
 
 namespace Symfony\Component\Intl;
 
-use Symfony\Component\Intl\Data\Bundle\Reader\JsonBundleReader;
 use Symfony\Component\Intl\Data\Bundle\Reader\BufferedBundleReader;
 use Symfony\Component\Intl\Data\Bundle\Reader\BundleEntryReader;
 use Symfony\Component\Intl\Data\Bundle\Reader\BundleEntryReaderInterface;
+use Symfony\Component\Intl\Data\Bundle\Reader\JsonBundleReader;
 use Symfony\Component\Intl\Data\Provider\LocaleDataProvider;
 use Symfony\Component\Intl\Data\Provider\ScriptDataProvider;
 use Symfony\Component\Intl\ResourceBundle\CurrencyBundle;
diff --git a/NumberFormatter/NumberFormatter.php b/NumberFormatter/NumberFormatter.php
@@ -11,10 +11,10 @@
 
 namespace Symfony\Component\Intl\NumberFormatter;
 
-use Symfony\Component\Intl\Exception\NotImplementedException;
-use Symfony\Component\Intl\Exception\MethodNotImplementedException;
 use Symfony\Component\Intl\Exception\MethodArgumentNotImplementedException;
 use Symfony\Component\Intl\Exception\MethodArgumentValueNotImplementedException;
+use Symfony\Component\Intl\Exception\MethodNotImplementedException;
+use Symfony\Component\Intl\Exception\NotImplementedException;
 use Symfony\Component\Intl\Globals\IntlGlobals;
 use Symfony\Component\Intl\Intl;
 use Symfony\Component\Intl\Locale\Locale;
diff --git a/Resources/bin/update-data.php b/Resources/bin/update-data.php
@@ -9,6 +9,9 @@
  * file that was distributed with this source code.
  */
 
+use Symfony\Component\Filesystem\Filesystem;
+use Symfony\Component\Intl\Data\Bundle\Compiler\GenrbCompiler;
+use Symfony\Component\Intl\Data\Bundle\Reader\BundleEntryReader;
 use Symfony\Component\Intl\Data\Bundle\Reader\JsonBundleReader;
 use Symfony\Component\Intl\Data\Bundle\Writer\JsonBundleWriter;
 use Symfony\Component\Intl\Data\Generator\CurrencyDataGenerator;
@@ -21,12 +24,9 @@
 use Symfony\Component\Intl\Data\Provider\RegionDataProvider;
 use Symfony\Component\Intl\Data\Provider\ScriptDataProvider;
 use Symfony\Component\Intl\Intl;
-use Symfony\Component\Intl\Data\Bundle\Compiler\GenrbCompiler;
-use Symfony\Component\Intl\Data\Bundle\Reader\BundleEntryReader;
 use Symfony\Component\Intl\Locale;
 use Symfony\Component\Intl\Util\IcuVersion;
 use Symfony\Component\Intl\Util\SvnRepository;
-use Symfony\Component\Filesystem\Filesystem;
 
 require_once __DIR__.'/common.php';
 require_once __DIR__.'/autoload.php';
diff --git a/Tests/Data/Bundle/Reader/BundleEntryReaderTest.php b/Tests/Data/Bundle/Reader/BundleEntryReaderTest.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\Intl\Tests\Data\Bundle\Reader;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Intl\Exception\ResourceBundleNotFoundException;
 use Symfony\Component\Intl\Data\Bundle\Reader\BundleEntryReader;
+use Symfony\Component\Intl\Exception\ResourceBundleNotFoundException;
 
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
diff --git a/Tests/IntlTest.php b/Tests/IntlTest.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\Intl\Tests;
 
-use Symfony\Component\Intl\Intl;
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Intl\Intl;
 
 class IntlTest extends TestCase
 {
