Merge remote-tracking branch 'api/bug-fixes' into bug-fixes

Author: Hayder Sharhan

app/code/Magento/Integration/Model/Oauth/Token/RequestLog/Config.php

@@ -46,4 +46,4 @@ public function getLockTimeout()
     {
         return (int)$this->storeConfig->getValue('oauth/authentication_lock/timeout');
     }
-}
+}

app/code/Magento/Integration/Model/Oauth/Token/RequestLog/WriterInterface.php

@@ -17,6 +17,7 @@ interface WriterInterface
      * @param string $userName
      * @param int $userType
      * @param return void
+     * @return void
      */
     public function resetFailuresCount($userName, $userType);
 
@@ -26,6 +27,7 @@ public function resetFailuresCount($userName, $userType);
      * @param string $userName
      * @param int $userType
      * @param return void
+     * @return void
      */
     public function incrementFailuresCount($userName, $userType);
 

app/code/Magento/Integration/Model/ResourceModel/Oauth/Token/RequestLog.php

@@ -12,8 +12,9 @@
 /**
  * Resource model for failed authentication attempts to retrieve admin/customer token.
  */
-class RequestLog extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-    implements ReaderInterface, WriterInterface
+class RequestLog extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb implements
+    ReaderInterface,
+    WriterInterface
 {
     /**
      * @var \Magento\Framework\Stdlib\DateTime\DateTime

app/code/Magento/WebapiSecurity/Model/Plugin/AnonymousResourceSecurity.php

@@ -9,6 +9,9 @@
 
 class AnonymousResourceSecurity
 {
+    /**
+     * Config path
+     */
     const XML_ALLOW_INSECURE = 'webapi/webapisecurity/allow_insecure';
 
     /**
@@ -34,9 +37,12 @@ public function __construct(\Magento\Framework\App\Config\ReinitableConfigInterf
     }
 
     /**
+     * Filter config values.
+     *
      * @param Converter $subject
      * @param array $nodes
      * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function afterConvert(Converter $subject, $nodes)
     {
@@ -67,6 +73,8 @@ public function afterConvert(Converter $subject, $nodes)
     }
 
     /**
+     * Get node by path.
+     *
      * @param string $route
      * @param string $requestType
      * @param array $source

app/code/Magento/WebapiSecurity/Model/Plugin/CacheInvalidator.php

@@ -23,10 +23,12 @@ public function __construct(\Magento\Framework\App\Cache\TypeListInterface $cach
     }
 
     /**
+     * Invalidate WebApi cache if needed.
+     * 
      * @param \Magento\Framework\App\Config\Value $subject
      * @param \Magento\Framework\App\Config\Value $result
-     *
      * @return \Magento\Framework\App\Config\Value
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function afterAfterSave(
         \Magento\Framework\App\Config\Value $subject,

app/code/Magento/WebapiSecurity/composer.json

@@ -4,10 +4,11 @@
     "require": {
         "php": "~5.5.22|~5.6.0|~7.0.0",
         "magento/module-backend": "100.0.*",
+        "magento/module-webapi": "100.0.*",
         "magento/framework": "100.0.*"
     },
     "type": "magento2-module",
-    "version": "100.0.2",
+    "version": "100.0.0",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/WebapiSecurity/registration.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2015 Magento. All rights reserved.
+ * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 

composer.json

@@ -172,7 +172,7 @@
         "magento/module-vault": "100.0.2",
         "magento/module-version": "100.0.2",
         "magento/module-webapi": "100.0.2",
-        "magento/module-webapisecurity": "100.0.2",
+        "magento/module-webapisecurity": "100.0.0",
         "magento/module-weee": "100.0.2",
         "magento/module-widget": "100.0.2",
         "magento/module-wishlist": "100.0.2",