Skip to content

Commit 87a4f92

Browse files
authored
Merge pull request #2104 from magento-performance/MAGETWO-87675
[performance] MAGETWO-87675: FATAL error on compiler generation on PHP 7.0.11
2 parents c920a56 + 60602a1 commit 87a4f92

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
use Magento\Framework\Exception\LocalizedException;
1313
use Magento\Framework\Locale\ResolverInterface;
1414
use Magento\Framework\Phrase;
15-
use Magento\Framework\Stdlib\DateTime;
1615

1716
/**
1817
* Timezone library
@@ -42,7 +41,7 @@ class Timezone implements TimezoneInterface
4241
protected $_scopeResolver;
4342

4443
/**
45-
* @var DateTime
44+
* @var \Magento\Framework\Stdlib\DateTime
4645
*/
4746
protected $_dateTime;
4847

@@ -64,15 +63,15 @@ class Timezone implements TimezoneInterface
6463
/**
6564
* @param ScopeResolverInterface $scopeResolver
6665
* @param ResolverInterface $localeResolver
67-
* @param DateTime $dateTime
66+
* @param \Magento\Framework\Stdlib\DateTime $dateTime
6867
* @param ScopeConfigInterface $scopeConfig
6968
* @param string $scopeType
7069
* @param string $defaultTimezonePath
7170
*/
7271
public function __construct(
7372
ScopeResolverInterface $scopeResolver,
7473
ResolverInterface $localeResolver,
75-
DateTime $dateTime,
74+
\Magento\Framework\Stdlib\DateTime $dateTime,
7675
ScopeConfigInterface $scopeConfig,
7776
$scopeType,
7877
$defaultTimezonePath

0 commit comments

Comments
 (0)