Merge branch 'release/1.0.9'

Model/Feed.php

@@ -231,13 +231,12 @@ private function initExport(\Magento\Store\Api\Data\StoreInterface $store)
     }
 
     /**
-     * Finish the feed generation, i.e. stop the store emulation and close the csv writer.
+     * Finish the feed generation, i.e. stop the store emulation.
      *
      * @return $this
      */
     private function finishExport()
     {
-        $this->writer->close();
         $this->appEmulation->stopEnvironmentEmulation();
 
         return $this;

Model/Feed/Writer.php

@@ -37,44 +37,40 @@ class Writer extends Csv
      */
     private $filename;
 
-    /**
-     * @var \Magento\Framework\App\Filesystem\DirectoryList
-     */
-    private $directoryList;
-
     /**
      * @param \Magento\Framework\Filesystem $filesystem
-     * @param \Magento\Framework\App\Filesystem\DirectoryList $directoryList
-     * @param $filename
+     * @param string $filename
      * @param null $destination
      */
     public function __construct(
         \Magento\Framework\Filesystem $filesystem,
-        \Magento\Framework\App\Filesystem\DirectoryList $directoryList,
         $filename,
         $destination = null
     ) {
-        $this->directoryList = $directoryList;
         $this->filename = $filename;
 
-        // @see \Magento\ImportExport\Model\Export\Adapter\Csv::__construct()
-        register_shutdown_function([$this, 'destruct']);
-
-        // We use a temporary filename for file generation and do the rename in $this::close().
+        // We use a temporary filename for file generation and do the rename in $this::destruct().
         AbstractAdapter::__construct($filesystem, $this->filename . self::TMP_FILENAME_EXTENSION, DirectoryList::MEDIA);
     }
 
+    /**
+     * This method only exists for compatibility with Magento 2.1 and 2.2.
+     */
+    public function __destruct()
+    {
+        $this->destruct();
+    }
+
     /**
      * Run all actions that should be executed when the writer closes.
      *
      * Actually this is renaming the temporary filename to the real one.
      *
-     * @return $this
+     * @return void
      */
-    public function close()
+    public function destruct()
     {
         $this->_directoryHandle->renameFile($this->filename . self::TMP_FILENAME_EXTENSION, $this->filename);
-
-        return $this;
+        parent::destruct();
     }
 }

README.md

@@ -19,7 +19,7 @@ We recommend to proceed with the following preparational steps before you start
 #### Installation with Composer (recommended)
 1.	In the root directory of your Magento 2 installation install the Recolize Recommendation Engine Extension via the following composer command:
     ```
-    composer require --no-dev recolize/module-recommendation-engine-magento2
+    composer require --update-no-dev  recolize/module-recommendation-engine-magento2
     ```
 
 2.	Afterwards activate the Magento 2 Extension with the following commands:
@@ -61,4 +61,4 @@ In case of an emergency you can easily disable the extension temporarily via the
 As an alternative you can execute the following command in the Magento root directory:
 ```
 bin/magento module:disable Recolize_RecommendationEngine
-```
+```

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "recolize/module-recommendation-engine-magento2",
   "description": "The Recolize Recommendation Engine as extension for Magento 2",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "type": "magento2-module",
   "keywords": [
     "recolize",
@@ -22,7 +22,9 @@
     "email": "[email protected]"
   },
   "require": {
-    "magento/framework": ">=100.1.3"
+    "php": "^5.6|^7",
+    "magento/framework": ">=100.1.3",
+    "magento/module-import-export": ">=100.1.3"
   },
   "autoload": {
     "files": [
@@ -33,6 +35,7 @@
     }
   },
   "require-dev": {
+    "roave/security-advisories": "dev-master",
     "magento/magento-coding-standard": "^5.0"
   },
   "scripts": {
@@ -42,5 +45,11 @@
     "post-update-cmd": [
       "([ $COMPOSER_DEV_MODE -eq 0 ] || vendor/bin/phpcs --config-set installed_paths ../../magento/magento-coding-standard/)"
     ]
-  }
+  },
+  "repositories": [
+    {
+      "type": "composer",
+      "url": "https://repo.magento.com/"
+    }
+  ]
 }

etc/adminhtml/system.xml

@@ -16,7 +16,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
     <system>
         <tab id="recolize" translate="label" sortOrder="200" class="recolizeRecommendationEngineSection">
-            <label><![CDATA[<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAEk2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNS40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgICAgICAgICB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIKICAgICAgICAgICAgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiCiAgICAgICAgICAgIHhtbG5zOnRpZmY9Imh0dHA6Ly9ucy5hZG9iZS5jb20vdGlmZi8xLjAvIgogICAgICAgICAgICB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iPgogICAgICAgICA8eG1wTU06RGVyaXZlZEZyb20gcmRmOnBhcnNlVHlwZT0iUmVzb3VyY2UiPgogICAgICAgICAgICA8c3RSZWY6aW5zdGFuY2VJRD54bXAuaWlkOmIxZTA1OWQyLWI2YTAtNDRhZS1hMGVlLWUyYjZlOWJlOTgyNTwvc3RSZWY6aW5zdGFuY2VJRD4KICAgICAgICAgICAgPHN0UmVmOmRvY3VtZW50SUQ+YWRvYmU6ZG9jaWQ6cGhvdG9zaG9wOjE5Mjc3YmZmLTA5NDItMTE3OC1hNGQxLWFjMjY3NzY0ZjM1MTwvc3RSZWY6ZG9jdW1lbnRJRD4KICAgICAgICAgPC94bXBNTTpEZXJpdmVkRnJvbT4KICAgICAgICAgPHhtcE1NOkRvY3VtZW50SUQ+eG1wLmRpZDoxQjM2QzI4NEMwRDgxMUU0ODQ2N0RDRUQ2QzQ0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" alt="Recolize" /> <div>Recolize</div>]]></label>
+            <label>Recolize</label>
         </tab>
         <section id="recolize_recommendation_engine" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
             <tab>recolize</tab>

etc/module.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Recolize_RecommendationEngine" setup_version="1.0.8">
+    <module name="Recolize_RecommendationEngine" setup_version="1.0.9">
         <sequence>
             <module name="Magento_Backend"/>
         </sequence>