Merge branch 'feature-v2-ip-sources' into v2

.github/CONTRIBUTING.md

@@ -3,13 +3,13 @@ Contributing
 Report an issue
 ---------------
 Please follow the guidelines below when creating an issue so that your issue can be more promptly resolved:
-* Provide information including: the version of PHP and IPTool, the type of operating system and Web server;
+* Provide information including: the version of PHP and IPStack Wizard, the type of operating system;
 * Provide the complete error call stack if available;
 * Describe the steps for reproducing the issue. It would be even better if you could provide code to reproduce the issue;
 
-Do not report an issue if you are asking how to use some IPTool feature. You should use the [Documentation](https://github/ddrv/iptool/wiki).
+Do not report an issue if you are asking how to use some IPStack Wizard feature. You should use the Documentation in `docs` folder.
 
-Before you report an issue, please search through existing issues to see if your issue is already reported or fixed to make sure you are not reporting a duplicated issue. Also make sure you have the latest version of IPTool and see if the issue still exists.
+Before you report an issue, please search through existing issues to see if your issue is already reported or fixed to make sure you are not reporting a duplicated issue. Also make sure you have the latest version of IPStack Wizard and see if the issue still exists.
 
 Translate documentstion
 -----------------------

.github/ISSUE_TEMPLATE.md

@@ -6,10 +6,10 @@
 
 ### Additional info
 
-|Q|A|
-|---|---|
-|Wizard version|2.0.?|
-|PHP version|?| 
-|Operating system|?|
+| Q                | A
+| ---------------- | ---
+| Wizard version   | 2.0.?
+| PHP version      | 
+| Operating system |
 
-### Add your binary database file in attacnments
+### Add your binary database file in attacnments

.gitignore

@@ -0,0 +1 @@
+/.idea/*

README.md

@@ -1,5 +1,5 @@
-[![Packagist](https://img.shields.io/packagist/v/ipstack/wizard.svg?style=flat-square)](https://packagist.org/packages/ipstack/wizard)
-[![Downloads](https://img.shields.io/packagist/dt/ipstack/wizard.svg?style=flat-square)](https://packagist.org/packages/ipstack/wizard/stats)
+[![Latest Stable Version](https://img.shields.io/packagist/v/ipstack/wizard.svg?style=flat-square)](https://packagist.org/packages/ipstack/wizard)
+[![Total Downloads](https://img.shields.io/packagist/dt/ipstack/wizard.svg?style=flat-square)](https://packagist.org/packages/ipstack/wizard/stats)
 [![License](https://img.shields.io/packagist/l/ipstack/wizard.svg?style=flat-square)](https://github.com/ipstack/wizard/blob/master/LICENSE)
 [![PHP](https://img.shields.io/packagist/php-v/ipstack/wizard.svg?style=flat-square)](https://php.net)
 
@@ -8,6 +8,8 @@
 
 > IP Stack Wizard. Create your IP Address database.
 
-[Database format](https://github.com/ipstack/database-format/tree/v2.0.0)
+## Supported formats
+
+- IPStack v1
 
 The idea is taken from [Sypex Geo](https://sypexgeo.net)

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "ipstack/wizard",
-  "version": "2.0.0-beta",
+  "version": "2.0.0",
   "type": "library",
   "description": "Wizard for create databases for ipstack",
   "keywords": ["iptool", "ipstack", "ipstack-wizard", "ip", "geo", "geoip", "info", "data", "ip-database", "wizard"],
@@ -15,10 +15,8 @@
   "require": {
     "php": ">=5.3",
     "ext-pdo_sqlite": "*",
-    "ddrv/extra-pack": "*"
-  },
-  "require-dev": {
-    "phpunit/phpunit": ">=4.8"
+    "ext-pdo": "*",
+    "ext-mbstring": "*"
   },
   "autoload": {
     "psr-4": {