Use phive instead of polluting dependencies (#103)

* Move some things to phive

* ensure tools are updated

* Ensure tools exist

* Install phive if it doesn't exist

* Specify the keys to trust

* check installation

* Use shell semantics

* Fix tools

* Now use tools directory

* Use phpunit

* Update to latest rc

Author: withinboredom

.github/workflows/php.yml

@@ -16,8 +16,10 @@ jobs:
         with:
           php-version: 8.0
           extensions: xdebug
-      - name: Validate composer.json and composer.lock
-        run: composer validate
+      - name: Validate composer.json and install tools
+        run: |
+          composer validate
+          make tools
 
       - name: Cache Composer packages
         id: composer-cache
@@ -50,7 +52,7 @@ jobs:
           php-version: 8.0
           extensions: xdebug
       - name: Validate composer.json and composer.lock
-        run: composer validate
+        run: composer validate && make tools
 
       - name: Cache Composer packages
         id: composer-cache
@@ -129,7 +131,7 @@ jobs:
     timeout-minutes: 5
     strategy:
       matrix:
-        dapr-version: [ 1.3.0-rc.1, 1.2.0, 1.2.1, 1.2.2 ]
+        dapr-version: [ 1.3.0-rc.4, 1.2.0, 1.2.1, 1.2.2 ]
     steps:
       - name: Download Caddy Image
         uses: actions/download-artifact@v2

.gitignore

@@ -4,3 +4,4 @@
 /.idea/
 .phpunit.result.cache
 coverage.xml
+/tools/

.phive/phars.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phive xmlns="https://phar.io/phive">
+  <phar name="psalm" version="^4.7" installed="4.8.1" location="./tools/psalm" copy="false"/>
+</phive>

Makefile

@@ -2,8 +2,10 @@
 export GITHUB_SHA=latest
 export DAPR_VERSION=1.3.0-rc.1
 
+PHIVE=$(shell which phive || echo .phive/phive)
+
 .PHONY: integration-tests
-integration-tests: build
+integration-tests: build tools
 	docker-compose down -v
 	docker-compose up &
 	sleep 10
@@ -28,3 +30,16 @@ build-tests: vendor/autoload.php
 .PHONY: build-caddy
 build-caddy: vendor/autoload.php
 	docker build -t caddy:latest -f images/caddy.Dockerfile .
+
+$(PHIVE):
+	wget -O phive.phar "https://phar.io/releases/phive.phar"
+	wget -O phive.phar.asc "https://phar.io/releases/phive.phar.asc"
+	gpg --keyserver hkps://keys.openpgp.org --recv-keys 0x9D8A98B29B2D5D79
+	gpg --verify phive.phar.asc phive.phar
+	rm phive.phar.asc
+	chmod +x phive.phar
+	mv phive.phar $(PHIVE)
+
+tools: .phive/phars.xml $(PHIVE)
+	rm -rf tools && echo $(PHIVE)
+	$(PHIVE) install --trust-gpg-keys 12CE0F1D262429A5,4AA394086372C20A

composer.json

@@ -27,8 +27,7 @@
   },
   "require-dev": {
     "ext-xdebug": "*",
-    "phpunit/phpunit": "^9",
-    "vimeo/psalm": "^4.7"
+    "phpunit/phpunit": "^9"
   },
   "autoload": {
     "psr-4": {
@@ -52,6 +51,6 @@
     "integration-tests": [
       "curl localhost:9502/do_tests"
     ],
-    "lint": "./vendor/bin/psalm"
+    "lint": "./tools/psalm"
   }
 }