🚀 update(dependencies): upgrade Laravel framework and other packages to latest versions

This commit is contained in:
fsociety
2024-12-23 18:27:08 +01:00
parent 899ff36334
commit 73bed106b4
3 changed files with 139 additions and 86 deletions

View File

@@ -7,6 +7,6 @@ use Livewire\Form;
class VoteForm extends Form
{
#[Validate('required|min:5')]
#[Validate('nullable|min:5')]
public $reason = '';
}

128
composer.lock generated
View File

@@ -1810,16 +1810,16 @@
},
{
"name": "laravel/framework",
"version": "v11.35.1",
"version": "v11.36.1",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "dcfa130ede1a6fa4343dc113410963e791ad34fb"
"reference": "df06f5163f4550641fdf349ebc04916a61135a64"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/dcfa130ede1a6fa4343dc113410963e791ad34fb",
"reference": "dcfa130ede1a6fa4343dc113410963e791ad34fb",
"url": "https://api.github.com/repos/laravel/framework/zipball/df06f5163f4550641fdf349ebc04916a61135a64",
"reference": "df06f5163f4550641fdf349ebc04916a61135a64",
"shasum": ""
},
"require": {
@@ -1840,7 +1840,7 @@
"guzzlehttp/uri-template": "^1.0",
"laravel/prompts": "^0.1.18|^0.2.0|^0.3.0",
"laravel/serializable-closure": "^1.3|^2.0",
"league/commonmark": "^2.2.1",
"league/commonmark": "^2.6",
"league/flysystem": "^3.25.1",
"league/flysystem-local": "^3.25.1",
"league/uri": "^7.5.1",
@@ -1855,7 +1855,7 @@
"symfony/console": "^7.0.3",
"symfony/error-handler": "^7.0.3",
"symfony/finder": "^7.0.3",
"symfony/http-foundation": "^7.0.3",
"symfony/http-foundation": "^7.2.0",
"symfony/http-kernel": "^7.0.3",
"symfony/mailer": "^7.0.3",
"symfony/mime": "^7.0.3",
@@ -2021,7 +2021,7 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2024-12-12T18:25:58+00:00"
"time": "2024-12-17T22:32:08+00:00"
},
{
"name": "laravel/prompts",
@@ -2083,16 +2083,16 @@
},
{
"name": "laravel/pulse",
"version": "v1.3.1",
"version": "v1.3.2",
"source": {
"type": "git",
"url": "https://github.com/laravel/pulse.git",
"reference": "d1a5bf2eca36c6e3bedb4ceecd45df7d002a1ebc"
"reference": "f0bf3959faa89c05fa211632b6d2665131b017fc"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/pulse/zipball/d1a5bf2eca36c6e3bedb4ceecd45df7d002a1ebc",
"reference": "d1a5bf2eca36c6e3bedb4ceecd45df7d002a1ebc",
"url": "https://api.github.com/repos/laravel/pulse/zipball/f0bf3959faa89c05fa211632b6d2665131b017fc",
"reference": "f0bf3959faa89c05fa211632b6d2665131b017fc",
"shasum": ""
},
"require": {
@@ -2166,7 +2166,7 @@
"issues": "https://github.com/laravel/pulse/issues",
"source": "https://github.com/laravel/pulse"
},
"time": "2024-12-11T22:59:06+00:00"
"time": "2024-12-12T18:17:53+00:00"
},
{
"name": "laravel/reverb",
@@ -2315,16 +2315,16 @@
},
{
"name": "laravel/sanctum",
"version": "v4.0.6",
"version": "v4.0.7",
"source": {
"type": "git",
"url": "https://github.com/laravel/sanctum.git",
"reference": "9e069e36d90b1e1f41886efa0fe9800a6b354694"
"reference": "698064236a46df016e64a7eb059b1414e0b281df"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/sanctum/zipball/9e069e36d90b1e1f41886efa0fe9800a6b354694",
"reference": "9e069e36d90b1e1f41886efa0fe9800a6b354694",
"url": "https://api.github.com/repos/laravel/sanctum/zipball/698064236a46df016e64a7eb059b1414e0b281df",
"reference": "698064236a46df016e64a7eb059b1414e0b281df",
"shasum": ""
},
"require": {
@@ -2375,20 +2375,20 @@
"issues": "https://github.com/laravel/sanctum/issues",
"source": "https://github.com/laravel/sanctum"
},
"time": "2024-11-26T21:18:33+00:00"
"time": "2024-12-11T16:40:21+00:00"
},
{
"name": "laravel/serializable-closure",
"version": "v2.0.0",
"version": "v2.0.1",
"source": {
"type": "git",
"url": "https://github.com/laravel/serializable-closure.git",
"reference": "0d8d3d8086984996df86596a86dea60398093a81"
"reference": "613b2d4998f85564d40497e05e89cb6d9bd1cbe8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/serializable-closure/zipball/0d8d3d8086984996df86596a86dea60398093a81",
"reference": "0d8d3d8086984996df86596a86dea60398093a81",
"url": "https://api.github.com/repos/laravel/serializable-closure/zipball/613b2d4998f85564d40497e05e89cb6d9bd1cbe8",
"reference": "613b2d4998f85564d40497e05e89cb6d9bd1cbe8",
"shasum": ""
},
"require": {
@@ -2436,7 +2436,7 @@
"issues": "https://github.com/laravel/serializable-closure/issues",
"source": "https://github.com/laravel/serializable-closure"
},
"time": "2024-11-19T01:38:44+00:00"
"time": "2024-12-16T15:26:28+00:00"
},
{
"name": "laravel/tinker",
@@ -3057,16 +3057,16 @@
},
{
"name": "livewire/livewire",
"version": "v3.5.17",
"version": "v3.5.18",
"source": {
"type": "git",
"url": "https://github.com/livewire/livewire.git",
"reference": "7bbf80d93db9b866776bf957ca6229364bca8d87"
"reference": "62f0fa6b340a467c25baa590a567d9a134b357da"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/livewire/livewire/zipball/7bbf80d93db9b866776bf957ca6229364bca8d87",
"reference": "7bbf80d93db9b866776bf957ca6229364bca8d87",
"url": "https://api.github.com/repos/livewire/livewire/zipball/62f0fa6b340a467c25baa590a567d9a134b357da",
"reference": "62f0fa6b340a467c25baa590a567d9a134b357da",
"shasum": ""
},
"require": {
@@ -3121,7 +3121,7 @@
"description": "A front-end framework for Laravel.",
"support": {
"issues": "https://github.com/livewire/livewire/issues",
"source": "https://github.com/livewire/livewire/tree/v3.5.17"
"source": "https://github.com/livewire/livewire/tree/v3.5.18"
},
"funding": [
{
@@ -3129,7 +3129,7 @@
"type": "github"
}
],
"time": "2024-12-06T13:41:21+00:00"
"time": "2024-12-23T15:05:02+00:00"
},
{
"name": "livewire/volt",
@@ -3385,16 +3385,16 @@
},
{
"name": "nesbot/carbon",
"version": "3.8.2",
"version": "3.8.3",
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
"reference": "e1268cdbc486d97ce23fef2c666dc3c6b6de9947"
"reference": "f01cfa96468f4c38325f507ab81a4f1d2cd93cfe"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/e1268cdbc486d97ce23fef2c666dc3c6b6de9947",
"reference": "e1268cdbc486d97ce23fef2c666dc3c6b6de9947",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/f01cfa96468f4c38325f507ab81a4f1d2cd93cfe",
"reference": "f01cfa96468f4c38325f507ab81a4f1d2cd93cfe",
"shasum": ""
},
"require": {
@@ -3426,10 +3426,6 @@
],
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "3.x-dev",
"dev-2.x": "2.x-dev"
},
"laravel": {
"providers": [
"Carbon\\Laravel\\ServiceProvider"
@@ -3439,6 +3435,10 @@
"includes": [
"extension.neon"
]
},
"branch-alias": {
"dev-2.x": "2.x-dev",
"dev-master": "3.x-dev"
}
},
"autoload": {
@@ -3487,7 +3487,7 @@
"type": "tidelift"
}
],
"time": "2024-11-07T17:46:48+00:00"
"time": "2024-12-21T18:03:19+00:00"
},
{
"name": "nette/schema",
@@ -6284,12 +6284,12 @@
"type": "library",
"extra": {
"laravel": {
"providers": [
"SimpleSoftwareIO\\QrCode\\QrCodeServiceProvider"
],
"aliases": {
"QrCode": "SimpleSoftwareIO\\QrCode\\Facades\\QrCode"
}
},
"providers": [
"SimpleSoftwareIO\\QrCode\\QrCodeServiceProvider"
]
}
},
"autoload": {
@@ -6594,16 +6594,16 @@
},
{
"name": "spatie/eloquent-sortable",
"version": "4.4.0",
"version": "4.4.1",
"source": {
"type": "git",
"url": "https://github.com/spatie/eloquent-sortable.git",
"reference": "7a460c775d29741f42744bac52f993cb5b84be0f"
"reference": "2448c25a2c4b588bc0e0b9820f8bbd110a2afd73"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/spatie/eloquent-sortable/zipball/7a460c775d29741f42744bac52f993cb5b84be0f",
"reference": "7a460c775d29741f42744bac52f993cb5b84be0f",
"url": "https://api.github.com/repos/spatie/eloquent-sortable/zipball/2448c25a2c4b588bc0e0b9820f8bbd110a2afd73",
"reference": "2448c25a2c4b588bc0e0b9820f8bbd110a2afd73",
"shasum": ""
},
"require": {
@@ -6652,7 +6652,7 @@
],
"support": {
"issues": "https://github.com/spatie/eloquent-sortable/issues",
"source": "https://github.com/spatie/eloquent-sortable/tree/4.4.0"
"source": "https://github.com/spatie/eloquent-sortable/tree/4.4.1"
},
"funding": [
{
@@ -6664,7 +6664,7 @@
"type": "github"
}
],
"time": "2024-06-04T11:09:54+00:00"
"time": "2024-12-23T09:54:53+00:00"
},
{
"name": "spatie/image",
@@ -7370,16 +7370,16 @@
},
{
"name": "spatie/laravel-sluggable",
"version": "3.7.0",
"version": "3.7.1",
"source": {
"type": "git",
"url": "https://github.com/spatie/laravel-sluggable.git",
"reference": "26bd614233dd0a5fbd783c5bc5bb93512cf03fdb"
"reference": "23dcb4cb9306f235a1eb20f170978afde82d0221"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/spatie/laravel-sluggable/zipball/26bd614233dd0a5fbd783c5bc5bb93512cf03fdb",
"reference": "26bd614233dd0a5fbd783c5bc5bb93512cf03fdb",
"url": "https://api.github.com/repos/spatie/laravel-sluggable/zipball/23dcb4cb9306f235a1eb20f170978afde82d0221",
"reference": "23dcb4cb9306f235a1eb20f170978afde82d0221",
"shasum": ""
},
"require": {
@@ -7417,7 +7417,7 @@
"spatie"
],
"support": {
"source": "https://github.com/spatie/laravel-sluggable/tree/3.7.0"
"source": "https://github.com/spatie/laravel-sluggable/tree/3.7.1"
},
"funding": [
{
@@ -7425,7 +7425,7 @@
"type": "github"
}
],
"time": "2024-12-09T13:35:55+00:00"
"time": "2024-12-23T09:54:10+00:00"
},
{
"name": "spatie/laravel-tags",
@@ -10333,31 +10333,33 @@
},
{
"name": "tijsverkoyen/css-to-inline-styles",
"version": "v2.2.7",
"version": "v2.3.0",
"source": {
"type": "git",
"url": "https://github.com/tijsverkoyen/CssToInlineStyles.git",
"reference": "83ee6f38df0a63106a9e4536e3060458b74ccedb"
"reference": "0d72ac1c00084279c1816675284073c5a337c20d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/83ee6f38df0a63106a9e4536e3060458b74ccedb",
"reference": "83ee6f38df0a63106a9e4536e3060458b74ccedb",
"url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/0d72ac1c00084279c1816675284073c5a337c20d",
"reference": "0d72ac1c00084279c1816675284073c5a337c20d",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-libxml": "*",
"php": "^5.5 || ^7.0 || ^8.0",
"symfony/css-selector": "^2.7 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0"
"php": "^7.4 || ^8.0",
"symfony/css-selector": "^5.4 || ^6.0 || ^7.0"
},
"require-dev": {
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0 || ^7.5 || ^8.5.21 || ^9.5.10"
"phpstan/phpstan": "^2.0",
"phpstan/phpstan-phpunit": "^2.0",
"phpunit/phpunit": "^8.5.21 || ^9.5.10"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.2.x-dev"
"dev-master": "2.x-dev"
}
},
"autoload": {
@@ -10380,9 +10382,9 @@
"homepage": "https://github.com/tijsverkoyen/CssToInlineStyles",
"support": {
"issues": "https://github.com/tijsverkoyen/CssToInlineStyles/issues",
"source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/v2.2.7"
"source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/v2.3.0"
},
"time": "2023-12-08T13:03:43+00:00"
"time": "2024-12-21T16:25:41+00:00"
},
{
"name": "uma/phpasn1",

View File

@@ -23,7 +23,6 @@ state([
'isAllowed' => false,
'currentPubkey' => null,
'currentPleb' => null,
'reasons' => fn() => $this->getReasons(),
'ownVoteExists' => false,
'boardVotes' => fn() => $this->getBoardVotes(),
'otherVotes' => fn() => $this->getOtherVotes(),
@@ -37,18 +36,10 @@ on([
$approve = fn() => $this->handleApprove();
$notApprove = fn() => $this->handleNotApprove();
$getReasons = function () {
return Vote::query()
->where('project_proposal_id', $this->projectProposal->id)
->where('value', false)
->get();
};
$getBoardVotes = function () {
return Vote::query()
->where('project_proposal_id', $this->projectProposal->id)
->whereHas('einundzwanzigPleb', fn($q) => $q->whereIn('npub', config('einundzwanzig.config.current_board')))
->where('value', true)
->get();
};
@@ -59,7 +50,6 @@ $getOtherVotes = function () {
'einundzwanzigPleb',
fn($q) => $q->whereIn('npub', config('einundzwanzig.config.current_board'))
)
->where('value', true)
->get();
};
@@ -103,11 +93,9 @@ $handleNotApprove = function () {
'einundzwanzig_pleb_id' => $this->currentPleb->id,
], [
'value' => false,
'reason' => $this->form->reason,
]);
$this->form->reset();
$this->ownVoteExists = true;
$this->reasons = $this->getReasons();
};
?>
@@ -183,7 +171,7 @@ $handleNotApprove = function () {
<hr class="my-6 border-t border-gray-100 dark:border-gray-700/60">
<!-- Reasons -->
<div>
{{--<div>
<h2 class="text-xl leading-snug text-gray-800 dark:text-gray-100 font-bold mb-2">
Ablehnungen ({{ count($reasons) }})
</h2>
@@ -205,7 +193,7 @@ $handleNotApprove = function () {
</li>
@endforeach
</ul>
</div>
</div>--}}
</div>
@@ -228,7 +216,7 @@ $handleNotApprove = function () {
<i class="fill-current shrink-0 fa-sharp-duotone fa-solid fa-thumbs-down"></i>
<span class="ml-1">Ablehnen</span>
</button>
<x-textarea wire:model="form.reason" label="Grund für deine Ablehnung"/>
{{--<x-textarea wire:model="form.reason" label="Grund für deine Ablehnung"/>--}}
</div>
@else
<div class="space-y-2">
@@ -241,11 +229,11 @@ $handleNotApprove = function () {
<div class="bg-white dark:bg-gray-800 p-5 shadow-sm rounded-xl lg:w-72 xl:w-80">
<div class="flex justify-between space-x-1 mb-5">
<div class="text-sm text-gray-800 dark:text-gray-100 font-semibold">
Zustimmungen des Vorstands ({{ count($boardVotes) }})
Zustimmungen des Vorstands ({{ count($boardVotes->where('value', 1)) }})
</div>
</div>
<ul class="space-y-3">
@foreach($boardVotes as $vote)
@foreach($boardVotes->where('value', 1) as $vote)
<li>
<div class="flex justify-between">
<div class="grow flex items-center">
@@ -257,9 +245,40 @@ $handleNotApprove = function () {
alt="{{ $vote->einundzwanzigPleb->profile->name }}">
</div>
<div class="truncate">
<span class="text-sm font-medium text-gray-800 dark:text-gray-100">
{{ $vote->einundzwanzigPleb->profile->name }}
</span>
<span class="text-sm font-medium text-gray-800 dark:text-gray-100">
{{ $vote->einundzwanzigPleb->profile->name }}
</span>
</div>
</div>
</div>
</li>
@endforeach
</ul>
</div>
<!-- 2nd block -->
<div class="bg-white dark:bg-gray-800 p-5 shadow-sm rounded-xl lg:w-72 xl:w-80">
<div class="flex justify-between space-x-1 mb-5">
<div class="text-sm text-gray-800 dark:text-gray-100 font-semibold">
Ablehnungen des Vorstands ({{ count($boardVotes->where('value', 0)) }})
</div>
</div>
<ul class="space-y-3">
@foreach($boardVotes->where('value', 0) as $vote)
<li>
<div class="flex justify-between">
<div class="grow flex items-center">
<div class="relative mr-3">
<img class="w-8 h-8 rounded-full"
src="{{ $vote->einundzwanzigPleb->profile->picture }}"
width="32"
height="32"
alt="{{ $vote->einundzwanzigPleb->profile->name }}">
</div>
<div class="truncate">
<span class="text-sm font-medium text-gray-800 dark:text-gray-100">
{{ $vote->einundzwanzigPleb->profile->name }}
</span>
</div>
</div>
</div>
@@ -272,11 +291,43 @@ $handleNotApprove = function () {
<div class="bg-white dark:bg-gray-800 p-5 shadow-sm rounded-xl lg:w-72 xl:w-80">
<div class="flex justify-between space-x-1 mb-5">
<div class="text-sm text-gray-800 dark:text-gray-100 font-semibold">
Zustimmungen der übrigen Mitglieder ({{ count($otherVotes) }})
Zustimmungen der übrigen Mitglieder ({{ count($otherVotes->where('value', 1)) }})
</div>
</div>
<ul class="space-y-3">
@foreach($otherVotes as $vote)
@foreach($otherVotes->where('value', 1) as $vote)
<li>
<div class="flex items-center justify-between">
<div class="grow flex items-center">
<div class="relative mr-3">
<img class="w-8 h-8 rounded-full"
src="{{ $vote->einundzwanzigPleb->profile->picture }}"
width="32"
height="32"
alt="{{ $vote->einundzwanzigPleb->profile->name }}">
</div>
<div class="truncate">
<span
class="text-sm font-medium text-gray-800 dark:text-gray-100">
{{ $vote->einundzwanzigPleb->profile->name }}
</span>
</div>
</div>
</div>
</li>
@endforeach
</ul>
</div>
<!-- 3rd block -->
<div class="bg-white dark:bg-gray-800 p-5 shadow-sm rounded-xl lg:w-72 xl:w-80">
<div class="flex justify-between space-x-1 mb-5">
<div class="text-sm text-gray-800 dark:text-gray-100 font-semibold">
Ablehnungen der übrigen Mitglieder ({{ count($otherVotes->where('value', 0)) }})
</div>
</div>
<ul class="space-y-3">
@foreach($otherVotes->where('value', 0) as $vote)
<li>
<div class="flex items-center justify-between">
<div class="grow flex items-center">