Merge pull request #2 from movemove-io/Feature/Tests

Feature/tests

Author: pipisco

.gitignore

@@ -0,0 +1,3 @@
+composer.lock
+*.cache
+vendor

.travis.yml

@@ -1,25 +1,18 @@
 language: php
 
 php:
-  - 5.6
-  - 7.1
-  - 7.2
   - 7.3
   - 7.4
 
 env:
-  - LARAVEL_VERSION=5.6.*
-  - LARAVEL_VERSION=5.7.*
-  - LARAVEL_VERSION=5.8.*
-  - LARAVEL_VERSION=6.*
   - LARAVEL_VERSION=7.*
   - LARAVEL_VERSION=8.*
 
 matrix:
   fast_finish: true
 
 before_script:
-  - composer update
+  - composer install
 
 script:
   - phpunit

composer.json

@@ -19,8 +19,16 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "MoveMoveIo\\DaData\\Tests": "tests/"
+            "MoveMoveIo\\DaData\\Tests\\": "tests/"
         }
     },
-    "require": {}
+    "require": {
+        "php": "^7.2.5",
+        "illuminate/support": "^8.8.0",
+        "guzzlehttp/guzzle": "^7.0"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^9.4.0",
+        "orchestra/testbench": "^6.2.0"
+    }
 }

config/dadata.php

@@ -1,5 +1,13 @@
 <?php
 
+/**
+ * Copyright (c) Dmitry Kovalev.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @see https://github.com/movemove-io/laravel-dadata
+ */
 return [
     /*
     |--------------------------------------------------------------------------

phpunit.xml.dist

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit bootstrap="vendor/autoload.php"
+         backupGlobals="false"
+         backupStaticAttributes="false"
+         colors="true"
+         verbose="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false">
+    <testsuites>
+        <testsuite name="Test Suite">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist>
+            <directory suffix=".php">src/</directory>
+        </whitelist>
+    </filter>
+    <php>
+        <env name="DADATA_TOKEN" value="c21c38ebaf520082d64516fbe041d2a8a6d4211f"/>
+        <env name="DADATA_SECRET" value="adccd63ac28701442e26b7eef57eb5eb0a72143e"/>
+    </php>
+</phpunit>

src/DaDataAddressService.php renamed to src/DaDataAddress.php

@@ -5,10 +5,10 @@
 use MoveMoveIo\DaData\Enums\Language;
 
 /**
- * Class DaDataAddressService
+ * Class DaDataAddress
  * @package MoveMoveIo\DaData
  */
-class DaDataAddressService extends DaDataService
+class DaDataAddress extends DaDataService
 {
 
     /**
@@ -73,13 +73,13 @@ public function prompt(
      *
      * Returns all information about the address by coordinates.
      * Works for homes, streets and cities.
-     *
      * @param float $lat
      * @param float $lon
      * @param int $count
      * @param int $radius_meters
      * @param int $language
      * @return array
+     * @throws \Exception
      */
     public function geolocate(
         float   $lat,

src/DaDataService.php

@@ -42,9 +42,39 @@ class DaDataService
      */
     public function __construct()
     {
-        $this->token   = config('dadata.token');
-        $this->secret  = config('dadata.secret');
-        $this->timeout = config('dadata.timeout');
+        if (file_exists(config_path() . '/dadata.php')) {
+            $this->token = config('dadata.token');
+            $this->secret = config('dadata.secret');
+            $this->timeout = config('dadata.timeout');
+        } else {
+            $this->token = env('DADATA_TOKEN', null);
+            $this->secret = env('DADATA_SECRET', null);
+            $this->timeout = env('DADATA_TIMEOUT', 10);
+        }
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getToken() : ?string
+    {
+        return $this->token;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getSecret() : ?string
+    {
+        return $this->secret;
+    }
+
+    /**
+     * @return int|null
+     */
+    public function getTimeout() : ?int
+    {
+        return $this->timeout;
     }
 
     /**

src/DaDataServiceProvider.php

@@ -18,9 +18,11 @@ class DaDataServiceProvider extends ServiceProvider
      */
     public function register()
     {
-        $this->app->bind('da_data_address', function () {
-            return new DaDataAddressService();
+        $this->app->singleton('da_data_address', function () {
+            return new DaDataAddress();
         });
+
+        $this->app->alias('da_data_address', DaDataAddress::class);
     }
 
     /**

src/Facades/DaDataAddress.php

@@ -10,15 +10,14 @@
  */
 class DaDataAddress extends Facade
 {
-
     /**
      * Get the registered name of the component.
      *
      * @return string
      */
-    protected static function getFacadeAccessor() : string
+    protected static function getFacadeAccessor()
     {
         return 'da_data_address';
     }
-
 }
+

src/Providers/CleanerDaDataProvider.php

@@ -76,6 +76,4 @@ public function post(string $method, array $data = []) : array
         return $this->postData($headers, $url, $data, $this->timeout);
     }
 
-
-
 }