Skip to content

Commit 787755d

Browse files
sivaschenkosivaschenko
committed
Merge branch 'develop' of https://github.corp.ebay.com/magento-firedrakes/magento2ce into codefreeze
2 parents 5e4be3b + 59f1a97 commit 787755d

File tree

462 files changed

+2068
-1811
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

462 files changed

+2068
-1811
lines changed

‎app/code/Magento/AdminNotification/Model/Resource/System/Message/Collection.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
2222

2323
/**
2424
* @param \Magento\Core\Model\EntityFactory $entityFactory
25-
* @param \Magento\Framework\Logger $logger
25+
* @param \Psr\Log\LoggerInterface $logger
2626
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
2727
* @param \Magento\Framework\Event\ManagerInterface $eventManager
2828
* @param \Magento\Framework\Notification\MessageList $messageList
@@ -31,7 +31,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
3131
*/
3232
public function __construct(
3333
\Magento\Core\Model\EntityFactory $entityFactory,
34-
\Magento\Framework\Logger $logger,
34+
\Psr\Log\LoggerInterface $logger,
3535
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
3636
\Magento\Framework\Event\ManagerInterface $eventManager,
3737
\Magento\Framework\Notification\MessageList $messageList,

‎app/code/Magento/Authorization/Model/Acl/AclRetriever.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
use Magento\Framework\Acl\Builder as AclBuilder;
1313
use Magento\Framework\Exception\AuthorizationException;
1414
use Magento\Framework\Exception\LocalizedException;
15-
use Magento\Framework\Logger;
15+
use Psr\Log\LoggerInterface as Logger;
1616

1717
/**
1818
* Permission tree retriever
@@ -79,7 +79,7 @@ public function getAllowedResourcesByUser($userType, $userId)
7979
} catch (AuthorizationException $e) {
8080
throw $e;
8181
} catch (\Exception $e) {
82-
$this->logger->logException($e);
82+
$this->logger->critical($e);
8383
throw new LocalizedException(
8484
'Error happened while getting a list of allowed resources. Check exception log for details.'
8585
);

‎app/code/Magento/Authorization/Model/Resource/Rules.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,21 @@ class Rules extends \Magento\Framework\Model\Resource\Db\AbstractDb
2929
protected $_aclBuilder;
3030

3131
/**
32-
* @var \Magento\Framework\Logger
32+
* @var \Psr\Log\LoggerInterface
3333
*/
3434
protected $_logger;
3535

3636
/**
3737
* @param \Magento\Framework\App\Resource $resource
3838
* @param \Magento\Framework\Acl\Builder $aclBuilder
39-
* @param \Magento\Framework\Logger $logger
39+
* @param \Psr\Log\LoggerInterface $logger
4040
* @param \Magento\Framework\Acl\RootResource $rootResource
4141
* @param \Magento\Framework\Acl\CacheInterface $aclCache
4242
*/
4343
public function __construct(
4444
\Magento\Framework\App\Resource $resource,
4545
\Magento\Framework\Acl\Builder $aclBuilder,
46-
\Magento\Framework\Logger $logger,
46+
\Psr\Log\LoggerInterface $logger,
4747
\Magento\Framework\Acl\RootResource $rootResource,
4848
\Magento\Framework\Acl\CacheInterface $aclCache
4949
) {
@@ -116,7 +116,7 @@ public function saveRel(\Magento\Authorization\Model\Rules $rule)
116116
throw $e;
117117
} catch (\Exception $e) {
118118
$adapter->rollBack();
119-
$this->_logger->logException($e);
119+
$this->_logger->critical($e);
120120
}
121121
}
122122
}

‎app/code/Magento/Backend/Block/Context.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class Context extends \Magento\Framework\View\Element\Context
3232
* @param \Magento\Framework\View\Asset\Repository $assetRepo
3333
* @param \Magento\Framework\View\ConfigInterface $viewConfig
3434
* @param \Magento\Framework\App\Cache\StateInterface $cacheState
35-
* @param \Magento\Framework\Logger $logger
35+
* @param \Psr\Log\LoggerInterface $logger
3636
* @param \Magento\Framework\Escaper $escaper
3737
* @param \Magento\Framework\Filter\FilterManager $filterManager
3838
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
@@ -55,7 +55,7 @@ public function __construct(
5555
\Magento\Framework\View\Asset\Repository $assetRepo,
5656
\Magento\Framework\View\ConfigInterface $viewConfig,
5757
\Magento\Framework\App\Cache\StateInterface $cacheState,
58-
\Magento\Framework\Logger $logger,
58+
\Psr\Log\LoggerInterface $logger,
5959
\Magento\Framework\Escaper $escaper,
6060
\Magento\Framework\Filter\FilterManager $filterManager,
6161
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,

‎app/code/Magento/Backend/Block/Template/Context.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class Context extends \Magento\Framework\View\Element\Template\Context
5656
* @param \Magento\Framework\View\Asset\Repository $assetRepo
5757
* @param \Magento\Framework\View\ConfigInterface $viewConfig
5858
* @param \Magento\Framework\App\Cache\StateInterface $cacheState
59-
* @param \Magento\Framework\Logger $logger
59+
* @param \Psr\Log\LoggerInterface $logger
6060
* @param \Magento\Framework\Escaper $escaper
6161
* @param \Magento\Framework\Filter\FilterManager $filterManager
6262
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
@@ -89,7 +89,7 @@ public function __construct(
8989
\Magento\Framework\View\Asset\Repository $assetRepo,
9090
\Magento\Framework\View\ConfigInterface $viewConfig,
9191
\Magento\Framework\App\Cache\StateInterface $cacheState,
92-
\Magento\Framework\Logger $logger,
92+
\Psr\Log\LoggerInterface $logger,
9393
\Magento\Framework\Escaper $escaper,
9494
\Magento\Framework\Filter\FilterManager $filterManager,
9595
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,

‎app/code/Magento/Backend/Block/Widget/Context.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class Context extends \Magento\Backend\Block\Template\Context
3939
* @param \Magento\Framework\View\Asset\Repository $assetRepo
4040
* @param \Magento\Framework\View\ConfigInterface $viewConfig
4141
* @param \Magento\Framework\App\Cache\StateInterface $cacheState
42-
* @param \Magento\Framework\Logger $logger
42+
* @param \Psr\Log\LoggerInterface $logger
4343
* @param \Magento\Framework\Escaper $escaper
4444
* @param \Magento\Framework\Filter\FilterManager $filterManager
4545
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
@@ -74,7 +74,7 @@ public function __construct(
7474
\Magento\Framework\View\Asset\Repository $assetRepo,
7575
\Magento\Framework\View\ConfigInterface $viewConfig,
7676
\Magento\Framework\App\Cache\StateInterface $cacheState,
77-
\Magento\Framework\Logger $logger,
77+
\Psr\Log\LoggerInterface $logger,
7878
\Magento\Framework\Escaper $escaper,
7979
\Magento\Framework\Filter\FilterManager $filterManager,
8080
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,

‎app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Date.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ protected function _getFormat()
4545
\Magento\Framework\Stdlib\DateTime\TimezoneInterface::FORMAT_TYPE_MEDIUM
4646
);
4747
} catch (\Exception $e) {
48-
$this->_logger->logException($e);
48+
$this->_logger->critical($e);
4949
}
5050
}
5151
$format = self::$_format;

‎app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Datetime.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ protected function _getFormat()
3232
\Magento\Framework\Stdlib\DateTime\TimezoneInterface::FORMAT_TYPE_MEDIUM
3333
);
3434
} catch (\Exception $e) {
35-
$this->_logger->logException($e);
35+
$this->_logger->critical($e);
3636
}
3737
}
3838
$format = self::$_format;

‎app/code/Magento/Backend/Controller/Adminhtml/Dashboard/Tunnel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public function execute()
6868
->setContents($response->getBody());
6969
return $resultRaw;
7070
} catch (\Exception $e) {
71-
$this->_objectManager->get('Magento\Framework\Logger')->logException($e);
71+
$this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
7272
$error = __('see error log for details');
7373
$httpCode = 503;
7474
}

‎app/code/Magento/Backend/Controller/Adminhtml/System/Config/System/Storage/Status.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ public function execute()
7979
) && $flagData['timeout_reached'])
8080
) {
8181
$this->_objectManager->get(
82-
'Magento\Framework\Logger'
83-
)->logException(
82+
'Psr\Log\LoggerInterface'
83+
)->critical(
8484
new \Magento\Framework\Exception(
8585
__('The timeout limit for response from synchronize process was reached.')
8686
)

‎app/code/Magento/Backend/Controller/Adminhtml/System/Config/System/Storage/Synchronize.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public function execute()
4343
try {
4444
$this->_getSyncSingleton()->synchronize($storage);
4545
} catch (\Exception $e) {
46-
$this->_objectManager->get('Magento\Framework\Logger')->logException($e);
46+
$this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
4747
$flag->passError($e);
4848
}
4949

‎app/code/Magento/Backend/Model/Menu.php

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@
99
*/
1010
class Menu extends \ArrayObject
1111
{
12-
/**
13-
* Name of special logger key for debugging building menu
14-
*/
15-
const LOGGER_KEY = 'menu-debug';
16-
1712
/**
1813
* Path in tree structure
1914
*
@@ -22,15 +17,15 @@ class Menu extends \ArrayObject
2217
protected $_path = '';
2318

2419
/**
25-
* @var \Magento\Framework\Logger
20+
* @var \Psr\Log\LoggerInterface
2621
*/
2722
protected $_logger;
2823

2924
/**
30-
* @param \Magento\Framework\Logger $logger
25+
* @param \Psr\Log\LoggerInterface $logger
3126
* @param string $pathInMenuStructure
3227
*/
33-
public function __construct(\Magento\Framework\Logger $logger, $pathInMenuStructure = '')
28+
public function __construct(\Psr\Log\LoggerInterface $logger, $pathInMenuStructure = '')
3429
{
3530
if ($pathInMenuStructure) {
3631
$this->_path = $pathInMenuStructure . '/';
@@ -60,9 +55,8 @@ public function add(\Magento\Backend\Model\Menu\Item $item, $parentId = null, $i
6055
$index = intval($index);
6156
if (!isset($this[$index])) {
6257
$this->offsetSet($index, $item);
63-
$this->_logger->logDebug(
64-
sprintf('Add of item with id %s was processed', $item->getId()),
65-
self::LOGGER_KEY
58+
$this->_logger->info(
59+
sprintf('Add of item with id %s was processed', $item->getId())
6660
);
6761
} else {
6862
$this->add($item, $parentId, $index + 1);
@@ -126,9 +120,8 @@ public function remove($itemId)
126120
if ($item->getId() == $itemId) {
127121
unset($this[$key]);
128122
$result = true;
129-
$this->_logger->logDebug(
130-
sprintf('Remove on item with id %s was processed', $item->getId()),
131-
self::LOGGER_KEY
123+
$this->_logger->info(
124+
sprintf('Remove on item with id %s was processed', $item->getId())
132125
);
133126
break;
134127
}

‎app/code/Magento/Backend/Model/Menu/AbstractDirector.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ public function __construct(\Magento\Backend\Model\Menu\Builder\CommandFactory $
2525
*
2626
* @param array $config
2727
* @param \Magento\Backend\Model\Menu\Builder $builder
28-
* @param \Magento\Framework\Logger $logger
28+
* @param \Psr\Log\LoggerInterface $logger
2929
* @return void
3030
*/
3131
abstract public function direct(
3232
array $config,
3333
\Magento\Backend\Model\Menu\Builder $builder,
34-
\Magento\Framework\Logger $logger
34+
\Psr\Log\LoggerInterface $logger
3535
);
3636
}

‎app/code/Magento/Backend/Model/Menu/Config.php

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class Config
3333
protected $_menu;
3434

3535
/**
36-
* @var \Magento\Framework\Logger
36+
* @var \Psr\Log\LoggerInterface
3737
*/
3838
protected $_logger;
3939

@@ -64,7 +64,7 @@ class Config
6464
* @param \Magento\Backend\Model\Menu\Config\Reader $configReader
6565
* @param \Magento\Framework\App\Cache\Type\Config $configCacheType
6666
* @param \Magento\Framework\Event\ManagerInterface $eventManager
67-
* @param \Magento\Framework\Logger $logger
67+
* @param \Psr\Log\LoggerInterface $logger
6868
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
6969
* @param \Magento\Framework\App\State $appState
7070
*/
@@ -75,7 +75,7 @@ public function __construct(
7575
\Magento\Backend\Model\Menu\Config\Reader $configReader,
7676
\Magento\Framework\App\Cache\Type\Config $configCacheType,
7777
\Magento\Framework\Event\ManagerInterface $eventManager,
78-
\Magento\Framework\Logger $logger,
78+
\Psr\Log\LoggerInterface $logger,
7979
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
8080
\Magento\Framework\App\State $appState
8181
) {
@@ -101,21 +101,17 @@ public function __construct(
101101
*/
102102
public function getMenu()
103103
{
104-
if ($this->_scopeConfig->getValue('dev/log/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)) {
105-
$this->_logger->addStreamLog(\Magento\Backend\Model\Menu::LOGGER_KEY);
106-
}
107-
108104
try {
109105
$this->_initMenu();
110106
return $this->_menu;
111107
} catch (\InvalidArgumentException $e) {
112-
$this->_logger->logException($e);
108+
$this->_logger->critical($e);
113109
throw $e;
114110
} catch (\BadMethodCallException $e) {
115-
$this->_logger->logException($e);
111+
$this->_logger->critical($e);
116112
throw $e;
117113
} catch (\OutOfRangeException $e) {
118-
$this->_logger->logException($e);
114+
$this->_logger->critical($e);
119115
throw $e;
120116
} catch (\Exception $e) {
121117
throw $e;

‎app/code/Magento/Backend/Model/Menu/Director/Director.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,15 @@ class Director extends \Magento\Backend\Model\Menu\AbstractDirector
1717
* Get command object
1818
*
1919
* @param array $data command params
20-
* @param \Magento\Framework\Logger $logger
20+
* @param \Psr\Log\LoggerInterface $logger
2121
* @return \Magento\Backend\Model\Menu\Builder\AbstractCommand
2222
*/
2323
protected function _getCommand($data, $logger)
2424
{
2525
$command = $this->_commandFactory->create($data['type'], ['data' => $data]);
2626
if (isset($this->_messagePatterns[$data['type']])) {
27-
$logger->logDebug(
28-
sprintf($this->_messagePatterns[$data['type']], $command->getId()),
29-
\Magento\Backend\Model\Menu::LOGGER_KEY
27+
$logger->info(
28+
sprintf($this->_messagePatterns[$data['type']], $command->getId())
3029
);
3130
}
3231
return $command;
@@ -37,10 +36,10 @@ protected function _getCommand($data, $logger)
3736
*
3837
* @param array $config
3938
* @param \Magento\Backend\Model\Menu\Builder $builder
40-
* @param \Magento\Framework\Logger $logger
39+
* @param \Psr\Log\LoggerInterface $logger
4140
* @return void
4241
*/
43-
public function direct(array $config, \Magento\Backend\Model\Menu\Builder $builder, \Magento\Framework\Logger $logger)
42+
public function direct(array $config, \Magento\Backend\Model\Menu\Builder $builder, \Psr\Log\LoggerInterface $logger)
4443
{
4544
foreach ($config as $data) {
4645
$builder->processCommand($this->_getCommand($data, $logger));

‎app/code/Magento/Backend/etc/adminhtml/system.xml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -193,23 +193,6 @@
193193
<comment>Translate, blocks and other output caches should be disabled for both frontend and admin inline translations.</comment>
194194
</field>
195195
</group>
196-
<group id="log" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
197-
<label>Log Settings</label>
198-
<field id="active" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
199-
<label>Enabled</label>
200-
<source_model>Magento\Backend\Model\Config\Source\Yesno</source_model>
201-
</field>
202-
<field id="file" translate="label comment" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
203-
<label>System Log File Name</label>
204-
<backend_model>Magento\Backend\Model\Config\Backend\Filename</backend_model>
205-
<comment>Logging from \Magento\Framework\Logger. File is located in {{base_dir}}/var/log</comment>
206-
</field>
207-
<field id="exception_file" translate="label comment" type="text" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1">
208-
<label>Exceptions Log File Name</label>
209-
<backend_model>Magento\Backend\Model\Config\Backend\Filename</backend_model>
210-
<comment>Logging from \Magento\Framework\Logger. File is located in {{base_dir}}/var/log</comment>
211-
</field>
212-
</group>
213196
<group id="js" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
214197
<label>JavaScript Settings</label>
215198
<field id="merge_files" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">

‎app/code/Magento/Backend/i18n/de_DE.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ Developer,Developer
504504
"Translate, blocks and other output caches should be disabled for both frontend and admin inline translations.","Translate, blocks and other output caches should be disabled for both frontend and admin inline translations."
505505
"Log Settings","Log Settings"
506506
"System Log File Name","System Log File Name"
507-
"Logging from \Magento\Framework\Logger. File is located in {{base_dir}}/var/log","Logging from \Magento\Framework\Logger. File is located in {{base_dir}}/var/log"
507+
"Logging from \Psr\Log\LoggerInterface. File is located in {{base_dir}}/var/log","Logging from \Psr\Log\LoggerInterface. File is located in {{base_dir}}/var/log"
508508
"Exceptions Log File Name","Exceptions Log File Name"
509509
"JavaScript Settings","JavaScript Settings"
510510
"Merge JavaScript Files","Merge JavaScript Files"

‎app/code/Magento/Backend/i18n/en_US.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ Developer,Developer
504504
"Translate, blocks and other output caches should be disabled for both frontend and admin inline translations.","Translate, blocks and other output caches should be disabled for both frontend and admin inline translations."
505505
"Log Settings","Log Settings"
506506
"System Log File Name","System Log File Name"
507-
"Logging from \Magento\Framework\Logger. File is located in {{base_dir}}/var/log","Logging from \Magento\Framework\Logger. File is located in {{base_dir}}/var/log"
507+
"Logging from \Psr\Log\LoggerInterface. File is located in {{base_dir}}/var/log","Logging from \Psr\Log\LoggerInterface. File is located in {{base_dir}}/var/log"
508508
"Exceptions Log File Name","Exceptions Log File Name"
509509
"JavaScript Settings","JavaScript Settings"
510510
"Merge JavaScript Files","Merge JavaScript Files"

‎app/code/Magento/Backend/i18n/es_ES.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ Developer,Developer
504504
"Translate, blocks and other output caches should be disabled for both frontend and admin inline translations.","Translate, blocks and other output caches should be disabled for both frontend and admin inline translations."
505505
"Log Settings","Log Settings"
506506
"System Log File Name","System Log File Name"
507-
"Logging from \Magento\Framework\Logger. File is located in {{base_dir}}/var/log","Logging from \Magento\Framework\Logger. File is located in {{base_dir}}/var/log"
507+
"Logging from \Psr\Log\LoggerInterface. File is located in {{base_dir}}/var/log","Logging from \Psr\Log\LoggerInterface. File is located in {{base_dir}}/var/log"
508508
"Exceptions Log File Name","Exceptions Log File Name"
509509
"JavaScript Settings","JavaScript Settings"
510510
"Merge JavaScript Files","Merge JavaScript Files"

‎app/code/Magento/Backend/i18n/fr_FR.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ Developer,Developer
504504
"Translate, blocks and other output caches should be disabled for both frontend and admin inline translations.","Translate, blocks and other output caches should be disabled for both frontend and admin inline translations."
505505
"Log Settings","Log Settings"
506506
"System Log File Name","System Log File Name"
507-
"Logging from \Magento\Framework\Logger. File is located in {{base_dir}}/var/log","Logging from \Magento\Framework\Logger. File is located in {{base_dir}}/var/log"
507+
"Logging from \Psr\Log\LoggerInterface. File is located in {{base_dir}}/var/log","Logging from \Psr\Log\LoggerInterface. File is located in {{base_dir}}/var/log"
508508
"Exceptions Log File Name","Exceptions Log File Name"
509509
"JavaScript Settings","JavaScript Settings"
510510
"Merge JavaScript Files","Merge JavaScript Files"

0 commit comments

Comments
 (0)