Merge pull request #3 from PostScripton/dev

PostScripton · web-flow · commit 4c0e1019df9f · 2021-03-27T01:06:12.000+03:00
Fixed ServiceProvider
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "postscripton/money",
     "description": "A convenient way to convert numbers from DB or inputs into money strings for humans",
-  	"version": "1.0.1",
+  	"version": "1.0.2",
   	"type": "library",
     "license": "MIT",
     "authors": [
@@ -11,7 +11,7 @@
         }
     ],
     "require": {
-	  	"php": ">=7.1"
+	  	"php": "^7.1"
     },
   	"require-dev": {
         "orchestra/testbench": "^6.15"
diff --git a/src/MoneyServiceProvider.php b/src/MoneyServiceProvider.php
@@ -1,11 +1,10 @@
 <?php
 
-namespace PostScripton\Money\ServiceProviders;
+namespace PostScripton\Money;
 
 use Illuminate\Support\ServiceProvider;
-use PostScripton\Money\Currency;
 use PostScripton\Money\Exceptions\CurrencyDoesNotExistException;
-use PostScripton\Money\Money;
+use PostScripton\Money\Exceptions\ShouldPublishConfigFileException;
 
 class MoneyServiceProvider extends ServiceProvider
 {
@@ -15,7 +14,7 @@ public function boot()
 
 		try {
 			Money::set(' ', '.', 1, false, Currency::code('RUB'));
-		} catch (CurrencyDoesNotExistException $e) {
+		} catch (CurrencyDoesNotExistException | ShouldPublishConfigFileException $e) {
 			dd($e->getMessage());
 		}
 	}
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -2,7 +2,7 @@
 
 namespace PostScripton\Money\Tests;
 
-use PostScripton\Money\ServiceProviders\MoneyServiceProvider;
+use PostScripton\Money\MoneyServiceProvider;
 
 class TestCase extends \Orchestra\Testbench\TestCase
 {

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,10 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace PostScripton\Money\ServiceProviders;`
	`3`	`+namespace PostScripton\Money;`
`4`	`4`
`5`	`5`	`use Illuminate\Support\ServiceProvider;`
`6`		`-use PostScripton\Money\Currency;`
`7`	`6`	`use PostScripton\Money\Exceptions\CurrencyDoesNotExistException;`
`8`		`-use PostScripton\Money\Money;`
	`7`	`+use PostScripton\Money\Exceptions\ShouldPublishConfigFileException;`
`9`	`8`
`10`	`9`	`class MoneyServiceProvider extends ServiceProvider`
`11`	`10`	`{`
`@@ -15,7 +14,7 @@ public function boot()`
`15`	`14`
`16`	`15`	`try {`
`17`	`16`	`Money::set(' ', '.', 1, false, Currency::code('RUB'));`
`18`		`- } catch (CurrencyDoesNotExistException $e) {`
	`17`	`+ } catch (CurrencyDoesNotExistException \| ShouldPublishConfigFileException $e) {`
`19`	`18`	`dd($e->getMessage());`
`20`	`19`	`}`
`21`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace PostScripton\Money\Tests;`
`4`	`4`
`5`		`-use PostScripton\Money\ServiceProviders\MoneyServiceProvider;`
	`5`	`+use PostScripton\Money\MoneyServiceProvider;`
`6`	`6`
`7`	`7`	`class TestCase extends \Orchestra\Testbench\TestCase`
`8`	`8`	`{`