Fixing CI issues

src/Category/Category.php

@@ -1,8 +1,28 @@
 <?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License version 3.0
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/AFL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to [email protected] so we can send you a copy immediately.
+ *
+ * @author    PrestaShop SA and Contributors <[email protected]>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
+ */
+
+namespace PrestaShop\Module\PrestashopCheckout\Category;
 
 class Category
 {
-    const DIGITAL_GOODS = "DIGITAL_GOODS";
-    const PHYSICAL_GOODS = "PHYSICAL_GOODS";
-    const DONATION = "DONATION";
+    const DIGITAL_GOODS = 'DIGITAL_GOODS';
+    const PHYSICAL_GOODS = 'PHYSICAL_GOODS';
+    const DONATION = 'DONATION';
 }

src/Discount/Discount.php

@@ -38,7 +38,7 @@ class Discount
      */
     public function __construct($name, $value)
     {
-        $this->name = $this->assertDiscountNameIsValid($name);
+        $this->name = $name;
         $this->value = $this->assertDiscountValueIsValid($value);
     }
 
@@ -58,22 +58,6 @@ public function getValue()
         return $this->value;
     }
 
-    /**
-     * @param string $name
-     *
-     * @return string
-     *
-     * @throws DiscountException
-     */
-    public function assertDiscountNameIsValid($name)
-    {
-        if (is_string($name)) {
-            return $name;
-        }
-
-        throw new DiscountException('Discount name is not a string', DiscountException::INVALID_NAME);
-    }
-
     /**
      * @param string $value
      *

src/Product/Exception/ProductException.php

@@ -24,5 +24,4 @@
 
 class ProductException extends PsCheckoutException
 {
-
 }

src/Product/Product.php

@@ -33,10 +33,10 @@ class Product
     /** @var int */
     private $quantity;
 
-    /** @var boolean */
+    /** @var bool */
     private $isInStock;
 
-    /** @var boolean */
+    /** @var bool */
     private $isAvailableForOrder;
 
     /** @var string */
@@ -77,7 +77,7 @@ public function getUnitPrice()
     }
 
     /**
-     * @return string
+     * @return int
      */
     public function getQuantity()
     {

tests/Unit/Amount/AmountTest.php

@@ -39,21 +39,21 @@ public function validAmountDataProvider()
             [
                 [
                     'value' => '24.99',
-                    'currencyCode' => 'EUR'
+                    'currencyCode' => 'EUR',
                 ],
             ],
             [
                 [
                     'value' => '25.00',
-                    'currencyCode' => 'USD'
-                ]
+                    'currencyCode' => 'USD',
+                ],
             ],
             [
                 [
                     'value' => '17',
-                    'currencyCode' => 'JPY'
-                ]
-            ]
+                    'currencyCode' => 'JPY',
+                ],
+            ],
         ];
     }
 
@@ -63,47 +63,47 @@ public function invalidAmountDataProvider()
             [
                 [
                     'value' => 'twenty',
-                    'currencyCode' => 'EUR'
+                    'currencyCode' => 'EUR',
                 ],
                 [
                     'class' => AmountException::class,
                     'code' => AmountException::INVALID_AMOUNT,
-                    'message' => 'Amount value twenty is not a numeric'
-                ]
+                    'message' => 'Amount value twenty is not a numeric',
+                ],
             ],
             [
                 [
                     'value' => '23..66',
-                    'currencyCode' => 'USD'
+                    'currencyCode' => 'USD',
                 ],
                 [
                     'class' => AmountException::class,
                     'code' => AmountException::INVALID_AMOUNT,
-                    'message' => 'Amount value 23..66 is not a numeric'
-                ]
+                    'message' => 'Amount value 23..66 is not a numeric',
+                ],
             ],
             [
                 [
                     'value' => '24.99',
-                    'currencyCode' => 'FRA'
+                    'currencyCode' => 'FRA',
                 ],
                 [
                     'class' => AmountException::class,
                     'code' => AmountException::INVALID_CURRENCY,
-                    'message' => 'Currency code FRA is not supported'
-                ]
+                    'message' => 'Currency code FRA is not supported',
+                ],
             ],
             [
                 [
                     'value' => '24.99',
-                    'currencyCode' => 'JPY'
+                    'currencyCode' => 'JPY',
                 ],
                 [
                     'class' => AmountException::class,
                     'code' => AmountException::UNEXPECTED_DECIMAL_AMOUNT,
-                    'message' => 'Currency code JPY does not support decimal amount'
-                ]
-            ]
+                    'message' => 'Currency code JPY does not support decimal amount',
+                ],
+            ],
         ];
     }
 }

tests/Unit/Discount/DiscountTest.php

@@ -39,54 +39,43 @@ public function validDiscountDataProvider()
             [
                 [
                     'name' => '30EUR discount',
-                    'value' => '30'
-                ]
+                    'value' => '30',
+                ],
             ],
             [
                 [
                     'name' => 'Black friday offer',
-                    'value' => '24.99'
-                ]
-            ]
+                    'value' => '24.99',
+                ],
+            ],
         ];
     }
 
     public function invalidDiscountDataProvider()
     {
         return [
-            [
-                [
-                    'name' => 14.99,
-                    'value' => '30'
-                ],
-                [
-                    'class' => DiscountException::class,
-                    'code' => DiscountException::INVALID_NAME,
-                    'message' => 'Discount name is not a string'
-                ]
-            ],
             [
                 [
                     'name' => '30EUR discount',
-                    'value' => 30
+                    'value' => 30,
                 ],
                 [
                     'class' => DiscountException::class,
                     'code' => DiscountException::INVALID_VALUE,
-                    'message' => 'Discount value is not supported'
-                ]
+                    'message' => 'Discount value is not supported',
+                ],
             ],
             [
                 [
                     'name' => '50% discount',
-                    'value' => '50%'
+                    'value' => '50%',
                 ],
                 [
                     'class' => DiscountException::class,
                     'code' => DiscountException::INVALID_VALUE,
-                    'message' => 'Discount value is not supported'
-                ]
-            ]
+                    'message' => 'Discount value is not supported',
+                ],
+            ],
         ];
     }
 }