sync: master to devel

.github/dependabot.yml

@@ -7,20 +7,8 @@ updates:
     day: saturday
     time: "10:00"
   open-pull-requests-limit: 10
-  target-branch: devel
+  target-branch: development
   versioning-strategy: increase
-  ignore:
-  - dependency-name: postcss
-    versions:
-    - 8.2.6
-    - 8.2.7
-  - dependency-name: xo
-    versions:
-    - 0.38.1
-  - dependency-name: autoprefixer
-    versions:
-    - 10.2.3
-    - 10.2.4
   reviewers:
     - "pi-hole/web-maintainers"
 - package-ecosystem: github-actions
@@ -30,6 +18,16 @@ updates:
     day: saturday
     time: "10:00"
   open-pull-requests-limit: 10
-  target-branch: devel
+  target-branch: development
+  reviewers:
+    - "pi-hole/web-maintainers"
+- package-ecosystem: composer
+  directory: "/"
+  schedule:
+    interval: weekly
+    day: saturday
+    time: "10:00"
+  open-pull-requests-limit: 10
+  target-branch: development
   reviewers:
     - "pi-hole/web-maintainers"

.github/workflows/codeql.yml

@@ -4,13 +4,13 @@ on:
   push:
     branches:
       - master
-      - devel
+      - development
       - "!dependabot/**"
   pull_request:
     # The branches below must be a subset of the branches above
     branches:
       - master
-      - devel
+      - development
   schedule:
     - cron: "0 0 * * 0"
 
@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3.0.2
+        uses: actions/checkout@v4.1.1
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v2

.github/workflows/codespell.yml

@@ -11,10 +11,10 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v3.0.2
+        uses: actions/checkout@v4.1.1
       -
         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

@@ -9,6 +9,6 @@ jobs:
     name: editorconfig-checker
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.0.2
+      - uses: actions/checkout@v4.1.1
       - uses: editorconfig-checker/action-editorconfig-checker@main
       - run: editorconfig-checker

.github/workflows/merge-conflict.yml

@@ -0,0 +1,21 @@
+name: "Check for merge conflicts"
+on:
+  # So that PRs touching the same files as the push are updated
+  push:
+  # So that the `dirtyLabel` is removed if conflicts are resolve
+  # We recommend `pull_request_target` so that github secrets are available.
+  # In `pull_request` we wouldn't be able to change labels of fork PRs
+  pull_request_target:
+    types: [synchronize]
+
+jobs:
+  main:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check if PRs are have merge conflicts
+        uses: eps1lon/actions-label-merge-conflict@v2.1.0
+        with:
+          dirtyLabel: "Merge Conflicts"
+          repoToken: "${{ secrets.GITHUB_TOKEN }}"
+          commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
+          commentOnClean: "Conflicts have been resolved."

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

@@ -6,7 +6,7 @@ jobs:
     name: PHP-CS-Fixer
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3.0.2
+    - uses: actions/checkout@v4.1.1
     - name: PHP-CS-Fixer
       uses: docker://oskarstark/php-cs-fixer-ga
       with:

.github/workflows/phpstan.yml

@@ -8,27 +8,14 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3.0.2
-    - name: Change PHP version
-      run: |
-        sudo update-alternatives --set php /usr/bin/php8.0
-        sudo update-alternatives --set phar /usr/bin/phar8.0
-        sudo update-alternatives --set phpdbg /usr/bin/phpdbg8.0
-        sudo update-alternatives --set php-cgi /usr/bin/php-cgi8.0
-        sudo update-alternatives --set phar.phar /usr/bin/phar.phar8.0
-        php -version
-    - name: Validate composer.json and composer.lock
-      run: composer validate
-    - name: Cache Composer packages
-      id: composer-cache
-      uses: actions/cache@v3.0.6
+    - uses: actions/checkout@v4.1.1
+
+    - name: Install composer
+      uses: php-actions/composer@v6
+
+    - name: Run PHPStan
+      uses: php-actions/phpstan@v3
       with:
-        path: vendor
-        key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-php-
-    - name: Install dependencies
-      if: steps.composer-cache.outputs.cache-hit != 'true'
-      run: composer install --prefer-dist --no-progress --no-suggest
-    - name: Run phpstan
-      run: composer run-script phpstan
+        configuration: phpstan.neon.dist
+        memory_limit: 256M
+

.github/workflows/stale.yml

@@ -4,23 +4,45 @@ on:
   schedule:
     - cron: '0 8 * * *'
   workflow_dispatch:
+  issue_comment:
 
-jobs:
-  stale:
+env:
+  stale_label: stale
 
+jobs:
+  stale_action:
+    if: github.event_name != 'issue_comment'
     runs-on: ubuntu-latest
     permissions:
       issues: write
 
     steps:
-    - uses: actions/stale@v5.1.1
+    - uses: actions/stale@v8.0.0
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         days-before-stale: 30
         days-before-close: 5
         stale-issue-message: 'This issue is stale because it has been open 30 days with no activity. Please comment or update this issue or it will be closed in 5 days.'
-        stale-issue-label: 'stale'
-        exempt-issue-labels: 'internal, Fixed In Next Release, Bug'
+        stale-issue-label: '${{ env.stale_label }}'
+        exempt-issue-labels: 'internal, Fixed In Next Release, Bug, never-stale'
         exempt-all-issue-assignees: true
         operations-per-run: 300
         close-issue-reason: 'not_planned'
+
+  remove_stale:
+    # trigger "stale" removal immediately when stale issues are commented on
+    # we need to explicitly check that the trigger does not run on comment on a PR as
+    # 'issue_comment' triggers on issues AND PR comments
+    # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#issue_comment-on-issues-only-or-pull-requests-only
+    if: ${{ !github.event.issue.pull_request && github.event_name != 'schedule' }}
+    permissions:
+      contents: read #  for actions/checkout
+      issues: write #  to edit issues label
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4.1.1
+      - name: Remove 'stale' label
+        run: gh issue edit ${{ github.event.issue.number }} --remove-label ${{ env.stale_label }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/stale_pr.yml

@@ -0,0 +1,35 @@
+name: Close stale PR
+# This action will add a `stale` label and close immediately every PR that meets the following conditions:
+#   - it is already marked with "merge conflict" label
+#   - there was no update/comment on the PR in the last 30 days.
+
+on:
+  schedule:
+    - cron: '0 10 * * *'
+  workflow_dispatch:
+
+jobs:
+  stale:
+
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+
+    steps:
+      - uses: actions/stale@v8.0.0
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          # Do not automatically mark PR/issue as stale
+          days-before-stale: -1
+          # Override 'days-before-stale' for PR only
+          days-before-pr-stale: 30
+          # Close PRs immediately, after marking them 'stale'
+          days-before-pr-close: 0
+          # only run the action on merge conflict PR
+          any-of-labels: 'Merge Conflicts'
+          exempt-pr-labels: 'internal, never-stale, ON HOLD, WIP'
+          exempt-all-pr-assignees: true
+          operations-per-run: 300
+          stale-pr-message: ''
+          close-pr-message: 'Existing merge conflicts have not been addressed. This PR is considered abandoned.'

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

@@ -11,17 +11,8 @@ jobs:
     name: Syncing branches
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.0.2
+        uses: actions/checkout@v4.1.1
       - name: Opening pull request
-        id: pull
-        uses: tretuna/sync-branches@1.4.0
-        with:
+        run: gh pr create -B development -H master --title 'Sync master back into development' --body 'Created by Github action' --label 'internal'
+        env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          FROM_BRANCH: 'master'
-          TO_BRANCH: 'devel'
-      - name: Label the pull request to ignore for release note generation
-        uses: actions-ecosystem/action-add-labels@v1.1.3
-        with:
-          labels: internal
-          repo: ${{ github.repository }}
-          number: ${{ steps.pull.outputs.PULL_REQUEST_NUMBER }}

.github/workflows/test.yml

@@ -3,7 +3,7 @@ name: Tests
 on:
   push:
     branches:
-      - devel
+      - development
       - master
   pull_request:
     branches:
@@ -19,10 +19,10 @@ jobs:
 
     steps:
       - name: Clone repository
-        uses: actions/checkout@v3.0.2
+        uses: actions/checkout@v4.1.1
 
       - name: Set up Node.js
-        uses: actions/setup-node@v3.4.1
+        uses: actions/setup-node@v4.0.0
         with:
           node-version: "16.x"
           cache: npm

.php-cs-fixer.dist.php

@@ -22,6 +22,7 @@
     ->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)

CONTRIBUTING.md

@@ -31,8 +31,8 @@ When requesting or submitting new features, first consider whether it might be u
 
 ## Technical Requirements
 
-- Submit Pull Requests to the **devel branch only**.
-- Before Submitting your Pull Request, merge `devel` with your new branch and fix any conflicts. (Make sure you don't break anything in development!)
+- Submit Pull Requests to the **development branch only**.
+- Before Submitting your Pull Request, merge `development` with your new branch and fix any conflicts. (Make sure you don't break anything in development!)
 - Commit Unix line endings.
 - Please use the Pi-hole brand: **Pi-hole** (Take a special look at the capitalized 'P' and a low 'h' with a hyphen)
 - (Optional fun) keep to the theme of Star Trek/black holes/gravity.

README.md

@@ -11,7 +11,7 @@
   <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">
+    <img src="https://pi-hole.github.io/graphics/Screenshots/pihole_dashboard_v5.png" alt="Pi-hole Web interface">
   </a>
 </p>
 
@@ -112,7 +112,7 @@ While we are primarily reachable on our <a href="https://discourse.pi-hole.net/"
 ## Password protection
 
 <p align="center">
-  <img src="https://pi-hole.github.io/graphics/Screenshots/password-protection.png" height="400" alt="Password protection">
+  <img src="https://pi-hole.github.io/graphics/Screenshots/password_protection_v5.png" alt="Password protection">
 </p>
 
 ## Detailed graphs and doughnut charts

api.php

@@ -8,8 +8,8 @@
 */
 
 $api = true;
-require_once 'scripts/pi-hole/php/FTL.php';
 require_once 'scripts/pi-hole/php/password.php';
+require_once 'scripts/pi-hole/php/FTL.php';
 require_once 'scripts/pi-hole/php/database.php';
 require_once 'scripts/pi-hole/php/auth.php';
 check_cors();
@@ -71,10 +71,28 @@
     $branches = array('core_branch' => $core_branch,
         'web_branch' => $web_branch,
         'FTL_branch' => $FTL_branch, );
+    if (isset($versions['DOCKER_VERSION'])) {
+        // Docker info is available only inside containers
+        $updates['docker_update'] = $docker_update;
+        $current['docker_current'] = $docker_current;
+        $latest['docker_latest'] = $docker_latest;
+    }
+
     $data = array_merge($data, $updates);
     $data = array_merge($data, $current);
     $data = array_merge($data, $latest);
     $data = array_merge($data, $branches);
+} elseif (isset($_GET['setTempUnit'])) {
+    $unit = strtolower($_GET['setTempUnit']);
+    if ($unit == 'c' || $unit == 'f' || $unit == 'k') {
+        pihole_execute('-a -'.$unit);
+        $result = 'success';
+    } else {
+        // invalid unit
+        $result = 'error';
+    }
+
+    $data = array_merge($data, array('result' => $result));
 } elseif (isset($_GET['list'])) {
     if (!$auth) {
         exit('Not authorized!');
@@ -86,22 +104,22 @@
 
     switch ($_GET['list']) {
         case 'black':
-            $_POST['type'] = ListType::blacklist;
+            $_POST['type'] = LISTTYPE_BLACKLIST;
 
             break;
 
         case 'regex_black':
-            $_POST['type'] = ListType::regex_blacklist;
+            $_POST['type'] = LISTTYPE_REGEX_BLACKLIST;
 
             break;
 
         case 'white':
-            $_POST['type'] = ListType::whitelist;
+            $_POST['type'] = LISTTYPE_WHITELIST;
 
             break;
 
         case 'regex_white':
-            $_POST['type'] = ListType::regex_whitelist;
+            $_POST['type'] = LISTTYPE_REGEX_WHITELIST;
 
             break;