mirror_php/Cachet
1
0
Fork 0
mirror of https://github.com/CachetHQ/Cachet.git synced 2025-01-16 13:09:06 +01:00
Code Issues Projects Releases Wiki Activity

Compatibility fixes

Browse Source
This commit is contained in:
James Brooks 2021-03-29 12:24:45 +01:00
parent 2440079493
commit 84b0c5a4be
5 changed files with 1487 additions and 936 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/StatusPageController.php
View File

@ -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;

18
composer.json
View File

@ -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",
"alt-three/twitter": "^3.1",
"cachethq/badger": "^2.0",
"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": {

2393
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

6
config/app.php
View File

@ -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,

4
config/markdown.php
View File

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