浏览代码

Fix up CI

mscherer 3 年之前
父节点
当前提交
e237a14659
共有 3 个文件被更改,包括 3 次插入20 次删除
  1. 1 1
      composer.json
  2. 0 9
      tests/TestCase/HtmlDom/HtmlDomTest.php
  3. 2 10
      tests/TestCase/Model/Behavior/PasswordableBehaviorTest.php

+ 1 - 1
composer.json

@@ -22,7 +22,7 @@
 		}
 	],
 	"require": {
-		"php": ">=7.3",
+		"php": ">=7.4",
 		"cakephp/cakephp": "^4.2.0",
 		"dereuromark/cakephp-shim": "^2.0.0"
 	},

+ 0 - 9
tests/TestCase/HtmlDom/HtmlDomTest.php

@@ -13,15 +13,6 @@ class HtmlDomTest extends TestCase {
 	protected $HtmlDom;
 
 	/**
-	 * @return void
-	 */
-	public function setUp(): void {
-		parent::setUp();
-
-		$this->skipIf(!class_exists('Yangqi\Htmldom\Htmldom') || version_compare(PHP_VERSION, '7.3') >= 0);
-	}
-
-	/**
 	 * HtmlDom test
 	 *
 	 * @return void

+ 2 - 10
tests/TestCase/Model/Behavior/PasswordableBehaviorTest.php

@@ -139,11 +139,7 @@ class PasswordableBehaviorTest extends TestCase {
 		$this->Users->patchEntity($user, $data);
 		$is = $this->Users->save($user);
 		$this->assertTrue((bool)$is);
-		if (version_compare(Configure::version(), '3.6.0', '<')) {
-			$fields = ['name', 'created', 'modified', 'id'];
-		} else {
-			$fields = ['name', 'id'];
-		}
+		$fields = ['name', 'id'];
 		$this->assertEquals($fields, $is->getVisible());
 
 		$id = $user->id;
@@ -156,11 +152,7 @@ class PasswordableBehaviorTest extends TestCase {
 		$this->Users->patchEntity($user, $data);
 		$is = $this->Users->save($user);
 		$this->assertTrue((bool)$is);
-		if (version_compare(Configure::version(), '3.6.0', '<')) {
-			$fields = ['id', 'modified'];
-		} else {
-			$fields = ['id'];
-		}
+		$fields = ['id'];
 		$this->assertEquals($fields, $is->getVisible());
 	}