dev-php/symfony-config: new version 2.8.20.

This new version depends (optionally) on a newer version of PHPUnit,
which lets us run its test suite. The test suite passes for me, so
I've removed the RESTRICT=test.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

3 files changed, 11 insertions, 10 deletions

diff --git a/dev-php/symfony-config/Manifest b/dev-php/symfony-config/Manifest
index 2ac1c0770ec..e29e8a3ee7a 100644
--- a/dev-php/symfony-config/Manifest
+++ b/dev-php/symfony-config/Manifest
@@ -1 +1 @@
-DIST symfony-config-2.8.19.tar.gz 52568 SHA256 0804dde6ea36afe5f428f838288e22bb8e02e123b970f2ae2f3fef1f18f0f294 SHA512 00d89ec1c78245429652ed48639fe54188c9cafcb7d3cc7978054d26d2e6be44addc738750575a134644b7b9735e805e95cb2890e9c4063dc7359e3b12da6942 WHIRLPOOL eae0fae487163864017097c3172ae151617818ed363618f0df66b12e4d371240609e39ed4446cf5a94da99a08ed8d0120677fd71d3e49a7f55502a41ad055bfb
+DIST symfony-config-2.8.20.tar.gz 52587 SHA256 19f54b4fc33666872ef1e66c0b3269cfc5b634808b61984d791ec399ef1d815e SHA512 f515f9886be8daa85a3cfe70935b4586ee749a62c3c73c6f2c934af16d4a81f9e49445bdae85329f88fa4dacaf87c56b9b599793d7926e712242bd1fc9dc0675 WHIRLPOOL 61ed346ae004c0ce8037e5c4ceb4d519af9fda6f09e2d533672ee0040c13fa15c53b2abe49f3fba32b827af058b6047200b5c812a2dccf56b7bece812bdeb0ed
diff --git a/dev-php/symfony-config/files/autoload.php b/dev-php/symfony-config/files/autoload.php
index 4cbfc168d79..6c6f5c501be 100644
--- a/dev-php/symfony-config/files/autoload.php
+++ b/dev-php/symfony-config/files/autoload.php
@@ -9,7 +9,12 @@ if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
 
 \Fedora\Autoloader\Autoload::addPsr4('Symfony\\Component\\Config\\', __DIR__);
 
-// Dependencies
+// Required dependencies.
 \Fedora\Autoloader\Dependencies::required(array(
   "${vendor_dir}/Symfony/Component/Filesystem/autoload.php"
 ));
+
+// Optional dependencies.
+\Fedora\Autoloader\Dependencies::optional(array(
+  "${vendor_dir}/PHPUnit/vendor/autoload.php"
+));
diff --git a/dev-php/symfony-config/symfony-config-2.8.19.ebuild b/dev-php/symfony-config/symfony-config-2.8.20.ebuild
index b53316b5174..0daa831d25f 100644
--- a/dev-php/symfony-config/symfony-config-2.8.19.ebuild
+++ b/dev-php/symfony-config/symfony-config-2.8.20.ebuild
@@ -5,29 +5,25 @@ EAPI=6
 
 DESCRIPTION="Symfony Config Component"
 HOMEPAGE="https://github.com/symfony/config"
-SRC_URI="https://github.com/symfony/config/archive/v${PV}.tar.gz -> symfony-config-${PV}.tar.gz"
+SRC_URI="https://github.com/symfony/config/archive/v${PV}.tar.gz
+	-> symfony-config-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
-# This needs a newer phpunit and a modified autoload.php but should work.
-RESTRICT=test
-
 RDEPEND="
 	dev-lang/php:*
 	dev-php/fedora-autoloader
 	dev-php/symfony-filesystem"
-DEPEND="test? (	${RDEPEND} dev-php/phpunit )"
+DEPEND="test? (	${RDEPEND} >=dev-php/phpunit-5.7.15 )"
 
 S="${WORKDIR}/config-${PV}"
 
 src_prepare() {
 	default
 	if use test; then
-		# Not quite right: we need to include PHPUnit's autoload.php as
-		# part of ours for the test suite to work.
 		cp "${FILESDIR}"/autoload.php "${S}"/autoload-test.php || die
 	fi
 }
@@ -39,5 +35,5 @@ src_install() {
 }
 
 src_test() {
-	phpunit --bootstrap "${S}"/autoload-test.php || die "test suite failed"
+	phpunit --bootstrap "${S}/autoload-test.php" || die 'test suite failed'
 }