Fix for 3.6 support.

.gitignore

@@ -2,6 +2,5 @@
 /phpunit.phar
 /vendor/
 /tmp/
-/plugins/Setup
 /composer.phar
 /.idea

src/Error/ErrorHandlerTrait.php

@@ -6,15 +6,15 @@ use Cake\Controller\Exception\MissingActionException;
 use Cake\Core\Configure;
 use Cake\Datasource\Exception\InvalidPrimaryKeyException;
 use Cake\Datasource\Exception\RecordNotFoundException;
-use Cake\Network\Exception\BadRequestException;
-use Cake\Network\Exception\ConflictException;
-use Cake\Network\Exception\GoneException;
-use Cake\Network\Exception\InvalidCsrfTokenException;
-use Cake\Network\Exception\MethodNotAllowedException;
-use Cake\Network\Exception\NotAcceptableException;
-use Cake\Network\Exception\NotFoundException;
-use Cake\Network\Exception\UnauthorizedException;
-use Cake\Network\Exception\UnavailableForLegalReasonsException;
+use Cake\Http\Exception\BadRequestException;
+use Cake\Http\Exception\ConflictException;
+use Cake\Http\Exception\GoneException;
+use Cake\Http\Exception\InvalidCsrfTokenException;
+use Cake\Http\Exception\MethodNotAllowedException;
+use Cake\Http\Exception\NotAcceptableException;
+use Cake\Http\Exception\NotFoundException;
+use Cake\Http\Exception\UnauthorizedException;
+use Cake\Http\Exception\UnavailableForLegalReasonsException;
 use Cake\Routing\Exception\MissingControllerException;
 use Cake\Routing\Exception\MissingRouteException;
 use Cake\View\Exception\MissingViewException;
@@ -43,6 +43,15 @@ trait ErrorHandlerTrait {
 		MissingRouteException::class,
 		MissingViewException::class,
 		UnavailableForLegalReasonsException::class,
+		'Cake\Network\Exception\BadRequestException',
+		'Cake\Network\Exception\ConflictException',
+		'Cake\Network\Exception\GoneException',
+		'Cake\Network\Exception\InvalidCsrfTokenException',
+		'Cake\Network\Exception\MethodNotAllowedException',
+		'Cake\Network\Exception\NotAcceptableException',
+		'Cake\Network\Exception\NotFoundException',
+		'Cake\Network\Exception\UnauthorizedException',
+		'Cake\Network\Exception\UnavailableForLegalReasonsException',
 	];
 
 	/**

tests/TestCase/Error/Middleware/ErrorHandlerMiddlewareTest.php

@@ -3,8 +3,8 @@
 namespace Tools\Test\TestCase\Error\Middleware;
 
 use Cake\Core\Configure;
+use Cake\Http\ServerRequest;
 use Cake\Network\Exception\NotFoundException;
-use Cake\Network\Http\Request;
 use Tools\Error\Middleware\ErrorHandlerMiddleware;
 use Tools\TestSuite\TestCase;
 use Tools\TestSuite\ToolsTestTrait;
@@ -46,12 +46,12 @@ class ErrorHandlerMiddlewareTest extends TestCase {
 	public function test404() {
 		$parameters = [
 			new NotFoundException(),
-			new Request(),
+			new ServerRequest(),
 		];
 		$result = $this->invokeMethod($this->errorHandlerMiddleware, 'is404', $parameters);
 		$this->assertTrue($result);
 
-		$request = new Request('http://foo.bar', Request::METHOD_GET, ['Referer' => 'http://foo.bar/baz']);
+		$request = new ServerRequest(['url' => 'http://foo.bar', 'environment' => ['HTTP_REFERER' => 'http://foo.bar/baz']]);
 		$parameters = [
 			new NotFoundException(),
 			$request,

tests/TestCase/Model/Behavior/PasswordableBehaviorTest.php

@@ -138,7 +138,7 @@ class PasswordableBehaviorTest extends TestCase {
 		$this->Users->patchEntity($user, $data);
 		$is = $this->Users->save($user);
 		$this->assertTrue((bool)$is);
-		$this->assertEquals(['name', 'created', 'modified', 'id'], $is->visibleProperties());
+		$this->assertEquals(['name', 'id'], $is->visibleProperties());
 
 		$id = $user->id;
 		$user = $this->Users->newEntity();
@@ -150,7 +150,7 @@ class PasswordableBehaviorTest extends TestCase {
 		$this->Users->patchEntity($user, $data);
 		$is = $this->Users->save($user);
 		$this->assertTrue((bool)$is);
-		$this->assertEquals(['id', 'modified'], $is->visibleProperties());
+		$this->assertEquals(['id'], $is->visibleProperties());
 	}
 
 	/**