Skip to content

Commit

Permalink
minor #210 Add missing entries to .gitattributes
Browse files Browse the repository at this point in the history
* Add missing entries to .gitattributes

* Fix ci
  • Loading branch information
VincentLanglet authored Mar 17, 2024
1 parent 69cb36a commit fb22413
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 11 deletions.
14 changes: 8 additions & 6 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
.github export-ignore
.gitattributes export-ignore
.gitignore export-ignore
.travis.yml export-ignore
phpunit.xml.dist export-ignore
tests export-ignore
.github export-ignore
.gitattributes export-ignore
.gitignore export-ignore
.travis.yml export-ignore
.php-cs-fixer.dist.php export-ignore
phpstan.neon export-ignore
phpunit.xml.dist export-ignore
tests export-ignore
10 changes: 5 additions & 5 deletions src/DateTimeFormatter.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ public function __construct(private TranslatorInterface $translator)
*/
public function formatDiff(
int|string|\DateTimeInterface $from,
int|string|\DateTimeInterface $to = null,
string $locale = null
int|string|\DateTimeInterface|null $to = null,
?string $locale = null
): string {
$from = self::formatDateTime($from);
$to = self::formatDateTime($to);
Expand Down Expand Up @@ -53,7 +53,7 @@ public function formatDiff(
*
* @source https://github.com/symfony/symfony/blob/ad72245261792c6b5d2db821fcbd141b11095215/src/Symfony/Component/Console/Helper/Helper.php#L97
*/
public function formatDuration(float $seconds, string $locale = null): string
public function formatDuration(float $seconds, ?string $locale = null): string
{
static $timeFormats = [
[0, 'duration.none'],
Expand Down Expand Up @@ -94,8 +94,8 @@ public function formatDuration(float $seconds, string $locale = null): string
*/
public function formatAge(
int|string|\DateTimeInterface $from,
int|string|\DateTimeInterface $to = null,
string $locale = null
int|string|\DateTimeInterface|null $to = null,
?string $locale = null
): string {
$from = self::formatDateTime($from);
$to = self::formatDateTime($to);
Expand Down

0 comments on commit fb22413

Please sign in to comment.