Release 5.14 (#2321)

.codespellignore

@@ -1,2 +1,2 @@
 ede
-EDE
+EDE

.editorconfig

@@ -12,17 +12,28 @@ charset = utf-8
 trim_trailing_whitespace = true
 
 [*.css]
-indent_style = space
 indent_size = 2
 
-[scripts/**.js]
-indent_style = space
+[*.js]
 indent_size = 2
 
 [package.json]
-indent_style = space
+indent_size = 2
+
+[.yamllint.conf]
 indent_size = 2
 
 [*.yml]
-indent_style = space
 indent_size = 2
+
+[*.md]
+indent_size = 2
+
+# Ignore paths
+[**/vendor/**]
+charset = unset
+end_of_line = unset
+insert_final_newline = unset
+trim_trailing_whitespace = unset
+indent_style = unset
+indent_size = unset

.github/dco.yml

@@ -1,2 +1,2 @@
 require:
-  members: false
+  members: false

.github/workflows/codeql.yml

@@ -21,15 +21,15 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.0.2
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v1
+        uses: github/codeql-action/init@v2
         with:
           languages: "javascript"
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v1
+        uses: github/codeql-action/autobuild@v2
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v1
+        uses: github/codeql-action/analyze@v2

.github/workflows/codespell.yml

@@ -11,10 +11,10 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v3.0.2
       -
         name: Spell-Checking
         uses: codespell-project/actions-codespell@master
         with:
           ignore_words_file: .codespellignore
-          skip: ./scripts/vendor,./style/vendor
+          skip: ./scripts/vendor,./style/vendor,./package.json,./package-lock.json,./composer.json,./composer.lock

.github/workflows/editorconfig-checker.yml

@@ -0,0 +1,14 @@
+name: editorconfig-checker
+
+on:
+  pull_request:
+  push:
+
+jobs:
+  build:
+    name: editorconfig-checker
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3.0.2
+      - uses: editorconfig-checker/action-editorconfig-checker@main
+      - run: editorconfig-checker

.github/workflows/php-cs-fixer.yml

@@ -0,0 +1,13 @@
+# .github/workflows/php-cs-fixer.yml
+on: [push, pull_request]
+name: Lint
+jobs:
+  php-cs-fixer:
+    name: PHP-CS-Fixer
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3.0.2
+    - name: PHP-CS-Fixer
+      uses: docker://oskarstark/php-cs-fixer-ga
+      with:
+        args: --diff --dry-run

.github/workflows/phpstan.yml

@@ -8,7 +8,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3.0.2
     - name: Change PHP version
       run: |
         sudo update-alternatives --set php /usr/bin/php8.0
@@ -21,7 +21,7 @@ jobs:
       run: composer validate
     - name: Cache Composer packages
       id: composer-cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3.0.8
       with:
         path: vendor
         key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}

.github/workflows/stale.yml

@@ -13,7 +13,7 @@ jobs:
       issues: write
 
     steps:
-    - uses: actions/stale@v5
+    - uses: actions/stale@v5.1.1
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         days-before-stale: 30

.github/workflows/sync-back-to-dev.yml

@@ -11,7 +11,7 @@ jobs:
     name: Syncing branches
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.0.2
       - name: Opening pull request
         id: pull
         uses: tretuna/sync-branches@1.4.0
@@ -20,7 +20,7 @@ jobs:
           FROM_BRANCH: 'master'
           TO_BRANCH: 'devel'
       - name: Label the pull request to ignore for release note generation
-        uses: actions-ecosystem/action-add-labels@v1
+        uses: actions-ecosystem/action-add-labels@v1.1.3
         with:
           labels: internal
           repo: ${{ github.repository }}

.github/workflows/test.yml

@@ -19,10 +19,10 @@ jobs:
 
     steps:
       - name: Clone repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.0.2
 
       - name: Set up Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3.4.1
         with:
           node-version: "16.x"
           cache: npm

.gitignore

@@ -7,6 +7,7 @@ TODO
 *.zip
 test.html
 *.log
+.php-cs-fixer.cache
 
 # Intellij IDEA Project Files
 *.iml

.php-cs-fixer.dist.php

@@ -0,0 +1,31 @@
+<?php
+
+/* Pi-hole: A black hole for Internet advertisements
+*  (c) 2022 Pi-hole, LLC (https://pi-hole.net)
+*  Network-wide ad blocking via your own hardware.
+*
+*  This file is copyright under the latest version of the EUPL.
+*  Please see LICENSE file for your rights under this license.
+*/
+
+declare(strict_types=1);
+
+$finder = PhpCsFixer\Finder::create()
+    ->ignoreDotFiles(false)
+    ->ignoreVCSIgnored(true)
+    ->exclude('scripts/vendor')
+    ->in(__DIR__)
+;
+
+$config = new PhpCsFixer\Config();
+$config
+    ->setRules(array(
+        '@Symfony' => true,
+        'array_syntax' => array('syntax' => 'long'),
+        'yoda_style' => array('equal' => false, 'identical' => false, 'less_and_greater' => false, 'always_move_variable' => false),
+    ))
+    ->setLineEnding(PHP_EOL)
+    ->setFinder($finder)
+;
+
+return $config;

LICENSE

@@ -6,8 +6,9 @@ The license is available in the 22 official languages of the EU. The English ver
 Please see https://joinup.ec.europa.eu/community/eupl/og_page/eupl for official translations of the other languages.
 
 This license applies to the whole project EXCEPT the files located under
- - styles/vendor, and
- - scripts/vendor
+
+- styles/vendor, and
+- scripts/vendor
 whose licenses are located therein.
 
 -------------------------------------------------------------

README.md

@@ -1,14 +1,18 @@
 <p align="center">
-    <a href="https://pi-hole.net/">
-        <img src="https://pi-hole.github.io/graphics/Vortex/Vortex_with_Wordmark.svg" width="150" height="260" alt="Pi-hole">
-    </a>
-    <br>
-    <strong>Network-wide ad blocking via your own Linux hardware</strong>
-    <br>
-    <br>
-    <a href="https://pi-hole.net/">
-        <img src="https://pi-hole.github.io/graphics/Screenshots/pihole-dashboard.png" alt="Pi-hole Web interface">
-    </a>
+  <a href="https://pi-hole.net/">
+    <picture>
+      <source media="(prefers-color-scheme: dark)" srcset="https://pi-hole.github.io/graphics/Vortex/Vortex_Vertical_wordmark_darkmode.png">
+      <source media="(prefers-color-scheme: light)" srcset="https://pi-hole.github.io/graphics/Vortex/Vortex_Vertical_wordmark_lightmode.png">
+      <img src="https://pi-hole.github.io/graphics/Vortex/Vortex_Vertical_wordmark_lightmode.png" width="168" height="270" alt="Pi-hole website">
+    </picture>
+  </a>
+  <br>
+  <strong>Network-wide ad blocking via your own Linux hardware</strong>
+  <br>
+  <br>
+  <a href="https://pi-hole.net/">
+    <img src="https://pi-hole.github.io/graphics/Screenshots/pihole-dashboard.png" alt="Pi-hole Web interface">
+  </a>
 </p>
 
 Pi-hole[®](https://pi-hole.net/trademark-rules-and-brand-guidelines/)'s Web interface (based off of [AdminLTE](https://github.com/ColorlibHQ/AdminLTE)) provides a central location to manage your Pi-hole and review the statistics generated by FTLDNS[™](https://pi-hole.net/trademark-rules-and-brand-guidelines/).
@@ -175,16 +179,16 @@ Full usage available [here](https://discourse.pi-hole.net/t/pi-hole-api/1863). C
 
 ```json
 {
-   "domains_being_blocked":243038,
-   "dns_queries_today":2385,
-   "ads_blocked_today":414,
-   "ads_percentage_today":17.35849,
-   "unique_domains":429,
-   "queries_forwarded":1537,
-   "queries_cached":434,
-   "clients_ever_seen":5,
-   "unique_clients":5,
-   "status":"enabled"
+  "domains_being_blocked":243038,
+  "dns_queries_today":2385,
+  "ads_blocked_today":414,
+  "ads_percentage_today":17.35849,
+  "unique_domains":429,
+  "queries_forwarded":1537,
+  "queries_cached":434,
+  "clients_ever_seen":5,
+  "unique_clients":5,
+  "status":"enabled"
 }
 ```