Skip to content

Commit fcd1f78

Browse files
authored
Merge pull request #1207 from veewee/gitlib-rquires-raw-difffs
Require --raw diffs for gitlib
2 parents d8253ca + 81a6f9a commit fcd1f78

13 files changed

Lines changed: 256 additions & 237 deletions

File tree

.github/workflows/grumphp.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ jobs:
5858
run: |
5959
composer install --no-progress --no-suggest
6060
composer validate
61+
- name: Fix dev-deps issue on lowest 8.4
62+
if: matrix.php-versions == '8.4' && matrix.composer-deps == 'lowest'
63+
run: cd vendor/composer/composer && composer install
6164
- name: Set git variables
6265
run: |
6366
git config --global user.email "you@example.com"

appveyor.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,13 @@ init:
4343
- ps: $Env:AMP_DEBUG = '1'
4444

4545
install:
46+
# Install Visual C++ Redistributable (required for PHP 8.4+)
47+
- ps: |
48+
if ($Env:php_version -ge "8.4") {
49+
Write-Host "Installing Visual C++ Redistributable for PHP 8.4+"
50+
appveyor-retry choco install vcredist140 --yes --force --ignore-dependencies
51+
}
52+
4653
# Install PHP
4754
- ps: If ((Test-Path $Env:php_directory) -eq $False) { New-Item -Path $Env:php_directory -ItemType 'directory' }
4855
- ps: $php_install_parameters = '"/DontAddToPath /InstallDir:' + $Env:php_directory + '"'

composer.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"amphp/amp": "^3.0",
2121
"amphp/parallel": "^2.1",
2222
"doctrine/collections": "^1.6.8 || ^2.0",
23-
"gitonomy/gitlib": "^1.3",
23+
"gitonomy/gitlib": "^1.6",
2424
"laravel/serializable-closure": "^2.0",
2525
"monolog/monolog": "^2.0 || ^3.0",
2626
"ondram/ci-detector": "^4.0",
@@ -39,15 +39,15 @@
3939
"symfony/yaml": "^6.4 || ^7.0 || ^8.0"
4040
},
4141
"require-dev": {
42-
"brianium/paratest": "^7.8",
43-
"composer/composer": "^2.2.6",
44-
"nikic/php-parser": "^5.0",
45-
"php-cs-fixer/shim": "^3.88",
46-
"php-parallel-lint/php-parallel-lint": "^1.3",
47-
"phpspec/phpspec": "^8.0",
48-
"phpspec/prophecy": "^1.23",
42+
"brianium/paratest": "^7.8.5",
43+
"composer/composer": "^2.9.5",
44+
"nikic/php-parser": "^5.7",
45+
"php-cs-fixer/shim": "^3.93",
46+
"php-parallel-lint/php-parallel-lint": "^1.4",
47+
"phpspec/phpspec": "^8.2",
48+
"phpspec/prophecy": "^1.24",
4949
"phpspec/prophecy-phpunit": "^2.4",
50-
"phpunit/phpunit": "^11.5"
50+
"phpunit/phpunit": "^11.5.50"
5151
},
5252
"suggest": {
5353
"atoum/atoum": "Lets GrumPHP run your unit tests.",

0 commit comments

Comments
 (0)