Minor update dependencies (#5693)

* Minor update dependencies Follow-up of #5691 Mostly dev dependencies; nothing that affects our runtime * Update versions for GitHub Actions * Fix newly found typos * Fix exclude path
FreshRSS · Oct 8, 2023 · 13a1c41 · 13a1c41
1 parent 8d72465
commit 13a1c41
Show file tree

Hide file tree

Showing 15 changed files with 554 additions and 343 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -14,7 +14,7 @@ jobs:
 
     steps:
     - name: Git checkout source code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Composer tests
 
@@ -82,14 +82,14 @@ jobs:
       uses: actions/cache@v3
       with:
         path: bin
-        key: ${{ runner.os }}-bin-shfmt@v3.6.0-hadolint@v2.12.0-typos@v1.13.6
+        key: ${{ runner.os }}-bin-shfmt@v3.7.0-hadolint@v2.12.0-typos@v1.16.17
 
     - name: Add ./bin/ to $PATH
       run: mkdir -p bin/ && echo "${PWD}/bin" >> $GITHUB_PATH
 
     - name: Install shfmt
       if: steps.shell-cache.outputs.cache-hit != 'true'
-      run: GOBIN=${PWD}/bin/ go install mvdan.cc/sh/v3/cmd/shfmt@v3.6.0
+      run: GOBIN=${PWD}/bin/ go install mvdan.cc/sh/v3/cmd/shfmt@v3.7.0
 
     - name: Check shell script syntax
       # shellcheck is pre-installed https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2204-Readme.md
@@ -106,7 +106,7 @@ jobs:
       if: steps.shell-cache.outputs.cache-hit != 'true'
       run: |
         cd bin ;
-        wget -q 'https://github.com/crate-ci/typos/releases/download/v1.13.6/typos-v1.13.6-x86_64-unknown-linux-musl.tar.gz' &&
+        wget -q 'https://github.com/crate-ci/typos/releases/download/v1.16.17/typos-v1.16.17-x86_64-unknown-linux-musl.tar.gz' &&
         tar -xvf *.tar.gz './typos' &&
         chmod +x typos &&
         rm *.tar.gz ;

diff --git a/.typos.toml b/.typos.toml
@@ -45,6 +45,7 @@ extend-exclude = [
 	"lib/SimplePie/",
 	"node_modules/",
 	"p/scripts/vendor/",
+	"p/themes/BlueLagoon/README.md",
 	"package-lock.json",
 	"vendor/",
 ]
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1458,7 +1458,7 @@
 
 * Features
 	* New option `disable_update` (also from CLI) to hide the system to update to new FreshRSS versions [#1436](https://github.com/FreshRSS/FreshRSS/pull/1436)
-	* Share with Ⓚnown [#1420](https://github.com/FreshRSS/FreshRSS/pull/1420)
+	* Share with Known [#1420](https://github.com/FreshRSS/FreshRSS/pull/1420)
 	* Share with GNU social [#1422](https://github.com/FreshRSS/FreshRSS/issues/1422)
 * UI
 	* New theme *Origine-compact* [#1388](https://github.com/FreshRSS/FreshRSS/pull/1388)

diff --git a/composer.lock b/composer.lock
diff --git a/docs/en/internationalization.md b/docs/en/internationalization.md
@@ -75,7 +75,7 @@ git grep TODO app/i18n/he
 
 ## Acknowledge a false-positive
 
-Our tool detects if a string needs to be translated if it equals to the English version. For instance, the word “version” is the same in English and French. Thus, our tool would mark the French word to be translated. This is, in fact, the case for the `index.about.version` key. This case is considered as a false-positive because the word _is_ actually translated. To aknowledge such translations, you can run:
+Our tool detects if a string needs to be translated if it equals to the English version. For instance, the word “version” is the same in English and French. Thus, our tool would mark the French word to be translated. This is, in fact, the case for the `index.about.version` key. This case is considered as a false-positive because the word _is_ actually translated. To acknowledge such translations, you can run:
 
 ```sh
 make i18n-ignore-key lang=fr key=index.about.version

diff --git a/docs/en/users/05_Configuration.md b/docs/en/users/05_Configuration.md
@@ -24,7 +24,7 @@ Available languages are:
 | Hungarian               | Magyar                 | hu                                   |
 | Indonesian              | Bahasa Indonesia       | id                                   |
 | Italian                 | Italiano               | it                                   |
-| Japanease               | 日本語                  | ja                                   |
+| Japanese                | 日本語                  | ja                                   |
 | Korean                  | 한국어                  | ko                                   |
 | Latvian                 | Latviešu               | lv                                   |
 | Dutch                   | Nederlands             | nl                                   |

diff --git a/docs/i18n/freshrss.fr.po b/docs/i18n/freshrss.fr.po
@@ -5841,7 +5841,7 @@ msgid ""
 "English version. For instance, the word “version” is the same in English and "
 "French. Thus, our tool would mark the French word to be translated. This is, "
 "in fact, the case for the `index.about.version` key. This case is considered "
-"as a false-positive because the word _is_ actually translated. To aknowledge "
+"as a false-positive because the word _is_ actually translated. To acknowledge "
 "such translations, you can run:"
 msgstr ""
 
@@ -6845,7 +6845,7 @@ msgid ""
 "| Hebrew                  | עברית                  | he                                   |\n"
 "| Indonesian              | Bahasa Indonesia       | id                                   |\n"
 "| Italian                 | Italiano               | it                                   |\n"
-"| Japanease               | 日本語                  | ja                                   |\n"
+"| Japanese                | 日本語                  | ja                                   |\n"
 "| Korean                  | 한국어                  | ko                                   |\n"
 "| Latvian                 | Latviešu               | lv                                   |\n"
 "| Dutch                   | Nederlands             | nl                                   |\n"

diff --git a/docs/i18n/templates/freshrss.pot b/docs/i18n/templates/freshrss.pot
@@ -5399,7 +5399,7 @@ msgid ""
 "English version. For instance, the word “version” is the same in English and "
 "French. Thus, our tool would mark the French word to be translated. This is, "
 "in fact, the case for the `index.about.version` key. This case is considered "
-"as a false-positive because the word _is_ actually translated. To aknowledge "
+"as a false-positive because the word _is_ actually translated. To acknowledge "
 "such translations, you can run:"
 msgstr ""
 
@@ -6356,7 +6356,7 @@ msgid ""
 "|\n"
 "| Italian                 | Italiano               | it                                   "
 "|\n"
-"| Japanease               | 日本語                  | ja                                   "
+"| Japanese                | 日本語                  | ja                                   "
 "|\n"
 "| Korean                  | 한국어                  | ko                                   "
 "|\n"

diff --git a/lib/composer.json b/lib/composer.json
@@ -12,8 +12,8 @@
     ],
     "require": {
         "marienfressinaud/lib_opml": "0.5.1",
-        "phpgt/cssxpath": "dev-master#4fbe420aba3d9e729940107ded4236a835a1a132",
-        "phpmailer/phpmailer": "6.8.0"
+        "phpgt/cssxpath": "dev-master#d99d35f7194bac19fb3f8726b70c1bc83de3e931",
+        "phpmailer/phpmailer": "6.8.1"
     },
     "config": {
         "sort-packages": true,

diff --git a/lib/phpmailer/phpmailer/README.md b/lib/phpmailer/phpmailer/README.md
@@ -47,7 +47,7 @@ This software is distributed under the [LGPL 2.1](http://www.gnu.org/licenses/lg
 PHPMailer is available on [Packagist](https://packagist.org/packages/phpmailer/phpmailer) (using semantic versioning), and installation via [Composer](https://getcomposer.org) is the recommended way to install PHPMailer. Just add this line to your `composer.json` file:
 
 ```json
-"phpmailer/phpmailer": "^6.8.0"
+"phpmailer/phpmailer": "^6.8.1"
 ```
 
 or run
@@ -150,7 +150,7 @@ PHPMailer defaults to English, but in the [language](https://github.com/PHPMaile
 $mail->setLanguage('fr', '/optional/path/to/language/directory/');
 ```
 
-We welcome corrections and new languages – if you're looking for corrections, run the [PHPMailerLangTest.php](https://github.com/PHPMailer/PHPMailer/tree/master/test/PHPMailerLangTest.php) script in the tests folder and it will show any missing translations.
+We welcome corrections and new languages – if you're looking for corrections, run the [Language/TranslationCompletenessTest.php](https://github.com/PHPMailer/PHPMailer/blob/master/test/Language/TranslationCompletenessTest.php) script in the tests folder and it will show any missing translations.
 
 ## Documentation
 Start reading at the [GitHub wiki](https://github.com/PHPMailer/PHPMailer/wiki). If you're having trouble, head for [the troubleshooting guide](https://github.com/PHPMailer/PHPMailer/wiki/Troubleshooting) as it's frequently updated.

diff --git a/lib/phpmailer/phpmailer/VERSION b/lib/phpmailer/phpmailer/VERSION
@@ -1 +1 @@
-6.8.0
+6.8.1
diff --git a/lib/phpmailer/phpmailer/src/PHPMailer.php b/lib/phpmailer/phpmailer/src/PHPMailer.php
@@ -750,7 +750,7 @@ class PHPMailer
      *
      * @var string
      */
-    const VERSION = '6.8.0';
+    const VERSION = '6.8.1';
 
     /**
      * Error severity: message only, continue processing.
@@ -795,7 +795,7 @@ class PHPMailer
      * The maximum line length supported by mail().
      *
      * Background: mail() will sometimes corrupt messages
-     * with headers headers longer than 65 chars, see #818.
+     * with headers longer than 65 chars, see #818.
      *
      * @var int
      */