2.4.0 release

Makefile

@@ -38,9 +38,12 @@ prepare:
 	cp src/Composer/FixBrokenStaticAutoloader.php '$(BUILD_DIR)/src/Composer'
 	php $(BUILD_DIR)/fix-some-stuff-in-composer.php
 	composer install --working-dir='$(BUILD_DIR)' --no-scripts --no-plugins --no-dev --no-interaction --optimize-autoloader
+	# Bundle suggested optional packages:
+	composer require --working-dir='$(BUILD_DIR)' 'nikic/php-parser:~4.0' --update-no-dev --no-interaction
 	php -d error_reporting='(E_ALL & ~E_DEPRECATED)' ./vendor/bin/box compile --working-dir='$(BUILD_DIR)' -vvv
 	# Copy composer plugin
 	cp '$(BUILD_DIR)/src/Composer/GrumPHPPlugin.php' '$(ROOT_DIR)/src/Composer/GrumPHPPlugin.php'
+	cp '$(BUILD_DIR)/composer.lock' '$(ROOT_DIR)/phar.composer.lock'
 	# All good : lets finish up
 	cp '$(BUILD_DIR)/grumphp.phar' '$(ROOT_DIR)'
 	gpg --local-user toonverwerft@gmail.com --armor --detach-sign grumphp.phar
@@ -50,7 +53,10 @@ sanity:
 	$(if $(BUILD_DIR),,$(error BUILD_DIR is not defined. Pass via "make sanity BUILD_DIR=/tmp/prepared-grumphp-src"))
 	mv '$(BUILD_DIR)/composer.json.backup' '$(BUILD_DIR)/composer.json'
 	rm -rf '$(BUILD_DIR)/vendor'
-	composer install --working-dir='$(BUILD_DIR)' --no-interaction
+	# Change content of composer.json to force a new content-hash.
+	# Otherwise, the autoloader would have the same hash twice and fail.
+	composer config --working-dir='$(BUILD_DIR)' --unset 'platform'
+	composer update --working-dir='$(BUILD_DIR)' --no-interaction
 	cd $(BUILD_DIR) && ./grumphp.phar run --testsuite=git_pre_commit && cd $(ROOT_DIR)
 
 cleanup:

grumphp.phar.asc

@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQJLBAABCAA1FiEEGVT9SvplyC5AyxoTqja5lgtbgj0FAmVgSYcXHHRvb252ZXJ3
-ZXJmdEBnbWFpbC5jb20ACgkQqja5lgtbgj00TBAAh1RKsNfliyWO4Vu0xtC7hCz9
-r8sQKP4vknjzeUVnc55rTR21IRHPTMk/55r1C7VoecoEHHyjqwShOeIHnUdIdy4l
-0OEsycu0cd/e0KCrefvrxiJj4WDIGjQYhjDSMMo626GTdbBeuhoUhxCvDBi0swGK
-znDmgZ+Z1SP84JVczBlaPR5g/GLRDswegoh8qCO3nGxuoARvzF8OHUw9bBfdD7qw
-eDexzTaNY1KoFHf3380ZT2Gf4afVzUsoEjqLZ8XWDxdNLWEDgkuQ9erUQInOzysc
-Iek7pfp3nJeQLeXY8BixgNyu5p3Ht3bS5K2B5JMG71f+a7+EUEJKYqm4muyw5YLW
-gDKY/7onDuK26KQpbahBvO60h9j1YXgmincD11DQnbCfoDltPouGFE7I2uahJXJt
-d+W7TlVbtpsHpOdDmEDPeq2YdSTAh7ZAAvrJuBAsEawFY+cCxmp0QYLygYmwFjH3
-SiFIEDkoPwlHW4jKbHKBliNJiy23bsO2HHkplH0DZE3Pw3bMYG9EtBQJtzK1qzwG
-45bwnReLG9CXCHAU59tKb3PNGMOZU5DpbwFvnT1Z2QEDgW5VnJcOgZRGS6uTO92v
-RAFARD171eDMoW27nOJ3ukAYeRSl/vSR3j6YbrQ2RwOGPVs4lloPoI+Y9ydwW0cF
-/PcYuybfHE9PryeknYM=
-=GqM0
+iQJLBAABCAA1FiEEGVT9SvplyC5AyxoTqja5lgtbgj0FAmWFS4sXHHRvb252ZXJ3
+ZXJmdEBnbWFpbC5jb20ACgkQqja5lgtbgj1nKhAAgkZgufKzKn3MvEseH3EMCQfC
+mKt8alWuX/1kGx/frvBp6PurlgttreMP/5wPqMQbpbcDxDne87vXn5IAgt6EU9g1
+xQBKERXInZE7KoM8Y9Cg0SS4AQFbGez0Zn0h/yZi0juyTu4yJNZgsNwV2+4Mq1o3
+gJeYFb9njjiXm7d9C2qRpuQCOSiIKxF8NINDgY5B6CCz+7rJCWFLj7gIKU/Bw+nC
+VnMjxyBeKLnL8jmvr8A5enm5gJnAd7ZhHBTdTQD8BbnL8h9vrQuOVqteSc9kZ89L
+Rx6lRcDrRMMtSSluonVf5mFIYM3ZGSzF//1IMxUgE1Nv/DjAfnarjEPpOWUprdJJ
+tXdB3xGUEFGbgRAWJXcbHrrFUTUaAEb/wXiOTBPNSEBHuvEim/yjEIN8JRkb6Q4Z
+FNurAye+MVdV+aOvJmkx6ZiDF29bc3njs92LzVLqbiLF6d55ovkeL/WP40qaQXjp
+G1gHJbEngmlF5EqcpEh5GvgPkBTpHiKyN80a2wtQxE64Ws95WxPWa8NB+ylMz4Uj
+yfkWDknhwyL3+WOlhj3V6H0A25g2IxonJqxVdtTMaWkpTdowaae25ye5yjen4Aj5
+PKd/cJ6wmHtUeUvSBtZYtybP4NK6+LKJ2TsNglmviMEj0SOd+K4OrhPA3lwe6spg
+AeuY6VP58WYGgTMbcMg=
+=XOWb
 -----END PGP SIGNATURE-----