Merge pull request #11 from pagarme/develop

Develop

Author: netorodrigues

README.md

@@ -13,7 +13,7 @@ This is the repository of Pagar.me's payment module core for all supported e-com
 -   [Pagar.me Magento payment module for Magento 2.3+](https://github.com/pagarme/magento2).
 
 ## Dependencies
-*   ``PHP`` Version 5.6+
+*   ``PHP`` Version 7.1+
 
 ## Install
 Require by composer

azure-pipelines.yml

@@ -28,12 +28,12 @@ stages:
         sudo update-alternatives --set phpdbg /usr/bin/phpdbg$(phpCurrentVersion)
         sudo update-alternatives --set php-cgi /usr/bin/php-cgi$(phpCurrentVersion)
         sudo update-alternatives --set phar.phar /usr/bin/phar.phar$(phpCurrentVersion)
-        sudo apt-get install php-xdebug
+        sudo apt-get install php7.2-xdebug
         php -version        
       displayName: Build PHP Version $(phpCurrentVersion)  
 
     - script: |     
-        sudo apt-get install php-xdebug
+        sudo apt-get install php7.2-xdebug
         php -version             
       displayName: Install PHP extensions
     

composer.json

@@ -2,15 +2,15 @@
   "name": "pagarme/ecommerce-module-core",
   "description": "Core component for Pagar.me e-commerce platform modules.",
   "license": "MIT",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "authors": [
     {
       "name":"Open Source Team"
     }
   ],
   "type": "library",
   "require": {
-    "php": ">=5.6",
+    "php": ">=7.1",
     "monolog/monolog": "~1.6",
     "mundipagg/mundiapi": "^3.0",
     "ext-json": "*"

src/Hub/Commands/InstallCommand.php

@@ -18,6 +18,8 @@ public function execute()
 
         $moduleConfig->setHubInstallId($this->getInstallId());
 
+        $moduleConfig->setHubEnvironment($this->getType());
+
         $moduleConfig->setPublicKey(
             $this->getAccountPublicKey()
         );

src/Hub/Factories/HubCommandFactory.php

@@ -31,8 +31,8 @@ public function createFromStdClass($object)
 
         /**
          *
- * @var AbstractCommand $command 
-*/
+        * @var AbstractCommand $command
+        */
         $command = new $commandClass();
 
         $command->setAccessToken(
@@ -48,7 +48,10 @@ public function createFromStdClass($object)
         );
 
         $publicKeyClass = PublicKey::class;
-        if ($command->getType()->equals(CommandType::Sandbox())) {
+        if (
+            $command->getType()->equals(CommandType::Sandbox())
+            || $command->getType()->equals(CommandType::Development())
+        ) {
             $publicKeyClass = TestPublicKey::class;
         }
 

src/Hub/Services/HubIntegrationService.php

@@ -49,8 +49,9 @@ public function endHubIntegration(
 
         $installToken = $tokenRepo->findByPagarmeId(new HubInstallToken($installToken));
 
-        if (is_a($installToken, InstallToken::class) 
-            && !$installToken->isExpired() 
+        if (
+            is_a($installToken, InstallToken::class)
+            && !$installToken->isExpired()
             && !$installToken->isUsed()
         ) {
             $body = [
@@ -100,4 +101,4 @@ public function executeCommandFromPost($body)
         $command = $commandFactory->createFromStdClass($body);
         $command->execute();
     }
-}
+}

src/Kernel/Abstractions/AbstractModuleCoreSetup.php

@@ -4,6 +4,7 @@
 
 use Pagarme\Core\Kernel\Aggregates\Configuration;
 use Pagarme\Core\Kernel\Repositories\ConfigurationRepository;
+use MundiAPILib\Configuration as MundiAPIConfiguration;
 use ReflectionClass;
 
 abstract class AbstractModuleCoreSetup
@@ -72,6 +73,15 @@ public static function bootstrap($platformRoot = null)
             static::$platformRoot = $platformRoot;
 
             static::updateModuleConfiguration();
+
+            static::$instance->setApiBaseUrl();
+        }
+    }
+
+    protected static function setApiBaseUrl()
+    {
+        if (static::$moduleConfig->isHubEnabled()) {
+            MundiAPIConfiguration::$BASEURI = 'https://hubapi.mundipagg.com/core/v1';
         }
     }
 
@@ -98,7 +108,7 @@ protected static function updateModuleConfiguration()
             static::$moduleConfig->setStoreId(static::getCurrentStoreId());
         }
 
-        if(
+        if (
             static::$moduleConfig->getStoreId() != static::getDefaultStoreId() &&
             $savedConfig === null
         ) {
@@ -241,7 +251,7 @@ public static function getModuleConcreteDir()
 
     public static function setModuleConcreteDir($concreteModuleDir)
     {
-        if(!isset(self::$moduleConcreteDir)) {
+        if (!isset(self::$moduleConcreteDir)) {
             self::$moduleConcreteDir = $concreteModuleDir;
         }
     }
@@ -288,4 +298,3 @@ public static function getStoreTimezone()
      */
     abstract protected function getPlatformStoreTimezone();
 }
-

src/Kernel/Aggregates/Configuration.php

@@ -62,6 +62,12 @@ final class Configuration extends AbstractEntity
      */
     private $hubInstallId;
 
+    /**
+     *
+     * @var string
+     */
+    private $hubEnvironment;
+
     /** @var string */
     private $cardOperation;
 
@@ -315,6 +321,16 @@ public function getHubInstallId()
         return $this->hubInstallId;
     }
 
+    public function setHubEnvironment($hubEnvironment)
+    {
+        $this->hubEnvironment = $hubEnvironment;
+    }
+
+    public function getHubEnvironment()
+    {
+        return $this->hubEnvironment;
+    }
+
     /**
      *
      * @param  bool $boletoEnabled
@@ -711,6 +727,7 @@ public function jsonSerialize()
             "boletoCreditCardEnabled" => $this->boletoCreditCardEnabled,
             "testMode" => $this->testMode,
             "hubInstallId" => $this->isHubEnabled() ? $this->hubInstallId->getValue() : null,
+            "hubEnvironment" => $this->hubEnvironment,
             "addressAttributes" => $this->getAddressAttributes(),
             "keys" => $this->keys,
             "cardOperation" => $this->cardOperation,

src/Kernel/Factories/ConfigurationFactory.php

@@ -124,6 +124,10 @@ public function createFromJsonData($json)
             );
         }
 
+        if (!empty($data->hubEnvironment)) {
+            $config->setHubEnvironment($data->hubEnvironment);
+        }
+
         if (!empty($data->keys) ) {
             if (!isset($data->publicKey)) {
                 $index = Configuration::KEY_PUBLIC;

src/Kernel/Factories/Configurations/PixConfigFactory.php

@@ -27,6 +27,17 @@ public function createFromDbData($data)
             $pixConfig->setExpirationQrCode($data->expirationQrCode);
         }
 
+        if (!empty($data->additionalInformation)) {
+            $additionalInformationArray = json_decode(
+                json_encode($data->additionalInformation),
+                true
+            );
+
+            $pixConfig->setAdditionalInformation(
+                $additionalInformationArray
+            );
+        }
+
         if (!empty($data->bankType)) {
             $pixConfig->setBankType(
                 $data->bankType