Migrated to PSR7. Seperated API clases

Author: codenix-sv

.gitignore

@@ -1,5 +1,5 @@
 vendor
 composer.lock
-.idea
 build
-phpunit.xml
+phpunit.xml
+.phpunit.result.cache

.travis.yml

@@ -1,12 +1,12 @@
 language: php
 
 php:
-  - '7.1'
+  - '7.2'
+  - '7.3'
+  - '7.4'
 
-# faster builds on new travis setup not using sudo
 sudo: false
 
-# cache vendor dirs
 cache:
   directories:
     - $HOME/.composer/cache
@@ -16,15 +16,22 @@ install:
   - travis_retry composer update --dev --prefer-dist --no-interaction
 
 before_script:
-- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-- chmod +x ./cc-test-reporter
-- if [ $(phpenv version-name) = "7.1" ]; then ./cc-test-reporter before-build; fi
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build
 
 script:
   - composer validate --strict
   - vendor/bin/phpunit
 
 after_script:
-  - if [ $(phpenv version-name) = "7.1" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT; fi
+  - if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT; fi
   - wget https://scrutinizer-ci.com/ocular.phar
-  - php ocular.phar code-coverage:upload --format=php-clover ./build/logs/clover.xml
+  - php ocular.phar code-coverage:upload --format=php-clover ./build/logs/clover.xml
+
+notifications:
+  email:
+    recipients:
+      - codenix.sv@gmail.com
+    on_success: never
+    on_failure: always

LICENSE

@@ -1,29 +1,21 @@
-BSD 3-Clause License
+MIT License
 
-Copyright (c) 2017, Vladymyr Svyryd
-All rights reserved.
+Copyright (c) 2017 Volodymyr Svyryd
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+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:
 
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of the copyright holder nor the names of its
-  contributors may be used to endorse or promote products derived from
-  this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+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,20 +1,18 @@
 # bittrex-api
-[![Build Status](https://travis-ci.org/codenix-sv/bittrex-api.svg?branch=master)](https://travis-ci.org/codenix-sv/bittrex-api)
-[![Maintainability](https://api.codeclimate.com/v1/badges/49b696439195269120b4/maintainability)](https://codeclimate.com/github/codenix-sv/bittrex-api/maintainability)
-[![Test Coverage](https://api.codeclimate.com/v1/badges/49b696439195269120b4/test_coverage)](https://codeclimate.com/github/codenix-sv/bittrex-api/test_coverage)
+[![Build Status](https://travis-ci.com/codenix-sv/bittrex-api.svg?branch=master)](https://travis-ci.com/codenix-sv/bittrex-api)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/codenix-sv/bittrex-api/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/codenix-sv/bittrex-api/?branch=master)
-[![Code Coverage](https://scrutinizer-ci.com/g/codenix-sv/bittrex-api/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/codenix-sv/bittrex-api/?branch=master)
-[![Code Intelligence Status](https://scrutinizer-ci.com/g/codenix-sv/bittrex-api/badges/code-intelligence.svg?b=master)](https://scrutinizer-ci.com/code-intelligence)
-
-[![License](https://poser.pugx.org/codenix-sv/bittrex-api/license)](https://packagist.org/packages/codenix-sv/bittrex-api)
-[![Latest Stable Version](https://poser.pugx.org/codenix-sv/bittrex-api/v/stable)](https://packagist.org/packages/codenix-sv/bittrex-api)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/49b696439195269120b4/test_coverage)](https://codeclimate.com/github/codenix-sv/bittrex-api/test_coverage)
+[![Maintainability](https://api.codeclimate.com/v1/badges/49b696439195269120b4/maintainability)](https://codeclimate.com/github/codenix-sv/bittrex-api/maintainability)
+[![License: MIT](https://img.shields.io/github/license/codenix-sv/bittrex-api)](https://github.com/codenix-sv/bittrex-api/blob/master/LICENSE)
+![Packagist](https://img.shields.io/packagist/dt/codenix-sv/bittrex-api)
 
-A simple PHP wrapper for [Bittrex API](https://bittrex.com/Home/Api). Bittrex is the next generation crypto trading platform.
+A simple PHP wrapper for [Bittrex API](https://bittrex.github.io/api/v1-1). Bittrex is the next generation crypto trading platform.
 
 ## Requirements
 
-- PHP >= 7.1
-- [Bittrex account](https://bittrex.com), API key and API secret
+* PHP >= 7.2
+* ext-json
+* [Bittrex account](https://global.bittrex.com/), API key and API secret
 
 ## Installation
 
@@ -23,12 +21,12 @@ The preferred way to install this extension is through [composer](http://getcomp
 Either run
 
 ```bash
-$ composer require codenix-sv/bittrex-api:~0.2
+$ composer require codenix-sv/bittrex-api
 ```
 or add
 
 ```json
-"codenix-sv/bittrex-api" : "~0.2"
+"codenix-sv/bittrex-api" : "^1.0"
 ```
 
 to the require section of your application's `composer.json` file.
@@ -37,104 +35,119 @@ to the require section of your application's `composer.json` file.
 
 ### Example
 ```php
-use codenixsv\Bittrex\BittrexManager;
+use Codenixsv\BittrexApi\BittrexClient;
 
-$manager = new BittrexManager('API_KEY', 'API_SECRET');
-$client = $manager->createClient();
+$client = new BittrexClient();
+$client->setCredential('API_KEY', 'API_SECRET');
 
-$responce = $client->getBalances();
+$data = $client->public()->getMarkets();
 ```
-### Available methods
+## Available methods
 
-#### Public API
+### Public API
 
-##### Get the open and available trading markets
+#### Get the open and available trading markets
 ```php
-$responce = $client->getMarkets();
+$data = $client->public()->getMarkets();
 ```
-##### Get all supported currencies
+
+#### Get all supported currencies
 ```php
-$responce = $client->getCurrencies();
+$data = $client->public()->getCurrencies();
 ```
-##### Get the current tick values for a market
+
+#### Get the current tick values for a market
 ```php
-$responce = $client->getTicker('BTC-LTC');
+$data = $client->public()->getTicker('BTC-LTC');
 ```
-##### Get the last 24 hour summary of all active exchanges
+#### Get the last 24 hour summary of all active exchanges
 ```php
-$responce = $client->getMarketSummaries();
+$data = $client->public()->getMarketSummaries();
 ```
-##### Get the last 24 hour summary of all active exchanges for a market
+
+#### Get the last 24 hour summary of all active exchanges for a market
 ```php
-$responce = $client->getMarketSummary('BTC-LTC');
+$data = $client->public()->getMarketSummary('BTC-LTC');
 ```
-##### Get the orderbook for a given market
+
+#### Get the orderbook for a given market
 ```php
-$responce = $client->getOrderBook('BTC-LTC');
+$data = $client->public()->getOrderBook('BTC-LTC');
 ```
-##### Get latest trades that have occurred for a specific market
+
+#### Get latest trades that have occurred for a specific market
 ```php
-$responce = $client->getMarketHistory('BTC-LTC');
+$data = $client->public()->getMarketHistory('BTC-LTC');
 ```
 
-#### Market API
+### Market API
 
-##### Place a buy order in a specific market
+#### Place a buy order in a specific market
 ```php
-$responce = $client->buyLimit('BTC-LTC', 1.2, 1.3);
+$data = $client->market()->buyLimit('BTC-LTC', 1.2, 1.3);
 ```
-##### Place a sell order in a specific market
+
+#### Place a sell order in a specific market
 ```php
-$responce = $client->sellLimit('BTC-LTC', 1.2, 1.3);
+$data = $client->market()->sellLimit('BTC-LTC', 1.2, 1.3);
 ```
-##### Cancel a buy or sell order
+
+#### Cancel a buy or sell order
 ```php
-$responce = $client->cancel('251c48e7-95d4-d53f-ad76-a7c6547b74ca9');
+$data = $client->market()->cancel('251c48e7-95d4-d53f-ad76-a7c6547b74ca9');
 ```
-##### Get all orders that you currently have opened
+
+#### Get all orders that you currently have opened
 ```php
-$responce = $client->getOpenOrders('BTC-LTC');
+$data = $client->market()->getOpenOrders('BTC-LTC');
 ```
 
-#### Account API
+### Account API
 
-##### Get all balances from your account
+#### Get all balances from your account
 ```php
-$responce = $client->getBalances();
+$data = $client->account()->getBalances();
 ```
-##### Get balance from your account for a specific currency
+
+#### Get balance from your account for a specific currency
 ```php
-$responce = $client->getBalance('BTC');
+$data = $client->account()->getBalance('BTC');
 ```
-##### Get or generate an address for a specific currency
+
+#### Get or generate an address for a specific currency
 ```php
-$responce = $client->getDepositAddress('BTC');
+$data = $client->account()->getDepositAddress('BTC');
 ```
-##### Withdraw funds from your account
+
+#### Withdraw funds from your account
 ```php
-$responce = $client->withdraw('BTC', 20.40, 'EAC_ADDRESS');
+$data = $client->account()->withdraw('BTC', 20.40, 'EAC_ADDRESS');
 ```
-##### Get a single order by uuid
+
+#### Get a single order by uuid
 ```php
-$responce = $client->getOrder('251c48e7-95d4-d53f-ad76-a7c6547b74ca9');
+$data = $client->account()->getOrder('251c48e7-95d4-d53f-ad76-a7c6547b74ca9');
 ```
-##### Get order history
+
+#### Get order history
 ```php
-$responce = $client->getOrderHistory('BTC-LTC');
+$data = $client->account()->getOrderHistory('BTC-LTC');
 ```
-##### Get withdrawal history
+
+#### Get withdrawal history
 ```php
-$responce = $client->getWithdrawalHistory('BTC');
+$data = $client->account()->getWithdrawalHistory('BTC');
 ```
-##### Get deposit history
+
+#### Get deposit history
 ```php
-$responce = $client->getDepositHistory('BTC');
+$data = $client->account()->getDepositHistory('BTC');
 ```
 
 ## Further Information
-Please, check the [Bittrex site](https://bittrex.com/Home/Api) documentation for further
+Please, check the [Bittrex site](https://bittrex.github.io/api/v1-1) documentation for further
 information about API.
 
 ## License
 
-**bittrex-api** is released under the BSD 3-Clause License. See the bundled [LICENSE](./LICENSE) for details.
+`codenix-sv/bittrex-api` is released under the MIT License. See the bundled [LICENSE](./LICENSE) for details.

composer.json

@@ -1,39 +1,35 @@
 {
     "name": "codenix-sv/bittrex-api",
-    "description": "PHP client for the Bittrex API",
-    "keywords": [
-            "bittrex",
-            "bitcoin",
-            "btc",
-            "bittrex-api"
-        ],
     "type": "library",
-    "license": "BSD-3-Clause",
+    "description": "PHP client for Bittrex API",
+    "homepage": "https://github.com/codenix-sv/bittrex-api",
+    "keywords": ["client", "api", "php", "bittrex", "rest", "bittrex-api", "exchange"],
+    "license": "MIT",
     "support": {
-            "issues": "https://github.com/codenix-sv/bittrex-api/issues?state=open",
-            "source": "https://github.com/codenix-sv/bittrex-api"
-        },
+        "issues": "https://github.com/codenix-sv/bittrex-api/issues?state=open",
+        "source": "https://github.com/codenix-sv/bittrex-api"
+    },
     "authors": [
         {
-            "name": "Vladymyr Svyryd",
+            "name": "Volodymyr Svyryd",
             "email": "codenix.sv@gmail.com",
             "role": "Developer"
         }
     ],
     "require": {
-        "php": ">=7.1"
+        "php": "^7.2",
+        "ext-json": "*"
+
     },
     "require-dev": {
-        "phpunit/phpunit": "~6.0"
+        "phpunit/phpunit": "^8.0",
+        "guzzlehttp/guzzle": "~6.0"
     },
     "autoload": {
-        "psr-4": {
-            "codenixsv\\Bittrex\\": "src/"
-        }
+        "psr-4": { "Codenixsv\\BittrexApi\\": "src/" }
     },
     "autoload-dev": {
-        "psr-4": {
-            "codenixsv\\Bittrex\\": "tests/"
-        }
-    }
+        "psr-4": { "Codenixsv\\BittrexApi\\Tests\\": "tests/"}
+    },
+    "prefer-stable": true
 }