Make this package buildable again

3 files changed, 25 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5cdbedc10873..fcf50d85abc8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,19 @@
+# Generated by makepkg 6.0.1
+# Tue Jul 26 16:13:26 UTC 2022
 pkgbase = php-language-server
 	pkgdesc = PHP language server implementation
 	pkgver = 5.4.6
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/felixfbecker/php-language-server
 	arch = x86_64
 	license = ISC
 	makedepends = composer
-	depends = php>=7
+	depends = php7
 	source = php-language-server-5.4.6.tar.gz::https://github.com/felixfbecker/php-language-server/archive/v5.4.6.tar.gz
+	source = exception.patch::https://github.com/felixfbecker/php-language-server/commit/d5bbffb30db1d117184518713a4bea191fc6ab22.diff
 	source = php-language-server
-	md5sums = 3934a16509185f1def5040099710fbc9
-	md5sums = cb882eef5bc51ae553fdc7c43d181544
+	sha256sums = 289873a9d2f42b829eb66ff5251476e611de3102bca2b52f9fefd7d4f98e7357
+	sha256sums = eff140afa56f5f2bcda7b6da6e599ef86e9de4692a357ff06c4aaf9dfed36000
+	sha256sums = b4cfc545e3edb8c8e9a664b8d853f378fe4ed11960a721318d04d9388c2d5fcd
 
 pkgname = php-language-server
-
diff --git a/PKGBUILD b/PKGBUILD
index 77f5be6f5447..b909fb9c75a8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,37 @@
 # Maintainer: Jan-Jaap Korpershoek <jjkorpershoek96 at gmail dot com>
 pkgname=php-language-server
 pkgver=5.4.6
-pkgrel=1
+pkgrel=2
 pkgdesc="PHP language server implementation"
 arch=('x86_64')
 url="https://github.com/felixfbecker/php-language-server"
 license=('ISC')
-depends=('php>=7')
+depends=('php7')
 makedepends=('composer')
 source=(
     "$pkgname-$pkgver.tar.gz::https://github.com/felixfbecker/$pkgname/archive/v$pkgver.tar.gz"
+    "exception.patch::https://github.com/felixfbecker/$pkgname/commit/d5bbffb30db1d117184518713a4bea191fc6ab22.diff"
     "php-language-server"
 )
-md5sums=('3934a16509185f1def5040099710fbc9'
-         'cb882eef5bc51ae553fdc7c43d181544')
+sha256sums=('289873a9d2f42b829eb66ff5251476e611de3102bca2b52f9fefd7d4f98e7357'
+            'eff140afa56f5f2bcda7b6da6e599ef86e9de4692a357ff06c4aaf9dfed36000'
+            'b4cfc545e3edb8c8e9a664b8d853f378fe4ed11960a721318d04d9388c2d5fcd')
+
+prepare() {
+    cd "$srcdir/$pkgname-$pkgver"
+    # Avoid a crash due to badly catched exception.
+    # See https://github.com/felixfbecker/php-language-server/pull/756
+    patch -p1 -i ../exception.patch
+}
 
 build() {
     cd "$srcdir/$pkgname-$pkgver"
-    composer install
-    composer run-script parse-stubs
+    php7 /usr/bin/composer install
+    php7 /usr/bin/composer run-script parse-stubs
 }
 
 package() {
-    path=$pkgdir/usr/share/php/$pkgname
+    path=$pkgdir/usr/share/php7/$pkgname
     mkdir -p $path
     mkdir -p "$pkgdir/usr/bin"
     install -Dm755 php-language-server "$pkgdir/usr/bin/"
diff --git a/php-language-server b/php-language-server
index 3fbc1f4de56c..1b5f92d1f2b6 100644
--- a/php-language-server
+++ b/php-language-server
@@ -1,2 +1,2 @@
 #!/bin/bash
-php /usr/share/php/php-language-server/bin/php-language-server.php
+php7 /usr/share/php7/php-language-server/bin/php-language-server.php