Merge pull request #86 from pagarme/develop

Release 2.1.0

Author: fabiano-mallmann

composer.json

@@ -2,7 +2,7 @@
   "name": "pagarme/ecommerce-module-core",
   "description": "Core component for Pagar.me e-commerce platform modules.",
   "license": "MIT",
-  "version": "1.2.0",
+  "version": "2.1.0",
   "authors": [
     {
       "name":"Open Source Team"
@@ -11,15 +11,15 @@
   "type": "library",
   "require": {
     "php": ">=7.1",
-    "monolog/monolog": "*",
-    "pagarme/pagarmecoreapi": "^5.7",
+    "monolog/monolog": "<3",
+    "pagarme/pagarmecoreapi": "5.6.1",
     "ext-json": "*"
   },
   "require-dev": {
     "mockery/mockery": "1.2.4",
     "nesbot/carbon": "1.39.0",
     "ext-pdo": "*",
-    "phpunit/phpunit": "5.7.27"
+    "phpunit/phpunit": "^5 | ^6 | ^7 | ^8 | ^9"
   },
   "autoload": {
     "psr-4": {
@@ -37,5 +37,10 @@
     ],
     "tests": "vendor/bin/phpunit --colors=always",
     "tests-coverage": "vendor/bin/phpunit --colors=always --coverage-html ./tests/report"
+  },
+  "config": {
+    "allow-plugins": {
+      "kylekatarnls/update-helper": true
+    }
   }
 }

src/Hub/Aggregates/InstallToken.php

@@ -132,10 +132,7 @@ public function setDisabled($isDisabled)
     {
     }
 
-    /**
-     *
-     * @return array|mixed
-     */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         $obj = new \stdClass();

src/Hub/Commands/CommandType.php

@@ -12,7 +12,7 @@ final class CommandType extends AbstractValueObject
 
     /**
      *
-     * @var string 
+     * @var string
      */
     private $value;
 
@@ -58,7 +58,7 @@ private function setValue($value)
 
     /**
      *
-     * @var static $object 
+     * @var static $object
      */
     public function isEqual($object)
     {
@@ -72,8 +72,9 @@ public function isEqual($object)
      * which is a value of any type other than a resource.
      * @since 5.4.0
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return $this->value;
     }
-}
+}

src/Kernel/Aggregates/Charge.php

@@ -17,17 +17,17 @@ final class Charge extends AbstractEntity implements ChargeInterface
 
     /**
      *
-     * @var OrderId 
+     * @var OrderId
      */
     private $orderId;
     /**
      *
-     * @var int 
+     * @var int
      */
     private $amount;
     /**
      *
-     * @var int 
+     * @var int
      */
     private $paidAmount;
     /**
@@ -45,18 +45,18 @@ final class Charge extends AbstractEntity implements ChargeInterface
 
     /**
      *
-     * @var string 
+     * @var string
      */
     private $code;
     /**
      *
-     * @var ChargeStatus 
+     * @var ChargeStatus
      */
     private $status;
 
     /**
      *
-     * @var Transaction[] 
+     * @var Transaction[]
      */
     private $transactions;
 
@@ -456,6 +456,7 @@ public function getCustomerId()
      * which is a value of any type other than a resource.
      * @since  5.4.0
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         $obj = new \stdClass();
@@ -475,4 +476,4 @@ public function jsonSerialize()
 
         return $obj;
     }
-}
+}

src/Kernel/Aggregates/Configuration.php

@@ -705,7 +705,7 @@ public function setBoletoDueDays($boletoDueDays)
         if (!is_numeric($boletoDueDays)) {
             throw new InvalidParamException("Boleto due days should be an integer!", $boletoDueDays);
         }
-        
+
         $this->boletoDueDays = (int) $boletoDueDays;
     }
 
@@ -733,6 +733,7 @@ public function setBoletoBankCode($boletoBankCode)
      * which is a value of any type other than a resource.
      * @since  5.4.0
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return [

src/Kernel/Aggregates/LogObject.php

@@ -96,6 +96,7 @@ public function setVersions($versions)
      * which is a value of any type other than a resource.
      * @since  5.4.0
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         $baseObject = new \stdClass();
@@ -106,4 +107,4 @@ public function jsonSerialize()
 
         return $baseObject;
     }
-}
+}

src/Kernel/Aggregates/Order.php

@@ -15,18 +15,18 @@ final class Order extends AbstractEntity
 
     /**
      *
-     * @var PlatformOrderInterface 
+     * @var PlatformOrderInterface
      */
     private $platformOrder;
 
     /**
      *
-     * @var OrderStatus 
+     * @var OrderStatus
      */
     private $status;
     /**
      *
-     * @var Charge[] 
+     * @var Charge[]
      */
     private $charges;
 
@@ -170,7 +170,7 @@ public function addCharge(ChargeInterface $newCharge)
         $charges[] = $newCharge;
         $this->charges = $charges;
 
-        return $this;  
+        return $this;
     }
 
     public function updateCharge(ChargeInterface $updatedCharge, $overwriteId = false)
@@ -200,6 +200,7 @@ public function updateCharge(ChargeInterface $updatedCharge, $overwriteId = fals
      * which is a value of any type other than a resource.
      * @since  5.4.0
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         $obj = new \stdClass();
@@ -214,4 +215,4 @@ public function jsonSerialize()
 
         return $obj;
     }
-}
+}

src/Kernel/Aggregates/Transaction.php

@@ -18,7 +18,7 @@ final class Transaction extends AbstractEntity
     private $transactionType;
     /**
      *
-     * @var int 
+     * @var int
      */
     private $amount;
     /**
@@ -29,23 +29,23 @@ final class Transaction extends AbstractEntity
 
     /**
      *
-     * @var TransactionStatus 
+     * @var TransactionStatus
      */
     private $status;
     /**
      *
-     * @var \DateTime 
+     * @var \DateTime
      */
     private $createdAt;
     /**
      *
-     * @var ChargeId 
+     * @var ChargeId
      */
     private $chargeId;
 
     /**
      *
-     * @var string 
+     * @var string
      */
     private $acquirerName;
     /**
@@ -65,19 +65,19 @@ final class Transaction extends AbstractEntity
     private $acquirerAuthCode;
     /**
      *
-     * @var string 
+     * @var string
      */
     private $acquirerMessage;
 
     /**
      *
-     * @var string 
+     * @var string
      */
     private $brand;
 
     /**
      *
-     * @var int 
+     * @var int
      */
     private $installments;
 
@@ -398,6 +398,7 @@ public function setPostData($postData)
      * which is a value of any type other than a resource.
      * @since  5.4.0
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         $obj = new \stdClass();
@@ -441,4 +442,4 @@ public function setCardData($cardData)
         $this->cardData = $cardData;
         return $this;
     }
-}
+}

src/Kernel/Exceptions/AbstractPagarmeCoreException.php

@@ -17,6 +17,7 @@ abstract class AbstractPagarmeCoreException
       * which is a value of any type other than a resource.
       * @since  5.4.0
       */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         $obj = new \stdClass();
@@ -30,4 +31,4 @@ public function jsonSerialize()
 
         return $obj;
     }
-}
+}

src/Kernel/Helper/StringFunctionsHelper.php

@@ -153,6 +153,9 @@ public function cleanStrToDb($str)
      */
     public static function removeLineBreaks($text)
     {
+        if($text === null) {
+            return "";
+        }
         $pattern = '/\\\s+\\\s\\\r\\\n|\\\r|\\\t|\\\n\\\r|\\\n/m';
         $textCleanBreakLines = trim(
             preg_replace(