Andrew Wallo 7 月之前
父節點
當前提交
7c7c413f6b

+ 35
- 10
app/Listeners/HandleTransactionImport.php 查看文件

@@ -4,18 +4,11 @@ namespace App\Listeners;
4 4
 
5 5
 use App\Events\StartTransactionImport;
6 6
 use App\Jobs\ProcessTransactionImport;
7
-use App\Services\ConnectedBankAccountService;
7
+use Illuminate\Database\Eloquent\ModelNotFoundException;
8 8
 use Illuminate\Support\Facades\DB;
9 9
 
10 10
 class HandleTransactionImport
11 11
 {
12
-    /**
13
-     * Create the event listener.
14
-     */
15
-    public function __construct(
16
-        protected ConnectedBankAccountService $connectedBankAccountService
17
-    ) {}
18
-
19 12
     /**
20 13
      * Handle the event.
21 14
      */
@@ -33,8 +26,40 @@ class HandleTransactionImport
33 26
         $selectedBankAccountId = $event->selectedBankAccountId;
34 27
         $startDate = $event->startDate;
35 28
 
36
-        $bankAccount = $this->connectedBankAccountService->getOrProcessBankAccountForConnectedBankAccount($company, $connectedBankAccount, $selectedBankAccountId);
37
-        $account = $this->connectedBankAccountService->getOrProcessAccountForConnectedBankAccount($bankAccount, $company, $connectedBankAccount);
29
+        if ($selectedBankAccountId === 'new') {
30
+            $defaultAccountSubtypeName = $connectedBankAccount->type->getDefaultSubtype();
31
+
32
+            $accountSubtype = $company->accountSubtypes()
33
+                ->where('name', $defaultAccountSubtypeName)
34
+                ->first();
35
+
36
+            if ($accountSubtype === null) {
37
+                throw new ModelNotFoundException("Account subtype '{$defaultAccountSubtypeName}' not found for company '{$company->name}'");
38
+            }
39
+
40
+            $account = $company->accounts()->create([
41
+                'name' => $connectedBankAccount->name,
42
+                'currency_code' => $connectedBankAccount->currency_code,
43
+                'description' => $connectedBankAccount->name,
44
+                'subtype_id' => $accountSubtype->id,
45
+            ]);
46
+
47
+            $bankAccount = $account->bankAccount()->create([
48
+                'company_id' => $company->id,
49
+                'institution_id' => $connectedBankAccount->institution_id,
50
+                'type' => $connectedBankAccount->type,
51
+                'number' => $connectedBankAccount->mask,
52
+                'enabled' => $company->bankAccounts()->where('enabled', true)->doesntExist(),
53
+            ]);
54
+        } else {
55
+            $bankAccount = $company->bankAccounts()->find($selectedBankAccountId);
56
+
57
+            if ($bankAccount === null) {
58
+                throw new ModelNotFoundException("Bank account '{$selectedBankAccountId}' not found for company '{$company->name}'");
59
+            }
60
+
61
+            $account = $bankAccount->account;
62
+        }
38 63
 
39 64
         $connectedBankAccount->update([
40 65
             'bank_account_id' => $bankAccount->id,

+ 3
- 3
app/Observers/AccountObserver.php 查看文件

@@ -44,7 +44,7 @@ class AccountObserver
44 44
         }
45 45
     }
46 46
 
47
-    private function setFieldsForBankAccount(Account $account): void
47
+    private function setAccountCode(Account $account): void
48 48
     {
49 49
         $generatedAccountCode = AccountCode::generate($account->subtype);
50 50
 
@@ -56,8 +56,8 @@ class AccountObserver
56 56
      */
57 57
     public function created(Account $account): void
58 58
     {
59
-        if ($account->bankAccount && $account->code === null) {
60
-            $this->setFieldsForBankAccount($account);
59
+        if (! $account->code) {
60
+            $this->setAccountCode($account);
61 61
             $account->save();
62 62
         }
63 63
     }

+ 0
- 23
app/Repositories/Accounting/AccountSubtypeRepository.php 查看文件

@@ -1,23 +0,0 @@
1
-<?php
2
-
3
-namespace App\Repositories\Accounting;
4
-
5
-use App\Models\Accounting\AccountSubtype;
6
-use App\Models\Company;
7
-use Illuminate\Database\Eloquent\ModelNotFoundException;
8
-
9
-class AccountSubtypeRepository
10
-{
11
-    public function findAccountSubtypeByNameOrFail(Company $company, $name): AccountSubtype
12
-    {
13
-        $accountSubtype = $company->accountSubtypes()
14
-            ->where('name', $name)
15
-            ->first();
16
-
17
-        if ($accountSubtype === null) {
18
-            throw new ModelNotFoundException("Account subtype '{$accountSubtype}' not found for company '{$company->name}'");
19
-        }
20
-
21
-        return $accountSubtype;
22
-    }
23
-}

+ 0
- 34
app/Repositories/Banking/ConnectedBankAccountRepository.php 查看文件

@@ -1,34 +0,0 @@
1
-<?php
2
-
3
-namespace App\Repositories\Banking;
4
-
5
-use App\Models\Accounting\Account;
6
-use App\Models\Accounting\AccountSubtype;
7
-use App\Models\Banking\BankAccount;
8
-use App\Models\Banking\ConnectedBankAccount;
9
-use App\Models\Company;
10
-
11
-class ConnectedBankAccountRepository
12
-{
13
-    public function createBankAccountForConnectedBankAccount(Company $company, ConnectedBankAccount $connectedBankAccount)
14
-    {
15
-        return $connectedBankAccount->bankAccount()->create([
16
-            'company_id' => $company->id,
17
-            'institution_id' => $connectedBankAccount->institution_id,
18
-            'type' => $connectedBankAccount->type,
19
-            'number' => $connectedBankAccount->mask,
20
-            'enabled' => BankAccount::where('company_id', $company->id)->where('enabled', true)->doesntExist(),
21
-        ]);
22
-    }
23
-
24
-    public function createAccountForConnectedBankAccount(Company $company, ConnectedBankAccount $connectedBankAccount, BankAccount $bankAccount, AccountSubtype $accountSubtype): Account
25
-    {
26
-        return $bankAccount->account()->create([
27
-            'company_id' => $company->id,
28
-            'name' => $connectedBankAccount->name,
29
-            'currency_code' => $connectedBankAccount->currency_code,
30
-            'description' => $connectedBankAccount->name,
31
-            'subtype_id' => $accountSubtype->id,
32
-        ]);
33
-    }
34
-}

+ 0
- 45
app/Services/ConnectedBankAccountService.php 查看文件

@@ -1,45 +0,0 @@
1
-<?php
2
-
3
-namespace App\Services;
4
-
5
-use App\Models\Accounting\Account;
6
-use App\Models\Banking\BankAccount;
7
-use App\Models\Banking\ConnectedBankAccount;
8
-use App\Models\Company;
9
-use App\Repositories\Accounting\AccountSubtypeRepository;
10
-use App\Repositories\Banking\ConnectedBankAccountRepository;
11
-
12
-class ConnectedBankAccountService
13
-{
14
-    public function __construct(
15
-        protected AccountSubtypeRepository $accountSubtypeRepository,
16
-        protected ConnectedBankAccountRepository $connectedBankAccountRepository
17
-    ) {}
18
-
19
-    public function getOrProcessBankAccountForConnectedBankAccount(Company $company, ConnectedBankAccount $connectedBankAccount, int | string $selectedBankAccountId): BankAccount
20
-    {
21
-        if ($selectedBankAccountId === 'new') {
22
-            return $this->connectedBankAccountRepository->createBankAccountForConnectedBankAccount($company, $connectedBankAccount);
23
-        }
24
-
25
-        return $company->bankAccounts()->find($selectedBankAccountId);
26
-    }
27
-
28
-    public function getOrProcessAccountForConnectedBankAccount(BankAccount $bankAccount, Company $company, ConnectedBankAccount $connectedBankAccount): Account
29
-    {
30
-        if ($bankAccount->account()->doesntExist()) {
31
-            return $this->processNewAccountForBank($bankAccount, $company, $connectedBankAccount);
32
-        }
33
-
34
-        return $bankAccount->account;
35
-    }
36
-
37
-    public function processNewAccountForBank(BankAccount $bankAccount, Company $company, ConnectedBankAccount $connectedBankAccount): Account
38
-    {
39
-        $defaultAccountSubtypeName = $bankAccount->type->getDefaultSubtype();
40
-
41
-        $accountSubtype = $this->accountSubtypeRepository->findAccountSubtypeByNameOrFail($company, $defaultAccountSubtypeName);
42
-
43
-        return $this->connectedBankAccountRepository->createAccountForConnectedBankAccount($company, $connectedBankAccount, $bankAccount, $accountSubtype);
44
-    }
45
-}

+ 72
- 85
composer.lock 查看文件

@@ -497,16 +497,16 @@
497 497
         },
498 498
         {
499 499
             "name": "aws/aws-sdk-php",
500
-            "version": "3.340.4",
500
+            "version": "3.342.0",
501 501
             "source": {
502 502
                 "type": "git",
503 503
                 "url": "https://github.com/aws/aws-sdk-php.git",
504
-                "reference": "2896cfb3f6b2bd06757b16e99e1cab93c9598af3"
504
+                "reference": "5b8c837ab0c9754ab3408bd9afe6f0c67516b1fd"
505 505
             },
506 506
             "dist": {
507 507
                 "type": "zip",
508
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/2896cfb3f6b2bd06757b16e99e1cab93c9598af3",
509
-                "reference": "2896cfb3f6b2bd06757b16e99e1cab93c9598af3",
508
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/5b8c837ab0c9754ab3408bd9afe6f0c67516b1fd",
509
+                "reference": "5b8c837ab0c9754ab3408bd9afe6f0c67516b1fd",
510 510
                 "shasum": ""
511 511
             },
512 512
             "require": {
@@ -588,9 +588,9 @@
588 588
             "support": {
589 589
                 "forum": "https://github.com/aws/aws-sdk-php/discussions",
590 590
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
591
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.340.4"
591
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.342.0"
592 592
             },
593
-            "time": "2025-02-28T19:13:38+00:00"
593
+            "time": "2025-03-05T19:20:14+00:00"
594 594
         },
595 595
         {
596 596
             "name": "aws/aws-sdk-php-laravel",
@@ -1733,7 +1733,7 @@
1733 1733
         },
1734 1734
         {
1735 1735
             "name": "filament/actions",
1736
-            "version": "v3.3.0",
1736
+            "version": "v3.3.3",
1737 1737
             "source": {
1738 1738
                 "type": "git",
1739 1739
                 "url": "https://github.com/filamentphp/actions.git",
@@ -1786,16 +1786,16 @@
1786 1786
         },
1787 1787
         {
1788 1788
             "name": "filament/filament",
1789
-            "version": "v3.3.0",
1789
+            "version": "v3.3.3",
1790 1790
             "source": {
1791 1791
                 "type": "git",
1792 1792
                 "url": "https://github.com/filamentphp/panels.git",
1793
-                "reference": "2ddea9d4c3c7d1bfce2d9ea6b3d7d7fe8c5682ec"
1793
+                "reference": "6ca7e497517a78413777ab74a0688a70337f6b4f"
1794 1794
             },
1795 1795
             "dist": {
1796 1796
                 "type": "zip",
1797
-                "url": "https://api.github.com/repos/filamentphp/panels/zipball/2ddea9d4c3c7d1bfce2d9ea6b3d7d7fe8c5682ec",
1798
-                "reference": "2ddea9d4c3c7d1bfce2d9ea6b3d7d7fe8c5682ec",
1797
+                "url": "https://api.github.com/repos/filamentphp/panels/zipball/6ca7e497517a78413777ab74a0688a70337f6b4f",
1798
+                "reference": "6ca7e497517a78413777ab74a0688a70337f6b4f",
1799 1799
                 "shasum": ""
1800 1800
             },
1801 1801
             "require": {
@@ -1847,20 +1847,20 @@
1847 1847
                 "issues": "https://github.com/filamentphp/filament/issues",
1848 1848
                 "source": "https://github.com/filamentphp/filament"
1849 1849
             },
1850
-            "time": "2025-02-25T08:19:05+00:00"
1850
+            "time": "2025-03-05T09:26:29+00:00"
1851 1851
         },
1852 1852
         {
1853 1853
             "name": "filament/forms",
1854
-            "version": "v3.3.0",
1854
+            "version": "v3.3.3",
1855 1855
             "source": {
1856 1856
                 "type": "git",
1857 1857
                 "url": "https://github.com/filamentphp/forms.git",
1858
-                "reference": "2d3670835f3fef356e8a0c2dc756eeb9f9acce73"
1858
+                "reference": "420f6b2b30288c853024d189213e38f644dd6f6e"
1859 1859
             },
1860 1860
             "dist": {
1861 1861
                 "type": "zip",
1862
-                "url": "https://api.github.com/repos/filamentphp/forms/zipball/2d3670835f3fef356e8a0c2dc756eeb9f9acce73",
1863
-                "reference": "2d3670835f3fef356e8a0c2dc756eeb9f9acce73",
1862
+                "url": "https://api.github.com/repos/filamentphp/forms/zipball/420f6b2b30288c853024d189213e38f644dd6f6e",
1863
+                "reference": "420f6b2b30288c853024d189213e38f644dd6f6e",
1864 1864
                 "shasum": ""
1865 1865
             },
1866 1866
             "require": {
@@ -1903,20 +1903,20 @@
1903 1903
                 "issues": "https://github.com/filamentphp/filament/issues",
1904 1904
                 "source": "https://github.com/filamentphp/filament"
1905 1905
             },
1906
-            "time": "2025-02-25T08:19:00+00:00"
1906
+            "time": "2025-03-05T09:26:39+00:00"
1907 1907
         },
1908 1908
         {
1909 1909
             "name": "filament/infolists",
1910
-            "version": "v3.3.0",
1910
+            "version": "v3.3.3",
1911 1911
             "source": {
1912 1912
                 "type": "git",
1913 1913
                 "url": "https://github.com/filamentphp/infolists.git",
1914
-                "reference": "3e5f9d2ec79a2be9080c9e081c5284bbeb93ed7a"
1914
+                "reference": "3498bfd23670f94d9c2160d2a7382775dfc97430"
1915 1915
             },
1916 1916
             "dist": {
1917 1917
                 "type": "zip",
1918
-                "url": "https://api.github.com/repos/filamentphp/infolists/zipball/3e5f9d2ec79a2be9080c9e081c5284bbeb93ed7a",
1919
-                "reference": "3e5f9d2ec79a2be9080c9e081c5284bbeb93ed7a",
1918
+                "url": "https://api.github.com/repos/filamentphp/infolists/zipball/3498bfd23670f94d9c2160d2a7382775dfc97430",
1919
+                "reference": "3498bfd23670f94d9c2160d2a7382775dfc97430",
1920 1920
                 "shasum": ""
1921 1921
             },
1922 1922
             "require": {
@@ -1954,11 +1954,11 @@
1954 1954
                 "issues": "https://github.com/filamentphp/filament/issues",
1955 1955
                 "source": "https://github.com/filamentphp/filament"
1956 1956
             },
1957
-            "time": "2025-02-25T08:19:04+00:00"
1957
+            "time": "2025-03-03T08:11:43+00:00"
1958 1958
         },
1959 1959
         {
1960 1960
             "name": "filament/notifications",
1961
-            "version": "v3.3.0",
1961
+            "version": "v3.3.3",
1962 1962
             "source": {
1963 1963
                 "type": "git",
1964 1964
                 "url": "https://github.com/filamentphp/notifications.git",
@@ -2010,16 +2010,16 @@
2010 2010
         },
2011 2011
         {
2012 2012
             "name": "filament/support",
2013
-            "version": "v3.3.0",
2013
+            "version": "v3.3.3",
2014 2014
             "source": {
2015 2015
                 "type": "git",
2016 2016
                 "url": "https://github.com/filamentphp/support.git",
2017
-                "reference": "9ae768216b8f1cd6921946c98364b95f51053b20"
2017
+                "reference": "fb5ff99b8f7559815434c109d505c12c141510da"
2018 2018
             },
2019 2019
             "dist": {
2020 2020
                 "type": "zip",
2021
-                "url": "https://api.github.com/repos/filamentphp/support/zipball/9ae768216b8f1cd6921946c98364b95f51053b20",
2022
-                "reference": "9ae768216b8f1cd6921946c98364b95f51053b20",
2021
+                "url": "https://api.github.com/repos/filamentphp/support/zipball/fb5ff99b8f7559815434c109d505c12c141510da",
2022
+                "reference": "fb5ff99b8f7559815434c109d505c12c141510da",
2023 2023
                 "shasum": ""
2024 2024
             },
2025 2025
             "require": {
@@ -2065,20 +2065,20 @@
2065 2065
                 "issues": "https://github.com/filamentphp/filament/issues",
2066 2066
                 "source": "https://github.com/filamentphp/filament"
2067 2067
             },
2068
-            "time": "2025-02-25T08:19:17+00:00"
2068
+            "time": "2025-03-05T09:26:25+00:00"
2069 2069
         },
2070 2070
         {
2071 2071
             "name": "filament/tables",
2072
-            "version": "v3.3.0",
2072
+            "version": "v3.3.3",
2073 2073
             "source": {
2074 2074
                 "type": "git",
2075 2075
                 "url": "https://github.com/filamentphp/tables.git",
2076
-                "reference": "0b5152d810780d03a560b8e5387dc61881b72b42"
2076
+                "reference": "5f2fbd8f0c6ffd19b2462269778ed96ce3c6fd35"
2077 2077
             },
2078 2078
             "dist": {
2079 2079
                 "type": "zip",
2080
-                "url": "https://api.github.com/repos/filamentphp/tables/zipball/0b5152d810780d03a560b8e5387dc61881b72b42",
2081
-                "reference": "0b5152d810780d03a560b8e5387dc61881b72b42",
2080
+                "url": "https://api.github.com/repos/filamentphp/tables/zipball/5f2fbd8f0c6ffd19b2462269778ed96ce3c6fd35",
2081
+                "reference": "5f2fbd8f0c6ffd19b2462269778ed96ce3c6fd35",
2082 2082
                 "shasum": ""
2083 2083
             },
2084 2084
             "require": {
@@ -2117,11 +2117,11 @@
2117 2117
                 "issues": "https://github.com/filamentphp/filament/issues",
2118 2118
                 "source": "https://github.com/filamentphp/filament"
2119 2119
             },
2120
-            "time": "2025-02-25T08:19:15+00:00"
2120
+            "time": "2025-03-03T09:07:30+00:00"
2121 2121
         },
2122 2122
         {
2123 2123
             "name": "filament/widgets",
2124
-            "version": "v3.3.0",
2124
+            "version": "v3.3.3",
2125 2125
             "source": {
2126 2126
                 "type": "git",
2127 2127
                 "url": "https://github.com/filamentphp/widgets.git",
@@ -2921,16 +2921,16 @@
2921 2921
         },
2922 2922
         {
2923 2923
             "name": "kirschbaum-development/eloquent-power-joins",
2924
-            "version": "4.2.0",
2924
+            "version": "4.2.1",
2925 2925
             "source": {
2926 2926
                 "type": "git",
2927 2927
                 "url": "https://github.com/kirschbaum-development/eloquent-power-joins.git",
2928
-                "reference": "aafbe349e0ad4862273880652d0141bb753c4fc7"
2928
+                "reference": "84a24784d9abde8bafb1998a0841a6bc10fa6f8e"
2929 2929
             },
2930 2930
             "dist": {
2931 2931
                 "type": "zip",
2932
-                "url": "https://api.github.com/repos/kirschbaum-development/eloquent-power-joins/zipball/aafbe349e0ad4862273880652d0141bb753c4fc7",
2933
-                "reference": "aafbe349e0ad4862273880652d0141bb753c4fc7",
2932
+                "url": "https://api.github.com/repos/kirschbaum-development/eloquent-power-joins/zipball/84a24784d9abde8bafb1998a0841a6bc10fa6f8e",
2933
+                "reference": "84a24784d9abde8bafb1998a0841a6bc10fa6f8e",
2934 2934
                 "shasum": ""
2935 2935
             },
2936 2936
             "require": {
@@ -2978,9 +2978,9 @@
2978 2978
             ],
2979 2979
             "support": {
2980 2980
                 "issues": "https://github.com/kirschbaum-development/eloquent-power-joins/issues",
2981
-                "source": "https://github.com/kirschbaum-development/eloquent-power-joins/tree/4.2.0"
2981
+                "source": "https://github.com/kirschbaum-development/eloquent-power-joins/tree/4.2.1"
2982 2982
             },
2983
-            "time": "2025-02-13T23:30:29+00:00"
2983
+            "time": "2025-03-05T10:11:33+00:00"
2984 2984
         },
2985 2985
         {
2986 2986
             "name": "knplabs/knp-snappy",
@@ -3051,16 +3051,16 @@
3051 3051
         },
3052 3052
         {
3053 3053
             "name": "laravel/framework",
3054
-            "version": "v11.44.0",
3054
+            "version": "v11.44.1",
3055 3055
             "source": {
3056 3056
                 "type": "git",
3057 3057
                 "url": "https://github.com/laravel/framework.git",
3058
-                "reference": "e9a33da34815ac1ed46c7e4c477a775f4592f0a7"
3058
+                "reference": "0883d4175f4e2b5c299e7087ad3c74f2ce195c6d"
3059 3059
             },
3060 3060
             "dist": {
3061 3061
                 "type": "zip",
3062
-                "url": "https://api.github.com/repos/laravel/framework/zipball/e9a33da34815ac1ed46c7e4c477a775f4592f0a7",
3063
-                "reference": "e9a33da34815ac1ed46c7e4c477a775f4592f0a7",
3062
+                "url": "https://api.github.com/repos/laravel/framework/zipball/0883d4175f4e2b5c299e7087ad3c74f2ce195c6d",
3063
+                "reference": "0883d4175f4e2b5c299e7087ad3c74f2ce195c6d",
3064 3064
                 "shasum": ""
3065 3065
             },
3066 3066
             "require": {
@@ -3168,7 +3168,7 @@
3168 3168
                 "league/flysystem-read-only": "^3.25.1",
3169 3169
                 "league/flysystem-sftp-v3": "^3.25.1",
3170 3170
                 "mockery/mockery": "^1.6.10",
3171
-                "orchestra/testbench-core": "^9.9.4",
3171
+                "orchestra/testbench-core": "^9.11.2",
3172 3172
                 "pda/pheanstalk": "^5.0.6",
3173 3173
                 "php-http/discovery": "^1.15",
3174 3174
                 "phpstan/phpstan": "^2.0",
@@ -3262,7 +3262,7 @@
3262 3262
                 "issues": "https://github.com/laravel/framework/issues",
3263 3263
                 "source": "https://github.com/laravel/framework"
3264 3264
             },
3265
-            "time": "2025-02-24T13:08:54+00:00"
3265
+            "time": "2025-03-05T15:34:10+00:00"
3266 3266
         },
3267 3267
         {
3268 3268
             "name": "laravel/prompts",
@@ -4306,16 +4306,16 @@
4306 4306
         },
4307 4307
         {
4308 4308
             "name": "livewire/livewire",
4309
-            "version": "v3.6.0",
4309
+            "version": "v3.6.1",
4310 4310
             "source": {
4311 4311
                 "type": "git",
4312 4312
                 "url": "https://github.com/livewire/livewire.git",
4313
-                "reference": "4c66b569cb729ba9b2f4a3c4e79f50fd8f2b71d1"
4313
+                "reference": "0df0a762698176d714e42e2dfed92b6b9e24b8e4"
4314 4314
             },
4315 4315
             "dist": {
4316 4316
                 "type": "zip",
4317
-                "url": "https://api.github.com/repos/livewire/livewire/zipball/4c66b569cb729ba9b2f4a3c4e79f50fd8f2b71d1",
4318
-                "reference": "4c66b569cb729ba9b2f4a3c4e79f50fd8f2b71d1",
4317
+                "url": "https://api.github.com/repos/livewire/livewire/zipball/0df0a762698176d714e42e2dfed92b6b9e24b8e4",
4318
+                "reference": "0df0a762698176d714e42e2dfed92b6b9e24b8e4",
4319 4319
                 "shasum": ""
4320 4320
             },
4321 4321
             "require": {
@@ -4370,7 +4370,7 @@
4370 4370
             "description": "A front-end framework for Laravel.",
4371 4371
             "support": {
4372 4372
                 "issues": "https://github.com/livewire/livewire/issues",
4373
-                "source": "https://github.com/livewire/livewire/tree/v3.6.0"
4373
+                "source": "https://github.com/livewire/livewire/tree/v3.6.1"
4374 4374
             },
4375 4375
             "funding": [
4376 4376
                 {
@@ -4378,7 +4378,7 @@
4378 4378
                     "type": "github"
4379 4379
                 }
4380 4380
             ],
4381
-            "time": "2025-02-26T00:57:32+00:00"
4381
+            "time": "2025-03-04T21:48:52+00:00"
4382 4382
         },
4383 4383
         {
4384 4384
             "name": "masterminds/html5",
@@ -6120,16 +6120,16 @@
6120 6120
         },
6121 6121
         {
6122 6122
             "name": "ramsey/collection",
6123
-            "version": "2.0.0",
6123
+            "version": "2.1.0",
6124 6124
             "source": {
6125 6125
                 "type": "git",
6126 6126
                 "url": "https://github.com/ramsey/collection.git",
6127
-                "reference": "a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5"
6127
+                "reference": "3c5990b8a5e0b79cd1cf11c2dc1229e58e93f109"
6128 6128
             },
6129 6129
             "dist": {
6130 6130
                 "type": "zip",
6131
-                "url": "https://api.github.com/repos/ramsey/collection/zipball/a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5",
6132
-                "reference": "a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5",
6131
+                "url": "https://api.github.com/repos/ramsey/collection/zipball/3c5990b8a5e0b79cd1cf11c2dc1229e58e93f109",
6132
+                "reference": "3c5990b8a5e0b79cd1cf11c2dc1229e58e93f109",
6133 6133
                 "shasum": ""
6134 6134
             },
6135 6135
             "require": {
@@ -6137,25 +6137,22 @@
6137 6137
             },
6138 6138
             "require-dev": {
6139 6139
                 "captainhook/plugin-composer": "^5.3",
6140
-                "ergebnis/composer-normalize": "^2.28.3",
6141
-                "fakerphp/faker": "^1.21",
6140
+                "ergebnis/composer-normalize": "^2.45",
6141
+                "fakerphp/faker": "^1.24",
6142 6142
                 "hamcrest/hamcrest-php": "^2.0",
6143
-                "jangregor/phpstan-prophecy": "^1.0",
6144
-                "mockery/mockery": "^1.5",
6143
+                "jangregor/phpstan-prophecy": "^2.1",
6144
+                "mockery/mockery": "^1.6",
6145 6145
                 "php-parallel-lint/php-console-highlighter": "^1.0",
6146
-                "php-parallel-lint/php-parallel-lint": "^1.3",
6147
-                "phpcsstandards/phpcsutils": "^1.0.0-rc1",
6148
-                "phpspec/prophecy-phpunit": "^2.0",
6149
-                "phpstan/extension-installer": "^1.2",
6150
-                "phpstan/phpstan": "^1.9",
6151
-                "phpstan/phpstan-mockery": "^1.1",
6152
-                "phpstan/phpstan-phpunit": "^1.3",
6153
-                "phpunit/phpunit": "^9.5",
6154
-                "psalm/plugin-mockery": "^1.1",
6155
-                "psalm/plugin-phpunit": "^0.18.4",
6156
-                "ramsey/coding-standard": "^2.0.3",
6157
-                "ramsey/conventional-commits": "^1.3",
6158
-                "vimeo/psalm": "^5.4"
6146
+                "php-parallel-lint/php-parallel-lint": "^1.4",
6147
+                "phpspec/prophecy-phpunit": "^2.3",
6148
+                "phpstan/extension-installer": "^1.4",
6149
+                "phpstan/phpstan": "^2.1",
6150
+                "phpstan/phpstan-mockery": "^2.0",
6151
+                "phpstan/phpstan-phpunit": "^2.0",
6152
+                "phpunit/phpunit": "^10.5",
6153
+                "ramsey/coding-standard": "^2.3",
6154
+                "ramsey/conventional-commits": "^1.6",
6155
+                "roave/security-advisories": "dev-latest"
6159 6156
             },
6160 6157
             "type": "library",
6161 6158
             "extra": {
@@ -6193,19 +6190,9 @@
6193 6190
             ],
6194 6191
             "support": {
6195 6192
                 "issues": "https://github.com/ramsey/collection/issues",
6196
-                "source": "https://github.com/ramsey/collection/tree/2.0.0"
6193
+                "source": "https://github.com/ramsey/collection/tree/2.1.0"
6197 6194
             },
6198
-            "funding": [
6199
-                {
6200
-                    "url": "https://github.com/ramsey",
6201
-                    "type": "github"
6202
-                },
6203
-                {
6204
-                    "url": "https://tidelift.com/funding/github/packagist/ramsey/collection",
6205
-                    "type": "tidelift"
6206
-                }
6207
-            ],
6208
-            "time": "2022-12-31T21:50:55+00:00"
6195
+            "time": "2025-03-02T04:48:29+00:00"
6209 6196
         },
6210 6197
         {
6211 6198
             "name": "ramsey/uuid",

+ 6
- 6
package-lock.json 查看文件

@@ -1088,9 +1088,9 @@
1088 1088
             }
1089 1089
         },
1090 1090
         "node_modules/caniuse-lite": {
1091
-            "version": "1.0.30001701",
1092
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001701.tgz",
1093
-            "integrity": "sha512-faRs/AW3jA9nTwmJBSO1PQ6L/EOgsB5HMQQq4iCu5zhPgVVgO/pZRHlmatwijZKetFw8/Pr4q6dEN8sJuq8qTw==",
1091
+            "version": "1.0.30001702",
1092
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001702.tgz",
1093
+            "integrity": "sha512-LoPe/D7zioC0REI5W73PeR1e1MLCipRGq/VkovJnd6Df+QVqT+vT33OXCp8QUd7kA7RZrHWxb1B36OQKI/0gOA==",
1094 1094
             "dev": true,
1095 1095
             "funding": [
1096 1096
                 {
@@ -1264,9 +1264,9 @@
1264 1264
             "license": "MIT"
1265 1265
         },
1266 1266
         "node_modules/electron-to-chromium": {
1267
-            "version": "1.5.109",
1268
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.109.tgz",
1269
-            "integrity": "sha512-AidaH9JETVRr9DIPGfp1kAarm/W6hRJTPuCnkF+2MqhF4KaAgRIcBc8nvjk+YMXZhwfISof/7WG29eS4iGxQLQ==",
1267
+            "version": "1.5.112",
1268
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.112.tgz",
1269
+            "integrity": "sha512-oen93kVyqSb3l+ziUgzIOlWt/oOuy4zRmpwestMn4rhFWAoFJeFuCVte9F2fASjeZZo7l/Cif9TiyrdW4CwEMA==",
1270 1270
             "dev": true,
1271 1271
             "license": "ISC"
1272 1272
         },

Loading…
取消
儲存