Compatibility fixes

app/Http/Controllers/StatusPageController.php

@@ -11,7 +11,7 @@
 
 namespace CachetHQ\Cachet\Http\Controllers;
 
-use AltThree\Badger\Facades\Badger;
+use CachetHQ\Badger\Facades\Badger;
 use CachetHQ\Cachet\Http\Controllers\Api\AbstractApiController;
 use CachetHQ\Cachet\Models\Component;
 use CachetHQ\Cachet\Models\Incident;

composer.json

@@ -33,10 +33,10 @@
         "ext-mbstring": "*",
         "ext-openssl": "*",
         "ext-xml": "*",
-        "alt-three/badger": "^5.1",
         "alt-three/bus": "^4.1",
-        "alt-three/emoji": "^7.0",
+        "cachethq/badger": "^2.0",
-        "alt-three/twitter": "^3.1",
+        "cachethq/emoji": "^3.0",
+        "cachethq/twitter": "^3.0",
         "alt-three/validator": "^4.1",
         "aws/aws-sdk-php": "^3.7",
         "barryvdh/laravel-cors": "^0.11.0",
@@ -46,7 +46,7 @@
         "fideloper/proxy": "^4.0",
         "graham-campbell/binput": "^6.0",
         "graham-campbell/exceptions": "^11.1",
-        "graham-campbell/markdown": "^10.2",
+        "graham-campbell/markdown": "^11.2",
         "guzzlehttp/guzzle": "^6.3.3",
         "jenssegers/date": "^3.4",
         "laravel/framework": "5.7.*",
@@ -59,7 +59,7 @@
     },
     "require-dev": {
         "ext-sqlite3": "*",
-        "alt-three/testbench": "^4.0",
+        "alt-three/testbench": "5.0.x-dev",
         "barryvdh/laravel-debugbar": "^3.2",
         "filp/whoops": "^2.3",
         "fzaninotto/faker": "^1.8",
@@ -97,6 +97,14 @@
         "post-autoload-dump": [
           "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
           "@php artisan package:discover"
+        ],
+        "test": [
+          "@php artisan config:clear",
+          "vendor/bin/phpunit"
+        ],
+        "test-coverage": [
+          "@php artisan config:clear",
+          "vendor/bin/phpunit --coverage-clover=coverage.xml"
         ]
     },
     "config": {

config/app.php

@@ -174,11 +174,11 @@ return [
          * Packages Service Providers...
          */
         env('APP_DEBUG') ? Bugsnag\BugsnagLaravel\BugsnagServiceProvider::class : null,
-        AltThree\Badger\BadgerServiceProvider::class,
-        AltThree\Emoji\EmojiServiceProvider::class,
-        AltThree\Twitter\TwitterServiceProvider::class,
         Barryvdh\Cors\ServiceProvider::class,
         env('APP_DEBUG') ? Barryvdh\Debugbar\ServiceProvider::class : null,
+        CachetHQ\Badger\BadgerServiceProvider::class,
+        CachetHQ\Emoji\EmojiServiceProvider::class,
+        CachetHQ\Twitter\TwitterServiceProvider::class,
         GrahamCampbell\Binput\BinputServiceProvider::class,
         GrahamCampbell\Exceptions\ExceptionsServiceProvider::class,
         GrahamCampbell\Markdown\MarkdownServiceProvider::class,

config/markdown.php

@@ -40,8 +40,8 @@ return [
     */
 
     'extensions' => array_filter([
-        env('CACHET_EMOJI', false) ? 'AltThree\Emoji\EmojiExtension' : null,
+        env('CACHET_EMOJI', false) ? 'CachetHQ\Emoji\EmojiExtension' : null,
-        env('CACHET_AUTO_TWITTER', true) ? 'AltThree\Twitter\TwitterExtension' : null,
+        env('CACHET_AUTO_TWITTER', true) ? 'CachetHQ\Twitter\TwitterExtension' : null,
     ]),
 
     /*