Merge pull request #85 from wagnert/master

Add support for EE attribute import

.semver

@@ -2,5 +2,5 @@
 :major: 1
 :minor: 0
 :patch: 0
-:special: 'beta.4'
+:special: 'beta.10'
 :metadata: ''

CHANGELOG.md

@@ -1,3 +1,13 @@
+# Version 1.0.0-beta10
+
+## Bugfixes
+
+* None
+
+## Features
+
+* Add support for EE attribute import
+
 # Version 1.0.0-beta9
 
 ## Bugfixes

README.md

@@ -95,9 +95,10 @@ The following configuration options are available:
 | Option               | Description                                                     | Default value |
 |:---------------------|:----------------------------------------------------------------|:--------------|
 | --configuration      | Specify the pathname to the configuration file to use | `./vendor/techdivision/import-product/etc/techdivision-import.json` |
+| --pid-filename       | The explicit PID filename to use | `<system-temp-dir>/importer.pid` |
+| --system-name        | The system name to be used (will added to the mail subject, if mails are configured) | The hostname |
+| --installation-dir   | The Magento installation directory to which the files has to be imported | The actual working directory |
 | --entity-type-code   | The Magento entity type code, **MUST** be one of `catalog_product` or `catalog_category`  | n/a |
-| --system-name        | The system name to be used (will added to the mail subject, if mails are configured) | n/a |
-| --installation-dir   | The Magento installation directory to which the files has to be imported | n/a |
 | --source-dir         | The directory that has to be watched for new files | n/a |
 | --target-dir         | The target directory with the files that has been imported | n/a |
 | --magento-edition    | The Magento edition to be used, either one of CE or EE | n/a |
@@ -109,11 +110,16 @@ The following configuration options are available:
 | --db-password        | The password used to connect to the Magento database | n/a |
 | --debug-mode         | The flag to activate the debug mode | `false` |
 | --log-level          | The log level to use (see Monolog documentation for further information) | `info` |
-| --pid-filename       | The explicit PID filename to use | `<system-temp-dir>/importer.pid` |
 
 Beside the `configuration` option, all options can and **SHOULD** be defined in the configuration file. The 
 commandline options should only be used to override these values in some circumstances.
 
+If the `configuration` option has **NOT** been specified, the system tries to locate the Magento Edition, based
+on the specified `installation-dir` option. If the `installation-dir` option **IS** specified explictly, and the
+directory is a valid Magento root directory, the application tries to load database credentials from the 
+`app/etc/env.php` script, so it is **NOT** necessary to specify a database configuration, nor in the configuration 
+file or as commandline parameter.
+
 ### Configuration File
 
 The configuration file **MUST** be in JSON format. Beside itself, all necessary configuration options/arguments

bin/import-simple

@@ -25,6 +25,7 @@ if (!$loaded) {
 }
 
 use TechDivision\Import\Cli\Application;
+use TechDivision\Import\Cli\Console\ArgvInput;
 use TechDivision\Import\Cli\Command\ImportProductsCommand;
 use TechDivision\Import\Cli\Command\ImportCategoriesCommand;
 use TechDivision\Import\Cli\Command\ImportAttributesCommand;
@@ -37,4 +38,4 @@ $application->add(new ImportCategoriesCommand());
 $application->add(new ImportAttributesCommand());
 $application->add(new ImportClearPidFileCommand());
 $application->add(new ImportCreateOkFileCommand());
-$application->run();
+$application->run(new ArgvInput());

composer.json

@@ -14,9 +14,9 @@
         "symfony/expression-language": "~2.8|~3.0",
         "symfony/dependency-injection": "~2.3, !=2.7.0",
         "league/flysystem": "~1.0",
-        "techdivision/import-app-simple": "1.0.0-beta2",
-        "techdivision/import-configuration-jms": "1.0.0-beta5",
-        "techdivision/import": "1.0.0-beta11",
+        "techdivision/import-app-simple": "1.0.0-beta3",
+        "techdivision/import-configuration-jms": "1.0.0-beta6",
+        "techdivision/import": "1.0.0-beta12",
         "techdivision/import-ee": "1.0.0-beta1",
         "techdivision/import-attribute": "1.0.0-alpha4",
         "techdivision/import-category": "1.0.0-beta2",

projects/sample-data/ce/216/data/attributes/add-update/attribute-import_20170428-124902_01.csv

@@ -1,7 +1,7 @@
-store_view_code,attribute_set_name,attribute_group_name,entity_type_code,attribute_code,attribute_model,attribute_option_values,attribute_option_swatch,attribute_option_sort_order,backend_model,backend_table,frontend_model,frontend_input,frontend_label,frontend_class,source_model,frontend_input_renderer,apply_to,display_pattern,backend_type,position,is_required,is_user_defined,default_value,is_unique,note,is_global,is_visible,is_searchable,is_filterable,is_comparable,is_visible_on_front,is_html_allowed_on_front,is_used_for_price_rules,is_filterable_in_search,used_in_product_listing,used_for_sort_by,is_visible_in_advanced_search,position,is_wysiwyg_enabled,is_used_for_promo_rules,is_required_in_admin_store,is_used_in_grid,is_visible_in_grid,is_filterable_in_grid,search_weigh,additional_data,is_used_in_autocomplete,is_displayed_in_autocomplete,is_used_in_spellcheck,facet_min_coverage_rate,facet_max_size,facet_sort_order,display_precision
-"",Default,Product Details,catalog_product,test_select,,"option-01-admin,option-02-admin",,"1,2",,,,select,Test Select (Updated),,Magento\Eav\Model\Entity\Attribute\Source\Table,,,,int,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-default,,,,test_select,,"option-01-default,option-02-default",,,,,,,Test Auswahlfeld (Aktualisiert),,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-"",Default,Product Details,catalog_product,test_multiselect,,"option-01-admin,option-02-admin,option-03-admin",,"3,2,1",Magento\Eav\Model\Entity\Attribute\Backend\ArrayBackend,,,multiselect,Test Multiselect (Updated),,,,,,varchar,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-default,,,,test_multiselect,,"option-01-default,option-02-default,option-03-default",,,,,,,Test Mehrfachauswahlfeld (Aktualisiert),,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-"",Default,Product Details,catalog_product,test_visual_swatch,,"vs-option-01-admin,vs-option-02-admin","type=2,value=#000000|type=2,value=#d646d6","2,1",,,,select,Test Visual Swatch (Updated),,,,,,int,,,,,,,,,,,,,,,,,,,,,,,,,,,"swatch_input_type=visual,update_product_preview_image=0,use_product_image_for_swatch=0",,,,,,,
-default,,,,test_visual_swatch,,"vs-option-01-default,vs-option-02-default",,,,,,,Test Grafisches Auswahlfeld (Aktualisiert),,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+store_view_code,attribute_set_name,attribute_group_name,entity_type_code,attribute_code,sort_order,attribute_model,attribute_option_values,attribute_option_swatch,attribute_option_sort_order,backend_model,backend_table,frontend_model,frontend_input,frontend_label,frontend_class,source_model,frontend_input_renderer,apply_to,display_pattern,backend_type,is_required,is_user_defined,default_value,is_unique,note,is_global,is_visible,is_searchable,is_filterable,is_comparable,is_visible_on_front,is_html_allowed_on_front,is_used_for_price_rules,is_filterable_in_search,used_in_product_listing,used_for_sort_by,is_visible_in_advanced_search,position,is_wysiwyg_enabled,is_used_for_promo_rules,is_required_in_admin_store,is_used_in_grid,is_visible_in_grid,is_filterable_in_grid,search_weigh,additional_data,is_used_in_autocomplete,is_displayed_in_autocomplete,is_used_in_spellcheck,facet_min_coverage_rate,facet_max_size,facet_sort_order,display_precision
+,Default,Product Details,catalog_product,test_select,,,"option-01-admin,option-02-admin",,"1,2",,,,select,Test Select (Updated),,Magento\Eav\Model\Entity\Attribute\Source\Table,,,,int,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+default,,,,test_select,,,"option-01-default,option-02-default",,,,,,,Test Auswahlfeld (Aktualisiert),,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,Default,Product Details,catalog_product,test_multiselect,,,"option-01-admin,option-02-admin,option-03-admin",,"3,2,1",Magento\Eav\Model\Entity\Attribute\Backend\ArrayBackend,,,multiselect,Test Multiselect (Updated),,,,,,varchar,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+default,,,,test_multiselect,,,"option-01-default,option-02-default,option-03-default",,,,,,,Test Mehrfachauswahlfeld (Aktualisiert),,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,Default,Product Details,catalog_product,test_visual_swatch,,,"vs-option-01-admin,vs-option-02-admin","type=2,value=#000000|type=2,value=#d646d6","2,1",,,,select,Test Visual Swatch (Updated),,,,,,int,,,,,,,,,,,,,,,,,,,,,,,,,,"swatch_input_type=visual,update_product_preview_image=0,use_product_image_for_swatch=0",,,,,,,
+default,,,,test_visual_swatch,,,"vs-option-01-default,vs-option-02-default",,,,,,,Test Grafisches Auswahlfeld (Aktualisiert),,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,

projects/sample-data/ce/216/data/attributes/replace/attribute-import_20170428-124902_01.csv

@@ -1,7 +1,7 @@
-store_view_code,attribute_set_name,attribute_group_name,entity_type_code,attribute_code,attribute_model,attribute_option_values,attribute_option_swatch,attribute_option_sort_order,backend_model,backend_table,frontend_model,frontend_input,frontend_label,frontend_class,source_model,frontend_input_renderer,apply_to,display_pattern,backend_type,position,is_required,is_user_defined,default_value,is_unique,note,is_global,is_visible,is_searchable,is_filterable,is_comparable,is_visible_on_front,is_html_allowed_on_front,is_used_for_price_rules,is_filterable_in_search,used_in_product_listing,used_for_sort_by,is_visible_in_advanced_search,position,is_wysiwyg_enabled,is_used_for_promo_rules,is_required_in_admin_store,is_used_in_grid,is_visible_in_grid,is_filterable_in_grid,search_weigh,additional_data,is_used_in_autocomplete,is_displayed_in_autocomplete,is_used_in_spellcheck,facet_min_coverage_rate,facet_max_size,facet_sort_order,display_precision
-"",Default,Product Details,catalog_product,test_select,,"option-01-admin,option-02-admin",,"1,2",,,,select,Test Select,,Magento\Eav\Model\Entity\Attribute\Source\Table,,,,int,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-default,,,,test_select,,"option-01-default,option-02-default",,,,,,,Test Auswahlfeld,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-"",Default,Product Details,catalog_product,test_multiselect,,"option-01-admin,option-02-admin,option-03-admin",,"3,2,1",Magento\Eav\Model\Entity\Attribute\Backend\ArrayBackend,,,multiselect,Test Multiselect,,,,,,varchar,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-default,,,,test_multiselect,,"option-01-default,option-02-default,option-03-default",,,,,,,Test Mehrfachauswahlfeld,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-"",Default,Product Details,catalog_product,test_visual_swatch,,"vs-option-01-admin,vs-option-02-admin","type=2,value=#000000|type=2,value=#d646d6","2,1",,,,select,Test Visual Swatch,,,,,,int,,,,,,,,,,,,,,,,,,,,,,,,,,,"swatch_input_type=visual,update_product_preview_image=0,use_product_image_for_swatch=1",,,,,,,
-default,,,,test_visual_swatch,,"vs-option-01-default,vs-option-02-default",,,,,,,Test Grafisches Auswahlfeld,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+store_view_code,attribute_set_name,attribute_group_name,entity_type_code,attribute_code,sort_order,attribute_model,attribute_option_values,attribute_option_swatch,attribute_option_sort_order,backend_model,backend_table,frontend_model,frontend_input,frontend_label,frontend_class,source_model,frontend_input_renderer,apply_to,display_pattern,backend_type,is_required,is_user_defined,default_value,is_unique,note,is_global,is_visible,is_searchable,is_filterable,is_comparable,is_visible_on_front,is_html_allowed_on_front,is_used_for_price_rules,is_filterable_in_search,used_in_product_listing,used_for_sort_by,is_visible_in_advanced_search,position,is_wysiwyg_enabled,is_used_for_promo_rules,is_required_in_admin_store,is_used_in_grid,is_visible_in_grid,is_filterable_in_grid,search_weigh,additional_data,is_used_in_autocomplete,is_displayed_in_autocomplete,is_used_in_spellcheck,facet_min_coverage_rate,facet_max_size,facet_sort_order,display_precision
+,Default,Product Details,catalog_product,test_select,,,"option-01-admin,option-02-admin",,"1,2",,,,select,Test Select,,Magento\Eav\Model\Entity\Attribute\Source\Table,,,,int,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+default,,,,test_select,,,"option-01-default,option-02-default",,,,,,,Test Auswahlfeld,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,Default,Product Details,catalog_product,test_multiselect,,,"option-01-admin,option-02-admin,option-03-admin",,"3,2,1",Magento\Eav\Model\Entity\Attribute\Backend\ArrayBackend,,,multiselect,Test Multiselect,,,,,,varchar,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+default,,,,test_multiselect,,,"option-01-default,option-02-default,option-03-default",,,,,,,Test Mehrfachauswahlfeld,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,Default,Product Details,catalog_product,test_visual_swatch,,,"vs-option-01-admin,vs-option-02-admin","type=2,value=#000000|type=2,value=#d646d6","2,1",,,,select,Test Visual Swatch,,,,,,int,,,,,,,,,,,,,,,,,,,,,,,,,,"swatch_input_type=visual,update_product_preview_image=0,use_product_image_for_swatch=1",,,,,,,
+default,,,,test_visual_swatch,,,"vs-option-01-default,vs-option-02-default",,,,,,,Test Grafisches Auswahlfeld,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,