Skip to content

Commit 79ca141

Browse files
authored
Merge pull request #144 from CarbonPHP/fix/php-8-6-compatibility
Ignore warning for Laravel master-branch test
2 parents 8b02600 + 6a3c73a commit 79ca141

3 files changed

Lines changed: 8 additions & 1 deletion

File tree

‎.github/workflows/tests.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,11 @@ jobs:
9999
run: composer require --no-update --no-interaction "symfony/translation:^5.4.35||^6.3.12||^7.0.3||^8.0.0" "symfony/contracts:^2.5.3||>=3.4.2" "sebastian/exporter:>5.1.2"
100100
# https://github.com/symfony/symfony/commit/f4118e110a46de3ffb799e7d79bf15128d1646ea
101101

102+
- name: Updgrade carbonphp/carbon-doctrine-types
103+
if: matrix.php >= 8.6
104+
shell: bash
105+
run: composer require --no-update --no-interaction "carbonphp/carbon-doctrine-types:^1.0.1||^2.1.1||>=3.2.1"
106+
102107
- name: Install dependencies
103108
uses: nick-fields/retry@v4
104109
if: steps.composer-cache.outputs.cache-hit != 'true'

‎tests/Carbon/TestingAidsTest.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,12 +324,14 @@ public function testSetTestNow()
324324

325325
Carbon::setTestNow('2013-09-01 10:20:30.654321');
326326
$n1 = Carbon::now();
327+
usleep(1);
327328
$n2 = Carbon::now();
328329

329330
$this->assertFalse($n2 > $n1);
330331

331332
Carbon::setTestNow(false);
332333
$n1 = Carbon::now();
334+
usleep(1);
333335
$n2 = Carbon::now();
334336

335337
$this->assertTrue($n2 > $n1);

‎tests/Laravel/laravel.master.multi-tester.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ projects:
1818
- sed -i 's/trigger_deprecation/#trigger_deprecation/g' vendor/symfony/console/Application.php
1919
- sed -i 's/testRouteCanBeFilteredByAction/skipTestRouteCanBeFilteredByAction/g' tests/Testing/Console/RouteListCommandTest.php
2020
# Run the test
21-
- vendor/bin/phpunit --no-coverage
21+
- vendor/bin/phpunit --no-coverage --do-not-fail-on-warning --do-not-fail-on-phpunit-warning

0 commit comments

Comments
 (0)