Skip to content

Commit

Permalink
Updated PHPUnit to 3.5.15 release
Browse files Browse the repository at this point in the history
  • Loading branch information
mikeho committed Aug 22, 2011
1 parent fafc105 commit 5225b05
Show file tree
Hide file tree
Showing 324 changed files with 8,984 additions and 19,836 deletions.
11 changes: 4 additions & 7 deletions cli/scripts/_core/phpunit.cli.php
@@ -1,15 +1,12 @@
<?php
if (extension_loaded('xdebug')) {
ini_set('xdebug.show_exception_trace', 0);
}

set_include_path('.' . PATH_SEPARATOR . __QCODO_CORE__ . PATH_SEPARATOR . get_include_path());

require_once 'PHPUnit/Util/Filter.php';
PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'PHPUNIT');
// require_once (__QCODO_CORE__ . '/PHPUnit/Util/Filter.php');
// PHPUnit_Util_Filter::getInstance()->addFileToFilter(__FILE__, 'PHPUNIT');

require 'PHPUnit/TextUI/Command.php';
require_once (__QCODO_CORE__ . '/PHPUnit/Autoload.php');
define('PHPUnit_MAIN_METHOD', 'PHPUnit_TextUI_Command::main');

array_shift($_SERVER['argv']);
PHPUnit_TextUI_Command::main();
?>
Expand Up @@ -2,7 +2,7 @@
/**
* PHPUnit
*
* Copyright (c) 2002-2010, Sebastian Bergmann <sb@sebastian-bergmann.de>.
* Copyright (c) 2002-2011, Sebastian Bergmann <sebastian@phpunit.de>.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -34,49 +34,56 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
* @category Testing
* @package PHPUnit
* @author Sebastian Bergmann <sb@sebastian-bergmann.de>
* @copyright 2002-2010 Sebastian Bergmann <sb@sebastian-bergmann.de>
* @author Sebastian Bergmann <sebastian@phpunit.de>
* @copyright 2002-2011 Sebastian Bergmann <sebastian@phpunit.de>
* @license http://www.opensource.org/licenses/bsd-license.php BSD License
* @link http://www.phpunit.de/
* @since File available since Release 3.2.0
* @since File available since Release 3.5.0
*/

require_once 'PHPUnit/Util/Log/PMD/Rule/Class.php';
require_once 'PHPUnit/Util/Filter.php';
require_once 'PHPUnit/Util/Filesystem.php';
require_once 'PHP/CodeCoverage/Filter.php';

PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'PHPUNIT');

/**
*
*
* @category Testing
* @package PHPUnit
* @author Sebastian Bergmann <sb@sebastian-bergmann.de>
* @copyright 2002-2010 Sebastian Bergmann <sb@sebastian-bergmann.de>
* @license http://www.opensource.org/licenses/bsd-license.php BSD License
* @version Release: 3.4.11
* @link http://www.phpunit.de/
* @since Class available since Release 3.2.0
*/
class PHPUnit_Util_Log_PMD_Rule_Class_DepthOfInheritanceTree extends PHPUnit_Util_Log_PMD_Rule_Class
{
public function __construct($threshold = 6, $priority = 1)
{
parent::__construct($threshold, $priority);
}

public function apply(PHPUnit_Util_Metrics $metrics)
if (!function_exists('phpunit_autoload')) {
function phpunit_autoload($class)
{
$dit = $metrics->getDIT();
if (strpos($class, 'PHPUnit_') === 0) {
$file = str_replace('_', '/', $class) . '.php';
$file = PHPUnit_Util_Filesystem::fileExistsInIncludePath($file);

if ($dit > $this->threshold) {
return sprintf(
'Depth of Inheritance Tree (DIT) is %d.',
$dit
);
if ($file) {
require_once $file;
}
}
}

spl_autoload_register('phpunit_autoload');

$dir = dirname(__FILE__);
$filter = PHP_CodeCoverage_Filter::getInstance();

$filter->addDirectoryToBlacklist(
$dir . '/Extensions', '.php', '', 'PHPUNIT', FALSE
);

$filter->addDirectoryToBlacklist(
$dir . '/Framework', '.php', '', 'PHPUNIT', FALSE
);

$filter->addDirectoryToBlacklist(
$dir . '/Runner', '.php', '', 'PHPUNIT', FALSE
);

$filter->addDirectoryToBlacklist(
$dir . '/TextUI', '.php', '', 'PHPUNIT', FALSE
);

$filter->addDirectoryToBlacklist(
$dir . '/Util', '.php', '', 'PHPUNIT', FALSE
);

$filter->addFileToBlacklist(__FILE__, 'PHPUNIT', FALSE);

unset($dir, $filter);
}
?>
Expand Up @@ -2,7 +2,7 @@
/**
* PHPUnit
*
* Copyright (c) 2002-2010, Sebastian Bergmann <sb@sebastian-bergmann.de>.
* Copyright (c) 2002-2011, Sebastian Bergmann <sb@sebastian-bergmann.de>.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -34,33 +34,24 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
* @category Testing
* @package PHPUnit
* @package DbUnit
* @author Mike Lively <m@digitalsandwich.com>
* @copyright 2002-2010 Sebastian Bergmann <sb@sebastian-bergmann.de>
* @copyright 2002-2011 Sebastian Bergmann <sb@sebastian-bergmann.de>
* @license http://www.opensource.org/licenses/bsd-license.php BSD License
* @link http://www.phpunit.de/
* @since File available since Release 3.2.0
* @since File available since Release 1.0.0
*/

require_once 'PHPUnit/Framework.php';
require_once 'PHPUnit/Util/Filter.php';

require_once 'PHPUnit/Extensions/Database/ITester.php';

PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'PHPUNIT');

/**
* Can be used as a foundation for new DatabaseTesters.
*
* @category Testing
* @package PHPUnit
* @package DbUnit
* @author Mike Lively <m@digitalsandwich.com>
* @copyright 2010 Mike Lively <m@digitalsandwich.com>
* @license http://www.opensource.org/licenses/bsd-license.php BSD License
* @version Release: 3.4.11
* @version Release: 1.0.3
* @link http://www.phpunit.de/
* @since Class available since Release 3.2.0
* @since Class available since Release 1.0.0
*/
abstract class PHPUnit_Extensions_Database_AbstractTester implements PHPUnit_Extensions_Database_ITester
{
Expand All @@ -87,12 +78,10 @@ abstract class PHPUnit_Extensions_Database_AbstractTester implements PHPUnit_Ext

/**
* Creates a new database tester.
*
* @param PHPUnit_Extensions_Database_DB_IDatabaseConnection $databaseConnection
*/
public function __construct()
{
$this->setUpOperation = PHPUnit_Extensions_Database_Operation_Factory::CLEAN_INSERT();
$this->setUpOperation = PHPUnit_Extensions_Database_Operation_Factory::CLEAN_INSERT();
$this->tearDownOperation = PHPUnit_Extensions_Database_Operation_Factory::NONE();
}

Expand Down Expand Up @@ -202,4 +191,3 @@ protected function getTearDownOperation()
return $this->tearDownOperation;
}
}
?>
Expand Up @@ -2,7 +2,7 @@
/**
* PHPUnit
*
* Copyright (c) 2002-2010, Sebastian Bergmann <sb@sebastian-bergmann.de>.
* Copyright (c) 2002-2011, Sebastian Bergmann <sb@sebastian-bergmann.de>.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -34,32 +34,24 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
* @category Testing
* @package PHPUnit
* @package DbUnit
* @author Mike Lively <m@digitalsandwich.com>
* @copyright 2002-2010 Sebastian Bergmann <sb@sebastian-bergmann.de>
* @copyright 2002-2011 Sebastian Bergmann <sb@sebastian-bergmann.de>
* @license http://www.opensource.org/licenses/bsd-license.php BSD License
* @link http://www.phpunit.de/
* @since File available since Release 3.2.0
* @since File available since Release 1.0.0
*/

require_once 'PHPUnit/Framework.php';
require_once 'PHPUnit/Util/Filter.php';
require_once 'PHPUnit/Framework/Constraint.php';

PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'PHPUNIT');

/**
* Asserts whether or not two dbunit datasets are equal.
*
* @category Testing
* @package PHPUnit
* @package DbUnit
* @author Mike Lively <m@digitalsandwich.com>
* @copyright 2010 Mike Lively <m@digitalsandwich.com>
* @license http://www.opensource.org/licenses/bsd-license.php BSD License
* @version Release: 3.4.11
* @version Release: 1.0.3
* @link http://www.phpunit.de/
* @since Class available since Release 3.2.0
* @since Class available since Release 1.0.0
*/
class PHPUnit_Extensions_Database_Constraint_DataSetIsEqual extends PHPUnit_Framework_Constraint
{
Expand Down Expand Up @@ -128,4 +120,3 @@ public function toString()
$this->value->__toString());
}
}
?>
Expand Up @@ -2,7 +2,7 @@
/**
* PHPUnit
*
* Copyright (c) 2002-2010, Sebastian Bergmann <sb@sebastian-bergmann.de>.
* Copyright (c) 2002-2011, Sebastian Bergmann <sb@sebastian-bergmann.de>.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -34,32 +34,24 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
* @category Testing
* @package PHPUnit
* @package DbUnit
* @author Mike Lively <m@digitalsandwich.com>
* @copyright 2002-2010 Sebastian Bergmann <sb@sebastian-bergmann.de>
* @copyright 2002-2011 Sebastian Bergmann <sb@sebastian-bergmann.de>
* @license http://www.opensource.org/licenses/bsd-license.php BSD License
* @link http://www.phpunit.de/
* @since File available since Release 3.2.0
* @since File available since Release 1.0.0
*/

require_once 'PHPUnit/Framework.php';
require_once 'PHPUnit/Util/Filter.php';
require_once 'PHPUnit/Framework/Constraint.php';

PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'PHPUNIT');

/**
* Asserts whether or not two dbunit tables are equal.
*
* @category Testing
* @package PHPUnit
* @package DbUnit
* @author Mike Lively <m@digitalsandwich.com>
* @copyright 2010 Mike Lively <m@digitalsandwich.com>
* @license http://www.opensource.org/licenses/bsd-license.php BSD License
* @version Release: 3.4.11
* @version Release: 1.0.3
* @link http://www.phpunit.de/
* @since Class available since Release 3.2.0
* @since Class available since Release 1.0.0
*/
class PHPUnit_Extensions_Database_Constraint_TableIsEqual extends PHPUnit_Framework_Constraint
{
Expand Down Expand Up @@ -129,4 +121,3 @@ public function toString()
PHPUnit_Util_Type::toString($this->value));
}
}
?>
35 changes: 11 additions & 24 deletions includes/qcodo/_core/PHPUnit/Extensions/Database/DB/DataSet.php
Expand Up @@ -2,7 +2,7 @@
/**
* PHPUnit
*
* Copyright (c) 2002-2010, Sebastian Bergmann <sb@sebastian-bergmann.de>.
* Copyright (c) 2002-2011, Sebastian Bergmann <sb@sebastian-bergmann.de>.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -34,36 +34,24 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
* @category Testing
* @package PHPUnit
* @package DbUnit
* @author Mike Lively <m@digitalsandwich.com>
* @copyright 2002-2010 Sebastian Bergmann <sb@sebastian-bergmann.de>
* @copyright 2002-2011 Sebastian Bergmann <sb@sebastian-bergmann.de>
* @license http://www.opensource.org/licenses/bsd-license.php BSD License
* @link http://www.phpunit.de/
* @since File available since Release 3.2.0
* @since File available since Release 1.0.0
*/

require_once 'PHPUnit/Framework.php';
require_once 'PHPUnit/Util/Filter.php';

require_once 'PHPUnit/Extensions/Database/DataSet/AbstractDataSet.php';
require_once 'PHPUnit/Extensions/Database/DataSet/DefaultTableMetaData.php';
require_once 'PHPUnit/Extensions/Database/DB/TableIterator.php';
require_once 'PHPUnit/Extensions/Database/DB/Table.php';

PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'PHPUNIT');

/**
* Provides access to a database instance as a data set.
*
* @category Testing
* @package PHPUnit
* @package DbUnit
* @author Mike Lively <m@digitalsandwich.com>
* @copyright 2010 Mike Lively <m@digitalsandwich.com>
* @license http://www.opensource.org/licenses/bsd-license.php BSD License
* @version Release: 3.4.11
* @version Release: 1.0.3
* @link http://www.phpunit.de/
* @since Class available since Release 3.2.0
* @since Class available since Release 1.0.0
*/
class PHPUnit_Extensions_Database_DB_DataSet extends PHPUnit_Extensions_Database_DataSet_AbstractDataSet
{
Expand Down Expand Up @@ -108,19 +96,19 @@ public static function buildTableSelect(PHPUnit_Extensions_Database_DataSet_ITab

$columns = $tableMetaData->getColumns();
if ($databaseConnection) {
$columns = array_map(array($databaseConnection, 'quoteSchemaObject'), $columns);
$columns = array_map(array($databaseConnection, 'quoteSchemaObject'), $columns);
}
$columnList = implode(', ', $columns);

if ($databaseConnection) {
$tableName = $databaseConnection->quoteSchemaObject($tableMetaData->getTableName());
$tableName = $databaseConnection->quoteSchemaObject($tableMetaData->getTableName());
} else {
$tableName = $tableMetaData->getTableName();
$tableName = $tableMetaData->getTableName();
}

$primaryKeys = $tableMetaData->getPrimaryKeys();
if ($databaseConnection) {
$primaryKeys = array_map(array($databaseConnection, 'quoteSchemaObject'), $primaryKeys);
$primaryKeys = array_map(array($databaseConnection, 'quoteSchemaObject'), $primaryKeys);
}
if (count($primaryKeys)) {
$orderBy = 'ORDER BY ' . implode(' ASC, ', $primaryKeys) . ' ASC';
Expand Down Expand Up @@ -183,4 +171,3 @@ public function getTableNames()
return $this->databaseConnection->getMetaData()->getTableNames();
}
}
?>

0 comments on commit 5225b05

Please sign in to comment.