Merge pull request #790 from magento-engcom/develop-prs

[EngCom] Public Pull Requests

Author: Oleksii Korshenko

app/code/Magento/Widget/Model/ResourceModel/Widget/Instance/Options/ThemeId.php

@@ -22,11 +22,11 @@ class ThemeId implements \Magento\Framework\Option\ArrayInterface
     protected $_resourceModel;
 
     /**
-     * @param \Magento\Theme\Model\ResourceModel\Theme\Collection $widgetResourceModel
+     * @param \Magento\Theme\Model\ResourceModel\Theme\CollectionFactory $widgetResourceModel
      */
-    public function __construct(\Magento\Theme\Model\ResourceModel\Theme\Collection $widgetResourceModel)
+    public function __construct(\Magento\Theme\Model\ResourceModel\Theme\CollectionFactory $widgetResourceModel)
     {
-        $this->_resourceModel = $widgetResourceModel;
+        $this->_resourceModel = $widgetResourceModel->create();
     }
 
     /**

lib/internal/Magento/Framework/Code/Reader/ArgumentsReader.php

@@ -25,7 +25,7 @@ public function getConstructorArguments(\ReflectionClass $class, $groupByPositio
         /**
          * Skip native PHP types, classes without constructor
          */
-        if (!$class->getFileName() || false == $class->hasMethod(
+        if ($class->isInterface() || !$class->getFileName() || false == $class->hasMethod(
             '__construct'
         ) || !$inherited && $class->getConstructor()->class != $class->getName()
         ) {

setup/src/Magento/Setup/Module/I18n/Dictionary/Writer/Csv.php

@@ -59,14 +59,18 @@ public function write(Phrase $phrase)
      */
     public function __destructor()
     {
-        fclose($this->_fileHandler);
+        if (is_resource($this->_fileHandler)) {
+            fclose($this->_fileHandler);
+        }
     }
 
     /**
      * Destructor for closing file handler
      */
     public function __destruct()
     {
-        fclose($this->_fileHandler);
+        if (is_resource($this->_fileHandler)) {
+            fclose($this->_fileHandler);
+        }
     }
 }