- Update to 3.2.1

Submitted by:	Gerrit Beine (maintainer via private mail)

2 files changed, 174 insertions, 58 deletions

diff --git a/devel/pear-PHPUnit3/Makefile b/devel/pear-PHPUnit3/Makefile
index 9679d2bc7a69..869d549f5ca7 100644
--- a/devel/pear-PHPUnit3/Makefile
+++ b/devel/pear-PHPUnit3/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	PHPUnit
-PORTVERSION=	3.0.6
-PORTREVISION=	1
+PORTVERSION=	3.2.1
 CATEGORIES=	devel www pear
 MASTER_SITES=	http://pear.phpunit.de/get/
 
@@ -20,8 +19,14 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 CONFLICTS=	PHPUnit-[0-9]*
 
 LATEST_LINK=	pear-${PORTNAME}
-OPTIONS=	PEAR_LOG "PEAR::Log support" off \
+OPTIONS=	PEAR_IMAGE_GRAPHVIZ "PEAR::Image::GraphViz support" off \
+		PEAR_LOG "PEAR::Log support" off \
 		JSON "Enable JSON support" off \
+		PDO "Enable PDO support" off \
+		PDO_SQLITE "Enable PDO_SQLite support" off \
+		TOKENIZER "Enable Tokenizer support" off \
+		PDO_MYSQL "Enable PDO_MySQL support" off \
+		XDEBUG "Enable Xdebug support" off
 
 CHANNEL=	pear.phpunit.de
 SUB_FILES=	pear-deinstall pear-install
@@ -29,44 +34,64 @@ SUB_LIST+=	CHANNEL=${CHANNEL}
 PKGINSTALL=	${WRKDIR}/pear-install
 PKGDEINSTALL=	${WRKDIR}/pear-deinstall
 
-BROKEN=		doesn't work in jails
-
 DEFAULT_PHP_VER=5
 IGNORE_WITH_PHP=4
 
-USE_PHP=	dom spl
+USE_PHP=	dom spl pcre
 
-FILES=		PHPUnit2/Extensions/ExceptionTestCase.php \
-		PHPUnit2/Extensions/PerformanceTestCase.php \
-		PHPUnit2/Extensions/RepeatedTest.php \
-		PHPUnit2/Extensions/TestDecorator.php \
-		PHPUnit2/Extensions/TestSetup.php \
-		PHPUnit2/Framework/Assert.php \
-		PHPUnit2/Framework/AssertionFailedError.php \
-		PHPUnit2/Framework/ComparisonFailure.php \
-		PHPUnit2/Framework/Error.php \
-		PHPUnit2/Framework/IncompleteTest.php \
-		PHPUnit2/Framework/IncompleteTestError.php \
-		PHPUnit2/Framework/Test.php \
-		PHPUnit2/Framework/TestCase.php \
-		PHPUnit2/Framework/TestListener.php \
-		PHPUnit2/Framework/TestResult.php \
-		PHPUnit2/Framework/TestSuite.php \
-		PHPUnit2/Framework/Warning.php \
-		PHPUnit2/Runner/BaseTestRunner.php \
-		PHPUnit2/Runner/IncludePathTestCollector.php \
-		PHPUnit2/Runner/StandardTestSuiteLoader.php \
-		PHPUnit2/Runner/TestCollector.php \
-		PHPUnit2/Runner/TestSuiteLoader.php \
-		PHPUnit2/Runner/Version.php \
-		PHPUnit2/TextUI/ResultPrinter.php \
-		PHPUnit2/TextUI/TestRunner.php \
-		PHPUnit2/Util/Log/PEAR.php \
-		PHPUnit2/Util/Log/XML.php \
-		PHPUnit2/Util/Filter.php \
+FILES=		PHPUnit/Extensions/Database/Constraint/DataSetIsEqual.php \
+		PHPUnit/Extensions/Database/Constraint/TableIsEqual.php \
+		PHPUnit/Extensions/Database/DB/MetaData/InformationSchema.php \
+		PHPUnit/Extensions/Database/DB/MetaData/Sqlite.php \
+		PHPUnit/Extensions/Database/DB/DataSet.php \
+		PHPUnit/Extensions/Database/DB/DefaultDatabaseConnection.php \
+		PHPUnit/Extensions/Database/DB/FilteredDataSet.php \
+		PHPUnit/Extensions/Database/DB/IDatabaseConnection.php \
+		PHPUnit/Extensions/Database/DB/IMetaData.php \
+		PHPUnit/Extensions/Database/DB/MetaData.php \
+		PHPUnit/Extensions/Database/DB/ResultSetTable.php \
+		PHPUnit/Extensions/Database/DB/Table.php \
+		PHPUnit/Extensions/Database/DB/TableIterator.php \
+		PHPUnit/Extensions/Database/DB/TableMetaData.php \
+		PHPUnit/Extensions/Database/DataSet/AbstractDataSet.php \
+		PHPUnit/Extensions/Database/DataSet/AbstractTable.php \
+		PHPUnit/Extensions/Database/DataSet/AbstractTableMetaData.php \
+		PHPUnit/Extensions/Database/DataSet/AbstractXmlDataSet.php \
+		PHPUnit/Extensions/Database/DataSet/DataSetFilter.php \
+		PHPUnit/Extensions/Database/DataSet/DefaultDataSet.php \
+		PHPUnit/Extensions/Database/DataSet/DefaultTable.php \
+		PHPUnit/Extensions/Database/DataSet/DefaultTableIterator.php \
+		PHPUnit/Extensions/Database/DataSet/DefaultTableMetaData.php \
+		PHPUnit/Extensions/Database/DataSet/FlatXmlDataSet.php \
+		PHPUnit/Extensions/Database/DataSet/IDataSet.php \
+		PHPUnit/Extensions/Database/DataSet/ITable.php \
+		PHPUnit/Extensions/Database/DataSet/ITableIterator.php \
+		PHPUnit/Extensions/Database/DataSet/ITableMetaData.php \
+		PHPUnit/Extensions/Database/DataSet/TableFilter.php \
+		PHPUnit/Extensions/Database/DataSet/TableMetaDataFilter.php \
+		PHPUnit/Extensions/Database/DataSet/XmlDataSet.php \
+		PHPUnit/Extensions/Database/Operation/Composite.php \
+		PHPUnit/Extensions/Database/Operation/Delete.php \
+		PHPUnit/Extensions/Database/Operation/DeleteAll.php \
+		PHPUnit/Extensions/Database/Operation/Exception.php \
+		PHPUnit/Extensions/Database/Operation/Factory.php \
+		PHPUnit/Extensions/Database/Operation/IDatabaseOperation.php \
+		PHPUnit/Extensions/Database/Operation/Insert.php \
+		PHPUnit/Extensions/Database/Operation/Null.php \
+		PHPUnit/Extensions/Database/Operation/Replace.php \
+		PHPUnit/Extensions/Database/Operation/RowBased.php \
+		PHPUnit/Extensions/Database/Operation/Truncate.php \
+		PHPUnit/Extensions/Database/Operation/Update.php \
+		PHPUnit/Extensions/Database/AbstractTester.php \
+		PHPUnit/Extensions/Database/DefaultTester.php \
+		PHPUnit/Extensions/Database/ITester.php \
+		PHPUnit/Extensions/Database/TestCase.php \
+		PHPUnit/Extensions/PhptTestCase/Logger.php \
 		PHPUnit/Extensions/ExceptionTestCase.php \
 		PHPUnit/Extensions/OutputTestCase.php \
 		PHPUnit/Extensions/PerformanceTestCase.php \
+		PHPUnit/Extensions/PhptTestCase.php \
+		PHPUnit/Extensions/PhptTestSuite.php \
 		PHPUnit/Extensions/RepeatedTest.php \
 		PHPUnit/Extensions/SeleniumTestCase.php \
 		PHPUnit/Extensions/TestDecorator.php \
@@ -78,6 +103,9 @@ FILES=		PHPUnit2/Extensions/ExceptionTestCase.php \
 		PHPUnit/Framework/ComparisonFailure/Type.php \
 		PHPUnit/Framework/Constraint/And.php \
 		PHPUnit/Framework/Constraint/ArrayHasKey.php \
+		PHPUnit/Framework/Constraint/Attribute.php \
+		PHPUnit/Framework/Constraint/ClassHasAttribute.php \
+		PHPUnit/Framework/Constraint/ClassHasStaticAttribute.php \
 		PHPUnit/Framework/Constraint/FileExists.php \
 		PHPUnit/Framework/Constraint/GreaterThan.php \
 		PHPUnit/Framework/Constraint/IsAnything.php \
@@ -92,6 +120,7 @@ FILES=		PHPUnit2/Extensions/ExceptionTestCase.php \
 		PHPUnit/Framework/Constraint/PCREMatch.php \
 		PHPUnit/Framework/Constraint/StringContains.php \
 		PHPUnit/Framework/Constraint/TraversableContains.php \
+		PHPUnit/Framework/Constraint/TraversableContainsOnly.php \
 		PHPUnit/Framework/Constraint/Xor.php \
 		PHPUnit/Framework/MockObject/Builder/Identity.php \
 		PHPUnit/Framework/MockObject/Builder/InvocationMocker.php \
@@ -111,6 +140,7 @@ FILES=		PHPUnit2/Extensions/ExceptionTestCase.php \
 		PHPUnit/Framework/MockObject/Matcher/Parameters.php \
 		PHPUnit/Framework/MockObject/Matcher/StatelessInvocation.php \
 		PHPUnit/Framework/MockObject/Stub/ConsecutiveCalls.php \
+		PHPUnit/Framework/MockObject/Stub/Exception.php \
 		PHPUnit/Framework/MockObject/Stub/MatcherCollection.php \
 		PHPUnit/Framework/MockObject/Stub/Return.php \
 		PHPUnit/Framework/MockObject/Invocation.php \
@@ -129,6 +159,7 @@ FILES=		PHPUnit2/Extensions/ExceptionTestCase.php \
 		PHPUnit/Framework/ExpectationFailedException.php \
 		PHPUnit/Framework/IncompleteTest.php \
 		PHPUnit/Framework/IncompleteTestError.php \
+		PHPUnit/Framework/Notice.php \
 		PHPUnit/Framework/SelfDescribing.php \
 		PHPUnit/Framework/SkippedTest.php \
 		PHPUnit/Framework/SkippedTestError.php \
@@ -148,65 +179,122 @@ FILES=		PHPUnit2/Extensions/ExceptionTestCase.php \
 		PHPUnit/TextUI/Command.php \
 		PHPUnit/TextUI/ResultPrinter.php \
 		PHPUnit/TextUI/TestRunner.php \
+		PHPUnit/Util/Log/CodeCoverage/Database.php \
+		PHPUnit/Util/Log/CodeCoverage/XML.php \
+		PHPUnit/Util/Log/Database/MySQL.sql \
+		PHPUnit/Util/Log/Database/SQLite3.sql \
+		PHPUnit/Util/Log/PMD/Rule/Class/DepthOfInheritanceTree.php \
+		PHPUnit/Util/Log/PMD/Rule/Class/EfferentCoupling.php \
+		PHPUnit/Util/Log/PMD/Rule/Class/ExcessiveClassLength.php \
+		PHPUnit/Util/Log/PMD/Rule/Class/ExcessivePublicCount.php \
+		PHPUnit/Util/Log/PMD/Rule/Class/TooManyFields.php \
+		PHPUnit/Util/Log/PMD/Rule/Function/CRAP.php \
+		PHPUnit/Util/Log/PMD/Rule/Function/CodeCoverage.php \
+		PHPUnit/Util/Log/PMD/Rule/Function/CyclomaticComplexity.php \
+		PHPUnit/Util/Log/PMD/Rule/Function/ExcessiveMethodLength.php \
+		PHPUnit/Util/Log/PMD/Rule/Function/ExcessiveParameterList.php \
+		PHPUnit/Util/Log/PMD/Rule/Function/NPathComplexity.php \
+		PHPUnit/Util/Log/PMD/Rule/Project/CRAP.php \
+		PHPUnit/Util/Log/PMD/Rule/Class.php \
+		PHPUnit/Util/Log/PMD/Rule/File.php \
+		PHPUnit/Util/Log/PMD/Rule/Function.php \
+		PHPUnit/Util/Log/PMD/Rule/Project.php \
+		PHPUnit/Util/Log/PMD/Rule.php \
 		PHPUnit/Util/Log/GraphViz.php \
 		PHPUnit/Util/Log/JSON.php \
 		PHPUnit/Util/Log/PEAR.php \
 		PHPUnit/Util/Log/TAP.php \
 		PHPUnit/Util/Log/XML.php \
-		PHPUnit/Util/Report/Coverage/Node/Directory.php \
-		PHPUnit/Util/Report/Coverage/Node/File.php \
-		PHPUnit/Util/Report/Coverage/Factory.php \
-		PHPUnit/Util/Report/Coverage/Node.php \
+		PHPUnit/Util/Metrics/Class.php \
+		PHPUnit/Util/Metrics/File.php \
+		PHPUnit/Util/Metrics/Function.php \
+		PHPUnit/Util/Metrics/Project.php \
+		PHPUnit/Util/Report/Node/Directory.php \
+		PHPUnit/Util/Report/Node/File.php \
 		PHPUnit/Util/Report/Template/butter.png \
 		PHPUnit/Util/Report/Template/chameleon.png \
-		PHPUnit/Util/Report/Template/coverage_directory.html \
-		PHPUnit/Util/Report/Template/coverage_file.html \
-		PHPUnit/Util/Report/Template/coverage_item.html \
-		PHPUnit/Util/Report/Template/coverage_item_details.html \
-		PHPUnit/Util/Report/Template/coverage_item_details_header.html \
+		PHPUnit/Util/Report/Template/close12_1.gif \
+		PHPUnit/Util/Report/Template/container-min.js \
+		PHPUnit/Util/Report/Template/container.css \
+		PHPUnit/Util/Report/Template/directory.html \
+		PHPUnit/Util/Report/Template/file.html \
+		PHPUnit/Util/Report/Template/file_no_yui.html \
 		PHPUnit/Util/Report/Template/glass.png \
+		PHPUnit/Util/Report/Template/item.html \
+		PHPUnit/Util/Report/Template/method_item.html \
 		PHPUnit/Util/Report/Template/scarlet_red.png \
 		PHPUnit/Util/Report/Template/snow.png \
 		PHPUnit/Util/Report/Template/style.css \
-		PHPUnit/Util/Report/Template/testsuite.html \
-		PHPUnit/Util/Report/Template/testsuite_item.html \
-		PHPUnit/Util/Report/Test/Node/Test.php \
-		PHPUnit/Util/Report/Test/Node/TestSuite.php \
-		PHPUnit/Util/Report/Test/Factory.php \
-		PHPUnit/Util/Report/Test/Node.php \
-		PHPUnit/Util/Report/GraphViz.php \
+		PHPUnit/Util/Report/Template/yahoo-dom-event.js \
+		PHPUnit/Util/Report/Template/yui_item.js \
+		PHPUnit/Util/Report/Node.php \
 		PHPUnit/Util/Skeleton/IncompleteTestMethod.tpl \
 		PHPUnit/Util/Skeleton/TestClass.tpl \
 		PHPUnit/Util/Skeleton/TestMethod.tpl \
+		PHPUnit/Util/Skeleton/TestMethodConstraint.tpl \
 		PHPUnit/Util/TestDox/ResultPrinter/HTML.php \
 		PHPUnit/Util/TestDox/ResultPrinter/Text.php \
 		PHPUnit/Util/TestDox/NamePrettifier.php \
 		PHPUnit/Util/TestDox/ResultPrinter.php \
-		PHPUnit/Util/Array.php \
+		PHPUnit/Util/Class.php \
+		PHPUnit/Util/CodeCoverage.php \
+		PHPUnit/Util/Configuration.php \
 		PHPUnit/Util/ErrorHandler.php \
 		PHPUnit/Util/Fileloader.php \
 		PHPUnit/Util/Filesystem.php \
 		PHPUnit/Util/Filter.php \
 		PHPUnit/Util/FilterIterator.php \
 		PHPUnit/Util/Getopt.php \
+		PHPUnit/Util/Metrics.php \
+		PHPUnit/Util/PDO.php \
 		PHPUnit/Util/Printer.php \
 		PHPUnit/Util/Report.php \
 		PHPUnit/Util/Skeleton.php \
 		PHPUnit/Util/Template.php \
 		PHPUnit/Util/Test.php \
+		PHPUnit/Util/TestSuiteIterator.php \
 		PHPUnit/Util/Timer.php \
 		PHPUnit/Util/Type.php \
+		PHPUnit/Util/XML.php \
 		PHPUnit/Framework.php
 EXAMPLES=	BankAccount/BankAccount.php \
 		BankAccount/BankAccountTest.php \
+		BankAccountDB/_files/bank-account-after-deposits.xml \
+		BankAccountDB/_files/bank-account-after-new-account.xml \
+		BankAccountDB/_files/bank-account-after-withdrawals.xml \
+		BankAccountDB/_files/bank-account-seed.xml \
+		BankAccountDB/BankAccount.php \
+		BankAccountDB/BankAccountDBTest.php \
+		BankAccountDB/BankAccountDBTestMySQL.php \
 		Money/IMoney.php \
 		Money/Money.php \
 		Money/MoneyBag.php \
 		Money/MoneyTest.php \
 		FailureTest.php
-TESTS=		Extensions/AllTests.php \
-		Extensions/ExceptionTestCaseTest.php \
-		Extensions/ExtensionTest.php \
+TESTS=		Extensions/Database/DataSet/AllTests.php \
+		Extensions/Database/DataSet/FilterTest.php \
+		Extensions/Database/DataSet/XmlDataSetsTest.php \
+		Extensions/Database/Operation/AllTests.php \
+		Extensions/Database/Operation/OperationsTest.php \
+		Extensions/Database/Operation/RowBasedTest.php \
+		Extensions/Database/_files/XmlDataSets/DeleteAllOperationTest.xml \
+		Extensions/Database/_files/XmlDataSets/DeleteOperationResult.xml \
+		Extensions/Database/_files/XmlDataSets/DeleteOperationTest.xml \
+		Extensions/Database/_files/XmlDataSets/FilteredTestComparison.xml \
+		Extensions/Database/_files/XmlDataSets/FilteredTestFixture.xml \
+		Extensions/Database/_files/XmlDataSets/FlatXmlDataSet.xml \
+		Extensions/Database/_files/XmlDataSets/InsertOperationResult.xml \
+		Extensions/Database/_files/XmlDataSets/InsertOperationTest.xml \
+		Extensions/Database/_files/XmlDataSets/OperationsTestFixture.xml \
+		Extensions/Database/_files/XmlDataSets/ReplaceOperationResult.xml \
+		Extensions/Database/_files/XmlDataSets/ReplaceOperationTest.xml \
+		Extensions/Database/_files/XmlDataSets/RowBasedExecute.xml \
+		Extensions/Database/_files/XmlDataSets/UpdateOperationResult.xml \
+		Extensions/Database/_files/XmlDataSets/UpdateOperationTest.xml \
+		Extensions/Database/_files/XmlDataSets/XmlDataSet.xml \
+		Extensions/Database/_files/.dummy \
+		Extensions/Database/AllTests.php \
+		Extensions/AllTests.php \
 		Extensions/OutputTestCaseTest.php \
 		Extensions/PerformanceTestCaseTest.php \
 		Extensions/RepeatedTestTest.php \
@@ -225,6 +313,7 @@ TESTS=		Extensions/AllTests.php \
 		Util/TestDox/AllTests.php \
 		Util/TestDox/NamePrettifierTest.php \
 		Util/AllTests.php \
+		Util/TimerTest.php \
 		_files/AnInterface.php \
 		_files/ClassWithNonPublicAttributes.php \
 		_files/DoubleTestCase.php \
@@ -255,7 +344,6 @@ TESTS=		Extensions/AllTests.php \
 		_files/TornDown3.php \
 		_files/TornDown4.php \
 		_files/TornDown5.php \
-		_files/TornDown6.php \
 		_files/WasRun.php \
 		AllTests.php \
 		TestConfiguration.php.dist
@@ -269,9 +357,37 @@ _TESTSDIR=	PHPUnit/Tests
 RUN_DEPENDS+=	${PEARDIR}/Log/null.php:${PORTSDIR}/sysutils/pear-Log
 .endif
 
+.if defined(WITH_PEAR_IMAGE_GRAPHVIZ)
+RUN_DEPENDS+=	${PEARDIR}/Image/GraphViz.php:${PORTSDIR}/graphics/pear-Image_GraphViz
+.endif
+
 .if defined(WITH_JSON)
 USE_PHP+=	json
 .endif
 
+.if defined(WITH_PDO)
+USE_PHP+=	pdo
+.endif
+
+.if defined(WITH_PDO_MYSQL)
+RUN_DEPENDS+=	${PREFIX}/lib/php/${PHP_EXT_DIR}/pdo_mysql.so:${PORTSDIR}/databases/php5-pdo_mysql
+.endif
+
+.if defined(WITH_PDO_SQLITE)
+USE_PHP+=	pdo_sqlite
+.endif
+
+.if defined(WITH_TOKENIZER)
+USE_PHP+=	tokenizer
+.endif
+
+.if defined(WITH_XDEBUG)
+RUN_DEPENDS+=	${PREFIX}/lib/php/${PHP_EXT_DIR}/xdebug.so:${PORTSDIR}/devel/php-xdebug
+.endif
+
+post-patch:
+	@${TOUCH} ${WRKSRC}/PHPUnit/Tests/Extensions/Database/_files/.dummy
+
+.include "${PORTSDIR}/Mk/bsd.php.mk"
 .include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
diff --git a/devel/pear-PHPUnit3/distinfo b/devel/pear-PHPUnit3/distinfo
index 526eb1cfd0fa..0873fac0b796 100644
--- a/devel/pear-PHPUnit3/distinfo
+++ b/devel/pear-PHPUnit3/distinfo
@@ -1,3 +1,3 @@
-MD5 (PEAR/PHPUnit-3.0.6.tgz) = cf8365f8b8e86412e6c1590d6d4e872f
-SHA256 (PEAR/PHPUnit-3.0.6.tgz) = 5f2a4092dcb0606a5eaaaaffdd2ac6e05b392a76f5627ee8e52900db877706a3
-SIZE (PEAR/PHPUnit-3.0.6.tgz) = 100140
+MD5 (PEAR/PHPUnit-3.2.1.tgz) = 09105ee29eca5b1f4376721c020b4d42
+SHA256 (PEAR/PHPUnit-3.2.1.tgz) = 3748429b0ce2ae17892821248b3e7abbe435bad02136561431a3c00b74145241
+SIZE (PEAR/PHPUnit-3.2.1.tgz) = 195844