Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update dependencies #1337

Merged
merged 6 commits into from
May 23, 2022
Merged

Update dependencies #1337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b791437
`composer update` and remove MD dep
qwerty287 May 21, 2022
bac8b17
Bump composer.json deps
qwerty287 May 21, 2022
8ca3a42
Add required PHP exts
qwerty287 May 21, 2022
54b70e6
Update action name
qwerty287 May 21, 2022
e3a4dbd
Fix indentation
qwerty287 May 21, 2022
b2ce904
Update composer.json
qwerty287 May 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/Build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
sql-versions: ['mariadb', 'postgresql', 'sqlite']
mode: ['', '--no-dev']

name: PHP${{ matrix.php-versions }} - ${{ matrix.sql-versions }} - ${{ matrix.mode }}
name: PHP${{ matrix.php-versions }} - ${{ matrix.sql-versions }} ${{ matrix.mode }}
nagmat84 marked this conversation as resolved.
Show resolved Hide resolved

env:
extensions: bcmath, curl, dom, gd, imagick, json, libxml, mbstring, pcntl, pdo, pdo_sqlite, pdo_mysql, pdo_pgsql, pgsql, sqlite3, zip
Expand Down
4 changes: 2 additions & 2 deletions app/Models/PageContent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
use App\Models\Extensions\ThrowsConsistentExceptions;
use App\Models\Extensions\UseFixedQueryBuilder;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Mail\Markdown;
use Illuminate\Support\Carbon;
use Markdown;

/**
* App\PageContent.
Expand Down Expand Up @@ -39,7 +39,7 @@ public function get_content()
$return = '<div class="' . $this->class . '"><img src="' . $this->content . '" alt="image" /></div>';
} elseif ($this->type == 'div') {
$return = '<div class="' . $this->class . '">';
$return .= Markdown::convertToHtml($this->content);
$return .= Markdown::parse($this->content)->toHtml();
$return .= '</div>';
}

Expand Down
17 changes: 10 additions & 7 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,23 @@
"require": {
"php": "^8.0",
"ext-bcmath": "*",
"ext-ctype": "*",
"ext-exif": "*",
"ext-fileinfo": "*",
"ext-fileinfo": "*",
"ext-gd": "*",
"ext-json": "*",
"ext-mbstring": "*",
"ext-openssl": "*",
"ext-pdo": "*",
"ext-tokenizer": "*",
"ext-xml": "*",
"ext-zip": "*",
"bepsvpt/secure-headers": "^7.1",
"darkghosthunter/larapass": "dev-LycheeSpecial",
"doctrine/dbal": "^3.1",
"fideloper/proxy": "^4.3",
"geocoder-php/cache-provider": "^4.3",
"geocoder-php/nominatim-provider": "^5.5",
"graham-campbell/markdown": "^13.1",
nagmat84 marked this conversation as resolved.
Show resolved Hide resolved
"laravel/framework": "^8.0",
"livewire/livewire": "^2.7",
"lychee-org/nestedset": "^6",
Expand All @@ -37,7 +43,7 @@
"spatie/guzzle-rate-limiter-middleware": "^2.0",
"spatie/laravel-feed": "^4.0",
"spatie/laravel-image-optimizer": "^1.6.2",
"symfony/cache": "^5.3",
"symfony/cache": "^v6.0.0",
"whichbrowser/parser": "^2.0"
},
"require-dev": {
Expand All @@ -47,13 +53,10 @@
"filp/whoops": "^2.5",
"friendsofphp/php-cs-fixer": "^3.3",
"itsgoingd/clockwork": "^5.0",
"laravel/homestead": "^12.8",
"laravel/homestead": "^v13.2.1",
"nunomaduro/collision": "^5.0",
"phpunit/phpunit": "^9"
},
"conflict": {
"doctrine/dbal": "2.10.3"
},
"autoload": {
"classmap": [
"database/seeds",
Expand Down
Loading