symfony
diff --git a/‎src/Symfony/Component/Routing/Annotation/Route.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Routing/Annotation/Route.php
+9-9Lines changed: 9 additions & 9 deletions b/‎src/Symfony/Component/Routing/Annotation/Route.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Routing/Annotation/Route.php
+9-9Lines changed: 9 additions & 9 deletions
diff --git a/‎src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
+5-5Lines changed: 5 additions & 5 deletions b/‎src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
+5-5Lines changed: 5 additions & 5 deletions
diff --git a/‎src/Symfony/Component/Routing/Tests/Annotation/RouteTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Routing/Tests/Annotation/RouteTest.php
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Routing/Tests/Annotation/RouteTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Routing/Tests/Annotation/RouteTest.php
+1-1Lines changed: 1 addition & 1 deletion
@@ -22,7 +22,7 @@
 class Route
 {
     private $path;
-    private $locales = array();
+    private $localizedPaths = array();
     private $name;
     private $requirements = array();
     private $options = array();
@@ -39,17 +39,17 @@ class Route
      */
     public function __construct(array $data)
     {
-        if (isset($data['locales'])) {
-            throw new \BadMethodCallException(sprintf('Unknown property "locales" on annotation "%s".', get_class($this)));
+        if (isset($data['localized_paths'])) {
+            throw new \BadMethodCallException(sprintf('Unknown property "localized_paths" on annotation "%s".', get_class($this)));
         }
 
         if (isset($data['value'])) {
-            $data[is_array($data['value']) ? 'locales' : 'path'] = $data['value'];
+            $data[is_array($data['value']) ? 'localized_paths' : 'path'] = $data['value'];
             unset($data['value']);
         }
 
         if (isset($data['path']) && is_array($data['path'])) {
-            $data['locales'] = $data['path'];
+            $data['localized_paths'] = $data['path'];
             unset($data['path']);
         }
 
@@ -72,14 +72,14 @@ public function getPath()
         return $this->path;
     }
 
-    public function setLocales(array $locales)
+    public function setLocalizedPaths(array $localizedPaths)
     {
-        $this->locales = $locales;
+        $this->localizedPaths = $localizedPaths;
     }
 
-    public function getLocales(): array
+    public function getLocalizedPaths(): array
     {
-        return $this->locales;
+        return $this->localizedPaths;
     }
 
     public function setHost($pattern)
 
@@ -124,7 +124,7 @@ public function load($class, $type = null)
         if (0 === $collection->count() && $class->hasMethod('__invoke') && $annot = $this->reader->getClassAnnotation($class, $this->routeAnnotationClass)) {
             $globals['path'] = null;
             $globals['name'] = '';
-            $globals['locales'] = array();
+            $globals['localized_paths'] = array();
             $this->addRoute($collection, $annot, $globals, $class, $class->getMethod('__invoke'));
         }
 
@@ -155,8 +155,8 @@ protected function addRoute(RouteCollection $collection, $annot, $globals, \Refl
             $condition = $globals['condition'];
         }
 
-        $path = $annot->getLocales() ?: $annot->getPath();
-        $prefix = $globals['locales'] ?: $globals['path'];
+        $path = $annot->getLocalizedPaths() ?: $annot->getPath();
+        $prefix = $globals['localized_paths'] ?: $globals['path'];
         $paths = array();
 
         if (\is_array($path)) {
@@ -253,7 +253,7 @@ protected function getGlobals(\ReflectionClass $class)
     {
         $globals = array(
             'path' => null,
-            'locales' => array(),
+            'localized_paths' => array(),
             'requirements' => array(),
             'options' => array(),
             'defaults' => array(),
@@ -273,7 +273,7 @@ protected function getGlobals(\ReflectionClass $class)
                 $globals['path'] = $annot->getPath();
             }
 
-            $globals['locales'] = $annot->getLocales();
+            $globals['localized_paths'] = $annot->getLocalizedPaths();
 
             if (null !== $annot->getRequirements()) {
                 $globals['requirements'] = $annot->getRequirements();
 
@@ -53,7 +53,7 @@ public function getValidParameters()
             array('methods', array('GET', 'POST'), 'getMethods'),
             array('host', '{locale}.example.com', 'getHost'),
             array('condition', 'context.getMethod() == "GET"', 'getCondition'),
-            array('value', array('nl' => '/hier', 'en' => '/here'), 'getLocales'),
+            array('value', array('nl' => '/hier', 'en' => '/here'), 'getLocalizedPaths'),
         );
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`class Route`
`23`	`23`	`{`
`24`	`24`	`private $path;`
`25`		`- private $locales = array();`
	`25`	`+ private $localizedPaths = array();`
`26`	`26`	`private $name;`
`27`	`27`	`private $requirements = array();`
`28`	`28`	`private $options = array();`
`@@ -39,17 +39,17 @@ class Route`
`39`	`39`	`*/`
`40`	`40`	`public function __construct(array $data)`
`41`	`41`	`{`
`42`		`- if (isset($data['locales'])) {`
`43`		`- throw new \BadMethodCallException(sprintf('Unknown property "locales" on annotation "%s".', get_class($this)));`
	`42`	`+ if (isset($data['localized_paths'])) {`
	`43`	`+ throw new \BadMethodCallException(sprintf('Unknown property "localized_paths" on annotation "%s".', get_class($this)));`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`if (isset($data['value'])) {`
`47`		`- $data[is_array($data['value']) ? 'locales' : 'path'] = $data['value'];`
	`47`	`+ $data[is_array($data['value']) ? 'localized_paths' : 'path'] = $data['value'];`
`48`	`48`	`unset($data['value']);`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`if (isset($data['path']) && is_array($data['path'])) {`
`52`		`- $data['locales'] = $data['path'];`
	`52`	`+ $data['localized_paths'] = $data['path'];`
`53`	`53`	`unset($data['path']);`
`54`	`54`	`}`
`55`	`55`
`@@ -72,14 +72,14 @@ public function getPath()`
`72`	`72`	`return $this->path;`
`73`	`73`	`}`
`74`	`74`
`75`		`- public function setLocales(array $locales)`
	`75`	`+ public function setLocalizedPaths(array $localizedPaths)`
`76`	`76`	`{`
`77`		`- $this->locales = $locales;`
	`77`	`+ $this->localizedPaths = $localizedPaths;`
`78`	`78`	`}`
`79`	`79`
`80`		`- public function getLocales(): array`
	`80`	`+ public function getLocalizedPaths(): array`
`81`	`81`	`{`
`82`		`- return $this->locales;`
	`82`	`+ return $this->localizedPaths;`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`public function setHost($pattern)`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public function getValidParameters()`
`53`	`53`	`array('methods', array('GET', 'POST'), 'getMethods'),`
`54`	`54`	`array('host', '{locale}.example.com', 'getHost'),`
`55`	`55`	`array('condition', 'context.getMethod() == "GET"', 'getCondition'),`
`56`		`- array('value', array('nl' => '/hier', 'en' => '/here'), 'getLocales'),`
	`56`	`+ array('value', array('nl' => '/hier', 'en' => '/here'), 'getLocalizedPaths'),`
`57`	`57`	`);`
`58`	`58`	`}`
`59`	`59`	`}`