Merge remote-tracking branch 'main-ce/develop' into MAGETWO-36096

Yuri Kovsher · Yuri Kovsher · commit 2652c4d494f2 · 2015-04-16T16:02:45.000+03:00
diff --git a/app/code/Magento/Sales/etc/adminhtml/system.xml b/app/code/Magento/Sales/etc/adminhtml/system.xml
@@ -348,7 +348,7 @@
             <label>PDF Print-outs</label>
             <tab>sales</tab>
             <resource>Magento_Sales::sales_pdf</resource>
-            <group id="invoice" translate="label" type="text" sortOrder="1" showInDefault="10" showInWebsite="1" showInStore="1">
+            <group id="invoice" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Invoice</label>
                 <field id="put_order_id" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Display Order ID in Header</label>
diff --git 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",
diff --git 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
@@ -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';
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public function testGetFaviconFileNegative()`
`85`	`85`	`public function testGetFaviconFile()`
`86`	`86`	`{`
`87`	`87`	`$scopeConfigValue = 'path';`
`88`		`- $urlToMediaDir = 'http://magneto.url/pub/media/';`
	`88`	`+ $urlToMediaDir = 'http://magento.url/pub/media/';`
`89`	`89`	`$expectedFile = ImageFavicon::UPLOAD_DIR . '/' . $scopeConfigValue;`
`90`	`90`	`$expectedUrl = $urlToMediaDir . $expectedFile;`
`91`	`91`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ public function testGetFiles($libraryFiles, $themeFiles)`
`120`	`120`	`$this->libraryDirectoryMock->expects($this->any())->method('search')->will($this->returnValue($libraryFiles));`
`121`	`121`	`$this->libraryDirectoryMock->expects($this->any())->method('getAbsolutePath')->will($this->returnCallback(`
`122`	`122`	`function ($file) {`
`123`		`- return '/opt/Magneto/lib/' . $file;`
	`123`	`+ return '/opt/Magento/lib/' . $file;`
`124`	`124`	`}`
`125`	`125`	`));`
`126`	`126`	`$themePath = '/var/Magento/ATheme';`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public function createBlock($blockName, array $arguments = [])`
`42`	`42`	`$blockName = ltrim($blockName, '\\');`
`43`	`43`	`$block = $this->objectManager->create($blockName, $arguments);`
`44`	`44`	`if (!$block instanceof BlockInterface) {`
`45`		`- throw new \LogicException($blockName . ' does not implemented BlockInterface');`
	`45`	`+ throw new \LogicException($blockName . ' does not implement BlockInterface');`
`46`	`46`	`}`
`47`	`47`	`if ($block instanceof Template) {`
`48`	`48`	`$block->setTemplateContext($block);`