From ec8547a4ac0a38a0a2cc9161c4272f88ed3584ec Mon Sep 17 00:00:00 2001 From: wagnert Date: Fri, 24 Mar 2017 16:50:45 +0100 Subject: [PATCH 1/2] Add Swift Mailer configuration for logger and MissingOptionValuesPlugin --- .gitignore | 1 + CHANGELOG.md | 10 +++ RoboFile.php | 2 +- projects/sample-data/.DS_Store | Bin 6148 -> 0 bytes .../conf/categories/techdivision-import.json | 33 +++++++++ .../conf/products/techdivision-import.json | 67 ++++++++++++++++- .../magento-import_20161024-194026_01.csv | 2 +- .../conf/categories/techdivision-import.json | 33 +++++++++ .../conf/products/techdivision-import.json | 69 ++++++++++++++++++ .../conf/categories/techdivision-import.json | 33 +++++++++ .../conf/products/techdivision-import.json | 69 ++++++++++++++++++ 11 files changed, 315 insertions(+), 4 deletions(-) delete mode 100644 projects/sample-data/.DS_Store diff --git a/.gitignore b/.gitignore index caebcc68..06f62635 100755 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .buildpath .project .settings +.DS_Store composer.lock /dist /target diff --git a/CHANGELOG.md b/CHANGELOG.md index c1827ef5..c85a861e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +# Version 1.0.0-alpha56 + +## Bugfixes + +* None + +## Features + +* Add Swift Mailer configuration for logger and MissingOptionValuesPlugin + # Version 1.0.0-alpha55 ## Bugfixes diff --git a/RoboFile.php b/RoboFile.php index 50a50526..919905e2 100644 --- a/RoboFile.php +++ b/RoboFile.php @@ -206,7 +206,7 @@ public function runCs() // run the code sniffer $this->_exec( sprintf( - '%s/bin/phpcs -n --extensions=php --standard=psr2 --report-full --report-checkstyle=%s/reports/phpcs.xml %s', + '%s/bin/phpcs -n --report-full --extensions=php --standard=phpcs.xml --report-checkstyle=%s/reports/phpcs.xml %s', $this->properties['vendor.dir'], $this->properties['target.dir'], $this->properties['src.dir'] diff --git a/projects/sample-data/.DS_Store b/projects/sample-data/.DS_Store deleted file mode 100644 index 4f0ed8911ba43fc4029e653161ba5296922c19fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%}T>S5Z<*_w-hl4!5;VGt%nwkJqaP!gEt|f2bDG<#Rl4>G^s^vC9k1xgiXdQ#+ZPH$Wd7#IK0xeVS*7k&XJCSK@x!V z9*m6duLFL2iDhiaM!|IP`v*~)H5wm$qg3A9+7?1o#ZL9k>nBq$^Rr3n`r{jAMPV;6 z`el*~zH~phih9$IwRf7tnIFZy@k03Rbrgrm)J-OFn5ua${HzbTl}bfaI#z8qvs-pu z+O|Ef%UP?{sLP|ni+FvBUr|@Dm1be~{1+9fP?>wRJ#;*Jt#X5m7+Lw*;az z=orj3f(L}_R6w1|%@c#`bQqT=&M}y4)ai_?m0=#Ua`AZKYIPWwDx7ggBlW}pF|f=) zNt+g)|7Y;atbF7zr;tSq5Ci{=0bXuJaA`%r)XHIIhwG=^~&Ap^g~%1qMC=TYFFT diff --git a/projects/sample-data/ce/212/conf/categories/techdivision-import.json b/projects/sample-data/ce/212/conf/categories/techdivision-import.json index 019a5857..c412a354 100644 --- a/projects/sample-data/ce/212/conf/categories/techdivision-import.json +++ b/projects/sample-data/ce/212/conf/categories/techdivision-import.json @@ -21,6 +21,39 @@ "password": "appserver.i0" } ], + "loggers": [ + { + "name": "mail", + "channel-name" : "logger/mail", + "type" : "Monolog\\Logger", + "handlers" : [ + { + "type": "Monolog\\Handler\\SwiftMailerHandler", + "params" : [ + { + "log-level" : "error", + "bubble" : false + } + ], + "swift-mailer" : { + "factory" : "TechDivision\\Import\\Utils\\SwiftMailer\\SendmailTransportMailerFactory", + "mailer-factory" : "\\Swift_Mailer", + "params" : [ + { + "to" : "tw@appserver.io", + "from" : "tw@appserver.io", + "subject": "Importer Error", + "content-type" : "text/plain" + } + ], + "transport" : { + "transport-factory" : "\\Swift_SendmailTransport" + } + } + } + ] + } + ], "operations" : [ { "name" : "delete", diff --git a/projects/sample-data/ce/212/conf/products/techdivision-import.json b/projects/sample-data/ce/212/conf/products/techdivision-import.json index 4ef0a646..8cd023ae 100644 --- a/projects/sample-data/ce/212/conf/products/techdivision-import.json +++ b/projects/sample-data/ce/212/conf/products/techdivision-import.json @@ -21,6 +21,39 @@ "password": "appserver.i0" } ], + "loggers": [ + { + "name": "mail", + "channel-name" : "logger/mail", + "type" : "Monolog\\Logger", + "handlers" : [ + { + "type": "Monolog\\Handler\\SwiftMailerHandler", + "params" : [ + { + "log-level" : "error", + "bubble" : false + } + ], + "swift-mailer" : { + "factory" : "TechDivision\\Import\\Utils\\SwiftMailer\\SendmailTransportMailerFactory", + "mailer-factory" : "\\Swift_Mailer", + "params" : [ + { + "to" : "tw@appserver.io", + "from" : "tw@appserver.io", + "subject": "Importer Error", + "content-type" : "text/plain" + } + ], + "transport" : { + "transport-factory" : "\\Swift_SendmailTransport" + } + } + } + ] + } + ], "operations" : [ { "name" : "delete", @@ -188,7 +221,22 @@ ] }, { - "class-name": "TechDivision\\Import\\Plugins\\MissingOptionValuesPlugin" + "class-name": "TechDivision\\Import\\Plugins\\MissingOptionValuesPlugin", + "swift-mailer" : { + "factory" : "TechDivision\\Import\\Utils\\SwiftMailer\\SendmailTransportMailerFactory", + "mailer-factory" : "\\Swift_Mailer", + "params" : [ + { + "to" : "tw@appserver.io", + "from" : "tw@appserver.io", + "subject": "Importer Error", + "content-type" : "text/plain" + } + ], + "transport" : { + "transport-factory" : "\\Swift_SendmailTransport" + } + } }, { "class-name": "TechDivision\\Import\\Plugins\\ArchivePlugin" @@ -323,7 +371,22 @@ ] }, { - "class-name": "TechDivision\\Import\\Plugins\\MissingOptionValuesPlugin" + "class-name": "TechDivision\\Import\\Plugins\\MissingOptionValuesPlugin", + "swift-mailer" : { + "factory" : "TechDivision\\Import\\Utils\\SwiftMailer\\SendmailTransportMailerFactory", + "mailer-factory" : "\\Swift_Mailer", + "params" : [ + { + "to" : "tw@appserver.io", + "from" : "tw@appserver.io", + "subject": "Missing Option Values", + "content-type" : "text/plain" + } + ], + "transport" : { + "transport-factory" : "\\Swift_SendmailTransport" + } + } }, { "class-name": "TechDivision\\Import\\Plugins\\ArchivePlugin" diff --git a/projects/sample-data/ce/212/data/products/add-update/magento-import_20161024-194026_01.csv b/projects/sample-data/ce/212/data/products/add-update/magento-import_20161024-194026_01.csv index 30e6a857..74574a7f 100644 --- a/projects/sample-data/ce/212/data/products/add-update/magento-import_20161024-194026_01.csv +++ b/projects/sample-data/ce/212/data/products/add-update/magento-import_20161024-194026_01.csv @@ -5,7 +5,7 @@ sku,store_view_code,attribute_set_code,product_type,categories,product_websites,
  • Adjustable shoulder strap.
  • Full-length zipper.
  • L 29"" x W 13"" x H 11"".
    • -",,,1,Taxable Goods,"Catalog, Search",36,33,,,joust-duffle-bag-ssss,,,,/m/b/mb01-blue-0.jpg,,/m/b/mb01-blue-0.jpg,,/m/b/mb01-blue-0.jpg,,,,"10/24/16, 12:36 PM","10/24/16, 12:36 PM",,,Block after Info Column,,,,,,,,,,,,,"activity=Gym|Hiking|Trail|Urban,erin_recommends=Yes,features_bags=Audio Pocket|Waterproof|Lightweight|Laptop Sleeve,material=Canvas|Cotton|Mesh|Polyester,sale=Yes,strap_bags=Adjustable|Cross Body|Padded|Shoulder|Single,style_bags=Messenger|Exercise|Tote",100,0,1,0,0,1,1,1,0,1,1,,1,0,1,1,0,1,0,0,0,"24-MB05,24-MB03,24-MB04","2,3,1","24-WB05,24-WB02,24-WB01",",,","24-UB02,24-MB02,24-MB06","3,2,1",/m/b/mb01-blue-0.jpg,Image,,,,,,,,,, +",,,1,Taxable Goods,"Catalog, Search",36,33,,,joust-duffle-bag-ssss,,,,/m/b/mb01-blue-0.jpg,,/m/b/mb01-blue-0.jpg,,/m/b/mb01-blue-0.jpg,,,,"10/24/16, 12:36 PM","10/24/16, 12:36 PM",,,Block after Info Column,,,,,,,,,,,,,"activity=Gyms|Hiking|Trail|Urban,erin_recommends=Yes,features_bags=Audio Pocket|Waterproof|Lightweight|Laptop Sleeve,material=Canvas|Cotton|Mesh|Polyester,sale=Yes,strap_bags=Adjustable|Cross Body|Padded|Shoulder|Single,style_bags=Messenger|Exercise|Tote",100,0,1,0,0,1,1,1,0,1,1,,1,0,1,1,0,1,0,0,0,"24-MB05,24-MB03,24-MB04","2,3,1","24-WB05,24-WB02,24-WB01",",,","24-UB02,24-MB02,24-MB06","3,2,1",/m/b/mb01-blue-0.jpg,Image,,,,,,,,,, 24-MB04,,Bag,simple,"Default Category/Gear,Default Category/Collections,Default Category/Gear/Bags",base,Strive Shoulder Pack,"

    Convenience is next to nothing when your day is crammed with action. So whether you're heading to class, gym, or the unbeaten path, make sure you've got your Strive Shoulder Pack stuffed with all your essentials, and extras as well.

    • Zippered main compartment.
      • diff --git a/projects/sample-data/ce/215/conf/categories/techdivision-import.json b/projects/sample-data/ce/215/conf/categories/techdivision-import.json index 812aef88..53d1778f 100644 --- a/projects/sample-data/ce/215/conf/categories/techdivision-import.json +++ b/projects/sample-data/ce/215/conf/categories/techdivision-import.json @@ -21,6 +21,39 @@ "password": "appserver.i0" } ], + "loggers": [ + { + "name": "mail", + "channel-name" : "logger/mail", + "type" : "Monolog\\Logger", + "handlers" : [ + { + "type": "Monolog\\Handler\\SwiftMailerHandler", + "params" : [ + { + "log-level" : "error", + "bubble" : false + } + ], + "swift-mailer" : { + "factory" : "TechDivision\\Import\\Utils\\SwiftMailer\\SendmailTransportMailerFactory", + "mailer-factory" : "\\Swift_Mailer", + "params" : [ + { + "to" : "tw@appserver.io", + "from" : "tw@appserver.io", + "subject": "Importer Error", + "content-type" : "text/plain" + } + ], + "transport" : { + "transport-factory" : "\\Swift_SendmailTransport" + } + } + } + ] + } + ], "operations" : [ { "name" : "delete", diff --git a/projects/sample-data/ce/215/conf/products/techdivision-import.json b/projects/sample-data/ce/215/conf/products/techdivision-import.json index 6fd7e46c..c3d418d4 100644 --- a/projects/sample-data/ce/215/conf/products/techdivision-import.json +++ b/projects/sample-data/ce/215/conf/products/techdivision-import.json @@ -21,6 +21,39 @@ "password": "appserver.i0" } ], + "loggers": [ + { + "name": "mail", + "channel-name" : "logger/mail", + "type" : "Monolog\\Logger", + "handlers" : [ + { + "type": "Monolog\\Handler\\SwiftMailerHandler", + "params" : [ + { + "log-level" : "error", + "bubble" : false + } + ], + "swift-mailer" : { + "factory" : "TechDivision\\Import\\Utils\\SwiftMailer\\SendmailTransportMailerFactory", + "mailer-factory" : "\\Swift_Mailer", + "params" : [ + { + "to" : "tw@appserver.io", + "from" : "tw@appserver.io", + "subject": "Importer Error", + "content-type" : "text/plain" + } + ], + "transport" : { + "transport-factory" : "\\Swift_SendmailTransport" + } + } + } + ] + } + ], "operations" : [ { "name" : "delete", @@ -187,6 +220,24 @@ } ] }, + { + "class-name": "TechDivision\\Import\\Plugins\\MissingOptionValuesPlugin", + "swift-mailer" : { + "factory" : "TechDivision\\Import\\Utils\\SwiftMailer\\SendmailTransportMailerFactory", + "mailer-factory" : "\\Swift_Mailer", + "params" : [ + { + "to" : "tw@appserver.io", + "from" : "tw@appserver.io", + "subject": "Importer Error", + "content-type" : "text/plain" + } + ], + "transport" : { + "transport-factory" : "\\Swift_SendmailTransport" + } + } + }, { "class-name": "TechDivision\\Import\\Plugins\\ArchivePlugin" } @@ -319,6 +370,24 @@ } ] }, + { + "class-name": "TechDivision\\Import\\Plugins\\MissingOptionValuesPlugin", + "swift-mailer" : { + "factory" : "TechDivision\\Import\\Utils\\SwiftMailer\\SendmailTransportMailerFactory", + "mailer-factory" : "\\Swift_Mailer", + "params" : [ + { + "to" : "tw@appserver.io", + "from" : "tw@appserver.io", + "subject": "Missing Option Values", + "content-type" : "text/plain" + } + ], + "transport" : { + "transport-factory" : "\\Swift_SendmailTransport" + } + } + }, { "class-name": "TechDivision\\Import\\Plugins\\ArchivePlugin" } diff --git a/projects/sample-data/ee/212/conf/categories/techdivision-import.json b/projects/sample-data/ee/212/conf/categories/techdivision-import.json index 43dcd4fe..d72b4cb3 100644 --- a/projects/sample-data/ee/212/conf/categories/techdivision-import.json +++ b/projects/sample-data/ee/212/conf/categories/techdivision-import.json @@ -21,6 +21,39 @@ "password": "appserver.i0" } ], + "loggers": [ + { + "name": "mail", + "channel-name" : "logger/mail", + "type" : "Monolog\\Logger", + "handlers" : [ + { + "type": "Monolog\\Handler\\SwiftMailerHandler", + "params" : [ + { + "log-level" : "error", + "bubble" : false + } + ], + "swift-mailer" : { + "factory" : "TechDivision\\Import\\Utils\\SwiftMailer\\SendmailTransportMailerFactory", + "mailer-factory" : "\\Swift_Mailer", + "params" : [ + { + "to" : "tw@appserver.io", + "from" : "tw@appserver.io", + "subject": "Importer Error", + "content-type" : "text/plain" + } + ], + "transport" : { + "transport-factory" : "\\Swift_SendmailTransport" + } + } + } + ] + } + ], "operations" : [ { "name" : "delete", diff --git a/projects/sample-data/ee/212/conf/products/techdivision-import.json b/projects/sample-data/ee/212/conf/products/techdivision-import.json index cdfb7110..0e4345ea 100644 --- a/projects/sample-data/ee/212/conf/products/techdivision-import.json +++ b/projects/sample-data/ee/212/conf/products/techdivision-import.json @@ -21,6 +21,39 @@ "password": "appserver.i0" } ], + "loggers": [ + { + "name": "mail", + "channel-name" : "logger/mail", + "type" : "Monolog\\Logger", + "handlers" : [ + { + "type": "Monolog\\Handler\\SwiftMailerHandler", + "params" : [ + { + "log-level" : "error", + "bubble" : false + } + ], + "swift-mailer" : { + "factory" : "TechDivision\\Import\\Utils\\SwiftMailer\\SendmailTransportMailerFactory", + "mailer-factory" : "\\Swift_Mailer", + "params" : [ + { + "to" : "tw@appserver.io", + "from" : "tw@appserver.io", + "subject": "Importer Error", + "content-type" : "text/plain" + } + ], + "transport" : { + "transport-factory" : "\\Swift_SendmailTransport" + } + } + } + ] + } + ], "operations" : [ { "name" : "delete", @@ -187,6 +220,24 @@ } ] }, + { + "class-name": "TechDivision\\Import\\Plugins\\MissingOptionValuesPlugin", + "swift-mailer" : { + "factory" : "TechDivision\\Import\\Utils\\SwiftMailer\\SendmailTransportMailerFactory", + "mailer-factory" : "\\Swift_Mailer", + "params" : [ + { + "to" : "tw@appserver.io", + "from" : "tw@appserver.io", + "subject": "Importer Error", + "content-type" : "text/plain" + } + ], + "transport" : { + "transport-factory" : "\\Swift_SendmailTransport" + } + } + }, { "class-name": "TechDivision\\Import\\Plugins\\ArchivePlugin" } @@ -319,6 +370,24 @@ } ] }, + { + "class-name": "TechDivision\\Import\\Plugins\\MissingOptionValuesPlugin", + "swift-mailer" : { + "factory" : "TechDivision\\Import\\Utils\\SwiftMailer\\SendmailTransportMailerFactory", + "mailer-factory" : "\\Swift_Mailer", + "params" : [ + { + "to" : "tw@appserver.io", + "from" : "tw@appserver.io", + "subject": "Missing Option Values", + "content-type" : "text/plain" + } + ], + "transport" : { + "transport-factory" : "\\Swift_SendmailTransport" + } + } + }, { "class-name": "TechDivision\\Import\\Plugins\\ArchivePlugin" } From 1080714874cf122dc925fdd492c69dfbe3d1a34a Mon Sep 17 00:00:00 2001 From: wagnert Date: Fri, 24 Mar 2017 16:51:43 +0100 Subject: [PATCH 2/2] Fixed invalid option value --- .../products/add-update/magento-import_20161024-194026_01.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/sample-data/ce/212/data/products/add-update/magento-import_20161024-194026_01.csv b/projects/sample-data/ce/212/data/products/add-update/magento-import_20161024-194026_01.csv index 74574a7f..30e6a857 100644 --- a/projects/sample-data/ce/212/data/products/add-update/magento-import_20161024-194026_01.csv +++ b/projects/sample-data/ce/212/data/products/add-update/magento-import_20161024-194026_01.csv @@ -5,7 +5,7 @@ sku,store_view_code,attribute_set_code,product_type,categories,product_websites,
    • Adjustable shoulder strap.
    • Full-length zipper.
    • L 29"" x W 13"" x H 11"".
      • -
    ",,,1,Taxable Goods,"Catalog, Search",36,33,,,joust-duffle-bag-ssss,,,,/m/b/mb01-blue-0.jpg,,/m/b/mb01-blue-0.jpg,,/m/b/mb01-blue-0.jpg,,,,"10/24/16, 12:36 PM","10/24/16, 12:36 PM",,,Block after Info Column,,,,,,,,,,,,,"activity=Gyms|Hiking|Trail|Urban,erin_recommends=Yes,features_bags=Audio Pocket|Waterproof|Lightweight|Laptop Sleeve,material=Canvas|Cotton|Mesh|Polyester,sale=Yes,strap_bags=Adjustable|Cross Body|Padded|Shoulder|Single,style_bags=Messenger|Exercise|Tote",100,0,1,0,0,1,1,1,0,1,1,,1,0,1,1,0,1,0,0,0,"24-MB05,24-MB03,24-MB04","2,3,1","24-WB05,24-WB02,24-WB01",",,","24-UB02,24-MB02,24-MB06","3,2,1",/m/b/mb01-blue-0.jpg,Image,,,,,,,,,, +",,,1,Taxable Goods,"Catalog, Search",36,33,,,joust-duffle-bag-ssss,,,,/m/b/mb01-blue-0.jpg,,/m/b/mb01-blue-0.jpg,,/m/b/mb01-blue-0.jpg,,,,"10/24/16, 12:36 PM","10/24/16, 12:36 PM",,,Block after Info Column,,,,,,,,,,,,,"activity=Gym|Hiking|Trail|Urban,erin_recommends=Yes,features_bags=Audio Pocket|Waterproof|Lightweight|Laptop Sleeve,material=Canvas|Cotton|Mesh|Polyester,sale=Yes,strap_bags=Adjustable|Cross Body|Padded|Shoulder|Single,style_bags=Messenger|Exercise|Tote",100,0,1,0,0,1,1,1,0,1,1,,1,0,1,1,0,1,0,0,0,"24-MB05,24-MB03,24-MB04","2,3,1","24-WB05,24-WB02,24-WB01",",,","24-UB02,24-MB02,24-MB06","3,2,1",/m/b/mb01-blue-0.jpg,Image,,,,,,,,,, 24-MB04,,Bag,simple,"Default Category/Gear,Default Category/Collections,Default Category/Gear/Bags",base,Strive Shoulder Pack,"

    Convenience is next to nothing when your day is crammed with action. So whether you're heading to class, gym, or the unbeaten path, make sure you've got your Strive Shoulder Pack stuffed with all your essentials, and extras as well.

    • Zippered main compartment.