Merge pull request #14 from ingrammicro/autotesting

Autotesting

Author: marcserrat

.gitattributes

@@ -0,0 +1,7 @@
+/CHANGELOG.md   export-ignore
+/.gitattributes export-ignore
+/.travis.yml    export-ignore
+/phpunit.xml   export-ignore
+/examples       export-ignore
+/tests          export-ignore
+/assets         export-ignore

.gitignore

@@ -223,4 +223,7 @@ fabric.properties
 
 # composer
 /vendor
-composer.lock
+composer.lock
+
+# codecov
+coverage.xml

.travis.yml

@@ -0,0 +1,16 @@
+language: php
+
+php:
+- '5.6'
+- '7.0'
+- '7.1'
+- '7.2'
+
+install:
+- composer install
+
+script:
+- ./vendor/bin/phpunit -c ./phpunit.xml
+
+after_success:
+- bash <(curl -s https://codecov.io/bash)

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Connect PHP fulfillment SDK Change Log
 
+## 1.1.0
+    - Added autotesting coverage
+    - Introduced new FulfillmentAutomation interface instead of former RequestsProcessor
+    - Removed php Reflection as performance improvement
+    - New Model system
+    - Added Guzzle as defult http client
 ## 1.0.4
     - Deprecation of var for public on accessible variables to be compilant with latest standards
     - moved to psr-4 instead of psr-1

README.md

@@ -2,6 +2,8 @@
 
 # Connect PHP SDK
 
+[![Build Status](https://travis-ci.com/ingrammicro/connect-php-sdk.svg?branch=master)](https://travis-ci.com/ingrammicro/connect-php-sdk) [![Latest Stable Version](https://poser.pugx.org/apsconnect/connect-sdk/v/stable)](https://packagist.org/packages/apsconnect/connect-sdk) [![License](https://poser.pugx.org/apsconnect/connect-sdk/license)](https://packagist.org/packages/apsconnect/connect-sdk) [![codecov](https://codecov.io/gh/ingrammicro/connect-php-sdk/branch/master/graph/badge.svg)](https://codecov.io/gh/ingrammicro/connect-php-sdk)
+
 ## Getting Started
 Connect PHP SDK allows an easy and fast integration with [Connect](http://connect.cloud.im/) fulfillment API. Thanks to it you can automate the fulfillment of orders generated by your products.
 
@@ -29,13 +31,17 @@ Your code may use any scheduler to execute, from a simple cron to a cloud schedu
 Connect PHP SDK is available on [Packagist](https://packagist.org/packages/apsconnect/connect-sdk) (using semantic versioning), and installation via [Composer](https://getcomposer.org) is the recommended way to install Connect PHP SDK. Just add this line to your `composer.json` file:
 
 ```json
-"apsconnect/connect-sdk": "~1.0"
+{
+  "require": {
+    "apsconnect/connect-sdk": "^1.0"
+    }
+}
 ```
 
 or run
 
 ```sh
-composer require apsconnect/connect-sdk
+composer require apsconnect/connect-sdk --no-dev --prefer-dist --classmap-authoritative
 ```
 
 Note that the `vendor` folder and the `vendor/autoload.php` script are generated by Composer
@@ -50,32 +56,25 @@ require_once "vendor/autoload.php";
 /**
  * Class ProductRequests
  */
-class ProductRequests extends \Connect\RequestsProcessor
+class ProductRequests extends \Connect\FulfillmentAutomation
 {
-    /**
-     * ProductRequests constructor.
-     * @param $config
-     * @throws ReflectionException
-     * @throws \Connect\ConfigException
-     * @throws \Connect\ConfigPropertyInvalid
-     * @throws \Connect\ConfigPropertyMissed
-     */
-    function __construct($config)
-    {
-        parent::__construct($config);
-    }
+    
 
     /**
      * @param \Connect\Request $request
      * @return string|void
+     * @return \Connect\ActivationTemplateResponse
+     * @return \Connect\ActivationTileResponse  
      * @throws Exception
      * @throws \Connect\Exception
      * @throws \Connect\Fail
      * @throws \Connect\Skip
+     * @throws \Connect\Inquire   
      */
-    function processRequest($request)
+    
+    public function processRequest($request)
     {
-        Connect\Logger::get()->info("Processing Request: " . $request->id . " for asset: " . $request->asset->id);
+        $this->logger->info("Processing Request: " . $request->id . " for asset: " . $request->asset->id);
         switch ($request->type) {
             case "purchase":
                 if($request->asset->params['email']->value == ""){
@@ -85,7 +84,7 @@ class ProductRequests extends \Connect\RequestsProcessor
                 }
                 foreach ($request->asset->items as $item) {
                     if ($item->quantity > 1000000) {
-                        Connect\Logger::get()->info("Is Not possible to purchase product " . $item->id . " more than 1000000 time, requested: " . $item->quantity);
+                        $this->logger->info("Is Not possible to purchase product " . $item->id . " more than 1000000 time, requested: " . $item->quantity);
                         throw new \Connect\Fail("Is Not possible to purchase product " . $item->id . " more than 1000000 time, requested: " . $item->quantity);
                     }
                     else {
@@ -112,11 +111,11 @@ class ProductRequests extends \Connect\RequestsProcessor
 
 //Main Code Block
 try {
-    $apiConfig = array(
+    $apiConfig = new \Connect\Config([
         'apiKey' => 'Key_Available_in_ui',
         'apiEndpoint' => 'https://api.connect.cloud.im/public/v1',
         'products' => 'CN-631-322-641' #Optional value
-    );
+    ]);
     $requests = new ProductRequests($apiConfig);
     $requests->process();
 

composer.json

@@ -7,11 +7,24 @@
         "php": ">=5.6.0",
         "ext-curl": "*",
         "ext-json": "*",
-        "ext-Reflection": "*"
+        "doctrine/inflector": "^1.1.0",
+        "psr/container": "^1.0.0",
+        "psr/log": "^1.0.0",
+        "pimple/pimple": "^3.0",
+        "guzzlehttp/guzzle": "~6.0"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^5.7",
+        "mockery/mockery": "^0.9"
     },
     "autoload": {
         "psr-4": {
             "Connect\\": "src/"
         }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Test\\": "tests/"
+        }
     }
 }

examples/config.json

@@ -1,7 +1,7 @@
 {
   "apiKey": "XXX:YYY",
-  "apiEndpoint": "https://host/public/v1",
-  "logLevel": "info",
+  "apiEndpoint": "http://localhost:8000",
+  "logLevel": 2,
   "timeout": 10,
-  "sslVerifyHost": true
+  "sslVerifyHost": false
 }

examples/example.php

@@ -5,14 +5,9 @@
 
 class MyAppRequests extends \Connect\RequestsProcessor
 {
-    public function __construct()
-    {
-        parent::__construct('config.json');
-    }
 
     public function processRequest($req)
     {
-
         $req->asset->tiers['customer']->name;
         $req->asset->tiers['tier1']->name;
 
@@ -22,7 +17,7 @@ public function processRequest($req)
 
         $p1 = $req->asset->params['param_a']->error('xxxx');
 
-        $p2 = new \Connect\Param('param_b', 'true');
+        $p2 = new \Connect\Param(['param_b' => true]);
         $req->requestProcessor->updateParameters($req, [$p1, $p2]);
 
         foreach ($req->asset->items as $item) {
@@ -49,16 +44,6 @@ public function processRequest($req)
 
         $req->asset->params['param_a'];
 
-// 		if (!isset($req->asset->params['param_a']))
-// 			throw new \Connect\Inquire(array( 'param_a' => 'ActivationID should be set' ));
-// 			throw new \Connect\Inquire(array( 
-// 					$req->asset->params['param_a']->error('xxxx'),
-// 					$req->asset->params['param_b']->error('yyyy')->value('default')
-// 			));
-
-// 		if (!isset($req->asset->params['param_b']))
-// 			throw new \Connect\Fail(array( 'param_b' => 'Your activation code is already used' ));
-
         throw new \Connect\Skip();
 
         return "activation succeeded";
@@ -71,14 +56,8 @@ public function processRequest($req)
     $rp = new MyAppRequests();
     $rp->process();
 
-    // throw new Exception('Some unexpected error happened');
-
 } catch (Exception $e) {
-
     \Connect\Logger::get()->error($e->getMessage());
-    // Dump to log all level records
     \Connect\Logger::get()->dump();
 }
 
-// $rlist = $rp->listRequests(array('status' => 'inquiring'));
-// print_r($rlist);

phpunit.xml

@@ -0,0 +1,58 @@
+<phpunit bootstrap="vendor/autoload.php" verbose="true" stopOnError="true" stopOnFailure="true">
+    <filter>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">src</directory>
+        </whitelist>
+    </filter>
+    <logging>
+        <log type="testdox-text" target="php://stdout" showUncoveredFiles="false"/>
+        <log type="coverage-html" target="tmp/report" lowUpperBound="35" highLowerBound="70"/>
+        <log type="coverage-clover" target="coverage.xml"/>
+    </logging>
+    <listeners>
+        <listener class="\Mockery\Adapter\Phpunit\TestListener"
+                  file="vendor/mockery/mockery/library/Mockery/Adapter/Phpunit/TestListener.php">
+        </listener>
+    </listeners>
+    <testsuites>
+        <testsuite name="ContactInfo">
+            <file>tests/Unit/ContactInfoTest.php</file>
+        </testsuite>
+        <testsuite name="Fail">
+            <file>tests/Unit/FailTest.php</file>
+        </testsuite>
+        <testsuite name="Inquire">
+            <file>tests/Unit/InquireTest.php</file>
+        </testsuite>
+        <testsuite name="Message">
+            <file>tests/Unit/MessageTest.php</file>
+        </testsuite>
+        <testsuite name="Skip">
+            <file>tests/Unit/SkipTest.php</file>
+        </testsuite>
+        <testsuite name="ActivationTemplateResponse">
+            <file>tests/Unit/ActivationTemplateResponseTest.php</file>
+        </testsuite>
+        <testsuite name="Logger">
+            <file>tests/Unit/Logger/LogRecordTest.php</file>
+            <file>tests/Unit/Logger/LogSessionTest.php</file>
+            <file>tests/Unit/LoggerTest.php</file>
+        </testsuite>
+        <testsuite name="ActivationTileResponse">
+            <file>tests/Unit/ActivationTileResponseTest.php</file>
+        </testsuite>
+        <testsuite name="RequestTest">
+            <file>tests/Unit/RequestTest.php</file>
+        </testsuite>
+        <testsuite name="Configuration">
+            <file>tests/Unit/ConfigurationTest.php</file>
+        </testsuite>
+        <testsuite name="Application">
+            <file>tests/Unit/FulfillmentAutomationTest.php</file>
+        </testsuite>
+        <testsuite name="Models">
+            <file>tests/Unit/ModelTest.php</file>
+            <file>tests/Unit/ParamTest.php</file>
+        </testsuite>
+    </testsuites>
+</phpunit>

src/Asset.php

@@ -12,7 +12,7 @@
  * Class Asset
  * @package Connect
  */
-class Asset
+class Asset extends Model
 {
     public $id;
     public $external_id;
@@ -33,12 +33,12 @@ class Asset
     public $items;
 
     /**
-     * @var Param{id}
+     * @var Param[]
      */
     public $params;
 
     /**
-     * @var Tier{}
+     * @var Tiers
      */
     public $tiers;
 }