@@ -9,7 +9,6 @@ |
||
9 | 9 | * @package Teamwork |
10 | 10 | */ |
11 | 11 | |
12 | -use Illuminate\Support\Facades\Validator; |
|
13 | 12 | use Illuminate\Support\ServiceProvider; |
14 | 13 | use Mpociot\VatCalculator\Facades\VatCalculator; |
15 | 14 | use Mpociot\VatCalculator\Validators\VatCalculatorValidatorExtension; |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | { |
71 | 71 | $this->app->bind('vatcalculator', '\Mpociot\VatCalculator\VatCalculator'); |
72 | 72 | |
73 | - $this->app->bind('\Mpociot\VatCalculator\VatCalculator', function ($app) { |
|
73 | + $this->app->bind('\Mpociot\VatCalculator\VatCalculator', function($app) { |
|
74 | 74 | $config = $app->make('Illuminate\Contracts\Config\Repository'); |
75 | 75 | |
76 | 76 | return new \Mpociot\VatCalculator\VatCalculator($config); |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | */ |
85 | 85 | public function registerFacade() |
86 | 86 | { |
87 | - $this->app->booting(function () { |
|
87 | + $this->app->booting(function() { |
|
88 | 88 | $loader = \Illuminate\Foundation\AliasLoader::getInstance(); |
89 | 89 | $loader->alias('VatCalculator', 'Mpociot\VatCalculator\Facades\VatCalculator'); |
90 | 90 | }); |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | 'vatnumber-validator' |
110 | 110 | ); |
111 | 111 | |
112 | - $this->app['validator']->extend('vat_number', |
|
112 | + $this->app[ 'validator' ]->extend('vat_number', |
|
113 | 113 | 'Mpociot\VatCalculator\Validators\VatCalculatorValidatorExtension@validateVatNumber'); |
114 | 114 | } |
115 | 115 |
@@ -51,7 +51,7 @@ |
||
51 | 51 | $valid_company = false; |
52 | 52 | if ($request->has('vat_number')) { |
53 | 53 | $valid_company = $this->validateVATID($request->get('vat_number')); |
54 | - $valid_company = $valid_company['is_valid']; |
|
54 | + $valid_company = $valid_company[ 'is_valid' ]; |
|
55 | 55 | $valid_vat_id = $valid_company; |
56 | 56 | } |
57 | 57 |
@@ -2,7 +2,6 @@ |
||
2 | 2 | |
3 | 3 | namespace Mpociot\VatCalculator\Validators; |
4 | 4 | |
5 | -use Illuminate\Validation\Validator; |
|
6 | 5 | use Mpociot\VatCalculator\Exceptions\VATCheckUnavailableException; |
7 | 6 | use Mpociot\VatCalculator\Facades\VatCalculator; |
8 | 7 |
@@ -454,7 +454,7 @@ discard block |
||
454 | 454 | } |
455 | 455 | |
456 | 456 | /** |
457 | - * @param mixed $countryCode |
|
457 | + * @param string $countryCode |
|
458 | 458 | */ |
459 | 459 | public function setCountryCode($countryCode) |
460 | 460 | { |
@@ -470,7 +470,7 @@ discard block |
||
470 | 470 | } |
471 | 471 | |
472 | 472 | /** |
473 | - * @param mixed $postalCode |
|
473 | + * @param string $postalCode |
|
474 | 474 | */ |
475 | 475 | public function setPostalCode($postalCode) |
476 | 476 | { |
@@ -571,7 +571,7 @@ discard block |
||
571 | 571 | } |
572 | 572 | |
573 | 573 | /** |
574 | - * @param $vatNumber |
|
574 | + * @param string $vatNumber |
|
575 | 575 | * |
576 | 576 | * @throws VATCheckUnavailableException |
577 | 577 | * |
@@ -359,10 +359,10 @@ discard block |
||
359 | 359 | */ |
360 | 360 | private function getClientIP() |
361 | 361 | { |
362 | - if (isset($_SERVER['HTTP_X_FORWARDED_FOR']) && $_SERVER['HTTP_X_FORWARDED_FOR']) { |
|
363 | - $clientIpAddress = $_SERVER['HTTP_X_FORWARDED_FOR']; |
|
364 | - } elseif (isset($_SERVER['REMOTE_ADDR']) && $_SERVER['REMOTE_ADDR']) { |
|
365 | - $clientIpAddress = $_SERVER['REMOTE_ADDR']; |
|
362 | + if (isset($_SERVER[ 'HTTP_X_FORWARDED_FOR' ]) && $_SERVER[ 'HTTP_X_FORWARDED_FOR' ]) { |
|
363 | + $clientIpAddress = $_SERVER[ 'HTTP_X_FORWARDED_FOR' ]; |
|
364 | + } elseif (isset($_SERVER[ 'REMOTE_ADDR' ]) && $_SERVER[ 'REMOTE_ADDR' ]) { |
|
365 | + $clientIpAddress = $_SERVER[ 'REMOTE_ADDR' ]; |
|
366 | 366 | } else { |
367 | 367 | $clientIpAddress = ''; |
368 | 368 | } |
@@ -382,11 +382,11 @@ discard block |
||
382 | 382 | $ip = $this->getClientIP(); |
383 | 383 | $url = self::GEOCODE_SERVICE_URL.$ip; |
384 | 384 | $result = file_get_contents($url); |
385 | - switch ($result[0]) { |
|
385 | + switch ($result[ 0 ]) { |
|
386 | 386 | case '1': |
387 | 387 | $data = explode(';', $result); |
388 | 388 | |
389 | - return $data[1]; |
|
389 | + return $data[ 1 ]; |
|
390 | 390 | break; |
391 | 391 | default: |
392 | 392 | return false; |
@@ -404,7 +404,7 @@ discard block |
||
404 | 404 | { |
405 | 405 | $taxKey = 'vat_calculator.rules.'.strtoupper($countryCode); |
406 | 406 | |
407 | - return isset($this->taxRules[strtoupper($countryCode)]) || (isset($this->config) && $this->config->has($taxKey)); |
|
407 | + return isset($this->taxRules[ strtoupper($countryCode) ]) || (isset($this->config) && $this->config->has($taxKey)); |
|
408 | 408 | } |
409 | 409 | |
410 | 410 | /** |
@@ -544,18 +544,18 @@ discard block |
||
544 | 544 | return $this->config->get($taxKey, 0); |
545 | 545 | } |
546 | 546 | |
547 | - if (!isset($this->postalCodeExceptions[$countryCode]) || $postalCode === null) { |
|
548 | - return isset($this->taxRules[strtoupper($countryCode)]['rate']) ? $this->taxRules[strtoupper($countryCode)]['rate'] : 0; |
|
547 | + if (!isset($this->postalCodeExceptions[ $countryCode ]) || $postalCode === null) { |
|
548 | + return isset($this->taxRules[ strtoupper($countryCode) ][ 'rate' ]) ? $this->taxRules[ strtoupper($countryCode) ][ 'rate' ] : 0; |
|
549 | 549 | } else { |
550 | - foreach ($this->postalCodeExceptions[$countryCode] as $postalCodeException) { |
|
551 | - if (!preg_match($postalCodeException['postalCode'], $postalCode)) { |
|
550 | + foreach ($this->postalCodeExceptions[ $countryCode ] as $postalCodeException) { |
|
551 | + if (!preg_match($postalCodeException[ 'postalCode' ], $postalCode)) { |
|
552 | 552 | continue; |
553 | 553 | } |
554 | - if (isset($postalCodeException['name'])) { |
|
555 | - return $this->taxRules[$postalCodeException['code']]['exceptions'][$postalCodeException['name']]; |
|
554 | + if (isset($postalCodeException[ 'name' ])) { |
|
555 | + return $this->taxRules[ $postalCodeException[ 'code' ] ][ 'exceptions' ][ $postalCodeException[ 'name' ] ]; |
|
556 | 556 | } |
557 | 557 | |
558 | - return $this->taxRules[$postalCodeException['code']]['rate']; |
|
558 | + return $this->taxRules[ $postalCodeException[ 'code' ] ][ 'rate' ]; |
|
559 | 559 | } |
560 | 560 | |
561 | 561 | return 0; |
@@ -579,7 +579,7 @@ discard block |
||
579 | 579 | */ |
580 | 580 | public function isValidVATNumber($vatNumber) |
581 | 581 | { |
582 | - $vatNumber = str_replace([' ', '-', '.', ','], '', trim($vatNumber)); |
|
582 | + $vatNumber = str_replace([ ' ', '-', '.', ',' ], '', trim($vatNumber)); |
|
583 | 583 | $countryCode = substr($vatNumber, 0, 2); |
584 | 584 | $vatNumber = substr($vatNumber, 2); |
585 | 585 |