Updated to latest stable v2.6.0; Switched to using phar instead of pear

(thanks KingCrunch).

2 files changed, 27 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 47a2c48f83a3..6ba9d25dd682 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,19 @@
 # Generated by mksrcinfo v8
-# Wed Jan 13 17:03:16 UTC 2016
+# Sun Apr 17 11:57:59 UTC 2016
 pkgbase = php-codesniffer
-	pkgdesc = PHP_CodeSniffer tokenises PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.
-	pkgver = 2.5.0
+	pkgdesc = PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files to detect and fix violations of a defined set of coding standards.
+	pkgver = 2.6.0
 	pkgrel = 1
 	url = http://pear.php.net/package/PHP_CodeSniffer/
 	arch = any
 	license = BSD
-	makedepends = php-pear
 	depends = php
-	noextract = PHP_CodeSniffer-2.5.0.tgz
-	source = http://download.pear.php.net/package/PHP_CodeSniffer-2.5.0.tgz
-	sha256sums = 185d8bb66bf2397199711ad412071aea717a93e9b4098313a54258fcd6e811db
+	source = https://github.com/squizlabs/PHP_CodeSniffer/releases/download/2.6.0/phpcs.phar
+	source = https://github.com/squizlabs/PHP_CodeSniffer/releases/download/2.6.0/phpcbf.phar
+	source = https://raw.githubusercontent.com/squizlabs/PHP_CodeSniffer/2.6.0/licence.txt
+	sha256sums = 81e8df3aa89f1920994fb818ccbac7ea40251e3dd0473effb41981d209d9b40a
+	sha256sums = b230cc5804dcd17bf2bc52d5eda0cfa60423e3afd68641f8bebea0f698284ec6
+	sha256sums = 821c1697ab88bb71a5d1637743024e455d87074b8a5d0732f85205bd40cba6c9
 
 pkgname = php-codesniffer
 
diff --git a/PKGBUILD b/PKGBUILD
index 05198ba0e8f7..36c64e15125a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,23 +3,30 @@
 
 pkgname=php-codesniffer
 _pkgname=PHP_CodeSniffer
-pkgver=2.5.0
+pkgver=2.6.0
 pkgrel=1
-pkgdesc="PHP_CodeSniffer tokenises PHP, JavaScript and CSS files and detects violations of a defined set of coding standards."
+pkgdesc="PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files to detect and fix violations of a defined set of coding standards."
 arch=('any')
 url="http://pear.php.net/package/PHP_CodeSniffer/"
 license=('BSD')
 depends=('php')
-makedepends=('php-pear')
-source=("http://download.pear.php.net/package/${_pkgname}-${pkgver}.tgz")
-noextract=("${_pkgname}-${pkgver}.tgz")
-sha256sums=('185d8bb66bf2397199711ad412071aea717a93e9b4098313a54258fcd6e811db')
+source=("https://github.com/squizlabs/${_pkgname}/releases/download/${pkgver}/phpcs.phar"
+        "https://github.com/squizlabs/${_pkgname}/releases/download/${pkgver}/phpcbf.phar"
+        "https://raw.githubusercontent.com/squizlabs/PHP_CodeSniffer/${pkgver}/licence.txt")
+
+sha256sums=('81e8df3aa89f1920994fb818ccbac7ea40251e3dd0473effb41981d209d9b40a'
+            'b230cc5804dcd17bf2bc52d5eda0cfa60423e3afd68641f8bebea0f698284ec6'
+            '821c1697ab88bb71a5d1637743024e455d87074b8a5d0732f85205bd40cba6c9')
 
 package() {
-  pear install -P ${pkgdir} ${srcdir}/${_pkgname}-${pkgver}.tgz
+  install -d "${pkgdir}/usr/share/webapps/bin"
+  install -D -m 755 "${srcdir}/phpcs.phar" "${pkgdir}/usr/share/webapps/bin/phpcs.phar"
+  install -D -m 755 "${srcdir}/phpcbf.phar" "${pkgdir}/usr/share/webapps/bin/phpcbf.phar"
+
+  install -d "${pkgdir}/usr/bin"
+  ln -s "/usr/share/webapps/bin/phpcs.phar" "${pkgdir}/usr/bin/phpcs"
+  ln -s "/usr/share/webapps/bin/phpcbf.phar" "${pkgdir}/usr/bin/phpcbf"
 
-  # Remove PEAR channel metadata etc. from the package (which may cause
-  # filesystem conflicts), thanks skremiec.
-  cd ${pkgdir}/usr/share/pear
-  rm -r $(ls -A | grep '^\.')
+  install -d "${pkgdir}/usr/share/licenses"
+  install -D -m 644 "${srcdir}/licence.txt" "${pkgdir}/usr/share/licenses/${pkgname}/licence.txt"
 }