Skip to content

Commit 74dde3d

Browse files
Merge pull request #33 from magento/1.0-fwd
Forward-port 1.0 branch
2 parents b475999 + e6d0917 commit 74dde3d

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

Model/Cache/InvalidateLogger.php

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,15 @@ class InvalidateLogger extends \Magento\Framework\Cache\InvalidateLogger
2020
*/
2121
public function execute($invalidateInfo)
2222
{
23-
$invalidateInfo['trace'] = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
23+
if (is_array($invalidateInfo)) {
24+
$invalidateInfo['trace'] = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
25+
} elseif (is_string($invalidateInfo)) {
26+
$invalidateInfo = [
27+
'main' => $invalidateInfo,
28+
'trace' => debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS)
29+
];
30+
}
31+
2432
parent::execute($invalidateInfo);
2533
}
2634
}

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/magento-cloud-components",
33
"description": "Cloud Components Module for Magento 2.x",
44
"type": "magento2-module",
5-
"version": "1.0.2",
5+
"version": "1.0.5",
66
"require": {
77
"php": "^7.0",
88
"ext-json": "*",
@@ -28,9 +28,9 @@
2828
"@phpmd",
2929
"@phpunit"
3030
],
31-
"phpstan": "phpstan analyse -c Test/static/phpstan.neon",
32-
"phpcs": "phpcs ./ --standard=Test/static/phpcs-ruleset.xml -p -n",
33-
"phpmd": "phpmd Console xml Test/static/phpmd-ruleset.xml",
31+
"phpstan": "phpstan analyse -c test/static/phpstan.neon",
32+
"phpcs": "phpcs ./ --standard=test/static/phpcs-ruleset.xml -p -n",
33+
"phpmd": "phpmd Console xml test/static/phpmd-ruleset.xml",
3434
"phpunit": "phpunit --configuration Test/Unit",
3535
"pre-install-cmd": "@install_suggested",
3636
"pre-update-cmd": "@install_suggested",

0 commit comments

Comments
 (0)