Merge pull request #49 from ADmad/cake-4.x

Cake 4.x

Author: ADmad

.editorconfig

@@ -13,3 +13,6 @@ trim_trailing_whitespace = true
 [*.yml]
 indent_style = space
 indent_size = 2
+
+[*.neon]
+indent_style = tab

.gitattributes

@@ -2,6 +2,9 @@
 .editorconfig export-ignore
 .gitattributes export-ignore
 .gitignore export-ignore
-phpunit.xml export-ignore
+phpunit.xml.dist export-ignore
 .travis.yml export-ignore
 tests export-ignore
+phpstan.neon export-ignore
+psalm.xml export-ignore
+psalm-baseline.xml export-ignore

.gitignore

@@ -1,2 +1,3 @@
 /composer.lock
 /vendor
+.phpunit.result.cache

.scrutinizer.yml

@@ -1,13 +1,12 @@
 language: php
 
 php:
-  - 5.6
-  - 7.1
-  - 7.3
+  - 7.2
+  - 7.4
 
 services:
-  - mysql
   - postgresql
+  - mysql
 
 env:
   matrix:
@@ -22,36 +21,45 @@ matrix:
   fast_finish: true
 
   include:
-    - php: 7.1
+    - php: 7.2
       env: PHPCS=1 DEFAULT=0
 
-    - php: 7.1
+    - php: 7.2
       env: STATIC_ANALYSIS=1 DEFAULT=0
 
-    - php: 5.6
+    - php: 7.2
       env: PREFER_LOWEST=1
 
 before_script:
-  - if [[ $TRAVIS_PHP_VERSION != 7.1 ]]; then phpenv config-rm xdebug.ini; fi
+  - if [[ $PREFER_LOWEST != 1 ]]; then composer update --no-interaction; fi
+  - if [[ $PREFER_LOWEST == 1 ]]; then composer update --no-interaction --prefer-lowest --prefer-stable; fi
 
-  - if [[ $PREFER_LOWEST != 1 ]]; then composer install --no-interaction; fi
-  - if [[ $PREFER_LOWEST = 1 ]]; then composer update --no-interaction --prefer-lowest --prefer-stable; fi
+  - if [[ $DB == 'mysql' ]]; then mysql -e 'CREATE DATABASE cakephp_test;'; fi
+  - if [[ $DB == 'pgsql' ]]; then psql -c 'CREATE DATABASE cakephp_test;' -U postgres; fi
 
-  - if [[ $DB = 'mysql' ]]; then mysql -e 'CREATE DATABASE cakephp_test;'; fi
-  - if [[ $DB = 'pgsql' ]]; then psql -c 'CREATE DATABASE cakephp_test;' -U postgres; fi
-
-  - if [[ $PHPCS = '1' ]]; then composer require cakephp/cakephp-codesniffer; fi
+  - if [[ $PHPCS == 1 ]]; then composer require cakephp/cakephp-codesniffer:^4.0; fi
+  - if [[ $STATIC_ANALYSIS == 1 ]]; then composer stan-setup; fi
 
 script:
-  - if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION = 7.1 ]]; then vendor/bin/phpunit --coverage-clover=clover.xml; fi
-  - if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION != 7.1 ]]; then vendor/bin/phpunit; fi
+  - |
+      if [[ $DEFAULT == 1 && $TRAVIS_PHP_VERSION == 7.2 ]]; then
+        mkdir -p build/logs
+        vendor/bin/phpunit --coverage-clover=build/logs/clover.xml
+      fi
+
+  - if [[ $DEFAULT == 1 && $TRAVIS_PHP_VERSION != 7.2 ]]; then vendor/bin/phpunit; fi
 
-  - if [[ $PHPCS = 1 ]]; then vendor/bin/phpcs -p --extensions=php --standard=vendor/cakephp/cakephp-codesniffer/CakePHP ./src ./tests; fi
+  - if [[ $PHPCS == 1 ]]; then vendor/bin/phpcs -p --standard=vendor/cakephp/cakephp-codesniffer/CakePHP ./src ./tests; fi
 
-  - if [[ $STATIC_ANALYSIS = 1 ]]; then composer require --dev phpstan/phpstan:^0.11 && vendor/bin/phpstan analyse src; fi
+  - if [[ $STATIC_ANALYSIS == 1 ]]; then composer stan; fi
 
 after_success:
-  - if [[ $DEFAULT = 1 && $DB = 'mysql' && $TRAVIS_PHP_VERSION = 7.1 ]]; then bash <(curl -s https://codecov.io/bash); fi
+  - |
+      if [[ $DEFAULT == 1 && $TRAVIS_PHP_VERSION = 7.2 ]]; then
+        wget https://github.com/php-coveralls/php-coveralls/releases/download/v2.1.0/php-coveralls.phar
+        chmod +x php-coveralls.phar
+        ./php-coveralls.phar
+      fi
 
 notifications:
   email: false

.styleci.yml

@@ -17,10 +17,6 @@ This plugins provides:
 - Validation class for auto translating validation message.
 - A widget to generate select box with list of timezone identifiers.
 
-## Requirements
-
-* CakePHP 3.0+
-
 ## Installation
 
 ```
@@ -46,7 +42,7 @@ The `I18nRoutes` helps generating language prefixed routes of style
 For e.g. you can add routes to your `routes.php` similar to the ones shown below:
 
 ```php
-Router::scope('/', function ($routes) {
+$routes->scope('/', function ($routes) {
     $routes->connect(
         '/:controller',
         ['action' => 'index'],
@@ -79,7 +75,7 @@ inflected accordingly.
 
 ### I18nMiddleware
 
-While not necessary one would generally use the `I18nMiddleware` too when using
+While not necessary, one would generally use the `I18nMiddleware` too when using
 language prefixed routes with the help of `I18nRoute`.
 
 You can setup the `I18nMiddleware` in your `src/Application::middleware()` as
@@ -104,7 +100,8 @@ $middlware->add(new \ADmad\I18n\Middleware\I18nMiddleware([
 
 The keys of `languages` array are the language prefixes you use in your URL.
 
-To ensure that the `lang` router param is available, you must add this middleware *after* adding CakePHP's default routing middleware (i.e. after `->add(new RoutingMiddleware($this))`).
+To ensure that the `lang` router param is available, you must add this middleware
+*after* adding CakePHP's default routing middleware (i.e. after `->add(new RoutingMiddleware($this))`).
 
 The middleware does basically two things:
 
@@ -116,7 +113,7 @@ The middleware does basically two things:
    you must connect a route for `/` to a controller action. That controller action
    will never be actually called as the middleware will intercept and redirect
    the request.
-   
+
    For e.g. `$routes->connect('/', ['controller' => 'Foo']);`
 
 2. When accesing any URL with language prefix    it set's the app's locale based
@@ -154,12 +151,12 @@ I18n::config('default', function ($domain, $locale) {
 });
 ```
 
-You can use `ADmad/I18n.I18n` shell to extract the translation message from your
+You can use `admad/i18n extract` command to extract the translation message from your
 code files and populate the translations table. Updating the db records with
 translations for each language is upto you.
 
 ```
-bin/cake ADmad/I18n.i18n extract
+bin/cake admad/i18n extract
 ```
 
 Now you can use the translation funtions like `__()` etc. as you normally would.
@@ -172,7 +169,7 @@ In your `AppView::initialize()` configure the `FormHelper` to use `TimezoneWidge
 
 ```php
 // src/View/AppView.php
-public function initialize()
+public function initialize(): void
 {
     $this->loadHelper('Form', [
         'widget' => [

.travis.yml

@@ -23,10 +23,10 @@
         "issues":"https://github.com/ADmad/cakephp-i18n/issues"
     },
     "require": {
-        "cakephp/cakephp": "^3.5"
+        "cakephp/cakephp": "^4.0.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7.14|^6.0"
+        "phpunit/phpunit": "~8.5.0"
     },
     "autoload": {
         "psr-4": {
@@ -35,13 +35,19 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "ADmad\\I18n\\Test\\": "tests"
+            "ADmad\\I18n\\Test\\": "tests",
+            "TestApp\\": "tests/test_app/src",
+            "TestPlugin\\": "tests/test_app/plugins/TestPlugin/src",
+            "Company\\TestPluginThree\\": "tests/test_app/plugins/Company/TestPluginThree/src"
         }
     },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.0.x-dev"
-        }
-    },
-    "prefer-stable": true
+    "scripts": {
+        "phpstan": "phpstan.phar analyse",
+        "psalm": "psalm.phar",
+        "stan": [
+            "@phpstan",
+            "@psalm"
+        ],
+        "stan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan:^0.12 psalm/phar:^3.11.2 && mv composer.backup composer.json"
+    }
 }

README.md

@@ -1,6 +1,24 @@
 parameters:
-    level: 3
-    autoload_files:
-        - tests/bootstrap.php
-    ignoreErrors:
-        - '#Call to an undefined method Cake\\Datasource\\QueryInterface::enableHydration\(\)#'
+	level: 6
+	checkMissingIterableValueType: false
+	checkGenericClassInNonGenericObjectType: false
+	treatPhpDocTypesAsCertain: false
+	bootstrapFiles:
+		- tests/bootstrap.php
+	paths:
+		- src
+	ignoreErrors:
+		-
+			message: "#^Parameter \\#1 \\$var_array of function extract is passed by reference, so it expects variables only\\.$#"
+			count: 1
+			path: src/Command/I18nExtractCommand.php
+
+		-
+			message: "#^Strict comparison using \\!\\=\\= between null and null will always evaluate to false\\.$#"
+			count: 2
+			path: src/Command/I18nExtractCommand.php
+
+		-
+			message: "#^Parameter \\#1 \\$request of method ADmad\\\\I18n\\\\Middleware\\\\I18nMiddleware\\:\\:detectLanguage\\(\\) expects Cake\\\\Http\\\\ServerRequest, Psr\\\\Http\\\\Message\\\\ServerRequestInterface given\\.$#"
+			count: 1
+			path: src/Middleware/I18nMiddleware.php

composer.json

@@ -3,7 +3,6 @@
     colors="true"
     processIsolation="false"
     stopOnFailure="false"
-    syntaxCheck="false"
     bootstrap="./tests/bootstrap.php"
     >
     <php>
@@ -32,7 +31,6 @@
     <filter>
         <whitelist>
             <directory suffix=".php">./src/</directory>
-            <directory suffix=".ctp">./src/</directory>
         </whitelist>
     </filter>
 </phpunit>