MAGETWO-36882: Stabilizing branch

Author: akaplya

app/code/Magento/Reports/Model/Resource/Helper.php

@@ -39,10 +39,10 @@ public function mergeVisitorProductIndex($mainTable, $data, $matchFields)
     /**
      * Update rating position
      *
-     * @param string $adapter
-     * @param string $type
-     * @param string $column
-     * @param string $mainTable
+     * @param $adapter
+     * @param $type
+     * @param $column
+     * @param $mainTable
      * @param $aggregationTable
      * @return $this
      */

app/code/Magento/Sales/Model/Resource/Order/Status.php

@@ -38,11 +38,13 @@ class Status extends EntityAbstract
     protected $logger;
 
     /**
-     * Class constructor
-     *
      * @param \Magento\Framework\Model\Resource\Db\Context $context
+     * @param \Magento\Sales\Model\Resource\Attribute $attribute
+     * @param Manager $sequenceManager
+     * @param EntitySnapshot $entitySnapshot
      * @param LogWriter $logger
-     * @param string|null $resourcePrefix
+     * @param null $resourcePrefix
+     * @param \Magento\Sales\Model\Resource\GridInterface $gridAggregator
      */
     public function __construct(
         \Magento\Framework\Model\Resource\Db\Context $context,

setup/src/Magento/Setup/Model/Installer.php

@@ -806,17 +806,16 @@ public function installUserConfig($data)
 
     /**
      * Creates data handler
-     *
      * @param string $className
-     * @param $interface
+     * @param string $interfaceName
      * @return mixed|null
      * @throws \Magento\Setup\Exception
      */
-    protected function createSchemaDataHandler($className, $interface)
+    protected function createSchemaDataHandler($className, $interfaceName)
     {
         if (class_exists($className)) {
-            if (!is_subclass_of($className, $interface) && $className !== $interface) {
-                throw  new \Magento\Setup\Exception($className . ' must implement \\' . $interface);
+            if (!is_subclass_of($className, $interfaceName) && $className !== $interfaceName) {
+                throw  new \Magento\Setup\Exception($className . ' must implement \\' . $interfaceName);
             } else {
                 return $this->objectManagerProvider->get()->create($className);
             }