Skip to content

Commit c7207f6

Browse files
authored
🔃 [EngCom] Public Pull Requests - 2.3-develop
Accepted Public Pull Requests: - #13299: Small refactor of getFrontName (by @akiojalehto) - #13318: Fix typo in database column comment (by @akiojalehto) - #13144: Log file path when image open throws exception (by @pmclain)
2 parents 8e77e2f + a10d403 commit c7207f6

File tree

4 files changed

+8
-9
lines changed

4 files changed

+8
-9
lines changed

app/code/Magento/Catalog/Setup/InstallSchema.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -674,7 +674,7 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
674674
\Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
675675
null,
676676
['unsigned' => true, 'nullable' => false, 'default' => '0'],
677-
'Attriute Set ID'
677+
'Attribute Set ID'
678678
)
679679
->addColumn(
680680
'parent_id',

lib/internal/Magento/Framework/Image/Adapter/Gd2.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,10 @@ public function open($filename)
6262
throw new \OverflowException('Memory limit has been reached.');
6363
}
6464
$this->imageDestroy();
65-
$this->_imageHandler = call_user_func($this->_getCallback('create'), $this->_fileName);
65+
$this->_imageHandler = call_user_func(
66+
$this->_getCallback('create', null, sprintf('Unsupported image format. File: %s', $this->_fileName)),
67+
$this->_fileName
68+
);
6669
}
6770

6871
/**

lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public function open($filename)
7777
try {
7878
$this->_imageHandler = new \Imagick($this->_fileName);
7979
} catch (\ImagickException $e) {
80-
throw new \Exception('Unsupported image format.', $e->getCode(), $e);
80+
throw new \Exception(sprintf('Unsupported image format. File: %s', $this->_fileName), $e->getCode(), $e);
8181
}
8282

8383
$this->backgroundColor();

lib/internal/Magento/Framework/View/Context.php

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -332,15 +332,11 @@ public function getModuleName()
332332
}
333333

334334
/**
335-
* Retrieve the module name
336-
*
337-
* @return string
338-
*
339-
* @todo alias of getModuleName
335+
* @see getModuleName
340336
*/
341337
public function getFrontName()
342338
{
343-
return $this->getRequest()->getModuleName();
339+
return $this->getModuleName();
344340
}
345341

346342
/**

0 commit comments

Comments
 (0)