Skip to content

Replaced phive with additional composers #229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 3, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
*.phpt text eol=lf
/composer.lock export-ignore
/.github/ export-ignore
/.phive/ export-ignore
/tests export-ignore
/tools export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
/.php_cs export-ignore
Expand Down
4 changes: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,9 @@ version: 2
updates:
- package-ecosystem: "composer"
directory: "/"
schedule:
interval: "daily"
- package-ecosystem: "composer"
directory: "/tools"
schedule:
interval: "daily"
16 changes: 2 additions & 14 deletions .github/workflows/mutation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
branches:
- "6.x"
schedule:
- cron: '* 8 * * *'
- cron: '0 8 * * *'

jobs:
compatibility:
Expand All @@ -31,19 +31,10 @@ jobs:
uses: "shivammathur/setup-php@v2"
with:
coverage: "pcov"
tools: phive, composer:v2
tools: composer:v2
php-version: "${{ matrix.php-version }}"
ini-values: memory_limit=-1

- name: "Cache Phive dependencies"
uses: "actions/cache@v2"
with:
path: |
~/.phive
key: "${{ runner.os }}-phive-${{ hashFiles('**/phars.xml') }}"
restore-keys: |
${{ runner.os }}-phive-

- name: "Get Composer Cache Directory"
id: composer-cache
run: |
Expand All @@ -58,9 +49,6 @@ jobs:
restore-keys: |
php-${{ matrix.php-version }}-${{ matrix.dependencies }}-composer-

- name: "Install tools"
run: "phive install --trust-gpg-keys E82B2FB314E9906E,CF1A108D0E7AE720,8A03EA3B385DBAA1,C5095986493B4AA0 --force-accept-unsigned"

- name: "Install lowest dependencies"
if: ${{ matrix.dependencies == 'lowest' }}
run: "composer update --prefer-lowest --no-interaction --no-progress --no-suggest"
Expand Down
16 changes: 2 additions & 14 deletions .github/workflows/static-analyze.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
branches:
- "6.x"
schedule:
- cron: '* 8 * * *'
- cron: '0 8 * * *'

jobs:
compatibility:
Expand All @@ -33,16 +33,7 @@ jobs:
coverage: "pcov"
php-version: "${{ matrix.php-version }}"
ini-values: memory_limit=-1
tools: phive, composer:v2

- name: "Cache Phive dependencies"
uses: "actions/cache@v2"
with:
path: |
~/.phive
key: "${{ runner.os }}-phive-${{ hashFiles('**/phars.xml') }}"
restore-keys: |
${{ runner.os }}-phive-
tools: composer:v2

- name: "Get Composer Cache Directory"
id: composer-cache
Expand All @@ -58,9 +49,6 @@ jobs:
restore-keys: |
php-${{ matrix.php-version }}-${{ matrix.dependencies }}-composer-

- name: "Install tools"
run: "phive install --trust-gpg-keys E82B2FB314E9906E,CF1A108D0E7AE720,8A03EA3B385DBAA1,C5095986493B4AA0 --force-accept-unsigned"

- name: "Install lowest dependencies"
if: ${{ matrix.dependencies == 'lowest' }}
run: "composer update --prefer-lowest --no-interaction --no-progress --no-suggest"
Expand Down
16 changes: 2 additions & 14 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
branches:
- "6.x"
schedule:
- cron: '* 8 * * *'
- cron: '0 8 * * *'

jobs:
compatibility:
Expand Down Expand Up @@ -36,16 +36,7 @@ jobs:
coverage: "pcov"
php-version: "${{ matrix.php-version }}"
ini-values: memory_limit=-1
tools: phive, composer:v2

- name: "Cache Phive dependencies"
uses: "actions/cache@v2"
with:
path: |
~/.phive
key: "${{ runner.os }}-phive-${{ hashFiles('**/phars.xml') }}"
restore-keys: |
${{ runner.os }}-phive-
tools: composer:v2

- name: "Get Composer Cache Directory"
id: composer-cache
Expand All @@ -61,9 +52,6 @@ jobs:
restore-keys: |
php-${{ matrix.php-version }}-${{ matrix.dependencies }}-composer-

- name: "Install tools"
run: "phive install --trust-gpg-keys E82B2FB314E9906E,CF1A108D0E7AE720,8A03EA3B385DBAA1,C5095986493B4AA0 --force-accept-unsigned"

- name: "Install lowest dependencies"
if: ${{ matrix.dependencies == 'lowest' }}
run: "composer update --prefer-lowest --no-interaction --no-progress --no-suggest"
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
vendor/
bin/
var/
tools/
.DS_Store
.idea
.phpunit.result.cache
9 changes: 0 additions & 9 deletions .phive/phars.xml

This file was deleted.

20 changes: 13 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
},
"require-dev": {
"openlss/lib-array2xml": "^1.0",
"phpunit/phpunit": "^9.4",
"symfony/expression-language": "^2.3|^3.0|^4.0|^5.0"
},
"suggest": {
Expand Down Expand Up @@ -57,19 +56,26 @@
"@test:mutation"
],
"cs:php:fix": [
"tools/php-cs-fixer fix --using-cache=no"
"tools\/vendor\/bin\/php-cs-fixer fix --using-cache=no"
],
"test" : [
"phpunit"
"tools\/vendor\/bin\/phpunit"
],
"test:mutation": [
"Composer\\Config::disableProcessTimeout",
"tools/infection"
"tools\/vendor\/bin\/infection"
],
"static:analyze": [
"tools/psalm --shepherd --stats",
"tools/phpstan analyze -c phpstan.neon",
"tools/php-cs-fixer fix --dry-run"
"tools\/vendor\/bin\/psalm --shepherd --stats",
"tools\/vendor\/bin\/phpstan analyze -c phpstan.neon",
"tools\/vendor\/bin\/php-cs-fixer fix --dry-run"
],
"tools:install": "composer install --working-dir=./tools",
"post-install-cmd": [
"@tools:install"
],
"post-update-cmd": [
"@tools:install"
]
}
}
Loading