From b769341ba2df7fb6b7c82f015384536aada2307d Mon Sep 17 00:00:00 2001 From: EliasZ Date: Sun, 5 Apr 2015 13:17:55 +0200 Subject: [PATCH 1/4] fix typo --- lib/internal/Magento/Framework/View/Element/BlockFactory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/internal/Magento/Framework/View/Element/BlockFactory.php b/lib/internal/Magento/Framework/View/Element/BlockFactory.php index 8832e6e40bb89..08f66289fb108 100644 --- a/lib/internal/Magento/Framework/View/Element/BlockFactory.php +++ b/lib/internal/Magento/Framework/View/Element/BlockFactory.php @@ -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); From 79184c45aeb0fcf55bd03da2dfdef47bd2bdc5ef Mon Sep 17 00:00:00 2001 From: Elias Date: Sun, 5 Apr 2015 13:29:03 +0200 Subject: [PATCH 2/4] magneto typos --- app/code/Magento/Theme/Test/Unit/Model/Favicon/FaviconTest.php | 2 +- .../Framework/Less/Test/Unit/File/Collector/LibraryTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Theme/Test/Unit/Model/Favicon/FaviconTest.php b/app/code/Magento/Theme/Test/Unit/Model/Favicon/FaviconTest.php index cb439cd4ea692..d8ee45c4f15f0 100644 --- a/app/code/Magento/Theme/Test/Unit/Model/Favicon/FaviconTest.php +++ b/app/code/Magento/Theme/Test/Unit/Model/Favicon/FaviconTest.php @@ -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; diff --git a/lib/internal/Magento/Framework/Less/Test/Unit/File/Collector/LibraryTest.php b/lib/internal/Magento/Framework/Less/Test/Unit/File/Collector/LibraryTest.php index 9dc45f4008b20..1bb6e276c9761 100644 --- a/lib/internal/Magento/Framework/Less/Test/Unit/File/Collector/LibraryTest.php +++ b/lib/internal/Magento/Framework/Less/Test/Unit/File/Collector/LibraryTest.php @@ -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'; From b372c2db337d69f359e9dc610e19064791a8b636 Mon Sep 17 00:00:00 2001 From: Nolwennig Guilbert Date: Fri, 10 Apr 2015 14:10:15 +0200 Subject: [PATCH 3/4] Update system.xml Fix sortOrder in adminhtml (I just saw this "mistake" now in 1.7.0.2 CE version) --- app/code/Magento/Sales/etc/adminhtml/system.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Sales/etc/adminhtml/system.xml b/app/code/Magento/Sales/etc/adminhtml/system.xml index e7482704e39ad..de36abd6c710c 100644 --- a/app/code/Magento/Sales/etc/adminhtml/system.xml +++ b/app/code/Magento/Sales/etc/adminhtml/system.xml @@ -340,7 +340,7 @@ sales Magento_Sales::sales_pdf - + From b1ad3098395fd861f24427be9a6a657ea02b19b9 Mon Sep 17 00:00:00 2001 From: Rouven Alexander Rieker Date: Mon, 13 Apr 2015 11:52:13 +0200 Subject: [PATCH 4/4] [BUGFIX] SalesSequence: Fixed composer installer dependency --- app/code/Magento/SalesSequence/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/SalesSequence/composer.json b/app/code/Magento/SalesSequence/composer.json index 8d71564f7d997..da5dd3cbe32d2 100644 --- a/app/code/Magento/SalesSequence/composer.json +++ b/app/code/Magento/SalesSequence/composer.json @@ -4,7 +4,7 @@ "require": { "php": "~5.5.0|~5.6.0", "magento/framework": "0.74.0-beta4", - "magento/magento-composer-installer": "0.74.0-beta4" + "magento/magento-composer-installer": "*" }, "type": "magento2-module", "version": "0.74.0-beta4",