Migrating carbon and phpdotenv

composer.json

@@ -17,7 +17,7 @@
         "php": ">=7.1.3",
         "illuminate/database": "~5.6",
         "illuminate/support": "~5.6",
-        "nesbot/carbon": "~1.0",
+        "nesbot/carbon": "~2.0",
         "symfony/http-kernel": "~2.7|~3.0|~4.0",
         "guzzlehttp/guzzle": "^6.0"
     },
@@ -26,7 +26,7 @@
         "illuminate/routing": "~5.6",
         "mockery/mockery": "~1.0",
         "phpunit/phpunit": "~7.0",
-        "vlucas/phpdotenv": "~2.0",
+        "vlucas/phpdotenv": "^3.3",
         "orchestra/testbench": "~3.6"
     },
     "autoload": {

phpunit.xml

@@ -8,7 +8,6 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
 >
     <testsuites>
         <testsuite name="Package Test Suite">

src/Http/Controllers/WebhookController.php

@@ -8,6 +8,7 @@
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Event;
+use Illuminate\Support\Str;
 use Log;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -16,7 +17,9 @@ class WebhookController extends Controller
     /**
      * Handle a Fastspring webhook call.
      *
-     * @param \Illuminate\Http\Request $request
+     * @param \Illuminate\Http\Request $request The webhook requet
+     *
+     * @throws Exception
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
@@ -53,11 +56,11 @@ public function handleWebhook(Request $request)
             // prepare category event class names like OrderAny
             $explodedType = explode('.', $event['type']);
             $category = array_shift($explodedType);
-            $categoryEvent = '\Bgultekin\CashierFastspring\Events\\'.studly_case($category).'Any';
+            $categoryEvent = '\Bgultekin\CashierFastspring\Events\\'.Str::studly($category).'Any';
 
             // prepare category event class names like activity
             $activity = str_replace('.', ' ', $event['type']);
-            $activityEvent = '\Bgultekin\CashierFastspring\Events\\'.studly_case($activity);
+            $activityEvent = '\Bgultekin\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
@@ -71,32 +74,38 @@ public function handleWebhook(Request $request)
                 }
 
                 // trigger events
-                Event::fire(new Events\Any(
-                    $event['id'],
-                    $event['type'],
-                    $event['live'],
-                    $event['processed'],
-                    $event['created'],
-                    $event['data']
-                ));
-
-                Event::fire(new $categoryEvent(
-                    $event['id'],
-                    $event['type'],
-                    $event['live'],
-                    $event['processed'],
-                    $event['created'],
-                    $event['data']
-                ));
-
-                Event::fire(new $activityEvent(
-                    $event['id'],
-                    $event['type'],
-                    $event['live'],
-                    $event['processed'],
-                    $event['created'],
-                    $event['data']
-                ));
+                Event::dispatch(
+                    new Events\Any(
+                        $event['id'],
+                        $event['type'],
+                        $event['live'],
+                        $event['processed'],
+                        $event['created'],
+                        $event['data']
+                    )
+                );
+
+                Event::dispatch(
+                    new $categoryEvent(
+                        $event['id'],
+                        $event['type'],
+                        $event['live'],
+                        $event['processed'],
+                        $event['created'],
+                        $event['data']
+                    )
+                );
+
+                Event::dispatch(
+                    new $activityEvent(
+                        $event['id'],
+                        $event['type'],
+                        $event['live'],
+                        $event['processed'],
+                        $event['created'],
+                        $event['data']
+                    )
+                );
 
                 // add event id to successful events
                 $successfulEvents[] = $event['id'];

tests/CashierFastspringTest.php

@@ -26,12 +26,12 @@ class CashierFastspringTest extends TestCase
     public static function setUpBeforeClass()
     {
         if (file_exists(__DIR__.'/.env')) {
-            $dotenv = new \Dotenv\Dotenv(__DIR__);
+            $dotenv = \Dotenv\Dotenv::create(__DIR__);
             $dotenv->load();
         }
     }
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/FastspringTest.php

@@ -20,12 +20,12 @@ class FastspringTest extends TestCase
     public static function setUpBeforeClass()
     {
         if (file_exists(__DIR__.'/.env')) {
-            $dotenv = new \Dotenv\Dotenv(__DIR__);
+            $dotenv = \Dotenv\Dotenv::create(__DIR__);
             $dotenv->load();
         }
     }
 
-    public function setUp()
+    public function setUp(): void
     {
         // prepare class for testing
         $mock = new MockHandler(array_fill(

tests/InvoiceTest.php

@@ -18,12 +18,12 @@ class InvoiceTest extends TestCase
     public static function setUpBeforeClass()
     {
         if (file_exists(__DIR__.'/.env')) {
-            $dotenv = new \Dotenv\Dotenv(__DIR__);
+            $dotenv = \Dotenv\Dotenv::create(__DIR__);
             $dotenv->load();
         }
     }
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/ListenersTest.php

@@ -20,12 +20,12 @@ class ListenersTest extends TestCase
     public static function setUpBeforeClass()
     {
         if (file_exists(__DIR__.'/.env')) {
-            $dotenv = new \Dotenv\Dotenv(__DIR__);
+            $dotenv = \Dotenv\Dotenv::create(__DIR__);
             $dotenv->load();
         }
     }
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/ServiceProviderTest.php

@@ -7,7 +7,7 @@
 
 class ServiceProviderTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
     }

tests/SubscriptionPeriodTest.php

@@ -16,12 +16,12 @@ class SubscriptionPeriodTest extends TestCase
     public static function setUpBeforeClass()
     {
         if (file_exists(__DIR__.'/.env')) {
-            $dotenv = new \Dotenv\Dotenv(__DIR__);
+            $dotenv = \Dotenv\Dotenv::create(__DIR__);
             $dotenv->load();
         }
     }
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/SubscriptionTest.php

@@ -20,12 +20,12 @@ class SubscriptionTest extends TestCase
     public static function setUpBeforeClass()
     {
         if (file_exists(__DIR__.'/.env')) {
-            $dotenv = new \Dotenv\Dotenv(__DIR__);
+            $dotenv = \Dotenv\Dotenv::create(__DIR__);
             $dotenv->load();
         }
     }
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/Traits/Database.php

@@ -17,7 +17,7 @@ protected function getEnvironmentSetUp($app)
         ]);
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         Schema::drop('users');
         Schema::drop('subscriptions');

tests/WebhookControllerTest.php

@@ -7,14 +7,15 @@
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Event;
+use Illuminate\Support\Str;
 use Orchestra\Testbench\TestCase;
 
 class WebhookControllerTest extends TestCase
 {
     public static function setUpBeforeClass()
     {
         if (file_exists(__DIR__.'/.env')) {
-            $dotenv = new \Dotenv\Dotenv(__DIR__);
+            $dotenv = \Dotenv\Dotenv::create(__DIR__);
             $dotenv->load();
         }
     }
@@ -182,11 +183,11 @@ public function testWebhooksEvents()
             // prepare category event class names like OrderAny
             $explodedType = explode('.', $mockEvent['type']);
             $category = array_shift($explodedType);
-            $categoryEvent = 'Bgultekin\CashierFastspring\Events\\'.studly_case($category).'Any';
+            $categoryEvent = 'Bgultekin\CashierFastspring\Events\\'.Str::studly($category).'Any';
 
             // prepare category event class names like activity
             $activity = str_replace('.', ' ', $mockEvent['type']);
-            $activityEvent = 'Bgultekin\CashierFastspring\Events\\'.studly_case($activity);
+            $activityEvent = 'Bgultekin\CashierFastspring\Events\\'.Str::studly($activity);
 
             $listenEvents = [
                 Events\Any::class,