symfony
diff --git a/‎src/Symfony/Component/Translation/Range.php renamed to ‎src/Symfony/Component/Translation/Interval.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/Interval.php
+15-13Lines changed: 15 additions & 13 deletions b/‎src/Symfony/Component/Translation/Range.php renamed to ‎src/Symfony/Component/Translation/Interval.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/Interval.php
+15-13Lines changed: 15 additions & 13 deletions
diff --git a/‎src/Symfony/Component/Translation/MessageSelector.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/MessageSelector.php
+4-4Lines changed: 4 additions & 4 deletions b/‎src/Symfony/Component/Translation/MessageSelector.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/MessageSelector.php
+4-4Lines changed: 4 additions & 4 deletions
diff --git a/‎tests/Symfony/Tests/Component/Translation/RangeTest.php renamed to ‎tests/Symfony/Tests/Component/Translation/IntervalTest.php
Copy file name to clipboardExpand all lines: tests/Symfony/Tests/Component/Translation/IntervalTest.php
+5-5Lines changed: 5 additions & 5 deletions b/‎tests/Symfony/Tests/Component/Translation/RangeTest.php renamed to ‎tests/Symfony/Tests/Component/Translation/IntervalTest.php
Copy file name to clipboardExpand all lines: tests/Symfony/Tests/Component/Translation/IntervalTest.php
+5-5Lines changed: 5 additions & 5 deletions
@@ -12,13 +12,13 @@
  */
 
 /**
- * Range tests if a given number belongs to a given range.
+ * Tests if a given number belongs to a given math interval.
  *
- * A range can represent a finite set of numbers:
+ * An interval can represent a finite set of numbers:
  *
  *  {1,2,3,4}
  *
- * A range can represent numbers between two numbers:
+ * An interval can represent numbers between two numbers:
  *
  *  [1, +Inf]
  *  ]-1,2[
@@ -27,22 +27,24 @@
  * The right delimiter can be [ (exclusive) or ] (inclusive).
  * Beside numbers, you can use -Inf and +Inf for the infinite.
  *
+ * @see http://en.wikipedia.org/wiki/Interval_%28mathematics%29#The_ISO_notation
+ *
  * @author Fabien Potencier <fabien.potencier@symfony-project.com>
  */
-class Range
+class Interval
 {
     /**
-     * Tests if the given number is in the range.
+     * Tests if the given number is in the math interval.
      *
-     * @param integer $number A number
-     * @param string  $range  A range of numbers
+     * @param integer $number   A number
+     * @param string  $interval An interval
      */
-    static public function test($number, $range)
+    static public function test($number, $interval)
     {
-        $range = trim($range);
+        $interval = trim($interval);
 
-        if (!preg_match('/^'.self::getRangeRegexp().'$/x', $range, $matches)) {
-            throw new \InvalidArgumentException(sprintf('"%s" is not a valid range expression.', $range));
+        if (!preg_match('/^'.self::getIntervalRegexp().'$/x', $interval, $matches)) {
+            throw new \InvalidArgumentException(sprintf('"%s" is not a valid interval.', $interval));
         }
 
         if ($matches[1]) {
@@ -66,11 +68,11 @@ static public function test($number, $range)
     }
 
     /**
-     * Returns a Regexp that matches valid ranges.
+     * Returns a Regexp that matches valid intervals.
      *
      * @return string A Regexp (without the delimiters)
      */
-    static public function getRangeRegexp()
+    static public function getIntervalRegexp()
     {
         return <<<EOF
         ({\s*
 
@@ -26,8 +26,8 @@ public function choose($message, $number, $locale)
         foreach ($parts as $part) {
             $part = trim($part);
 
-            if (preg_match('/^(?<range>'.Range::getRangeRegexp().')\s+(?<message>.+?)$/x', $part, $matches)) {
-                $explicitRules[$matches['range']] = $matches['message'];
+            if (preg_match('/^(?<interval>'.Interval::getIntervalRegexp().')\s+(?<message>.+?)$/x', $part, $matches)) {
+                $explicitRules[$matches['interval']] = $matches['message'];
             } elseif (preg_match('/^\w+\: +(.+)$/', $part, $matches)) {
                 $standardRules[] = $matches[1];
             } else {
@@ -36,8 +36,8 @@ public function choose($message, $number, $locale)
         }
 
         // try to match an explicit rule, then fallback to the standard ones
-        foreach ($explicitRules as $range => $m) {
-            if (Range::test($number, $range)) {
+        foreach ($explicitRules as $interval => $m) {
+            if (Interval::test($number, $interval)) {
                 return $m;
             }
         }
 
@@ -11,24 +11,24 @@
 
 namespace Symfony\Tests\Component\Translation;
 
-use Symfony\Component\Translation\Range;
+use Symfony\Component\Translation\Interval;
 
-class RangeTest extends \PHPUnit_Framework_TestCase
+class IntervalTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @dataProvider getTests
      */
-    public function testTest($expected, $number, $range)
+    public function testTest($expected, $number, $interval)
     {
-        $this->assertEquals($expected, Range::test($number, $range));
+        $this->assertEquals($expected, Interval::test($number, $interval));
     }
 
     /**
      * @expectedException \InvalidArgumentException
      */
     public function testTestException()
     {
-        Range::test(1, 'foobar');
+        Interval::test(1, 'foobar');
     }
 
     public function getTests()
Original file line number	Diff line number	Diff line change
`@@ -12,13 +12,13 @@`
`12`	`12`	`*/`
`13`	`13`
`14`	`14`	`/**`
`15`		`- * Range tests if a given number belongs to a given range.`
	`15`	`+ * Tests if a given number belongs to a given math interval.`
`16`	`16`	`*`
`17`		`- * A range can represent a finite set of numbers:`
	`17`	`+ * An interval can represent a finite set of numbers:`
`18`	`18`	`*`
`19`	`19`	`* {1,2,3,4}`
`20`	`20`	`*`
`21`		`- * A range can represent numbers between two numbers:`
	`21`	`+ * An interval can represent numbers between two numbers:`
`22`	`22`	`*`
`23`	`23`	`* [1, +Inf]`
`24`	`24`	`* ]-1,2[`
`@@ -27,22 +27,24 @@`
`27`	`27`	`* The right delimiter can be [ (exclusive) or ] (inclusive).`
`28`	`28`	`* Beside numbers, you can use -Inf and +Inf for the infinite.`
`29`	`29`	`*`
	`30`	`+ * @see http://en.wikipedia.org/wiki/Interval_%28mathematics%29#The_ISO_notation`
	`31`	`+ *`
`30`	`32`	`* @author Fabien Potencier <fabien.potencier@symfony-project.com>`
`31`	`33`	`*/`
`32`		`-class Range`
	`34`	`+class Interval`
`33`	`35`	`{`
`34`	`36`	`/**`
`35`		`- * Tests if the given number is in the range.`
	`37`	`+ * Tests if the given number is in the math interval.`
`36`	`38`	`*`
`37`		`- * @param integer $number A number`
`38`		`- * @param string $range A range of numbers`
	`39`	`+ * @param integer $number A number`
	`40`	`+ * @param string $interval An interval`
`39`	`41`	`*/`
`40`		`- static public function test($number, $range)`
	`42`	`+ static public function test($number, $interval)`
`41`	`43`	`{`
`42`		`- $range = trim($range);`
	`44`	`+ $interval = trim($interval);`
`43`	`45`
`44`		`- if (!preg_match('/^'.self::getRangeRegexp().'$/x', $range, $matches)) {`
`45`		`- throw new \InvalidArgumentException(sprintf('"%s" is not a valid range expression.', $range));`
	`46`	`+ if (!preg_match('/^'.self::getIntervalRegexp().'$/x', $interval, $matches)) {`
	`47`	`+ throw new \InvalidArgumentException(sprintf('"%s" is not a valid interval.', $interval));`
`46`	`48`	`}`
`47`	`49`
`48`	`50`	`if ($matches[1]) {`
`@@ -66,11 +68,11 @@ static public function test($number, $range)`
`66`	`68`	`}`
`67`	`69`
`68`	`70`	`/**`
`69`		`- * Returns a Regexp that matches valid ranges.`
	`71`	`+ * Returns a Regexp that matches valid intervals.`
`70`	`72`	`*`
`71`	`73`	`* @return string A Regexp (without the delimiters)`
`72`	`74`	`*/`
`73`		`- static public function getRangeRegexp()`
	`75`	`+ static public function getIntervalRegexp()`
`74`	`76`	`{`
`75`	`77`	`return <<<EOF`
`76`	`78`	`({\s*`
Original file line number	Diff line number	Diff line change
`@@ -11,24 +11,24 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Tests\Component\Translation;`
`13`	`13`
`14`		`-use Symfony\Component\Translation\Range;`
	`14`	`+use Symfony\Component\Translation\Interval;`
`15`	`15`
`16`		`-class RangeTest extends \PHPUnit_Framework_TestCase`
	`16`	`+class IntervalTest extends \PHPUnit_Framework_TestCase`
`17`	`17`	`{`
`18`	`18`	`/**`
`19`	`19`	`* @dataProvider getTests`
`20`	`20`	`*/`
`21`		`- public function testTest($expected, $number, $range)`
	`21`	`+ public function testTest($expected, $number, $interval)`
`22`	`22`	`{`
`23`		`- $this->assertEquals($expected, Range::test($number, $range));`
	`23`	`+ $this->assertEquals($expected, Interval::test($number, $interval));`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`/**`
`27`	`27`	`* @expectedException \InvalidArgumentException`
`28`	`28`	`*/`
`29`	`29`	`public function testTestException()`
`30`	`30`	`{`
`31`		`- Range::test(1, 'foobar');`
	`31`	`+ Interval::test(1, 'foobar');`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`public function getTests()`