Commit 612f4a30 authored by Anton Smirnov's avatar Anton Smirnov
Browse files

Merge branch '1.x' 

# Conflicts:
#	src/Helpers/DateTimeHelper.php
parents 9e4f5962 520ce38c

docs/index.rst

+3 −3
Original line number Diff line number Diff line 
Clock

#####



|Packagist| |GitLab| |GitHub| |Bitbucket| |Gitea|

|Packagist| |GitLab| |GitHub| |Codeberg| |Gitea|



A collection of clock abstraction classes for PSR-20_.
@@ -54,7 +54,7 @@ The library is available as open source under the terms of the `MIT License`_. 
   :target:     https://github.com/arokettu/php-clock

.. |GitLab|     image:: https://img.shields.io/badge/get%20on-GitLab-informational.svg?style=flat-square&logo=gitlab

   :target:     https://gitlab.com/sandfox/php-clock

.. |Bitbucket|  image:: https://img.shields.io/badge/get%20on-Bitbucket-informational.svg?style=flat-square&logo=bitbucket

   :target:     https://bitbucket.org/sandfox/php-clock

.. |Codeberg|   image:: https://img.shields.io/badge/get%20on-Codeberg-informational.svg?style=flat-square&logo=codeberg

   :target:     https://codeberg.org/sandfox/php-clock

.. |Gitea|      image:: https://img.shields.io/badge/get%20on-Gitea-informational.svg?style=flat-square&logo=gitea

   :target:     https://sandfox.org/sandfox/php-clock

src/Helpers/CreateFromFactories.php

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ trait CreateFromFactories 


    public static function fromTimestamp(int|float $timestamp, DateTimeZone|null $timeZone = null): self

    {

        if (\method_exists(DateTimeImmutable::class, 'createFromTimestamp')) {

        if (PHP_VERSION_ID >= 80400) {

            // coverage is generated by PHP 8.2 where this method is not yet available

            // @codeCoverageIgnoreStart

            $dt = DateTimeImmutable::createFromTimestamp($timestamp);

README.md

+1 −1

File changed.

Contains only whitespace changes.