From 2004092dae72847ed8bee0e803478d9709b50efe Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Wed, 21 Mar 2018 10:10:50 +0100 Subject: [PATCH] [Routing] use American English --- .../Routing/Loader/schema/routing/routing-1.0.xsd | 6 +++--- .../Tests/Fixtures/{localised.xml => localized.xml} | 4 ++-- .../Routing/Tests/Loader/XmlFileLoaderTest.php | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) rename src/Symfony/Component/Routing/Tests/Fixtures/{localised.xml => localized.xml} (91%) diff --git a/src/Symfony/Component/Routing/Loader/schema/routing/routing-1.0.xsd b/src/Symfony/Component/Routing/Loader/schema/routing/routing-1.0.xsd index dd2477999d..2c7544a887 100644 --- a/src/Symfony/Component/Routing/Loader/schema/routing/routing-1.0.xsd +++ b/src/Symfony/Component/Routing/Loader/schema/routing/routing-1.0.xsd @@ -24,7 +24,7 @@ - + @@ -44,7 +44,7 @@ - + @@ -57,7 +57,7 @@ - + diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/localised.xml b/src/Symfony/Component/Routing/Tests/Fixtures/localized.xml similarity index 91% rename from src/Symfony/Component/Routing/Tests/Fixtures/localised.xml rename to src/Symfony/Component/Routing/Tests/Fixtures/localized.xml index 73a2a73bba..8146f9592f 100644 --- a/src/Symfony/Component/Routing/Tests/Fixtures/localised.xml +++ b/src/Symfony/Component/Routing/Tests/Fixtures/localized.xml @@ -4,10 +4,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd"> - + MyBundle:Blog:show /path /route - \ No newline at end of file + diff --git a/src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php index 0b2e1a9d79..2dfbdb694f 100644 --- a/src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php +++ b/src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php @@ -86,17 +86,17 @@ class XmlFileLoaderTest extends TestCase public function testLoadLocalized() { $loader = new XmlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures'))); - $routeCollection = $loader->load('localised.xml'); + $routeCollection = $loader->load('localized.xml'); $routes = $routeCollection->all(); $this->assertCount(2, $routes, 'Two routes are loaded'); $this->assertContainsOnly('Symfony\Component\Routing\Route', $routes); - $this->assertEquals('/route', $routeCollection->get('localised.fr')->getPath()); - $this->assertEquals('/path', $routeCollection->get('localised.en')->getPath()); + $this->assertEquals('/route', $routeCollection->get('localized.fr')->getPath()); + $this->assertEquals('/path', $routeCollection->get('localized.en')->getPath()); } - public function testLocalisedImports() + public function testLocalizedImports() { $loader = new XmlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures/localized'))); $routeCollection = $loader->load('importer-with-locale.xml'); @@ -109,7 +109,7 @@ class XmlFileLoaderTest extends TestCase $this->assertEquals('/the-prefix/suffix', $routeCollection->get('imported.en')->getPath()); } - public function testLocalisedImportsOfNotLocalizedRoutes() + public function testLocalizedImportsOfNotLocalizedRoutes() { $loader = new XmlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures/localized'))); $routeCollection = $loader->load('importer-with-locale-imports-non-localized-route.xml');