Merge branch 'master' into develop

Author: Casperhr

.scrutinizer.yml

@@ -0,0 +1 @@
+#Global configs, only add new or override existing

README.md

@@ -1,5 +1,9 @@
-# php-sdk
+# Laravel-sdk
 
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/nstack-io/laravel-sdk/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/nstack-io/laravel-sdk/?branch=master)
+[![Code Coverage](https://scrutinizer-ci.com/g/nstack-io/laravel-sdk/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/nstack-io/laravel-sdk/?branch=master)
+[![Build Status](https://scrutinizer-ci.com/g/nstack-io/laravel-sdk/badges/build.png?b=master)](https://scrutinizer-ci.com/g/nstack-io/laravel-sdk/build-status/master)
+[![Code Intelligence Status](https://scrutinizer-ci.com/g/nstack-io/laravel-sdk/badges/code-intelligence.svg?b=master)](https://scrutinizer-ci.com/code-intelligence)
 
 ## 📝 Introduction
 
@@ -71,12 +75,23 @@ or via global function
 nstack()->getContinentsClient()->index()
 ```
 
+
 or via integration with `trans()` [helper](https://laravel.com/docs/5.8/helpers#method-trans)
 
 ```php
 echo trans('messages.welcome');
 ```
 
+
+All the basic fuctionality can be found in the php-sdk
+
+## Features
+
+    [x] Register php-sdk in laravel provider, with Facade and global func
+    [x] Translate provider for localization using laravels global func: trans(key)    
+
+[Link here](https://github.com/nstack-io/php-sdk)
+
 All PHP functionality can be found
 
 [Link](https://github.com/nstack-io/php-sdk)

tests/TestCase.php

@@ -2,57 +2,6 @@
 
 namespace NStack\Tests;
 
-use GuzzleHttp\Client;
-use GuzzleHttp\Psr7\Response;
-use NStack\Config;
-
 class TestCase extends \PHPUnit\Framework\TestCase
 {
-
-<<<<<<< HEAD
-=======
-        return json_decode($content, true);
-    }
-
-    /**
-     * getClientWithMockedGet
-     *
-     * @param string $filename
-     * @return \GuzzleHttp\Client
-     * @author Casper Rasmussen <[email protected]>
-     */
-    protected function getClientWithMockedGet(string $filename): Client
-    {
-        $response = new Response(200, ['Content-Type' => 'application/json'],
-            $this->getMockAsString($filename));
-
-        $guzzle = \Mockery::mock(\GuzzleHttp\Client::class);
-        $guzzle->shouldReceive('get')->once()->andReturn($response);
-
-        return $guzzle;
-    }
-
-    /**
-     * getMockAsString
-     *
-     * @param string $fileName
-     * @return string
-     * @author Casper Rasmussen <[email protected]>
-     */
-    protected function getMockAsString(string $fileName): string
-    {
-        return file_get_contents(getcwd() . '/tests/mocks/' . $fileName);
-    }
-
-    /**
-     * getConfig
-     *
-     * @return \NStack\Config
-     * @author Casper Rasmussen <[email protected]>
-     */
-    public function getConfig(): Config
-    {
-        return new Config('', '');
-    }
->>>>>>> b56de27aae2dc30889c6f76338addbf1962027e9
 }