浏览代码

Fix PHP7.3 tests.

mscherer 7 年之前
父节点
当前提交
5966d0194a
共有 2 个文件被更改,包括 3 次插入1 次删除
  1. 2 0
      src/Model/Behavior/ResetBehavior.php
  2. 1 1
      tests/TestCase/HtmlDom/HtmlDomTest.php

+ 2 - 0
src/Model/Behavior/ResetBehavior.php

@@ -118,6 +118,8 @@ class ResetBehavior extends Behavior {
 		}
 		}
 
 
 		$params += $defaults;
 		$params += $defaults;
+
+		$conditions = $params['conditions'];
 		$count = $this->_table->find('count', compact('conditions'));
 		$count = $this->_table->find('count', compact('conditions'));
 		$max = (int)ini_get('max_execution_time');
 		$max = (int)ini_get('max_execution_time');
 		if ($max) {
 		if ($max) {

+ 1 - 1
tests/TestCase/HtmlDom/HtmlDomTest.php

@@ -18,7 +18,7 @@ class HtmlDomTest extends TestCase {
 	public function setUp() {
 	public function setUp() {
 		parent::setUp();
 		parent::setUp();
 
 
-		$this->skipIf(!class_exists('Yangqi\Htmldom\Htmldom'));
+		$this->skipIf(!class_exists('Yangqi\Htmldom\Htmldom') || version_compare(PHP_VERSION, '7.3') >= 0);
 	}
 	}
 
 
 	/**
 	/**