Skip to content

Commit

Permalink
rueckbau dev deps
Browse files Browse the repository at this point in the history
temporary repository from a79e0ba not needed any longer after patch in
upstream [fixers-patch].

this removes the requirement for composer github authentication.

updates in the development cycle:

- kubawerlos/php-cs-fixer-custom-fixers v3.2.1 (from v2.4.1 via v2.5.0)
  (v3.2.0.1)

update and lock with php 7.4 language level.

ref: a79e0ba
[fixers-patch]: kubawerlos/php-cs-fixer-custom-fixers#644
  • Loading branch information
ktomk committed Nov 8, 2021
1 parent 4697c9e commit 8fcebb8
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 58 deletions.
5 changes: 0 additions & 5 deletions .env.dist
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,3 @@ MYSQL_PASSWORD=test_user_password
DOCKER_ID_USER
DOCKER_ID_PASSWORD
DOCKER_ID_EMAIL

# ---
# Composer: Github OAuth
#
COMPOSER_AUTH
3 changes: 0 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@ jobs:
php-version: ${{ matrix.php-version }}
coverage: xdebug
extensions: ${{ matrix.xdebug }}, yaml
env:
COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
COMPOSER_AUTH: '{"github-oauth": {"github.com": "${{ secrets.GITHUB_TOKEN }}"}}'

- uses: actions/cache@v2
with:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ The format is based on [Keep a Changelog] and Pipelines adheres to

## [unreleased]
### Fix
- Remove temporary repository for development dependencies
- Change log 0.0.58 release date malformed

## [0.0.58] - 2021-11-07
Expand Down
8 changes: 1 addition & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
},
"require-dev": {
"friendsofphp/php-cs-fixer": "~3.2.1",
"kubawerlos/php-cs-fixer-custom-fixers": "~3.2.0.1",
"kubawerlos/php-cs-fixer-custom-fixers": "~3.2.1",
"phpunit/phpunit": "^4 || ^5 || ^6.5 || ^7.0 || ^8.0 || ^9.0",
"roave/security-advisories": "dev-latest"
},
Expand Down Expand Up @@ -122,10 +122,4 @@
"platform-check": false,
"sort-packages": true
}
, "repositories": {
"php-cs-fixer-custom-fixers": {
"type": "vcs",
"url": "https://github.com/ktomk/php-cs-fixer-custom-fixers.git"
}
}
}
51 changes: 10 additions & 41 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions lib/script/ppconf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,6 @@ while [ $# -gt 0 ]; do
deps="friendsofphp/php-cs-fixer kubawerlos/php-cs-fixer-custom-fixers"
printf " %s: %s\n" "$1" "$deps"
fi
# remove temporary php-cs-fixer-custom-fixers repository
f_composer --quiet config --unset repositories.php-cs-fixer-custom-fixers
# shellcheck disable=SC2086 # unquoted $deps (from $2) intended
f_composer --quiet remove --dev --ignore-platform-reqs $deps
shift 2
Expand Down

0 comments on commit 8fcebb8

Please sign in to comment.