Merge pull request #7564 from firefly-iii/fix-ci

Fix ci

.github/workflows/cleanup.yml

@@ -56,11 +56,12 @@ jobs:
             
             const workflows = [
               'cleanup.yml',
-              'depsreview.yaml',
-              'qodana.yml',
               'closed-issues.yml',
+              'depsreview.yaml',
               'laravel.yml',
               'lock.yml',
+              'qodana.yml',
+              'sonarcloud.yml',
               'stale.yml'
             ]
             

.github/workflows/closed-issues.yml

@@ -13,10 +13,11 @@ jobs:
           message: |
               Hi there! This is an automatic reply. `Share and enjoy`
               
-              This issue is now closed. Please be aware that closed issues are not actively monitored. If you reply, you may get no response.
+              This issue is now 🔒 closed. Please be aware that closed issues are **not** watched. If you reply, you may get no response.
                        
               - If the original bug is not actually fixed, please feel free to open a new issue. Please refer to this issue for clarity.
-              - Follow-up questions can also be posted in a new [discussion](https://github.com/firefly-iii/firefly-iii/discussions/)
+              - Follow-up questions must be posted in a new [discussion](https://github.com/firefly-iii/firefly-iii/discussions/)
+              - Further replies to this issue will get **no response**.
               
-              Thank you for your consideration.
+              Thank you for your contributions.
           repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/qodana.yml

@@ -32,6 +32,6 @@ jobs:
           php artisan ide-helper:generate;
 
       - name: 'Qodana Scan'
-        uses: JetBrains/qodana-action@v2023.1.0
+        uses: JetBrains/qodana-action@main
         env:
           QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}

app/Handlers/Events/Model/BudgetLimitHandler.php

@@ -181,7 +181,7 @@ class BudgetLimitHandler
         $start  = app('navigation')->startOfPeriod($budgetLimit->start_date, $viewRange);
         $end    = app('navigation')->startOfPeriod($budgetLimit->end_date, $viewRange);
         $end    = app('navigation')->endOfPeriod($end, $viewRange);
-        $budget = Budget::withTrashed()->find($budgetLimit->budget_id);
+        $budget = Budget::find($budgetLimit->budget_id);
         if(null === $budget) {
             Log::warning('Budget is null, cannot continue.');
             $budgetLimit->forceDelete();
@@ -210,6 +210,7 @@ class BudgetLimitHandler
                 'end_date',
                 $currentEnd->format('Y-m-d')
             )->where('transaction_currency_id', $budgetLimit->transaction_currency_id)->first();
+
             if (null !== $availableBudget) {
                 Log::debug('Found 1 AB, will update.');
                 $this->calculateAmount($availableBudget);

composer.lock

@@ -6393,16 +6393,16 @@
         },
         {
             "name": "symfony/http-client",
-            "version": "v6.2.10",
+            "version": "v6.2.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-client.git",
-                "reference": "3f5545a91c8e79dedd1a06c4b04e1682c80c42f9"
+                "reference": "39f679c12648cc43bd9f0db12cc69b82041b91a1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-client/zipball/3f5545a91c8e79dedd1a06c4b04e1682c80c42f9",
-                "reference": "3f5545a91c8e79dedd1a06c4b04e1682c80c42f9",
+                "url": "https://api.github.com/repos/symfony/http-client/zipball/39f679c12648cc43bd9f0db12cc69b82041b91a1",
+                "reference": "39f679c12648cc43bd9f0db12cc69b82041b91a1",
                 "shasum": ""
             },
             "require": {
@@ -6426,6 +6426,7 @@
                 "guzzlehttp/promises": "^1.4",
                 "nyholm/psr7": "^1.0",
                 "php-http/httplug": "^1.0|^2.0",
+                "php-http/message-factory": "^1.0",
                 "psr/http-client": "^1.0",
                 "symfony/dependency-injection": "^5.4|^6.0",
                 "symfony/http-kernel": "^5.4|^6.0",
@@ -6461,7 +6462,7 @@
                 "http"
             ],
             "support": {
-                "source": "https://github.com/symfony/http-client/tree/v6.2.10"
+                "source": "https://github.com/symfony/http-client/tree/v6.2.11"
             },
             "funding": [
                 {
@@ -6477,7 +6478,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-04-20T13:12:48+00:00"
+            "time": "2023-05-12T08:48:34+00:00"
         },
         {
             "name": "symfony/http-client-contracts",

qodana.yaml

@@ -1,7 +1,7 @@
 profile:
   name: qodana.recommended
 version: "1.0"
-linter: jetbrains/qodana-php:2022.3-eap
+linter: jetbrains/qodana-php:latest
 exclude:
   - name: All
     paths:

yarn.lock

@@ -4349,9 +4349,9 @@ postcss@^7.0.36:
     source-map "^0.6.1"
 
 postcss@^8.1.10, postcss@^8.2.15, postcss@^8.4, postcss@^8.4.14:
-  version "8.4.23"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.23.tgz#df0aee9ac7c5e53e1075c24a3613496f9e6552ab"
-  integrity sha512-bQ3qMcpF6A/YjR55xtoTr0jGOlnPOKAIMdOWiv0EIT6HVPEaJiJB4NLljSbiHoC2RX7DN5Uvjtpbg1NPdwv1oA==
+  version "8.4.24"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.24.tgz#f714dba9b2284be3cc07dbd2fc57ee4dc972d2df"
+  integrity sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==
   dependencies:
     nanoid "^3.3.6"
     picocolors "^1.0.0"