Merge branch '1.1'

2024-06-27 09:40:05 +02:00 · 2018-05-19 16:46:58 +02:00 · 2018-05-19 16:46:58 +02:00 · 47eaea6f28
parent 7b5a2928ff 020ea1ebb5
commit 47eaea6f28
2 changed files with 140 additions and 132 deletions
--- a/library/Rules/Locale/FrSubdivisionCode.php
+++ b/library/Rules/Locale/FrSubdivisionCode.php
@ -32,124 +32,131 @@ final class FrSubdivisionCode extends AbstractSearcher
    protected function getDataSource(): array
    {
        return [
-           '01', // Ain
-           '02', // Aisne
-           '03', // Allier
-           '04', // Alpes-de-Haute-Provence
-           '05', // Hautes-Alpes
-           '06', // Alpes-Maritimes
-           '07', // Ardèche
-           '08', // Ardennes
-           '09', // Ariège
-           '10', // Aube
-           '11', // Aude
-           '12', // Aveyron
-           '13', // Bouches-du-Rhône
-           '14', // Calvados
-           '15', // Cantal
-           '16', // Charente
-           '17', // Charente-Maritime
-           '18', // Cher
-           '19', // Corrèze
-           '21', // Côte-d'Or
-           '22', // Côtes-d'Armor
-           '23', // Creuse
-           '24', // Dordogne
-           '25', // Doubs
-           '26', // Drôme
-           '27', // Eure
-           '28', // Eure-et-Loir
-           '29', // Finistère
-           '2A', // Corse-du-Sud
-           '2B', // Haute-Corse
-           '30', // Gard
-           '31', // Haute-Garonne
-           '32', // Gers
-           '33', // Gironde
-           '34', // Hérault
-           '35', // Ille-et-Vilaine
-           '36', // Indre
-           '37', // Indre-et-Loire
-           '38', // Isère
-           '39', // Jura
-           '40', // Landes
-           '41', // Loir-et-Cher
-           '42', // Loire
-           '43', // Haute-Loire
-           '44', // Loire-Atlantique
-           '45', // Loiret
-           '46', // Lot
-           '47', // Lot-et-Garonne
-           '48', // Lozère
-           '49', // Maine-et-Loire
-           '50', // Manche
-           '51', // Marne
-           '52', // Haute-Marne
-           '53', // Mayenne
-           '54', // Meurthe-et-Moselle
-           '55', // Meuse
-           '56', // Morbihan
-           '57', // Moselle
-           '58', // Nièvre
-           '59', // Nord
-           '60', // Oise
-           '61', // Orne
-           '62', // Pas-de-Calais
-           '63', // Puy-de-Dôme
-           '64', // Pyrénées-Atlantiques
-           '65', // Hautes-Pyrénées
-           '66', // Pyrénées-Orientales
-           '67', // Bas-Rhin
-           '68', // Haut-Rhin
-           '69', // Rhône
-           '70', // Haute-Saône
-           '71', // Saône-et-Loire
-           '72', // Sarthe
-           '73', // Savoie
-           '74', // Haute-Savoie
-           '75', // Paris
-           '76', // Seine-Maritime
-           '77', // Seine-et-Marne
-           '78', // Yvelines
-           '79', // Deux-Sèvres
-           '80', // Somme
-           '81', // Tarn
-           '82', // Tarn-et-Garonne
-           '83', // Var
-           '84', // Vaucluse
-           '85', // Vendée
-           '86', // Vienne
-           '87', // Haute-Vienne
-           '88', // Vosges
-           '89', // Yonne
-           '90', // Territoire de Belfort
-           '91', // Essonne
-           '92', // Hauts-de-Seine
-           '93', // Seine-Saint-Denis
-           '94', // Val-de-Marne
-           '95', // Val-d'Oise
-           'ARA', // Auvergne-Rhône-Alpes
-           'BFC', // Bourgogne-Franche-Comté
-           'BL', // Saint Barthélemy (see also separate ISO 3166-1 entry under BL)
-           'BRE', // Bretagne
-           'COR', // Corse
-           'CP', // Clipperton
-           'CVL', // Centre-Val de Loire
-           'GES', // Grand Est
-           'HDF', // Hauts-de-France
-           'IDF', // Île-de-France
-           'MF', // Saint Martin (see also separate ISO 3166-1 entry under MF)
-           'NAQ', // Nouvelle-Aquitaine
-           'NC', // Nouvelle-Calédonie (see also separate ISO 3166-1 entry under NC)
-           'NOR', // Normandy
-           'OCC', // Occitanie
-           'PAC', // Provence-Alpes-Côte d'Azur
-           'PDL', // Pays de la Loire
-           'PF', // Polynésie française (see also separate ISO 3166-1 entry under PF)
-           'PM', // Saint-Pierre-et-Miquelon (see also separate ISO 3166-1 entry under PM)
-           'TF', // Terres Australes Françaises (see also separate ISO 3166-1 entry under TF)
-           'WF', // Wallis et Futuna (see also separate ISO 3166-1 entry under WF)
-           'YT', // Mayotte (see also separate ISO 3166-1 entry under YT)
+            'ARA', // Auvergne-Rhône-Alpes
+            'BFC', // Bourgogne-Franche-Comté
+            'BRE', // Bretagne
+            'CVL', // Centre-Val de Loire
+            'COR', // Corse
+            'GES', // Grand Est
+            'GUA', // Guadeloupe
+            'HDF', // Hauts-de-France
+            'IDF', // Île-de-France
+            'MAY', // Mayotte
+            'NOR', // Normandie
+            'NAQ', // Nouvelle-Aquitaine
+            'OCC', // Occitanie
+            'PDL', // Pays de la Loire
+            'PAC', // Provence-Alpes-Côte d'Azur
+            'LRE', // La Réunion
+            '01', // Ain
+            '02', // Aisne
+            '03', // Allier
+            '04', // Alpes-de-Haute-Provence
+            '05', // Hautes-Alpes
+            '06', // Alpes-Maritimes
+            '07', // Ardèche
+            '08', // Ardennes
+            '09', // Ariège
+            '10', // Aube
+            '11', // Aude
+            '12', // Aveyron
+            '13', // Bouches-du-Rhône
+            '14', // Calvados
+            '15', // Cantal
+            '16', // Charente
+            '17', // Charente-Maritime
+            '18', // Cher
+            '19', // Corrèze
+            '21', // Côte-d'Or
+            '22', // Côtes-d'Armor
+            '23', // Creuse
+            '24', // Dordogne
+            '25', // Doubs
+            '26', // Drôme
+            '27', // Eure
+            '28', // Eure-et-Loir
+            '29', // Finistère
+            '2A', // Corse-du-Sud
+            '2B', // Haute-Corse
+            '30', // Gard
+            '31', // Haute-Garonne
+            '32', // Gers
+            '33', // Gironde
+            '34', // Hérault
+            '35', // Ille-et-Vilaine
+            '36', // Indre
+            '37', // Indre-et-Loire
+            '38', // Isère
+            '39', // Jura
+            '40', // Landes
+            '41', // Loir-et-Cher
+            '42', // Loire
+            '43', // Haute-Loire
+            '44', // Loire-Atlantique
+            '45', // Loiret
+            '46', // Lot
+            '47', // Lot-et-Garonne
+            '48', // Lozère
+            '49', // Maine-et-Loire
+            '50', // Manche
+            '51', // Marne
+            '52', // Haute-Marne
+            '53', // Mayenne
+            '54', // Meurthe-et-Moselle
+            '55', // Meuse
+            '56', // Morbihan
+            '57', // Moselle
+            '58', // Nièvre
+            '59', // Nord
+            '60', // Oise
+            '61', // Orne
+            '62', // Pas-de-Calais
+            '63', // Puy-de-Dôme
+            '64', // Pyrénées-Atlantiques
+            '65', // Hautes-Pyrénées
+            '66', // Pyrénées-Orientales
+            '67', // Bas-Rhin
+            '68', // Haut-Rhin
+            '69', // Rhône
+            '70', // Haute-Saône
+            '71', // Saône-et-Loire
+            '72', // Sarthe
+            '73', // Savoie
+            '74', // Haute-Savoie
+            '75', // Paris
+            '76', // Seine-Maritime
+            '77', // Seine-et-Marne
+            '78', // Yvelines
+            '79', // Deux-Sèvres
+            '80', // Somme
+            '81', // Tarn
+            '82', // Tarn-et-Garonne
+            '83', // Var
+            '84', // Vaucluse
+            '85', // Vendée
+            '86', // Vienne
+            '87', // Haute-Vienne
+            '88', // Vosges
+            '89', // Yonne
+            '90', // Territoire de Belfort
+            '91', // Essonne
+            '92', // Hauts-de-Seine
+            '93', // Seine-Saint-Denis
+            '94', // Val-de-Marne
+            '95', // Val-d'Oise
+            'BL', // Saint Barthélemy (see also separate ISO 3166-1 entry under BL)
+            'CP', // Clipperton
+            'GF', // Guyane (française) (see also separate country code entry under GF)
+            'GP', // Guadeloupe (see also separate country code entry under GP)
+            'MF', // Saint Martin (see also separate ISO 3166-1 entry under MF)
+            'MQ', // Martinique (see also separate country code entry under MQ)
+            'NC', // Nouvelle-Calédonie (see also separate ISO 3166-1 entry under NC)
+            'PF', // Polynésie française (see also separate ISO 3166-1 entry under PF)
+            'PM', // Saint-Pierre-et-Miquelon (see also separate ISO 3166-1 entry under PM)
+            'RE', // La Réunion (see also separate country code entry under RE)
+            'TF', // Terres Australes Françaises (see also separate ISO 3166-1 entry under TF)
+            'WF', // Wallis et Futuna (see also separate ISO 3166-1 entry under WF)
+            'YT', // Mayotte (see also separate ISO 3166-1 entry under YT)
       ];
    }
 }
--- a/library/Validator.php
+++ b/library/Validator.php
@ -32,18 +32,19 @@ use Respect\Validation\Rules\Key;
 * @method static Validator attribute(string $reference, Validatable $validator = null, bool $mandatory = true)
 * @method static Validator base()
 * @method static Validator base64()
- * @method static Validator between(mixed $minimum, mixed $maximum, bool $inclusive = true)
+ * @method static Validator between($minimum, $maximum, bool $inclusive = true)
+ * @method static Validator bic(string $countryCode)
 * @method static Validator boolType()
 * @method static Validator boolVal()
 * @method static Validator bsn()
 * @method static Validator call()
 * @method static Validator callableType()
- * @method static Validator callback(mixed $callback)
- * @method static Validator charset(mixed $charset)
+ * @method static Validator callback(callable $callback)
+ * @method static Validator charset($charset)
 * @method static Validator cnh()
 * @method static Validator cnpj()
 * @method static Validator consonant(string $additionalChars = null)
- * @method static Validator contains(mixed $containsValue, bool $identical = false)
+ * @method static Validator contains($containsValue, bool $identical = false)
 * @method static Validator countable()
 * @method static Validator countryCode()
 * @method static Validator currencyCode()
@ -56,8 +57,8 @@ use Respect\Validation\Rules\Key;
 * @method static Validator domain(bool $tldCheck = true)
 * @method static Validator each(Validatable $itemValidator = null, Validatable $keyValidator = null)
 * @method static Validator email()
- * @method static Validator endsWith(mixed $endValue, bool $identical = false)
- * @method static Validator equals(mixed $compareTo)
+ * @method static Validator endsWith($endValue, bool $identical = false)
+ * @method static Validator equals($compareTo)
 * @method static Validator even()
 * @method static Validator executable()
 * @method static Validator exists()
@ -66,22 +67,22 @@ use Respect\Validation\Rules\Key;
 * @method static Validator falseVal()
 * @method static Validator fibonacci()
 * @method static Validator file()
- * @method static Validator filterVar(int $filter, mixed $options = null)
+ * @method static Validator filterVar(int $filter, $options = null)
 * @method static Validator finite()
 * @method static Validator floatVal()
 * @method static Validator floatType()
 * @method static Validator graph(string $additionalChars = null)
 * @method static Validator hexRgbColor()
- * @method static Validator identical(mixed $value)
+ * @method static Validator identical($value)
 * @method static Validator identityCard(string $countryCode)
 * @method static Validator image(finfo $fileInfo = null)
 * @method static Validator imei()
- * @method static Validator in(mixed $haystack, bool $compareIdentical = false)
+ * @method static Validator in($haystack, bool $compareIdentical = false)
 * @method static Validator infinite()
 * @method static Validator instance(string $instanceName)
 * @method static Validator intVal()
 * @method static Validator intType()
- * @method static Validator ip(mixed $ipOptions = null)
+ * @method static Validator ip($ipOptions = null)
 * @method static Validator iterableType()
 * @method static Validator json()
 * @method static Validator key(string $reference, Validatable $referenceValidator = null, bool $mandatory = true)
@ -95,10 +96,10 @@ use Respect\Validation\Rules\Key;
 * @method static Validator lowercase()
 * @method static Validator luhn()
 * @method static Validator macAddress()
- * @method static Validator max(mixed $maxValue, bool $inclusive = true)
+ * @method static Validator max($maxValue, bool $inclusive = true)
 * @method static Validator maximumAge(int $age, string $format = null)
 * @method static Validator mimetype(string $mimetype)
- * @method static Validator min(mixed $minValue, bool $inclusive = true)
+ * @method static Validator min($minValue, bool $inclusive = true)
 * @method static Validator minimumAge(int $age, bool $format = null)
 * @method static Validator multiple(int $multipleOf)
 * @method static Validator negative()
@ -137,7 +138,7 @@ use Respect\Validation\Rules\Key;
 * @method static Validator size(string $minSize = null, string $maxSize = null)
 * @method static Validator slug()
 * @method static Validator space(string $additionalChars = null)
- * @method static Validator startsWith(mixed $startValue, bool $identical = false)
+ * @method static Validator startsWith($startValue, bool $identical = false)
 * @method static Validator stringType()
 * @method static Validator stringVal()
 * @method static Validator subdivisionCode(string $countryCode)
@ -159,7 +160,7 @@ use Respect\Validation\Rules\Key;
 * @method static Validator writable()
 * @method static Validator xdigit(string $additionalChars = null)
 * @method static Validator yes($useLocale = false)
- * @method static Validator zend(mixed $validator, array $params = null)
+ * @method static Validator zend($validator, array $params = null)
 */
 class Validator extends AllOf
 {