瀏覽代碼

TestHelper.php raised a PHP warning in PHPunit 3.4, this is now fixed
Removed a call to PHP_CodeCoverage_Filter in tests/Zend/Config/Writer/AllTests.php, as this is no longer required

Changes are related to #ZF-10830

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@23509 44c647ce-9c0f-0410-b52a-842ac1e357ba

andries 15 年之前
父節點
當前提交
248e4810b1
共有 2 個文件被更改,包括 1 次插入4 次删除
  1. 1 1
      tests/TestHelper.php
  2. 0 3
      tests/Zend/Config/Writer/AllTests.php

+ 1 - 1
tests/TestHelper.php

@@ -23,7 +23,7 @@
 /*
  * Include PHPUnit dependencies
  */
-if (!fopen('PHPUnit/Autoload.php', 'r', true)) {
+if (!@fopen('PHPUnit/Autoload.php', 'r', true)) {
     require_once 'PHPUnit/Framework.php'; // < PHPUnit 3.5.5
 } else {
     require_once 'PHPUnit/Autoload.php'; // >= of PHPUnit 3.5.5

+ 0 - 3
tests/Zend/Config/Writer/AllTests.php

@@ -22,9 +22,6 @@
 
 require_once dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
-
-PHP_CodeCoverage_Filter::getInstance()->addDirectoryToBlacklist(dirname(__FILE__) . '/temp', 'cfg');
-
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Config_Writer_AllTests::main');
 }