magento-engcom/magento2ce#2203: Fixed tests failures

Author: Stanislav Idolov

app/code/Magento/Analytics/ReportXml/DB/SelectBuilder.php

@@ -11,6 +11,7 @@
 
 /**
  * Responsible for Select object creation, works as a builder. Returns Select as result;
+ *
  * Used in SQL assemblers.
  */
 class SelectBuilder

app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php

@@ -10,6 +10,9 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\StateException;
 
+/**
+ * Eav Option Management
+ */
 class OptionManagement implements \Magento\Eav\Api\AttributeOptionManagementInterface
 {
     /**
@@ -36,7 +39,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function add($entityType, $attributeCode, $option)
     {
@@ -79,7 +82,7 @@ public function add($entityType, $attributeCode, $option)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function delete($entityType, $attributeCode, $optionId)
     {
@@ -110,7 +113,7 @@ public function delete($entityType, $attributeCode, $optionId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getItems($entityType, $attributeCode)
     {
@@ -129,6 +132,8 @@ public function getItems($entityType, $attributeCode)
     }
 
     /**
+     * Validate option
+     *
      * @param \Magento\Eav\Api\Data\AttributeInterface $attribute
      * @param int $optionId
      * @throws NoSuchEntityException
@@ -148,6 +153,8 @@ protected function validateOption($attribute, $optionId)
     }
 
     /**
+     * Returns option id
+     *
      * @param \Magento\Eav\Api\Data\AttributeOptionInterface $option
      * @return string
      */
@@ -157,6 +164,8 @@ private function getOptionId(\Magento\Eav\Api\Data\AttributeOptionInterface $opt
     }
 
     /**
+     * Set option value
+     *
      * @param \Magento\Eav\Api\Data\AttributeOptionInterface $option
      * @param \Magento\Eav\Api\Data\AttributeInterface $attribute
      * @param string $optionLabel

app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/OptionManagementTest.php

@@ -59,13 +59,13 @@ public function testAdd()
         $labelMock = $this->createMock(\Magento\Eav\Api\Data\AttributeOptionLabelInterface::class);
         $option =
             ['value' => [
-                'new_option' => [
+                'id_new_option' => [
                     0 => 'optionLabel',
                     42 => 'labelLabel',
                 ],
             ],
             'order' => [
-                'new_option' => 'optionSortOrder',
+                'id_new_option' => 'optionSortOrder',
             ],
             ];
 
@@ -78,10 +78,10 @@ public function testAdd()
         $labelMock->expects($this->once())->method('getStoreId')->willReturn(42);
         $labelMock->expects($this->once())->method('getLabel')->willReturn('labelLabel');
         $optionMock->expects($this->once())->method('getIsDefault')->willReturn(true);
-        $attributeMock->expects($this->once())->method('setDefault')->with(['new_option']);
+        $attributeMock->expects($this->once())->method('setDefault')->with(['id_new_option']);
         $attributeMock->expects($this->once())->method('setOption')->with($option);
         $this->resourceModelMock->expects($this->once())->method('save')->with($attributeMock);
-        $this->assertEquals('new_option', $this->model->add($entityType, $attributeCode, $optionMock));
+        $this->assertEquals('id_new_option', $this->model->add($entityType, $attributeCode, $optionMock));
     }
 
     /**
@@ -167,13 +167,13 @@ public function testAddWithCannotSaveException()
         $labelMock = $this->createMock(\Magento\Eav\Api\Data\AttributeOptionLabelInterface::class);
         $option =
             ['value' => [
-                'new_option' => [
+                'id_new_option' => [
                     0 => 'optionLabel',
                     42 => 'labelLabel',
                 ],
             ],
                 'order' => [
-                    'new_option' => 'optionSortOrder',
+                    'id_new_option' => 'optionSortOrder',
                 ],
             ];
 
@@ -186,7 +186,7 @@ public function testAddWithCannotSaveException()
         $labelMock->expects($this->once())->method('getStoreId')->willReturn(42);
         $labelMock->expects($this->once())->method('getLabel')->willReturn('labelLabel');
         $optionMock->expects($this->once())->method('getIsDefault')->willReturn(true);
-        $attributeMock->expects($this->once())->method('setDefault')->with(['new_option']);
+        $attributeMock->expects($this->once())->method('setDefault')->with(['id_new_option']);
         $attributeMock->expects($this->once())->method('setOption')->with($option);
         $this->resourceModelMock->expects($this->once())->method('save')->with($attributeMock)
             ->willThrowException(new \Exception());

app/code/Magento/Paypal/Model/AbstractConfig.php

@@ -134,7 +134,7 @@ public function setStoreId($storeId)
      * Returns payment configuration value
      *
      * @param string $key
-     * @param null $storeId
+     * @param null|int $storeId
      * @return null|string
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
@@ -254,7 +254,7 @@ public function isWppApiAvailable()
     /**
      * Check whether method available for checkout or not
      *
-     * @param null $methodCode
+     * @param null|string $methodCode
      *
      * @return bool
      */

app/code/Magento/Paypal/Model/Config.php

@@ -10,6 +10,7 @@
 
 /**
  * Config model that is aware of all \Magento\Paypal payment methods
+ *
  * Works with PayPal-specific system configuration
 
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
@@ -632,6 +633,7 @@ public function __construct(
 
     /**
      * Check whether method available for checkout or not
+     *
      * Logic based on merchant country, methods dependence
      *
      * @param string|null $methodCode
@@ -723,6 +725,7 @@ public function getMerchantCountry()
 
     /**
      * Check whether method supported for specified country or not
+     *
      * Use $_methodCode and merchant country by default
      *
      * @param string|null $method
@@ -896,6 +899,7 @@ public function getExpressCheckoutEditUrl($token)
 
     /**
      * Get url for additional actions that PayPal may require customer to do after placing the order.
+     *
      * For instance, redirecting customer to bank for payment confirmation.
      *
      * @param string $token
@@ -957,6 +961,7 @@ public function areButtonsDynamic()
 
     /**
      * Express checkout shortcut pic URL getter
+     *
      * PayPal will ignore "pal", if there is no total amount specified
      *
      * @param string $localeCode
@@ -996,6 +1001,7 @@ public function getExpressCheckoutInContextImageUrl($localeCode)
 
     /**
      * Get PayPal "mark" image URL
+     *
      * Supposed to be used on payment methods selection
      * $staticSize is applicable for static images only
      *
@@ -1032,6 +1038,7 @@ public function getPaymentMarkImageUrl($localeCode, $orderTotal = null, $pal = n
 
     /**
      * Get "What Is PayPal" localized URL
+     *
      * Supposed to be used with "mark" as popup window
      *
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
@@ -1262,6 +1269,7 @@ public function getExpressCheckoutBASignupOptions()
 
     /**
      * Whether to ask customer to create billing agreements
+     *
      * Unilateral payments are incompatible with the billing agreements
      *
      * @return bool
@@ -1376,6 +1384,7 @@ public function exportExpressCheckoutStyleSettings(\Magento\Framework\DataObject
 
     /**
      * Dynamic PayPal image URL getter
+     *
      * Also can render dynamic Acceptance Mark
      *
      * @param string $type
@@ -1725,6 +1734,7 @@ public function getBmlPublisherId()
 
     /**
      * Get Display option from stored config
+     *
      * @param string $section
      *
      * @return mixed
@@ -1752,6 +1762,7 @@ public function getBmlDisplay($section)
 
     /**
      * Get Position option from stored config
+     *
      * @param string $section
      *
      * @return mixed
@@ -1767,6 +1778,7 @@ public function getBmlPosition($section)
 
     /**
      * Get Size option from stored config
+     *
      * @param string $section
      *
      * @return mixed