Skip to content

Commit 9bd0a7c

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents c60e715 + 7d25dc7 commit 9bd0a7c

File tree

4 files changed

+4
-141
lines changed

4 files changed

+4
-141
lines changed

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
"bower-asset/yii2-pjax": "~2.0.1"
8282
},
8383
"require-dev": {
84-
"cweagans/composer-patches": "^1.6",
84+
"cweagans/composer-patches": "^1.7",
8585
"phpunit/phpunit": "4.8.34",
8686
"cebe/indent": "~1.0.2",
8787
"friendsofphp/php-cs-fixer": "~2.2.3",
@@ -115,11 +115,11 @@
115115
"composer-exit-on-patch-failure": true,
116116
"patches": {
117117
"phpunit/phpunit-mock-objects": {
118-
"Fix PHP 7 and 8 compatibility": "./tests/phpunit_mock_objects.patch"
118+
"Fix PHP 7 and 8 compatibility": "https://yiisoft.github.io/phpunit-patches/phpunit_mock_objects.patch"
119119
},
120120
"phpunit/phpunit": {
121-
"Fix PHP 7 compatibility": "./tests/phpunit_php7.patch",
122-
"Fix PHP 8 compatibility": "./tests/phpunit_php8.patch"
121+
"Fix PHP 7 compatibility": "https://yiisoft.github.io/phpunit-patches/phpunit_php7.patch",
122+
"Fix PHP 8 compatibility": "https://yiisoft.github.io/phpunit-patches/phpunit_php8.patch"
123123
}
124124
}
125125
}

tests/phpunit_mock_objects.patch

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

tests/phpunit_php7.patch

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

tests/phpunit_php8.patch

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

0 commit comments

Comments
 (0)