fix tests

src/Model/Behavior/PasswordableBehavior.php

@@ -75,8 +75,8 @@ class PasswordableBehavior extends Behavior {
 			],
 		],
 		'formFieldCurrent' => [
-			'notEmpty' => [
-				'rule' => ['notEmpty'],
+			'notBlank' => [
+				'rule' => ['notBlank'],
 				'message' => 'valErrProvideCurrentPwd',
 				'last' => true,
 			],

src/View/Helper/FlashHelper.php

@@ -13,7 +13,7 @@ use Tools\Controller\Component\FlashComponent;
  */
 class FlashHelper extends Helper {
 
-	public $helpers = ['Session'];
+	public $helpers = [];
 
 	/**
 	 * Display all flash messages.
@@ -36,7 +36,7 @@ class FlashHelper extends Helper {
 	 */
 	public function render(array $types = []) {
 		// Get the messages from the session
-		$messages = (array)$this->Session->read('FlashMessage');
+		$messages = (array)$this->request->session()->read('FlashMessage');
 		$cMessages = (array)Configure::read('FlashMessage');
 		if (!empty($cMessages)) {
 			$messages = (array)Hash::merge($messages, $cMessages);

tests/TestApp/Model/Table/BitmaskedCommentsTable.php

@@ -8,8 +8,8 @@ class BitmaskedCommentsTable extends Table {
 
 	public $validate = [
 		'status' => [
-			'notEmpty' => [
-				'rule' => 'notEmpty',
+			'notBlank' => [
+				'rule' => 'notBlank',
 				'last' => true
 			]
 		]

tests/TestCase/HtmlDom/HtmlDomTest.php

@@ -12,6 +12,8 @@ class HtmlDomTest extends TestCase {
 
 	public function setUp() {
 		parent::setUp();
+
+		$this->skipIf(!class_exists('Yangqi\Htmldom\Htmldom'));
 	}
 
 	/**