Final changes to StyleCI which should pass validation.

Trucky · Nov 18, 2019 · e667874 · e667874
1 parent 498436f
commit e667874
Show file tree

Hide file tree

Showing 15 changed files with 45 additions and 47 deletions.
diff --git a/.styleci.yml b/.styleci.yml
@@ -12,6 +12,4 @@ finder:
 enabled:
   - concat_with_spaces
 disabled:
-  - not_operator_with_successor_space
-  - unary_operator_spaces
-  - concat_without_spaces
+  - function_declaration
diff --git a/src/Billable.php b/src/Billable.php
@@ -152,7 +152,7 @@ public function subscribedToPlan($plans, $subscription = 'default')
     {
         $subscription = $this->subscription($subscription);
 
-        if (! $subscription || ! $subscription->valid()) {
+        if (!$subscription || !$subscription->valid()) {
             return false;
         }
 
@@ -174,7 +174,7 @@ public function subscribedToPlan($plans, $subscription = 'default')
      */
     public function onPlan($plan)
     {
-        return ! is_null($this->subscriptions->first(function ($value) use ($plan) {
+        return !is_null($this->subscriptions->first(function ($value) use ($plan) {
             return $value->plan === $plan && $value->valid();
         }));
     }
@@ -186,7 +186,7 @@ public function onPlan($plan)
      */
     public function hasFastspringId()
     {
-        return ! is_null($this->fastspring_id);
+        return !is_null($this->fastspring_id);
     }
 
     /**
@@ -245,7 +245,7 @@ public function createAsFastspringCustomer(array $options = [])
      */
     public function updateAsFastspringCustomer(array $options = [])
     {
-        if (! $this->hasFastspringId()) {
+        if (!$this->hasFastspringId()) {
             throw new Exception('User has no fastspring_id');
         }
 
@@ -278,7 +278,7 @@ public function asFastspringCustomer()
     {
         // check the fastspring_id first
         // if there is non, no need to try
-        if (! $this->hasFastspringId()) {
+        if (!$this->hasFastspringId()) {
             throw new Exception('User has no fastspring_id');
         }
 

diff --git a/src/CashierServiceProvider.php b/src/CashierServiceProvider.php
@@ -29,20 +29,20 @@ public function boot()
 
         // publish migrations
         $this->publishes([
-            __DIR__.'/../resources/migrations/create_subscriptions_table_for_cashier_fastspring.php' => sprintf(
-                database_path('migrations').'/%s_create_subscriptions_table_for_cashier_fastspring.php',
+            __DIR__ . '/../resources/migrations/create_subscriptions_table_for_cashier_fastspring.php' => sprintf(
+                database_path('migrations') . '/%s_create_subscriptions_table_for_cashier_fastspring.php',
                 date('Y_m_d_His', $time)
             ),
-            __DIR__.'/../resources/migrations/upgrade_user_table_for_cashier_fastspring.php' => sprintf(
-                database_path('migrations').'/%s_upgrade_user_table_for_cashier_fastspring.php',
+            __DIR__ . '/../resources/migrations/upgrade_user_table_for_cashier_fastspring.php' => sprintf(
+                database_path('migrations') . '/%s_upgrade_user_table_for_cashier_fastspring.php',
                 date('Y_m_d_His', ++$time)
             ),
-            __DIR__.'/../resources/migrations/create_invoices_table_for_cashier_fastspring.php' => sprintf(
-                database_path('migrations').'/%s_create_invoices_table_for_cashier_fastspring.php',
+            __DIR__ . '/../resources/migrations/create_invoices_table_for_cashier_fastspring.php' => sprintf(
+                database_path('migrations') . '/%s_create_invoices_table_for_cashier_fastspring.php',
                 date('Y_m_d_His', ++$time)
             ),
-            __DIR__.'/../resources/migrations/create_subscription_periods_table_for_cashier_fastspring.php' => sprintf(
-                database_path('migrations').'/%s_create_subscription_periods_table_for_cashier_fastspring.php',
+            __DIR__ . '/../resources/migrations/create_subscription_periods_table_for_cashier_fastspring.php' => sprintf(
+                database_path('migrations') . '/%s_create_subscription_periods_table_for_cashier_fastspring.php',
                 date('Y_m_d_His', ++$time)
             ),
         ]);

diff --git a/src/Fastspring/Fastspring.php b/src/Fastspring/Fastspring.php
@@ -38,7 +38,7 @@ class Fastspring
      */
     public static function __callStatic($method, $parameters)
     {
-        if (! self::$instance) {
+        if (!self::$instance) {
             $username = (getenv('FASTSPRING_USERNAME') ?: config('services.fastspring.username'));
             $password = (getenv('FASTSPRING_PASSWORD') ?: config('services.fastspring.password'));
 

diff --git a/src/Http/Controllers/WebhookController.php b/src/Http/Controllers/WebhookController.php
@@ -71,11 +71,11 @@ public function handleWebhook(Request $request)
             // prepare category event class names like OrderAny
             $explodedType = explode('.', $event['type']);
             $category = array_shift($explodedType);
-            $categoryEvent = '\TwentyTwoDigital\CashierFastspring\Events\\'.Str::studly($category).'Any';
+            $categoryEvent = '\TwentyTwoDigital\CashierFastspring\Events\\' . Str::studly($category) . 'Any';
 
             // prepare category event class names like activity
             $activity = str_replace('.', ' ', $event['type']);
-            $activityEvent = '\TwentyTwoDigital\CashierFastspring\Events\\'.Str::studly($activity);
+            $activityEvent = '\TwentyTwoDigital\CashierFastspring\Events\\' . Str::studly($activity);
 
             // there may be some exceptions on events
             // so if anything goes bad its ID won't be added on the successfullEvents
@@ -84,8 +84,8 @@ public function handleWebhook(Request $request)
             try {
                 // check if the related event classes are exist
                 // there may be not handled events
-                if (! class_exists($categoryEvent) || ! class_exists($activityEvent)) {
-                    throw new Exception('There is no event for '.$event['type']);
+                if (!class_exists($categoryEvent) || !class_exists($activityEvent)) {
+                    throw new Exception('There is no event for ' . $event['type']);
                 }
 
                 // trigger events

diff --git a/src/Listeners/SubscriptionActivated.php b/src/Listeners/SubscriptionActivated.php
@@ -57,7 +57,7 @@ public function handle(Events\SubscriptionActivated $event)
 
         $subscription = $user->subscription();
 
-        if (! $subscription) {
+        if (!$subscription) {
             $subscription = new Subscription();
             $subscription->user_id = $user->id;
             $subscription->name = $subscriptionName;

diff --git a/src/Listeners/SubscriptionChargeCompleted.php b/src/Listeners/SubscriptionChargeCompleted.php
@@ -67,7 +67,7 @@ public function handle(Events\SubscriptionChargeCompleted $event)
         $periodEndDate = $nextDate->subDay()->format('Y-m-d H:i:s');
 
         // yeap, weird way
-        $methodName = 'sub'.Str::title($subscription->interval_unit).'sNoOverflow';
+        $methodName = 'sub' . Str::title($subscription->interval_unit) . 'sNoOverflow';
         $periodStartDate = $nextDate->$methodName($subscription->interval_length)->addDay()->format('Y-m-d H:i:s');
 
         // fill the model

diff --git a/src/Subscription.php b/src/Subscription.php
@@ -219,7 +219,7 @@ protected function createPeriodLocally()
                     break;
 
                 default:
-                    throw new Exception('Unexcepted interval unit: '.$subscription->interval_unit);
+                    throw new Exception('Unexcepted interval unit: ' . $subscription->interval_unit);
             }
 
             $subscriptionPeriodData = [
@@ -230,7 +230,7 @@ protected function createPeriodLocally()
             ];
 
             $lastPeriod = SubscriptionPeriod::firstOrCreate($subscriptionPeriodData);
-        } while (! ($today->greaterThanOrEqualTo($lastPeriod->start_date)
+        } while (!($today->greaterThanOrEqualTo($lastPeriod->start_date)
             && $today->lessThanOrEqualTo($lastPeriod->end_date)
         ));
 
@@ -260,7 +260,7 @@ public function owner()
      */
     public function valid()
     {
-        return ! $this->deactivated();
+        return !$this->deactivated();
     }
 
     /**
@@ -436,7 +436,7 @@ public function swap($plan, $prorate, $quantity = 1, $coupons = [])
 
         // else
         // TODO: it might be better to create custom exception
-        throw new Exception('Swap operation failed. Response: '.json_encode($response));
+        throw new Exception('Swap operation failed. Response: ' . json_encode($response));
     }
 
     /**
@@ -462,7 +462,7 @@ public function cancel()
 
         // else
         // TODO: it might be better to create custom exception
-        throw new Exception('Cancel operation failed. Response: '.json_encode($response));
+        throw new Exception('Cancel operation failed. Response: ' . json_encode($response));
     }
 
     /**
@@ -486,7 +486,7 @@ public function cancelNow()
 
         // else
         // TODO: it might be better to create custom exception
-        throw new Exception('CancelNow operation failed. Response: '.json_encode($response));
+        throw new Exception('CancelNow operation failed. Response: ' . json_encode($response));
     }
 
     /**
@@ -499,7 +499,7 @@ public function cancelNow()
      */
     public function resume()
     {
-        if (! $this->onGracePeriod()) {
+        if (!$this->onGracePeriod()) {
             throw new LogicException('Unable to resume subscription that is not within grace period or not canceled.');
         }
 
@@ -520,6 +520,6 @@ public function resume()
 
         // else
         // TODO: it might be better to create custom exception
-        throw new Exception('Resume operation failed. Response: '.json_encode($response));
+        throw new Exception('Resume operation failed. Response: ' . json_encode($response));
     }
 }
diff --git a/src/SubscriptionBuilder.php b/src/SubscriptionBuilder.php
@@ -124,7 +124,7 @@ public function create()
      */
     protected function getFastspringIdOfCustomer()
     {
-        if (! $this->owner->fastspring_id) {
+        if (!$this->owner->fastspring_id) {
             try {
                 $customer = $this->owner->createAsFastspringCustomer();
             } catch (ClientException $e) {

diff --git a/tests/CashierFastspringTest.php b/tests/CashierFastspringTest.php
@@ -25,7 +25,7 @@ class CashierFastspringTest extends TestCase
 
     public static function setUpBeforeClass()
     {
-        if (file_exists(__DIR__.'/.env')) {
+        if (file_exists(__DIR__ . '/.env')) {
             $dotenv = \Dotenv\Dotenv::create(__DIR__);
             $dotenv->load();
         }

diff --git a/tests/FastspringTest.php b/tests/FastspringTest.php
@@ -19,7 +19,7 @@ class FastspringTest extends TestCase
 
     public static function setUpBeforeClass()
     {
-        if (file_exists(__DIR__.'/.env')) {
+        if (file_exists(__DIR__ . '/.env')) {
             $dotenv = \Dotenv\Dotenv::create(__DIR__);
             $dotenv->load();
         }

diff --git a/tests/InvoiceTest.php b/tests/InvoiceTest.php
@@ -15,7 +15,7 @@ class InvoiceTest extends TestCase
 
     public static function setUpBeforeClass()
     {
-        if (file_exists(__DIR__.'/.env')) {
+        if (file_exists(__DIR__ . '/.env')) {
             $dotenv = \Dotenv\Dotenv::create(__DIR__);
             $dotenv->load();
         }

diff --git a/tests/ListenersTest.php b/tests/ListenersTest.php
@@ -19,7 +19,7 @@ class ListenersTest extends TestCase
 
     public static function setUpBeforeClass()
     {
-        if (file_exists(__DIR__.'/.env')) {
+        if (file_exists(__DIR__ . '/.env')) {
             $dotenv = \Dotenv\Dotenv::create(__DIR__);
             $dotenv->load();
         }
@@ -133,7 +133,7 @@ public function testSubscriptionDeactivatedListener()
      */
     protected function payloadOfSubscriptionCanceled($subscriptionId, $accountId)
     {
-        $template = file_get_contents(__DIR__.'/Payloads/subscription_canceled.json');
+        $template = file_get_contents(__DIR__ . '/Payloads/subscription_canceled.json');
         $jsonString = $this->renderTemplate(
             $template,
             ['subscriptionId' => $subscriptionId, 'accountId' => $accountId]
@@ -144,15 +144,15 @@ protected function payloadOfSubscriptionCanceled($subscriptionId, $accountId)
 
     protected function payloadOfSubscriptionActivated($accountId)
     {
-        $template = file_get_contents(__DIR__.'/Payloads/subscription_activated.json');
+        $template = file_get_contents(__DIR__ . '/Payloads/subscription_activated.json');
         $jsonString = $this->renderTemplate($template, ['accountId' => $accountId]);
 
         return json_decode($jsonString, true);
     }
 
     protected function payloadOfSubscriptionDeactivated($accountId, $subscriptionId)
     {
-        $template = file_get_contents(__DIR__.'/Payloads/subscription_deactivated.json');
+        $template = file_get_contents(__DIR__ . '/Payloads/subscription_deactivated.json');
         $jsonString = $this->renderTemplate($template, [
             'accountId'      => $accountId,
             'subscriptionId' => $subscriptionId,
@@ -163,7 +163,7 @@ protected function payloadOfSubscriptionDeactivated($accountId, $subscriptionId)
 
     protected function payloadOfSubscriptionChargeCompleted($subscriptionId, $accountId)
     {
-        $template = file_get_contents(__DIR__.'/Payloads/subscription_charge_completed.json');
+        $template = file_get_contents(__DIR__ . '/Payloads/subscription_charge_completed.json');
         $jsonString = $this->renderTemplate(
             $template,
             ['subscriptionId' => $subscriptionId, 'accountId' => $accountId]
@@ -174,7 +174,7 @@ protected function payloadOfSubscriptionChargeCompleted($subscriptionId, $accoun
 
     protected function payloadOfOrderCompleted($accountId)
     {
-        $template = file_get_contents(__DIR__.'/Payloads/order_completed.json');
+        $template = file_get_contents(__DIR__ . '/Payloads/order_completed.json');
         $jsonString = $this->renderTemplate($template, ['accountId' => $accountId]);
 
         return json_decode($jsonString, true);
@@ -188,7 +188,7 @@ protected function renderTemplate($template, $data)
         $patterns = [];
 
         foreach ($dataKeys as $dataKey) {
-            $patterns[] = '/{'.$dataKey.'}/';
+            $patterns[] = '/{' . $dataKey . '}/';
         }
 
         return preg_replace($patterns, $replacements, $template);

diff --git a/tests/SubscriptionPeriodTest.php b/tests/SubscriptionPeriodTest.php
@@ -15,7 +15,7 @@ class SubscriptionPeriodTest extends TestCase
 
     public static function setUpBeforeClass()
     {
-        if (file_exists(__DIR__.'/.env')) {
+        if (file_exists(__DIR__ . '/.env')) {
             $dotenv = \Dotenv\Dotenv::create(__DIR__);
             $dotenv->load();
         }

diff --git a/tests/WebhookControllerTest.php b/tests/WebhookControllerTest.php
@@ -19,7 +19,7 @@ class WebhookControllerTest extends TestCase
      */
     public static function setUpBeforeClass()
     {
-        if (file_exists(__DIR__.'/.env')) {
+        if (file_exists(__DIR__ . '/.env')) {
             $dotenv = \Dotenv\Dotenv::create(__DIR__);
             $dotenv->load();
         }
@@ -198,7 +198,7 @@ public function testWebhooksEvents()
 
         foreach ($webhookEvents as $key => $webhookEvent) {
             $mockEvent = [
-                'id'        => 'id-'.$key,
+                'id'        => 'id-' . $key,
                 'live'      => true,
                 'processed' => false,
                 'type'      => $webhookEvent,
@@ -209,11 +209,11 @@ public function testWebhooksEvents()
             // prepare category event class names like OrderAny
             $explodedType = explode('.', $mockEvent['type']);
             $category = array_shift($explodedType);
-            $categoryEvent = 'TwentyTwoDigital\CashierFastspring\Events\\'.Str::studly($category).'Any';
+            $categoryEvent = 'TwentyTwoDigital\CashierFastspring\Events\\' . Str::studly($category) . 'Any';
 
             // prepare category event class names like activity
             $activity = str_replace('.', ' ', $mockEvent['type']);
-            $activityEvent = 'TwentyTwoDigital\CashierFastspring\Events\\'.Str::studly($activity);
+            $activityEvent = 'TwentyTwoDigital\CashierFastspring\Events\\' . Str::studly($activity);
 
             $listenEvents = [
                 Events\Any::class,