Merge remote-tracking branch 'origin/master' into cake4

# Conflicts:
#	.travis.yml
#	composer.json

.travis.yml

@@ -2,8 +2,7 @@ language: php
 
 php:
   - 7.2
-  - 7.3
-  - 7.4snapshot
+  - 7.4
 
 env:
   matrix:

composer.json

@@ -14,7 +14,7 @@
 	],
 	"require": {
 		"php": ">=7.2",
-		"cakephp/cakephp": "4.x-dev"
+		"cakephp/cakephp": "^4.0"
 	},
 	"require-dev": {
 		"cakephp/debug_kit": "4.x-dev",
@@ -46,7 +46,7 @@
 		"test-setup": "[ ! -f phpunit.phar ] && wget https://phar.phpunit.de/phpunit-8.4.3.phar && mv phpunit-8.4.3.phar phpunit.phar || true",
 		"test-coverage" : "php phpunit.phar --log-junit tmp/coverage/unitreport.xml --coverage-html tmp/coverage --coverage-clover tmp/coverage/coverage.xml",
 		"phpstan": "phpstan analyse -c tests/phpstan.neon -l 6 src/",
-		"phpstan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan-shim && mv composer.backup composer.json",
+		"phpstan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan:^0.11 && mv composer.backup composer.json",
 		"cs-check": "phpcs -p --standard=vendor/fig-r/psr2r-sniffer/PSR2R/ruleset.xml --ignore=/tests/test_files/,/config/Migrations/ --extensions=php src/ tests/",
 		"cs-fix": "phpcbf -p --standard=vendor/fig-r/psr2r-sniffer/PSR2R/ruleset.xml --ignore=/tests/test_files/,/config/Migrations/ --extensions=php src/ tests/",
 		"lowest": "validate-prefer-lowest",

docs/README.md

@@ -60,6 +60,9 @@ You can also clear the cache from code using `TinyAuth\Utility\Cache::clear()` m
 You can easily switch out the INI file adapters for both using `allowAdapter` and `aclAdapter` config.
 This way you can also read from DB or provide any other API driven backend to read the data from for your authentication or authorization.
 
+Current customizations:
+- [TinyAuthBackend plugin](https://github.com/dereuromark/cakephp-tinyauth-backend) as backend GUI for "allow" and "ACL".
+
 ## Troubleshooting
 First of all: Isolate the issue. Never mix **authentication** and **authorization** (read the top part again).
 

src/Auth/AclTrait.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace TinyAuth\Auth;
 
 use Cake\Core\Configure;

src/Auth/AllowTrait.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace TinyAuth\Auth;
 
 use Cake\Core\Configure;

src/Auth/TinyAuthorize.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace TinyAuth\Auth;
 
 use Cake\Auth\BaseAuthorize;

src/Plugin.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace TinyAuth;
 
 use Cake\Core\BasePlugin;

src/Policy/RequestPolicy.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace TinyAuth\Policy;
 
 use Authorization\IdentityInterface;

src/Utility/TinyAuth.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace TinyAuth\Utility;
 
 use Cake\Core\InstanceConfigTrait;

src/Utility/Utility.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace TinyAuth\Utility;
 
 use Cake\Core\Exception\Exception;

tests/Fixture/DatabaseRolesFixture.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace TinyAuth\Test\Fixture;
 
 use Cake\TestSuite\Fixture\TestFixture;

tests/Fixture/DatabaseRolesUsersFixture.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace TinyAuth\Test\Fixture;
 
 use Cake\TestSuite\Fixture\TestFixture;

tests/Fixture/DatabaseUserRolesFixture.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace TinyAuth\Test\Fixture;
 
 use Cake\TestSuite\Fixture\TestFixture;

tests/Fixture/EmptyRolesFixture.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace TinyAuth\Test\Fixture;
 
 use Cake\TestSuite\Fixture\TestFixture;

tests/Fixture/RolesUsersFixture.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace TinyAuth\Test\Fixture;
 
 use Cake\TestSuite\Fixture\TestFixture;

tests/Fixture/UsersFixture.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace TinyAuth\Test\Fixture;
 
 use Cake\TestSuite\Fixture\TestFixture;

tests/TestCase/Auth/AclAdapter/IniAclAdapterTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace TinyAuth\Test\Auth\AclAdapter;
 
 use Cake\Core\Plugin;

tests/TestCase/Auth/AllowAdapter/IniAllowAdapterTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace TinyAuth\Test\Auth\AllowAdapter;
 
 use Cake\Core\Plugin;

tests/TestCase/Auth/TinyAuthorizeTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace TinyAuth\Test\Auth;
 
 use Cake\Controller\ComponentRegistry;

tests/TestCase/Command/TinyAuthSyncCommandTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace TinyAuth\Test\TestCase\Command;
 
 use Cake\Console\Command;

tests/TestCase/View/Helper/AuthenticationHelperTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace TinyAuth\Test\TestCase\View\Helper;
 
 use Cake\Core\Plugin;

tests/test_app/Auth/TestTinyAuthorize.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace TestApp\Auth;
 
 use Cake\Core\Plugin;

tests/test_app/Controller/Admin/MyPrefix/MyTestController.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace TestApp\Controller\Admin\MyPrefix;
 
 use Cake\Controller\Controller;

tests/test_app/Controller/Component/TestAuthUserComponent.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace TestApp\Controller\Component;
 
 use Cake\Core\Plugin;

tests/test_app/Controller/OffersController.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace TestApp\Controller;
 
 use Cake\Controller\Controller;

tests/test_app/View/AppView.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace TestApp\View;
 
 use Cake\View\View;