summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD20
-rw-r--r--php-cs-fixer.install10
3 files changed, 10 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8f54f40315af..0ae911b91a42 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -10,9 +10,7 @@ pkgbase = php-cs-fixer
makedepends = php-composer
depends = php>=5.3.6
source = https://github.com/FriendsOfPHP/PHP-CS-Fixer/archive/v1.10.1.tar.gz
- source = php-cs-fixer.install
sha512sums = 3c85e269f6bd808314071de56040ffb4aac123b43ed488357fb52d2f66287b737743b9a0001d24e2be49248b5c6d91bf01a626b5f69329a7126989dc6bf3b3d6
- sha512sums = 0eff98de88ad715939217f16138941bb3e9c8bb6e34d85db875c1fc0166e3fb4b0ec8dd9df5d9865c9f772621dc5a6aaf668d2ba8e26b632905bdaedf435feb5
pkgname = php-cs-fixer
diff --git a/PKGBUILD b/PKGBUILD
index 9f844ea49be2..06318c368837 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,28 +12,14 @@ arch=("any")
depends=("php>=5.3.6")
makedepends=("php-box" "php-composer")
install="${pkgname}.install"
-source=("https://github.com/FriendsOfPHP/${_pkgname}/archive/v${pkgver}.tar.gz"
- "${pkgname}.install")
-sha512sums=('3c85e269f6bd808314071de56040ffb4aac123b43ed488357fb52d2f66287b737743b9a0001d24e2be49248b5c6d91bf01a626b5f69329a7126989dc6bf3b3d6'
- '0eff98de88ad715939217f16138941bb3e9c8bb6e34d85db875c1fc0166e3fb4b0ec8dd9df5d9865c9f772621dc5a6aaf668d2ba8e26b632905bdaedf435feb5')
-
-prepare() {
- if ! php -i | grep 'PHP Archive support => enabled' >/dev/null 2>&1; then
- echo "Error: phar.so must be enabled and phar.readonly = Off in your php.ini to compile"
- exit 1
- fi
-
- if ! php -i | grep 'phar.readonly => Off' >/dev/null 2>&1; then
- echo "Error: phar.so is enabled but phar.readonly must be set to 'Off' in your php.ini to compile"
- exit 1
- fi
-}
+source=("https://github.com/FriendsOfPHP/${_pkgname}/archive/v${pkgver}.tar.gz")
+sha512sums=('3c85e269f6bd808314071de56040ffb4aac123b43ed488357fb52d2f66287b737743b9a0001d24e2be49248b5c6d91bf01a626b5f69329a7126989dc6bf3b3d6')
build() {
cd "${srcdir}/${_pkgname}-${pkgver}"
composer install --prefer-dist --no-dev
sed -i '/git-commit/d' box.json
- php-box build
+ php -d extension=phar.so -d phar.readonly=Off -d display_errors=Off /usr/bin/php-box build
}
package() {
diff --git a/php-cs-fixer.install b/php-cs-fixer.install
index 8dc706e83a24..ff184db05134 100644
--- a/php-cs-fixer.install
+++ b/php-cs-fixer.install
@@ -1,8 +1,12 @@
post_install() {
- echo
- echo "Warning: If you previously changed phar.readonly = Off you may now set phar.readonly = On in your php.ini";
+ if ! php -i | grep 'PHP Archive support => enabled' >/dev/null 2>&1; then
+ echo
+ echo "Error: phar.so must be enabled in your php.ini"
+ echo
+ exit 1
+ fi
}
post_upgrade() {
- post_install
+ post_install
}