From ae1ce2c47de16916db8473c21b3620f4afebe6df Mon Sep 17 00:00:00 2001
From: Yevgeny Tomenko <skie@mail.ru>
Date: Sun, 16 Feb 2020 00:24:55 +0300
Subject: [PATCH 1/9] upgrade to cakephp 4.0

---
 .semver                                       |   5 ++
 composer.json                                 |  30 ++++++++--
 phpunit.xml.dist                              |  11 ----
 {src/Locale => resources/locales}/ar/cake.po  |   0
 .../locales}/ar_TN/cake.po                    |   0
 .../locales}/ca_ES/cake.po                    |   0
 {src/Locale => resources/locales}/cake.pot    |   0
 {src/Locale => resources/locales}/cs/cake.po  |   0
 {src/Locale => resources/locales}/da/cake.po  |   0
 {src/Locale => resources/locales}/de/cake.po  |   0
 {src/Locale => resources/locales}/es/cake.mo  | Bin
 {src/Locale => resources/locales}/es/cake.po  |   0
 .../locales}/fa_IR/cake.po                    |   0
 .../locales}/fr_FR/cake.po                    |   0
 {src/Locale => resources/locales}/hu/cake.po  |   0
 {src/Locale => resources/locales}/it/cake.po  |   0
 .../locales}/ja_JP/cake.po                    |   0
 {src/Locale => resources/locales}/nb/cake.po  |   0
 {src/Locale => resources/locales}/nl/cake.po  |   0
 {src/Locale => resources/locales}/no/cake.po  |   0
 {src/Locale => resources/locales}/pl/cake.po  |   0
 {src/Locale => resources/locales}/pt/cake.po  |   0
 .../locales}/ro_RO/cake.po                    |   0
 {src/Locale => resources/locales}/ru/cake.po  |   0
 {src/Locale => resources/locales}/tr/cake.po  |   0
 {src/Locale => resources/locales}/ua/cake.po  |   0
 {src/Locale => resources/locales}/vi/cake.po  |   0
 .../locales}/zh_CN/cake.po                    |   0
 src/Plugin.php                                |  30 ++++++++++
 src/Validation/AtValidation.php               |  22 +++----
 src/Validation/AuValidation.php               |  20 ++++---
 src/Validation/BdValidation.php               |  20 ++++---
 src/Validation/BeValidation.php               |  20 ++++---
 src/Validation/BrValidation.php               |  54 +++++++++---------
 src/Validation/CaValidation.php               |  20 ++++---
 src/Validation/ChValidation.php               |  22 +++----
 src/Validation/CnValidation.php               |  20 ++++---
 src/Validation/CzValidation.php               |  20 ++++---
 src/Validation/DeValidation.php               |  24 ++++----
 src/Validation/DkValidation.php               |  28 ++++-----
 src/Validation/EsValidation.php               |  42 +++++++-------
 src/Validation/FiValidation.php               |  51 ++++++++---------
 src/Validation/FrValidation.php               |  26 +++++----
 src/Validation/GbValidation.php               |  22 +++----
 src/Validation/HrValidation.php               |  18 +++---
 src/Validation/IdValidation.php               |  26 +++++----
 src/Validation/InValidation.php               |  18 +++---
 src/Validation/IrValidation.php               |  34 +++++------
 src/Validation/ItValidation.php               |  34 +++++------
 src/Validation/JpValidation.php               |  28 ++++-----
 src/Validation/LocalizedValidation.php        |   8 ++-
 src/Validation/LtValidation.php               |  18 +++---
 src/Validation/LvValidation.php               |  23 ++++----
 src/Validation/MxValidation.php               |  18 +++---
 src/Validation/NlValidation.php               |  20 ++++---
 src/Validation/NoValidation.php               |  18 +++---
 src/Validation/PlValidation.php               |  54 +++++++-----------
 src/Validation/PtValidation.php               |  22 +++----
 src/Validation/RoValidation.php               |  22 +++----
 src/Validation/RsValidation.php               |  36 ++++++------
 src/Validation/RuValidation.php               |  32 ++++++-----
 src/Validation/SkValidation.php               |  20 ++++---
 src/Validation/TnValidation.php               |  22 +++----
 src/Validation/TrValidation.php               |  22 +++----
 src/Validation/TwValidation.php               |  36 ++++++------
 src/Validation/UaValidation.php               |  24 ++++----
 src/Validation/UkValidation.php               |  10 ++--
 src/Validation/UsValidation.php               |  22 +++----
 src/Validation/ValidationInterface.php        |  16 +++---
 tests/TestCase/IntegrationTest.php            |  10 ++--
 .../TestCase/Validation/AtValidationTest.php  |   2 +
 .../TestCase/Validation/AuValidationTest.php  |   2 +
 .../TestCase/Validation/BdValidationTest.php  |   2 +
 .../TestCase/Validation/BeValidationTest.php  |   2 +
 .../TestCase/Validation/BrValidationTest.php  |  11 ++--
 .../TestCase/Validation/CaValidationTest.php  |   2 +
 .../TestCase/Validation/ChValidationTest.php  |   2 +
 .../TestCase/Validation/CnValidationTest.php  |   2 +
 .../TestCase/Validation/CzValidationTest.php  |   2 +
 .../TestCase/Validation/DeValidationTest.php  |   2 +-
 .../TestCase/Validation/DkValidationTest.php  |   2 +
 .../TestCase/Validation/EsValidationTest.php  |   2 +
 .../TestCase/Validation/FiValidationTest.php  |   3 +-
 .../TestCase/Validation/FrValidationTest.php  |   2 +
 .../TestCase/Validation/GbValidationTest.php  |   2 +
 .../TestCase/Validation/HrValidationTest.php  |   2 +
 ...idatationTest.php => IdValidationTest.php} |   2 +
 ...idatationTest.php => InValidationTest.php} |   2 +
 .../TestCase/Validation/IrValidationTest.php  |   2 +
 .../TestCase/Validation/ItValidationTest.php  |   2 +
 .../TestCase/Validation/JpValidationTest.php  |   2 +
 .../TestCase/Validation/LtValidationTest.php  |   2 +
 .../TestCase/Validation/LvValidationTest.php  |   3 +-
 .../TestCase/Validation/MxValidationTest.php  |   2 +
 .../TestCase/Validation/NlValidationTest.php  |   2 +
 .../TestCase/Validation/NoValidationTest.php  |   2 +
 .../TestCase/Validation/PlValidationTest.php  |   2 +
 .../TestCase/Validation/PtValidationTest.php  |   2 +
 .../TestCase/Validation/RoValidationTest.php  |   2 +
 .../TestCase/Validation/RsValidationTest.php  |   2 +
 .../TestCase/Validation/RuValidationTest.php  |   3 +
 .../TestCase/Validation/SkValidationTest.php  |   2 +
 .../TestCase/Validation/TnValidationTest.php  |   5 +-
 .../TestCase/Validation/TrValidationTest.php  |   2 +
 .../TestCase/Validation/TwValidationTest.php  |   2 +
 .../TestCase/Validation/UaValidationTest.php  |   2 +
 .../TestCase/Validation/UsValidationTest.php  |   2 +
 tests/bootstrap.php                           |  13 ++++-
 108 files changed, 688 insertions(+), 512 deletions(-)
 create mode 100644 .semver
 rename {src/Locale => resources/locales}/ar/cake.po (100%)
 mode change 100755 => 100644
 rename {src/Locale => resources/locales}/ar_TN/cake.po (100%)
 rename {src/Locale => resources/locales}/ca_ES/cake.po (100%)
 mode change 100755 => 100644
 rename {src/Locale => resources/locales}/cake.pot (100%)
 rename {src/Locale => resources/locales}/cs/cake.po (100%)
 rename {src/Locale => resources/locales}/da/cake.po (100%)
 rename {src/Locale => resources/locales}/de/cake.po (100%)
 rename {src/Locale => resources/locales}/es/cake.mo (100%)
 rename {src/Locale => resources/locales}/es/cake.po (100%)
 rename {src/Locale => resources/locales}/fa_IR/cake.po (100%)
 rename {src/Locale => resources/locales}/fr_FR/cake.po (100%)
 rename {src/Locale => resources/locales}/hu/cake.po (100%)
 rename {src/Locale => resources/locales}/it/cake.po (100%)
 rename {src/Locale => resources/locales}/ja_JP/cake.po (100%)
 rename {src/Locale => resources/locales}/nb/cake.po (100%)
 rename {src/Locale => resources/locales}/nl/cake.po (100%)
 rename {src/Locale => resources/locales}/no/cake.po (100%)
 rename {src/Locale => resources/locales}/pl/cake.po (100%)
 rename {src/Locale => resources/locales}/pt/cake.po (100%)
 rename {src/Locale => resources/locales}/ro_RO/cake.po (100%)
 rename {src/Locale => resources/locales}/ru/cake.po (100%)
 rename {src/Locale => resources/locales}/tr/cake.po (100%)
 rename {src/Locale => resources/locales}/ua/cake.po (100%)
 rename {src/Locale => resources/locales}/vi/cake.po (100%)
 rename {src/Locale => resources/locales}/zh_CN/cake.po (100%)
 create mode 100644 src/Plugin.php
 rename tests/TestCase/Validation/{IdValidatationTest.php => IdValidationTest.php} (97%)
 rename tests/TestCase/Validation/{InValidatationTest.php => InValidationTest.php} (99%)

diff --git a/.semver b/.semver
new file mode 100644
index 00000000..f5ef8df3
--- /dev/null
+++ b/.semver
@@ -0,0 +1,5 @@
+---
+:major: 3
+:minor: 0
+:patch: 0
+:special: ''
diff --git a/composer.json b/composer.json
index 63d233b6..c7f65c09 100644
--- a/composer.json
+++ b/composer.json
@@ -18,12 +18,12 @@
         "source": "https://github.com/cakephp/localized"
     },
     "require": {
-        "php": ">=5.6",
-        "cakephp/cakephp": "^3.5"
+        "php": ">=7.2",
+        "cakephp/cakephp": "^4.0.0"
     },
     "require-dev": {
-        "cakephp/cakephp-codesniffer": "^3.0",
-        "phpunit/phpunit": "^4.8|^5.7|^6.0"
+        "cakephp/cakephp-codesniffer": "^4.0",
+        "phpunit/phpunit": "^8.0"
     },
     "autoload": {
         "psr-4": {
@@ -35,5 +35,27 @@
             "Cake\\Test\\": "vendor/cakephp/cakephp/tests",
             "Cake\\Localized\\Test\\": "tests"
         }
+    },
+    "scripts": {
+        "check": [
+            "@cs-check",
+            "@test",
+            "@analyse"
+        ],
+        "analyse": [
+            "@stan",
+            "@psalm"
+         ],
+        "cs-check": "phpcs -p --standard=vendor/cakephp/cakephp-codesniffer/CakePHP src/ tests/",
+        "cs-fix": "phpcbf --standard=vendor/cakephp/cakephp-codesniffer/CakePHP src/ tests/",
+        "test": "phpunit --stderr",
+        "stan": "phpstan analyse src/",
+        "psalm": "php vendor/psalm/phar/psalm.phar --show-info=false src/ ",
+        "stan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan:^0.12.0 psalm/phar:^3.7 && mv composer.backup composer.json",
+        "stan-rebuild-baseline": "phpstan analyse --configuration phpstan.neon --error-format baselineNeon src/ > phpstan-baseline.neon",
+        "psalm-rebuild-baseline": "php vendor/psalm/phar/psalm.phar --show-info=false  --set-baseline=psalm-baseline.xml  src/",
+        "rector": "rector process src/",
+        "rector-setup": "cp composer.json composer.backup && composer require --dev rector/rector:^0.7 && mv composer.backup composer.json",
+        "coverage-test": "phpunit --stderr --coverage-clover=clover.xml"
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 36ec5426..4b379895 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -3,7 +3,6 @@
     colors="true"
     processIsolation="false"
     stopOnFailure="false"
-    syntaxCheck="false"
     bootstrap="./tests/bootstrap.php"
     >
     <php>
@@ -18,15 +17,5 @@
         </testsuite>
     </testsuites>
 
-    <!-- Prevent coverage reports from looking in tests and vendors -->
-    <filter>
-        <blacklist>
-            <directory suffix=".php">./vendor/</directory>
-            <directory suffix=".ctp">./vendor/</directory>
-
-            <directory suffix=".php">./tests/</directory>
-            <directory suffix=".ctp">./tests/</directory>
-        </blacklist>
-    </filter>
 
 </phpunit>
diff --git a/src/Locale/ar/cake.po b/resources/locales/ar/cake.po
old mode 100755
new mode 100644
similarity index 100%
rename from src/Locale/ar/cake.po
rename to resources/locales/ar/cake.po
diff --git a/src/Locale/ar_TN/cake.po b/resources/locales/ar_TN/cake.po
similarity index 100%
rename from src/Locale/ar_TN/cake.po
rename to resources/locales/ar_TN/cake.po
diff --git a/src/Locale/ca_ES/cake.po b/resources/locales/ca_ES/cake.po
old mode 100755
new mode 100644
similarity index 100%
rename from src/Locale/ca_ES/cake.po
rename to resources/locales/ca_ES/cake.po
diff --git a/src/Locale/cake.pot b/resources/locales/cake.pot
similarity index 100%
rename from src/Locale/cake.pot
rename to resources/locales/cake.pot
diff --git a/src/Locale/cs/cake.po b/resources/locales/cs/cake.po
similarity index 100%
rename from src/Locale/cs/cake.po
rename to resources/locales/cs/cake.po
diff --git a/src/Locale/da/cake.po b/resources/locales/da/cake.po
similarity index 100%
rename from src/Locale/da/cake.po
rename to resources/locales/da/cake.po
diff --git a/src/Locale/de/cake.po b/resources/locales/de/cake.po
similarity index 100%
rename from src/Locale/de/cake.po
rename to resources/locales/de/cake.po
diff --git a/src/Locale/es/cake.mo b/resources/locales/es/cake.mo
similarity index 100%
rename from src/Locale/es/cake.mo
rename to resources/locales/es/cake.mo
diff --git a/src/Locale/es/cake.po b/resources/locales/es/cake.po
similarity index 100%
rename from src/Locale/es/cake.po
rename to resources/locales/es/cake.po
diff --git a/src/Locale/fa_IR/cake.po b/resources/locales/fa_IR/cake.po
similarity index 100%
rename from src/Locale/fa_IR/cake.po
rename to resources/locales/fa_IR/cake.po
diff --git a/src/Locale/fr_FR/cake.po b/resources/locales/fr_FR/cake.po
similarity index 100%
rename from src/Locale/fr_FR/cake.po
rename to resources/locales/fr_FR/cake.po
diff --git a/src/Locale/hu/cake.po b/resources/locales/hu/cake.po
similarity index 100%
rename from src/Locale/hu/cake.po
rename to resources/locales/hu/cake.po
diff --git a/src/Locale/it/cake.po b/resources/locales/it/cake.po
similarity index 100%
rename from src/Locale/it/cake.po
rename to resources/locales/it/cake.po
diff --git a/src/Locale/ja_JP/cake.po b/resources/locales/ja_JP/cake.po
similarity index 100%
rename from src/Locale/ja_JP/cake.po
rename to resources/locales/ja_JP/cake.po
diff --git a/src/Locale/nb/cake.po b/resources/locales/nb/cake.po
similarity index 100%
rename from src/Locale/nb/cake.po
rename to resources/locales/nb/cake.po
diff --git a/src/Locale/nl/cake.po b/resources/locales/nl/cake.po
similarity index 100%
rename from src/Locale/nl/cake.po
rename to resources/locales/nl/cake.po
diff --git a/src/Locale/no/cake.po b/resources/locales/no/cake.po
similarity index 100%
rename from src/Locale/no/cake.po
rename to resources/locales/no/cake.po
diff --git a/src/Locale/pl/cake.po b/resources/locales/pl/cake.po
similarity index 100%
rename from src/Locale/pl/cake.po
rename to resources/locales/pl/cake.po
diff --git a/src/Locale/pt/cake.po b/resources/locales/pt/cake.po
similarity index 100%
rename from src/Locale/pt/cake.po
rename to resources/locales/pt/cake.po
diff --git a/src/Locale/ro_RO/cake.po b/resources/locales/ro_RO/cake.po
similarity index 100%
rename from src/Locale/ro_RO/cake.po
rename to resources/locales/ro_RO/cake.po
diff --git a/src/Locale/ru/cake.po b/resources/locales/ru/cake.po
similarity index 100%
rename from src/Locale/ru/cake.po
rename to resources/locales/ru/cake.po
diff --git a/src/Locale/tr/cake.po b/resources/locales/tr/cake.po
similarity index 100%
rename from src/Locale/tr/cake.po
rename to resources/locales/tr/cake.po
diff --git a/src/Locale/ua/cake.po b/resources/locales/ua/cake.po
similarity index 100%
rename from src/Locale/ua/cake.po
rename to resources/locales/ua/cake.po
diff --git a/src/Locale/vi/cake.po b/resources/locales/vi/cake.po
similarity index 100%
rename from src/Locale/vi/cake.po
rename to resources/locales/vi/cake.po
diff --git a/src/Locale/zh_CN/cake.po b/resources/locales/zh_CN/cake.po
similarity index 100%
rename from src/Locale/zh_CN/cake.po
rename to resources/locales/zh_CN/cake.po
diff --git a/src/Plugin.php b/src/Plugin.php
new file mode 100644
index 00000000..96ec00f2
--- /dev/null
+++ b/src/Plugin.php
@@ -0,0 +1,30 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Localized Plugin class.
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link http://cakephp.org
+ * @since Localized Plugin v 0.1
+ * @license http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+namespace Cake\Localized;
+
+use Cake\Core\BasePlugin;
+
+class Plugin extends BasePlugin
+{
+    /**
+     * Plugin name.
+     *
+     * @var string
+     */
+    protected $name = 'Localized';
+}
diff --git a/src/Validation/AtValidation.php b/src/Validation/AtValidation.php
index aedf20bc..8913166f 100644
--- a/src/Validation/AtValidation.php
+++ b/src/Validation/AtValidation.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Austrian Localized Validation class. Handles localized validation for Austria.
  *
@@ -8,10 +10,10 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org
- * @since         Localized Plugin v 0.1
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link http://cakephp.org
+ * @since Localized Plugin v 0.1
+ * @license http://www.opensource.org/licenses/mit-license.php MIT License
  */
 namespace Cake\Localized\Validation;
 
@@ -29,9 +31,9 @@ class AtValidation extends LocalizedValidation
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function postal($check)
+    public static function postal(string $check): bool
     {
-        $pattern = '/^[0-9]{4}$/';
+        $pattern = '/^\d{4}$/';
 
         return (bool)preg_match($pattern, $check);
     }
@@ -40,10 +42,10 @@ public static function postal($check)
      * Checks a phone number.
      *
      * @param string $check The value to check.
-     * @throws NotImplementedException Exception
+     * @throws \Cake\Network\Exception\NotImplementedException Exception
      * @return bool Success.
      */
-    public static function phone($check)
+    public static function phone(string $check): bool
     {
         throw new NotImplementedException(__d('localized', '%s Not implemented yet.'));
     }
@@ -52,10 +54,10 @@ public static function phone($check)
      * Checks a country specific identification number.
      *
      * @param string $check The value to check.
-     * @throws NotImplementedException Exception
+     * @throws \Cake\Network\Exception\NotImplementedException Exception
      * @return bool Success.
      */
-    public static function personId($check)
+    public static function personId(string $check): bool
     {
         throw new NotImplementedException(__d('localized', '%s Not implemented yet.'));
     }
diff --git a/src/Validation/AuValidation.php b/src/Validation/AuValidation.php
index 0f548529..6f80d2d7 100644
--- a/src/Validation/AuValidation.php
+++ b/src/Validation/AuValidation.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Australian Localised Validation class. Handles localised validation for Australia.
  *
@@ -8,10 +10,10 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org
- * @since         Localized Plugin v 0.1
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link http://cakephp.org
+ * @since Localized Plugin v 0.1
+ * @license http://www.opensource.org/licenses/mit-license.php MIT License
  */
 namespace Cake\Localized\Validation;
 
@@ -29,9 +31,9 @@ class AuValidation extends LocalizedValidation
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function postal($check)
+    public static function postal(string $check): bool
     {
-        $pattern = '/^[0-9]{4}$/';
+        $pattern = '/^\d{4}$/';
 
         return (bool)preg_match($pattern, $check);
     }
@@ -42,7 +44,7 @@ public static function postal($check)
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function phone($check)
+    public static function phone(string $check): bool
     {
         $normalized = preg_replace('/(\s+|-|\(|\))/', '', preg_replace('/0011\s?61/', '+61', $check)); //remove spaces, parentheses and hyphens, convert full intl prefix.
         $pattern = '/^(((0|\+61)[2378])(\d){8}|((0|\+61)[45](\d){2}|1300|1800|190[02])(\d){6}|(\+61)?180(\d){4}|(\+61)?13\d{4}|(\+61)?12[2-8](\d){1,7}|(\+61|0)14[12357](\d){6})$/';
@@ -54,10 +56,10 @@ public static function phone($check)
      * Checks an identification number.
      *
      * @param string $check The value to check.
-     * @throws NotImplementedException Exception
+     * @throws \Cake\Network\Exception\NotImplementedException Exception
      * @return bool Success.
      */
-    public static function personId($check)
+    public static function personId(string $check): bool
     {
         throw new NotImplementedException(__d('localized', '%s Not implemented yet.'));
     }
diff --git a/src/Validation/BdValidation.php b/src/Validation/BdValidation.php
index 4c5e68d5..f44b5f67 100644
--- a/src/Validation/BdValidation.php
+++ b/src/Validation/BdValidation.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * BD Localized Validation class. Handles localized validation for Bangladesh.
  *
@@ -8,10 +10,10 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org
- * @since         Localized Plugin v 0.1
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link http://cakephp.org
+ * @since Localized Plugin v 0.1
+ * @license http://www.opensource.org/licenses/mit-license.php MIT License
  */
 namespace Cake\Localized\Validation;
 
@@ -29,7 +31,7 @@ class BdValidation extends LocalizedValidation
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function postal($check)
+    public static function postal(string $check): bool
     {
         $pattern = '/^\d{4}$/';
 
@@ -40,10 +42,10 @@ public static function postal($check)
      * Checks a phone number.
      *
      * @param string $check The value to check.
-     * @throws NotImplementedException Exception
+     * @throws \Cake\Network\Exception\NotImplementedException Exception
      * @return bool Success.
      */
-    public static function phone($check)
+    public static function phone(string $check): bool
     {
         throw new NotImplementedException(__d('localized', '%s Not implemented yet.'));
     }
@@ -52,10 +54,10 @@ public static function phone($check)
      * Checks a country specific identification number.
      *
      * @param string $check The value to check.
-     * @throws NotImplementedException Exception
+     * @throws \Cake\Network\Exception\NotImplementedException Exception
      * @return bool Success.
      */
-    public static function personId($check)
+    public static function personId(string $check): bool
     {
         throw new NotImplementedException(__d('localized', '%s Not implemented yet.'));
     }
diff --git a/src/Validation/BeValidation.php b/src/Validation/BeValidation.php
index 8f314a1a..ca47dbbb 100644
--- a/src/Validation/BeValidation.php
+++ b/src/Validation/BeValidation.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Belgian Localized Validation class. Handles localized validation for Belgium.
  *
@@ -8,10 +10,10 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org
- * @since         Localized Plugin v 0.1
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link http://cakephp.org
+ * @since Localized Plugin v 0.1
+ * @license http://www.opensource.org/licenses/mit-license.php MIT License
  */
 namespace Cake\Localized\Validation;
 
@@ -29,9 +31,9 @@ class BeValidation extends LocalizedValidation
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function postal($check)
+    public static function postal(string $check): bool
     {
-        $pattern = '/^[1-9]{1}[0-9]{3}$/';
+        $pattern = '/^[1-9]{1}\d{3}$/';
 
         return (bool)preg_match($pattern, $check);
     }
@@ -40,10 +42,10 @@ public static function postal($check)
      * Checks a phone number.
      *
      * @param string $check The value to check.
-     * @throws NotImplementedException Exception
+     * @throws \Cake\Network\Exception\NotImplementedException Exception
      * @return bool Success.
      */
-    public static function phone($check)
+    public static function phone(string $check): bool
     {
         throw new NotImplementedException(__d('localized', '%s Not implemented yet.'));
     }
@@ -54,7 +56,7 @@ public static function phone($check)
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function personId($check)
+    public static function personId(string $check): bool
     {
         throw new NotImplementedException(__d('localized', '%s Not implemented yet.'));
     }
diff --git a/src/Validation/BrValidation.php b/src/Validation/BrValidation.php
index eae82d13..d8022275 100644
--- a/src/Validation/BrValidation.php
+++ b/src/Validation/BrValidation.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Brazillian Localized Validation class. Handles localized validation for Brazil.
  *
@@ -8,10 +10,10 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright    Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link         http://cakephp.org
- * @since        Localized Plugin v 0.1
- * @license      http://www.opensource.org/licenses/mit-license.php MIT License
+ * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link http://cakephp.org
+ * @since Localized Plugin v 0.1
+ * @license http://www.opensource.org/licenses/mit-license.php MIT License
  */
 namespace Cake\Localized\Validation;
 
@@ -27,7 +29,7 @@ class BrValidation extends LocalizedValidation
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function phone($check)
+    public static function phone(string $check): bool
     {
         return (bool)preg_match('/^(\+?\d{1,3}? ?)?(\(0?\d{2}\) ?)?9?\d{4}[-. ]?\d{4}$/', $check);
     }
@@ -38,9 +40,9 @@ public static function phone($check)
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function postal($check)
+    public static function postal(string $check): bool
     {
-        return (bool)preg_match('/^[0-9]{5}-?[0-9]{3}$/', $check);
+        return (bool)preg_match('/^\d{5}-?\d{3}$/', $check);
     }
 
     /**
@@ -49,7 +51,7 @@ public static function postal($check)
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function personId($check)
+    public static function personId(string $check): bool
     {
         return BrValidation::cpf($check) || BrValidation::cnpj($check);
     }
@@ -60,9 +62,9 @@ public static function personId($check)
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function cpf($check)
+    public static function cpf(string $check): bool
     {
-        $check = trim($check);
+        $check = trim(strval($check));
 
         // sometimes the user submits a masked CNPJ
         if (preg_match('/^\d\d\d.\d\d\d.\d\d\d\-\d\d/', $check)) {
@@ -71,13 +73,13 @@ public static function cpf($check)
             return false;
         }
 
-        if (strlen($check) != 11) {
+        if (strlen($check) !== 11) {
             return false;
         }
 
         // repeated values are invalid, but algorithms fails to check it
         for ($i = 0; $i < 10; $i++) {
-            if (str_repeat($i, 11) === $check) {
+            if (str_repeat(strval($i), 11) === $check) {
                 return false;
             }
         }
@@ -90,15 +92,11 @@ public static function cpf($check)
                 $sum += $check[$i] * $position;
             }
             $div = $sum % 11;
-            if ($div < 2) {
-                $check[$pos] = 0;
-            } else {
-                $check[$pos] = 11 - $div;
-            }
+            $check[$pos] = $div < 2 ? 0 : 11 - $div;
         }
         $dvRight = $check[9] * 10 + $check[10];
 
-        return ($dvRight == $dv);
+        return $dvRight == $dv;
     }
 
     /**
@@ -107,9 +105,9 @@ public static function cpf($check)
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function cnpj($check)
+    public static function cnpj(string $check): bool
     {
-        $check = trim($check);
+        $check = trim(strval($check));
         // sometimes the user submits a masked CNPJ
         if (preg_match('/^\d\d.\d\d\d.\d\d\d\/\d\d\d\d\-\d\d/', $check)) {
             $check = str_replace(['-', '.', '/'], '', $check);
@@ -117,21 +115,21 @@ public static function cnpj($check)
             return false;
         }
 
-        if (strlen($check) != 14) {
+        if (strlen($check) !== 14) {
             return false;
         }
         $firstSum = ($check[0] * 5) + ($check[1] * 4) + ($check[2] * 3) + ($check[3] * 2) +
             ($check[4] * 9) + ($check[5] * 8) + ($check[6] * 7) + ($check[7] * 6) +
             ($check[8] * 5) + ($check[9] * 4) + ($check[10] * 3) + ($check[11] * 2);
 
-        $firstVerificationDigit = ($firstSum % 11) < 2 ? 0 : 11 - ($firstSum % 11);
+        $firstVerificationDigit = $firstSum % 11 < 2 ? 0 : 11 - ($firstSum % 11);
 
         $secondSum = ($check[0] * 6) + ($check[1] * 5) + ($check[2] * 4) + ($check[3] * 3) +
             ($check[4] * 2) + ($check[5] * 9) + ($check[6] * 8) + ($check[7] * 7) +
             ($check[8] * 6) + ($check[9] * 5) + ($check[10] * 4) + ($check[11] * 3) +
             ($check[12] * 2);
 
-        $secondVerificationDigit = ($secondSum % 11) < 2 ? 0 : 11 - ($secondSum % 11);
+        $secondVerificationDigit = $secondSum % 11 < 2 ? 0 : 11 - ($secondSum % 11);
 
         return ($check[12] == $firstVerificationDigit) && ($check[13] == $secondVerificationDigit);
     }
@@ -142,7 +140,7 @@ public static function cnpj($check)
      * @param string $cnh License driver number
      * @return bool
      */
-    public static function cnh($cnh)
+    public static function cnh(string $cnh): bool
     {
         if (!is_numeric($cnh) && !is_string($cnh)) {
             return false;
@@ -154,7 +152,7 @@ public static function cnh($cnh)
         }
         // Check for repeated values
         for ($i = 0; $i < 10; $i++) {
-            if (str_repeat($i, 11) === $check) {
+            if (str_repeat(strval($i), 11) === $check) {
                 return false;
             }
         }
@@ -177,9 +175,9 @@ public static function cnh($cnh)
 
         // Calculate second digit
         $x = $v % 11;
-        $dv2 = ($x >= 10) ? 0 : $x - $dsc;
+        $dv2 = $x >= 10 ? 0 : $x - $dsc;
 
-        return ($dv1 . $dv2) === substr($check, -2);
+        return $dv1 . $dv2 === substr($check, -2);
     }
 
     /**
@@ -188,7 +186,7 @@ public static function cnh($cnh)
      * @param string|int $cns National Heath Card Number
      * @return bool
      */
-    public static function cns($cns)
+    public static function cns($cns): bool
     {
         if (!is_numeric($cns) && !is_string($cns)) {
             return false;
diff --git a/src/Validation/CaValidation.php b/src/Validation/CaValidation.php
index 853877bc..c4662375 100644
--- a/src/Validation/CaValidation.php
+++ b/src/Validation/CaValidation.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Canadian Localized Validation class. Handles localized validation for Canada.
  *
@@ -8,10 +10,10 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org
- * @since         Localized Plugin v 0.1
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link http://cakephp.org
+ * @since Localized Plugin v 0.1
+ * @license http://www.opensource.org/licenses/mit-license.php MIT License
  */
 namespace Cake\Localized\Validation;
 
@@ -29,9 +31,9 @@ class CaValidation extends LocalizedValidation
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function postal($check)
+    public static function postal(string $check): bool
     {
-        $pattern = '/\\A\\b[ABCEGHJKLMNPRSTVXY][0-9][A-Z] [0-9][A-Z][0-9]\\b\\z/i';
+        $pattern = '/\A\b[ABCEGHJKLMNPRSTVXY]\d[A-Z] \d[A-Z]\d\b\z/i';
 
         return (bool)preg_match($pattern, $check);
     }
@@ -40,10 +42,10 @@ public static function postal($check)
      * Checks a phone number.
      *
      * @param string $check The value to check.
-     * @throws NotImplementedException Exception
+     * @throws \Cake\Network\Exception\NotImplementedException Exception
      * @return bool Success.
      */
-    public static function phone($check)
+    public static function phone(string $check): bool
     {
         throw new NotImplementedException(__d('localized', '%s Not implemented yet.'));
     }
@@ -54,7 +56,7 @@ public static function phone($check)
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function personId($check)
+    public static function personId(string $check): bool
     {
         throw new NotImplementedException(__d('localized', '%s Not implemented yet.'));
     }
diff --git a/src/Validation/ChValidation.php b/src/Validation/ChValidation.php
index b4387225..9fc480a5 100644
--- a/src/Validation/ChValidation.php
+++ b/src/Validation/ChValidation.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Swiss Localized Validation class. Handles localized validation for Switzerland.
  *
@@ -8,10 +10,10 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org
- * @since         Localized Plugin v 0.1
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link http://cakephp.org
+ * @since Localized Plugin v 0.1
+ * @license http://www.opensource.org/licenses/mit-license.php MIT License
  */
 namespace Cake\Localized\Validation;
 
@@ -31,9 +33,9 @@ class ChValidation extends LocalizedValidation
      *
      * @link http://en.wikipedia.org/wiki/Postal_codes_in_Switzerland_and_Liechtenstein
      */
-    public static function postal($check)
+    public static function postal(string $check): bool
     {
-        $pattern = '/^[1-9][0-9]{3}$/';
+        $pattern = '/^[1-9]\d{3}$/';
 
         return (bool)preg_match($pattern, $check);
     }
@@ -42,10 +44,10 @@ public static function postal($check)
      * Checks a phone number.
      *
      * @param string $check The value to check.
-     * @throws NotImplementedException Exception
+     * @throws \Cake\Network\Exception\NotImplementedException Exception
      * @return bool Success.
      */
-    public static function phone($check)
+    public static function phone(string $check): bool
     {
         throw new NotImplementedException(__d('localized', '%s Not implemented yet.'));
     }
@@ -54,10 +56,10 @@ public static function phone($check)
      * Checks a country specific identification number.
      *
      * @param string $check The value to check.
-     * @throws NotImplementedException Exception
+     * @throws \Cake\Network\Exception\NotImplementedException Exception
      * @return bool Success.
      */
-    public static function personId($check)
+    public static function personId(string $check): bool
     {
         throw new NotImplementedException(__d('localized', '%s Not implemented yet.'));
     }
diff --git a/src/Validation/CnValidation.php b/src/Validation/CnValidation.php
index 76a8e7d8..e8b86407 100644
--- a/src/Validation/CnValidation.php
+++ b/src/Validation/CnValidation.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * CN Localized Validation class. Handles localized validation for The Peoples Republic of China (mainland)
  *
@@ -8,10 +10,10 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org
- * @since         Localized Plugin v 0.1
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link http://cakephp.org
+ * @since Localized Plugin v 0.1
+ * @license http://www.opensource.org/licenses/mit-license.php MIT License
  */
 namespace Cake\Localized\Validation;
 
@@ -32,7 +34,7 @@ class CnValidation extends LocalizedValidation
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function phone($check)
+    public static function phone(string $check): bool
     {
         // optional nation prefix
         $pattern = '/^(((0086)|(\+86))-?)?(';
@@ -54,9 +56,9 @@ public static function phone($check)
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function postal($check)
+    public static function postal(string $check): bool
     {
-        $pattern = '/^[0-9]{6}$/';
+        $pattern = '/^\d{6}$/';
 
         return (bool)preg_match($pattern, $check);
     }
@@ -69,7 +71,7 @@ public static function postal($check)
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function personId($check)
+    public static function personId(string $check): bool
     {
         if (strlen($check) !== 18) {
             return false;
@@ -93,6 +95,6 @@ public static function personId($check)
             }
         }
 
-        return ($checksum === (12 - ($sum % 11)) % 11);
+        return $checksum === (12 - ($sum % 11)) % 11;
     }
 }
diff --git a/src/Validation/CzValidation.php b/src/Validation/CzValidation.php
index e5af2551..5bae1fce 100644
--- a/src/Validation/CzValidation.php
+++ b/src/Validation/CzValidation.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Czech Localized Validation class. Handles localized validation for Czech Republic
  *
@@ -8,10 +10,10 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org
- * @since         Localized Plugin v 0.1
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link http://cakephp.org
+ * @since Localized Plugin v 0.1
+ * @license http://www.opensource.org/licenses/mit-license.php MIT License
  */
 namespace Cake\Localized\Validation;
 
@@ -29,7 +31,7 @@ class CzValidation extends LocalizedValidation
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function postal($check)
+    public static function postal(string $check): bool
     {
         $pattern = '/^[1-7]\d{2} ?\d{2}$/';
 
@@ -40,10 +42,10 @@ public static function postal($check)
      * Checks a phone number.
      *
      * @param string $check The value to check.
-     * @throws NotImplementedException Exception
+     * @throws \Cake\Network\Exception\NotImplementedException Exception
      * @return bool Success.
      */
-    public static function phone($check)
+    public static function phone(string $check): bool
     {
         throw new NotImplementedException(__d('localized', '%s Not implemented yet.'));
     }
@@ -52,10 +54,10 @@ public static function phone($check)
      * Checks a country specific identification number.
      *
      * @param string $check The value to check.
-     * @throws NotImplementedException Exception
+     * @throws \Cake\Network\Exception\NotImplementedException Exception
      * @return bool Success.
      */
-    public static function personId($check)
+    public static function personId(string $check): bool
     {
         throw new NotImplementedException(__d('localized', '%s Not implemented yet.'));
     }
diff --git a/src/Validation/DeValidation.php b/src/Validation/DeValidation.php
index 79d31885..935b8275 100644
--- a/src/Validation/DeValidation.php
+++ b/src/Validation/DeValidation.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * German Localized Validation class. Handles localized validation for Germany.
  *
@@ -8,10 +10,10 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org
- * @since         Localized Plugin v 0.1
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link http://cakephp.org
+ * @since Localized Plugin v 0.1
+ * @license http://www.opensource.org/licenses/mit-license.php MIT License
  */
 namespace Cake\Localized\Validation;
 
@@ -29,7 +31,7 @@ class DeValidation extends LocalizedValidation
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function postal($check)
+    public static function postal(string $check): bool
     {
         $pattern = '/^(0[1-46-9]\d{3}|[1-357-9]\d{4}|[4][0-24-9]\d{3}|[6][013-9]\d{3})$/';
 
@@ -44,9 +46,9 @@ public static function postal($check)
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function address1($check)
+    public static function address1(string $check): bool
     {
-        $pattern = '/[a-zA-ZäöüÄÖÜß \.]+ [0-9]+[a-zA-Z]?/';
+        $pattern = '/[a-zA-ZäöüÄÖÜß \.]+ \d+[a-zA-Z]?/';
 
         return (bool)preg_match($pattern, $check);
     }
@@ -57,7 +59,7 @@ public static function address1($check)
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function phone($check)
+    public static function phone(string $check): bool
     {
         $pattern = '/^[0-9\/. \-]*$/';
 
@@ -71,7 +73,7 @@ public static function phone($check)
      * @param string $check the date of birth.
      * @return bool Success.
      */
-    public static function dob($check)
+    public static function dob(string $check): bool
     {
         $pattern = '/^\d{2}\.\d{2}\.(\d{2}|\d{4})$/';
         $return = preg_match($pattern, $check);
@@ -88,10 +90,10 @@ public static function dob($check)
      * Checks a country specific identification number.
      *
      * @param string $check The value to check.
-     * @throws NotImplementedException Exception
+     * @throws \Cake\Network\Exception\NotImplementedException Exception
      * @return bool Success.
      */
-    public static function personId($check)
+    public static function personId(string $check): bool
     {
         throw new NotImplementedException(__d('localized', '%s Not implemented yet.'));
     }
diff --git a/src/Validation/DkValidation.php b/src/Validation/DkValidation.php
index f6eaa5d1..2693a9eb 100644
--- a/src/Validation/DkValidation.php
+++ b/src/Validation/DkValidation.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Danish Localized Validation class. Handles localized validation for Denmark.
  *
@@ -8,15 +10,13 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org
- * @since         Localized Plugin v 0.1
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link http://cakephp.org
+ * @since Localized Plugin v 0.1
+ * @license http://www.opensource.org/licenses/mit-license.php MIT License
  */
 namespace Cake\Localized\Validation;
 
-use Cake\Network\Exception\NotImplementedException;
-
 /**
  * DkValidation
  *
@@ -29,9 +29,9 @@ class DkValidation extends LocalizedValidation
      * @param string $check The value to check.
      * @return bool Success
      */
-    public static function personId($check)
+    public static function personId(string $check): bool
     {
-        $pattern = '/\\A\\b[0-9]{6}-[0-9]{4}\\b\\z/i';
+        $pattern = '/\A\b\d{6}-\d{4}\b\z/i';
 
         return (bool)preg_match($pattern, $check);
     }
@@ -40,12 +40,12 @@ public static function personId($check)
      * Checks a postal code for Denmark.
      *
      * @param string $check The value to check.
-     * @throws NotImplementedException Exception
+     * @throws \Cake\Network\Exception\NotImplementedException Exception
      * @return bool Success
      */
-    public static function postal($check)
+    public static function postal(string $check): bool
     {
-        $pattern = '/\\A\\b[0-9]{4}\\b\\z/i';
+        $pattern = '/\A\b\d{4}\b\z/i';
 
         return (bool)preg_match($pattern, $check);
     }
@@ -54,12 +54,12 @@ public static function postal($check)
      * Checks a phone number.
      *
      * @param string $check The value to check.
-     * @throws NotImplementedException Exception
+     * @throws \Cake\Network\Exception\NotImplementedException Exception
      * @return bool Success.
      */
-    public static function phone($check)
+    public static function phone(string $check): bool
     {
-        $pattern = '/\\A\\b[0-9]{8}\\b\\z/i';
+        $pattern = '/\A\b\d{8}\b\z/i';
 
         return (bool)preg_match($pattern, $check);
     }
diff --git a/src/Validation/EsValidation.php b/src/Validation/EsValidation.php
index dc899137..49d70931 100644
--- a/src/Validation/EsValidation.php
+++ b/src/Validation/EsValidation.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Spanish Localized Validation class. Handles localized validation for Spain.
  *
@@ -8,15 +10,13 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org
- * @since         Localized Plugin v 0.1
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link http://cakephp.org
+ * @since Localized Plugin v 0.1
+ * @license http://www.opensource.org/licenses/mit-license.php MIT License
  */
 namespace Cake\Localized\Validation;
 
-use Cake\Network\Exception\NotImplementedException;
-
 /**
  * EsValidation
  *
@@ -36,9 +36,9 @@ class EsValidation extends LocalizedValidation
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function postal($check)
+    public static function postal(string $check): bool
     {
-        $pattern = '/^(5[0-2]|[0-4][0-9])[0-9]{3}$/';
+        $pattern = '/^(5[0-2]|[0-4]\d)\d{3}$/';
 
         return (bool)preg_match($pattern, $check);
     }
@@ -49,9 +49,9 @@ public static function postal($check)
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function phone($check)
+    public static function phone(string $check): bool
     {
-        $pattern = '/^\\+?(34[-. ]?)?(([6789]{1})(([0-9]{2})[-. ]?|([0-9]{1})[-. ]?([0-9]{1}))|70[-. ]?([0-9]{1}))([0-9]{2})[-. ]?([0-9]{1})[-. ]?([0-9]{1})[-. ]?([0-9]{2})$/';
+        $pattern = '/^\+?(34[-. ]?)?(([6789]{1})((\d{2})[-. ]?|(\d{1})[-. ]?(\d{1}))|70[-. ]?(\d{1}))(\d{2})[-. ]?(\d{1})[-. ]?(\d{1})[-. ]?(\d{2})$/';
 
         return (bool)preg_match($pattern, $check);
     }
@@ -62,7 +62,7 @@ public static function phone($check)
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function personId($check)
+    public static function personId($check): bool
     {
         $checks = ['dni', 'nie', 'nif'];
 
@@ -81,14 +81,14 @@ public static function personId($check)
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function dni($check)
+    public static function dni(string $check): bool
     {
-        if (!preg_match('/^([0-9]+)([A-Z]{1})$/', $check, $matches)) {
+        if (!preg_match('/^(\d+)([A-Z]{1})$/', $check, $matches)) {
             return false;
         }
 
         array_shift($matches);
-        list($num, $letter) = $matches;
+        [$num, $letter] = $matches;
 
         return $letter === static::$CODES[$num % 23];
     }
@@ -99,14 +99,14 @@ public static function dni($check)
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function nie($check)
+    public static function nie(string $check): bool
     {
-        if (!preg_match('/^([XYZ])([0-9]+)([A-Z]{1})$/', $check, $matches)) {
+        if (!preg_match('/^([XYZ])(\d+)([A-Z]{1})$/', $check, $matches)) {
             return false;
         }
 
         array_shift($matches);
-        list($first, $num, $letter) = $matches;
+        [$first, $num, $letter] = $matches;
         $num = strtr($first, 'XYZ', '012') . $num;
 
         return $letter === static::$CODES[$num % 23];
@@ -118,9 +118,9 @@ public static function nie($check)
      * @param string $check The value to check.
      * @return bool Success
      */
-    public static function nif($check)
+    public static function nif(string $check): bool
     {
-        if (!preg_match('/^[KLM]{1}([0-9]+)([A-Z]{1})$/', $check, $matches)) {
+        if (!preg_match('/^[KLM]{1}(\d+)([A-Z]{1})$/', $check, $matches)) {
             return false;
         }
 
@@ -128,10 +128,10 @@ public static function nif($check)
 
         for ($i = 1; $i < 8; $i += 2) {
             $tmp = (string)(2 * $check[$i]);
-            $sum += $tmp[0] + ((strlen($tmp) == 2) ? $tmp[1] : 0);
+            $sum += $tmp[0] + (strlen($tmp) === 2 ? $tmp[1] : 0);
         }
 
-        $num = 10 - substr($sum, -1);
+        $num = 10 - substr(strval($sum), -1);
 
         return $check[strlen($check) - 1] === chr($num + 64);
     }
diff --git a/src/Validation/FiValidation.php b/src/Validation/FiValidation.php
index 1196f89b..16c2f066 100644
--- a/src/Validation/FiValidation.php
+++ b/src/Validation/FiValidation.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Finnish Localized Validation class. Handles localized validation for Finland.
  *
@@ -8,12 +10,11 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org
- * @since         Localized Plugin v 0.1
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link http://cakephp.org
+ * @since Localized Plugin v 0.1
+ * @license http://www.opensource.org/licenses/mit-license.php MIT License
  */
-
 namespace Cake\Localized\Validation;
 
 use Cake\Network\Exception\NotImplementedException;
@@ -24,7 +25,6 @@
  */
 class FiValidation extends LocalizedValidation
 {
-
     /**
      * Checks a postal code for Finland.
      *
@@ -32,9 +32,9 @@ class FiValidation extends LocalizedValidation
      *
      * @return bool Success.
      */
-    public static function postal($check)
+    public static function postal(string $check): bool
     {
-        $pattern = '/^[0-9]{5}$/';
+        $pattern = '/^\d{5}$/';
 
         return (bool)preg_match($pattern, $check);
     }
@@ -44,10 +44,10 @@ public static function postal($check)
      *
      * @param string $check The value to check.
      *
-     * @throws NotImplementedException Exception
+     * @throws \Cake\Network\Exception\NotImplementedException Exception
      * @return bool Success.
      */
-    public static function phone($check)
+    public static function phone(string $check): bool
     {
         throw new NotImplementedException(__d('localized', '%s Not implemented yet.'));
     }
@@ -59,10 +59,10 @@ public static function phone($check)
      *
      * @return bool Success.
      */
-    public static function personId($check)
+    public static function personId($check): bool
     {
-        $pattern = '/^[0-9]{6}[-+A][0-9A-Z]{4}$/';
-        if (!(bool)preg_match($pattern, $check)) {
+        $pattern = '/^\d{6}[-+A][0-9A-Z]{4}$/';
+        if (!(bool)preg_match($pattern, strval($check))) {
             return false;
         }
 
@@ -80,7 +80,7 @@ public static function personId($check)
         }
         $list = array_values($list);
 
-        return $check[strlen($check) - 1] === $list[intval(substr($check, 0, 6) . substr($check, 7, 3)) % 31];
+        return $check[strlen($check) - 1] === $list[(int)(substr($check, 0, 6) . substr($check, 7, 3)) % 31];
     }
 
     /**
@@ -90,7 +90,7 @@ public static function personId($check)
      *
      * @return bool Success
      */
-    public static function businessId($check)
+    public static function businessId(string $check): bool
     {
         $businessId = trim($check);
 
@@ -111,7 +111,7 @@ public static function businessId($check)
             return false;
         }
 
-        $checkResult = intval($businessId[strlen($businessId) - 1]);
+        $checkResult = (int)$businessId[strlen($businessId) - 1];
         $weights = [7, 9, 10, 5, 8, 4, 2];
         $n = 0;
 
@@ -123,11 +123,8 @@ public static function businessId($check)
         if ($match === 10) {
             return false;
         }
-        if ($match === $checkResult) {
-            return true;
-        }
 
-        return false;
+        return $match === $checkResult;
     }
 
     /**
@@ -137,16 +134,16 @@ public static function businessId($check)
      *
      * @return bool Success
      */
-    public static function creditorReference($check)
+    public static function creditorReference(string $check): bool
     {
-        if (preg_match('/^RF[0-9]{8,}$/', $check) === false) {
+        if (preg_match('/^RF\d{8,}$/', $check) === false) {
             return false;
         }
 
         $base = substr($check, 4, strlen($check) - 5);
         $checksum = substr($check, -1, 1);
 
-        if (preg_match('/^[0-9]{3,18}$/', $base) === false) {
+        if (preg_match('/^\d{3,18}$/', $base) === false) {
             return false;
         }
 
@@ -164,9 +161,9 @@ public static function creditorReference($check)
      *
      * @return bool Success
      */
-    public static function referenceNumber($check)
+    public static function referenceNumber(string $check): bool
     {
-        if (preg_match('/^[0-9]{4,19}$/', $check) === false) {
+        if (preg_match('/^\d{4,19}$/', $check) === false) {
             return false;
         }
 
@@ -186,7 +183,7 @@ public static function referenceNumber($check)
      *
      * @return int
      */
-    public static function calculateReferenceNumberChecksum($base)
+    public static function calculateReferenceNumberChecksum(string $base): int
     {
         $pattern = [7, 3, 1];
         $nodes = array_reverse(str_split($base, 1));
@@ -202,7 +199,7 @@ public static function calculateReferenceNumberChecksum($base)
             $i++;
         }
 
-        $lastItems = str_split($result, 1);
+        $lastItems = str_split(strval($result), 1);
         $checksum = 10 - end($lastItems);
 
         if ($checksum >= 10) {
diff --git a/src/Validation/FrValidation.php b/src/Validation/FrValidation.php
index 746a973f..46d44ba7 100644
--- a/src/Validation/FrValidation.php
+++ b/src/Validation/FrValidation.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * French Localized Validation class. Handles localized validation for France.
  *
@@ -8,10 +10,10 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org
- * @since         Localized Plugin v 0.1
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link http://cakephp.org
+ * @since Localized Plugin v 0.1
+ * @license http://www.opensource.org/licenses/mit-license.php MIT License
  */
 namespace Cake\Localized\Validation;
 
@@ -27,9 +29,9 @@ class FrValidation extends LocalizedValidation
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function phone($check)
+    public static function phone(string $check): bool
     {
-        $pattern = '/(^0|\+33)(0?[1-9]{1}|\s0?[1-9]{1}|-0?[1-9]{1}|\.0?[1-9]{1})(([0-9]{8})|((\s[0-9]{2}){4})|((-[0-9]{2}){4})|((\.[0-9]{2}){4}))$|(^0(508|596|590|594|262))(([0-9]{6})|((\s[0-9]{2}){3})|((-[0-9]{2}){3})|((\.[0-9]{2}){3}))$|(^\+(?\'intl\'508|596|590|594|262))((\k\'intl\'[0-9]{6})|(\s\k\'intl\'(\s[0-9]{2}){3})|(-\k\'intl\'(-[0-9]{2}){3})|(\.\k\'intl\'(\.[0-9]{2}){3}))$/';
+        $pattern = '/(^0|\+33)(0?[1-9]{1}|\s0?[1-9]{1}|-0?[1-9]{1}|\.0?[1-9]{1})((\d{8})|((\s\d{2}){4})|((-\d{2}){4})|((\.\d{2}){4}))$|(^0(508|596|590|594|262))((\d{6})|((\s\d{2}){3})|((-\d{2}){3})|((\.\d{2}){3}))$|(^\+(?\'intl\'508|596|590|594|262))((\k\'intl\'\d{6})|(\s\k\'intl\'(\s\d{2}){3})|(-\k\'intl\'(-\d{2}){3})|(\.\k\'intl\'(\.\d{2}){3}))$/';
 
         return (bool)preg_match($pattern, $check);
     }
@@ -40,11 +42,11 @@ public static function phone($check)
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function postal($check)
+    public static function postal(string $check): bool
     {
         $pattern = '/^\d{5}$/';
         if ((bool)preg_match($pattern, $check)) {
-            $value = intval($check);
+            $value = (int)$check;
 
             return $value >= 1000 && $value <= 99138;
         }
@@ -58,7 +60,7 @@ public static function postal($check)
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function personId($check)
+    public static function personId($check): bool
     {
         $pattern = '/^[12]\d{2}(0\d|1[012])(\d{2}|2[AB])\d{8}$/';
         if (!preg_match($pattern, $check)) {
@@ -71,14 +73,14 @@ public static function personId($check)
         // Corse special cases
         // source : http://xml.insee.fr/schema/nir.html
         // check : http://www.parodie.com/monetique/nir.htm
-        if ($numberWithoutKey[6] == 'A') {
+        if ($numberWithoutKey[6] === 'A') {
             $numberWithoutKey = str_replace('A', '0', $numberWithoutKey);
             $numberWithoutKey -= 1000000;
-        } elseif ($numberWithoutKey[6] == 'B') {
+        } elseif ($numberWithoutKey[6] === 'B') {
             $numberWithoutKey = str_replace('B', '0', $numberWithoutKey);
             $numberWithoutKey -= 2000000;
         }
 
-        return $key == (97 - ($numberWithoutKey - (floor($numberWithoutKey / 97) * 97)));
+        return $key == 97 - ($numberWithoutKey - (floor($numberWithoutKey / 97) * 97));
     }
 }
diff --git a/src/Validation/GbValidation.php b/src/Validation/GbValidation.php
index a806e577..5de751a4 100644
--- a/src/Validation/GbValidation.php
+++ b/src/Validation/GbValidation.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
@@ -6,10 +8,10 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org
- * @since         Localized Plugin v 0.1
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link http://cakephp.org
+ * @since Localized Plugin v 0.1
+ * @license http://www.opensource.org/licenses/mit-license.php MIT License
  */
 namespace Cake\Localized\Validation;
 
@@ -27,9 +29,9 @@ class GbValidation extends LocalizedValidation
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function postal($check)
+    public static function postal(string $check): bool
     {
-        $pattern = '/\\A\\b[A-Z]{1,2}[0-9][A-Z0-9]? ?[0-9][ABD-HJLNP-UW-Z]{2}\\b\\z/i';
+        $pattern = '/\A\b[A-Z]{1,2}\d[A-Z0-9]? ?\d[ABD-HJLNP-UW-Z]{2}\b\z/i';
 
         return (bool)preg_match($pattern, $check);
     }
@@ -38,10 +40,10 @@ public static function postal($check)
      * Checks a phone number.
      *
      * @param string $check The value to check.
-     * @throws NotImplementedException Exception
+     * @throws \Cake\Network\Exception\NotImplementedException Exception
      * @return bool Success.
      */
-    public static function phone($check)
+    public static function phone(string $check): bool
     {
         throw new NotImplementedException(__d('localized', '%s Not implemented yet.'));
     }
@@ -50,10 +52,10 @@ public static function phone($check)
      * Checks a country specific identification number.
      *
      * @param string $check The value to check.
-     * @throws NotImplementedException Exception
+     * @throws \Cake\Network\Exception\NotImplementedException Exception
      * @return bool Success.
      */
-    public static function personId($check)
+    public static function personId($check): bool
     {
         throw new NotImplementedException(__d('localized', '%s Not implemented yet.'));
     }
diff --git a/src/Validation/HrValidation.php b/src/Validation/HrValidation.php
index f5248b43..98d7f4af 100644
--- a/src/Validation/HrValidation.php
+++ b/src/Validation/HrValidation.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Localized Validation class. Handles localized validation for Croatia.
  *
@@ -8,9 +10,9 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link http://cakephp.org
+ * @license http://www.opensource.org/licenses/mit-license.php MIT License
  */
 namespace Cake\Localized\Validation;
 
@@ -28,7 +30,7 @@ class HrValidation extends LocalizedValidation
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function postal($check)
+    public static function postal(string $check): bool
     {
         $pattern = '/^\d{5}$/';
 
@@ -39,10 +41,10 @@ public static function postal($check)
      * Checks a phone number.
      *
      * @param string $check The value to check.
-     * @throws NotImplementedException Exception
+     * @throws \Cake\Network\Exception\NotImplementedException Exception
      * @return bool Success.
      */
-    public static function phone($check)
+    public static function phone(string $check): bool
     {
         throw new NotImplementedException(__d('localized', '%s Not implemented yet.'));
     }
@@ -51,10 +53,10 @@ public static function phone($check)
      * Checks a country specific identification number.
      *
      * @param string $check The value to check.
-     * @throws NotImplementedException Exception
+     * @throws \Cake\Network\Exception\NotImplementedException Exception
      * @return bool Success.
      */
-    public static function personId($check)
+    public static function personId($check): bool
     {
         throw new NotImplementedException(__d('localized', '%s Not implemented yet.'));
     }
diff --git a/src/Validation/IdValidation.php b/src/Validation/IdValidation.php
index fadf7f2a..93404743 100644
--- a/src/Validation/IdValidation.php
+++ b/src/Validation/IdValidation.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * ID Localized Validation class. Handles localized validation for Indonesia.
  *
@@ -8,10 +10,10 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org
- * @since         Localized Plugin v 0.1
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @copyright Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link http://cakephp.org
+ * @since Localized Plugin v 0.1
+ * @license http://www.opensource.org/licenses/mit-license.php MIT License
  */
 namespace Cake\Localized\Validation;
 
@@ -29,9 +31,9 @@ class IdValidation extends LocalizedValidation
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function postal($check)
+    public static function postal(string $check): bool
     {
-        $pattern = '/[1-9][0-9]{4}/';
+        $pattern = '/[1-9]\d{4}/';
 
         return (bool)preg_match($pattern, $check);
     }
@@ -42,9 +44,9 @@ public static function postal($check)
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function mobile($check)
+    public static function mobile(string $check): bool
     {
-        $pattern = '/(^0|^62|\+62)(8[0-9]{8,10})$/';
+        $pattern = '/(^0|^62|\+62)(8\d{8,10})$/';
 
         return (bool)preg_match($pattern, $check);
     }
@@ -53,10 +55,10 @@ public static function mobile($check)
      * Checks a phone number.
      *
      * @param string $check The value to check.
-     * @throws NotImplementedException Exception
+     * @throws \Cake\Network\Exception\NotImplementedException Exception
      * @return bool Success.
      */
-    public static function phone($check)
+    public static function phone(string $check): bool
     {
         throw new NotImplementedException(__d('localized', '%s Not implemented yet.'));
     }
@@ -65,10 +67,10 @@ public static function phone($check)
      * Checks a country specific identification number.
      *
      * @param string $check The value to check.
-     * @throws NotImplementedException Exception
+     * @throws \Cake\Network\Exception\NotImplementedException Exception
      * @return bool Success.
      */
-    public static function personId($check)
+    public static function personId($check): bool
     {
         throw new NotImplementedException(__d('localized', '%s Not implemented yet.'));
     }
diff --git a/src/Validation/InValidation.php b/src/Validation/InValidation.php
index 57ca15ac..236dd13e 100644
--- a/src/Validation/InValidation.php
+++ b/src/Validation/InValidation.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Indian Localized Validation class. Handles localized validation for India
  *
@@ -8,10 +10,10 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org
- * @since         Localized Plugin v 0.1
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link http://cakephp.org
+ * @since Localized Plugin v 0.1
+ * @license http://www.opensource.org/licenses/mit-license.php MIT License
  */
 namespace Cake\Localized\Validation;
 
@@ -28,7 +30,7 @@ class InValidation extends LocalizedValidation
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function postal($check)
+    public static function postal(string $check): bool
     {
         $pattern = '/^\d{3}\s?\d{3}$/';
 
@@ -41,7 +43,7 @@ public static function postal($check)
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function phone($check)
+    public static function phone(string $check): bool
     {
         $pattern = '/((\+*)((0[ -]+)*|(91 )*)(\d{12}+|\d{10}+))|\d{5}([- ]*)\d{6}/';
 
@@ -52,10 +54,10 @@ public static function phone($check)
      * Checks an identification number.
      *
      * @param string $check The value to check.
-     * @throws NotImplementedException Exception
+     * @throws \Cake\Network\Exception\NotImplementedException Exception
      * @return bool Success.
      */
-    public static function personId($check)
+    public static function personId($check): bool
     {
         throw new NotImplementedException(__d('localized', '%s Not implemented yet.'));
     }
diff --git a/src/Validation/IrValidation.php b/src/Validation/IrValidation.php
index 45170265..b715d3a7 100644
--- a/src/Validation/IrValidation.php
+++ b/src/Validation/IrValidation.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
@@ -6,10 +8,10 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org
- * @since         Localized Plugin v 0.1
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link http://cakephp.org
+ * @since Localized Plugin v 0.1
+ * @license http://www.opensource.org/licenses/mit-license.php MIT License
  */
 namespace Cake\Localized\Validation;
 
@@ -26,7 +28,7 @@ class IrValidation extends LocalizedValidation
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function alphaNumeric($check)
+    public static function alphaNumeric(string $check): bool
     {
         $pattern = '/[^\x{0600}-\x{06FF}\x{FB50}-\x{FDFD}\x{FE70}-\x{FEFF}\x{0750}-\x{077F}0-9\s\x{200C}]+/u';
 
@@ -39,7 +41,7 @@ public static function alphaNumeric($check)
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function numeric($check)
+    public static function numeric(string $check): bool
     {
         $pattern = '/[^\x{06F0}-\x{06F9}\x]+/u';
 
@@ -52,9 +54,9 @@ public static function numeric($check)
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function cc($check)
+    public static function cc(string $check): bool
     {
-        $pattern = '/[0-9]{4}-?[0-9]{4}-?[0-9]{4}-?[0-9]{4}$/';
+        $pattern = '/\d{4}-?\d{4}-?\d{4}-?\d{4}$/';
 
         return (bool)preg_match($pattern, $check);
     }
@@ -65,9 +67,9 @@ public static function cc($check)
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function phone($check)
+    public static function phone(string $check): bool
     {
-        $pattern = '/^[- .\(\)]?((98)|(\+98)|(0098)|0){1}[- .\(\)]{0,3}[1-9]{1}[0-9]{1,}[- .\(\)]*[0-9]{3,8}[- .\(\)]?$/';
+        $pattern = '/^[- .\(\)]?((98)|(\+98)|(0098)|0){1}[- .\(\)]{0,3}[1-9]{1}\d{1,}[- .\(\)]*\d{3,8}[- .\(\)]?$/';
 
         return (bool)preg_match($pattern, $check);
     }
@@ -78,9 +80,9 @@ public static function phone($check)
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function mobile($check)
+    public static function mobile(string $check): bool
     {
-        $pattern = '/^[- .\(\)]?((98)|(\+98)|(0098)|0){1}[- .\(\)]{0,3}((90)|(91)|(92)|(93)){1}[0-9]{8}$/';
+        $pattern = '/^[- .\(\)]?((98)|(\+98)|(0098)|0){1}[- .\(\)]{0,3}((90)|(91)|(92)|(93)){1}\d{8}$/';
 
         return (bool)preg_match($pattern, $check);
     }
@@ -91,7 +93,7 @@ public static function mobile($check)
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function postal($check)
+    public static function postal(string $check): bool
     {
         $pattern = '/^\d{10}$/';
 
@@ -104,7 +106,7 @@ public static function postal($check)
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function personId($check)
+    public static function personId(string $check): bool
     {
         $pattern = '/^\d{10}$/';
         if (!preg_match($pattern, $check)) {
@@ -114,11 +116,11 @@ public static function personId($check)
         $equivalent = 0;
         for ($i = 0; $i < 9; $i++) {
             $sum += $check{$i} * (10 - $i);
-            if ($check{1} == $check{$i}) {
+            if ($check{1} === $check{$i}) {
                 $equivalent++;
             }
         }
-        if ($equivalent == 10) {
+        if ($equivalent === 10) {
             return false;
         }
         $remaining = $sum % 11;
diff --git a/src/Validation/ItValidation.php b/src/Validation/ItValidation.php
index fc91a156..93725b3b 100644
--- a/src/Validation/ItValidation.php
+++ b/src/Validation/ItValidation.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Italian Localized Validation class. Handles localized validation for Italy.
  *
@@ -8,10 +10,10 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org
- * @since         Localized Plugin v 0.1
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link http://cakephp.org
+ * @since Localized Plugin v 0.1
+ * @license http://www.opensource.org/licenses/mit-license.php MIT License
  */
 namespace Cake\Localized\Validation;
 
@@ -29,9 +31,9 @@ class ItValidation extends LocalizedValidation
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function phone($check)
+    public static function phone(string $check): bool
     {
-        $pattern = '/^([0-9]*\-?\ ?\/?[0-9]*)$/';
+        $pattern = '/^(\d*\-?\ ?\/?\d*)$/';
 
         return (bool)preg_match($pattern, $check);
     }
@@ -42,9 +44,9 @@ public static function phone($check)
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function postal($check)
+    public static function postal(string $check): bool
     {
-        $pattern = '/^[0-9]{5}$/i';
+        $pattern = '/^\d{5}$/i';
 
         return (bool)preg_match($pattern, $check);
     }
@@ -55,14 +57,14 @@ public static function postal($check)
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function cf($check)
+    public static function cf(string $check): bool
     {
-        if ((strlen($check) === 11) && preg_match('/[0-9]{11}/', $check)) {
+        if ((strlen($check) === 11) && preg_match('/\d{11}/', $check)) {
             return true;
         }
 
         $check = strtoupper($check);
-        if (strlen($check) != 16 || !preg_match('/[A-Z]{6}[0-9]{2}[A-Z][0-9]{2}[A-Z][0-9]{3}[A-Z]/', $check)) {
+        if (strlen($check) !== 16 || !preg_match('/[A-Z]{6}\d{2}[A-Z]\d{2}[A-Z]\d{3}[A-Z]/', $check)) {
             return false;
         }
 
@@ -73,29 +75,29 @@ public static function cf($check)
             'G' => 15, 'H' => 17, 'I' => 19, 'J' => 21, 'K' => 2, 'L' => 4,
             'M' => 18, 'N' => 20, 'O' => 11, 'P' => 3, 'Q' => 6, 'R' => 8,
             'S' => 12, 'T' => 14, 'U' => 16, 'V' => 10, 'W' => 22, 'X' => 25,
-            'Y' => 24, 'Z' => 23
+            'Y' => 24, 'Z' => 23,
         ];
         $sum = 0;
 
         for ($i = 1; $i <= 13; $i += 2) {
-            $sum += (is_numeric($check[$i])) ? (int)$check[$i] : ord($check[$i]) - ord('A');
+            $sum += is_numeric($check[$i]) ? (int)$check[$i] : ord($check[$i]) - ord('A');
         }
 
         for ($i = 0; $i <= 14; $i += 2) {
             $sum += $checkOdd[$check[$i]];
         }
 
-        return (chr($sum % 26 + ord('A')) == $check[15]);
+        return chr($sum % 26 + ord('A')) === $check[15];
     }
 
     /**
      * Checks a country specific identification number.
      *
      * @param string $check The value to check.
-     * @throws NotImplementedException Exception
+     * @throws \Cake\Network\Exception\NotImplementedException Exception
      * @return bool Success.
      */
-    public static function personId($check)
+    public static function personId($check): bool
     {
         throw new NotImplementedException(__d('localized', '%s Not implemented yet.'));
     }
diff --git a/src/Validation/JpValidation.php b/src/Validation/JpValidation.php
index 38edac89..822a0bd8 100644
--- a/src/Validation/JpValidation.php
+++ b/src/Validation/JpValidation.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Japanese Localized Validation class. Handles localized validation for Japan.
  *
@@ -8,10 +10,10 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org
- * @since         Localized Plugin v 0.1
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link http://cakephp.org
+ * @since Localized Plugin v 0.1
+ * @license http://www.opensource.org/licenses/mit-license.php MIT License
  */
 namespace Cake\Localized\Validation;
 
@@ -45,7 +47,7 @@ class JpValidation extends LocalizedValidation
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function phone($check)
+    public static function phone(string $check): bool
     {
         $pattern = '/^(?:(?:0120(?:[\s\-]?\d{3}){2})|(?:0|\+81[\s\-]?)[1-9](?:(?:0[\s\-]?\d{4})|(?:[1-9](?:\d{3}|\d{1}[\s\-]\d{2}|\d{2}[\s\-]\d{1}|[\s\-]\d{3}))|(?:[\s\-]\d{4}))(?:[\s\-]?\d{4}))$/';
 
@@ -61,7 +63,7 @@ public static function phone($check)
      * @return bool Success.
      * @link http://www.soumu.go.jp/main_sosiki/joho_tsusin/top/tel_number/q_and_a.html
      */
-    public static function phoneDigits($check)
+    public static function phoneDigits(string $check): bool
     {
         $check = preg_replace(['/[\s\-]/', '/\+81/'], ['', '0'], $check);
 
@@ -76,9 +78,9 @@ public static function phoneDigits($check)
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function postal($check)
+    public static function postal(string $check): bool
     {
-        $pattern = '/^[0-9]{3}-[0-9]{4}$/';
+        $pattern = '/^\d{3}-\d{4}$/';
 
         return (bool)preg_match($pattern, $check);
     }
@@ -91,7 +93,7 @@ public static function postal($check)
      * @param bool $allowSpace Allow double-byte space.
      * @return bool Success.
      */
-    public static function hiragana($check, $allowSpace = true)
+    public static function hiragana(string $check, bool $allowSpace = true): bool
     {
         if ($allowSpace) {
             $pattern = '/^(\xe3(\x80\x80|\x81[\x81-\xbf]|\x82[\x80-\x96]|\x83\xbc))*$/';
@@ -110,7 +112,7 @@ public static function hiragana($check, $allowSpace = true)
      * @param bool $allowSpace Allow double-byte space.
      * @return bool Success.
      */
-    public static function katakana($check, $allowSpace = true)
+    public static function katakana(string $check, bool $allowSpace = true): bool
     {
         if ($allowSpace) {
             $pattern = '/^(\xe3(\x80\x80|\x82[\xa1-\xbf]|\x83[\x80-\xb6]|\x83\xbc))*$/';
@@ -127,7 +129,7 @@ public static function katakana($check, $allowSpace = true)
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function zenkaku($check)
+    public static function zenkaku(string $check): bool
     {
         $length = mb_strlen($check);
         for ($i = 0; $i < $length; $i++) {
@@ -144,10 +146,10 @@ public static function zenkaku($check)
      * Checks a country specific identification number.
      *
      * @param string $check The value to check.
-     * @throws NotImplementedException Exception
+     * @throws \Cake\Network\Exception\NotImplementedException Exception
      * @return bool Success.
      */
-    public static function personId($check)
+    public static function personId($check): bool
     {
         throw new NotImplementedException(__d('localized', '%s Not implemented yet.'));
     }
diff --git a/src/Validation/LocalizedValidation.php b/src/Validation/LocalizedValidation.php
index c7de410c..64377010 100644
--- a/src/Validation/LocalizedValidation.php
+++ b/src/Validation/LocalizedValidation.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
@@ -6,9 +8,9 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link http://cakephp.org
+ * @license http://www.opensource.org/licenses/mit-license.php MIT License
  */
 namespace Cake\Localized\Validation;
 
diff --git a/src/Validation/LtValidation.php b/src/Validation/LtValidation.php
index 9ff93cb3..5482cc63 100644
--- a/src/Validation/LtValidation.php
+++ b/src/Validation/LtValidation.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
@@ -6,10 +8,10 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org
- * @since         localized 0.1
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link http://cakephp.org
+ * @since localized 0.1
+ * @license http://www.opensource.org/licenses/mit-license.php MIT License
  */
 namespace Cake\Localized\Validation;
 
@@ -25,9 +27,9 @@ class LtValidation extends LocalizedValidation
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function phone($check)
+    public static function phone(string $check): bool
     {
-        $pattern = "/^(([\+]?370)|(8))[\s-]?\(?[0-9]{2,3}\)?[\s-]?([0-9]{2}[\s-]?){2}?[0-9]{1,2}$/";
+        $pattern = "/^(([\\+]?370)|(8))[\\s-]?\\(?\\d{2,3}\\)?[\\s-]?(\\d{2}[\\s-]?){2}?\\d{1,2}\$/";
 
         return (bool)preg_match($pattern, $check);
     }
@@ -38,7 +40,7 @@ public static function phone($check)
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function postal($check)
+    public static function postal(string $check): bool
     {
         $pattern = '/^(lt)?[\s-]?[\d]{5}$/i';
 
@@ -51,7 +53,7 @@ public static function postal($check)
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function personId($check)
+    public static function personId($check): bool
     {
         $pattern = '/^([a-z]{2})[\s-]?[\d]{7}$/i';
 
diff --git a/src/Validation/LvValidation.php b/src/Validation/LvValidation.php
index 5cb637d1..1ff49138 100644
--- a/src/Validation/LvValidation.php
+++ b/src/Validation/LvValidation.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Latvian Localized Validation class. Handles localized validation for Latvia.
  *
@@ -8,10 +10,10 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org
- * @since         Localized Plugin v 0.1
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link http://cakephp.org
+ * @since Localized Plugin v 0.1
+ * @license http://www.opensource.org/licenses/mit-license.php MIT License
  */
 namespace Cake\Localized\Validation;
 
@@ -23,16 +25,15 @@
  */
 class LvValidation extends LocalizedValidation
 {
-
     /**
      * Checks a postal code for Latvia.
      *
      * @param string $check The value to check.
      *
-     * @throws NotImplementedException Exception
+     * @throws \Cake\Network\Exception\NotImplementedException Exception
      * @return bool Success.
      */
-    public static function postal($check)
+    public static function postal(string $check): bool
     {
         throw new NotImplementedException(__d('localized', '%s Not implemented yet.'));
     }
@@ -42,10 +43,10 @@ public static function postal($check)
      *
      * @param string $check The value to check.
      *
-     * @throws NotImplementedException Exception
+     * @throws \Cake\Network\Exception\NotImplementedException Exception
      * @return bool Success.
      */
-    public static function phone($check)
+    public static function phone(string $check): bool
     {
         throw new NotImplementedException(__d('localized', '%s Not implemented yet.'));
     }
@@ -57,11 +58,11 @@ public static function phone($check)
      *
      * @return bool Success.
      */
-    public static function personId($check)
+    public static function personId($check): bool
     {
         $check = trim(str_replace('-', '', $check));
 
-        $pattern = '/^[0-9]{6}[0-9A-Z]{5}$/';
+        $pattern = '/^\d{6}[0-9A-Z]{5}$/';
         if (!(bool)preg_match($pattern, $check)) {
             return false;
         }
diff --git a/src/Validation/MxValidation.php b/src/Validation/MxValidation.php
index a0501a50..af6500b9 100644
--- a/src/Validation/MxValidation.php
+++ b/src/Validation/MxValidation.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Mexican Localized Validation class. Handles localized validation for Mexico.
  *
@@ -8,10 +10,10 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org
- * @since         Localized Plugin v 0.1
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link http://cakephp.org
+ * @since Localized Plugin v 0.1
+ * @license http://www.opensource.org/licenses/mit-license.php MIT License
  */
 namespace Cake\Localized\Validation;
 
@@ -29,7 +31,7 @@ class MxValidation extends LocalizedValidation
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function phone($check)
+    public static function phone(string $check): bool
     {
         $pattern = '/^(\d{8}|\d{10}|\d{13}|((\d{2}[-,\s]){4}\d{2})|\(\d{3}\)\d{3}-\d{4}|\(\d{2}\)\d{4}-\d{4}|\d{3}[-,\s]\d{2}[-,\s]\d{8})$/i';
 
@@ -42,7 +44,7 @@ public static function phone($check)
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function postal($check)
+    public static function postal(string $check): bool
     {
         $pattern = '/^\d{5}$/i';
 
@@ -53,10 +55,10 @@ public static function postal($check)
      * Checks a country specific identification number.
      *
      * @param string $check The value to check.
-     * @throws NotImplementedException Exception
+     * @throws \Cake\Network\Exception\NotImplementedException Exception
      * @return bool Success.
      */
-    public static function personId($check)
+    public static function personId($check): bool
     {
         throw new NotImplementedException(__d('localized', '%s Not implemented yet.'));
     }
diff --git a/src/Validation/NlValidation.php b/src/Validation/NlValidation.php
index 3b31c759..f384b424 100644
--- a/src/Validation/NlValidation.php
+++ b/src/Validation/NlValidation.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
@@ -6,10 +8,10 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org
- * @since         Localized Plugin v 0.1
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link http://cakephp.org
+ * @since Localized Plugin v 0.1
+ * @license http://www.opensource.org/licenses/mit-license.php MIT License
  */
 namespace Cake\Localized\Validation;
 
@@ -25,7 +27,7 @@ class NlValidation extends LocalizedValidation
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function phone($check)
+    public static function phone(string $check): bool
     {
         $pattern = '/^0(6[\s-]?[1-9]\d{7}|[1-9]\d[\s-]?[1-9]\d{6}|[1-9]\d{2}[\s-]?[1-9]\d{5})$/';
 
@@ -38,9 +40,9 @@ public static function phone($check)
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function postal($check)
+    public static function postal(string $check): bool
     {
-        $pattern = '/^[1-9][0-9]{3}\s?[A-Z]{2}$/i';
+        $pattern = '/^[1-9]\d{3}\s?[A-Z]{2}$/i';
 
         return (bool)preg_match($pattern, $check);
     }
@@ -51,9 +53,9 @@ public static function postal($check)
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function personId($check)
+    public static function personId($check): bool
     {
-        $pattern = '/\\A\\b[0-9]{9}\\b\\z/i';
+        $pattern = '/\A\b\d{9}\b\z/i';
 
         return (bool)preg_match($pattern, $check);
     }
diff --git a/src/Validation/NoValidation.php b/src/Validation/NoValidation.php
index 52076cb2..aaa873e3 100644
--- a/src/Validation/NoValidation.php
+++ b/src/Validation/NoValidation.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Norwegian Localized Validation class. Handles localized validation for Norway.
  *
@@ -8,10 +10,10 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org
- * @since         Localized Plugin v 0.1
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link http://cakephp.org
+ * @since Localized Plugin v 0.1
+ * @license http://www.opensource.org/licenses/mit-license.php MIT License
  */
 namespace Cake\Localized\Validation;
 
@@ -28,7 +30,7 @@ class NoValidation extends LocalizedValidation
      * @param string $check the date of birth.
      * @return bool Success.
      */
-    public static function dob($check)
+    public static function dob(string $check): bool
     {
         $pattern = '/^\d{1,2}\.\d{1,2}\.(\d{2}|\d{4})$/';
         $return = preg_match($pattern, $check);
@@ -47,7 +49,7 @@ public static function dob($check)
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function phone($check)
+    public static function phone(string $check): bool
     {
         return (bool)preg_match('/^((\d{8})|(\d{3} \d{2} \d{3})|(\d{2} \d{2} \d{2} \d{2}))$/', $check);
     }
@@ -58,7 +60,7 @@ public static function phone($check)
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function postal($check)
+    public static function postal(string $check): bool
     {
         $pattern = '/^\d{4}$/';
 
@@ -71,7 +73,7 @@ public static function postal($check)
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function personId($check)
+    public static function personId($check): bool
     {
         $pattern = '/^(\d{11})|(\d{6} \d{5})$/';
 
diff --git a/src/Validation/PlValidation.php b/src/Validation/PlValidation.php
index 77208d75..e1b222f6 100644
--- a/src/Validation/PlValidation.php
+++ b/src/Validation/PlValidation.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
@@ -6,10 +8,10 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org
- * @since         Localized Plugin v 0.1
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link http://cakephp.org
+ * @since Localized Plugin v 0.1
+ * @license http://www.opensource.org/licenses/mit-license.php MIT License
  */
 namespace Cake\Localized\Validation;
 
@@ -17,7 +19,7 @@
  * Polish Localized Validation class. Handles localized validation for Poland.
  *
  */
-class PlValidation extends LocalizedValidation
+class PlValidation extends \Cake\Localized\Validation\LocalizedValidation
 {
     /**
      * Checks a postal code for Poland.
@@ -25,9 +27,9 @@ class PlValidation extends LocalizedValidation
      * @param string $check Value to check
      * @return bool Success.
      */
-    public static function postal($check)
+    public static function postal(string $check): bool
     {
-        $pattern = '/^[0-9]{2}-[0-9]{3}$/D';
+        $pattern = '/^\d{2}-\d{3}$/D';
 
         return (bool)preg_match($pattern, $check);
     }
@@ -40,9 +42,10 @@ public static function postal($check)
      * @param string $check Value to check
      * @return bool Success.
      * @deprecated 3.3.2 This method does not validate Polish Person ID and will be changed in the next major version.
+
      * To validate Person ID (PESEL) please use `pesel()` method instead.
      */
-    public static function personId($check)
+    public static function personId(string $check): bool
     {
         return static::nip($check);
     }
@@ -54,31 +57,24 @@ public static function personId($check)
      * @return bool Success.
      * @link http://pl.wikipedia.org/wiki/NIP
      */
-    public static function nip($check)
+    public static function nip(string $check): bool
     {
-        $pattern = '/^([0-9]{3}-[0-9]{3}-[0-9]{2}-[0-9]{2})|([0-9]{3}-[0-9]{2}-[0-9]{2}-[0-9]{3})|([0-9]{10})$/';
+        $pattern = '/^(\d{3}-\d{3}-\d{2}-\d{2})|(\d{3}-\d{2}-\d{2}-\d{3})|(\d{10})$/';
         if (!preg_match($pattern, $check)) {
             return false;
         }
-
         $sum = 0;
         $weights = [6, 5, 7, 2, 3, 4, 5, 6, 7];
         $check = str_replace('-', '', $check);
-
         for ($i = 0; $i < 9; $i++) {
             $sum += $check[$i] * $weights[$i];
         }
-
         $control = $sum % 11;
-        if ($control == 10) {
+        if ($control === 10) {
             $control = 0;
         }
 
-        if ($check[9] == $control) {
-            return true;
-        }
-
-        return false;
+        return $check[9] == $control;
     }
 
     /**
@@ -89,22 +85,19 @@ public static function nip($check)
      * @return bool Success.
      * @link http://pl.wikipedia.org/wiki/PESEL
      */
-    public static function pesel($check)
+    public static function pesel(string $check): bool
     {
-        $pattern = '/^[0-9]{11}$/';
+        $pattern = '/^\d{11}$/';
         if (preg_match($pattern, $check)) {
             $sum = 0;
             $weights = [1, 3, 7, 9, 1, 3, 7, 9, 1, 3];
-
             for ($i = 0; $i < 10; $i++) {
                 $sum += $check[$i] * $weights[$i];
             }
-
             $control = 10 - $sum % 10;
-            if ($control == 10) {
+            if ($control === 10) {
                 $control = 0;
             }
-
             if ($check[10] == $control) {
                 return true;
             }
@@ -122,19 +115,17 @@ public static function pesel($check)
      * @return bool Success.
      * @link http://pl.wikipedia.org/wiki/REGON
      */
-    public static function regon($check)
+    public static function regon(string $check): bool
     {
         if (!preg_match('/^([\d]{9}|[\d]{14})$/', $check)) {
             return false;
         }
-
-        if (strlen($check) == 9) {
+        if (strlen($check) === 9) {
             // Validate short version (9 digits)
-            $chars = str_split($check);
+            $chars = str_split(strval($check));
             $sum = array_sum(array_map(function ($weight, $digit) {
                 return $weight * $digit;
             }, [8, 9, 2, 3, 4, 5, 6, 7], array_slice($chars, 0, 8)));
-
             $checksum = $sum % 11;
 
             return $checksum % 10 == $chars[8];
@@ -144,7 +135,6 @@ public static function regon($check)
             $sum = array_sum(array_map(function ($weight, $digit) {
                 return $weight * $digit;
             }, [2, 4, 8, 5, 0, 9, 7, 3, 6, 1, 2, 4, 8], array_slice($chars, 0, 13)));
-
             $checksum = $sum % 11;
 
             return $checksum % 10 == $chars[13];
@@ -157,7 +147,7 @@ public static function regon($check)
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function phone($check)
+    public static function phone(string $check): bool
     {
         $pattern = '/^([0+]48)?\d{9}$/';
 
diff --git a/src/Validation/PtValidation.php b/src/Validation/PtValidation.php
index 4e7ed8c4..946db29b 100644
--- a/src/Validation/PtValidation.php
+++ b/src/Validation/PtValidation.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Portuguese Localized Validation class. Handles localized validation for Portugal
  *
@@ -8,10 +10,10 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org
- * @since         Localized Plugin v 0.1
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link http://cakephp.org
+ * @since Localized Plugin v 0.1
+ * @license http://www.opensource.org/licenses/mit-license.php MIT License
  */
 namespace Cake\Localized\Validation;
 
@@ -29,9 +31,9 @@ class PtValidation extends LocalizedValidation
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function postal($check)
+    public static function postal(string $check): bool
     {
-        $pattern = '/^[1-9]{1}[0-9]{3}-[0-9]{3}$/';
+        $pattern = '/^[1-9]{1}\d{3}-\d{3}$/';
 
         return (bool)preg_match($pattern, $check);
     }
@@ -40,10 +42,10 @@ public static function postal($check)
      * Checks a phone number.
      *
      * @param string $check The value to check.
-     * @throws NotImplementedException Exception
+     * @throws \Cake\Network\Exception\NotImplementedException Exception
      * @return bool Success.
      */
-    public static function phone($check)
+    public static function phone(string $check): bool
     {
         throw new NotImplementedException(__d('localized', '%s Not implemented yet.'));
     }
@@ -52,10 +54,10 @@ public static function phone($check)
      * Checks a country specific identification number.
      *
      * @param string $check The value to check.
-     * @throws NotImplementedException Exception
+     * @throws \Cake\Network\Exception\NotImplementedException Exception
      * @return bool Success.
      */
-    public static function personId($check)
+    public static function personId($check): bool
     {
         throw new NotImplementedException(__d('localized', '%s Not implemented yet.'));
     }
diff --git a/src/Validation/RoValidation.php b/src/Validation/RoValidation.php
index 6f14f500..63992e81 100644
--- a/src/Validation/RoValidation.php
+++ b/src/Validation/RoValidation.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * RO Localized Validation class. Handles localized validation for Romania
  *
@@ -8,10 +10,10 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org
- * @since         Localized Plugin v 0.1
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link http://cakephp.org
+ * @since Localized Plugin v 0.1
+ * @license http://www.opensource.org/licenses/mit-license.php MIT License
  */
 namespace Cake\Localized\Validation;
 
@@ -29,9 +31,9 @@ class RoValidation
      * @param string $check The value to check.
      * @return bool
      */
-    public static function postal($check)
+    public static function postal(string $check): bool
     {
-        $pattern = '/^[0-9]{6}$/';
+        $pattern = '/^\d{6}$/';
 
         return (bool)preg_match($pattern, $check);
     }
@@ -40,10 +42,10 @@ public static function postal($check)
      * Checks a phone number.
      *
      * @param string $check The value to check.
-     * @throws NotImplementedException Exception
+     * @throws \Cake\Network\Exception\NotImplementedException Exception
      * @return bool Success.
      */
-    public static function phone($check)
+    public static function phone(string $check)
     {
         throw new NotImplementedException(__d('localized', '%s Not implemented yet.'));
     }
@@ -52,10 +54,10 @@ public static function phone($check)
      * Checks a country specific identification number.
      *
      * @param string $check The value to check.
-     * @throws NotImplementedException Exception
+     * @throws \Cake\Network\Exception\NotImplementedException Exception
      * @return bool Success.
      */
-    public static function personId($check)
+    public static function personId(string $check)
     {
         throw new NotImplementedException(__d('localized', '%s Not implemented yet.'));
     }
diff --git a/src/Validation/RsValidation.php b/src/Validation/RsValidation.php
index 6f076158..201d1de4 100644
--- a/src/Validation/RsValidation.php
+++ b/src/Validation/RsValidation.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Serbian Localized Validation class. Handles localized validation for Serbia.
  *
@@ -8,10 +10,10 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org
- * @since         Localized Plugin v 0.1
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link http://cakephp.org
+ * @since Localized Plugin v 0.1
+ * @license http://www.opensource.org/licenses/mit-license.php MIT License
  */
 namespace Cake\Localized\Validation;
 
@@ -29,9 +31,9 @@ class RsValidation extends LocalizedValidation
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function postal($check)
+    public static function postal(string $check): bool
     {
-        $pattern = '/^[0-9]{5}$/';
+        $pattern = '/^\d{5}$/';
 
         return (bool)preg_match($pattern, $check);
     }
@@ -43,16 +45,16 @@ public static function postal($check)
      * @return bool Success.
      * @link http://en.wikipedia.org/wiki/Unique_Master_Citizen_Number
      */
-    public static function personId($check)
+    public static function personId($check): bool
     {
-        if (!preg_match('/^[0-9]{13}$/', $check)) {
+        if (!preg_match('/^\d{13}$/', $check)) {
             return false;
         }
 
-        list($a, $b, $c, $d, $e, $f, $g, $h, $i, $j, $k, $l, $m) = str_split($check);
+        [$a, $b, $c, $d, $e, $f, $g, $h, $i, $j, $k, $l, $m] = str_split(strval($check));
         $checksum = 11 - ( 7 * ($a + $g) + 6 * ($b + $h) + 5 * ($c + $i) + 4 * ($d + $j) + 3 * ($e + $k) + 2 * ($f + $l) ) % 11;
 
-        return ($checksum == $m);
+        return $checksum == $m;
     }
 
     /**
@@ -61,9 +63,9 @@ public static function personId($check)
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function addressCode($check)
+    public static function addressCode(string $check): bool
     {
-        $pattern = '/^[0-9]{6}$/';
+        $pattern = '/^\d{6}$/';
 
         return (bool)preg_match($pattern, $check);
     }
@@ -77,7 +79,7 @@ public static function addressCode($check)
      * @return bool Success.
      * @deprecated Use addressCode() instead.
      */
-    public static function address_code($check)
+    public static function address_code(string $check): bool
     {
         return static::addressCode($check);
     }
@@ -89,7 +91,7 @@ public static function address_code($check)
      * @return bool Success
      * @deprecated Use postal() instead.
      */
-    public static function postal_number($check)
+    public static function postal_number(string $check): bool
     {
         return static::postal($check);
     }
@@ -104,7 +106,7 @@ public static function postal_number($check)
      * @link http://en.wikipedia.org/wiki/Unique_Master_Citizen_Number
      * @deprecated Use personId() instead.
      */
-    public static function jmbg($check)
+    public static function jmbg(string $check): bool
     {
         return static::personId($check);
     }
@@ -113,10 +115,10 @@ public static function jmbg($check)
      * Checks a phone number.
      *
      * @param string $check The value to check.
-     * @throws NotImplementedException Exception
+     * @throws \Cake\Network\Exception\NotImplementedException Exception
      * @return bool Success.
      */
-    public static function phone($check)
+    public static function phone(string $check): bool
     {
         throw new NotImplementedException(__d('localized', '%s Not implemented yet.'));
     }
diff --git a/src/Validation/RuValidation.php b/src/Validation/RuValidation.php
index 7ac1fbdb..a37a060a 100644
--- a/src/Validation/RuValidation.php
+++ b/src/Validation/RuValidation.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Russian Localized Validation class. Handles localized validation for Russia
  *
@@ -8,10 +10,10 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org
- * @since         Localized Plugin v 1.0.0
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link http://cakephp.org
+ * @since Localized Plugin v 1.0.0
+ * @license http://www.opensource.org/licenses/mit-license.php MIT License
  */
 namespace Cake\Localized\Validation;
 
@@ -28,9 +30,9 @@ class RuValidation extends LocalizedValidation
      * @return bool Success.
      * @link https://en.wikipedia.org/wiki/List_of_postal_codes_in_Russia
      */
-    public static function postal($check)
+    public static function postal(string $check): bool
     {
-        $pattern = '/^((1[0-2][1-9]|110|120)|14[0-24]|15[0236]|16[01236789]|17[03]|18[03-8]|19[0-9]|214|236|24[18]|30[01258]|344|35[0589]|36[0-4789]|39[0246-8]|40[034]|41[04]|42[04568]|43[0-2]|44[03]|45[0234]|460|555|60[012367]|61[049]|62[0589]|63[04]|64[04789]|65[056]|66[04579]|67[0125789]|68[035789]|69[03])[0-9]{3}$/';
+        $pattern = '/^((1[0-2][1-9]|110|120)|14[0-24]|15[0236]|16[01236789]|17[03]|18[03-8]|19\d|214|236|24[18]|30[01258]|344|35[0589]|36[0-4789]|39[0246-8]|40[034]|41[04]|42[04568]|43[0-2]|44[03]|45[0234]|460|555|60[012367]|61[049]|62[0589]|63[04]|64[04789]|65[056]|66[04579]|67[0125789]|68[035789]|69[03])\d{3}$/';
 
         return (bool)preg_match($pattern, $check);
     }
@@ -41,7 +43,7 @@ public static function postal($check)
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function address1($check)
+    public static function address1(string $check): bool
     {
         $pattern = '/^[a-zA-Z\p{Cyrillic} \.]+,/u';
 
@@ -54,7 +56,7 @@ public static function address1($check)
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function phone($check)
+    public static function phone(string $check): bool
     {
         $pattern = '/^\+7 \(\d+\) \d{3,}$/';
 
@@ -68,7 +70,7 @@ public static function phone($check)
      * @return bool Success.
      * @link https://en.wikipedia.org/wiki/Internal_Passport_of_Russia
      */
-    public static function passport($check)
+    public static function passport(string $check): bool
     {
         $pattern = '/^\d{4} \d{6}$/';
 
@@ -82,14 +84,14 @@ public static function passport($check)
      * @return bool Success.
      * @link https://en.wikipedia.org/wiki/VAT_identification_number
      */
-    public static function vatin($check)
+    public static function vatin(string $check): bool
     {
         $pattern = '/^\d{10}|\d{12}$/';
         if (!preg_match($pattern, $check)) {
             return false;
         }
 
-        $digits = str_split($check); // getting digits & positions from id string
+        $digits = str_split(strval($check)); // getting digits & positions from id string
 
         $calculatedChecksum = null;
         if (strlen($check) === 10) {
@@ -128,7 +130,7 @@ public static function vatin($check)
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function personId($check)
+    public static function personId($check): bool
     {
         return static::snils($check);
     }
@@ -140,14 +142,14 @@ public static function personId($check)
      * @return bool Success.
      * @link https://ru.wikipedia.org/wiki/СНИЛС
      */
-    public static function snils($check)
+    public static function snils(string $check): bool
     {
         $pattern = '/\d{3}-\d{3}-\d{3} \d{2}/';
         if (!preg_match($pattern, $check)) {
             return false;
         }
 
-        list ($id, $checksum) = explode(' ', $check, 2);
+        [$id, $checksum] = explode(' ', $check, 2);
 
         $id = str_replace('-', '', $id);
         // getting digits & positions from id string
@@ -159,7 +161,7 @@ public static function snils($check)
         }
 
         $calculatedChecksum = $sum % 101;
-        $calculatedChecksum = str_pad($calculatedChecksum, 2, '0', STR_PAD_LEFT);
+        $calculatedChecksum = str_pad(strval($calculatedChecksum), 2, '0', STR_PAD_LEFT);
         $calculatedChecksum = substr($calculatedChecksum, -2);
 
         return $calculatedChecksum === $checksum;
diff --git a/src/Validation/SkValidation.php b/src/Validation/SkValidation.php
index 3c85eb3d..38ff442b 100644
--- a/src/Validation/SkValidation.php
+++ b/src/Validation/SkValidation.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Slovak Localized Validation class. Handles localized validation for Slovakia.
  *
@@ -8,10 +10,10 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org
- * @since         Localized Plugin v 0.1
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link http://cakephp.org
+ * @since Localized Plugin v 0.1
+ * @license http://www.opensource.org/licenses/mit-license.php MIT License
  */
 namespace Cake\Localized\Validation;
 
@@ -29,7 +31,7 @@ class SkValidation extends LocalizedValidation
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function postal($check)
+    public static function postal(string $check): bool
     {
         $pattern = '/^[0,8,9]\d{2} ?\d{2}$/';
 
@@ -40,10 +42,10 @@ public static function postal($check)
      * Checks a phone number.
      *
      * @param string $check The value to check.
-     * @throws NotImplementedException Exception
+     * @throws \Cake\Network\Exception\NotImplementedException Exception
      * @return bool Success.
      */
-    public static function phone($check)
+    public static function phone(string $check): bool
     {
         throw new NotImplementedException(__d('localized', '%s Not implemented yet.'));
     }
@@ -52,10 +54,10 @@ public static function phone($check)
      * Checks a country specific identification number.
      *
      * @param string $check The value to check.
-     * @throws NotImplementedException Exception
+     * @throws \Cake\Network\Exception\NotImplementedException Exception
      * @return bool Success.
      */
-    public static function personId($check)
+    public static function personId($check): bool
     {
         throw new NotImplementedException(__d('localized', '%s Not implemented yet.'));
     }
diff --git a/src/Validation/TnValidation.php b/src/Validation/TnValidation.php
index 7ce583f9..0787a706 100644
--- a/src/Validation/TnValidation.php
+++ b/src/Validation/TnValidation.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Tunisia Localized Validation class. Handles localized validation for Tunisia.
  *
@@ -8,10 +10,10 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org
- * @since         Localized Plugin v 0.1
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link http://cakephp.org
+ * @since Localized Plugin v 0.1
+ * @license http://www.opensource.org/licenses/mit-license.php MIT License
  */
 namespace Cake\Localized\Validation;
 
@@ -28,9 +30,9 @@ class TnValidation extends LocalizedValidation
      * @return bool Success.
      * @see https://en.wikipedia.org/wiki/Telephone_numbers_in_Tunisia
      */
-    public static function phone($check)
+    public static function phone(string $check): bool
     {
-        $pattern = '/^(00216|\+216){0,1}(2|4|5|7|9)([0-9]{7})$/';
+        $pattern = '/^(00216|\+216){0,1}(2|4|5|7|9)(\d{7})$/';
 
         return (bool)preg_match($pattern, $check);
     }
@@ -42,9 +44,9 @@ public static function phone($check)
      * @return bool Success.
      * @see https://en.wikipedia.org/wiki/Postal_codes_in_Tunisia
      */
-    public static function postal($check)
+    public static function postal(string $check): bool
     {
-        $pattern = '/^[1-9][0-2][0-9]{2}$/';
+        $pattern = '/^[1-9][0-2]\d{2}$/';
 
         return (bool)preg_match($pattern, $check);
     }
@@ -55,9 +57,9 @@ public static function postal($check)
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function personId($check)
+    public static function personId(string $check): bool
     {
-        $pattern = '/^[0-9]{8,9}$/';
+        $pattern = '/^\d{8,9}$/';
 
         return (bool)preg_match($pattern, $check);
     }
diff --git a/src/Validation/TrValidation.php b/src/Validation/TrValidation.php
index 6e4b8572..50f855f9 100644
--- a/src/Validation/TrValidation.php
+++ b/src/Validation/TrValidation.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Turkey Localised Validation class. Handles localised validation for Turkey.
  *
@@ -8,10 +10,10 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org
- * @since         Localized Plugin v 0.1
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link http://cakephp.org
+ * @since Localized Plugin v 0.1
+ * @license http://www.opensource.org/licenses/mit-license.php MIT License
  */
 namespace Cake\Localized\Validation;
 
@@ -29,9 +31,9 @@ class TrValidation extends LocalizedValidation
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function postal($check)
+    public static function postal(string $check): bool
     {
-        $pattern = '/^(0[1-9]|[1-7][0-9]|8[0-1])[0-9]{3}$/';
+        $pattern = '/^(0[1-9]|[1-7]\d|8[0-1])\d{3}$/';
 
         return (bool)preg_match($pattern, $check);
     }
@@ -42,7 +44,7 @@ public static function postal($check)
      * @param string $tckn The value to check.
      * @return bool Success.
      */
-    public static function personId($tckn)
+    public static function personId($tckn): bool
     {
         if (strlen($tckn) !== 11) {
             return false;
@@ -71,10 +73,10 @@ public static function personId($tckn)
      * Checks a phone number.
      *
      * @param string $check The value to check.
-     * @throws NotImplementedException Exception
+     * @throws \Cake\Network\Exception\NotImplementedException Exception
      * @return bool Success.
      */
-    public static function phone($check)
+    public static function phone(string $check): bool
     {
         throw new NotImplementedException(__d('localized', '%s Not implemented yet.'));
     }
@@ -86,7 +88,7 @@ public static function phone($check)
      * @return bool Success.
      * @deprecated Use personId() instead.
      */
-    public static function trIdentityNumber($check)
+    public static function trIdentityNumber(string $check): bool
     {
         return static::personId($check);
     }
diff --git a/src/Validation/TwValidation.php b/src/Validation/TwValidation.php
index c745efee..bbd39c3e 100644
--- a/src/Validation/TwValidation.php
+++ b/src/Validation/TwValidation.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Taiwan Localized Validation class. Handles localized validation for Taiwan.
  *
@@ -8,10 +10,10 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org
- * @since         Localized Plugin v 0.1
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link http://cakephp.org
+ * @since Localized Plugin v 0.1
+ * @license http://www.opensource.org/licenses/mit-license.php MIT License
  */
 namespace Cake\Localized\Validation;
 
@@ -27,9 +29,9 @@ class TwValidation extends LocalizedValidation
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function phone($check)
+    public static function phone(string $check): bool
     {
-        $pattern = '/^\\(?(0|\\+886)[-. ]?[2-9][\\)-. ]?([0-9][\\)-. ]?){2}([0-9][-. ]?){3}[0-9]{2}[0-9]?$/';
+        $pattern = '/^\(?(0|\+886)[-. ]?[2-9][\)-. ]?(\d[\)-. ]?){2}(\d[-. ]?){3}\d{2}\d?$/';
 
         return (bool)preg_match($pattern, $check);
     }
@@ -40,9 +42,9 @@ public static function phone($check)
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function postal($check)
+    public static function postal(string $check): bool
     {
-        $pattern = '/^[1-9][0-9]{2}([0-9]{2})?$/';
+        $pattern = '/^[1-9]\d{2}(\d{2})?$/';
 
         return (bool)preg_match($pattern, $check);
     }
@@ -53,26 +55,26 @@ public static function postal($check)
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function personId($check)
+    public static function personId($check): bool
     {
         $check = strtoupper($check);
-        if (!preg_match('/^[A-Z][1-2][0-9]{8}$/', $check)) {
+        if (!preg_match('/^[A-Z][1-2]\d{8}$/', $check)) {
             return false;
         }
         $keyTable = [
             'A' => 10, 'B' => 11, 'C' => 12, 'D' => 13, 'E' => 14, 'F' => 15, 'G' => 16, 'H' => 17,
             'I' => 34, 'J' => 18, 'K' => 19, 'L' => 20, 'M' => 21, 'N' => 22, 'O' => 35, 'P' => 23,
             'Q' => 24, 'R' => 25, 'S' => 26, 'T' => 27, 'U' => 28, 'V' => 29, 'W' => 32, 'X' => 30,
-            'Y' => 31, 'Z' => 33
+            'Y' => 31, 'Z' => 33,
         ];
         $n1 = $keyTable[$check[0]];
-        $checksum = intval($n1 / 10) + ($n1 % 10) * 9;
+        $checksum = (int)($n1 / 10) + ($n1 % 10) * 9;
 
         for ($i = 1; $i < 9; $i++) {
             $checksum += $check[$i] * (9 - $i);
         }
 
-        return (substr(10 - ($checksum % 10), 0, 1) == $check[9]);
+        return substr(strval(10 - ($checksum % 10)), 0, 1) === $check[9];
     }
 
     /**
@@ -82,16 +84,16 @@ public static function personId($check)
      * @return bool Success.
      * @link http://herolin.mine.nu/entry/is-valid-TW-company-ID
      */
-    public static function ubn($check)
+    public static function ubn(string $check): bool
     {
-        if (!preg_match('/^[0-9]{8}$/', $check)) {
+        if (!preg_match('/^\d{8}$/', $check)) {
             return false;
         }
         $tbNum = [1, 2, 1, 2, 1, 2, 4, 1];
         $intSum = 0;
         for ($i = 0; $i < 8; $i++) {
             $intMultiply = $check[$i] * $tbNum[$i];
-            $intAddition = (floor($intMultiply / 10) + ($intMultiply % 10));
+            $intAddition = floor($intMultiply / 10) + ($intMultiply % 10);
             $intSum += $intAddition;
         }
 
@@ -105,7 +107,7 @@ public static function ubn($check)
      * @return bool Success.
      * @deprecated Use personId() instead.
      */
-    public static function nicn($check)
+    public static function nicn(string $check): bool
     {
         return static::personId($check);
     }
diff --git a/src/Validation/UaValidation.php b/src/Validation/UaValidation.php
index 6f004d24..b1051e80 100644
--- a/src/Validation/UaValidation.php
+++ b/src/Validation/UaValidation.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Ukrainian Localized Validation class. Handles localized validation for Ukraine
  *
@@ -8,15 +10,13 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org
- * @since         Localized Plugin v 1.0.0
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link http://cakephp.org
+ * @since Localized Plugin v 1.0.0
+ * @license http://www.opensource.org/licenses/mit-license.php MIT License
  */
 namespace Cake\Localized\Validation;
 
-use Cake\Network\Exception\NotImplementedException;
-
 /**
  * UaValidation
  *
@@ -31,9 +31,9 @@ class UaValidation extends LocalizedValidation
      * @return bool Success.
      * @link https://en.wikipedia.org/wiki/Postal_codes_in_Ukraine
      */
-    public static function postal($check)
+    public static function postal(string $check): bool
     {
-        $pattern = '/^(0[1-9][0-9][0-9][0-9]|1[0-9][0-9][0-9][0-9]|2[0-9][0-9][0-9][0-9]|3[0-9][0-9][0-9][0-9]|4[0-9][0-9][0-9][0-9]|5[0-9][0-9][0-9][0-9]|6[0-9][0-9][0-9][0-9]|7[0-9][0-9][0-9][0-9]|8[0-9][0-9][0-9][0-9]|9[0-9][0-9][0-9][0-9]|)$/';
+        $pattern = '/^(0[1-9]\d\d\d|1\d\d\d\d|2\d\d\d\d|3\d\d\d\d|4\d\d\d\d|5\d\d\d\d|6\d\d\d\d|7\d\d\d\d|8\d\d\d\d|9\d\d\d\d|)$/';
 
         return (bool)preg_match($pattern, $check);
     }
@@ -46,7 +46,7 @@ public static function postal($check)
      * @return bool Success.
      * @link https://en.wikipedia.org/wiki/Telephone_numbers_in_Ukraine
      */
-    public static function phone($check)
+    public static function phone(string $check): bool
     {
         $pattern = '/^((8|\+38)-?)?(\(?+...\)?)?-?\d{3}-?\d{2}-?\d{2}$/';
 
@@ -61,7 +61,7 @@ public static function phone($check)
      * @return bool Success.
      * @link https://en.wikipedia.org/wiki/Ukrainian_identity_card#Previous_internal_passport
      */
-    public static function passport($check)
+    public static function passport(string $check): bool
     {
         $pattern = '/^[АБВГҐДЕЄЖЗИІЇЙКЛМНОПРСТУФХЦЧШЩЬЮЯ]{2}\d{6}/u';
 
@@ -75,7 +75,7 @@ public static function passport($check)
      * @return bool Success.
      * @link https://en.wikipedia.org/wiki/Ukrainian_identity_card#Current_identity_card
      */
-    public static function idCard($check)
+    public static function idCard(string $check): bool
     {
         $pattern = '/^(\d{8}-\d{5})$/';
 
@@ -89,7 +89,7 @@ public static function idCard($check)
      * @return bool Success.
      * @link https://en.wikipedia.org/wiki/VAT_identification_number#VAT_numbers_of_non-EU_countries
      */
-    public static function personId($check)
+    public static function personId($check): bool
     {
         $pattern = '/^\d{10}$/';
 
diff --git a/src/Validation/UkValidation.php b/src/Validation/UkValidation.php
index 90ff9f6d..526a0316 100644
--- a/src/Validation/UkValidation.php
+++ b/src/Validation/UkValidation.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
@@ -6,10 +8,10 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org
- * @since         Localized Plugin v 0.1
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link http://cakephp.org
+ * @since Localized Plugin v 0.1
+ * @license http://www.opensource.org/licenses/mit-license.php MIT License
  */
 namespace Cake\Localized\Validation;
 
diff --git a/src/Validation/UsValidation.php b/src/Validation/UsValidation.php
index 6ca11f0d..e269e304 100644
--- a/src/Validation/UsValidation.php
+++ b/src/Validation/UsValidation.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
@@ -6,10 +8,10 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org
- * @since         Localized Plugin v 0.1
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link http://cakephp.org
+ * @since Localized Plugin v 0.1
+ * @license http://www.opensource.org/licenses/mit-license.php MIT License
  */
 namespace Cake\Localized\Validation;
 
@@ -25,9 +27,9 @@ class UsValidation extends LocalizedValidation
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function phone($check)
+    public static function phone(string $check): bool
     {
-        $pattern = '/^(?:(?:\+?1\s*(?:[.-]\s*)?)?(?!\(?(555))(?:\(\s*([2-9][0-9]{2})\s*\)';
+        $pattern = '/^(?:(?:\+?1\s*(?:[.-]\s*)?)?(?!\(?(555))(?:\(\s*([2-9]\d{2})\s*\)';
         $pattern .= '|([2-9][0-9]{2}))\s*(?:[.-]\s*)?)';
         $pattern .= '(?!(555(?:\s*(?:[.|\-|\s]\s*))(01([0-9][0-9])|1212)))';
         $pattern .= '(?!(555(01([0-9][0-9])|1212)))';
@@ -44,9 +46,9 @@ public static function phone($check)
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function postal($check)
+    public static function postal(string $check): bool
     {
-        $pattern = '/\\A\\b[0-9]{5}(?:-[0-9]{4})?\\b\\z/i';
+        $pattern = '/\A\b\d{5}(?:-\d{4})?\b\z/i';
 
         return (bool)preg_match($pattern, $check);
     }
@@ -57,9 +59,9 @@ public static function postal($check)
      * @param string $check The value to check.
      * @return bool Success
      */
-    public static function personId($check)
+    public static function personId($check): bool
     {
-        $pattern = '/\\A\\b[0-9]{3}-[0-9]{2}-[0-9]{4}\\b\\z/i';
+        $pattern = '/\A\b\d{3}-\d{2}-\d{4}\b\z/i';
 
         return (bool)preg_match($pattern, $check);
     }
diff --git a/src/Validation/ValidationInterface.php b/src/Validation/ValidationInterface.php
index f6743627..872ac57a 100644
--- a/src/Validation/ValidationInterface.php
+++ b/src/Validation/ValidationInterface.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
@@ -6,11 +8,10 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link http://cakephp.org
+ * @license http://www.opensource.org/licenses/mit-license.php MIT License
  */
-
 namespace Cake\Localized\Validation;
 
 /**
@@ -19,14 +20,13 @@
  */
 interface ValidationInterface
 {
-
     /**
      * Checks a phone number.
      *
      * @param string $string The value to check.
      * @return bool Success.
      */
-    public static function phone($string);
+    public static function phone(string $string): bool;
 
     /**
      * Checks a postal code.
@@ -34,7 +34,7 @@ public static function phone($string);
      * @param string $string The value to check.
      * @return bool Success.
      */
-    public static function postal($string);
+    public static function postal(string $string): bool;
 
     /**
      * Checks a country specific identification number.
@@ -42,5 +42,5 @@ public static function postal($string);
      * @param string $string The value to check.
      * @return bool Success.
      */
-    public static function personId($string);
+    public static function personId(string $string): bool;
 }
diff --git a/tests/TestCase/IntegrationTest.php b/tests/TestCase/IntegrationTest.php
index 9525113b..f26cd73e 100644
--- a/tests/TestCase/IntegrationTest.php
+++ b/tests/TestCase/IntegrationTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Plugin Integration Validation class.
  *
@@ -32,7 +34,7 @@ class IntegrationTest extends TestCase
      */
     public function testLocalizedProviderIntegration()
     {
-        $validator = new Validator;
+        $validator = new Validator();
         $validator->setProvider('fr', FrValidation::class);
         $validator->add('phoneField', 'myCustomRuleNameForPhone', [
             'rule' => 'phone',
@@ -44,12 +46,12 @@ public function testLocalizedProviderIntegration()
             'provider' => 'fr',
         ]);
         $this->assertCount(2, $validator);
-        $this->assertEmpty($validator->errors([
+        $this->assertEmpty($validator->validate([
             'phoneField' => '05 24 22 72 27',
-            'postalField' => '93000'
+            'postalField' => '93000',
         ]));
 
-        $errors = $validator->errors(['phoneField' => '924.227.227', 'postalField' => '0000']);
+        $errors = $validator->validate(['phoneField' => '924.227.227', 'postalField' => '0000']);
         $expected = [
             'phoneField' => ['myCustomRuleNameForPhone' => 'Numéro invalide'],
             'postalField' => ['myCustomRuleNameForPostal' => 'The provided value is invalid'],
diff --git a/tests/TestCase/Validation/AtValidationTest.php b/tests/TestCase/Validation/AtValidationTest.php
index b92c24e8..8202b98a 100644
--- a/tests/TestCase/Validation/AtValidationTest.php
+++ b/tests/TestCase/Validation/AtValidationTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Austrian Localized Validation class test case
  *
diff --git a/tests/TestCase/Validation/AuValidationTest.php b/tests/TestCase/Validation/AuValidationTest.php
index 23652ca1..c9c93025 100644
--- a/tests/TestCase/Validation/AuValidationTest.php
+++ b/tests/TestCase/Validation/AuValidationTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Australian Localized Validation class test case
  *
diff --git a/tests/TestCase/Validation/BdValidationTest.php b/tests/TestCase/Validation/BdValidationTest.php
index e4411b7c..6e77424e 100644
--- a/tests/TestCase/Validation/BdValidationTest.php
+++ b/tests/TestCase/Validation/BdValidationTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * BD Localized Validation class test case
  *
diff --git a/tests/TestCase/Validation/BeValidationTest.php b/tests/TestCase/Validation/BeValidationTest.php
index c2a6c6e7..9cd4a6bd 100644
--- a/tests/TestCase/Validation/BeValidationTest.php
+++ b/tests/TestCase/Validation/BeValidationTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Belgian Localized Validation class test case
  *
diff --git a/tests/TestCase/Validation/BrValidationTest.php b/tests/TestCase/Validation/BrValidationTest.php
index ea78d804..11cfdb7e 100644
--- a/tests/TestCase/Validation/BrValidationTest.php
+++ b/tests/TestCase/Validation/BrValidationTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Brazilian Localized Validation class test case
  *
@@ -147,12 +149,12 @@ public function testSsn()
         $this->assertFalse(BrValidation::cpf('abcdefghi'));
 
         //testing 15 digits
-        $this->assertFalse(BrValidation::cnpj(123456789123456));
-        $this->assertFalse(BrValidation::cnpj(062476224000121));
+        $this->assertFalse(BrValidation::cnpj('123456789123456'));
+        $this->assertFalse(BrValidation::cnpj('062476224000121'));
         $this->assertFalse(BrValidation::cnpj('062476224000121'));
         $this->assertFalse(BrValidation::cnpj('062.476.224/0001-21'));
         $this->assertTrue(BrValidation::cnpj('62.476.224/0001-21'));
-        $this->assertTrue(BrValidation::cnpj(62476224000121));
+        $this->assertTrue(BrValidation::cnpj('62476224000121'));
         $this->assertTrue(BrValidation::cnpj('62476224000121'));
     }
 
@@ -170,7 +172,6 @@ public function testCnh()
         $this->assertFalse(BrValidation::cnh('11111111111'));
         $this->assertFalse(BrValidation::cnh('018278545'));
         $this->assertFalse(BrValidation::cnh('abcdefghij'));
-        $this->assertFalse(BrValidation::cnh(['01827854569']));
     }
 
     /**
@@ -183,7 +184,7 @@ public function testCns()
         $this->assertTrue(BrValidation::cns('702 5053 3246 4238'));
         $this->assertTrue(BrValidation::cns('898 0058 0155 2261'));
         $this->assertTrue(BrValidation::cns('706000307269748'));
-        $this->assertTrue(BrValidation::cns(706902161943931));
+        $this->assertTrue(BrValidation::cns('706902161943931'));
 
         $this->assertFalse(BrValidation::cns('702 5053 3246 4237'));
         $this->assertFalse(BrValidation::cns('111 1111 1111 1111'));
diff --git a/tests/TestCase/Validation/CaValidationTest.php b/tests/TestCase/Validation/CaValidationTest.php
index a26ab25a..32bdd1cc 100644
--- a/tests/TestCase/Validation/CaValidationTest.php
+++ b/tests/TestCase/Validation/CaValidationTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Canadian Localized Validation class test case
  *
diff --git a/tests/TestCase/Validation/ChValidationTest.php b/tests/TestCase/Validation/ChValidationTest.php
index 549af52e..af6cae39 100644
--- a/tests/TestCase/Validation/ChValidationTest.php
+++ b/tests/TestCase/Validation/ChValidationTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Swiss Localized Validation class test case
  *
diff --git a/tests/TestCase/Validation/CnValidationTest.php b/tests/TestCase/Validation/CnValidationTest.php
index 1ae4fd3d..97db003f 100644
--- a/tests/TestCase/Validation/CnValidationTest.php
+++ b/tests/TestCase/Validation/CnValidationTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * CN Localized Validation class test case
  *
diff --git a/tests/TestCase/Validation/CzValidationTest.php b/tests/TestCase/Validation/CzValidationTest.php
index 82a55bc1..f6080488 100644
--- a/tests/TestCase/Validation/CzValidationTest.php
+++ b/tests/TestCase/Validation/CzValidationTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Czech Localized Validation class test case
  *
diff --git a/tests/TestCase/Validation/DeValidationTest.php b/tests/TestCase/Validation/DeValidationTest.php
index 5b99c6ae..0d7b5161 100644
--- a/tests/TestCase/Validation/DeValidationTest.php
+++ b/tests/TestCase/Validation/DeValidationTest.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * German Localized Validation class test case
@@ -26,7 +27,6 @@
  */
 class DeValidationTest extends TestCase
 {
-
     /**
      * test the phone method of DeValidation
      *
diff --git a/tests/TestCase/Validation/DkValidationTest.php b/tests/TestCase/Validation/DkValidationTest.php
index 3994990d..5e32bbde 100644
--- a/tests/TestCase/Validation/DkValidationTest.php
+++ b/tests/TestCase/Validation/DkValidationTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Danish Localized Validation class test case
  *
diff --git a/tests/TestCase/Validation/EsValidationTest.php b/tests/TestCase/Validation/EsValidationTest.php
index f3dd500c..58b31ac6 100644
--- a/tests/TestCase/Validation/EsValidationTest.php
+++ b/tests/TestCase/Validation/EsValidationTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Spanish Localized Validation class test case
  *
diff --git a/tests/TestCase/Validation/FiValidationTest.php b/tests/TestCase/Validation/FiValidationTest.php
index 86b84343..f7966361 100644
--- a/tests/TestCase/Validation/FiValidationTest.php
+++ b/tests/TestCase/Validation/FiValidationTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Finnish Localized Validation class test case
  *
@@ -25,7 +27,6 @@
  */
 class FiValidationTest extends TestCase
 {
-
     /**
      * Person id data provider
      *
diff --git a/tests/TestCase/Validation/FrValidationTest.php b/tests/TestCase/Validation/FrValidationTest.php
index 449d985d..7b71dfc4 100644
--- a/tests/TestCase/Validation/FrValidationTest.php
+++ b/tests/TestCase/Validation/FrValidationTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * French Localized Validation class test case
  *
diff --git a/tests/TestCase/Validation/GbValidationTest.php b/tests/TestCase/Validation/GbValidationTest.php
index 9c300e84..bf75aa89 100644
--- a/tests/TestCase/Validation/GbValidationTest.php
+++ b/tests/TestCase/Validation/GbValidationTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
diff --git a/tests/TestCase/Validation/HrValidationTest.php b/tests/TestCase/Validation/HrValidationTest.php
index 3846603e..999f02a9 100644
--- a/tests/TestCase/Validation/HrValidationTest.php
+++ b/tests/TestCase/Validation/HrValidationTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Slovak Localized Validation class test case
  *
diff --git a/tests/TestCase/Validation/IdValidatationTest.php b/tests/TestCase/Validation/IdValidationTest.php
similarity index 97%
rename from tests/TestCase/Validation/IdValidatationTest.php
rename to tests/TestCase/Validation/IdValidationTest.php
index c28e02ce..9aeddb10 100644
--- a/tests/TestCase/Validation/IdValidatationTest.php
+++ b/tests/TestCase/Validation/IdValidationTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Indonesian Localized Validation class test case
  *
diff --git a/tests/TestCase/Validation/InValidatationTest.php b/tests/TestCase/Validation/InValidationTest.php
similarity index 99%
rename from tests/TestCase/Validation/InValidatationTest.php
rename to tests/TestCase/Validation/InValidationTest.php
index 61b8b162..1b7ee844 100644
--- a/tests/TestCase/Validation/InValidatationTest.php
+++ b/tests/TestCase/Validation/InValidationTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Indian Localized Validation class test case
  *
diff --git a/tests/TestCase/Validation/IrValidationTest.php b/tests/TestCase/Validation/IrValidationTest.php
index 28e74690..aa7f0678 100644
--- a/tests/TestCase/Validation/IrValidationTest.php
+++ b/tests/TestCase/Validation/IrValidationTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Iran Localized Validation class test case
  *
diff --git a/tests/TestCase/Validation/ItValidationTest.php b/tests/TestCase/Validation/ItValidationTest.php
index ba15acca..c83a3096 100644
--- a/tests/TestCase/Validation/ItValidationTest.php
+++ b/tests/TestCase/Validation/ItValidationTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Italian Localized Validation class test case
  *
diff --git a/tests/TestCase/Validation/JpValidationTest.php b/tests/TestCase/Validation/JpValidationTest.php
index d3604cf9..d4114b3b 100644
--- a/tests/TestCase/Validation/JpValidationTest.php
+++ b/tests/TestCase/Validation/JpValidationTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Japanese Localized Validation class test case
  *
diff --git a/tests/TestCase/Validation/LtValidationTest.php b/tests/TestCase/Validation/LtValidationTest.php
index 3a7c770c..989c2593 100644
--- a/tests/TestCase/Validation/LtValidationTest.php
+++ b/tests/TestCase/Validation/LtValidationTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * LT Localized Validation class test case
  *
diff --git a/tests/TestCase/Validation/LvValidationTest.php b/tests/TestCase/Validation/LvValidationTest.php
index 3e9e4c56..68e0d0a2 100644
--- a/tests/TestCase/Validation/LvValidationTest.php
+++ b/tests/TestCase/Validation/LvValidationTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Latvian Localized Validation class test case
  *
@@ -25,7 +27,6 @@
  */
 class LvValidationTest extends TestCase
 {
-
     /**
      * Person id data provider
      *
diff --git a/tests/TestCase/Validation/MxValidationTest.php b/tests/TestCase/Validation/MxValidationTest.php
index ee842325..60b34d7b 100644
--- a/tests/TestCase/Validation/MxValidationTest.php
+++ b/tests/TestCase/Validation/MxValidationTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Mexican Localized Validation class test case
  *
diff --git a/tests/TestCase/Validation/NlValidationTest.php b/tests/TestCase/Validation/NlValidationTest.php
index 51d25523..f108368c 100644
--- a/tests/TestCase/Validation/NlValidationTest.php
+++ b/tests/TestCase/Validation/NlValidationTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Dutch Localized Validation class test case
  *
diff --git a/tests/TestCase/Validation/NoValidationTest.php b/tests/TestCase/Validation/NoValidationTest.php
index f1eb273d..8aecd430 100644
--- a/tests/TestCase/Validation/NoValidationTest.php
+++ b/tests/TestCase/Validation/NoValidationTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Norwegian Localized Validation class test case
  *
diff --git a/tests/TestCase/Validation/PlValidationTest.php b/tests/TestCase/Validation/PlValidationTest.php
index d0ef067a..f9213105 100644
--- a/tests/TestCase/Validation/PlValidationTest.php
+++ b/tests/TestCase/Validation/PlValidationTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Polish Localized Validation class test case
  *
diff --git a/tests/TestCase/Validation/PtValidationTest.php b/tests/TestCase/Validation/PtValidationTest.php
index 2887d439..e774236d 100644
--- a/tests/TestCase/Validation/PtValidationTest.php
+++ b/tests/TestCase/Validation/PtValidationTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Portuguese Localized Validation class test case
  *
diff --git a/tests/TestCase/Validation/RoValidationTest.php b/tests/TestCase/Validation/RoValidationTest.php
index 3035b6d9..e132cabc 100644
--- a/tests/TestCase/Validation/RoValidationTest.php
+++ b/tests/TestCase/Validation/RoValidationTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * RO Localized Validation class test case
  *
diff --git a/tests/TestCase/Validation/RsValidationTest.php b/tests/TestCase/Validation/RsValidationTest.php
index 50311740..56aa0a7c 100644
--- a/tests/TestCase/Validation/RsValidationTest.php
+++ b/tests/TestCase/Validation/RsValidationTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Serbian Localized Validation class test case
  *
diff --git a/tests/TestCase/Validation/RuValidationTest.php b/tests/TestCase/Validation/RuValidationTest.php
index 6dd1ce09..97c7a5ca 100644
--- a/tests/TestCase/Validation/RuValidationTest.php
+++ b/tests/TestCase/Validation/RuValidationTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Russian Localized Validation class test case
  *
@@ -75,6 +77,7 @@ public function testPassport()
         $this->assertFalse(RuValidation::passport('1234123456'));
         $this->assertFalse(RuValidation::passport('1234 1x3456'));
     }
+
     /**
      * test vatin method of RuValidation
      *
diff --git a/tests/TestCase/Validation/SkValidationTest.php b/tests/TestCase/Validation/SkValidationTest.php
index 5ff4cb8a..8ce35b1f 100644
--- a/tests/TestCase/Validation/SkValidationTest.php
+++ b/tests/TestCase/Validation/SkValidationTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Slovak Localized Validation class test case
  *
diff --git a/tests/TestCase/Validation/TnValidationTest.php b/tests/TestCase/Validation/TnValidationTest.php
index 76703a59..394ca58f 100644
--- a/tests/TestCase/Validation/TnValidationTest.php
+++ b/tests/TestCase/Validation/TnValidationTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Tunisia Localized Validation class test case
  *
@@ -54,7 +56,6 @@ public function testPhone()
         $this->assertFalse(TnValidation::phone('9899999'));
         $this->assertFalse(TnValidation::phone('989999999'));
         $this->assertFalse(TnValidation::phone('004012345678'));
-        $this->assertFalse(TnValidation::phone(false));
         $this->assertFalse(TnValidation::phone('abcdef'));
     }
 
@@ -81,7 +82,6 @@ public function testPostal()
         $this->assertFalse(TnValidation::postal('abcd'));
         $this->assertFalse(TnValidation::postal('1'));
         $this->assertFalse(TnValidation::postal('10'));
-        $this->assertFalse(TnValidation::postal(true));
     }
 
     /**
@@ -99,7 +99,6 @@ public function testPersonId()
         $this->assertFalse(TnValidation::personId('0123456789'));
         $this->assertFalse(TnValidation::personId('1234 56798'));
         $this->assertFalse(TnValidation::personId('01234 567989'));
-        $this->assertFalse(TnValidation::personId(true));
         $this->assertFalse(TnValidation::personId('abcdefgh'));
     }
 }
diff --git a/tests/TestCase/Validation/TrValidationTest.php b/tests/TestCase/Validation/TrValidationTest.php
index 84cebde2..b263d955 100644
--- a/tests/TestCase/Validation/TrValidationTest.php
+++ b/tests/TestCase/Validation/TrValidationTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Turkey Localized Validation class test case
  *
diff --git a/tests/TestCase/Validation/TwValidationTest.php b/tests/TestCase/Validation/TwValidationTest.php
index 49e237e3..3cc46da9 100644
--- a/tests/TestCase/Validation/TwValidationTest.php
+++ b/tests/TestCase/Validation/TwValidationTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Taiwan Localized Validation class test case
  *
diff --git a/tests/TestCase/Validation/UaValidationTest.php b/tests/TestCase/Validation/UaValidationTest.php
index 600a2845..abd1775b 100644
--- a/tests/TestCase/Validation/UaValidationTest.php
+++ b/tests/TestCase/Validation/UaValidationTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Russian Localized Validation class test case
  *
diff --git a/tests/TestCase/Validation/UsValidationTest.php b/tests/TestCase/Validation/UsValidationTest.php
index 93ac6be6..c9dc4c27 100644
--- a/tests/TestCase/Validation/UsValidationTest.php
+++ b/tests/TestCase/Validation/UsValidationTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * US Localized Validation class test case
  *
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 3ab4d96f..a71b626b 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 use Cake\Core\Plugin;
 
 $findRoot = function ($root) {
@@ -22,6 +24,15 @@
     return;
 }
 
+if (!defined('DS')) {
+    define('DS', DIRECTORY_SEPARATOR);
+}
+
+Cake\Core\Configure::write('debug', true);
+
 require $root . '/vendor/cakephp/cakephp/tests/bootstrap.php';
 
-Plugin::load('Cake/Localized', ['path' => dirname(dirname(__FILE__)) . DS]);
+Plugin::getCollection()->add(new \Cake\Localized\Plugin([
+    'path' => dirname(dirname(__FILE__)) . DS,
+    'routes' => false,
+]));

From 68d8532809496fa0b65687bbd1507a7ddaf64e6c Mon Sep 17 00:00:00 2001
From: Yevgeny Tomenko <skie@mail.ru>
Date: Sun, 16 Feb 2020 00:32:55 +0300
Subject: [PATCH 2/9] update travis config

---
 .travis.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8b178b7c..a66c5dfa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,9 @@
 language: php
 
 php:
-  - 5.6
-  - 7.0
-  - 7.1
   - 7.2
+  - 7.3
+  - 7.4
 
 sudo: false
 
@@ -12,10 +11,10 @@ matrix:
   fast_finish: true
 
   include:
-    - php: 7.1
+    - php: 7.4
       env: PHPCS=1
 
-    - php: 5.6
+    - php: 7.2
       env: PREFER_LOWEST=1
 
 install:

From b3b7d4fd1d5b986f67d05e25fb378c58c158a14b Mon Sep 17 00:00:00 2001
From: Yevgeny Tomenko <skie@mail.ru>
Date: Sun, 16 Feb 2020 00:39:22 +0300
Subject: [PATCH 3/9] refactor obsolete syntax

---
 src/Validation/IrValidation.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Validation/IrValidation.php b/src/Validation/IrValidation.php
index b715d3a7..9a7ffe61 100644
--- a/src/Validation/IrValidation.php
+++ b/src/Validation/IrValidation.php
@@ -115,8 +115,8 @@ public static function personId(string $check): bool
         $sum = 0;
         $equivalent = 0;
         for ($i = 0; $i < 9; $i++) {
-            $sum += $check{$i} * (10 - $i);
-            if ($check{1} === $check{$i}) {
+            $sum += substr($check, $i, 1) * (10 - $i);
+            if (substr($check, 1, 1) === substr($check, $i, 1)) {
                 $equivalent++;
             }
         }
@@ -125,9 +125,9 @@ public static function personId(string $check): bool
         }
         $remaining = $sum % 11;
         if ($remaining <= 1) {
-            return (bool)($remaining == $check{9});
+            return (bool)($remaining == substr($check, 9, 1));
         }
 
-        return (bool)((11 - $remaining) == $check{9});
+        return (bool)((11 - $remaining) == substr($check, 9, 1));
     }
 }

From 0fd89a4e05c484e836a9d2013572ae8259426a10 Mon Sep 17 00:00:00 2001
From: Yevgeny Tomenko <skie@mail.ru>
Date: Sun, 16 Feb 2020 00:43:19 +0300
Subject: [PATCH 4/9] (chore) code cleanup

---
 src/Validation/IrValidation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Validation/IrValidation.php b/src/Validation/IrValidation.php
index 9a7ffe61..2061b66d 100644
--- a/src/Validation/IrValidation.php
+++ b/src/Validation/IrValidation.php
@@ -128,6 +128,6 @@ public static function personId(string $check): bool
             return (bool)($remaining == substr($check, 9, 1));
         }
 
-        return (bool)((11 - $remaining) == substr($check, 9, 1));
+        return (bool)(substr($check, 9, 1) == 11 - $remaining);
     }
 }

From 00e2f98c0331450770baf74a81bc5b5df6dec6b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=AF=D1=80=D0=BE=D1=81=D0=BB=D0=B0=D0=B2?=
 <yaroslav@ua-biz.info>
Date: Fri, 3 Apr 2020 00:37:15 +0300
Subject: [PATCH 5/9] Phone numbers like 80xxyyyyyyy are considered invalid
 from 14 October 2009

---
 src/Validation/UaValidation.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Validation/UaValidation.php b/src/Validation/UaValidation.php
index b1051e80..4b66aa6a 100644
--- a/src/Validation/UaValidation.php
+++ b/src/Validation/UaValidation.php
@@ -41,14 +41,14 @@ public static function postal(string $check): bool
     /**
      * Checks phone number for Ukraine
      *
-     * @example +38-044-283-93-57; (068)2839357; +380442839357; +38 (063)537-28-07; 8044223-95-26; +380612839357;
+     * @example +38-044-283-93-57; (068)2839357; +380442839357; +38 (063)537-28-07; +380612839357;
      * @param string $check The value to check.
      * @return bool Success.
      * @link https://en.wikipedia.org/wiki/Telephone_numbers_in_Ukraine
      */
     public static function phone(string $check): bool
     {
-        $pattern = '/^((8|\+38)-?)?(\(?+...\)?)?-?\d{3}-?\d{2}-?\d{2}$/';
+        $pattern = '/^(\+38-?)?(\(?+...\)?)?-?\d{3}-?\d{2}-?\d{2}$/';
 
         return (bool)preg_match($pattern, $check);
     }

From 6c1f1e4d1f320f4c180aa54e589ef469819a2b95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=AF=D1=80=D0=BE=D1=81=D0=BB=D0=B0=D0=B2?=
 <yaroslav@ua-biz.info>
Date: Fri, 3 Apr 2020 00:43:36 +0300
Subject: [PATCH 6/9] Phone numbers like 80xxyyyyyyy are considered invalid
 from 14 October 2009

---
 tests/TestCase/Validation/UaValidationTest.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/TestCase/Validation/UaValidationTest.php b/tests/TestCase/Validation/UaValidationTest.php
index abd1775b..cbd9850b 100644
--- a/tests/TestCase/Validation/UaValidationTest.php
+++ b/tests/TestCase/Validation/UaValidationTest.php
@@ -52,9 +52,10 @@ public function testPhone()
         $this->assertTrue(UaValidation::phone('+38-044-283-93-57'));
         $this->assertTrue(UaValidation::phone('(068)2839357'));
         $this->assertTrue(UaValidation::phone('+380442839357'));
-        $this->assertFalse(UaValidation::phone('+38 (063)537-28-07'));
-        $this->assertTrue(UaValidation::phone('8044223-95-26'));
         $this->assertTrue(UaValidation::phone('+380612839357'));
+
+        $this->assertFalse(UaValidation::phone('+38 (063)537-28-07'));
+        $this->assertFalse(UaValidation::phone('8044223-95-26'));
     }
 
     /**

From d2cc9fb56c7d45fe3c4d225cfd66d56f3ed750e9 Mon Sep 17 00:00:00 2001
From: mscherer <mark.scherer@spryker.com>
Date: Fri, 3 Apr 2020 00:10:09 +0200
Subject: [PATCH 7/9] Merge CakeDC-3.x as Cake4 prep.

---
 .editorconfig  |  4 +---
 .gitattributes | 18 ++----------------
 .gitignore     |  2 +-
 .semver        |  5 -----
 .travis.yml    |  9 +++++----
 README.md      | 10 +++++-----
 6 files changed, 14 insertions(+), 34 deletions(-)
 delete mode 100644 .semver

diff --git a/.editorconfig b/.editorconfig
index 70619017..6e4a9119 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,6 +1,5 @@
 ; This file is for unifying the coding style for different editors and IDEs.
-; More information at http://editorconfig.org
-
+; More information at https://editorconfig.org
 root = true
 
 [*]
@@ -14,5 +13,4 @@ trim_trailing_whitespace = true
 end_of_line = crlf
 
 [*.yml]
-indent_style = space
 indent_size = 2
diff --git a/.gitattributes b/.gitattributes
index 7ff9965d..5fe90dad 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,20 +1,6 @@
 # Define the line ending behavior of the different file extensions
-# Set default behaviour, in case users don't have core.autocrlf set.
-* text=auto
-* text eol=lf
-
-# Explicitly declare text files we want to always be normalized and converted
-# to native line endings on checkout.
-*.php text
-*.default text
-*.ctp text
-*.md text
-*.po text
-*.js text
-*.css text
-*.ini text
-*.txt text
-*.xml text
+# Set default behavior, in case users don't have core.autocrlf set.
+* text text=auto eol=lf
 
 # Declare files that will always have CRLF line endings on checkout.
 *.bat eol=crlf
diff --git a/.gitignore b/.gitignore
index fab8667a..6c0987d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 /composer.lock
 /phpunit.phar
 /vendor/
-.idea
\ No newline at end of file
+/.idea/
diff --git a/.semver b/.semver
deleted file mode 100644
index f5ef8df3..00000000
--- a/.semver
+++ /dev/null
@@ -1,5 +0,0 @@
----
-:major: 3
-:minor: 0
-:patch: 0
-:special: ''
diff --git a/.travis.yml b/.travis.yml
index a66c5dfa..6ad997ef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,11 +2,8 @@ language: php
 
 php:
   - 7.2
-  - 7.3
   - 7.4
 
-sudo: false
-
 matrix:
   fast_finish: true
 
@@ -23,7 +20,11 @@ install:
 
 script:
   - sh -c "if [ '$PHPCS' != '1' ]; then vendor/bin/phpunit; fi"
-  - sh -c "if [ '$PHPCS' = '1' ]; then ./vendor/bin/phpcs -n -p --extensions=php --standard=vendor/cakephp/cakephp-codesniffer/CakePHP ./src ./tests; fi"
+  - sh -c "if [ '$PHPCS' = '1' ]; then ./vendor/bin/phpcs -n -p --extensions=php --standard=vendor/cakephp/cakephp-codesniffer/CakePHP src/ tests/; fi"
+
+cache:
+  directories:
+    - $HOME/.composer/cache
 
 notifications:
   email: false
diff --git a/README.md b/README.md
index d7796170..c56159fd 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # CakePHP Localized plugin
-[![Build Status](https://secure.travis-ci.org/cakephp/localized.svg?branch=master)](http://travis-ci.org/cakephp/localized)
+[![Build Status](https://travis-ci.org/cakephp/localized.svg?branch=master)](http://travis-ci.org/cakephp/localized)
 [![License](https://poser.pugx.org/cakephp/localized/license.svg)](https://packagist.org/packages/cakephp/localized)
 [![Total Downloads](https://poser.pugx.org/cakephp/localized/d/total.svg)](https://packagist.org/packages/cakephp/localized)
 
@@ -9,12 +9,12 @@ This plugin contains various localized validation classes for specific countries
 
 The master branch has the following requirements:
 
-* CakePHP 3.1.0 or greater.
-* PHP 5.4.16 or greater.
+* CakePHP 3.5+.
+* PHP 5.6+.
 
 ## Installation
 
-You can install this plugin into your CakePHP application using [composer](http://getcomposer.org).
+You can install this plugin into your CakePHP application using [composer](https://getcomposer.org).
 
 The recommended way to install composer packages is:
 
@@ -43,7 +43,7 @@ class PostsTable extends Table
 {
     public function validationDefault(Validator $validator)
     {
-        $validator->provider('fr', FrValidation::class);
+        $validator->setProvider('fr', FrValidation::class);
         $validator->add('phoneField', 'myCustomRuleNameForPhone', [
             'rule' => 'phone',
             'provider' => 'fr'

From d2216b507be3dad85feadd661158032d30cac38f Mon Sep 17 00:00:00 2001
From: mscherer <mark.scherer@spryker.com>
Date: Fri, 3 Apr 2020 00:25:56 +0200
Subject: [PATCH 8/9] PHPStan Level 1.

---
 .travis.yml                                   | 11 ++++++++---
 composer.json                                 |  2 +-
 phpstan.neon                                  |  5 +++++
 src/Plugin.php                                | 19 +++++++++++++++++++
 src/Validation/AtValidation.php               |  6 +++---
 src/Validation/AuValidation.php               |  4 ++--
 src/Validation/BdValidation.php               |  6 +++---
 src/Validation/BeValidation.php               |  4 ++--
 src/Validation/BrValidation.php               |  4 ++--
 src/Validation/CaValidation.php               |  4 ++--
 src/Validation/ChValidation.php               |  6 +++---
 src/Validation/CzValidation.php               |  6 +++---
 src/Validation/DeValidation.php               |  4 ++--
 src/Validation/DkValidation.php               |  4 ++--
 src/Validation/EsValidation.php               |  2 +-
 src/Validation/FiValidation.php               |  6 +++---
 src/Validation/FrValidation.php               |  2 +-
 src/Validation/GbValidation.php               |  8 ++++----
 src/Validation/HrValidation.php               |  8 ++++----
 src/Validation/IdValidation.php               |  8 ++++----
 src/Validation/InValidation.php               |  6 +++---
 src/Validation/ItValidation.php               |  6 +++---
 src/Validation/JpValidation.php               |  6 +++---
 src/Validation/LtValidation.php               |  2 +-
 src/Validation/LvValidation.php               |  8 ++++----
 src/Validation/MxValidation.php               |  6 +++---
 src/Validation/NlValidation.php               |  2 +-
 src/Validation/NoValidation.php               |  2 +-
 src/Validation/PtValidation.php               |  8 ++++----
 src/Validation/RoValidation.php               |  6 +++---
 src/Validation/RsValidation.php               |  6 +++---
 src/Validation/RuValidation.php               |  2 +-
 src/Validation/SkValidation.php               |  8 ++++----
 src/Validation/TrValidation.php               |  6 +++---
 src/Validation/TwValidation.php               |  2 +-
 src/Validation/UaValidation.php               |  2 +-
 src/Validation/UsValidation.php               |  2 +-
 .../TestCase/Validation/FiValidationTest.php  |  1 -
 38 files changed, 114 insertions(+), 86 deletions(-)
 create mode 100644 phpstan.neon

diff --git a/.travis.yml b/.travis.yml
index 6ad997ef..3efa8f18 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,12 +4,16 @@ php:
   - 7.2
   - 7.4
 
+env:
+  global:
+    - DEFAULT=1
+
 matrix:
   fast_finish: true
 
   include:
     - php: 7.4
-      env: PHPCS=1
+      env: CHECKS=1 DEFAULT=0
 
     - php: 7.2
       env: PREFER_LOWEST=1
@@ -19,8 +23,9 @@ install:
   - if [[ $PREFER_LOWEST == 1 ]]; then composer update --prefer-dist --no-interaction --prefer-lowest --prefer-stable ; fi
 
 script:
-  - sh -c "if [ '$PHPCS' != '1' ]; then vendor/bin/phpunit; fi"
-  - sh -c "if [ '$PHPCS' = '1' ]; then ./vendor/bin/phpcs -n -p --extensions=php --standard=vendor/cakephp/cakephp-codesniffer/CakePHP src/ tests/; fi"
+  - if [[ $DEFAULT == 1 ]]; then vendor/bin/phpunit; fi
+  - if [[ $CHECKS == 1 ]]; then composer stan-setup && composer stan ; fi
+  - if [[ $CHECKS == 1 ]]; then composer cs-check ; fi
 
 cache:
   directories:
diff --git a/composer.json b/composer.json
index c7f65c09..c135e1f1 100644
--- a/composer.json
+++ b/composer.json
@@ -50,7 +50,7 @@
         "cs-fix": "phpcbf --standard=vendor/cakephp/cakephp-codesniffer/CakePHP src/ tests/",
         "test": "phpunit --stderr",
         "stan": "phpstan analyse src/",
-        "psalm": "php vendor/psalm/phar/psalm.phar --show-info=false src/ ",
+        "psalm": "php vendor/psalm/phar/psalm.phar --show-info=false src/",
         "stan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan:^0.12.0 psalm/phar:^3.7 && mv composer.backup composer.json",
         "stan-rebuild-baseline": "phpstan analyse --configuration phpstan.neon --error-format baselineNeon src/ > phpstan-baseline.neon",
         "psalm-rebuild-baseline": "php vendor/psalm/phar/psalm.phar --show-info=false  --set-baseline=psalm-baseline.xml  src/",
diff --git a/phpstan.neon b/phpstan.neon
new file mode 100644
index 00000000..efda9224
--- /dev/null
+++ b/phpstan.neon
@@ -0,0 +1,5 @@
+parameters:
+    level: 1
+    treatPhpDocTypesAsCertain: false
+    autoload_files:
+        - tests/bootstrap.php
diff --git a/src/Plugin.php b/src/Plugin.php
index 96ec00f2..76ffd253 100644
--- a/src/Plugin.php
+++ b/src/Plugin.php
@@ -27,4 +27,23 @@ class Plugin extends BasePlugin
      * @var string
      */
     protected $name = 'Localized';
+
+    /**
+     * @var bool
+     */
+    protected $routesEnabled = false;
+
+    /**
+     * @var bool
+     */
+    protected $bootstrapEnabled = false;
+    /**
+     * @var bool
+     */
+    protected $consoleEnabled = false;
+
+    /**
+     * @var bool
+     */
+    protected $middlewareEnabled = false;
 }
diff --git a/src/Validation/AtValidation.php b/src/Validation/AtValidation.php
index 8913166f..83150696 100644
--- a/src/Validation/AtValidation.php
+++ b/src/Validation/AtValidation.php
@@ -17,7 +17,7 @@
  */
 namespace Cake\Localized\Validation;
 
-use Cake\Network\Exception\NotImplementedException;
+use Cake\Http\Exception\NotImplementedException;
 
 /**
  * AtValidation
@@ -42,7 +42,7 @@ public static function postal(string $check): bool
      * Checks a phone number.
      *
      * @param string $check The value to check.
-     * @throws \Cake\Network\Exception\NotImplementedException Exception
+     * @throws \Cake\Http\Exception\NotImplementedException Exception
      * @return bool Success.
      */
     public static function phone(string $check): bool
@@ -54,7 +54,7 @@ public static function phone(string $check): bool
      * Checks a country specific identification number.
      *
      * @param string $check The value to check.
-     * @throws \Cake\Network\Exception\NotImplementedException Exception
+     * @throws \Cake\Http\Exception\NotImplementedException Exception
      * @return bool Success.
      */
     public static function personId(string $check): bool
diff --git a/src/Validation/AuValidation.php b/src/Validation/AuValidation.php
index 6f80d2d7..5299a7ab 100644
--- a/src/Validation/AuValidation.php
+++ b/src/Validation/AuValidation.php
@@ -17,7 +17,7 @@
  */
 namespace Cake\Localized\Validation;
 
-use Cake\Network\Exception\NotImplementedException;
+use Cake\Http\Exception\NotImplementedException;
 
 /**
  * AuValidation
@@ -56,7 +56,7 @@ public static function phone(string $check): bool
      * Checks an identification number.
      *
      * @param string $check The value to check.
-     * @throws \Cake\Network\Exception\NotImplementedException Exception
+     * @throws \Cake\Http\Exception\NotImplementedException Exception
      * @return bool Success.
      */
     public static function personId(string $check): bool
diff --git a/src/Validation/BdValidation.php b/src/Validation/BdValidation.php
index f44b5f67..035d116a 100644
--- a/src/Validation/BdValidation.php
+++ b/src/Validation/BdValidation.php
@@ -17,7 +17,7 @@
  */
 namespace Cake\Localized\Validation;
 
-use Cake\Network\Exception\NotImplementedException;
+use Cake\Http\Exception\NotImplementedException;
 
 /**
  * BdValidation
@@ -42,7 +42,7 @@ public static function postal(string $check): bool
      * Checks a phone number.
      *
      * @param string $check The value to check.
-     * @throws \Cake\Network\Exception\NotImplementedException Exception
+     * @throws \Cake\Http\Exception\NotImplementedException Exception
      * @return bool Success.
      */
     public static function phone(string $check): bool
@@ -54,7 +54,7 @@ public static function phone(string $check): bool
      * Checks a country specific identification number.
      *
      * @param string $check The value to check.
-     * @throws \Cake\Network\Exception\NotImplementedException Exception
+     * @throws \Cake\Http\Exception\NotImplementedException Exception
      * @return bool Success.
      */
     public static function personId(string $check): bool
diff --git a/src/Validation/BeValidation.php b/src/Validation/BeValidation.php
index ca47dbbb..83dde499 100644
--- a/src/Validation/BeValidation.php
+++ b/src/Validation/BeValidation.php
@@ -17,7 +17,7 @@
  */
 namespace Cake\Localized\Validation;
 
-use Cake\Network\Exception\NotImplementedException;
+use Cake\Http\Exception\NotImplementedException;
 
 /**
  * BeValidation
@@ -42,7 +42,7 @@ public static function postal(string $check): bool
      * Checks a phone number.
      *
      * @param string $check The value to check.
-     * @throws \Cake\Network\Exception\NotImplementedException Exception
+     * @throws \Cake\Http\Exception\NotImplementedException Exception
      * @return bool Success.
      */
     public static function phone(string $check): bool
diff --git a/src/Validation/BrValidation.php b/src/Validation/BrValidation.php
index d8022275..0834a6d8 100644
--- a/src/Validation/BrValidation.php
+++ b/src/Validation/BrValidation.php
@@ -89,12 +89,12 @@ public static function cpf(string $check): bool
             $sum = 0;
             $position = $pos + 1;
             for ($i = 0; $i <= $pos - 1; $i++, $position--) {
-                $sum += $check[$i] * $position;
+                $sum += (int)$check[$i] * $position;
             }
             $div = $sum % 11;
             $check[$pos] = $div < 2 ? 0 : 11 - $div;
         }
-        $dvRight = $check[9] * 10 + $check[10];
+        $dvRight = (int)$check[9] * 10 + (int)$check[10];
 
         return $dvRight == $dv;
     }
diff --git a/src/Validation/CaValidation.php b/src/Validation/CaValidation.php
index c4662375..0acdd4f7 100644
--- a/src/Validation/CaValidation.php
+++ b/src/Validation/CaValidation.php
@@ -17,7 +17,7 @@
  */
 namespace Cake\Localized\Validation;
 
-use Cake\Network\Exception\NotImplementedException;
+use Cake\Http\Exception\NotImplementedException;
 
 /**
  * CaValidation
@@ -42,7 +42,7 @@ public static function postal(string $check): bool
      * Checks a phone number.
      *
      * @param string $check The value to check.
-     * @throws \Cake\Network\Exception\NotImplementedException Exception
+     * @throws \Cake\Http\Exception\NotImplementedException Exception
      * @return bool Success.
      */
     public static function phone(string $check): bool
diff --git a/src/Validation/ChValidation.php b/src/Validation/ChValidation.php
index 9fc480a5..65a4328e 100644
--- a/src/Validation/ChValidation.php
+++ b/src/Validation/ChValidation.php
@@ -17,7 +17,7 @@
  */
 namespace Cake\Localized\Validation;
 
-use Cake\Network\Exception\NotImplementedException;
+use Cake\Http\Exception\NotImplementedException;
 
 /**
  * ChValidation
@@ -44,7 +44,7 @@ public static function postal(string $check): bool
      * Checks a phone number.
      *
      * @param string $check The value to check.
-     * @throws \Cake\Network\Exception\NotImplementedException Exception
+     * @throws \Cake\Http\Exception\NotImplementedException Exception
      * @return bool Success.
      */
     public static function phone(string $check): bool
@@ -56,7 +56,7 @@ public static function phone(string $check): bool
      * Checks a country specific identification number.
      *
      * @param string $check The value to check.
-     * @throws \Cake\Network\Exception\NotImplementedException Exception
+     * @throws \Cake\Http\Exception\NotImplementedException Exception
      * @return bool Success.
      */
     public static function personId(string $check): bool
diff --git a/src/Validation/CzValidation.php b/src/Validation/CzValidation.php
index 5bae1fce..67ea3889 100644
--- a/src/Validation/CzValidation.php
+++ b/src/Validation/CzValidation.php
@@ -17,7 +17,7 @@
  */
 namespace Cake\Localized\Validation;
 
-use Cake\Network\Exception\NotImplementedException;
+use Cake\Http\Exception\NotImplementedException;
 
 /**
  * CzValidation
@@ -42,7 +42,7 @@ public static function postal(string $check): bool
      * Checks a phone number.
      *
      * @param string $check The value to check.
-     * @throws \Cake\Network\Exception\NotImplementedException Exception
+     * @throws \Cake\Http\Exception\NotImplementedException Exception
      * @return bool Success.
      */
     public static function phone(string $check): bool
@@ -54,7 +54,7 @@ public static function phone(string $check): bool
      * Checks a country specific identification number.
      *
      * @param string $check The value to check.
-     * @throws \Cake\Network\Exception\NotImplementedException Exception
+     * @throws \Cake\Http\Exception\NotImplementedException Exception
      * @return bool Success.
      */
     public static function personId(string $check): bool
diff --git a/src/Validation/DeValidation.php b/src/Validation/DeValidation.php
index 935b8275..f251fca5 100644
--- a/src/Validation/DeValidation.php
+++ b/src/Validation/DeValidation.php
@@ -17,7 +17,7 @@
  */
 namespace Cake\Localized\Validation;
 
-use Cake\Network\Exception\NotImplementedException;
+use Cake\Http\Exception\NotImplementedException;
 
 /**
  * DeValidation
@@ -90,7 +90,7 @@ public static function dob(string $check): bool
      * Checks a country specific identification number.
      *
      * @param string $check The value to check.
-     * @throws \Cake\Network\Exception\NotImplementedException Exception
+     * @throws \Cake\Http\Exception\NotImplementedException Exception
      * @return bool Success.
      */
     public static function personId(string $check): bool
diff --git a/src/Validation/DkValidation.php b/src/Validation/DkValidation.php
index 2693a9eb..fcc90de0 100644
--- a/src/Validation/DkValidation.php
+++ b/src/Validation/DkValidation.php
@@ -40,7 +40,7 @@ public static function personId(string $check): bool
      * Checks a postal code for Denmark.
      *
      * @param string $check The value to check.
-     * @throws \Cake\Network\Exception\NotImplementedException Exception
+     * @throws \Cake\Http\Exception\NotImplementedException Exception
      * @return bool Success
      */
     public static function postal(string $check): bool
@@ -54,7 +54,7 @@ public static function postal(string $check): bool
      * Checks a phone number.
      *
      * @param string $check The value to check.
-     * @throws \Cake\Network\Exception\NotImplementedException Exception
+     * @throws \Cake\Http\Exception\NotImplementedException Exception
      * @return bool Success.
      */
     public static function phone(string $check): bool
diff --git a/src/Validation/EsValidation.php b/src/Validation/EsValidation.php
index 49d70931..04350516 100644
--- a/src/Validation/EsValidation.php
+++ b/src/Validation/EsValidation.php
@@ -62,7 +62,7 @@ public static function phone(string $check): bool
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function personId($check): bool
+    public static function personId(string $check): bool
     {
         $checks = ['dni', 'nie', 'nif'];
 
diff --git a/src/Validation/FiValidation.php b/src/Validation/FiValidation.php
index 16c2f066..68a7d0cc 100644
--- a/src/Validation/FiValidation.php
+++ b/src/Validation/FiValidation.php
@@ -17,7 +17,7 @@
  */
 namespace Cake\Localized\Validation;
 
-use Cake\Network\Exception\NotImplementedException;
+use Cake\Http\Exception\NotImplementedException;
 
 /**
  * FiValidation
@@ -44,7 +44,7 @@ public static function postal(string $check): bool
      *
      * @param string $check The value to check.
      *
-     * @throws \Cake\Network\Exception\NotImplementedException Exception
+     * @throws \Cake\Http\Exception\NotImplementedException Exception
      * @return bool Success.
      */
     public static function phone(string $check): bool
@@ -59,7 +59,7 @@ public static function phone(string $check): bool
      *
      * @return bool Success.
      */
-    public static function personId($check): bool
+    public static function personId(string $check): bool
     {
         $pattern = '/^\d{6}[-+A][0-9A-Z]{4}$/';
         if (!(bool)preg_match($pattern, strval($check))) {
diff --git a/src/Validation/FrValidation.php b/src/Validation/FrValidation.php
index 46d44ba7..0bc9a481 100644
--- a/src/Validation/FrValidation.php
+++ b/src/Validation/FrValidation.php
@@ -60,7 +60,7 @@ public static function postal(string $check): bool
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function personId($check): bool
+    public static function personId(string $check): bool
     {
         $pattern = '/^[12]\d{2}(0\d|1[012])(\d{2}|2[AB])\d{8}$/';
         if (!preg_match($pattern, $check)) {
diff --git a/src/Validation/GbValidation.php b/src/Validation/GbValidation.php
index 5de751a4..2240f27c 100644
--- a/src/Validation/GbValidation.php
+++ b/src/Validation/GbValidation.php
@@ -15,7 +15,7 @@
  */
 namespace Cake\Localized\Validation;
 
-use Cake\Network\Exception\NotImplementedException;
+use Cake\Http\Exception\NotImplementedException;
 
 /**
  * GB Localized Validation class. Handles localized validation for The United Kingdom
@@ -40,7 +40,7 @@ public static function postal(string $check): bool
      * Checks a phone number.
      *
      * @param string $check The value to check.
-     * @throws \Cake\Network\Exception\NotImplementedException Exception
+     * @throws \Cake\Http\Exception\NotImplementedException Exception
      * @return bool Success.
      */
     public static function phone(string $check): bool
@@ -52,10 +52,10 @@ public static function phone(string $check): bool
      * Checks a country specific identification number.
      *
      * @param string $check The value to check.
-     * @throws \Cake\Network\Exception\NotImplementedException Exception
+     * @throws \Cake\Http\Exception\NotImplementedException Exception
      * @return bool Success.
      */
-    public static function personId($check): bool
+    public static function personId(string $check): bool
     {
         throw new NotImplementedException(__d('localized', '%s Not implemented yet.'));
     }
diff --git a/src/Validation/HrValidation.php b/src/Validation/HrValidation.php
index 98d7f4af..88ee9486 100644
--- a/src/Validation/HrValidation.php
+++ b/src/Validation/HrValidation.php
@@ -16,7 +16,7 @@
  */
 namespace Cake\Localized\Validation;
 
-use Cake\Network\Exception\NotImplementedException;
+use Cake\Http\Exception\NotImplementedException;
 
 /**
  * HrValidation
@@ -41,7 +41,7 @@ public static function postal(string $check): bool
      * Checks a phone number.
      *
      * @param string $check The value to check.
-     * @throws \Cake\Network\Exception\NotImplementedException Exception
+     * @throws \Cake\Http\Exception\NotImplementedException Exception
      * @return bool Success.
      */
     public static function phone(string $check): bool
@@ -53,10 +53,10 @@ public static function phone(string $check): bool
      * Checks a country specific identification number.
      *
      * @param string $check The value to check.
-     * @throws \Cake\Network\Exception\NotImplementedException Exception
+     * @throws \Cake\Http\Exception\NotImplementedException Exception
      * @return bool Success.
      */
-    public static function personId($check): bool
+    public static function personId(string $check): bool
     {
         throw new NotImplementedException(__d('localized', '%s Not implemented yet.'));
     }
diff --git a/src/Validation/IdValidation.php b/src/Validation/IdValidation.php
index 93404743..d0aafd46 100644
--- a/src/Validation/IdValidation.php
+++ b/src/Validation/IdValidation.php
@@ -17,7 +17,7 @@
  */
 namespace Cake\Localized\Validation;
 
-use Cake\Network\Exception\NotImplementedException;
+use Cake\Http\Exception\NotImplementedException;
 
 /**
  * IdValidation
@@ -55,7 +55,7 @@ public static function mobile(string $check): bool
      * Checks a phone number.
      *
      * @param string $check The value to check.
-     * @throws \Cake\Network\Exception\NotImplementedException Exception
+     * @throws \Cake\Http\Exception\NotImplementedException Exception
      * @return bool Success.
      */
     public static function phone(string $check): bool
@@ -67,10 +67,10 @@ public static function phone(string $check): bool
      * Checks a country specific identification number.
      *
      * @param string $check The value to check.
-     * @throws \Cake\Network\Exception\NotImplementedException Exception
+     * @throws \Cake\Http\Exception\NotImplementedException Exception
      * @return bool Success.
      */
-    public static function personId($check): bool
+    public static function personId(string $check): bool
     {
         throw new NotImplementedException(__d('localized', '%s Not implemented yet.'));
     }
diff --git a/src/Validation/InValidation.php b/src/Validation/InValidation.php
index 236dd13e..09262074 100644
--- a/src/Validation/InValidation.php
+++ b/src/Validation/InValidation.php
@@ -17,7 +17,7 @@
  */
 namespace Cake\Localized\Validation;
 
-use Cake\Network\Exception\NotImplementedException;
+use Cake\Http\Exception\NotImplementedException;
 
 /**
  * InValidation
@@ -54,10 +54,10 @@ public static function phone(string $check): bool
      * Checks an identification number.
      *
      * @param string $check The value to check.
-     * @throws \Cake\Network\Exception\NotImplementedException Exception
+     * @throws \Cake\Http\Exception\NotImplementedException Exception
      * @return bool Success.
      */
-    public static function personId($check): bool
+    public static function personId(string $check): bool
     {
         throw new NotImplementedException(__d('localized', '%s Not implemented yet.'));
     }
diff --git a/src/Validation/ItValidation.php b/src/Validation/ItValidation.php
index 93725b3b..acb53253 100644
--- a/src/Validation/ItValidation.php
+++ b/src/Validation/ItValidation.php
@@ -17,7 +17,7 @@
  */
 namespace Cake\Localized\Validation;
 
-use Cake\Network\Exception\NotImplementedException;
+use Cake\Http\Exception\NotImplementedException;
 
 /**
  * ItValidation
@@ -94,10 +94,10 @@ public static function cf(string $check): bool
      * Checks a country specific identification number.
      *
      * @param string $check The value to check.
-     * @throws \Cake\Network\Exception\NotImplementedException Exception
+     * @throws \Cake\Http\Exception\NotImplementedException Exception
      * @return bool Success.
      */
-    public static function personId($check): bool
+    public static function personId(string $check): bool
     {
         throw new NotImplementedException(__d('localized', '%s Not implemented yet.'));
     }
diff --git a/src/Validation/JpValidation.php b/src/Validation/JpValidation.php
index 822a0bd8..eec26c2f 100644
--- a/src/Validation/JpValidation.php
+++ b/src/Validation/JpValidation.php
@@ -17,7 +17,7 @@
  */
 namespace Cake\Localized\Validation;
 
-use Cake\Network\Exception\NotImplementedException;
+use Cake\Http\Exception\NotImplementedException;
 
 /**
  * JpValidation
@@ -146,10 +146,10 @@ public static function zenkaku(string $check): bool
      * Checks a country specific identification number.
      *
      * @param string $check The value to check.
-     * @throws \Cake\Network\Exception\NotImplementedException Exception
+     * @throws \Cake\Http\Exception\NotImplementedException Exception
      * @return bool Success.
      */
-    public static function personId($check): bool
+    public static function personId(string $check): bool
     {
         throw new NotImplementedException(__d('localized', '%s Not implemented yet.'));
     }
diff --git a/src/Validation/LtValidation.php b/src/Validation/LtValidation.php
index 5482cc63..36337a3e 100644
--- a/src/Validation/LtValidation.php
+++ b/src/Validation/LtValidation.php
@@ -53,7 +53,7 @@ public static function postal(string $check): bool
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function personId($check): bool
+    public static function personId(string $check): bool
     {
         $pattern = '/^([a-z]{2})[\s-]?[\d]{7}$/i';
 
diff --git a/src/Validation/LvValidation.php b/src/Validation/LvValidation.php
index 1ff49138..d6e5d545 100644
--- a/src/Validation/LvValidation.php
+++ b/src/Validation/LvValidation.php
@@ -17,7 +17,7 @@
  */
 namespace Cake\Localized\Validation;
 
-use Cake\Network\Exception\NotImplementedException;
+use Cake\Http\Exception\NotImplementedException;
 
 /**
  * LvValidation
@@ -30,7 +30,7 @@ class LvValidation extends LocalizedValidation
      *
      * @param string $check The value to check.
      *
-     * @throws \Cake\Network\Exception\NotImplementedException Exception
+     * @throws \Cake\Http\Exception\NotImplementedException Exception
      * @return bool Success.
      */
     public static function postal(string $check): bool
@@ -43,7 +43,7 @@ public static function postal(string $check): bool
      *
      * @param string $check The value to check.
      *
-     * @throws \Cake\Network\Exception\NotImplementedException Exception
+     * @throws \Cake\Http\Exception\NotImplementedException Exception
      * @return bool Success.
      */
     public static function phone(string $check): bool
@@ -58,7 +58,7 @@ public static function phone(string $check): bool
      *
      * @return bool Success.
      */
-    public static function personId($check): bool
+    public static function personId(string $check): bool
     {
         $check = trim(str_replace('-', '', $check));
 
diff --git a/src/Validation/MxValidation.php b/src/Validation/MxValidation.php
index af6500b9..7230bb2c 100644
--- a/src/Validation/MxValidation.php
+++ b/src/Validation/MxValidation.php
@@ -17,7 +17,7 @@
  */
 namespace Cake\Localized\Validation;
 
-use Cake\Network\Exception\NotImplementedException;
+use Cake\Http\Exception\NotImplementedException;
 
 /**
  * MxValidation
@@ -55,10 +55,10 @@ public static function postal(string $check): bool
      * Checks a country specific identification number.
      *
      * @param string $check The value to check.
-     * @throws \Cake\Network\Exception\NotImplementedException Exception
+     * @throws \Cake\Http\Exception\NotImplementedException Exception
      * @return bool Success.
      */
-    public static function personId($check): bool
+    public static function personId(string $check): bool
     {
         throw new NotImplementedException(__d('localized', '%s Not implemented yet.'));
     }
diff --git a/src/Validation/NlValidation.php b/src/Validation/NlValidation.php
index f384b424..b8c9501d 100644
--- a/src/Validation/NlValidation.php
+++ b/src/Validation/NlValidation.php
@@ -53,7 +53,7 @@ public static function postal(string $check): bool
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function personId($check): bool
+    public static function personId(string $check): bool
     {
         $pattern = '/\A\b\d{9}\b\z/i';
 
diff --git a/src/Validation/NoValidation.php b/src/Validation/NoValidation.php
index aaa873e3..05069c6f 100644
--- a/src/Validation/NoValidation.php
+++ b/src/Validation/NoValidation.php
@@ -73,7 +73,7 @@ public static function postal(string $check): bool
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function personId($check): bool
+    public static function personId(string $check): bool
     {
         $pattern = '/^(\d{11})|(\d{6} \d{5})$/';
 
diff --git a/src/Validation/PtValidation.php b/src/Validation/PtValidation.php
index 946db29b..6432bb20 100644
--- a/src/Validation/PtValidation.php
+++ b/src/Validation/PtValidation.php
@@ -17,7 +17,7 @@
  */
 namespace Cake\Localized\Validation;
 
-use Cake\Network\Exception\NotImplementedException;
+use Cake\Http\Exception\NotImplementedException;
 
 /**
  * PtValidation
@@ -42,7 +42,7 @@ public static function postal(string $check): bool
      * Checks a phone number.
      *
      * @param string $check The value to check.
-     * @throws \Cake\Network\Exception\NotImplementedException Exception
+     * @throws \Cake\Http\Exception\NotImplementedException Exception
      * @return bool Success.
      */
     public static function phone(string $check): bool
@@ -54,10 +54,10 @@ public static function phone(string $check): bool
      * Checks a country specific identification number.
      *
      * @param string $check The value to check.
-     * @throws \Cake\Network\Exception\NotImplementedException Exception
+     * @throws \Cake\Http\Exception\NotImplementedException Exception
      * @return bool Success.
      */
-    public static function personId($check): bool
+    public static function personId(string $check): bool
     {
         throw new NotImplementedException(__d('localized', '%s Not implemented yet.'));
     }
diff --git a/src/Validation/RoValidation.php b/src/Validation/RoValidation.php
index 63992e81..7592137a 100644
--- a/src/Validation/RoValidation.php
+++ b/src/Validation/RoValidation.php
@@ -17,7 +17,7 @@
  */
 namespace Cake\Localized\Validation;
 
-use Cake\Network\Exception\NotImplementedException;
+use Cake\Http\Exception\NotImplementedException;
 
 /**
  * RoValidation
@@ -42,7 +42,7 @@ public static function postal(string $check): bool
      * Checks a phone number.
      *
      * @param string $check The value to check.
-     * @throws \Cake\Network\Exception\NotImplementedException Exception
+     * @throws \Cake\Http\Exception\NotImplementedException Exception
      * @return bool Success.
      */
     public static function phone(string $check)
@@ -54,7 +54,7 @@ public static function phone(string $check)
      * Checks a country specific identification number.
      *
      * @param string $check The value to check.
-     * @throws \Cake\Network\Exception\NotImplementedException Exception
+     * @throws \Cake\Http\Exception\NotImplementedException Exception
      * @return bool Success.
      */
     public static function personId(string $check)
diff --git a/src/Validation/RsValidation.php b/src/Validation/RsValidation.php
index 201d1de4..48f65a4d 100644
--- a/src/Validation/RsValidation.php
+++ b/src/Validation/RsValidation.php
@@ -17,7 +17,7 @@
  */
 namespace Cake\Localized\Validation;
 
-use Cake\Network\Exception\NotImplementedException;
+use Cake\Http\Exception\NotImplementedException;
 
 /**
  * RsValidation
@@ -45,7 +45,7 @@ public static function postal(string $check): bool
      * @return bool Success.
      * @link http://en.wikipedia.org/wiki/Unique_Master_Citizen_Number
      */
-    public static function personId($check): bool
+    public static function personId(string $check): bool
     {
         if (!preg_match('/^\d{13}$/', $check)) {
             return false;
@@ -115,7 +115,7 @@ public static function jmbg(string $check): bool
      * Checks a phone number.
      *
      * @param string $check The value to check.
-     * @throws \Cake\Network\Exception\NotImplementedException Exception
+     * @throws \Cake\Http\Exception\NotImplementedException Exception
      * @return bool Success.
      */
     public static function phone(string $check): bool
diff --git a/src/Validation/RuValidation.php b/src/Validation/RuValidation.php
index a37a060a..fe346ff8 100644
--- a/src/Validation/RuValidation.php
+++ b/src/Validation/RuValidation.php
@@ -130,7 +130,7 @@ public static function vatin(string $check): bool
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function personId($check): bool
+    public static function personId(string $check): bool
     {
         return static::snils($check);
     }
diff --git a/src/Validation/SkValidation.php b/src/Validation/SkValidation.php
index 38ff442b..e2279349 100644
--- a/src/Validation/SkValidation.php
+++ b/src/Validation/SkValidation.php
@@ -17,7 +17,7 @@
  */
 namespace Cake\Localized\Validation;
 
-use Cake\Network\Exception\NotImplementedException;
+use Cake\Http\Exception\NotImplementedException;
 
 /**
  * SkValidation
@@ -42,7 +42,7 @@ public static function postal(string $check): bool
      * Checks a phone number.
      *
      * @param string $check The value to check.
-     * @throws \Cake\Network\Exception\NotImplementedException Exception
+     * @throws \Cake\Http\Exception\NotImplementedException Exception
      * @return bool Success.
      */
     public static function phone(string $check): bool
@@ -54,10 +54,10 @@ public static function phone(string $check): bool
      * Checks a country specific identification number.
      *
      * @param string $check The value to check.
-     * @throws \Cake\Network\Exception\NotImplementedException Exception
+     * @throws \Cake\Http\Exception\NotImplementedException Exception
      * @return bool Success.
      */
-    public static function personId($check): bool
+    public static function personId(string $check): bool
     {
         throw new NotImplementedException(__d('localized', '%s Not implemented yet.'));
     }
diff --git a/src/Validation/TrValidation.php b/src/Validation/TrValidation.php
index 50f855f9..ca1405e6 100644
--- a/src/Validation/TrValidation.php
+++ b/src/Validation/TrValidation.php
@@ -17,7 +17,7 @@
  */
 namespace Cake\Localized\Validation;
 
-use Cake\Network\Exception\NotImplementedException;
+use Cake\Http\Exception\NotImplementedException;
 
 /**
  * TrValidation
@@ -44,7 +44,7 @@ public static function postal(string $check): bool
      * @param string $tckn The value to check.
      * @return bool Success.
      */
-    public static function personId($tckn): bool
+    public static function personId(string $tckn): bool
     {
         if (strlen($tckn) !== 11) {
             return false;
@@ -73,7 +73,7 @@ public static function personId($tckn): bool
      * Checks a phone number.
      *
      * @param string $check The value to check.
-     * @throws \Cake\Network\Exception\NotImplementedException Exception
+     * @throws \Cake\Http\Exception\NotImplementedException Exception
      * @return bool Success.
      */
     public static function phone(string $check): bool
diff --git a/src/Validation/TwValidation.php b/src/Validation/TwValidation.php
index bbd39c3e..0af9e87b 100644
--- a/src/Validation/TwValidation.php
+++ b/src/Validation/TwValidation.php
@@ -55,7 +55,7 @@ public static function postal(string $check): bool
      * @param string $check The value to check.
      * @return bool Success.
      */
-    public static function personId($check): bool
+    public static function personId(string $check): bool
     {
         $check = strtoupper($check);
         if (!preg_match('/^[A-Z][1-2]\d{8}$/', $check)) {
diff --git a/src/Validation/UaValidation.php b/src/Validation/UaValidation.php
index 4b66aa6a..a1e899ea 100644
--- a/src/Validation/UaValidation.php
+++ b/src/Validation/UaValidation.php
@@ -89,7 +89,7 @@ public static function idCard(string $check): bool
      * @return bool Success.
      * @link https://en.wikipedia.org/wiki/VAT_identification_number#VAT_numbers_of_non-EU_countries
      */
-    public static function personId($check): bool
+    public static function personId(string $check): bool
     {
         $pattern = '/^\d{10}$/';
 
diff --git a/src/Validation/UsValidation.php b/src/Validation/UsValidation.php
index e269e304..a54a73a3 100644
--- a/src/Validation/UsValidation.php
+++ b/src/Validation/UsValidation.php
@@ -59,7 +59,7 @@ public static function postal(string $check): bool
      * @param string $check The value to check.
      * @return bool Success
      */
-    public static function personId($check): bool
+    public static function personId(string $check): bool
     {
         $pattern = '/\A\b\d{3}-\d{2}-\d{4}\b\z/i';
 
diff --git a/tests/TestCase/Validation/FiValidationTest.php b/tests/TestCase/Validation/FiValidationTest.php
index f7966361..3be21fd3 100644
--- a/tests/TestCase/Validation/FiValidationTest.php
+++ b/tests/TestCase/Validation/FiValidationTest.php
@@ -42,7 +42,6 @@ public function personIdProvider()
             ['010100+991B', false],
             ['010100-9856', false],
             ['010100A929B', false],
-            [null, false],
             ['', false],
         ];
     }

From 045bb044cfb15b2a355f76126c292a58885751b3 Mon Sep 17 00:00:00 2001
From: mscherer <mark.scherer@spryker.com>
Date: Fri, 3 Apr 2020 00:32:53 +0200
Subject: [PATCH 9/9] No warnings for now.

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index c135e1f1..72495e3a 100644
--- a/composer.json
+++ b/composer.json
@@ -46,7 +46,7 @@
             "@stan",
             "@psalm"
          ],
-        "cs-check": "phpcs -p --standard=vendor/cakephp/cakephp-codesniffer/CakePHP src/ tests/",
+        "cs-check": "phpcs -p -n --standard=vendor/cakephp/cakephp-codesniffer/CakePHP src/ tests/",
         "cs-fix": "phpcbf --standard=vendor/cakephp/cakephp-codesniffer/CakePHP src/ tests/",
         "test": "phpunit --stderr",
         "stan": "phpstan analyse src/",