Skip to content

Commit abbc78e

Browse files
authored
Merge pull request #1464 from KodeStar/2.x
Update framework to laravel 11 and fix images with no extension causing error 500
2 parents 11453e1 + d1801d1 commit abbc78e

8,095 files changed

Lines changed: 246986 additions & 190349 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.env.example

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,15 @@ APP_KEY=
44
APP_DEBUG=false
55
APP_URL=http://localhost
66

7+
APP_LOCALE=en
8+
APP_FALLBACK_LOCALE=en
9+
APP_FAKER_LOCALE=en_US
10+
APP_MAINTENANCE_DRIVER=file
11+
APP_MAINTENANCE_STORE=database
12+
BCRYPT_ROUNDS=12
13+
714
LOG_CHANNEL=daily
15+
LOG_STACK=single
816

917
DB_CONNECTION=sqlite
1018
DB_DATABASE=app.sqlite
@@ -16,11 +24,14 @@ DB_DATABASE=app.sqlite
1624
#DB_USERNAME=<user>
1725
#DB_PASSWORD=<password>
1826

19-
BROADCAST_DRIVER=log
20-
CACHE_DRIVER=file
27+
BROADCAST_CONNECTION=log
28+
CACHE_STORE=file
2129
QUEUE_CONNECTION=sync
2230
SESSION_DRIVER=file
2331
SESSION_LIFETIME=120
32+
SESSION_ENCRYPT=false
33+
SESSION_PATH=/
34+
SESSION_DOMAIN=null
2435
QUEUE_DRIVER=sync
2536

2637
REDIS_HOST=127.0.0.1

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
extensions: mbstring, dom, fileinfo, mysql, libxml, xml, xmlwriter, dom, tokenizer, filter, json, phar, pcre, openssl, pdo, intl, curl
1717

1818
- name: Cache composer dependencies
19-
uses: actions/cache@v1
19+
uses: actions/cache@v4
2020
with:
2121
path: vendor
2222
key: composer-${{ hashFiles('composer.lock') }}
@@ -32,7 +32,7 @@ jobs:
3232
php artisan key:generate
3333
3434
- name: Cache yarn dependencies
35-
uses: actions/cache@v1
35+
uses: actions/cache@v4
3636
with:
3737
path: node_modules
3838
key: yarn-${{ hashFiles('yarn.lock') }}

app/Console/Kernel.php

Lines changed: 0 additions & 28 deletions
This file was deleted.

app/Exceptions/Handler.php

Lines changed: 0 additions & 30 deletions
This file was deleted.

app/Facades/Form.php

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?php
2+
3+
namespace App\Facades;
4+
5+
use Illuminate\Support\Facades\Facade;
6+
7+
class Form extends Facade
8+
{
9+
protected static function getFacadeAccessor()
10+
{
11+
return 'custom-form';
12+
}
13+
}

app/Http/Controllers/ItemController.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,13 @@ public function dash(Request $request): View
4545
$data['categories'] = Item::whereHas('children')->with('children', function ($query) {
4646
$query->pinned()->orderBy('order', 'asc');
4747
})->pinned()->orderBy('order', 'asc')->get();
48-
4948
} elseif ($treat_tags_as == 'tags') {
5049
$data['apps'] = Item::with('parents')->where('type', 0)->pinned()->orderBy('order', 'asc')->get();
5150
$data['all_apps'] = Item::where('type', 0)->orderBy('order', 'asc')->get();
52-
$data['taglist'] = Item::where('id', 0)->orWhere(function($query) {
51+
$data['taglist'] = Item::where('id', 0)->orWhere(function ($query) {
5352
$query->where('type', 1)->pinned();
5453
})->orderBy('order', 'asc')->get();
5554
} else {
56-
5755
$data['apps'] = Item::whereHas('parents', function ($query) {
5856
$query->where('id', 0);
5957
})->whereIn('role', $roles)->orWhere('type', 1)->pinned()->orderBy('order', 'asc')->get();
@@ -67,15 +65,13 @@ public function dash(Request $request): View
6765
$data['categories'] = Item::whereHas('children')->with('children', function ($query) {
6866
$query->pinned()->orderBy('order', 'asc');
6967
})->pinned()->orderBy('order', 'asc')->get();
70-
7168
} elseif ($treat_tags_as == 'tags') {
7269
$data['apps'] = Item::with('parents')->where('type', 0)->pinned()->orderBy('order', 'asc')->get();
7370
$data['all_apps'] = Item::where('type', 0)->orderBy('order', 'asc')->get();
74-
$data['taglist'] = Item::where('id', 0)->orWhere(function($query) {
71+
$data['taglist'] = Item::where('id', 0)->orWhere(function ($query) {
7572
$query->where('type', 1)->pinned();
7673
})->orderBy('order', 'asc')->get();
7774
} else {
78-
7975
$data['apps'] = Item::whereHas('parents', function ($query) {
8076
$query->where('id', 0);
8177
})->orWhere('type', 1)->pinned()->orderBy('order', 'asc')->get();
@@ -254,6 +250,9 @@ public static function storelogic(Request $request, $id = null): Item
254250

255251
$file = $request->input('icon');
256252
$path_parts = pathinfo($file);
253+
if (!isset($path_parts['extension'])) {
254+
throw ValidationException::withMessages(['file' => 'Icon URL must have a valid file extension.']);
255+
}
257256
$extension = $path_parts['extension'];
258257

259258
$contents = file_get_contents($request->input('icon'), false, stream_context_create($options));

app/Http/Kernel.php

Lines changed: 0 additions & 61 deletions
This file was deleted.

app/Http/Middleware/EncryptCookies.php

Lines changed: 0 additions & 17 deletions
This file was deleted.

app/Http/Middleware/TrimStrings.php

Lines changed: 0 additions & 19 deletions
This file was deleted.

app/Http/Middleware/ValidateSignature.php

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)