[arch-commits] Commit in composer/trunk (PKGBUILD)

[Pierre Schmitz]

    Date: Saturday, October 24, 2020 @ 16:12:42
  Author: pierre
Revision: 398775

upgpkg: composer 2.0.0-1

Modified:
  composer/trunk/PKGBUILD

----------+
 PKGBUILD |   35 +++++++++++++++--------------------
 1 file changed, 15 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-10-24 10:23:48 UTC (rev 398774)
+++ PKGBUILD	2020-10-24 16:12:42 UTC (rev 398775)
@@ -1,27 +1,25 @@
 # Maintainer: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=composer
-pkgver=1.10.16
+pkgver=2.0.0
 pkgrel=1
 pkgdesc="Dependency Manager for PHP"
 arch=('any')
 license=('MIT')
 url='https://getcomposer.org/'
-depends=('php')
-makedepends=('git' 'unzip')
-checkdepends=('mercurial')
-replaces=('php-composer')
-conflicts=('php-composer')
-provides=('php-composer')
+depends=('php' 'unzip')
+makedepends=('git')
+checkdepends=('php-intl')
 source=("${pkgname}::git+https://github.com/composer/composer.git#tag=${pkgver}"
         "${pkgname}-${pkgver}.phar::https://getcomposer.org/download/${pkgver}/composer.phar")
-sha512sums=('SKIP'
-            '337e5363e0842db21ca33c2957af33eedff66051e9783ffe965b9c73877e9340fe91d4082fa7b3cf5284bf7fd2139df67109ad6299ef6f7fb8fa9ee166c6878d')
+sha256sums=('SKIP'
+            '139657aa2b37867800292724145e3c4895f7755d845758b403dc329d17bdd285')
+COMPOSER_FLAGS="--ansi --no-interaction --no-progress --prefer-dist"
 
 prepare() {
 	cd "${srcdir}/${pkgname}"
 
-	php "${srcdir}/${pkgname}-${pkgver}.phar" -n install --no-dev --prefer-dist
+	php "${srcdir}/${pkgname}-${pkgver}.phar" install --no-dev ${COMPOSER_FLAGS}
 }
 
 build() {
@@ -34,20 +32,17 @@
 	cd "${srcdir}/${pkgname}"
 
 	# check if the upstream build and ours differ
-	diff -q ${srcdir}/${pkgname}-${pkgver}.phar composer.phar
+	diff -q ${srcdir}/${pkgname}-${pkgver}.phar composer.phar > /dev/null || msg2 "Upstream composer differs from ours"
 
+	# Install the dev dependencies to run the unit tests
+	bin/composer install ${COMPOSER_FLAGS}
+
 	bin/composer validate
 
-	git config --global user.email "${USER}@${HOST}"
-	git config --global user.name "${USER}"
+	git config --global user.email composer at example.com
+	git config --global user.name composer
 
-	# Install the dev dependencies to run the unit tests
-	bin/composer -n install --prefer-dist
-
-	# Fix test dependencies for Composer 1.10.7
-	bin/composer require --dev 'symfony/phpunit-bridge:^4.2'
-
-	SYMFONY_PHPUNIT_VERSION=7.5 vendor/bin/simple-phpunit
+	php -d extension=intl vendor/bin/simple-phpunit
 }
 
 package() {