[gentoo-commits] repo/gentoo:master commit in: dev-php/symfony-finder/files/, dev-php/symfony-finder/

[Michael Orlitzky]

commit:     1933c9054cf50c4ec55fe412cfa606ea64482ac2
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Thu May  4 12:26:09 2017 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Thu May  4 12:27:58 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1933c905

dev-php/symfony-finder: new version 3.2.8.

This new version enables the test suite, after patching out a problem
test: it tries to sort files by their atime, and that obviously fails
if your filesystem is mounted noatime. After skipping that test, the
suite passes, so I've removed the RESTRICT=test that was in place.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-php/symfony-finder/Manifest                    |  2 +-
 .../files/skip-file-time-sort-tests.patch          | 24 ++++++++++++++++++++++
 ...er-3.2.6.ebuild => symfony-finder-3.2.8.ebuild} | 22 ++++++++------------
 3 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/dev-php/symfony-finder/Manifest b/dev-php/symfony-finder/Manifest
index 4fdddba084a..65d8cd2fa01 100644
--- a/dev-php/symfony-finder/Manifest
+++ b/dev-php/symfony-finder/Manifest
@@ -1 +1 @@
-DIST symfony-finder-3.2.6.tar.gz 24432 SHA256 410e46ac676d532608a8e29885e4066c4108a970f6e03e0ff80155706ac06580 SHA512 ffcff1ff1ae09b7a8a02cade82f97f4e634e24a8d1466d05e1940682be712e9bf58f5df511d650a791d2a564bb1f3fa7fdbcee8f5c5206cda398102b3355546d WHIRLPOOL dd4fa1740d6deb320d334433cfafd3af3b089c3cdc1d62bddf73d20f0e773137ddf86643413ed0e2cf7ba86d04cabfc4a5e1aa08caa4bf7e60e7616191c57aaf
+DIST symfony-finder-3.2.8.tar.gz 24452 SHA256 57d9e3380558188719a6ed6a6767f41feacc0e08935e94ca7469abdbc7d68837 SHA512 7eff457c6c70bf58b4af7e9adbeeb68a1ad684b95510d929f137545be6b755ece37949687f4de27c7fb4d5f208e30c6b0b3a32a804f7a6a6b8ed0d4ed7dfd9cd WHIRLPOOL 0733e6c28a408fb410006bf8edf2f03f1d32a9cece384e11a830f11910e53e92559efe10aff626e2207e42199d4b057b20ef927be3f7e4bf5774b824a087c9db

diff --git a/dev-php/symfony-finder/files/skip-file-time-sort-tests.patch b/dev-php/symfony-finder/files/skip-file-time-sort-tests.patch
new file mode 100644
index 00000000000..d0ee130b4e7
--- /dev/null
+++ b/dev-php/symfony-finder/files/skip-file-time-sort-tests.patch
@@ -0,0 +1,24 @@
+There's one set of tests that tries to sort an array of files by their
+access and modification times, and that doesn't work if your filesystem
+is mounted with noatime (a lot of our users do that).
+
+This should probably be fixed upstream, and has been reported here:
+
+  https://github.com/symfony/symfony/issues/17489
+
+diff --git a/Tests/Iterator/SortableIteratorTest.php b/Tests/Iterator/SortableIteratorTest.php
+index 4750f25..29d176a 100644
+--- a/Tests/Iterator/SortableIteratorTest.php
++++ b/Tests/Iterator/SortableIteratorTest.php
+@@ -62,10 +62,7 @@ class SortableIteratorTest extends RealIteratorTestCase
+             || $mode === SortableIterator::SORT_BY_CHANGED_TIME
+             || $mode === SortableIterator::SORT_BY_MODIFIED_TIME
+         ) {
+-            if ('\\' === DIRECTORY_SEPARATOR && SortableIterator::SORT_BY_MODIFIED_TIME !== $mode) {
+-                $this->markTestSkipped('Sorting by atime or ctime is not supported on Windows');
+-            }
+-            $this->assertOrderedIteratorForGroups($expected, $iterator);
++	  $this->markTestSkipped('Sorting by time is failure-prone on Gentoo');
+         } else {
+             $this->assertOrderedIterator($expected, $iterator);
+         }

diff --git a/dev-php/symfony-finder/symfony-finder-3.2.6.ebuild b/dev-php/symfony-finder/symfony-finder-3.2.8.ebuild
similarity index 55%
rename from dev-php/symfony-finder/symfony-finder-3.2.6.ebuild
rename to dev-php/symfony-finder/symfony-finder-3.2.8.ebuild
index bac77a1346b..50e82b6605c 100644
--- a/dev-php/symfony-finder/symfony-finder-3.2.6.ebuild
+++ b/dev-php/symfony-finder/symfony-finder-3.2.8.ebuild
@@ -11,33 +11,29 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
-# 20170204-The test suite is broken in 3.1.10 on php-5.x
-RESTRICT="test"
 
-RDEPEND="
-	dev-lang/php:*
+RDEPEND="dev-lang/php:*
 	dev-php/fedora-autoloader"
-DEPEND="
-	test? (
-		${RDEPEND}
-		dev-php/phpunit )"
+DEPEND="test? ( ${RDEPEND} >=dev-php/phpunit-5.7.15 )"
 
 S="${WORKDIR}/finder-${PV}"
 
+PATCHES=( "${FILESDIR}/skip-file-time-sort-tests.patch" )
+
 src_prepare() {
 	default
 	if use test; then
-		cp "${FILESDIR}"/autoload.php "${S}"/autoload-test.php || die
+		cp "${FILESDIR}/autoload.php" "${S}/autoload-test.php" || die
 	fi
 }
 
 src_install() {
 	insinto "/usr/share/php/Symfony/Component/Finder"
-	doins -r Comparator Exception Iterator Finder.php \
-	Glob.php LICENSE SplFileInfo.php "${FILESDIR}"/autoload.php
-	dodoc README.md
+	doins -r Comparator Exception Iterator
+	doins *.php "${FILESDIR}"/autoload.php
+	dodoc CHANGELOG.md README.md
 }
 
 src_test() {
-	phpunit --bootstrap "${S}"/autoload-test.php || die "test suite failed"
+	phpunit --bootstrap "${S}/autoload-test.php" || die 'test suite failed'
 }