Skip to content

Commit

Permalink
🔃 [EngCom] Public Pull Requests - 2.3-develop
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
magento-team authored Jan 24, 2018
2 parents 8e77e2f + a10d403 commit c7207f6
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Setup/InstallSchema.php
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,7 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
\Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
null,
['unsigned' => true, 'nullable' => false, 'default' => '0'],
'Attriute Set ID'
'Attribute Set ID'
)
->addColumn(
'parent_id',
Expand Down
5 changes: 4 additions & 1 deletion lib/internal/Magento/Framework/Image/Adapter/Gd2.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,10 @@ public function open($filename)
throw new \OverflowException('Memory limit has been reached.');
}
$this->imageDestroy();
$this->_imageHandler = call_user_func($this->_getCallback('create'), $this->_fileName);
$this->_imageHandler = call_user_func(
$this->_getCallback('create', null, sprintf('Unsupported image format. File: %s', $this->_fileName)),
$this->_fileName
);
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public function open($filename)
try {
$this->_imageHandler = new \Imagick($this->_fileName);
} catch (\ImagickException $e) {
throw new \Exception('Unsupported image format.', $e->getCode(), $e);
throw new \Exception(sprintf('Unsupported image format. File: %s', $this->_fileName), $e->getCode(), $e);
}

$this->backgroundColor();
Expand Down
8 changes: 2 additions & 6 deletions lib/internal/Magento/Framework/View/Context.php
Original file line number Diff line number Diff line change
Expand Up @@ -332,15 +332,11 @@ public function getModuleName()
}

/**
* Retrieve the module name
*
* @return string
*
* @todo alias of getModuleName
* @see getModuleName
*/
public function getFrontName()
{
return $this->getRequest()->getModuleName();
return $this->getModuleName();
}

/**
Expand Down

0 comments on commit c7207f6

Please sign in to comment.