-
Notifications
You must be signed in to change notification settings - Fork 63
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
PHP 8.4 adds a new interface method DatetimeImmutable::createFromTimestamp().
- Loading branch information
Showing
2 changed files
with
64 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,8 +15,57 @@ permissions: | |
|
||
jobs: | ||
testsuite: | ||
uses: cakephp/.github/.github/workflows/[email protected] | ||
secrets: inherit | ||
runs-on: ubuntu-22.04 | ||
continue-on-error: ${{ matrix.unstable }} | ||
strategy: | ||
fail-fast: false | ||
matrix: | ||
php-version: ['8.1'] | ||
dependencies: [highest] | ||
unstable: [false] | ||
include: | ||
- php-version: '8.1' | ||
dependencies: lowest | ||
unstable: false | ||
- php-version: '8.2' | ||
dependencies: highest | ||
unstable: false | ||
- php-version: '8.3' | ||
dependencies: highest | ||
unstable: false | ||
- php-version: '8.4' | ||
dependencies: highest | ||
unstable: true | ||
composer-options: "--ignore-platform-req=php" | ||
|
||
steps: | ||
- uses: actions/checkout@v4 | ||
|
||
- name: Setup PHP | ||
uses: shivammathur/setup-php@v2 | ||
with: | ||
php-version: ${{ matrix.php-version }} | ||
extensions: mbstring, intl | ||
ini-values: zend.assertions=1 | ||
coverage: pcov | ||
|
||
- name: Composer install | ||
uses: ramsey/composer-install@v2 | ||
with: | ||
dependency-versions: ${{ matrix.dependencies }} | ||
composer-options: ${{ matrix.composer-options }} | ||
|
||
- name: Run PHPUnit | ||
run: | | ||
if [[ ${{ matrix.php-version }} == '8.1' && ${{ matrix.dependencies }} == 'highest' ]]; then | ||
export CODECOVERAGE=1 && vendor/bin/phpunit --display-deprecations --display-warnings --display-incomplete --display-skipped --coverage-clover=coverage.xml | ||
else | ||
vendor/bin/phpunit --display-deprecations --display-warnings | ||
fi | ||
- name: Code Coverage Report | ||
if: success() && matrix.php-version == '8.1' && matrix.dependencies == 'highest' | ||
uses: codecov/codecov-action@v3 | ||
|
||
cs-stan: | ||
uses: cakephp/.github/.github/workflows/[email protected] | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -736,13 +736,23 @@ public static function createFromArray(array $values): static | |
/** | ||
* Create an instance from a timestamp | ||
* | ||
* @param int $timestamp The timestamp to create an instance from. | ||
* @param int|float $timestamp The timestamp to create an instance from. | ||
Check warning on line 739 in src/Chronos.php GitHub Actions / cs-stan / Coding Standard & Static Analysis
|
||
* @param \DateTimeZone|string|null $timezone The DateTimeZone object or timezone name the new instance should use. | ||
* @return static | ||
*/ | ||
public static function createFromTimestamp(int $timestamp, DateTimeZone|string|null $timezone = null): static | ||
public static function createFromTimestamp(int|float $timestamp, DateTimeZone|string|null $timezone = null): static | ||
{ | ||
return static::now($timezone)->setTimestamp($timestamp); | ||
if (PHP_VERSION_ID >= 80400 && $timezone === null) { | ||
return parent::createFromTimestamp($timestamp); | ||
} | ||
|
||
$instance = static::now($timezone); | ||
|
||
if (is_int($timestamp)) { | ||
return $instance->setTimestamp($timestamp); | ||
} | ||
|
||
return $instance->modify('@' . $timestamp); | ||
} | ||
|
||
/** | ||
|