8000 Merge branch '6.4' into 7.0 · symfony/clock@1c680e5 · GitHub
[go: up one dir, main page]

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings
{"payload":{"commit":{"oid":"1c680e565dc0044d8ed3baeb57835fcacd9c6aed","url":"/symfony/clock/commit/1c680e565dc0044d8ed3baeb57835fcacd9c6aed","authoredDate":"2024-01-23T16:02:46.000+01:00","committedDate":"2024-01-23T16:02:46.000+01:00","shortMessage":null,"shortMessageMarkdown":"\u003cdiv\u003eMerge branch '6.4' into 7.0\u003c/div\u003e","shortMessageMarkdownLink":null,"bodyMessageHtml":"* 6.4:\n Fix implicitly-required parameters\n minor #53524 [Messenger] [AmazonSqs] Allow `async-aws/sqs` version 2 (smoench)\n Fix bad merge\n List CS fix in .git-blame-ignore-revs\n Fix implicitly-required parameters\n List CS fix in .git-blame-ignore-revs\n Apply php-cs-fixer fix --rules nullable_type_declaration_for_default_null_value\n [Messenger][AmazonSqs] Allow async-aws/sqs version 2","authors":[{"login":"nicolas-grekas","displayName":"Nicolas Grekas","avatarUrl":"https://avatars.githubusercontent.com/u/243674?v=4","path":"/nicolas-grekas","isGitHub":false}],"committerAttribution":false,"committer":{"login":"nicolas-grekas","displayName":"Nicolas Grekas","avatarUrl":"https://avatars.githubusercontent.com/u/243674?v=4","path":"/nicolas-grekas","isGitHub":false},"parents":["67c5ae749ebabe7d8c84c3cab2544331eee7d2cf","f48770105c544001da00b8d745873a628e0de198"],"globalRelayId":"C_kwDOHutE-doAKDFjNjgwZTU2NWRjMDA0NGQ4ZWQzYmFlYjU3ODM1ZmNhY2Q5YzZhZWQ","sha1":"67c5ae749ebabe7d8c84c3cab2544331eee7d2cf","sha2":"1c680e565dc0044d8ed3baeb57835fcacd9c6aed"},"currentUser":null,"repo":{"id":518735097,"defaultBranch":"7.3","name":"clock","ownerLogin":"symfony","currentUserCanPush":false,"isFork":false,"isEmpty":false,"createdAt":"2022-07-28T06:54:55.000Z","ownerAvatar":"https://avatars.githubusercontent.com/u/143937?v=4","public":true,"private":false,"isOrgOwned":true},"diffEntryData":[{"diffLines":[{"stylingDirective":null,"type":"HUNK","blobLineNumber":20,"text":"@@ -21,7 +21,7 @@ final class DatePoint extends \\DateTimeImmutable","html":"@@ -21,7 +21,7 @@ final class DatePoint extends \\DateTimeImmutable","displayNoNewLineWarning":false,"position":0,"left":20,"right":20},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":21,"text":" /**","html":" \u003cspan class=pl-c\u003e/**\u003c/span\u003e","displayNoNewLineWarning":false,"position":1,"left":21,"right":21},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":22,"text":" * @throws \\DateMalformedStringException When $datetime is invalid","html":" \u003cspan class=pl-c\u003e * @throws \\DateMalformedStringException When $datetime is invalid\u003c/span\u003e","displayNoNewLineWarning":false,"position":2,"left":22,"right":22},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":23,"text":" */","html":" \u003cspan class=pl-c\u003e */\u003c/span\u003e","displayNoNewLineWarning":false,"position":3,"left":23,"right":23},{"stylingDirective":null,"type":"DELETION","blobLineNumber":24,"text":"- public function __construct(string $datetime = 'now', \\DateTimeZone $timezone = null, parent $reference = null)","html":"- \u003cspan class=\"pl-k\"\u003epublic\u003c/span\u003e \u003cspan class=\"pl-k\"\u003efunction\u003c/span\u003e \u003cspan class=\"pl-en\"\u003e__construct\u003c/span\u003e(\u003cspan class=\"pl-smi\"\u003estring\u003c/span\u003e \u003cspan class=\"pl-s1\"\u003e\u003cspan class=\"pl-c1\"\u003e$\u003c/span\u003edatetime\u003c/span\u003e = \u003cspan class=\"pl-s\"\u003e'\u003cspan class=\"pl-s\"\u003enow\u003c/span\u003e'\u003c/span\u003e, \u003cspan class=\"pl-smi\"\u003e\\\u003cspan class=\"pl-smi\"\u003eDateTimeZone\u003c/span\u003e\u003c/span\u003e \u003cspan class=\"pl-s1\"\u003e\u003cspan class=\"pl-c1\"\u003e$\u003c/span\u003etimezone\u003c/span\u003e = \u003cspan class=\"pl-c1\"\u003enull\u003c/span\u003e, \u003cspan class=\"pl-smi\"\u003e\u003cspan class=\"pl-smi\"\u003eparent\u003c/span\u003e\u003c/span\u003e \u003cspan class=\"pl-s1\"\u003e\u003cspan class=\"pl-c1\"\u003e$\u003c/span\u003ereference\u003c/span\u003e = \u003cspan class=\"pl-c1\"\u003enull\u003c/span\u003e)","displayNoNewLineWarning":false,"position":4,"left":24,"right":23},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":24,"text":"+ public function __construct(string $datetime = 'now', ?\\DateTimeZone $timezone = null, ?parent $reference = null)","html":"+ \u003cspan class=\"pl-k\"\u003epublic\u003c/span\u003e \u003cspan class=\"pl-k\"\u003efunction\u003c/span\u003e \u003cspan class=\"pl-en\"\u003e__construct\u003c/span\u003e(\u003cspan class=\"pl-smi\"\u003estring\u003c/span\u003e \u003cspan class=\"pl-s1\"\u003e\u003cspan class=\"pl-c1\"\u003e$\u003c/span\u003edatetime\u003c/span\u003e = \u003cspan class=\"pl-s\"\u003e'\u003cspan class=\"pl-s\"\u003enow\u003c/span\u003e'\u003c/span\u003e, \u003cspan class=\"x x-first x-last\"\u003e?\u003c/span\u003e\u003cspan class=\"pl-smi\"\u003e\\\u003cspan class=\"pl-smi\"\u003eDateTimeZone\u003c/span\u003e\u003c/span\u003e \u003cspan class=\"pl-s1\"\u003e\u003cspan class=\"pl-c1\"\u003e$\u003c/span\u003etimezone\u003c/span\u003e = \u003cspan class=\"pl-c1\"\u003enull\u003c/span\u003e, \u003cspan class=\"x x-first x-last\"\u003e?\u003c/span\u003e\u003cspan class=\"pl-smi\"\u003e\u003cspan class=\"pl-smi\"\u003eparent\u003c/span\u003e\u003c/span\u003e \u003cspan class=\"pl-s1\"\u003e\u003cspan class=\"pl-c1\"\u003e$\u003c/span\u003ereference\u003c/span\u003e = \u003cspan class=\"pl-c1\"\u003enull\u003c/span\u003e)","displayNoNewLineWarning":false,"position":5,"left":24,"right":24},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":25,"text":" {","html":" {","displayNoNewLineWarning":false,"position":6,"left":25,"right":25},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":26,"text":" $now = $reference ?? Clock::get()-\u003enow();","html":" \u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003enow\u003c/span\u003e = \u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003ereference\u003c/span\u003e ?? Clock::\u003cspan class=pl-en\u003eget\u003c/span\u003e()-\u0026gt;\u003cspan class=pl-en\u003enow\u003c/span\u003e();","displayNoNewLineWarning":false,"position":7,"left":26,"right":26},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":27,"text":" ","html":"\u003cbr\u003e","displayNoNewLineWarning":false,"position":8,"left":27,"right":27},{"stylingDirective":null,"type":"HUNK","blobLineNumber":50,"text":"@@ -51,7 +51,7 @@ public function __construct(string $datetime = 'now', \\DateTimeZone $timezone =","html":"@@ -51,7 +51,7 @@ public function __construct(string $datetime = \u0026#39;now\u0026#39;, \\DateTimeZone $timezone =","displayNoNewLineWarning":false,"position":9,"left":50,"right":50},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":51,"text":" /**","html":" \u003cspan class=pl-c\u003e/**\u003c/span\u003e","displayNoNewLineWarning":false,"position":10,"left":51,"right":51},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":52,"text":" * @throws \\DateMalformedStringException When $format or $datetime are invalid","html":" \u003cspan class=pl-c\u003e * @throws \\DateMalformedStringException When $format or $datetime are invalid\u003c/span\u003e","displayNoNewLineWarning":false,"position":11,"left":52,"right":52},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":53,"text":" */","html":" \u003cspan class=pl-c\u003e */\u003c/span\u003e","displayNoNewLineWarning":false,"position":12,"left":53,"right":53},{"stylingDirective":null,"type":"DELETION","blobLineNumber":54,"text":"- public static function createFromFormat(string $format, string $datetime, \\DateTimeZone $timezone = null): static","html":"- \u003cspan class=\"pl-k\"\u003epublic\u003c/span\u003e \u003cspan class=\"pl-k\"\u003estatic\u003c/span\u003e \u003cspan class=\"pl-k\"\u003efunction\u003c/span\u003e \u003cspan class=\"pl-en\"\u003ecreateFromFormat\u003c/span\u003e(\u003cspan class=\"pl-smi\"\u003estring\u003c/span\u003e \u003cspan class=\"pl-s1\"\u003e\u003cspan class=\"pl-c1\"\u003e$\u003c/span\u003eformat\u003c/span\u003e, \u003cspan class=\"pl-smi\"\u003estring\u003c/span\u003e \u003cspan class=\"pl-s1\"\u003e\u003cspan class=\"pl-c1\"\u003e$\u003c/span\u003edatetime\u003c/span\u003e, \u003cspan class=\"pl-smi\"\u003e\\\u003cspan class=\"pl-smi\"\u003eDateTimeZone\u003c/span\u003e\u003c/span\u003e \u003cspan class=\"pl-s1\"\u003e\u003cspan class=\"pl-c1\"\u003e$\u003c/span\u003etimezone\u003c/span\u003e = \u003cspan class=\"pl-c1\"\u003enull\u003c/span\u003e): \u003cspan class=\"pl-smi\"\u003e\u003cspan class=\"pl-smi\"\u003estatic\u003c/span\u003e\u003c/span\u003e","displayNoNewLineWarning":false,"position":13,"left":54,"right":53},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":54,"text":"+ public static function createFromFormat(string $format, string $datetime, ?\\DateTimeZone $timezone = null): static","html":"+ \u003cspan class=\"pl-k\"\u003epublic\u003c/span\u003e \u003cspan class=\"pl-k\"\u003estatic\u003c/span\u003e \u003cspan class=\"pl-k\"\u003efunction\u003c/span\u003e \u003cspan class=\"pl-en\"\u003ecreateFromFormat\u003c/span\u003e(\u003cspan class=\"pl-smi\"\u003estring\u003c/span\u003e \u003cspan class=\"pl-s1\"\u003e\u003cspan class=\"pl-c1\"\u003e$\u003c/span\u003eformat\u003c/span\u003e, \u003cspan class=\"pl-smi\"\u003estring\u003c/span\u003e \u003cspan class=\"pl-s1\"\u003e\u003cspan class=\"pl-c1\"\u003e$\u003c/span\u003edatetime\u003c/span\u003e, \u003cspan class=\"x x-first x-last\"\u003e?\u003c/span\u003e\u003cspan class=\"pl-smi\"\u003e\\\u003cspan class=\"pl-smi\"\u003eDateTimeZone\u003c/span\u003e\u003c/span\u003e \u003cspan class=\"pl-s1\"\u003e\u003cspan class=\"pl-c1\"\u003e$\u003c/span\u003etimezone\u003c/span\u003e = \u003cspan class=\"pl-c1\"\u003enull\u003c/span\u003e): \u003cspan class=\"pl-smi\"\u003e\u003cspan class=\"pl-smi\"\u003estatic\u003c/span\u003e\u003c/span\u003e","displayNoNewLineWarning":false,"position":14,"left":54,"right":54},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":55,"text":" {","html":" {","displayNoNewLineWarning":false,"position":15,"left":55,"right":55},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":56,"text":" return parent::createFromFormat($format, $datetime, $timezone) ?: throw new \\DateMalformedStringException(static::getLastErrors()['errors'][0] ?? 'Invalid date string or format.');","html":" \u003cspan class=pl-k\u003ereturn\u003c/span\u003e \u003cspan class=pl-smi\u003eparent\u003c/span\u003e::\u003cspan class=pl-en\u003ecreateFromFormat\u003c/span\u003e(\u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003eformat\u003c/span\u003e, \u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003edatetime\u003c/span\u003e, \u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003etimezone\u003c/span\u003e) ?: \u003cspan class=pl-k\u003ethrow\u003c/span\u003e \u003cspan class=pl-k\u003enew\u003c/span\u003e \\\u003cspan class=pl-v\u003eDateMalformedStringException\u003c/span\u003e(\u003cspan class=pl-smi\u003estatic\u003c/span\u003e::\u003cspan class=pl-en\u003egetLastErrors\u003c/span\u003e()[\u003cspan class=pl-s\u003e\u0026#39;\u003cspan class=pl-s\u003eerrors\u003c/span\u003e\u0026#39;\u003c/span\u003e][\u003cspan class=pl-c1\u003e0\u003c/span\u003e] ?? \u003cspan class=pl-s\u003e\u0026#39;\u003cspan class=pl-s\u003eInvalid date string or format.\u003c/span\u003e\u0026#39;\u003c/span\u003e);","displayNoNewLineWarning":false,"position":16,"left":56,"right":56},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":57,"text":" }","html":" }","displayNoNewLineWarning":false,"position":17,"left":57,"right":57}],"diffNumber":0,"diffSize":"0 Bytes","isBinary":false,"isTooBig":false,"collapsed":false,"isSubmodule":false,"lineCount":120,"linesChanged":4,"newTreeEntry":{"lineCount":120,"path":"DatePoint.php","mode":100644,"isGenerated":false},"oldTreeEntry":{"lineCount":0,"path":"DatePoint.php","mode":100644},"linesAdded":2,"linesDeleted":2,"path":"DatePoint.php","pathDigest":"61e1d00b8d549d2801dab1b5082e87fef54f7e343504f3f65e56ebd81a728fe8","status":"MODIFIED","truncatedReason":null,"oldOid":"67c5ae749ebabe7d8c84c3cab2544331eee7d2cf","newOid":"1c680e565dc0044d8ed3baeb57835fcacd9c6aed","copilotChatReference":null,"deletedSha":"67c5ae749ebabe7d8c84c3cab2544331eee7d2cf","canToggleRichDiff":false,"defaultToRichDiff":false,"proseDifffHtml":null,"renderInfo":null,"dependencyDiffPath":null,"submodule":null},{"diffLines":[{"stylingDirective":null,"type":"HUNK","blobLineNumber":25,"text":"@@ -26,7 +26,7 @@ final class MockClock implements ClockInterface","html":"@@ -26,7 +26,7 @@ final class MockClock implements ClockInterface","displayNoNewLineWarning":false,"position":0,"left":25,"right":25},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":26,"text":" * @throws \\DateMalformedStringException When $now is invalid","html":" \u003cspan class=pl-c\u003e * @throws \\DateMalformedStringException When $now is invalid\u003c/span\u003e","displayNoNewLineWarning":false,"position":1,"left":26,"right":26},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":27,"text":" * @throws \\DateInvalidTimeZoneException When $timezone is invalid","html":" \u003cspan class=pl-c\u003e * @throws \\DateInvalidTimeZoneException When $timezone is invalid\u003c/span\u003e","displayNoNewLineWarning":false,"position":2,"left":27,"right":27},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":28,"text":" */","html":" \u003cspan class=pl-c\u003e */\u003c/span\u003e","displayNoNewLineWarning":false,"position":3,"left":28,"right":28},{"stylingDirective":null,"type":"DELETION","blobLineNumber":29,"text":"- public function __construct(\\DateTimeImmutable|string $now = 'now', \\DateTimeZone|string $timezone = null)","html":"- \u003cspan class=\"pl-k\"\u003epublic\u003c/span\u003e \u003cspan class=\"pl-k\"\u003efunction\u003c/span\u003e \u003cspan class=\"pl-en\"\u003e__construct\u003c/span\u003e(\u003cspan class=\"pl-smi\"\u003e\\\u003cspan class=\"pl-smi\"\u003eDateTimeImmutable\u003c/span\u003e\u003c/span\u003e|\u003cspan class=\"pl-smi\"\u003estring\u003c/span\u003e \u003cspan class=\"pl-s1\"\u003e\u003cspan class=\"pl-c1\"\u003e$\u003c/span\u003enow\u003c/span\u003e = \u003cspan class=\"pl-s\"\u003e'\u003cspan class=\"pl-s\"\u003enow\u003c/span\u003e'\u003c/span\u003e, \u003cspan class=\"pl-smi\"\u003e\\\u003cspan class=\"pl-smi\"\u003eDateTimeZone\u003c/span\u003e\u003c/span\u003e|\u003cspan class=\"pl-smi\"\u003estring\u003c/span\u003e \u003cspan class=\"pl-s1\"\u003e\u003cspan class=\"pl-c1\"\u003e$\u003c/span\u003etimezone\u003c/span\u003e = \u003cspan class=\"pl-c1\"\u003enull\u003c/span\u003e)","displayNoNewLineWarning":false,"position":4,"left":29,"right":28},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":29,"text":"+ public function __construct(\\DateTimeImmutable|string $now = 'now', \\DateTimeZone|string|null $timezone = null)","html":"+ \u003cspan class=\"pl-k\"\u003epublic\u003c/span\u003e \u003cspan class=\"pl-k\"\u003efunction\u003c/span\u003e \u003cspan class=\"pl-en\"\u003e__construct\u003c/span\u003e(\u003cspan class=\"pl-smi\"\u003e\\\u003cspan class=\"pl-smi\"\u003eDateTimeImmutable\u003c/span\u003e\u003c/span\u003e|\u003cspan class=\"pl-smi\"\u003estring\u003c/span\u003e \u003cspan class=\"pl-s1\"\u003e\u003cspan class=\"pl-c1\"\u003e$\u003c/span\u003enow\u003c/span\u003e = \u003cspan class=\"pl-s\"\u003e'\u003cspan class=\"pl-s\"\u003enow\u003c/span\u003e'\u003c/span\u003e, \u003cspan class=\"pl-smi\"\u003e\\\u003cspan class=\"pl-smi\"\u003eDateTimeZone\u003c/span\u003e\u003c/span\u003e|\u003cspan class=\"pl-smi\"\u003estring\u003c/span\u003e\u003cspan class=\"x x-first\"\u003e|\u003c/span\u003e\u003cspan class=\"pl-smi x x-last\"\u003enull\u003c/span\u003e \u003cspan class=\"pl-s1\"\u003e\u003cspan class=\"pl-c1\"\u003e$\u003c/span\u003etimezone\u003c/span\u003e = \u003cspan class=\"pl-c1\"\u003enull\u003c/span\u003e)","displayNoNewLineWarning":false,"position":5,"left":29,"right":29},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":30,"text":" {","html":" {","displayNoNewLineWarning":false,"position":6,"left":30,"right":30},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":31,"text":" if (\\PHP_VERSION_ID \u003e= 80300 \u0026\u0026 \\is_string($timezone)) {","html":" \u003cspan class=pl-k\u003eif\u003c/span\u003e (\\\u003cspan class=pl-c1\u003ePHP_VERSION_ID\u003c/span\u003e \u0026gt;= \u003cspan class=pl-c1\u003e80300\u003c/span\u003e \u0026amp;\u0026amp; \u003cspan class=pl-en\u003e\\is_string\u003c/span\u003e(\u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003etimezone\u003c/span\u003e)) {","displayNoNewLineWarning":false,"position":7,"left":31,"right":31},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":32,"text":" $timezone = new \\DateTimeZone($timezone);","html":" \u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003etimezone\u003c/span\u003e = \u003cspan class=pl-k\u003enew\u003c/span\u003e \\\u003cspan class=pl-v\u003eDateTimeZone\u003c/span\u003e(\u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003etimezone\u003c/span\u003e);","displayNoNewLineWarning":false,"position":8,"left":32,"right":32}],"diffNumber":1,"diffSize":"0 Bytes","isBinary":false,"isTooBig":false,"collapsed":false,"isSubmodule":false,"lineCount":98,"linesChanged":2,"newTreeEntry":{"lineCount":98,"path":"MockClock.php","mode":100644,"isGenerated":false},"oldTreeEntry":{"lineCount":0,"path":"MockClock.php","mode":100644},"linesAdded":1,"linesDeleted":1,"path":"MockClock.php","pathDigest":"c2bf8793122a67acfc416e941af071b2352c54569fcd02f40509cabd002c1d12","status":"MODIFIED","truncatedReason":null,"oldOid":"67c5ae749ebabe7d8c84c3cab2544331eee7d2cf","newOid":"1c680e565dc0044d8ed3baeb57835fcacd9c6aed","copilotChatReference":null,"deletedSha":"67c5ae749ebabe7d8c84c3cab2544331eee7d2cf","canToggleRichDiff":false,"defaultToRichDiff":false,"proseDifffHtml":null,"renderInfo":null,"dependencyDiffPath":null,"submodule":null},{"diffLines":[{"stylingDirective":null,"type":"HUNK","blobLineNumber":24,"text":"@@ -25,7 +25,7 @@ final class MonotonicClock implements ClockInterface","html":"@@ -25,7 +25,7 @@ final class MonotonicClock implements ClockInterface","displayNoNewLineWarning":false,"position":0,"left":24,"right":24},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":25,"text":" /**","html":" \u003cspan class=pl-c\u003e/**\u003c/span\u003e","displayNoNewLineWarning":false,"position":1,"left":25,"right":25},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":26,"text":" * @throws \\DateInvalidTimeZoneException When $timezone is invalid","html":" \u003cspan class=pl-c\u003e * @throws \\DateInvalidTimeZoneException When $timezone is invalid\u003c/span\u003e","displayNoNewLineWarning":false,"position":2,"left":26,"right":26},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":27,"text":" */","html":" \u003cspan class=pl-c\u003e */\u003c/span\u003e","displayNoNewLineWarning":false,"position":3,"left":27,"right":27},{"stylingDirective":null,"type":"DELETION","blobLineNumber":28,"text":"- public function __construct(\\DateTimeZone|string $timezone = null)","html":"- \u003cspan class=\"pl-k\"\u003epublic\u003c/span\u003e \u003cspan class=\"pl-k\"\u003efunction\u003c/span\u003e \u003cspan class=\"pl-en\"\u003e__construct\u003c/span\u003e(\u003cspan class=\"pl-smi\"\u003e\\\u003cspan class=\"pl-smi\"\u003eDateTimeZone\u003c/span\u003e\u003c/span\u003e|\u003cspan class=\"pl-smi\"\u003estring\u003c/span\u003e \u003cspan class=\"pl-s1\"\u003e\u003cspan class=\"pl-c1\"\u003e$\u003c/span\u003etimezone\u003c/span\u003e = \u003cspan class=\"pl-c1\"\u003enull\u003c/span\u003e)","displayNoNewLineWarning":false,"position":4,"left":28,"right":27},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":28,"text":"+ public function __construct(\\DateTimeZone|string|null $timezone = null)","html":"+ \u003cspan class=\"pl-k\"\u003epublic\u003c/span\u003e \u003cspan class=\"pl-k\"\u003efunction\u003c/span\u003e \u003cspan class=\"pl-en\"\u003e__construct\u003c/span\u003e(\u003cspan class=\"pl-smi\"\u003e\\\u003cspan class=\"pl-smi\"\u003eDateTimeZone\u003c/span\u003e\u003c/span\u003e|\u003cspan class=\"pl-smi\"\u003estring\u003c/span\u003e\u003cspan class=\"x x-first\"\u003e|\u003c/span\u003e\u003cspan class=\"pl-smi x x-last\"\u003enull\u003c/span\u003e \u003cspan class=\"pl-s1\"\u003e\u003cspan class=\"pl-c1\"\u003e$\u003c/span\u003etimezone\u003c/span\u003e = \u003cspan class=\"pl-c1\"\u003enull\u003c/span\u003e)","displayNoNewLineWarning":false,"position":5,"left":28,"right":28},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":29,"text":" {","html":" {","displayNoNewLineWarning":false,"position":6,"left":29,"right":29},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":30,"text":" if (false === $offset = hrtime()) {","html":" \u003cspan class=pl-k\u003eif\u003c/span\u003e (\u003cspan class=pl-c1\u003efalse\u003c/span\u003e === \u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003eoffset\u003c/span\u003e = \u003cspan class=pl-en\u003ehrtime\u003c/span\u003e()) {","displayNoNewLineWarning":false,"position":7,"left":30,"right":30},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":31,"text":" throw new \\RuntimeException('hrtime() returned false: the runtime environment does not provide access to a monotonic timer.');","html":" \u003cspan class=pl-k\u003ethrow\u003c/span\u003e \u003cspan class=pl-k\u003enew\u003c/span\u003e \\\u003cspan class=pl-v\u003eRuntimeException\u003c/span\u003e(\u003cspan class=pl-s\u003e\u0026#39;\u003cspan class=pl-s\u003ehrtime() returned false: the runtime environment does not provide access to a monotonic timer.\u003c/span\u003e\u0026#39;\u003c/span\u003e);","displayNoNewLineWarning":false,"position":8,"left":31,"right":31}],"diffNumber":2,"diffSize":"0 Bytes","isBinary":false,"isTooBig":false,"collapsed":false,"isSubmodule":false,"lineCount":93,"linesChanged":2,"newTreeEntry":{"lineCount":93,"path":"MonotonicClock.php","mode":100644,"isGenerated":false},"oldTreeEntry":{"lineCount":0,"path":"MonotonicClock.php","mode":100644},"linesAdded":1,"linesDeleted":1,"path":"MonotonicClock.php","pathDigest":"43a6d3621a0f1b9e3441a6768e7c8f69e89988790e6699e528b88e85d0114a0c","status":"MODIFIED","truncatedReason":null,"oldOid":"67c5ae749ebabe7d8c84c3cab2544331eee7d2cf","newOid":"1c680e565dc0044d8ed3baeb57835fcacd9c6aed","copilotChatReference":null,"deletedSha":"67c5ae749ebabe7d8c84c3cab2544331eee7d2cf","canToggleRichDiff":false,"defaultToRichDiff":false,"proseDifffHtml":null,"renderInfo":null,"dependencyDiffPath":null,"submodule":null},{"diffLines":[{"stylingDirective":null,"type":"HUNK","blobLineNumber":22,"text":"@@ -23,7 +23,7 @@ final class NativeClock implements ClockInterface","html":"@@ -23,7 +23,7 @@ final class NativeClock implements ClockInterface","displayNoNewLineWarning":false,"position":0,"left":22,"right":22},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":23,"text":" /**","html":" \u003cspan class=pl-c\u003e/**\u003c/span\u003e","displayNoNewLineWarning":false,"position":1,"left":23,"right":23},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":24,"text":" * @throws \\DateInvalidTimeZoneException When $timezone is invalid","html":" \u003cspan class=pl-c\u003e * @throws \\DateInvalidTimeZoneException When $timezone is invalid\u003c/span\u003e","displayNoNewLineWarning":false,"position":2,"left":24,"right":24},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":25,"text":" */","html":" \u003cspan class=pl-c\u003e */\u003c/span\u003e","displayNoNewLineWarning":false,"position":3,"left":25,"right":25},{"stylingDirective":null,"type":"DELETION","blobLineNumber":26,"text":"- public function __construct(\\DateTimeZone|string $timezone = null)","html":"- \u003cspan class=\"pl-k\"\u003epublic\u003c/span\u003e \u003cspan class=\"pl-k\"\u003efunction\u003c/span\u003e \u003cspan class=\"pl-en\"\u003e__construct\u003c/span\u003e(\u003cspan class=\"pl-smi\"\u003e\\\u003cspan class=\"pl-smi\"\u003eDateTimeZone\u003c/span\u003e\u003c/span\u003e|\u003cspan class=\"pl-smi\"\u003estring\u003c/span\u003e \u003cspan class=\"pl-s1\"\u003e\u003cspan class=\"pl-c1\"\u003e$\u003c/span\u003etimezone\u003c/span\u003e = \u003cspan class=\"pl-c1\"\u003enull\u003c/span\u003e)","displayNoNewLineWarning":false,"position":4,"left":26,"right":25},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":26,"text":"+ public function __construct(\\DateTimeZone|string|null $timezone = null)","html":"+ \u003cspan class=\"pl-k\"\u003epublic\u003c/span\u003e \u003cspan class=\"pl-k\"\u003efunction\u003c/span\u003e \u003cspan class=\"pl-en\"\u003e__construct\u003c/span\u003e(\u003cspan class=\"pl-smi\"\u003e\\\u003cspan class=\"pl-smi\"\u003eDateTimeZone\u003c/span\u003e\u003c/span\u003e|\u003cspan class=\"pl-smi\"\u003estring\u003c/span\u003e\u003cspan class=\"x x-first\"\u003e|\u003c/span\u003e\u003cspan class=\"pl-smi x x-last\"\u003enull\u003c/span\u003e \u003cspan class=\"pl-s1\"\u003e\u003cspan class=\"pl-c1\"\u003e$\u003c/span\u003etimezone\u003c/span\u003e = \u003cspan class=\"pl-c1\"\u003enull\u003c/span\u003e)","displayNoNewLineWarning":false,"position":5,"left":26,"right":26},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":27,"text":" {","html":" {","displayNoNewLineWarning":false,"position":6,"left":27,"right":27},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":28,"text":" $this-\u003etimezone = \\is_string($timezone ??= date_default_timezone_get()) ? $this-\u003ewithTimeZone($timezone)-\u003etimezone : $timezone;","html":" \u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003e\u003cspan class=pl-smi\u003ethis\u003c/span\u003e\u003c/span\u003e-\u0026gt;\u003cspan class=pl-c1\u003etimezone\u003c/span\u003e = \u003cspan class=pl-en\u003e\\is_string\u003c/span\u003e(\u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003etimezone\u003c/span\u003e ??= \u003cspan class=pl-en\u003edate_default_timezone_get\u003c/span\u003e()) ? \u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003e\u003cspan class=pl-smi\u003ethis\u003c/span\u003e\u003c/span\u003e-\u0026gt;\u003cspan class=pl-en\u003ewithTimeZone\u003c/span\u003e(\u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003etimezone\u003c/span\u003e)-\u0026gt;\u003cspan class=pl-c1\u003etimezone\u003c/span\u003e : \u003cspan class=pl-s1\u003e\u003cspan class=pl-c1\u003e$\u003c/span\u003etimezone\u003c/span\u003e;","displayNoNewLineWarning":false,"position":7,"left":28,"right":28},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":29,"text":" }","html":" }","displayNoNewLineWarning":false,"position":8,"left":29,"right":29}],"diffNumber":3,"diffSize":"0 Bytes","isBinary":false,"isTooBig":false,"collapsed":false,"isSubmodule":false,"lineCount":67,"linesChanged":2,"newTreeEntry":{"lineCount":67,"path":"NativeClock.php","mode":100644,"isGenerated":false},"oldTreeEntry":{"lineCount":0,"path":"NativeClock.php","mode":100644},"linesAdded":1,"linesDeleted":1,"path":"NativeClock.php","pathDigest":"ea4812722519b853eb1f3a85c4b4849c7411d93da57cc55ff4e9873bcb654425","status":"MODIFIED","truncatedReason":null,"oldOid":"67c5ae749ebabe7d8c84c3cab2544331eee7d2cf","newOid":"1c680e565dc0044d8ed3baeb57835fcacd9c6aed","copilotChatReference":null,"deletedSha":"67c5ae749ebabe7d8c84c3cab2544331eee7d2cf","canToggleRichDiff":false,"defaultToRichDiff":false,"proseDifffHtml":null,"renderInfo":null,"dependencyDiffPath":null,"submodule":null}],"splitViewPreference":"unified","ignoreWhitespace":false,"commentsPreference":"visible","diffLineSpacingPreference":"relaxed","useMonospaceFont":false,"pasteUrlLinkAsPlainText":false,"userNotices":[],"path":"/symfony/clock/commit/1c680e565dc0044d8ed3baeb57835fcacd9c6aed","fileTreeExpanded":true,"headerInfo":{"additions":5,"deletions":5,"filesChanged":4,"filesChangedString":"4"},"moreDiffsToLoad":false,"asyncDiffLoadInfo":{"startIndex":4,"truncated":false,"byteCount":2623,"lineShownCount":45},"commentInfo":{"canComment":false,"locked":false,"canLock":false,"repoArchived":false},"csrf_tokens":{"/users/diffview?diff=split":{"post":"UVx_mAAtqCc5qp4-Ml2zOyQX9EuYCcOKs_zKy61dBNw3gx_p5ZDfPj9fAyvYEnfmQiLi0StXCISj8oTfJ_0TwA"},"/users/diffview?diff=unified":{"post":"g-NdL9nUOiIeOBxTz6cMi5hhq-VvdECWHvzYRaDcTA7lPD1ePGlNOxjNgUYl6MhW_lS9f9wqi5gO8pZRKnxbEg"},"/notifications/thread":{"post":"R0M6yWNaOzZ7yShcARvbuf-tBv2R0EVL_6tNPqztuaAHMR2FrwEz1Js-1-878cpO0J7SE-qhnEpUqVcbGltVQA"}}},"title":"Merge branch '6.4' into 7.0 · symfony/clock@1c680e5","appPayload":{"helpUrl":"https://docs.github.com","findInDiffWorkerPath":"/assets-cdn/worker/find-in-diff-worker-6dcb06aa9fad.js","enabled_features":{"diff_ux_refresh_beta":false,"diff_inline_comments":true,"diff_ux_refresh_ssr_five":false,"diff_ux_refresh_ssr_ten":false}}}

Commit 1c680e5

Browse files
Merge branch '6.4' into 7.0
* 6.4: Fix implicitly-required parameters minor #53524 [Messenger] [AmazonSqs] Allow `async-aws/sqs` version 2 (smoench) Fix bad merge List CS fix in .git-blame-ignore-revs Fix implicitly-required parameters List CS fix in .git-blame-ignore-revs Apply php-cs-fixer fix --rules nullable_type_declaration_for_default_null_value [Messenger][AmazonSqs] Allow async-aws/sqs version 2
2 parents 67c5ae7 + f487701 commit 1c680e5

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

DatePoint.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ final class DatePoint extends \DateTimeImmutable
2121
/**
2222
* @throws \DateMalformedStringException When $datetime is invalid
2323
*/
24-
public function __construct(string $datetime = 'now', \DateTimeZone $timezone = null, parent $reference = null)
24+
public function __construct(string $datetime = 'now', ?\DateTimeZone $timezone = null, ?parent $reference = null)
2525
{
2626
$now = $reference ?? Clock::get()->now();
2727

@@ -51,7 +51,7 @@ public function __construct(string $datetime = 'now', \DateTimeZone $timezone =
5151
/**
5252
* @throws \DateMalformedStringException When $format or $datetime are invalid
5353
*/
54-
public static function createFromFormat(string $format, string $datetime, \DateTimeZone $timezone = null): static
54+
public static function createFromFormat(string $format, string $datetime, ?\DateTimeZone $timezone = null): static
5555
{
5656
return parent::createFromFormat($format, $datetime, $timezone) ?: throw new \DateMalformedStringException(static::getLastErrors()['errors'][0] ?? 'Invalid date string or format.');
5757
}

MockClock.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ final class MockClock implements ClockInterface
2626
* @throws \DateMalformedStringException When $now is invalid
2727
* @throws \DateInvalidTimeZoneException When $timezone is invalid
2828
*/
29-
public function __construct(\DateTimeImmutable|string $now = 'now', \DateTimeZone|string $timezone = null)
29+
public function __construct(\DateTimeImmutable|string $now = 'now', \DateTimeZone|string|null $timezone = null)
3030
{
3131
if (\PHP_VERSION_ID >= 80300 && \is_string($timezone)) {
3232
$timezone = new \DateTimeZone($timezone);

MonotonicClock.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ final class MonotonicClock implements ClockInterface
2525
/**
2626
* @throws \DateInvalidTimeZoneException When $timezone is invalid
2727
*/
28-
public function __construct(\DateTimeZone|string $timezone = null)
28+
public function __construct(\DateTimeZone|string|null $timezone = null)
2929
{
3030
if (false === $offset = hrtime()) {
3131
throw new \RuntimeException('hrtime() returned false: the runtime environment does not provide access to a monotonic timer.');

NativeClock.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ final class NativeClock implements ClockInterface
2323
/**
2424
* @throws \DateInvalidTimeZoneException When $timezone is invalid
2525
*/
26-
public function __construct(\DateTimeZone|string $timezone = null)
26+
public function __construct(\DateTimeZone|string|null $timezone = null)
2727
{
2828
$this->timezone = \is_string($timezone ??= date_default_timezone_get()) ? $this->withTimeZone($timezone)->timezone : $timezone;
2929
}

0 commit comments

Comments
 (0)
0