Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix typos #1165

Merged
merged 2 commits into from
Apr 16, 2015
Merged

fix typos #1165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b769341
fix typo
EliasZ Apr 5, 2015
79184c4
magneto typos
EliasZ Apr 5, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/code/Magento/Theme/Test/Unit/Model/Favicon/FaviconTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public function testGetFaviconFileNegative()
public function testGetFaviconFile()
{
$scopeConfigValue = 'path';
$urlToMediaDir = 'http://magneto.url/pub/media/';
$urlToMediaDir = 'http://magento.url/pub/media/';
$expectedFile = ImageFavicon::UPLOAD_DIR . '/' . $scopeConfigValue;
$expectedUrl = $urlToMediaDir . $expectedFile;

Expand Down
2 changes: 1 addition & 1 deletion lib/internal/Magento/Framework/Less/Test/Unit/File/Collector/LibraryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ public function testGetFiles($libraryFiles, $themeFiles)
$this->libraryDirectoryMock->expects($this->any())->method('search')->will($this->returnValue($libraryFiles));
$this->libraryDirectoryMock->expects($this->any())->method('getAbsolutePath')->will($this->returnCallback(
function ($file) {
return '/opt/Magneto/lib/' . $file;
return '/opt/Magento/lib/' . $file;
}
));
$themePath = '/var/Magento/ATheme';
Expand Down
2 changes: 1 addition & 1 deletion lib/internal/Magento/Framework/View/Element/BlockFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public function createBlock($blockName, array $arguments = [])
$blockName = ltrim($blockName, '\\');
$block = $this->objectManager->create($blockName, $arguments);
if (!$block instanceof BlockInterface) {
throw new \LogicException($blockName . ' does not implemented BlockInterface');
throw new \LogicException($blockName . ' does not implement BlockInterface');
}
if ($block instanceof Template) {
$block->setTemplateContext($block);
Expand Down