Merge branch 'develop' of github.corp.magento.com:magento2/sample-data into MAGETWO-47395

YevSent · YevSent · commit 9924506ade0a · 2016-02-22T09:56:49.000+02:00
diff --git a/app/code/Magento/BundleSampleData/registration.php b/app/code/Magento/BundleSampleData/registration.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-\Magento\Framework\Component\ComponentRegistrar::register(
-    \Magento\Framework\Component\ComponentRegistrar::MODULE,
-    'Magento_BundleSampleData',
-    __DIR__
-);
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_BundleSampleData', __DIR__);
diff --git a/app/code/Magento/CatalogRuleSampleData/registration.php b/app/code/Magento/CatalogRuleSampleData/registration.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-\Magento\Framework\Component\ComponentRegistrar::register(
-    \Magento\Framework\Component\ComponentRegistrar::MODULE,
-    'Magento_CatalogRuleSampleData',
-    __DIR__
-);
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_CatalogRuleSampleData', __DIR__);
diff --git a/app/code/Magento/CatalogSampleData/registration.php b/app/code/Magento/CatalogSampleData/registration.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-\Magento\Framework\Component\ComponentRegistrar::register(
-    \Magento\Framework\Component\ComponentRegistrar::MODULE,
-    'Magento_CatalogSampleData',
-    __DIR__
-);
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_CatalogSampleData', __DIR__);
diff --git a/app/code/Magento/CmsSampleData/fixtures/blocks/pages_static_blocks.csv b/app/code/Magento/CmsSampleData/fixtures/blocks/pages_static_blocks.csv
@@ -2,5 +2,5 @@ title,identifier,content
 Login Info Block,login-data,"<div class=""message info"" style=""margin-top: 50px;"">
     <p><strong>Try Demo Customer Access</strong></p>
     <p><span style=""display:inline-block; width: 80px; padding-right: 10px;"">Email:</span>roni_cost@example.com</p>
-    <p><span style=""display:inline-block; width: 80px; padding-right: 10px;"">Password:</span>roni_cost@example.com</p>
+    <p><span style=""display:inline-block; width: 80px; padding-right: 10px;"">Password:</span>roni_cost3@example.com</p>
 </div>"
diff --git a/app/code/Magento/CmsSampleData/registration.php b/app/code/Magento/CmsSampleData/registration.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-\Magento\Framework\Component\ComponentRegistrar::register(
-    \Magento\Framework\Component\ComponentRegistrar::MODULE,
-    'Magento_CmsSampleData',
-    __DIR__
-);
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_CmsSampleData', __DIR__);
diff --git a/app/code/Magento/ConfigurableSampleData/registration.php b/app/code/Magento/ConfigurableSampleData/registration.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-\Magento\Framework\Component\ComponentRegistrar::register(
-    \Magento\Framework\Component\ComponentRegistrar::MODULE,
-    'Magento_ConfigurableSampleData',
-    __DIR__
-);
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_ConfigurableSampleData', __DIR__);
diff --git a/app/code/Magento/CustomerSampleData/fixtures/customer_profile.csv b/app/code/Magento/CustomerSampleData/fixtures/customer_profile.csv
@@ -1,2 +1,2 @@
 firstname,lastname,email,password,dob,gender,street,city,region,country_id,postcode,telephone
-Veronica,Costello,"roni_cost@example.com","roni_cost@example.com","1973-12-15",2,"a:2:{i:0;s:24:""6146 Honey Bluff Parkway"";i:1;s:0:"""";}",Calder,Michigan,US,"49628-7978","(555) 229-3326"
+Veronica,Costello,"roni_cost@example.com","roni_cost3@example.com","1973-12-15",2,"a:2:{i:0;s:24:""6146 Honey Bluff Parkway"";i:1;s:0:"""";}",Calder,Michigan,US,"49628-7978","(555) 229-3326"
diff --git a/app/code/Magento/CustomerSampleData/registration.php b/app/code/Magento/CustomerSampleData/registration.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-\Magento\Framework\Component\ComponentRegistrar::register(
-    \Magento\Framework\Component\ComponentRegistrar::MODULE,
-    'Magento_CustomerSampleData',
-    __DIR__
-);
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_CustomerSampleData', __DIR__);
diff --git a/app/code/Magento/DownloadableSampleData/registration.php b/app/code/Magento/DownloadableSampleData/registration.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-\Magento\Framework\Component\ComponentRegistrar::register(
-    \Magento\Framework\Component\ComponentRegistrar::MODULE,
-    'Magento_DownloadableSampleData',
-    __DIR__
-);
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_DownloadableSampleData', __DIR__);
diff --git a/app/code/Magento/GroupedProductSampleData/registration.php b/app/code/Magento/GroupedProductSampleData/registration.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-\Magento\Framework\Component\ComponentRegistrar::register(
-    \Magento\Framework\Component\ComponentRegistrar::MODULE,
-    'Magento_GroupedProductSampleData',
-    __DIR__
-);
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_GroupedProductSampleData', __DIR__);
diff --git a/app/code/Magento/MsrpSampleData/registration.php b/app/code/Magento/MsrpSampleData/registration.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-\Magento\Framework\Component\ComponentRegistrar::register(
-    \Magento\Framework\Component\ComponentRegistrar::MODULE,
-    'Magento_MsrpSampleData',
-    __DIR__
-);
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_MsrpSampleData', __DIR__);
diff --git a/app/code/Magento/OfflineShippingSampleData/registration.php b/app/code/Magento/OfflineShippingSampleData/registration.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-\Magento\Framework\Component\ComponentRegistrar::register(
-    \Magento\Framework\Component\ComponentRegistrar::MODULE,
-    'Magento_OfflineShippingSampleData',
-    __DIR__
-);
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_OfflineShippingSampleData', __DIR__);
diff --git a/app/code/Magento/ProductLinksSampleData/registration.php b/app/code/Magento/ProductLinksSampleData/registration.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-\Magento\Framework\Component\ComponentRegistrar::register(
-    \Magento\Framework\Component\ComponentRegistrar::MODULE,
-    'Magento_ProductLinksSampleData',
-    __DIR__
-);
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_ProductLinksSampleData', __DIR__);
diff --git a/app/code/Magento/ReviewSampleData/registration.php b/app/code/Magento/ReviewSampleData/registration.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-\Magento\Framework\Component\ComponentRegistrar::register(
-    \Magento\Framework\Component\ComponentRegistrar::MODULE,
-    'Magento_ReviewSampleData',
-    __DIR__
-);
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_ReviewSampleData', __DIR__);
diff --git a/app/code/Magento/SalesRuleSampleData/registration.php b/app/code/Magento/SalesRuleSampleData/registration.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-\Magento\Framework\Component\ComponentRegistrar::register(
-    \Magento\Framework\Component\ComponentRegistrar::MODULE,
-    'Magento_SalesRuleSampleData',
-    __DIR__
-);
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_SalesRuleSampleData', __DIR__);
diff --git a/app/code/Magento/SalesSampleData/registration.php b/app/code/Magento/SalesSampleData/registration.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-\Magento\Framework\Component\ComponentRegistrar::register(
-    \Magento\Framework\Component\ComponentRegistrar::MODULE,
-    'Magento_SalesSampleData',
-    __DIR__
-);
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_SalesSampleData', __DIR__);
diff --git a/app/code/Magento/SwatchesSampleData/registration.php b/app/code/Magento/SwatchesSampleData/registration.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-\Magento\Framework\Component\ComponentRegistrar::register(
-    \Magento\Framework\Component\ComponentRegistrar::MODULE,
-    'Magento_SwatchesSampleData',
-    __DIR__
-);
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_SwatchesSampleData', __DIR__);
diff --git a/app/code/Magento/TaxSampleData/registration.php b/app/code/Magento/TaxSampleData/registration.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-\Magento\Framework\Component\ComponentRegistrar::register(
-    \Magento\Framework\Component\ComponentRegistrar::MODULE,
-    'Magento_TaxSampleData',
-    __DIR__
-);
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_TaxSampleData', __DIR__);
diff --git a/app/code/Magento/ThemeSampleData/registration.php b/app/code/Magento/ThemeSampleData/registration.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-\Magento\Framework\Component\ComponentRegistrar::register(
-    \Magento\Framework\Component\ComponentRegistrar::MODULE,
-    'Magento_ThemeSampleData',
-    __DIR__
-);
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_ThemeSampleData', __DIR__);
diff --git a/app/code/Magento/WidgetSampleData/registration.php b/app/code/Magento/WidgetSampleData/registration.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-\Magento\Framework\Component\ComponentRegistrar::register(
-    \Magento\Framework\Component\ComponentRegistrar::MODULE,
-    'Magento_WidgetSampleData',
-    __DIR__
-);
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_WidgetSampleData', __DIR__);
diff --git a/app/code/Magento/WishlistSampleData/registration.php b/app/code/Magento/WishlistSampleData/registration.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-\Magento\Framework\Component\ComponentRegistrar::register(
-    \Magento\Framework\Component\ComponentRegistrar::MODULE,
-    'Magento_WishlistSampleData',
-    __DIR__
-);
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_WishlistSampleData', __DIR__);

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`firstname,lastname,email,password,dob,gender,street,city,region,country_id,postcode,telephone`
`2`		`-Veronica,Costello,"[email protected]","roni_cost@example.com","1973-12-15",2,"a:2:{i:0;s:24:""6146 Honey Bluff Parkway"";i:1;s:0:"""";}",Calder,Michigan,US,"49628-7978","(555) 229-3326"`
	`2`	`+Veronica,Costello,"[email protected]","roni_cost3@example.com","1973-12-15",2,"a:2:{i:0;s:24:""6146 Honey Bluff Parkway"";i:1;s:0:"""";}",Calder,Michigan,US,"49628-7978","(555) 229-3326"`