diff --git a/.gitignore b/.gitignore index b931d6aa..caebcc68 100755 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,6 @@ composer.lock /dist /target /vendor -/example/tmp -/example/magento2-sample-data +/projects/sample-data/tmp +/projects/sample-data/magento2-sample-data +/projects/.gitignore diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b04d77a..72387a25 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,16 @@ +# Version 1.0.0-alpha6 + +## Bugfixes + +* None + +## Features + +* Now load default store on start-up +* Rename example => projects folder + re-order directory structure to support multiple projects +* Rename ProductProcessorFactory => ProductBunchProcessorFactory +* Fixed some typos + # Version 1.0.0-alpha5 ## Bugfixes diff --git a/README.md b/README.md index 233ff0da..1d203511 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ To run the example import, it is necessary to get a copy of the Magento 2 sample from Github, assumed you're in the root folder of this repository, by invoking ```sh -$ git clone https://github.com/magento/magento2-sample-data.git example/magento2-sample-data +$ git clone https://github.com/magento/magento2-sample-data.git projects/sample-data/magento2-sample-data ``` on the command line. @@ -89,10 +89,10 @@ have to copied to the source directory specified for the subjects. When running directory before. ```sh -$ sudo rm -rf example/tmp \ - && sudo mkdir example/tmp \ - && sudo cp example/ce/212/data/*.csv example/tmp \ +$ sudo rm -rf projects/sample-data/tmp \ + && sudo mkdir projects/sample-data/tmp \ + && sudo cp projects/sample-data/ce/212/data/*.csv projects/sample-data/tmp \ && sudo bin/import-simple import:products \ --installation-dir=/var/www/magento \ - --configuration=example/ce/212/conf/techdivision-import.json + --configuration=projects/sample-data/ce/212/conf/techdivision-import.json ``` \ No newline at end of file diff --git a/projects/.DS_Store b/projects/.DS_Store new file mode 100644 index 00000000..0ea1aba8 Binary files /dev/null and b/projects/.DS_Store differ diff --git a/projects/sample-data/.DS_Store b/projects/sample-data/.DS_Store new file mode 100644 index 00000000..d7ed1bca Binary files /dev/null and b/projects/sample-data/.DS_Store differ diff --git a/example/ce/212/conf/techdivision-import.json b/projects/sample-data/ce/212/conf/techdivision-import.json similarity index 92% rename from example/ce/212/conf/techdivision-import.json rename to projects/sample-data/ce/212/conf/techdivision-import.json index 87999b0b..4f786f4d 100644 --- a/example/ce/212/conf/techdivision-import.json +++ b/projects/sample-data/ce/212/conf/techdivision-import.json @@ -15,12 +15,12 @@ "subjects" : [ { "class-name": "TechDivision\\Import\\Product\\Subjects\\BunchSubject", - "processor-factory" : "TechDivision\\Import\\Cli\\Services\\ProductProcessorFactory", + "processor-factory" : "TechDivision\\Import\\Cli\\Services\\ProductBunchProcessorFactory", "utility-class-name" : "TechDivision\\Import\\Product\\Utils\\SqlStatements", "identifier": "files", "source-date-format": "n/d/y, g:i A", - "source-dir": "example/tmp", - "target-dir": "example/tmp", + "source-dir": "projects/sample-data/tmp", + "target-dir": "projects/sample-data/tmp", "prefix": "magento-import", "observers": [ { @@ -37,12 +37,12 @@ "subjects": [ { "class-name": "TechDivision\\Import\\Product\\Subjects\\BunchSubject", - "processor-factory" : "TechDivision\\Import\\Cli\\Services\\ProductProcessorFactory", + "processor-factory" : "TechDivision\\Import\\Cli\\Services\\ProductBunchProcessorFactory", "utility-class-name" : "TechDivision\\Import\\Product\\Utils\\SqlStatements", "identifier": "files", "source-date-format": "n/d/y, g:i A", - "source-dir": "example/tmp", - "target-dir": "example/tmp", + "source-dir": "projects/sample-data/tmp", + "target-dir": "projects/sample-data/tmp", "prefix": "magento-import", "observers": [ { @@ -210,8 +210,8 @@ "processor-factory" : "TechDivision\\Import\\Cli\\Services\\ProductVariantProcessorFactory", "utility-class-name" : "TechDivision\\Import\\Product\\Variant\\Utils\\SqlStatements", "prefix": "variants", - "source-dir": "example/tmp", - "target-dir": "example/tmp", + "source-dir": "projects/sample-data/tmp", + "target-dir": "projects/sample-data/tmp", "observers": [ { "import": [ @@ -225,8 +225,8 @@ "processor-factory" : "TechDivision\\Import\\Cli\\Services\\ProductBundleProcessorFactory", "utility-class-name" : "TechDivision\\Import\\Product\\Bundle\\Utils\\SqlStatements", "prefix": "bundles", - "source-dir": "example/tmp", - "target-dir": "example/tmp", + "source-dir": "projects/sample-data/tmp", + "target-dir": "projects/sample-data/tmp", "observers": [ { "import": [ @@ -243,13 +243,13 @@ "processor-factory" : "TechDivision\\Import\\Cli\\Services\\ProductMediaProcessorFactory", "utility-class-name" : "TechDivision\\Import\\Product\\Media\\Utils\\SqlStatements", "prefix": "media", - "source-dir": "example/tmp", - "target-dir": "example/tmp", + "source-dir": "projects/sample-data/tmp", + "target-dir": "projects/sample-data/tmp", "params" : [ { "root-directory" : "/", "media-directory" : "/opt/appserver/webapps/magento2_ce212/pub/media/catalog/product", - "images-file-directory" : "example/magento2-sample-data/pub/media/catalog/product" + "images-file-directory" : "projects/sample-data/magento2-sample-data/pub/media/catalog/product" } ], "observers": [ @@ -269,8 +269,8 @@ "processor-factory" : "TechDivision\\Import\\Cli\\Services\\ProductLinkProcessorFactory", "utility-class-name" : "TechDivision\\Import\\Product\\Links\\Utils\\SqlStatements", "prefix": "links", - "source-dir": "example/tmp", - "target-dir": "example/tmp", + "source-dir": "projects/sample-data/tmp", + "target-dir": "projects/sample-data/tmp", "observers": [ { "import": [ diff --git a/example/ce/212/data/magento-import_20161024_194026_01.csv b/projects/sample-data/ce/212/data/magento-import_20161024_194026_01.csv similarity index 100% rename from example/ce/212/data/magento-import_20161024_194026_01.csv rename to projects/sample-data/ce/212/data/magento-import_20161024_194026_01.csv diff --git a/example/ce/212/data/magento-import_20161024_194026_02.csv b/projects/sample-data/ce/212/data/magento-import_20161024_194026_02.csv similarity index 100% rename from example/ce/212/data/magento-import_20161024_194026_02.csv rename to projects/sample-data/ce/212/data/magento-import_20161024_194026_02.csv diff --git a/example/ce/212/data/magento-import_20161024_194026_03.csv b/projects/sample-data/ce/212/data/magento-import_20161024_194026_03.csv similarity index 100% rename from example/ce/212/data/magento-import_20161024_194026_03.csv rename to projects/sample-data/ce/212/data/magento-import_20161024_194026_03.csv diff --git a/example/ce/212/data/magento-import_20161024_194026_04.csv b/projects/sample-data/ce/212/data/magento-import_20161024_194026_04.csv similarity index 100% rename from example/ce/212/data/magento-import_20161024_194026_04.csv rename to projects/sample-data/ce/212/data/magento-import_20161024_194026_04.csv diff --git a/projects/sample-data/ee/.DS_Store b/projects/sample-data/ee/.DS_Store new file mode 100644 index 00000000..3bd45994 Binary files /dev/null and b/projects/sample-data/ee/.DS_Store differ diff --git a/projects/sample-data/ee/212/.DS_Store b/projects/sample-data/ee/212/.DS_Store new file mode 100644 index 00000000..fe725539 Binary files /dev/null and b/projects/sample-data/ee/212/.DS_Store differ diff --git a/example/ee/212/conf/techdivision-import.json b/projects/sample-data/ee/212/conf/techdivision-import.json similarity index 92% rename from example/ee/212/conf/techdivision-import.json rename to projects/sample-data/ee/212/conf/techdivision-import.json index 20e136c8..bf0991be 100644 --- a/example/ee/212/conf/techdivision-import.json +++ b/projects/sample-data/ee/212/conf/techdivision-import.json @@ -15,12 +15,12 @@ "subjects" : [ { "class-name": "TechDivision\\Import\\Product\\Ee\\Subjects\\EeBunchSubject", - "processor-factory" : "TechDivision\\Import\\Cli\\Services\\EeProductProcessorFactory", + "processor-factory" : "TechDivision\\Import\\Cli\\Services\\EeProductBunchProcessorFactory", "utility-class-name" : "TechDivision\\Import\\Product\\Ee\\Utils\\SqlStatements", "identifier": "files", "source-date-format": "n/d/y, g:i A", - "source-dir": "example/tmp", - "target-dir": "example/tmp", + "source-dir": "projects/sample-data/tmp", + "target-dir": "projects/sample-data/tmp", "prefix": "magento-import", "observers": [ { @@ -37,12 +37,12 @@ "subjects": [ { "class-name": "TechDivision\\Import\\Product\\Ee\\Subjects\\EeBunchSubject", - "processor-factory" : "TechDivision\\Import\\Cli\\Services\\EeProductProcessorFactory", + "processor-factory" : "TechDivision\\Import\\Cli\\Services\\EeProductBunchProcessorFactory", "utility-class-name" : "TechDivision\\Import\\Product\\Ee\\Utils\\SqlStatements", "identifier": "files", "source-date-format": "n/d/y, g:i A", - "source-dir": "example/tmp", - "target-dir": "example/tmp", + "source-dir": "projects/sample-data/tmp", + "target-dir": "projects/sample-data/tmp", "prefix": "magento-import", "observers": [ { @@ -210,8 +210,8 @@ "processor-factory" : "TechDivision\\Import\\Cli\\Services\\ProductVariantProcessorFactory", "utility-class-name" : "TechDivision\\Import\\Product\\Variant\\Utils\\SqlStatements", "prefix": "variants", - "source-dir": "example/tmp", - "target-dir": "example/tmp", + "source-dir": "projects/sample-data/tmp", + "target-dir": "projects/sample-data/tmp", "observers": [ { "import": [ @@ -225,8 +225,8 @@ "processor-factory" : "TechDivision\\Import\\Cli\\Services\\ProductBundleProcessorFactory", "utility-class-name" : "TechDivision\\Import\\Product\\Bundle\\Utils\\SqlStatements", "prefix": "bundles", - "source-dir": "example/tmp", - "target-dir": "example/tmp", + "source-dir": "projects/sample-data/tmp", + "target-dir": "projects/sample-data/tmp", "observers": [ { "import": [ @@ -243,13 +243,13 @@ "processor-factory" : "TechDivision\\Import\\Cli\\Services\\ProductMediaProcessorFactory", "utility-class-name" : "TechDivision\\Import\\Product\\Media\\Ee\\Utils\\SqlStatements", "prefix": "media", - "source-dir": "example/tmp", - "target-dir": "example/tmp", + "source-dir": "projects/sample-data/tmp", + "target-dir": "projects/sample-data/tmp", "params" : [ { "root-directory" : "/", "media-directory" : "/opt/appserver/webapps/magento2_ee212/pub/media/catalog/product", - "images-file-directory" : "example/magento2-sample-data/pub/media/catalog/product" + "images-file-directory" : "projects/sample-data/magento2-sample-data/pub/media/catalog/product" } ], "observers": [ @@ -269,8 +269,8 @@ "processor-factory" : "TechDivision\\Import\\Cli\\Services\\ProductLinkProcessorFactory", "utility-class-name" : "TechDivision\\Import\\Product\\Link\\Utils\\SqlStatements", "prefix": "links", - "source-dir": "example/tmp", - "target-dir": "example/tmp", + "source-dir": "projects/sample-data/tmp", + "target-dir": "projects/sample-data/tmp", "observers": [ { "import": [ diff --git a/example/ee/212/data/magento-import_20161021_161909_01.csv b/projects/sample-data/ee/212/data/magento-import_20161021_161909_01.csv similarity index 100% rename from example/ee/212/data/magento-import_20161021_161909_01.csv rename to projects/sample-data/ee/212/data/magento-import_20161021_161909_01.csv diff --git a/example/ee/212/data/magento-import_20161021_161909_02.csv b/projects/sample-data/ee/212/data/magento-import_20161021_161909_02.csv similarity index 100% rename from example/ee/212/data/magento-import_20161021_161909_02.csv rename to projects/sample-data/ee/212/data/magento-import_20161021_161909_02.csv diff --git a/example/ee/212/data/magento-import_20161021_161909_03.csv b/projects/sample-data/ee/212/data/magento-import_20161021_161909_03.csv similarity index 100% rename from example/ee/212/data/magento-import_20161021_161909_03.csv rename to projects/sample-data/ee/212/data/magento-import_20161021_161909_03.csv diff --git a/example/ee/212/data/magento-import_20161021_161909_04.csv b/projects/sample-data/ee/212/data/magento-import_20161021_161909_04.csv similarity index 100% rename from example/ee/212/data/magento-import_20161021_161909_04.csv rename to projects/sample-data/ee/212/data/magento-import_20161021_161909_04.csv diff --git a/src/Services/EeProductProcessorFactory.php b/src/Services/EeProductBunchProcessorFactory.php similarity index 93% rename from src/Services/EeProductProcessorFactory.php rename to src/Services/EeProductBunchProcessorFactory.php index c7a2eef2..43df2265 100644 --- a/src/Services/EeProductProcessorFactory.php +++ b/src/Services/EeProductBunchProcessorFactory.php @@ -1,7 +1,7 @@ * @copyright 2016 TechDivision GmbH @@ -61,7 +61,7 @@ * @link https://github.com/techdivision/import-cli-simple * @link http://www.techdivision.com */ -class ProductProcessorFactory extends AbstractProductProcessorFactory +class ProductBunchProcessorFactory extends AbstractProductProcessorFactory { /** @@ -71,7 +71,7 @@ class ProductProcessorFactory extends AbstractProductProcessorFactory */ protected static function getProcessorType() { - return 'TechDivision\Import\Product\Services\ProductProcessor'; + return 'TechDivision\Import\Product\Services\ProductBunchProcessor'; } /** @@ -220,23 +220,23 @@ public static function factory(\PDO $connection, SubjectInterface $configuration // initialize the product processor $processorType = static::getProcessorType(); - $productProcessor = new $processorType(); - $productProcessor->setConnection($connection); - $productProcessor->setEavAttributeOptionValueRepository($eavAttributeOptionValueRepository); - $productProcessor->setUrlRewriteRepository($urlRewriteRepository); - $productProcessor->setProductCategoryAction($productCategoryAction); - $productProcessor->setProductDatetimeAction($productDatetimeAction); - $productProcessor->setProductDecimalAction($productDecimalAction); - $productProcessor->setProductIntAction($productIntAction); - $productProcessor->setProductAction($productAction); - $productProcessor->setProductTextAction($productTextAction); - $productProcessor->setProductVarcharAction($productVarcharAction); - $productProcessor->setProductWebsiteAction($productWebsiteAction); - $productProcessor->setStockItemAction($stockItemAction); - $productProcessor->setStockStatusAction($stockStatusAction); - $productProcessor->setUrlRewriteAction($urlRewriteAction); + $productBunchProcessor = new $processorType(); + $productBunchProcessor->setConnection($connection); + $productBunchProcessor->setEavAttributeOptionValueRepository($eavAttributeOptionValueRepository); + $productBunchProcessor->setUrlRewriteRepository($urlRewriteRepository); + $productBunchProcessor->setProductCategoryAction($productCategoryAction); + $productBunchProcessor->setProductDatetimeAction($productDatetimeAction); + $productBunchProcessor->setProductDecimalAction($productDecimalAction); + $productBunchProcessor->setProductIntAction($productIntAction); + $productBunchProcessor->setProductAction($productAction); + $productBunchProcessor->setProductTextAction($productTextAction); + $productBunchProcessor->setProductVarcharAction($productVarcharAction); + $productBunchProcessor->setProductWebsiteAction($productWebsiteAction); + $productBunchProcessor->setStockItemAction($stockItemAction); + $productBunchProcessor->setStockStatusAction($stockStatusAction); + $productBunchProcessor->setUrlRewriteAction($urlRewriteAction); // return the instance - return $productProcessor; + return $productBunchProcessor; } } diff --git a/src/Services/ProductBundleProcessorFactory.php b/src/Services/ProductBundleProcessorFactory.php index a909a954..a846cdbf 100644 --- a/src/Services/ProductBundleProcessorFactory.php +++ b/src/Services/ProductBundleProcessorFactory.php @@ -31,7 +31,7 @@ use TechDivision\Import\Product\Bundle\Actions\Processors\ProductBundleSelectionPricePersistProcessor; /** - * A SLSB providing methods to load product data using a PDO connection. + * Factory to create a new product bundle processor. * * @author Tim Wagner * @copyright 2016 TechDivision GmbH diff --git a/src/Services/ProductLinkProcessorFactory.php b/src/Services/ProductLinkProcessorFactory.php index 40cc04c3..568ccf94 100644 --- a/src/Services/ProductLinkProcessorFactory.php +++ b/src/Services/ProductLinkProcessorFactory.php @@ -33,7 +33,7 @@ use TechDivision\Import\Product\Link\Actions\Processors\ProductLinkAttributeVarcharPersistProcessor; /** - * A SLSB providing methods to load product link data using a PDO connection. + * Factory to create a new product link processor. * * @author Tim Wagner * @copyright 2016 TechDivision GmbH diff --git a/src/Services/ProductMediaProcessorFactory.php b/src/Services/ProductMediaProcessorFactory.php index 282179d4..5bf0cc93 100644 --- a/src/Services/ProductMediaProcessorFactory.php +++ b/src/Services/ProductMediaProcessorFactory.php @@ -31,7 +31,7 @@ use TechDivision\Import\Product\Media\Actions\ProductMediaGalleryValueToEntityAction; /** - * A SLSB providing methods to load product data using a PDO connection. + * Factory to create a new product media processor. * * @author Tim Wagner * @copyright 2016 TechDivision GmbH diff --git a/src/Services/ProductVariantProcessorFactory.php b/src/Services/ProductVariantProcessorFactory.php index 1057598c..64468e5b 100644 --- a/src/Services/ProductVariantProcessorFactory.php +++ b/src/Services/ProductVariantProcessorFactory.php @@ -33,7 +33,7 @@ use TechDivision\Import\Product\Variant\Actions\Processors\ProductSuperLinkPersistProcessor; /** - * A SLSB providing methods to load product data using a PDO connection. + * Factory to create a new product variant processor. * * @author Tim Wagner * @copyright 2016 TechDivision GmbH diff --git a/src/Simple.php b/src/Simple.php index 0730e841..8f379b2f 100644 --- a/src/Simple.php +++ b/src/Simple.php @@ -281,6 +281,7 @@ public function setUp() $globalData[RegistryKeys::STORES] = $importProcessor->getStores(); $globalData[RegistryKeys::LINK_TYPES] = $importProcessor->getLinkTypes(); $globalData[RegistryKeys::TAX_CLASSES] = $importProcessor->getTaxClasses(); + $globalData[RegistryKeys::DEFAULT_STORE] = $importProcessor->getDefaultStore(); $globalData[RegistryKeys::STORE_WEBSITES] = $importProcessor->getStoreWebsites(); $globalData[RegistryKeys::ROOT_CATEGORIES] = $importProcessor->getRootCategories(); $globalData[RegistryKeys::ATTRIBUTE_SETS] = $eavAttributeSets = $importProcessor->getEavAttributeSetsByEntityTypeId(4); @@ -322,7 +323,10 @@ public function setUp() $globalData[RegistryKeys::EAV_ATTRIBUTES] = $eavAttributes; // add the status with the global data - $registryProcessor->mergeAttributesRecursive($this->getSerial(), array(RegistryKeys::GLOBAL_DATA => $globalData)); + $registryProcessor->mergeAttributesRecursive( + $this->getSerial(), + array(RegistryKeys::GLOBAL_DATA => $globalData) + ); } catch (\Exception $e) { $this->getSystemLogger()->error($e->__toString());