Fix errors on php < 7

wapmorgan · Jul 13, 2017 · 3070356 · 3070356
1 parent 9c4c404
commit 3070356
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Russian/TimeUnitSpeller.php b/src/Russian/TimeUnitSpeller.php
@@ -17,7 +17,7 @@ class TimeUnitSpeller extends \morphos\TimeUnitSpeller
 	const AGO = 'назад';
 	const IN = 'через';
 
-	const AND = 'и';
+	const AND_WORD = 'и';
 
 	const JUST_NOW = 'только что';
 

diff --git a/src/TimeUnitSpeller.php b/src/TimeUnitSpeller.php
@@ -15,7 +15,7 @@ abstract class TimeUnitSpeller
 	const AGO = 'ago';
 	const IN = 'in';
 
-	const AND = 'and';
+	const AND_WORD = 'and';
 
 	const JUST_NOW = 'just now';
 
@@ -44,7 +44,7 @@ public static function spellInterval(DateInterval $interval, $options = 0)
 
 		if ($options & self::SEPARATE && count($parts) > 1) {
 			$last_part = array_pop($parts);
-			$spelled = implode(', ', $parts).' '.static::AND.' '.$last_part;
+			$spelled = implode(', ', $parts).' '.static::AND_WORD.' '.$last_part;
 		} else
 			$spelled = implode(' ', $parts);