Merge pull request #230 from mercadopago/master

Update from master

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,31 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+> For support request no related with bugs or feature requests for this SDK, please use the official developers support channel https://mercadopago.com.ar/developers/es/support/
+
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Using this snippet '....' 
+3. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Server (please complete the following information):**
+ - OS: [e.g. iOS]
+ - WebServer
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.gitignore

@@ -17,4 +17,6 @@ nbproject
 /composer.lock
 
 #Samples Vendor
-/samples/vendor
+/samples/vendor
+
+.env

.travis.yml

@@ -1,9 +1,9 @@
 language: php
 php:
-  - "5.3"
-  - "5.5"
   - "5.6"
   - "7.0"
+  - "7.1"
+  - "7.2"
 
 before_script:
   - composer self-update

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 MercadoPago Developers
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,26 +1,24 @@
 # Mercado Pago SDK for PHP
 
-[![Build Status](https://travis-ci.org/imasson/px-php.png)](https://travis-ci.org/imasson/px-php)
-[![Coverage Status](https://coveralls.io/repos/github/imasson/px-php/badge.svg?branch=feature-ci-configuration-restclient)](https://coveralls.io/github/imasson/px-php?branch=feature-ci-configuration-restclient)
+[![Build Status](https://travis-ci.org/mercadopago/dx-php.png)](https://travis-ci.org/mercadopago/dx-php)
 
 This library provides developers with a simple set of bindings to the Mercado Pago API.
 
 ### PHP Versions Supported:
 
-The SDK supports PHP 5 or major
+The SDK supports PHP 5.6 or major
 
 ### Installation 
 
 #### Using Composer
 
-1. Download [Composer](https://getcomposer.org/download/) if not already installed
-2. Go to your project directory and Execute `composer require "mercadopago/px-php"` on the command line.
+1. Download [Composer](https://getcomposer.org/doc/00-intro.md#installation-linux-unix-macos) if not already installed
+2. Go to your project directory and run `composer require "mercadopago/dx-php:1.2.1"` on the command line.
 3. This how your directory structure would look like.
-
-![screen shot 2017-12-27 at 5 25 43 pm](https://user-images.githubusercontent.com/864790/34393031-6c1068a4-eb2e-11e7-933a-81a47ba7b727.png)
-
 4. Thats all, you have Mercado Pago SDK installed.
 
+![installation-demo](img/ezgif-2-f98e8701825e.gif)
+
 ### Quick Start 
 
 1. You have to require the library from your Composer vendor folder.
@@ -33,19 +31,18 @@ The SDK supports PHP 5 or major
 
   You have two types of credentials:
 
-  * **For web-checkout:**
+  * **For API or custom checkout:**
     ```php
     MercadoPago\SDK::setAccessToken("YOUR_ACCESS_TOKEN");      // On Production
     MercadoPago\SDK::setAccessToken("YOUR_TEST_ACCESS_TOKEN"); // On Sandbox
     ```
-
-  * **For API or custom checkout:**
+  * **For Web-checkout:**
     ```php
     MercadoPago\SDK::setClientId("YOUR_CLIENT_ID");
     MercadoPago\SDK::setClientSecret("YOUR_CLIENT_SECRET");
     ```
 
-3. Use the resource objects.
+3. Using resource objects.
 
   You can interact with all the resources available in the public API, to this each resource is represented by classes according to the following diagram:
 
@@ -56,7 +53,7 @@ The SDK supports PHP 5 or major
 ```php
   <?php
 
-    require_once 'vendor/autoload.php';
+    require __DIR__  . '/vendor/autoload.php';
 
     MercadoPago\SDK::setAccessToken("YOUR_ACCESS_TOKEN");
 
@@ -70,14 +67,12 @@ The SDK supports PHP 5 or major
     $payment->payer = array(
       "email" => "[email protected]"
     );
-
-    $payment->save();
-
+
     echo $payment->status;
-
+    
   ?>
 ```
 
 ### Support 
 
-Write us at developers@mercadopago.com
+Write us at [developers.mercadopago.com](https://developers.mercadopago.com)

composer.json

@@ -3,6 +3,11 @@
   "type": "library",
   "homepage": "https://github.com/mercadopago/dx-php",
   "license": "MIT",
+  "config": {
+    "platform": {
+        "php": "5.6"
+    }
+  },
   "authors": [
     {
       "name": "imasson",
@@ -16,25 +21,28 @@
     }
   ],
   "require": {
-    "php": ">=5.4.0",
-    "doctrine/common": "~2.4"
+    "php": ">=5.5.0",
+    "doctrine/common": "~2.6",
+    "doctrine/annotations": "1.4"
   },
   "require-dev": {
-    "phpunit/phpunit": "~4.0",
+    "phpunit/phpunit": "^5",
     "symfony/yaml": "~2.5",
     "phpmd/phpmd": "@stable",
     "squizlabs/php_codesniffer": "2.3.*",
     "sebastian/phpcpd": "*", 
-    "doctrine/orm": "~2.3"
+    "doctrine/orm": "~2.3",
+    "vlucas/phpdotenv": "^2.5"
   },
   "autoload": {
     "psr-4": {
       "MercadoPago\\": [
         "src/MercadoPago/",
         "tests/",
+        "src/MercadoPago/Generic/",
         "src/MercadoPago/Entities/",
         "src/MercadoPago/Entities/Shared/"
       ]
     }
   }
-}
+}

samples/customer-and-cards/customer/create.php

@@ -2,7 +2,7 @@
 
     require_once dirname(__FILE__).'/../../index.php';
 
-    $config->set('ACCESS_TOKEN', 'TEST-6295877106812064-042916-6cead5bc1e48af95ea61cc9254595865__LC_LA__-202809963');
+    $config->set('ACCESS_TOKEN', 'ACCESS_TOKEN');
 
     $customer = new MercadoPago\Customer();
     $customer->email = "[email protected]";

samples/payment/minimal/cancel.php

@@ -2,7 +2,7 @@
 
   require_once dirname(__FILE__) . '/../../index.php';
 
-  $config->set('ACCESS_TOKEN', 'TEST-6295877106812064-042916-6cead5bc1e48af95ea61cc9254595865__LC_LA__-202809963');
+  $config->set('ACCESS_TOKEN', 'ACCESS_TOKEN');
 
   # Create a Payment
   require_once dirname(__FILE__) . '/create.php';

samples/suscriptions/basic-suscription.php

@@ -2,7 +2,7 @@
 
   require_once dirname(__FILE__) . '/../../index.php';
 
-  $config->set('ACCESS_TOKEN', 'TEST-6295877106812064-042916-6cead5bc1e48af95ea61cc9254595865__LC_LA__-202809963');
+  $config->set('ACCESS_TOKEN', 'ACCESS_TOKEN');
 
 
   $preapproval_data = new MercadoPago\Preapproval();

samples/suscriptions/pause-subscription.php

@@ -2,7 +2,7 @@
 
   require_once dirname(__FILE__) . '/../../index.php';
 
-  $config->set('ACCESS_TOKEN', 'TEST-6295877106812064-042916-6cead5bc1e48af95ea61cc9254595865__LC_LA__-202809963');
+  $config->set('ACCESS_TOKEN', 'ACCESS_TOKEN');
 
 
   # Create a Plan

samples/suscriptions/plan-create.php

@@ -2,7 +2,7 @@
 
   require_once dirname(__FILE__) . '/../../index.php';
 
-  $config->set('ACCESS_TOKEN', 'TEST-6295877106812064-042916-6cead5bc1e48af95ea61cc9254595865__LC_LA__-202809963');
+  $config->set('ACCESS_TOKEN', 'ACCESS_TOKEN');
 
   $plan = new MercadoPago\Plan();
 

samples/suscriptions/subscribe-to-plan.php

@@ -2,7 +2,7 @@
 
   require_once dirname(__FILE__) . '/../../index.php';
 
-  $config->set('ACCESS_TOKEN', 'TEST-6295877106812064-042916-6cead5bc1e48af95ea61cc9254595865__LC_LA__-202809963');
+  $config->set('ACCESS_TOKEN', 'ACCESS_TOKEN');
 
 
   # Create a Plan
@@ -12,7 +12,7 @@
 
   $subscription->plan_id = $plan->id;
 
-  $subscription->payer = array("id": "customer_id");
+  $subscription->payer = array("id" => "customer_id");
 
   $subscription->save();
 

src/MercadoPago/Annotation/Attribute.php

@@ -17,6 +17,7 @@ class Attribute extends Annotation
      * @var
      */
     public $required = false;
+    public $serialize = true ;
     public $readOnly;
     public $primaryKey;
     public $idempotency;

src/MercadoPago/Config.php

@@ -32,6 +32,7 @@ protected function getDefaults()
             'base_url'      => 'https://api.mercadopago.com',
             'CLIENT_ID'     => '',
             'CLIENT_SECRET' => '',
+            'USER_ID'       => '',
             'APP_ID'        => '',
             'ACCESS_TOKEN'  => '',
             'REFRESH_TOKEN' => '',
@@ -106,13 +107,47 @@ private function _getParser($extension)
     public function set($key, $value)
     {
         parent::set($key, $value);
-        if ($this->get('CLIENT_ID') != "" && $this->get('CLIENT_SECRET') != "" && empty($this->get('ACCESS_TOKEN'))) {
+
+        if ($key == "ACCESS_TOKEN") { 
+            $user = $this->getUserId($value);
+            parent::set('USER_ID', $user['id']);
+        }
+
+        if (parent::get('CLIENT_ID') != "" && parent::get('CLIENT_SECRET') != "" && empty(parent::get('ACCESS_TOKEN'))) {
+
             $response = $this->getToken();
-            if (isset($response['access_token']) && isset($response['refresh_token'])) {
+
+            if (isset($response['access_token'])) {
                 parent::set('ACCESS_TOKEN', $response['access_token']);
-                parent::set('REFRESH_TOKEN', $response['refresh_token']);
+
+
+                $user = $this->getUserId($response['access_token']);
+
+                if (isset($user['id'])) {
+                    parent::set('USER_ID', $user['id']);
+                }
+
             }
+
+        }
+    }
+
+
+    /** 
+     * @return mixed
+     */
+    public function getUserId($access_token)
+    {
+        if (!$this->_restclient) {
+            $this->_restclient = new RestClient();
+            $this->_restclient->setHttpParam('address', $this->get('base_url'));
         }
+        $response = $this->_restclient->get("/users/me", array(
+                "url_query" => array("access_token" => $access_token)
+            )
+        );  
+
+        return $response["body"];
     }
 
     /**
@@ -143,8 +178,8 @@ public function refreshToken()
             $this->_restclient = new RestClient();
         }
         $data = ['grant_type'    => 'refresh_token',
-            'refresh_token'     => $this->get('REFRESH_TOKEN'),
-            'client_secret' => $this->get('ACCESS_TOKEN')];
+                'refresh_token'     => $this->get('REFRESH_TOKEN'),
+                'client_secret' => $this->get('ACCESS_TOKEN')];
         $this->_restclient->setHttpParam('address', $this->get('base_url'));
         $response = $this->_restclient->post("/oauth/token", ['json_data' => json_encode($data)]);
         if (isset($response['access_token']) && isset($response['refresh_token']) && isset($response['client_id']) && isset($response['client_secret'])) {

src/MercadoPago/Config/AbstractConfig.php

@@ -36,6 +36,14 @@ protected function getDefaults()
         return [];
     }
 
+    public function clean()
+    {
+        return $this->data = array(
+            'base_url'      => 'https://api.mercadopago.com',
+        );
+    }
+
+
     /**
      * @param      $key
      * @param null $default
@@ -44,6 +52,7 @@ protected function getDefaults()
      */
     public function get($key, $default = null)
     {
+
         if ($this->has($key)) {
             return $this->data[$key];
         }