From 239dcaa2668674c27fc8c0a3408f4a3c60151c44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=B6ller?= <am@localheinz.com>
Date: Mon, 22 Nov 2021 11:03:09 +0100
Subject: [PATCH] Enhancement: Install humbug/box with phive

---
 .github/workflows/integrate.yaml |   6 +++---
 .github/workflows/release.yaml   |   6 +++---
 phar/box.phar => .phive/box      | Bin
 .phive/phars.xml                 |   1 +
 Makefile                         |   6 +++---
 5 files changed, 10 insertions(+), 9 deletions(-)
 rename phar/box.phar => .phive/box (100%)

diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
index d3ba4256..5b00ac85 100644
--- a/.github/workflows/integrate.yaml
+++ b/.github/workflows/integrate.yaml
@@ -334,13 +334,13 @@ jobs:
         run: "echo $(cat box.json | jq 'del(.git)') > box.json"
 
       - name: "Validate configuration for humbug/box"
-        run: "phar/box.phar validate box.json"
+        run: ".phive/box validate box.json"
 
       - name: "Compile composer-normalize.phar with humbug/box"
-        run: "phar/box.phar compile --config=box.json"
+        run: ".phive/box compile --config=box.json"
 
       - name: "Show info about composer-normalize.phar with humbug/box"
-        run: "phar/box.phar info ${{ env.COMPOSER_NORMALIZE_PHAR }}"
+        run: ".phive/box info ${{ env.COMPOSER_NORMALIZE_PHAR }}"
 
       - name: "Run composer-normalize.phar"
         run: "${{ env.COMPOSER_NORMALIZE_PHAR }}"
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index d5607d66..e45a58e1 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -63,13 +63,13 @@ jobs:
         run: "composer require composer/composer:${{ env.COMPOSER_VERSION }} --no-interaction --no-progress"
 
       - name: "Validate configuration for humbug/box"
-        run: "phar/box.phar validate box.json"
+        run: ".phive/box validate box.json"
 
       - name: "Compile composer-normalize.phar with humbug/box"
-        run: "phar/box.phar compile --config=box.json"
+        run: ".phive/box compile --config=box.json"
 
       - name: "Show info about composer-normalize.phar with humbug/box"
-        run: "phar/box.phar info ${{ env.COMPOSER_NORMALIZE_PHAR }}"
+        run: ".phive/box info ${{ env.COMPOSER_NORMALIZE_PHAR }}"
 
       - name: "Run composer-normalize.phar"
         run: "${{ env.COMPOSER_NORMALIZE_PHAR }}"
diff --git a/phar/box.phar b/.phive/box
similarity index 100%
rename from phar/box.phar
rename to .phive/box
diff --git a/.phive/phars.xml b/.phive/phars.xml
index 94f2883c..31582504 100644
--- a/.phive/phars.xml
+++ b/.phive/phars.xml
@@ -2,4 +2,5 @@
 <phive xmlns="https://phar.io/phive">
     <phar name="composer-normalize" version="^2.15.0" installed="2.15.0" location="./.phive/composer-normalize" copy="true"/>
     <phar name="composer-require-checker" version="^2.1.0" installed="2.1.0" location="./.phive/composer-require-checker" copy="true"/>
+    <phar name="humbug/box" version="3.8.4" installed="3.8.4" location="./.phive/box" copy="true"/>
 </phive>
diff --git a/Makefile b/Makefile
index 9a1fb84b..6ca6bb36 100644
--- a/Makefile
+++ b/Makefile
@@ -25,11 +25,11 @@ help: ## Displays this list of targets with descriptions
 
 .PHONY: phar
 phar: vendor ## Builds a phar with humbug/box
-	phar/box.phar validate box.json
+	.phive/box validate box.json
 	composer require composer/composer:${COMPOSER_VERSION}  --no-interaction --no-progress --update-with-dependencies
-	phar/box.phar compile --config=box.json
+	.phive/box compile --config=box.json
 	git checkout HEAD -- composer.json composer.lock
-	phar/box.phar info .build/phar/composer-normalize.phar
+	.phive/box info .build/phar/composer-normalize.phar
 	.build/phar/composer-normalize.phar
 	.build/phar/composer-normalize.phar --dry-run composer.json