Rename locale classes. Support PHP 7.0

romeOz · May 20, 2015 · 7dccf4e · 7dccf4e
1 parent 991129a
commit 7dccf4e
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 16 deletions.
diff --git a/src/Validate.php b/src/Validate.php
@@ -540,8 +540,8 @@ protected function defaultRules()
             'bool' => [
                 'class' => BoolRule::className(),
                 'locales' => [
-                    'en' => \rock\validate\locale\en\Bool::className(),
-                    'ru' => \rock\validate\locale\ru\Bool::className(),
+                    'en' => \rock\validate\locale\en\BoolLocale::className(),
+                    'ru' => \rock\validate\locale\ru\BoolLocale::className(),
                 ]
             ],
             'call' => [
@@ -694,8 +694,8 @@ protected function defaultRules()
             'float' => [
                 'class' => FloatRule::className(),
                 'locales' => [
-                    'en' => \rock\validate\locale\en\Float::className(),
-                    'ru' => \rock\validate\locale\ru\Float::className(),
+                    'en' => \rock\validate\locale\en\FloatLocale::className(),
+                    'ru' => \rock\validate\locale\ru\FloatLocale::className(),
                 ]
             ],
             'graph' => [
@@ -715,8 +715,8 @@ protected function defaultRules()
             'int' => [
                 'class' => IntRule::className(),
                 'locales' => [
-                    'en' => \rock\validate\locale\en\Int::className(),
-                    'ru' => \rock\validate\locale\ru\Int::className(),
+                    'en' => \rock\validate\locale\en\IntLocale::className(),
+                    'ru' => \rock\validate\locale\ru\IntLocale::className(),
                 ]
             ],
             'ip' => [
@@ -848,8 +848,8 @@ protected function defaultRules()
             'string' => [
                 'class' => \rock\validate\rules\StringRule::className(),
                 'locales' => [
-                    'en' => \rock\validate\locale\en\String::className(),
-                    'ru' => \rock\validate\locale\ru\String::className(),
+                    'en' => \rock\validate\locale\en\StringLocale::className(),
+                    'ru' => \rock\validate\locale\ru\StringLocale::className(),
                 ]
             ],
             'symbolicLink' => [

diff --git a/src/locale/en/Bool.php → src/locale/en/BoolLocale.php b/src/locale/en/Bool.php → src/locale/en/BoolLocale.php
@@ -5,7 +5,7 @@
 
 use rock\validate\locale\Locale;
 
-class Bool extends Locale
+class BoolLocale extends Locale
 {
     public function defaultTemplates()
     {

diff --git a/src/locale/en/Float.php → src/locale/en/FloatLocale.php b/src/locale/en/Float.php → src/locale/en/FloatLocale.php
@@ -5,7 +5,7 @@
 
 use rock\validate\locale\Locale;
 
-class Float extends Locale
+class FloatLocale extends Locale
 {
     public function defaultTemplates()
     {

diff --git a/src/locale/en/Int.php → src/locale/en/IntLocale.php b/src/locale/en/Int.php → src/locale/en/IntLocale.php
@@ -5,7 +5,7 @@
 
 use rock\validate\locale\Locale;
 
-class Int extends Locale
+class IntLocale extends Locale
 {
     public function defaultTemplates()
     {

diff --git a/src/locale/en/String.php → src/locale/en/StringLocale.php b/src/locale/en/String.php → src/locale/en/StringLocale.php
@@ -5,7 +5,7 @@
 
 use rock\validate\locale\Locale;
 
-class String extends Locale
+class StringLocale extends Locale
 {
     public function defaultTemplates()
     {

diff --git a/src/locale/ru/Bool.php → src/locale/ru/BoolLocale.php b/src/locale/ru/Bool.php → src/locale/ru/BoolLocale.php
@@ -11,7 +11,7 @@
  * @codeCoverageIgnore
  * @package rock\validate\locale\ru
  */
-class Bool extends Locale
+class BoolLocale extends Locale
 {
     public function defaultTemplates()
     {

diff --git a/src/locale/ru/Float.php → src/locale/ru/FloatLocale.php b/src/locale/ru/Float.php → src/locale/ru/FloatLocale.php
@@ -11,7 +11,7 @@
  * @codeCoverageIgnore
  * @package rock\validate\locale\ru
  */
-class Float extends Locale
+class FloatLocale extends Locale
 {
     public function defaultTemplates()
     {

diff --git a/src/locale/ru/Int.php → src/locale/ru/IntLocale.php b/src/locale/ru/Int.php → src/locale/ru/IntLocale.php
@@ -11,7 +11,7 @@
  * @codeCoverageIgnore
  * @package rock\validate\locale\ru
  */
-class Int extends Locale
+class IntLocale extends Locale
 {
     public function defaultTemplates()
     {

diff --git a/src/locale/ru/String.php → src/locale/ru/StringLocale.php b/src/locale/ru/String.php → src/locale/ru/StringLocale.php
@@ -11,7 +11,7 @@
  * @codeCoverageIgnore
  * @package rock\validate\locale\ru
  */
-class String extends Locale
+class StringLocale extends Locale
 {
     public function defaultTemplates()
     {