Skip to content

Commit c35d151

Browse files
committed
ci: move composer-normalize to standalone phar
1 parent dfbeb6b commit c35d151

File tree

4 files changed

+5
-474
lines changed

4 files changed

+5
-474
lines changed

.phive/phars.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<phive xmlns="https://phar.io/phive">
3-
<phar name="composer-require-checker" version="^4.10.0" installed="4.10.0" location="./.phive/composer-require-checker" copy="false"/>
3+
<phar name="composer-normalize" version="^2.42.0" installed="2.42.0" location="./.phive/composer-normalize" copy="false"/>
4+
<phar name="composer-require-checker" version="^4.11.0" installed="4.11.0" location="./.phive/composer-require-checker" copy="false"/>
45
</phive>

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ update: ## Updates composer dependencies by running composer update command
171171
.PHONY: update
172172

173173
phive: ## Installs dependencies with phive
174-
$(APP_RUNNER) /usr/local/bin/phive install --trust-gpg-keys 0x033E5F8D801A2F8D
174+
$(APP_RUNNER) /usr/local/bin/phive install --trust-gpg-keys 0xC00543248C87FB13,0x033E5F8D801A2F8D
175175
.PHONY: phive
176176

177177
#
@@ -241,7 +241,7 @@ lint-deps: ## Runs composer-require-checker – checks for dependencies that are
241241
.PHONY: lint-deps
242242

243243
lint-composer: ## Normalize composer.json and composer.lock files
244-
$(APP_COMPOSER) normalize
244+
$(APP_RUNNER) .phive/composer-normalize normalize
245245
.PHONY: lint-composer
246246

247247
lint-audit: ## Runs security checks for composer dependencies

composer.json

-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
"ext-curl": "*",
6666
"ext-pdo_mysql": "*",
6767
"beberlei/assert": "^3.3",
68-
"ergebnis/composer-normalize": "^2.42",
6968
"fakerphp/faker": "^1.23",
7069
"larastan/larastan": "^2.9",
7170
"laravel/telescope": "^5.0",

0 commit comments

Comments
 (0)