Resolves issue #ZF-10830. Testsuite is now compatible with PHPUnit 3.5.5, and remains BC with PHPUnit 3.4

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

tests/TestHelper.php

@@ -23,13 +23,11 @@
 /*
  * Include PHPUnit dependencies
  */
-require_once 'PHPUnit/Framework.php';
-require_once 'PHPUnit/Framework/IncompleteTestError.php';
-require_once 'PHPUnit/Framework/TestCase.php';
-require_once 'PHPUnit/Framework/TestSuite.php';
-require_once 'PHPUnit/Runner/Version.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-require_once 'PHPUnit/Util/Filter.php';
+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
+}
 
 /*
  * Set error reporting to the level to which Zend Framework code must comply.
@@ -67,28 +65,6 @@ if (is_readable($zfCoreTests . DIRECTORY_SEPARATOR . 'TestConfiguration.php')) {
     require_once $zfCoreTests . DIRECTORY_SEPARATOR . 'TestConfiguration.php.dist';
 }
 
-if (defined('TESTS_GENERATE_REPORT') && TESTS_GENERATE_REPORT === true &&
-    version_compare(PHPUnit_Runner_Version::id(), '3.1.6', '>=')) {
-
-    /*
-     * Add Zend Framework library/ directory to the PHPUnit code coverage
-     * whitelist. This has the effect that only production code source files
-     * appear in the code coverage report and that all production code source
-     * files, even those that are not covered by a test yet, are processed.
-     */
-    PHPUnit_Util_Filter::addDirectoryToWhitelist($zfCoreLibrary);
-
-    /*
-     * Omit from code coverage reports the contents of the tests directory
-     */
-    foreach (array('.php', '.phtml', '.csv', '.inc') as $suffix) {
-        PHPUnit_Util_Filter::addDirectoryToFilter($zfCoreTests, $suffix);
-    }
-    PHPUnit_Util_Filter::addDirectoryToFilter(PEAR_INSTALL_DIR);
-    PHPUnit_Util_Filter::addDirectoryToFilter(PHP_LIBDIR);
-}
-
-
 /**
  * Start output buffering, if enabled
  */

tests/Zend/Application/_files/appconfig.inc

@@ -1,6 +1,7 @@
 <?php
-require_once 'PHPUnit/Util/Filter.php';
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
+
+
 
 $config = array(
     'foo' => 'bar',

tests/Zend/Barcode/AllTests.php

@@ -33,7 +33,8 @@ require_once dirname(__FILE__) . '/../../TestHelper.php';
 /**
  * Exclude from code coverage report
  */
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
+
 
 
 require_once 'Zend/Barcode/FactoryTest.php';
@@ -88,9 +89,9 @@ class Zend_Barcode_AllTests
         $suite->addTestSuite('Zend_Barcode_FactoryTest');
 
         $suite->addTestSuite('Zend_Barcode_Object_Code39Test');
-        
+
         $suite->addTestSuite('Zend_Barcode_Object_Code128Test');
-        
+
         $suite->addTestSuite('Zend_Barcode_Object_Code25Test');
         $suite->addTestSuite('Zend_Barcode_Object_Code25interleavedTest');
         $suite->addTestSuite('Zend_Barcode_Object_Itf14Test');

tests/Zend/Cache/CommonBackendTest.php

@@ -20,9 +20,8 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
 
 /**
  * PHPUnit test case

tests/Zend/Cache/CommonExtendedBackendTest.php

@@ -20,10 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
-
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
-
 /**
  * PHPUnit test case
  */

tests/Zend/Cache/SkipTests.php

@@ -25,9 +25,8 @@
  */
 require_once 'PHPUnit/Framework/TestCase.php';
 
-require_once 'PHPUnit/Util/Filter.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
 
 /**
  * @category   Zend

tests/Zend/Config/Writer/AllTests.php

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

tests/Zend/Controller/Action/HelperBrokerTest.php

@@ -48,6 +48,11 @@ require_once 'Zend/Controller/Action/Helper/Redirector.php';
 class Zend_Controller_Action_HelperBrokerTest extends PHPUnit_Framework_TestCase
 {
     /**
+     * @var Zend_Controller_Front
+     */
+    protected $front;
+
+    /**
      * Runs the test methods of this class.
      *
      * @access public
@@ -70,8 +75,8 @@ class Zend_Controller_Action_HelperBrokerTest extends PHPUnit_Framework_TestCase
                     ->throwExceptions(true);
         Zend_Controller_Action_HelperBroker::resetHelpers();
 
-        $viewRenderer = Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer');
-        $viewRenderer->setActionController();
+        //$viewRenderer = Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer');
+        //$viewRenderer->setActionController();
     }
 
     public function testLoadingAndReturningHelper()
@@ -320,6 +325,20 @@ class Zend_Controller_Action_HelperBrokerTest extends PHPUnit_Framework_TestCase
         $this->assertFalse(empty($paths));
     }
 
+    public function testCanLoadNamespacedHelper()
+    {
+        $this->front->setControllerDirectory(dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . '_files')
+            ->setResponse(new Zend_Controller_Response_Cli())
+            ->returnResponse(true);
+
+        $path = dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . '_files/Helpers';
+        Zend_Controller_Action_HelperBroker::addPath($path, 'MyApp\Controller\Action\Helper\\');
+
+        $request  = new Zend_Controller_Request_Http('http://framework.zend.com/helper-broker/test-can-load-namespaced-helper/');
+        $response = $this->front->dispatch($request);
+        $this->assertEquals('MyApp\Controller\Action\Helper\NamespacedHelper', $response->getBody());
+    }
+
     /**
      * @group ZF-4704
      */

tests/Zend/Controller/_files/Admin/BazController.php

@@ -20,9 +20,8 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
 
 require_once 'Zend/Controller/Action.php';
 

tests/Zend/Controller/_files/Admin/FooBarController.php

@@ -20,9 +20,8 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
 
 require_once 'Zend/Controller/Action.php';
 require_once dirname(__FILE__) . '/../FooController.php';

tests/Zend/Controller/_files/Admin/FooController.php

@@ -20,9 +20,8 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
 
 require_once 'Zend/Controller/Action.php';
 require_once dirname(__FILE__) . '/../FooController.php';

tests/Zend/Controller/_files/BazController.php

@@ -20,9 +20,8 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
 
 require_once 'Zend/Controller/Action.php';
 

tests/Zend/Controller/_files/EmptyController.php

@@ -20,9 +20,8 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
 
 require_once 'Zend/Controller/Action.php';
 

tests/Zend/Controller/_files/FooBarController.php

@@ -20,9 +20,8 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
 
 require_once 'Zend/Controller/Action.php';
 

tests/Zend/Controller/_files/FooController.php

@@ -20,9 +20,8 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
 
 require_once 'Zend/Controller/Action.php';
 

tests/Zend/Controller/_files/HelperBrokerController.php

@@ -20,8 +20,8 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
+
 
 require_once 'Zend/Controller/Action.php';
 
@@ -93,4 +93,13 @@ class HelperBrokerController extends Zend_Controller_Action
         $this->getResponse()->appendBody(get_class($this->_helper->TestHelper));
     }
 
+    public function testCanLoadNamespacedHelperAction()
+    {
+        try {
+            $helper = $this->_helper->getHelper('NamespacedHelper');
+            $this->getResponse()->appendBody(get_class($helper));
+        } catch (Exception $e) {
+            $this->getResponse()->appendBody($e->getMessage());
+        }
+    }
 }

tests/Zend/Controller/_files/Helpers/TestHelper.php

@@ -20,8 +20,8 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
+
 
 /**
  * Mock file for testbed

tests/Zend/Controller/_files/Helpers/Url.php

@@ -20,8 +20,8 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
+
 
 /**
  * Mock file for testbed

tests/Zend/Controller/_files/IndexController.php

@@ -20,9 +20,8 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
 
 require_once 'Zend/Controller/Action.php';
 

tests/Zend/Controller/_files/ManuallyIncludedControllers.php

@@ -20,8 +20,8 @@
  * @version    $Id: ManuallyIncludedControllers.php $
  */
 
-require_once 'PHPUnit/Util/Filter.php';
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
+
 
 require_once 'Zend/Controller/Action.php';
 

tests/Zend/Controller/_files/ObController.php

@@ -20,9 +20,8 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
 
 require_once 'Zend/Controller/Action.php';
 require_once 'Zend/View.php';

tests/Zend/Controller/_files/ViewController.php

@@ -20,9 +20,8 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
 
 require_once 'Zend/Controller/Action.php';
 

tests/Zend/Controller/_files/modules/bar/controllers/IndexController.php

@@ -20,9 +20,8 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
 
 require_once 'Zend/Controller/Action.php';
 

tests/Zend/Controller/_files/modules/bar/views/scripts/index/test.phtml

@@ -1,5 +1,5 @@
 <?php
-require_once 'PHPUnit/Util/Filter.php';
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
+
 ?>
 Rendered index/test.phtml in bar module

tests/Zend/Controller/_files/modules/bar/views/scripts/test.phtml

@@ -1,5 +1,5 @@
 <?php
-require_once 'PHPUnit/Util/Filter.php';
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
+
 ?>
 Rendered test.phtml in bar module

tests/Zend/Controller/_files/modules/foo/controllers/Admin/IndexController.php

@@ -20,9 +20,8 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
 
 require_once 'Zend/Controller/Action.php';
 

tests/Zend/Controller/_files/modules/foo/controllers/IndexController.php

@@ -20,9 +20,8 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Util/Filter.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
 
 require_once 'Zend/Controller/Action.php';
 

tests/Zend/Controller/views/scripts/foo-bar/baz-bat.phtml

@@ -1,5 +1,5 @@
 <?php
-require_once 'PHPUnit/Util/Filter.php';
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
+
 ?>
 Inside foo-bar/baz-bat.phtml

tests/Zend/Controller/views/scripts/site.phtml

@@ -1,5 +1,5 @@
 <?php
-require_once 'PHPUnit/Util/Filter.php';
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
+
 ?>
 In the sitewide view

tests/Zend/Controller/views/scripts/view/index.phtml

@@ -1,5 +1,5 @@
 <?php
-require_once 'PHPUnit/Util/Filter.php';
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
+
 ?>
 In the index action view

tests/Zend/Controller/views/scripts/view/name.phtml

@@ -1,5 +1,5 @@
 <?php
-require_once 'PHPUnit/Util/Filter.php';
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
+
 ?>
 In the name view

tests/Zend/CurrencyTest.php

@@ -31,10 +31,6 @@ require_once dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'TestHelper.php'
 require_once 'Zend/Locale.php';
 require_once 'Zend/Currency.php';
 
-/**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework.php';
 
 /**
  * @category   Zend

tests/Zend/Db/Adapter/Db2Test.php

@@ -30,8 +30,6 @@ require_once 'Zend/Db/Adapter/TestCommon.php';
  */
 require_once 'Zend/Db/Adapter/Db2.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
-
 /**
  * @category   Zend
  * @package    Zend_Db

tests/Zend/Db/Adapter/MysqliTest.php

@@ -30,8 +30,6 @@ require_once 'Zend/Db/Adapter/TestCommon.php';
  */
 require_once 'Zend/Db/Adapter/Mysqli.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
-
 /**
  * @category   Zend
  * @package    Zend_Db

tests/Zend/Db/Adapter/OracleTest.php

@@ -30,7 +30,6 @@ require_once 'Zend/Db/Adapter/TestCommon.php';
  */
 require_once 'Zend/Db/Adapter/Oracle.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
 /**
  * @category   Zend

tests/Zend/Db/Adapter/Pdo/IbmTest.php

@@ -33,9 +33,6 @@ require_once 'Zend/Db/Adapter/Db2Test.php';
 require_once 'Zend/Db/Adapter/Pdo/Ibm.php';
 
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
-
-
 /**
  * @category   Zend
  * @package    Zend_Db

tests/Zend/Db/Adapter/Pdo/MssqlTest.php

@@ -30,7 +30,6 @@ require_once 'Zend/Db/Adapter/Pdo/TestCommon.php';
  */
 require_once 'Zend/Db/Adapter/Pdo/Mysql.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
 /**
  * @category   Zend

tests/Zend/Db/Adapter/Pdo/MysqlTest.php

@@ -33,9 +33,6 @@ require_once 'Zend/Db/Adapter/Pdo/TestCommon.php';
 require_once 'Zend/Db/Adapter/Pdo/Mysql.php';
 
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
-
-
 /**
  * @category   Zend
  * @package    Zend_Db

tests/Zend/Db/Adapter/Pdo/OciTest.php

@@ -22,7 +22,6 @@
 
 require_once 'Zend/Db/Adapter/Pdo/TestCommon.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
 /**
  * @category   Zend

tests/Zend/Db/Adapter/Pdo/PgsqlTest.php

@@ -22,7 +22,6 @@
 
 require_once 'Zend/Db/Adapter/Pdo/TestCommon.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
 /**
  * @category   Zend

tests/Zend/Db/Adapter/Pdo/SqliteTest.php

@@ -27,9 +27,6 @@
 require_once 'Zend/Db/Adapter/Pdo/TestCommon.php';
 
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
-
-
 /**
  * @category   Zend
  * @package    Zend_Db

tests/Zend/Db/Adapter/Pdo/TestCommon.php

@@ -27,7 +27,8 @@
 require_once 'Zend/Db/Adapter/TestCommon.php';
 
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
+
 
 
 /**

tests/Zend/Db/Adapter/SqlsrvTest.php

@@ -30,8 +30,6 @@ require_once 'Zend/Db/Adapter/TestCommon.php';
  */
 require_once 'Zend/Db/Adapter/Sqlsrv.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
-
 /**
  * @category   Zend
  * @package    Zend_Db
@@ -441,7 +439,7 @@ class Zend_Db_Adapter_SqlsrvTest extends Zend_Db_Adapter_TestCommon
 
         $this->assertTrue($db->setTransactionIsolationLevel(), "Setting to default should work by passsing null or nothing");
     }
-    
+
     /**
      * @group ZF-9252
      * @see zf-trunk/tests/Zend/Db/Adapter/Zend_Db_Adapter_TestCommon#testAdapterLimit()
@@ -463,7 +461,7 @@ class Zend_Db_Adapter_SqlsrvTest extends Zend_Db_Adapter_TestCommon
             'Expecting to get product_id 1');
 
     }
-    
+
     /**
      * @group ZF-9252
      * @see zf-trunk/tests/Zend/Db/Adapter/Zend_Db_Adapter_TestCommon#testAdapterLimitOffset()
@@ -471,7 +469,7 @@ class Zend_Db_Adapter_SqlsrvTest extends Zend_Db_Adapter_TestCommon
     public function testAdapterLimitOffset()
     {
         parent::testAdapterLimitOffset();
-        
+
         $products = $this->_db->quoteIdentifier('zfproducts');
         $product_id = $this->_db->quoteIdentifier('product_id');
 
@@ -483,7 +481,7 @@ class Zend_Db_Adapter_SqlsrvTest extends Zend_Db_Adapter_TestCommon
             'Expecting row count to be 1');
         $this->assertEquals(2, $result[0]['product_id'],
             'Expecting to get product_id 2');
-    } 
+    }
 
     /**
      * @group ZF-8148
@@ -499,7 +497,7 @@ class Zend_Db_Adapter_SqlsrvTest extends Zend_Db_Adapter_TestCommon
         $result = $stmt->fetchAll();
         $this->assertEquals(1, count($result),
             'Expecting row count to be 1');
-    }  
+    }
 
     /**
      * @group ZF-8148
@@ -517,7 +515,7 @@ class Zend_Db_Adapter_SqlsrvTest extends Zend_Db_Adapter_TestCommon
             'Expecting row count to be 1');
         $this->assertEquals(1, $result[0]['product_id'],
             'Expecting to get product_id 1');
-    }     
+    }
 
     /**
      * @group ZF-8148
@@ -535,8 +533,8 @@ class Zend_Db_Adapter_SqlsrvTest extends Zend_Db_Adapter_TestCommon
             'Expecting row count to be 1');
         $this->assertEquals(2, $result[0]['product_id'],
             'Expecting to get product_id 2');
-    }  
-    
+    }
+
     /**
      * @group ZF-8901
      */
@@ -554,7 +552,7 @@ class Zend_Db_Adapter_SqlsrvTest extends Zend_Db_Adapter_TestCommon
             'Expecting row count to be 1');
         $this->assertEquals(2, $result[0]['product_id'],
             'Expecting to get product_id 2');
-    }    
+    }
 
     public function getDriver()
     {

tests/Zend/Db/Adapter/Static.php

@@ -21,13 +21,7 @@
  */
 
 
-/**
- * PHPUnit_Util_Filter
- */
-require_once 'PHPUnit/Util/Filter.php';
-
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
 
 /**

tests/Zend/Db/Adapter/StaticTest.php

@@ -26,8 +26,6 @@
  */
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
-
 /**
  * @see Zend_Db
  */

tests/Zend/Db/Adapter/TestCommon.php

@@ -30,7 +30,8 @@ require_once 'Zend/Db/TestSetup.php';
  */
 require_once 'Zend/Loader.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
+
 
 /**
  * @category   Zend

tests/Zend/Db/Adapter/_files/Test/Db2Statement.php

@@ -21,13 +21,8 @@
  */
 
 
-/**
- * PHPUnit_Util_Filter
- */
-require_once 'PHPUnit/Util/Filter.php';
 
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
 
 /**

tests/Zend/Db/Adapter/_files/Test/MysqliStatement.php

@@ -21,13 +21,7 @@
  */
 
 
-/**
- * PHPUnit_Util_Filter
- */
-require_once 'PHPUnit/Util/Filter.php';
-
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
 
 /**

tests/Zend/Db/Adapter/_files/Test/OracleStatement.php

@@ -21,13 +21,8 @@
  */
 
 
-/**
- * PHPUnit_Util_Filter
- */
-require_once 'PHPUnit/Util/Filter.php';
 
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
 
 /**

tests/Zend/Db/Adapter/_files/Test/PdoStatement.php

@@ -21,13 +21,7 @@
  */
 
 
-/**
- * PHPUnit_Util_Filter
- */
-require_once 'PHPUnit/Util/Filter.php';
-
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
 
 /**

tests/Zend/Db/Adapter/_files/Testnamespace/Static.php

@@ -21,13 +21,8 @@
  */
 
 
-/**
- * PHPUnit_Util_Filter
- */
-require_once 'PHPUnit/Util/Filter.php';
 
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
 
 /**

tests/Zend/Db/Profiler/Db2Test.php

@@ -27,7 +27,8 @@
 require_once 'Zend/Db/Profiler/TestCommon.php';
 
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
+
 
 
 /**

tests/Zend/Db/Profiler/MysqliTest.php

@@ -27,7 +27,8 @@
 require_once 'Zend/Db/Profiler/TestCommon.php';
 
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
+
 
 
 /**

tests/Zend/Db/Profiler/OracleTest.php

@@ -27,9 +27,6 @@
 require_once 'Zend/Db/Profiler/TestCommon.php';
 
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
-
-
 /**
  * @category   Zend
  * @package    Zend_Db

tests/Zend/Db/Profiler/Pdo/IbmTest.php

@@ -26,7 +26,8 @@
  */
 require_once 'Zend/Db/Profiler/TestCommon.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
+
 
 
 /**

tests/Zend/Db/Profiler/Pdo/MssqlTest.php

@@ -25,7 +25,8 @@
  */
 require_once 'Zend/Db/Profiler/TestCommon.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
+
 
 
 /**

tests/Zend/Db/Profiler/Pdo/MysqlTest.php

@@ -27,7 +27,7 @@
 require_once 'Zend/Db/Profiler/TestCommon.php';
 
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
 
 
 /**

tests/Zend/Db/Profiler/Pdo/OciTest.php

@@ -27,7 +27,7 @@
 require_once 'Zend/Db/Profiler/TestCommon.php';
 
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
 
 
 /**

tests/Zend/Db/Profiler/Pdo/PgsqlTest.php

@@ -27,7 +27,7 @@
 require_once 'Zend/Db/Profiler/TestCommon.php';
 
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
 
 
 /**

tests/Zend/Db/Profiler/Pdo/SqliteTest.php

@@ -27,7 +27,7 @@
 require_once 'Zend/Db/Profiler/TestCommon.php';
 
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
 
 
 /**

tests/Zend/Db/Profiler/ProfilerCustom.php

@@ -26,7 +26,8 @@
  */
 require_once 'Zend/Db/Profiler.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
+
 
 /**
  * @category   Zend

tests/Zend/Db/Profiler/SqlsrvTest.php

@@ -27,7 +27,8 @@
 require_once 'Zend/Db/Profiler/TestCommon.php';
 
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
+
 
 
 /**

tests/Zend/Db/Profiler/StaticTest.php

@@ -27,9 +27,6 @@
 require_once 'Zend/Db/TestSetup.php';
 
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
-
-
 /**
  * @category   Zend
  * @package    Zend_Db

tests/Zend/Db/Profiler/TestCommon.php

@@ -27,7 +27,8 @@
 require_once 'Zend/Db/TestSetup.php';
 
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
+
 
 /**
  * @category   Zend

tests/Zend/Db/Select/Db2Test.php

@@ -22,7 +22,8 @@
 
 require_once 'Zend/Db/Select/TestCommon.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
+
 
 /**
  * @category   Zend

tests/Zend/Db/Select/MysqliTest.php

@@ -22,7 +22,9 @@
 
 require_once 'Zend/Db/Select/TestCommon.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
+
+
 
 /**
  * @category   Zend

tests/Zend/Db/Select/OdbcTest.php

@@ -22,7 +22,9 @@
 
 require_once 'Zend/Db/Select/TestCommon.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
+
+
 
 /**
  * @category   Zend

tests/Zend/Db/Select/OracleTest.php

@@ -22,7 +22,9 @@
 
 require_once 'Zend/Db/Select/TestCommon.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
+
+
 
 /**
  * @category   Zend

tests/Zend/Db/Select/Pdo/IbmTest.php

@@ -27,7 +27,7 @@
 require_once 'Zend/Db/Select/TestCommon.php';
 
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
 
 
 /**

tests/Zend/Db/Select/Pdo/MssqlTest.php

@@ -22,7 +22,9 @@
 
 require_once 'Zend/Db/Select/TestCommon.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
+
+
 
 /**
  * @category   Zend

tests/Zend/Db/Select/Pdo/MysqlTest.php

@@ -27,7 +27,7 @@
 require_once 'Zend/Db/Select/TestCommon.php';
 
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
 
 
 /**

tests/Zend/Db/Select/Pdo/OciTest.php

@@ -22,7 +22,6 @@
 
 require_once 'Zend/Db/Select/OracleTest.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
 /**
  * @category   Zend

tests/Zend/Db/Select/Pdo/PgsqlTest.php

@@ -27,9 +27,6 @@
 require_once 'Zend/Db/Select/TestCommon.php';
 
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
-
-
 /**
  * @category   Zend
  * @package    Zend_Db

tests/Zend/Db/Select/Pdo/SqliteTest.php

@@ -22,7 +22,6 @@
 
 require_once 'Zend/Db/Select/TestCommon.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
 /**
  * @category   Zend

tests/Zend/Db/Select/SqlsrvTest.php

@@ -22,7 +22,9 @@
 
 require_once 'Zend/Db/Select/TestCommon.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
+
+
 
 /**
  * @category   Zend

tests/Zend/Db/Select/StaticTest.php

@@ -27,9 +27,6 @@
 require_once 'Zend/Db/Select/TestCommon.php';
 
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
-
-
 /**
  * @category   Zend
  * @package    Zend_Db
@@ -511,7 +508,7 @@ class Zend_Db_Select_StaticTest extends Zend_Db_Select_TestCommon
 
 	/**
 	 * Test if the quotation type could be passed
-	 * 
+	 *
 	 * @group ZF-10000
 	 */
 	public function testSelectHavingQuoteBySpecificType()
@@ -519,14 +516,14 @@ class Zend_Db_Select_StaticTest extends Zend_Db_Select_TestCommon
 		$select = $this->_select()
 			->columns(array('count' => 'COUNT(*)'))
 			->group('bug_id');
-		
+
 		$select->having('COUNT(*) > ?', '1', Zend_Db::INT_TYPE);
 		$this->assertEquals('SELECT "zfproducts".*, COUNT(*) AS "count" FROM "zfproducts" GROUP BY "bug_id" HAVING (COUNT(*) > 1)', $select->__toString());
 	}
-	
+
 	/**
 	 * Test if the quotation is done for int
-	 * 
+	 *
 	 * @group ZF-10000
 	 */
 	public function testSelectHavingQuoteAsIntAutomatically()
@@ -534,14 +531,14 @@ class Zend_Db_Select_StaticTest extends Zend_Db_Select_TestCommon
 		$select = $this->_select()
 			->columns(array('count' => 'COUNT(*)'))
 			->group('bug_id');
-		
+
 		$select->having('COUNT(*) > ?', 1);
 		$this->assertEquals('SELECT "zfproducts".*, COUNT(*) AS "count" FROM "zfproducts" GROUP BY "bug_id" HAVING (COUNT(*) > 1)', $select->__toString());
 	}
-	
+
 	/**
 	 * Test if the quotation is done for string
-	 * 
+	 *
 	 * @group ZF-10000
 	 */
 	public function testSelectHavingQuoteAsStringAutomatically()
@@ -549,14 +546,14 @@ class Zend_Db_Select_StaticTest extends Zend_Db_Select_TestCommon
 		$select = $this->_select()
 			->columns(array('count' => 'COUNT(*)'))
 			->group('bug_id');
-		
+
 		$select->having('COUNT(*) > ?', '1');
 		$this->assertEquals('SELECT "zfproducts".*, COUNT(*) AS "count" FROM "zfproducts" GROUP BY "bug_id" HAVING (COUNT(*) > \'1\')', $select->__toString());
 	}
-	
+
 	/**
 	 * Test if the quotation type could be passed
-	 * 
+	 *
 	 * @group ZF-10000
 	 */
 	public function testSelectOrHavingQuoteBySpecificType()
@@ -564,15 +561,15 @@ class Zend_Db_Select_StaticTest extends Zend_Db_Select_TestCommon
 		$select = $this->_select()
 			->columns(array('count' => 'COUNT(*)'))
 			->group('bug_id');
-		
+
 		$select->having('COUNT(*) > ?', '1', Zend_Db::INT_TYPE);
 		$select->orHaving('COUNT(*) = ?', '2', Zend_Db::INT_TYPE);
 		$this->assertEquals('SELECT "zfproducts".*, COUNT(*) AS "count" FROM "zfproducts" GROUP BY "bug_id" HAVING (COUNT(*) > 1) OR (COUNT(*) = 2)', $select->__toString());
 	}
-	
+
 	/**
 	 * Test if the quotation is done for int
-	 * 
+	 *
 	 * @group ZF-10000
 	 */
 	public function testSelectOrHavingQuoteAsIntAutomatically()
@@ -580,15 +577,15 @@ class Zend_Db_Select_StaticTest extends Zend_Db_Select_TestCommon
 		$select = $this->_select()
 			->columns(array('count' => 'COUNT(*)'))
 			->group('bug_id');
-		
+
 		$select->having('COUNT(*) > ?', 1);
 		$select->orHaving('COUNT(*) = ?', 2);
 		$this->assertEquals('SELECT "zfproducts".*, COUNT(*) AS "count" FROM "zfproducts" GROUP BY "bug_id" HAVING (COUNT(*) > 1) OR (COUNT(*) = 2)', $select->__toString());
 	}
-	
+
 	/**
 	 * Test if the quotation is done for string
-	 * 
+	 *
 	 * @group ZF-10000
 	 */
 	public function testSelectOrHavingQuoteAsStringAutomatically()
@@ -596,7 +593,7 @@ class Zend_Db_Select_StaticTest extends Zend_Db_Select_TestCommon
 		$select = $this->_select()
 			->columns(array('count' => 'COUNT(*)'))
 			->group('bug_id');
-		
+
 		$select->having('COUNT(*) > ?', '1');
 		$select->orHaving('COUNT(*) = ?', '2');
 		$this->assertEquals('SELECT "zfproducts".*, COUNT(*) AS "count" FROM "zfproducts" GROUP BY "bug_id" HAVING (COUNT(*) > \'1\') OR (COUNT(*) = \'2\')', $select->__toString());

tests/Zend/Db/Select/TestCommon.php

@@ -27,7 +27,7 @@
 require_once 'Zend/Db/TestSetup.php';
 
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
 
 
 /**

tests/Zend/Db/SkipTests.php

@@ -22,9 +22,8 @@
 
 require_once 'PHPUnit/Framework/TestCase.php';
 
-require_once 'PHPUnit/Util/Filter.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
 
 /**
  * @category   Zend

tests/Zend/Db/Statement/Db2Test.php

@@ -22,7 +22,6 @@
 
 require_once 'Zend/Db/Statement/TestCommon.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
 /**
  * @category   Zend

tests/Zend/Db/Statement/MysqliTest.php

@@ -22,7 +22,6 @@
 
 require_once 'Zend/Db/Statement/TestCommon.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
 /**
  * @category   Zend
@@ -144,10 +143,10 @@ class Zend_Db_Statement_MysqliTest extends Zend_Db_Statement_TestCommon
         $result = $stmt->fetch();
         $this->assertFalse($result);
     }
-    
+
 	/**
 	 * Test to verify valid report of issue
-	 * 
+	 *
      * @group ZF-8986
      */
     public function testNumberOfBoundParamsDoesNotMatchNumberOfTokens()
@@ -160,7 +159,7 @@ class Zend_Db_Statement_MysqliTest extends Zend_Db_Statement_TestCommon
     		'object_long'   => 'REAL',
         ));
         $tableName = $this->_util->getTableName('zf_objects');
-        
+
         $numRows = $this->_db->insert($tableName, array (
         	'object_id' => 1,
         	'object_type' => 1,
@@ -168,11 +167,11 @@ class Zend_Db_Statement_MysqliTest extends Zend_Db_Statement_TestCommon
         	'object_lati' => 1.12345,
         	'object_long' => 1.54321,
         ));
-        
+
         $sql = 'SELECT object_id, object_type, object_status,'
-             . ' object_lati, object_long FROM ' . $tableName 
+             . ' object_lati, object_long FROM ' . $tableName
              . ' WHERE object_id = ?';
-             
+
         try {
         	$stmt = $this->_db->query($sql, 1);
         } catch (Exception $e) {

tests/Zend/Db/Statement/OdbcTest.php

@@ -22,7 +22,8 @@
 
 require_once 'Zend/Db/Statement/TestCommon.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
+
 
 /**
  * @category   Zend

tests/Zend/Db/Statement/OracleTest.php

@@ -22,7 +22,6 @@
 
 require_once 'Zend/Db/Statement/TestCommon.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
 /**
  * @category   Zend

tests/Zend/Db/Statement/Pdo/IbmTest.php

@@ -22,7 +22,6 @@
 
 require_once 'Zend/Db/Statement/Pdo/TestCommon.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
 /**
  * @category   Zend

tests/Zend/Db/Statement/Pdo/MssqlTest.php

@@ -22,7 +22,9 @@
 
 require_once 'Zend/Db/Statement/Pdo/TestCommon.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
+
+
 
 /**
  * @category   Zend

tests/Zend/Db/Statement/Pdo/MysqlTest.php

@@ -22,7 +22,6 @@
 
 require_once 'Zend/Db/Statement/Pdo/TestCommon.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
 /**
  * @category   Zend

tests/Zend/Db/Statement/Pdo/OciTest.php

@@ -22,7 +22,9 @@
 
 require_once 'Zend/Db/Statement/Pdo/TestCommon.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
+
+
 
 /**
  * @category   Zend

tests/Zend/Db/Statement/Pdo/PgsqlTest.php

@@ -22,7 +22,9 @@
 
 require_once 'Zend/Db/Statement/Pdo/TestCommon.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
+
+
 
 /**
  * @category   Zend

tests/Zend/Db/Statement/Pdo/SqliteTest.php

@@ -22,7 +22,6 @@
 
 require_once 'Zend/Db/Statement/Pdo/TestCommon.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
 /**
  * @category   Zend

tests/Zend/Db/Statement/Pdo/TestCommon.php

@@ -22,7 +22,6 @@
 
 require_once 'Zend/Db/Statement/TestCommon.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
 /*
  * @category   Zend

tests/Zend/Db/Statement/SqlsrvTest.php

@@ -22,7 +22,6 @@
 
 require_once 'Zend/Db/Statement/TestCommon.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
 /**
  * @category   Zend
@@ -90,7 +89,7 @@ class Zend_Db_Statement_SqlsrvTest extends Zend_Db_Statement_TestCommon
 
         $stmt->closeCursor();
     }
-    
+
     /*
      * @group ZF-8138
      */
@@ -99,32 +98,32 @@ class Zend_Db_Statement_SqlsrvTest extends Zend_Db_Statement_TestCommon
         $products   = $this->_db->quoteIdentifier('zfproducts');
         $product_id = $this->_db->quoteIdentifier('product_id');
         $product_name = $this->_db->quoteIdentifier('product_name');
-        
+
         $products_procedure   = $this->_db->quoteIdentifier('#InsertIntoProducts');
-        
+
         $prodecure = "CREATE PROCEDURE $products_procedure
                                     @ProductName varchar(100)
                    AS
                        BEGIN
                              -- insert row (result set 1)
-                             INSERT INTO $products 
+                             INSERT INTO $products
                                          ($product_name)
                                     VALUES
                                          (@ProductName);
-                            
+
                              -- Get results (result set 2)
                              SELECT * FROM $products;
                        END";
-        
+
         // create procedure
         $this->_db->query($prodecure);
 
         $stmt  = $this->_db->query('{call ' . $products_procedure .'(?)}', array('Product'));
 
         $result1 = $stmt->rowCount();
-        
+
         $this->assertEquals(1, $result1, 'Expected 1 row to be inserted');
-        
+
         $stmt->nextRowset();
 
         $result2 = $stmt->fetchAll();
@@ -134,22 +133,22 @@ class Zend_Db_Statement_SqlsrvTest extends Zend_Db_Statement_TestCommon
 
         $stmt->closeCursor();
     }
-	
+
 	/*
      * @group ZF-7559
      */
     public function testStatementWithProcedure()
     {
         $products   = $this->_db->quoteIdentifier('zfproducts');
-        
+
         $products_procedure   = $this->_db->quoteIdentifier('#GetProducts');
-        
+
         $prodecure = "CREATE PROCEDURE $products_procedure
                    AS
                        BEGIN
                              SELECT * FROM $products;
                        END";
-        
+
         // create procedure
         $this->_db->query($prodecure);
 

tests/Zend/Db/Statement/Static.php

@@ -21,13 +21,8 @@
  */
 
 
-/**
- * PHPUnit_Util_Filter
- */
-require_once 'PHPUnit/Util/Filter.php';
 
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
 
 
 /**

tests/Zend/Db/Statement/StaticTest.php

@@ -21,8 +21,8 @@
  */
 
 require_once 'PHPUnit/Framework/TestCase.php';
-require_once 'PHPUnit/Util/Filter.php';
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
+
 
 /**
  * @category   Zend

tests/Zend/Db/Statement/TestCommon.php

@@ -24,7 +24,9 @@ require_once 'Zend/Db/TestSetup.php';
 
 require_once 'Zend/Db/Statement/Exception.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
+
+
 
 /**
  * @category   Zend

tests/Zend/Db/Table/Db2Test.php

@@ -22,7 +22,9 @@
 
 require_once 'Zend/Db/Table/TestCommon.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
+
+
 
 /**
  * @category   Zend

tests/Zend/Db/Table/MysqliTest.php

@@ -22,7 +22,9 @@
 
 require_once 'Zend/Db/Table/TestCommon.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
+
+
 
 /**
  * @category   Zend

tests/Zend/Db/Table/OdbcTest.php

@@ -22,7 +22,9 @@
 
 require_once 'Zend/Db/Table/TestCommon.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
+
+
 
 /**
  * @category   Zend

tests/Zend/Db/Table/OracleTest.php

@@ -22,7 +22,9 @@
 
 require_once 'Zend/Db/Table/TestCommon.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
+
+
 
 /**
  * @category   Zend

tests/Zend/Db/Table/Pdo/IbmTest.php

@@ -27,7 +27,7 @@
 require_once 'Zend/Db/Table/TestCommon.php';
 
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
 
 
 /**

tests/Zend/Db/Table/Pdo/MssqlTest.php

@@ -22,7 +22,9 @@
 
 require_once 'Zend/Db/Table/TestCommon.php';
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
+
+
 
 /**
  * @category   Zend

tests/Zend/Db/Table/Pdo/MysqlTest.php

@@ -27,7 +27,7 @@
 require_once 'Zend/Db/Table/TestCommon.php';
 
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+
 
 
 /**