Skip to content

Commit 0f198ef

Browse files
authored
Replaced phive with additional composers (#229)
1 parent 2ec3f56 commit 0f198ef

19 files changed

+5855
-2283
lines changed

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
*.phpt text eol=lf
33
/composer.lock export-ignore
44
/.github/ export-ignore
5-
/.phive/ export-ignore
65
/tests export-ignore
6+
/tools export-ignore
77
/.gitattributes export-ignore
88
/.gitignore export-ignore
99
/.php_cs export-ignore

.github/dependabot.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,9 @@ version: 2
22
updates:
33
- package-ecosystem: "composer"
44
directory: "/"
5+
schedule:
6+
interval: "daily"
7+
- package-ecosystem: "composer"
8+
directory: "/tools"
59
schedule:
610
interval: "daily"

.github/workflows/mutation.yml

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
branches:
77
- "6.x"
88
schedule:
9-
- cron: '* 8 * * *'
9+
- cron: '0 8 * * *'
1010

1111
jobs:
1212
compatibility:
@@ -31,19 +31,10 @@ jobs:
3131
uses: "shivammathur/setup-php@v2"
3232
with:
3333
coverage: "pcov"
34-
tools: phive, composer:v2
34+
tools: composer:v2
3535
php-version: "${{ matrix.php-version }}"
3636
ini-values: memory_limit=-1
3737

38-
- name: "Cache Phive dependencies"
39-
uses: "actions/cache@v2"
40-
with:
41-
path: |
42-
~/.phive
43-
key: "${{ runner.os }}-phive-${{ hashFiles('**/phars.xml') }}"
44-
restore-keys: |
45-
${{ runner.os }}-phive-
46-
4738
- name: "Get Composer Cache Directory"
4839
id: composer-cache
4940
run: |
@@ -58,9 +49,6 @@ jobs:
5849
restore-keys: |
5950
php-${{ matrix.php-version }}-${{ matrix.dependencies }}-composer-
6051
61-
- name: "Install tools"
62-
run: "phive install --trust-gpg-keys E82B2FB314E9906E,CF1A108D0E7AE720,8A03EA3B385DBAA1,C5095986493B4AA0 --force-accept-unsigned"
63-
6452
- name: "Install lowest dependencies"
6553
if: ${{ matrix.dependencies == 'lowest' }}
6654
run: "composer update --prefer-lowest --no-interaction --no-progress --no-suggest"

.github/workflows/static-analyze.yml

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
branches:
77
- "6.x"
88
schedule:
9-
- cron: '* 8 * * *'
9+
- cron: '0 8 * * *'
1010

1111
jobs:
1212
compatibility:
@@ -33,16 +33,7 @@ jobs:
3333
coverage: "pcov"
3434
php-version: "${{ matrix.php-version }}"
3535
ini-values: memory_limit=-1
36-
tools: phive, composer:v2
37-
38-
- name: "Cache Phive dependencies"
39-
uses: "actions/cache@v2"
40-
with:
41-
path: |
42-
~/.phive
43-
key: "${{ runner.os }}-phive-${{ hashFiles('**/phars.xml') }}"
44-
restore-keys: |
45-
${{ runner.os }}-phive-
36+
tools: composer:v2
4637

4738
- name: "Get Composer Cache Directory"
4839
id: composer-cache
@@ -58,9 +49,6 @@ jobs:
5849
restore-keys: |
5950
php-${{ matrix.php-version }}-${{ matrix.dependencies }}-composer-
6051
61-
- name: "Install tools"
62-
run: "phive install --trust-gpg-keys E82B2FB314E9906E,CF1A108D0E7AE720,8A03EA3B385DBAA1,C5095986493B4AA0 --force-accept-unsigned"
63-
6452
- name: "Install lowest dependencies"
6553
if: ${{ matrix.dependencies == 'lowest' }}
6654
run: "composer update --prefer-lowest --no-interaction --no-progress --no-suggest"

.github/workflows/tests.yml

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
branches:
77
- "6.x"
88
schedule:
9-
- cron: '* 8 * * *'
9+
- cron: '0 8 * * *'
1010

1111
jobs:
1212
compatibility:
@@ -36,16 +36,7 @@ jobs:
3636
coverage: "pcov"
3737
php-version: "${{ matrix.php-version }}"
3838
ini-values: memory_limit=-1
39-
tools: phive, composer:v2
40-
41-
- name: "Cache Phive dependencies"
42-
uses: "actions/cache@v2"
43-
with:
44-
path: |
45-
~/.phive
46-
key: "${{ runner.os }}-phive-${{ hashFiles('**/phars.xml') }}"
47-
restore-keys: |
48-
${{ runner.os }}-phive-
39+
tools: composer:v2
4940

5041
- name: "Get Composer Cache Directory"
5142
id: composer-cache
@@ -61,9 +52,6 @@ jobs:
6152
restore-keys: |
6253
php-${{ matrix.php-version }}-${{ matrix.dependencies }}-composer-
6354
64-
- name: "Install tools"
65-
run: "phive install --trust-gpg-keys E82B2FB314E9906E,CF1A108D0E7AE720,8A03EA3B385DBAA1,C5095986493B4AA0 --force-accept-unsigned"
66-
6755
- name: "Install lowest dependencies"
6856
if: ${{ matrix.dependencies == 'lowest' }}
6957
run: "composer update --prefer-lowest --no-interaction --no-progress --no-suggest"

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
vendor/
22
bin/
33
var/
4-
tools/
54
.DS_Store
65
.idea
76
.phpunit.result.cache

.phive/phars.xml

Lines changed: 0 additions & 9 deletions
This file was deleted.

composer.json

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
},
2626
"require-dev": {
2727
"openlss/lib-array2xml": "^1.0",
28-
"phpunit/phpunit": "^9.4",
2928
"symfony/expression-language": "^2.3|^3.0|^4.0|^5.0"
3029
},
3130
"suggest": {
@@ -57,19 +56,26 @@
5756
"@test:mutation"
5857
],
5958
"cs:php:fix": [
60-
"tools/php-cs-fixer fix --using-cache=no"
59+
"tools\/vendor\/bin\/php-cs-fixer fix --using-cache=no"
6160
],
6261
"test" : [
63-
"phpunit"
62+
"tools\/vendor\/bin\/phpunit"
6463
],
6564
"test:mutation": [
6665
"Composer\\Config::disableProcessTimeout",
67-
"tools/infection"
66+
"tools\/vendor\/bin\/infection"
6867
],
6968
"static:analyze": [
70-
"tools/psalm --shepherd --stats",
71-
"tools/phpstan analyze -c phpstan.neon",
72-
"tools/php-cs-fixer fix --dry-run"
69+
"tools\/vendor\/bin\/psalm --shepherd --stats",
70+
"tools\/vendor\/bin\/phpstan analyze -c phpstan.neon",
71+
"tools\/vendor\/bin\/php-cs-fixer fix --dry-run"
72+
],
73+
"tools:install": "composer install --working-dir=./tools",
74+
"post-install-cmd": [
75+
"@tools:install"
76+
],
77+
"post-update-cmd": [
78+
"@tools:install"
7379
]
7480
}
7581
}

0 commit comments

Comments
 (0)