diff --git a/app/code/Magento/AdminNotification/Model/Resource/System/Message/Collection.php b/app/code/Magento/AdminNotification/Model/Resource/System/Message/Collection.php
index 230934526fbeda2cee4ff28447e809c5f76bdb73..ff450f7379266ac453299d12136b0617aabf26fc 100644
--- a/app/code/Magento/AdminNotification/Model/Resource/System/Message/Collection.php
+++ b/app/code/Magento/AdminNotification/Model/Resource/System/Message/Collection.php
@@ -22,7 +22,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Framework\Notification\MessageList $messageList
@@ -31,7 +31,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Framework\Notification\MessageList $messageList,
diff --git a/app/code/Magento/Authorization/Model/Acl/AclRetriever.php b/app/code/Magento/Authorization/Model/Acl/AclRetriever.php
index 3837a7babb2f375b5a418b8c2fd324ce6bc5377c..bbe4491d5cf8fe8c6fa5e51e9986e9838ddeb0d8 100644
--- a/app/code/Magento/Authorization/Model/Acl/AclRetriever.php
+++ b/app/code/Magento/Authorization/Model/Acl/AclRetriever.php
@@ -12,7 +12,7 @@ use Magento\Authorization\Model\UserContextInterface;
use Magento\Framework\Acl\Builder as AclBuilder;
use Magento\Framework\Exception\AuthorizationException;
use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Logger;
+use Psr\Log\LoggerInterface as Logger;
/**
* Permission tree retriever
@@ -79,7 +79,7 @@ class AclRetriever
} catch (AuthorizationException $e) {
throw $e;
} catch (\Exception $e) {
- $this->logger->logException($e);
+ $this->logger->critical($e);
throw new LocalizedException(
'Error happened while getting a list of allowed resources. Check exception log for details.'
);
diff --git a/app/code/Magento/Authorization/Model/Resource/Rules.php b/app/code/Magento/Authorization/Model/Resource/Rules.php
index e367b05e2cfb0122d80dc6693d56b2180ca9aed3..d1f16dbe54a44fe18d71d6cb440f3a89b06469ac 100644
--- a/app/code/Magento/Authorization/Model/Resource/Rules.php
+++ b/app/code/Magento/Authorization/Model/Resource/Rules.php
@@ -29,21 +29,21 @@ class Rules extends \Magento\Framework\Model\Resource\Db\AbstractDb
protected $_aclBuilder;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $_logger;
/**
* @param \Magento\Framework\App\Resource $resource
* @param \Magento\Framework\Acl\Builder $aclBuilder
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Acl\RootResource $rootResource
* @param \Magento\Framework\Acl\CacheInterface $aclCache
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
\Magento\Framework\Acl\Builder $aclBuilder,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Acl\RootResource $rootResource,
\Magento\Framework\Acl\CacheInterface $aclCache
) {
@@ -116,7 +116,7 @@ class Rules extends \Magento\Framework\Model\Resource\Db\AbstractDb
throw $e;
} catch (\Exception $e) {
$adapter->rollBack();
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
}
}
}
diff --git a/app/code/Magento/Backend/Block/Context.php b/app/code/Magento/Backend/Block/Context.php
index 4e7548cde61e93852f3420d1f4472ef694525c66..988a0d22efd5834d255facbaaa49b22f15ae069c 100644
--- a/app/code/Magento/Backend/Block/Context.php
+++ b/app/code/Magento/Backend/Block/Context.php
@@ -32,7 +32,7 @@ class Context extends \Magento\Framework\View\Element\Context
* @param \Magento\Framework\View\Asset\Repository $assetRepo
* @param \Magento\Framework\View\ConfigInterface $viewConfig
* @param \Magento\Framework\App\Cache\StateInterface $cacheState
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Escaper $escaper
* @param \Magento\Framework\Filter\FilterManager $filterManager
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
@@ -55,7 +55,7 @@ class Context extends \Magento\Framework\View\Element\Context
\Magento\Framework\View\Asset\Repository $assetRepo,
\Magento\Framework\View\ConfigInterface $viewConfig,
\Magento\Framework\App\Cache\StateInterface $cacheState,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Escaper $escaper,
\Magento\Framework\Filter\FilterManager $filterManager,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
diff --git a/app/code/Magento/Backend/Block/Template/Context.php b/app/code/Magento/Backend/Block/Template/Context.php
index 16e3bc65b5ace03f9df9c4202e435f47ec415840..b16288e76d23260d4858414930377074e99d5929 100644
--- a/app/code/Magento/Backend/Block/Template/Context.php
+++ b/app/code/Magento/Backend/Block/Template/Context.php
@@ -56,7 +56,7 @@ class Context extends \Magento\Framework\View\Element\Template\Context
* @param \Magento\Framework\View\Asset\Repository $assetRepo
* @param \Magento\Framework\View\ConfigInterface $viewConfig
* @param \Magento\Framework\App\Cache\StateInterface $cacheState
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Escaper $escaper
* @param \Magento\Framework\Filter\FilterManager $filterManager
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
@@ -89,7 +89,7 @@ class Context extends \Magento\Framework\View\Element\Template\Context
\Magento\Framework\View\Asset\Repository $assetRepo,
\Magento\Framework\View\ConfigInterface $viewConfig,
\Magento\Framework\App\Cache\StateInterface $cacheState,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Escaper $escaper,
\Magento\Framework\Filter\FilterManager $filterManager,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
diff --git a/app/code/Magento/Backend/Block/Widget/Context.php b/app/code/Magento/Backend/Block/Widget/Context.php
index 7fd088cb03e0e9fa4a99883cd5277f8708b38b3d..549f433d313ec6faed1103ce2c92a87d2414f62c 100644
--- a/app/code/Magento/Backend/Block/Widget/Context.php
+++ b/app/code/Magento/Backend/Block/Widget/Context.php
@@ -39,7 +39,7 @@ class Context extends \Magento\Backend\Block\Template\Context
* @param \Magento\Framework\View\Asset\Repository $assetRepo
* @param \Magento\Framework\View\ConfigInterface $viewConfig
* @param \Magento\Framework\App\Cache\StateInterface $cacheState
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Escaper $escaper
* @param \Magento\Framework\Filter\FilterManager $filterManager
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
@@ -74,7 +74,7 @@ class Context extends \Magento\Backend\Block\Template\Context
\Magento\Framework\View\Asset\Repository $assetRepo,
\Magento\Framework\View\ConfigInterface $viewConfig,
\Magento\Framework\App\Cache\StateInterface $cacheState,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Escaper $escaper,
\Magento\Framework\Filter\FilterManager $filterManager,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Date.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Date.php
index f2b3b0381aa89e9647822da5d0ccd1e7fd7f07a1..f9524ada7933e530f668c23f6ffcb667c41f6276 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Date.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Date.php
@@ -45,7 +45,7 @@ class Date extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRe
\Magento\Framework\Stdlib\DateTime\TimezoneInterface::FORMAT_TYPE_MEDIUM
);
} catch (\Exception $e) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
}
}
$format = self::$_format;
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Datetime.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Datetime.php
index 3ac62cee213c872769e703bc664a9bdabc649eb9..8b6e3f124258df18fe22aad82112be3e0d1d6d06 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Datetime.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Datetime.php
@@ -32,7 +32,7 @@ class Datetime extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstra
\Magento\Framework\Stdlib\DateTime\TimezoneInterface::FORMAT_TYPE_MEDIUM
);
} catch (\Exception $e) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
}
}
$format = self::$_format;
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/Tunnel.php b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/Tunnel.php
index 5a2785e0e74f98972d2ee859ca8775b59b67b628..94752f8e1e4ed20dcc93721a507e9e3c80bdd0f3 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/Tunnel.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/Tunnel.php
@@ -68,7 +68,7 @@ class Tunnel extends \Magento\Backend\Controller\Adminhtml\Dashboard
->setContents($response->getBody());
return $resultRaw;
} catch (\Exception $e) {
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$error = __('see error log for details');
$httpCode = 503;
}
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Config/System/Storage/Status.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Config/System/Storage/Status.php
index f3133d990c93cfcc0717ad436030a3f8b004c78b..fa14e28e5c50ece20078464fae5f3b9160571b49 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Config/System/Storage/Status.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Config/System/Storage/Status.php
@@ -79,8 +79,8 @@ class Status extends \Magento\Backend\Controller\Adminhtml\System\Config\System\
) && $flagData['timeout_reached'])
) {
$this->_objectManager->get(
- 'Magento\Framework\Logger'
- )->logException(
+ 'Psr\Log\LoggerInterface'
+ )->critical(
new \Magento\Framework\Exception(
__('The timeout limit for response from synchronize process was reached.')
)
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Config/System/Storage/Synchronize.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Config/System/Storage/Synchronize.php
index b2b6c0fff5e5d33149b9a91c8b5296ed486c38a9..f7f1615bf25930afff0cda3e48f448b4bc20934b 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Config/System/Storage/Synchronize.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Config/System/Storage/Synchronize.php
@@ -43,7 +43,7 @@ class Synchronize extends \Magento\Backend\Controller\Adminhtml\System\Config\Sy
try {
$this->_getSyncSingleton()->synchronize($storage);
} catch (\Exception $e) {
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$flag->passError($e);
}
diff --git a/app/code/Magento/Backend/Model/Menu.php b/app/code/Magento/Backend/Model/Menu.php
index f70c0b698268be380c08c10d90d8c203d5006ad0..79fd68d8edb748d562e303e84cac0a13f49890b1 100644
--- a/app/code/Magento/Backend/Model/Menu.php
+++ b/app/code/Magento/Backend/Model/Menu.php
@@ -9,11 +9,6 @@ namespace Magento\Backend\Model;
*/
class Menu extends \ArrayObject
{
- /**
- * Name of special logger key for debugging building menu
- */
- const LOGGER_KEY = 'menu-debug';
-
/**
* Path in tree structure
*
@@ -22,15 +17,15 @@ class Menu extends \ArrayObject
protected $_path = '';
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $_logger;
/**
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param string $pathInMenuStructure
*/
- public function __construct(\Magento\Framework\Logger $logger, $pathInMenuStructure = '')
+ public function __construct(\Psr\Log\LoggerInterface $logger, $pathInMenuStructure = '')
{
if ($pathInMenuStructure) {
$this->_path = $pathInMenuStructure . '/';
@@ -60,9 +55,8 @@ class Menu extends \ArrayObject
$index = intval($index);
if (!isset($this[$index])) {
$this->offsetSet($index, $item);
- $this->_logger->logDebug(
- sprintf('Add of item with id %s was processed', $item->getId()),
- self::LOGGER_KEY
+ $this->_logger->info(
+ sprintf('Add of item with id %s was processed', $item->getId())
);
} else {
$this->add($item, $parentId, $index + 1);
@@ -126,9 +120,8 @@ class Menu extends \ArrayObject
if ($item->getId() == $itemId) {
unset($this[$key]);
$result = true;
- $this->_logger->logDebug(
- sprintf('Remove on item with id %s was processed', $item->getId()),
- self::LOGGER_KEY
+ $this->_logger->info(
+ sprintf('Remove on item with id %s was processed', $item->getId())
);
break;
}
diff --git a/app/code/Magento/Backend/Model/Menu/AbstractDirector.php b/app/code/Magento/Backend/Model/Menu/AbstractDirector.php
index f00a30085e076ea3e7eaf00a33f0a3debab49a3e..fa434a36aa8f40faae405461ac5d824dd05f93eb 100644
--- a/app/code/Magento/Backend/Model/Menu/AbstractDirector.php
+++ b/app/code/Magento/Backend/Model/Menu/AbstractDirector.php
@@ -25,12 +25,12 @@ abstract class AbstractDirector
*
* @param array $config
* @param \Magento\Backend\Model\Menu\Builder $builder
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @return void
*/
abstract public function direct(
array $config,
\Magento\Backend\Model\Menu\Builder $builder,
- \Magento\Framework\Logger $logger
+ \Psr\Log\LoggerInterface $logger
);
}
diff --git a/app/code/Magento/Backend/Model/Menu/Config.php b/app/code/Magento/Backend/Model/Menu/Config.php
index 0a023244a00a26b9dcc95001c8cded7dde77f212..19f9c2526a713f52182c179b593d560fdaa661e6 100644
--- a/app/code/Magento/Backend/Model/Menu/Config.php
+++ b/app/code/Magento/Backend/Model/Menu/Config.php
@@ -33,7 +33,7 @@ class Config
protected $_menu;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $_logger;
@@ -64,7 +64,7 @@ class Config
* @param \Magento\Backend\Model\Menu\Config\Reader $configReader
* @param \Magento\Framework\App\Cache\Type\Config $configCacheType
* @param \Magento\Framework\Event\ManagerInterface $eventManager
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Framework\App\State $appState
*/
@@ -75,7 +75,7 @@ class Config
\Magento\Backend\Model\Menu\Config\Reader $configReader,
\Magento\Framework\App\Cache\Type\Config $configCacheType,
\Magento\Framework\Event\ManagerInterface $eventManager,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Framework\App\State $appState
) {
@@ -101,21 +101,17 @@ class Config
*/
public function getMenu()
{
- if ($this->_scopeConfig->getValue('dev/log/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)) {
- $this->_logger->addStreamLog(\Magento\Backend\Model\Menu::LOGGER_KEY);
- }
-
try {
$this->_initMenu();
return $this->_menu;
} catch (\InvalidArgumentException $e) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
throw $e;
} catch (\BadMethodCallException $e) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
throw $e;
} catch (\OutOfRangeException $e) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
throw $e;
} catch (\Exception $e) {
throw $e;
diff --git a/app/code/Magento/Backend/Model/Menu/Director/Director.php b/app/code/Magento/Backend/Model/Menu/Director/Director.php
index dc1854a5ddf0ab4ce76734dcf1eaf233499c5278..0d77330ecb0c501159def7be2ab3eb403d265cde 100644
--- a/app/code/Magento/Backend/Model/Menu/Director/Director.php
+++ b/app/code/Magento/Backend/Model/Menu/Director/Director.php
@@ -17,16 +17,15 @@ class Director extends \Magento\Backend\Model\Menu\AbstractDirector
* Get command object
*
* @param array $data command params
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @return \Magento\Backend\Model\Menu\Builder\AbstractCommand
*/
protected function _getCommand($data, $logger)
{
$command = $this->_commandFactory->create($data['type'], ['data' => $data]);
if (isset($this->_messagePatterns[$data['type']])) {
- $logger->logDebug(
- sprintf($this->_messagePatterns[$data['type']], $command->getId()),
- \Magento\Backend\Model\Menu::LOGGER_KEY
+ $logger->info(
+ sprintf($this->_messagePatterns[$data['type']], $command->getId())
);
}
return $command;
@@ -37,10 +36,10 @@ class Director extends \Magento\Backend\Model\Menu\AbstractDirector
*
* @param array $config
* @param \Magento\Backend\Model\Menu\Builder $builder
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @return void
*/
- public function direct(array $config, \Magento\Backend\Model\Menu\Builder $builder, \Magento\Framework\Logger $logger)
+ public function direct(array $config, \Magento\Backend\Model\Menu\Builder $builder, \Psr\Log\LoggerInterface $logger)
{
foreach ($config as $data) {
$builder->processCommand($this->_getCommand($data, $logger));
diff --git a/app/code/Magento/Backend/etc/adminhtml/system.xml b/app/code/Magento/Backend/etc/adminhtml/system.xml
index 46b73ca4621c457d523053720a5777210fb95c19..888b0855bb97285f88a55527c05950bc75aa0321 100644
--- a/app/code/Magento/Backend/etc/adminhtml/system.xml
+++ b/app/code/Magento/Backend/etc/adminhtml/system.xml
@@ -193,23 +193,6 @@
<comment>Translate, blocks and other output caches should be disabled for both frontend and admin inline translations.</comment>
</field>
</group>
- <group id="log" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
- <label>Log Settings</label>
- <field id="active" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
- <label>Enabled</label>
- <source_model>Magento\Backend\Model\Config\Source\Yesno</source_model>
- </field>
- <field id="file" translate="label comment" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
- <label>System Log File Name</label>
- <backend_model>Magento\Backend\Model\Config\Backend\Filename</backend_model>
- <comment>Logging from \Magento\Framework\Logger. File is located in {{base_dir}}/var/log</comment>
- </field>
- <field id="exception_file" translate="label comment" type="text" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1">
- <label>Exceptions Log File Name</label>
- <backend_model>Magento\Backend\Model\Config\Backend\Filename</backend_model>
- <comment>Logging from \Magento\Framework\Logger. File is located in {{base_dir}}/var/log</comment>
- </field>
- </group>
<group id="js" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
<label>JavaScript Settings</label>
<field id="merge_files" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/app/code/Magento/Backend/i18n/de_DE.csv b/app/code/Magento/Backend/i18n/de_DE.csv
index 7a956dbcdcfac8a2a273978a7de9d18777128b48..9e12e495d09b79041066b3d27581470edcc2c62c 100644
--- a/app/code/Magento/Backend/i18n/de_DE.csv
+++ b/app/code/Magento/Backend/i18n/de_DE.csv
@@ -504,7 +504,7 @@ Developer,Developer
"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."
"Log Settings","Log Settings"
"System Log File Name","System Log File Name"
-"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"
+"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"
"Exceptions Log File Name","Exceptions Log File Name"
"JavaScript Settings","JavaScript Settings"
"Merge JavaScript Files","Merge JavaScript Files"
diff --git a/app/code/Magento/Backend/i18n/en_US.csv b/app/code/Magento/Backend/i18n/en_US.csv
index 7a956dbcdcfac8a2a273978a7de9d18777128b48..9e12e495d09b79041066b3d27581470edcc2c62c 100644
--- a/app/code/Magento/Backend/i18n/en_US.csv
+++ b/app/code/Magento/Backend/i18n/en_US.csv
@@ -504,7 +504,7 @@ Developer,Developer
"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."
"Log Settings","Log Settings"
"System Log File Name","System Log File Name"
-"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"
+"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"
"Exceptions Log File Name","Exceptions Log File Name"
"JavaScript Settings","JavaScript Settings"
"Merge JavaScript Files","Merge JavaScript Files"
diff --git a/app/code/Magento/Backend/i18n/es_ES.csv b/app/code/Magento/Backend/i18n/es_ES.csv
index 7a956dbcdcfac8a2a273978a7de9d18777128b48..9e12e495d09b79041066b3d27581470edcc2c62c 100644
--- a/app/code/Magento/Backend/i18n/es_ES.csv
+++ b/app/code/Magento/Backend/i18n/es_ES.csv
@@ -504,7 +504,7 @@ Developer,Developer
"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."
"Log Settings","Log Settings"
"System Log File Name","System Log File Name"
-"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"
+"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"
"Exceptions Log File Name","Exceptions Log File Name"
"JavaScript Settings","JavaScript Settings"
"Merge JavaScript Files","Merge JavaScript Files"
diff --git a/app/code/Magento/Backend/i18n/fr_FR.csv b/app/code/Magento/Backend/i18n/fr_FR.csv
index 7a956dbcdcfac8a2a273978a7de9d18777128b48..9e12e495d09b79041066b3d27581470edcc2c62c 100644
--- a/app/code/Magento/Backend/i18n/fr_FR.csv
+++ b/app/code/Magento/Backend/i18n/fr_FR.csv
@@ -504,7 +504,7 @@ Developer,Developer
"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."
"Log Settings","Log Settings"
"System Log File Name","System Log File Name"
-"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"
+"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"
"Exceptions Log File Name","Exceptions Log File Name"
"JavaScript Settings","JavaScript Settings"
"Merge JavaScript Files","Merge JavaScript Files"
diff --git a/app/code/Magento/Backend/i18n/nl_NL.csv b/app/code/Magento/Backend/i18n/nl_NL.csv
index 7a956dbcdcfac8a2a273978a7de9d18777128b48..9e12e495d09b79041066b3d27581470edcc2c62c 100644
--- a/app/code/Magento/Backend/i18n/nl_NL.csv
+++ b/app/code/Magento/Backend/i18n/nl_NL.csv
@@ -504,7 +504,7 @@ Developer,Developer
"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."
"Log Settings","Log Settings"
"System Log File Name","System Log File Name"
-"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"
+"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"
"Exceptions Log File Name","Exceptions Log File Name"
"JavaScript Settings","JavaScript Settings"
"Merge JavaScript Files","Merge JavaScript Files"
diff --git a/app/code/Magento/Backend/i18n/pt_BR.csv b/app/code/Magento/Backend/i18n/pt_BR.csv
index 7a956dbcdcfac8a2a273978a7de9d18777128b48..9e12e495d09b79041066b3d27581470edcc2c62c 100644
--- a/app/code/Magento/Backend/i18n/pt_BR.csv
+++ b/app/code/Magento/Backend/i18n/pt_BR.csv
@@ -504,7 +504,7 @@ Developer,Developer
"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."
"Log Settings","Log Settings"
"System Log File Name","System Log File Name"
-"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"
+"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"
"Exceptions Log File Name","Exceptions Log File Name"
"JavaScript Settings","JavaScript Settings"
"Merge JavaScript Files","Merge JavaScript Files"
diff --git a/app/code/Magento/Backend/i18n/zh_CN.csv b/app/code/Magento/Backend/i18n/zh_CN.csv
index 7a956dbcdcfac8a2a273978a7de9d18777128b48..9e12e495d09b79041066b3d27581470edcc2c62c 100644
--- a/app/code/Magento/Backend/i18n/zh_CN.csv
+++ b/app/code/Magento/Backend/i18n/zh_CN.csv
@@ -504,7 +504,7 @@ Developer,Developer
"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."
"Log Settings","Log Settings"
"System Log File Name","System Log File Name"
-"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"
+"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"
"Exceptions Log File Name","Exceptions Log File Name"
"JavaScript Settings","JavaScript Settings"
"Merge JavaScript Files","Merge JavaScript Files"
diff --git a/app/code/Magento/Backup/Controller/Adminhtml/Index/Create.php b/app/code/Magento/Backup/Controller/Adminhtml/Index/Create.php
index ebcf25e8637e9123a7718b46b6cd51ce19ffc9a8..d594ed0907050804b77eb590e5d8ff406826572c 100644
--- a/app/code/Magento/Backup/Controller/Adminhtml/Index/Create.php
+++ b/app/code/Magento/Backup/Controller/Adminhtml/Index/Create.php
@@ -86,10 +86,10 @@ class Create extends \Magento\Backup\Controller\Adminhtml\Index
} catch (\Magento\Framework\Backup\Exception\NotEnoughFreeSpace $e) {
$errorMessage = __('You need more free space to create a backup.');
} catch (\Magento\Framework\Backup\Exception\NotEnoughPermissions $e) {
- $this->_objectManager->get('Magento\Framework\Logger')->log($e->getMessage());
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->info($e->getMessage());
$errorMessage = __('You need more permissions to create a backup.');
} catch (\Exception $e) {
- $this->_objectManager->get('Magento\Framework\Logger')->log($e->getMessage());
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->info($e->getMessage());
$errorMessage = __('Something went wrong creating the backup.');
}
diff --git a/app/code/Magento/Backup/Controller/Adminhtml/Index/Rollback.php b/app/code/Magento/Backup/Controller/Adminhtml/Index/Rollback.php
index 86c130e00757f6508d88d289715df9e9df959208..20723783b18fa94bffba7210ffaebb10c8aa358c 100644
--- a/app/code/Magento/Backup/Controller/Adminhtml/Index/Rollback.php
+++ b/app/code/Magento/Backup/Controller/Adminhtml/Index/Rollback.php
@@ -122,10 +122,10 @@ class Rollback extends \Magento\Backup\Controller\Adminhtml\Index
} catch (\Magento\Framework\Backup\Exception\FtpValidationFailed $e) {
$errorMsg = __('Failed to validate FTP');
} catch (\Magento\Framework\Backup\Exception\NotEnoughPermissions $e) {
- $this->_objectManager->get('Magento\Framework\Logger')->log($e->getMessage());
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->info($e->getMessage());
$errorMsg = __('Not enough permissions to perform rollback.');
} catch (\Exception $e) {
- $this->_objectManager->get('Magento\Framework\Logger')->log($e->getMessage());
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->info($e->getMessage());
$errorMsg = __('Failed to rollback');
}
diff --git a/app/code/Magento/Backup/Model/Observer.php b/app/code/Magento/Backup/Model/Observer.php
index 0e2d75bc06ec1079efa906dedad46ef6e46c89fe..c6e408ce4e9374eace22b210458cf17546ebfd88 100644
--- a/app/code/Magento/Backup/Model/Observer.php
+++ b/app/code/Magento/Backup/Model/Observer.php
@@ -43,7 +43,7 @@ class Observer
protected $_coreRegistry = null;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $_logger;
@@ -74,7 +74,7 @@ class Observer
/**
* @param \Magento\Backup\Helper\Data $backupData
* @param \Magento\Framework\Registry $coreRegistry
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Framework\Filesystem $filesystem
* @param \Magento\Framework\Backup\Factory $backupFactory
@@ -83,7 +83,7 @@ class Observer
public function __construct(
\Magento\Backup\Helper\Data $backupData,
\Magento\Framework\Registry $coreRegistry,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Framework\Filesystem $filesystem,
\Magento\Framework\Backup\Factory $backupFactory,
@@ -139,12 +139,12 @@ class Observer
$backupManager->create();
$message = $this->_backupData->getCreateSuccessMessageByType($type);
- $this->_logger->log($message);
+ $this->_logger->info($message);
} catch (\Exception $e) {
$this->_errors[] = $e->getMessage();
$this->_errors[] = $e->getTrace();
- $this->_logger->log($e->getMessage(), \Zend_Log::ERR);
- $this->_logger->logException($e);
+ $this->_logger->info($e->getMessage());
+ $this->_logger->critical($e);
}
if ($this->_scopeConfig->isSetFlag(self::XML_PATH_BACKUP_MAINTENANCE_MODE, ScopeInterface::SCOPE_STORE)) {
diff --git a/app/code/Magento/Bundle/Model/Product/Type.php b/app/code/Magento/Bundle/Model/Product/Type.php
index d347baa277fbff8e0886253717e35265c18c915d..adcd9dd07f48b2e880acf372bd5ba2223c8dd53e 100644
--- a/app/code/Magento/Bundle/Model/Product/Type.php
+++ b/app/code/Magento/Bundle/Model/Product/Type.php
@@ -141,7 +141,7 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
* @param \Magento\Core\Helper\File\Storage\Database $fileStorageDb
* @param \Magento\Framework\Filesystem $filesystem
* @param \Magento\Framework\Registry $coreRegistry
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param ProductRepositoryInterface $productRepository
* @param \Magento\Catalog\Helper\Product $catalogProduct
* @param \Magento\Catalog\Helper\Data $catalogData
@@ -167,7 +167,7 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
\Magento\Core\Helper\File\Storage\Database $fileStorageDb,
\Magento\Framework\Filesystem $filesystem,
\Magento\Framework\Registry $coreRegistry,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
ProductRepositoryInterface $productRepository,
\Magento\Catalog\Helper\Product $catalogProduct,
\Magento\Catalog\Helper\Data $catalogData,
diff --git a/app/code/Magento/Catalog/Block/Product/Context.php b/app/code/Magento/Catalog/Block/Product/Context.php
index 916e5c5fff6c076ee1fa0e2a2590682519daeb51..14ae9729f3e07a2cb2b74836acd29c191d32fe31 100644
--- a/app/code/Magento/Catalog/Block/Product/Context.php
+++ b/app/code/Magento/Catalog/Block/Product/Context.php
@@ -83,7 +83,7 @@ class Context extends \Magento\Framework\View\Element\Template\Context
* @param \Magento\Framework\View\Asset\Repository $assetRepo
* @param \Magento\Framework\View\ConfigInterface $viewConfig
* @param \Magento\Framework\App\Cache\StateInterface $cacheState
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Escaper $escaper
* @param \Magento\Framework\Filter\FilterManager $filterManager
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
@@ -122,7 +122,7 @@ class Context extends \Magento\Framework\View\Element\Template\Context
\Magento\Framework\View\Asset\Repository $assetRepo,
\Magento\Framework\View\ConfigInterface $viewConfig,
\Magento\Framework\App\Cache\StateInterface $cacheState,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Escaper $escaper,
\Magento\Framework\Filter\FilterManager $filterManager,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php
index f335af5a99dfe1c4f763a36f2606d42bfacd238e..8b4683d0fb483a6f351624dc54432e35f8626413 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php
@@ -18,7 +18,7 @@ class Move extends \Magento\Catalog\Controller\Adminhtml\Category
protected $layoutFactory;
/**
- * @var \Magento\Framework\Logger $logger
+ * @var \Psr\Log\LoggerInterface $logger
*/
protected $logger;
@@ -27,14 +27,14 @@ class Move extends \Magento\Catalog\Controller\Adminhtml\Category
* @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
* @param \Magento\Framework\Controller\Result\JSONFactory $resultJsonFactory
* @param \Magento\Framework\View\LayoutFactory $layoutFactory,
- * @param \Magento\Framework\Logger $logger,
+ * @param \Psr\Log\LoggerInterface $logger,
*/
public function __construct(
\Magento\Backend\App\Action\Context $context,
\Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory,
\Magento\Framework\Controller\Result\JSONFactory $resultJsonFactory,
\Magento\Framework\View\LayoutFactory $layoutFactory,
- \Magento\Framework\Logger $logger
+ \Psr\Log\LoggerInterface $logger
) {
parent::__construct($context, $resultRedirectFactory);
$this->resultJsonFactory = $resultJsonFactory;
@@ -77,7 +77,7 @@ class Move extends \Magento\Catalog\Controller\Adminhtml\Category
} catch (\Exception $e) {
$error = true;
$this->messageManager->addError(__('There was a category move error.'));
- $this->logger->logException($e);
+ $this->logger->critical($e);
}
if (!$error) {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Builder.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Builder.php
index 511f9a701d5413f014ec7d9a7814e147da45c1a0..0f712c177e24df5cc0fb838f806fc5c21450027b 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Builder.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Builder.php
@@ -8,7 +8,7 @@ namespace Magento\Catalog\Controller\Adminhtml\Product;
use Magento\Catalog\Model\ProductFactory;
use Magento\Cms\Model\Wysiwyg as WysiwygModel;
use Magento\Framework\App\RequestInterface;
-use Magento\Framework\Logger;
+use Psr\Log\LoggerInterface as Logger;
use Magento\Framework\Registry;
class Builder
@@ -19,7 +19,7 @@ class Builder
protected $productFactory;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $logger;
@@ -75,7 +75,7 @@ class Builder
$product->load($productId);
} catch (\Exception $e) {
$product->setTypeId(\Magento\Catalog\Model\Product\Type::DEFAULT_TYPE);
- $this->logger->logException($e);
+ $this->logger->critical($e);
}
}
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Duplicate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Duplicate.php
index 827d1bdce796135622498ee9a265b5e50de0db80..618b90846c50111866dd0c8828e64c579a1c6f28 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Duplicate.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Duplicate.php
@@ -53,7 +53,7 @@ class Duplicate extends \Magento\Catalog\Controller\Adminhtml\Product
$this->messageManager->addSuccess(__('You duplicated the product.'));
$resultRedirect->setPath('catalog/*/edit', ['_current' => true, 'id' => $newProduct->getId()]);
} catch (\Exception $e) {
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$this->messageManager->addError($e->getMessage());
$resultRedirect->setPath('catalog/*/edit', ['_current' => true]);
}
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php
index 3e55766a835c5dd0e8519a187a6366a5b0a96643..7dc0df9dbaee5e1e6011651c38c978987a4f2cd2 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php
@@ -116,7 +116,7 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product
$this->_session->setProductData($data);
$redirectBack = $productId ? true : 'new';
} catch (\Exception $e) {
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$this->messageManager->addError($e->getMessage());
$this->_session->setProductData($data);
$redirectBack = $productId ? true : 'new';
diff --git a/app/code/Magento/Catalog/Controller/Category/View.php b/app/code/Magento/Catalog/Controller/Category/View.php
index 4e9df866610649b231ef106eb50288e8a347b981..d6db2447de5f1313addfb6fe498ede24f8c234fd 100644
--- a/app/code/Magento/Catalog/Controller/Category/View.php
+++ b/app/code/Magento/Catalog/Controller/Category/View.php
@@ -123,7 +123,7 @@ class View extends \Magento\Framework\App\Action\Action
['category' => $category, 'controller_action' => $this]
);
} catch (\Magento\Framework\Model\Exception $e) {
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
return false;
}
diff --git a/app/code/Magento/Catalog/Controller/Product/View.php b/app/code/Magento/Catalog/Controller/Product/View.php
index 3f36fe958a42cb6acc37fe913fc973f6eba7e37a..de750fd1151475b76f5dde70be25546a76f0577c 100644
--- a/app/code/Magento/Catalog/Controller/Product/View.php
+++ b/app/code/Magento/Catalog/Controller/Product/View.php
@@ -111,7 +111,7 @@ class View extends \Magento\Catalog\Controller\Product
if ($e->getCode() == $this->viewHelper->ERR_NO_PRODUCT_LOADED) {
return $this->noProductRedirect();
} else {
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$resultForward = $this->resultForwardFactory->create();
$resultForward->forward('noroute');
return $resultForward;
diff --git a/app/code/Magento/Catalog/Helper/Image.php b/app/code/Magento/Catalog/Helper/Image.php
index 9388d17fda737f059b1bcd641b83a2e8be2bddb0..e232b7280a7939922ecf58bc9ae1cf269205909b 100644
--- a/app/code/Magento/Catalog/Helper/Image.php
+++ b/app/code/Magento/Catalog/Helper/Image.php
@@ -417,7 +417,7 @@ class Image extends AbstractHelper
try {
$url = $this->_assetRepo->getUrl($this->getPlaceholder());
} catch (\Exception $e) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
$url = $this->_urlBuilder->getUrl('', ['_direct' => 'core/index/notFound']);
}
return $url;
diff --git a/app/code/Magento/Catalog/Helper/Product.php b/app/code/Magento/Catalog/Helper/Product.php
index 4503f58d1ec836ff45af7eac63b5631b4450913a..b26f922a2abffcc00015da45b00f4bf912171f2a 100644
--- a/app/code/Magento/Catalog/Helper/Product.php
+++ b/app/code/Magento/Catalog/Helper/Product.php
@@ -448,7 +448,7 @@ class Product extends \Magento\Core\Helper\Url
['product' => $product, 'controller_action' => $controller]
);
} catch (\Magento\Framework\Model\Exception $e) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
return false;
}
diff --git a/app/code/Magento/Catalog/Helper/Product/Flat/Indexer.php b/app/code/Magento/Catalog/Helper/Product/Flat/Indexer.php
index 52473fe4834d131a60f06332727b0e9b9b4b1965..e029df6c439b40a9ada97050ac241801e300d2fa 100644
--- a/app/code/Magento/Catalog/Helper/Product/Flat/Indexer.php
+++ b/app/code/Magento/Catalog/Helper/Product/Flat/Indexer.php
@@ -304,7 +304,7 @@ class Indexer extends \Magento\Framework\App\Helper\AbstractHelper
$attribute->getBackend();
$this->_attributes[$attributeCode] = $attribute;
} catch (\Exception $e) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
}
}
}
diff --git a/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Image.php b/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Image.php
index 4ab260e6e4cf653bda4bfa7de18477398303b107..2b3267239255e5f47ef4e720da1deb5d7a2b602b 100644
--- a/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Image.php
+++ b/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Image.php
@@ -34,19 +34,19 @@ class Image extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
protected $_fileUploaderFactory;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $_logger;
/**
* Construct
*
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Filesystem $filesystem
* @param \Magento\Core\Model\File\UploaderFactory $fileUploaderFactory
*/
public function __construct(
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Filesystem $filesystem,
\Magento\Core\Model\File\UploaderFactory $fileUploaderFactory
) {
@@ -93,7 +93,7 @@ class Image extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
$this->getAttribute()->getEntity()->saveAttribute($object, $this->getAttribute()->getName());
} catch (\Exception $e) {
if ($e->getCode() != \Magento\Core\Model\File\Uploader::TMP_NAME_EMPTY) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
}
}
return $this;
diff --git a/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php b/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
index 645c2437f5738507ef71b34a5fe85f52a408fecc..1b9fcdff10fe83b1b4c3526806c082f6f84678a9 100644
--- a/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
+++ b/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
@@ -123,7 +123,7 @@ abstract class AbstractType
protected $_eventManager;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $_logger;
@@ -164,7 +164,7 @@ abstract class AbstractType
* @param \Magento\Core\Helper\File\Storage\Database $fileStorageDb
* @param \Magento\Framework\Filesystem $filesystem
* @param \Magento\Framework\Registry $coreRegistry
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param ProductRepositoryInterface $productRepository
*/
public function __construct(
@@ -176,7 +176,7 @@ abstract class AbstractType
\Magento\Core\Helper\File\Storage\Database $fileStorageDb,
\Magento\Framework\Filesystem $filesystem,
\Magento\Framework\Registry $coreRegistry,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
ProductRepositoryInterface $productRepository
) {
$this->_catalogProductOption = $catalogProductOption;
@@ -1005,7 +1005,7 @@ abstract class AbstractType
} catch (\Magento\Framework\Model\Exception $e) {
$errors[] = $e->getMessages();
} catch (\Exception $e) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
$errors[] = __('Something went wrong while processing the request.');
}
diff --git a/app/code/Magento/Catalog/Model/Resource/Category/Attribute/Collection.php b/app/code/Magento/Catalog/Model/Resource/Category/Attribute/Collection.php
index bd7a18f5d3d4057e680e0331adec06d14fca9259..8f45e9274243814c0a448a4dad6a6d0ea480e63e 100644
--- a/app/code/Magento/Catalog/Model/Resource/Category/Attribute/Collection.php
+++ b/app/code/Magento/Catalog/Model/Resource/Category/Attribute/Collection.php
@@ -20,7 +20,7 @@ class Collection extends \Magento\Eav\Model\Resource\Entity\Attribute\Collection
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Eav\Model\EntityFactory $eavEntityFactory
@@ -30,7 +30,7 @@ class Collection extends \Magento\Eav\Model\Resource\Entity\Attribute\Collection
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Eav\Model\Config $eavConfig,
diff --git a/app/code/Magento/Catalog/Model/Resource/Category/Flat/Collection.php b/app/code/Magento/Catalog/Model/Resource/Category/Flat/Collection.php
index 19cf99775d61330349b33ea5e847879a1b5c9b13..24ba5f442771cade8e2181070ddb6d9f5c230889 100644
--- a/app/code/Magento/Catalog/Model/Resource/Category/Flat/Collection.php
+++ b/app/code/Magento/Catalog/Model/Resource/Category/Flat/Collection.php
@@ -9,7 +9,7 @@ use Magento\Core\Model\EntityFactory;
use Magento\Framework\Event\ManagerInterface;
use Magento\Framework\Data\Collection\Db\FetchStrategyInterface;
use Magento\Framework\Model\Resource\Db\AbstractDb;
-use Magento\Framework\Logger;
+use Psr\Log\LoggerInterface as Logger;
use Magento\Store\Model\StoreManagerInterface;
/**
diff --git a/app/code/Magento/Catalog/Model/Resource/Collection/AbstractCollection.php b/app/code/Magento/Catalog/Model/Resource/Collection/AbstractCollection.php
index a70a1aa239ccd74c3fec2f58800baea9ffa77068..996f805d3efc8a9d02a4b7b8b65a6390877df4b5 100644
--- a/app/code/Magento/Catalog/Model/Resource/Collection/AbstractCollection.php
+++ b/app/code/Magento/Catalog/Model/Resource/Collection/AbstractCollection.php
@@ -28,7 +28,7 @@ class AbstractCollection extends \Magento\Eav\Model\Entity\Collection\AbstractCo
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Eav\Model\Config $eavConfig
@@ -43,7 +43,7 @@ class AbstractCollection extends \Magento\Eav\Model\Entity\Collection\AbstractCo
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Eav\Model\Config $eavConfig,
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Attribute/Collection.php b/app/code/Magento/Catalog/Model/Resource/Product/Attribute/Collection.php
index 5650e22e54352787fd69a44d4abc6e6f8296977c..6183326f86b90f88dc33083784a261879ccf9d32 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Attribute/Collection.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Attribute/Collection.php
@@ -18,7 +18,7 @@ class Collection extends \Magento\Eav\Model\Resource\Entity\Attribute\Collection
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Eav\Model\EntityFactory $eavEntityFactory
@@ -28,7 +28,7 @@ class Collection extends \Magento\Eav\Model\Resource\Entity\Attribute\Collection
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Eav\Model\Config $eavConfig,
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Collection.php b/app/code/Magento/Catalog/Model/Resource/Product/Collection.php
index 0d5d6565704a0aba82aefae03ef8eefe785bca68..73b7c3cb603b3fc7e3ea58a2385c36c76c727d14 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Collection.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Collection.php
@@ -248,7 +248,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Collection\AbstractColl
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Eav\Model\Config $eavConfig
@@ -272,7 +272,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Collection\AbstractColl
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Eav\Model\Config $eavConfig,
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Compare/Item/Collection.php b/app/code/Magento/Catalog/Model/Resource/Product/Compare/Item/Collection.php
index 46e9df4738f189c7e4958a56c7ef8959b0fbc8bb..c82e9ed4d6ffc0b1149529bd2bdf48dbebea3029 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Compare/Item/Collection.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Compare/Item/Collection.php
@@ -49,7 +49,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Eav\Model\Config $eavConfig
@@ -75,7 +75,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Eav\Model\Config $eavConfig,
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Option/Collection.php b/app/code/Magento/Catalog/Model/Resource/Product/Option/Collection.php
index 645ab02c2ad436b3fb782fd9aaf532ca481164d4..550aa2c1ae5e0e99e76eec0158dd640ec8ebddab 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Option/Collection.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Option/Collection.php
@@ -27,7 +27,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Catalog\Model\Resource\Product\Option\Value\CollectionFactory $optionValueCollectionFactory
@@ -37,7 +37,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Catalog\Model\Resource\Product\Option\Value\CollectionFactory $optionValueCollectionFactory,
diff --git a/app/code/Magento/Catalog/Model/Resource/Url.php b/app/code/Magento/Catalog/Model/Resource/Url.php
index d59abd1efead5d8b18e5f8a0d656c41787820052..eacf7eceddc10b7d91f891de3c59a5f33d3eaa98 100644
--- a/app/code/Magento/Catalog/Model/Resource/Url.php
+++ b/app/code/Magento/Catalog/Model/Resource/Url.php
@@ -49,7 +49,7 @@ class Url extends \Magento\Framework\Model\Resource\Db\AbstractDb
protected $_rootChildrenIds = [];
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $_logger;
@@ -92,7 +92,7 @@ class Url extends \Magento\Framework\Model\Resource\Db\AbstractDb
* @param \Magento\Eav\Model\Config $eavConfig
* @param Product $productResource
* @param \Magento\Catalog\Model\Category $catalogCategory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
@@ -100,7 +100,7 @@ class Url extends \Magento\Framework\Model\Resource\Db\AbstractDb
\Magento\Eav\Model\Config $eavConfig,
Product $productResource,
\Magento\Catalog\Model\Category $catalogCategory,
- \Magento\Framework\Logger $logger
+ \Psr\Log\LoggerInterface $logger
) {
$this->_storeManager = $storeManager;
$this->_eavConfig = $eavConfig;
diff --git a/app/code/Magento/Catalog/Pricing/Render/FinalPriceBox.php b/app/code/Magento/Catalog/Pricing/Render/FinalPriceBox.php
index ceaaba2fcc5c9fe62450ed74bb017b0552c590c5..9b9feb713dcb206731ff1617e52832eedd0708eb 100644
--- a/app/code/Magento/Catalog/Pricing/Render/FinalPriceBox.php
+++ b/app/code/Magento/Catalog/Pricing/Render/FinalPriceBox.php
@@ -33,7 +33,7 @@ class FinalPriceBox extends BasePriceBox
/** @var MsrpPrice $msrpPriceType */
$msrpPriceType = $this->getSaleableItem()->getPriceInfo()->getPrice('msrp_price');
} catch (\InvalidArgumentException $e) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
return $this->wrapResult($result);
}
diff --git a/app/code/Magento/CatalogImportExport/Model/Export/Product.php b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
index 1f8ac93fd8125187b5be450ce667ea0b23758705..c3d0f1d794394fbc36ed203b7717865a47aa54c5 100644
--- a/app/code/Magento/CatalogImportExport/Model/Export/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
@@ -139,7 +139,7 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
protected $_exportConfig;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $_logger;
@@ -200,7 +200,7 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
* @param \Magento\Eav\Model\Config $config
* @param \Magento\Framework\App\Resource $resource
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Catalog\Model\Resource\Product\Collection $collection
* @param \Magento\ImportExport\Model\Export\ConfigInterface $exportConfig
* @param \Magento\Catalog\Model\Resource\ProductFactory $productFactory
@@ -218,7 +218,7 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
\Magento\Eav\Model\Config $config,
\Magento\Framework\App\Resource $resource,
\Magento\Store\Model\StoreManagerInterface $storeManager,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Catalog\Model\Resource\Product\Collection $collection,
\Magento\ImportExport\Model\Export\ConfigInterface $exportConfig,
\Magento\Catalog\Model\Resource\ProductFactory $productFactory,
@@ -1105,7 +1105,7 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
}
}
} catch (\Exception $e) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
}
return $exportData;
}
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index 8f59ba1aa57c22299af9ab6cc03c2c550674e161..60bcd0528cf208056d53fbd0b3f43c34fa7f8bd1 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -481,7 +481,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
protected $indexerRegistry;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
private $_logger;
@@ -520,7 +520,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
* @param \Magento\CatalogInventory\Model\Resource\Stock\ItemFactory $stockResItemFac
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Framework\Stdlib\DateTime $dateTime
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Indexer\Model\IndexerRegistry $indexerRegistry
* @param array $data
* @throws \Magento\Framework\Model\Exception
@@ -555,7 +555,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
\Magento\CatalogInventory\Model\Resource\Stock\ItemFactory $stockResItemFac,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Framework\Stdlib\DateTime $dateTime,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Indexer\Model\IndexerRegistry $indexerRegistry,
array $data = []
) {
@@ -1102,7 +1102,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
if ($linkedId == null) {
// Import file links to a SKU which is skipped for some reason, which leads to a "NULL"
// link causing fatal errors.
- $this->_logger->logException(
+ $this->_logger->critical(
new \Exception(
sprintf(
'WARNING: Orphaned link skipped: From SKU %s (ID %d) to SKU %s, ' .
diff --git a/app/code/Magento/CatalogInventory/Model/Resource/Stock/Item/StockItemCriteriaMapper.php b/app/code/Magento/CatalogInventory/Model/Resource/Stock/Item/StockItemCriteriaMapper.php
index 14c56cf114085b9c5f1c98c59c959e577511d05d..5c67e12811ebfadcb3eace8a1d30c09b3d42b6dc 100644
--- a/app/code/Magento/CatalogInventory/Model/Resource/Stock/Item/StockItemCriteriaMapper.php
+++ b/app/code/Magento/CatalogInventory/Model/Resource/Stock/Item/StockItemCriteriaMapper.php
@@ -10,7 +10,7 @@ use Magento\Framework\DB\MapperFactory;
use Magento\Framework\DB\Select;
use Magento\Framework\Data\ObjectFactory;
use Magento\Store\Model\StoreManagerInterface;
-use Magento\Framework\Logger;
+use Psr\Log\LoggerInterface as Logger;
use Magento\Framework\Data\Collection\Db\FetchStrategyInterface;
/**
diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/ApplyRules.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/ApplyRules.php
index 923ce9bd10c7065458991852e61424f325da1084..3d8804ff6d77cc68ee305af0436833c393325664 100644
--- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/ApplyRules.php
+++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/ApplyRules.php
@@ -29,7 +29,7 @@ class ApplyRules extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog
$this->messageManager->addError($errorMessage . ' ' . $ruleJob->getError());
}
} catch (\Exception $e) {
- $this->_objectManager->create('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->create('Psr\Log\LoggerInterface')->critical($e);
$this->messageManager->addError($errorMessage);
}
$this->_redirect('catalog_rule/*');
diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Delete.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Delete.php
index 440407f0e168c4d801690e95d32aa49076f0583a..fb7a1fc6b310e8b425ebcd8fd7070bc003ec1d25 100644
--- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Delete.php
+++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Delete.php
@@ -31,7 +31,7 @@ class Delete extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog
$this->messageManager->addError(
__('An error occurred while deleting the rule. Please review the log and try again.')
);
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$this->_redirect('catalog_rule/*/edit', ['id' => $this->getRequest()->getParam('id')]);
return;
}
diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php
index 7124feaa8c9f7b7d319e2166f367a1c22d6f597a..70f07b81bfb0f588a93f95ad4779abc0036464ff 100644
--- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php
+++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php
@@ -75,7 +75,7 @@ class Save extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog
$this->messageManager->addError(
__('An error occurred while saving the rule data. Please review the log and try again.')
);
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$this->_objectManager->get('Magento\Backend\Model\Session')->setPageData($data);
$this->_redirect('catalog_rule/*/edit', ['id' => $this->getRequest()->getParam('rule_id')]);
return;
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php b/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php
index 690e8e5a35cc2300d5b443c963abaf025e2d63dc..9c5cbbedb2b1e4f6841524aade16273b095f308e 100644
--- a/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php
+++ b/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php
@@ -31,7 +31,7 @@ class IndexBuilder
protected $ruleCollectionFactory;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $logger;
@@ -75,7 +75,7 @@ class IndexBuilder
* @param PriceCurrencyInterface $priceCurrency
* @param \Magento\Framework\App\Resource $resource
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Eav\Model\Config $eavConfig
* @param \Magento\Framework\Stdlib\DateTime $dateFormat
* @param \Magento\Framework\Stdlib\DateTime\DateTime $dateTime
@@ -87,7 +87,7 @@ class IndexBuilder
PriceCurrencyInterface $priceCurrency,
\Magento\Framework\App\Resource $resource,
\Magento\Store\Model\StoreManagerInterface $storeManager,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Eav\Model\Config $eavConfig,
\Magento\Framework\Stdlib\DateTime $dateFormat,
\Magento\Framework\Stdlib\DateTime\DateTime $dateTime,
@@ -129,7 +129,7 @@ class IndexBuilder
try {
$this->doReindexByIds($ids);
} catch (\Exception $e) {
- $this->logException($e);
+ $this->critical($e);
throw new CatalogRuleException($e->getMessage(), $e->getCode(), $e);
}
}
@@ -162,7 +162,7 @@ class IndexBuilder
try {
$this->doReindexFull();
} catch (\Exception $e) {
- $this->logException($e);
+ $this->critical($e);
throw new CatalogRuleException($e->getMessage(), $e->getCode(), $e);
}
}
@@ -551,7 +551,7 @@ class IndexBuilder
/**
* @param int $websiteId
* @param int|null $productId
- * @return \Zend\Db\Adapter\Driver\StatementInterface|\Zend_Db_Statement_Interface
+ * @return \Zend_Db_Statement_Interface
* @throws \Magento\Eav\Exception
*/
protected function getRuleProductsStmt($websiteId, $productId = null)
@@ -691,8 +691,8 @@ class IndexBuilder
* @param \Exception $e
* @return void
*/
- protected function logException($e)
+ protected function critical($e)
{
- $this->logger->logException($e);
+ $this->logger->critical($e);
}
}
diff --git a/app/code/Magento/CatalogRule/Model/Resource/Rule.php b/app/code/Magento/CatalogRule/Model/Resource/Rule.php
index edc600c5faa05c9faf75d09b5ffcedf8174f9ae4..8d2f50e3fd9f369fbd245e487b22c3d0e7ec73ac 100644
--- a/app/code/Magento/CatalogRule/Model/Resource/Rule.php
+++ b/app/code/Magento/CatalogRule/Model/Resource/Rule.php
@@ -22,7 +22,7 @@ class Rule extends \Magento\Rule\Model\Resource\AbstractResource
const SECONDS_IN_DAY = 86400;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $_logger;
@@ -96,7 +96,7 @@ class Rule extends \Magento\Rule\Model\Resource\AbstractResource
* @param \Magento\Eav\Model\Config $eavConfig
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\CatalogRule\Helper\Data $catalogRuleData
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Stdlib\DateTime $dateTime
* @param PriceCurrencyInterface $priceCurrency
*/
@@ -108,7 +108,7 @@ class Rule extends \Magento\Rule\Model\Resource\AbstractResource
\Magento\Eav\Model\Config $eavConfig,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\CatalogRule\Helper\Data $catalogRuleData,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Stdlib\DateTime $dateTime,
PriceCurrencyInterface $priceCurrency
) {
diff --git a/app/code/Magento/CatalogRule/Model/Rule/Condition/Product.php b/app/code/Magento/CatalogRule/Model/Rule/Condition/Product.php
index 7511d2f5c0bf065478159504cf539b9ca14a44f6..cb8b7786232a33d0fbf98c848ec2a55f0d83ffe7 100644
--- a/app/code/Magento/CatalogRule/Model/Rule/Condition/Product.php
+++ b/app/code/Magento/CatalogRule/Model/Rule/Condition/Product.php
@@ -8,26 +8,29 @@
*/
namespace Magento\CatalogRule\Model\Rule\Condition;
+/**
+ * Class Product
+ */
class Product extends \Magento\Rule\Model\Condition\Product\AbstractProduct
{
/**
* Validate product attribute value for condition
*
- * @param \Magento\Framework\Object $object
+ * @param \Magento\Framework\Model\AbstractModel $model
* @return bool
*/
- public function validate(\Magento\Framework\Object $object)
+ public function validate(\Magento\Framework\Model\AbstractModel $model)
{
$attrCode = $this->getAttribute();
if ('category_ids' == $attrCode) {
- return $this->validateAttribute($object->getAvailableInCategories());
+ return $this->validateAttribute($model->getAvailableInCategories());
}
- $oldAttrValue = $object->hasData($attrCode) ? $object->getData($attrCode) : null;
- $this->_setAttributeValue($object);
+ $oldAttrValue = $model->hasData($attrCode) ? $model->getData($attrCode) : null;
+ $this->_setAttributeValue($model);
- $result = $this->validateAttribute($object->getData($this->getAttribute()));
- $this->_restoreOldAttrValue($object, $oldAttrValue);
+ $result = $this->validateAttribute($model->getData($this->getAttribute()));
+ $this->_restoreOldAttrValue($model, $oldAttrValue);
return (bool)$result;
}
@@ -35,36 +38,36 @@ class Product extends \Magento\Rule\Model\Condition\Product\AbstractProduct
/**
* Restore old attribute value
*
- * @param \Magento\Framework\Object $object
+ * @param \Magento\Framework\Model\AbstractModel $model
* @param mixed $oldAttrValue
* @return void
*/
- protected function _restoreOldAttrValue($object, $oldAttrValue)
+ protected function _restoreOldAttrValue(\Magento\Framework\Model\AbstractModel $model, $oldAttrValue)
{
$attrCode = $this->getAttribute();
if (is_null($oldAttrValue)) {
- $object->unsetData($attrCode);
+ $model->unsetData($attrCode);
} else {
- $object->setData($attrCode, $oldAttrValue);
+ $model->setData($attrCode, $oldAttrValue);
}
}
/**
* Set attribute value
*
- * @param \Magento\Framework\Object $object
+ * @param \Magento\Framework\Model\AbstractModel $model
* @return $this
*/
- protected function _setAttributeValue($object)
+ protected function _setAttributeValue(\Magento\Framework\Model\AbstractModel $model)
{
- $storeId = $object->getStoreId();
+ $storeId = $model->getStoreId();
$defaultStoreId = \Magento\Store\Model\Store::DEFAULT_STORE_ID;
- if (!isset($this->_entityAttributeValues[$object->getId()])) {
+ if (!isset($this->_entityAttributeValues[$model->getId()])) {
return $this;
}
- $productValues = $this->_entityAttributeValues[$object->getId()];
+ $productValues = $this->_entityAttributeValues[$model->getId()];
if (!isset($productValues[$storeId]) && !isset($productValues[$defaultStoreId])) {
return $this;
@@ -72,10 +75,11 @@ class Product extends \Magento\Rule\Model\Condition\Product\AbstractProduct
$value = isset($productValues[$storeId]) ? $productValues[$storeId] : $productValues[$defaultStoreId];
- $value = $this->_prepareDatetimeValue($value, $object);
- $value = $this->_prepareMultiselectValue($value, $object);
+ $value = $this->_prepareDatetimeValue($value, $model);
+ $value = $this->_prepareMultiselectValue($value, $model);
+
+ $model->setData($this->getAttribute(), $value);
- $object->setData($this->getAttribute(), $value);
return $this;
}
@@ -83,15 +87,16 @@ class Product extends \Magento\Rule\Model\Condition\Product\AbstractProduct
* Prepare datetime attribute value
*
* @param mixed $value
- * @param \Magento\Framework\Object $object
+ * @param \Magento\Framework\Model\AbstractModel $model
* @return mixed
*/
- protected function _prepareDatetimeValue($value, $object)
+ protected function _prepareDatetimeValue($value, \Magento\Framework\Model\AbstractModel $model)
{
- $attribute = $object->getResource()->getAttribute($this->getAttribute());
+ $attribute = $model->getResource()->getAttribute($this->getAttribute());
if ($attribute && $attribute->getBackendType() == 'datetime') {
$value = strtotime($value);
}
+
return $value;
}
@@ -99,15 +104,16 @@ class Product extends \Magento\Rule\Model\Condition\Product\AbstractProduct
* Prepare multiselect attribute value
*
* @param mixed $value
- * @param \Magento\Framework\Object $object
+ * @param \Magento\Framework\Model\AbstractModel $model
* @return mixed
*/
- protected function _prepareMultiselectValue($value, $object)
+ protected function _prepareMultiselectValue($value, \Magento\Framework\Model\AbstractModel $model)
{
- $attribute = $object->getResource()->getAttribute($this->getAttribute());
+ $attribute = $model->getResource()->getAttribute($this->getAttribute());
if ($attribute && $attribute->getFrontendInput() == 'multiselect') {
$value = strlen($value) ? explode(',', $value) : [];
}
+
return $value;
}
}
diff --git a/app/code/Magento/CatalogSearch/Model/Resource/Advanced/Collection.php b/app/code/Magento/CatalogSearch/Model/Resource/Advanced/Collection.php
index 397bef86191a79bf904e13ae69bf2789cd783793..f8d25720209b343b4a019b6ee49d117018737a7e 100644
--- a/app/code/Magento/CatalogSearch/Model/Resource/Advanced/Collection.php
+++ b/app/code/Magento/CatalogSearch/Model/Resource/Advanced/Collection.php
@@ -31,7 +31,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Eav\Model\Config $eavConfig
@@ -56,7 +56,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Eav\Model\Config $eavConfig,
diff --git a/app/code/Magento/CatalogSearch/Model/Resource/Fulltext/Collection.php b/app/code/Magento/CatalogSearch/Model/Resource/Fulltext/Collection.php
index f20d6544bd44c4ee6f14cb2b191738ba02cf4a5d..3a6827063f78f6414f01bf7922ef4823cfd2ffe9 100644
--- a/app/code/Magento/CatalogSearch/Model/Resource/Fulltext/Collection.php
+++ b/app/code/Magento/CatalogSearch/Model/Resource/Fulltext/Collection.php
@@ -48,7 +48,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Eav\Model\Config $eavConfig
@@ -75,7 +75,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Eav\Model\Config $eavConfig,
diff --git a/app/code/Magento/CatalogSearch/Model/Resource/Search/Collection.php b/app/code/Magento/CatalogSearch/Model/Resource/Search/Collection.php
index b5c31a4afac4737b191f361c4099da331981b1fe..2880a05ef464257bd60d0ed4a06f13ec5f0880bb 100644
--- a/app/code/Magento/CatalogSearch/Model/Resource/Search/Collection.php
+++ b/app/code/Magento/CatalogSearch/Model/Resource/Search/Collection.php
@@ -34,7 +34,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection impl
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Eav\Model\Config $eavConfig
@@ -59,7 +59,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection impl
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Eav\Model\Config $eavConfig,
diff --git a/app/code/Magento/Centinel/Controller/Adminhtml/Centinel/Index/ValidatePaymentData.php b/app/code/Magento/Centinel/Controller/Adminhtml/Centinel/Index/ValidatePaymentData.php
index 20a7d48d4ee87dc08e5799795bca68fde5197ff3..1cb27e4d7b623209aca3aa32d5981c9782d4c75b 100644
--- a/app/code/Magento/Centinel/Controller/Adminhtml/Centinel/Index/ValidatePaymentData.php
+++ b/app/code/Magento/Centinel/Controller/Adminhtml/Centinel/Index/ValidatePaymentData.php
@@ -27,7 +27,7 @@ class ValidatePaymentData extends \Magento\Centinel\Controller\Adminhtml\Centine
} catch (\Magento\Framework\Model\Exception $e) {
$result['message'] = $e->getMessage();
} catch (\Exception $e) {
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$result['message'] = __('Validation failed.');
}
$this->getResponse()->representJson(
diff --git a/app/code/Magento/Centinel/Model/Api.php b/app/code/Magento/Centinel/Model/Api.php
index bb2b990ab7d0f0505ea92dd8312669bb16b64511..ccfe486b544d9562420752dae622251713c39b53 100644
--- a/app/code/Magento/Centinel/Model/Api.php
+++ b/app/code/Magento/Centinel/Model/Api.php
@@ -213,19 +213,17 @@ class Api extends \Magento\Framework\Object
protected $_clientInstance = null;
/**
- * Log adapter factory
- *
- * @var \Magento\Framework\Logger\AdapterFactory
+ * @var \Psr\Log\LoggerInterface
*/
- protected $_logFactory;
+ protected $logger;
/**
- * @param \Magento\Framework\Logger\AdapterFactory $logFactory
+ * @param \Psr\Log\LoggerInterface $logger
* @param array $data
*/
- public function __construct(\Magento\Framework\Logger\AdapterFactory $logFactory, array $data = [])
+ public function __construct(\Psr\Log\LoggerInterface $logger, array $data = [])
{
- $this->_logFactory = $logFactory;
+ $this->logger = $logger;
parent::__construct($data);
}
@@ -419,13 +417,7 @@ class Api extends \Magento\Framework\Object
protected function _debug($debugData)
{
if ($this->getDebugFlag()) {
- $this->_logFactory->create(
- ['fileName' => 'card_validation_3d_secure.log']
- )->setFilterDataKeys(
- $this->_debugReplacePrivateDataKeys
- )->log(
- $debugData
- );
+ $this->logger->debug($debugData);
}
}
}
diff --git a/app/code/Magento/Checkout/Controller/Cart/Add.php b/app/code/Magento/Checkout/Controller/Cart/Add.php
index 69b4b42b53eefb1ca57298c411cc17c5007e2759..64abe026ff2f5ca522528018c6799712a9866d6c 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Add.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Add.php
@@ -134,7 +134,7 @@ class Add extends \Magento\Checkout\Controller\Cart
}
} catch (\Exception $e) {
$this->messageManager->addException($e, __('We cannot add this item to your shopping cart'));
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$this->_goBack();
}
}
diff --git a/app/code/Magento/Checkout/Controller/Cart/Addgroup.php b/app/code/Magento/Checkout/Controller/Cart/Addgroup.php
index 08607e38f063faa032cf3584f43bff4642730e9f..4911ebfd7ff64e081b92a13ce5f63c3bfe1bd7cd 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Addgroup.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Addgroup.php
@@ -31,7 +31,7 @@ class Addgroup extends \Magento\Checkout\Controller\Cart
}
} catch (\Exception $e) {
$this->messageManager->addException($e, __('We cannot add this item to your shopping cart'));
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$this->_goBack();
}
}
diff --git a/app/code/Magento/Checkout/Controller/Cart/Configure.php b/app/code/Magento/Checkout/Controller/Cart/Configure.php
index 8731afaae8dceacde1558ca23c50fc1ed2921cf5..99fd6f1823074139888402d81fb75b845dc71566 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Configure.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Configure.php
@@ -71,7 +71,7 @@ class Configure extends \Magento\Checkout\Controller\Cart
return $resultPage;
} catch (\Exception $e) {
$this->messageManager->addError(__('We cannot configure the product.'));
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$this->_goBack();
return;
}
diff --git a/app/code/Magento/Checkout/Controller/Cart/CouponPost.php b/app/code/Magento/Checkout/Controller/Cart/CouponPost.php
index 346bb38a4a67b5a35a1ebad8a6884e9aa532416d..4bb72d37daeabe00bc6907396144f776127f1030 100644
--- a/app/code/Magento/Checkout/Controller/Cart/CouponPost.php
+++ b/app/code/Magento/Checkout/Controller/Cart/CouponPost.php
@@ -103,7 +103,7 @@ class CouponPost extends \Magento\Checkout\Controller\Cart
$this->messageManager->addError($e->getMessage());
} catch (\Exception $e) {
$this->messageManager->addError(__('We cannot apply the coupon code.'));
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
}
$this->_goBack();
diff --git a/app/code/Magento/Checkout/Controller/Cart/Delete.php b/app/code/Magento/Checkout/Controller/Cart/Delete.php
index 30540402d4ee00b15bb667c6ab78d162c9e7ef5e..0e57262dd25906dc536e44bec19857d3572bfc85 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Delete.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Delete.php
@@ -20,7 +20,7 @@ class Delete extends \Magento\Checkout\Controller\Cart
$this->cart->removeItem($id)->save();
} catch (\Exception $e) {
$this->messageManager->addError(__('We cannot remove the item.'));
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
}
}
$defaultUrl = $this->_objectManager->create('Magento\Framework\UrlInterface')->getUrl('*/*');
diff --git a/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php b/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php
index 91b7c652ae3f6f7e3a04ed9a41cd39c3d5bfa309..7cc5528e1a445174f4c84da1cd71abed96b920a0 100644
--- a/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php
+++ b/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php
@@ -83,7 +83,7 @@ class UpdateItemOptions extends \Magento\Checkout\Controller\Cart
}
} catch (\Exception $e) {
$this->messageManager->addException($e, __('We cannot update the item.'));
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$this->_goBack();
}
$this->_redirect('*/*');
diff --git a/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php b/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php
index 753e4ac69b0074edfb7660b62455afdf32fbb9d3..314755827a7594b2c6388f28439653e0e253124e 100644
--- a/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php
+++ b/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php
@@ -56,7 +56,7 @@ class UpdatePost extends \Magento\Checkout\Controller\Cart
);
} catch (\Exception $e) {
$this->messageManager->addException($e, __('We cannot update the shopping cart.'));
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
}
}
diff --git a/app/code/Magento/Checkout/Controller/Onepage/SaveOrder.php b/app/code/Magento/Checkout/Controller/Onepage/SaveOrder.php
index 18fe3c01b92b9fc56c0e51e4fefded5a2682f460..1fa75bfe5cc228f66932c8b8f013ce4dea1ca416 100644
--- a/app/code/Magento/Checkout/Controller/Onepage/SaveOrder.php
+++ b/app/code/Magento/Checkout/Controller/Onepage/SaveOrder.php
@@ -63,7 +63,7 @@ class SaveOrder extends \Magento\Checkout\Controller\Onepage
$result['goto_section'] = 'payment';
$result['update_section'] = ['name' => 'payment-method', 'html' => $this->_getPaymentMethodsHtml()];
} catch (\Magento\Framework\Model\Exception $e) {
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$this->_objectManager->get(
'Magento\Checkout\Helper\Data'
)->sendPaymentFailedEmail(
@@ -91,7 +91,7 @@ class SaveOrder extends \Magento\Checkout\Controller\Onepage
$this->getOnepage()->getCheckout()->setUpdateSection(null);
}
} catch (\Exception $e) {
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$this->_objectManager->get(
'Magento\Checkout\Helper\Data'
)->sendPaymentFailedEmail(
diff --git a/app/code/Magento/Checkout/Controller/Onepage/SavePayment.php b/app/code/Magento/Checkout/Controller/Onepage/SavePayment.php
index 9e14aae22b385904533d3c2e98538400e65bee63..28e561ecaa53180d864a7f096191dcae93bbf3ce 100644
--- a/app/code/Magento/Checkout/Controller/Onepage/SavePayment.php
+++ b/app/code/Magento/Checkout/Controller/Onepage/SavePayment.php
@@ -56,7 +56,7 @@ class SavePayment extends \Magento\Checkout\Controller\Onepage
} catch (\Magento\Framework\Model\Exception $e) {
$result['error'] = $e->getMessage();
} catch (\Exception $e) {
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$result['error'] = __('Unable to set Payment Method');
}
$this->getResponse()->representJson(
diff --git a/app/code/Magento/Checkout/Model/Type/Onepage.php b/app/code/Magento/Checkout/Model/Type/Onepage.php
index 00496f62cd207ab57452c9f26413ea8319a17a3f..ea05ce051088d4fc8a4e9b243353354a1af8cc99 100644
--- a/app/code/Magento/Checkout/Model/Type/Onepage.php
+++ b/app/code/Magento/Checkout/Model/Type/Onepage.php
@@ -51,7 +51,7 @@ class Onepage
protected $_helper;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $_logger;
@@ -168,7 +168,7 @@ class Onepage
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Checkout\Helper\Data $helper
* @param \Magento\Customer\Model\Url $customerUrl
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Checkout\Model\Session $checkoutSession
* @param \Magento\Customer\Model\Session $customerSession
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
@@ -196,7 +196,7 @@ class Onepage
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Checkout\Helper\Data $helper,
\Magento\Customer\Model\Url $customerUrl,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Checkout\Model\Session $checkoutSession,
\Magento\Customer\Model\Session $customerSession,
\Magento\Store\Model\StoreManagerInterface $storeManager,
@@ -925,7 +925,7 @@ class Onepage
try {
$this->_involveNewCustomer();
} catch (\Exception $e) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
}
}
@@ -953,7 +953,7 @@ class Onepage
try {
$this->orderSender->send($order);
} catch (\Exception $e) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
}
}
diff --git a/app/code/Magento/Checkout/Service/V1/Address/Billing/WriteService.php b/app/code/Magento/Checkout/Service/V1/Address/Billing/WriteService.php
index 8cb870b3fbdb71084f2c0242190df22ceceb17c7..2a5e12158c6f3211718bf3b6e675e8d4c15ea988 100644
--- a/app/code/Magento/Checkout/Service/V1/Address/Billing/WriteService.php
+++ b/app/code/Magento/Checkout/Service/V1/Address/Billing/WriteService.php
@@ -9,7 +9,7 @@ use Magento\Checkout\Service\V1\Address\Validator;
use Magento\Sales\Model\Quote\AddressFactory;
use Magento\Sales\Model\QuoteRepository;
use Magento\Framework\Exception\InputException;
-use Magento\Framework\Logger;
+use Psr\Log\LoggerInterface as Logger;
/** Quote billing address write service object. */
class WriteService implements WriteServiceInterface
@@ -105,7 +105,7 @@ class WriteService implements WriteServiceInterface
try {
$this->quoteRepository->save($quote);
} catch (\Exception $e) {
- $this->logger->logException($e);
+ $this->logger->critical($e);
throw new InputException('Unable to save address. Please, check input data.');
}
return $quote->getBillingAddress()->getId();
diff --git a/app/code/Magento/Checkout/Service/V1/Address/Shipping/WriteService.php b/app/code/Magento/Checkout/Service/V1/Address/Shipping/WriteService.php
index b58cfd6bab45626e9f21139443882f59f2983717..779e20019107a9a6174fe08f241649e1a451132e 100644
--- a/app/code/Magento/Checkout/Service/V1/Address/Shipping/WriteService.php
+++ b/app/code/Magento/Checkout/Service/V1/Address/Shipping/WriteService.php
@@ -6,7 +6,7 @@ namespace Magento\Checkout\Service\V1\Address\Shipping;
use Magento\Framework\Exception\InputException;
use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\Logger;
+use Psr\Log\LoggerInterface as Logger;
/** Quote shipping address write service object. */
class WriteService implements WriteServiceInterface
@@ -102,7 +102,7 @@ class WriteService implements WriteServiceInterface
try {
$this->quoteRepository->save($quote);
} catch (\Exception $e) {
- $this->logger->logException($e);
+ $this->logger->critical($e);
throw new InputException('Unable to save address. Please, check input data.');
}
return $quote->getShippingAddress()->getId();
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php
index 29019f02ee3e8965787c1a0e1d7a819affd7a476..6b5ac115db2b2c489c78fd7f24316579821651d4 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php
@@ -47,7 +47,7 @@ class Directive extends \Magento\Backend\App\Action
} catch (\Exception $e) {
$image->open($this->_objectManager->get('Magento\Cms\Model\Wysiwyg\Config')->getSkinImagePlaceholderUrl());
$response->setHeader('Content-Type', $image->getMimeType())->setBody($image->getImage());
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
}
}
}
diff --git a/app/code/Magento/Cms/Model/Resource/Page/Grid/Collection.php b/app/code/Magento/Cms/Model/Resource/Page/Grid/Collection.php
index d0610198550f7e30095a398abd8b5fd60d83526d..4c97a28717c47aed287dc245611c7c81dbd4d0d1 100644
--- a/app/code/Magento/Cms/Model/Resource/Page/Grid/Collection.php
+++ b/app/code/Magento/Cms/Model/Resource/Page/Grid/Collection.php
@@ -27,7 +27,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
@@ -36,7 +36,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Store\Model\StoreManagerInterface $storeManager,
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
index 688d04e2f09d1eaf330a52c307c3edc5912ed3a4..961e7861f02aee3b4214fd656b54e5189e5f4615 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
@@ -163,7 +163,7 @@ class Configurable extends \Magento\Catalog\Model\Product\Type\AbstractType
* @param \Magento\Core\Helper\File\Storage\Database $fileStorageDb
* @param \Magento\Framework\Filesystem $filesystem
* @param \Magento\Framework\Registry $coreRegistry
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param ProductRepositoryInterface $productRepository
* @param \Magento\ConfigurableProduct\Model\Resource\Product\Type\ConfigurableFactory $typeConfigurableFactory
* @param \Magento\Eav\Model\EntityFactory $entityFactory
@@ -187,7 +187,7 @@ class Configurable extends \Magento\Catalog\Model\Product\Type\AbstractType
\Magento\Core\Helper\File\Storage\Database $fileStorageDb,
\Magento\Framework\Filesystem $filesystem,
\Magento\Framework\Registry $coreRegistry,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
ProductRepositoryInterface $productRepository,
\Magento\ConfigurableProduct\Model\Resource\Product\Type\ConfigurableFactory $typeConfigurableFactory,
\Magento\Eav\Model\EntityFactory $entityFactory,
diff --git a/app/code/Magento/ConfigurableProduct/Model/Resource/Product/Collection/AssociatedProduct.php b/app/code/Magento/ConfigurableProduct/Model/Resource/Product/Collection/AssociatedProduct.php
index 3a6ea1b12da6a5c4b9a0e165ef4c5d3b8d940482..c9c9e020bd5513cb977151e5c8ba20a8b941e9e2 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Resource/Product/Collection/AssociatedProduct.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Resource/Product/Collection/AssociatedProduct.php
@@ -40,7 +40,7 @@ class AssociatedProduct extends \Magento\Catalog\Model\Resource\Product\Collecti
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Eav\Model\Config $eavConfig
@@ -67,7 +67,7 @@ class AssociatedProduct extends \Magento\Catalog\Model\Resource\Product\Collecti
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Eav\Model\Config $eavConfig,
diff --git a/app/code/Magento/ConfigurableProduct/Model/Resource/Product/Type/Configurable/Attribute/Collection.php b/app/code/Magento/ConfigurableProduct/Model/Resource/Product/Type/Configurable/Attribute/Collection.php
index 7ccbfe16b5922f714da46a1bf35ee24903477753..2d8efc12b7a3ebb853607b96413a9d93d5a4b92e 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Resource/Product/Type/Configurable/Attribute/Collection.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Resource/Product/Type/Configurable/Attribute/Collection.php
@@ -66,7 +66,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
@@ -79,7 +79,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Store\Model\StoreManagerInterface $storeManager,
diff --git a/app/code/Magento/Core/Model/File/Storage/Database.php b/app/code/Magento/Core/Model/File/Storage/Database.php
index 61d9202cc4dfe493eb5c6d2a8b5514b6e3661fae..6484ffcb070318e0241d7735a5fd161c20248f75 100644
--- a/app/code/Magento/Core/Model/File/Storage/Database.php
+++ b/app/code/Magento/Core/Model/File/Storage/Database.php
@@ -233,7 +233,7 @@ class Database extends \Magento\Core\Model\File\Storage\Database\AbstractDatabas
$this->_getResource()->saveFile($file);
} catch (\Exception $e) {
$this->_errors[] = $e->getMessage();
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
}
}
diff --git a/app/code/Magento/Core/Model/File/Storage/Directory/Database.php b/app/code/Magento/Core/Model/File/Storage/Directory/Database.php
index be3f8cbd10abc8ca165dd8a3017cb06bf4c6c632..0174d3b1c9047af6ecfae238223ce261e950d9cc 100644
--- a/app/code/Magento/Core/Model/File/Storage/Directory/Database.php
+++ b/app/code/Magento/Core/Model/File/Storage/Directory/Database.php
@@ -201,7 +201,7 @@ class Database extends \Magento\Core\Model\File\Storage\Database\AbstractDatabas
throw new \Magento\Framework\Model\Exception(__('Parent directory does not exist: %1', $dir['path']));
}
} catch (\Exception $e) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
}
}
diff --git a/app/code/Magento/Core/Model/File/Storage/File.php b/app/code/Magento/Core/Model/File/Storage/File.php
index cbc14e1f21fcd0a878ed1fa3ccc4e2dd2054370b..66ac32332d00553ed14c19bdfcaac144f328e5a8 100644
--- a/app/code/Magento/Core/Model/File/Storage/File.php
+++ b/app/code/Magento/Core/Model/File/Storage/File.php
@@ -50,18 +50,18 @@ class File
protected $_errors = [];
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $_logger;
/**
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Core\Helper\File\Storage\Database $storageHelper
* @param \Magento\Core\Helper\File\Media $mediaHelper
* @param \Magento\Core\Model\Resource\File\Storage\File $fileUtility
*/
public function __construct(
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Core\Helper\File\Storage\Database $storageHelper,
\Magento\Core\Helper\File\Media $mediaHelper,
\Magento\Core\Model\Resource\File\Storage\File $fileUtility
@@ -193,7 +193,7 @@ class File
try {
$fileInfo = $this->_mediaHelper->collectFileInfo($this->getMediaBaseDirectory(), $fileName);
} catch (\Exception $e) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
continue;
}
@@ -221,7 +221,7 @@ class File
$this->{$callback}($part);
} catch (\Exception $e) {
$this->_errors[] = $e->getMessage();
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
}
}
@@ -284,7 +284,7 @@ class File
return $this->_fileUtility->saveFile($filename, $file['content'], $overwrite);
} catch (\Exception $e) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
throw new \Magento\Framework\Model\Exception(
__('Unable to save file "%1" at "%2"', $file['filename'], $file['directory'])
);
diff --git a/app/code/Magento/Core/Model/Layout/Merge.php b/app/code/Magento/Core/Model/Layout/Merge.php
index d12c1a07b963ddd1a7ddaed1e99d570b01ec0ac6..a1533f98efb5b846730f43b032c35c6fcbeab978 100644
--- a/app/code/Magento/Core/Model/Layout/Merge.php
+++ b/app/code/Magento/Core/Model/Layout/Merge.php
@@ -113,7 +113,7 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
protected $_layoutValidator;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $_logger;
@@ -132,6 +132,27 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
*/
protected $cacheSuffix;
+ /**
+ * Status for new added handle
+ *
+ * @var int
+ */
+ protected $handleAdded = 1;
+
+ /**
+ * Status for handle being processed
+ *
+ * @var int
+ */
+ protected $handleProcessing = 2;
+
+ /**
+ * Status for processed handle
+ *
+ * @var int
+ */
+ protected $handleProcessed = 3;
+
/**
* Init merge model
*
@@ -143,7 +164,7 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
* @param \Magento\Framework\App\State $appState
* @param \Magento\Framework\Cache\FrontendInterface $cache
* @param \Magento\Core\Model\Layout\Update\Validator $validator
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Filesystem $filesystem
* @param \Magento\Framework\View\Design\ThemeInterface $theme Non-injectable theme instance
* @param string $cacheSuffix
@@ -157,7 +178,7 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
\Magento\Framework\App\State $appState,
\Magento\Framework\Cache\FrontendInterface $cache,
\Magento\Core\Model\Layout\Update\Validator $validator,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Filesystem $filesystem,
\Magento\Framework\View\Design\ThemeInterface $theme = null,
$cacheSuffix = ''
@@ -217,10 +238,10 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
{
if (is_array($handleName)) {
foreach ($handleName as $name) {
- $this->_handles[$name] = 1;
+ $this->_handles[$name] = $this->handleAdded;
}
} else {
- $this->_handles[$handleName] = 1;
+ $this->_handles[$handleName] = $this->handleAdded;
}
return $this;
}
@@ -436,8 +457,7 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
$messages = $this->_layoutValidator->getMessages();
//Add first message to exception
$message = reset($messages);
- $this->_logger->addStreamLog(\Magento\Framework\Logger::LOGGER_SYSTEM);
- $this->_logger->log('Cache file with merged layout: ' . $cacheId . ': ' . $message, \Zend_Log::ERR);
+ $this->_logger->info('Cache file with merged layout: ' . $cacheId . ': ' . $message);
}
}
return $this;
@@ -477,8 +497,16 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
*/
protected function _merge($handle)
{
- $this->_fetchPackageLayoutUpdates($handle);
- $this->_fetchDbLayoutUpdates($handle);
+ if (!isset($this->_handles[$handle]) || $this->_handles[$handle] == $this->handleAdded) {
+ $this->_handles[$handle] = $this->handleProcessing;
+ $this->_fetchPackageLayoutUpdates($handle);
+ $this->_fetchDbLayoutUpdates($handle);
+ $this->_handles[$handle] = $this->handleProcessed;
+ } elseif ($this->_handles[$handle] == $this->handleProcessing
+ && $this->_appState->getMode() === \Magento\Framework\App\State::MODE_DEVELOPER
+ ) {
+ $this->_logger->info('Cyclic dependency in merged layout for handle: ' . $handle);
+ }
return $this;
}
@@ -573,8 +601,6 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
foreach ($updateXml->children() as $child) {
if (strtolower($child->getName()) == 'update' && isset($child['handle'])) {
$this->_merge((string)$child['handle']);
- // Adding merged layout handle to the list of applied handles
- $this->addHandle((string)$child['handle']);
}
}
if (isset($updateXml['layout'])) {
@@ -697,9 +723,8 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
$errors[] = "{$error->message} Line: {$error->line}";
}
- $this->_logger->log(
- sprintf("Theme layout update file '%s' is not valid.\n%s", $fileName, implode("\n", $errors)),
- \Zend_Log::ERR
+ $this->_logger->info(
+ sprintf("Theme layout update file '%s' is not valid.\n%s", $fileName, implode("\n", $errors))
);
}
}
diff --git a/app/code/Magento/Core/Model/Observer.php b/app/code/Magento/Core/Model/Observer.php
index d3a9341f9f3784ee058430b9415c8d8de6c804f4..9f67373accaa208c39b9ab67694480837d9985eb 100644
--- a/app/code/Magento/Core/Model/Observer.php
+++ b/app/code/Magento/Core/Model/Observer.php
@@ -44,7 +44,7 @@ class Observer
protected $_registration;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $_logger;
@@ -55,7 +55,7 @@ class Observer
* @param \Magento\Framework\App\Config\ReinitableConfigInterface $config
* @param \Magento\Framework\View\Asset\Repository $assetRepo
* @param Theme\Registration $registration
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
*/
public function __construct(
\Magento\Framework\App\Cache\Frontend\Pool $cacheFrontendPool,
@@ -64,7 +64,7 @@ class Observer
\Magento\Framework\App\Config\ReinitableConfigInterface $config,
\Magento\Framework\View\Asset\Repository $assetRepo,
\Magento\Core\Model\Theme\Registration $registration,
- \Magento\Framework\Logger $logger
+ \Psr\Log\LoggerInterface $logger
) {
$this->_cacheFrontendPool = $cacheFrontendPool;
$this->_currentTheme = $design->getDesignTheme();
@@ -102,7 +102,7 @@ class Observer
try {
$this->_registration->register($pathPattern);
} catch (\Magento\Framework\Model\Exception $e) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
}
return $this;
}
@@ -133,7 +133,7 @@ class Observer
$this->_pageAssets->add($identifier, $asset);
}
} catch (\InvalidArgumentException $e) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
}
}
}
diff --git a/app/code/Magento/Core/Model/Resource/Design/Collection.php b/app/code/Magento/Core/Model/Resource/Design/Collection.php
index 05c1d98f23ef5ca2e5d53e2bd49e9c8ed9ae351b..4d0f641ead44f21088b74d9ab1b5b9de180875e9 100644
--- a/app/code/Magento/Core/Model/Resource/Design/Collection.php
+++ b/app/code/Magento/Core/Model/Resource/Design/Collection.php
@@ -16,7 +16,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Framework\Stdlib\DateTime $dateTime
@@ -25,7 +25,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Framework\Stdlib\DateTime $dateTime,
diff --git a/app/code/Magento/Core/Model/Resource/File/Storage/File.php b/app/code/Magento/Core/Model/Resource/File/Storage/File.php
index c2bb3fadf75677d160cd522767c7a26421e2fb7a..74e1eb3c16bdb6ad7ec0b0c65298a9e97dada236 100644
--- a/app/code/Magento/Core/Model/Resource/File/Storage/File.php
+++ b/app/code/Magento/Core/Model/Resource/File/Storage/File.php
@@ -17,15 +17,15 @@ class File
protected $_filesystem;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $_logger;
/**
* @param \Magento\Framework\Filesystem $filesystem
- * @param \Magento\Framework\Logger $log
+ * @param \Psr\Log\LoggerInterface $log
*/
- public function __construct(\Magento\Framework\Filesystem $filesystem, \Magento\Framework\Logger $log)
+ public function __construct(\Magento\Framework\Filesystem $filesystem, \Psr\Log\LoggerInterface $log)
{
$this->_logger = $log;
$this->_filesystem = $filesystem;
@@ -98,7 +98,7 @@ class File
try {
$this->_filesystem->getDirectoryWrite(DirectoryList::MEDIA)->create($path);
} catch (\Exception $e) {
- $this->_logger->log($e->getMessage());
+ $this->_logger->info($e->getMessage());
throw new \Magento\Framework\Model\Exception(
__('Unable to create directory: %1', DirectoryList::MEDIA . '/' . $path)
);
@@ -125,7 +125,7 @@ class File
return true;
}
} catch (\Magento\Framework\Filesystem\FilesystemException $e) {
- $this->_logger->log($e->getMessage());
+ $this->_logger->info($e->getMessage());
throw new \Magento\Framework\Model\Exception(__('Unable to save file: %1', $filePath));
}
diff --git a/app/code/Magento/Core/Model/Resource/Layout/Link/Collection.php b/app/code/Magento/Core/Model/Resource/Layout/Link/Collection.php
index 0669794c3c750c752f540622369e1ebc24d41445..926b672c14abab341199293b2b778439d978ddc9 100644
--- a/app/code/Magento/Core/Model/Resource/Layout/Link/Collection.php
+++ b/app/code/Magento/Core/Model/Resource/Layout/Link/Collection.php
@@ -15,7 +15,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
protected $dateTime;
/**
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Framework\Stdlib\DateTime $dateTime
@@ -25,7 +25,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Framework\Stdlib\DateTime $dateTime,
diff --git a/app/code/Magento/Core/Model/Resource/Layout/Update/Collection.php b/app/code/Magento/Core/Model/Resource/Layout/Update/Collection.php
index 01a14102107d7d3ce020063569d60fe86489f0f9..3254d1aa0022bcf53d5bfc6b1e27daa704e85947 100644
--- a/app/code/Magento/Core/Model/Resource/Layout/Update/Collection.php
+++ b/app/code/Magento/Core/Model/Resource/Layout/Update/Collection.php
@@ -30,7 +30,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Framework\Stdlib\DateTime $dateTime
@@ -39,7 +39,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Framework\Stdlib\DateTime $dateTime,
diff --git a/app/code/Magento/Core/etc/config.xml b/app/code/Magento/Core/etc/config.xml
index 77708c9752012092694185487a8ba1b718beafd8..dda5079bb16a5f58d9c45fc4038d5f61808da2f6 100644
--- a/app/code/Magento/Core/etc/config.xml
+++ b/app/code/Magento/Core/etc/config.xml
@@ -19,11 +19,6 @@
<debug>
<profiler>0</profiler>
</debug>
- <log>
- <active>0</active>
- <file>system.log</file>
- <exception_file>exception.log</exception_file>
- </log>
<js>
<merge_files>0</merge_files>
<minify_files>0</minify_files>
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfo.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfo.php
index 5701c366a1d5005e2833030ae9f0e45e3d7806fa..1e2366b20fb8e04714473c5c9bd6c562f326b545 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfo.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfo.php
@@ -128,7 +128,7 @@ class PersonalInfo extends \Magento\Backend\Block\Template
);
return $this->formatDate($date, TimezoneInterface::FORMAT_TYPE_MEDIUM, true);
} catch (\Exception $e) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
return '';
}
}
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Group/Edit/Form.php b/app/code/Magento/Customer/Block/Adminhtml/Group/Edit/Form.php
index fbc41f25069e2176f94a58dc3af7dac0e7bef746..6c67a1f555ef1785e722f1c6db058656e4837707 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Group/Edit/Form.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Group/Edit/Form.php
@@ -115,7 +115,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
'title' => __('Tax Class'),
'class' => 'required-entry',
'required' => true,
- 'values' => $this->_taxCustomer->toOptionArray(true),
+ 'values' => $this->_taxCustomer->toOptionArray(),
]
);
diff --git a/app/code/Magento/Customer/Controller/Account/LoginPost.php b/app/code/Magento/Customer/Controller/Account/LoginPost.php
index 412ed7c140d5de6aefb7b4f6f248f63950bf86e1..e409febe60fdb3563d5d65b8192d0b0451de57fd 100644
--- a/app/code/Magento/Customer/Controller/Account/LoginPost.php
+++ b/app/code/Magento/Customer/Controller/Account/LoginPost.php
@@ -159,7 +159,7 @@ class LoginPost extends \Magento\Customer\Controller\Account
$this->_getSession()->setUsername($login['username']);
} catch (\Exception $e) {
// PA DSS violation: this exception log can disclose customer password
- // $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ // $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$this->messageManager->addError(__('There was an error validating the login and password.'));
}
} else {
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Wishlist.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Wishlist.php
index c1b141f2710bc140e9820f7fa89d0c71d73dbcc0..c0b15e0b4367529daeba48534487094b3d806de2 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Wishlist.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Wishlist.php
@@ -23,7 +23,7 @@ class Wishlist extends \Magento\Customer\Controller\Adminhtml\Index
try {
$this->_objectManager->create('Magento\Wishlist\Model\Item')->load($itemId)->delete();
} catch (\Exception $exception) {
- $this->_objectManager->get('Magento\Framework\Logger')->logException($exception);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($exception);
}
}
diff --git a/app/code/Magento/Customer/Model/AccountManagement.php b/app/code/Magento/Customer/Model/AccountManagement.php
index 5d4dec963603d7fbb5cf948e576b5c9c31047e50..4117585521568920fae4d5502435d19d8c1b9949 100644
--- a/app/code/Magento/Customer/Model/AccountManagement.php
+++ b/app/code/Magento/Customer/Model/AccountManagement.php
@@ -25,7 +25,7 @@ use Magento\Framework\Exception\NoSuchEntityException;
use Magento\Framework\Exception\State\ExpiredException;
use Magento\Framework\Exception\State\InputMismatchException;
use Magento\Framework\Exception\State\InvalidTransitionException;
-use Magento\Framework\Logger;
+use Psr\Log\LoggerInterface as Logger;
use Magento\Framework\Mail\Exception as MailException;
use Magento\Framework\Mail\Template\TransportBuilder;
use Magento\Framework\Math\Random;
@@ -311,7 +311,7 @@ class AccountManagement implements AccountManagementInterface
);
} catch (MailException $e) {
// If we are not able to send a new account email, this should be ignored
- $this->logger->logException($e);
+ $this->logger->critical($e);
}
}
@@ -431,7 +431,7 @@ class AccountManagement implements AccountManagementInterface
}
} catch (MailException $e) {
// If we are not able to send a reset password email, this should be ignored
- $this->logger->logException($e);
+ $this->logger->critical($e);
}
}
@@ -584,7 +584,7 @@ class AccountManagement implements AccountManagementInterface
}
} catch (MailException $e) {
// If we are not able to send a new account email, this should be ignored
- $this->logger->logException($e);
+ $this->logger->critical($e);
}
}
@@ -638,7 +638,7 @@ class AccountManagement implements AccountManagementInterface
try {
$this->sendPasswordResetNotificationEmail($customer);
} catch (MailException $e) {
- $this->logger->logException($e);
+ $this->logger->critical($e);
}
return true;
diff --git a/app/code/Magento/Customer/Model/Attribute/Data/Postcode.php b/app/code/Magento/Customer/Model/Attribute/Data/Postcode.php
index f492c92be48d7f6dc6e149846e1dd3d3ab2cb458..489c138cef5ad3237a29412519e8f8ddb710f3ce 100644
--- a/app/code/Magento/Customer/Model/Attribute/Data/Postcode.php
+++ b/app/code/Magento/Customer/Model/Attribute/Data/Postcode.php
@@ -8,7 +8,7 @@ use Magento\Directory\Helper\Data as DirectoryHelper;
use Magento\Eav\Model\AttributeDataFactory;
use Magento\Framework\App\RequestInterface;
use Magento\Framework\Locale\ResolverInterface;
-use Magento\Framework\Logger;
+use Psr\Log\LoggerInterface as Logger;
use Magento\Framework\Stdlib\DateTime\TimezoneInterface as MagentoTimezone;
/**
diff --git a/app/code/Magento/Customer/Model/Metadata/Form/AbstractData.php b/app/code/Magento/Customer/Model/Metadata/Form/AbstractData.php
index b7f66440bf4dfeed400c4ac9e9f5aad2488a7e42..e5c0978f140307a35b71e6b4f4e0e0fccccf2d8f 100644
--- a/app/code/Magento/Customer/Model/Metadata/Form/AbstractData.php
+++ b/app/code/Magento/Customer/Model/Metadata/Form/AbstractData.php
@@ -57,7 +57,7 @@ abstract class AbstractData
protected $_localeResolver;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $_logger;
@@ -78,7 +78,7 @@ abstract class AbstractData
/**
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Customer\Api\Data\AttributeMetadataInterface $attribute
* @param \Magento\Framework\Locale\ResolverInterface $localeResolver
* @param string|int|bool $value
@@ -87,7 +87,7 @@ abstract class AbstractData
*/
public function __construct(
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Customer\Api\Data\AttributeMetadataInterface $attribute,
\Magento\Framework\Locale\ResolverInterface $localeResolver,
$value,
diff --git a/app/code/Magento/Customer/Model/Metadata/Form/File.php b/app/code/Magento/Customer/Model/Metadata/Form/File.php
index 926e2078f27465b37b7a37c2e43eaa3a25fe0001..2d8f7a9b78f9e4fc81d39738ae85ab47e595a594 100644
--- a/app/code/Magento/Customer/Model/Metadata/Form/File.php
+++ b/app/code/Magento/Customer/Model/Metadata/Form/File.php
@@ -44,7 +44,7 @@ class File extends AbstractData
/**
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Customer\Api\Data\AttributeMetadataInterface $attribute
* @param \Magento\Framework\Locale\ResolverInterface $localeResolver
* @param null $value
@@ -57,7 +57,7 @@ class File extends AbstractData
*/
public function __construct(
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Customer\Api\Data\AttributeMetadataInterface $attribute,
\Magento\Framework\Locale\ResolverInterface $localeResolver,
$value,
@@ -270,7 +270,7 @@ class File extends AbstractData
$uploader->save($mediaDir->getAbsolutePath($this->_entityTypeCode), $value['name']);
$result = $uploader->getUploadedFileName();
} catch (\Exception $e) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
}
}
diff --git a/app/code/Magento/Customer/Model/Metadata/Form/Postcode.php b/app/code/Magento/Customer/Model/Metadata/Form/Postcode.php
index 8cd0d39d0ead8fb27cbc3ab4bf54a36bc2368d47..531f59819281ba8a9349411fbc7b475890df18ab 100644
--- a/app/code/Magento/Customer/Model/Metadata/Form/Postcode.php
+++ b/app/code/Magento/Customer/Model/Metadata/Form/Postcode.php
@@ -8,7 +8,7 @@ use Magento\Customer\Api\Data\AttributeMetadataInterface;
use Magento\Customer\Model\Metadata\ElementFactory;
use Magento\Directory\Helper\Data as DirectoryHelper;
use Magento\Framework\Locale\ResolverInterface;
-use Magento\Framework\Logger;
+use Psr\Log\LoggerInterface as Logger;
use Magento\Framework\Stdlib\DateTime\TimezoneInterface as MagentoTimezone;
/**
diff --git a/app/code/Magento/Customer/Model/Metadata/Form/Text.php b/app/code/Magento/Customer/Model/Metadata/Form/Text.php
index b9aa53407860c3ac9214b9417ff384c9fc895ab4..34802ae362c811c082e6d0a6e6573fa17aef5394 100644
--- a/app/code/Magento/Customer/Model/Metadata/Form/Text.php
+++ b/app/code/Magento/Customer/Model/Metadata/Form/Text.php
@@ -17,7 +17,7 @@ class Text extends AbstractData
/**
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Customer\Api\Data\AttributeMetadataInterface $attribute
* @param \Magento\Framework\Locale\ResolverInterface $localeResolver
* @param string $value
@@ -27,7 +27,7 @@ class Text extends AbstractData
*/
public function __construct(
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Customer\Api\Data\AttributeMetadataInterface $attribute,
\Magento\Framework\Locale\ResolverInterface $localeResolver,
$value,
diff --git a/app/code/Magento/Customer/Model/Resource/Customer/Collection.php b/app/code/Magento/Customer/Model/Resource/Customer/Collection.php
index ab1f24796f95b3e068831d52c80daeee36400dbf..dfd228083a10e04d430c51ae422a314e295e432f 100644
--- a/app/code/Magento/Customer/Model/Resource/Customer/Collection.php
+++ b/app/code/Magento/Customer/Model/Resource/Customer/Collection.php
@@ -28,7 +28,7 @@ class Collection extends \Magento\Eav\Model\Entity\Collection\AbstractCollection
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Eav\Model\Config $eavConfig
@@ -44,7 +44,7 @@ class Collection extends \Magento\Eav\Model\Entity\Collection\AbstractCollection
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Eav\Model\Config $eavConfig,
diff --git a/app/code/Magento/Customer/Model/Vat.php b/app/code/Magento/Customer/Model/Vat.php
index 0bd3d70b8d2c70c6f5ec093e5d01937680fe697f..de7be3cc6061cfec44c2192d8b722fff9cfcaed5 100644
--- a/app/code/Magento/Customer/Model/Vat.php
+++ b/app/code/Magento/Customer/Model/Vat.php
@@ -5,7 +5,7 @@
namespace Magento\Customer\Model;
use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\Logger;
+use Psr\Log\LoggerInterface as Logger;
use Magento\Store\Model\ScopeInterface;
/**
@@ -172,7 +172,7 @@ class Vat
);
if (!extension_loaded('soap')) {
- $this->logger->logException(new \Magento\Framework\Model\Exception(__('PHP SOAP extension is required.')));
+ $this->logger->critical(new \Magento\Framework\Model\Exception(__('PHP SOAP extension is required.')));
return $gatewayResponse;
}
diff --git a/app/code/Magento/Customer/Model/Visitor.php b/app/code/Magento/Customer/Model/Visitor.php
index 0a41a5ba682cf9554e4330eb56a66a90947574c3..642e33c184c5ba1b3477987d45187b518302b176 100644
--- a/app/code/Magento/Customer/Model/Visitor.php
+++ b/app/code/Magento/Customer/Model/Visitor.php
@@ -164,7 +164,7 @@ class Visitor extends \Magento\Framework\Model\AbstractModel
$this->_eventManager->dispatch('visitor_activity_save', ['visitor' => $this]);
$this->session->setVisitorData($this->getData());
} catch (\Exception $e) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
}
return $this;
}
diff --git a/app/code/Magento/Customer/etc/config.xml b/app/code/Magento/Customer/etc/config.xml
index 10a4fcbd2f67215baea83c148bce75131cd61da5..521a80d8c306c793a7a1a56d028a4710548261cb 100644
--- a/app/code/Magento/Customer/etc/config.xml
+++ b/app/code/Magento/Customer/etc/config.xml
@@ -58,7 +58,7 @@ T: {{var telephone}}
{{depend fax}}F: {{var fax}}{{/depend}}
{{depend vat_id}}VAT: {{var vat_id}}{{/depend}}</text>
<oneline>{{depend prefix}}{{var prefix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}{{depend suffix}} {{var suffix}}{{/depend}}, {{var street}}, {{var city}}, {{var region}} {{var postcode}}, {{var country}}</oneline>
- <html><![CDATA[{{depend prefix}}{{var prefix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}{{depend suffix}} {{var suffix}}{{/depend}}<br/>
+ <html><![CDATA[{{depend prefix}}{{var prefix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}{{depend suffix}} {{var suffix}}{{/depend}}{{depend firstname}}<br/>{{/depend}}
{{depend company}}{{var company}}<br />{{/depend}}
{{if street1}}{{var street1}}<br />{{/if}}
{{depend street2}}{{var street2}}<br />{{/depend}}
diff --git a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor.php b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor.php
index 795726faba28c9ab9a787c0eaf257afeb2a19917..c412dc0c274d188b3f53e2065ba89b58843a9fba 100644
--- a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor.php
+++ b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor.php
@@ -123,7 +123,7 @@ class Editor extends \Magento\Backend\App\Action
} catch (\Exception $e) {
$this->messageManager->addError(__('We can\'t load the list of themes.'));
$this->getResponse()->setRedirect($this->_redirect->getRefererUrl());
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
}
}
diff --git a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/AssignThemeToStore.php b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/AssignThemeToStore.php
index 763971b0af06fc4f9ce13adf49d3af3b10cfb8c9..f5083bc5691f095cc2560ddf7dc4eda0cca8a1e9 100644
--- a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/AssignThemeToStore.php
+++ b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/AssignThemeToStore.php
@@ -77,7 +77,7 @@ class AssignThemeToStore extends \Magento\DesignEditor\Controller\Adminhtml\Syst
}
$response = ['message' => $successMessage, 'themeId' => $themeCustomization->getId()];
} catch (\Exception $e) {
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$response = ['error' => true, 'message' => __('This theme is not assigned.')];
}
$this->getResponse()->representJson($coreHelper->jsonEncode($response));
diff --git a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Duplicate.php b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Duplicate.php
index 2cb0ede931f9c08359c4996f68df80596eff1ab7..eca41fcefbff3aabce0f81c654e0e85922e1d190 100644
--- a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Duplicate.php
+++ b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Duplicate.php
@@ -35,9 +35,9 @@ class Duplicate extends \Magento\DesignEditor\Controller\Adminhtml\System\Design
$this->messageManager->addSuccess(__('You saved a duplicate copy of this theme in "My Customizations."'));
} catch (CoreException $e) {
$this->messageManager->addError($e->getMessage());
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
} catch (\Exception $e) {
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$this->messageManager->addError(__('You cannot duplicate this theme.'));
}
$this->getResponse()->setRedirect($this->_redirect->getRefererUrl());
diff --git a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Files/TreeJson.php b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Files/TreeJson.php
index e8955aa585b22512f995f2e9d0c0429fd610571f..a6623aded0a756e80dc39378f4eef1fc78fb3e67 100644
--- a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Files/TreeJson.php
+++ b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Files/TreeJson.php
@@ -23,7 +23,7 @@ class TreeJson extends \Magento\Theme\Controller\Adminhtml\System\Design\Wysiwyg
)
);
} catch (\Exception $e) {
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$this->getResponse()->representJson(
$this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode([])
);
diff --git a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Launch.php b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Launch.php
index 14e1134e7a77e1979c40ad20f82bda874d67dd10..2de06eed51ea4366455e0a8c39c3954e37157e88 100644
--- a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Launch.php
+++ b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Launch.php
@@ -154,12 +154,12 @@ class Launch extends \Magento\DesignEditor\Controller\Adminhtml\System\Design\Ed
$this->_view->renderLayout();
} catch (CoreException $e) {
$this->messageManager->addException($e, $e->getMessage());
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$this->_redirect('adminhtml/*/');
return;
} catch (\Exception $e) {
$this->messageManager->addException($e, __('Sorry, there was an unknown error.'));
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$this->_redirect('adminhtml/*/');
return;
}
diff --git a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/LoadThemeList.php b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/LoadThemeList.php
index 6c4695c701be24d64b569a051158fabad08b7466..a33bd2d476d7e3e17166cc0e7f31279e65993239 100644
--- a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/LoadThemeList.php
+++ b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/LoadThemeList.php
@@ -41,7 +41,7 @@ class LoadThemeList extends \Magento\DesignEditor\Controller\Adminhtml\System\De
$response = ['content' => $this->_view->getLayout()->getOutput()];
} catch (\Exception $e) {
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$response = ['error' => __('Sorry, but we can\'t load the theme list.')];
}
$this->getResponse()->representJson($coreHelper->jsonEncode($response));
diff --git a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/QuickEdit.php b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/QuickEdit.php
index f690b4b7cfc21d6126e3ca7de7cdbebda43162bf..191ba153fba26a4c49098dd274272888a90318b8 100644
--- a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/QuickEdit.php
+++ b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/QuickEdit.php
@@ -31,9 +31,9 @@ class QuickEdit extends \Magento\DesignEditor\Controller\Adminhtml\System\Design
$response = ['success' => true];
} catch (CoreException $e) {
$response = ['error' => true, 'message' => $e->getMessage()];
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
} catch (\Exception $e) {
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$response = ['error' => true, 'message' => __('This theme is not saved.')];
}
$this->getResponse()->representJson($coreHelper->jsonEncode($response));
diff --git a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Revert.php b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Revert.php
index 108d9298fbb26ef374b50c8f7e2d5d62904473ba..7440420675a7573d99f8bf824760c8537bd1749c 100644
--- a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Revert.php
+++ b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Revert.php
@@ -47,7 +47,7 @@ class Revert extends \Magento\DesignEditor\Controller\Adminhtml\System\Design\Ed
}
$response = ['message' => $message];
} catch (\Exception $e) {
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$response = ['error' => true, 'message' => __('Unknown error')];
}
/** @var $coreHelper \Magento\Core\Helper\Data */
diff --git a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Save.php b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Save.php
index 899c59803f8fe2210613e1b8008b30aa93f83286..6594a57ebe54919cf889540db5ce704747b02341 100644
--- a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Save.php
+++ b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Save.php
@@ -28,7 +28,7 @@ class Save extends \Magento\DesignEditor\Controller\Adminhtml\System\Design\Edit
}
$response = ['message' => $message];
} catch (\Exception $e) {
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$response = ['error' => true, 'message' => __('Sorry, there was an unknown error.')];
}
diff --git a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/DeleteCustomFiles.php b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/DeleteCustomFiles.php
index 9d3e391833605fdd57acebb10a5dae898c0e0d32..fec2fb908a960fec8d46cdf153c4e6dd7932ff83 100644
--- a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/DeleteCustomFiles.php
+++ b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/DeleteCustomFiles.php
@@ -22,7 +22,7 @@ class DeleteCustomFiles extends \Magento\DesignEditor\Controller\Adminhtml\Syste
$this->_forward('jsList');
} catch (\Exception $e) {
$this->getResponse()->setRedirect($this->_redirect->getRefererUrl());
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
}
}
}
diff --git a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/JsList.php b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/JsList.php
index f815039bb3a4c5ba8cd368a87854ed8cd3a6936b..b260d9e175d545df4ca9e2e3f45578854b16535e 100644
--- a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/JsList.php
+++ b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/JsList.php
@@ -24,7 +24,7 @@ class JsList extends \Magento\DesignEditor\Controller\Adminhtml\System\Design\Ed
$this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($result)
);
} catch (\Exception $e) {
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
}
}
}
diff --git a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/RemoveQuickStyleImage.php b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/RemoveQuickStyleImage.php
index 933c7c7546bcbe783dd316818ba655bdf47f5486..12b8a161c678cfcda9247bd38c283071c035cfd1 100644
--- a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/RemoveQuickStyleImage.php
+++ b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/RemoveQuickStyleImage.php
@@ -41,14 +41,14 @@ class RemoveQuickStyleImage extends \Magento\DesignEditor\Controller\Adminhtml\S
$response = ['error' => false, 'content' => $result];
} catch (CoreException $e) {
$response = ['error' => true, 'message' => $e->getMessage()];
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
} catch (\Exception $e) {
$errorMessage = __(
'Something went wrong uploading the image.' .
' Please check the file format and try again (JPEG, GIF, or PNG).'
);
$response = ['error' => true, 'message' => $errorMessage];
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
}
$this->getResponse()->representJson(
$this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($response)
diff --git a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/RemoveStoreLogo.php b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/RemoveStoreLogo.php
index a28c14fcc0a806c3a82038e6153e46725810ab32..1d2e9666f080cfe41951f15fee27610408c5ac6e 100644
--- a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/RemoveStoreLogo.php
+++ b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/RemoveStoreLogo.php
@@ -50,14 +50,14 @@ class RemoveStoreLogo extends \Magento\DesignEditor\Controller\Adminhtml\System\
$response = ['error' => false, 'content' => []];
} catch (CoreException $e) {
$response = ['error' => true, 'message' => $e->getMessage()];
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
} catch (\Exception $e) {
$errorMessage = __(
'Something went wrong uploading the image.' .
' Please check the file format and try again (JPEG, GIF, or PNG).'
);
$response = ['error' => true, 'message' => $errorMessage];
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
}
$this->getResponse()->representJson(
$this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($response)
diff --git a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/ReorderJs.php b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/ReorderJs.php
index 692a1479a96086b79d17b64c4f12254a1a754fb4..f7fb123df044622ed48dffe86bf8253ca69e70a3 100644
--- a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/ReorderJs.php
+++ b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/ReorderJs.php
@@ -27,10 +27,10 @@ class ReorderJs extends \Magento\DesignEditor\Controller\Adminhtml\System\Design
$result = ['success' => true];
} catch (CoreException $e) {
$result = ['error' => true, 'message' => $e->getMessage()];
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
} catch (\Exception $e) {
$result = ['error' => true, 'message' => __('We cannot upload the CSS file.')];
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
}
$this->getResponse()->representJson(
$this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($result)
diff --git a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/SaveCssContent.php b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/SaveCssContent.php
index 6edc4c2dc49c012def426e8f9b7a20d18c971405..8e2d1de1c79a2aae482f585c9edfc8c0cc14d1e1 100644
--- a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/SaveCssContent.php
+++ b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/SaveCssContent.php
@@ -35,10 +35,10 @@ class SaveCssContent extends \Magento\DesignEditor\Controller\Adminhtml\System\D
];
} catch (CoreException $e) {
$response = ['error' => true, 'message' => $e->getMessage()];
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
} catch (\Exception $e) {
$response = ['error' => true, 'message' => __('We can\'t save the custom css file.')];
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
}
$this->getResponse()->representJson(
$this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($response)
diff --git a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/SaveImageSizing.php b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/SaveImageSizing.php
index c9d65e7636cf7e8b840828e0d7bca08320a03ca5..d29d45cdedc6f968b47c6955713408c8190f08b3 100644
--- a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/SaveImageSizing.php
+++ b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/SaveImageSizing.php
@@ -35,10 +35,10 @@ class SaveImageSizing extends \Magento\DesignEditor\Controller\Adminhtml\System\
$result = ['success' => true, 'message' => __('We saved the image sizes.')];
} catch (CoreException $e) {
$result = ['error' => true, 'message' => $e->getMessage()];
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
} catch (\Exception $e) {
$result = ['error' => true, 'message' => __('We can\'t save image sizes.')];
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
}
$this->getResponse()->representJson(
$this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($result)
diff --git a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/SaveQuickStyles.php b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/SaveQuickStyles.php
index d14b8bd6365d4774718d3dd2d9464c12962fe005..53b8cbb302685ce34a025683343e95ce6f9a7fd6 100644
--- a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/SaveQuickStyles.php
+++ b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/SaveQuickStyles.php
@@ -31,14 +31,14 @@ class SaveQuickStyles extends \Magento\DesignEditor\Controller\Adminhtml\System\
$response = ['success' => true];
} catch (CoreException $e) {
$response = ['error' => true, 'message' => $e->getMessage()];
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
} catch (\Exception $e) {
$errorMessage = __(
'Something went wrong uploading the image.' .
' Please check the file format and try again (JPEG, GIF, or PNG).'
);
$response = ['error' => true, 'message' => $errorMessage];
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
}
$this->getResponse()->representJson(
$this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($response)
diff --git a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/Upload.php b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/Upload.php
index 928962e41e0f63ab291730be3141d4c6160d7f55..b6bce92f5701576fb7fef661e3ee59f3798dcc8f 100644
--- a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/Upload.php
+++ b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/Upload.php
@@ -39,10 +39,10 @@ class Upload extends \Magento\DesignEditor\Controller\Adminhtml\System\Design\Ed
];
} catch (CoreException $e) {
$response = ['error' => true, 'message' => $e->getMessage()];
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
} catch (\Exception $e) {
$response = ['error' => true, 'message' => __('We cannot upload the CSS file.')];
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
}
$this->getResponse()->representJson(
$this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($response)
diff --git a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/UploadJs.php b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/UploadJs.php
index 62e7e0922a9225d2dd4abe345430671052f9991a..53120e8379b449f5cb6ab084673d89a425440268 100644
--- a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/UploadJs.php
+++ b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/UploadJs.php
@@ -33,10 +33,10 @@ class UploadJs extends \Magento\DesignEditor\Controller\Adminhtml\System\Design\
return;
} catch (CoreException $e) {
$response = ['error' => true, 'message' => $e->getMessage()];
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
} catch (\Exception $e) {
$response = ['error' => true, 'message' => __('We cannot upload the JS file.')];
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
}
$this->getResponse()->representJson(
$this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($response)
diff --git a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/UploadQuickStyleImage.php b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/UploadQuickStyleImage.php
index 113765a967d591117da1ed371fc488c4a80e2c84..9ffd1d2e8cb3cbe42a0b9c6b8cd291a775d9c92b 100644
--- a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/UploadQuickStyleImage.php
+++ b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/UploadQuickStyleImage.php
@@ -39,14 +39,14 @@ class UploadQuickStyleImage extends \Magento\DesignEditor\Controller\Adminhtml\S
} catch (CoreException $e) {
$this->messageManager->addError($e->getMessage());
$response = ['error' => true, 'message' => $e->getMessage()];
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
} catch (\Exception $e) {
$errorMessage = __(
'Something went wrong uploading the image.' .
' Please check the file format and try again (JPEG, GIF, or PNG).'
);
$response = ['error' => true, 'message' => $errorMessage];
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
}
$this->getResponse()->representJson(
$this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($response)
diff --git a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/UploadStoreLogo.php b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/UploadStoreLogo.php
index fa16fc80f141f5fca40e0b83f736edd82a6fc516..ee93ce4c57b1d19771b11d284a651037e82a8ffc 100644
--- a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/UploadStoreLogo.php
+++ b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/UploadStoreLogo.php
@@ -44,14 +44,14 @@ class UploadStoreLogo extends \Magento\DesignEditor\Controller\Adminhtml\System\
$response = ['error' => false, 'content' => ['name' => basename($storeLogo->getValue())]];
} catch (CoreException $e) {
$response = ['error' => true, 'message' => $e->getMessage()];
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
} catch (\Exception $e) {
$errorMessage = __(
'Something went wrong uploading the image.' .
' Please check the file format and try again (JPEG, GIF, or PNG).'
);
$response = ['error' => true, 'message' => $errorMessage];
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
}
$this->getResponse()->representJson(
$this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($response)
diff --git a/app/code/Magento/Dhl/Model/Carrier.php b/app/code/Magento/Dhl/Model/Carrier.php
index e5dd061c91d47f2744c7d6b01c29679bcb99f34f..b81ffca5c1081fc5cdbb8aedb08ee614b6b313ac 100644
--- a/app/code/Magento/Dhl/Model/Carrier.php
+++ b/app/code/Magento/Dhl/Model/Carrier.php
@@ -184,7 +184,7 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
/**
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Sales\Model\Quote\Address\RateResult\ErrorFactory $rateErrorFactory
- * @param \Magento\Framework\Logger\AdapterFactory $logAdapterFactory
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Shipping\Model\Simplexml\ElementFactory $xmlElFactory
* @param \Magento\Shipping\Model\Rate\ResultFactory $rateFactory
* @param \Magento\Sales\Model\Quote\Address\RateResult\MethodFactory $rateMethodFactory
@@ -210,7 +210,7 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Sales\Model\Quote\Address\RateResult\ErrorFactory $rateErrorFactory,
- \Magento\Framework\Logger\AdapterFactory $logAdapterFactory,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Shipping\Model\Simplexml\ElementFactory $xmlElFactory,
\Magento\Shipping\Model\Rate\ResultFactory $rateFactory,
\Magento\Sales\Model\Quote\Address\RateResult\MethodFactory $rateMethodFactory,
@@ -245,7 +245,7 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
parent::__construct(
$scopeConfig,
$rateErrorFactory,
- $logAdapterFactory,
+ $logger,
$xmlElFactory,
$rateFactory,
$rateMethodFactory,
diff --git a/app/code/Magento/Directory/Model/PriceCurrency.php b/app/code/Magento/Directory/Model/PriceCurrency.php
index 1768f841a494ebf8cc392912c038ce00545c4220..3cc16e54ca6e21c768d3f124936ee3098d180162 100644
--- a/app/code/Magento/Directory/Model/PriceCurrency.php
+++ b/app/code/Magento/Directory/Model/PriceCurrency.php
@@ -6,7 +6,7 @@ namespace Magento\Directory\Model;
use Magento\Framework\App\ScopeInterface;
use Magento\Store\Model\StoreManagerInterface;
-use Magento\Framework\Logger;
+use Psr\Log\LoggerInterface as Logger;
use Magento\Store\Model\Store;
/**
@@ -135,7 +135,7 @@ class PriceCurrency implements \Magento\Framework\Pricing\PriceCurrencyInterface
$scope = $this->storeManager->getStore($scope);
}
} catch (\Exception $e) {
- $this->logger->logException($e);
+ $this->logger->critical($e);
$scope = $this->storeManager->getStore();
}
diff --git a/app/code/Magento/Directory/Model/Resource/Country/Collection.php b/app/code/Magento/Directory/Model/Resource/Country/Collection.php
index dbf8bbd6c5917981442fbe1f7a439b30edef649e..ed505ab7aa0f4f69f512080859947e1d06e49ba0 100644
--- a/app/code/Magento/Directory/Model/Resource/Country/Collection.php
+++ b/app/code/Magento/Directory/Model/Resource/Country/Collection.php
@@ -43,7 +43,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Framework\Locale\ListsInterface $localeLists
@@ -56,7 +56,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Framework\Locale\ListsInterface $localeLists,
diff --git a/app/code/Magento/Directory/Model/Resource/Region/Collection.php b/app/code/Magento/Directory/Model/Resource/Region/Collection.php
index 3669796392ec85d2b31692f07b6a9eace72e76e8..25e32fd40f55046c742ba0334f1bba0a134057f1 100644
--- a/app/code/Magento/Directory/Model/Resource/Region/Collection.php
+++ b/app/code/Magento/Directory/Model/Resource/Region/Collection.php
@@ -31,7 +31,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Framework\Locale\ResolverInterface $localeResolver
@@ -40,7 +40,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Framework\Locale\ResolverInterface $localeResolver,
diff --git a/app/code/Magento/Downloadable/Model/Product/Type.php b/app/code/Magento/Downloadable/Model/Product/Type.php
index 054db0e1eb825165c63c86d0127a3020419444aa..3fa35f6189e4a7bd68c7091954cfd62deb8b3893 100644
--- a/app/code/Magento/Downloadable/Model/Product/Type.php
+++ b/app/code/Magento/Downloadable/Model/Product/Type.php
@@ -63,7 +63,7 @@ class Type extends \Magento\Catalog\Model\Product\Type\Virtual
* @param \Magento\Core\Helper\File\Storage\Database $fileStorageDb
* @param \Magento\Framework\Filesystem $filesystem
* @param \Magento\Framework\Registry $coreRegistry
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param ProductRepositoryInterface $productRepository
* @param \Magento\Downloadable\Helper\File $downloadableFile
* @param \Magento\Downloadable\Model\Resource\SampleFactory $sampleResFactory
@@ -82,7 +82,7 @@ class Type extends \Magento\Catalog\Model\Product\Type\Virtual
\Magento\Core\Helper\File\Storage\Database $fileStorageDb,
\Magento\Framework\Filesystem $filesystem,
\Magento\Framework\Registry $coreRegistry,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
ProductRepositoryInterface $productRepository,
\Magento\Downloadable\Helper\File $downloadableFile,
\Magento\Downloadable\Model\Resource\SampleFactory $sampleResFactory,
diff --git a/app/code/Magento/Eav/Model/Attribute/Data/AbstractData.php b/app/code/Magento/Eav/Model/Attribute/Data/AbstractData.php
index d27bd6c57814042e4855fe5c519499a522c10974..f8a52ed7bde3d415e13ba2070b323f79c938789b 100644
--- a/app/code/Magento/Eav/Model/Attribute/Data/AbstractData.php
+++ b/app/code/Magento/Eav/Model/Attribute/Data/AbstractData.php
@@ -75,18 +75,18 @@ abstract class AbstractData
protected $_localeResolver;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $_logger;
/**
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Locale\ResolverInterface $localeResolver
*/
public function __construct(
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Locale\ResolverInterface $localeResolver
) {
$this->_localeDate = $localeDate;
diff --git a/app/code/Magento/Eav/Model/Attribute/Data/File.php b/app/code/Magento/Eav/Model/Attribute/Data/File.php
index 8ef938a8abf6c20abc0be26bdc9f6332dd909f36..94b0e6ff1c674ea60029b541223b0d950d9af585 100644
--- a/app/code/Magento/Eav/Model/Attribute/Data/File.php
+++ b/app/code/Magento/Eav/Model/Attribute/Data/File.php
@@ -38,7 +38,7 @@ class File extends \Magento\Eav\Model\Attribute\Data\AbstractData
/**
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Locale\ResolverInterface $localeResolver
* @param \Magento\Framework\Url\EncoderInterface $urlEncoder
* @param \Magento\Core\Model\File\Validator\NotProtectedExtension $fileValidator
@@ -46,7 +46,7 @@ class File extends \Magento\Eav\Model\Attribute\Data\AbstractData
*/
public function __construct(
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Locale\ResolverInterface $localeResolver,
\Magento\Framework\Url\EncoderInterface $urlEncoder,
\Magento\Core\Model\File\Validator\NotProtectedExtension $fileValidator,
@@ -244,7 +244,7 @@ class File extends \Magento\Eav\Model\Attribute\Data\AbstractData
$fileName = $uploader->getUploadedFileName();
$this->getEntity()->setData($attribute->getAttributeCode(), $fileName);
} catch (\Exception $e) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
}
}
diff --git a/app/code/Magento/Eav/Model/Attribute/Data/Text.php b/app/code/Magento/Eav/Model/Attribute/Data/Text.php
index 32e1485353669eaa6e05d09c17f32546ca15b0c2..e32506f45dd1fcc778016473b9942de3a2e5c29b 100644
--- a/app/code/Magento/Eav/Model/Attribute/Data/Text.php
+++ b/app/code/Magento/Eav/Model/Attribute/Data/Text.php
@@ -20,13 +20,13 @@ class Text extends \Magento\Eav\Model\Attribute\Data\AbstractData
/**
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Locale\ResolverInterface $localeResolver
* @param \Magento\Framework\Stdlib\String $stringHelper
*/
public function __construct(
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Locale\ResolverInterface $localeResolver,
\Magento\Framework\Stdlib\String $stringHelper
) {
diff --git a/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php b/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php
index 4d4709d1ef6a93af472bf973ce74ea2bfdb3b9fb..9c10fc846bce234dfd1992822875ad33fbc30239 100644
--- a/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php
+++ b/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php
@@ -115,7 +115,7 @@ abstract class AbstractCollection extends \Magento\Framework\Data\Collection\Db
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Eav\Model\Config $eavConfig
@@ -127,7 +127,7 @@ abstract class AbstractCollection extends \Magento\Framework\Data\Collection\Db
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Eav\Model\Config $eavConfig,
diff --git a/app/code/Magento/Eav/Model/Entity/Setup/Context.php b/app/code/Magento/Eav/Model/Entity/Setup/Context.php
index 2ce7e2f7411cb2d36d7c1574c1141036046173ca..b08b99d84ab25ba121887f8de16d240ff98ad007 100644
--- a/app/code/Magento/Eav/Model/Entity/Setup/Context.php
+++ b/app/code/Magento/Eav/Model/Entity/Setup/Context.php
@@ -14,7 +14,7 @@ class Context extends \Magento\Framework\Module\Setup\Context
protected $attributeMapper;
/**
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Framework\App\Resource $appResource
* @param \Magento\Framework\Module\Dir\Reader $modulesReader
@@ -26,7 +26,7 @@ class Context extends \Magento\Framework\Module\Setup\Context
* @param PropertyMapperInterface $attributeMapper
*/
public function __construct(
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Framework\App\Resource $appResource,
\Magento\Framework\Module\Dir\Reader $modulesReader,
diff --git a/app/code/Magento/Eav/Model/Resource/Attribute/Collection.php b/app/code/Magento/Eav/Model/Resource/Attribute/Collection.php
index 0a9317b4f9f083245c3570e7d1e789af173b3a73..6cb28f94a1cc2ea38309aa6049d560161aea66e0 100644
--- a/app/code/Magento/Eav/Model/Resource/Attribute/Collection.php
+++ b/app/code/Magento/Eav/Model/Resource/Attribute/Collection.php
@@ -39,7 +39,7 @@ abstract class Collection extends \Magento\Eav\Model\Resource\Entity\Attribute\C
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Eav\Model\Config $eavConfig
@@ -49,7 +49,7 @@ abstract class Collection extends \Magento\Eav\Model\Resource\Entity\Attribute\C
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Eav\Model\Config $eavConfig,
diff --git a/app/code/Magento/Eav/Model/Resource/Entity/Attribute/Collection.php b/app/code/Magento/Eav/Model/Resource/Entity/Attribute/Collection.php
index 8a98da583ab4d6555481cd6d0daa48cdd5033bdd..240a6419a323076b7e5f9b8247adf0439189bacd 100644
--- a/app/code/Magento/Eav/Model/Resource/Entity/Attribute/Collection.php
+++ b/app/code/Magento/Eav/Model/Resource/Entity/Attribute/Collection.php
@@ -27,7 +27,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
/**
* @param \Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Eav\Model\Config $eavConfig
@@ -36,7 +36,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
*/
public function __construct(
\Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Eav\Model\Config $eavConfig,
diff --git a/app/code/Magento/Eav/Model/Resource/Entity/Attribute/Grid/Collection.php b/app/code/Magento/Eav/Model/Resource/Entity/Attribute/Grid/Collection.php
index a6ac2254c5e230400654d59c7e175cca9b01b24d..5aa44c5e8235e0a8592129f2664b300c06c2cc77 100644
--- a/app/code/Magento/Eav/Model/Resource/Entity/Attribute/Grid/Collection.php
+++ b/app/code/Magento/Eav/Model/Resource/Entity/Attribute/Grid/Collection.php
@@ -20,7 +20,7 @@ class Collection extends \Magento\Eav\Model\Resource\Entity\Attribute\Set\Collec
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Framework\Registry $registryManager
@@ -29,7 +29,7 @@ class Collection extends \Magento\Eav\Model\Resource\Entity\Attribute\Set\Collec
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Framework\Registry $registryManager,
diff --git a/app/code/Magento/Eav/Model/Resource/Entity/Attribute/Option/Collection.php b/app/code/Magento/Eav/Model/Resource/Entity/Attribute/Option/Collection.php
index 103f98ab770781d4a5a2438587844d29a96f4009..63f6ace2580efd3b95ca4aa27d1d41434fadbca3 100644
--- a/app/code/Magento/Eav/Model/Resource/Entity/Attribute/Option/Collection.php
+++ b/app/code/Magento/Eav/Model/Resource/Entity/Attribute/Option/Collection.php
@@ -30,7 +30,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Framework\App\Resource $coreResource
@@ -40,7 +40,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Framework\App\Resource $coreResource,
diff --git a/app/code/Magento/Eav/Model/Resource/Form/Attribute/Collection.php b/app/code/Magento/Eav/Model/Resource/Form/Attribute/Collection.php
index 780c1e81c7b2ba0e1190603601a77aa23c76bb69..269fd414eccfec3eb389f5ff0329ecca68a7c889 100644
--- a/app/code/Magento/Eav/Model/Resource/Form/Attribute/Collection.php
+++ b/app/code/Magento/Eav/Model/Resource/Form/Attribute/Collection.php
@@ -51,7 +51,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Eav\Model\Config $eavConfig
@@ -61,7 +61,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Eav\Model\Config $eavConfig,
diff --git a/app/code/Magento/Eav/Model/Resource/Form/Fieldset/Collection.php b/app/code/Magento/Eav/Model/Resource/Form/Fieldset/Collection.php
index 5cd3436044bbe3670e571e3f2b61891a3674b7bb..33a959f9b95c8861e49732fb0705a54172ae9a0f 100644
--- a/app/code/Magento/Eav/Model/Resource/Form/Fieldset/Collection.php
+++ b/app/code/Magento/Eav/Model/Resource/Form/Fieldset/Collection.php
@@ -16,7 +16,7 @@ use Magento\Eav\Model\Form\Type;
use Magento\Framework\Event\ManagerInterface;
use Magento\Framework\Data\Collection\Db\FetchStrategyInterface;
use Magento\Framework\Model\Resource\Db\AbstractDb;
-use Magento\Framework\Logger;
+use Psr\Log\LoggerInterface as Logger;
use Magento\Store\Model\StoreManagerInterface;
class Collection extends \Magento\Framework\Model\Resource\Db\Collection\AbstractCollection
diff --git a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/DefaultTemplate.php b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/DefaultTemplate.php
index cc8e45631d35714be7463e4ad24220c906b6b0b5..8ffde1bd2a1644efffa4be0f3f1c7f56d5f01a11 100644
--- a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/DefaultTemplate.php
+++ b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/DefaultTemplate.php
@@ -29,7 +29,7 @@ class DefaultTemplate extends \Magento\Email\Controller\Adminhtml\Email\Template
$this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($template->getData())
);
} catch (\Exception $e) {
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
}
}
}
diff --git a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Delete.php b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Delete.php
index 3c0b93101cca54768a55c3ac3e7a8a269f6b8007..1e2c4d369644a6cd4bc5992fc05021cebe67b263 100644
--- a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Delete.php
+++ b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Delete.php
@@ -38,7 +38,7 @@ class Delete extends \Magento\Email\Controller\Adminhtml\Email\Template
$this->messageManager->addError(
__('An error occurred while deleting email template data. Please review log and try again.')
);
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
// save data in session
$this->_objectManager->get(
'Magento\Backend\Model\Session'
diff --git a/app/code/Magento/Email/Model/Template/Filter.php b/app/code/Magento/Email/Model/Template/Filter.php
index 062afab9e21218a2ad0d44fb22b38b5153039352..5bdfa48d884481a11c545a9babe2f22fe511ad2f 100644
--- a/app/code/Magento/Email/Model/Template/Filter.php
+++ b/app/code/Magento/Email/Model/Template/Filter.php
@@ -51,7 +51,7 @@ class Filter extends \Magento\Framework\Filter\Template
protected $_assetRepo;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $_logger;
@@ -111,7 +111,7 @@ class Filter extends \Magento\Framework\Filter\Template
/**
* @param \Magento\Framework\Stdlib\String $string
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Escaper $escaper
* @param \Magento\Framework\View\Asset\Repository $assetRepo
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -127,7 +127,7 @@ class Filter extends \Magento\Framework\Filter\Template
*/
public function __construct(
\Magento\Framework\Stdlib\String $string,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Escaper $escaper,
\Magento\Framework\View\Asset\Repository $assetRepo,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -615,7 +615,7 @@ class Filter extends \Magento\Framework\Filter\Template
$value = parent::filter($value);
} catch (\Exception $e) {
$value = '';
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
}
return $value;
}
diff --git a/app/code/Magento/Fedex/Model/Carrier.php b/app/code/Magento/Fedex/Model/Carrier.php
index c614c296009379b0663e930ae36b8be8bb9d5c4e..7f5c390ed91abfddae4ac393b6ab21e97813ce20 100644
--- a/app/code/Magento/Fedex/Model/Carrier.php
+++ b/app/code/Magento/Fedex/Model/Carrier.php
@@ -106,11 +106,6 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
*/
protected $_storeManager;
- /**
- * @var \Magento\Framework\Logger
- */
- protected $_logger;
-
/**
* @var \Magento\Catalog\Model\Resource\Product\CollectionFactory
*/
@@ -119,7 +114,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
/**
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Sales\Model\Quote\Address\RateResult\ErrorFactory $rateErrorFactory
- * @param \Magento\Framework\Logger\AdapterFactory $logAdapterFactory
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Shipping\Model\Simplexml\ElementFactory $xmlElFactory
* @param \Magento\Shipping\Model\Rate\ResultFactory $rateFactory
* @param \Magento\Sales\Model\Quote\Address\RateResult\MethodFactory $rateMethodFactory
@@ -131,7 +126,6 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
* @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
* @param \Magento\Directory\Helper\Data $directoryData
* @param \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry
- * @param \Magento\Framework\Logger $logger
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Module\Dir\Reader $configReader
* @param \Magento\Catalog\Model\Resource\Product\CollectionFactory $productCollectionFactory
@@ -142,7 +136,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Sales\Model\Quote\Address\RateResult\ErrorFactory $rateErrorFactory,
- \Magento\Framework\Logger\AdapterFactory $logAdapterFactory,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Shipping\Model\Simplexml\ElementFactory $xmlElFactory,
\Magento\Shipping\Model\Rate\ResultFactory $rateFactory,
\Magento\Sales\Model\Quote\Address\RateResult\MethodFactory $rateMethodFactory,
@@ -154,7 +148,6 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
\Magento\Directory\Model\CurrencyFactory $currencyFactory,
\Magento\Directory\Helper\Data $directoryData,
\Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry,
- \Magento\Framework\Logger $logger,
\Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Module\Dir\Reader $configReader,
\Magento\Catalog\Model\Resource\Product\CollectionFactory $productCollectionFactory,
@@ -165,7 +158,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
parent::__construct(
$scopeConfig,
$rateErrorFactory,
- $logAdapterFactory,
+ $logger,
$xmlElFactory,
$rateFactory,
$rateMethodFactory,
@@ -183,7 +176,6 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
$this->_shipServiceWsdl = $wsdlBasePath . 'ShipService_v10.wsdl';
$this->_rateServiceWsdl = $wsdlBasePath . 'RateService_v10.wsdl';
$this->_trackServiceWsdl = $wsdlBasePath . 'TrackService_v5.wsdl';
- $this->_logger = $logger;
}
/**
@@ -459,7 +451,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
$debugData['result'] = $response;
} catch (\Exception $e) {
$debugData['result'] = ['error' => $e->getMessage(), 'code' => $e->getCode()];
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
}
} else {
$response = unserialize($response);
@@ -774,7 +766,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
throw new \Exception(__('Failed to parse xml document: %1', $xmlContent));
}
} catch (\Exception $e) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
return false;
}
}
@@ -1038,7 +1030,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
$debugData['result'] = $response;
} catch (\Exception $e) {
$debugData['result'] = ['error' => $e->getMessage(), 'code' => $e->getCode()];
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
}
} else {
$response = unserialize($response);
diff --git a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/ConfirmCaptcha.php b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/ConfirmCaptcha.php
index ed8d3b3a98a690b0223dedb394f7cd4dff3921be..558a8366b6894bad5acefd25626950f02acc3270 100644
--- a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/ConfirmCaptcha.php
+++ b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/ConfirmCaptcha.php
@@ -63,7 +63,7 @@ class ConfirmCaptcha extends \Magento\GoogleShopping\Controller\Adminhtml\Google
)
);
} catch (\Exception $e) {
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$this->messageManager->addError(__('Something went wrong during Captcha confirmation.'));
}
diff --git a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/MassAdd.php b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/MassAdd.php
index 7b25e9e7c05b876038d5206113169387984202ca..d9b56660354788951409602fe7b4da31b1bd7303 100644
--- a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/MassAdd.php
+++ b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/MassAdd.php
@@ -48,7 +48,7 @@ class MassAdd extends \Magento\GoogleShopping\Controller\Adminhtml\Googleshoppin
__('An error has occurred while adding products to google shopping account.'),
$e->getMessage()
);
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
return;
}
diff --git a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/Refresh.php b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/Refresh.php
index a93e723d3fc5e1aa1802f32f94a58c5fa93fad1e..8d9a12f1ee37c128a672494ec75c3879c69db97d 100644
--- a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/Refresh.php
+++ b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/Refresh.php
@@ -55,7 +55,7 @@ class Refresh extends \Magento\GoogleShopping\Controller\Adminhtml\Googleshoppin
'One or more products were not deleted from google shopping account. Refer to the log file for details.'
)
);
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
return;
}
diff --git a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Types/Delete.php b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Types/Delete.php
index c89198bad9b5660918985c2b94b5da30321d84ef..57fc8b200a6f1766396d142c79f6b32f15d7bfcc 100644
--- a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Types/Delete.php
+++ b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Types/Delete.php
@@ -23,7 +23,7 @@ class Delete extends \Magento\GoogleShopping\Controller\Adminhtml\Googleshopping
}
$this->messageManager->addSuccess(__('Attribute set mapping was deleted'));
} catch (\Exception $e) {
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$this->messageManager->addError(__("We can't delete Attribute Set Mapping."));
}
$this->_redirect('adminhtml/*/index', ['store' => $this->_getStore()->getId()]);
diff --git a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Types/Edit.php b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Types/Edit.php
index 9255b7fb806517c38903eedeb527c40f912c8d1e..1817702a5c7e073fe96776ae54c6d2ef43f23c7b 100644
--- a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Types/Edit.php
+++ b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Types/Edit.php
@@ -43,7 +43,7 @@ class Edit extends \Magento\GoogleShopping\Controller\Adminhtml\Googleshopping\T
$this->_view->getPage()->getConfig()->getTitle()->prepend(__('Google Content Attributes'));
$this->_view->renderLayout();
} catch (\Exception $e) {
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$this->messageManager->addError(__("We can't edit Attribute Set Mapping."));
$this->_redirect('adminhtml/*/index');
}
diff --git a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Types/LoadAttributeSets.php b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Types/LoadAttributeSets.php
index 2b9bdd82677da9aa009b4758ccb017b49b9afe3b..3daee5428e1cbc3c03a9e945183c679ba3e9c08b 100644
--- a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Types/LoadAttributeSets.php
+++ b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Types/LoadAttributeSets.php
@@ -23,7 +23,7 @@ class LoadAttributeSets extends \Magento\GoogleShopping\Controller\Adminhtml\Goo
)->toHtml()
);
} catch (\Exception $e) {
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
// just need to output text with error
$this->messageManager->addError(__("We can't load attribute sets."));
}
diff --git a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Types/LoadAttributes.php b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Types/LoadAttributes.php
index 443ea921ab780c879029862ddaa7e3613d0471cf..e427a4664df17b1a48836af4a227832dfa8d4b1e 100644
--- a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Types/LoadAttributes.php
+++ b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Types/LoadAttributes.php
@@ -27,7 +27,7 @@ class LoadAttributes extends \Magento\GoogleShopping\Controller\Adminhtml\Google
)->toHtml()
);
} catch (\Exception $e) {
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
// just need to output text with error
$this->messageManager->addError(__("We can't load attributes."));
}
diff --git a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Types/NewAction.php b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Types/NewAction.php
index ba47fa1415e1f4ecd1f69acc4dfc59ea74996b35..2d56b33d6674e007023ecba237362444af8554d6 100644
--- a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Types/NewAction.php
+++ b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Types/NewAction.php
@@ -26,7 +26,7 @@ class NewAction extends \Magento\GoogleShopping\Controller\Adminhtml\Googleshopp
$this->_view->getPage()->getConfig()->getTitle()->prepend(__('New Google Content Attribute Mapping'));
$this->_view->renderLayout();
} catch (\Exception $e) {
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$this->messageManager->addError(__("We can't create Attribute Set Mapping."));
$this->_redirect('adminhtml/*/index', ['store' => $this->_getStore()->getId()]);
}
diff --git a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Types/Save.php b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Types/Save.php
index 0991036ac84f7be585d493a0704ba6ef90173280..f2ee9b58d4bd82206bd2ca0dd165241180e89873 100644
--- a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Types/Save.php
+++ b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Types/Save.php
@@ -71,7 +71,7 @@ class Save extends \Magento\GoogleShopping\Controller\Adminhtml\Googleshopping\T
);
}
} catch (\Exception $e) {
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$this->messageManager->addError(__("We can't save Attribute Set Mapping."));
}
$this->_redirect('adminhtml/*/index', ['store' => $this->_getStore()->getId()]);
diff --git a/app/code/Magento/GoogleShopping/Model/MassOperations.php b/app/code/Magento/GoogleShopping/Model/MassOperations.php
index 6215f00c349c7b639c7cfa394036be3f66d4d313..52c6f69d1e9d1589b76e8d45e8122332cda2201a 100644
--- a/app/code/Magento/GoogleShopping/Model/MassOperations.php
+++ b/app/code/Magento/GoogleShopping/Model/MassOperations.php
@@ -69,7 +69,7 @@ class MassOperations
* @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
* @param \Magento\Framework\Notification\NotifierInterface $notifier
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\GoogleShopping\Helper\Data $gleShoppingData
* @param \Magento\GoogleShopping\Helper\Category $gleShoppingCategory
* @param array $data
@@ -80,7 +80,7 @@ class MassOperations
\Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
\Magento\Framework\Notification\NotifierInterface $notifier,
\Magento\Store\Model\StoreManagerInterface $storeManager,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\GoogleShopping\Helper\Data $gleShoppingData,
\Magento\GoogleShopping\Helper\Category $gleShoppingCategory,
array $data = []
@@ -119,7 +119,7 @@ class MassOperations
/**
* Logger
*
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $_logger;
@@ -180,7 +180,7 @@ class MassOperations
$e->getMessage()
);
} catch (\Exception $e) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
$errors[] = __('The product "%1" hasn\'t been added to Google Content.', $product->getName());
}
}
@@ -268,7 +268,7 @@ class MassOperations
);
$totalFailed++;
} catch (\Exception $e) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
$errors[] = __('The item "%1" hasn\'t been updated.', $item->getProduct()->getName());
$totalFailed++;
}
@@ -329,7 +329,7 @@ class MassOperations
$item->getProduct()
);
} catch (\Exception $e) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
$errors[] = __('The item "%1" hasn\'t been deleted.', $item->getProduct()->getName());
}
}
diff --git a/app/code/Magento/GoogleShopping/Model/Resource/Item/Collection.php b/app/code/Magento/GoogleShopping/Model/Resource/Item/Collection.php
index 345e68b911d80e2cd68566ccbdcff8b5c2c0d028..4b932e02a34b55bb81791fefd63e280da9a414a3 100644
--- a/app/code/Magento/GoogleShopping/Model/Resource/Item/Collection.php
+++ b/app/code/Magento/GoogleShopping/Model/Resource/Item/Collection.php
@@ -27,7 +27,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Framework\DB\Helper $resourceHelper
@@ -37,7 +37,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Framework\DB\Helper $resourceHelper,
diff --git a/app/code/Magento/GoogleShopping/Model/Service.php b/app/code/Magento/GoogleShopping/Model/Service.php
index 511b5d5998316c236298a199eb732e8070ab0ea0..f1a9814e9c2bda7c35486208930c4a8bbc94d4ee 100644
--- a/app/code/Magento/GoogleShopping/Model/Service.php
+++ b/app/code/Magento/GoogleShopping/Model/Service.php
@@ -32,13 +32,6 @@ class Service extends \Magento\Framework\Object
*/
protected $_config;
- /**
- * Log adapter factory
- *
- * @var \Magento\Framework\Logger\AdapterFactory
- */
- protected $_logAdapterFactory;
-
/**
* Service
* @var \Magento\Framework\Gdata\Gshopping\Content
@@ -52,25 +45,25 @@ class Service extends \Magento\Framework\Object
protected $_contentFactory;
/**
- * Constructor
- *
- * By default is looking for first argument as array and assigns it as object
- * attributes This behavior may change in child classes
- *
- * @param \Magento\Framework\Logger\AdapterFactory $logAdapterFactory
+ * @var \Psr\Log\LoggerInterface
+ */
+ protected $logger;
+
+ /**
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Registry $coreRegistry
- * @param \Magento\GoogleShopping\Model\Config $config
+ * @param Config $config
* @param \Magento\Framework\Gdata\Gshopping\ContentFactory $contentFactory
* @param array $data
*/
public function __construct(
- \Magento\Framework\Logger\AdapterFactory $logAdapterFactory,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Registry $coreRegistry,
\Magento\GoogleShopping\Model\Config $config,
\Magento\Framework\Gdata\Gshopping\ContentFactory $contentFactory,
array $data = []
) {
- $this->_logAdapterFactory = $logAdapterFactory;
+ $this->logger = $logger;
$this->_coreRegistry = $coreRegistry;
$this->_config = $config;
$this->_contentFactory = $contentFactory;
@@ -149,12 +142,7 @@ class Service extends \Magento\Framework\Object
$this->_service = $this->_connect($storeId);
if ($this->getConfig()->getIsDebug($storeId)) {
- $this->_service->setLogAdapter(
- $this->_logAdapterFactory->create(['fileName' => 'googleshopping.log']),
- 'log'
- )->setDebug(
- true
- );
+ $this->_service->setLogAdapter($this->logger, 'debug')->setDebug(true);
}
}
return $this->_service;
diff --git a/app/code/Magento/GoogleShopping/Model/Service/Item.php b/app/code/Magento/GoogleShopping/Model/Service/Item.php
index d00483fe86c40452499aeb47725e71ac4bf6dae1..857945556fc50a10973b7ace2e98b5b28bcc1723 100644
--- a/app/code/Magento/GoogleShopping/Model/Service/Item.php
+++ b/app/code/Magento/GoogleShopping/Model/Service/Item.php
@@ -24,7 +24,7 @@ class Item extends \Magento\GoogleShopping\Model\Service
protected $_date;
/**
- * @param \Magento\Framework\Logger\AdapterFactory $logAdapterFactory
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Registry $coreRegistry
* @param \Magento\GoogleShopping\Model\Config $config
* @param \Magento\Framework\Gdata\Gshopping\ContentFactory $contentFactory
@@ -33,7 +33,7 @@ class Item extends \Magento\GoogleShopping\Model\Service
* @param array $data
*/
public function __construct(
- \Magento\Framework\Logger\AdapterFactory $logAdapterFactory,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Registry $coreRegistry,
\Magento\GoogleShopping\Model\Config $config,
\Magento\Framework\Gdata\Gshopping\ContentFactory $contentFactory,
@@ -43,7 +43,7 @@ class Item extends \Magento\GoogleShopping\Model\Service
) {
$this->_date = $date;
$this->_googleShoppingHelper = $googleShoppingHelper;
- parent::__construct($logAdapterFactory, $coreRegistry, $config, $contentFactory, $data);
+ parent::__construct($logger, $coreRegistry, $config, $contentFactory, $data);
}
/**
diff --git a/app/code/Magento/GroupedProduct/Controller/Adminhtml/Edit/Popup.php b/app/code/Magento/GroupedProduct/Controller/Adminhtml/Edit/Popup.php
index 5d9ffe429bddf70048592aa25424b4c75958091a..350cc7bb4414883212ca006f73128945470b4f45 100644
--- a/app/code/Magento/GroupedProduct/Controller/Adminhtml/Edit/Popup.php
+++ b/app/code/Magento/GroupedProduct/Controller/Adminhtml/Edit/Popup.php
@@ -18,7 +18,7 @@ class Popup extends \Magento\Backend\App\AbstractAction
protected $factory;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $logger;
@@ -26,13 +26,13 @@ class Popup extends \Magento\Backend\App\AbstractAction
* @param \Magento\Backend\App\Action\Context $context
* @param \Magento\Framework\Registry $registry
* @param \Magento\Catalog\Model\ProductFactory $factory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
*/
public function __construct(
\Magento\Backend\App\Action\Context $context,
\Magento\Framework\Registry $registry,
\Magento\Catalog\Model\ProductFactory $factory,
- \Magento\Framework\Logger $logger
+ \Psr\Log\LoggerInterface $logger
) {
$this->registry = $registry;
$this->factory = $factory;
@@ -74,7 +74,7 @@ class Popup extends \Magento\Backend\App\AbstractAction
$product->load($productId);
} catch (\Exception $e) {
$product->setTypeId(\Magento\Catalog\Model\Product\Type::DEFAULT_TYPE);
- $this->logger->logException($e);
+ $this->logger->critical($e);
}
}
diff --git a/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php b/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php
index 34a82a60b5c13b01ea5ca56b1ad0d3eba12feb46..4a6f83b3ffd02087eaec2adcec53bf2b3228c71a 100644
--- a/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php
+++ b/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php
@@ -88,7 +88,7 @@ class Grouped extends \Magento\Catalog\Model\Product\Type\AbstractType
* @param \Magento\Core\Helper\File\Storage\Database $fileStorageDb
* @param \Magento\Framework\Filesystem $filesystem
* @param \Magento\Framework\Registry $coreRegistry
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param ProductRepositoryInterface $productRepository
* @param \Magento\GroupedProduct\Model\Resource\Product\Link $catalogProductLink
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
@@ -107,7 +107,7 @@ class Grouped extends \Magento\Catalog\Model\Product\Type\AbstractType
\Magento\Core\Helper\File\Storage\Database $fileStorageDb,
\Magento\Framework\Filesystem $filesystem,
\Magento\Framework\Registry $coreRegistry,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
ProductRepositoryInterface $productRepository,
\Magento\GroupedProduct\Model\Resource\Product\Link $catalogProductLink,
\Magento\Store\Model\StoreManagerInterface $storeManager,
diff --git a/app/code/Magento/GroupedProduct/Model/Resource/Product/Type/Grouped/AssociatedProductsCollection.php b/app/code/Magento/GroupedProduct/Model/Resource/Product/Type/Grouped/AssociatedProductsCollection.php
index 923420bb700d0af8b30df921acb60a3419503649..c66cd3d23f38bd9054893e690d451666cc1ac963 100644
--- a/app/code/Magento/GroupedProduct/Model/Resource/Product/Type/Grouped/AssociatedProductsCollection.php
+++ b/app/code/Magento/GroupedProduct/Model/Resource/Product/Type/Grouped/AssociatedProductsCollection.php
@@ -27,7 +27,7 @@ class AssociatedProductsCollection extends \Magento\Catalog\Model\Resource\Produ
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Eav\Model\Config $eavConfig
@@ -53,7 +53,7 @@ class AssociatedProductsCollection extends \Magento\Catalog\Model\Resource\Produ
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Eav\Model\Config $eavConfig,
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Export.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Export.php
index d53388494c7a8471ac6a6484714164ce73ee12fe..1ed8b3eb9e2fb36cbe09ebd1b8fb34d868aa844e 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Export.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Export.php
@@ -48,7 +48,7 @@ class Export extends \Magento\ImportExport\Controller\Adminhtml\Export
} catch (\Magento\Framework\Model\Exception $e) {
$this->messageManager->addError($e->getMessage());
} catch (\Exception $e) {
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$this->messageManager->addError(__('Please correct the data sent.'));
}
} else {
diff --git a/app/code/Magento/ImportExport/Model/AbstractModel.php b/app/code/Magento/ImportExport/Model/AbstractModel.php
index ca62620295ef0ca1c32cc4d4ab849e697e5dfb1e..987884e46fabcf9cd3518ec94ea46c809e8a77a0 100644
--- a/app/code/Magento/ImportExport/Model/AbstractModel.php
+++ b/app/code/Magento/ImportExport/Model/AbstractModel.php
@@ -20,12 +20,6 @@ abstract class AbstractModel extends \Magento\Framework\Object
*/
protected $_debugMode = false;
- /**
- * Logger instance
- * @var \Magento\Framework\Logger\Adapter
- */
- protected $_logInstance;
-
/**
* Fields that should be replaced in debug with '***'
*
@@ -41,7 +35,7 @@ abstract class AbstractModel extends \Magento\Framework\Object
protected $_logTrace = [];
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $_logger;
@@ -51,25 +45,17 @@ abstract class AbstractModel extends \Magento\Framework\Object
protected $_varDirectory;
/**
- * @var \Magento\Framework\Logger\AdapterFactory
- */
- protected $_adapterFactory;
-
- /**
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Filesystem $filesystem
- * @param \Magento\Framework\Logger\AdapterFactory $adapterFactory
* @param array $data
*/
public function __construct(
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Filesystem $filesystem,
- \Magento\Framework\Logger\AdapterFactory $adapterFactory,
array $data = []
) {
$this->_logger = $logger;
$this->_varDirectory = $filesystem->getDirectoryWrite(DirectoryList::VAR_DIR);
- $this->_adapterFactory = $adapterFactory;
parent::__construct($data);
}
@@ -87,32 +73,11 @@ abstract class AbstractModel extends \Magento\Framework\Object
} else {
$this->_logTrace[] = $debugData;
}
- if (!$this->_debugMode) {
- return $this;
- }
- if (!$this->_logInstance) {
- $dirName = date('Y/m/d/');
- $fileName = join(
- '_',
- [
- str_replace(':', '-', $this->getRunAt()),
- $this->getScheduledOperationId(),
- $this->getOperationType(),
- $this->getEntity()
- ]
- );
- $path = 'import_export/' . $dirName;
- $this->_varDirectory->create($path);
-
- $fileName = $path . $fileName . '.log';
- $this->_logInstance = $this->_adapterFactory->create(
- ['fileName' => $this->_varDirectory->getAbsolutePath($fileName)]
- )->setFilterDataKeys(
- $this->_debugReplacePrivateDataKeys
- );
+ if ($this->_debugMode) {
+ $this->_logger->debug($debugData);
}
- $this->_logInstance->log($debugData);
+
return $this;
}
diff --git a/app/code/Magento/ImportExport/Model/Export.php b/app/code/Magento/ImportExport/Model/Export.php
index e31fe45df3ddae4c4bcac40588ade572cb1fdc2f..d4555391afd3db51ff40733ae9acb0998a82fc66 100644
--- a/app/code/Magento/ImportExport/Model/Export.php
+++ b/app/code/Magento/ImportExport/Model/Export.php
@@ -56,18 +56,16 @@ class Export extends \Magento\ImportExport\Model\AbstractModel
protected $_exportAdapterFac;
/**
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Filesystem $filesystem
- * @param \Magento\Framework\Logger\AdapterFactory $adapterFactory
* @param \Magento\ImportExport\Model\Export\ConfigInterface $exportConfig
* @param \Magento\ImportExport\Model\Export\Entity\Factory $entityFactory
* @param \Magento\ImportExport\Model\Export\Adapter\Factory $exportAdapterFac
* @param array $data
*/
public function __construct(
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Filesystem $filesystem,
- \Magento\Framework\Logger\AdapterFactory $adapterFactory,
\Magento\ImportExport\Model\Export\ConfigInterface $exportConfig,
\Magento\ImportExport\Model\Export\Entity\Factory $entityFactory,
\Magento\ImportExport\Model\Export\Adapter\Factory $exportAdapterFac,
@@ -76,7 +74,7 @@ class Export extends \Magento\ImportExport\Model\AbstractModel
$this->_exportConfig = $exportConfig;
$this->_entityFactory = $entityFactory;
$this->_exportAdapterFac = $exportAdapterFac;
- parent::__construct($logger, $filesystem, $adapterFactory, $data);
+ parent::__construct($logger, $filesystem, $data);
}
/**
@@ -94,7 +92,7 @@ class Export extends \Magento\ImportExport\Model\AbstractModel
try {
$this->_entityAdapter = $this->_entityFactory->create($entities[$this->getEntity()]['model']);
} catch (\Exception $e) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
throw new \Magento\Framework\Model\Exception(__('Please enter a correct entity model'));
}
if (!$this->_entityAdapter instanceof \Magento\ImportExport\Model\Export\Entity\AbstractEntity &&
@@ -138,7 +136,7 @@ class Export extends \Magento\ImportExport\Model\AbstractModel
try {
$this->_writer = $this->_exportAdapterFac->create($fileFormats[$this->getFileFormat()]['model']);
} catch (\Exception $e) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
throw new \Magento\Framework\Model\Exception(__('Please enter a correct entity model'));
}
if (!$this->_writer instanceof \Magento\ImportExport\Model\Export\Adapter\AbstractAdapter) {
diff --git a/app/code/Magento/ImportExport/Model/Import.php b/app/code/Magento/ImportExport/Model/Import.php
index 6b5900c9b8f384fbffed19b38aabb52c9ff17000..37f63e1ce2978b02343a42855f2a634802f175ac 100644
--- a/app/code/Magento/ImportExport/Model/Import.php
+++ b/app/code/Magento/ImportExport/Model/Import.php
@@ -110,9 +110,8 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
protected $_filesystem;
/**
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Filesystem $filesystem
- * @param \Magento\Framework\Logger\AdapterFactory $adapterFactory
* @param \Magento\ImportExport\Helper\Data $importExportData
* @param \Magento\Framework\App\Config\ScopeConfigInterface $coreConfig
* @param Import\ConfigInterface $importConfig
@@ -126,9 +125,8 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
* @param array $data
*/
public function __construct(
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Filesystem $filesystem,
- \Magento\Framework\Logger\AdapterFactory $adapterFactory,
\Magento\ImportExport\Helper\Data $importExportData,
\Magento\Framework\App\Config\ScopeConfigInterface $coreConfig,
\Magento\ImportExport\Model\Import\ConfigInterface $importConfig,
@@ -152,7 +150,7 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
$this->indexerRegistry = $indexerRegistry;
$this->_behaviorFactory = $behaviorFactory;
$this->_filesystem = $filesystem;
- parent::__construct($logger, $filesystem, $adapterFactory, $data);
+ parent::__construct($logger, $filesystem, $data);
}
/**
@@ -170,7 +168,7 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
try {
$this->_entityAdapter = $this->_entityFactory->create($entities[$this->getEntity()]['model']);
} catch (\Exception $e) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
throw new \Magento\Framework\Model\Exception(__('Please enter a correct entity model'));
}
if (!$this->_entityAdapter instanceof \Magento\ImportExport\Model\Import\Entity\AbstractEntity &&
diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration.php
index 8e8b39726f7aa6506edddd84ef3cb37ae6354d3d..2e1acd132001d7a6f11a4760af2c64791fdd93ef 100644
--- a/app/code/Magento/Integration/Controller/Adminhtml/Integration.php
+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration.php
@@ -27,7 +27,7 @@ class Integration extends Action
*/
protected $_registry;
- /** @var \Magento\Framework\Logger */
+ /** @var \Psr\Log\LoggerInterface */
protected $_logger;
/** @var \Magento\Integration\Service\V1\IntegrationInterface */
@@ -53,7 +53,7 @@ class Integration extends Action
/**
* @param \Magento\Backend\App\Action\Context $context
* @param \Magento\Framework\Registry $registry
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Integration\Service\V1\IntegrationInterface $integrationService
* @param IntegrationOauthService $oauthService
* @param \Magento\Core\Helper\Data $coreHelper
@@ -64,7 +64,7 @@ class Integration extends Action
public function __construct(
\Magento\Backend\App\Action\Context $context,
\Magento\Framework\Registry $registry,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Integration\Service\V1\IntegrationInterface $integrationService,
IntegrationOauthService $oauthService,
\Magento\Core\Helper\Data $coreHelper,
diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Delete.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Delete.php
index 809323333ca0468282167a5363b2b0a802ef87d3..cc56199c514768901e16db7906d57930648de537 100644
--- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Delete.php
+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Delete.php
@@ -52,7 +52,7 @@ class Delete extends \Magento\Integration\Controller\Adminhtml\Integration
} catch (\Magento\Integration\Exception $e) {
$this->messageManager->addError($e->getMessage());
} catch (\Exception $e) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
}
$this->_redirect('*/*/');
}
diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Edit.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Edit.php
index f7523b7c4bfafc80efd2d21cfc67520539c8a69a..52254b3be871968c44ccd583ce9ad8eff5cce426 100644
--- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Edit.php
+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Edit.php
@@ -29,7 +29,7 @@ class Edit extends \Magento\Integration\Controller\Adminhtml\Integration
$this->_redirect('*/*/');
return;
} catch (\Exception $e) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
$this->messageManager->addError(__('Internal error. Check exception log for details.'));
$this->_redirect('*/*');
return;
diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/PermissionsDialog.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/PermissionsDialog.php
index 40c30063f95726935eed857948fe0a4861369f30..8169abfebef32918f4f13e94617d81f7bfbed076 100644
--- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/PermissionsDialog.php
+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/PermissionsDialog.php
@@ -26,7 +26,7 @@ class PermissionsDialog extends \Magento\Integration\Controller\Adminhtml\Integr
$this->_redirect('*/*/');
return;
} catch (\Exception $e) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
$this->messageManager->addError(__('Internal error. Check exception log for details.'));
$this->_redirect('*/*');
return;
diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Save.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Save.php
index 2f580567c2b8815ae2be22b62c1c2dd38da5e092..309b2b80699346bb5274eb0fa632b914a6c0c5c3 100644
--- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Save.php
+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Save.php
@@ -46,7 +46,7 @@ class Save extends \Magento\Integration\Controller\Adminhtml\Integration
$this->_redirect('*/*/');
return;
} catch (\Exception $e) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
$this->messageManager->addError(__('Internal error. Check exception log for details.'));
$this->_redirect('*/*');
return;
@@ -94,7 +94,7 @@ class Save extends \Magento\Integration\Controller\Adminhtml\Integration
$this->messageManager->addError($this->escaper->escapeHtml($e->getMessage()));
$this->_redirectOnSaveError();
} catch (\Exception $e) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
$this->messageManager->addError($this->escaper->escapeHtml($e->getMessage()));
$this->_redirectOnSaveError();
}
diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensDialog.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensDialog.php
index 15cd3f85fc90cb68e5da1c4f50c6a1d884784975..f8747958f2cf44a99bb81da64857d23e0404ecac 100644
--- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensDialog.php
+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensDialog.php
@@ -53,7 +53,7 @@ class TokensDialog extends \Magento\Integration\Controller\Adminhtml\Integration
$this->_redirect('*/*');
return;
} catch (\Exception $e) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
$this->messageManager->addError(__('Internal error. Check exception log for details.'));
$this->_redirect('*/*');
return;
diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensExchange.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensExchange.php
index 7ddd5e935f1ddd35a1d6de2a1a94aff7e4760bb9..342b198336c4afd292f7e40d16c137720fcd1dda 100644
--- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensExchange.php
+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensExchange.php
@@ -64,7 +64,7 @@ class TokensExchange extends \Magento\Integration\Controller\Adminhtml\Integrati
$this->_redirect('*/*');
return;
} catch (\Exception $e) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
$this->messageManager->addError(__('Internal error. Check exception log for details.'));
$this->_redirect('*/*');
return;
diff --git a/app/code/Magento/Integration/Service/V1/AuthorizationService.php b/app/code/Magento/Integration/Service/V1/AuthorizationService.php
index 177ba061c5aee04d5b3af787b14ac25ad63a6119..b6aed4022ff57836428c87d6d371b8325fdf4660 100644
--- a/app/code/Magento/Integration/Service/V1/AuthorizationService.php
+++ b/app/code/Magento/Integration/Service/V1/AuthorizationService.php
@@ -15,7 +15,7 @@ use Magento\Framework\Acl;
use Magento\Framework\Acl\Builder as AclBuilder;
use Magento\Framework\Acl\RootResource as RootAclResource;
use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Logger;
+use Psr\Log\LoggerInterface as Logger;
/**
* Service for integration permissions management.
@@ -101,7 +101,7 @@ class AuthorizationService implements AuthorizationServiceInterface
}
$this->_associateResourcesWithRole($role, $resources);
} catch (\Exception $e) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
throw new LocalizedException('Error happened while granting permissions. Check exception log for details.');
}
}
@@ -122,7 +122,7 @@ class AuthorizationService implements AuthorizationServiceInterface
try {
$this->_deleteRole($integrationId);
} catch (\Exception $e) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
throw new LocalizedException(
'Error happened while deleting role and permissions. Check exception log for details.'
);
diff --git a/app/code/Magento/Integration/Service/V1/Oauth.php b/app/code/Magento/Integration/Service/V1/Oauth.php
index c3c9e30e9e0bd7063f6e188fc2054942a3a9cc05..85f72fca0d09b1fff68bb39966b48980e0a0057c 100644
--- a/app/code/Magento/Integration/Service/V1/Oauth.php
+++ b/app/code/Magento/Integration/Service/V1/Oauth.php
@@ -46,7 +46,7 @@ class Oauth implements OauthInterface
protected $_httpClient;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $_logger;
@@ -68,7 +68,7 @@ class Oauth implements OauthInterface
* @param TokenFactory $tokenFactory
* @param IntegrationOauthHelper $dataHelper
* @param \Magento\Framework\HTTP\ZendClient $httpClient
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param OauthHelper $oauthHelper
* @param TokenProvider $tokenProvider
*/
@@ -78,7 +78,7 @@ class Oauth implements OauthInterface
TokenFactory $tokenFactory,
IntegrationOauthHelper $dataHelper,
\Magento\Framework\HTTP\ZendClient $httpClient,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
OauthHelper $oauthHelper,
TokenProvider $tokenProvider
) {
@@ -220,7 +220,7 @@ class Oauth implements OauthInterface
} catch (\Magento\Framework\Oauth\Exception $exception) {
throw $exception;
} catch (\Exception $exception) {
- $this->_logger->logException($exception);
+ $this->_logger->critical($exception);
throw new \Magento\Framework\Oauth\Exception(
'Unable to post data to consumer due to an unexpected error'
);
diff --git a/app/code/Magento/Log/Model/Resource/Visitor/Online/Collection.php b/app/code/Magento/Log/Model/Resource/Visitor/Online/Collection.php
index cfdaae9d44bfcaf0dbc35466cac34e8a62c7b29b..f0188880781d8a24614e125f5b4f1ebf162aa4a8 100644
--- a/app/code/Magento/Log/Model/Resource/Visitor/Online/Collection.php
+++ b/app/code/Magento/Log/Model/Resource/Visitor/Online/Collection.php
@@ -25,7 +25,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Eav\Helper\Data $eavHelper
@@ -34,7 +34,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Eav\Helper\Data $eavHelper,
diff --git a/app/code/Magento/Log/Model/Resource/Visitor/Online/Grid/Collection.php b/app/code/Magento/Log/Model/Resource/Visitor/Online/Grid/Collection.php
index 32971b43e8dfcf45a4935180d5fba9558a473356..43ad11917851cd5cfa32f66fc5ff88c63f721df6 100644
--- a/app/code/Magento/Log/Model/Resource/Visitor/Online/Grid/Collection.php
+++ b/app/code/Magento/Log/Model/Resource/Visitor/Online/Grid/Collection.php
@@ -15,7 +15,7 @@ class Collection extends \Magento\Log\Model\Resource\Visitor\Online\Collection
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Eav\Helper\Data $eavHelper
@@ -25,7 +25,7 @@ class Collection extends \Magento\Log\Model\Resource\Visitor\Online\Collection
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Eav\Helper\Data $eavHelper,
diff --git a/app/code/Magento/Log/Model/Visitor.php b/app/code/Magento/Log/Model/Visitor.php
index 079e1dd97759db12bdb091b166d711940e4386a8..ea33af37a292a55e6177622df16225b0204153e3 100644
--- a/app/code/Magento/Log/Model/Visitor.php
+++ b/app/code/Magento/Log/Model/Visitor.php
@@ -209,7 +209,7 @@ class Visitor extends \Magento\Framework\Model\AbstractModel
$visitor->setData($this->getData());
}
} catch (\Exception $e) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
}
return $this;
}
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Overview.php b/app/code/Magento/Multishipping/Controller/Checkout/Overview.php
index a49a02698a29986a870c5f2c27df0024810fd104..23474bac028c964372ed0f63321a2f3de5263cc8 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/Overview.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/Overview.php
@@ -41,7 +41,7 @@ class Overview extends \Magento\Multishipping\Controller\Checkout
$this->messageManager->addError($e->getMessage());
$this->_redirect('*/*/billing');
} catch (\Exception $e) {
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$this->messageManager->addException($e, __('We cannot open the overview page.'));
$this->_redirect('*/*/billing');
}
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php b/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php
index 1549d894a76a4f2f02c202319c375b4053f67c0b..22b3cad9e9a88664339df5377634217d1b3abb39 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php
@@ -105,7 +105,7 @@ class OverviewPost extends \Magento\Multishipping\Controller\Checkout
$this->messageManager->addError($e->getMessage());
$this->_redirect('*/*/billing');
} catch (\Exception $e) {
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$this->_objectManager->get(
'Magento\Checkout\Helper\Data'
)->sendPaymentFailedEmail(
diff --git a/app/code/Magento/Newsletter/Model/Resource/Problem/Collection.php b/app/code/Magento/Newsletter/Model/Resource/Problem/Collection.php
index 2725043fc129aef75815329386056c4b428a5278..57fbf47df91360a3c19b7b565eaf49995fba62d6 100644
--- a/app/code/Magento/Newsletter/Model/Resource/Problem/Collection.php
+++ b/app/code/Magento/Newsletter/Model/Resource/Problem/Collection.php
@@ -56,7 +56,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param CustomerRepository $customerRepository
@@ -66,7 +66,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
CustomerRepository $customerRepository,
diff --git a/app/code/Magento/Newsletter/Model/Resource/Queue/Collection.php b/app/code/Magento/Newsletter/Model/Resource/Queue/Collection.php
index c967aa6e7ba393de6207e9e9e500494e4488ec1f..99ad006db65e13ca960f04422f9561b6bb375db0 100644
--- a/app/code/Magento/Newsletter/Model/Resource/Queue/Collection.php
+++ b/app/code/Magento/Newsletter/Model/Resource/Queue/Collection.php
@@ -34,7 +34,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Framework\Stdlib\DateTime\DateTime $date
@@ -43,7 +43,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Framework\Stdlib\DateTime\DateTime $date,
diff --git a/app/code/Magento/Newsletter/Model/Resource/Subscriber/Collection.php b/app/code/Magento/Newsletter/Model/Resource/Subscriber/Collection.php
index 6b405f08c38624878c5474f3d78b9dae2f6bd04a..1da9cb8fd70a0c6d69ebefbbcc0a87207aecf7b6 100644
--- a/app/code/Magento/Newsletter/Model/Resource/Subscriber/Collection.php
+++ b/app/code/Magento/Newsletter/Model/Resource/Subscriber/Collection.php
@@ -57,7 +57,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Eav\Helper\Data $customerHelperData
@@ -66,7 +66,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Eav\Helper\Data $customerHelperData,
diff --git a/app/code/Magento/Newsletter/Model/Subscriber.php b/app/code/Magento/Newsletter/Model/Subscriber.php
index c0b2d96137ac3d5ccffe02f76087acd99fcf6c87..1a29809a3374c527e4935afc100e37783b8abcd7 100644
--- a/app/code/Magento/Newsletter/Model/Subscriber.php
+++ b/app/code/Magento/Newsletter/Model/Subscriber.php
@@ -583,7 +583,7 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
}
} catch (MailException $e) {
// If we are not able to send a new account email, this should be ignored
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
}
}
return $this;
diff --git a/app/code/Magento/OfflinePayments/Model/Banktransfer.php b/app/code/Magento/OfflinePayments/Model/Banktransfer.php
index fb8d31b9c90f378aa80868c318e90d6794861ade..858f68ddc21c5f1881129010d1a389282ef5db9f 100644
--- a/app/code/Magento/OfflinePayments/Model/Banktransfer.php
+++ b/app/code/Magento/OfflinePayments/Model/Banktransfer.php
@@ -32,6 +32,13 @@ class Banktransfer extends \Magento\Payment\Model\Method\AbstractMethod
*/
protected $_infoBlockType = 'Magento\Payment\Block\Info\Instructions';
+ /**
+ * Availability option
+ *
+ * @var bool
+ */
+ protected $_isOffline = true;
+
/**
* Get instructions text from config
*
diff --git a/app/code/Magento/OfflinePayments/Model/Cashondelivery.php b/app/code/Magento/OfflinePayments/Model/Cashondelivery.php
index 74097a82728688af1fb18a4e8a33ab027bbb1959..07ca59f6ac74829f0b2e943ef59c903819e5bbbb 100644
--- a/app/code/Magento/OfflinePayments/Model/Cashondelivery.php
+++ b/app/code/Magento/OfflinePayments/Model/Cashondelivery.php
@@ -30,6 +30,13 @@ class Cashondelivery extends \Magento\Payment\Model\Method\AbstractMethod
*/
protected $_infoBlockType = 'Magento\Payment\Block\Info\Instructions';
+ /**
+ * Availability option
+ *
+ * @var bool
+ */
+ protected $_isOffline = true;
+
/**
* Get instructions text from config
*
diff --git a/app/code/Magento/OfflinePayments/Model/Checkmo.php b/app/code/Magento/OfflinePayments/Model/Checkmo.php
index 4b1bc2b0558421442357a3f48c1698045cb41875..37a8e7a3e20ccac918afb69218f6b774d1b7b102 100644
--- a/app/code/Magento/OfflinePayments/Model/Checkmo.php
+++ b/app/code/Magento/OfflinePayments/Model/Checkmo.php
@@ -21,6 +21,13 @@ class Checkmo extends \Magento\Payment\Model\Method\AbstractMethod
*/
protected $_infoBlockType = 'Magento\OfflinePayments\Block\Info\Checkmo';
+ /**
+ * Availability option
+ *
+ * @var bool
+ */
+ protected $_isOffline = true;
+
/**
* Assign data to info model instance
*
diff --git a/app/code/Magento/OfflinePayments/Model/Purchaseorder.php b/app/code/Magento/OfflinePayments/Model/Purchaseorder.php
index d41a3cdbf77ccc8fbd145243a6742d3addda76e3..0c82a6352f44a227a0b31f7108aa2299f0e37c6d 100644
--- a/app/code/Magento/OfflinePayments/Model/Purchaseorder.php
+++ b/app/code/Magento/OfflinePayments/Model/Purchaseorder.php
@@ -21,6 +21,13 @@ class Purchaseorder extends \Magento\Payment\Model\Method\AbstractMethod
*/
protected $_infoBlockType = 'Magento\OfflinePayments\Block\Info\Purchaseorder';
+ /**
+ * Availability option
+ *
+ * @var bool
+ */
+ protected $_isOffline = true;
+
/**
* Assign data to info model instance
*
diff --git a/app/code/Magento/OfflineShipping/Model/Carrier/Flatrate.php b/app/code/Magento/OfflineShipping/Model/Carrier/Flatrate.php
index 76e0436d79118635ad3750b97f714aca43901e6d..559102029f395fc87912f5226ed104009f1e6afc 100644
--- a/app/code/Magento/OfflineShipping/Model/Carrier/Flatrate.php
+++ b/app/code/Magento/OfflineShipping/Model/Carrier/Flatrate.php
@@ -35,7 +35,7 @@ class Flatrate extends \Magento\Shipping\Model\Carrier\AbstractCarrier implement
/**
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Sales\Model\Quote\Address\RateResult\ErrorFactory $rateErrorFactory
- * @param \Magento\Framework\Logger\AdapterFactory $logAdapterFactory
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Shipping\Model\Rate\ResultFactory $rateResultFactory
* @param \Magento\Sales\Model\Quote\Address\RateResult\MethodFactory $rateMethodFactory
* @param array $data
@@ -43,14 +43,14 @@ class Flatrate extends \Magento\Shipping\Model\Carrier\AbstractCarrier implement
public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Sales\Model\Quote\Address\RateResult\ErrorFactory $rateErrorFactory,
- \Magento\Framework\Logger\AdapterFactory $logAdapterFactory,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Shipping\Model\Rate\ResultFactory $rateResultFactory,
\Magento\Sales\Model\Quote\Address\RateResult\MethodFactory $rateMethodFactory,
array $data = []
) {
$this->_rateResultFactory = $rateResultFactory;
$this->_rateMethodFactory = $rateMethodFactory;
- parent::__construct($scopeConfig, $rateErrorFactory, $logAdapterFactory, $data);
+ parent::__construct($scopeConfig, $rateErrorFactory, $logger, $data);
}
/**
diff --git a/app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php b/app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php
index 0e9274eb72644706d6351adba09a8c031f8ac174..5fac8565babe68fbeeddc2efb95621281c2510b2 100644
--- a/app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php
+++ b/app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php
@@ -36,7 +36,7 @@ class Freeshipping extends \Magento\Shipping\Model\Carrier\AbstractCarrier imple
/**
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Sales\Model\Quote\Address\RateResult\ErrorFactory $rateErrorFactory
- * @param \Magento\Framework\Logger\AdapterFactory $logAdapterFactory
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Shipping\Model\Rate\ResultFactory $rateResultFactory
* @param \Magento\Sales\Model\Quote\Address\RateResult\MethodFactory $rateMethodFactory
* @param array $data
@@ -44,14 +44,14 @@ class Freeshipping extends \Magento\Shipping\Model\Carrier\AbstractCarrier imple
public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Sales\Model\Quote\Address\RateResult\ErrorFactory $rateErrorFactory,
- \Magento\Framework\Logger\AdapterFactory $logAdapterFactory,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Shipping\Model\Rate\ResultFactory $rateResultFactory,
\Magento\Sales\Model\Quote\Address\RateResult\MethodFactory $rateMethodFactory,
array $data = []
) {
$this->_rateResultFactory = $rateResultFactory;
$this->_rateMethodFactory = $rateMethodFactory;
- parent::__construct($scopeConfig, $rateErrorFactory, $logAdapterFactory, $data);
+ parent::__construct($scopeConfig, $rateErrorFactory, $logger, $data);
}
/**
diff --git a/app/code/Magento/OfflineShipping/Model/Carrier/Pickup.php b/app/code/Magento/OfflineShipping/Model/Carrier/Pickup.php
index 16a86670b815c27c12b2e9f76d3c3c48330f5d13..d689bef7b956743e395dc8c406e3f29ffaca2e67 100644
--- a/app/code/Magento/OfflineShipping/Model/Carrier/Pickup.php
+++ b/app/code/Magento/OfflineShipping/Model/Carrier/Pickup.php
@@ -30,7 +30,7 @@ class Pickup extends \Magento\Shipping\Model\Carrier\AbstractCarrier implements
/**
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Sales\Model\Quote\Address\RateResult\ErrorFactory $rateErrorFactory
- * @param \Magento\Framework\Logger\AdapterFactory $logAdapterFactory
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Shipping\Model\Rate\ResultFactory $rateResultFactory
* @param \Magento\Sales\Model\Quote\Address\RateResult\MethodFactory $rateMethodFactory
* @param array $data
@@ -38,14 +38,14 @@ class Pickup extends \Magento\Shipping\Model\Carrier\AbstractCarrier implements
public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Sales\Model\Quote\Address\RateResult\ErrorFactory $rateErrorFactory,
- \Magento\Framework\Logger\AdapterFactory $logAdapterFactory,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Shipping\Model\Rate\ResultFactory $rateResultFactory,
\Magento\Sales\Model\Quote\Address\RateResult\MethodFactory $rateMethodFactory,
array $data = []
) {
$this->_rateResultFactory = $rateResultFactory;
$this->_rateMethodFactory = $rateMethodFactory;
- parent::__construct($scopeConfig, $rateErrorFactory, $logAdapterFactory, $data);
+ parent::__construct($scopeConfig, $rateErrorFactory, $logger, $data);
}
/**
diff --git a/app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php b/app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php
index 60cb1f3faa31754161d4252a53b72e74ad34e810..710c6b45ff3d3f630d6c267038d3e21934a07e1a 100644
--- a/app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php
+++ b/app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php
@@ -45,7 +45,7 @@ class Tablerate extends \Magento\Shipping\Model\Carrier\AbstractCarrier implemen
/**
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Sales\Model\Quote\Address\RateResult\ErrorFactory $rateErrorFactory
- * @param \Magento\Framework\Logger\AdapterFactory $logAdapterFactory
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Shipping\Model\Rate\ResultFactory $rateResultFactory
* @param \Magento\Sales\Model\Quote\Address\RateResult\MethodFactory $resultMethodFactory
* @param \Magento\OfflineShipping\Model\Resource\Carrier\TablerateFactory $tablerateFactory
@@ -54,7 +54,7 @@ class Tablerate extends \Magento\Shipping\Model\Carrier\AbstractCarrier implemen
public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Sales\Model\Quote\Address\RateResult\ErrorFactory $rateErrorFactory,
- \Magento\Framework\Logger\AdapterFactory $logAdapterFactory,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Shipping\Model\Rate\ResultFactory $rateResultFactory,
\Magento\Sales\Model\Quote\Address\RateResult\MethodFactory $resultMethodFactory,
\Magento\OfflineShipping\Model\Resource\Carrier\TablerateFactory $tablerateFactory,
@@ -63,7 +63,7 @@ class Tablerate extends \Magento\Shipping\Model\Carrier\AbstractCarrier implemen
$this->_rateResultFactory = $rateResultFactory;
$this->_resultMethodFactory = $resultMethodFactory;
$this->_tablerateFactory = $tablerateFactory;
- parent::__construct($scopeConfig, $rateErrorFactory, $logAdapterFactory, $data);
+ parent::__construct($scopeConfig, $rateErrorFactory, $logger, $data);
foreach ($this->getCode('condition_name') as $k => $v) {
$this->_conditionNames[] = $k;
}
diff --git a/app/code/Magento/OfflineShipping/Model/Resource/Carrier/Tablerate.php b/app/code/Magento/OfflineShipping/Model/Resource/Carrier/Tablerate.php
index 9b019fd194de8d4b9399ddaa5712882dca3930f0..ee3d001166fe36c91e84a81052a41899959b1b7a 100644
--- a/app/code/Magento/OfflineShipping/Model/Resource/Carrier/Tablerate.php
+++ b/app/code/Magento/OfflineShipping/Model/Resource/Carrier/Tablerate.php
@@ -85,7 +85,7 @@ class Tablerate extends \Magento\Framework\Model\Resource\Db\AbstractDb
protected $_coreConfig;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $_logger;
@@ -118,7 +118,7 @@ class Tablerate extends \Magento\Framework\Model\Resource\Db\AbstractDb
/**
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\App\Config\ScopeConfigInterface $coreConfig
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\OfflineShipping\Model\Carrier\Tablerate $carrierTablerate
@@ -128,7 +128,7 @@ class Tablerate extends \Magento\Framework\Model\Resource\Db\AbstractDb
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\App\Config\ScopeConfigInterface $coreConfig,
\Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\OfflineShipping\Model\Carrier\Tablerate $carrierTablerate,
@@ -316,7 +316,7 @@ class Tablerate extends \Magento\Framework\Model\Resource\Db\AbstractDb
} catch (\Exception $e) {
$adapter->rollback();
$stream->close();
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
throw new \Magento\Framework\Model\Exception(__('Something went wrong while importing table rates.'));
}
diff --git a/app/code/Magento/Payment/Model/Method/AbstractMethod.php b/app/code/Magento/Payment/Model/Method/AbstractMethod.php
index 993666627b4ea931f3692fd596a06825617380d9..7f20e76e347c2f68f2c20d37711d84bf6efbd230 100644
--- a/app/code/Magento/Payment/Model/Method/AbstractMethod.php
+++ b/app/code/Magento/Payment/Model/Method/AbstractMethod.php
@@ -70,6 +70,13 @@ abstract class AbstractMethod extends \Magento\Framework\Object implements Metho
*/
protected $_isGateway = false;
+ /**
+ * Payment Method feature
+ *
+ * @var bool
+ */
+ protected $_isOffline = false;
+
/**
* Payment Method feature
*
@@ -197,33 +204,29 @@ abstract class AbstractMethod extends \Magento\Framework\Object implements Metho
protected $_eventManager;
/**
- * Log adapter factory
- *
- * @var \Magento\Framework\Logger\AdapterFactory
+ * @var \Psr\Log\LoggerInterface
*/
- protected $_logAdapterFactory;
+ protected $logger;
/**
- * Construct
- *
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Payment\Helper\Data $paymentData
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Framework\Logger\AdapterFactory $logAdapterFactory
+ * @param \Psr\Log\LoggerInterface $logger
* @param array $data
*/
public function __construct(
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Payment\Helper\Data $paymentData,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Framework\Logger\AdapterFactory $logAdapterFactory,
+ \Psr\Log\LoggerInterface $logger,
array $data = []
) {
parent::__construct($data);
+ $this->logger = $logger;
$this->_eventManager = $eventManager;
$this->_paymentData = $paymentData;
$this->_scopeConfig = $scopeConfig;
- $this->_logAdapterFactory = $logAdapterFactory;
}
/**
@@ -370,6 +373,16 @@ abstract class AbstractMethod extends \Magento\Framework\Object implements Metho
return $this->_isGateway;
}
+ /**
+ * Retrieve payment method online/offline flag
+ *
+ * @return bool
+ */
+ public function isOffline()
+ {
+ return $this->_isOffline;
+ }
+
/**
* Flag if we need to run payment initialize while order place
*
@@ -773,13 +786,7 @@ abstract class AbstractMethod extends \Magento\Framework\Object implements Metho
protected function _debug($debugData)
{
if ($this->getDebugFlag()) {
- $this->_logAdapterFactory->create(
- ['fileName' => 'payment_' . $this->getCode() . '.log']
- )->setFilterDataKeys(
- $this->_debugReplacePrivateDataKeys
- )->log(
- $debugData
- );
+ $this->logger->debug($debugData);
}
}
diff --git a/app/code/Magento/Payment/Model/Method/Cc.php b/app/code/Magento/Payment/Model/Method/Cc.php
index 457911b28ea2dc90fdf0bf1eb04f36f7e963ed51..d7383e31db1168005ad8286d553b7e23656e00bd 100644
--- a/app/code/Magento/Payment/Model/Method/Cc.php
+++ b/app/code/Magento/Payment/Model/Method/Cc.php
@@ -38,19 +38,11 @@ class Cc extends \Magento\Payment\Model\Method\AbstractMethod
*/
protected $_centinelService;
- /**
- * Construct
- *
- * @var \Magento\Framework\Logger
- */
- protected $_logger;
-
/**
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Payment\Helper\Data $paymentData
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Framework\Logger\AdapterFactory $logAdapterFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Module\ModuleListInterface $moduleList
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Centinel\Model\Service $centinelService
@@ -60,16 +52,14 @@ class Cc extends \Magento\Payment\Model\Method\AbstractMethod
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Payment\Helper\Data $paymentData,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Framework\Logger\AdapterFactory $logAdapterFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Module\ModuleListInterface $moduleList,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Centinel\Model\Service $centinelService,
array $data = []
) {
- parent::__construct($eventManager, $paymentData, $scopeConfig, $logAdapterFactory, $data);
+ parent::__construct($eventManager, $paymentData, $scopeConfig, $logger, $data);
$this->_moduleList = $moduleList;
- $this->_logger = $logger;
$this->_localeDate = $localeDate;
$this->_centinelService = $centinelService;
}
diff --git a/app/code/Magento/Payment/Model/Method/Free.php b/app/code/Magento/Payment/Model/Method/Free.php
index e5bf9c1ba6e1d12487da9d9f930b2ebf6660b970..7463a08bcd5ddb5ae7a065ff16f99b94843bde2b 100644
--- a/app/code/Magento/Payment/Model/Method/Free.php
+++ b/app/code/Magento/Payment/Model/Method/Free.php
@@ -43,7 +43,7 @@ class Free extends \Magento\Payment\Model\Method\AbstractMethod
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Payment\Helper\Data $paymentData
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Framework\Logger\AdapterFactory $logAdapterFactory
+ * @param \Psr\Log\LoggerInterface $logger
* @param PriceCurrencyInterface $priceCurrency
* @param array $data
*/
@@ -51,11 +51,11 @@ class Free extends \Magento\Payment\Model\Method\AbstractMethod
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Payment\Helper\Data $paymentData,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Framework\Logger\AdapterFactory $logAdapterFactory,
+ \Psr\Log\LoggerInterface $logger,
PriceCurrencyInterface $priceCurrency,
array $data = []
) {
- parent::__construct($eventManager, $paymentData, $scopeConfig, $logAdapterFactory, $data);
+ parent::__construct($eventManager, $paymentData, $scopeConfig, $logger, $data);
$this->priceCurrency = $priceCurrency;
}
diff --git a/app/code/Magento/Persistent/Block/Header/Additional.php b/app/code/Magento/Persistent/Block/Header/Additional.php
index 298052731e37a41d9aebf3e266ddc9cf6bb38b49..4b7f83d2e233582f4b890ea4f41e181224ccad96 100644
--- a/app/code/Magento/Persistent/Block/Header/Additional.php
+++ b/app/code/Magento/Persistent/Block/Header/Additional.php
@@ -44,6 +44,7 @@ class Additional extends \Magento\Framework\View\Element\Html\Link
\Magento\Customer\Api\CustomerRepositoryInterface $customerRepository,
array $data = []
) {
+ $this->isScopePrivate = true;
$this->_customerViewHelper = $customerViewHelper;
$this->_persistentSessionHelper = $persistentSessionHelper;
$this->customerRepository = $customerRepository;
@@ -68,12 +69,16 @@ class Additional extends \Magento\Framework\View\Element\Html\Link
*/
protected function _toHtml()
{
- $persistentName = $this->_escaper->escapeHtml(
- $this->_customerViewHelper->getCustomerName(
- $this->customerRepository->getById($this->_persistentSessionHelper->getSession()->getCustomerId())
- )
- );
- return '<span><a ' . $this->getLinkAttributes() . ' >' . $this->escapeHtml(__('(Not %1?)', $persistentName))
- . '</a></span>';
+ if ($this->_persistentSessionHelper->getSession()->getCustomerId()) {
+ $persistentName = $this->escapeHtml(
+ $this->_customerViewHelper->getCustomerName(
+ $this->customerRepository->getById($this->_persistentSessionHelper->getSession()->getCustomerId())
+ )
+ );
+ return '<span><a ' . $this->getLinkAttributes() . ' >' . __('(Not %1?)', $persistentName)
+ . '</a></span>';
+ }
+
+ return '';
}
}
diff --git a/app/code/Magento/Persistent/Model/Layout/DepersonalizePlugin.php b/app/code/Magento/Persistent/Model/Layout/DepersonalizePlugin.php
new file mode 100644
index 0000000000000000000000000000000000000000..46bf6df52128910be28b0609f07219113b827492
--- /dev/null
+++ b/app/code/Magento/Persistent/Model/Layout/DepersonalizePlugin.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+namespace Magento\Persistent\Model\Layout;
+
+/**
+ * Class DepersonalizePlugin
+ */
+class DepersonalizePlugin
+{
+ /**
+ * @var \Magento\Persistent\Model\Session
+ */
+ protected $persistentSession;
+
+ /**
+ * @var \Magento\Framework\App\RequestInterface
+ */
+ protected $request;
+
+ /**
+ * @var \Magento\Framework\Module\Manager
+ */
+ protected $moduleManager;
+
+ /**
+ * @var \Magento\PageCache\Model\Config
+ */
+ protected $cacheConfig;
+
+ /**
+ * Constructor
+ *
+ * @param \Magento\Persistent\Model\Session $persistentSession
+ * @param \Magento\Framework\App\RequestInterface $request
+ * @param \Magento\Framework\Module\Manager $moduleManager
+ * @param \Magento\PageCache\Model\Config $cacheConfig
+ */
+ public function __construct(
+ \Magento\Persistent\Model\Session $persistentSession,
+ \Magento\Framework\App\RequestInterface $request,
+ \Magento\Framework\Module\Manager $moduleManager,
+ \Magento\PageCache\Model\Config $cacheConfig
+ ) {
+ $this->persistentSession = $persistentSession;
+ $this->request = $request;
+ $this->moduleManager = $moduleManager;
+ $this->cacheConfig = $cacheConfig;
+ }
+
+ /**
+ * After generate Xml
+ *
+ * @param \Magento\Framework\View\LayoutInterface $subject
+ * @param \Magento\Framework\View\LayoutInterface $result
+ * @return \Magento\Framework\View\LayoutInterface
+ */
+ public function afterGenerateXml(
+ \Magento\Framework\View\LayoutInterface $subject,
+ \Magento\Framework\View\LayoutInterface $result
+ ) {
+ if ($this->moduleManager->isEnabled('Magento_PageCache')
+ && $this->cacheConfig->isEnabled()
+ && !$this->request->isAjax()
+ && $subject->isCacheable()
+ ) {
+ $this->persistentSession->setCustomerId(null);
+ }
+
+ return $result;
+ }
+}
diff --git a/app/code/Magento/Persistent/composer.json b/app/code/Magento/Persistent/composer.json
index f875228c958126bafe01cfa9cfdf4569009e0ea3..b09817d8ff1016da036ca2d00aaf19e8de40b322 100644
--- a/app/code/Magento/Persistent/composer.json
+++ b/app/code/Magento/Persistent/composer.json
@@ -9,6 +9,7 @@
"magento/module-customer": "0.42.0-beta1",
"magento/module-sales": "0.42.0-beta1",
"magento/module-cron": "0.42.0-beta1",
+ "magento/module-page-cache": "0.42.0-beta1",
"magento/framework": "0.42.0-beta1",
"magento/magento-composer-installer": "*"
},
diff --git a/app/code/Magento/Persistent/etc/frontend/di.xml b/app/code/Magento/Persistent/etc/frontend/di.xml
index 08f489c24699059cb7dc67e01d60f1dac3bd7276..d35e4c3dc204c404b59100908e77862ad3f0ef68 100644
--- a/app/code/Magento/Persistent/etc/frontend/di.xml
+++ b/app/code/Magento/Persistent/etc/frontend/di.xml
@@ -12,4 +12,10 @@
</argument>
</arguments>
</type>
+ <type name="Magento\Framework\View\Layout">
+ <plugin name="persistent-session-depersonalize"
+ type="Magento\Persistent\Model\Layout\DepersonalizePlugin"
+ sortOrder="10"
+ />
+ </type>
</config>
diff --git a/app/code/Magento/Persistent/etc/module.xml b/app/code/Magento/Persistent/etc/module.xml
index 0a201d7d4ef6e18d49d03945c7e64f55e31288c9..c71ae0efdf48609f9f666542e7b7584fbb3356c5 100644
--- a/app/code/Magento/Persistent/etc/module.xml
+++ b/app/code/Magento/Persistent/etc/module.xml
@@ -8,6 +8,7 @@
<module name="Magento_Persistent" schema_version="2.0.0">
<sequence>
<module name="Magento_Checkout"/>
+ <module name="Magento_PageCache"/>
</sequence>
</module>
</config>
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Viewed.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Viewed.php
index 00d5e13925e95928fe018ba1f23784ea9fab9fe5..18e7b255e42388be0d491ae9364929c0c814e5e2 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Viewed.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/Viewed.php
@@ -49,7 +49,7 @@ class Viewed extends \Magento\Reports\Controller\Adminhtml\Report\Product
$this->messageManager->addError(
__('An error occurred while showing the product views report. Please review the log and try again.')
);
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$this->_redirect('reports/*/viewed/');
return;
}
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshLifetime.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshLifetime.php
index 56ca83847b4b662efa53df013ae9a381ed4302b2..956d727041cb81bd6f01998fdb1b536858e1e2d6 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshLifetime.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshLifetime.php
@@ -25,7 +25,7 @@ class RefreshLifetime extends \Magento\Reports\Controller\Adminhtml\Report\Stati
$this->messageManager->addError($e->getMessage());
} catch (\Exception $e) {
$this->messageManager->addError(__('We can\'t refresh lifetime statistics.'));
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
}
if ($this->_getSession()->isFirstPageAfterLogin()) {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshRecent.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshRecent.php
index c66170a2e787d12c366c405da51563443420843d..dd6cf080fa7560515e829314fd1b24157ebdedd5 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshRecent.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshRecent.php
@@ -28,7 +28,7 @@ class RefreshRecent extends \Magento\Reports\Controller\Adminhtml\Report\Statist
$this->messageManager->addError($e->getMessage());
} catch (\Exception $e) {
$this->messageManager->addError(__('We can\'t refresh recent statistics.'));
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
}
if ($this->_getSession()->isFirstPageAfterLogin()) {
diff --git a/app/code/Magento/Reports/Model/Resource/Customer/Collection.php b/app/code/Magento/Reports/Model/Resource/Customer/Collection.php
index bf5a1d3c700a0ce830cf9b4b4f652e4c82f8109a..12bf75598b5ce03613ddf542ab597cc2608189ae 100644
--- a/app/code/Magento/Reports/Model/Resource/Customer/Collection.php
+++ b/app/code/Magento/Reports/Model/Resource/Customer/Collection.php
@@ -67,7 +67,7 @@ class Collection extends \Magento\Customer\Model\Resource\Customer\Collection
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Eav\Model\Config $eavConfig
@@ -85,7 +85,7 @@ class Collection extends \Magento\Customer\Model\Resource\Customer\Collection
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Eav\Model\Config $eavConfig,
diff --git a/app/code/Magento/Reports/Model/Resource/Order/Collection.php b/app/code/Magento/Reports/Model/Resource/Order/Collection.php
index d5fbb0d48a288dcf2923b2bb97cf5d37927afa5e..5e90b28e091f91435c6c8191e095de26ed664541 100644
--- a/app/code/Magento/Reports/Model/Resource/Order/Collection.php
+++ b/app/code/Magento/Reports/Model/Resource/Order/Collection.php
@@ -56,7 +56,7 @@ class Collection extends \Magento\Sales\Model\Resource\Order\Collection
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Framework\DB\Helper $coreResourceHelper
@@ -72,7 +72,7 @@ class Collection extends \Magento\Sales\Model\Resource\Order\Collection
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Framework\DB\Helper $coreResourceHelper,
diff --git a/app/code/Magento/Reports/Model/Resource/Product/Collection.php b/app/code/Magento/Reports/Model/Resource/Product/Collection.php
index 04c689b3eb98a8929773043674aad1d8285444a7..28ad32d28ed42b4d9cf85cba759f019529edc7a8 100644
--- a/app/code/Magento/Reports/Model/Resource/Product/Collection.php
+++ b/app/code/Magento/Reports/Model/Resource/Product/Collection.php
@@ -54,7 +54,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Eav\Model\Config $eavConfig
@@ -81,7 +81,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Eav\Model\Config $eavConfig,
diff --git a/app/code/Magento/Reports/Model/Resource/Product/Index/Collection/AbstractCollection.php b/app/code/Magento/Reports/Model/Resource/Product/Index/Collection/AbstractCollection.php
index 5e3234b2262125a59fd8cd83876cbccd94aa4ae6..6a980688534b0193bc37a14a75e5ba9b99af2916 100644
--- a/app/code/Magento/Reports/Model/Resource/Product/Index/Collection/AbstractCollection.php
+++ b/app/code/Magento/Reports/Model/Resource/Product/Index/Collection/AbstractCollection.php
@@ -26,7 +26,7 @@ abstract class AbstractCollection extends \Magento\Catalog\Model\Resource\Produc
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Eav\Model\Config $eavConfig
@@ -51,7 +51,7 @@ abstract class AbstractCollection extends \Magento\Catalog\Model\Resource\Produc
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Eav\Model\Config $eavConfig,
diff --git a/app/code/Magento/Reports/Model/Resource/Product/Lowstock/Collection.php b/app/code/Magento/Reports/Model/Resource/Product/Lowstock/Collection.php
index 6e6251cad6c8b0bedfaad479017ce950911ef04c..c6e28286319ba8f1efd8ac45b823d244031c4b6f 100644
--- a/app/code/Magento/Reports/Model/Resource/Product/Lowstock/Collection.php
+++ b/app/code/Magento/Reports/Model/Resource/Product/Lowstock/Collection.php
@@ -43,7 +43,7 @@ class Collection extends \Magento\Reports\Model\Resource\Product\Collection
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Eav\Model\Config $eavConfig
@@ -73,7 +73,7 @@ class Collection extends \Magento\Reports\Model\Resource\Product\Collection
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Eav\Model\Config $eavConfig,
diff --git a/app/code/Magento/Reports/Model/Resource/Quote/Collection.php b/app/code/Magento/Reports/Model/Resource/Quote/Collection.php
index 89c1a3ea0d6d09572aaea5d3b92db780860d84ae..50a0031ab5f117d7c448c1b18aff05a204fdf362 100644
--- a/app/code/Magento/Reports/Model/Resource/Quote/Collection.php
+++ b/app/code/Magento/Reports/Model/Resource/Quote/Collection.php
@@ -45,7 +45,7 @@ class Collection extends \Magento\Sales\Model\Resource\Quote\Collection
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Catalog\Model\Resource\Product\Collection $productResource
@@ -55,7 +55,7 @@ class Collection extends \Magento\Sales\Model\Resource\Quote\Collection
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Catalog\Model\Resource\Product\Collection $productResource,
diff --git a/app/code/Magento/Reports/Model/Resource/Report/AbstractReport.php b/app/code/Magento/Reports/Model/Resource/Report/AbstractReport.php
index 62b6de167e8b70bf3ae00e8550a8c318487cef9f..8fea5b72d7d088f6857cae95a62c95a6d5ffdf7c 100644
--- a/app/code/Magento/Reports/Model/Resource/Report/AbstractReport.php
+++ b/app/code/Magento/Reports/Model/Resource/Report/AbstractReport.php
@@ -18,7 +18,7 @@ abstract class AbstractReport extends \Magento\Framework\Model\Resource\Db\Abstr
protected $_flag = null;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $_logger;
@@ -34,7 +34,7 @@ abstract class AbstractReport extends \Magento\Framework\Model\Resource\Db\Abstr
/**
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Reports\Model\FlagFactory $reportsFlagFactory
* @param \Magento\Framework\Stdlib\DateTime $dateTime
@@ -42,7 +42,7 @@ abstract class AbstractReport extends \Magento\Framework\Model\Resource\Db\Abstr
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Reports\Model\FlagFactory $reportsFlagFactory,
\Magento\Framework\Stdlib\DateTime $dateTime,
@@ -451,7 +451,7 @@ abstract class AbstractReport extends \Magento\Framework\Model\Resource\Db\Abstr
$nextPeriod = $tr['time'];
}
} catch (\Exception $e) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
}
return $tzTransitions;
diff --git a/app/code/Magento/Reports/Model/Resource/Report/Product/Viewed.php b/app/code/Magento/Reports/Model/Resource/Report/Product/Viewed.php
index 8224d7952e7543ac21bd2cbb8c49ddfcfbb109aa..0065c5b791cdf2d76f5d0d1af73e23a4afd3cf24 100644
--- a/app/code/Magento/Reports/Model/Resource/Report/Product/Viewed.php
+++ b/app/code/Magento/Reports/Model/Resource/Report/Product/Viewed.php
@@ -39,7 +39,7 @@ class Viewed extends \Magento\Sales\Model\Resource\Report\AbstractReport
/**
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Reports\Model\FlagFactory $reportsFlagFactory
* @param \Magento\Framework\Stdlib\DateTime $dateTime
@@ -49,7 +49,7 @@ class Viewed extends \Magento\Sales\Model\Resource\Report\AbstractReport
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Reports\Model\FlagFactory $reportsFlagFactory,
\Magento\Framework\Stdlib\DateTime $dateTime,
diff --git a/app/code/Magento/Reports/Model/Resource/Report/Product/Viewed/Collection.php b/app/code/Magento/Reports/Model/Resource/Report/Product/Viewed/Collection.php
index b23f2bbafb1cbeba3b87ac8a412e1902277fa269..7923155007ee7995f81221472893c18f14eb24e8 100644
--- a/app/code/Magento/Reports/Model/Resource/Report/Product/Viewed/Collection.php
+++ b/app/code/Magento/Reports/Model/Resource/Report/Product/Viewed/Collection.php
@@ -26,7 +26,7 @@ class Collection extends \Magento\Reports\Model\Resource\Report\Collection\Abstr
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Sales\Model\Resource\Report $resource
@@ -34,7 +34,7 @@ class Collection extends \Magento\Reports\Model\Resource\Report\Collection\Abstr
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Sales\Model\Resource\Report $resource,
diff --git a/app/code/Magento/Reports/Model/Resource/Review/Customer/Collection.php b/app/code/Magento/Reports/Model/Resource/Review/Customer/Collection.php
index 4d9785f546263814bda5dc25c6dcdcfda47d75c6..6c3e9d99b3e7eba017fc1d6e252d132c0489b512 100644
--- a/app/code/Magento/Reports/Model/Resource/Review/Customer/Collection.php
+++ b/app/code/Magento/Reports/Model/Resource/Review/Customer/Collection.php
@@ -19,7 +19,7 @@ class Collection extends \Magento\Review\Model\Resource\Review\Collection
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Review\Helper\Data $reviewData
@@ -31,7 +31,7 @@ class Collection extends \Magento\Review\Model\Resource\Review\Collection
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Review\Helper\Data $reviewData,
diff --git a/app/code/Magento/Reports/Model/Resource/Wishlist/Collection.php b/app/code/Magento/Reports/Model/Resource/Wishlist/Collection.php
index f06e1bcabab3cac47db11b47ed1147c14cc2fa32..c692dc1c0acb6415564316f1febe3cee7112c835 100644
--- a/app/code/Magento/Reports/Model/Resource/Wishlist/Collection.php
+++ b/app/code/Magento/Reports/Model/Resource/Wishlist/Collection.php
@@ -26,7 +26,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Customer\Model\Resource\Customer\CollectionFactory $customerResFactory
@@ -35,7 +35,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Customer\Model\Resource\Customer\CollectionFactory $customerResFactory,
diff --git a/app/code/Magento/Review/Controller/Product.php b/app/code/Magento/Review/Controller/Product.php
index 35f6a85f6e8296f879e666c17c0410b0436a6dd4..1bbc2610ff55c1960cc791a575bcaa62fe062572 100644
--- a/app/code/Magento/Review/Controller/Product.php
+++ b/app/code/Magento/Review/Controller/Product.php
@@ -47,7 +47,7 @@ class Product extends \Magento\Framework\App\Action\Action
/**
* Logger
*
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $_logger;
@@ -98,7 +98,7 @@ class Product extends \Magento\Framework\App\Action\Action
* @param \Magento\Framework\Registry $coreRegistry
* @param \Magento\Customer\Model\Session $customerSession
* @param \Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
* @param \Magento\Review\Model\ReviewFactory $reviewFactory
* @param \Magento\Review\Model\RatingFactory $ratingFactory
@@ -112,7 +112,7 @@ class Product extends \Magento\Framework\App\Action\Action
\Magento\Framework\Registry $coreRegistry,
\Magento\Customer\Model\Session $customerSession,
\Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
\Magento\Review\Model\ReviewFactory $reviewFactory,
\Magento\Review\Model\RatingFactory $ratingFactory,
@@ -195,7 +195,7 @@ class Product extends \Magento\Framework\App\Action\Action
['product' => $product, 'controller_action' => $this]
);
} catch (\Magento\Framework\Model\Exception $e) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
return false;
}
diff --git a/app/code/Magento/Review/Model/Resource/Rating.php b/app/code/Magento/Review/Model/Resource/Rating.php
index afc92f067d858fa376eeaca682dd7910e755ae76..64ba57293a0439589dd2a25a84dddcba36be9725 100644
--- a/app/code/Magento/Review/Model/Resource/Rating.php
+++ b/app/code/Magento/Review/Model/Resource/Rating.php
@@ -26,13 +26,13 @@ class Rating extends \Magento\Framework\Model\Resource\Db\AbstractDb
protected $moduleManager;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $_logger;
/**
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Module\Manager $moduleManager
* @param \Magento\Review\Helper\Data $ratingData
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
@@ -40,7 +40,7 @@ class Rating extends \Magento\Framework\Model\Resource\Db\AbstractDb
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Module\Manager $moduleManager,
\Magento\Review\Helper\Data $ratingData,
\Magento\Store\Model\StoreManagerInterface $storeManager,
@@ -197,7 +197,7 @@ class Rating extends \Magento\Framework\Model\Resource\Db\AbstractDb
}
$adapter->commit();
} catch (\Exception $e) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
$adapter->rollBack();
}
}
@@ -233,7 +233,7 @@ class Rating extends \Magento\Framework\Model\Resource\Db\AbstractDb
$adapter->commit();
} catch (\Exception $e) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
$adapter->rollBack();
}
}
diff --git a/app/code/Magento/Review/Model/Resource/Rating/Collection.php b/app/code/Magento/Review/Model/Resource/Rating/Collection.php
index 59a4578e2931d6aaa87081fd929c3604867a4e95..290814cf08be1a5eb87399854e7660f61d43939a 100644
--- a/app/code/Magento/Review/Model/Resource/Rating/Collection.php
+++ b/app/code/Magento/Review/Model/Resource/Rating/Collection.php
@@ -29,7 +29,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
@@ -39,7 +39,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Store\Model\StoreManagerInterface $storeManager,
diff --git a/app/code/Magento/Review/Model/Resource/Rating/Grid/Collection.php b/app/code/Magento/Review/Model/Resource/Rating/Grid/Collection.php
index 69875d13f8592f23355724c79dde99b4042e00b2..57c530f0a0c10d3531106a6189de672237ec89d4 100644
--- a/app/code/Magento/Review/Model/Resource/Rating/Grid/Collection.php
+++ b/app/code/Magento/Review/Model/Resource/Rating/Grid/Collection.php
@@ -20,7 +20,7 @@ class Collection extends \Magento\Review\Model\Resource\Rating\Collection
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
@@ -31,7 +31,7 @@ class Collection extends \Magento\Review\Model\Resource\Rating\Collection
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Store\Model\StoreManagerInterface $storeManager,
diff --git a/app/code/Magento/Review/Model/Resource/Rating/Option/Vote/Collection.php b/app/code/Magento/Review/Model/Resource/Rating/Option/Vote/Collection.php
index 02a3d934520ffc0f36f05255225238e44e0aa13a..c106f65892a244979dd8c154496714bad72d1524 100644
--- a/app/code/Magento/Review/Model/Resource/Rating/Option/Vote/Collection.php
+++ b/app/code/Magento/Review/Model/Resource/Rating/Option/Vote/Collection.php
@@ -25,7 +25,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
@@ -35,7 +35,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Store\Model\StoreManagerInterface $storeManager,
diff --git a/app/code/Magento/Review/Model/Resource/Review/Collection.php b/app/code/Magento/Review/Model/Resource/Review/Collection.php
index 2e2694c0f86144afb52a2f5071a7af2d8cb551bb..7c0e4fb196a42855429dfe08f8605cae8efc64b6 100644
--- a/app/code/Magento/Review/Model/Resource/Review/Collection.php
+++ b/app/code/Magento/Review/Model/Resource/Review/Collection.php
@@ -75,7 +75,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Review\Helper\Data $reviewData
@@ -86,7 +86,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Review\Helper\Data $reviewData,
diff --git a/app/code/Magento/Review/Model/Resource/Review/Product/Collection.php b/app/code/Magento/Review/Model/Resource/Review/Product/Collection.php
index ea67d81c0569b551276eb8fc8419030354d6cdc6..e43f85a0fcfe56a5690e6480c15faf3b55319a26 100644
--- a/app/code/Magento/Review/Model/Resource/Review/Product/Collection.php
+++ b/app/code/Magento/Review/Model/Resource/Review/Product/Collection.php
@@ -57,7 +57,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Eav\Model\Config $eavConfig
@@ -83,7 +83,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Eav\Model\Config $eavConfig,
diff --git a/app/code/Magento/Review/Model/Resource/Review/Summary/Collection.php b/app/code/Magento/Review/Model/Resource/Review/Summary/Collection.php
index b4b00c2d252676b38633a7012505b5ed389c1a75..db45d49c4ce6e9dd1186ae981e5a7fceb482caca 100644
--- a/app/code/Magento/Review/Model/Resource/Review/Summary/Collection.php
+++ b/app/code/Magento/Review/Model/Resource/Review/Summary/Collection.php
@@ -20,13 +20,13 @@ class Collection extends \Magento\Framework\Data\Collection\Db
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\App\Resource $resource
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\App\Resource $resource
) {
diff --git a/app/code/Magento/Review/view/frontend/layout/checkout_cart_configure.xml b/app/code/Magento/Review/view/frontend/layout/checkout_cart_configure.xml
index 94b9ab847723132217f742a18acf43d1fbcf9172..046550a20b83495449fbfd29e7e49c37cdc35cee 100644
--- a/app/code/Magento/Review/view/frontend/layout/checkout_cart_configure.xml
+++ b/app/code/Magento/Review/view/frontend/layout/checkout_cart_configure.xml
@@ -5,6 +5,7 @@
*/
-->
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
+ <update handle="catalog_product_view"/>
<body>
<referenceBlock name="reviews.tab">
<block class="Magento\Review\Block\Form\Configure" name="product.review.form" as="review_form">
diff --git a/app/code/Magento/Review/view/frontend/layout/wishlist_index_configure.xml b/app/code/Magento/Review/view/frontend/layout/wishlist_index_configure.xml
new file mode 100644
index 0000000000000000000000000000000000000000..046550a20b83495449fbfd29e7e49c37cdc35cee
--- /dev/null
+++ b/app/code/Magento/Review/view/frontend/layout/wishlist_index_configure.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
+ <update handle="catalog_product_view"/>
+ <body>
+ <referenceBlock name="reviews.tab">
+ <block class="Magento\Review\Block\Form\Configure" name="product.review.form" as="review_form">
+ <container name="product.review.form.fields.before" as="form_fields_before" label="Review Form Fields Before"/>
+ </block>
+ </referenceBlock>
+ </body>
+</page>
diff --git a/app/code/Magento/Rss/App/Action/Plugin/BackendAuthentication.php b/app/code/Magento/Rss/App/Action/Plugin/BackendAuthentication.php
index 7e8d7dfefe0057f55cfe19aa9eaac7acf7da8280..46bf1c318dc9d35e09980f606df81dd29f103cf6 100644
--- a/app/code/Magento/Rss/App/Action/Plugin/BackendAuthentication.php
+++ b/app/code/Magento/Rss/App/Action/Plugin/BackendAuthentication.php
@@ -22,7 +22,7 @@ class BackendAuthentication extends \Magento\Backend\App\Action\Plugin\Authentic
protected $httpAuthentication;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $logger;
@@ -43,7 +43,7 @@ class BackendAuthentication extends \Magento\Backend\App\Action\Plugin\Authentic
* @param \Magento\Framework\App\ActionFlag $actionFlag
* @param \Magento\Framework\Message\ManagerInterface $messageManager
* @param \Magento\Framework\HTTP\Authentication $httpAuthentication
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\AuthorizationInterface $authorization
* @param array $aclResources
*/
@@ -54,7 +54,7 @@ class BackendAuthentication extends \Magento\Backend\App\Action\Plugin\Authentic
\Magento\Framework\App\ActionFlag $actionFlag,
\Magento\Framework\Message\ManagerInterface $messageManager,
\Magento\Framework\HTTP\Authentication $httpAuthentication,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\AuthorizationInterface $authorization,
array $aclResources
) {
@@ -99,7 +99,7 @@ class BackendAuthentication extends \Magento\Backend\App\Action\Plugin\Authentic
try {
$this->_auth->login($login, $password);
} catch (\Magento\Backend\Model\Auth\Exception $e) {
- $this->logger->logException($e);
+ $this->logger->critical($e);
}
}
diff --git a/app/code/Magento/Rss/Controller/Feed.php b/app/code/Magento/Rss/Controller/Feed.php
index 889bbd05af316dde3837f3a0764eed8f747a9999..06a19e3c9dad0117bc9de3ddb12f3559eae07f04 100644
--- a/app/code/Magento/Rss/Controller/Feed.php
+++ b/app/code/Magento/Rss/Controller/Feed.php
@@ -25,7 +25,7 @@ class Feed extends \Magento\Framework\App\Action\Action
protected $httpAuthentication;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $logger;
@@ -52,7 +52,7 @@ class Feed extends \Magento\Framework\App\Action\Action
* @param \Magento\Customer\Model\Session $customerSession
* @param \Magento\Customer\Api\AccountManagementInterface $customerAccountManagement
* @param \Magento\Framework\HTTP\Authentication $httpAuthentication
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
*/
public function __construct(
\Magento\Framework\App\Action\Context $context,
@@ -62,7 +62,7 @@ class Feed extends \Magento\Framework\App\Action\Action
\Magento\Customer\Model\Session $customerSession,
\Magento\Customer\Api\AccountManagementInterface $customerAccountManagement,
\Magento\Framework\HTTP\Authentication $httpAuthentication,
- \Magento\Framework\Logger $logger
+ \Psr\Log\LoggerInterface $logger
) {
$this->rssManager = $rssManager;
$this->scopeConfig = $scopeConfig;
@@ -86,7 +86,7 @@ class Feed extends \Magento\Framework\App\Action\Action
$this->customerSession->setCustomerDataAsLoggedIn($customer);
$this->customerSession->regenerateId();
} catch (\Exception $e) {
- $this->logger->logException($e);
+ $this->logger->critical($e);
}
}
diff --git a/app/code/Magento/Rule/Model/Condition/AbstractCondition.php b/app/code/Magento/Rule/Model/Condition/AbstractCondition.php
index 9c2987de3a34dc978ab3cf524df4cb1fd2d42ea1..916a1404540f9cc36f91ca68729da4a18983fde1 100644
--- a/app/code/Magento/Rule/Model/Condition/AbstractCondition.php
+++ b/app/code/Magento/Rule/Model/Condition/AbstractCondition.php
@@ -832,12 +832,17 @@ abstract class AbstractCondition extends \Magento\Framework\Object implements Co
}
/**
- * @param \Magento\Framework\Object $object
+ * @param \Magento\Framework\Model\AbstractModel $model
* @return bool
*/
- public function validate(\Magento\Framework\Object $object)
+ public function validate(\Magento\Framework\Model\AbstractModel $model)
{
- return $this->validateAttribute($object->getData($this->getAttribute()));
+ if (!$model->hasData($this->getAttribute())) {
+ $model->load($model->getId());
+ }
+ $attributeValue = $model->getData($this->getAttribute());
+
+ return $this->validateAttribute($attributeValue);
}
/**
diff --git a/app/code/Magento/Rule/Model/Condition/Combine.php b/app/code/Magento/Rule/Model/Condition/Combine.php
index 8e9355a4957b2b026656f4e896a588e3f5f7a49e..45d78849d03861b87eb1701dde8d8156716808ff 100644
--- a/app/code/Magento/Rule/Model/Condition/Combine.php
+++ b/app/code/Magento/Rule/Model/Condition/Combine.php
@@ -12,7 +12,7 @@ class Combine extends AbstractCondition
protected $_conditionFactory;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $_logger;
@@ -215,7 +215,7 @@ class Combine extends AbstractCondition
$this->addCondition($condition);
$condition->loadArray($conditionArr, $key);
} catch (\Exception $e) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
}
}
}
@@ -316,12 +316,12 @@ class Combine extends AbstractCondition
}
/**
- * @param \Magento\Framework\Object $object
+ * @param \Magento\Framework\Model\AbstractModel $model
* @return bool
*/
- public function validate(\Magento\Framework\Object $object)
+ public function validate(\Magento\Framework\Model\AbstractModel $model)
{
- return $this->_isValid($object);
+ return $this->_isValid($model);
}
/**
@@ -338,7 +338,7 @@ class Combine extends AbstractCondition
/**
* Is entity valid
*
- * @param int|\Magento\Framework\Object $entity
+ * @param int|\Magento\Framework\Model\AbstractModel $entity
* @return bool
*/
protected function _isValid($entity)
@@ -351,7 +351,7 @@ class Combine extends AbstractCondition
$true = (bool)$this->getValue();
foreach ($this->getConditions() as $cond) {
- if ($entity instanceof \Magento\Framework\Object) {
+ if ($entity instanceof \Magento\Framework\Model\AbstractModel) {
$validated = $cond->validate($entity);
} else {
$validated = $cond->validateByEntityId($entity);
diff --git a/app/code/Magento/Rule/Model/Condition/Context.php b/app/code/Magento/Rule/Model/Condition/Context.php
index 5c7a32fb71296411125516b24591589636f8d180..58ef010e230786ca707b31e0d599144751b61401 100644
--- a/app/code/Magento/Rule/Model/Condition/Context.php
+++ b/app/code/Magento/Rule/Model/Condition/Context.php
@@ -32,7 +32,7 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
protected $_conditionFactory;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $_logger;
@@ -41,14 +41,14 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Framework\View\LayoutInterface $layout
* @param \Magento\Rule\Model\ConditionFactory $conditionFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
*/
public function __construct(
\Magento\Framework\View\Asset\Repository $assetRepo,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Framework\View\LayoutInterface $layout,
\Magento\Rule\Model\ConditionFactory $conditionFactory,
- \Magento\Framework\Logger $logger
+ \Psr\Log\LoggerInterface $logger
) {
$this->_assetRepo = $assetRepo;
$this->_localeDate = $localeDate;
@@ -90,7 +90,7 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
}
/**
- * @return \Magento\Framework\Logger
+ * @return \Psr\Log\LoggerInterface
*/
public function getLogger()
{
diff --git a/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php b/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php
index 00034cf90ae766066f4035d3102829de1ac8f8cd..f0d4de7d40fb932111e73fe13d855b55a97f96b3 100644
--- a/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php
+++ b/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php
@@ -523,50 +523,50 @@ abstract class AbstractProduct extends \Magento\Rule\Model\Condition\AbstractCon
/**
* Validate product attribute value for condition
*
- * @param \Magento\Framework\Object $object
+ * @param \Magento\Framework\Model\AbstractModel $model
* @return bool
*/
- public function validate(\Magento\Framework\Object $object)
+ public function validate(\Magento\Framework\Model\AbstractModel $model)
{
$attrCode = $this->getAttribute();
if ('category_ids' == $attrCode) {
- return $this->validateAttribute($object->getAvailableInCategories());
- } elseif (!isset($this->_entityAttributeValues[$object->getId()])) {
- if (!$object->getResource()) {
+ return $this->validateAttribute($model->getAvailableInCategories());
+ } elseif (!isset($this->_entityAttributeValues[$model->getId()])) {
+ if (!$model->getResource()) {
return false;
}
- $attr = $object->getResource()->getAttribute($attrCode);
+ $attr = $model->getResource()->getAttribute($attrCode);
if ($attr && $attr->getBackendType() == 'datetime' && !is_int($this->getValue())) {
$this->setValue(strtotime($this->getValue()));
- $value = strtotime($object->getData($attrCode));
+ $value = strtotime($model->getData($attrCode));
return $this->validateAttribute($value);
}
if ($attr && $attr->getFrontendInput() == 'multiselect') {
- $value = $object->getData($attrCode);
+ $value = $model->getData($attrCode);
$value = strlen($value) ? explode(',', $value) : [];
return $this->validateAttribute($value);
}
- return parent::validate($object);
+ return parent::validate($model);
} else {
$result = false;
// any valid value will set it to TRUE
// remember old attribute state
- $oldAttrValue = $object->hasData($attrCode) ? $object->getData($attrCode) : null;
+ $oldAttrValue = $model->hasData($attrCode) ? $model->getData($attrCode) : null;
- foreach ($this->_entityAttributeValues[$object->getId()] as $value) {
- $attr = $object->getResource()->getAttribute($attrCode);
+ foreach ($this->_entityAttributeValues[$model->getId()] as $value) {
+ $attr = $model->getResource()->getAttribute($attrCode);
if ($attr && $attr->getBackendType() == 'datetime') {
$value = strtotime($value);
} elseif ($attr && $attr->getFrontendInput() == 'multiselect') {
$value = strlen($value) ? explode(',', $value) : [];
}
- $object->setData($attrCode, $value);
- $result |= parent::validate($object);
+ $model->setData($attrCode, $value);
+ $result |= parent::validate($model);
if ($result) {
break;
@@ -574,9 +574,9 @@ abstract class AbstractProduct extends \Magento\Rule\Model\Condition\AbstractCon
}
if (is_null($oldAttrValue)) {
- $object->unsetData($attrCode);
+ $model->unsetData($attrCode);
} else {
- $object->setData($attrCode, $oldAttrValue);
+ $model->setData($attrCode, $oldAttrValue);
}
return (bool)$result;
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Comment.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Comment.php
index 7ca3943d4ec36651c90e562c822d8ce89cf0e095..6391503155d4c02d43eff26a83adced789a43b33 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Comment.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Comment.php
@@ -47,18 +47,4 @@ class Comment extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
{
return $this->escapeHtml($this->getQuote()->getCustomerNote());
}
-
- /**
- * Get note notification
- *
- * @return bool
- */
- public function getNoteNotify()
- {
- $notify = $this->getQuote()->getCustomerNoteNotify();
- if (is_null($notify) || $notify) {
- return true;
- }
- return false;
- }
}
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals.php
index 833932ae64b85f88d583d7ba710442b0b56bc210..dedf8478a6d14ebfd4eedf955608376d9d195d92 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals.php
@@ -181,4 +181,18 @@ class Totals extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
{
return $this->_salesData->canSendNewOrderConfirmationEmail($this->getQuote()->getStoreId());
}
+
+ /**
+ * Get note notification
+ *
+ * @return bool
+ */
+ public function getNoteNotify()
+ {
+ $notify = $this->getQuote()->getCustomerNoteNotify();
+ if (is_null($notify) || $notify) {
+ return true;
+ }
+ return false;
+ }
}
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Transactions.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Transactions.php
index c807707f19da411d1cb623e558fa97688f9a13c9..a39f367057dc0497aa91b5777064f96f51853a6b 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Transactions.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Transactions.php
@@ -17,20 +17,40 @@ class Transactions extends \Magento\Framework\View\Element\Text\ListText impleme
*/
protected $_authorization;
+ /**
+ * Core registry
+ *
+ * @var \Magento\Framework\Registry
+ */
+ protected $_coreRegistry = null;
+
/**
* @param \Magento\Framework\View\Element\Context $context
* @param \Magento\Framework\AuthorizationInterface $authorization
+ * @param \Magento\Framework\Registry $registry
* @param array $data
*/
public function __construct(
\Magento\Framework\View\Element\Context $context,
\Magento\Framework\AuthorizationInterface $authorization,
+ \Magento\Framework\Registry $registry,
array $data = []
) {
$this->_authorization = $authorization;
+ $this->_coreRegistry = $registry;
parent::__construct($context, $data);
}
+ /**
+ * Retrieve order model instance
+ *
+ * @return \Magento\Sales\Model\Order
+ */
+ public function getOrder()
+ {
+ return $this->_coreRegistry->registry('current_order');
+ }
+
/**
* {@inheritdoc}
*/
@@ -52,7 +72,7 @@ class Transactions extends \Magento\Framework\View\Element\Text\ListText impleme
*/
public function canShowTab()
{
- return true;
+ return !$this->getOrder()->getPayment()->getMethodInstance()->isOffline();
}
/**
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Cancel.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Cancel.php
index 0218e05f6793085849d8395c6f38e8268e6e87c0..94b9f269119ec2fc84bccdfa805dbbfb93a785a1 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Cancel.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Cancel.php
@@ -24,7 +24,7 @@ class Cancel extends \Magento\Sales\Controller\Adminhtml\Order
$this->messageManager->addError($e->getMessage());
} catch (\Exception $e) {
$this->messageManager->addError(__('You have not canceled the item.'));
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
}
$this->_redirect('sales/order/view', ['order_id' => $order->getId()]);
}
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php
index c6aea409518e1587d8bf91ffd67017233cee30f3..fd22737d14566efd3e36b2c49d6ef4f5370cdb40 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php
@@ -123,7 +123,7 @@ class Save extends \Magento\Backend\App\Action
$this->messageManager->addError($e->getMessage());
$this->_getSession()->setFormData($data);
} catch (\Exception $e) {
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$this->messageManager->addError(__('Cannot save the credit memo.'));
}
$this->_redirect('sales/*/new', ['_current' => true]);
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Email.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Email.php
index 39c33005acb51e81d0d9a85be2466d8b196adde8..4db052f51d7bbd75b1c64fc76ffa2399194a44a2 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Email.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Email.php
@@ -29,7 +29,7 @@ class Email extends \Magento\Sales\Controller\Adminhtml\Order
$this->messageManager->addError($e->getMessage());
} catch (\Exception $e) {
$this->messageManager->addError(__('We couldn\'t send the email order.'));
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
}
$this->_redirect('sales/order/view', ['order_id' => $order->getId()]);
}
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php
index 0d6cd7ddf62244cf3e0fba6b15da3aaf12b9c6fa..24eaeae72801812cc512730fd774670cc1fa1827 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php
@@ -188,14 +188,14 @@ class Save extends \Magento\Backend\App\Action
try {
$this->invoiceCommentSender->send($invoice, !empty($data['send_email']), $comment);
} catch (\Exception $e) {
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$this->messageManager->addError(__('We can\'t send the invoice email.'));
}
if ($shipment) {
try {
$this->shipmentSender->send($shipment, !empty($data['send_email']));
} catch (\Exception $e) {
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$this->messageManager->addError(__('We can\'t send the shipment.'));
}
}
@@ -206,7 +206,7 @@ class Save extends \Magento\Backend\App\Action
$this->messageManager->addError($e->getMessage());
} catch (\Exception $e) {
$this->messageManager->addError(__('We can\'t save the invoice.'));
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
}
$this->_redirect('sales/*/new', ['order_id' => $orderId]);
}
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/ReviewPayment.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/ReviewPayment.php
index 6c7215245cd1607bf354d1f230ab058680dd14b9..b1507b81be3a31d2438f18acc1ece5bd902c3521 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/ReviewPayment.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/ReviewPayment.php
@@ -49,7 +49,7 @@ class ReviewPayment extends \Magento\Sales\Controller\Adminhtml\Order
$this->messageManager->addError($e->getMessage());
} catch (\Exception $e) {
$this->messageManager->addError(__('We couldn\'t update the payment.'));
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
}
$this->_redirect('sales/order/view', ['order_id' => $order->getId()]);
}
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/View.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/View.php
index 20ccd84c08b52bda37e6ebb98a60df5ff0db6187..fc4ed63d9b97625594813c0140da3d0a4f5ef8ae 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/View.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/View.php
@@ -26,7 +26,7 @@ class View extends \Magento\Sales\Controller\Adminhtml\Order
$this->_redirect('sales/order/index');
return;
} catch (\Exception $e) {
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$this->messageManager->addError(__('Exception occurred during order load'));
$this->_redirect('sales/order/index');
return;
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/VoidPayment.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/VoidPayment.php
index 5a637a1ba4743ec559a6b3a432860930c38902ee..1e30725aa5ea56030b59243876eab53b2b90a918 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/VoidPayment.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/VoidPayment.php
@@ -26,7 +26,7 @@ class VoidPayment extends \Magento\Sales\Controller\Adminhtml\Order
$this->messageManager->addError($e->getMessage());
} catch (\Exception $e) {
$this->messageManager->addError(__('We couldn\'t void the payment.'));
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
}
$this->_redirect('sales/*/view', ['order_id' => $order->getId()]);
}
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Fetch.php b/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Fetch.php
index 0377fcf35b61563412667c2d4a630f2293c38148..72bdfbd4073f35ddc840c58aca687293834a47f1 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Fetch.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Fetch.php
@@ -28,7 +28,7 @@ class Fetch extends \Magento\Sales\Controller\Adminhtml\Transactions
$this->messageManager->addError($e->getMessage());
} catch (\Exception $e) {
$this->messageManager->addError(__('We can\'t update the transaction details.'));
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
}
$this->_redirect('sales/transactions/view', ['_current' => true]);
}
diff --git a/app/code/Magento/Sales/Model/AbstractNotifier.php b/app/code/Magento/Sales/Model/AbstractNotifier.php
index b6e8e45610a0f8e5bfcace1ca038d427b2a78e3a..d9c808ee4e66d3283e276c776732c126f097f62d 100644
--- a/app/code/Magento/Sales/Model/AbstractNotifier.php
+++ b/app/code/Magento/Sales/Model/AbstractNotifier.php
@@ -5,7 +5,7 @@
namespace Magento\Sales\Model;
-use Magento\Framework\Logger;
+use Psr\Log\LoggerInterface as Logger;
use Magento\Framework\Mail\Exception;
use Magento\Sales\Model\Order\Email\Sender;
use Magento\Sales\Model\Resource\Order\Status\History\CollectionFactory;
@@ -22,7 +22,7 @@ abstract class AbstractNotifier extends \Magento\Framework\Model\AbstractModel
protected $historyCollectionFactory;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $logger;
@@ -67,7 +67,7 @@ abstract class AbstractNotifier extends \Magento\Framework\Model\AbstractModel
$historyItem->save();
}
} catch (Exception $e) {
- $this->logger->logException($e);
+ $this->logger->critical($e);
return false;
}
return true;
diff --git a/app/code/Magento/Sales/Model/AdminOrder/Create.php b/app/code/Magento/Sales/Model/AdminOrder/Create.php
index f027b6b36e92550b29b067912c3d15d5ab342a6e..5d06152dd0b3c2dfc508514df37d03942a9ab86f 100644
--- a/app/code/Magento/Sales/Model/AdminOrder/Create.php
+++ b/app/code/Magento/Sales/Model/AdminOrder/Create.php
@@ -86,7 +86,7 @@ class Create extends \Magento\Framework\Object implements \Magento\Checkout\Mode
protected $_coreRegistry = null;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $_logger;
@@ -200,7 +200,7 @@ class Create extends \Magento\Framework\Object implements \Magento\Checkout\Mode
* @param \Magento\Framework\Registry $coreRegistry
* @param \Magento\Sales\Model\Config $salesConfig
* @param \Magento\Backend\Model\Session\Quote $quoteSession
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Object\Copy $objectCopyService
* @param \Magento\Framework\Message\ManagerInterface $messageManager
* @param Product\Quote\Initializer $quoteInitializer
@@ -226,7 +226,7 @@ class Create extends \Magento\Framework\Object implements \Magento\Checkout\Mode
\Magento\Framework\Registry $coreRegistry,
\Magento\Sales\Model\Config $salesConfig,
\Magento\Backend\Model\Session\Quote $quoteSession,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Object\Copy $objectCopyService,
\Magento\Framework\Message\ManagerInterface $messageManager,
Product\Quote\Initializer $quoteInitializer,
@@ -1034,7 +1034,7 @@ class Create extends \Magento\Framework\Object implements \Magento\Checkout\Mode
$this->recollectCart();
throw $e;
} catch (\Exception $e) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
}
$this->recollectCart();
diff --git a/app/code/Magento/Sales/Model/AdminOrder/EmailSender.php b/app/code/Magento/Sales/Model/AdminOrder/EmailSender.php
index c0c32f00441f4aced21f5e88b26f18e5249d9dbe..9e283b8d52b0787cd4d1be0170d9842a113ce037 100644
--- a/app/code/Magento/Sales/Model/AdminOrder/EmailSender.php
+++ b/app/code/Magento/Sales/Model/AdminOrder/EmailSender.php
@@ -4,7 +4,7 @@
*/
namespace Magento\Sales\Model\AdminOrder;
-use Magento\Framework\Logger;
+use Psr\Log\LoggerInterface as Logger;
use Magento\Framework\Message\ManagerInterface;
use Magento\Sales\Model\Order;
use Magento\Sales\Model\Order\Email\Sender\OrderSender;
@@ -53,7 +53,7 @@ class EmailSender
try {
$this->orderSender->send($order);
} catch (\Magento\Framework\Mail\Exception $exception) {
- $this->logger->logException($exception);
+ $this->logger->critical($exception);
$this->messageManager->addWarning(
__('You did not email your customer. Please check your email settings.')
);
diff --git a/app/code/Magento/Sales/Model/Config/Ordered.php b/app/code/Magento/Sales/Model/Config/Ordered.php
index 0da1fc08f1006210634707a022741d2948b8d35c..06640009284956ef69f08bff48a5ae10b2c1d47a 100644
--- a/app/code/Magento/Sales/Model/Config/Ordered.php
+++ b/app/code/Magento/Sales/Model/Config/Ordered.php
@@ -59,7 +59,7 @@ abstract class Ordered extends \Magento\Framework\App\Config\Base
protected $_configCacheType;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $_logger;
@@ -70,13 +70,13 @@ abstract class Ordered extends \Magento\Framework\App\Config\Base
/**
* @param \Magento\Framework\App\Cache\Type\Config $configCacheType
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Sales\Model\Config $salesConfig
* @param \Magento\Framework\Simplexml\Element $sourceData
*/
public function __construct(
\Magento\Framework\App\Cache\Type\Config $configCacheType,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Sales\Model\Config $salesConfig,
$sourceData = null
) {
diff --git a/app/code/Magento/Sales/Model/Order.php b/app/code/Magento/Sales/Model/Order.php
index 540409a35baf4349c244590c48af12137b0f449a..89e8ca8befbd5570256a568b714e10b62e4595da 100644
--- a/app/code/Magento/Sales/Model/Order.php
+++ b/app/code/Magento/Sales/Model/Order.php
@@ -3389,7 +3389,7 @@ class Order extends AbstractModel implements EntityInterface, ApiOrderInterface
if ($this->getData(ApiOrderInterface::STATUS_HISTORIES) == null) {
$this->setData(
ApiOrderInterface::STATUS_HISTORIES,
- $this->getPaymentsCollection()->getItems()
+ $this->getStatusHistoryCollection()->getItems()
);
}
return $this->getData(ApiOrderInterface::STATUS_HISTORIES);
diff --git a/app/code/Magento/Sales/Model/Order/CreditmemoNotifier.php b/app/code/Magento/Sales/Model/Order/CreditmemoNotifier.php
index 97cd87fc60b87321732c9e9e19759f6cf852287b..ad1edd48113e6cab4befd3521ed3da98f7f657f6 100644
--- a/app/code/Magento/Sales/Model/Order/CreditmemoNotifier.php
+++ b/app/code/Magento/Sales/Model/Order/CreditmemoNotifier.php
@@ -5,7 +5,7 @@
namespace Magento\Sales\Model\Order;
-use Magento\Framework\Logger;
+use Psr\Log\LoggerInterface as Logger;
use Magento\Sales\Model\Order\Email\Sender\CreditmemoSender;
use Magento\Sales\Model\Resource\Order\Status\History\CollectionFactory;
@@ -21,7 +21,7 @@ class CreditmemoNotifier extends \Magento\Sales\Model\AbstractNotifier
protected $historyCollectionFactory;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $logger;
diff --git a/app/code/Magento/Sales/Model/Order/InvoiceNotifier.php b/app/code/Magento/Sales/Model/Order/InvoiceNotifier.php
index d8952c48f476627cd16f5746ede37efd92506dc1..e9c82ce7c7293cc1b4a84dc3c39a12a1cf78e5d0 100644
--- a/app/code/Magento/Sales/Model/Order/InvoiceNotifier.php
+++ b/app/code/Magento/Sales/Model/Order/InvoiceNotifier.php
@@ -5,7 +5,7 @@
namespace Magento\Sales\Model\Order;
-use Magento\Framework\Logger;
+use Psr\Log\LoggerInterface as Logger;
use Magento\Sales\Model\Order\Email\Sender\InvoiceSender;
use Magento\Sales\Model\Resource\Order\Status\History\CollectionFactory;
@@ -21,7 +21,7 @@ class InvoiceNotifier extends \Magento\Sales\Model\AbstractNotifier
protected $historyCollectionFactory;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $logger;
diff --git a/app/code/Magento/Sales/Model/Order/Total/Config/Base.php b/app/code/Magento/Sales/Model/Order/Total/Config/Base.php
index f20acae7fc27f59eb0dfd69262c8db615b2c7988..00c098f071f379f693664888b70d5ad805675959 100644
--- a/app/code/Magento/Sales/Model/Order/Total/Config/Base.php
+++ b/app/code/Magento/Sales/Model/Order/Total/Config/Base.php
@@ -37,14 +37,14 @@ class Base extends \Magento\Sales\Model\Config\Ordered
/**
* @param \Magento\Framework\App\Cache\Type\Config $configCacheType
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Sales\Model\Config $salesConfig
* @param \Magento\Sales\Model\Order\TotalFactory $orderTotalFactory
* @param mixed $sourceData
*/
public function __construct(
\Magento\Framework\App\Cache\Type\Config $configCacheType,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Sales\Model\Config $salesConfig,
\Magento\Sales\Model\Order\TotalFactory $orderTotalFactory,
$sourceData = null
diff --git a/app/code/Magento/Sales/Model/OrderNotifier.php b/app/code/Magento/Sales/Model/OrderNotifier.php
index 2177000ca1501edeccbfc08b12c29b34b596a846..317a49b0c5d2cc6a3caf186ae7c617518ab6aae9 100644
--- a/app/code/Magento/Sales/Model/OrderNotifier.php
+++ b/app/code/Magento/Sales/Model/OrderNotifier.php
@@ -5,7 +5,7 @@
namespace Magento\Sales\Model;
-use Magento\Framework\Logger;
+use Psr\Log\LoggerInterface as Logger;
use Magento\Sales\Model\Order\Email\Sender\OrderSender;
use Magento\Sales\Model\Resource\Order\Status\History\CollectionFactory;
@@ -21,7 +21,7 @@ class OrderNotifier extends \Magento\Sales\Model\AbstractNotifier
protected $historyCollectionFactory;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $logger;
diff --git a/app/code/Magento/Sales/Model/Quote/Address/Total/Collector.php b/app/code/Magento/Sales/Model/Quote/Address/Total/Collector.php
index 7458e105508f49e86e7cb108a8c4307826cd2a29..9c711850919a76a9a2f93b92b8f1b8e4ff89c8b6 100644
--- a/app/code/Magento/Sales/Model/Quote/Address/Total/Collector.php
+++ b/app/code/Magento/Sales/Model/Quote/Address/Total/Collector.php
@@ -61,7 +61,7 @@ class Collector extends \Magento\Sales\Model\Config\Ordered
/**
* @param \Magento\Framework\App\Cache\Type\Config $configCacheType
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Sales\Model\Config $salesConfig
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
@@ -71,7 +71,7 @@ class Collector extends \Magento\Sales\Model\Config\Ordered
*/
public function __construct(
\Magento\Framework\App\Cache\Type\Config $configCacheType,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Sales\Model\Config $salesConfig,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Store\Model\StoreManagerInterface $storeManager,
diff --git a/app/code/Magento/Sales/Model/Resource/Order/Collection.php b/app/code/Magento/Sales/Model/Resource/Order/Collection.php
index 3a2e120ca3b3573d937183702b2dd90de7b5d04c..a27701d5112c846abf4ba7bd7ddb660b4cc6b378 100644
--- a/app/code/Magento/Sales/Model/Resource/Order/Collection.php
+++ b/app/code/Magento/Sales/Model/Resource/Order/Collection.php
@@ -35,7 +35,7 @@ class Collection extends AbstractCollection implements OrderSearchResultInterfac
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Framework\DB\Helper $coreResourceHelper
@@ -44,7 +44,7 @@ class Collection extends AbstractCollection implements OrderSearchResultInterfac
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Framework\DB\Helper $coreResourceHelper,
diff --git a/app/code/Magento/Sales/Model/Resource/Order/Creditmemo/Order/Grid/Collection.php b/app/code/Magento/Sales/Model/Resource/Order/Creditmemo/Order/Grid/Collection.php
index 21e235b812607dfd972a9c380ee69bf434e48deb..2cade1f151f745026a5657402e061988ae6b22ab 100644
--- a/app/code/Magento/Sales/Model/Resource/Order/Creditmemo/Order/Grid/Collection.php
+++ b/app/code/Magento/Sales/Model/Resource/Order/Creditmemo/Order/Grid/Collection.php
@@ -18,7 +18,7 @@ class Collection extends \Magento\Sales\Model\Resource\Order\Creditmemo\Grid\Col
/**
* @param \Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Framework\Registry $registryManager
@@ -27,7 +27,7 @@ class Collection extends \Magento\Sales\Model\Resource\Order\Creditmemo\Grid\Col
*/
public function __construct(
\Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Framework\Registry $registryManager,
diff --git a/app/code/Magento/Sales/Model/Resource/Order/Invoice/Orders/Grid/Collection.php b/app/code/Magento/Sales/Model/Resource/Order/Invoice/Orders/Grid/Collection.php
index b4dc1664e44f58f94cf383fee2489425660d95e7..8f3b2f013182887b0f8629353552c951ecd4c29e 100644
--- a/app/code/Magento/Sales/Model/Resource/Order/Invoice/Orders/Grid/Collection.php
+++ b/app/code/Magento/Sales/Model/Resource/Order/Invoice/Orders/Grid/Collection.php
@@ -13,7 +13,7 @@ class Collection extends \Magento\Sales\Model\Resource\Order\Invoice\Grid\Collec
/**
* @param \Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Framework\Registry $registryManager
@@ -22,7 +22,7 @@ class Collection extends \Magento\Sales\Model\Resource\Order\Invoice\Grid\Collec
*/
public function __construct(
\Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Framework\Registry $registryManager,
diff --git a/app/code/Magento/Sales/Model/Resource/Order/Payment/Collection.php b/app/code/Magento/Sales/Model/Resource/Order/Payment/Collection.php
index 5afc10aacfae73b71ff0b6bdc23d09c6db2a4474..b303628884586f524468493b37018845a3d9c09a 100644
--- a/app/code/Magento/Sales/Model/Resource/Order/Payment/Collection.php
+++ b/app/code/Magento/Sales/Model/Resource/Order/Payment/Collection.php
@@ -28,7 +28,7 @@ class Collection extends AbstractCollection implements OrderPaymentSearchResultI
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Zend_Db_Adapter_Abstract $connection
@@ -36,7 +36,7 @@ class Collection extends AbstractCollection implements OrderPaymentSearchResultI
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
$connection = null,
diff --git a/app/code/Magento/Sales/Model/Resource/Order/Shipment/Order/Grid/Collection.php b/app/code/Magento/Sales/Model/Resource/Order/Shipment/Order/Grid/Collection.php
index 56da2f266f1b8e90a30f322ee6ad29d733e794c3..e5a1677943e36df854ae82d7f7b798935ef5d21d 100644
--- a/app/code/Magento/Sales/Model/Resource/Order/Shipment/Order/Grid/Collection.php
+++ b/app/code/Magento/Sales/Model/Resource/Order/Shipment/Order/Grid/Collection.php
@@ -18,7 +18,7 @@ class Collection extends \Magento\Sales\Model\Resource\Order\Shipment\Grid\Colle
/**
* @param \Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Framework\Registry $registryManager
@@ -27,7 +27,7 @@ class Collection extends \Magento\Sales\Model\Resource\Order\Shipment\Grid\Colle
*/
public function __construct(
\Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Framework\Registry $registryManager,
diff --git a/app/code/Magento/Sales/Model/Resource/Order/Status.php b/app/code/Magento/Sales/Model/Resource/Order/Status.php
index 34a9b9608b36252fe6c6b326e05495bbc4ab27e5..df6258b3683b0b1e107e6379a77b9c1efc9b81c4 100644
--- a/app/code/Magento/Sales/Model/Resource/Order/Status.php
+++ b/app/code/Magento/Sales/Model/Resource/Order/Status.php
@@ -5,7 +5,7 @@
namespace Magento\Sales\Model\Resource\Order;
use Magento\Framework\App\Resource;
-use Magento\Framework\Logger as LogWriter;
+use Psr\Log\LoggerInterface as LogWriter;
use Magento\Framework\Model\Exception;
/**
@@ -30,7 +30,7 @@ class Status extends \Magento\Framework\Model\Resource\Db\AbstractDb
protected $stateTable;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $logger;
diff --git a/app/code/Magento/Sales/Model/Resource/Quote/Address/Rate/Collection.php b/app/code/Magento/Sales/Model/Resource/Quote/Address/Rate/Collection.php
index e88135a1bfa0e9d784ee2e655344f94ee7c25da9..e726f76e37c19ef77826e85e1e3bfd12b6bbac56 100644
--- a/app/code/Magento/Sales/Model/Resource/Quote/Address/Rate/Collection.php
+++ b/app/code/Magento/Sales/Model/Resource/Quote/Address/Rate/Collection.php
@@ -20,7 +20,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Sales\Model\Quote\Address\CarrierFactoryInterface $carrierFactory
@@ -29,7 +29,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Sales\Model\Quote\Address\CarrierFactoryInterface $carrierFactory,
diff --git a/app/code/Magento/Sales/Model/Resource/Quote/Item/Collection.php b/app/code/Magento/Sales/Model/Resource/Quote/Item/Collection.php
index 1aa6352b2238b4964b8706dbbb590a793013f539..979e29328651a6c5067b4587a7edff0b2379cb30 100644
--- a/app/code/Magento/Sales/Model/Resource/Quote/Item/Collection.php
+++ b/app/code/Magento/Sales/Model/Resource/Quote/Item/Collection.php
@@ -40,7 +40,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Sales\Model\Resource\Quote\Item\Option\CollectionFactory $itemOptionCollectionFactory
@@ -51,7 +51,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Sales\Model\Resource\Quote\Item\Option\CollectionFactory $itemOptionCollectionFactory,
diff --git a/app/code/Magento/Sales/Model/Resource/Quote/Payment/Collection.php b/app/code/Magento/Sales/Model/Resource/Quote/Payment/Collection.php
index 178e03ab5dbdb0d8e210a036e56ba237a0d0131e..1a3a1f075433f8e727065735792db5ad353f2866 100644
--- a/app/code/Magento/Sales/Model/Resource/Quote/Payment/Collection.php
+++ b/app/code/Magento/Sales/Model/Resource/Quote/Payment/Collection.php
@@ -11,7 +11,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
{
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Zend_Db_Adapter_Abstract $connection
@@ -19,7 +19,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
$connection = null,
diff --git a/app/code/Magento/Sales/Model/Resource/Report/Bestsellers.php b/app/code/Magento/Sales/Model/Resource/Report/Bestsellers.php
index 9e9cbc9bb7949f9ee8fff9d7dfd7b16de11ecc79..49989878dc42fc596112be51a000f68f46190e12 100644
--- a/app/code/Magento/Sales/Model/Resource/Report/Bestsellers.php
+++ b/app/code/Magento/Sales/Model/Resource/Report/Bestsellers.php
@@ -36,7 +36,7 @@ class Bestsellers extends AbstractReport
/**
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Reports\Model\FlagFactory $reportsFlagFactory
* @param \Magento\Framework\Stdlib\DateTime $dateTime
@@ -47,7 +47,7 @@ class Bestsellers extends AbstractReport
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Reports\Model\FlagFactory $reportsFlagFactory,
\Magento\Framework\Stdlib\DateTime $dateTime,
diff --git a/app/code/Magento/Sales/Model/Resource/Report/Bestsellers/Collection.php b/app/code/Magento/Sales/Model/Resource/Report/Bestsellers/Collection.php
index 73525e8f13a33274f9111c4cd10ff1bb7a238032..16782bc6898734e65640e4070b9ec5f17abc2093 100644
--- a/app/code/Magento/Sales/Model/Resource/Report/Bestsellers/Collection.php
+++ b/app/code/Magento/Sales/Model/Resource/Report/Bestsellers/Collection.php
@@ -27,7 +27,7 @@ class Collection extends \Magento\Sales\Model\Resource\Report\Collection\Abstrac
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Sales\Model\Resource\Report $resource
@@ -35,7 +35,7 @@ class Collection extends \Magento\Sales\Model\Resource\Report\Collection\Abstrac
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Sales\Model\Resource\Report $resource,
diff --git a/app/code/Magento/Sales/Model/Resource/Report/Collection/AbstractCollection.php b/app/code/Magento/Sales/Model/Resource/Report/Collection/AbstractCollection.php
index d6142402445a614e5700286ca99d58eb1cf71a7e..7a8bd502caaaeb67053ee7d9f24bd9d3cfe02a51 100644
--- a/app/code/Magento/Sales/Model/Resource/Report/Collection/AbstractCollection.php
+++ b/app/code/Magento/Sales/Model/Resource/Report/Collection/AbstractCollection.php
@@ -20,7 +20,7 @@ class AbstractCollection extends \Magento\Reports\Model\Resource\Report\Collecti
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Sales\Model\Resource\Report $resource
@@ -28,7 +28,7 @@ class AbstractCollection extends \Magento\Reports\Model\Resource\Report\Collecti
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Sales\Model\Resource\Report $resource,
diff --git a/app/code/Magento/Sales/Model/Resource/Report/Invoiced/Collection/Invoiced.php b/app/code/Magento/Sales/Model/Resource/Report/Invoiced/Collection/Invoiced.php
index 73be9036f20f15e3a2ee52e1b53e86ad9b557acf..1f6c851355688a7e5bc91ba27d8c19b331cc6c37 100644
--- a/app/code/Magento/Sales/Model/Resource/Report/Invoiced/Collection/Invoiced.php
+++ b/app/code/Magento/Sales/Model/Resource/Report/Invoiced/Collection/Invoiced.php
@@ -13,7 +13,7 @@ class Invoiced extends Order
{
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Sales\Model\Resource\Report $resource
@@ -21,7 +21,7 @@ class Invoiced extends Order
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Sales\Model\Resource\Report $resource,
diff --git a/app/code/Magento/Sales/Model/Resource/Report/Invoiced/Collection/Order.php b/app/code/Magento/Sales/Model/Resource/Report/Invoiced/Collection/Order.php
index 600501645c53e5ea45da79377783ef54c2426c6b..f2a9f172b2fa2a2300cd69fa5bc4284f93b6463a 100644
--- a/app/code/Magento/Sales/Model/Resource/Report/Invoiced/Collection/Order.php
+++ b/app/code/Magento/Sales/Model/Resource/Report/Invoiced/Collection/Order.php
@@ -27,7 +27,7 @@ class Order extends \Magento\Sales\Model\Resource\Report\Collection\AbstractColl
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Sales\Model\Resource\Report $resource
@@ -35,7 +35,7 @@ class Order extends \Magento\Sales\Model\Resource\Report\Collection\AbstractColl
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Sales\Model\Resource\Report $resource,
diff --git a/app/code/Magento/Sales/Model/Resource/Report/Order.php b/app/code/Magento/Sales/Model/Resource/Report/Order.php
index c18cbf90c5e5467ff7be964bb3dcedad655bcb3c..4e8dea3eb1e9dde45bcfba4c46d6b7004e4d641a 100644
--- a/app/code/Magento/Sales/Model/Resource/Report/Order.php
+++ b/app/code/Magento/Sales/Model/Resource/Report/Order.php
@@ -21,7 +21,7 @@ class Order extends AbstractReport
/**
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Reports\Model\FlagFactory $reportsFlagFactory
* @param \Magento\Framework\Stdlib\DateTime $dateTime
@@ -31,7 +31,7 @@ class Order extends AbstractReport
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Reports\Model\FlagFactory $reportsFlagFactory,
\Magento\Framework\Stdlib\DateTime $dateTime,
diff --git a/app/code/Magento/Sales/Model/Resource/Report/Order/Collection.php b/app/code/Magento/Sales/Model/Resource/Report/Order/Collection.php
index 4c6afaa58c819fb2524ca4a92b05660e044a638c..61143dda0bd003ed575ed37c7971aef2d68420de 100644
--- a/app/code/Magento/Sales/Model/Resource/Report/Order/Collection.php
+++ b/app/code/Magento/Sales/Model/Resource/Report/Order/Collection.php
@@ -34,7 +34,7 @@ class Collection extends \Magento\Sales\Model\Resource\Report\Collection\Abstrac
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Sales\Model\Resource\Report $resource
@@ -42,7 +42,7 @@ class Collection extends \Magento\Sales\Model\Resource\Report\Collection\Abstrac
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Sales\Model\Resource\Report $resource,
diff --git a/app/code/Magento/Sales/Model/Resource/Report/Refunded/Collection/Order.php b/app/code/Magento/Sales/Model/Resource/Report/Refunded/Collection/Order.php
index 4c9615483775d92b8b4514e1e5cb91f9327470b5..ff0eb84377c04c9673f43d118b5f48ffcb8fb1c6 100644
--- a/app/code/Magento/Sales/Model/Resource/Report/Refunded/Collection/Order.php
+++ b/app/code/Magento/Sales/Model/Resource/Report/Refunded/Collection/Order.php
@@ -27,7 +27,7 @@ class Order extends \Magento\Sales\Model\Resource\Report\Collection\AbstractColl
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Sales\Model\Resource\Report $resource
@@ -35,7 +35,7 @@ class Order extends \Magento\Sales\Model\Resource\Report\Collection\AbstractColl
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Sales\Model\Resource\Report $resource,
diff --git a/app/code/Magento/Sales/Model/Resource/Report/Refunded/Collection/Refunded.php b/app/code/Magento/Sales/Model/Resource/Report/Refunded/Collection/Refunded.php
index 820e18229b6cddbdb678c55e01fe53f712b74043..d79ab374ac25f2e723053d089227767038275e5b 100644
--- a/app/code/Magento/Sales/Model/Resource/Report/Refunded/Collection/Refunded.php
+++ b/app/code/Magento/Sales/Model/Resource/Report/Refunded/Collection/Refunded.php
@@ -13,7 +13,7 @@ class Refunded extends Order
{
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Sales\Model\Resource\Report $resource
@@ -21,7 +21,7 @@ class Refunded extends Order
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Sales\Model\Resource\Report $resource,
diff --git a/app/code/Magento/Sales/Model/Resource/Report/Shipping/Collection/Order.php b/app/code/Magento/Sales/Model/Resource/Report/Shipping/Collection/Order.php
index a9b72b30be0e0428f1098c8f5a432c2d45d0a3d9..cedf8781e90693fc91e12b7a5a753560689c6952 100644
--- a/app/code/Magento/Sales/Model/Resource/Report/Shipping/Collection/Order.php
+++ b/app/code/Magento/Sales/Model/Resource/Report/Shipping/Collection/Order.php
@@ -27,7 +27,7 @@ class Order extends \Magento\Sales\Model\Resource\Report\Collection\AbstractColl
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Sales\Model\Resource\Report $resource
@@ -35,7 +35,7 @@ class Order extends \Magento\Sales\Model\Resource\Report\Collection\AbstractColl
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Sales\Model\Resource\Report $resource,
diff --git a/app/code/Magento/Sales/Model/Resource/Report/Shipping/Collection/Shipment.php b/app/code/Magento/Sales/Model/Resource/Report/Shipping/Collection/Shipment.php
index ceaf16cf728ba9b6a1f7fc4aa05ac6aceb12ee10..b2fcd7ac9dc8208bf0eb770ccf0ea92584b5fb80 100644
--- a/app/code/Magento/Sales/Model/Resource/Report/Shipping/Collection/Shipment.php
+++ b/app/code/Magento/Sales/Model/Resource/Report/Shipping/Collection/Shipment.php
@@ -13,7 +13,7 @@ class Shipment extends Order
{
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Sales\Model\Resource\Report $resource
@@ -21,7 +21,7 @@ class Shipment extends Order
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Sales\Model\Resource\Report $resource,
diff --git a/app/code/Magento/Sales/Model/Resource/Sale/Collection.php b/app/code/Magento/Sales/Model/Resource/Sale/Collection.php
index 99d40d4961df1940071cc9e8edbfcc661b4f07be..d0987f3d99d2c4bfc503c7cb62b68eb90002d7fa 100644
--- a/app/code/Magento/Sales/Model/Resource/Sale/Collection.php
+++ b/app/code/Magento/Sales/Model/Resource/Sale/Collection.php
@@ -8,7 +8,7 @@ use Magento\Core\Model\EntityFactory;
use Magento\Store\Model\StoreManagerInterface;
use Magento\Framework\Data\Collection\Db\FetchStrategyInterface;
use Magento\Framework\Event\ManagerInterface;
-use Magento\Framework\Logger;
+use Psr\Log\LoggerInterface as Logger;
use Magento\Sales\Model\Resource\Order;
/**
diff --git a/app/code/Magento/Sales/Model/Resource/Transaction/Grid/Collection.php b/app/code/Magento/Sales/Model/Resource/Transaction/Grid/Collection.php
index 438a0998be99b8bf6ca6878954118918175f6a8a..4f8bb993dbd046202a8f8563d5bd73a1c2028068 100644
--- a/app/code/Magento/Sales/Model/Resource/Transaction/Grid/Collection.php
+++ b/app/code/Magento/Sales/Model/Resource/Transaction/Grid/Collection.php
@@ -16,7 +16,7 @@ class Collection extends \Magento\Sales\Model\Resource\Order\Payment\Transaction
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Framework\Registry $registryManager
@@ -25,7 +25,7 @@ class Collection extends \Magento\Sales\Model\Resource\Order\Payment\Transaction
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Framework\Registry $registryManager,
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals.phtml
index 31c3a50031389f1d74a97b7c784763df490d04b3..2e104cccf9ef4051f29cdd9137a4943c6a93fea3 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals.phtml
@@ -13,7 +13,7 @@
<div class="divider"></div>
<div class="order-totals-bottom">
<div class="field choice field-append-comments">
- <input type="checkbox" id="notify_customer" name="order[comment][customer_note_notify]" value="1" <?php if ($this->getNoteNotify()): ?>checked="true"<?php endif; ?>/>
+ <input type="checkbox" id="notify_customer" name="order[comment][customer_note_notify]" value="1"<?php if ($this->getNoteNotify()): ?> checked="checked"<?php endif; ?>/>
<label for="notify_customer" class="normal"><?php echo __('Append Comments') ?></label>
</div>
<?php if ($this->canSendNewOrderConfirmationEmail()): ?>
diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Delete.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Delete.php
index de4dc93a3a8d027f84dd9453e40b19ad50c671d9..cd5fe932c1bfe2ed916eef49e4234dd55d2a30a7 100644
--- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Delete.php
+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Delete.php
@@ -29,7 +29,7 @@ class Delete extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
$this->messageManager->addError(
__('An error occurred while deleting the rule. Please review the log and try again.')
);
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$this->_redirect('sales_rule/*/edit', ['id' => $this->getRequest()->getParam('id')]);
return;
}
diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Generate.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Generate.php
index e2bc24c960c9a97c62fdaa7e08353988b1f9bdaf..c29d02cc2d3f39a0d733ffb2ab209bf6b77e39c9 100644
--- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Generate.php
+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Generate.php
@@ -52,7 +52,7 @@ class Generate extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
$result['error'] = __(
'Something went wrong while generating coupons. Please review the log and try again.'
);
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
}
}
$this->getResponse()->representJson(
diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Save.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Save.php
index 515cfc481f1d206e0d34f2272bbf40316f800956..1aa9ed6cc533d5c60405a2ef2a303d7a573b6bc9 100644
--- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Save.php
+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Save.php
@@ -93,7 +93,7 @@ class Save extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
$this->messageManager->addError(
__('An error occurred while saving the rule data. Please review the log and try again.')
);
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$this->_objectManager->get('Magento\Backend\Model\Session')->setPageData($data);
$this->_redirect('sales_rule/*/edit', ['id' => $this->getRequest()->getParam('rule_id')]);
return;
diff --git a/app/code/Magento/SalesRule/Model/Resource/Report/Collection.php b/app/code/Magento/SalesRule/Model/Resource/Report/Collection.php
index 9e0e726e5016667c768bc0ebab42e78d1aa40eb7..8ef7dfc1de56854677f7f43614c8c915a8cc043d 100644
--- a/app/code/Magento/SalesRule/Model/Resource/Report/Collection.php
+++ b/app/code/Magento/SalesRule/Model/Resource/Report/Collection.php
@@ -46,7 +46,7 @@ class Collection extends \Magento\Sales\Model\Resource\Report\Collection\Abstrac
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Sales\Model\Resource\Report $resource
@@ -55,7 +55,7 @@ class Collection extends \Magento\Sales\Model\Resource\Report\Collection\Abstrac
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Sales\Model\Resource\Report $resource,
diff --git a/app/code/Magento/SalesRule/Model/Resource/Report/Rule.php b/app/code/Magento/SalesRule/Model/Resource/Report/Rule.php
index ad81ce6fd4077244bb55fccc6c9fe12eaea3cb59..43ac17f896e14b1bb73dff57fbc61fcf018dcc65 100644
--- a/app/code/Magento/SalesRule/Model/Resource/Report/Rule.php
+++ b/app/code/Magento/SalesRule/Model/Resource/Report/Rule.php
@@ -23,7 +23,7 @@ class Rule extends \Magento\Reports\Model\Resource\Report\AbstractReport
/**
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Reports\Model\FlagFactory $reportsFlagFactory
* @param \Magento\Framework\Stdlib\DateTime $dateTime
@@ -33,7 +33,7 @@ class Rule extends \Magento\Reports\Model\Resource\Report\AbstractReport
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Reports\Model\FlagFactory $reportsFlagFactory,
\Magento\Framework\Stdlib\DateTime $dateTime,
diff --git a/app/code/Magento/SalesRule/Model/Resource/Report/Rule/Createdat.php b/app/code/Magento/SalesRule/Model/Resource/Report/Rule/Createdat.php
index 9e3ec5c0403365310e91fc63114e51199fb09931..63bd5a0554ec11e0b87c172ad1e8ef0327d2c85d 100644
--- a/app/code/Magento/SalesRule/Model/Resource/Report/Rule/Createdat.php
+++ b/app/code/Magento/SalesRule/Model/Resource/Report/Rule/Createdat.php
@@ -94,7 +94,10 @@ class Createdat extends \Magento\Reports\Model\Resource\Report\AbstractReport
'base_subtotal_canceled',
0
) . ' - ' . $adapter->getIfNullSql(
- 'ABS(base_discount_amount) - ' . $adapter->getIfNullSql('base_discount_canceled', 0),
+ 'ABS(base_discount_amount) - ABS(' . $adapter->getIfNullSql('base_discount_canceled', 0) . ')',
+ 0
+ ) . ' + ' . $adapter->getIfNullSql(
+ 'base_tax_amount - ' . $adapter->getIfNullSql('base_tax_canceled', 0),
0
) . ')
* base_to_global_rate)',
@@ -120,9 +123,12 @@ class Createdat extends \Magento\Reports\Model\Resource\Report\AbstractReport
'base_subtotal_refunded',
0
) . ' - ' . $adapter->getIfNullSql(
- 'base_discount_invoiced - ' . $adapter->getIfNullSql('base_discount_refunded', 0),
+ 'ABS(base_discount_invoiced) - ABS(' . $adapter->getIfNullSql('base_discount_refunded', 0) . ')',
0
- ) . ') * base_to_global_rate)',
+ ) . ' + ' . $adapter->getIfNullSql(
+ 'base_tax_invoiced - ' . $adapter->getIfNullSql('base_tax_refunded', 0),
+ 0
+ ) . ') * base_to_global_rate)',
0
),
];
diff --git a/app/code/Magento/SalesRule/Model/Resource/Rule/Collection.php b/app/code/Magento/SalesRule/Model/Resource/Rule/Collection.php
index b8d8057dd82381d62e3e5841ac0ac5e25c5f90ef..ba0fb345b2692af8d324aa2e70d106bc9d8621c9 100644
--- a/app/code/Magento/SalesRule/Model/Resource/Rule/Collection.php
+++ b/app/code/Magento/SalesRule/Model/Resource/Rule/Collection.php
@@ -36,7 +36,7 @@ class Collection extends \Magento\Rule\Model\Resource\Rule\Collection\AbstractCo
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Framework\Stdlib\DateTime\DateTime $date
@@ -45,7 +45,7 @@ class Collection extends \Magento\Rule\Model\Resource\Rule\Collection\AbstractCo
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Framework\Stdlib\DateTime\DateTime $date,
diff --git a/app/code/Magento/SalesRule/Model/Rule/Condition/Address.php b/app/code/Magento/SalesRule/Model/Rule/Condition/Address.php
index 49983011229bbcad73b1b30522e7f2e81090bd93..5589be55402fcc313d92320bb3936a5337f9b846 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Condition/Address.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Condition/Address.php
@@ -160,22 +160,22 @@ class Address extends \Magento\Rule\Model\Condition\AbstractCondition
/**
* Validate Address Rule Condition
*
- * @param \Magento\Framework\Object $object
+ * @param \Magento\Framework\Model\AbstractModel $model
* @return bool
*/
- public function validate(\Magento\Framework\Object $object)
+ public function validate(\Magento\Framework\Model\AbstractModel $model)
{
- $address = $object;
+ $address = $model;
if (!$address instanceof \Magento\Sales\Model\Quote\Address) {
- if ($object->getQuote()->isVirtual()) {
- $address = $object->getQuote()->getBillingAddress();
+ if ($model->getQuote()->isVirtual()) {
+ $address = $model->getQuote()->getBillingAddress();
} else {
- $address = $object->getQuote()->getShippingAddress();
+ $address = $model->getQuote()->getShippingAddress();
}
}
if ('payment_method' == $this->getAttribute() && !$address->hasPaymentMethod()) {
- $address->setPaymentMethod($object->getQuote()->getPayment()->getMethod());
+ $address->setPaymentMethod($model->getQuote()->getPayment()->getMethod());
}
return parent::validate($address);
diff --git a/app/code/Magento/SalesRule/Model/Rule/Condition/Product.php b/app/code/Magento/SalesRule/Model/Rule/Condition/Product.php
index 9b614b59ae334bd77f35da6f781db5349da99c44..2f4fcbf7c0af2424f2c645b4357b26171c1f5bea 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Condition/Product.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Condition/Product.php
@@ -28,24 +28,24 @@ class Product extends \Magento\Rule\Model\Condition\Product\AbstractProduct
/**
* Validate Product Rule Condition
*
- * @param \Magento\Framework\Object $object
+ * @param \Magento\Framework\Model\AbstractModel $model
* @return bool
*/
- public function validate(\Magento\Framework\Object $object)
+ public function validate(\Magento\Framework\Model\AbstractModel $model)
{
//@todo reimplement this method when is fixed MAGETWO-5713
/** @var \Magento\Catalog\Model\Product $product */
- $product = $object->getProduct();
+ $product = $model->getProduct();
if (!$product instanceof \Magento\Catalog\Model\Product) {
- $product = $this->productRepository->getById($object->getProductId());
+ $product = $this->productRepository->getById($model->getProductId());
}
$product->setQuoteItemQty(
- $object->getQty()
+ $model->getQty()
)->setQuoteItemPrice(
- $object->getPrice() // possible bug: need to use $object->getBasePrice()
+ $model->getPrice() // possible bug: need to use $model->getBasePrice()
)->setQuoteItemRowTotal(
- $object->getBaseRowTotal()
+ $model->getBaseRowTotal()
);
return parent::validate($product);
diff --git a/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Found.php b/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Found.php
index c36ee4671e1d41083c0aa7e05583b44f3430bd09..bea0defa401ebbadb578e1bea86061dc2c1c619d 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Found.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Found.php
@@ -52,15 +52,15 @@ class Found extends \Magento\SalesRule\Model\Rule\Condition\Product\Combine
/**
* Validate
*
- * @param \Magento\Framework\Object $object Quote
+ * @param \Magento\Framework\Model\AbstractModel $model
* @return bool
*/
- public function validate(\Magento\Framework\Object $object)
+ public function validate(\Magento\Framework\Model\AbstractModel $model)
{
$all = $this->getAggregator() === 'all';
$true = (bool)$this->getValue();
$found = false;
- foreach ($object->getAllItems() as $item) {
+ foreach ($model->getAllItems() as $item) {
$found = $all;
foreach ($this->getConditions() as $cond) {
$validated = $cond->validate($item);
diff --git a/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Subselect.php b/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Subselect.php
index 59a5455e96b91b9174874d3b12c84464e387dd4c..08f75032598088f2f081167c7f3b412a0af0d227 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Subselect.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Subselect.php
@@ -133,17 +133,17 @@ class Subselect extends \Magento\SalesRule\Model\Rule\Condition\Product\Combine
/**
* Validate
*
- * @param \Magento\Framework\Object $object Quote
+ * @param \Magento\Framework\Model\AbstractModel $model
* @return bool
*/
- public function validate(\Magento\Framework\Object $object)
+ public function validate(\Magento\Framework\Model\AbstractModel $model)
{
if (!$this->getConditions()) {
return false;
}
$attr = $this->getAttribute();
$total = 0;
- foreach ($object->getQuote()->getAllVisibleItems() as $item) {
+ foreach ($model->getQuote()->getAllVisibleItems() as $item) {
if (parent::validate($item)) {
$total += $item->getData($attr);
}
diff --git a/app/code/Magento/SalesRule/Model/RulesApplier.php b/app/code/Magento/SalesRule/Model/RulesApplier.php
index f7bde08d44e737f81121f7758b645e0e77c869b6..4dace1d8f8df786175108bb19d7b207517dcf5b0 100644
--- a/app/code/Magento/SalesRule/Model/RulesApplier.php
+++ b/app/code/Magento/SalesRule/Model/RulesApplier.php
@@ -59,7 +59,18 @@ class RulesApplier
}
if (!$skipValidation && !$rule->getActions()->validate($item)) {
- continue;
+ $childItems = $item->getChildren();
+ $isContinue = true;
+ if (!empty($childItems)) {
+ foreach ($childItems as $childItem) {
+ if ($rule->getActions()->validate($childItem)) {
+ $isContinue = false;
+ }
+ }
+ }
+ if ($isContinue) {
+ continue;
+ }
}
$this->applyRule($item, $rule, $address, $couponCode);
diff --git a/app/code/Magento/Search/Model/Resource/Query/Collection.php b/app/code/Magento/Search/Model/Resource/Query/Collection.php
index 07dc2a4f169f1d9cccb41229124e21ed78355fb6..9da9c34b18fb2835e127d9bafc6d0f1ac77bcf81 100644
--- a/app/code/Magento/Search/Model/Resource/Query/Collection.php
+++ b/app/code/Magento/Search/Model/Resource/Query/Collection.php
@@ -35,7 +35,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
@@ -45,7 +45,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
*/
public function __construct(
\Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Store\Model\StoreManagerInterface $storeManager,
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/CreateLabel.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/CreateLabel.php
index ac12fa4957763d4194055d6d96c7817f533f5b02..5b09369e89f35d2dc5ba0ccc705e1875d4a7adb8 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/CreateLabel.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/CreateLabel.php
@@ -64,7 +64,7 @@ class CreateLabel extends \Magento\Backend\App\Action
$response->setError(true);
$response->setMessage($e->getMessage());
} catch (\Exception $e) {
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$response->setError(true);
$response->setMessage(__('An error occurred while creating shipping label.'));
}
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/PrintLabel.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/PrintLabel.php
index f8223143233c74f4b284cf0f4a118eb909389af0..4058d5f0632c340c00f58ea5cf9df0e709cdae4e 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/PrintLabel.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/PrintLabel.php
@@ -95,7 +95,7 @@ class PrintLabel extends \Magento\Backend\App\Action
} catch (\Magento\Framework\Model\Exception $e) {
$this->messageManager->addError($e->getMessage());
} catch (\Exception $e) {
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$this->messageManager->addError(__('An error occurred while creating shipping label.'));
}
$this->_redirect(
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
index 075c04dfff05a987e6f6a45266f8ea20433f5878..893cf57a363b12129d7b0b8e31083d1f5a0504d1 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
@@ -143,7 +143,7 @@ class Save extends \Magento\Backend\App\Action
$this->_redirect('*/*/new', ['order_id' => $this->getRequest()->getParam('order_id')]);
}
} catch (\Exception $e) {
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
if ($isNeedCreateLabel) {
$responseAjax->setError(true);
$responseAjax->setMessage(__('An error occurred while creating shipping label.'));
diff --git a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php
index 4cf071e4acab4fe32213ddf460e0683a1893357e..21a384ed8845e38d1bc8c81e4e9122975f19c7c3 100644
--- a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php
+++ b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php
@@ -86,26 +86,26 @@ abstract class AbstractCarrier extends \Magento\Framework\Object implements Abst
protected $_rateErrorFactory;
/**
- * @var \Magento\Sales\Model\Quote\Address\RateResult\ErrorFactory
+ * @var \Psr\Log\LoggerInterface
*/
- protected $_logAdapterFactory;
+ protected $_logger;
/**
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Sales\Model\Quote\Address\RateResult\ErrorFactory $rateErrorFactory
- * @param \Magento\Framework\Logger\AdapterFactory $logAdapterFactory
+ * @param \Psr\Log\LoggerInterface $logger
* @param array $data
*/
public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Sales\Model\Quote\Address\RateResult\ErrorFactory $rateErrorFactory,
- \Magento\Framework\Logger\AdapterFactory $logAdapterFactory,
+ \Psr\Log\LoggerInterface $logger,
array $data = []
) {
parent::__construct($data);
$this->_scopeConfig = $scopeConfig;
$this->_rateErrorFactory = $rateErrorFactory;
- $this->_logAdapterFactory = $logAdapterFactory;
+ $this->_logger = $logger;
}
/**
@@ -568,13 +568,7 @@ abstract class AbstractCarrier extends \Magento\Framework\Object implements Abst
protected function _debug($debugData)
{
if ($this->getDebugFlag()) {
- $this->_logAdapterFactory->create(
- ['fileName' => 'shipping_' . $this->getCarrierCode() . '.log']
- )->setFilterDataKeys(
- $this->_debugReplacePrivateDataKeys
- )->log(
- $debugData
- );
+ $this->_logger->debug($debugData);
}
}
diff --git a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
index 7337c2a96e1467ae679110a7f3ec70f44c2baf4f..3a8f97aab639ea552ad18aab151d13a809b0c696 100644
--- a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
+++ b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
@@ -103,7 +103,7 @@ abstract class AbstractCarrierOnline extends AbstractCarrier
/**
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Sales\Model\Quote\Address\RateResult\ErrorFactory $rateErrorFactory
- * @param \Magento\Framework\Logger\AdapterFactory $logAdapterFactory
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Shipping\Model\Simplexml\ElementFactory $xmlElFactory
* @param \Magento\Shipping\Model\Rate\ResultFactory $rateFactory
* @param \Magento\Sales\Model\Quote\Address\RateResult\MethodFactory $rateMethodFactory
@@ -122,7 +122,7 @@ abstract class AbstractCarrierOnline extends AbstractCarrier
public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Sales\Model\Quote\Address\RateResult\ErrorFactory $rateErrorFactory,
- \Magento\Framework\Logger\AdapterFactory $logAdapterFactory,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Shipping\Model\Simplexml\ElementFactory $xmlElFactory,
\Magento\Shipping\Model\Rate\ResultFactory $rateFactory,
\Magento\Sales\Model\Quote\Address\RateResult\MethodFactory $rateMethodFactory,
@@ -147,7 +147,7 @@ abstract class AbstractCarrierOnline extends AbstractCarrier
$this->_currencyFactory = $currencyFactory;
$this->_directoryData = $directoryData;
$this->stockRegistry = $stockRegistry;
- parent::__construct($scopeConfig, $rateErrorFactory, $logAdapterFactory, $data);
+ parent::__construct($scopeConfig, $rateErrorFactory, $logger, $data);
}
/**
diff --git a/app/code/Magento/Shipping/Model/ShipmentNotifier.php b/app/code/Magento/Shipping/Model/ShipmentNotifier.php
index 6f868b0627f59771accf2e66992cee733642ccba..38299cb23fc24fa04a6adf352853552720364710 100644
--- a/app/code/Magento/Shipping/Model/ShipmentNotifier.php
+++ b/app/code/Magento/Shipping/Model/ShipmentNotifier.php
@@ -5,7 +5,7 @@
namespace Magento\Shipping\Model;
-use Magento\Framework\Logger;
+use Psr\Log\LoggerInterface as Logger;
use Magento\Sales\Model\Order\Email\Sender\ShipmentSender;
use Magento\Sales\Model\Resource\Order\Status\History\CollectionFactory;
@@ -21,7 +21,7 @@ class ShipmentNotifier extends \Magento\Sales\Model\AbstractNotifier
protected $historyCollectionFactory;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $logger;
diff --git a/app/code/Magento/Store/Model/Resource/Config/Collection/Scoped.php b/app/code/Magento/Store/Model/Resource/Config/Collection/Scoped.php
index 2e416222c87acfd6f59a36bc7128a1072c9994ac..411d7aa62edd2ab7e92975dd256bec645ad0ca0b 100644
--- a/app/code/Magento/Store/Model/Resource/Config/Collection/Scoped.php
+++ b/app/code/Magento/Store/Model/Resource/Config/Collection/Scoped.php
@@ -24,7 +24,7 @@ class Scoped extends \Magento\Framework\Model\Resource\Db\Collection\AbstractCol
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Core\Model\Resource\Config\Data $resource
@@ -34,7 +34,7 @@ class Scoped extends \Magento\Framework\Model\Resource\Db\Collection\AbstractCol
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Core\Model\Resource\Config\Data $resource,
diff --git a/app/code/Magento/Store/Model/StorageFactory.php b/app/code/Magento/Store/Model/StorageFactory.php
index 053a718011087ee8a73e0877efa78073b62b0014..edcf2110824c0a78de8ffaa80274017c16162519 100644
--- a/app/code/Magento/Store/Model/StorageFactory.php
+++ b/app/code/Magento/Store/Model/StorageFactory.php
@@ -30,11 +30,6 @@ class StorageFactory
*/
protected $_eventManager;
- /**
- * @var \Magento\Framework\Logger
- */
- protected $_log;
-
/**
* @var \Magento\Framework\Session\SidResolverInterface
*/
@@ -63,7 +58,6 @@ class StorageFactory
/**
* @param \Magento\Framework\ObjectManagerInterface $objectManager
* @param \Magento\Framework\Event\ManagerInterface $eventManager
- * @param \Magento\Framework\Logger $logger
* @param \Magento\Framework\Session\SidResolverInterface $sidResolver
* @param \Magento\Framework\App\State $appState
* @param \Magento\Framework\App\Http\Context $httpContext
@@ -75,7 +69,6 @@ class StorageFactory
public function __construct(
\Magento\Framework\ObjectManagerInterface $objectManager,
\Magento\Framework\Event\ManagerInterface $eventManager,
- \Magento\Framework\Logger $logger,
\Magento\Framework\Session\SidResolverInterface $sidResolver,
\Magento\Framework\App\State $appState,
\Magento\Framework\App\Http\Context $httpContext,
@@ -87,7 +80,6 @@ class StorageFactory
$this->_objectManager = $objectManager;
$this->_storageClassName = $storageClassName;
$this->_eventManager = $eventManager;
- $this->_log = $logger;
$this->_appState = $appState;
$this->_sidResolver = $sidResolver;
$this->_writerModel = $writerModel;
@@ -127,36 +119,6 @@ class StorageFactory
$this->_sidResolver->setUseSessionInUrl($useSid);
$this->_eventManager->dispatch('core_app_init_current_store_after');
-
- $store = $storage->getStore(true);
- $logActive = $this->_scopeConfig->isSetFlag(
- 'dev/log/active',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
- $store
- );
- if ($logActive || $this->_appState->getMode() === \Magento\Framework\App\State::MODE_DEVELOPER) {
- $logFile = $this->_scopeConfig->getValue(
- 'dev/log/file',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
- $store
- );
- $logExceptionFile = $this->_scopeConfig->getValue(
- 'dev/log/exception_file',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
- $store
- );
- $this->_log->unsetLoggers();
- $this->_log->addStreamLog(
- \Magento\Framework\Logger::LOGGER_SYSTEM,
- $logFile,
- $this->_writerModel
- );
- $this->_log->addStreamLog(
- \Magento\Framework\Logger::LOGGER_EXCEPTION,
- $logExceptionFile,
- $this->_writerModel
- );
- }
}
}
return $this->_cache[$className];
diff --git a/app/code/Magento/Tax/Model/Resource/Calculation/Rate/Collection.php b/app/code/Magento/Tax/Model/Resource/Calculation/Rate/Collection.php
index e9f427e3b0e6fda6c8251f06f5ef5c98ebf848b6..f70eb49035601ab8b88865f74d4a8980fc8dd71f 100644
--- a/app/code/Magento/Tax/Model/Resource/Calculation/Rate/Collection.php
+++ b/app/code/Magento/Tax/Model/Resource/Calculation/Rate/Collection.php
@@ -22,7 +22,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
@@ -31,7 +31,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Store\Model\StoreManagerInterface $storeManager,
diff --git a/app/code/Magento/Tax/Model/Resource/Report/Collection.php b/app/code/Magento/Tax/Model/Resource/Report/Collection.php
index 7ae32523bcc3a02907e363b1333fcbe5106f5042..6cdfeb5bf15c3e59bd156d17a5d539c0906a1f04 100644
--- a/app/code/Magento/Tax/Model/Resource/Report/Collection.php
+++ b/app/code/Magento/Tax/Model/Resource/Report/Collection.php
@@ -31,7 +31,7 @@ class Collection extends \Magento\Sales\Model\Resource\Report\Collection\Abstrac
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Sales\Model\Resource\Report $resource
@@ -39,7 +39,7 @@ class Collection extends \Magento\Sales\Model\Resource\Report\Collection\Abstrac
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Sales\Model\Resource\Report $resource,
diff --git a/app/code/Magento/Tax/Model/Resource/Report/Tax.php b/app/code/Magento/Tax/Model/Resource/Report/Tax.php
index f85c89784ca53c5ea017adcf477965ea487d7442..c184dd5bf6e46f4546a1375159d0fcc5b44d1660 100644
--- a/app/code/Magento/Tax/Model/Resource/Report/Tax.php
+++ b/app/code/Magento/Tax/Model/Resource/Report/Tax.php
@@ -22,7 +22,7 @@ class Tax extends \Magento\Reports\Model\Resource\Report\AbstractReport
/**
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Reports\Model\FlagFactory $reportsFlagFactory
* @param \Magento\Framework\Stdlib\DateTime $dateTime
@@ -32,7 +32,7 @@ class Tax extends \Magento\Reports\Model\Resource\Report\AbstractReport
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Reports\Model\FlagFactory $reportsFlagFactory,
\Magento\Framework\Stdlib\DateTime $dateTime,
diff --git a/app/code/Magento/Tax/Model/TaxClass/Source/Customer.php b/app/code/Magento/Tax/Model/TaxClass/Source/Customer.php
index 6d97a822c554c2aa5618b2f5a6f086d732263be6..7033763324eb59787c59b05d368bdbd020343fb8 100644
--- a/app/code/Magento/Tax/Model/TaxClass/Source/Customer.php
+++ b/app/code/Magento/Tax/Model/TaxClass/Source/Customer.php
@@ -5,8 +5,9 @@
namespace Magento\Tax\Model\TaxClass\Source;
-use Magento\Tax\Api\Data\TaxClassInterface as TaxClass;
+use Magento\Framework\Exception\StateException;
use Magento\Tax\Api\TaxClassManagementInterface;
+use Magento\Tax\Api\Data\TaxClassInterface as TaxClass;
/**
* Customer tax class source model.
@@ -48,33 +49,27 @@ class Customer extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
/**
* Retrieve all customer tax classes as an options array.
*
- * @param bool $withEmpty
* @return array
+ * @throws StateException
*/
- public function getAllOptions($withEmpty = true)
+ public function getAllOptions()
{
- if (!$this->_options) {
- $filter = $this->filterBuilder
- ->setField(TaxClass::KEY_TYPE)
+ if (empty($this->_options)) {
+ $options = [];
+ $filter = $this->filterBuilder->setField(TaxClass::KEY_TYPE)
->setValue(TaxClassManagementInterface::TYPE_CUSTOMER)
->create();
$searchCriteria = $this->searchCriteriaBuilder->addFilter([$filter])->create();
$searchResults = $this->taxClassRepository->getList($searchCriteria);
foreach ($searchResults->getItems() as $taxClass) {
- $this->_options[] = [
+ $options[] = [
'value' => $taxClass->getClassId(),
'label' => $taxClass->getClassName(),
];
}
+ $this->_options = $options;
}
- if ($withEmpty) {
- if (!$this->_options) {
- return [['value' => '0', 'label' => __('None')]];
- } else {
- return array_merge([['value' => '0', 'label' => __('None')]], $this->_options);
- }
- }
return $this->_options;
}
}
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Delete.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Delete.php
index 9e3677a44a820425e95012da8b193ebde3b5713c..70ac5381a357524c009bd19429354eecf4168f2b 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Delete.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Delete.php
@@ -35,7 +35,7 @@ class Delete extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme
$this->messageManager->addError($e->getMessage());
} catch (\Exception $e) {
$this->messageManager->addException($e, __('We cannot delete the theme.'));
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
}
/**
* @todo Temporary solution. Theme module should not know about the existence of editor module.
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/DownloadCss.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/DownloadCss.php
index cfe1325536416e05747812f82828e8c8d8f6fbd3..a36241655f6035d43993f116035a42a665474b78 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/DownloadCss.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/DownloadCss.php
@@ -43,7 +43,7 @@ class DownloadCss extends \Magento\Theme\Controller\Adminhtml\System\Design\Them
} catch (\Exception $e) {
$this->messageManager->addException($e, __('File not found: "%1".', $fileId));
$this->getResponse()->setRedirect($this->_redirect->getRefererUrl());
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
}
}
}
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/DownloadCustomCss.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/DownloadCustomCss.php
index 36dde793b45c4fc2a4966c8d590801df61cdd6d0..38f9b1a5c8095982afe69df87d6164cc15dbac61 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/DownloadCustomCss.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/DownloadCustomCss.php
@@ -41,7 +41,7 @@ class DownloadCustomCss extends \Magento\Theme\Controller\Adminhtml\System\Desig
} catch (\Exception $e) {
$this->messageManager->addException($e, __('We cannot find file'));
$this->getResponse()->setRedirect($this->_redirect->getRefererUrl());
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
}
}
}
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Edit.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Edit.php
index 86d8996180c19969bec44fbadd6f719a7ca4eeed..cc443d1d80b1d92065c5e18de037a7fd25f6c36c 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Edit.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Edit.php
@@ -40,7 +40,7 @@ class Edit extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme
$this->_redirect('adminhtml/*/');
} catch (\Exception $e) {
$this->messageManager->addError(__('We cannot find the theme.'));
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$this->_redirect('adminhtml/*/');
}
}
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Save.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Save.php
index 3eb7a42afd42a461d11177e22a6cc1adc73f278b..2c3965ec8cf2ea017d22c8d0d02c351920e5240c 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Save.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Save.php
@@ -69,7 +69,7 @@ class Save extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme
$redirectBack = true;
} catch (\Exception $e) {
$this->messageManager->addError('The theme was not saved');
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
}
$redirectBack ? $this->_redirect(
'adminhtml/*/edit',
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/UploadCss.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/UploadCss.php
index 6d39f4e303d0cd32b91770b48fdcc6d9a4fc1984..bf7ee434a10958ae7782dae518f40ca3ae93c2d3 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/UploadCss.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/UploadCss.php
@@ -23,7 +23,7 @@ class UploadCss extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme
$result = ['error' => true, 'message' => $e->getMessage()];
} catch (\Exception $e) {
$result = ['error' => true, 'message' => __('We cannot upload the CSS file.')];
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
}
$this->getResponse()->representJson(
$this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($result)
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/UploadJs.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/UploadJs.php
index efa49e8f6d603be4e579270781fa4d45e1e81c35..6722f35aa165d2ce428632a068146b090a3a15ff 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/UploadJs.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/UploadJs.php
@@ -47,7 +47,7 @@ class UploadJs extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme
$result = ['error' => true, 'message' => $e->getMessage()];
} catch (\Exception $e) {
$result = ['error' => true, 'message' => __('We cannot upload the JS file.')];
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
}
$this->getResponse()->representJson(
$this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($result)
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/NewFolder.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/NewFolder.php
index d02e1326cc69718ee6d2f3fcff6042fc45c5774e..cd50539d069a427511be32e6158566086c7d78f4 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/NewFolder.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/NewFolder.php
@@ -22,7 +22,7 @@ class NewFolder extends \Magento\Theme\Controller\Adminhtml\System\Design\Wysiwy
$result = ['error' => true, 'message' => $e->getMessage()];
} catch (\Exception $e) {
$result = ['error' => true, 'message' => __('Sorry, there was an unknown error.')];
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
}
$this->getResponse()->representJson(
$this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($result)
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/PreviewImage.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/PreviewImage.php
index 2f42a5585d2e030a12907899d77fd737cb821409..e1bd7a7bec317f4df541ed867f7cdedc274dd591 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/PreviewImage.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/PreviewImage.php
@@ -27,7 +27,7 @@ class PreviewImage extends \Magento\Theme\Controller\Adminhtml\System\Design\Wys
DirectoryList::MEDIA
);
} catch (\Exception $e) {
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$this->_redirect('core/index/notFound');
}
}
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/TreeJson.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/TreeJson.php
index 1ee9b8980537cb5aba86004bd3bdf25930b26fec..931876210972c1c0dcf7235f765f806284a13c46 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/TreeJson.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/TreeJson.php
@@ -23,7 +23,7 @@ class TreeJson extends \Magento\Theme\Controller\Adminhtml\System\Design\Wysiwyg
)
);
} catch (\Exception $e) {
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$this->getResponse()->representJson(
$this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode([])
);
diff --git a/app/code/Magento/Theme/Model/Wysiwyg/Storage.php b/app/code/Magento/Theme/Model/Wysiwyg/Storage.php
index 7b5181a2be052102ace59751e79fb3b038f4b2cc..0dc097aa355a0520b2ec060ff2217f026a61a42e 100644
--- a/app/code/Magento/Theme/Model/Wysiwyg/Storage.php
+++ b/app/code/Magento/Theme/Model/Wysiwyg/Storage.php
@@ -159,7 +159,7 @@ class Storage
$image->resize(self::THUMBNAIL_WIDTH, self::THUMBNAIL_HEIGHT);
$image->save($this->mediaWriteDirectory->getAbsolutePath($thumbnailPath));
} catch (\Magento\Framework\Filesystem\FilesystemException $e) {
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
return false;
}
diff --git a/app/code/Magento/Ups/Model/Carrier.php b/app/code/Magento/Ups/Model/Carrier.php
index 86a2f8b5bb2f76acecefffaf087cc0d251e0a0c8..8a5ea44b6eff892c3b97852b1df2ca5ef9708f62 100644
--- a/app/code/Magento/Ups/Model/Carrier.php
+++ b/app/code/Magento/Ups/Model/Carrier.php
@@ -105,7 +105,7 @@ class Carrier extends AbstractCarrierOnline implements CarrierInterface
protected $_localeFormat;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $_logger;
@@ -117,7 +117,7 @@ class Carrier extends AbstractCarrierOnline implements CarrierInterface
/**
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Sales\Model\Quote\Address\RateResult\ErrorFactory $rateErrorFactory
- * @param \Magento\Framework\Logger\AdapterFactory $logAdapterFactory
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Shipping\Model\Simplexml\ElementFactory $xmlElFactory
* @param \Magento\Shipping\Model\Rate\ResultFactory $rateFactory
* @param \Magento\Sales\Model\Quote\Address\RateResult\MethodFactory $rateMethodFactory
@@ -129,7 +129,6 @@ class Carrier extends AbstractCarrierOnline implements CarrierInterface
* @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
* @param \Magento\Directory\Helper\Data $directoryData
* @param \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry
- * @param \Magento\Framework\Logger $logger
* @param \Magento\Framework\Locale\FormatInterface $localeFormat
* @param Config $configHelper
* @param array $data
@@ -139,7 +138,7 @@ class Carrier extends AbstractCarrierOnline implements CarrierInterface
public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Sales\Model\Quote\Address\RateResult\ErrorFactory $rateErrorFactory,
- \Magento\Framework\Logger\AdapterFactory $logAdapterFactory,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Shipping\Model\Simplexml\ElementFactory $xmlElFactory,
\Magento\Shipping\Model\Rate\ResultFactory $rateFactory,
\Magento\Sales\Model\Quote\Address\RateResult\MethodFactory $rateMethodFactory,
@@ -151,18 +150,16 @@ class Carrier extends AbstractCarrierOnline implements CarrierInterface
\Magento\Directory\Model\CurrencyFactory $currencyFactory,
\Magento\Directory\Helper\Data $directoryData,
\Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry,
- \Magento\Framework\Logger $logger,
\Magento\Framework\Locale\FormatInterface $localeFormat,
Config $configHelper,
array $data = []
) {
- $this->_logger = $logger;
$this->_localeFormat = $localeFormat;
$this->configHelper = $configHelper;
parent::__construct(
$scopeConfig,
$rateErrorFactory,
- $logAdapterFactory,
+ $logger,
$xmlElFactory,
$rateFactory,
$rateMethodFactory,
@@ -518,7 +515,7 @@ class Carrier extends AbstractCarrierOnline implements CarrierInterface
$message = __(
'Sorry, something went wrong. Please try again or contact us and we\'ll try to help.'
);
- $this->_logger->log($message . ': ' . $errorTitle);
+ $this->_logger->debug($message . ': ' . $errorTitle);
break;
case 6:
if (in_array($row[3], $allowedMethods)) {
diff --git a/app/code/Magento/UrlRewrite/Model/Resource/UrlRewriteCollection.php b/app/code/Magento/UrlRewrite/Model/Resource/UrlRewriteCollection.php
index 0e50c89bf2dbc35b588bf66891939657efcf0741..ad3059c13eea4bdc023fe440d20f8c1518310309 100644
--- a/app/code/Magento/UrlRewrite/Model/Resource/UrlRewriteCollection.php
+++ b/app/code/Magento/UrlRewrite/Model/Resource/UrlRewriteCollection.php
@@ -17,7 +17,7 @@ class UrlRewriteCollection extends \Magento\Framework\Model\Resource\Db\Collecti
/**
* @param \Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
@@ -26,7 +26,7 @@ class UrlRewriteCollection extends \Magento\Framework\Model\Resource\Db\Collecti
*/
public function __construct(
\Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Store\Model\StoreManagerInterface $storeManager,
diff --git a/app/code/Magento/Usps/Model/Carrier.php b/app/code/Magento/Usps/Model/Carrier.php
index d6aebb495fcf7ffdbd180a11d9bf09fd6d9cf72d..7f22a33a79b9a60d707bb934b7e5d4b7d1f7a5b5 100644
--- a/app/code/Magento/Usps/Model/Carrier.php
+++ b/app/code/Magento/Usps/Model/Carrier.php
@@ -107,7 +107,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
/**
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Sales\Model\Quote\Address\RateResult\ErrorFactory $rateErrorFactory
- * @param \Magento\Framework\Logger\AdapterFactory $logAdapterFactory
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Shipping\Model\Simplexml\ElementFactory $xmlElFactory
* @param \Magento\Shipping\Model\Rate\ResultFactory $rateFactory
* @param \Magento\Sales\Model\Quote\Address\RateResult\MethodFactory $rateMethodFactory
@@ -129,7 +129,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Sales\Model\Quote\Address\RateResult\ErrorFactory $rateErrorFactory,
- \Magento\Framework\Logger\AdapterFactory $logAdapterFactory,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Shipping\Model\Simplexml\ElementFactory $xmlElFactory,
\Magento\Shipping\Model\Rate\ResultFactory $rateFactory,
\Magento\Sales\Model\Quote\Address\RateResult\MethodFactory $rateMethodFactory,
@@ -152,7 +152,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
parent::__construct(
$scopeConfig,
$rateErrorFactory,
- $logAdapterFactory,
+ $logger,
$xmlElFactory,
$rateFactory,
$rateMethodFactory,
diff --git a/app/code/Magento/Webapi/Controller/ErrorProcessor.php b/app/code/Magento/Webapi/Controller/ErrorProcessor.php
index d810a58015c2f592b8766372dde451318a14b4b5..3e951b285ad67fab5ead489fbe9d1f528f9ccc85 100644
--- a/app/code/Magento/Webapi/Controller/ErrorProcessor.php
+++ b/app/code/Magento/Webapi/Controller/ErrorProcessor.php
@@ -48,7 +48,7 @@ class ErrorProcessor
protected $_appState;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $_logger;
@@ -67,13 +67,13 @@ class ErrorProcessor
/**
* @param \Magento\Core\Helper\Data $helper
* @param \Magento\Framework\App\State $appState
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Filesystem $filesystem
*/
public function __construct(
\Magento\Core\Helper\Data $helper,
\Magento\Framework\App\State $appState,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Filesystem $filesystem
) {
$this->_coreHelper = $helper;
@@ -134,7 +134,7 @@ class ErrorProcessor
//if not in Dev mode, make sure the message and code is masked for unanticipated exceptions
if (!$isDevMode) {
/** Log information about actual exception */
- $reportId = $this->_logException($exception);
+ $reportId = $this->_critical($exception);
$message = sprintf(self::INTERNAL_SERVER_ERROR_MSG, $reportId);
$code = 0;
}
@@ -166,7 +166,7 @@ class ErrorProcessor
if ($this->_appState->getMode() == State::MODE_DEVELOPER || $exception instanceof \Magento\Webapi\Exception) {
$this->render($exception->getMessage(), $exception->getTraceAsString(), $httpCode);
} else {
- $reportId = $this->_logException($exception);
+ $reportId = $this->_critical($exception);
$this->render(
__('Internal Error. Details are available in Magento log file. Report ID: %1', $reportId),
'Trace is not available.',
@@ -182,16 +182,16 @@ class ErrorProcessor
* @param \Exception $exception
* @return string $reportId
*/
- protected function _logException(\Exception $exception)
+ protected function _critical(\Exception $exception)
{
$exceptionClass = get_class($exception);
$reportId = uniqid("webapi-");
$exceptionForLog = new $exceptionClass(
- /** Trace is added separately by logException. */
+ /** Trace is added separately by critical. */
"Report ID: {$reportId}; Message: {$exception->getMessage()}",
$exception->getCode()
);
- $this->_logger->logException($exceptionForLog);
+ $this->_logger->critical($exceptionForLog);
return $reportId;
}
diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance.php
index 6c749bd080fcc9b523a3f53a5463dc4fbd872d1a..447568540595fad9c58122da43cce6b4ae29a29c 100644
--- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance.php
+++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance.php
@@ -23,7 +23,7 @@ class Instance extends \Magento\Backend\App\Action
protected $_widgetFactory;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $_logger;
@@ -41,7 +41,7 @@ class Instance extends \Magento\Backend\App\Action
* @param \Magento\Backend\App\Action\Context $context
* @param \Magento\Framework\Registry $coreRegistry
* @param \Magento\Widget\Model\Widget\InstanceFactory $widgetFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Math\Random $mathRandom
* @param \Magento\Framework\Translate\InlineInterface $translateInline
*/
@@ -49,7 +49,7 @@ class Instance extends \Magento\Backend\App\Action
\Magento\Backend\App\Action\Context $context,
\Magento\Framework\Registry $coreRegistry,
\Magento\Widget\Model\Widget\InstanceFactory $widgetFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Math\Random $mathRandom,
\Magento\Framework\Translate\InlineInterface $translateInline
) {
diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Save.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Save.php
index f756cb5d2b8201acedcc71a9c53dfe3cfb539dc2..d7fd7dd28cca7c03e653a021a628ce494814941c 100644
--- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Save.php
+++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Save.php
@@ -44,7 +44,7 @@ class Save extends \Magento\Widget\Controller\Adminhtml\Widget\Instance
return;
} catch (\Exception $exception) {
$this->messageManager->addError($exception->getMessage());
- $this->_logger->logException($exception);
+ $this->_logger->critical($exception);
$this->_redirect('adminhtml/*/edit', ['_current' => true]);
return;
}
diff --git a/app/code/Magento/Widget/Model/Template/Filter.php b/app/code/Magento/Widget/Model/Template/Filter.php
index e5c7aa30374b2b8a8969a9c4ffe7c85cbf645dfc..695345a62c8f3d20dbca49ad0fba0b4c8dfe1179 100644
--- a/app/code/Magento/Widget/Model/Template/Filter.php
+++ b/app/code/Magento/Widget/Model/Template/Filter.php
@@ -21,7 +21,7 @@ class Filter extends \Magento\Cms\Model\Template\Filter
/**
* @param \Magento\Framework\Stdlib\String $string
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Escaper $escaper
* @param \Magento\Framework\View\Asset\Repository $assetRepo
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -36,7 +36,7 @@ class Filter extends \Magento\Cms\Model\Template\Filter
*/
public function __construct(
\Magento\Framework\Stdlib\String $string,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Escaper $escaper,
\Magento\Framework\View\Asset\Repository $assetRepo,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
diff --git a/app/code/Magento/Wishlist/Controller/Index/Add.php b/app/code/Magento/Wishlist/Controller/Index/Add.php
index 93a5a80497f50a760c1d49811c90a49f1da997e0..7b45de5f6fdac175b8567ddec58d55230502b33d 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Add.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Add.php
@@ -127,7 +127,7 @@ class Add extends Action\Action implements IndexInterface
);
} catch (\Exception $e) {
$this->messageManager->addError(__('An error occurred while adding item to wish list.'));
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
}
$this->_redirect('*', ['wishlist_id' => $wishlist->getId()]);
diff --git a/app/code/Magento/Wishlist/Controller/Index/Cart.php b/app/code/Magento/Wishlist/Controller/Index/Cart.php
index e0508e6c0e2efa860e0a01bcbdc3407b654e7759..edb018b57b84ec7481d38b773fa7566818e8332c 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Cart.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Cart.php
@@ -21,18 +21,66 @@ class Cart extends Action\Action implements IndexInterface
*/
protected $quantityProcessor;
+ /**
+ * @var \Magento\Wishlist\Model\ItemFactory
+ */
+ protected $itemFactory;
+
+ /**
+ * @var \Magento\Checkout\Model\Cart
+ */
+ protected $cart;
+
+ /**
+ * @var \Magento\Wishlist\Model\Item\OptionFactory
+ */
+ private $optionFactory;
+
+ /**
+ * @var \Magento\Catalog\Helper\Product
+ */
+ protected $productHelper;
+
+ /**
+ * @var \Magento\Framework\Escaper
+ */
+ protected $escaper;
+
+ /**
+ * @var \Magento\Wishlist\Helper\Data
+ */
+ protected $helper;
+
/**
* @param Action\Context $context
* @param \Magento\Wishlist\Controller\WishlistProviderInterface $wishlistProvider
* @param \Magento\Wishlist\Model\LocaleQuantityProcessor $quantityProcessor
+ * @param \Magento\Wishlist\Model\ItemFactory $itemFactory
+ * @param \Magento\Checkout\Model\Cart $cart
+ * @param \Magento\Wishlist\Model\Item\OptionFactory $
+ * @param \Magento\Catalog\Helper\Product $productHelper
+ * @param \Magento\Framework\Escaper $escaper
+ * @param \Magento\Wishlist\Helper\Data $helper
*/
public function __construct(
Action\Context $context,
\Magento\Wishlist\Controller\WishlistProviderInterface $wishlistProvider,
- \Magento\Wishlist\Model\LocaleQuantityProcessor $quantityProcessor
+ \Magento\Wishlist\Model\LocaleQuantityProcessor $quantityProcessor,
+ \Magento\Wishlist\Model\ItemFactory $itemFactory,
+ \Magento\Checkout\Model\Cart $cart,
+ \Magento\Wishlist\Model\Item\OptionFactory $optionFactory,
+ \Magento\Catalog\Helper\Product $productHelper,
+ \Magento\Framework\Escaper $escaper,
+ \Magento\Wishlist\Helper\Data $helper
) {
$this->wishlistProvider = $wishlistProvider;
$this->quantityProcessor = $quantityProcessor;
+ $this->itemFactory = $itemFactory;
+ $this->cart = $cart;
+ $this->optionFactory = $optionFactory;
+ $this->productHelper = $productHelper;
+ $this->escaper = $escaper;
+ $this->helper = $helper;
parent::__construct($context);
}
@@ -49,7 +97,7 @@ class Cart extends Action\Action implements IndexInterface
$itemId = (int)$this->getRequest()->getParam('item');
/* @var $item \Magento\Wishlist\Model\Item */
- $item = $this->_objectManager->create('Magento\Wishlist\Model\Item')->load($itemId);
+ $item = $this->itemFactory->create()->load($itemId);
if (!$item->getId()) {
return $this->_redirect('*/*');
}
@@ -72,70 +120,61 @@ class Cart extends Action\Action implements IndexInterface
$item->setQty($qty);
}
- /* @var $session \Magento\Framework\Session\Generic */
- $session = $this->_objectManager->get('Magento\Wishlist\Model\Session');
- $cart = $this->_objectManager->get('Magento\Checkout\Model\Cart');
-
$redirectUrl = $this->_url->getUrl('*/*');
+ $configureUrl = $this->_url->getUrl(
+ '*/*/configure/',
+ [
+ 'id' => $item->getId(),
+ 'product_id' => $item->getProductId(),
+ ]
+ );
try {
- $options = $this->_objectManager->create(
- 'Magento\Wishlist\Model\Item\Option'
- )->getCollection()->addItemFilter(
- [$itemId]
- );
+ /** @var \Magento\Wishlist\Model\Resource\Item\Option\Collection $options */
+ $options = $this->optionFactory->create()->getCollection()->addItemFilter([$itemId]);
$item->setOptions($options->getOptionsByItem($itemId));
- $buyRequest = $this->_objectManager->get(
- 'Magento\Catalog\Helper\Product'
- )->addParamsToBuyRequest(
+ $buyRequest = $this->productHelper->addParamsToBuyRequest(
$this->getRequest()->getParams(),
['current_config' => $item->getBuyRequest()]
);
$item->mergeBuyRequest($buyRequest);
- $item->addToCart($cart, true);
- $cart->save()->getQuote()->collectTotals();
+ $item->addToCart($this->cart, true);
+ $this->cart->save()->getQuote()->collectTotals();
$wishlist->save();
- if (!$cart->getQuote()->getHasError()) {
+ if (!$this->cart->getQuote()->getHasError()) {
$message = __(
'You added %1 to your shopping cart.',
- $this->_objectManager->get('Magento\Framework\Escaper')->escapeHtml($item->getProduct()->getName())
+ $this->escaper->escapeHtml($item->getProduct()->getName())
);
$this->messageManager->addSuccess($message);
}
- $this->_objectManager->get('Magento\Wishlist\Helper\Data')->calculate();
-
- if ($this->_objectManager->get('Magento\Checkout\Helper\Cart')->getShouldRedirectToCart()) {
- $redirectUrl = $this->_objectManager->get('Magento\Checkout\Helper\Cart')->getCartUrl();
+ if ($this->cart->getShouldRedirectToCart()) {
+ $redirectUrl = $this->cart->getCartUrl();
} else {
$refererUrl = $this->_redirect->getRefererUrl();
- if ($refererUrl &&
- ($refererUrl != $this->_objectManager->get('Magento\Framework\UrlInterface')
- ->getUrl('*/*/configure/', ['id' => $item->getId()])
- )
- ) {
+ if ($refererUrl && $refererUrl != $configureUrl) {
$redirectUrl = $refererUrl;
}
}
- $this->_objectManager->get('Magento\Wishlist\Helper\Data')->calculate();
} catch (\Magento\Framework\Model\Exception $e) {
if ($e->getCode() == \Magento\Wishlist\Model\Item::EXCEPTION_CODE_NOT_SALABLE) {
$this->messageManager->addError(__('This product(s) is out of stock.'));
} elseif ($e->getCode() == \Magento\Wishlist\Model\Item::EXCEPTION_CODE_HAS_REQUIRED_OPTIONS) {
$this->messageManager->addNotice($e->getMessage());
- $redirectUrl = $this->_url->getUrl('*/*/configure/', ['id' => $item->getId()]);
+ $redirectUrl = $configureUrl;
} else {
$this->messageManager->addNotice($e->getMessage());
- $redirectUrl = $this->_url->getUrl('*/*/configure/', ['id' => $item->getId()]);
+ $redirectUrl = $configureUrl;
}
} catch (\Exception $e) {
$this->messageManager->addException($e, __('Cannot add item to shopping cart'));
}
- $this->_objectManager->get('Magento\Wishlist\Helper\Data')->calculate();
+ $this->helper->calculate();
return $this->getResponse()->setRedirect($redirectUrl);
}
diff --git a/app/code/Magento/Wishlist/Controller/Index/Configure.php b/app/code/Magento/Wishlist/Controller/Index/Configure.php
index d7539cd2046fef16e1c171f13c6f0ce0c997b45c..56e56caff33dbbe1d42765a85ab9aa23dd817176 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Configure.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Configure.php
@@ -99,7 +99,7 @@ class Configure extends Action\Action implements IndexInterface
return;
} catch (\Exception $e) {
$this->messageManager->addError(__('We can\'t configure the product.'));
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$this->_redirect('*');
return;
}
diff --git a/app/code/Magento/Wishlist/Controller/Index/Update.php b/app/code/Magento/Wishlist/Controller/Index/Update.php
index 3b0e7b58f0915c8369dd906d4bed86525e579042..40c1e7dbee43ab811d4f795315879e322531465c 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Update.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Update.php
@@ -94,7 +94,7 @@ class Update extends Action\Action implements IndexInterface
try {
$item->delete();
} catch (\Exception $e) {
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$this->messageManager->addError(__('Can\'t delete item from wishlist'));
}
}
diff --git a/app/code/Magento/Wishlist/Controller/Index/UpdateItemOptions.php b/app/code/Magento/Wishlist/Controller/Index/UpdateItemOptions.php
index cc5893c55da6afc5e23fe7408d2410c4266047a5..8d6046d6e938a7f8848699341723974ecb770e1f 100644
--- a/app/code/Magento/Wishlist/Controller/Index/UpdateItemOptions.php
+++ b/app/code/Magento/Wishlist/Controller/Index/UpdateItemOptions.php
@@ -99,7 +99,7 @@ class UpdateItemOptions extends Action\Action implements IndexInterface
$this->messageManager->addError($e->getMessage());
} catch (\Exception $e) {
$this->messageManager->addError(__('An error occurred while updating wish list.'));
- $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
}
$this->_redirect('*/*', ['wishlist_id' => $wishlist->getId()]);
}
diff --git a/app/code/Magento/Wishlist/Model/ItemCarrier.php b/app/code/Magento/Wishlist/Model/ItemCarrier.php
index 07a014b3ff59fc6a90ad537cbdfbf4700501001f..a492568b03d805de7eda791827577bb4ea24d04d 100644
--- a/app/code/Magento/Wishlist/Model/ItemCarrier.php
+++ b/app/code/Magento/Wishlist/Model/ItemCarrier.php
@@ -9,7 +9,7 @@ use Magento\Checkout\Helper\Cart as CartHelper;
use Magento\Checkout\Model\Cart;
use Magento\Customer\Model\Session;
use Magento\Framework\App\Response\RedirectInterface;
-use Magento\Framework\Logger;
+use Psr\Log\LoggerInterface as Logger;
use Magento\Framework\Message\ManagerInterface as MessageManager;
use Magento\Framework\UrlInterface;
use Magento\Wishlist\Helper\Data as WishlistHelper;
@@ -32,7 +32,7 @@ class ItemCarrier
protected $cart;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $logger;
@@ -145,7 +145,7 @@ class ItemCarrier
$cart->getQuote()->deleteItem($cartItem);
}
} catch (\Exception $e) {
- $this->logger->logException($e);
+ $this->logger->critical($e);
$messages[] = __('We cannot add this item to your shopping cart.');
}
}
diff --git a/app/code/Magento/Wishlist/Model/Resource/Item/Collection.php b/app/code/Magento/Wishlist/Model/Resource/Item/Collection.php
index 73bfe66eedfdb439d58baca9ccbe3bf400392095..8ab2536a38ad7ca14b72a6387e13bcc39cc92003 100644
--- a/app/code/Magento/Wishlist/Model/Resource/Item/Collection.php
+++ b/app/code/Magento/Wishlist/Model/Resource/Item/Collection.php
@@ -131,7 +131,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration
@@ -153,7 +153,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration,
diff --git a/app/code/Magento/Wishlist/Model/Resource/Item/Collection/Grid.php b/app/code/Magento/Wishlist/Model/Resource/Item/Collection/Grid.php
index c785b0fff90150aa222239de07ffdd576c1be9ce..06c7bd3b58e577d8f66f089f2ce3c3f468fc9d02 100644
--- a/app/code/Magento/Wishlist/Model/Resource/Item/Collection/Grid.php
+++ b/app/code/Magento/Wishlist/Model/Resource/Item/Collection/Grid.php
@@ -19,7 +19,7 @@ class Grid extends \Magento\Wishlist\Model\Resource\Item\Collection
/**
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration
@@ -42,7 +42,7 @@ class Grid extends \Magento\Wishlist\Model\Resource\Item\Collection
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration,
diff --git a/app/etc/di.xml b/app/etc/di.xml
index 11bb9ee59bbfd3b9594f97dd2fef3ad361e791a8..5fa642e9363e644b6821f21ffacc8395d05d1c65 100644
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -5,6 +5,7 @@
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
+ <preference for="Psr\Log\LoggerInterface" type="Magento\Framework\Logger\Monolog" />
<preference for="Magento\Framework\ObjectManager\FactoryInterface" type="Magento\Framework\ObjectManager\Factory\Dynamic\Developer" />
<preference for="Magento\Framework\Search\Adapter\Mysql\Filter\PreprocessorInterface" type="Magento\Framework\Search\Adapter\Mysql\Filter\Preprocessor" />
<preference for="Magento\Framework\Search\Adapter\Mysql\Field\ResolverInterface" type="Magento\Framework\Search\Adapter\Mysql\Field\Resolver" />
@@ -85,6 +86,26 @@
<preference for="Magento\Framework\DB\LoggerInterface" type="Magento\Framework\DB\Logger\Null"/>
<preference for="Magento\Framework\App\Resource\ConnectionAdapterInterface" type="Magento\Framework\Model\Resource\Type\Db\Pdo\Mysql"/>
<preference for="Magento\Framework\DB\QueryInterface" type="Magento\Framework\DB\Query"/>
+ <type name="Magento\Framework\Logger\Handler\System">
+ <arguments>
+ <argument name="filesystem" xsi:type="object">Magento\Framework\Filesystem\Driver\File</argument>
+ </arguments>
+ </type>
+ <type name="Magento\Framework\Logger\Monolog">
+ <arguments>
+ <argument name="name" xsi:type="string">main</argument>
+ <argument name="handlers" xsi:type="array">
+ <item name="exception" xsi:type="object">Magento\Framework\Logger\Handler\Critical</item>
+ <item name="system" xsi:type="object">Magento\Framework\Logger\Handler\System</item>
+ <item name="debug" xsi:type="object">Magento\Framework\Logger\Handler\Debug</item>
+ </argument>
+ </arguments>
+ </type>
+ <type name="Monolog\Handler\StreamHandler">
+ <arguments>
+ <argument name="stream" xsi:type="string">var/log/system.log</argument>
+ </arguments>
+ </type>
<type name="Magento\Framework\Model\Context">
<arguments>
<argument name="actionValidator" xsi:type="object">Magento\Framework\Model\ActionValidator\RemoveAction\Proxy</argument>
diff --git a/composer.json b/composer.json
index ae473710a82d728ce3daef6b7ad24675b916756e..78915324de0faf32d84025317fe8acb1a05187eb 100644
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,8 @@
"zendframework/zend-log": "2.3.1",
"zendframework/zend-http": "2.3.1",
"magento/zendframework1": "1.12.9-patch1",
- "composer/composer": "1.0.0-alpha8"
+ "composer/composer": "1.0.0-alpha8",
+ "monolog/monolog": "1.11.0"
},
"require-dev": {
"phpunit/phpunit": "4.1.0",
diff --git a/composer.lock b/composer.lock
index 7cb7c6f857a442535a10bf2c75a3e5c0803611bd..3aa9ff558933f6dce695a96b62b59c0b312a1a56 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "cf88c5db8e11255eb97498f788609028",
+ "hash": "25a2a2ff9de53c394a797011b0f84855",
"packages": [
{
"name": "composer/composer",
@@ -178,6 +178,116 @@
],
"time": "2014-12-12 15:28:16"
},
+ {
+ "name": "monolog/monolog",
+ "version": "1.11.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/Seldaek/monolog.git",
+ "reference": "ec3961874c43840e96da3a8a1ed20d8c73d7e5aa"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/Seldaek/monolog/zipball/ec3961874c43840e96da3a8a1ed20d8c73d7e5aa",
+ "reference": "ec3961874c43840e96da3a8a1ed20d8c73d7e5aa",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.0",
+ "psr/log": "~1.0"
+ },
+ "provide": {
+ "psr/log-implementation": "1.0.0"
+ },
+ "require-dev": {
+ "aws/aws-sdk-php": "~2.4, >2.4.8",
+ "doctrine/couchdb": "~1.0@dev",
+ "graylog2/gelf-php": "~1.0",
+ "phpunit/phpunit": "~3.7.0",
+ "raven/raven": "~0.5",
+ "ruflin/elastica": "0.90.*",
+ "videlalvaro/php-amqplib": "~2.4"
+ },
+ "suggest": {
+ "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
+ "doctrine/couchdb": "Allow sending log messages to a CouchDB server",
+ "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
+ "ext-mongo": "Allow sending log messages to a MongoDB server",
+ "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
+ "raven/raven": "Allow sending log messages to a Sentry server",
+ "rollbar/rollbar": "Allow sending log messages to Rollbar",
+ "ruflin/elastica": "Allow sending log messages to an Elastic Search server",
+ "videlalvaro/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.11.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Monolog\\": "src/Monolog"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Jordi Boggiano",
+ "email": "j.boggiano@seld.be",
+ "homepage": "http://seld.be"
+ }
+ ],
+ "description": "Sends your logs to files, sockets, inboxes, databases and various web services",
+ "homepage": "http://github.com/Seldaek/monolog",
+ "keywords": [
+ "log",
+ "logging",
+ "psr-3"
+ ],
+ "time": "2014-09-30 13:30:58"
+ },
+ {
+ "name": "psr/log",
+ "version": "1.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-fig/log.git",
+ "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b",
+ "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b",
+ "shasum": ""
+ },
+ "type": "library",
+ "autoload": {
+ "psr-0": {
+ "Psr\\Log\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "PHP-FIG",
+ "homepage": "http://www.php-fig.org/"
+ }
+ ],
+ "description": "Common interface for logging libraries",
+ "keywords": [
+ "log",
+ "psr",
+ "psr-3"
+ ],
+ "time": "2012-12-21 11:40:51"
+ },
{
"name": "seld/jsonlint",
"version": "1.3.0",
diff --git a/dev/tests/functional/.gitignore b/dev/tests/functional/.gitignore
index f12c1a579105c852eae99d7f3f99befa173cb4a0..d3b32c5f1d405f9a8bb0a4b6ba742409c6f6050b 100755
--- a/dev/tests/functional/.gitignore
+++ b/dev/tests/functional/.gitignore
@@ -3,6 +3,9 @@
/generated
/var
/config/*
-!/config/*.dist
+!/config/application.yml.dist
+!/config/handler.yml.dist
+!/config/isolation.yml.dist
+!/config/server.yml.dist
phpunit.xml
/lib/Mtf/Util/Generate/testcase.xml
diff --git a/dev/tests/functional/lib/Mtf/Util/Generate/Repository/TableCollection.php b/dev/tests/functional/lib/Mtf/Util/Generate/Repository/TableCollection.php
index 940de6bd0ff863bb8f3fa112e003a562d5394030..f5c9bcbe2d5049fecb43f216e504fb6eef94c149 100644
--- a/dev/tests/functional/lib/Mtf/Util/Generate/Repository/TableCollection.php
+++ b/dev/tests/functional/lib/Mtf/Util/Generate/Repository/TableCollection.php
@@ -21,7 +21,7 @@ class TableCollection extends AbstractCollection
/**
* @constructor
* @param \Magento\Core\Model\EntityFactory $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param null $connection
@@ -30,7 +30,7 @@ class TableCollection extends AbstractCollection
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
$connection = null,
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Application.php b/dev/tests/integration/framework/Magento/TestFramework/Application.php
index 17caa1db0b137c8a9cabff91770ef28f2485b4e5..5ecbb875d993109d81f26d62c655ff39d432961d 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Application.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Application.php
@@ -272,10 +272,10 @@ class Application
$objectManager->removeSharedInstance('Magento\Framework\Filesystem');
$objectManager->addSharedInstance($filesystem, 'Magento\Framework\Filesystem');
- /** @var \Magento\Framework\Logger $logger */
+ /** @var \Psr\Log\LoggerInterface $logger */
$logger = $objectManager->get('Magento\TestFramework\ErrorLog\Logger');
- $objectManager->removeSharedInstance('Magento\Framework\Logger');
- $objectManager->addSharedInstance($logger, 'Magento\Framework\Logger');
+ $objectManager->removeSharedInstance('Psr\Log\LoggerInterface');
+ $objectManager->addSharedInstance($logger, 'Psr\Log\LoggerInterface');
Helper\Bootstrap::setObjectManager($objectManager);
diff --git a/dev/tests/integration/framework/Magento/TestFramework/ErrorLog/Listener.php b/dev/tests/integration/framework/Magento/TestFramework/ErrorLog/Listener.php
index a74645c54aef3ab4863c5fbada46526ff7076872..e86373e49f13209e85d08692877f753bf4de87c6 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/ErrorLog/Listener.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/ErrorLog/Listener.php
@@ -72,7 +72,7 @@ class Listener implements \PHPUnit_Framework_TestListener
*/
public function startTest(\PHPUnit_Framework_Test $test)
{
- $this->logger = Helper\Bootstrap::getObjectManager()->get('Magento\Framework\Logger');
+ $this->logger = Helper\Bootstrap::getObjectManager()->get('Magento\TestFramework\ErrorLog\Logger');
$this->logger->clearMessages();
}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/ErrorLog/Logger.php b/dev/tests/integration/framework/Magento/TestFramework/ErrorLog/Logger.php
index c97c2565cbabd5e071b620827cf514d61507925d..d548626cee8f89510417520553da95ba8c0062e7 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/ErrorLog/Logger.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/ErrorLog/Logger.php
@@ -4,7 +4,7 @@
*/
namespace Magento\TestFramework\ErrorLog;
-class Logger extends \Magento\Framework\Logger
+class Logger extends \Magento\Framework\Logger\Monolog
{
/** @var array */
protected $messages = [];
@@ -18,14 +18,10 @@ class Logger extends \Magento\Framework\Logger
*/
protected $minimumErrorLevel;
- /**
- * @param \Magento\Framework\Filesystem $filesystem
- * @param string $defaultFile
- */
- public function __construct(\Magento\Framework\Filesystem $filesystem, $defaultFile = '')
+ public function __construct()
{
- parent::__construct($filesystem, $defaultFile);
$this->minimumErrorLevel = defined('TESTS_ERROR_LOG_LISTENER_LEVEL') ? TESTS_ERROR_LOG_LISTENER_LEVEL : -1;
+ parent::__construct('integration-test');
}
/**
@@ -43,21 +39,4 @@ class Logger extends \Magento\Framework\Logger
{
return $this->messages;
}
-
- /**
- * @param string $message
- * @param int $level
- * @param string $loggerKey
- */
- public function log($message, $level = \Zend_Log::DEBUG, $loggerKey = \Magento\Framework\Logger::LOGGER_SYSTEM)
- {
- if ($level <= $this->minimumErrorLevel) {
- $this->messages[] = [
- 'logger' => $loggerKey,
- 'level' => $level,
- 'message' => $message,
- ];
- }
- parent::log($message, $level, $loggerKey);
- }
}
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Model/SessionTest.php b/dev/tests/integration/testsuite/Magento/Backend/Model/SessionTest.php
index 1b8db05de4677937750b61717ba7d088e9a762d9..8c49a3d858962f4dac06ea1ec7fd59e4b693f876 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Model/SessionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Model/SessionTest.php
@@ -16,7 +16,7 @@ class SessionTest extends \PHPUnit_Framework_TestCase
if (array_key_exists('adminhtml', $_SESSION)) {
unset($_SESSION['adminhtml']);
}
- $logger = $this->getMock('Magento\Framework\Logger', [], [], '', false);
+ $logger = $this->getMock('Psr\Log\LoggerInterface', [], [], '', false);
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
'Magento\Backend\Model\Session',
[$logger]
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Type/AbstractTypeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Type/AbstractTypeTest.php
index cb7cc49ea3c16c36b913abd62e69b02b29a88aa0..47a3fca574925c2993773583c785dd973659aac4 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Type/AbstractTypeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Type/AbstractTypeTest.php
@@ -31,7 +31,7 @@ class AbstractTypeTest extends \PHPUnit_Framework_TestCase
$fileStorageDb = $this->getMock('Magento\Core\Helper\File\Storage\Database', [], [], '', false);
$filesystem = $this->getMock('Magento\Framework\Filesystem', [], [], '', false);
$registry = $this->getMock('Magento\Framework\Registry', [], [], '', false);
- $logger = $this->getMock('Magento\Framework\Logger', [], [], '', false);
+ $logger = $this->getMock('Psr\Log\LoggerInterface', [], [], '', false);
$this->_model = $this->getMockForAbstractClass(
'Magento\Catalog\Model\Product\Type\AbstractType',
[
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/AddressTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/AddressTest.php
index 75f463af75981787eca161678dfe29dc4a94d174..2ff68a63b48dd14027592f5da89d3e48688da35b 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Controller/AddressTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/AddressTest.php
@@ -14,7 +14,7 @@ class AddressTest extends \Magento\TestFramework\TestCase\AbstractController
protected function setUp()
{
parent::setUp();
- $logger = $this->getMock('Magento\Framework\Logger', [], [], '', false);
+ $logger = $this->getMock('Psr\Log\LoggerInterface', [], [], '', false);
$session = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
'Magento\Customer\Model\Session',
[$logger]
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Model/Resource/Db/Collection/AbstractTest.php b/dev/tests/integration/testsuite/Magento/Framework/Model/Resource/Db/Collection/AbstractTest.php
index ecfd7fa158df532a4fb7d6d34262a894859ac69f..cbf2052f709b49c4df346a291afa07eb013a4c0b 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Model/Resource/Db/Collection/AbstractTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Model/Resource/Db/Collection/AbstractTest.php
@@ -43,7 +43,7 @@ class AbstractTest extends \PHPUnit_Framework_TestCase
$entityFactory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
'Magento\Core\Model\EntityFactory'
);
- $logger = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Framework\Logger');
+ $logger = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Psr\Log\LoggerInterface');
$this->_model = $this->getMockForAbstractClass(
'Magento\Framework\Model\Resource\Db\Collection\AbstractCollection',
diff --git a/dev/tests/integration/testsuite/Magento/Integration/Service/V1/AuthorizationServiceTest.php b/dev/tests/integration/testsuite/Magento/Integration/Service/V1/AuthorizationServiceTest.php
index 9dfd1848d3d2e53c649b53a02b6253462083f347..7192622e0c53b7ef4503e5ad776c81b2e6077415 100644
--- a/dev/tests/integration/testsuite/Magento/Integration/Service/V1/AuthorizationServiceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Integration/Service/V1/AuthorizationServiceTest.php
@@ -25,8 +25,8 @@ class AuthorizationServiceTest extends \PHPUnit_Framework_TestCase
{
parent::setUp();
$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
- $loggerMock = $this->getMockBuilder('Magento\\Framework\\Logger')->disableOriginalConstructor()->getMock();
- $loggerMock->expects($this->any())->method('logException')->will($this->returnSelf());
+ $loggerMock = $this->getMockBuilder('Psr\\Log\\LoggerInterface')->disableOriginalConstructor()->getMock();
+ $loggerMock->expects($this->any())->method('critical')->will($this->returnSelf());
$this->_service = $objectManager->create(
'Magento\Integration\Service\V1\AuthorizationService',
[
diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Controller/CheckoutTest.php b/dev/tests/integration/testsuite/Magento/Multishipping/Controller/CheckoutTest.php
index 87bf4d582e6500191a2f5361703b7315788d982a..9e25b21ee91f5cf87ec891e791fcc243c091028a 100644
--- a/dev/tests/integration/testsuite/Magento/Multishipping/Controller/CheckoutTest.php
+++ b/dev/tests/integration/testsuite/Magento/Multishipping/Controller/CheckoutTest.php
@@ -31,7 +31,7 @@ class CheckoutTest extends \Magento\TestFramework\TestCase\AbstractController
->setQuoteId($quote->getId());
$formKey = $this->_objectManager->get('Magento\Framework\Data\Form\FormKey');
- $logger = $this->getMock('Magento\Framework\Logger', [], [], '', false);
+ $logger = $this->getMock('Psr\Log\LoggerInterface', [], [], '', false);
/** @var $session \Magento\Customer\Model\Session */
$session = Bootstrap::getObjectManager()->create('Magento\Customer\Model\Session', [$logger]);
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/Model/Resource/Report/Rule/CreatedatTest.php b/dev/tests/integration/testsuite/Magento/SalesRule/Model/Resource/Report/Rule/CreatedatTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..2d14ae963cee1ab9c32a2e47c809f34065836cfe
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/Model/Resource/Report/Rule/CreatedatTest.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+namespace Magento\SalesRule\Model\Resource\Report\Rule;
+
+/**
+ * Createdat test for check report totals calculate
+ *
+ * @magentoDataFixture Magento/SalesRule/_files/order_with_coupon.php
+ */
+class CreatedatTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @dataProvider orderParamsDataProvider()
+ * @param $orderParams
+ */
+ public function testTotals($orderParams)
+ {
+ /** @var \Magento\Sales\Model\Order $order */
+ $order = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Sales\Model\Order');
+ $order->loadByIncrementId('100000001')
+ ->setBaseGrandTotal($orderParams['base_subtotal'])
+ ->setSubtotal($orderParams['base_subtotal'])
+ ->setBaseSubtotal($orderParams['base_subtotal'])
+ ->setBaseDiscountAmount($orderParams['base_discount_amount'])
+ ->setBaseTaxAmount($orderParams['base_tax_amount'])
+ ->setBaseSubtotalInvoiced($orderParams['base_subtotal_invoiced'])
+ ->setBaseDiscountInvoiced($orderParams['base_discount_invoiced'])
+ ->setBaseTaxInvoiced($orderParams['base_tax_invoiced'])
+ ->setBaseShippingAmount(0)
+ ->setBaseToGlobalRate(1)
+ ->setCouponCode('1234567890')
+ ->setCreatedAt('2014-10-25 10:10:10')
+ ->save();
+ // refresh report statistics
+ /** @var \Magento\SalesRule\Model\Resource\Report\Rule $reportResource */
+ $reportResource = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+ 'Magento\SalesRule\Model\Resource\Report\Rule'
+ );
+ $reportResource->aggregate();
+ /** @var \Magento\SalesRule\Model\Resource\Report\Collection $reportCollection */
+ $reportCollection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+ 'Magento\SalesRule\Model\Resource\Report\Collection'
+ );
+ $salesRuleReportItem = $reportCollection->getFirstItem();
+ $this->assertEquals($this->getTotalAmount($order), $salesRuleReportItem['total_amount']);
+ $this->assertEquals($this->getTotalAmountActual($order), $salesRuleReportItem['total_amount_actual']);
+ }
+
+ /**
+ * Repeat sql formula from \Magento\SalesRule\Model\Resource\Report\Rule\Createdat::_aggregateByOrder
+ *
+ * @param \Magento\Sales\Model\Order $order
+ * @return float
+ */
+ private function getTotalAmount(\Magento\Sales\Model\Order $order)
+ {
+ return (
+ $order->getBaseSubtotal() - $order->getBaseSubtotalCanceled()
+ - (abs($order->getBaseDiscountAmount()) - abs($order->getBaseDiscountCanceled()))
+ + ($order->getBaseTaxAmount() - $order->getBaseTaxCanceled())
+ ) * $order->getBaseToGlobalRate();
+ }
+
+ /**
+ * Repeat sql formula from \Magento\SalesRule\Model\Resource\Report\Rule\Createdat::_aggregateByOrder
+ *
+ * @param \Magento\Sales\Model\Order $order
+ * @return float
+ */
+ private function getTotalAmountActual(\Magento\Sales\Model\Order $order)
+ {
+ return (
+ $order->getBaseSubtotalInvoiced() - $order->getSubtotalRefunded()
+ - abs($order->getBaseDiscountInvoiced()) - abs($order->getBaseDiscountRefunded())
+ + $order->getBaseTaxInvoiced() - $order->getBaseTaxRefunded()
+ ) * $order->getBaseToGlobalRate();
+ }
+
+ /**
+ * @return array
+ */
+ public function orderParamsDataProvider()
+ {
+ return [
+ [
+ [
+ 'base_discount_amount' => 98.80,
+ 'base_subtotal' => 494,
+ 'base_tax_amount' => 8.8,
+ 'base_subtotal_invoiced' => 494,
+ 'base_discount_invoiced' => 98.80,
+ 'base_tax_invoiced' => 8.8
+ ]
+ ]
+ ];
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sendfriend/Block/SendTest.php b/dev/tests/integration/testsuite/Magento/Sendfriend/Block/SendTest.php
index c0f8365317556ade4bb01e518825e00f7c0cac8c..2e88e9f1fd658d6428c75cce3b4ca9f20fc6a981 100644
--- a/dev/tests/integration/testsuite/Magento/Sendfriend/Block/SendTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sendfriend/Block/SendTest.php
@@ -53,7 +53,7 @@ class SendTest extends \PHPUnit_Framework_TestCase
*/
public function testGetCustomerFieldFromSession($field, $value)
{
- $logger = $this->getMock('Magento\Framework\Logger', [], [], '', false);
+ $logger = $this->getMock('Psr\Log\LoggerInterface', [], [], '', false);
/** @var $session \Magento\Customer\Model\Session */
$session = Bootstrap::getObjectManager()->create('Magento\Customer\Model\Session', [$logger]);
/** @var \Magento\Customer\Api\AccountManagementInterface $service */
diff --git a/dev/tests/integration/testsuite/Magento/Tax/Model/TaxClass/Source/CustomerTest.php b/dev/tests/integration/testsuite/Magento/Tax/Model/TaxClass/Source/CustomerTest.php
index 94bcf24352b16bfd9c3d816990bcb9fac6695b67..f6ef2eced2db724e13d211dff8d906144e443e80 100644
--- a/dev/tests/integration/testsuite/Magento/Tax/Model/TaxClass/Source/CustomerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Tax/Model/TaxClass/Source/CustomerTest.php
@@ -27,7 +27,7 @@ class CustomerTest extends \PHPUnit_Framework_TestCase
$source = Bootstrap::getObjectManager()->get('Magento\Tax\Model\TaxClass\Source\Customer');
$this->assertEquals(
$expectedResult,
- $source->getAllOptions(false),
+ $source->getAllOptions(),
'Tax Class options are invalid.'
);
}
@@ -46,7 +46,6 @@ class CustomerTest extends \PHPUnit_Framework_TestCase
if (empty($expectedResult)) {
$this->fail('Preconditions failed: At least one tax class should be available.');
}
- $expectedResult = array_merge([['value' => '0', 'label' => __('None')]], $expectedResult);
/** @var \Magento\Tax\Model\TaxClass\Source\Product $source */
$source = Bootstrap::getObjectManager()->get('Magento\Tax\Model\TaxClass\Source\Customer');
$this->assertEquals(
diff --git a/dev/tests/integration/testsuite/Magento/Translation/Model/InlineParserTest.php b/dev/tests/integration/testsuite/Magento/Translation/Model/InlineParserTest.php
index e8e777f10bf005b6eaf5f286394a7978c97a001d..21aca63de45299c1646b7ad80c7e4fdf73a8be8e 100644
--- a/dev/tests/integration/testsuite/Magento/Translation/Model/InlineParserTest.php
+++ b/dev/tests/integration/testsuite/Magento/Translation/Model/InlineParserTest.php
@@ -62,8 +62,8 @@ class InlineParserTest extends \PHPUnit_Framework_TestCase
} catch (\Exception $e) {
$model->delete();
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()
- ->get('Magento\Framework\Logger')
- ->logException($e);
+ ->get('Psr\Log\LoggerInterface')
+ ->critical($e);
}
}
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/IndexTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/IndexTest.php
index 3fea90233aa3fa6b4e48ae17e506338e132ae630..26cb4a3747ab7d184aa175f93e7bffc58b72fe5c 100644
--- a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/IndexTest.php
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/IndexTest.php
@@ -24,7 +24,7 @@ class IndexTest extends \Magento\TestFramework\TestCase\AbstractController
protected function setUp()
{
parent::setUp();
- $logger = $this->getMock('Magento\Framework\Logger', [], [], '', false);
+ $logger = $this->getMock('Psr\Log\LoggerInterface', [], [], '', false);
$this->_customerSession = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
'Magento\Customer\Model\Session',
[$logger]
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
index f89a0ded5448b9d45388a1b93b76bf58a19c2746..e95ec93ee08ebea8de2e2745d80a585686ca4a21 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
@@ -1724,7 +1724,7 @@ return [
['Magento\Adminhtml\Block\Report\Wishlist', 'Magento\Reports\Block\Adminhtml\Wishlist'],
['Magento\Backend\Helper\Addresses'],
['Magento\Core\Model\Cookie', 'Magento\Framework\Stdlib\Cookie'],
- ['Magento\Core\Model\Logger', 'Magento\Framework\Logger'],
+ ['Magento\Core\Model\Logger', 'Psr\Log\LoggerInterface'],
['Magento\Core\Block\Template\Context', 'Magento\Framework\View\Element\Template\Context'],
['Magento\Page\Block\Template\Container'],
['Magento\Page\Block\Redirect', 'Magento\Framework\View\Element\Redirect'],
@@ -2330,7 +2330,7 @@ return [
['Magento\Locale', 'Magento\Framework\Locale'],
['Magento\LocaleFactory', 'Magento\Framework\LocaleFactory'],
['Magento\LocaleInterface', 'Magento\Framework\LocaleInterface'],
- ['Magento\Logger', 'Magento\Framework\Logger'],
+ ['Magento\Logger', 'Psr\Log\LoggerInterface'],
['Magento\Phrase', 'Magento\Framework\Phrase'],
['Magento\Pear', 'Magento\Framework\Pear'],
[
@@ -2842,4 +2842,5 @@ return [
['Magento\Rule\Model\Rule', 'Magento\Rule\Model\AbstractModel'],
['Magento\Framework\App\Cache\State\Options', 'Magento\Framework\App\Cache\State'],
['Magento\Framework\App\Cache\State\OptionsInterface', 'Magento\Framework\App\Cache\State'],
+ ['Magento\Framework\Logger', 'Psr\Log\LoggerInterface'],
];
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
index 5b3c80f4e523a22dce1f42b0e83ce78114022d0d..425044b2bdd626b6dea92862fe818cc8b1a239c4 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
@@ -1929,7 +1929,7 @@ return [
['setTablePrefix', 'Magento\Framework\App\Magento\Framework\App\Resource', 'Can be passed through constructor only'],
['_debugTimer', 'Magento\Framework\DB\Adapter\Pdo\Mysql', 'Magento\Framework\DB\Logger\LoggerAbstract::startTimer'],
['_debugStat', 'Magento\Framework\DB\Adapter\Pdo\Mysql', 'Magento\Framework\DB\Logger\File::logStats'],
- ['_debugException', 'Magento\Framework\DB\Adapter\Pdo\Mysql', 'Magento\Framework\DB\Logger\File::logException'],
+ ['_debugException', 'Magento\Framework\DB\Adapter\Pdo\Mysql', 'Magento\Framework\DB\Logger\File::critical'],
['_debugWriteToFile', 'Magento\Framework\DB\Adapter\Pdo\Mysql', 'Magento\Framework\DB\Logger\File::log'],
['applyDataUpdates', 'Magento\Framework\Module\Setup', 'Magento\Framework\Module\DataSetup::applyDataUpdates'],
['_installData', 'Magento\Framework\Module\Setup', 'Magento\Framework\Module\DataSetup::_installData'],
@@ -2001,6 +2001,11 @@ return [
['getScriptTranslation', 'Magento\Framework\LocaleInterface'],
['getCountryTranslation', 'Magento\Framework\LocaleInterface'],
['getTerritoryTranslation', 'Magento\Framework\LocaleInterface'],
+ [
+ 'getNoteNotify',
+ 'Magento\Sales\Block\Adminhtml\Order\Create\Comment',
+ 'Magento\Sales\Block\Adminhtml\Order\Create\Totals'
+ ],
['getLinksConfig', 'Magento\Downloadable\Block\Catalog\Product\Links'],
['getAuthorizationAmounts', 'Magento\Paypal\Model\Config'],
['cleanTransactions', 'Magento\Paypal\Model\Observer']
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_namespaces.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_namespaces.php
index 6892d99ff7d206fe3c2ba0ff2ad25e2ab243e628..469e282ce54fa7946f51b9fbe4e7725a18de1c75 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_namespaces.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_namespaces.php
@@ -28,7 +28,7 @@ return [
['Magento\Phrase', 'Magento\Framework\Phrase'],
['Magento\Locale', 'Magento\Framework\Locale'],
['Magento\Message', 'Magento\Framework\Message'],
- ['Magento\Logger', 'Magento\Framework\Logger'],
+ ['Magento\Logger', 'Psr\Log\LoggerInterface'],
['Magento\Error', 'Magento\Framework\Error'],
['Magento\Filter', 'Magento\Framework\Filter'],
['Magento\DomDocument', 'Magento\Framework\DomDocument'],
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php
index 06922811fcf6b5603f6e0768dc3bf15cec5bc890..9edcd2c881a181af30d129027c2c91187e58a132 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php
@@ -22,7 +22,7 @@ return [
['_childGroups', 'Magento\Core\Block\AbstractBlock'],
['_combineHistory'],
['_config', 'Magento\Core\Model\Design\Package'],
- ['_config', 'Magento\Framework\Logger', '_dirs'],
+ ['_config', 'Psr\Log\LoggerInterface', '_dirs'],
['_config', 'Magento\Core\Model\Resource\Setup'],
['_configModel', 'Magento\Backend\Model\Menu\AbstractDirector'],
['_connectionConfig', 'Magento\Core\Model\Resource\Setup'],
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
index 89690a5dd630054c8c4bddbf318749ef6162600b..083fbe5c84c2fbab4e519adeb8e61f21d67feacb 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
@@ -144,3 +144,4 @@ app/code/Magento/Sales/Model/Spi
Magento/Catalog/Model/ProductLink
Magento/GroupedProduct/Model/Resource/Product/Type/Grouped
lib/internal/Magento/Framework/Interception/ObjectManager/Config
+app/code/Magento/OfflinePayments/Model
\ No newline at end of file
diff --git a/dev/tests/unit/framework/Magento/Test/Block/Adminhtml.php b/dev/tests/unit/framework/Magento/Test/Block/Adminhtml.php
index 8080328c0f1aee3c1ee6071f2a3127828e5aee31..865cc78c1d92f0c85ed8a9a1b99260ef09f8644d 100644
--- a/dev/tests/unit/framework/Magento/Test/Block/Adminhtml.php
+++ b/dev/tests/unit/framework/Magento/Test/Block/Adminhtml.php
@@ -82,7 +82,7 @@ class Adminhtml extends \PHPUnit_Framework_TestCase
$this->_urlMock = $this->_makeMock('Magento\Framework\UrlInterface');
$this->_eventManagerMock = $this->_makeMock('Magento\Framework\Event\ManagerInterface');
$this->_controllerMock = $this->_makeMock('Magento\Framework\App\FrontController');
- $this->_loggerMock = $this->_makeMock('Magento\Framework\Logger');
+ $this->_loggerMock = $this->_makeMock('Psr\Log\LoggerInterface');
$this->_filesystemMock = $this->_makeMock('Magento\Framework\Filesystem');
$this->_cacheMock = $this->_makeMock('Magento\Framework\App\CacheInterface');
$this->_scopeConfigMock = $this->_makeMock('Magento\Framework\App\Config\ScopeConfigInterface');
diff --git a/dev/tests/unit/testsuite/Magento/Authorization/Model/Acl/AclRetrieverTest.php b/dev/tests/unit/testsuite/Magento/Authorization/Model/Acl/AclRetrieverTest.php
index 72906ff1a521e12de5fcb1f56ad0043d9e01a497..a1e39651e62085757c512a855463b9b8d434d7c6 100644
--- a/dev/tests/unit/testsuite/Magento/Authorization/Model/Acl/AclRetrieverTest.php
+++ b/dev/tests/unit/testsuite/Magento/Authorization/Model/Acl/AclRetrieverTest.php
@@ -165,7 +165,7 @@ class AclRetrieverTest extends \PHPUnit_Framework_TestCase
$aclBuilderMock,
$roleCollectionFactoryMock,
$rulesCollectionFactoryMock,
- $this->getMock('Magento\Framework\Logger', [], [], '', false)
+ $this->getMock('Psr\Log\LoggerInterface')
);
}
}
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/TunnelTest.php b/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/TunnelTest.php
index c7a5f978517553ab559812154ad05afb6cb2b069..58b3541dd4cf0fbaf7c6810c5285fdacbb17178e 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/TunnelTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/TunnelTest.php
@@ -142,11 +142,11 @@ class TunnelTest extends \PHPUnit_Framework_TestCase
->method('create')
->with('Magento\Framework\HTTP\ZendClient')
->will($this->throwException($exceptionMock));
- $loggerMock = $this->getMock('Magento\Framework\Logger', ['logException'], [], '', false);
- $loggerMock->expects($this->once())->method('logException')->with($exceptionMock);
+ $loggerMock = $this->getMock('Psr\Log\LoggerInterface');
+ $loggerMock->expects($this->once())->method('critical')->with($exceptionMock);
$this->_objectManager->expects($this->at(2))
->method('get')
- ->with('Magento\Framework\Logger')
+ ->with('Psr\Log\LoggerInterface')
->will($this->returnValue($loggerMock));
$controller = $this->_factory($this->_request, $this->_response);
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Backend/BaseurlTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Backend/BaseurlTest.php
index 4434ebbb8ee12e6832344c497ddb0c7807f34e70..dc5dd79a794c3eee6127fa08a45f639c4ee35000 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Backend/BaseurlTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Backend/BaseurlTest.php
@@ -11,7 +11,7 @@ class BaseurlTest extends \PHPUnit_Framework_TestCase
$eventDispatcher = $this->getMock('Magento\Framework\Event\ManagerInterface', [], [], '', false);
$appState = $this->getMock('Magento\Framework\App\State', [], [], '', false);
$cacheManager = $this->getMock('Magento\Framework\App\CacheInterface');
- $logger = $this->getMock('Magento\Framework\Logger', [], [], '', false);
+ $logger = $this->getMock('Psr\Log\LoggerInterface');
$actionValidatorMock = $this->getMock(
'Magento\Framework\Model\ActionValidator\RemoveAction',
[],
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Backend/SecureTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Backend/SecureTest.php
index d1a38f433c5f5bf3326211988497f0599b6e0a64..8d8c30a7dd7ea9a4830ae3d8755e466564f017c5 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Backend/SecureTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Backend/SecureTest.php
@@ -11,7 +11,7 @@ class SecureTest extends \PHPUnit_Framework_TestCase
$eventDispatcher = $this->getMock('Magento\Framework\Event\ManagerInterface', [], [], '', false);
$appState = $this->getMock('Magento\Framework\App\State', [], [], '', false);
$cacheManager = $this->getMock('Magento\Framework\App\CacheInterface');
- $logger = $this->getMock('Magento\Framework\Logger', [], [], '', false);
+ $logger = $this->getMock('Psr\Log\LoggerInterface');
$actionValidatorMock = $this->getMock(
'\Magento\Framework\Model\ActionValidator\RemoveAction',
[],
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Source/Admin/PageTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Source/Admin/PageTest.php
index 1fff5d361bb37e47d7f0108f18ddd8516fc3a4ff..7e7fbee400dba5c77da2e32367b6bb33c5e8c103 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Source/Admin/PageTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Source/Admin/PageTest.php
@@ -32,7 +32,7 @@ class PageTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $logger = $this->getMock('Magento\Framework\Logger', [], [], '', false);
+ $logger = $this->getMock('Psr\Log\LoggerInterface');
$this->_menuModel = new \Magento\Backend\Model\Menu($logger);
$this->_menuSubModel = new \Magento\Backend\Model\Menu($logger);
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/Menu/BuilderTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/Menu/BuilderTest.php
index 25e7413aa295d0a9649b8bfb6eac42d54b030fd8..b4880b7154cb4775843d368c5b6062dfb5953933 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/Menu/BuilderTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/Menu/BuilderTest.php
@@ -27,7 +27,7 @@ class BuilderTest extends \PHPUnit_Framework_TestCase
$this->_menuMock = $this->getMock(
'Magento\Backend\Model\Menu',
[],
- [$this->getMock('Magento\Framework\Logger', [], [], '', false)]
+ [$this->getMock('Psr\Log\LoggerInterface')]
);
$this->_model = new \Magento\Backend\Model\Menu\Builder($this->_factoryMock, $this->_menuMock);
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/Menu/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/Menu/ConfigTest.php
index 097ab1634ebce95ec740271fbc9fa443d356919a..bc5f314e0618de34a38676afc9161df173687a88 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/Menu/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/Menu/ConfigTest.php
@@ -94,18 +94,12 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
false
);
- $this->_logger = $this->getMock(
- 'Magento\Framework\Logger',
- ['addStoreLog', 'log', 'logException'],
- [],
- '',
- false
- );
+ $this->_logger = $this->getMock('Psr\Log\LoggerInterface');
$this->_menuMock = $this->getMock(
'Magento\Backend\Model\Menu',
[],
- [$this->getMock('Magento\Framework\Logger', [], [], '', false)]
+ [$this->getMock('Psr\Log\LoggerInterface')]
);
$this->_menuBuilderMock = $this->getMock('Magento\Backend\Model\Menu\Builder', [], [], '', false);
@@ -210,7 +204,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
public function testGetMenuGenericExceptionIsNotLogged()
{
- $this->_logger->expects($this->never())->method('logException');
+ $this->_logger->expects($this->never())->method('critical');
$this->_menuBuilderMock->expects(
$this->exactly(1)
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/Menu/Director/DirectorTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/Menu/Director/DirectorTest.php
index 5a459132fa47c10e8d9adb5f51771dbd85ad80ca..696043006c9bc6c69faa027fc3730b51f4700ef1 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/Menu/Director/DirectorTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/Menu/Director/DirectorTest.php
@@ -38,13 +38,7 @@ class DirectorTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$this->_builderMock = $this->getMock('Magento\Backend\Model\Menu\Builder', [], [], '', false);
- $this->_logger = $this->getMock(
- 'Magento\Framework\Logger',
- ['addStoreLog', 'log', 'logException'],
- [],
- '',
- false
- );
+ $this->_logger = $this->getMock('Psr\Log\LoggerInterface');
$this->_commandMock = $this->getMock(
'Magento\Backend\Model\Menu\Builder\AbstractCommand',
['getId', '_execute', 'execute', 'chain'],
@@ -75,7 +69,7 @@ class DirectorTest extends \PHPUnit_Framework_TestCase
{
$config = [['type' => 'update'], ['type' => 'remove'], ['type' => 'added']];
$this->_builderMock->expects($this->at(2))->method('processCommand')->with($this->_commandMock);
- $this->_logger->expects($this->at(1))->method('logDebug');
+ $this->_logger->expects($this->at(1))->method('debug');
$this->_commandMock->expects($this->at(1))->method('getId');
$this->_model->direct($config, $this->_builderMock, $this->_logger);
}
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/Menu/Filter/IteratorTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/Menu/Filter/IteratorTest.php
index a1f3c38ae4a63c6709a488f417164e16db2850e6..080cd564b174ef7822a2ffa6eb7da9edabdbd0ff 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/Menu/Filter/IteratorTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/Menu/Filter/IteratorTest.php
@@ -38,7 +38,7 @@ class IteratorTest extends \PHPUnit_Framework_TestCase
$this->_items['item3']->expects($this->any())->method('isDisabled')->will($this->returnValue(false));
$this->_items['item3']->expects($this->any())->method('isAllowed')->will($this->returnValue(false));
- $loggerMock = $this->getMock('Magento\Framework\Logger', [], [], '', false);
+ $loggerMock = $this->getMock('Psr\Log\LoggerInterface');
$this->_menuModel = new \Magento\Backend\Model\Menu($loggerMock);
$this->_filterIteratorModel = new \Magento\Backend\Model\Menu\Filter\Iterator(
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/Menu/ItemTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/Menu/ItemTest.php
index e7ce46a61dcaaeaee875be2f8d8895233f1d9018..30d52ab0419daec4c63c855fe1edac307752bfbc 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/Menu/ItemTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/Menu/ItemTest.php
@@ -217,7 +217,7 @@ class ItemTest extends \PHPUnit_Framework_TestCase
$menuMock = $this->getMock(
'Magento\Backend\Model\Menu',
[],
- [$this->getMock('Magento\Framework\Logger', [], [], '', false)]
+ [$this->getMock('Psr\Log\LoggerInterface')]
);
$this->_menuFactoryMock->expects($this->once())->method('create')->will($this->returnValue($menuMock));
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/MenuTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/MenuTest.php
index ade079a7984a9d202ef1987bf84d82dcd8f57acf..f788228c365bee6a924cf171407235644c13a040 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/MenuTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/MenuTest.php
@@ -12,7 +12,7 @@ class MenuTest extends \PHPUnit_Framework_TestCase
protected $_model;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $_logger;
@@ -32,7 +32,7 @@ class MenuTest extends \PHPUnit_Framework_TestCase
$this->_items['item3'] = $this->getMock('Magento\Backend\Model\Menu\Item', [], [], '', false);
$this->_items['item3']->expects($this->any())->method('getId')->will($this->returnValue('item3'));
- $this->_logger = $this->getMock('Magento\Framework\Logger', ['log'], [], '', false);
+ $this->_logger = $this->getMock('Psr\Log\LoggerInterface');
$this->_model = new \Magento\Backend\Model\Menu($this->_logger);
}
@@ -47,14 +47,6 @@ class MenuTest extends \PHPUnit_Framework_TestCase
public function testAddDoLogAddAction()
{
- $this->_logger->expects(
- $this->once()
- )->method(
- 'log'
- )->with(
- $this->equalTo(sprintf('Add of item with id %s was processed', $this->_items['item1']->getId()))
- );
-
$this->_model->add($this->_items['item1']);
}
@@ -136,7 +128,7 @@ class MenuTest extends \PHPUnit_Framework_TestCase
$subMenu = $this->getMock(
'Magento\Backend\Model\Menu',
[],
- [$this->getMock('Magento\Framework\Logger', [], [], '', false)]
+ [$this->getMock('Psr\Log\LoggerInterface')]
);
$subMenu->expects($this->once())->method("add")->with($this->_items['item3']);
@@ -189,7 +181,7 @@ class MenuTest extends \PHPUnit_Framework_TestCase
$menuMock = $this->getMock(
'Magento\Backend\Model\Menu',
[],
- [$this->getMock('Magento\Framework\Logger', [], [], '', false)]
+ [$this->getMock('Psr\Log\LoggerInterface')]
);
$menuMock->expects($this->once())->method('remove')->with($this->equalTo('item2'));
@@ -203,15 +195,6 @@ class MenuTest extends \PHPUnit_Framework_TestCase
public function testRemoveDoLogRemoveAction()
{
$this->_model->add($this->_items['item1']);
-
- $this->_logger->expects(
- $this->once()
- )->method(
- 'log'
- )->with(
- $this->equalTo(sprintf('Remove on item with id %s was processed', $this->_items['item1']->getId()))
- );
-
$this->_model->remove('item1');
}
@@ -335,7 +318,6 @@ class MenuTest extends \PHPUnit_Framework_TestCase
public function testSerialize()
{
$this->assertNotEmpty($this->_model->serialize());
- $this->_logger->expects($this->once())->method('log');
$this->_model->add($this->_items['item1']);
}
}
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/UrlTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/UrlTest.php
index a06bdd16060f88ed57428c75463281a87572c418..74d4b10a1eb72e206f8dc6f7acbab224fb0f63dd 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/UrlTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/UrlTest.php
@@ -77,7 +77,7 @@ class UrlTest extends \PHPUnit_Framework_TestCase
$this->_menuMock = $this->getMock(
'Magento\Backend\Model\Menu',
[],
- [$this->getMock('Magento\Framework\Logger', [], [], '', false)]
+ [$this->getMock('Psr\Log\LoggerInterface')]
);
$this->_menuConfigMock = $this->getMock('Magento\Backend\Model\Menu\Config', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Product/BuilderTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Product/BuilderTest.php
index 06f8d57b4c979493e77a9be8cc04bb200ff2de17..cc5bec710735f26f463a1445277818f30cb5ce3b 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Product/BuilderTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Product/BuilderTest.php
@@ -43,7 +43,7 @@ class BuilderTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->loggerMock = $this->getMock('Magento\Framework\Logger', [], [], '', false);
+ $this->loggerMock = $this->getMock('Psr\Log\LoggerInterface');
$this->productFactoryMock = $this->getMock('Magento\Catalog\Model\ProductFactory', ['create'], [], '', false);
$this->registryMock = $this->getMock('Magento\Framework\Registry', [], [], '', false);
$this->wysiwygConfigMock = $this->getMock(
@@ -179,7 +179,7 @@ class BuilderTest extends \PHPUnit_Framework_TestCase
$this->throwException(new \Exception())
);
$this->loggerMock->expects($this->once())
- ->method('logException');
+ ->method('critical');
$this->productMock->expects($this->once())
->method('setAttributeSetId')
->with(3)
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Type/SimpleTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Type/SimpleTest.php
index 208968354742ad5d1ea669af8af308239ae62c04..716996ecadc9d11404b9199c7ea2ab2c8ac448f4 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Type/SimpleTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Type/SimpleTest.php
@@ -21,7 +21,7 @@ class SimpleTest extends \PHPUnit_Framework_TestCase
->disableOriginalConstructor()
->getMock();
$coreRegistry = $this->getMock('Magento\Framework\Registry', [], [], '', false);
- $logger = $this->getMock('Magento\Framework\Logger', [], [], '', false);
+ $logger = $this->getMock('Psr\Log\LoggerInterface');
$productFactoryMock = $this->getMock('Magento\Catalog\Model\ProductFactory', [], [], '', false);
$this->_model = $objectHelper->getObject(
'Magento\Catalog\Model\Product\Type\Simple',
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Type/VirtualTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Type/VirtualTest.php
index b8f01b46c8683d4f3ab83b54ad7f6510b1c191ce..3bcc6208d146763a1fca5355670a7a2a57e27dcc 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Type/VirtualTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Type/VirtualTest.php
@@ -21,7 +21,7 @@ class VirtualTest extends \PHPUnit_Framework_TestCase
$filesystem = $this->getMockBuilder('Magento\Framework\Filesystem')
->disableOriginalConstructor()
->getMock();
- $logger = $this->getMock('Magento\Framework\Logger', [], [], '', false);
+ $logger = $this->getMock('Psr\Log\LoggerInterface');
$productFactoryMock = $this->getMock('Magento\Catalog\Model\ProductFactory', [], [], '', false);
$this->_model = $objectHelper->getObject(
'Magento\Catalog\Model\Product\Type\Virtual',
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Link/Product/CollectionTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Link/Product/CollectionTest.php
index b49d56d50d073eefe5aa1d16d96d114bf0715f3d..f57e9360912cd6cf12bf9b807cbd5c3b3c38dc83 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Link/Product/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Link/Product/CollectionTest.php
@@ -76,7 +76,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$this->entityFactoryMock = $this->getMock('Magento\Core\Model\EntityFactory', [], [], '', false);
- $this->loggerMock = $this->getMock('Magento\Framework\Logger', [], [], '', false);
+ $this->loggerMock = $this->getMock('Psr\Log\LoggerInterface');
$this->fetchStrategyMock = $this->getMock('Magento\Framework\Data\Collection\Db\FetchStrategyInterface');
$this->managerInterfaceMock = $this->getMock('Magento\Framework\Event\ManagerInterface');
$this->configMock = $this->getMock('Magento\Eav\Model\Config', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Option/CollectionTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Option/CollectionTest.php
index 878c7e23d453432e8606324cc2f517fdff44ea3d..cbaa98332060ecb8d04f3b51477628306423575a 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Option/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Option/CollectionTest.php
@@ -12,7 +12,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
protected $collection;
/**
- * @var \Magento\Framework\Logger|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $loggerMock;
@@ -61,7 +61,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
$this->entityFactoryMock = $this->getMock(
'Magento\Core\Model\EntityFactory', ['create'], [], '', false
);
- $this->loggerMock = $this->getMock('Magento\Framework\Logger', ['log'], [], '', false);
+ $this->loggerMock = $this->getMock('Psr\Log\LoggerInterface');
$this->fetchStrategyMock = $this->getMock(
'Magento\Framework\Data\Collection\Db\FetchStrategy\Query', ['fetchAll'], [], '', false
);
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Pricing/Render/FinalPriceBoxTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Pricing/Render/FinalPriceBoxTest.php
index 610278f691b940ce9a58b5f28c03bb20fffbb495..930c7fcbd5b8aa246bab4026ae25866a0f11a538 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Pricing/Render/FinalPriceBoxTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Pricing/Render/FinalPriceBoxTest.php
@@ -41,7 +41,7 @@ class FinalPriceBoxTest extends \PHPUnit_Framework_TestCase
protected $product;
/**
- * @var \Magento\Framework\Logger|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $logger;
@@ -74,7 +74,7 @@ class FinalPriceBoxTest extends \PHPUnit_Framework_TestCase
$this->layout = $this->getMock('Magento\Framework\View\Layout', [], [], '', false);
$this->priceBox = $this->getMock('Magento\Framework\Pricing\Render\PriceBox', [], [], '', false);
- $this->logger = $this->getMock('Magento\Framework\Logger', [], [], '', false);
+ $this->logger = $this->getMock('Psr\Log\LoggerInterface');
$this->layout->expects($this->any())
->method('getBlock')
@@ -187,7 +187,7 @@ class FinalPriceBoxTest extends \PHPUnit_Framework_TestCase
public function testRenderMsrpNotRegisteredException()
{
$this->logger->expects($this->once())
- ->method('logException');
+ ->method('critical');
$this->priceInfo->expects($this->once())
->method('getPrice')
diff --git a/dev/tests/unit/testsuite/Magento/CatalogImportExport/Model/Import/Product/Type/OptionTest.php b/dev/tests/unit/testsuite/Magento/CatalogImportExport/Model/Import/Product/Type/OptionTest.php
index 00d68c8f7807e8d6a6d5cf1c94042864786b2e49..f43f1498795818bd0ad8999e7ee0450ae7f9b4bc 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogImportExport/Model/Import/Product/Type/OptionTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogImportExport/Model/Import/Product/Type/OptionTest.php
@@ -381,7 +381,7 @@ class OptionTest extends \PHPUnit_Framework_TestCase
'Magento\Framework\Data\Collection\Db\FetchStrategyInterface',
['fetchAll']
);
- $logger = $this->getMock('Magento\Framework\Logger', [], [], '', false);
+ $logger = $this->getMock('Psr\Log\LoggerInterface');
$entityFactory = $this->getMock('Magento\Core\Model\EntityFactory', [], [], '', false);
$optionCollection = $this->getMock(
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Model/Type/OnepageTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Model/Type/OnepageTest.php
index 7db6a77aa9e3ead3344e1fda80732deb9f70829b..294315836209f9ca2a7e426ad58a3ff65ab75ea9 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Model/Type/OnepageTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Model/Type/OnepageTest.php
@@ -28,7 +28,7 @@ class OnepageTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Customer\Model\Url|\PHPUnit_Framework_MockObject_MockObject */
protected $customerUrlMock;
- /** @var \Magento\Framework\Logger|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $loggerMock;
/** @var \Magento\Checkout\Model\Session|\PHPUnit_Framework_MockObject_MockObject */
@@ -113,7 +113,7 @@ class OnepageTest extends \PHPUnit_Framework_TestCase
$this->eventManagerMock = $this->getMock('Magento\Framework\Event\ManagerInterface');
$this->checkoutHelperMock = $this->getMock('Magento\Checkout\Helper\Data', [], [], '', false);
$this->customerUrlMock = $this->getMock('Magento\Customer\Model\Url', [], [], '', false);
- $this->loggerMock = $this->getMock('Magento\Framework\Logger', [], [], '', false);
+ $this->loggerMock = $this->getMock('Psr\Log\LoggerInterface');
$this->checkoutSessionMock = $this->getMock(
'Magento\Checkout\Model\Session',
['getLastOrderId', 'getQuote', 'setStepData', 'getStepData'],
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Address/Billing/WriteServiceTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Address/Billing/WriteServiceTest.php
index 688ceb111d5b94784cce9c1424e8141dfa929e7e..4635856766682bc3f4c8cfbf11c2398d359f2a88 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Address/Billing/WriteServiceTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Address/Billing/WriteServiceTest.php
@@ -69,7 +69,7 @@ class WriteServiceTest extends \PHPUnit_Framework_TestCase
'\Magento\Checkout\Service\V1\Address\Converter', [], [], '', false
);
- $this->loggerMock = $this->getMock('\Magento\Framework\Logger', [], [], '', false);
+ $this->loggerMock = $this->getMock('\Psr\Log\LoggerInterface', [], [], '', false);
$this->service = new \Magento\Checkout\Service\V1\Address\Billing\WriteService(
$this->quoteRepositoryMock,
diff --git a/dev/tests/unit/testsuite/Magento/Cms/Model/Resource/PageCriteriaMapperTest.php b/dev/tests/unit/testsuite/Magento/Cms/Model/Resource/PageCriteriaMapperTest.php
index 1affb8ae653b180b01aeaca786f5d07cdd4a52b0..1db747a91061da43a787a53e4d307fa01f794256 100644
--- a/dev/tests/unit/testsuite/Magento/Cms/Model/Resource/PageCriteriaMapperTest.php
+++ b/dev/tests/unit/testsuite/Magento/Cms/Model/Resource/PageCriteriaMapperTest.php
@@ -10,7 +10,7 @@ namespace Magento\Cms\Model\Resource;
class PageCriteriaMapperTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Framework\Logger|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $loggerMock;
@@ -46,13 +46,7 @@ class PageCriteriaMapperTest extends \PHPUnit_Framework_TestCase
*/
protected function setUp()
{
- $this->loggerMock = $this->getMock(
- 'Magento\Framework\Logger',
- [],
- [],
- '',
- false
- );
+ $this->loggerMock = $this->getMock('Psr\Log\LoggerInterface');
$this->fetchStrategyMock = $this->getMockForAbstractClass(
'Magento\Framework\Data\Collection\Db\FetchStrategyInterface',
[],
diff --git a/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Model/Product/Type/ConfigurableTest.php b/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Model/Product/Type/ConfigurableTest.php
index 2f072bd8810f72ec169d3962b3d80c40dce37782..7f282cceff00a384226fc73265059804c0728130 100644
--- a/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Model/Product/Type/ConfigurableTest.php
+++ b/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Model/Product/Type/ConfigurableTest.php
@@ -51,7 +51,7 @@ class ConfigurableTest extends \PHPUnit_Framework_TestCase
->disableOriginalConstructor()
->getMock();
$coreRegistry = $this->getMock('Magento\Framework\Registry', [], [], '', false);
- $logger = $this->getMock('Magento\Framework\Logger', [], [], '', false);
+ $logger = $this->getMock('Psr\Log\LoggerInterface');
$productFactoryMock = $this->getMock('Magento\Catalog\Model\ProductFactory', [], [], '', false);
$this->_typeConfigurableFactory = $this->getMock(
'Magento\ConfigurableProduct\Model\Resource\Product\Type\ConfigurableFactory',
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/File/Storage/Directory/DatabaseTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/File/Storage/Directory/DatabaseTest.php
index 3e0af8d3cc2993df8e57d8c3f5eedb5aeb9abcdd..24c78c03786b39633b890ca187fc14923c48ca2e 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/File/Storage/Directory/DatabaseTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/File/Storage/Directory/DatabaseTest.php
@@ -55,7 +55,7 @@ class DatabaseTest extends \PHPUnit_Framework_TestCase
protected $resourceDirectoryDatabaseMock;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $loggerMock;
@@ -106,7 +106,7 @@ class DatabaseTest extends \PHPUnit_Framework_TestCase
'',
false
);
- $this->loggerMock = $this->getMock('Magento\Framework\Logger', [], [], '', false);
+ $this->loggerMock = $this->getMock('Psr\Log\LoggerInterface');
$this->directoryFactoryMock->expects(
$this->any()
@@ -175,7 +175,7 @@ class DatabaseTest extends \PHPUnit_Framework_TestCase
{
$this->directoryMock->expects($this->any())->method('getParentId')->will($this->returnValue(null));
- $this->loggerMock->expects($this->any())->method('logException');
+ $this->loggerMock->expects($this->any())->method('critical');
$this->directoryDatabase->importDirectories([]);
}
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/File/Storage/MediaTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/File/Storage/MediaTest.php
index 86d283fc25bd1060e5cd913e20876f7e4696c1b5..ae0ed046c2bae69a9ec8c0fd0b4e87f5f9bdd128 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/File/Storage/MediaTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/File/Storage/MediaTest.php
@@ -36,7 +36,7 @@ class MediaTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->_loggerMock = $this->getMock('Magento\Framework\Logger', [], [], '', false);
+ $this->_loggerMock = $this->getMock('Psr\Log\LoggerInterface');
$this->_storageHelperMock = $this->getMock(
'Magento\Core\Helper\File\Storage\Database',
[],
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/MergeTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/MergeTest.php
index 1b0e8eaa4dea6079cf1c9da12ec7c372859bb8c0..028bec513f8fba31956b3d2234c2ec504fadfdca 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/MergeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/MergeTest.php
@@ -79,7 +79,7 @@ class MergeTest extends \PHPUnit_Framework_TestCase
$this->_appState = $this->getMock('Magento\Framework\App\State', [], [], '', false);
- $this->_logger = $this->getMock('Magento\Framework\Logger', [], [], '', false);
+ $this->_logger = $this->getMock('Psr\Log\LoggerInterface');
$this->_layoutValidator = $this->getMock(
'Magento\Core\Model\Layout\Update\Validator',
@@ -294,12 +294,8 @@ class MergeTest extends \PHPUnit_Framework_TestCase
public function testGetFileLayoutUpdatesXml()
{
$errorString = "Theme layout update file '" . __DIR__ . "/_files/layout/file_wrong.xml' is not valid.";
- $this->_logger->expects($this->atLeastOnce())->method('log')
- ->with(
- $this->stringStartsWith($errorString),
- \Zend_Log::ERR,
- \Magento\Framework\Logger::LOGGER_SYSTEM
- );
+ $this->_logger->expects($this->atLeastOnce())->method('info')
+ ->with($this->stringStartsWith($errorString));
$actualXml = $this->_model->getFileLayoutUpdatesXml();
$this->assertXmlStringEqualsXmlFile(__DIR__ . '/_files/merged.xml', $actualXml->asNiceXml());
@@ -406,11 +402,8 @@ class MergeTest extends \PHPUnit_Framework_TestCase
$messages = $this->_layoutValidator->getMessages();
// Testing error message is logged with logger
- $this->_logger->expects($this->once())->method('log')
- ->with(
- 'Cache file with merged layout: ' . $cacheId . ': ' . array_shift($messages),
- \Zend_Log::ERR
- );
+ $this->_logger->expects($this->once())->method('info')
+ ->with('Cache file with merged layout: ' . $cacheId . ': ' . array_shift($messages));
$this->_model->load();
}
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Resource/File/Storage/FileTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/Resource/File/Storage/FileTest.php
index 343573b5df69f66ff5f65fbcabb1f21ca7e887d4..5f61a0eddc9f8aba300101886499f5e70c469acf 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Resource/File/Storage/FileTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/Resource/File/Storage/FileTest.php
@@ -36,7 +36,7 @@ class FileTest extends \PHPUnit_Framework_TestCase
*/
protected function setUp()
{
- $this->loggerMock = $this->getMock('Magento\Framework\Logger', [], [], '', false);
+ $this->loggerMock = $this->getMock('Psr\Log\LoggerInterface');
$this->filesystemMock = $this->getMock(
'Magento\Framework\Filesystem',
['getDirectoryRead'],
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Resource/Layout/Link/CollectionTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/Resource/Layout/Link/CollectionTest.php
index 85a97321f602873e4000501d8a6c6f94a0e8e0a8..d606ae998b9f3695e12f38eb8cb547bca5fe80c3 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Resource/Layout/Link/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/Resource/Layout/Link/CollectionTest.php
@@ -28,7 +28,7 @@ class CollectionTest extends \Magento\Core\Model\Resource\Layout\AbstractTestCas
return new \Magento\Core\Model\Resource\Layout\Link\Collection(
$this->getMock('Magento\Core\Model\EntityFactory', [], [], '', false),
- $this->getMock('Magento\Framework\Logger', [], [], '', false),
+ $this->getMock('Psr\Log\LoggerInterface'),
$this->getMockForAbstractClass('Magento\Framework\Data\Collection\Db\FetchStrategyInterface'),
$eventManager,
$this->getMock('Magento\Framework\Stdlib\DateTime', null, [], '', true),
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Resource/Layout/Update/CollectionTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/Resource/Layout/Update/CollectionTest.php
index 06ae56f3b048fe2955a50d1bd66dd92f224af8ce..34d7145aafd3c785e471504355f0701f2df346a4 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Resource/Layout/Update/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/Resource/Layout/Update/CollectionTest.php
@@ -18,7 +18,7 @@ class CollectionTest extends \Magento\Core\Model\Resource\Layout\AbstractTestCas
return new \Magento\Core\Model\Resource\Layout\Update\Collection(
$this->getMock('Magento\Core\Model\EntityFactory', [], [], '', false),
- $this->getMock('Magento\Framework\Logger', [], [], '', false),
+ $this->getMock('Psr\Log\LoggerInterface'),
$this->getMockForAbstractClass('Magento\Framework\Data\Collection\Db\FetchStrategyInterface'),
$eventManager,
$this->getMock('Magento\Framework\Stdlib\DateTime', null, [], '', true),
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Model/Attribute/Data/PostcodeTest.php b/dev/tests/unit/testsuite/Magento/Customer/Model/Attribute/Data/PostcodeTest.php
index d5b34e20715f846ce8670d56bf29418da89dfde7..fd40eb5504a8f80007ed44b84c51acca8125ab64 100644
--- a/dev/tests/unit/testsuite/Magento/Customer/Model/Attribute/Data/PostcodeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Model/Attribute/Data/PostcodeTest.php
@@ -31,7 +31,7 @@ class PostcodeTest extends \PHPUnit_Framework_TestCase
private $localeResolverMock;
/**
- * @var \Magento\Framework\Logger|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
private $loggerMock;
@@ -41,8 +41,7 @@ class PostcodeTest extends \PHPUnit_Framework_TestCase
->getMock();
$this->localeResolverMock = $this->getMockBuilder('Magento\Framework\Locale\ResolverInterface')
->getMock();
- $this->loggerMock = $this->getMockBuilder('Magento\Framework\Logger')
- ->disableOriginalConstructor()
+ $this->loggerMock = $this->getMockBuilder('Psr\Log\LoggerInterface')
->getMock();
$this->directoryHelperMock = $this->getMockBuilder('Magento\Directory\Helper\Data')
->disableOriginalConstructor()
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Model/Customer/Attribute/Backend/BillingTest.php b/dev/tests/unit/testsuite/Magento/Customer/Model/Customer/Attribute/Backend/BillingTest.php
index 21d44a8283eb08a9051469426ac3711a2956dea9..15a2fb85938aa51362a0b24b8a30cd11448f3867 100644
--- a/dev/tests/unit/testsuite/Magento/Customer/Model/Customer/Attribute/Backend/BillingTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Model/Customer/Attribute/Backend/BillingTest.php
@@ -13,8 +13,8 @@ class BillingTest extends \PHPUnit_Framework_TestCase
public function setUp()
{
- $logger = $this->getMockBuilder('Magento\Framework\Logger')->disableOriginalConstructor()->getMock();
- /** @var \Magento\Framework\Logger $logger */
+ $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
+ /** @var \Psr\Log\LoggerInterface $logger */
$this->testable = new Billing($logger);
}
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Model/Customer/Attribute/Backend/ShippingTest.php b/dev/tests/unit/testsuite/Magento/Customer/Model/Customer/Attribute/Backend/ShippingTest.php
index 463632cb97d94539929f0e0197277235c4ca64c9..c4dcd2f89ae720fb7017294b8f8b0af5c6e20acd 100644
--- a/dev/tests/unit/testsuite/Magento/Customer/Model/Customer/Attribute/Backend/ShippingTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Model/Customer/Attribute/Backend/ShippingTest.php
@@ -14,8 +14,8 @@ class ShippingTest extends \PHPUnit_Framework_TestCase
public function setUp()
{
- $logger = $this->getMockBuilder('Magento\Framework\Logger')->disableOriginalConstructor()->getMock();
- /** @var \Magento\Framework\Logger $logger */
+ $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
+ /** @var \Psr\Log\LoggerInterface $logger */
$this->testable = new Shipping($logger);
}
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Model/Metadata/Form/AbstractDataTest.php b/dev/tests/unit/testsuite/Magento/Customer/Model/Metadata/Form/AbstractDataTest.php
index 41b751c72a04361e539261915184b81d284e36e0..937392319dc76ec1e3648b76a0243fb9d8fb2bf9 100644
--- a/dev/tests/unit/testsuite/Magento/Customer/Model/Metadata/Form/AbstractDataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Model/Metadata/Form/AbstractDataTest.php
@@ -19,7 +19,7 @@ class AbstractDataTest extends \PHPUnit_Framework_TestCase
/** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\Locale\ResolverInterface */
protected $_localeResolverMock;
- /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\Logger */
+ /** @var \PHPUnit_Framework_MockObject_MockObject | \Psr\Log\LoggerInterface */
protected $_loggerMock;
/** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Customer\Api\Data\AttributeMetadataInterface */
@@ -42,7 +42,7 @@ class AbstractDataTest extends \PHPUnit_Framework_TestCase
$this->_localeResolverMock = $this->getMockBuilder(
'Magento\Framework\Locale\ResolverInterface'
)->disableOriginalConstructor()->getMock();
- $this->_loggerMock = $this->getMockBuilder('Magento\Framework\Logger')->disableOriginalConstructor()->getMock();
+ $this->_loggerMock = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
$this->_attributeMock = $this->getMock('Magento\Customer\Api\Data\AttributeMetadataInterface');
$this->_value = 'VALUE';
$this->_entityTypeCode = 'ENTITY_TYPE_CODE';
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Model/Metadata/Form/AbstractFormTestCase.php b/dev/tests/unit/testsuite/Magento/Customer/Model/Metadata/Form/AbstractFormTestCase.php
index 827aa69df61dd924defc72eb2d666cc8a17e8908..eea536eb7e0a85594042f6e03518c706de98abfa 100644
--- a/dev/tests/unit/testsuite/Magento/Customer/Model/Metadata/Form/AbstractFormTestCase.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Model/Metadata/Form/AbstractFormTestCase.php
@@ -13,7 +13,7 @@ abstract class AbstractFormTestCase extends \PHPUnit_Framework_TestCase
/** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\Locale\ResolverInterface */
protected $localeResolverMock;
- /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\Logger */
+ /** @var \PHPUnit_Framework_MockObject_MockObject | \Psr\Log\LoggerInterface */
protected $loggerMock;
/** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Customer\Api\Data\AttributeMetadataInterface */
@@ -23,7 +23,7 @@ abstract class AbstractFormTestCase extends \PHPUnit_Framework_TestCase
{
$this->localeMock = $this->getMockBuilder('Magento\Framework\Stdlib\DateTime\TimezoneInterface')->getMock();
$this->localeResolverMock = $this->getMockBuilder('Magento\Framework\Locale\ResolverInterface')->getMock();
- $this->loggerMock = $this->getMockBuilder('Magento\Framework\Logger')->disableOriginalConstructor()->getMock();
+ $this->loggerMock = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
$this->attributeMetadataMock = $this->getMock('Magento\Customer\Api\Data\AttributeMetadataInterface');
}
}
diff --git a/dev/tests/unit/testsuite/Magento/Directory/Model/PriceCurrencyTest.php b/dev/tests/unit/testsuite/Magento/Directory/Model/PriceCurrencyTest.php
index 6b644e2703ffacfe07e21aafac40377e71d8294a..52490c8b7964f7aec745cce08131fc62b7576033 100644
--- a/dev/tests/unit/testsuite/Magento/Directory/Model/PriceCurrencyTest.php
+++ b/dev/tests/unit/testsuite/Magento/Directory/Model/PriceCurrencyTest.php
@@ -33,8 +33,7 @@ class PriceCurrencyTest extends \PHPUnit_Framework_TestCase
->setMethods(['create'])
->getMock();
- $this->logger = $this->getMockBuilder('Magento\Framework\Logger')
- ->disableOriginalConstructor()
+ $this->logger = $this->getMockBuilder('Psr\Log\LoggerInterface')
->getMock();
$objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
diff --git a/dev/tests/unit/testsuite/Magento/Directory/Model/Resource/Country/CollectionTest.php b/dev/tests/unit/testsuite/Magento/Directory/Model/Resource/Country/CollectionTest.php
index 0d46c4bec543a24c14f8dd8c3866a3c0a19b0047..00158413afe0ded2914cf998b32753965f11ba0f 100644
--- a/dev/tests/unit/testsuite/Magento/Directory/Model/Resource/Country/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Directory/Model/Resource/Country/CollectionTest.php
@@ -35,7 +35,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
$fetchStrategy = $this->getMockForAbstractClass('Magento\Framework\Data\Collection\Db\FetchStrategyInterface');
$entityFactory = $this->getMock('Magento\Core\Model\EntityFactory', [], [], '', false);
$scopeConfigMock = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
- $logger = $this->getMock('Magento\Framework\Logger', [], [], '', false);
+ $logger = $this->getMock('Psr\Log\LoggerInterface');
$countryFactory = $this->getMock(
'Magento\Directory\Model\Resource\CountryFactory',
[],
diff --git a/dev/tests/unit/testsuite/Magento/Downloadable/Model/Product/TypeTest.php b/dev/tests/unit/testsuite/Magento/Downloadable/Model/Product/TypeTest.php
index c5ac347e6e3224c79a6a2082173446752ee7fd34..2542ded81899faf4f9abf36f869cda02ea32d784 100644
--- a/dev/tests/unit/testsuite/Magento/Downloadable/Model/Product/TypeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Downloadable/Model/Product/TypeTest.php
@@ -26,7 +26,7 @@ class TypeTest extends \PHPUnit_Framework_TestCase
->disableOriginalConstructor()
->getMock();
$coreRegistry = $this->getMock('Magento\Framework\Registry', [], [], '', false);
- $logger = $this->getMock('Magento\Framework\Logger', [], [], '', false);
+ $logger = $this->getMock('Psr\Log\LoggerInterface');
$productFactoryMock = $this->getMock('Magento\Catalog\Model\ProductFactory', [], [], '', false);
$sampleResFactory = $this->getMock('Magento\Downloadable\Model\Resource\SampleFactory', [], [], '', false);
$linkResource = $this->getMock('Magento\Downloadable\Model\Resource\Link', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/AbstractDataTest.php b/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/AbstractDataTest.php
index 01669f34e3def192c36ba6b5159683f71b75312b..f1d427f3744bbec0b0e790263983b5de0cf671ce 100644
--- a/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/AbstractDataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/AbstractDataTest.php
@@ -14,7 +14,7 @@ class AbstractDataTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$timezoneMock = $this->getMock('\Magento\Framework\Stdlib\DateTime\TimezoneInterface');
- $loggerMock = $this->getMock('\Magento\Framework\Logger', [], [], '', false);
+ $loggerMock = $this->getMock('\Psr\Log\LoggerInterface', [], [], '', false);
$localeResolverMock = $this->getMock('\Magento\Framework\Locale\ResolverInterface');
$stringMock = $this->getMock('\Magento\Framework\Stdlib\String', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/BooleanTest.php b/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/BooleanTest.php
index 6b5d884332806144995305cb52dc1fb7fd2d5c65..0c8ead39311addc41fb80f2241ac553d78872653 100644
--- a/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/BooleanTest.php
+++ b/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/BooleanTest.php
@@ -14,7 +14,7 @@ class BooleanTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$timezoneMock = $this->getMock('\Magento\Framework\Stdlib\DateTime\TimezoneInterface');
- $loggerMock = $this->getMock('\Magento\Framework\Logger', [], [], '', false);
+ $loggerMock = $this->getMock('\Psr\Log\LoggerInterface', [], [], '', false);
$localeResolverMock = $this->getMock('\Magento\Framework\Locale\ResolverInterface');
$this->model = new Boolean($timezoneMock, $loggerMock, $localeResolverMock);
diff --git a/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/DateTest.php b/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/DateTest.php
index 4932899f0555262343ff87ed5555519bd7a6e0d1..6bb94af2800ed2b5cf6e0629d3b5a8d93d82173b 100644
--- a/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/DateTest.php
+++ b/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/DateTest.php
@@ -19,7 +19,7 @@ class DateTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$this->timezoneMock = $this->getMock('\Magento\Framework\Stdlib\DateTime\TimezoneInterface');
- $loggerMock = $this->getMock('\Magento\Framework\Logger', [], [], '', false);
+ $loggerMock = $this->getMock('\Psr\Log\LoggerInterface', [], [], '', false);
$localeResolverMock = $this->getMock('\Magento\Framework\Locale\ResolverInterface');
$this->model = new Date($this->timezoneMock, $loggerMock, $localeResolverMock);
diff --git a/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/FileTest.php b/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/FileTest.php
index 70370559083bf15c47edf4cc1155fccd28051445..1560e4e30485577ba6dba08d5ae9ef7b95a5ad38 100644
--- a/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/FileTest.php
+++ b/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/FileTest.php
@@ -24,7 +24,7 @@ class FileTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$timezoneMock = $this->getMock('\Magento\Framework\Stdlib\DateTime\TimezoneInterface');
- $loggerMock = $this->getMock('\Magento\Framework\Logger', [], [], '', false);
+ $loggerMock = $this->getMock('\Psr\Log\LoggerInterface', [], [], '', false);
$localeResolverMock = $this->getMock('\Magento\Framework\Locale\ResolverInterface');
$this->urlEncoder = $this->getMock('Magento\Framework\Url\EncoderInterface', [], [], '', false);
$this->fileValidatorMock = $this->getMock(
diff --git a/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/ImageTest.php b/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/ImageTest.php
index 59cb2a0d1475e4fe2107779fb0a894cb2ad51d0c..626e8b99683767884560bd0257ad5ae52064318b 100644
--- a/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/ImageTest.php
+++ b/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/ImageTest.php
@@ -14,7 +14,7 @@ class ImageTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$timezoneMock = $this->getMock('\Magento\Framework\Stdlib\DateTime\TimezoneInterface');
- $loggerMock = $this->getMock('\Magento\Framework\Logger', [], [], '', false);
+ $loggerMock = $this->getMock('\Psr\Log\LoggerInterface', [], [], '', false);
$localeResolverMock = $this->getMock('\Magento\Framework\Locale\ResolverInterface');
$urlEncoder = $this->getMock('Magento\Framework\Url\EncoderInterface', [], [], '', false);
$fileValidatorMock = $this->getMock(
diff --git a/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/MultilineTest.php b/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/MultilineTest.php
index 0e6e1e1f20fd8a09ed9d5dac285be83750d4e55e..7871eef64e54226e99a12c1296e44c38d4a6ba81 100644
--- a/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/MultilineTest.php
+++ b/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/MultilineTest.php
@@ -19,7 +19,7 @@ class MultilineTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$timezoneMock = $this->getMock('\Magento\Framework\Stdlib\DateTime\TimezoneInterface');
- $loggerMock = $this->getMock('\Magento\Framework\Logger', [], [], '', false);
+ $loggerMock = $this->getMock('\Psr\Log\LoggerInterface', [], [], '', false);
$localeResolverMock = $this->getMock('\Magento\Framework\Locale\ResolverInterface');
$this->stringMock = $this->getMock('\Magento\Framework\Stdlib\String', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/MultiselectTest.php b/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/MultiselectTest.php
index 6304d8fb153878aafb128e20b6b13ade199a07b2..969ebfcfd5da6d70eef84de1093a28ef754a02ec 100644
--- a/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/MultiselectTest.php
+++ b/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/MultiselectTest.php
@@ -14,7 +14,7 @@ class MultiselectTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$timezoneMock = $this->getMock('\Magento\Framework\Stdlib\DateTime\TimezoneInterface');
- $loggerMock = $this->getMock('\Magento\Framework\Logger', [], [], '', false);
+ $loggerMock = $this->getMock('\Psr\Log\LoggerInterface', [], [], '', false);
$localeResolverMock = $this->getMock('\Magento\Framework\Locale\ResolverInterface');
$this->model = new Multiselect($timezoneMock, $loggerMock, $localeResolverMock);
diff --git a/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/SelectTest.php b/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/SelectTest.php
index 5500ddd0bb7e58caf5c630c43cbb9cd8c5dbfa29..611c5c81d21583c52d45a9886db5c333b1c2a6ca 100644
--- a/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/SelectTest.php
+++ b/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/SelectTest.php
@@ -14,7 +14,7 @@ class SelectTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$timezoneMock = $this->getMock('\Magento\Framework\Stdlib\DateTime\TimezoneInterface');
- $loggerMock = $this->getMock('\Magento\Framework\Logger', [], [], '', false);
+ $loggerMock = $this->getMock('\Psr\Log\LoggerInterface', [], [], '', false);
$localeResolverMock = $this->getMock('\Magento\Framework\Locale\ResolverInterface');
$this->model = new Select($timezoneMock, $loggerMock, $localeResolverMock);
diff --git a/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/TextTest.php b/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/TextTest.php
index bd6504e7eea1e4ad7c8c5fab7997b1ad25ef6410..8b02bb74601d1dbed160bb75ff9940bb7c0f32fe 100644
--- a/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/TextTest.php
+++ b/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/TextTest.php
@@ -29,7 +29,7 @@ class TextTest extends \PHPUnit_Framework_TestCase
false,
false
);
- $logger = $this->getMock('Magento\Framework\Logger', [], [], '', false, false);
+ $logger = $this->getMock('Psr\Log\LoggerInterface');
$helper = $this->getMock('Magento\Framework\Stdlib\String', [], [], '', false, false);
$attributeData = [
diff --git a/dev/tests/unit/testsuite/Magento/Eav/Model/Entity/Attribute/Backend/ArrayTest.php b/dev/tests/unit/testsuite/Magento/Eav/Model/Entity/Attribute/Backend/ArrayTest.php
index 00cc2d8ec139b9871b36ce282c5cdbd3142269f6..6d83b5cf5687097219fa74709a229d5f977cf20a 100644
--- a/dev/tests/unit/testsuite/Magento/Eav/Model/Entity/Attribute/Backend/ArrayTest.php
+++ b/dev/tests/unit/testsuite/Magento/Eav/Model/Entity/Attribute/Backend/ArrayTest.php
@@ -25,7 +25,7 @@ class ArrayTest extends \PHPUnit_Framework_TestCase
'',
false
);
- $logger = $this->getMock('Magento\Framework\Logger', [], [], '', false);
+ $logger = $this->getMock('Psr\Log\LoggerInterface');
$this->_model = new \Magento\Eav\Model\Entity\Attribute\Backend\ArrayBackend($logger);
$this->_model->setAttribute($this->_attribute);
}
diff --git a/dev/tests/unit/testsuite/Magento/Eav/Model/Entity/Collection/AbstractCollectionTest.php b/dev/tests/unit/testsuite/Magento/Eav/Model/Entity/Collection/AbstractCollectionTest.php
index 643be759694cbccf4f828b71426cdea9c7f29b33..8c2fbd95ed9c58926d0ce8f8e38188d2d12a69eb 100644
--- a/dev/tests/unit/testsuite/Magento/Eav/Model/Entity/Collection/AbstractCollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Eav/Model/Entity/Collection/AbstractCollectionTest.php
@@ -17,7 +17,7 @@ class AbstractCollectionTest extends \PHPUnit_Framework_TestCase
protected $coreEntityFactoryMock;
/**
- * @var \Magento\Framework\Logger|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $loggerMock;
@@ -59,7 +59,7 @@ class AbstractCollectionTest extends \PHPUnit_Framework_TestCase
public function setUp()
{
$this->coreEntityFactoryMock = $this->getMock('Magento\Core\Model\EntityFactory', [], [], '', false);
- $this->loggerMock = $this->getMock('Magento\Framework\Logger', [], [], '', false);
+ $this->loggerMock = $this->getMock('Psr\Log\LoggerInterface');
$this->fetchStrategyMock = $this->getMock(
'Magento\Framework\Data\Collection\Db\FetchStrategyInterface',
[],
diff --git a/dev/tests/unit/testsuite/Magento/Eav/Model/Resource/Attribute/CollectionTest.php b/dev/tests/unit/testsuite/Magento/Eav/Model/Resource/Attribute/CollectionTest.php
index 0d712466ff20d64a1c74efc14246dff76a24437c..f71b2d4fd7174b86741407c2cd82e6aa29410ab8 100644
--- a/dev/tests/unit/testsuite/Magento/Eav/Model/Resource/Attribute/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Eav/Model/Resource/Attribute/CollectionTest.php
@@ -17,7 +17,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
protected $entityFactoryMock;
/**
- * @var \Magento\Framework\Logger|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $loggerMock;
@@ -64,7 +64,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$this->entityFactoryMock = $this->getMock('Magento\Core\Model\EntityFactory', [], [], '', false);
- $this->loggerMock = $this->getMock('Magento\Framework\Logger', [], [], '', false);
+ $this->loggerMock = $this->getMock('Psr\Log\LoggerInterface');
$this->fetchStrategyMock = $this->getMock('Magento\Framework\Data\Collection\Db\FetchStrategyInterface');
$this->eventManagerMock = $this->getMock('Magento\Framework\Event\ManagerInterface');
diff --git a/dev/tests/unit/testsuite/Magento/Eav/Model/Resource/Entity/Attribute/Option/CollectionTest.php b/dev/tests/unit/testsuite/Magento/Eav/Model/Resource/Entity/Attribute/Option/CollectionTest.php
index 7d2313e46b0aa399c7b2dce7b6938088b1c27187..5e27db60b517fc9189456d681734fb83816d7da5 100644
--- a/dev/tests/unit/testsuite/Magento/Eav/Model/Resource/Entity/Attribute/Option/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Eav/Model/Resource/Entity/Attribute/Option/CollectionTest.php
@@ -17,7 +17,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
protected $entityFactoryMock;
/**
- * @var \Magento\Framework\Logger|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $loggerMock;
@@ -59,7 +59,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$this->entityFactoryMock = $this->getMock('Magento\Core\Model\EntityFactory', [], [], '', false);
- $this->loggerMock = $this->getMock('Magento\Framework\Logger', [], [], '', false);
+ $this->loggerMock = $this->getMock('Psr\Log\LoggerInterface');
$this->fetchStrategyMock = $this->getMock(
'Magento\Framework\Data\Collection\Db\FetchStrategyInterface',
[],
diff --git a/dev/tests/unit/testsuite/Magento/Email/Block/Adminhtml/Template/EditTest.php b/dev/tests/unit/testsuite/Magento/Email/Block/Adminhtml/Template/EditTest.php
index 8b54b0509e57637d35b9848700b96b83b5cccac2..12105ab2f5527c33cba754c69461d1bb1f664a59 100644
--- a/dev/tests/unit/testsuite/Magento/Email/Block/Adminhtml/Template/EditTest.php
+++ b/dev/tests/unit/testsuite/Magento/Email/Block/Adminhtml/Template/EditTest.php
@@ -52,7 +52,7 @@ class EditTest extends \PHPUnit_Framework_TestCase
$menuMock = $this->getMock(
'Magento\Backend\Model\Menu',
[],
- [$this->getMock('Magento\Framework\Logger', [], [], '', false)]
+ [$this->getMock('Psr\Log\LoggerInterface')]
);
$menuItemMock = $this->getMock('Magento\Backend\Model\Menu\Item', [], [], '', false, false);
$urlBuilder = $this->getMock('Magento\Backend\Model\Url', [], [], '', false, false);
diff --git a/dev/tests/unit/testsuite/Magento/Fedex/Model/CarrierTest.php b/dev/tests/unit/testsuite/Magento/Fedex/Model/CarrierTest.php
index c770c8f10b3a79bb3d080eae296a18750bccf290..b02a6e9a733685d454e9d4c7d3a13867ac427062 100644
--- a/dev/tests/unit/testsuite/Magento/Fedex/Model/CarrierTest.php
+++ b/dev/tests/unit/testsuite/Magento/Fedex/Model/CarrierTest.php
@@ -77,7 +77,7 @@ class CarrierTest extends \PHPUnit_Framework_TestCase
'scopeConfig' => $scopeConfig,
'rateErrorFactory' =>
$this->getMock('Magento\Sales\Model\Quote\Address\RateResult\ErrorFactory', [], [], '', false),
- 'logAdapterFactory' => $this->getMock('Magento\Framework\Logger\AdapterFactory', [], [], '', false),
+ 'logger' => $this->getMock('Psr\Log\LoggerInterface'),
'xmlElFactory' => $this->getMock('Magento\Shipping\Model\Simplexml\ElementFactory', [], [], '', false),
'rateFactory' => $rateFactory,
'rateMethodFactory' => $rateMethodFactory,
@@ -91,7 +91,6 @@ class CarrierTest extends \PHPUnit_Framework_TestCase
'currencyFactory' => $this->getMock('Magento\Directory\Model\CurrencyFactory', [], [], '', false),
'directoryData' => $this->getMock('Magento\Directory\Helper\Data', [], [], '', false),
'stockRegistry' => $this->getMock('Magento\CatalogInventory\Model\StockRegistry', [], [], '', false),
- 'logger' => $this->getMock('Magento\Framework\Logger', [], [], '', false),
'storeManager' => $storeManager,
'configReader' => $this->getMock('Magento\Framework\Module\Dir\Reader', [], [], '', false),
'productCollectionFactory' =>
diff --git a/dev/tests/unit/testsuite/Magento/Framework/App/BootstrapTest.php b/dev/tests/unit/testsuite/Magento/Framework/App/BootstrapTest.php
index 11b5ff8d5ea3ae03237e34a6a875c2d48e2d205b..986ad6a02af5632186c871a9a92b8f088548a648 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/App/BootstrapTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/App/BootstrapTest.php
@@ -25,7 +25,7 @@ class BootstrapTest extends \PHPUnit_Framework_TestCase
protected $objectManager;
/**
- * @var \Magento\Framework\Logger | \PHPUnit_Framework_MockObject_MockObject
+ * @var \Psr\Log\LoggerInterface | \PHPUnit_Framework_MockObject_MockObject
*/
protected $logger;
@@ -62,7 +62,7 @@ class BootstrapTest extends \PHPUnit_Framework_TestCase
$this->maintenanceMode = $this->getMock('Magento\Framework\App\MaintenanceMode', ['isOn'], [], '', false);
$filesystem = $this->getMock('Magento\Framework\Filesystem', [], [], '', false);
- $this->logger = $this->getMock('Magento\Framework\Logger', [], [], '', false);
+ $this->logger = $this->getMock('Psr\Log\LoggerInterface');
$this->deploymentConfig = $this->getMock('Magento\Framework\App\DeploymentConfig', [], [], '', false);
@@ -71,7 +71,7 @@ class BootstrapTest extends \PHPUnit_Framework_TestCase
['Magento\Framework\App\MaintenanceMode', $this->maintenanceMode],
['Magento\Framework\Filesystem', $filesystem],
['Magento\Framework\App\DeploymentConfig', $this->deploymentConfig],
- ['Magento\Framework\Logger', $this->logger],
+ ['Psr\Log\LoggerInterface', $this->logger],
];
$this->objectManager->expects($this->any())->method('get')
diff --git a/dev/tests/unit/testsuite/Magento/Framework/DB/AbstractMapperTest.php b/dev/tests/unit/testsuite/Magento/Framework/DB/AbstractMapperTest.php
index 9a97d863332b53173db24ce45d4126b2891cf7b0..7ccd46efefa567e3f9a8de6a69d687ed4c4b3b87 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/DB/AbstractMapperTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/DB/AbstractMapperTest.php
@@ -25,7 +25,7 @@ class AbstractMapperTest extends \PHPUnit_Framework_TestCase
protected $selectMock;
/**
- * @var \Magento\Framework\Logger|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $loggerMock;
@@ -81,13 +81,7 @@ class AbstractMapperTest extends \PHPUnit_Framework_TestCase
'',
false
);
- $this->loggerMock = $this->getMock(
- 'Magento\Framework\Logger',
- [],
- [],
- '',
- false
- );
+ $this->loggerMock = $this->getMock('Psr\Log\LoggerInterface');
$this->fetchStrategyMock = $this->getMockForAbstractClass(
'Magento\Framework\Data\Collection\Db\FetchStrategyInterface',
[],
diff --git a/dev/tests/unit/testsuite/Magento/Framework/DB/Logger/FileTest.php b/dev/tests/unit/testsuite/Magento/Framework/DB/Logger/FileTest.php
index 63c684524727ba6a91182a4eece89ae325e32981..e883b622eb3683e495e40711ca04ef7f41faba92 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/DB/Logger/FileTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/DB/Logger/FileTest.php
@@ -128,7 +128,7 @@ class FileTest extends \PHPUnit_Framework_TestCase
$this->object->logStats('unknown', 'SELECT something');
}
- public function testLogException()
+ public function testcritical()
{
$exception = new \Exception('error message');
$expected = "%aEXCEPTION%a'Exception'%a'error message'%a";
@@ -137,6 +137,6 @@ class FileTest extends \PHPUnit_Framework_TestCase
->method('write')
->with($this->matches($expected));
- $this->object->logException($exception);
+ $this->object->critical($exception);
}
}
diff --git a/dev/tests/unit/testsuite/Magento/Framework/DB/QueryTest.php b/dev/tests/unit/testsuite/Magento/Framework/DB/QueryTest.php
index 799e194e822e0dcecee30c71d269c26411223f49..fa8981c85e39c3737b307f9972f1ac226f3b5faa 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/DB/QueryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/DB/QueryTest.php
@@ -30,7 +30,7 @@ class QueryTest extends \PHPUnit_Framework_TestCase
protected $fetchStmtMock;
/**
- * @var \Magento\Framework\Logger|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $loggerMock;
@@ -85,13 +85,7 @@ class QueryTest extends \PHPUnit_Framework_TestCase
'',
false
);
- $this->loggerMock = $this->getMock(
- 'Magento\Framework\Logger',
- [],
- [],
- '',
- false
- );
+ $this->loggerMock = $this->getMock('Psr\Log\LoggerInterface');
$this->fetchStrategyMock = $this->getMockForAbstractClass(
'Magento\Framework\Data\Collection\Db\FetchStrategyInterface',
[],
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Data/Collection/DbTest.php b/dev/tests/unit/testsuite/Magento/Framework/Data/Collection/DbTest.php
index 526254a8ddba1fbceaa715df738fe1ffed87d04f..34dbe81ac5930567eff4576bf1e8e6417bd4ca6d 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Data/Collection/DbTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Data/Collection/DbTest.php
@@ -12,7 +12,7 @@ class DbTest extends \PHPUnit_Framework_TestCase
protected $collection;
/**
- * @var \Magento\Framework\Logger|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $loggerMock;
@@ -34,7 +34,7 @@ class DbTest extends \PHPUnit_Framework_TestCase
$this->entityFactoryMock = $this->getMock(
'Magento\Core\Model\EntityFactory', ['create'], [], '', false
);
- $this->loggerMock = $this->getMock('Magento\Framework\Logger', ['log'], [], '', false);
+ $this->loggerMock = $this->getMock('Psr\Log\LoggerInterface');
$this->collection = new \Magento\Framework\Data\Collection\Db(
$this->entityFactoryMock,
$this->loggerMock,
@@ -306,7 +306,7 @@ class DbTest extends \PHPUnit_Framework_TestCase
public function testPrintLogQueryLogging($logQuery, $logFlag, $expectedCalls)
{
$this->collection->setFlag('log_query', $logFlag);
- $this->loggerMock->expects($this->exactly($expectedCalls))->method('log');
+ $this->loggerMock->expects($this->exactly($expectedCalls))->method('info');
$this->collection->printLogQuery(false, $logQuery, 'some_query');
}
diff --git a/dev/tests/unit/testsuite/Magento/Framework/LoggerTest.php b/dev/tests/unit/testsuite/Magento/Framework/LoggerTest.php
deleted file mode 100644
index a1b3f8cdce74bd6281b15d2585c86f25cedd1aea..0000000000000000000000000000000000000000
--- a/dev/tests/unit/testsuite/Magento/Framework/LoggerTest.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
- */
-namespace Magento\Framework;
-
-use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\Filesystem\Directory\Write;
-
-class LoggerTest extends \PHPUnit_Framework_TestCase
-{
- /**
- * @var \Magento\Framework\Logger|\PHPUnit_Framework_MockObject_MockObject
- */
- protected $model = null;
-
- /**
- * @var \ReflectionProperty
- */
- protected $loggersProperty = null;
-
- /**
- * @var \PHPUnit_Framework_MockObject_MockObject
- */
- protected $filesystemMock;
-
- /**
- * @var Write | \PHPUnit_Framework_MockObject_MockObject
- */
- protected $directory;
-
- /**
- * @var string
- */
- private static $logDir;
-
- public static function setUpBeforeClass()
- {
- self::$logDir = TESTS_TEMP_DIR . '/var/log';
- if (!is_dir(self::$logDir)) {
- mkdir(self::$logDir, 0777, true);
- }
- }
-
- public static function tearDownAfterClass()
- {
- $filesystemAdapter = new \Magento\Framework\Filesystem\Driver\File();
- $filesystemAdapter->deleteDirectory(self::$logDir);
- }
-
- protected function setUp()
- {
- $logDir = self::$logDir;
- $this->filesystemMock = $this->getMock('Magento\Framework\Filesystem', [], [], '', false);
- $this->directory = $this->getMock('Magento\Framework\Filesystem\Directory\Write', [], [], '', false);
- $this->filesystemMock->expects($this->any())
- ->method('getDirectoryWrite')
- ->with(DirectoryList::LOG)
- ->will($this->returnValue($this->directory));
- $this->directory->expects($this->any())->method('create')->will($this->returnValue(true));
- $this->directory->expects($this->any())->method('getAbsolutePath')->will(
- $this->returnCallback(
- function ($path) use ($logDir) {
- $path = ltrim($path, '\/');
- return $logDir . '/' . $path;
- }
- )
- );
-
- $this->model = new \Magento\Framework\Logger($this->filesystemMock);
- $this->loggersProperty = new \ReflectionProperty($this->model, '_loggers');
- $this->loggersProperty->setAccessible(true);
- }
-
- protected function tearDown()
- {
- $this->model = null; // will cause __descruct() in the underlying log class, which will close the open log files
- }
-
- /**
- * @param string $key
- * @param string $fileOrWrapper
- * @dataProvider addStreamLogDataProvider
- */
- public function testAddStreamLog($key, $fileOrWrapper)
- {
- $this->assertFalse($this->model->hasLog($key));
- $this->model->addStreamLog($key, $fileOrWrapper);
- $this->assertTrue($this->model->hasLog($key));
-
- $loggers = $this->loggersProperty->getValue($this->model);
- $this->assertArrayHasKey($key, $loggers);
- $zendLog = $loggers[$key];
- $this->assertInstanceOf('Zend_Log', $zendLog);
-
- $writersProperty = new \ReflectionProperty($zendLog, '_writers');
- $writersProperty->setAccessible(true);
- $writers = $writersProperty->getValue($zendLog);
- $this->assertArrayHasKey(0, $writers);
- $stream = $writers[0];
- $this->assertInstanceOf('Zend_Log_Writer_Stream', $writers[0]);
-
- $streamProperty = new \ReflectionProperty($stream, '_stream');
- $streamProperty->setAccessible(true);
- $fileOrWrapper = $streamProperty->getValue($stream);
- $this->assertInternalType('resource', $fileOrWrapper);
- $this->assertEquals('stream', get_resource_type($fileOrWrapper));
- }
-
- /**
- * @return array
- */
- public function addStreamLogDataProvider()
- {
- return [['test', 'php://output'], ['test', 'custom_file.log'], ['test', '']];
- }
-
- /**
- * @covers \Magento\Framework\Logger::hasLog
- */
- public function testAddLogWithSpecificKey()
- {
- $key = uniqid();
- $this->model->addStreamLog($key);
- $this->assertTrue($this->model->hasLog($key));
- }
-
- public function testLog()
- {
- $messageOne = uniqid();
- $messageTwo = uniqid();
- $messageThree = uniqid();
- $this->expectOutputRegex(
- '/' . 'DEBUG \(7\).+?' . $messageTwo . '.+?' . 'CRIT \(2\).+?' . $messageThree . '/s'
- );
- $this->model->addStreamLog('test', 'php://output');
- $this->model->log($messageOne);
- $this->model->log($messageTwo, \Zend_Log::DEBUG, 'test');
- $this->model->log($messageThree, \Zend_Log::CRIT, 'test');
- }
-
- public function testLogComplex()
- {
- $this->expectOutputRegex('/Array\s\(\s+\[0\] => 1\s\).+stdClass Object/s');
- $this->model->addStreamLog(\Magento\Framework\Logger::LOGGER_SYSTEM, 'php://output');
- $this->model->log([1]);
- $this->model->log(new \StdClass());
- $this->model->log('key');
- }
-
- public function testLogNoKey()
- {
- $key = 'key';
- $this->model->log($key);
- $this->assertFalse($this->model->hasLog($key));
- }
-
- public function testLogDebug()
- {
- $message = uniqid();
- /** @var $model \Magento\Framework\Logger|\PHPUnit_Framework_MockObject_MockObject */
- $model = $this->getMock('Magento\Framework\Logger', ['log'], [], '', false);
- $model->expects($this->at(0))
- ->method('log')
- ->with($message, \Zend_Log::DEBUG, \Magento\Framework\Logger::LOGGER_SYSTEM);
- $model->expects($this->at(1))
- ->method('log')
- ->with(
- $message,
- \Zend_Log::DEBUG,
- \Magento\Framework\Logger::LOGGER_EXCEPTION
- );
- $model->logDebug($message);
- $model->logDebug($message, \Magento\Framework\Logger::LOGGER_EXCEPTION);
- }
-
- public function testLogException()
- {
- $exception = new \Exception();
- $expected = "\n{$exception}";
- /** @var $model \Magento\Framework\Logger|\PHPUnit_Framework_MockObject_MockObject */
- $model = $this->getMock('Magento\Framework\Logger', ['log'], [], '', false);
- $model->expects($this->at(0))
- ->method('log')
- ->with(
- $expected,
- \Zend_Log::ERR,
- \Magento\Framework\Logger::LOGGER_EXCEPTION
- );
- $model->logException($exception);
- }
-
- public function testUnsetLoggers()
- {
- $key = 'test';
- $fileOrWrapper = 'custom_file.log';
- $this->model->addStreamLog($key, $fileOrWrapper);
- $this->assertTrue($this->model->hasLog($key));
- $this->model->unsetLoggers();
- $this->assertFalse($this->model->hasLog($key));
- }
-
- public function testLogFile()
- {
- $message = ['Wrong file name', 'Avoid using special chars'];
- $filename = 'custom_file.log';
- $this->model->logFile($message, \Zend_Log::DEBUG);
- $this->model->logFile($message, \Zend_Log::DEBUG, $filename);
- $this->assertTrue($this->model->hasLog($filename));
- }
-}
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Message/ManagerTest.php b/dev/tests/unit/testsuite/Magento/Framework/Message/ManagerTest.php
index 96db910fd4e1c30ad0e57eb0cccf41182de4924d..32e6638df24b58263baac8e2a4d0d6bfe83e546c 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Message/ManagerTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Message/ManagerTest.php
@@ -29,11 +29,6 @@ class ManagerTest extends \PHPUnit_Framework_TestCase
*/
protected $session;
- /**
- * @var \Magento\Framework\Logger|\PHPUnit_Framework_MockObject_MockObject
- */
- protected $logger;
-
/**
* @var \Magento\Framework\Event\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
@@ -66,11 +61,6 @@ class ManagerTest extends \PHPUnit_Framework_TestCase
)->disableOriginalConstructor()->setMethods(
['getData', 'setData']
)->getMock();
- $this->logger = $this->getMockBuilder(
- 'Magento\Framework\Logger'
- )->setMethods(
- ['logFile']
- )->disableOriginalConstructor()->getMock();
$this->eventManager = $this->getMockBuilder(
'Magento\Framework\Event\Manager'
)->setMethods(
@@ -86,7 +76,6 @@ class ManagerTest extends \PHPUnit_Framework_TestCase
'messageFactory' => $this->messageFactory,
'session' => $this->session,
'eventManager' => $this->eventManager,
- 'logger' => $this->logger
]
);
}
@@ -201,16 +190,6 @@ class ManagerTest extends \PHPUnit_Framework_TestCase
$this->returnValue($messageError)
);
- $this->logger->expects(
- $this->atLeastOnce()
- )->method(
- 'logFile'
- )->with(
- $this->stringStartsWith($logText),
- \Zend_Log::DEBUG,
- \Magento\Framework\Logger::LOGGER_EXCEPTION
- );
-
$messageCollection = $this->getMockBuilder(
'Magento\Framework\Message\Collection'
)->disableOriginalConstructor()->setMethods(
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Model/AbstractExtensibleModelTest.php b/dev/tests/unit/testsuite/Magento/Framework/Model/AbstractExtensibleModelTest.php
index 98eacb609f309014d80d21e645fa2c6e263a3500..26c1423a9662747db9f56968d7dd98d99b7ea159 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Model/AbstractExtensibleModelTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Model/AbstractExtensibleModelTest.php
@@ -55,7 +55,7 @@ class AbstractExtensibleModelTest extends \PHPUnit_Framework_TestCase
false
);
$this->contextMock = new \Magento\Framework\Model\Context(
- $this->getMock('Magento\Framework\Logger', [], [], '', false),
+ $this->getMock('Psr\Log\LoggerInterface'),
$this->getMock('Magento\Framework\Event\ManagerInterface', [], [], '', false),
$this->getMock('Magento\Framework\App\CacheInterface', [], [], '', false),
$this->getMock('Magento\Framework\App\State', [], [], '', false),
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Model/AbstractModelTest.php b/dev/tests/unit/testsuite/Magento/Framework/Model/AbstractModelTest.php
index 708eeda02c8730ff19bb3aa06b8407aa8338e46e..2d2109a4b6e292e36e35fe8b40c7d78813287f68 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Model/AbstractModelTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Model/AbstractModelTest.php
@@ -53,7 +53,7 @@ class AbstractModelTest extends \PHPUnit_Framework_TestCase
false
);
$this->contextMock = new \Magento\Framework\Model\Context(
- $this->getMock('Magento\Framework\Logger', [], [], '', false),
+ $this->getMock('Psr\Log\LoggerInterface'),
$this->getMock('Magento\Framework\Event\ManagerInterface', [], [], '', false),
$this->getMock('Magento\Framework\App\CacheInterface', [], [], '', false),
$this->getMock('Magento\Framework\App\State', [], [], '', false),
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Model/Resource/Db/Collection/AbstractCollectionTest.php b/dev/tests/unit/testsuite/Magento/Framework/Model/Resource/Db/Collection/AbstractCollectionTest.php
index 3d6b52266b576d95ef11bf390f3692b4cf87dbe6..8212036d79cc17a050c368425dbc706dbf146fb3 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Model/Resource/Db/Collection/AbstractCollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Model/Resource/Db/Collection/AbstractCollectionTest.php
@@ -21,7 +21,7 @@ class AbstractCollectionTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Framework\Data\Collection\EntityFactoryInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $entityFactoryMock;
- /** @var \Magento\Framework\Logger|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $loggerMock;
/** @var \Magento\Framework\Data\Collection\Db\FetchStrategyInterface|\PHPUnit_Framework_MockObject_MockObject */
@@ -45,7 +45,7 @@ class AbstractCollectionTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$this->entityFactoryMock = $this->getMock('Magento\Framework\Data\Collection\EntityFactoryInterface');
- $this->loggerMock = $this->getMock('Magento\Framework\Logger', [], [], '', false);
+ $this->loggerMock = $this->getMock('Psr\Log\LoggerInterface');
$this->fetchStrategyMock = $this->getMock('Magento\Framework\Data\Collection\Db\FetchStrategyInterface');
$this->managerMock = $this->getMock('Magento\Framework\Event\ManagerInterface');
$this->connectionMock = $this->getMock('Magento\Framework\DB\Adapter\Pdo\Mysql', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Module/Setup/MigrationTest.php b/dev/tests/unit/testsuite/Magento/Framework/Module/Setup/MigrationTest.php
index 29b126f121eb4d28556e1ea2f23b7aa7e1d026ca..455753f860ecff650f25db8e20a5ecf9107a6c7c 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Module/Setup/MigrationTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Module/Setup/MigrationTest.php
@@ -159,7 +159,7 @@ class MigrationTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue($this->getMock('Magento\Framework\App\Resource', [], [], '', false)));
$contextMock->expects($this->once())
->method('getLogger')
- ->will($this->returnValue($this->getMock('Magento\Framework\Logger', [], [], '', false)));
+ ->will($this->returnValue($this->getMock('Psr\Log\LoggerInterface')));
$contextMock->expects($this->once())
->method('getModulesReader')
->will(
@@ -216,7 +216,7 @@ class MigrationTest extends \PHPUnit_Framework_TestCase
$this->getMock('Magento\Framework\App\Resource', [], [], '', false, false),
$this->getMock('Magento\Framework\Filesystem', [], [], '', false),
$this->getMock('Magento\Core\Helper\Data', [], [], '', false),
- $this->getMock('Magento\Framework\Logger', [], [], '', false),
+ $this->getMock('Psr\Log\LoggerInterface'),
$this->getMock('Magento\Framework\Event\ManagerInterface', [], [], '', false),
$this->getMock('Magento\Framework\App\Config\ScopeConfigInterface'),
$this->getMock('Magento\Framework\Module\ModuleListInterface'),
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/Asset/MergedTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/Asset/MergedTest.php
index fe0c874a755ffc31681310aafa0f35294206db4e..0075409fc18f50888ea936053eba8da3eb3e70db 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/Asset/MergedTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/Asset/MergedTest.php
@@ -48,7 +48,7 @@ class MergedTest extends \PHPUnit_Framework_TestCase
$this->_assetJsTwo->expects($this->any())->method('getPath')
->will($this->returnValue('script_two.js'));
- $this->_logger = $this->getMock('Magento\Framework\Logger', ['logException'], [], '', false);
+ $this->_logger = $this->getMock('Psr\Log\LoggerInterface');
$this->_mergeStrategy = $this->getMock('Magento\Framework\View\Asset\MergeStrategyInterface');
@@ -100,7 +100,7 @@ class MergedTest extends \PHPUnit_Framework_TestCase
public function testIteratorInterfaceMerge()
{
$assets = [$this->_assetJsOne, $this->_assetJsTwo];
- $this->_logger->expects($this->never())->method('logException');
+ $this->_logger->expects($this->never())->method('critical');
$merged = new \Magento\Framework\View\Asset\Merged(
$this->_logger,
$this->_mergeStrategy,
@@ -135,7 +135,7 @@ class MergedTest extends \PHPUnit_Framework_TestCase
[$this->_assetJsOne, $this->_assetJsTwo, $assetBroken]
);
- $this->_logger->expects($this->once())->method('logException')->with($this->identicalTo($mergeError));
+ $this->_logger->expects($this->once())->method('critical')->with($this->identicalTo($mergeError));
$expectedResult = [$this->_assetJsOne, $this->_assetJsTwo, $assetBroken];
$this->_assertIteratorEquals($expectedResult, $merged);
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/Asset/MinifiedTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/Asset/MinifiedTest.php
index 47a209618de0a357afb2886df5e3c86c59d8db25..953d28830ee18de40a5eef2d77fb15c4e3f91ed0 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/Asset/MinifiedTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/Asset/MinifiedTest.php
@@ -14,7 +14,7 @@ class MinifiedTest extends \PHPUnit_Framework_TestCase
protected $_asset;
/**
- * @var \Magento\Framework\Logger|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $_logger;
@@ -51,7 +51,7 @@ class MinifiedTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$this->_asset = $this->getMockForAbstractClass('\Magento\Framework\View\Asset\LocalInterface');
- $this->_logger = $this->getMock('\Magento\Framework\Logger', [], [], '', false);
+ $this->_logger = $this->getMock('\Psr\Log\LoggerInterface', [], [], '', false);
$this->_baseUrl = $this->getMock('\Magento\Framework\Url', [], [], '', false);
$this->_staticViewDir = $this->getMockForAbstractClass(
'\Magento\Framework\Filesystem\Directory\WriteInterface'
@@ -210,7 +210,7 @@ class MinifiedTest extends \PHPUnit_Framework_TestCase
$this->_asset->expects($this->once())->method('getContent')->will($this->returnValue('content'));
$e = new \Exception('test');
$this->_adapter->expects($this->once())->method('minify')->with('content')->will($this->throwException($e));
- $this->_logger->expects($this->once())->method('logException');
+ $this->_logger->expects($this->once())->method('critical');
$this->_staticViewDir->expects($this->never())->method('writeFile');
$this->_asset->expects($this->once())->method('getFilePath')->will($this->returnValue('file_path'));
$this->_asset->expects($this->once())->method('getContext')->will($this->returnValue('context'));
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/ContextTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/ContextTest.php
index 79bf24db6497ec12355e34d3581a11dad2095520..a5e76e1716f578c6c93bb3f8c8f25aa54feec119 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/ContextTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/ContextTest.php
@@ -117,7 +117,7 @@ class ContextTest extends \PHPUnit_Framework_TestCase
public function testGetLogger()
{
- $this->assertInstanceOf('\Magento\Framework\Logger', $this->context->getLogger());
+ $this->assertInstanceOf('\Psr\Log\LoggerInterface', $this->context->getLogger());
}
public function testGetAppState()
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/Design/Theme/ImageTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/Design/Theme/ImageTest.php
index e3ab232cf713dc34e8bc27bd7f9db49188bd6573..406399dfcdadc7a2c4af07e37db9f484ea7c6efc 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/Design/Theme/ImageTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/Design/Theme/ImageTest.php
@@ -86,7 +86,7 @@ class ImageTest extends \PHPUnit_Framework_TestCase
$this->_imageMock = $this->getMock('Magento\Framework\Image', [], [], '', false, false);
$imageFactory->expects($this->any())->method('create')->will($this->returnValue($this->_imageMock));
- $logger = $this->getMock('Magento\Framework\Logger', [], [], '', false, false);
+ $logger = $this->getMock('Psr\Log\LoggerInterface');
$this->_themeMock = $this->getMock('Magento\Core\Model\Theme', ['__wakeup'], [], '', false, false);
$this->_uploaderMock = $this->getMock(
'Magento\Framework\View\Design\Theme\Image\Uploader',
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/Page/Config/RendererTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/Page/Config/RendererTest.php
index bb04603a2056e3aaa440e0aff008cab80a59cc1c..64e3254b0bc9740a25288cb107bb59fa3b3ea020 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/Page/Config/RendererTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/Page/Config/RendererTest.php
@@ -56,7 +56,7 @@ class RendererTest extends \PHPUnit_Framework_TestCase
protected $stringMock;
/**
- * @var \Magento\Framework\Logger|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $loggerMock;
@@ -106,8 +106,7 @@ class RendererTest extends \PHPUnit_Framework_TestCase
->disableOriginalConstructor()
->getMock();
- $this->loggerMock = $this->getMockBuilder('Magento\Framework\Logger')
- ->disableOriginalConstructor()
+ $this->loggerMock = $this->getMockBuilder('Psr\Log\LoggerInterface')
->getMock();
$this->assetsCollection = $this->getMockBuilder('Magento\Framework\View\Asset\GroupedCollection')
@@ -316,7 +315,7 @@ class RendererTest extends \PHPUnit_Framework_TestCase
->willReturnArgument(0);
$this->loggerMock->expects($this->once())
- ->method('logException')
+ ->method('critical')
->with($exception);
$this->urlBuilderMock->expects($this->once())
diff --git a/dev/tests/unit/testsuite/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/MassAddTest.php b/dev/tests/unit/testsuite/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/MassAddTest.php
index ff679334640895fa66d15487ce19aa878e1a7065..f5b3c73d021e9a0f1d21856ced05ffa0b9c63f39 100644
--- a/dev/tests/unit/testsuite/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/MassAddTest.php
+++ b/dev/tests/unit/testsuite/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/MassAddTest.php
@@ -73,10 +73,9 @@ class MassAddTest extends \PHPUnit_Framework_TestCase
$this->flag->expects($this->once())->method('lock')
->will($this->throwException(new \Exception('Test exception')));
- $logger = $this->getMockBuilder('Magento\Framework\Logger')->setMethods(['logException'])
- ->disableOriginalConstructor()->getMock();
+ $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
$this->controllerArguments['context']->getObjectManager()
- ->expects($this->at(2))->method('get')->with('Magento\Framework\Logger')
+ ->expects($this->at(2))->method('get')->with('Psr\Log\LoggerInterface')
->will($this->returnValue($logger));
$this->controller->execute();
diff --git a/dev/tests/unit/testsuite/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/RefreshTest.php b/dev/tests/unit/testsuite/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/RefreshTest.php
index 78c569bed4f8133203b94d37cc7b0e2e76aa0dfb..71c385ce8f15430ae79c05110b7e9435a5a29847 100644
--- a/dev/tests/unit/testsuite/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/RefreshTest.php
+++ b/dev/tests/unit/testsuite/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/RefreshTest.php
@@ -67,10 +67,9 @@ class RefreshTest extends \PHPUnit_Framework_TestCase
$this->flag->expects($this->once())->method('lock')
->will($this->throwException(new \Exception('Test exception')));
- $logger = $this->getMockBuilder('Magento\Framework\Logger')->setMethods(['logException'])
- ->disableOriginalConstructor()->getMock();
+ $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
$this->controllerArguments['context']->getObjectManager()->expects($this->at(1))->method('get')
- ->with('Magento\Framework\Logger')
+ ->with('Psr\Log\LoggerInterface')
->will($this->returnValue($logger));
$this->controller->execute();
diff --git a/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/MassOperationsTest.php b/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/MassOperationsTest.php
index 980020bf9d4b54c6a8a4567fbabf42b4b2a692b3..72752d10b7978e22ad5ee80fe45cdbd41fbea514 100644
--- a/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/MassOperationsTest.php
+++ b/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/MassOperationsTest.php
@@ -30,7 +30,7 @@ class MassOperationsTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $storeManagerInterface;
- /** @var \Magento\Framework\Logger|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $logger;
/** @var \Magento\GoogleShopping\Helper\Data|\PHPUnit_Framework_MockObject_MockObject */
@@ -49,7 +49,7 @@ class MassOperationsTest extends \PHPUnit_Framework_TestCase
$this->productFactory = $this->getMock('Magento\Catalog\Model\ProductFactory', [], [], '', false);
$this->notificationInterface = $this->getMock('Magento\Framework\Notification\NotifierInterface');
$this->storeManagerInterface = $this->getMock('Magento\Store\Model\StoreManagerInterface');
- $this->logger = $this->getMock('Magento\Framework\Logger', [], [], '', false);
+ $this->logger = $this->getMock('Psr\Log\LoggerInterface');
$this->googleShoppingHelper = $this->getMock('Magento\GoogleShopping\Helper\Data', [], [], '', false);
$this->googleShoppingCategoryHelper = $this->getMock('Magento\GoogleShopping\Helper\Category');
diff --git a/dev/tests/unit/testsuite/Magento/GroupedProduct/Model/Product/Type/GroupedTest.php b/dev/tests/unit/testsuite/Magento/GroupedProduct/Model/Product/Type/GroupedTest.php
index ad9392e906ed301fdbefc334be9d9e526d1018d4..cd98cd9ee707d8cf2783d51313915d73dcfc2c11 100644
--- a/dev/tests/unit/testsuite/Magento/GroupedProduct/Model/Product/Type/GroupedTest.php
+++ b/dev/tests/unit/testsuite/Magento/GroupedProduct/Model/Product/Type/GroupedTest.php
@@ -40,7 +40,7 @@ class GroupedTest extends \PHPUnit_Framework_TestCase
$filesystem = $this->getMock('Magento\Framework\Filesystem', [], [], '', false);
$coreRegistry = $this->getMock('Magento\Framework\Registry', [], [], '', false);
$this->product = $this->getMock('Magento\Catalog\Model\Product', [], [], '', false);
- $logger = $this->getMock('Magento\Framework\Logger', [], [], '', false);
+ $logger = $this->getMock('Psr\Log\LoggerInterface');
$productFactoryMock = $this->getMock('Magento\Catalog\Model\ProductFactory', [], [], '', false);
$this->catalogProductLink = $this->getMock(
'\Magento\GroupedProduct\Model\Resource\Product\Link',
diff --git a/dev/tests/unit/testsuite/Magento/ImportExport/Model/ExportTest.php b/dev/tests/unit/testsuite/Magento/ImportExport/Model/ExportTest.php
index 582bfb7111443e14369e1d2edb1af906de5c8e95..ce1d09e5366bbaa936b735b099c8a11f94c9ff3d 100644
--- a/dev/tests/unit/testsuite/Magento/ImportExport/Model/ExportTest.php
+++ b/dev/tests/unit/testsuite/Magento/ImportExport/Model/ExportTest.php
@@ -57,9 +57,8 @@ class ExportTest extends \PHPUnit_Framework_TestCase
$this->returnValue($this->_exportFileExtension)
);
- $logger = $this->getMock('Magento\Framework\Logger', [], [], '', false);
+ $logger = $this->getMock('Psr\Log\LoggerInterface');
$filesystem = $this->getMock('Magento\Framework\Filesystem', [], [], '', false);
- $adapterFactory = $this->getMock('Magento\Framework\Logger\AdapterFactory', [], [], '', false);
$entityFactory = $this->getMock(
'Magento\ImportExport\Model\Export\Entity\Factory',
[],
@@ -78,7 +77,7 @@ class ExportTest extends \PHPUnit_Framework_TestCase
$mockModelExport = $this->getMock(
'Magento\ImportExport\Model\Export',
['getEntityAdapter', '_getEntityAdapter', '_getWriter'],
- [$logger, $filesystem, $adapterFactory, $this->_exportConfigMock, $entityFactory, $exportAdapterFac]
+ [$logger, $filesystem, $this->_exportConfigMock, $entityFactory, $exportAdapterFac]
);
$mockModelExport->expects(
$this->any()
diff --git a/dev/tests/unit/testsuite/Magento/ImportExport/Model/Resource/CollectionByPagesIteratorTest.php b/dev/tests/unit/testsuite/Magento/ImportExport/Model/Resource/CollectionByPagesIteratorTest.php
index 15b1b6c5660d3606025433e67b5c11a087398d1a..4b3e456e4675fc079ac2257fd2bc64eee28952f1 100644
--- a/dev/tests/unit/testsuite/Magento/ImportExport/Model/Resource/CollectionByPagesIteratorTest.php
+++ b/dev/tests/unit/testsuite/Magento/ImportExport/Model/Resource/CollectionByPagesIteratorTest.php
@@ -41,7 +41,7 @@ class CollectionByPagesIteratorTest extends \PHPUnit_Framework_TestCase
$select = $this->getMock('Zend_Db_Select', [], [], '', false);
$entityFactory = $this->getMock('Magento\Core\Model\EntityFactory', [], [], '', false);
- $logger = $this->getMock('Magento\Framework\Logger', [], [], '', false);
+ $logger = $this->getMock('Psr\Log\LoggerInterface');
/** @var $collectionMock \Magento\Framework\Data\Collection\Db|PHPUnit_Framework_MockObject_MockObject */
$collectionMock = $this->getMock(
diff --git a/dev/tests/unit/testsuite/Magento/Integration/Controller/Adminhtml/IntegrationTest.php b/dev/tests/unit/testsuite/Magento/Integration/Controller/Adminhtml/IntegrationTest.php
index 4332d4ce46af64febc4a5e37dd49ab14b155b7ed..4e27d2ab84a864e0b107037a32f007dc690a2314 100644
--- a/dev/tests/unit/testsuite/Magento/Integration/Controller/Adminhtml/IntegrationTest.php
+++ b/dev/tests/unit/testsuite/Magento/Integration/Controller/Adminhtml/IntegrationTest.php
@@ -24,7 +24,7 @@ abstract class IntegrationTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Framework\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $_objectManagerMock;
- /** @var \Magento\Backend\Model\Layout\Filter\Acl|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Magento\Backend\Model\View\Layout\Filter\Acl|\PHPUnit_Framework_MockObject_MockObject */
protected $_layoutFilterMock;
/** @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject */
@@ -190,10 +190,10 @@ abstract class IntegrationTest extends \PHPUnit_Framework_TestCase
$menuMock = $this->getMock(
'Magento\Backend\Model\Menu',
[],
- [$this->getMock('Magento\Framework\Logger', [], [], '', false)]
+ [$this->getMock('Psr\Log\LoggerInterface')]
);
- $loggerMock = $this->getMockBuilder('Magento\Framework\Logger')->disableOriginalConstructor()->getMock();
- $loggerMock->expects($this->any())->method('logException')->will($this->returnSelf());
+ $loggerMock = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
+ $loggerMock->expects($this->any())->method('critical')->will($this->returnSelf());
$menuMock->expects($this->any())->method('getParentItems')->will($this->returnValue([]));
$blockMock->expects($this->any())->method('getMenuModel')->will($this->returnValue($menuMock));
$this->_layoutMock->expects($this->any())->method('getMessagesBlock')->will($this->returnValue($blockMock));
diff --git a/dev/tests/unit/testsuite/Magento/Integration/Helper/Oauth/ConsumerTest.php b/dev/tests/unit/testsuite/Magento/Integration/Helper/Oauth/ConsumerTest.php
index d2d4d092c67d3934adbd71d08fc4a6a150ad5796..075e79d14d0d808ad55fef52e211ca78d80a66b8 100644
--- a/dev/tests/unit/testsuite/Magento/Integration/Helper/Oauth/ConsumerTest.php
+++ b/dev/tests/unit/testsuite/Magento/Integration/Helper/Oauth/ConsumerTest.php
@@ -33,7 +33,7 @@ class ConsumerTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Integration\Service\V1\OauthInterface */
protected $_oauthService;
- /** @var \Magento\Framework\Logger */
+ /** @var \Psr\Log\LoggerInterface */
protected $_loggerMock;
protected function setUp()
@@ -90,9 +90,7 @@ class ConsumerTest extends \PHPUnit_Framework_TestCase
'Magento\Framework\HTTP\ZendClient'
)->disableOriginalConstructor()->getMock();
$this->_loggerMock = $this->getMockBuilder(
- 'Magento\Framework\Logger'
- )->disableOriginalConstructor()->setMethods(
- ['logException']
+ 'Psr\Log\LoggerInterface'
)->getMock();
$this->_oauthService = new \Magento\Integration\Service\V1\Oauth(
diff --git a/dev/tests/unit/testsuite/Magento/Integration/Service/V1/AuthorizationServiceTest.php b/dev/tests/unit/testsuite/Magento/Integration/Service/V1/AuthorizationServiceTest.php
index 73aeef14728a5bbc836f3e0df71d8b9b62c7f58c..b0a84bce0c52246e13f25a5bb3371d3e1b52c18d 100644
--- a/dev/tests/unit/testsuite/Magento/Integration/Service/V1/AuthorizationServiceTest.php
+++ b/dev/tests/unit/testsuite/Magento/Integration/Service/V1/AuthorizationServiceTest.php
@@ -43,7 +43,7 @@ class AuthorizationServiceTest extends \PHPUnit_Framework_TestCase
$this->getMock('Magento\Authorization\Model\Resource\Role\CollectionFactory', [], [], '', false),
$this->getMock('Magento\Authorization\Model\RulesFactory', [], [], '', false),
$this->getMock('Magento\Authorization\Model\Resource\Rules\CollectionFactory', [], [], '', false),
- $this->getMock('Magento\Framework\Logger', [], [], '', false),
+ $this->getMock('Psr\Log\LoggerInterface'),
$this->getMock('Magento\Framework\Acl\RootResource', [], [], '', false)
);
}
diff --git a/dev/tests/unit/testsuite/Magento/Integration/Service/V1/OauthTest.php b/dev/tests/unit/testsuite/Magento/Integration/Service/V1/OauthTest.php
index eaeb90e7e172c99da148ac64a01e3231bc2b78e8..01ab337946ea3b3bb18beefe1445050c745ff941 100644
--- a/dev/tests/unit/testsuite/Magento/Integration/Service/V1/OauthTest.php
+++ b/dev/tests/unit/testsuite/Magento/Integration/Service/V1/OauthTest.php
@@ -94,7 +94,7 @@ class OauthTest extends \PHPUnit_Framework_TestCase
$this->_tokenFactoryMock,
$this->getMock('Magento\Integration\Helper\Oauth\Data', [], [], '', false),
$this->getMock('Magento\Framework\HTTP\ZendClient', [], [], '', false),
- $this->getMock('Magento\Framework\Logger', [], [], '', false),
+ $this->getMock('Psr\Log\LoggerInterface'),
$this->getMock('Magento\Framework\Oauth\Helper\Oauth', [], [], '', false),
$this->_tokenProviderMock
);
diff --git a/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/BanktransferTest.php b/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/BanktransferTest.php
index 6c96fbfa42616add8f2f756e44fde042ec89f0a8..03f21339f631bda635b1cd238f60c3443e498519 100644
--- a/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/BanktransferTest.php
+++ b/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/BanktransferTest.php
@@ -17,20 +17,12 @@ class BanktransferTest extends \PHPUnit_Framework_TestCase
$eventManager = $this->getMock('Magento\Framework\Event\ManagerInterface', [], [], '', false);
$paymentDataMock = $this->getMock('Magento\Payment\Helper\Data', [], [], '', false);
$scopeConfig = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
- $adapterFactoryMock = $this->getMock(
- 'Magento\Framework\Logger\AdapterFactory',
- ['create'],
- [],
- '',
- false
- );
$this->_object = $objectManagerHelper->getObject(
'Magento\OfflinePayments\Model\Banktransfer',
[
'eventManager' => $eventManager,
'paymentData' => $paymentDataMock,
'scopeConfig' => $scopeConfig,
- 'logAdapterFactory' => $adapterFactoryMock
]
);
}
diff --git a/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/CashondeliveryTest.php b/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/CashondeliveryTest.php
index 651183471b28a3df7cb4c9f2d9ff487b65707c6d..2f3cb65cfc398b73c8f49322d261b8a1bf18b654 100644
--- a/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/CashondeliveryTest.php
+++ b/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/CashondeliveryTest.php
@@ -17,13 +17,6 @@ class CashondeliveryTest extends \PHPUnit_Framework_TestCase
$eventManager = $this->getMock('Magento\Framework\Event\ManagerInterface', [], [], '', false);
$paymentDataMock = $this->getMock('Magento\Payment\Helper\Data', [], [], '', false);
- $adapterFactoryMock = $this->getMock(
- 'Magento\Framework\Logger\AdapterFactory',
- ['create'],
- [],
- '',
- false
- );
$scopeConfig = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
$this->_object = $helper->getObject(
@@ -32,7 +25,6 @@ class CashondeliveryTest extends \PHPUnit_Framework_TestCase
'eventManager' => $eventManager,
'paymentData' => $paymentDataMock,
'scopeConfig' => $scopeConfig,
- 'logAdapterFactory' => $adapterFactoryMock
]
);
}
diff --git a/dev/tests/unit/testsuite/Magento/Payment/Block/Info/ContainerAbstractTest.php b/dev/tests/unit/testsuite/Magento/Payment/Block/Info/ContainerAbstractTest.php
index 0891b30fc9359eb3fd1629ede98535c4ac71448f..a2974944cb1df368dfffc49ce18a68bbd2e127fd 100644
--- a/dev/tests/unit/testsuite/Magento/Payment/Block/Info/ContainerAbstractTest.php
+++ b/dev/tests/unit/testsuite/Magento/Payment/Block/Info/ContainerAbstractTest.php
@@ -21,17 +21,7 @@ class ContainerAbstractTest extends \PHPUnit_Framework_TestCase
);
$objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
$paymentInfo = $objectManagerHelper->getObject('Magento\Payment\Model\Info');
- $adapterFactoryMock = $this->getMock(
- 'Magento\Framework\Logger\AdapterFactory',
- ['create'],
- [],
- '',
- false
- );
- $methodInstance = $objectManagerHelper->getObject(
- 'Magento\OfflinePayments\Model\Checkmo',
- ['logAdapterFactory' => $adapterFactoryMock]
- );
+ $methodInstance = $objectManagerHelper->getObject('Magento\OfflinePayments\Model\Checkmo');
$paymentInfo->setMethodInstance($methodInstance);
$block->expects($this->atLeastOnce())->method('getPaymentInfo')->will($this->returnValue($paymentInfo));
diff --git a/dev/tests/unit/testsuite/Magento/Payment/Model/Method/FreeTest.php b/dev/tests/unit/testsuite/Magento/Payment/Model/Method/FreeTest.php
index e927fe780dac5e5af893b50cf29ff229555f4253..11571cbb2f964f64bfeec9f8bd26f89e1584ad24 100644
--- a/dev/tests/unit/testsuite/Magento/Payment/Model/Method/FreeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Payment/Model/Method/FreeTest.php
@@ -20,14 +20,14 @@ class FreeTest extends \PHPUnit_Framework_TestCase
$eventManager = $this->getMock('Magento\Framework\Event\ManagerInterface', [], [], '', false);
$paymentData = $this->getMock('Magento\Payment\Helper\Data', [], [], '', false);
$this->scopeConfig = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface', [], [], '', false);
- $logAdapterFactory = $this->getMock('Magento\Framework\Logger\AdapterFactory', [], [], '', false);
+ $logger = $this->getMock('Psr\Log\LoggerInterface');
$this->currencyPrice = $this->getMockBuilder('Magento\Framework\Pricing\PriceCurrencyInterface')->getMock();
$this->methodFree = new \Magento\Payment\Model\Method\Free(
$eventManager,
$paymentData,
$this->scopeConfig,
- $logAdapterFactory,
+ $logger,
$this->currencyPrice
);
}
diff --git a/dev/tests/unit/testsuite/Magento/Persistent/Block/Header/AdditionalTest.php b/dev/tests/unit/testsuite/Magento/Persistent/Block/Header/AdditionalTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..9237b9f7ff895f02c4394d41bbc7d0e0803b0d9d
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Persistent/Block/Header/AdditionalTest.php
@@ -0,0 +1,356 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+namespace Magento\Persistent\Block\Header;
+
+/**
+ * Class AdditionalTest
+ */
+class AdditionalTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\Customer\Helper\View|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $customerViewHelperMock;
+
+ /**
+ * @var \Magento\Persistent\Helper\Session|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $persistentSessionHelperMock;
+
+ /**
+ * Customer repository
+ *
+ * @var \Magento\Customer\Api\CustomerRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $customerRepositoryMock;
+
+ /**
+ * @var \Magento\Framework\View\Element\Template\Context|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $contextMock;
+
+ /**
+ * @var \Magento\Framework\Event\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $eventManagerMock;
+
+ /**
+ * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $scopeConfigMock;
+
+ /**
+ * @var \Magento\Framework\App\Cache\StateInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $cacheStateMock;
+
+ /**
+ * @var \Magento\Framework\App\CacheInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $cacheMock;
+
+ /**
+ * @var \Magento\Framework\Session\SidResolverInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $sidResolverMock;
+
+ /**
+ * @var \Magento\Framework\Session\SessionManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $sessionMock;
+
+ /**
+ * @var \Magento\Framework\Escaper|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $escaperMock;
+
+ /**
+ * @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $urlBuilderMock;
+
+ /**
+ * @var \Magento\Persistent\Block\Header\Additional
+ */
+ protected $additional;
+
+ /**
+ * @var \Magento\TestFramework\Helper\ObjectManager
+ */
+ protected $objectManager;
+
+ /**
+ * Set up
+ *
+ * @return void
+ */
+ protected function setUp()
+ {
+ $this->objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
+
+ $this->contextMock = $this->getMock(
+ 'Magento\Framework\View\Element\Template\Context',
+ [
+ 'getEventManager',
+ 'getScopeConfig',
+ 'getCacheState',
+ 'getCache',
+ 'getInlineTranslation',
+ 'getSidResolver',
+ 'getSession',
+ 'getEscaper',
+ 'getUrlBuilder'
+ ],
+ [],
+ '',
+ false
+ );
+ $this->customerViewHelperMock = $this->getMock(
+ 'Magento\Customer\Helper\View',
+ [],
+ [],
+ '',
+ false
+ );
+ $this->persistentSessionHelperMock = $this->getMock(
+ 'Magento\Persistent\Helper\Session',
+ ['getSession'],
+ [],
+ '',
+ false
+ );
+ $this->customerRepositoryMock = $this->getMockForAbstractClass(
+ 'Magento\Customer\Api\CustomerRepositoryInterface',
+ [],
+ '',
+ false,
+ true,
+ true,
+ ['getById']
+ );
+
+ $this->eventManagerMock = $this->getMockForAbstractClass(
+ 'Magento\Framework\Event\ManagerInterface',
+ [],
+ '',
+ false,
+ true,
+ true,
+ ['dispatch']
+ );
+ $this->scopeConfigMock = $this->getMockForAbstractClass(
+ 'Magento\Framework\App\Config\ScopeConfigInterface',
+ [],
+ '',
+ false,
+ true,
+ true,
+ ['getValue']
+ );
+ $this->cacheStateMock = $this->getMockForAbstractClass(
+ 'Magento\Framework\App\Cache\StateInterface',
+ [],
+ '',
+ false,
+ true,
+ true,
+ ['isEnabled']
+ );
+ $this->cacheMock = $this->getMockForAbstractClass(
+ 'Magento\Framework\App\CacheInterface',
+ [],
+ '',
+ false,
+ true,
+ true,
+ ['load']
+ );
+ $this->sidResolverMock = $this->getMockForAbstractClass(
+ 'Magento\Framework\Session\SidResolverInterface',
+ [],
+ '',
+ false,
+ true,
+ true,
+ ['getSessionIdQueryParam']
+ );
+ $this->sessionMock = $this->getMockForAbstractClass(
+ 'Magento\Framework\Session\SessionManagerInterface',
+ [],
+ '',
+ false,
+ true,
+ true,
+ ['getSessionId']
+ );
+ $this->escaperMock = $this->getMockForAbstractClass(
+ 'Magento\Framework\Escaper',
+ [],
+ '',
+ false,
+ true,
+ true,
+ ['escapeHtml']
+ );
+ $this->urlBuilderMock = $this->getMockForAbstractClass(
+ 'Magento\Framework\UrlInterface',
+ [],
+ '',
+ false,
+ true,
+ true,
+ ['getUrl']
+ );
+
+ $this->contextMock->expects($this->once())
+ ->method('getEventManager')
+ ->willReturn($this->eventManagerMock);
+ $this->contextMock->expects($this->once())
+ ->method('getScopeConfig')
+ ->willReturn($this->scopeConfigMock);
+ $this->contextMock->expects($this->once())
+ ->method('getCacheState')
+ ->willReturn($this->cacheStateMock);
+ $this->contextMock->expects($this->once())
+ ->method('getCache')
+ ->willReturn($this->cacheMock);
+ $this->contextMock->expects($this->once())
+ ->method('getSidResolver')
+ ->willReturn($this->sidResolverMock);
+ $this->contextMock->expects($this->once())
+ ->method('getSession')
+ ->willReturn($this->sessionMock);
+ $this->contextMock->expects($this->once())
+ ->method('getEscaper')
+ ->willReturn($this->escaperMock);
+ $this->contextMock->expects($this->once())
+ ->method('getUrlBuilder')
+ ->willReturn($this->urlBuilderMock);
+
+ $this->additional = $this->objectManager->getObject(
+ 'Magento\Persistent\Block\Header\Additional',
+ [
+ 'context' => $this->contextMock,
+ 'customerViewHelper' => $this->customerViewHelperMock,
+ 'persistentSessionHelper' => $this->persistentSessionHelperMock,
+ 'customerRepository' => $this->customerRepositoryMock,
+ 'data' => []
+ ]
+ );
+ }
+
+ /**
+ * Run test toHtml method
+ *
+ * @param bool $customerId
+ * @return void
+ *
+ * @dataProvider dataProviderToHtml
+ */
+ public function testToHtml($customerId)
+ {
+ $cacheData = false;
+ $idQueryParam = 'id-query-param';
+ $sessionId = 'session-id';
+ $customerName = 'customer-name';
+
+ $this->additional->setData('cache_lifetime', 789);
+ $this->additional->setData('cache_key', 'cache-key');
+
+ $this->eventManagerMock->expects($this->once())
+ ->method('dispatch')
+ ->with('view_block_abstract_to_html_before', ['block' => $this->additional]);
+ $this->scopeConfigMock->expects($this->once())
+ ->method('getValue')
+ ->with(
+ 'advanced/modules_disable_output/Magento_Persistent',
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ )->willReturn(false);
+
+ // get cache
+ $this->cacheStateMock->expects($this->at(0))
+ ->method('isEnabled')
+ ->with(\Magento\Persistent\Block\Header\Additional::CACHE_GROUP)
+ ->willReturn(true);
+ // save cache
+ $this->cacheStateMock->expects($this->at(1))
+ ->method('isEnabled')
+ ->with(\Magento\Persistent\Block\Header\Additional::CACHE_GROUP)
+ ->willReturn(false);
+
+ $this->cacheMock->expects($this->once())
+ ->method('load')
+ ->willReturn($cacheData);
+ $this->sidResolverMock->expects($this->never())
+ ->method('getSessionIdQueryParam')
+ ->with($this->sessionMock)
+ ->willReturn($idQueryParam);
+ $this->sessionMock->expects($this->never())
+ ->method('getSessionId')
+ ->willReturn($sessionId);
+
+ // call protected _toHtml method
+ $sessionMock = $this->getMock(
+ 'Magento\Persistent\Model\Session',
+ ['getCustomerId'],
+ [],
+ '',
+ false
+ );
+
+ $this->persistentSessionHelperMock->expects($this->atLeastOnce())
+ ->method('getSession')
+ ->willReturn($sessionMock);
+
+ $sessionMock->expects($this->atLeastOnce())
+ ->method('getCustomerId')
+ ->willReturn($customerId);
+
+ if ($customerId) {
+
+ $customerMock = $this->getMockForAbstractClass(
+ 'Magento\Customer\Api\Data\CustomerInterface',
+ [],
+ '',
+ false,
+ true,
+ true,
+ []
+ );
+
+ $this->customerRepositoryMock->expects($this->once())
+ ->method('getById')
+ ->with($customerId)
+ ->willReturn($customerMock);
+
+ $this->customerViewHelperMock->expects($this->once())
+ ->method('getCustomerName')
+ ->with($customerMock)
+ ->willReturn($customerName);
+
+ $this->escaperMock->expects($this->at(0))
+ ->method('escapeHtml')
+ ->with($customerName)
+ ->willReturn($customerName);
+
+ $this->assertEquals('<span><a >(Not customer-name?)</a></span>', $this->additional->toHtml());
+ } else {
+ $this->assertEquals('', $this->additional->toHtml());
+ }
+ }
+
+ /**
+ * Data provider for dataProviderToHtml method
+ *
+ * @return array
+ */
+ public function dataProviderToHtml()
+ {
+ return [
+ ['customerId' => 2],
+ ['customerId' => null],
+ ];
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Persistent/Model/Layout/DepersonalizePluginTest.php b/dev/tests/unit/testsuite/Magento/Persistent/Model/Layout/DepersonalizePluginTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..4e92b86b297d766ee1e177c0d5679bdc65cb4faf
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Persistent/Model/Layout/DepersonalizePluginTest.php
@@ -0,0 +1,163 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+namespace Magento\Persistent\Model\Layout;
+
+/**
+ * Class DepersonalizePluginTest
+ */
+class DepersonalizePluginTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\Persistent\Model\Session|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $persistentSessionMock;
+
+ /**
+ * @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $requestMock;
+
+ /**
+ * @var \Magento\Framework\Module\Manager|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $moduleManagerMock;
+
+ /**
+ * @var \Magento\PageCache\Model\Config|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $cacheConfigMock;
+
+ /**
+ * @var \Magento\TestFramework\Helper\ObjectManager
+ */
+ protected $objectManager;
+
+ /**
+ * @var \Magento\Persistent\Model\Layout\DepersonalizePlugin
+ */
+ protected $plugin;
+
+ /**
+ * Set up
+ *
+ * @return void
+ */
+ protected function setUp()
+ {
+ $this->objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
+
+ $this->persistentSessionMock = $this->getMock(
+ 'Magento\Persistent\Model\Session',
+ ['setCustomerId'],
+ [],
+ '',
+ false
+ );
+
+ $this->requestMock = $this->getMockForAbstractClass(
+ 'Magento\Framework\App\RequestInterface',
+ [],
+ '',
+ false,
+ true,
+ true,
+ ['isAjax']
+ );
+ $this->moduleManagerMock = $this->getMock(
+ 'Magento\Framework\Module\Manager',
+ ['isEnabled'],
+ [],
+ '',
+ false
+ );
+ $this->cacheConfigMock = $this->getMock(
+ 'Magento\PageCache\Model\Config',
+ ['isEnabled'],
+ [],
+ '',
+ false
+ );
+
+ $this->plugin = $this->objectManager->getObject(
+ 'Magento\Persistent\Model\Layout\DepersonalizePlugin',
+ [
+ 'persistentSession' => $this->persistentSessionMock,
+ 'request' => $this->requestMock,
+ 'moduleManager' => $this->moduleManagerMock,
+ 'cacheConfig' => $this->cacheConfigMock
+ ]
+ );
+ }
+
+ /**
+ * Run test afterGenerateXml method
+ *
+ * @param bool $result
+ *
+ * @dataProvider dataProviderAfterGenerateXml
+ */
+ public function testAfterGenerateXml($result)
+ {
+ /** @var \Magento\Framework\View\LayoutInterface|\PHPUnit_Framework_MockObject_MockObject $subjectMock */
+ $subjectMock = $this->getMockForAbstractClass(
+ 'Magento\Framework\View\LayoutInterface',
+ [],
+ '',
+ false,
+ true,
+ true,
+ ['isCacheable']
+ );
+ /** @var \Magento\Framework\View\LayoutInterface|\PHPUnit_Framework_MockObject_MockObject $resultMock */
+ $resultMock = $this->getMockForAbstractClass(
+ 'Magento\Framework\View\LayoutInterface',
+ [],
+ '',
+ false,
+ true,
+ true,
+ []
+ );
+
+ $this->moduleManagerMock->expects($this->once())
+ ->method('isEnabled')
+ ->with('Magento_PageCache')
+ ->willReturn($result);
+ $this->cacheConfigMock->expects($this->any())
+ ->method('isEnabled')
+ ->willReturn($result);
+ $this->requestMock->expects($this->any())
+ ->method('isAjax')
+ ->willReturn(!$result);
+ $subjectMock->expects($this->any())
+ ->method('isCacheable')
+ ->willReturn($result);
+
+ if ($result) {
+ $this->persistentSessionMock->expects($this->once())
+ ->method('setCustomerId')
+ ->with(null);
+ } else {
+ $this->persistentSessionMock->expects($this->never())
+ ->method('setCustomerId')
+ ->with(null);
+ }
+
+ $this->assertEquals($resultMock, $this->plugin->afterGenerateXml($subjectMock, $resultMock));
+ }
+
+ /**
+ * Data provider for testAfterGenerateXml
+ *
+ * @return array
+ */
+ public function dataProviderAfterGenerateXml()
+ {
+ return [
+ ['result' => true],
+ ['result' => false]
+ ];
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Reports/Model/Resource/Report/Collection/AbstractCollectionTest.php b/dev/tests/unit/testsuite/Magento/Reports/Model/Resource/Report/Collection/AbstractCollectionTest.php
index f8bfd4a06e5a67430e78ad550659d972f2bb850c..69d555efe558d71bd3027b9208f0c7ed3ff3ed43 100644
--- a/dev/tests/unit/testsuite/Magento/Reports/Model/Resource/Report/Collection/AbstractCollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Reports/Model/Resource/Report/Collection/AbstractCollectionTest.php
@@ -14,7 +14,7 @@ class AbstractCollectionTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$entityFactory = $this->getMock('\Magento\Core\Model\EntityFactory', [], [], '', false);
- $logger = $this->getMock('\Magento\Framework\Logger', [], [], '', false);
+ $logger = $this->getMock('\Psr\Log\LoggerInterface', [], [], '', false);
$fetchStrategy = $this->getMock('\Magento\Framework\Data\Collection\Db\FetchStrategy\Query', [], [], '', false);
$eventManager = $this->getMock('\Magento\Framework\Event\Manager', [], [], '', false);
$connection = $this->getMock('\Magento\Framework\DB\Adapter\Pdo\Mysql', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Review/Model/Resource/Review/Summary/CollectionTest.php b/dev/tests/unit/testsuite/Magento/Review/Model/Resource/Review/Summary/CollectionTest.php
index 57e071b3ce9539eb0e4928cf393c727e5880c939..2fc0f29b85572786adbc98bd1af47f07dc5196b9 100644
--- a/dev/tests/unit/testsuite/Magento/Review/Model/Resource/Review/Summary/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Review/Model/Resource/Review/Summary/CollectionTest.php
@@ -23,7 +23,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
protected $entityFactoryMock;
/**
- * @var \Magento\Framework\Logger|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $loggerMock;
@@ -58,7 +58,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
'',
false
);
- $this->loggerMock = $this->getMock('Magento\Framework\Logger', ['log'], [], '', false);
+ $this->loggerMock = $this->getMock('Psr\Log\LoggerInterface');
$this->resourceMock = $this->getMock(
'Magento\Framework\App\Resource',
[],
diff --git a/dev/tests/unit/testsuite/Magento/Rule/Model/Condition/AbstractConditionTest.php b/dev/tests/unit/testsuite/Magento/Rule/Model/Condition/AbstractConditionTest.php
index ba41ccae4d43eb879a598c7b938a958421f704ea..9d1f9f3ac6f0af6db46d7c80c0e1cdff08bc0231 100644
--- a/dev/tests/unit/testsuite/Magento/Rule/Model/Condition/AbstractConditionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Rule/Model/Condition/AbstractConditionTest.php
@@ -106,6 +106,48 @@ class AbstractConditionTest extends \PHPUnit_Framework_TestCase
);
}
+ /**
+ * @param $existingValue
+ * @param $operator
+ * @param $valueForValidate
+ * @param $expectedResult
+ *
+ * @dataProvider validateAttributeDataProvider
+ */
+ public function testValidate($existingValue, $operator, $valueForValidate, $expectedResult)
+ {
+ $objectMock = $this->getMock(
+ 'Magento\Framework\Model\AbstractModel',
+ ['hasData', 'load', 'getId', 'getData'],
+ [],
+ '',
+ false
+ );
+ $objectMock->expects($this->once())
+ ->method('hasData')
+ ->willReturn(false);
+ $objectMock->expects($this->once())
+ ->method('getId')
+ ->willReturn(7);
+ $objectMock->expects($this->once())
+ ->method('load')
+ ->with(7);
+ $objectMock->expects($this->once())
+ ->method('getData')
+ ->willReturn($valueForValidate);
+
+ $this->_condition->setOperator($operator);
+ $this->_condition->setData('value_parsed', $existingValue);
+ $this->assertEquals(
+ $expectedResult,
+ $this->_condition->validate($objectMock),
+ "Failed asserting that "
+ . var_export($existingValue, true)
+ . $operator
+ . var_export($valueForValidate, true)
+ );
+ }
+
public function validateAttributeArrayInputTypeDataProvider()
{
return [
diff --git a/dev/tests/unit/testsuite/Magento/Rule/Model/Condition/CombineTest.php b/dev/tests/unit/testsuite/Magento/Rule/Model/Condition/CombineTest.php
index f33ecb18752f46595fc1bf504a89568e921826d5..109f79c4b2298c07194f2012d9f0e86bfe6b506c 100644
--- a/dev/tests/unit/testsuite/Magento/Rule/Model/Condition/CombineTest.php
+++ b/dev/tests/unit/testsuite/Magento/Rule/Model/Condition/CombineTest.php
@@ -20,7 +20,7 @@ class CombineTest extends \PHPUnit_Framework_TestCase
private $conditionFactoryMock;
/**
- * @var \Magento\Framework\Logger | \PHPUnit_Framework_MockObject_MockObject
+ * @var \Psr\Log\LoggerInterface | \PHPUnit_Framework_MockObject_MockObject
*/
private $loggerMock;
@@ -40,7 +40,7 @@ class CombineTest extends \PHPUnit_Framework_TestCase
->setMethods([])
->getMock();
- $this->loggerMock = $this->getMockBuilder('\Magento\Framework\Logger')
+ $this->loggerMock = $this->getMockBuilder('\Psr\Log\LoggerInterface')
->disableOriginalConstructor()
->setMethods([])
->getMock();
@@ -111,7 +111,7 @@ class CombineTest extends \PHPUnit_Framework_TestCase
->willReturn($this->conditionObjectMock);
$this->loggerMock->expects($this->never())
- ->method('logException');
+ ->method('critical');
$result = $this->combine->loadArray($array);
@@ -138,7 +138,7 @@ class CombineTest extends \PHPUnit_Framework_TestCase
->willThrowException(new \Exception('everything is fine, it is test'));
$this->loggerMock->expects($this->once())
- ->method('logException')
+ ->method('critical')
->with();
$result = $this->combine->loadArray($array);
diff --git a/dev/tests/unit/testsuite/Magento/Rule/Model/Condition/Product/AbstractProductTest.php b/dev/tests/unit/testsuite/Magento/Rule/Model/Condition/Product/AbstractProductTest.php
index 97289d77f0598c92a3f42df1faf45b58e14b4e62..93ad5f6f97d44e8b5012a8df2c51edb88bfa1173 100644
--- a/dev/tests/unit/testsuite/Magento/Rule/Model/Condition/Product/AbstractProductTest.php
+++ b/dev/tests/unit/testsuite/Magento/Rule/Model/Condition/Product/AbstractProductTest.php
@@ -55,7 +55,7 @@ class AbstractProductTest extends \PHPUnit_Framework_TestCase
public function testValidateAttributeEqualCategoryId()
{
- $product = $this->getMock('\Magento\Framework\Object', ["getAttribute"], [], '', false);
+ $product = $this->getMock('Magento\Framework\Model\AbstractModel', ["getAttribute"], [], '', false);
$this->_condition->setAttribute('category_ids');
$product->setAvailableInCategories(new \Magento\Framework\Object());
$this->assertFalse($this->_condition->validate($product));
@@ -63,7 +63,16 @@ class AbstractProductTest extends \PHPUnit_Framework_TestCase
public function testValidateEmptyEntityAttributeValues()
{
- $product = $this->getMock('\Magento\Framework\Object', ["getAttribute"], [], '', false);
+ $product = $this->getMock(
+ 'Magento\Framework\Model\AbstractModel',
+ ["getAttribute", 'getResource'],
+ [],
+ '',
+ false
+ );
+ $product->expects($this->once())
+ ->method('getResource')
+ ->willReturn(null);
$product->setId(1);
$configProperty = new \ReflectionProperty(
'Magento\Rule\Model\Condition\Product\AbstractProduct',
@@ -76,7 +85,13 @@ class AbstractProductTest extends \PHPUnit_Framework_TestCase
public function testValidateEmptyEntityAttributeValuesWithResource()
{
- $product = $this->getMock('\Magento\Framework\Object', ["getAttribute"], [], '', false);
+ $product = $this->getMock(
+ 'Magento\Framework\Model\AbstractModel',
+ ["getAttribute", 'getResource'],
+ [],
+ '',
+ false
+ );
$product->setId(1);
$time = '04/19/2012 11:59 am';
$product->setData('someAttribute', $time);
@@ -103,8 +118,10 @@ class AbstractProductTest extends \PHPUnit_Framework_TestCase
->with('someAttribute')
->will($this->returnValue($attribute));
$newResource->_config = $this->getMock('Magento\Eav\Model\Config', [], [], '', false);
+ $product->expects($this->atLeastOnce())
+ ->method('getResource')
+ ->willReturn($newResource);
- $product->setResource($newResource);
$this->assertFalse($this->_condition->validate($product));
$product->setData('someAttribute', 'option1,option2,option3');
@@ -125,7 +142,13 @@ class AbstractProductTest extends \PHPUnit_Framework_TestCase
public function testValidateSetEntityAttributeValuesWithResource()
{
$this->_condition->setAttribute('someAttribute');
- $product = $this->getMock('\Magento\Framework\Object', ['getAttribute'], [], '', false);
+ $product = $this->getMock(
+ 'Magento\Framework\Model\AbstractModel',
+ ['getAttribute', 'getResource'],
+ [],
+ '',
+ false
+ );
$product->setAtribute('attribute');
$product->setId(12);
@@ -146,7 +169,9 @@ class AbstractProductTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue($attribute));
$newResource->_config = $this->getMock('Magento\Eav\Model\Config', [], [], '', false);
- $product->setResource($newResource);
+ $product->expects($this->atLeastOnce())
+ ->method('getResource')
+ ->willReturn($newResource);
$this->_entityAttributeValuesProperty->setValue(
$this->_condition,
@@ -161,7 +186,13 @@ class AbstractProductTest extends \PHPUnit_Framework_TestCase
public function testValidateSetEntityAttributeValuesWithoutResource()
{
- $product = $this->getMock('\Magento\Framework\Object', ['someMethod'], [], '', false);
+ $product = $this->getMock(
+ 'Magento\Framework\Model\AbstractModel',
+ ['someMethod', 'getResource', 'load'],
+ [],
+ '',
+ false
+ );
$this->_condition->setAttribute('someAttribute');
$product->setAtribute('attribute');
$product->setId(12);
@@ -198,7 +229,9 @@ class AbstractProductTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue($attribute));
$newResource->_config = $this->getMock('Magento\Eav\Model\Config', [], [], '', false);
- $product->setResource($newResource);
+ $product->expects($this->atLeastOnce())
+ ->method('getResource')
+ ->willReturn($newResource);
$this->_entityAttributeValuesProperty->setValue(
$this->_condition,
diff --git a/dev/tests/unit/testsuite/Magento/Rule/Model/Resource/Rule/Collection/AbstractCollectionTest.php b/dev/tests/unit/testsuite/Magento/Rule/Model/Resource/Rule/Collection/AbstractCollectionTest.php
index f6aafa74b4ea419791e4a8aeada4cf959de0e722..5b0448f6cc93328262cdcb076218f1c4e63b6a3c 100644
--- a/dev/tests/unit/testsuite/Magento/Rule/Model/Resource/Rule/Collection/AbstractCollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Rule/Model/Resource/Rule/Collection/AbstractCollectionTest.php
@@ -25,7 +25,7 @@ class AbstractCollectionTest extends \PHPUnit_Framework_TestCase
protected $_entityFactoryMock;
/**
- * @var \Magento\Framework\Logger|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $_loggerMock;
@@ -47,7 +47,7 @@ class AbstractCollectionTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$this->_entityFactoryMock = $this->getMock('Magento\Framework\Data\Collection\EntityFactoryInterface');
- $this->_loggerMock = $this->getMock('Magento\Framework\Logger', [], [], '', false);
+ $this->_loggerMock = $this->getMock('Psr\Log\LoggerInterface');
$this->_fetchStrategyMock = $this->getMock('Magento\Framework\Data\Collection\Db\FetchStrategyInterface');
$this->_managerMock = $this->getMock('Magento\Framework\Event\ManagerInterface');
$this->_db = $this->getMockForAbstractClass(
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/TotalsTest.php b/dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/TotalsTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..79deefa5c8c7908bc27408326e7911afff6ef7fe
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/TotalsTest.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+namespace Magento\Sales\Block\Adminhtml\Order\Create;
+
+use Magento\TestFramework\Helper\ObjectManager;
+
+/**
+ * Totals block test
+ */
+class TotalsTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\TestFramework\Helper\ObjectManager
+ */
+ protected $objectManager;
+
+ /**
+ * @var \Magento\Sales\Block\Adminhtml\Order\Create\Totals
+ */
+ protected $totals;
+
+ /**
+ * @var \Magento\Sales\Model\Quote|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $quoteMock;
+
+ /**
+ * @var \Magento\Backend\Model\Session\Quote|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $sessionQuoteMock;
+
+ protected function setUp()
+ {
+ $this->objectManager = new ObjectManager($this);
+
+ $this->quoteMock = $this->getMock(
+ '\Magento\Sales\Model\Quote', ['getCustomerNoteNotify'], [], '', false
+ );
+ $this->sessionQuoteMock = $this->getMock(
+ '\Magento\Backend\Model\Session\Quote', [], [], '', false
+ );
+
+ $this->sessionQuoteMock->expects($this->any())
+ ->method('getQuote')
+ ->willReturn($this->quoteMock);
+
+ $this->totals = $this->objectManager->getObject(
+ '\Magento\Sales\Block\Adminhtml\Order\Create\Totals',
+ [
+ 'sessionQuote' => $this->sessionQuoteMock
+ ]
+ );
+ }
+
+ /**
+ * @param mixed $customerNoteNotify
+ * @param bool $expectedResult
+ * @dataProvider getNoteNotifyDataProvider
+ */
+ public function testGetNoteNotify($customerNoteNotify, $expectedResult)
+ {
+ $this->quoteMock->expects($this->any())
+ ->method('getCustomerNoteNotify')
+ ->willReturn($customerNoteNotify);
+
+ $this->assertEquals($expectedResult, $this->totals->getNoteNotify());
+ }
+
+ /**
+ * @return array
+ */
+ public function getNoteNotifyDataProvider()
+ {
+ return [
+ [0, false],
+ [1, true],
+ ['0', false],
+ ['1', true],
+ [null, true]
+ ];
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Order/View/Tab/Stub/OnlineMethod.php b/dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Order/View/Tab/Stub/OnlineMethod.php
new file mode 100644
index 0000000000000000000000000000000000000000..28818895ef30c57dfce4c1b52c97890b5f5fc137
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Order/View/Tab/Stub/OnlineMethod.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+namespace Magento\Sales\Block\Adminhtml\Order\View\Tab\Stub;
+
+/**
+ * Stub for an online payment method
+ */
+class OnlineMethod extends \Magento\Payment\Model\Method\AbstractMethod
+{
+ /**
+ * Availability option
+ *
+ * @var bool
+ */
+ protected $_isOffline = false;
+}
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Order/View/Tab/TransactionsTest.php b/dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Order/View/Tab/TransactionsTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..f82ea8b4220103e75002921f7e153b19ced441cc
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Order/View/Tab/TransactionsTest.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+namespace Magento\Sales\Block\Adminhtml\Order\View\Tab;
+
+/**
+ * Order transactions tab test
+ */
+class TransactionsTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\TestFramework\Helper\ObjectManager
+ */
+ protected $objectManager;
+
+ /**
+ * @var \Magento\Sales\Block\Adminhtml\Order\View\Tab\Transactions
+ */
+ protected $transactionsTab;
+
+ /**
+ * @var \Magento\Framework\Authorization|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $authorizationMock;
+
+ /**
+ * @var \Magento\Framework\Registry|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $coreRegistryMock;
+
+ /**
+ * @var \Magento\Sales\Model\Order|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $orderMock;
+
+ /**
+ * @var \Magento\Sales\Model\Order\Payment|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $paymentMock;
+
+ protected function setUp()
+ {
+ $this->objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
+
+ $this->authorizationMock = $this->getMock('\Magento\Framework\Authorization', [], [], '', false);
+ $this->coreRegistryMock = $this->getMock('Magento\Framework\Registry', [], [], '', false);
+ $this->orderMock = $this->getMock('\Magento\Sales\Model\Order', [], [], '', false);
+ $this->paymentMock = $this->getMock('\Magento\Sales\Model\Order\Payment', [], [], '', false);
+
+ $this->coreRegistryMock->expects($this->any())
+ ->method('registry')
+ ->with('current_order')
+ ->willReturn($this->orderMock);
+
+ $this->orderMock->expects($this->any())
+ ->method('getPayment')
+ ->willReturn($this->paymentMock);
+
+ $this->transactionsTab = $this->objectManager->getObject(
+ 'Magento\Sales\Block\Adminhtml\Order\View\Tab\Transactions',
+ [
+ 'authorization' => $this->authorizationMock,
+ 'registry' => $this->coreRegistryMock
+ ]
+ );
+ }
+
+ public function testGetOrder()
+ {
+ $this->assertInstanceOf('\Magento\Sales\Model\Order', $this->transactionsTab->getOrder());
+ }
+
+ /**
+ * @param string $methodClass
+ * @param bool $expectedResult
+ * @depends testGetOrder
+ * @dataProvider canShowTabDataProvider
+ */
+ public function testCanShowTab($methodClass, $expectedResult)
+ {
+ $methodInstance = $this->objectManager->getObject($methodClass);
+ $this->paymentMock->expects($this->any())
+ ->method('getMethodInstance')
+ ->willReturn($methodInstance);
+
+ $this->assertEquals($expectedResult, $this->transactionsTab->canShowTab());
+ }
+
+ /**
+ * @return array
+ */
+ public function canShowTabDataProvider()
+ {
+ return [
+ ['\Magento\Sales\Block\Adminhtml\Order\View\Tab\Stub\OnlineMethod', true],
+ ['\Magento\OfflinePayments\Model\Cashondelivery', false],
+ ['\Magento\OfflinePayments\Model\Checkmo', false],
+ ['\Magento\OfflinePayments\Model\Banktransfer', false],
+ ['\Magento\OfflinePayments\Model\Purchaseorder', false]
+ ];
+ }
+
+ /**
+ * @param bool $isAllowed
+ * @param bool $expectedResult
+ * @dataProvider isHiddenDataProvider
+ */
+ public function testIsHidden($isAllowed, $expectedResult)
+ {
+ $this->authorizationMock->expects($this->any())
+ ->method('isAllowed')
+ ->with('Magento_Sales::transactions_fetch')
+ ->willReturn($isAllowed);
+
+ $this->assertEquals($expectedResult, $this->transactionsTab->isHidden());
+ }
+
+ /**
+ * @return array
+ */
+ public function isHiddenDataProvider()
+ {
+ return [
+ [true, false],
+ [false, true]
+ ];
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php
index 4594b959c67b0fb443bc8804ab1095985580733b..80a1d4554f53572aee23c41bd576bb1cd3f10dba 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php
@@ -83,7 +83,7 @@ class CreateTest extends \PHPUnit_Framework_TestCase
$registryMock = $this->getMock('Magento\Framework\Registry');
$configMock = $this->getMock('Magento\Sales\Model\Config', [], [], '', false);
$this->sessionQuoteMock = $this->getMock('Magento\Backend\Model\Session\Quote', [], [], '', false);
- $loggerMock = $this->getMock('Magento\Framework\Logger', [], [], '', false);
+ $loggerMock = $this->getMock('Psr\Log\LoggerInterface');
$copyMock = $this->getMock('Magento\Framework\Object\Copy', [], [], '', false);
$messageManagerMock = $this->getMock('Magento\Framework\Message\ManagerInterface');
$this->formFactoryMock = $this->getMock(
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/AdminOrder/EmailSenderTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/AdminOrder/EmailSenderTest.php
index b8003b302be29e50960cc195903ac142d7f37371..36eb38f6789a81f524ded30e60fdb52b1e254979 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/AdminOrder/EmailSenderTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/AdminOrder/EmailSenderTest.php
@@ -41,7 +41,7 @@ class EmailSenderTest extends \PHPUnit_Framework_TestCase
false
);
$this->loggerMock = $this->getMock(
- '\Magento\Framework\Logger',
+ '\Psr\Log\LoggerInterface',
[],
[],
'',
@@ -80,7 +80,7 @@ class EmailSenderTest extends \PHPUnit_Framework_TestCase
$this->messageManagerMock->expects($this->once())
->method('addWarning');
$this->loggerMock->expects($this->once())
- ->method('logException');
+ ->method('critical');
$this->assertFalse($this->emailSender->send($this->orderMock));
}
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/CreditmemoNotifierTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/CreditmemoNotifierTest.php
index 7eb45cfe80f8c5e9de67352f9036a3f3a8eb6f5d..02507357841a117db6297bf0ba77b7af85d41515 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/CreditmemoNotifierTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/CreditmemoNotifierTest.php
@@ -61,13 +61,7 @@ class CreditmemoNotifierTest extends \PHPUnit_Framework_TestCase
'',
false
);
- $this->loggerMock = $this->getMock(
- 'Magento\Framework\Logger',
- ['logException'],
- [],
- '',
- false
- );
+ $this->loggerMock = $this->getMock('Psr\Log\LoggerInterface');
$this->notifier = new CreditmemoNotifier(
$this->historyCollectionFactory,
$this->loggerMock,
@@ -139,7 +133,7 @@ class CreditmemoNotifierTest extends \PHPUnit_Framework_TestCase
->with($this->equalTo($this->creditmemo))
->will($this->throwException($exception));
$this->loggerMock->expects($this->once())
- ->method('logException')
+ ->method('critical')
->with($this->equalTo($exception));
$this->assertFalse($this->notifier->notify($this->creditmemo));
}
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/InvoiceNotifierTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/InvoiceNotifierTest.php
index b838e43bd80b02ca16d967be78b27c3429916e50..0c1e956462581c43b767ff3076c45aee590932fb 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/InvoiceNotifierTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/InvoiceNotifierTest.php
@@ -61,13 +61,7 @@ class InvoiceNotifierTest extends \PHPUnit_Framework_TestCase
'',
false
);
- $this->loggerMock = $this->getMock(
- 'Magento\Framework\Logger',
- ['logException'],
- [],
- '',
- false
- );
+ $this->loggerMock = $this->getMock('Psr\Log\LoggerInterface');
$this->notifier = new InvoiceNotifier(
$this->historyCollectionFactory,
$this->loggerMock,
@@ -139,7 +133,7 @@ class InvoiceNotifierTest extends \PHPUnit_Framework_TestCase
->with($this->equalTo($this->invoice))
->will($this->throwException($exception));
$this->loggerMock->expects($this->once())
- ->method('logException')
+ ->method('critical')
->with($this->equalTo($exception));
$this->assertFalse($this->notifier->notify($this->invoice));
}
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Total/Config/BaseTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Total/Config/BaseTest.php
index 9328efcab2f8c4badc0b8b68c5755a5b1f49df4e..2f75543c3981b7ee41770f2a302e4dd3316401e7 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Total/Config/BaseTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Total/Config/BaseTest.php
@@ -14,7 +14,7 @@ class BaseTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Framework\App\Cache\Type\Config|\PHPUnit_Framework_MockObject_MockObject */
protected $configCacheType;
- /** @var \Magento\Framework\Logger|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $logger;
/** @var \Magento\Sales\Model\Config|\PHPUnit_Framework_MockObject_MockObject */
@@ -26,7 +26,7 @@ class BaseTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$this->configCacheType = $this->getMock('Magento\Framework\App\Cache\Type\Config', [], [], '', false);
- $this->logger = $this->getMock('Magento\Framework\Logger', [], [], '', false);
+ $this->logger = $this->getMock('Psr\Log\LoggerInterface');
$this->salesConfig = $this->getMock('Magento\Sales\Model\Config', [], [], '', false);
$this->orderTotalFactory = $this->getMock('Magento\Sales\Model\Order\TotalFactory', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/OrderNotifierTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/OrderNotifierTest.php
index c915ea7ec5c556ac06d076fbca992b74b794c3cd..b9e83c91494593beda174d2b98b85f7d2b29d936 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/OrderNotifierTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/OrderNotifierTest.php
@@ -61,13 +61,7 @@ class OrderNotifierTest extends \PHPUnit_Framework_TestCase
'',
false
);
- $this->loggerMock = $this->getMock(
- 'Magento\Framework\Logger',
- ['logException'],
- [],
- '',
- false
- );
+ $this->loggerMock = $this->getMock('Psr\Log\LoggerInterface');
$this->notifier = new OrderNotifier(
$this->historyCollectionFactory,
$this->loggerMock,
@@ -139,7 +133,7 @@ class OrderNotifierTest extends \PHPUnit_Framework_TestCase
->with($this->equalTo($this->order))
->will($this->throwException($exception));
$this->loggerMock->expects($this->once())
- ->method('logException')
+ ->method('critical')
->with($this->equalTo($exception));
$this->assertFalse($this->notifier->notify($this->order));
}
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/OrderTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/OrderTest.php
index 17e91454fa8cdab23e95d7c8fc8f49d868e3a814..6af26f5a8165ff5d41b2ca92cd10dbe50ee0ae12 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/OrderTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/OrderTest.php
@@ -4,6 +4,8 @@
*/
namespace Magento\Sales\Model;
+use Magento\Sales\Model\Resource\Order\Status\History\CollectionFactory as HistoryCollectionFactory;
+
/**
* Test class for \Magento\Sales\Model\Order
*/
@@ -39,6 +41,11 @@ class OrderTest extends \PHPUnit_Framework_TestCase
*/
protected $item;
+ /**
+ * @var HistoryCollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $historyCollectionFactoryMock;
+
protected function setUp()
{
$helper = new \Magento\TestFramework\Helper\ObjectManager($this);
@@ -56,6 +63,13 @@ class OrderTest extends \PHPUnit_Framework_TestCase
'',
false
);
+ $this->historyCollectionFactoryMock = $this->getMock(
+ 'Magento\Sales\Model\Resource\Order\Status\History\CollectionFactory',
+ ['create'],
+ [],
+ '',
+ false
+ );
$this->item = $this->getMock(
'Magento\Sales\Model\Resource\Order\Item',
['isDeleted', 'getQtyToInvoice', 'getParentItemId', 'getQuoteItemId'],
@@ -87,7 +101,8 @@ class OrderTest extends \PHPUnit_Framework_TestCase
'paymentCollectionFactory' => $this->paymentCollectionFactoryMock,
'orderItemCollectionFactory' => $this->orderItemCollectionFactoryMock,
'data' => ['increment_id' => $this->incrementId],
- 'context' => $context
+ 'context' => $context,
+ 'historyCollectionFactory' => $this->historyCollectionFactoryMock
]
);
}
@@ -484,4 +499,70 @@ class OrderTest extends \PHPUnit_Framework_TestCase
{
$this->assertEquals('order', $this->order->getEntityType());
}
+
+ /**
+ * Run test getStatusHistories method
+ *
+ * @return void
+ */
+ public function testGetStatusHistories()
+ {
+ $itemMock = $this->getMockForAbstractClass(
+ 'Magento\Sales\Api\Data\OrderStatusHistoryInterface',
+ [],
+ '',
+ false,
+ true,
+ true,
+ ['setOrder']
+ );
+ $dbMock = $this->getMock(
+ 'Magento\Framework\Data\Collection\Db',
+ ['setOrder'],
+ [],
+ '',
+ false
+ );
+ $collectionMock = $this->getMock(
+ 'Magento\Sales\Model\Resource\Order\Status\History\Collection',
+ [
+ 'setOrderFilter',
+ 'setOrder',
+ 'getItems',
+ 'getIterator',
+ 'toOptionArray',
+ 'count',
+ 'load'
+ ],
+ [],
+ '',
+ false
+ );
+
+ $collectionItems = [$itemMock];
+
+ $collectionMock->expects($this->once())
+ ->method('setOrderFilter')
+ ->with($this->order)
+ ->willReturnSelf();
+ $collectionMock->expects($this->once())
+ ->method('setOrder')
+ ->with('created_at', 'desc')
+ ->willReturn($dbMock);
+ $dbMock->expects($this->once())
+ ->method('setOrder')
+ ->with('entity_id', 'desc')
+ ->willReturn($collectionMock);
+ $collectionMock->expects($this->once())
+ ->method('getItems')
+ ->willReturn($collectionItems);
+
+ $this->historyCollectionFactoryMock->expects($this->once())
+ ->method('create')
+ ->willReturn($collectionMock);
+
+ for ($i = 10; --$i;) {
+ $this->assertEquals($collectionItems, $this->order->getStatusHistories());
+ }
+ }
}
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Resource/Order/Status/History/CollectionTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Resource/Order/Status/History/CollectionTest.php
index 7d76ae4ca3bec025d59ad18f01c33c17b1fd06fb..27daafea1a9712cad1d458d26be64d821f14b484 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Resource/Order/Status/History/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Resource/Order/Status/History/CollectionTest.php
@@ -97,7 +97,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
->method('create')
->will($this->returnValue($this->historyItemMock));
- $logger = $this->getMock('Magento\Framework\Logger', [], [], '', false);
+ $logger = $this->getMock('Psr\Log\LoggerInterface');
$this->collection = new \Magento\Sales\Model\Resource\Order\Status\History\Collection(
$this->entityFactoryMock,
$logger,
diff --git a/dev/tests/unit/testsuite/Magento/SalesRule/Model/Resource/Report/CollectionTest.php b/dev/tests/unit/testsuite/Magento/SalesRule/Model/Resource/Report/CollectionTest.php
index bd0aa76837deb4a8e014cb7a91d0fd315d01e192..25e0312732b58c975e2ddcad37914e1cd2a3c582 100644
--- a/dev/tests/unit/testsuite/Magento/SalesRule/Model/Resource/Report/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/SalesRule/Model/Resource/Report/CollectionTest.php
@@ -61,13 +61,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
false
);
- $this->loggerMock = $this->getMock(
- 'Magento\Framework\Logger',
- [],
- [],
- '',
- false
- );
+ $this->loggerMock = $this->getMock('Psr\Log\LoggerInterface');
$this->fetchStrategy = $this->getMock(
'Magento\Framework\Data\Collection\Db\FetchStrategyInterface',
diff --git a/dev/tests/unit/testsuite/Magento/SalesRule/Model/RulesApplierTest.php b/dev/tests/unit/testsuite/Magento/SalesRule/Model/RulesApplierTest.php
index bc875f4835b177b4cd8f2ce1e657c20c3fdd703e..200e619dbfcbed2678ce3ae894a762c019289a84 100644
--- a/dev/tests/unit/testsuite/Magento/SalesRule/Model/RulesApplierTest.php
+++ b/dev/tests/unit/testsuite/Magento/SalesRule/Model/RulesApplierTest.php
@@ -58,10 +58,16 @@ class RulesApplierTest extends \PHPUnit_Framework_TestCase
);
}
- public function testApplyRulesWhenRuleWithStopRulesProcessingIsUsed()
+ /**
+ * @param bool $isChildren
+ * @param bool $isContinue
+ *
+ * @dataProvider dataProviderChildren
+ */
+ public function testApplyRulesWhenRuleWithStopRulesProcessingIsUsed($isChildren, $isContinue)
{
$positivePrice = 1;
- $skipValidation = true;
+ $skipValidation = false;
$item = $this->getPreparedItem();
$couponCode = 111;
@@ -73,7 +79,7 @@ class RulesApplierTest extends \PHPUnit_Framework_TestCase
*/
$ruleWithStopFurtherProcessing = $this->getMock(
'Magento\SalesRule\Model\Rule',
- ['getStoreLabel', 'getCouponType', 'getRuleId', '__wakeup'],
+ ['getStoreLabel', 'getCouponType', 'getRuleId', '__wakeup', 'getActions'],
[],
'',
false
@@ -87,6 +93,14 @@ class RulesApplierTest extends \PHPUnit_Framework_TestCase
false
);
+ $actionMock = $this->getMock(
+ 'Magento\Rule\Model\Action\Collection',
+ ['validate'],
+ [],
+ '',
+ false
+ );
+
$ruleWithStopFurtherProcessing->setName('ruleWithStopFurtherProcessing');
$ruleThatShouldNotBeRun->setName('ruleThatShouldNotBeRun');
$rules = [$ruleWithStopFurtherProcessing, $ruleThatShouldNotBeRun];
@@ -96,20 +110,52 @@ class RulesApplierTest extends \PHPUnit_Framework_TestCase
$this->validatorUtility->expects($this->atLeastOnce())
->method('canProcessRule')
- ->will(
- $this->returnValue(true)
- );
- $ruleWithStopFurtherProcessing->expects($this->any())
- ->method('getRuleId')
- ->will($this->returnValue($ruleId));
- $this->applyRule($item, $ruleWithStopFurtherProcessing);
- $ruleWithStopFurtherProcessing->setStopRulesProcessing(true);
- $ruleThatShouldNotBeRun->expects($this->never())
- ->method('getStopRulesProcessing');
+ ->will($this->returnValue(true));
+
+ $ruleWithStopFurtherProcessing->expects($this->atLeastOnce())
+ ->method('getActions')
+ ->willReturn($actionMock);
+ $actionMock->expects($this->at(0))
+ ->method('validate')
+ ->with($item)
+ ->willReturn(!$isChildren);
+
+ // if there are child elements, check them
+ if ($isChildren) {
+ $item->expects($this->atLeastOnce())
+ ->method('getChildren')
+ ->willReturn([$item]);
+ $actionMock->expects($this->at(1))
+ ->method('validate')
+ ->with($item)
+ ->willReturn(!$isContinue);
+ }
+
+ //
+ if (!$isContinue || !$isChildren) {
+ $ruleWithStopFurtherProcessing->expects($this->any())
+ ->method('getRuleId')
+ ->will($this->returnValue($ruleId));
+
+ $this->applyRule($item, $ruleWithStopFurtherProcessing);
+
+ $ruleWithStopFurtherProcessing->setStopRulesProcessing(true);
+ $ruleThatShouldNotBeRun->expects($this->never())
+ ->method('getStopRulesProcessing');
+ }
+
$result = $this->rulesApplier->applyRules($item, $rules, $skipValidation, $couponCode);
$this->assertEquals($appliedRuleIds, $result);
}
+ public function dataProviderChildren()
+ {
+ return [
+ ['isChildren' => true, 'isContinue' => false],
+ ['isChildren' => false, 'isContinue' => true],
+ ];
+ }
+
/**
* @return \Magento\Sales\Model\Quote\Item\AbstractItem|\PHPUnit_Framework_MockObject_MockObject
*/
@@ -137,7 +183,8 @@ class RulesApplierTest extends \PHPUnit_Framework_TestCase
'setDiscountPercent',
'getAddress',
'setAppliedRuleIds',
- '__wakeup'
+ '__wakeup',
+ 'getChildren'
],
[],
'',
diff --git a/dev/tests/unit/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/CreateLabelTest.php b/dev/tests/unit/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/CreateLabelTest.php
index 4f137b020f68a80d62a967ad41f6c50ac7f4097c..3f95683d565f335e7bf90081728663ee8a7d67d2 100644
--- a/dev/tests/unit/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/CreateLabelTest.php
+++ b/dev/tests/unit/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/CreateLabelTest.php
@@ -199,13 +199,7 @@ class CreateLabelTest extends \PHPUnit_Framework_TestCase
*/
public function testExecuteSaveException()
{
- $logerMock = $this->getMock(
- 'Magento\Framework\Logger',
- ['logException', '__wakeup'],
- [],
- '',
- false
- );
+ $logerMock = $this->getMock('Psr\Log\LoggerInterface');
$this->shipmentLoaderMock->expects($this->once())
->method('load')
@@ -215,10 +209,10 @@ class CreateLabelTest extends \PHPUnit_Framework_TestCase
->with($this->shipmentMock, $this->requestMock)
->will($this->returnValue(true));
$this->shipmentMock->expects($this->once())->method('save')->will($this->throwException(new \Exception()));
- $logerMock->expects($this->once())->method('logException');
+ $logerMock->expects($this->once())->method('critical');
$this->objectManagerMock->expects($this->once())
->method('get')
- ->with('Magento\Framework\Logger')
+ ->with('Psr\Log\LoggerInterface')
->will($this->returnValue($logerMock));
$this->responseMock->expects($this->once())->method('representJson');
diff --git a/dev/tests/unit/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/PrintLabelTest.php b/dev/tests/unit/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/PrintLabelTest.php
index 87df1bed2da2b3cfc51b1d625ec3bd7ccb2a2303..441744207973257fdcb5a1e90c2d042ecea689b8 100644
--- a/dev/tests/unit/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/PrintLabelTest.php
+++ b/dev/tests/unit/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/PrintLabelTest.php
@@ -301,13 +301,7 @@ class PrintLabelTest extends \PHPUnit_Framework_TestCase
$labelContent = 'Label-content';
$incrementId = '1000001';
- $loggerMock = $this->getMock(
- 'Magento\Framework\Logger',
- ['logException'],
- [],
- '',
- false
- );
+ $loggerMock = $this->getMock('Psr\Log\LoggerInterface');
$this->shipmentLoaderMock->expects($this->once())
->method('load')
@@ -332,10 +326,10 @@ class PrintLabelTest extends \PHPUnit_Framework_TestCase
->will($this->returnSelf());
$this->objectManagerMock->expects($this->once())
->method('get')
- ->with('Magento\Framework\Logger')
+ ->with('Psr\Log\LoggerInterface')
->will($this->returnValue($loggerMock));
$loggerMock->expects($this->once())
- ->method('logException');
+ ->method('critical');
$this->requestMock->expects($this->at(4))
->method('getParam')
->with('shipment_id')
diff --git a/dev/tests/unit/testsuite/Magento/Shipping/Model/ShipmentNotifierTest.php b/dev/tests/unit/testsuite/Magento/Shipping/Model/ShipmentNotifierTest.php
index c37df83ef1992681e3b3c152835b797ea75608b2..647d012cb2e424886120a521d45534d2c1f35f9b 100644
--- a/dev/tests/unit/testsuite/Magento/Shipping/Model/ShipmentNotifierTest.php
+++ b/dev/tests/unit/testsuite/Magento/Shipping/Model/ShipmentNotifierTest.php
@@ -61,13 +61,7 @@ class ShipmentNotifierTest extends \PHPUnit_Framework_TestCase
'',
false
);
- $this->loggerMock = $this->getMock(
- 'Magento\Framework\Logger',
- ['logException'],
- [],
- '',
- false
- );
+ $this->loggerMock = $this->getMock('Psr\Log\LoggerInterface');
$this->notifier = new ShipmentNotifier(
$this->historyCollectionFactory,
$this->loggerMock,
@@ -139,7 +133,7 @@ class ShipmentNotifierTest extends \PHPUnit_Framework_TestCase
->with($this->equalTo($this->shipment))
->will($this->throwException($exception));
$this->loggerMock->expects($this->once())
- ->method('logException')
+ ->method('critical')
->with($this->equalTo($exception));
$this->assertFalse($this->notifier->notify($this->shipment));
}
diff --git a/dev/tests/unit/testsuite/Magento/Store/Model/StorageFactoryTest.php b/dev/tests/unit/testsuite/Magento/Store/Model/StorageFactoryTest.php
index 40baf58ed1c8151caf9ec7e4777df69111b34b2e..ea82acf99e2a3bd683226af3df1de6a2f7619602 100644
--- a/dev/tests/unit/testsuite/Magento/Store/Model/StorageFactoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/Model/StorageFactoryTest.php
@@ -119,7 +119,6 @@ class StorageFactoryTest extends \PHPUnit_Framework_TestCase
'',
false
);
- $this->_logMock = $this->getMock('Magento\Framework\Logger', [], [], '', false);
$this->_sidResolverMock = $this->getMock(
'\Magento\Framework\Session\SidResolverInterface',
[],
@@ -138,7 +137,6 @@ class StorageFactoryTest extends \PHPUnit_Framework_TestCase
$this->_model = $this->helper->getObject('\Magento\Store\Model\StorageFactory', [
'objectManager' => $this->_objectManagerMock,
'eventManager' => $this->_eventManagerMock,
- 'logger' => $this->_logMock,
'sidResolver' => $this->_sidResolverMock,
'appState' => $this->_appStateMock,
'httpContext' => $this->_httpContext,
@@ -183,7 +181,7 @@ class StorageFactoryTest extends \PHPUnit_Framework_TestCase
{
$store = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
- $this->_storeManager->expects($this->exactly(3))->method('getStore')->will($this->returnValue($store));
+ $this->_storeManager->expects($this->exactly(2))->method('getStore')->will($this->returnValue($store));
$this->_scopeConfig->expects(
$this->at(0)
@@ -196,17 +194,6 @@ class StorageFactoryTest extends \PHPUnit_Framework_TestCase
$this->returnValue(true)
);
- $this->_scopeConfig->expects(
- $this->at(1)
- )->method(
- 'isSetFlag'
- )->with(
- 'dev/log/active',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
- )->will(
- $this->returnValue(true)
- );
-
$this->_objectManagerMock->expects(
$this->once()
)->method(
@@ -225,8 +212,6 @@ class StorageFactoryTest extends \PHPUnit_Framework_TestCase
'core_app_init_current_store_after'
);
- $this->_logMock->expects($this->once())->method('unsetLoggers');
- $this->_logMock->expects($this->exactly(2))->method('addStreamLog');
$this->_sidResolverMock->expects($this->once())->method('setUseSessionInUrl')->with(true);
@@ -255,7 +240,6 @@ class StorageFactoryTest extends \PHPUnit_Framework_TestCase
);
$this->_eventManagerMock->expects($this->never())->method('dispatch');
- $this->_logMock->expects($this->never())->method('initForStore');
$this->_sidResolverMock->expects($this->never())->method('setUseSessionInUrl');
/** test create instance */
diff --git a/dev/tests/unit/testsuite/Magento/Tax/Model/TaxClass/Source/CustomerTest.php b/dev/tests/unit/testsuite/Magento/Tax/Model/TaxClass/Source/CustomerTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..2787e1c44c582e7280ca89617c703b9bd351bbfe
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Tax/Model/TaxClass/Source/CustomerTest.php
@@ -0,0 +1,183 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+namespace Magento\Tax\Model\TaxClass\Source;
+
+use Magento\TestFramework\Helper\ObjectManager;
+
+class CustomerTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\Tax\Api\TaxClassRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $taxClassRepositoryMock;
+
+ /**
+ * @var \Magento\Framework\Api\SearchCriteriaBuilder|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $searchCriteriaBuilderMock;
+
+ /**
+ * @var \Magento\Framework\Api\FilterBuilder|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $filterBuilderMock;
+
+ /**
+ * @var \Magento\Tax\Model\TaxClass\Source\Customer
+ */
+ protected $customer;
+
+ /**
+ * @var ObjectManager
+ */
+ protected $objectManager;
+
+ /**
+ * Set up
+ *
+ * @return void
+ */
+ protected function setUp()
+ {
+ $this->objectManager = new ObjectManager($this);
+
+ $this->taxClassRepositoryMock = $this->getMockForAbstractClass(
+ 'Magento\Tax\Api\TaxClassRepositoryInterface',
+ ['getList'],
+ '',
+ false,
+ true,
+ true,
+ []
+ );
+ $this->searchCriteriaBuilderMock = $this->getMock(
+ 'Magento\Framework\Api\SearchCriteriaBuilder',
+ ['addFilter', 'create'],
+ [],
+ '',
+ false
+ );
+ $this->filterBuilderMock = $this->getMock(
+ 'Magento\Framework\Api\FilterBuilder',
+ ['setField', 'setValue', 'create'],
+ [],
+ '',
+ false
+ );
+
+ $this->customer = $this->objectManager->getObject(
+ 'Magento\Tax\Model\TaxClass\Source\Customer',
+ [
+ 'taxClassRepository' => $this->taxClassRepositoryMock,
+ 'searchCriteriaBuilder' => $this->searchCriteriaBuilderMock,
+ 'filterBuilder' => $this->filterBuilderMock
+ ]
+ );
+ }
+
+ /**
+ * Run test getAllOptions method
+ *
+ * @param bool $isEmpty
+ * @param array $expected
+ * @dataProvider dataProviderGetAllOptions
+ */
+ public function testGetAllOptions($isEmpty, array $expected)
+ {
+ $filterMock = $this->getMock(
+ 'Magento\Framework\Api\Filter',
+ [],
+ [],
+ '',
+ false
+ );
+ $searchCriteriaMock = $this->getMock(
+ 'Magento\Framework\Api\SearchCriteria',
+ [],
+ [],
+ '',
+ false
+ );
+ $searchResultsMock = $this->getMockForAbstractClass(
+ 'Magento\Tax\Api\Data\TaxClassSearchResultsInterface',
+ [],
+ '',
+ false,
+ true,
+ true,
+ ['getItems']
+ );
+ $taxClassMock = $this->getMockForAbstractClass(
+ 'Magento\Tax\Api\Data\TaxClassInterface',
+ ['getClassId', 'getClassName'],
+ '',
+ false,
+ true,
+ true
+ );
+
+ $this->filterBuilderMock->expects($this->once())
+ ->method('setField')
+ ->with(\Magento\Tax\Api\Data\TaxClassInterface::KEY_TYPE)
+ ->willReturnSelf();
+ $this->filterBuilderMock->expects($this->once())
+ ->method('setValue')
+ ->with(\Magento\Tax\Api\TaxClassManagementInterface::TYPE_CUSTOMER)
+ ->willReturnSelf();
+ $this->filterBuilderMock->expects($this->once())
+ ->method('create')
+ ->willReturn($filterMock);
+ $this->searchCriteriaBuilderMock->expects($this->once())
+ ->method('addFilter')
+ ->with([$filterMock])
+ ->willReturnSelf();
+ $this->searchCriteriaBuilderMock->expects($this->once())
+ ->method('create')
+ ->willReturn($searchCriteriaMock);
+ $this->taxClassRepositoryMock->expects($this->once())
+ ->method('getList')
+ ->with($searchCriteriaMock)
+ ->willReturn($searchResultsMock);
+
+ if (!$isEmpty) {
+ $taxClassMock->expects($this->once())
+ ->method('getClassId')
+ ->willReturn(10);
+ $taxClassMock->expects($this->once())
+ ->method('getClassName')
+ ->willReturn('class-name');
+
+ $items = [$taxClassMock];
+ $searchResultsMock->expects($this->once())
+ ->method('getItems')
+ ->willReturn($items);
+
+ // checking of a lack of re-initialization
+ for ($i = 10; --$i;) {
+ $result = $this->customer->getAllOptions();
+ $this->assertEquals($expected, $result);
+ }
+ } else {
+ $items = [];
+ $searchResultsMock->expects($this->once())
+ ->method('getItems')
+ ->willReturn($items);
+ // checking exception
+ $this->assertEmpty($this->customer->getAllOptions());
+ }
+ }
+
+ /**
+ * Data provider for testGetAllOptions
+ *
+ * @return array
+ */
+ public function dataProviderGetAllOptions()
+ {
+ return [
+ ['isEmpty' => false, 'expected' => [['value' => 10, 'label' => 'class-name']]],
+ ['isEmpty' => true, 'expected' => []]
+ ];
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Theme/Controller/Adminhtml/System/Design/Theme/IndexTest.php b/dev/tests/unit/testsuite/Magento/Theme/Controller/Adminhtml/System/Design/Theme/IndexTest.php
index 22b22e760544a397b4cd8117a28f209c8f117e43..bc70b77601ccc832cd892d5be404ed2555bd6748 100644
--- a/dev/tests/unit/testsuite/Magento/Theme/Controller/Adminhtml/System/Design/Theme/IndexTest.php
+++ b/dev/tests/unit/testsuite/Magento/Theme/Controller/Adminhtml/System/Design/Theme/IndexTest.php
@@ -17,7 +17,7 @@ class IndexTest extends \Magento\Theme\Controller\Adminhtml\System\Design\ThemeT
$menuModel = $this->getMock(
'Magento\Backend\Model\Menu',
[],
- [$this->getMock('Magento\Framework\Logger', [], [], '', false)]
+ [$this->getMock('Psr\Log\LoggerInterface')]
);
$menuModel->expects($this->once())
->method('getParentItems')
diff --git a/dev/tests/unit/testsuite/Magento/Tools/View/Deployer/LogTest.php b/dev/tests/unit/testsuite/Magento/Tools/View/Deployer/LogTest.php
index 46eecc68c7c9fb9e54cfd3c2e8ff9dc2a5829e2b..d5f0549c391342cdfd76185def6bf87740481751 100644
--- a/dev/tests/unit/testsuite/Magento/Tools/View/Deployer/LogTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tools/View/Deployer/LogTest.php
@@ -5,8 +5,6 @@
namespace Magento\Tools\View\Deployer;
-use Magento\Tools\View\Deployer\Log;
-
class LogTest extends \PHPUnit_Framework_TestCase
{
/**
diff --git a/dev/tests/unit/testsuite/Magento/Webapi/Controller/ErrorProcessorTest.php b/dev/tests/unit/testsuite/Magento/Webapi/Controller/ErrorProcessorTest.php
index 1411c2fc83efcdb39bb6c5f8b21994172d2d7c9f..58cd77c941e18c2def855fc7b064e466935edd05 100644
--- a/dev/tests/unit/testsuite/Magento/Webapi/Controller/ErrorProcessorTest.php
+++ b/dev/tests/unit/testsuite/Magento/Webapi/Controller/ErrorProcessorTest.php
@@ -21,7 +21,7 @@ class ErrorProcessorTest extends \PHPUnit_Framework_TestCase
/** @var \PHPUnit_Framework_MockObject_MockObject */
protected $_appStateMock;
- /** @var \Magento\Framework\Logger */
+ /** @var \Psr\Log\LoggerInterface */
protected $_loggerMock;
protected function setUp()
@@ -35,7 +35,7 @@ class ErrorProcessorTest extends \PHPUnit_Framework_TestCase
->disableOriginalConstructor()
->getMock();
- $this->_loggerMock = $this->getMockBuilder('Magento\Framework\Logger')->disableOriginalConstructor()->getMock();
+ $this->_loggerMock = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
$filesystemMock = $this->getMockBuilder('\Magento\Framework\Filesystem')
->disableOriginalConstructor()
@@ -198,7 +198,7 @@ class ErrorProcessorTest extends \PHPUnit_Framework_TestCase
public function testMaskException($exception, $expectedHttpCode, $expectedMessage, $expectedDetails)
{
/** Assert that exception was logged. */
- // TODO:MAGETWO-21077 $this->_loggerMock->expects($this->once())->method('logException');
+ // TODO:MAGETWO-21077 $this->_loggerMock->expects($this->once())->method('critical');
$maskedException = $this->_errorProcessor->maskException($exception);
$this->assertMaskedException(
$maskedException,
diff --git a/dev/tests/unit/testsuite/Magento/Wishlist/Controller/Index/CartTest.php b/dev/tests/unit/testsuite/Magento/Wishlist/Controller/Index/CartTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..9fdcf260c8079805717df3610eb25a8fe4d0f91b
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Wishlist/Controller/Index/CartTest.php
@@ -0,0 +1,797 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Wishlist\Controller\Index;
+
+class CartTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var Cart
+ */
+ protected $model;
+
+ /**
+ * @var \Magento\Framework\App\Action\Context|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $contextMock;
+
+ /**
+ * @var \Magento\Wishlist\Controller\WishlistProviderInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $wishlistProviderMock;
+
+ /**
+ * @var \Magento\Wishlist\Model\LocaleQuantityProcessor|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $quantityProcessorMock;
+
+ /**
+ * @var \Magento\Wishlist\Model\ItemFactory|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $itemFactoryMock;
+
+ /**
+ * @var \Magento\Checkout\Model\Cart|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $checkoutCartMock;
+
+ /**
+ * @var \Magento\Wishlist\Model\Item\OptionFactory|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $optionFactoryMock;
+
+ /**
+ * @var \Magento\Catalog\Helper\Product|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $productHelperMock;
+
+ /**
+ * @var \Magento\Framework\Escaper|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $escaperMock;
+
+ /**
+ * @var \Magento\Wishlist\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $helperMock;
+
+ /**
+ * @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $requestMock;
+
+ /**
+ * @var \Magento\Framework\App\ResponseInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $responseMock;
+
+ /**
+ * @var \Magento\Framework\App\Response\RedirectInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $redirectMock;
+
+ /**
+ * @var \Magento\Framework\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $objectManagerMock;
+
+ /**
+ * @var \Magento\Framework\Message\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $messageManagerMock;
+
+ /**
+ * @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $urlMock;
+
+ protected function setUp()
+ {
+ $this->wishlistProviderMock = $this->getMockBuilder('Magento\Wishlist\Controller\WishlistProviderInterface')
+ ->disableOriginalConstructor()
+ ->setMethods(['getWishlist'])
+ ->getMockForAbstractClass();
+
+ $this->quantityProcessorMock = $this->getMockBuilder('Magento\Wishlist\Model\LocaleQuantityProcessor')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->itemFactoryMock = $this->getMockBuilder('Magento\Wishlist\Model\ItemFactory')
+ ->disableOriginalConstructor()
+ ->setMethods(['create'])
+ ->getMock();
+
+ $this->checkoutCartMock = $this->getMockBuilder('Magento\Checkout\Model\Cart')
+ ->disableOriginalConstructor()
+ ->setMethods(['save', 'getQuote', 'getShouldRedirectToCart', 'getCartUrl'])
+ ->getMock();
+
+ $this->optionFactoryMock = $this->getMockBuilder('Magento\Wishlist\Model\Item\OptionFactory')
+ ->disableOriginalConstructor()
+ ->setMethods(['create'])
+ ->getMock();
+
+ $this->productHelperMock = $this->getMockBuilder('Magento\Catalog\Helper\Product')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->escaperMock = $this->getMockBuilder('Magento\Framework\Escaper')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->helperMock = $this->getMockBuilder('Magento\Wishlist\Helper\Data')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->requestMock = $this->getMockBuilder('Magento\Framework\App\RequestInterface')
+ ->disableOriginalConstructor()
+ ->setMethods(['getParams', 'getParam'])
+ ->getMockForAbstractClass();
+
+ $this->responseMock = $this->getMockBuilder('Magento\Framework\App\ResponseInterface')
+ ->disableOriginalConstructor()
+ ->setMethods(['setRedirect'])
+ ->getMockForAbstractClass();
+
+ $this->redirectMock = $this->getMockBuilder('Magento\Framework\App\Response\RedirectInterface')
+ ->disableOriginalConstructor()
+ ->getMockForAbstractClass();
+
+ $this->objectManagerMock = $this->getMockBuilder('Magento\Framework\ObjectManagerInterface')
+ ->disableOriginalConstructor()
+ ->getMockForAbstractClass();
+
+ $this->messageManagerMock = $this->getMockBuilder('Magento\Framework\Message\ManagerInterface')
+ ->disableOriginalConstructor()
+ ->setMethods(['addSuccess'])
+ ->getMockForAbstractClass();
+
+ $this->urlMock = $this->getMockBuilder('Magento\Framework\UrlInterface')
+ ->disableOriginalConstructor()
+ ->setMethods(['getUrl'])
+ ->getMockForAbstractClass();
+
+ $this->contextMock = $this->getMockBuilder('Magento\Framework\App\Action\Context')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->contextMock->expects($this->any())
+ ->method('getRequest')
+ ->will($this->returnValue($this->requestMock));
+ $this->contextMock->expects($this->any())
+ ->method('getResponse')
+ ->will($this->returnValue($this->responseMock));
+ $this->contextMock->expects($this->any())
+ ->method('getRedirect')
+ ->will($this->returnValue($this->redirectMock));
+ $this->contextMock->expects($this->any())
+ ->method('getObjectManager')
+ ->will($this->returnValue($this->objectManagerMock));
+ $this->contextMock->expects($this->any())
+ ->method('getMessageManager')
+ ->will($this->returnValue($this->messageManagerMock));
+ $this->contextMock->expects($this->any())
+ ->method('getUrl')
+ ->will($this->returnValue($this->urlMock));
+
+ $this->model = new Cart(
+ $this->contextMock,
+ $this->wishlistProviderMock,
+ $this->quantityProcessorMock,
+ $this->itemFactoryMock,
+ $this->checkoutCartMock,
+ $this->optionFactoryMock,
+ $this->productHelperMock,
+ $this->escaperMock,
+ $this->helperMock
+ );
+ }
+
+ public function testExecuteWithNoItem()
+ {
+ $itemId = false;
+
+ $itemMock = $this->getMockBuilder('Magento\Wishlist\Model\Item')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->requestMock->expects($this->once())
+ ->method('getParam')
+ ->with('item', null)
+ ->willReturn($itemId);
+ $this->itemFactoryMock->expects($this->once())
+ ->method('create')
+ ->willReturn($itemMock);
+
+ $itemMock->expects($this->once())
+ ->method('load')
+ ->with($itemId, null)
+ ->willReturnSelf();
+ $itemMock->expects($this->once())
+ ->method('getId')
+ ->willReturn(null);
+
+ $this->redirectMock->expects($this->once())
+ ->method('redirect')
+ ->with($this->responseMock, '*/*', [])
+ ->willReturn($this->responseMock);
+
+ $this->assertEquals($this->responseMock, $this->model->execute());
+ }
+
+ public function testExecuteWithNoWishlist()
+ {
+ $itemId = 2;
+ $wishlistId = 1;
+
+ $itemMock = $this->getMockBuilder('Magento\Wishlist\Model\Item')
+ ->disableOriginalConstructor()
+ ->setMethods(['load', 'getId', 'getWishlistId'])
+ ->getMock();
+
+ $this->requestMock->expects($this->once())
+ ->method('getParam')
+ ->with('item', null)
+ ->willReturn($itemId);
+ $this->itemFactoryMock->expects($this->once())
+ ->method('create')
+ ->willReturn($itemMock);
+
+ $itemMock->expects($this->once())
+ ->method('load')
+ ->with($itemId, null)
+ ->willReturnSelf();
+ $itemMock->expects($this->once())
+ ->method('getId')
+ ->willReturn($itemId);
+ $itemMock->expects($this->once())
+ ->method('getWishlistId')
+ ->willReturn($wishlistId);
+
+ $this->wishlistProviderMock->expects($this->once())
+ ->method('getWishlist')
+ ->with($wishlistId)
+ ->willReturn(null);
+
+ $this->redirectMock->expects($this->once())
+ ->method('redirect')
+ ->with($this->responseMock, '*/*', [])
+ ->willReturn($this->responseMock);
+
+ $this->assertEquals($this->responseMock, $this->model->execute());
+ }
+
+ public function testExecuteWithQuantityArray()
+ {
+ $itemId = 2;
+ $wishlistId = 1;
+ $qty = [$itemId => 3];
+ $productId = 4;
+ $productName = 'product_name';
+ $indexUrl = 'index_url';
+ $configureUrl = 'configure_url';
+ $options = [5 => 'option'];
+ $params = ['item' => $itemId, 'qty' => $qty];
+ $refererUrl = 'referer_url';
+
+ $itemMock = $this->getMockBuilder('Magento\Wishlist\Model\Item')
+ ->disableOriginalConstructor()
+ ->setMethods(
+ [
+ 'load',
+ 'getId',
+ 'getWishlistId',
+ 'setQty',
+ 'setOptions',
+ 'getBuyRequest',
+ 'mergeBuyRequest',
+ 'addToCart',
+ 'getProduct',
+ 'getProductId',
+ ]
+ )
+ ->getMock();
+
+ $this->requestMock->expects($this->at(0))
+ ->method('getParam')
+ ->with('item', null)
+ ->willReturn($itemId);
+ $this->itemFactoryMock->expects($this->once())
+ ->method('create')
+ ->willReturn($itemMock);
+
+ $itemMock->expects($this->once())
+ ->method('load')
+ ->with($itemId, null)
+ ->willReturnSelf();
+ $itemMock->expects($this->exactly(2))
+ ->method('getId')
+ ->willReturn($itemId);
+ $itemMock->expects($this->once())
+ ->method('getWishlistId')
+ ->willReturn($wishlistId);
+
+ $wishlistMock = $this->getMockBuilder('Magento\Wishlist\Model\Wishlist')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->wishlistProviderMock->expects($this->once())
+ ->method('getWishlist')
+ ->with($wishlistId)
+ ->willReturn($wishlistMock);
+
+ $this->requestMock->expects($this->at(1))
+ ->method('getParam')
+ ->with('qty', null)
+ ->willReturn($qty);
+
+ $this->quantityProcessorMock->expects($this->once())
+ ->method('process')
+ ->with($qty[$itemId])
+ ->willReturnArgument(0);
+
+ $itemMock->expects($this->once())
+ ->method('setQty')
+ ->with($qty[$itemId])
+ ->willReturnSelf();
+
+ $this->urlMock->expects($this->at(0))
+ ->method('getUrl')
+ ->with('*/*', null)
+ ->willReturn($indexUrl);
+
+ $itemMock->expects($this->once())
+ ->method('getProductId')
+ ->willReturn($productId);
+
+ $this->urlMock->expects($this->at(1))
+ ->method('getUrl')
+ ->with('*/*/configure/', ['id' => $itemId, 'product_id' => $productId])
+ ->willReturn($configureUrl);
+
+ $optionMock = $this->getMockBuilder('Magento\Wishlist\Model\Item\Option')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->optionFactoryMock->expects($this->once())
+ ->method('create')
+ ->willReturn($optionMock);
+
+ $optionsMock = $this->getMockBuilder('Magento\Wishlist\Model\Resource\Item\Option\Collection')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $optionMock->expects($this->once())
+ ->method('getCollection')
+ ->willReturn($optionsMock);
+
+ $optionsMock->expects($this->once())
+ ->method('addItemFilter')
+ ->with([$itemId])
+ ->willReturnSelf();
+ $optionsMock->expects($this->once())
+ ->method('getOptionsByItem')
+ ->with($itemId)
+ ->willReturn($options);
+
+ $itemMock->expects($this->once())
+ ->method('setOptions')
+ ->with($options)
+ ->willReturnSelf();
+
+ $this->requestMock->expects($this->once())
+ ->method('getParams')
+ ->willReturn($params);
+
+ $buyRequestMock = $this->getMockBuilder('Magento\Framework\Object')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $itemMock->expects($this->once())
+ ->method('getBuyRequest')
+ ->willReturn($buyRequestMock);
+
+ $this->productHelperMock->expects($this->once())
+ ->method('addParamsToBuyRequest')
+ ->with($params, ['current_config' => $buyRequestMock])
+ ->willReturn($buyRequestMock);
+
+ $itemMock->expects($this->once())
+ ->method('mergeBuyRequest')
+ ->with($buyRequestMock)
+ ->willReturnSelf();
+ $itemMock->expects($this->once())
+ ->method('addToCart')
+ ->with($this->checkoutCartMock, true)
+ ->willReturn(true);
+
+ $this->checkoutCartMock->expects($this->once())
+ ->method('save')
+ ->willReturnSelf();
+
+ $quoteMock = $this->getMockBuilder('Magento\Sales\Model\Quote')
+ ->disableOriginalConstructor()
+ ->setMethods(['getHasError', 'collectTotals'])
+ ->getMock();
+
+ $this->checkoutCartMock->expects($this->exactly(2))
+ ->method('getQuote')
+ ->willReturn($quoteMock);
+
+ $quoteMock->expects($this->once())
+ ->method('collectTotals')
+ ->willReturnSelf();
+
+ $wishlistMock->expects($this->once())
+ ->method('save')
+ ->willReturnSelf();
+
+ $quoteMock->expects($this->once())
+ ->method('getHasError')
+ ->willReturn(false);
+
+ $productMock = $this->getMockBuilder('Magento\Catalog\Model\Product')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $itemMock->expects($this->once())
+ ->method('getProduct')
+ ->willReturn($productMock);
+
+ $productMock->expects($this->once())
+ ->method('getName')
+ ->willReturn($productName);
+
+ $this->escaperMock->expects($this->once())
+ ->method('escapeHtml')
+ ->with($productName, null)
+ ->willReturn($productName);
+
+ $this->messageManagerMock->expects($this->once())
+ ->method('addSuccess')
+ ->with('You added ' . $productName . ' to your shopping cart.', null)
+ ->willReturnSelf();
+
+ $this->checkoutCartMock->expects($this->once())
+ ->method('getShouldRedirectToCart')
+ ->willReturn(false);
+
+ $this->redirectMock->expects($this->once())
+ ->method('getRefererUrl')
+ ->willReturn($refererUrl);
+
+ $this->helperMock->expects($this->once())
+ ->method('calculate')
+ ->willReturnSelf();
+
+ $this->responseMock->expects($this->once())
+ ->method('setRedirect')
+ ->with($refererUrl)
+ ->willReturn($this->responseMock);
+
+ $this->assertEquals($this->responseMock, $this->model->execute());
+ }
+
+ public function testExecuteWithoutQuantityArrayAndOutOfStock()
+ {
+ $itemId = 2;
+ $wishlistId = 1;
+ $qty = [];
+ $productId = 4;
+ $indexUrl = 'index_url';
+ $configureUrl = 'configure_url';
+ $options = [5 => 'option'];
+ $params = ['item' => $itemId, 'qty' => $qty];
+
+ $itemMock = $this->getMockBuilder('Magento\Wishlist\Model\Item')
+ ->disableOriginalConstructor()
+ ->setMethods(
+ [
+ 'load',
+ 'getId',
+ 'getWishlistId',
+ 'setQty',
+ 'setOptions',
+ 'getBuyRequest',
+ 'mergeBuyRequest',
+ 'addToCart',
+ 'getProduct',
+ 'getProductId',
+ ]
+ )
+ ->getMock();
+
+ $this->requestMock->expects($this->at(0))
+ ->method('getParam')
+ ->with('item', null)
+ ->willReturn($itemId);
+ $this->itemFactoryMock->expects($this->once())
+ ->method('create')
+ ->willReturn($itemMock);
+
+ $itemMock->expects($this->once())
+ ->method('load')
+ ->with($itemId, null)
+ ->willReturnSelf();
+ $itemMock->expects($this->exactly(2))
+ ->method('getId')
+ ->willReturn($itemId);
+ $itemMock->expects($this->once())
+ ->method('getWishlistId')
+ ->willReturn($wishlistId);
+
+ $wishlistMock = $this->getMockBuilder('Magento\Wishlist\Model\Wishlist')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->wishlistProviderMock->expects($this->once())
+ ->method('getWishlist')
+ ->with($wishlistId)
+ ->willReturn($wishlistMock);
+
+ $this->requestMock->expects($this->at(1))
+ ->method('getParam')
+ ->with('qty', null)
+ ->willReturn($qty);
+
+ $this->quantityProcessorMock->expects($this->once())
+ ->method('process')
+ ->with(1)
+ ->willReturnArgument(0);
+
+ $itemMock->expects($this->once())
+ ->method('setQty')
+ ->with(1)
+ ->willReturnSelf();
+
+ $this->urlMock->expects($this->at(0))
+ ->method('getUrl')
+ ->with('*/*', null)
+ ->willReturn($indexUrl);
+
+ $itemMock->expects($this->once())
+ ->method('getProductId')
+ ->willReturn($productId);
+
+ $this->urlMock->expects($this->at(1))
+ ->method('getUrl')
+ ->with('*/*/configure/', ['id' => $itemId, 'product_id' => $productId])
+ ->willReturn($configureUrl);
+
+ $optionMock = $this->getMockBuilder('Magento\Wishlist\Model\Item\Option')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->optionFactoryMock->expects($this->once())
+ ->method('create')
+ ->willReturn($optionMock);
+
+ $optionsMock = $this->getMockBuilder('Magento\Wishlist\Model\Resource\Item\Option\Collection')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $optionMock->expects($this->once())
+ ->method('getCollection')
+ ->willReturn($optionsMock);
+
+ $optionsMock->expects($this->once())
+ ->method('addItemFilter')
+ ->with([$itemId])
+ ->willReturnSelf();
+ $optionsMock->expects($this->once())
+ ->method('getOptionsByItem')
+ ->with($itemId)
+ ->willReturn($options);
+
+ $itemMock->expects($this->once())
+ ->method('setOptions')
+ ->with($options)
+ ->willReturnSelf();
+
+ $this->requestMock->expects($this->once())
+ ->method('getParams')
+ ->willReturn($params);
+
+ $buyRequestMock = $this->getMockBuilder('Magento\Framework\Object')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $itemMock->expects($this->once())
+ ->method('getBuyRequest')
+ ->willReturn($buyRequestMock);
+
+ $this->productHelperMock->expects($this->once())
+ ->method('addParamsToBuyRequest')
+ ->with($params, ['current_config' => $buyRequestMock])
+ ->willReturn($buyRequestMock);
+
+ $itemMock->expects($this->once())
+ ->method('mergeBuyRequest')
+ ->with($buyRequestMock)
+ ->willReturnSelf();
+ $itemMock->expects($this->once())
+ ->method('addToCart')
+ ->with($this->checkoutCartMock, true)
+ ->willThrowException(
+ new \Magento\Framework\Model\Exception(null, \Magento\Wishlist\Model\Item::EXCEPTION_CODE_NOT_SALABLE)
+ );
+
+ $this->messageManagerMock->expects($this->once())
+ ->method('addError')
+ ->with('This product(s) is out of stock.', null)
+ ->willReturnSelf();
+
+ $this->helperMock->expects($this->once())
+ ->method('calculate')
+ ->willReturnSelf();
+
+ $this->responseMock->expects($this->once())
+ ->method('setRedirect')
+ ->with($indexUrl)
+ ->willReturn($this->responseMock);
+
+ $this->assertEquals($this->responseMock, $this->model->execute());
+ }
+
+ public function testExecuteWithoutQuantityArrayAndConfigurable()
+ {
+ $itemId = 2;
+ $wishlistId = 1;
+ $qty = [];
+ $productId = 4;
+ $indexUrl = 'index_url';
+ $configureUrl = 'configure_url';
+ $options = [5 => 'option'];
+ $params = ['item' => $itemId, 'qty' => $qty];
+
+ $itemMock = $this->getMockBuilder('Magento\Wishlist\Model\Item')
+ ->disableOriginalConstructor()
+ ->setMethods(
+ [
+ 'load',
+ 'getId',
+ 'getWishlistId',
+ 'setQty',
+ 'setOptions',
+ 'getBuyRequest',
+ 'mergeBuyRequest',
+ 'addToCart',
+ 'getProduct',
+ 'getProductId',
+ ]
+ )
+ ->getMock();
+
+ $this->requestMock->expects($this->at(0))
+ ->method('getParam')
+ ->with('item', null)
+ ->willReturn($itemId);
+ $this->itemFactoryMock->expects($this->once())
+ ->method('create')
+ ->willReturn($itemMock);
+
+ $itemMock->expects($this->once())
+ ->method('load')
+ ->with($itemId, null)
+ ->willReturnSelf();
+ $itemMock->expects($this->exactly(2))
+ ->method('getId')
+ ->willReturn($itemId);
+ $itemMock->expects($this->once())
+ ->method('getWishlistId')
+ ->willReturn($wishlistId);
+
+ $wishlistMock = $this->getMockBuilder('Magento\Wishlist\Model\Wishlist')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->wishlistProviderMock->expects($this->once())
+ ->method('getWishlist')
+ ->with($wishlistId)
+ ->willReturn($wishlistMock);
+
+ $this->requestMock->expects($this->at(1))
+ ->method('getParam')
+ ->with('qty', null)
+ ->willReturn($qty);
+
+ $this->quantityProcessorMock->expects($this->once())
+ ->method('process')
+ ->with(1)
+ ->willReturnArgument(0);
+
+ $itemMock->expects($this->once())
+ ->method('setQty')
+ ->with(1)
+ ->willReturnSelf();
+
+ $this->urlMock->expects($this->at(0))
+ ->method('getUrl')
+ ->with('*/*', null)
+ ->willReturn($indexUrl);
+
+ $itemMock->expects($this->once())
+ ->method('getProductId')
+ ->willReturn($productId);
+
+ $this->urlMock->expects($this->at(1))
+ ->method('getUrl')
+ ->with('*/*/configure/', ['id' => $itemId, 'product_id' => $productId])
+ ->willReturn($configureUrl);
+
+ $optionMock = $this->getMockBuilder('Magento\Wishlist\Model\Item\Option')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->optionFactoryMock->expects($this->once())
+ ->method('create')
+ ->willReturn($optionMock);
+
+ $optionsMock = $this->getMockBuilder('Magento\Wishlist\Model\Resource\Item\Option\Collection')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $optionMock->expects($this->once())
+ ->method('getCollection')
+ ->willReturn($optionsMock);
+
+ $optionsMock->expects($this->once())
+ ->method('addItemFilter')
+ ->with([$itemId])
+ ->willReturnSelf();
+ $optionsMock->expects($this->once())
+ ->method('getOptionsByItem')
+ ->with($itemId)
+ ->willReturn($options);
+
+ $itemMock->expects($this->once())
+ ->method('setOptions')
+ ->with($options)
+ ->willReturnSelf();
+
+ $this->requestMock->expects($this->once())
+ ->method('getParams')
+ ->willReturn($params);
+
+ $buyRequestMock = $this->getMockBuilder('Magento\Framework\Object')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $itemMock->expects($this->once())
+ ->method('getBuyRequest')
+ ->willReturn($buyRequestMock);
+
+ $this->productHelperMock->expects($this->once())
+ ->method('addParamsToBuyRequest')
+ ->with($params, ['current_config' => $buyRequestMock])
+ ->willReturn($buyRequestMock);
+
+ $itemMock->expects($this->once())
+ ->method('mergeBuyRequest')
+ ->with($buyRequestMock)
+ ->willReturnSelf();
+ $itemMock->expects($this->once())
+ ->method('addToCart')
+ ->with($this->checkoutCartMock, true)
+ ->willThrowException(
+ new \Magento\Framework\Model\Exception(
+ 'message',
+ \Magento\Wishlist\Model\Item::EXCEPTION_CODE_HAS_REQUIRED_OPTIONS
+ )
+ );
+
+ $this->messageManagerMock->expects($this->once())
+ ->method('addNotice')
+ ->with('message', null)
+ ->willReturnSelf();
+
+ $this->helperMock->expects($this->once())
+ ->method('calculate')
+ ->willReturnSelf();
+
+ $this->responseMock->expects($this->once())
+ ->method('setRedirect')
+ ->with($configureUrl)
+ ->willReturn($this->responseMock);
+
+ $this->assertEquals($this->responseMock, $this->model->execute());
+ }
+}
diff --git a/lib/internal/Magento/Framework/App/Area.php b/lib/internal/Magento/Framework/App/Area.php
index f37822b1b231b8b43e3b6c3b67b683f886df8c2d..0cef58d915916088422c2cd04a7fa4c526f70f7c 100644
--- a/lib/internal/Magento/Framework/App/Area.php
+++ b/lib/internal/Magento/Framework/App/Area.php
@@ -62,7 +62,7 @@ class Area implements \Magento\Framework\App\AreaInterface
protected $_diConfigLoader;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $_logger;
@@ -84,7 +84,7 @@ class Area implements \Magento\Framework\App\AreaInterface
protected $_designExceptions;
/**
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Framework\TranslateInterface $translator
* @param \Magento\Framework\ObjectManagerInterface $objectManager
@@ -95,7 +95,7 @@ class Area implements \Magento\Framework\App\AreaInterface
* @param string $areaCode
*/
public function __construct(
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Framework\TranslateInterface $translator,
\Magento\Framework\ObjectManagerInterface $objectManager,
@@ -167,7 +167,7 @@ class Area implements \Magento\Framework\App\AreaInterface
return true;
}
} catch (\Exception $e) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
}
return false;
}
diff --git a/lib/internal/Magento/Framework/App/Bootstrap.php b/lib/internal/Magento/Framework/App/Bootstrap.php
index e271ecb31206e4263528b7954b736cd258f34bff..c3808f5764af646b696c0ab44c3c81abe2b86c7a 100644
--- a/lib/internal/Magento/Framework/App/Bootstrap.php
+++ b/lib/internal/Magento/Framework/App/Bootstrap.php
@@ -410,7 +410,7 @@ class Bootstrap
if (!$this->objectManager) {
throw new \DomainException();
}
- $this->objectManager->get('Magento\Framework\Logger')->logException($e);
+ $this->objectManager->get('Psr\Log\LoggerInterface')->critical($e);
} catch (\Exception $e) {
$message .= "Could not write error message to log. Please use developer mode to see the message.\n";
}
diff --git a/lib/internal/Magento/Framework/App/Helper/AbstractHelper.php b/lib/internal/Magento/Framework/App/Helper/AbstractHelper.php
index 9eace9044d1676d5a9b14d68f41a3da3389a57ee..175cb85b531febfdb61082798d867d66b7b59fe5 100644
--- a/lib/internal/Magento/Framework/App/Helper/AbstractHelper.php
+++ b/lib/internal/Magento/Framework/App/Helper/AbstractHelper.php
@@ -36,7 +36,7 @@ abstract class AbstractHelper
protected $_moduleManager;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $_logger;
diff --git a/lib/internal/Magento/Framework/App/Helper/Context.php b/lib/internal/Magento/Framework/App/Helper/Context.php
index 48cebe198961b820ed0c7b8f13fdc5f94e33a058..49ae5dd5be2c802952fa1aaf1dee646ffeef7804 100644
--- a/lib/internal/Magento/Framework/App/Helper/Context.php
+++ b/lib/internal/Magento/Framework/App/Helper/Context.php
@@ -24,7 +24,7 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
protected $_eventManager;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $_logger;
@@ -66,7 +66,7 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
/**
* @param \Magento\Framework\Url\EncoderInterface $urlEncoder
* @param \Magento\Framework\Url\DecoderInterface $urlDecoder
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Translate\InlineInterface $translateInline
* @param \Magento\Framework\Module\Manager $moduleManager
* @param \Magento\Framework\App\RequestInterface $httpRequest
@@ -81,7 +81,7 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
public function __construct(
\Magento\Framework\Url\EncoderInterface $urlEncoder,
\Magento\Framework\Url\DecoderInterface $urlDecoder,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Translate\InlineInterface $translateInline,
\Magento\Framework\Module\Manager $moduleManager,
\Magento\Framework\App\RequestInterface $httpRequest,
@@ -153,7 +153,7 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
}
/**
- * @return \Magento\Framework\Logger
+ * @return \Psr\Log\LoggerInterface
*/
public function getLogger()
{
diff --git a/lib/internal/Magento/Framework/DB/AbstractMapper.php b/lib/internal/Magento/Framework/DB/AbstractMapper.php
index d6cac55a45e27193fa0cf6c73e10b77155576c14..cde379716e23fdeb612e1decac3abfd93b76312e 100644
--- a/lib/internal/Magento/Framework/DB/AbstractMapper.php
+++ b/lib/internal/Magento/Framework/DB/AbstractMapper.php
@@ -8,7 +8,7 @@ use Magento\Framework\Api\CriteriaInterface;
use Magento\Framework\Data\Collection\Db\FetchStrategyInterface;
use Magento\Framework\Data\ObjectFactory;
use Magento\Framework\DB\Adapter\AdapterInterface;
-use Magento\Framework\Logger;
+use Psr\Log\LoggerInterface as Logger;
use Magento\Framework\Object;
/**
diff --git a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
index 6f5b30cc40c7d96a5059ce095cff06bac983b2f7..b63ca6b8f22ee55bd15b87f1e63afd1033f124dd 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
@@ -444,7 +444,7 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
if (!$retry) {
$this->logger->logStats(LoggerInterface::TYPE_QUERY, $sql, $bind);
- $this->logger->logException($e);
+ $this->logger->critical($e);
throw $e;
}
}
diff --git a/lib/internal/Magento/Framework/DB/Logger/File.php b/lib/internal/Magento/Framework/DB/Logger/File.php
index 70ac5f4064a0a5f0a37c5b604b0f7054a2900d0c..f658077b3768543e68efffed9d2d512c7690d9d1 100644
--- a/lib/internal/Magento/Framework/DB/Logger/File.php
+++ b/lib/internal/Magento/Framework/DB/Logger/File.php
@@ -72,7 +72,7 @@ class File extends LoggerAbstract
/**
* {@inheritdoc}
*/
- public function logException(\Exception $e)
+ public function critical(\Exception $e)
{
$this->log("EXCEPTION \n$e\n\n");
}
diff --git a/lib/internal/Magento/Framework/DB/Logger/Null.php b/lib/internal/Magento/Framework/DB/Logger/Null.php
index 7b7dfbb1a791d1d32f35f8018e0cf458ae25ce22..8aafe5118ca3cecdfd7051ce6fa2aa79a5da6aaa 100644
--- a/lib/internal/Magento/Framework/DB/Logger/Null.php
+++ b/lib/internal/Magento/Framework/DB/Logger/Null.php
@@ -23,7 +23,7 @@ class Null implements \Magento\Framework\DB\LoggerInterface
/**
* {@inheritdoc}
*/
- public function logException(\Exception $e)
+ public function critical(\Exception $e)
{
}
diff --git a/lib/internal/Magento/Framework/DB/LoggerInterface.php b/lib/internal/Magento/Framework/DB/LoggerInterface.php
index e937704ac26f61fde5634d68993a6b185c83e8fa..28b39bc1342241ef3cd24fb5cf7223061a69ce10 100644
--- a/lib/internal/Magento/Framework/DB/LoggerInterface.php
+++ b/lib/internal/Magento/Framework/DB/LoggerInterface.php
@@ -43,5 +43,5 @@ interface LoggerInterface
* @param \Exception $e
* @return void
*/
- public function logException(\Exception $e);
+ public function critical(\Exception $e);
}
diff --git a/lib/internal/Magento/Framework/DB/Query.php b/lib/internal/Magento/Framework/DB/Query.php
index 39ef80941e14d0171d45eb1b410ce3e3bbee6d38..15e6575326c2ad8e51de4fb2f47f12dc598b222f 100644
--- a/lib/internal/Magento/Framework/DB/Query.php
+++ b/lib/internal/Magento/Framework/DB/Query.php
@@ -4,7 +4,7 @@
*/
namespace Magento\Framework\DB;
-use Magento\Framework\Logger;
+use Psr\Log\LoggerInterface as Logger;
/**
* Class Query
diff --git a/lib/internal/Magento/Framework/Data/AbstractSearchCriteriaBuilder.php b/lib/internal/Magento/Framework/Data/AbstractSearchCriteriaBuilder.php
index c7571d72e895783158b1d88ce2368881bc3968f7..6845e5edd8fd41bf02eca6291742b06288d4ff86 100644
--- a/lib/internal/Magento/Framework/Data/AbstractSearchCriteriaBuilder.php
+++ b/lib/internal/Magento/Framework/Data/AbstractSearchCriteriaBuilder.php
@@ -4,7 +4,7 @@
*/
namespace Magento\Framework\Data;
-use Magento\Framework\Logger;
+use Psr\Log\LoggerInterface as Logger;
/**
* Class AbstractSearchCriteriaBuilder
diff --git a/lib/internal/Magento/Framework/Data/Collection/Db.php b/lib/internal/Magento/Framework/Data/Collection/Db.php
index 2d756703476d974731f6c182602a83aac55c728a..a3d0b641186d68a815f88646344fa40e87a14224 100644
--- a/lib/internal/Magento/Framework/Data/Collection/Db.php
+++ b/lib/internal/Magento/Framework/Data/Collection/Db.php
@@ -7,7 +7,7 @@ namespace Magento\Framework\Data\Collection;
use Magento\Framework\Data\Collection\Db\FetchStrategyInterface;
use Magento\Framework\DB\Adapter\AdapterInterface;
use Magento\Framework\DB\Select;
-use Magento\Framework\Logger;
+use Psr\Log\LoggerInterface as Logger;
/**
* Base items collection class
@@ -709,7 +709,7 @@ class Db extends \Magento\Framework\Data\Collection
*/
protected function _logQuery($sql)
{
- $this->_logger->log(is_null($sql) ? $this->getSelect()->__toString() : $sql);
+ $this->_logger->info(is_null($sql) ? $this->getSelect()->__toString() : $sql);
}
/**
diff --git a/lib/internal/Magento/Framework/Image/Adapter/AbstractAdapter.php b/lib/internal/Magento/Framework/Image/Adapter/AbstractAdapter.php
index 8a2222a26956cbeaa0e3d2727030e5a2bc482147..bd5b3a6cf23752f9592caea020013eebec9a5d71 100644
--- a/lib/internal/Magento/Framework/Image/Adapter/AbstractAdapter.php
+++ b/lib/internal/Magento/Framework/Image/Adapter/AbstractAdapter.php
@@ -153,7 +153,7 @@ abstract class AbstractAdapter implements AdapterInterface
protected $directoryWrite;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $logger;
@@ -675,8 +675,7 @@ abstract class AbstractAdapter implements AdapterInterface
try {
$this->directoryWrite->create($this->directoryWrite->getRelativePath($destination));
} catch (\Magento\Framework\Filesystem\FilesystemException $e) {
- $this->logger->addStreamLog(\Magento\Framework\Logger::LOGGER_SYSTEM);
- $this->logger->log($e->getMessage());
+ $this->logger->critical($e);
throw new \Exception('Unable to write file into directory ' . $destination . '. Access forbidden.');
}
}
diff --git a/lib/internal/Magento/Framework/Less/PreProcessor/ErrorHandler.php b/lib/internal/Magento/Framework/Less/PreProcessor/ErrorHandler.php
index 58332f1ef3df91ad8a1526af58e726f401a5a31c..331ce1d74e15dff542785604f72c8cfd8c1e9a02 100644
--- a/lib/internal/Magento/Framework/Less/PreProcessor/ErrorHandler.php
+++ b/lib/internal/Magento/Framework/Less/PreProcessor/ErrorHandler.php
@@ -10,14 +10,14 @@ namespace Magento\Framework\Less\PreProcessor;
class ErrorHandler implements ErrorHandlerInterface
{
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $logger;
/**
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
*/
- public function __construct(\Magento\Framework\Logger $logger)
+ public function __construct(\Psr\Log\LoggerInterface $logger)
{
$this->logger = $logger;
}
@@ -27,6 +27,6 @@ class ErrorHandler implements ErrorHandlerInterface
*/
public function processException(\Exception $e)
{
- $this->logger->logException($e);
+ $this->logger->critical($e);
}
}
diff --git a/lib/internal/Magento/Framework/Logger.php b/lib/internal/Magento/Framework/Logger.php
deleted file mode 100644
index 378f2099dc4b79f85dae3359bd499162fd15cedc..0000000000000000000000000000000000000000
--- a/lib/internal/Magento/Framework/Logger.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
- */
-namespace Magento\Framework;
-
-use Magento\Framework\App\Filesystem\DirectoryList;
-
-/**
- * Logger model
- */
-class Logger
-{
- /**#@+
- * Keys that stand for particular log streams
- */
- const LOGGER_SYSTEM = 'system';
-
- const LOGGER_EXCEPTION = 'exception';
-
- /**#@-*/
-
- /**
- * @var array
- */
- protected $_loggers = [];
-
- /**
- * @var \Magento\Framework\Filesystem
- */
- protected $_filesystem;
-
- /**
- * @param \Magento\Framework\Filesystem $filesystem
- * @param string $defaultFile
- */
- public function __construct(\Magento\Framework\Filesystem $filesystem, $defaultFile = '')
- {
- $this->_filesystem = $filesystem;
- $this->addStreamLog(self::LOGGER_SYSTEM, $defaultFile)->addStreamLog(self::LOGGER_EXCEPTION, $defaultFile);
- }
-
- /**
- * Add a logger by specified key
- *
- * Second argument is a file name (relative to log directory) or a PHP "wrapper"
- *
- * @param string $loggerKey
- * @param string $fileOrWrapper
- * @param string $writerClass
- * @return \Magento\Framework\Logger
- * @link http://php.net/wrappers
- */
- public function addStreamLog($loggerKey, $fileOrWrapper = '', $writerClass = '')
- {
- $file = $fileOrWrapper ?: "{$loggerKey}.log";
- if (!preg_match('#^[a-z][a-z0-9+.-]*\://#i', $file)) {
- $logDir = $this->_filesystem->getDirectoryWrite(DirectoryList::LOG);
- $logDir->create();
- $file = $logDir->getAbsolutePath($file);
- }
- if (!$writerClass || !is_subclass_of($writerClass, 'Zend_Log_Writer_Stream')) {
- $writerClass = 'Zend_Log_Writer_Stream';
- }
- /** @var $writer \Zend_Log_Writer_Stream */
- $writer = $writerClass::factory(['stream' => $file]);
- $writer->setFormatter(
- new \Zend_Log_Formatter_Simple('%timestamp% %priorityName% (%priority%): %message%' . PHP_EOL)
- );
- $this->_loggers[$loggerKey] = new \Zend_Log($writer);
- return $this;
- }
-
- /**
- * Unset all declared loggers
- *
- * @return $this
- */
- public function unsetLoggers()
- {
- $this->_loggers = [];
- return $this;
- }
-
- /**
- * Check whether a logger exists by specified key
- *
- * @param string $key
- * @return bool
- */
- public function hasLog($key)
- {
- return isset($this->_loggers[$key]);
- }
-
- /**
- * Log a message
- *
- * @param string $message
- * @param int $level
- * @param string $loggerKey
- * @return void
- */
- public function log($message, $level = \Zend_Log::DEBUG, $loggerKey = self::LOGGER_SYSTEM)
- {
- if (!isset($this->_loggers[$loggerKey])) {
- return;
- }
- if (is_array($message) || is_object($message)) {
- $message = print_r($message, true);
- }
- /** @var $logger \Zend_Log */
- $logger = $this->_loggers[$loggerKey];
- $logger->log($message, $level);
- }
-
- /**
- * Log a message in specific file
- *
- * @param string $message
- * @param int $level
- * @param string $file
- * @return void
- */
- public function logFile($message, $level = \Zend_Log::DEBUG, $file = '')
- {
- if (!isset($file)) {
- $this->log($message, $level);
- }
- if (is_array($message) || is_object($message)) {
- $message = print_r($message, true);
- }
- /** @var $logger \Zend_Log */
- if (!$this->hasLog($file)) {
- $this->addStreamLog($file, $file);
- }
- /** @var $logger \Zend_Log */
- $this->log($message, $level, $file);
- }
-
- /**
- * Log a message with "debug" level
- *
- * @param string $message
- * @param string $loggerKey
- * @return void
- */
- public function logDebug($message, $loggerKey = self::LOGGER_SYSTEM)
- {
- $this->log($message, \Zend_Log::DEBUG, $loggerKey);
- }
-
- /**
- * Log an exception
- *
- * @param \Exception $e
- * @return void
- */
- public function logException(\Exception $e)
- {
- $this->log("\n" . $e->__toString(), \Zend_Log::ERR, self::LOGGER_EXCEPTION);
- }
-}
diff --git a/lib/internal/Magento/Framework/Logger/Adapter.php b/lib/internal/Magento/Framework/Logger/Adapter.php
deleted file mode 100644
index 404795cde9ba0c33479d4657baf912516682fa51..0000000000000000000000000000000000000000
--- a/lib/internal/Magento/Framework/Logger/Adapter.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
- */
-namespace Magento\Framework\Logger;
-
-/**
- * Log Adapter
- */
-class Adapter
-{
- /**
- * Log file name
- *
- * @var string
- */
- protected $_logFileName = '';
-
- /**
- * Data to log
- *
- * @var array
- */
- protected $_data = [];
-
- /**
- * Fields that should be replaced in debug data with '***'
- *
- * @var array
- */
- protected $_debugReplacePrivateDataKeys = [];
-
- /**
- * @var \Magento\Framework\Logger
- */
- protected $_logger;
-
- /**
- * Set log file name
- *
- * @param \Magento\Framework\Logger $logger
- * @param string $fileName
- */
- public function __construct(\Magento\Framework\Logger $logger, $fileName)
- {
- $this->_logFileName = $fileName;
- $this->_logger = $logger;
- }
-
- /**
- * Perform forced log data to file
- *
- * @param mixed $data
- * @return $this
- */
- public function log($data = null)
- {
- if ($data === null) {
- $data = $this->_data;
- } else {
- if (!is_array($data)) {
- $data = [$data];
- }
- }
- $data = $this->_filterDebugData($data);
- $data['__pid'] = getmypid();
- $this->_logger->logFile($data, \Zend_Log::DEBUG, $this->_logFileName);
- return $this;
- }
-
- /**
- * Log data setter
- *
- * @param string|array $key
- * @param mixed $value
- * @return $this
- */
- public function setData($key, $value = null)
- {
- if (is_array($key)) {
- $this->_data = $key;
- } else {
- $this->_data[$key] = $value;
- }
- return $this;
- }
-
- /**
- * Setter for private data keys, that should be replaced in debug data with '***'
- *
- * @param array $keys
- * @return $this
- */
- public function setFilterDataKeys($keys)
- {
- if (!is_array($keys)) {
- $keys = [$keys];
- }
- $this->_debugReplacePrivateDataKeys = $keys;
- return $this;
- }
-
- /**
- * Recursive filter data by private conventions
- *
- * @param mixed $debugData
- * @return string|array
- */
- protected function _filterDebugData($debugData)
- {
- if (is_array($debugData) && is_array($this->_debugReplacePrivateDataKeys)) {
- foreach ($debugData as $key => $value) {
- if (in_array($key, $this->_debugReplacePrivateDataKeys)) {
- $debugData[$key] = '****';
- } else {
- if (is_array($debugData[$key])) {
- $debugData[$key] = $this->_filterDebugData($debugData[$key]);
- }
- }
- }
- }
- return $debugData;
- }
-}
diff --git a/lib/internal/Magento/Framework/Logger/Handler/Critical.php b/lib/internal/Magento/Framework/Logger/Handler/Critical.php
new file mode 100644
index 0000000000000000000000000000000000000000..1f2a1950179d3481ca9b5dd178085c5ebe49fc1e
--- /dev/null
+++ b/lib/internal/Magento/Framework/Logger/Handler/Critical.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Framework\Logger\Handler;
+
+use Monolog\Logger;
+
+class Critical extends System
+{
+ /**
+ * @var string
+ */
+ protected $fileName = '/var/log/exception.log';
+
+ /**
+ * @var int
+ */
+ protected $loggerType = Logger::CRITICAL;
+}
diff --git a/lib/internal/Magento/Framework/Logger/Handler/Debug.php b/lib/internal/Magento/Framework/Logger/Handler/Debug.php
new file mode 100644
index 0000000000000000000000000000000000000000..ed360efb95dd0d4c7aa1e68e1275b99c151e88bc
--- /dev/null
+++ b/lib/internal/Magento/Framework/Logger/Handler/Debug.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Framework\Logger\Handler;
+
+use Monolog\Logger;
+
+class Debug extends System
+{
+ /**
+ * @var string
+ */
+ protected $fileName = '/var/log/debug.log';
+
+ /**
+ * @var int
+ */
+ protected $loggerType = Logger::DEBUG;
+}
diff --git a/lib/internal/Magento/Framework/Logger/Handler/System.php b/lib/internal/Magento/Framework/Logger/Handler/System.php
new file mode 100644
index 0000000000000000000000000000000000000000..39f50b524d99b3dcecaa679b8ed18ca1959dd92e
--- /dev/null
+++ b/lib/internal/Magento/Framework/Logger/Handler/System.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Framework\Logger\Handler;
+
+use Magento\Framework\Filesystem\DriverInterface;
+use Monolog\Handler\StreamHandler;
+use Monolog\Logger;
+
+class System extends StreamHandler
+{
+ /**
+ * @var string
+ */
+ protected $fileName = '/var/log/system.log';
+
+ /**
+ * @var int
+ */
+ protected $loggerType = Logger::INFO;
+
+ /**
+ * @var DriverInterface
+ */
+ protected $filesystem;
+
+ /**
+ * @param DriverInterface $filesystem
+ */
+ public function __construct(DriverInterface $filesystem)
+ {
+ $this->filesystem = $filesystem;
+ parent::__construct(BP . $this->fileName, $this->loggerType);
+ }
+
+ /**
+ * @{inerhitDoc}
+ *
+ * @param $record array
+ * @return void
+ */
+ public function write(array $record)
+ {
+ $logDir = $this->filesystem->getParentDirectory($this->url);
+ if (!$this->filesystem->isDirectory($logDir)) {
+ $this->filesystem->createDirectory($logDir, 0777);
+ }
+ parent::write($record);
+ }
+}
diff --git a/lib/internal/Magento/Framework/Logger/Monolog.php b/lib/internal/Magento/Framework/Logger/Monolog.php
new file mode 100644
index 0000000000000000000000000000000000000000..304528bf4c917e90f028517308a223ad2c2d2f90
--- /dev/null
+++ b/lib/internal/Magento/Framework/Logger/Monolog.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Framework\Logger;
+
+use Monolog\Logger;
+
+class Monolog extends Logger
+{
+}
diff --git a/lib/internal/Magento/Framework/Logger/README.md b/lib/internal/Magento/Framework/Logger/README.md
index 09eb8ee4505ef1e520742128ba8b5603b76ec71d..2d2b0410de1d1fd392c3d5573453cd09494b7514 100644
--- a/lib/internal/Magento/Framework/Logger/README.md
+++ b/lib/internal/Magento/Framework/Logger/README.md
@@ -1,5 +1,3 @@
# Logger
**Logger** provides a standard mechanism to log to system and error logs.
-
-* **Adapter** will filter out debug information.
\ No newline at end of file
diff --git a/lib/internal/Magento/Framework/Message/Manager.php b/lib/internal/Magento/Framework/Message/Manager.php
index 01c7eee8f42a7171bece772718ad77c046fc15fd..739cdb0dbf5dc2a56e67e975416b70a42549c9eb 100644
--- a/lib/internal/Magento/Framework/Message/Manager.php
+++ b/lib/internal/Magento/Framework/Message/Manager.php
@@ -5,7 +5,7 @@
namespace Magento\Framework\Message;
use Magento\Framework\Event\ManagerInterface as EventManagerInterface;
-use Magento\Framework\Logger;
+use Psr\Log\LoggerInterface as Logger;
/**
* Message manager model
@@ -258,7 +258,7 @@ class Manager implements ManagerInterface
$exception->getTraceAsString()
);
- $this->logger->logFile($message, \Zend_Log::DEBUG, Logger::LOGGER_EXCEPTION);
+ $this->logger->critical($message);
$this->addMessage($this->messageFactory->create(MessageInterface::TYPE_ERROR, $alternativeText), $group);
return $this;
}
diff --git a/lib/internal/Magento/Framework/Model/AbstractModel.php b/lib/internal/Magento/Framework/Model/AbstractModel.php
index 9bf7cd8b941291b962afa1560033852b37e45414..b223b53f1ce17fcbd49e594621441d18503be41d 100644
--- a/lib/internal/Magento/Framework/Model/AbstractModel.php
+++ b/lib/internal/Magento/Framework/Model/AbstractModel.php
@@ -109,7 +109,7 @@ abstract class AbstractModel extends \Magento\Framework\Object
protected $_registry;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $_logger;
diff --git a/lib/internal/Magento/Framework/Model/Context.php b/lib/internal/Magento/Framework/Model/Context.php
index 2b2835b5a20ed36a5126e5cd9263c82cdcb0516f..78f7125d2548710efc8ef2d82ac707af828e436e 100644
--- a/lib/internal/Magento/Framework/Model/Context.php
+++ b/lib/internal/Magento/Framework/Model/Context.php
@@ -19,7 +19,7 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
protected $_cacheManager;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $_logger;
@@ -34,14 +34,14 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
protected $_actionValidator;
/**
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Event\ManagerInterface $eventDispatcher
* @param \Magento\Framework\App\CacheInterface $cacheManager
* @param \Magento\Framework\App\State $appState
* @param \Magento\Framework\Model\ActionValidator\RemoveAction $actionValidator
*/
public function __construct(
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Event\ManagerInterface $eventDispatcher,
\Magento\Framework\App\CacheInterface $cacheManager,
\Magento\Framework\App\State $appState,
@@ -71,7 +71,7 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
}
/**
- * @return \Magento\Framework\Logger
+ * @return \Psr\Log\LoggerInterface
*/
public function getLogger()
{
diff --git a/lib/internal/Magento/Framework/Model/Resource/Db/Collection/AbstractCollection.php b/lib/internal/Magento/Framework/Model/Resource/Db/Collection/AbstractCollection.php
index aead4c8901f03fc6da9e432ec510812be6762f43..6e68ed3552d56043ae9e9abeb84cf10a5652f0e0 100644
--- a/lib/internal/Magento/Framework/Model/Resource/Db/Collection/AbstractCollection.php
+++ b/lib/internal/Magento/Framework/Model/Resource/Db/Collection/AbstractCollection.php
@@ -95,7 +95,7 @@ abstract class AbstractCollection extends \Magento\Framework\Data\Collection\Db
/**
* @param \Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Zend_Db_Adapter_Abstract $connection
@@ -103,7 +103,7 @@ abstract class AbstractCollection extends \Magento\Framework\Data\Collection\Db
*/
public function __construct(
\Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
$connection = null,
diff --git a/lib/internal/Magento/Framework/Module/DataSetup.php b/lib/internal/Magento/Framework/Module/DataSetup.php
index 2e2a93ccc93cc19f512ad2dcf008c5c336fa49d3..7612e372fa0a7b7c6ecf06fdfd3d3e90a0479250 100644
--- a/lib/internal/Magento/Framework/Module/DataSetup.php
+++ b/lib/internal/Magento/Framework/Module/DataSetup.php
@@ -50,7 +50,7 @@ class DataSetup extends \Magento\Framework\Module\Setup implements \Magento\Fram
protected $_eventManager;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $_logger;
@@ -223,9 +223,9 @@ class DataSetup extends \Magento\Framework\Module\Setup implements \Magento\Fram
if ($result) {
$this->_resource->setDataVersion($this->_resourceName, $file['toVersion']);
- $this->_logger->log($fileName);
+ $this->_logger->info($fileName);
} else {
- $this->_logger->log("Failed resource setup: {$fileName}");
+ $this->_logger->info("Failed resource setup: {$fileName}");
}
} catch (\Exception $e) {
throw new \Magento\Framework\Exception(
diff --git a/lib/internal/Magento/Framework/Module/Setup/Context.php b/lib/internal/Magento/Framework/Module/Setup/Context.php
index 5eb9006f3633c6599b375de5dc5d4199b71f3572..a2fcecf9f14f9e2988e522807088cba9c063983f 100644
--- a/lib/internal/Magento/Framework/Module/Setup/Context.php
+++ b/lib/internal/Magento/Framework/Module/Setup/Context.php
@@ -7,7 +7,7 @@ namespace Magento\Framework\Module\Setup;
class Context implements \Magento\Framework\ObjectManager\ContextInterface
{
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $_logger;
@@ -54,7 +54,7 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
/**
* Constructor
*
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Framework\App\Resource $appResource
* @param \Magento\Framework\Module\Dir\Reader $modulesReader
@@ -65,7 +65,7 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
* @param \Magento\Framework\Filesystem $filesystem
*/
public function __construct(
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Framework\App\Resource $appResource,
\Magento\Framework\Module\Dir\Reader $modulesReader,
@@ -95,7 +95,7 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
}
/**
- * @return \Magento\Framework\Logger $logger
+ * @return \Psr\Log\LoggerInterface $logger
*/
public function getLogger()
{
diff --git a/lib/internal/Magento/Framework/View/Asset/Merged.php b/lib/internal/Magento/Framework/View/Asset/Merged.php
index c91500992fbc5b7f0fb8eb0d22994de5c381047e..9bb0d8f4097529ed2378f21819f9fe9199a22d86 100644
--- a/lib/internal/Magento/Framework/View/Asset/Merged.php
+++ b/lib/internal/Magento/Framework/View/Asset/Merged.php
@@ -10,7 +10,7 @@ namespace Magento\Framework\View\Asset;
class Merged implements \Iterator
{
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $logger;
@@ -40,14 +40,14 @@ class Merged implements \Iterator
protected $isInitialized = false;
/**
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param MergeStrategyInterface $mergeStrategy
* @param \Magento\Framework\View\Asset\Repository $assetRepo
* @param MergeableInterface[] $assets
* @throws \InvalidArgumentException
*/
public function __construct(
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
MergeStrategyInterface $mergeStrategy,
\Magento\Framework\View\Asset\Repository $assetRepo,
array $assets
@@ -91,7 +91,7 @@ class Merged implements \Iterator
$this->mergeStrategy->merge($this->assets, $mergedAsset);
$this->assets = [$mergedAsset];
} catch (\Exception $e) {
- $this->logger->logException($e);
+ $this->logger->critical($e);
}
}
}
diff --git a/lib/internal/Magento/Framework/View/Asset/Minified.php b/lib/internal/Magento/Framework/View/Asset/Minified.php
index adc98daa17d0491b4ffd815e891537a9c5238c64..17e5230e458bf1d82cb14d479dadde64d0e76c28 100644
--- a/lib/internal/Magento/Framework/View/Asset/Minified.php
+++ b/lib/internal/Magento/Framework/View/Asset/Minified.php
@@ -74,7 +74,7 @@ class Minified implements MergeableInterface
/**
* Logger
*
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $logger;
@@ -103,7 +103,7 @@ class Minified implements MergeableInterface
* Constructor
*
* @param LocalInterface $asset
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Filesystem $filesystem
* @param \Magento\Framework\UrlInterface $baseUrl
* @param \Magento\Framework\Code\Minifier\AdapterInterface $adapter
@@ -111,7 +111,7 @@ class Minified implements MergeableInterface
*/
public function __construct(
LocalInterface $asset,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Filesystem $filesystem,
\Magento\Framework\UrlInterface $baseUrl,
\Magento\Framework\Code\Minifier\AdapterInterface $adapter,
@@ -223,7 +223,7 @@ class Minified implements MergeableInterface
try {
$this->fillPropertiesByMinifyingAsset();
} catch (\Exception $e) {
- $this->logger->logException(
+ $this->logger->critical(
new \Magento\Framework\Exception(
'Could not minify file: ' . $this->originalAsset->getSourceFile(),
0,
diff --git a/lib/internal/Magento/Framework/View/Context.php b/lib/internal/Magento/Framework/View/Context.php
index 2c3f94525545241d8ae7dec25baf756e81c6b5f6..df294c469070e4d211133b52982a184ddf7a75c8 100644
--- a/lib/internal/Magento/Framework/View/Context.php
+++ b/lib/internal/Magento/Framework/View/Context.php
@@ -11,7 +11,7 @@ use Magento\Framework\App\FrontControllerInterface;
use Magento\Framework\App\Request\Http as Request;
use Magento\Framework\App\State as AppState;
use Magento\Framework\Event\ManagerInterface;
-use Magento\Framework\Logger;
+use Psr\Log\LoggerInterface as Logger;
use Magento\Framework\Session\SessionManager;
use Magento\Framework\TranslateInterface;
use Magento\Framework\UrlInterface;
@@ -114,7 +114,7 @@ class Context
/**
* Logger
*
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $logger;
@@ -302,7 +302,7 @@ class Context
/**
* Retrieve logger
*
- * @return \Magento\Framework\Logger
+ * @return \Psr\Log\LoggerInterface
*/
public function getLogger()
{
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/Image.php b/lib/internal/Magento/Framework/View/Design/Theme/Image.php
index 1c4f224706f94a426713f7f3e0df71d904ac3bff..5408f611b83a22f7d9ec99875744572c99036ccb 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/Image.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/Image.php
@@ -63,7 +63,7 @@ class Image
/**
* Logger
*
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $logger;
@@ -88,7 +88,7 @@ class Image
* @param \Magento\Framework\Image\Factory $imageFactory
* @param Image\Uploader $uploader
* @param Image\PathInterface $themeImagePath
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param array $imageParams
* @param ThemeInterface $theme
* @codingStandardsIgnoreStart
@@ -98,7 +98,7 @@ class Image
\Magento\Framework\Image\Factory $imageFactory,
Image\Uploader $uploader,
Image\PathInterface $themeImagePath,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
array $imageParams = [self::PREVIEW_IMAGE_WIDTH, self::PREVIEW_IMAGE_HEIGHT],
ThemeInterface $theme = null
) {
@@ -158,7 +158,7 @@ class Image
$this->theme->setPreviewImage($destinationFileName);
} catch (\Magento\Framework\Filesystem\FilesystemException $e) {
$this->theme->setPreviewImage(null);
- $this->logger->logException($e);
+ $this->logger->critical($e);
}
return $isCopied;
}
diff --git a/lib/internal/Magento/Framework/View/Element/AbstractBlock.php b/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
index c270bbd52af27a35901dc817c8de4109580adaba..56689fe7335ae1bf90a8feddc1e35826ab935864 100644
--- a/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
+++ b/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
@@ -117,7 +117,7 @@ abstract class AbstractBlock extends \Magento\Framework\Object implements BlockI
/**
* Logger
*
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $_logger;
@@ -743,7 +743,7 @@ abstract class AbstractBlock extends \Magento\Framework\Object implements BlockI
$params = array_merge(['_secure' => $this->getRequest()->isSecure()], $params);
return $this->_assetRepo->getUrlWithParams($fileId, $params);
} catch (\Magento\Framework\Exception $e) {
- $this->_logger->logException($e);
+ $this->_logger->critical($e);
return $this->_getNotFoundUrl();
}
}
diff --git a/lib/internal/Magento/Framework/View/Element/Context.php b/lib/internal/Magento/Framework/View/Element/Context.php
index c908ec9fe3204973fd39b0b2d80a91bae9904109..c51fb19a835b2caeee4a8879b10736f4f4c32c6f 100644
--- a/lib/internal/Magento/Framework/View/Element/Context.php
+++ b/lib/internal/Magento/Framework/View/Element/Context.php
@@ -107,7 +107,7 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
/**
* Logger
*
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $_logger;
@@ -149,7 +149,7 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
* @param \Magento\Framework\View\Asset\Repository $assetRepo
* @param \Magento\Framework\View\ConfigInterface $viewConfig
* @param \Magento\Framework\App\Cache\StateInterface $cacheState
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Escaper $escaper
* @param \Magento\Framework\Filter\FilterManager $filterManager
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
@@ -171,7 +171,7 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
\Magento\Framework\View\Asset\Repository $assetRepo,
\Magento\Framework\View\ConfigInterface $viewConfig,
\Magento\Framework\App\Cache\StateInterface $cacheState,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Escaper $escaper,
\Magento\Framework\Filter\FilterManager $filterManager,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
@@ -340,7 +340,7 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
/**
* Get logger
*
- * @return \Magento\Framework\Logger
+ * @return \Psr\Log\LoggerInterface
*/
public function getLogger()
{
diff --git a/lib/internal/Magento/Framework/View/Element/Template.php b/lib/internal/Magento/Framework/View/Element/Template.php
index e4cc6b45156f93f63ecaad0add3c3c98caee3ddf..83f9c102cf2e32411a29ee1bb39bfb1dab7c4a89 100644
--- a/lib/internal/Magento/Framework/View/Element/Template.php
+++ b/lib/internal/Magento/Framework/View/Element/Template.php
@@ -251,7 +251,7 @@ class Template extends AbstractBlock
$html = $templateEngine->render($this->templateContext, $fileName, $this->_viewVars);
} else {
$html = '';
- $this->_logger->log("Invalid template file: '{$fileName}'", \Zend_Log::CRIT);
+ $this->_logger->info("Invalid template file: '{$fileName}'");
}
\Magento\Framework\Profiler::stop('TEMPLATE:' . $fileName);
diff --git a/lib/internal/Magento/Framework/View/Element/Template/Context.php b/lib/internal/Magento/Framework/View/Element/Template/Context.php
index e0578a46ec545346e8605d71a3a9cfb8c28ba3d4..1045d69095fc99eb155750c911a915b0e386167a 100644
--- a/lib/internal/Magento/Framework/View/Element/Template/Context.php
+++ b/lib/internal/Magento/Framework/View/Element/Template/Context.php
@@ -16,7 +16,7 @@ class Context extends \Magento\Framework\View\Element\Context
/**
* Logger instance
*
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $_logger;
@@ -74,7 +74,7 @@ class Context extends \Magento\Framework\View\Element\Context
* @param \Magento\Framework\View\Asset\Repository $assetRepo
* @param \Magento\Framework\View\ConfigInterface $viewConfig
* @param \Magento\Framework\App\Cache\StateInterface $cacheState
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Escaper $escaper
* @param \Magento\Framework\Filter\FilterManager $filterManager
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
@@ -102,7 +102,7 @@ class Context extends \Magento\Framework\View\Element\Context
\Magento\Framework\View\Asset\Repository $assetRepo,
\Magento\Framework\View\ConfigInterface $viewConfig,
\Magento\Framework\App\Cache\StateInterface $cacheState,
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
\Magento\Framework\Escaper $escaper,
\Magento\Framework\Filter\FilterManager $filterManager,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
@@ -157,7 +157,7 @@ class Context extends \Magento\Framework\View\Element\Context
/**
* Get logger instance
*
- * @return \Magento\Framework\Logger
+ * @return \Psr\Log\LoggerInterface
*/
public function getLogger()
{
diff --git a/lib/internal/Magento/Framework/View/Layout/Data/Structure.php b/lib/internal/Magento/Framework/View/Layout/Data/Structure.php
index d9ae103f1620ffd416df7a70e59ea9d90405a737..cff15d3f74a968ee631cfad4019fec39214fe191 100644
--- a/lib/internal/Magento/Framework/View/Layout/Data/Structure.php
+++ b/lib/internal/Magento/Framework/View/Layout/Data/Structure.php
@@ -19,18 +19,18 @@ class Structure extends DataStructure
protected $_nameIncrement = [];
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $logger;
/**
* Constructor
*
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
* @param array $elements
*/
public function __construct(
- \Magento\Framework\Logger $logger,
+ \Psr\Log\LoggerInterface $logger,
array $elements = null
) {
$this->logger = $logger;
@@ -108,10 +108,9 @@ class Structure extends DataStructure
if ($childName !== $sibling) {
$siblingParentName = $this->getParentId($sibling);
if ($parentName !== $siblingParentName) {
- $this->logger->log(
+ $this->logger->info(
"Broken reference: the '{$childName}' tries to reorder itself towards '{$sibling}', but " .
- "their parents are different: '{$parentName}' and '{$siblingParentName}' respectively.",
- \Zend_Log::CRIT
+ "their parents are different: '{$parentName}' and '{$siblingParentName}' respectively."
);
return;
}
diff --git a/lib/internal/Magento/Framework/View/Layout/Generator/Block.php b/lib/internal/Magento/Framework/View/Layout/Generator/Block.php
index 3e632e331a6565f906892c75649844bd9092e3fa..1b192f422b044f3c407ea80f6d62f5f0d9f641bd 100644
--- a/lib/internal/Magento/Framework/View/Layout/Generator/Block.php
+++ b/lib/internal/Magento/Framework/View/Layout/Generator/Block.php
@@ -29,7 +29,7 @@ class Block implements Layout\GeneratorInterface
protected $eventManager;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $logger;
@@ -39,13 +39,13 @@ class Block implements Layout\GeneratorInterface
* @param \Magento\Framework\View\Element\BlockFactory $blockFactory
* @param \Magento\Framework\Data\Argument\InterpreterInterface $argumentInterpreter
* @param \Magento\Framework\Event\ManagerInterface $eventManager
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
*/
public function __construct(
\Magento\Framework\View\Element\BlockFactory $blockFactory,
\Magento\Framework\Data\Argument\InterpreterInterface $argumentInterpreter,
\Magento\Framework\Event\ManagerInterface $eventManager,
- \Magento\Framework\Logger $logger
+ \Psr\Log\LoggerInterface $logger
) {
$this->blockFactory = $blockFactory;
$this->argumentInterpreter = $argumentInterpreter;
@@ -172,7 +172,7 @@ class Block implements Layout\GeneratorInterface
try {
$block = $this->blockFactory->createBlock($block, $arguments);
} catch (\ReflectionException $e) {
- $this->logger->log($e->getMessage());
+ $this->logger->critical($e->getMessage());
}
}
if (!$block instanceof \Magento\Framework\View\Element\AbstractBlock) {
diff --git a/lib/internal/Magento/Framework/View/Layout/ScheduledStructure/Helper.php b/lib/internal/Magento/Framework/View/Layout/ScheduledStructure/Helper.php
index b5b5e5124814613863366b6a0703b0fb840dbe4c..e0258bdcff72ef31fc01c1411cc5977392a430a4 100644
--- a/lib/internal/Magento/Framework/View/Layout/ScheduledStructure/Helper.php
+++ b/lib/internal/Magento/Framework/View/Layout/ScheduledStructure/Helper.php
@@ -26,15 +26,15 @@ class Helper
protected $counter = 0;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $logger;
/**
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
*/
public function __construct(
- \Magento\Framework\Logger $logger
+ \Psr\Log\LoggerInterface $logger
) {
$this->logger = $logger;
}
@@ -169,7 +169,7 @@ class Helper
$data = $scheduledStructure->getStructureElementData($key);
// if we have reference container to not existed element
if (!isset($row[self::SCHEDULED_STRUCTURE_INDEX_TYPE])) {
- $this->logger->log("Broken reference: missing declaration of the element '{$key}'.", \Zend_Log::CRIT);
+ $this->logger->info("Broken reference: missing declaration of the element '{$key}'.");
$scheduledStructure->unsetPathElement($key);
$scheduledStructure->unsetStructureElement($key);
return;
@@ -185,13 +185,12 @@ class Helper
try {
$structure->setAsChild($name, $parentName, $alias);
} catch (\Exception $e) {
- $this->logger->log($e->getMessage());
+ $this->logger->critical($e);
}
} else {
- $this->logger->log(
+ $this->logger->info(
"Broken reference: the '{$name}' element cannot be added as child to '{$parentName}', " .
- 'because the latter doesn\'t exist',
- \Zend_Log::CRIT
+ 'because the latter doesn\'t exist'
);
}
}
diff --git a/lib/internal/Magento/Framework/View/Page/Config/Renderer.php b/lib/internal/Magento/Framework/View/Page/Config/Renderer.php
index 44d388ed1aa773a37e660d45745fa79540746273..5edeba40ea2db7fbe6c1054859c8692302c0c461 100644
--- a/lib/internal/Magento/Framework/View/Page/Config/Renderer.php
+++ b/lib/internal/Magento/Framework/View/Page/Config/Renderer.php
@@ -39,7 +39,7 @@ class Renderer
protected $string;
/**
- * @var \Magento\Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $logger;
@@ -55,7 +55,7 @@ class Renderer
* @param \Magento\Framework\UrlInterface $urlBuilder
* @param \Magento\Framework\Escaper $escaper
* @param \Magento\Framework\Stdlib\String $string
- * @param \Magento\Framework\Logger $logger
+ * @param \Psr\Log\LoggerInterface $logger
*/
public function __construct(
Config $pageConfig,
@@ -64,7 +64,7 @@ class Renderer
\Magento\Framework\UrlInterface $urlBuilder,
\Magento\Framework\Escaper $escaper,
\Magento\Framework\Stdlib\String $string,
- \Magento\Framework\Logger $logger
+ \Psr\Log\LoggerInterface $logger
) {
$this->pageConfig = $pageConfig;
$this->assetMinifyService = $assetMinifyService;
@@ -339,7 +339,7 @@ class Renderer
$result .= sprintf($template, $asset->getUrl());
}
} catch (\Magento\Framework\Exception $e) {
- $this->logger->logException($e);
+ $this->logger->critical($e);
$result .= sprintf($template, $this->urlBuilder->getUrl('', ['_direct' => 'core/index/notFound']));
}
return $result;
diff --git a/lib/internal/Magento/Framework/View/Result/Page.php b/lib/internal/Magento/Framework/View/Result/Page.php
index c5435e9c4ceb7ec20ddc87da21785c8ea272792c..4ddaf6f9144015d950040bf3b91199f0eae9e71d 100644
--- a/lib/internal/Magento/Framework/View/Result/Page.php
+++ b/lib/internal/Magento/Framework/View/Result/Page.php
@@ -78,7 +78,7 @@ class Page extends Layout
protected $assetRepo;
/**
- * @var Framework\Logger
+ * @var \Psr\Log\LoggerInterface
*/
protected $logger;
@@ -327,7 +327,7 @@ class Page extends Layout
$params = array_merge(['_secure' => $this->request->isSecure()], $params);
return $this->assetRepo->getUrlWithParams($fileId, $params);
} catch (\Magento\Framework\Exception $e) {
- $this->logger->logException($e);
+ $this->logger->critical($e);
return $this->urlBuilder->getUrl('', ['_direct' => 'core/index/notFound']);
}
}