Skip to content

Commit 2144d16

Browse files
committed
Fix tests; drop bin composer (not used by CI, complex)
1 parent 782b8be commit 2144d16

7 files changed

Lines changed: 60 additions & 2668 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ jobs:
6464
6565
# Remove dependencies we don't need for unit tests that break platform requirements
6666
composer remove --dev \
67-
bamarni/composer-bin-plugin
67+
friendsofphp/php-cs-fixer \
68+
kubawerlos/php-cs-fixer-custom-fixers
6869
6970
composer install
7071

.github/workflows/linting.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
- name: Checkout
1313
uses: actions/checkout@v3
1414

15-
- name: Set up PHP 8.4
15+
- name: Set up PHP 8.3
1616
uses: shivammathur/setup-php@v2
1717
with:
18-
php-version: '8.4'
18+
php-version: '8.3'
1919
extensions: mbstring
2020

2121
- name: Get Composer Cache Directory
@@ -26,8 +26,8 @@ jobs:
2626
uses: actions/cache@v3
2727
with:
2828
path: ${{ steps.composer-cache.outputs.dir }}
29-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
30-
restore-keys: ${{ runner.os }}-composer-
29+
key: ${{ runner.os }}-composer-lint-${{ hashFiles('**/composer.lock') }}
30+
restore-keys: ${{ runner.os }}-composer-lint-
3131

3232
- name: Install dependencies
3333
run: composer install
@@ -45,10 +45,10 @@ jobs:
4545
- name: Checkout
4646
uses: actions/checkout@v3
4747

48-
- name: Set up PHP 8.4
48+
- name: Set up PHP 8.3
4949
uses: shivammathur/setup-php@v2
5050
with:
51-
php-version: '8.4'
51+
php-version: '8.3'
5252
extensions: mbstring
5353

5454
- name: Get Composer Cache Directory
@@ -59,8 +59,8 @@ jobs:
5959
uses: actions/cache@v3
6060
with:
6161
path: ${{ steps.composer-cache.outputs.dir }}
62-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
63-
restore-keys: ${{ runner.os }}-composer-
62+
key: ${{ runner.os }}-composer-lint-${{ hashFiles('**/composer.lock') }}
63+
restore-keys: ${{ runner.os }}-composer-lint-
6464

6565
- name: Install dependencies
6666
run: composer install

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Also useful:
3434
- Always add tests for the code that you write, including edge cases ;
3535
- Place the new functions where they belong (collections, arrays, utilities, etc.) ;
3636
- Add `README.md` doc entry for the functions ;
37-
- Execute `php composer.phar run doc` script to automatically build an updated `load.php` ;
37+
- Execute `composer run doc` script to automatically build an updated `load.php` ;
3838
- Update the benchmark `bench.php`, this helps us to validate the performance of the library ;
3939
- Update `CHANGELOG.md` with your changes.
4040

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
"require-dev": {
1818
"php": ">=8.1",
1919
"ext-json": "*",
20-
"bamarni/composer-bin-plugin": "^1.8",
2120
"doctrine/instantiator": "^1.0||^1.1||^1.4",
2221
"erusev/parsedown": "^1.7",
2322
"friendsofphp/php-cs-fixer": "^3.68",
2423
"nikic/php-parser": "^3.1||^4.13",
2524
"phpdocumentor/reflection-docblock": "^3.0||^4.3||^5.2",
26-
"phpunit/phpunit": "^4.8||^6.5||^9.5"
25+
"phpunit/phpunit": "^4.8||^6.5||^9.5",
26+
"kubawerlos/php-cs-fixer-custom-fixers": "^3.14"
2727
},
2828
"autoload": {
2929
"classmap": ["bottomline.php"],

composer.lock

Lines changed: 47 additions & 58 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor-bin/php-cs-fixer/composer.json

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

0 commit comments

Comments
 (0)