Skip to content

Commit 6ff15f6

Browse files
authored
Merge pull request #15 from vgelani/2.3-develop-PR-port-15602
[Forwardport] set correct annotation
2 parents 4ac0fc0 + 2feaf30 commit 6ff15f6

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,8 +260,8 @@ public function isScopeDateInInterval($scope, $dateFrom = null, $dateTo = null)
260260
* @param string|\DateTimeInterface $date
261261
* @param int $dateType
262262
* @param int $timeType
263-
* @param null $locale
264-
* @param null $timezone
263+
* @param string|null $locale
264+
* @param string|null $timezone
265265
* @param string|null $pattern
266266
* @return string
267267
*/

lib/internal/Magento/Framework/Stdlib/DateTime/TimezoneInterface.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ public function isScopeDateInInterval($scope, $dateFrom = null, $dateTo = null);
124124
* @param string|\DateTimeInterface $date
125125
* @param int $dateType
126126
* @param int $timeType
127-
* @param null $locale
128-
* @param null $timezone
127+
* @param string|null $locale
128+
* @param string|null $timezone
129129
* @param string|null $pattern
130130
* @return string
131131
*/

0 commit comments

Comments
 (0)